better prefix symbols to reduce clashes
Dana Jansens danakj@orodu.net
6 files changed,
474 insertions(+),
499 deletions(-)
M
engines/openbox/obengine.c
→
engines/openbox/obengine.c
@@ -15,59 +15,58 @@ #define ELEMENT_EVENTMASK (ButtonPressMask | ButtonReleaseMask | \
ButtonMotionMask | ExposureMask) /* style settings - geometry */ -int s_bevel; -int s_handle_height; -int s_bwidth; -int s_cbwidth; +int ob_s_bevel; +int ob_s_handle_height; +int ob_s_bwidth; +int ob_s_cbwidth; /* style settings - colors */ -color_rgb *s_b_color; -color_rgb *s_cb_focused_color; -color_rgb *s_cb_unfocused_color; -color_rgb *s_title_focused_color; -color_rgb *s_title_unfocused_color; -color_rgb *s_titlebut_focused_color; -color_rgb *s_titlebut_unfocused_color; +color_rgb *ob_s_b_color; +color_rgb *ob_s_cb_focused_color; +color_rgb *ob_s_cb_unfocused_color; +color_rgb *ob_s_title_focused_color; +color_rgb *ob_s_title_unfocused_color; +color_rgb *ob_s_titlebut_focused_color; +color_rgb *ob_s_titlebut_unfocused_color; /* style settings - fonts */ -int s_winfont_height; -int s_winfont_shadow; -int s_winfont_shadow_offset; -ObFont *s_winfont; +int ob_s_winfont_height; +int ob_s_winfont_shadow; +int ob_s_winfont_shadow_offset; +ObFont *ob_s_winfont; /* style settings - masks */ -pixmap_mask *s_max_mask; -pixmap_mask *s_icon_mask; -pixmap_mask *s_desk_mask; -pixmap_mask *s_close_mask; +pixmap_mask *ob_s_max_mask; +pixmap_mask *ob_s_icon_mask; +pixmap_mask *ob_s_desk_mask; +pixmap_mask *ob_s_close_mask; /* global appearances */ -Appearance *a_focused_unpressed_max; -Appearance *a_focused_pressed_max; -Appearance *a_unfocused_unpressed_max; -Appearance *a_unfocused_pressed_max; -Appearance *a_focused_unpressed_close; -Appearance *a_focused_pressed_close; -Appearance *a_unfocused_unpressed_close; -Appearance *a_unfocused_pressed_close; -Appearance *a_focused_unpressed_desk; -Appearance *a_focused_pressed_desk; -Appearance *a_unfocused_unpressed_desk; -Appearance *a_unfocused_pressed_desk; -Appearance *a_focused_unpressed_iconify; -Appearance *a_focused_pressed_iconify; -Appearance *a_unfocused_unpressed_iconify; -Appearance *a_unfocused_pressed_iconify; -Appearance *a_focused_grip; -Appearance *a_unfocused_grip; -Appearance *a_focused_title; -Appearance *a_unfocused_title; -Appearance *a_focused_label; -Appearance *a_unfocused_label; -Appearance *a_icon; /* always parentrelative, so no focused/unfocused */ -Appearance *a_focused_handle; -Appearance *a_unfocused_handle; +Appearance *ob_a_focused_unpressed_max; +Appearance *ob_a_focused_pressed_max; +Appearance *ob_a_unfocused_unpressed_max; +Appearance *ob_a_unfocused_pressed_max; +Appearance *ob_a_focused_unpressed_close; +Appearance *ob_a_focused_pressed_close; +Appearance *ob_a_unfocused_unpressed_close; +Appearance *ob_a_unfocused_pressed_close; +Appearance *ob_a_focused_unpressed_desk; +Appearance *ob_a_focused_pressed_desk; +Appearance *ob_a_unfocused_unpressed_desk; +Appearance *ob_a_unfocused_pressed_desk; +Appearance *ob_a_focused_unpressed_iconify; +Appearance *ob_a_focused_pressed_iconify; +Appearance *ob_a_unfocused_unpressed_iconify; +Appearance *ob_a_unfocused_pressed_iconify; +Appearance *ob_a_focused_grip; +Appearance *ob_a_unfocused_grip; +Appearance *ob_a_focused_title; +Appearance *ob_a_unfocused_title; +Appearance *ob_a_focused_label; +Appearance *ob_a_unfocused_label; +Appearance *ob_a_icon; /* always parentrelative, so no focused/unfocused */ +Appearance *ob_a_focused_handle; +Appearance *ob_a_unfocused_handle; static void layout_title(ObFrame *self); -static void frame_mouse_press(const ObEvent *e, ObFrame *self); -static void frame_mouse_release(const ObEvent *e, ObFrame *self); +static void mouse_event(const ObEvent *e, ObFrame *self); gboolean startup() {@@ -85,76 +84,78 @@ g_quark_from_string("iconify");
g_quark_from_string("icon"); g_quark_from_string("close"); - s_b_color = s_cb_unfocused_color = s_cb_focused_color = - s_title_unfocused_color = s_title_focused_color = - s_titlebut_unfocused_color = s_titlebut_focused_color = NULL; - s_winfont = NULL; - s_max_mask = s_icon_mask = s_desk_mask = s_close_mask = NULL; + ob_s_b_color = ob_s_cb_unfocused_color = ob_s_cb_focused_color = + ob_s_title_unfocused_color = ob_s_title_focused_color = + ob_s_titlebut_unfocused_color = ob_s_titlebut_focused_color = NULL; + ob_s_winfont = NULL; + ob_s_max_mask = ob_s_icon_mask = ob_s_desk_mask = ob_s_close_mask = NULL; - a_focused_unpressed_max = appearance_new(Surface_Planar, 1); - a_focused_pressed_max = appearance_new(Surface_Planar, 1); - a_unfocused_unpressed_max = appearance_new(Surface_Planar, 1); - a_unfocused_pressed_max = appearance_new(Surface_Planar, 1); - a_focused_unpressed_close = NULL; - a_focused_pressed_close = NULL; - a_unfocused_unpressed_close = NULL; - a_unfocused_pressed_close = NULL; - a_focused_unpressed_desk = NULL; - a_focused_pressed_desk = NULL; - a_unfocused_unpressed_desk = NULL; - a_unfocused_pressed_desk = NULL; - a_focused_unpressed_iconify = NULL; - a_focused_pressed_iconify = NULL; - a_unfocused_unpressed_iconify = NULL; - a_unfocused_pressed_iconify = NULL; - a_focused_grip = appearance_new(Surface_Planar, 0); - a_unfocused_grip = appearance_new(Surface_Planar, 0); - a_focused_title = appearance_new(Surface_Planar, 0); - a_unfocused_title = appearance_new(Surface_Planar, 0); - a_focused_label = appearance_new(Surface_Planar, 1); - a_unfocused_label = appearance_new(Surface_Planar, 1); - a_icon = appearance_new(Surface_Planar, 1); - a_focused_handle = appearance_new(Surface_Planar, 0); - a_unfocused_handle = appearance_new(Surface_Planar, 0); + ob_a_focused_unpressed_max = appearance_new(Surface_Planar, 1); + ob_a_focused_pressed_max = appearance_new(Surface_Planar, 1); + ob_a_unfocused_unpressed_max = appearance_new(Surface_Planar, 1); + ob_a_unfocused_pressed_max = appearance_new(Surface_Planar, 1); + ob_a_focused_unpressed_close = NULL; + ob_a_focused_pressed_close = NULL; + ob_a_unfocused_unpressed_close = NULL; + ob_a_unfocused_pressed_close = NULL; + ob_a_focused_unpressed_desk = NULL; + ob_a_focused_pressed_desk = NULL; + ob_a_unfocused_unpressed_desk = NULL; + ob_a_unfocused_pressed_desk = NULL; + ob_a_focused_unpressed_iconify = NULL; + ob_a_focused_pressed_iconify = NULL; + ob_a_unfocused_unpressed_iconify = NULL; + ob_a_unfocused_pressed_iconify = NULL; + ob_a_focused_grip = appearance_new(Surface_Planar, 0); + ob_a_unfocused_grip = appearance_new(Surface_Planar, 0); + ob_a_focused_title = appearance_new(Surface_Planar, 0); + ob_a_unfocused_title = appearance_new(Surface_Planar, 0); + ob_a_focused_label = appearance_new(Surface_Planar, 1); + ob_a_unfocused_label = appearance_new(Surface_Planar, 1); + ob_a_icon = appearance_new(Surface_Planar, 1); + ob_a_focused_handle = appearance_new(Surface_Planar, 0); + ob_a_unfocused_handle = appearance_new(Surface_Planar, 0); - if (load()) { - RECT_SET(a_focused_pressed_desk->area, 0, 0, + if (obtheme_load()) { + RECT_SET(ob_a_focused_pressed_desk->area, 0, 0, BUTTON_SIZE, BUTTON_SIZE); - RECT_SET(a_focused_unpressed_desk->area, 0, 0, + RECT_SET(ob_a_focused_unpressed_desk->area, 0, 0, BUTTON_SIZE, BUTTON_SIZE); - RECT_SET(a_unfocused_pressed_desk->area, 0, 0, + RECT_SET(ob_a_unfocused_pressed_desk->area, 0, 0, BUTTON_SIZE, BUTTON_SIZE); - RECT_SET(a_unfocused_unpressed_desk->area, 0, 0, + RECT_SET(ob_a_unfocused_unpressed_desk->area, 0, 0, BUTTON_SIZE, BUTTON_SIZE); - RECT_SET(a_focused_pressed_iconify->area, 0, 0, + RECT_SET(ob_a_focused_pressed_iconify->area, 0, 0, BUTTON_SIZE, BUTTON_SIZE); - RECT_SET(a_focused_unpressed_iconify->area, 0, 0, + RECT_SET(ob_a_focused_unpressed_iconify->area, 0, 0, BUTTON_SIZE, BUTTON_SIZE); - RECT_SET(a_unfocused_pressed_iconify->area, 0, 0, + RECT_SET(ob_a_unfocused_pressed_iconify->area, 0, 0, BUTTON_SIZE, BUTTON_SIZE); - RECT_SET(a_unfocused_unpressed_iconify->area, 0, 0, + RECT_SET(ob_a_unfocused_unpressed_iconify->area, 0, 0, BUTTON_SIZE, BUTTON_SIZE); - RECT_SET(a_unfocused_unpressed_iconify->area, 0, 0, + RECT_SET(ob_a_unfocused_unpressed_iconify->area, 0, 0, BUTTON_SIZE, BUTTON_SIZE); - RECT_SET(a_focused_pressed_max->area, 0, 0, + RECT_SET(ob_a_focused_pressed_max->area, 0, 0, BUTTON_SIZE, BUTTON_SIZE); - RECT_SET(a_focused_unpressed_max->area, 0, 0, + RECT_SET(ob_a_focused_unpressed_max->area, 0, 0, BUTTON_SIZE, BUTTON_SIZE); - RECT_SET(a_unfocused_pressed_max->area, 0, 0, + RECT_SET(ob_a_unfocused_pressed_max->area, 0, 0, BUTTON_SIZE, BUTTON_SIZE); - RECT_SET(a_unfocused_unpressed_max->area, 0, 0, + RECT_SET(ob_a_unfocused_unpressed_max->area, 0, 0, BUTTON_SIZE, BUTTON_SIZE); - RECT_SET(a_focused_pressed_close->area, 0, 0, + RECT_SET(ob_a_focused_pressed_close->area, 0, 0, BUTTON_SIZE, BUTTON_SIZE); - RECT_SET(a_focused_unpressed_close->area, 0, 0, + RECT_SET(ob_a_focused_unpressed_close->area, 0, 0, BUTTON_SIZE, BUTTON_SIZE); - RECT_SET(a_unfocused_pressed_close->area, 0, 0, + RECT_SET(ob_a_unfocused_pressed_close->area, 0, 0, BUTTON_SIZE, BUTTON_SIZE); - RECT_SET(a_unfocused_unpressed_close->area, 0, 0, + RECT_SET(ob_a_unfocused_unpressed_close->area, 0, 0, BUTTON_SIZE, BUTTON_SIZE); - RECT_SET(a_focused_grip->area, 0, 0, GRIP_WIDTH, s_handle_height); - RECT_SET(a_unfocused_grip->area, 0, 0, GRIP_WIDTH, s_handle_height); + RECT_SET(ob_a_focused_grip->area, 0, 0, + GRIP_WIDTH, ob_s_handle_height); + RECT_SET(ob_a_unfocused_grip->area, 0, 0, + GRIP_WIDTH, ob_s_handle_height); return TRUE; } else return FALSE;@@ -162,60 +163,60 @@ }
void shutdown() { - if (s_b_color != NULL) color_free(s_b_color); - if (s_cb_unfocused_color != NULL) color_free(s_cb_unfocused_color); - if (s_cb_focused_color != NULL) color_free(s_cb_focused_color); - if (s_title_unfocused_color != NULL) color_free(s_title_unfocused_color); - if (s_title_focused_color != NULL) color_free(s_title_focused_color); - if (s_titlebut_unfocused_color != NULL) - color_free(s_titlebut_unfocused_color); - if (s_titlebut_focused_color != NULL) - color_free(s_titlebut_focused_color); + if (ob_s_b_color != NULL) color_free(ob_s_b_color); + if (ob_s_cb_unfocused_color != NULL) color_free(ob_s_cb_unfocused_color); + if (ob_s_cb_focused_color != NULL) color_free(ob_s_cb_focused_color); + if (ob_s_title_unfocused_color != NULL) color_free(ob_s_title_unfocused_color); + if (ob_s_title_focused_color != NULL) color_free(ob_s_title_focused_color); + if (ob_s_titlebut_unfocused_color != NULL) + color_free(ob_s_titlebut_unfocused_color); + if (ob_s_titlebut_focused_color != NULL) + color_free(ob_s_titlebut_focused_color); - if (s_max_mask != NULL) pixmap_mask_free(s_max_mask); - if (s_desk_mask != NULL) pixmap_mask_free(s_desk_mask); - if (s_icon_mask != NULL) pixmap_mask_free(s_icon_mask); - if (s_close_mask != NULL) pixmap_mask_free(s_close_mask); + if (ob_s_max_mask != NULL) pixmap_mask_free(ob_s_max_mask); + if (ob_s_desk_mask != NULL) pixmap_mask_free(ob_s_desk_mask); + if (ob_s_icon_mask != NULL) pixmap_mask_free(ob_s_icon_mask); + if (ob_s_close_mask != NULL) pixmap_mask_free(ob_s_close_mask); - if (s_winfont != NULL) font_close(s_winfont); + if (ob_s_winfont != NULL) font_close(ob_s_winfont); - appearance_free(a_focused_unpressed_max); - appearance_free(a_focused_pressed_max); - appearance_free(a_unfocused_unpressed_max); - appearance_free(a_unfocused_pressed_max); - if (a_focused_unpressed_close != NULL) - appearance_free(a_focused_unpressed_close); - if (a_focused_pressed_close != NULL) - appearance_free(a_focused_pressed_close); - if (a_unfocused_unpressed_close != NULL) - appearance_free(a_unfocused_unpressed_close); - if (a_unfocused_pressed_close != NULL) - appearance_free(a_unfocused_pressed_close); - if (a_focused_unpressed_desk != NULL) - appearance_free(a_focused_unpressed_desk); - if (a_focused_pressed_desk != NULL) - appearance_free(a_focused_pressed_desk); - if (a_unfocused_unpressed_desk != NULL) - appearance_free(a_unfocused_unpressed_desk); - if (a_unfocused_pressed_desk != NULL) - appearance_free(a_unfocused_pressed_desk); - if (a_focused_unpressed_iconify != NULL) - appearance_free(a_focused_unpressed_iconify); - if (a_focused_pressed_iconify != NULL) - appearance_free(a_focused_pressed_iconify); - if (a_unfocused_unpressed_iconify != NULL) - appearance_free(a_unfocused_unpressed_iconify); - if (a_unfocused_pressed_iconify != NULL) - appearance_free(a_unfocused_pressed_iconify); - appearance_free(a_focused_grip); - appearance_free(a_unfocused_grip); - appearance_free(a_focused_title); - appearance_free(a_unfocused_title); - appearance_free(a_focused_label); - appearance_free(a_unfocused_label); - appearance_free(a_icon); - appearance_free(a_focused_handle); - appearance_free(a_unfocused_handle); + appearance_free(ob_a_focused_unpressed_max); + appearance_free(ob_a_focused_pressed_max); + appearance_free(ob_a_unfocused_unpressed_max); + appearance_free(ob_a_unfocused_pressed_max); + if (ob_a_focused_unpressed_close != NULL) + appearance_free(ob_a_focused_unpressed_close); + if (ob_a_focused_pressed_close != NULL) + appearance_free(ob_a_focused_pressed_close); + if (ob_a_unfocused_unpressed_close != NULL) + appearance_free(ob_a_unfocused_unpressed_close); + if (ob_a_unfocused_pressed_close != NULL) + appearance_free(ob_a_unfocused_pressed_close); + if (ob_a_focused_unpressed_desk != NULL) + appearance_free(ob_a_focused_unpressed_desk); + if (ob_a_focused_pressed_desk != NULL) + appearance_free(ob_a_focused_pressed_desk); + if (ob_a_unfocused_unpressed_desk != NULL) + appearance_free(ob_a_unfocused_unpressed_desk); + if (ob_a_unfocused_pressed_desk != NULL) + appearance_free(ob_a_unfocused_pressed_desk); + if (ob_a_focused_unpressed_iconify != NULL) + appearance_free(ob_a_focused_unpressed_iconify); + if (ob_a_focused_pressed_iconify != NULL) + appearance_free(ob_a_focused_pressed_iconify); + if (ob_a_unfocused_unpressed_iconify != NULL) + appearance_free(ob_a_unfocused_unpressed_iconify); + if (ob_a_unfocused_pressed_iconify != NULL) + appearance_free(ob_a_unfocused_pressed_iconify); + appearance_free(ob_a_focused_grip); + appearance_free(ob_a_unfocused_grip); + appearance_free(ob_a_focused_title); + appearance_free(ob_a_unfocused_title); + appearance_free(ob_a_focused_label); + appearance_free(ob_a_unfocused_label); + appearance_free(ob_a_icon); + appearance_free(ob_a_focused_handle); + appearance_free(ob_a_unfocused_handle); } static Window createWindow(Window parent, unsigned long mask,@@ -269,35 +270,33 @@ XMapWindow(ob_display, self->rgrip);
XMapWindow(ob_display, self->label); /* set colors/appearance/sizes for stuff that doesn't change */ - XSetWindowBorder(ob_display, self->frame.window, s_b_color->pixel); - XSetWindowBorder(ob_display, self->label, s_b_color->pixel); - XSetWindowBorder(ob_display, self->rgrip, s_b_color->pixel); - XSetWindowBorder(ob_display, self->lgrip, s_b_color->pixel); + XSetWindowBorder(ob_display, self->frame.window, ob_s_b_color->pixel); + XSetWindowBorder(ob_display, self->label, ob_s_b_color->pixel); + XSetWindowBorder(ob_display, self->rgrip, ob_s_b_color->pixel); + XSetWindowBorder(ob_display, self->lgrip, ob_s_b_color->pixel); XResizeWindow(ob_display, self->max, BUTTON_SIZE, BUTTON_SIZE); XResizeWindow(ob_display, self->iconify, BUTTON_SIZE, BUTTON_SIZE); XResizeWindow(ob_display, self->icon, BUTTON_SIZE, BUTTON_SIZE); XResizeWindow(ob_display, self->close, BUTTON_SIZE, BUTTON_SIZE); XResizeWindow(ob_display, self->desk, BUTTON_SIZE, BUTTON_SIZE); - XResizeWindow(ob_display, self->lgrip, GRIP_WIDTH, s_handle_height); - XResizeWindow(ob_display, self->rgrip, GRIP_WIDTH, s_handle_height); + XResizeWindow(ob_display, self->lgrip, GRIP_WIDTH, ob_s_handle_height); + XResizeWindow(ob_display, self->rgrip, GRIP_WIDTH, ob_s_handle_height); /* set up the dynamic appearances */ - self->a_unfocused_title = appearance_copy(a_unfocused_title); - self->a_focused_title = appearance_copy(a_focused_title); - self->a_unfocused_label = appearance_copy(a_unfocused_label); - self->a_focused_label = appearance_copy(a_focused_label); - self->a_unfocused_handle = appearance_copy(a_unfocused_handle); - self->a_focused_handle = appearance_copy(a_focused_handle); - self->a_icon = appearance_copy(a_icon); + self->a_unfocused_title = appearance_copy(ob_a_unfocused_title); + self->a_focused_title = appearance_copy(ob_a_focused_title); + self->a_unfocused_label = appearance_copy(ob_a_unfocused_label); + self->a_focused_label = appearance_copy(ob_a_focused_label); + self->a_unfocused_handle = appearance_copy(ob_a_unfocused_handle); + self->a_focused_handle = appearance_copy(ob_a_focused_handle); + self->a_icon = appearance_copy(ob_a_icon); self->max_press = self->close_press = self->desk_press = self->iconify_press = FALSE; - dispatch_register(Event_X_ButtonPress, (EventHandler)frame_mouse_press, - self); - dispatch_register(Event_X_ButtonRelease, (EventHandler)frame_mouse_release, - self); + dispatch_register(Event_X_ButtonPress | Event_X_ButtonRelease, + (EventHandler)mouse_event, self); return (Frame*)self; }@@ -314,8 +313,7 @@ appearance_free(self->a_icon);
XDestroyWindow(ob_display, self->frame.window); - dispatch_register(0, (EventHandler)frame_mouse_press, self); - dispatch_register(0, (EventHandler)frame_mouse_release, self); + dispatch_register(0, (EventHandler)mouse_event, self); g_free(self); }@@ -359,8 +357,8 @@ ShapeBounding, ShapeSet);
num = 0; if (self->frame.client->decorations & Decor_Titlebar) { - xrect[0].x = -s_bevel; - xrect[0].y = -s_bevel; + xrect[0].x = -ob_s_bevel; + xrect[0].y = -ob_s_bevel; xrect[0].width = self->width + self->bwidth * 2; xrect[0].height = TITLE_HEIGHT + self->bwidth * 2;@@ -368,10 +366,10 @@ ++num;
} if (self->frame.client->decorations & Decor_Handle) { - xrect[1].x = -s_bevel; + xrect[1].x = -ob_s_bevel; xrect[1].y = HANDLE_Y(self); xrect[1].width = self->width + self->bwidth * 2; - xrect[1].height = s_handle_height + + xrect[1].height = ob_s_handle_height + self->bwidth * 2; ++num; }@@ -387,8 +385,8 @@ void frame_adjust_area(ObFrame *self, gboolean moved, gboolean resized)
{ if (resized) { if (self->frame.client->decorations & Decor_Border) { - self->bwidth = s_bwidth; - self->cbwidth = s_cbwidth; + self->bwidth = ob_s_bwidth; + self->cbwidth = ob_s_cbwidth; } else { self->bwidth = self->cbwidth = 0; }@@ -440,34 +438,34 @@
if (self->frame.client->decorations & Decor_Handle) { XMoveResizeWindow(ob_display, self->handle, -self->bwidth, HANDLE_Y(self), - self->width, s_handle_height); + self->width, ob_s_handle_height); XMoveWindow(ob_display, self->lgrip, -self->bwidth, -self->bwidth); XMoveWindow(ob_display, self->rgrip, -self->bwidth + self->width - GRIP_WIDTH, -self->bwidth); - self->innersize.bottom += s_handle_height + + self->innersize.bottom += ob_s_handle_height + self->bwidth; XMapWindow(ob_display, self->handle); if (self->a_focused_handle->surface.data.planar.grad == Background_ParentRelative) RECT_SET(self->a_focused_handle->area, 0, 0, - self->width, s_handle_height); + self->width, ob_s_handle_height); else RECT_SET(self->a_focused_handle->area, GRIP_WIDTH + self->bwidth, 0, self->width - (GRIP_WIDTH + self->bwidth) * 2, - s_handle_height); + ob_s_handle_height); if (self->a_unfocused_handle->surface.data.planar.grad == Background_ParentRelative) RECT_SET(self->a_unfocused_handle->area, 0, 0, - self->width, s_handle_height); + self->width, ob_s_handle_height); else RECT_SET(self->a_unfocused_handle->area, GRIP_WIDTH + self->bwidth, 0, self->width - (GRIP_WIDTH + self->bwidth) * 2, - s_handle_height); + ob_s_handle_height); } else XUnmapWindow(ob_display, self->handle);@@ -517,7 +515,7 @@ self->width,
self->frame.area.height - self->bwidth * 2); if (resized) { - render_frame(self); + obrender_frame(self); frame_adjust_shape(self); }@@ -525,22 +523,22 @@ }
void frame_adjust_state(ObFrame *self) { - render_frame(self); + obrender_frame(self); } void frame_adjust_focus(ObFrame *self) { - render_frame(self); + obrender_frame(self); } void frame_adjust_title(ObFrame *self) { - render_frame(self); + obrender_frame(self); } void frame_adjust_icon(ObFrame *self) { - render_frame(self); + obrender_frame(self); } void frame_grab_client(ObFrame *self, Client *client)@@ -636,26 +634,26 @@ config_set("titlebar.layout", Config_String, layout);
} /* figure out whats being shown, and the width of the label */ - self->label_width = self->width - (s_bevel + 1) * 2; + self->label_width = self->width - (ob_s_bevel + 1) * 2; for (lc = layout.string; *lc != '\0'; ++lc) { switch (*lc) { case 'N': if (!(self->frame.client->decorations & Decor_Icon)) break; if (n) { *lc = ' '; break; } /* rm duplicates */ n = TRUE; - self->label_width -= BUTTON_SIZE + s_bevel + 1; + self->label_width -= BUTTON_SIZE + ob_s_bevel + 1; break; case 'D': if (!(self->frame.client->decorations & Decor_AllDesktops)) break; if (d) { *lc = ' '; break; } /* rm duplicates */ d = TRUE; - self->label_width -= BUTTON_SIZE + s_bevel + 1; + self->label_width -= BUTTON_SIZE + ob_s_bevel + 1; break; case 'I': if (!(self->frame.client->decorations & Decor_Iconify)) break; if (i) { *lc = ' '; break; } /* rm duplicates */ i = TRUE; - self->label_width -= BUTTON_SIZE + s_bevel + 1; + self->label_width -= BUTTON_SIZE + ob_s_bevel + 1; break; case 'L': if (l) { *lc = ' '; break; } /* rm duplicates */@@ -665,13 +663,13 @@ case 'M':
if (!(self->frame.client->decorations & Decor_Maximize)) break; if (m) { *lc = ' '; break; } /* rm duplicates */ m = TRUE; - self->label_width -= BUTTON_SIZE + s_bevel + 1; + self->label_width -= BUTTON_SIZE + ob_s_bevel + 1; break; case 'C': if (!(self->frame.client->decorations & Decor_Close)) break; if (c) { *lc = ' '; break; } /* rm duplicates */ c = TRUE; - self->label_width -= BUTTON_SIZE + s_bevel + 1; + self->label_width -= BUTTON_SIZE + ob_s_bevel + 1; break; } }@@ -687,7 +685,7 @@ if (!l) XUnmapWindow(ob_display, self->label);
if (!m) XUnmapWindow(ob_display, self->max); if (!c) XUnmapWindow(ob_display, self->close); - x = s_bevel + 1; + x = ob_s_bevel + 1; for (lc = layout.string; *lc != '\0'; ++lc) { switch (*lc) { case 'N':@@ -695,43 +693,43 @@ if (!n) break;
self->icon_x = x; RECT_SET(self->a_icon->area, 0, 0, BUTTON_SIZE, BUTTON_SIZE); XMapWindow(ob_display, self->icon); - XMoveWindow(ob_display, self->icon, x, s_bevel + 1); - x += BUTTON_SIZE + s_bevel + 1; + XMoveWindow(ob_display, self->icon, x, ob_s_bevel + 1); + x += BUTTON_SIZE + ob_s_bevel + 1; break; case 'D': if (!d) break; self->desk_x = x; XMapWindow(ob_display, self->desk); - XMoveWindow(ob_display, self->desk, x, s_bevel + 1); - x += BUTTON_SIZE + s_bevel + 1; + XMoveWindow(ob_display, self->desk, x, ob_s_bevel + 1); + x += BUTTON_SIZE + ob_s_bevel + 1; break; case 'I': if (!i) break; self->iconify_x = x; XMapWindow(ob_display, self->iconify); - XMoveWindow(ob_display, self->iconify, x, s_bevel + 1); - x += BUTTON_SIZE + s_bevel + 1; + XMoveWindow(ob_display, self->iconify, x, ob_s_bevel + 1); + x += BUTTON_SIZE + ob_s_bevel + 1; break; case 'L': if (!l) break; self->label_x = x; XMapWindow(ob_display, self->label); - XMoveWindow(ob_display, self->label, x, s_bevel); - x += self->label_width + s_bevel + 1; + XMoveWindow(ob_display, self->label, x, ob_s_bevel); + x += self->label_width + ob_s_bevel + 1; break; case 'M': if (!m) break; self->max_x = x; XMapWindow(ob_display, self->max); - XMoveWindow(ob_display, self->max, x, s_bevel + 1); - x += BUTTON_SIZE + s_bevel + 1; + XMoveWindow(ob_display, self->max, x, ob_s_bevel + 1); + x += BUTTON_SIZE + ob_s_bevel + 1; break; case 'C': if (!c) break; self->close_x = x; XMapWindow(ob_display, self->close); - XMoveWindow(ob_display, self->close, x, s_bevel + 1); - x += BUTTON_SIZE + s_bevel + 1; + XMoveWindow(ob_display, self->close, x, ob_s_bevel + 1); + x += BUTTON_SIZE + ob_s_bevel + 1; break; } }@@ -742,38 +740,48 @@ RECT_SET(self->a_unfocused_label->area, 0, 0,
self->label_width, LABEL_HEIGHT); } -static void frame_mouse_press(const ObEvent *e, ObFrame *self) +static void mouse_event(const ObEvent *e, ObFrame *self) { - Window win = e->data.x.e->xbutton.window; + Window win; + gboolean press = e->type == Event_X_ButtonPress; + + win = e->data.x.e->xbutton.window; if (win == self->max) { - self->max_press = TRUE; - render_frame(self); + self->max_press = press; + obrender_frame(self); } else if (win == self->close) { - self->close_press = TRUE; - render_frame(self); + self->close_press = press; + obrender_frame(self); } else if (win == self->iconify) { - self->iconify_press = TRUE; - render_frame(self); + self->iconify_press = press; + obrender_frame(self); } else if (win == self->desk) { - self->desk_press = TRUE; - render_frame(self); + self->desk_press = press; + obrender_frame(self); } } -static void frame_mouse_release(const ObEvent *e, ObFrame *self) +GQuark get_context(Client *client, Window win) { - Window win = e->data.x.e->xbutton.window; - if (win == self->max) { - self->max_press = FALSE; - render_frame(self); - } else if (win == self->close) { - self->close_press = FALSE; - render_frame(self); - } else if (win == self->iconify) { - self->iconify_press = FALSE; - render_frame(self); - } else if (win == self->desk) { - self->desk_press = FALSE; - render_frame(self); - } + ObFrame *self; + + if (win == ob_root) return g_quark_try_string("root"); + if (client == NULL) return g_quark_try_string("none"); + if (win == client->window) return g_quark_try_string("client"); + + self = (ObFrame*) client->frame; + if (win == self->frame.window) return g_quark_try_string("frame"); + if (win == self->frame.plate) return g_quark_try_string("client"); + if (win == self->title) return g_quark_try_string("titlebar"); + if (win == self->label) return g_quark_try_string("titlebar"); + if (win == self->handle) return g_quark_try_string("handle"); + if (win == self->lgrip) return g_quark_try_string("blcorner"); + if (win == self->rgrip) return g_quark_try_string("brcorner"); + if (win == self->max) return g_quark_try_string("maximize"); + if (win == self->iconify) return g_quark_try_string("iconify"); + if (win == self->close) return g_quark_try_string("close"); + if (win == self->icon) return g_quark_try_string("icon"); + if (win == self->desk) return g_quark_try_string("alldesktops"); + + return g_quark_try_string("none"); }
M
engines/openbox/obengine.h
→
engines/openbox/obengine.h
@@ -7,61 +7,61 @@ #include "../../render/color.h"
#include "../../render/font.h" #include "../../render/mask.h" -#define LABEL_HEIGHT (s_winfont_height + 2) -#define TITLE_HEIGHT (LABEL_HEIGHT + s_bevel * 2) +#define LABEL_HEIGHT (ob_s_winfont_height + 2) +#define TITLE_HEIGHT (LABEL_HEIGHT + ob_s_bevel * 2) #define HANDLE_Y(f) (f->innersize.top + f->frame.client->area.height + \ f->cbwidth) #define BUTTON_SIZE (LABEL_HEIGHT - 2) #define GRIP_WIDTH (BUTTON_SIZE * 2) -extern int s_bevel; -extern int s_handle_height; -extern int s_bwidth; -extern int s_cbwidth; +extern int ob_s_bevel; +extern int ob_s_handle_height; +extern int ob_s_bwidth; +extern int ob_s_cbwidth; -extern color_rgb *s_b_color; -extern color_rgb *s_cb_focused_color; -extern color_rgb *s_cb_unfocused_color; -extern color_rgb *s_title_focused_color; -extern color_rgb *s_title_unfocused_color; -extern color_rgb *s_titlebut_focused_color; -extern color_rgb *s_titlebut_unfocused_color; +extern color_rgb *ob_s_b_color; +extern color_rgb *ob_s_cb_focused_color; +extern color_rgb *ob_s_cb_unfocused_color; +extern color_rgb *ob_s_title_focused_color; +extern color_rgb *ob_s_title_unfocused_color; +extern color_rgb *ob_s_titlebut_focused_color; +extern color_rgb *ob_s_titlebut_unfocused_color; -extern int s_winfont_height; -extern int s_winfont_shadow; -extern int s_winfont_shadow_offset; -extern ObFont *s_winfont; +extern int ob_s_winfont_height; +extern int ob_s_winfont_shadow; +extern int ob_s_winfont_shadow_offset; +extern ObFont *ob_s_winfont; -extern pixmap_mask *s_max_mask; -extern pixmap_mask *s_icon_mask; -extern pixmap_mask *s_desk_mask; -extern pixmap_mask *s_close_mask; +extern pixmap_mask *ob_s_max_mask; +extern pixmap_mask *ob_s_icon_mask; +extern pixmap_mask *ob_s_desk_mask; +extern pixmap_mask *ob_s_close_mask; -extern Appearance *a_focused_unpressed_max; -extern Appearance *a_focused_pressed_max; -extern Appearance *a_unfocused_unpressed_max; -extern Appearance *a_unfocused_pressed_max; -extern Appearance *a_focused_unpressed_close; -extern Appearance *a_focused_pressed_close; -extern Appearance *a_unfocused_unpressed_close; -extern Appearance *a_unfocused_pressed_close; -extern Appearance *a_focused_unpressed_desk; -extern Appearance *a_focused_pressed_desk; -extern Appearance *a_unfocused_unpressed_desk; -extern Appearance *a_unfocused_pressed_desk; -extern Appearance *a_focused_unpressed_iconify; -extern Appearance *a_focused_pressed_iconify; -extern Appearance *a_unfocused_unpressed_iconify; -extern Appearance *a_unfocused_pressed_iconify; -extern Appearance *a_focused_grip; -extern Appearance *a_unfocused_grip; -extern Appearance *a_focused_title; -extern Appearance *a_unfocused_title; -extern Appearance *a_focused_label; -extern Appearance *a_unfocused_label; -extern Appearance *a_icon; -extern Appearance *a_focused_handle; -extern Appearance *a_unfocused_handle; +extern Appearance *ob_a_focused_unpressed_max; +extern Appearance *ob_a_focused_pressed_max; +extern Appearance *ob_a_unfocused_unpressed_max; +extern Appearance *ob_a_unfocused_pressed_max; +extern Appearance *ob_a_focused_unpressed_close; +extern Appearance *ob_a_focused_pressed_close; +extern Appearance *ob_a_unfocused_unpressed_close; +extern Appearance *ob_a_unfocused_pressed_close; +extern Appearance *ob_a_focused_unpressed_desk; +extern Appearance *ob_a_focused_pressed_desk; +extern Appearance *ob_a_unfocused_unpressed_desk; +extern Appearance *ob_a_unfocused_pressed_desk; +extern Appearance *ob_a_focused_unpressed_iconify; +extern Appearance *ob_a_focused_pressed_iconify; +extern Appearance *ob_a_unfocused_unpressed_iconify; +extern Appearance *ob_a_unfocused_pressed_iconify; +extern Appearance *ob_a_focused_grip; +extern Appearance *ob_a_unfocused_grip; +extern Appearance *ob_a_focused_title; +extern Appearance *ob_a_unfocused_title; +extern Appearance *ob_a_focused_label; +extern Appearance *ob_a_unfocused_label; +extern Appearance *ob_a_icon; +extern Appearance *ob_a_focused_handle; +extern Appearance *ob_a_unfocused_handle; typedef struct ObFrame { Frame frame;
M
engines/openbox/obrender.c
→
engines/openbox/obrender.c
@@ -2,21 +2,21 @@ #include "obengine.h"
#include "../../kernel/openbox.h" #include "../../kernel/screen.h" -static void render_label(ObFrame *self, Appearance *a); -static void render_max(ObFrame *self, Appearance *a); -static void render_icon(ObFrame *self, Appearance *a); -static void render_iconify(ObFrame *self, Appearance *a); -static void render_desk(ObFrame *self, Appearance *a); -static void render_close(ObFrame *self, Appearance *a); +static void obrender_label(ObFrame *self, Appearance *a); +static void obrender_max(ObFrame *self, Appearance *a); +static void obrender_icon(ObFrame *self, Appearance *a); +static void obrender_iconify(ObFrame *self, Appearance *a); +static void obrender_desk(ObFrame *self, Appearance *a); +static void obrender_close(ObFrame *self, Appearance *a); -void render_frame(ObFrame *self) +void obrender_frame(ObFrame *self) { if (client_focused(self->frame.client)) { XSetWindowBorder(ob_display, self->frame.plate, - s_cb_focused_color->pixel); + ob_s_cb_focused_color->pixel); } else { XSetWindowBorder(ob_display, self->frame.plate, - s_cb_unfocused_color->pixel); + ob_s_cb_unfocused_color->pixel); } if (self->frame.client->decorations & Decor_Titlebar) {@@ -29,60 +29,61 @@ self->a_focused_label : self->a_unfocused_label);
m = (client_focused(self->frame.client) ? ((self->max_press || self->frame.client->max_vert || self->frame.client->max_horz) ? - a_focused_pressed_max : a_focused_unpressed_max) : + ob_a_focused_pressed_max : ob_a_focused_unpressed_max) : ((self->max_press || self->frame.client->max_vert || self->frame.client->max_horz) ? - a_unfocused_pressed_max : a_unfocused_unpressed_max)); + ob_a_unfocused_pressed_max : ob_a_unfocused_unpressed_max)); n = self->a_icon; i = (client_focused(self->frame.client) ? (self->iconify_press ? - a_focused_pressed_iconify : a_focused_unpressed_iconify) : + ob_a_focused_pressed_iconify : ob_a_focused_unpressed_iconify) : (self->iconify_press ? - a_unfocused_pressed_iconify : a_unfocused_unpressed_iconify)); + ob_a_unfocused_pressed_iconify : + ob_a_unfocused_unpressed_iconify)); d = (client_focused(self->frame.client) ? (self->desk_press || self->frame.client->desktop == DESKTOP_ALL ? - a_focused_pressed_desk : a_focused_unpressed_desk) : + ob_a_focused_pressed_desk : ob_a_focused_unpressed_desk) : (self->desk_press || self->frame.client->desktop == DESKTOP_ALL ? - a_unfocused_pressed_desk : a_unfocused_unpressed_desk)); + ob_a_unfocused_pressed_desk : ob_a_unfocused_unpressed_desk)); c = (client_focused(self->frame.client) ? (self->close_press ? - a_focused_pressed_close : a_focused_unpressed_close) : + ob_a_focused_pressed_close : ob_a_focused_unpressed_close) : (self->close_press ? - a_unfocused_pressed_close : a_unfocused_unpressed_close)); + ob_a_unfocused_pressed_close : ob_a_unfocused_unpressed_close)); paint(self->title, t); /* set parents for any parent relative guys */ l->surface.data.planar.parent = t; l->surface.data.planar.parentx = self->label_x; - l->surface.data.planar.parenty = s_bevel; + l->surface.data.planar.parenty = ob_s_bevel; m->surface.data.planar.parent = t; m->surface.data.planar.parentx = self->max_x; - m->surface.data.planar.parenty = s_bevel + 1; + m->surface.data.planar.parenty = ob_s_bevel + 1; n->surface.data.planar.parent = t; n->surface.data.planar.parentx = self->icon_x; - n->surface.data.planar.parenty = s_bevel + 1; + n->surface.data.planar.parenty = ob_s_bevel + 1; i->surface.data.planar.parent = t; i->surface.data.planar.parentx = self->iconify_x; - i->surface.data.planar.parenty = s_bevel + 1; + i->surface.data.planar.parenty = ob_s_bevel + 1; d->surface.data.planar.parent = t; d->surface.data.planar.parentx = self->desk_x; - d->surface.data.planar.parenty = s_bevel + 1; + d->surface.data.planar.parenty = ob_s_bevel + 1; c->surface.data.planar.parent = t; c->surface.data.planar.parentx = self->close_x; - c->surface.data.planar.parenty = s_bevel + 1; + c->surface.data.planar.parenty = ob_s_bevel + 1; - render_label(self, l); - render_max(self, m); - render_icon(self, n); - render_iconify(self, i); - render_desk(self, d); - render_close(self, c); + obrender_label(self, l); + obrender_max(self, m); + obrender_icon(self, n); + obrender_iconify(self, i); + obrender_desk(self, d); + obrender_close(self, c); } if (self->frame.client->decorations & Decor_Handle) {@@ -91,7 +92,7 @@
h = (client_focused(self->frame.client) ? self->a_focused_handle : self->a_unfocused_handle); g = (client_focused(self->frame.client) ? - a_focused_grip : a_unfocused_grip); + ob_a_focused_grip : ob_a_unfocused_grip); if (g->surface.data.planar.grad == Background_ParentRelative) { g->surface.data.planar.parent = h;@@ -111,7 +112,7 @@ paint(self->rgrip, g);
} } -static void render_label(ObFrame *self, Appearance *a) +static void obrender_label(ObFrame *self, Appearance *a) { if (self->label_x < 0) return;@@ -123,7 +124,7 @@
paint(self->label, a); } -static void render_icon(ObFrame *self, Appearance *a) +static void obrender_icon(ObFrame *self, Appearance *a) { if (self->icon_x < 0) return;@@ -141,7 +142,7 @@
paint(self->icon, a); } -static void render_max(ObFrame *self, Appearance *a) +static void obrender_max(ObFrame *self, Appearance *a) { if (self->max_x < 0) return;@@ -149,7 +150,7 @@ RECT_SET(a->texture[0].position, 0, 0, BUTTON_SIZE,BUTTON_SIZE);
paint(self->max, a); } -static void render_iconify(ObFrame *self, Appearance *a) +static void obrender_iconify(ObFrame *self, Appearance *a) { if (self->iconify_x < 0) return;@@ -157,7 +158,7 @@ RECT_SET(a->texture[0].position, 0, 0, BUTTON_SIZE,BUTTON_SIZE);
paint(self->iconify, a); } -static void render_desk(ObFrame *self, Appearance *a) +static void obrender_desk(ObFrame *self, Appearance *a) { if (self->desk_x < 0) return;@@ -165,35 +166,10 @@ RECT_SET(a->texture[0].position, 0, 0, BUTTON_SIZE,BUTTON_SIZE);
paint(self->desk, a); } -static void render_close(ObFrame *self, Appearance *a) +static void obrender_close(ObFrame *self, Appearance *a) { if (self->close_x < 0) return; RECT_SET(a->texture[0].position, 0, 0, BUTTON_SIZE,BUTTON_SIZE); paint(self->close, a); } - -GQuark get_context(Client *client, Window win) -{ - ObFrame *self; - - if (win == ob_root) return g_quark_try_string("root"); - if (client == NULL) return g_quark_try_string("none"); - if (win == client->window) return g_quark_try_string("client"); - - self = (ObFrame*) client->frame; - if (win == self->frame.window) return g_quark_try_string("frame"); - if (win == self->frame.plate) return g_quark_try_string("client"); - if (win == self->title) return g_quark_try_string("titlebar"); - if (win == self->label) return g_quark_try_string("titlebar"); - if (win == self->handle) return g_quark_try_string("handle"); - if (win == self->lgrip) return g_quark_try_string("blcorner"); - if (win == self->rgrip) return g_quark_try_string("brcorner"); - if (win == self->max) return g_quark_try_string("maximize"); - if (win == self->iconify) return g_quark_try_string("iconify"); - if (win == self->close) return g_quark_try_string("close"); - if (win == self->icon) return g_quark_try_string("icon"); - if (win == self->desk) return g_quark_try_string("alldesktops"); - - return g_quark_try_string("none"); -}
M
engines/openbox/obrender.h
→
engines/openbox/obrender.h
@@ -3,6 +3,6 @@ #define __engines_openbox_render_h
#include "obengine.h" -void render_frame(ObFrame *self); +void obrender_frame(ObFrame *self); #endif
M
engines/openbox/obtheme.c
→
engines/openbox/obtheme.c
@@ -49,27 +49,7 @@ }
return rclass; } -gboolean read_bool(XrmDatabase db, char *rname, gboolean *value) -{ - gboolean ret = FALSE; - char *rclass = create_class_name(rname); - char *rettype; - XrmValue retvalue; - - if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) && - retvalue.addr != NULL) { - if (!g_ascii_strcasecmp(retvalue.addr, "true")) - *value = TRUE; - else - *value = FALSE; - ret = TRUE; - } - - g_free(rclass); - return ret; -} - -gboolean read_int(XrmDatabase db, char *rname, int *value) +static gboolean read_int(XrmDatabase db, char *rname, int *value) { gboolean ret = FALSE; char *rclass = create_class_name(rname);@@ -87,7 +67,7 @@ g_free(rclass);
return ret; } -gboolean read_string(XrmDatabase db, char *rname, char **value) +static gboolean read_string(XrmDatabase db, char *rname, char **value) { gboolean ret = FALSE; char *rclass = create_class_name(rname);@@ -104,7 +84,7 @@ g_free(rclass);
return ret; } -gboolean read_color(XrmDatabase db, char *rname, color_rgb **value) +static gboolean read_color(XrmDatabase db, char *rname, color_rgb **value) { gboolean ret = FALSE; char *rclass = create_class_name(rname);@@ -124,7 +104,7 @@ g_free(rclass);
return ret; } -gboolean read_mask(XrmDatabase db, char *rname, pixmap_mask **value) +static gboolean read_mask(XrmDatabase db, char *rname, pixmap_mask **value) { gboolean ret = FALSE; char *rclass = create_class_name(rname);@@ -244,7 +224,7 @@ }
} -gboolean read_appearance(XrmDatabase db, char *rname, Appearance *value) +static gboolean read_appearance(XrmDatabase db, char *rname, Appearance *value) { gboolean ret = FALSE; char *rclass = create_class_name(rname), *cname, *ctoname, *bcname;@@ -281,7 +261,7 @@ g_free(rclass);
return ret; } -void set_default_appearance(Appearance *a) +static void set_default_appearance(Appearance *a) { a->surface.data.planar.grad = Background_Solid; a->surface.data.planar.relief = Flat;@@ -292,7 +272,7 @@ a->surface.data.planar.primary = color_new(0, 0, 0);
a->surface.data.planar.secondary = color_new(0, 0, 0); } -gboolean load() +gboolean obtheme_load() { XrmDatabase db = NULL; Justify winjust;@@ -323,20 +303,20 @@ if (!config_get("font.shadow", Config_Bool, &shadow)) {
shadow.bool = TRUE; /* default */ config_set("font.shadow", Config_Bool, shadow); } - s_winfont_shadow = shadow.bool; + ob_s_winfont_shadow = shadow.bool; if (!config_get("font.shadow.offset", Config_Integer, &offset) || offset.integer < 0 || offset.integer >= 10) { offset.integer = 1; /* default */ config_set("font.shadow.offset", Config_Integer, offset); } - s_winfont_shadow_offset = offset.integer; + ob_s_winfont_shadow_offset = offset.integer; if (!config_get("font", Config_String, &font)) { font.string = DEFAULT_FONT; config_set("font", Config_String, font); } - s_winfont = font_open(font.string); - s_winfont_height = font_height(s_winfont, s_winfont_shadow, - s_winfont_shadow_offset); + ob_s_winfont = font_open(font.string); + ob_s_winfont_height = font_height(ob_s_winfont, ob_s_winfont_shadow, + ob_s_winfont_shadow_offset); winjust = Justify_Left; if (read_string(db, "window.justify", &winjuststr)) {@@ -347,165 +327,176 @@ winjust = Justify_Center;
g_free(winjuststr); } - if (!read_int(db, "handleWidth", &s_handle_height) || - s_handle_height < 0 || s_handle_height > 100) s_handle_height = 6; - if (!read_int(db, "bevelWidth", &s_bevel) || - s_bevel <= 0 || s_bevel > 100) s_bevel = 3; - if (!read_int(db, "borderWidth", &s_bwidth) || - s_bwidth < 0 || s_bwidth > 100) s_bwidth = 1; - if (!read_int(db, "frameWidth", &s_cbwidth) || - s_cbwidth < 0 || s_cbwidth > 100) s_cbwidth = s_bevel; + if (!read_int(db, "handleWidth", &ob_s_handle_height) || + ob_s_handle_height < 0 || ob_s_handle_height > 100) ob_s_handle_height = 6; + if (!read_int(db, "bevelWidth", &ob_s_bevel) || + ob_s_bevel <= 0 || ob_s_bevel > 100) ob_s_bevel = 3; + if (!read_int(db, "borderWidth", &ob_s_bwidth) || + ob_s_bwidth < 0 || ob_s_bwidth > 100) ob_s_bwidth = 1; + if (!read_int(db, "frameWidth", &ob_s_cbwidth) || + ob_s_cbwidth < 0 || ob_s_cbwidth > 100) ob_s_cbwidth = ob_s_bevel; - if (!read_color(db, "borderColor", &s_b_color)) - s_b_color = color_new(0, 0, 0); - if (!read_color(db, "window.frame.focusColor", &s_cb_focused_color)) - s_cb_focused_color = color_new(0xff, 0xff, 0xff); - if (!read_color(db, "window.frame.unfocusColor", &s_cb_unfocused_color)) - s_cb_unfocused_color = color_new(0xff, 0xff, 0xff); + if (!read_color(db, "borderColor", &ob_s_b_color)) + ob_s_b_color = color_new(0, 0, 0); + if (!read_color(db, "window.frame.focusColor", &ob_s_cb_focused_color)) + ob_s_cb_focused_color = color_new(0xff, 0xff, 0xff); + if (!read_color(db, "window.frame.unfocusColor", &ob_s_cb_unfocused_color)) + ob_s_cb_unfocused_color = color_new(0xff, 0xff, 0xff); if (!read_color(db, "window.label.focus.textColor", - &s_title_focused_color)) - s_title_focused_color = color_new(0xff, 0xff, 0xff); + &ob_s_title_focused_color)) + ob_s_title_focused_color = color_new(0xff, 0xff, 0xff); if (!read_color(db, "window.label.unfocus.textColor", - &s_title_unfocused_color)) - s_title_unfocused_color = color_new(0xff, 0xff, 0xff); + &ob_s_title_unfocused_color)) + ob_s_title_unfocused_color = color_new(0xff, 0xff, 0xff); if (!read_color(db, "window.button.focus.picColor", - &s_titlebut_focused_color)) - s_titlebut_focused_color = color_new(0, 0, 0); + &ob_s_titlebut_focused_color)) + ob_s_titlebut_focused_color = color_new(0, 0, 0); if (!read_color(db, "window.button.unfocus.picColor", - &s_titlebut_unfocused_color)) - s_titlebut_unfocused_color = color_new(0xff, 0xff, 0xff); + &ob_s_titlebut_unfocused_color)) + ob_s_titlebut_unfocused_color = color_new(0xff, 0xff, 0xff); - if (!read_mask(db, "window.button.max.mask", &s_max_mask)) { + if (!read_mask(db, "window.button.max.mask", &ob_s_max_mask)) { char data[] = { 0x7c, 0x44, 0x47, 0x47, 0x7f, 0x1f, 0x1f }; - s_max_mask = pixmap_mask_new(7, 7, data); + ob_s_max_mask = pixmap_mask_new(7, 7, data); } - if (!read_mask(db, "window.button.icon.mask", &s_icon_mask)) { + if (!read_mask(db, "window.button.icon.mask", &ob_s_icon_mask)) { char data[] = { 0x00, 0x00, 0x00, 0x00, 0x3e, 0x3e, 0x3e }; - s_icon_mask = pixmap_mask_new(7, 7, data); + ob_s_icon_mask = pixmap_mask_new(7, 7, data); } - if (!read_mask(db, "window.button.stick.mask", &s_desk_mask)) { + if (!read_mask(db, "window.button.stick.mask", &ob_s_desk_mask)) { char data[] = { 0x00, 0x36, 0x36, 0x00, 0x36, 0x36, 0x00 }; - s_desk_mask = pixmap_mask_new(7, 7, data); + ob_s_desk_mask = pixmap_mask_new(7, 7, data); } - if (!read_mask(db, "window.button.close.mask", &s_close_mask)) { + if (!read_mask(db, "window.button.close.mask", &ob_s_close_mask)) { char data[] = { 0x22, 0x77, 0x3e, 0x1c, 0x3e, 0x77, 0x22 }; - s_close_mask = pixmap_mask_new(7, 7, data); + ob_s_close_mask = pixmap_mask_new(7, 7, data); } - if (!read_appearance(db, "window.title.focus", a_focused_title)) - set_default_appearance(a_focused_title); - if (!read_appearance(db, "window.title.unfocus", a_unfocused_title)) - set_default_appearance(a_unfocused_title); - if (!read_appearance(db, "window.label.focus", a_focused_label)) - set_default_appearance(a_focused_label); - if (!read_appearance(db, "window.label.unfocus", a_unfocused_label)) - set_default_appearance(a_unfocused_label); - if (!read_appearance(db, "window.handle.focus", a_focused_handle)) - set_default_appearance(a_focused_handle); - if (!read_appearance(db, "window.handle.unfocus", a_unfocused_handle)) - set_default_appearance(a_unfocused_handle); - if (!read_appearance(db, "window.grip.focus", a_focused_grip)) - set_default_appearance(a_focused_grip); - if (!read_appearance(db, "window.grip.unfocus", a_unfocused_grip)) - set_default_appearance(a_unfocused_grip); + if (!read_appearance(db, "window.title.focus", ob_a_focused_title)) + set_default_appearance(ob_a_focused_title); + if (!read_appearance(db, "window.title.unfocus", ob_a_unfocused_title)) + set_default_appearance(ob_a_unfocused_title); + if (!read_appearance(db, "window.label.focus", ob_a_focused_label)) + set_default_appearance(ob_a_focused_label); + if (!read_appearance(db, "window.label.unfocus", ob_a_unfocused_label)) + set_default_appearance(ob_a_unfocused_label); + if (!read_appearance(db, "window.handle.focus", ob_a_focused_handle)) + set_default_appearance(ob_a_focused_handle); + if (!read_appearance(db, "window.handle.unfocus", ob_a_unfocused_handle)) + set_default_appearance(ob_a_unfocused_handle); + if (!read_appearance(db, "window.grip.focus", ob_a_focused_grip)) + set_default_appearance(ob_a_focused_grip); + if (!read_appearance(db, "window.grip.unfocus", ob_a_unfocused_grip)) + set_default_appearance(ob_a_unfocused_grip); if (!read_appearance(db, "window.button.pressed.focus", - a_focused_pressed_max)) + ob_a_focused_pressed_max)) if (!read_appearance(db, "window.button.pressed", - a_focused_pressed_max)) - set_default_appearance(a_focused_pressed_max); + ob_a_focused_pressed_max)) + set_default_appearance(ob_a_focused_pressed_max); if (!read_appearance(db, "window.button.pressed.unfocus", - a_unfocused_pressed_max)) + ob_a_unfocused_pressed_max)) if (!read_appearance(db, "window.button.pressed", - a_unfocused_pressed_max)) - set_default_appearance(a_unfocused_pressed_max); + ob_a_unfocused_pressed_max)) + set_default_appearance(ob_a_unfocused_pressed_max); if (!read_appearance(db, "window.button.focus", - a_focused_unpressed_max)) - set_default_appearance(a_focused_unpressed_max); + ob_a_focused_unpressed_max)) + set_default_appearance(ob_a_focused_unpressed_max); if (!read_appearance(db, "window.button.unfocus", - a_unfocused_unpressed_max)) - set_default_appearance(a_unfocused_unpressed_max); + ob_a_unfocused_unpressed_max)) + set_default_appearance(ob_a_unfocused_unpressed_max); - a_unfocused_unpressed_close = appearance_copy(a_unfocused_unpressed_max); - a_unfocused_pressed_close = appearance_copy(a_unfocused_pressed_max); - a_focused_unpressed_close = appearance_copy(a_focused_unpressed_max); - a_focused_pressed_close = appearance_copy(a_focused_pressed_max); - a_unfocused_unpressed_desk = appearance_copy(a_unfocused_unpressed_max); - a_unfocused_pressed_desk = appearance_copy(a_unfocused_pressed_max); - a_focused_unpressed_desk = appearance_copy(a_focused_unpressed_max); - a_focused_pressed_desk = appearance_copy(a_focused_pressed_max); - a_unfocused_unpressed_iconify = appearance_copy(a_unfocused_unpressed_max); - a_unfocused_pressed_iconify = appearance_copy(a_unfocused_pressed_max); - a_focused_unpressed_iconify = appearance_copy(a_focused_unpressed_max); - a_focused_pressed_iconify = appearance_copy(a_focused_pressed_max); + ob_a_unfocused_unpressed_close = + appearance_copy(ob_a_unfocused_unpressed_max); + ob_a_unfocused_pressed_close = appearance_copy(ob_a_unfocused_pressed_max); + ob_a_focused_unpressed_close = appearance_copy(ob_a_focused_unpressed_max); + ob_a_focused_pressed_close = appearance_copy(ob_a_focused_pressed_max); + ob_a_unfocused_unpressed_desk = + appearance_copy(ob_a_unfocused_unpressed_max); + ob_a_unfocused_pressed_desk = appearance_copy(ob_a_unfocused_pressed_max); + ob_a_focused_unpressed_desk = appearance_copy(ob_a_focused_unpressed_max); + ob_a_focused_pressed_desk = appearance_copy(ob_a_focused_pressed_max); + ob_a_unfocused_unpressed_iconify = + appearance_copy(ob_a_unfocused_unpressed_max); + ob_a_unfocused_pressed_iconify = + appearance_copy(ob_a_unfocused_pressed_max); + ob_a_focused_unpressed_iconify = + appearance_copy(ob_a_focused_unpressed_max); + ob_a_focused_pressed_iconify = appearance_copy(ob_a_focused_pressed_max); - a_icon->surface.data.planar.grad = Background_ParentRelative; + ob_a_icon->surface.data.planar.grad = Background_ParentRelative; /* set up the textures */ - a_focused_label->texture[0].type = Text; - a_focused_label->texture[0].data.text.justify = winjust; - a_focused_label->texture[0].data.text.font = s_winfont; - a_focused_label->texture[0].data.text.shadow = s_winfont_shadow; - a_focused_label->texture[0].data.text.offset = s_winfont_shadow_offset; - a_focused_label->texture[0].data.text.color = s_title_focused_color; + ob_a_focused_label->texture[0].type = Text; + ob_a_focused_label->texture[0].data.text.justify = winjust; + ob_a_focused_label->texture[0].data.text.font = ob_s_winfont; + ob_a_focused_label->texture[0].data.text.shadow = ob_s_winfont_shadow; + ob_a_focused_label->texture[0].data.text.offset = + ob_s_winfont_shadow_offset; + ob_a_focused_label->texture[0].data.text.color = ob_s_title_focused_color; - a_unfocused_label->texture[0].type = Text; - a_unfocused_label->texture[0].data.text.justify = winjust; - a_unfocused_label->texture[0].data.text.font = s_winfont; - a_unfocused_label->texture[0].data.text.shadow = s_winfont_shadow; - a_unfocused_label->texture[0].data.text.offset = s_winfont_shadow_offset; - a_unfocused_label->texture[0].data.text.color = s_title_unfocused_color; + ob_a_unfocused_label->texture[0].type = Text; + ob_a_unfocused_label->texture[0].data.text.justify = winjust; + ob_a_unfocused_label->texture[0].data.text.font = ob_s_winfont; + ob_a_unfocused_label->texture[0].data.text.shadow = ob_s_winfont_shadow; + ob_a_unfocused_label->texture[0].data.text.offset = + ob_s_winfont_shadow_offset; + ob_a_unfocused_label->texture[0].data.text.color = + ob_s_title_unfocused_color; - a_focused_unpressed_max->texture[0].type = - a_focused_pressed_max->texture[0].type = - a_unfocused_unpressed_max->texture[0].type = - a_unfocused_pressed_max->texture[0].type = - a_focused_unpressed_close->texture[0].type = - a_focused_pressed_close->texture[0].type = - a_unfocused_unpressed_close->texture[0].type = - a_unfocused_pressed_close->texture[0].type = - a_focused_unpressed_desk->texture[0].type = - a_focused_pressed_desk->texture[0].type = - a_unfocused_unpressed_desk->texture[0].type = - a_unfocused_pressed_desk->texture[0].type = - a_focused_unpressed_iconify->texture[0].type = - a_focused_pressed_iconify->texture[0].type = - a_unfocused_unpressed_iconify->texture[0].type = - a_unfocused_pressed_iconify->texture[0].type = Bitmask; - a_focused_unpressed_max->texture[0].data.mask.mask = - a_focused_pressed_max->texture[0].data.mask.mask = - a_unfocused_unpressed_max->texture[0].data.mask.mask = - a_unfocused_pressed_max->texture[0].data.mask.mask = s_max_mask; - a_focused_unpressed_close->texture[0].data.mask.mask = - a_focused_pressed_close->texture[0].data.mask.mask = - a_unfocused_unpressed_close->texture[0].data.mask.mask = - a_unfocused_pressed_close->texture[0].data.mask.mask = s_close_mask; - a_focused_unpressed_desk->texture[0].data.mask.mask = - a_focused_pressed_desk->texture[0].data.mask.mask = - a_unfocused_unpressed_desk->texture[0].data.mask.mask = - a_unfocused_pressed_desk->texture[0].data.mask.mask = s_desk_mask; - a_focused_unpressed_iconify->texture[0].data.mask.mask = - a_focused_pressed_iconify->texture[0].data.mask.mask = - a_unfocused_unpressed_iconify->texture[0].data.mask.mask = - a_unfocused_pressed_iconify->texture[0].data.mask.mask = s_icon_mask; - a_focused_unpressed_max->texture[0].data.mask.color = - a_focused_pressed_max->texture[0].data.mask.color = - a_focused_unpressed_close->texture[0].data.mask.color = - a_focused_pressed_close->texture[0].data.mask.color = - a_focused_unpressed_desk->texture[0].data.mask.color = - a_focused_pressed_desk->texture[0].data.mask.color = - a_focused_unpressed_iconify->texture[0].data.mask.color = - a_focused_pressed_iconify->texture[0].data.mask.color = - s_titlebut_focused_color; - a_unfocused_unpressed_max->texture[0].data.mask.color = - a_unfocused_pressed_max->texture[0].data.mask.color = - a_unfocused_unpressed_close->texture[0].data.mask.color = - a_unfocused_pressed_close->texture[0].data.mask.color = - a_unfocused_unpressed_desk->texture[0].data.mask.color = - a_unfocused_pressed_desk->texture[0].data.mask.color = - a_unfocused_unpressed_iconify->texture[0].data.mask.color = - a_unfocused_pressed_iconify->texture[0].data.mask.color = - s_titlebut_unfocused_color; + ob_a_focused_unpressed_max->texture[0].type = + ob_a_focused_pressed_max->texture[0].type = + ob_a_unfocused_unpressed_max->texture[0].type = + ob_a_unfocused_pressed_max->texture[0].type = + ob_a_focused_unpressed_close->texture[0].type = + ob_a_focused_pressed_close->texture[0].type = + ob_a_unfocused_unpressed_close->texture[0].type = + ob_a_unfocused_pressed_close->texture[0].type = + ob_a_focused_unpressed_desk->texture[0].type = + ob_a_focused_pressed_desk->texture[0].type = + ob_a_unfocused_unpressed_desk->texture[0].type = + ob_a_unfocused_pressed_desk->texture[0].type = + ob_a_focused_unpressed_iconify->texture[0].type = + ob_a_focused_pressed_iconify->texture[0].type = + ob_a_unfocused_unpressed_iconify->texture[0].type = + ob_a_unfocused_pressed_iconify->texture[0].type = Bitmask; + ob_a_focused_unpressed_max->texture[0].data.mask.mask = + ob_a_focused_pressed_max->texture[0].data.mask.mask = + ob_a_unfocused_unpressed_max->texture[0].data.mask.mask = + ob_a_unfocused_pressed_max->texture[0].data.mask.mask = ob_s_max_mask; + ob_a_focused_unpressed_close->texture[0].data.mask.mask = + ob_a_focused_pressed_close->texture[0].data.mask.mask = + ob_a_unfocused_unpressed_close->texture[0].data.mask.mask = + ob_a_unfocused_pressed_close->texture[0].data.mask.mask = + ob_s_close_mask; + ob_a_focused_unpressed_desk->texture[0].data.mask.mask = + ob_a_focused_pressed_desk->texture[0].data.mask.mask = + ob_a_unfocused_unpressed_desk->texture[0].data.mask.mask = + ob_a_unfocused_pressed_desk->texture[0].data.mask.mask = + ob_s_desk_mask; + ob_a_focused_unpressed_iconify->texture[0].data.mask.mask = + ob_a_focused_pressed_iconify->texture[0].data.mask.mask = + ob_a_unfocused_unpressed_iconify->texture[0].data.mask.mask = + ob_a_unfocused_pressed_iconify->texture[0].data.mask.mask = + ob_s_icon_mask; + ob_a_focused_unpressed_max->texture[0].data.mask.color = + ob_a_focused_pressed_max->texture[0].data.mask.color = + ob_a_focused_unpressed_close->texture[0].data.mask.color = + ob_a_focused_pressed_close->texture[0].data.mask.color = + ob_a_focused_unpressed_desk->texture[0].data.mask.color = + ob_a_focused_pressed_desk->texture[0].data.mask.color = + ob_a_focused_unpressed_iconify->texture[0].data.mask.color = + ob_a_focused_pressed_iconify->texture[0].data.mask.color = + ob_s_titlebut_focused_color; + ob_a_unfocused_unpressed_max->texture[0].data.mask.color = + ob_a_unfocused_pressed_max->texture[0].data.mask.color = + ob_a_unfocused_unpressed_close->texture[0].data.mask.color = + ob_a_unfocused_pressed_close->texture[0].data.mask.color = + ob_a_unfocused_unpressed_desk->texture[0].data.mask.color = + ob_a_unfocused_pressed_desk->texture[0].data.mask.color = + ob_a_unfocused_unpressed_iconify->texture[0].data.mask.color = + ob_a_unfocused_pressed_iconify->texture[0].data.mask.color = + ob_s_titlebut_unfocused_color; XrmDestroyDatabase(db); return TRUE;
M
engines/openbox/obtheme.h
→
engines/openbox/obtheme.h
@@ -3,6 +3,6 @@ #define __engine_theme_h
#include <glib.h> -gboolean load(); +gboolean obtheme_load(); #endif