#include "extensions.h"
#include "config.h"
#include "framerender.h"
+#include "mainloop.h"
#include "render/theme.h"
#define PLATE_EVENTMASK (SubstructureRedirectMask | ButtonPressMask)
#define FRAME_EVENTMASK (EnterWindowMask | LeaveWindowMask | \
- ButtonPressMask | ButtonReleaseMask)
+ ButtonPressMask | ButtonReleaseMask | \
+ VisibilityChangeMask)
#define ELEMENT_EVENTMASK (ButtonPressMask | ButtonReleaseMask | \
ButtonMotionMask | ExposureMask | \
EnterWindowMask | LeaveWindowMask)
f->cbwidth_y)
static void layout_title(ObFrame *self);
+static void flash_done(gpointer data);
+static gboolean flash_timeout(gpointer data);
+
+static void set_theme_statics(ObFrame *self);
+static void free_theme_statics(ObFrame *self);
static Window createWindow(Window parent, unsigned long mask,
XSetWindowAttributes *attrib)
self = g_new(ObFrame, 1);
self->visible = FALSE;
+ self->obscured = TRUE;
self->decorations = 0;
+ self->flashing = FALSE;
/* create all of the decor windows */
mask = CWOverrideRedirect | CWEventMask;
XMapWindow(ob_display, self->lgrip);
XMapWindow(ob_display, self->rgrip);
XMapWindow(ob_display, self->label);
- XMapWindow(ob_display, self->tlresize);
- XMapWindow(ob_display, self->trresize);
+ self->max_press = self->close_press = self->desk_press =
+ self->iconify_press = self->shade_press = FALSE;
+ self->max_hover = self->close_hover = self->desk_hover =
+ self->iconify_hover = self->shade_hover = FALSE;
+
+ set_theme_statics(self);
+
+ return (ObFrame*)self;
+}
+
+static void set_theme_statics(ObFrame *self)
+{
/* set colors/appearance/sizes for stuff that doesn't change */
XSetWindowBorder(ob_display, self->window, ob_rr_theme->b_color->pixel);
XSetWindowBorder(ob_display, self->title, ob_rr_theme->b_color->pixel);
RrAppearanceCopy(ob_rr_theme->a_unfocused_handle);
self->a_focused_handle = RrAppearanceCopy(ob_rr_theme->a_focused_handle);
self->a_icon = RrAppearanceCopy(ob_rr_theme->a_icon);
-
- self->max_press = self->close_press = self->desk_press =
- self->iconify_press = self->shade_press = FALSE;
- self->max_hover = self->close_hover = self->desk_hover =
- self->iconify_hover = self->shade_hover = FALSE;
-
- return (ObFrame*)self;
}
-static void frame_free(ObFrame *self)
+static void free_theme_statics(ObFrame *self)
{
RrAppearanceFree(self->a_unfocused_title);
RrAppearanceFree(self->a_focused_title);
RrAppearanceFree(self->a_unfocused_handle);
RrAppearanceFree(self->a_focused_handle);
RrAppearanceFree(self->a_icon);
+}
+
+static void frame_free(ObFrame *self)
+{
+ free_theme_statics(self);
XDestroyWindow(ob_display, self->window);
}
}
+void frame_adjust_theme(ObFrame *self)
+{
+ free_theme_statics(self);
+ set_theme_statics(self);
+ frame_adjust_area(self, TRUE, TRUE, FALSE);
+}
+
void frame_adjust_shape(ObFrame *self)
{
#ifdef SHAPE
{
if (resized) {
self->decorations = self->client->decorations;
+ self->max_horz = self->client->max_horz;
if (self->decorations & OB_FRAME_DECOR_BORDER) {
self->bwidth = ob_rr_theme->bwidth;
}
self->rbwidth = self->bwidth;
- if (self->client->max_vert && self->client->max_horz)
- self->decorations &= ~OB_FRAME_DECOR_HANDLE;
-
- if (self->client->max_horz)
+ if (self->max_horz)
self->bwidth = self->cbwidth_x = 0;
STRUT_SET(self->innersize,
self->cbwidth_x,
self->cbwidth_y);
self->width = self->client->area.width + self->cbwidth_x * 2 -
- (self->client->max_horz ? self->rbwidth * 2 : 0);
+ (self->max_horz ? self->rbwidth * 2 : 0);
self->width = MAX(self->width, 1); /* no lower than 1 */
/* set border widths */
self->width, ob_rr_theme->title_height);
XMapWindow(ob_display, self->title);
- XMoveWindow(ob_display, self->tlresize, 0, 0);
- XMoveWindow(ob_display, self->trresize,
- self->width - ob_rr_theme->grip_width, 0);
-
+ if (self->decorations & OB_FRAME_DECOR_GRIPS) {
+ XMoveWindow(ob_display, self->tlresize, 0, 0);
+ XMoveWindow(ob_display, self->trresize,
+ self->width - ob_rr_theme->grip_width, 0);
+ XMapWindow(ob_display, self->tlresize);
+ XMapWindow(ob_display, self->trresize);
+ } else {
+ XUnmapWindow(ob_display, self->tlresize);
+ XUnmapWindow(ob_display, self->trresize);
+ }
} else
XUnmapWindow(ob_display, self->title);
}
self->client->area.width +
self->size.left + self->size.right,
(self->client->shaded ?
- ob_rr_theme->title_height + self->bwidth*2:
+ ob_rr_theme->title_height + self->rbwidth * 2:
self->client->area.height +
self->size.top + self->size.bottom));
g_hash_table_remove(window_map, &self->tlresize);
g_hash_table_remove(window_map, &self->trresize);
+ ob_main_loop_timeout_remove_data(ob_main_loop, flash_timeout, self);
+
frame_free(self);
}
n = d = i = l = m = c = s = FALSE;
/* figure out whats being shown, and the width of the label */
- self->label_width = self->width - (ob_rr_theme->bevel + 1) * 2;
+ self->label_width = self->width - (ob_rr_theme->padding + 1) * 2;
for (lc = config_title_layout; *lc != '\0'; ++lc) {
switch (*lc) {
case 'N':
if (n) { *lc = ' '; break; } /* rm duplicates */
n = TRUE;
self->label_width -= (ob_rr_theme->button_size + 2 +
- ob_rr_theme->bevel + 1);
+ ob_rr_theme->padding + 1);
break;
case 'D':
if (d) { *lc = ' '; break; } /* rm duplicates */
d = TRUE;
self->label_width -= (ob_rr_theme->button_size +
- ob_rr_theme->bevel + 1);
+ ob_rr_theme->padding + 1);
break;
case 'S':
if (s) { *lc = ' '; break; } /* rm duplicates */
s = TRUE;
self->label_width -= (ob_rr_theme->button_size +
- ob_rr_theme->bevel + 1);
+ ob_rr_theme->padding + 1);
break;
case 'I':
if (i) { *lc = ' '; break; } /* rm duplicates */
i = TRUE;
self->label_width -= (ob_rr_theme->button_size +
- ob_rr_theme->bevel + 1);
+ ob_rr_theme->padding + 1);
break;
case 'L':
if (l) { *lc = ' '; break; } /* rm duplicates */
if (m) { *lc = ' '; break; } /* rm duplicates */
m = TRUE;
self->label_width -= (ob_rr_theme->button_size +
- ob_rr_theme->bevel + 1);
+ ob_rr_theme->padding + 1);
break;
case 'C':
if (c) { *lc = ' '; break; } /* rm duplicates */
c = TRUE;
self->label_width -= (ob_rr_theme->button_size +
- ob_rr_theme->bevel + 1);
+ ob_rr_theme->padding + 1);
break;
}
}
if (!m) XUnmapWindow(ob_display, self->max);
if (!c) XUnmapWindow(ob_display, self->close);
- x = ob_rr_theme->bevel + 1;
+ x = ob_rr_theme->padding + 1;
for (lc = config_title_layout; *lc != '\0'; ++lc) {
switch (*lc) {
case 'N':
if (!n) break;
self->icon_x = x;
XMapWindow(ob_display, self->icon);
- XMoveWindow(ob_display, self->icon, x, ob_rr_theme->bevel);
- x += ob_rr_theme->button_size + 2 + ob_rr_theme->bevel + 1;
+ XMoveWindow(ob_display, self->icon, x, ob_rr_theme->padding);
+ x += ob_rr_theme->button_size + 2 + ob_rr_theme->padding + 1;
break;
case 'D':
if (!d) break;
self->desk_x = x;
XMapWindow(ob_display, self->desk);
- XMoveWindow(ob_display, self->desk, x, ob_rr_theme->bevel + 1);
- x += ob_rr_theme->button_size + ob_rr_theme->bevel + 1;
+ XMoveWindow(ob_display, self->desk, x, ob_rr_theme->padding + 1);
+ x += ob_rr_theme->button_size + ob_rr_theme->padding + 1;
break;
case 'S':
if (!s) break;
self->shade_x = x;
XMapWindow(ob_display, self->shade);
- XMoveWindow(ob_display, self->shade, x, ob_rr_theme->bevel + 1);
- x += ob_rr_theme->button_size + ob_rr_theme->bevel + 1;
+ XMoveWindow(ob_display, self->shade, x, ob_rr_theme->padding + 1);
+ x += ob_rr_theme->button_size + ob_rr_theme->padding + 1;
break;
case 'I':
if (!i) break;
self->iconify_x = x;
XMapWindow(ob_display, self->iconify);
- XMoveWindow(ob_display, self->iconify, x, ob_rr_theme->bevel + 1);
- x += ob_rr_theme->button_size + ob_rr_theme->bevel + 1;
+ XMoveWindow(ob_display,self->iconify, x, ob_rr_theme->padding + 1);
+ x += ob_rr_theme->button_size + ob_rr_theme->padding + 1;
break;
case 'L':
if (!l) break;
self->label_x = x;
XMapWindow(ob_display, self->label);
- XMoveWindow(ob_display, self->label, x, ob_rr_theme->bevel);
- x += self->label_width + ob_rr_theme->bevel + 1;
+ XMoveWindow(ob_display, self->label, x, ob_rr_theme->padding);
+ x += self->label_width + ob_rr_theme->padding + 1;
break;
case 'M':
if (!m) break;
self->max_x = x;
XMapWindow(ob_display, self->max);
- XMoveWindow(ob_display, self->max, x, ob_rr_theme->bevel + 1);
- x += ob_rr_theme->button_size + ob_rr_theme->bevel + 1;
+ XMoveWindow(ob_display, self->max, x, ob_rr_theme->padding + 1);
+ x += ob_rr_theme->button_size + ob_rr_theme->padding + 1;
break;
case 'C':
if (!c) break;
self->close_x = x;
XMapWindow(ob_display, self->close);
- XMoveWindow(ob_display, self->close, x, ob_rr_theme->bevel + 1);
- x += ob_rr_theme->button_size + ob_rr_theme->bevel + 1;
+ XMoveWindow(ob_display, self->close, x, ob_rr_theme->padding + 1);
+ x += ob_rr_theme->button_size + ob_rr_theme->padding + 1;
break;
}
}
ObFrameContext frame_context_from_string(char *name)
{
- if (!g_ascii_strcasecmp("root", name))
- return OB_FRAME_CONTEXT_ROOT;
+ if (!g_ascii_strcasecmp("desktop", name))
+ return OB_FRAME_CONTEXT_DESKTOP;
else if (!g_ascii_strcasecmp("client", name))
return OB_FRAME_CONTEXT_CLIENT;
else if (!g_ascii_strcasecmp("titlebar", name))
{
ObFrame *self;
- if (win == RootWindow(ob_display, ob_screen)) return OB_FRAME_CONTEXT_ROOT;
+ if (win == RootWindow(ob_display, ob_screen))
+ return OB_FRAME_CONTEXT_DESKTOP;
if (client == NULL) return OB_FRAME_CONTEXT_NONE;
- if (win == client->window) return OB_FRAME_CONTEXT_CLIENT;
+ if (win == client->window) {
+ /* conceptually, this is the desktop, as far as users are
+ concerned */
+ if (client->type == OB_CLIENT_TYPE_DESKTOP)
+ return OB_FRAME_CONTEXT_DESKTOP;
+ return OB_FRAME_CONTEXT_CLIENT;
+ }
self = client->frame;
+ if (win == self->plate) {
+ /* conceptually, this is the desktop, as far as users are
+ concerned */
+ if (client->type == OB_CLIENT_TYPE_DESKTOP)
+ return OB_FRAME_CONTEXT_DESKTOP;
+ return OB_FRAME_CONTEXT_CLIENT;
+ }
+
if (win == self->window) return OB_FRAME_CONTEXT_FRAME;
- if (win == self->plate) return OB_FRAME_CONTEXT_CLIENT;
if (win == self->title) return OB_FRAME_CONTEXT_TITLEBAR;
if (win == self->label) return OB_FRAME_CONTEXT_TITLEBAR;
if (win == self->handle) return OB_FRAME_CONTEXT_HANDLE;
break;
}
}
+
+static void flash_done(gpointer data)
+{
+ ObFrame *self = data;
+
+ if (self->focused != self->flash_on)
+ frame_adjust_focus(self, self->focused);
+}
+
+static gboolean flash_timeout(gpointer data)
+{
+ ObFrame *self = data;
+ GTimeVal now;
+
+ g_get_current_time(&now);
+ if (now.tv_sec > self->flash_end.tv_sec ||
+ (now.tv_sec == self->flash_end.tv_sec &&
+ now.tv_usec >= self->flash_end.tv_usec))
+ self->flashing = FALSE;
+
+ if (!self->flashing)
+ return FALSE; /* we are done */
+
+ self->flash_on = !self->flash_on;
+ {
+ gboolean focused;
+
+ focused = self->focused; /* save the focused flag */
+ frame_adjust_focus(self, self->flash_on);
+ self->focused = focused;
+ }
+
+ return TRUE; /* go again */
+}
+
+void frame_flash_start(ObFrame *self)
+{
+ self->flash_on = self->focused;
+
+ if (!self->flashing)
+ ob_main_loop_timeout_add(ob_main_loop,
+ G_USEC_PER_SEC * 0.75,
+ flash_timeout,
+ self,
+ flash_done);
+ g_get_current_time(&self->flash_end);
+ g_time_val_add(&self->flash_end, G_USEC_PER_SEC * 5);
+
+ self->flashing = TRUE;
+}
+
+void frame_flash_stop(ObFrame *self)
+{
+ self->flashing = FALSE;
+}
projects / chaz / openbox / blobdiff