diff options
Diffstat (limited to 'openbox')
| -rw-r--r-- | openbox/dock.c | 42 | ||||
| -rw-r--r-- | openbox/frame.c | 128 | ||||
| -rw-r--r-- | openbox/framerender.c | 104 | ||||
| -rw-r--r-- | openbox/menu.c | 24 | ||||
| -rw-r--r-- | openbox/menu_render.c | 19 | ||||
| -rw-r--r-- | openbox/moveresize.c | 2 | ||||
| -rw-r--r-- | openbox/openbox.c | 14 | ||||
| -rw-r--r-- | openbox/openbox.h | 2 | ||||
| -rw-r--r-- | openbox/popup.c | 47 |
9 files changed, 201 insertions, 181 deletions
diff --git a/openbox/dock.c b/openbox/dock.c index 3fb9c78d..3dda174d 100644 --- a/openbox/dock.c +++ b/openbox/dock.c @@ -32,9 +32,9 @@ void dock_startup() RrVisual(ob_rr_inst), CWOverrideRedirect | CWEventMask, &attrib); - dock->a_frame = RrAppearanceCopy(theme_a_unfocused_title); - XSetWindowBorder(ob_display, dock->frame, theme_b_color->pixel); - XSetWindowBorderWidth(ob_display, dock->frame, theme_bwidth); + dock->a_frame = RrAppearanceCopy(ob_rr_theme->a_unfocused_title); + XSetWindowBorder(ob_display, dock->frame, ob_rr_theme->b_color->pixel); + XSetWindowBorderWidth(ob_display, dock->frame, ob_rr_theme->bwidth); g_hash_table_insert(window_map, &dock->frame, dock); stacking_add(DOCK_AS_WINDOW(dock)); @@ -182,8 +182,8 @@ void dock_configure() } /* used for calculating offsets */ - dock->w += theme_bwidth * 2; - dock->h += theme_bwidth * 2; + dock->w += ob_rr_theme->bwidth * 2; + dock->h += ob_rr_theme->bwidth * 2; /* calculate position */ switch (config_dock_pos) { @@ -265,39 +265,39 @@ void dock_configure() break; case DockPos_TopLeft: if (config_dock_horz) - dock->y -= dock->h - theme_bwidth; + dock->y -= dock->h - ob_rr_theme->bwidth; else - dock->x -= dock->w - theme_bwidth; + dock->x -= dock->w - ob_rr_theme->bwidth; break; case DockPos_Top: - dock->y -= dock->h - theme_bwidth; + dock->y -= dock->h - ob_rr_theme->bwidth; break; case DockPos_TopRight: if (config_dock_horz) - dock->y -= dock->h - theme_bwidth; + dock->y -= dock->h - ob_rr_theme->bwidth; else - dock->x += dock->w - theme_bwidth; + dock->x += dock->w - ob_rr_theme->bwidth; break; case DockPos_Left: - dock->x -= dock->w - theme_bwidth; + dock->x -= dock->w - ob_rr_theme->bwidth; break; case DockPos_Right: - dock->x += dock->w - theme_bwidth; + dock->x += dock->w - ob_rr_theme->bwidth; break; case DockPos_BottomLeft: if (config_dock_horz) - dock->y += dock->h - theme_bwidth; + dock->y += dock->h - ob_rr_theme->bwidth; else - dock->x -= dock->w - theme_bwidth; + dock->x -= dock->w - ob_rr_theme->bwidth; break; case DockPos_Bottom: - dock->y += dock->h - theme_bwidth; + dock->y += dock->h - ob_rr_theme->bwidth; break; case DockPos_BottomRight: if (config_dock_horz) - dock->y += dock->h - theme_bwidth; + dock->y += dock->h - ob_rr_theme->bwidth; else - dock->x += dock->w - theme_bwidth; + dock->x += dock->w - ob_rr_theme->bwidth; break; } } @@ -346,8 +346,8 @@ void dock_configure() } /* not used for actually sizing shit */ - dock->w -= theme_bwidth * 2; - dock->h -= theme_bwidth * 2; + dock->w -= ob_rr_theme->bwidth * 2; + dock->h -= ob_rr_theme->bwidth * 2; if (dock->w > 0 && dock->h > 0) { XMoveResizeWindow(ob_display, dock->frame, @@ -359,8 +359,8 @@ void dock_configure() XUnmapWindow(ob_display, dock->frame); /* but they are useful outside of this function! */ - dock->w += theme_bwidth * 2; - dock->h += theme_bwidth * 2; + dock->w += ob_rr_theme->bwidth * 2; + dock->h += ob_rr_theme->bwidth * 2; screen_update_struts(); } diff --git a/openbox/frame.c b/openbox/frame.c index 4307c98a..65e116c8 100644 --- a/openbox/frame.c +++ b/openbox/frame.c @@ -74,35 +74,37 @@ Frame *frame_new() XMapWindow(ob_display, self->label); /* set colors/appearance/sizes for stuff that doesn't change */ - XSetWindowBorder(ob_display, self->window, theme_b_color->pixel); - XSetWindowBorder(ob_display, self->label, theme_b_color->pixel); - XSetWindowBorder(ob_display, self->rgrip, theme_b_color->pixel); - XSetWindowBorder(ob_display, self->lgrip, theme_b_color->pixel); + XSetWindowBorder(ob_display, self->window, ob_rr_theme->b_color->pixel); + XSetWindowBorder(ob_display, self->label, ob_rr_theme->b_color->pixel); + XSetWindowBorder(ob_display, self->rgrip, ob_rr_theme->b_color->pixel); + XSetWindowBorder(ob_display, self->lgrip, ob_rr_theme->b_color->pixel); - XResizeWindow(ob_display, self->max, theme_button_size, theme_button_size); + XResizeWindow(ob_display, self->max, + ob_rr_theme->button_size, ob_rr_theme->button_size); XResizeWindow(ob_display, self->iconify, - theme_button_size, theme_button_size); + ob_rr_theme->button_size, ob_rr_theme->button_size); XResizeWindow(ob_display, self->icon, - theme_button_size + 2, theme_button_size + 2); + ob_rr_theme->button_size + 2, ob_rr_theme->button_size + 2); XResizeWindow(ob_display, self->close, - theme_button_size, theme_button_size); + ob_rr_theme->button_size, ob_rr_theme->button_size); XResizeWindow(ob_display, self->desk, - theme_button_size, theme_button_size); + ob_rr_theme->button_size, ob_rr_theme->button_size); XResizeWindow(ob_display, self->shade, - theme_button_size, theme_button_size); + ob_rr_theme->button_size, ob_rr_theme->button_size); XResizeWindow(ob_display, self->lgrip, - theme_grip_width, theme_handle_height); + ob_rr_theme->grip_width, ob_rr_theme->handle_height); XResizeWindow(ob_display, self->rgrip, - theme_grip_width, theme_handle_height); + ob_rr_theme->grip_width, ob_rr_theme->handle_height); /* set up the dynamic appearances */ - self->a_unfocused_title = RrAppearanceCopy(theme_a_unfocused_title); - self->a_focused_title = RrAppearanceCopy(theme_a_focused_title); - self->a_unfocused_label = RrAppearanceCopy(theme_a_unfocused_label); - self->a_focused_label = RrAppearanceCopy(theme_a_focused_label); - self->a_unfocused_handle = RrAppearanceCopy(theme_a_unfocused_handle); - self->a_focused_handle = RrAppearanceCopy(theme_a_focused_handle); - self->a_icon = RrAppearanceCopy(theme_a_icon); + self->a_unfocused_title = RrAppearanceCopy(ob_rr_theme->a_unfocused_title); + self->a_focused_title = RrAppearanceCopy(ob_rr_theme->a_focused_title); + self->a_unfocused_label = RrAppearanceCopy(ob_rr_theme->a_unfocused_label); + self->a_focused_label = RrAppearanceCopy(ob_rr_theme->a_focused_label); + self->a_unfocused_handle = + 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; @@ -164,19 +166,19 @@ void frame_adjust_shape(Frame *self) num = 0; if (self->client->decorations & Decor_Titlebar) { - xrect[0].x = -theme_bevel; - xrect[0].y = -theme_bevel; + xrect[0].x = -ob_rr_theme->bevel; + xrect[0].y = -ob_rr_theme->bevel; xrect[0].width = self->width + self->bwidth * 2; - xrect[0].height = theme_title_height + + xrect[0].height = ob_rr_theme->title_height + self->bwidth * 2; ++num; } if (self->client->decorations & Decor_Handle) { - xrect[1].x = -theme_bevel; + xrect[1].x = -ob_rr_theme->bevel; xrect[1].y = FRAME_HANDLE_Y(self); xrect[1].width = self->width + self->bwidth * 2; - xrect[1].height = theme_handle_height + + xrect[1].height = ob_rr_theme->handle_height + self->bwidth * 2; ++num; } @@ -192,8 +194,8 @@ void frame_adjust_area(Frame *self, gboolean moved, gboolean resized) { if (resized) { if (self->client->decorations & Decor_Border) { - self->bwidth = theme_bwidth; - self->cbwidth = theme_cbwidth; + self->bwidth = ob_rr_theme->bwidth; + self->cbwidth = ob_rr_theme->cbwidth; } else { self->bwidth = self->cbwidth = 0; } @@ -224,8 +226,8 @@ void frame_adjust_area(Frame *self, gboolean moved, gboolean resized) if (self->client->decorations & Decor_Titlebar) { XMoveResizeWindow(ob_display, self->title, -self->bwidth, -self->bwidth, - self->width, theme_title_height); - self->innersize.top += theme_title_height + self->bwidth; + self->width, ob_rr_theme->title_height); + self->innersize.top += ob_rr_theme->title_height + self->bwidth; XMapWindow(ob_display, self->title); /* layout the title bar elements */ @@ -236,20 +238,20 @@ void frame_adjust_area(Frame *self, gboolean moved, gboolean resized) if (self->client->decorations & Decor_Handle) { XMoveResizeWindow(ob_display, self->handle, -self->bwidth, FRAME_HANDLE_Y(self), - self->width, theme_handle_height); + self->width, ob_rr_theme->handle_height); XMoveWindow(ob_display, self->lgrip, -self->bwidth, -self->bwidth); XMoveWindow(ob_display, self->rgrip, -self->bwidth + self->width - - theme_grip_width, -self->bwidth); - self->innersize.bottom += theme_handle_height + + ob_rr_theme->grip_width, -self->bwidth); + self->innersize.bottom += ob_rr_theme->handle_height + self->bwidth; XMapWindow(ob_display, self->handle); /* XXX make a subwindow with these dimentions? - theme_grip_width + self->bwidth, 0, - self->width - (theme_grip_width + self->bwidth) * 2, - theme_handle_height); + ob_rr_theme->grip_width + self->bwidth, 0, + self->width - (ob_rr_theme->grip_width + self->bwidth) * 2, + ob_rr_theme->handle_height); */ } else XUnmapWindow(ob_display, self->handle); @@ -278,7 +280,7 @@ void frame_adjust_area(Frame *self, gboolean moved, gboolean resized) RECT_SET_SIZE(self->area, self->client->area.width + self->size.left + self->size.right, - (self->client->shaded ? theme_title_height + self->bwidth*2: + (self->client->shaded ? ob_rr_theme->title_height + self->bwidth*2: self->client->area.height + self->size.top + self->size.bottom)); @@ -419,32 +421,36 @@ static void layout_title(Frame *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 - (theme_bevel + 1) * 2; - for (lc = theme_title_layout; *lc != '\0'; ++lc) { + self->label_width = self->width - (ob_rr_theme->bevel + 1) * 2; + for (lc = ob_rr_theme->title_layout; *lc != '\0'; ++lc) { switch (*lc) { case 'N': if (!(self->client->decorations & Decor_Icon)) break; if (n) { *lc = ' '; break; } /* rm duplicates */ n = TRUE; - self->label_width -= theme_button_size + 2 + theme_bevel + 1; + self->label_width -= (ob_rr_theme->button_size + 2 + + ob_rr_theme->bevel + 1); break; case 'D': if (!(self->client->decorations & Decor_AllDesktops)) break; if (d) { *lc = ' '; break; } /* rm duplicates */ d = TRUE; - self->label_width -= theme_button_size + theme_bevel + 1; + self->label_width -= (ob_rr_theme->button_size + + ob_rr_theme->bevel + 1); break; case 'S': if (!(self->client->decorations & Decor_Shade)) break; if (s) { *lc = ' '; break; } /* rm duplicates */ s = TRUE; - self->label_width -= theme_button_size + theme_bevel + 1; + self->label_width -= (ob_rr_theme->button_size + + ob_rr_theme->bevel + 1); break; case 'I': if (!(self->client->decorations & Decor_Iconify)) break; if (i) { *lc = ' '; break; } /* rm duplicates */ i = TRUE; - self->label_width -= theme_button_size + theme_bevel + 1; + self->label_width -= (ob_rr_theme->button_size + + ob_rr_theme->bevel + 1); break; case 'L': if (l) { *lc = ' '; break; } /* rm duplicates */ @@ -454,20 +460,22 @@ static void layout_title(Frame *self) if (!(self->client->decorations & Decor_Maximize)) break; if (m) { *lc = ' '; break; } /* rm duplicates */ m = TRUE; - self->label_width -= theme_button_size + theme_bevel + 1; + self->label_width -= (ob_rr_theme->button_size + + ob_rr_theme->bevel + 1); break; case 'C': if (!(self->client->decorations & Decor_Close)) break; if (c) { *lc = ' '; break; } /* rm duplicates */ c = TRUE; - self->label_width -= theme_button_size + theme_bevel + 1; + self->label_width -= (ob_rr_theme->button_size + + ob_rr_theme->bevel + 1); break; } } if (self->label_width < 1) self->label_width = 1; XResizeWindow(ob_display, self->label, self->label_width, - theme_label_height); + ob_rr_theme->label_height); if (!n) XUnmapWindow(ob_display, self->icon); if (!d) XUnmapWindow(ob_display, self->desk); @@ -477,57 +485,57 @@ static void layout_title(Frame *self) if (!m) XUnmapWindow(ob_display, self->max); if (!c) XUnmapWindow(ob_display, self->close); - x = theme_bevel + 1; - for (lc = theme_title_layout; *lc != '\0'; ++lc) { + x = ob_rr_theme->bevel + 1; + for (lc = ob_rr_theme->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, theme_bevel); - x += theme_button_size + 2 + theme_bevel + 1; + XMoveWindow(ob_display, self->icon, x, ob_rr_theme->bevel); + x += ob_rr_theme->button_size + 2 + ob_rr_theme->bevel + 1; break; case 'D': if (!d) break; self->desk_x = x; XMapWindow(ob_display, self->desk); - XMoveWindow(ob_display, self->desk, x, theme_bevel + 1); - x += theme_button_size + theme_bevel + 1; + XMoveWindow(ob_display, self->desk, x, ob_rr_theme->bevel + 1); + x += ob_rr_theme->button_size + ob_rr_theme->bevel + 1; break; case 'S': if (!s) break; self->shade_x = x; XMapWindow(ob_display, self->shade); - XMoveWindow(ob_display, self->shade, x, theme_bevel + 1); - x += theme_button_size + theme_bevel + 1; + XMoveWindow(ob_display, self->shade, x, ob_rr_theme->bevel + 1); + x += ob_rr_theme->button_size + ob_rr_theme->bevel + 1; break; case 'I': if (!i) break; self->iconify_x = x; XMapWindow(ob_display, self->iconify); - XMoveWindow(ob_display, self->iconify, x, theme_bevel + 1); - x += theme_button_size + theme_bevel + 1; + XMoveWindow(ob_display, self->iconify, x, ob_rr_theme->bevel + 1); + x += ob_rr_theme->button_size + ob_rr_theme->bevel + 1; break; case 'L': if (!l) break; self->label_x = x; XMapWindow(ob_display, self->label); - XMoveWindow(ob_display, self->label, x, theme_bevel); - x += self->label_width + theme_bevel + 1; + XMoveWindow(ob_display, self->label, x, ob_rr_theme->bevel); + x += self->label_width + ob_rr_theme->bevel + 1; break; case 'M': if (!m) break; self->max_x = x; XMapWindow(ob_display, self->max); - XMoveWindow(ob_display, self->max, x, theme_bevel + 1); - x += theme_button_size + theme_bevel + 1; + XMoveWindow(ob_display, self->max, x, ob_rr_theme->bevel + 1); + x += ob_rr_theme->button_size + ob_rr_theme->bevel + 1; break; case 'C': if (!c) break; self->close_x = x; XMapWindow(ob_display, self->close); - XMoveWindow(ob_display, self->close, x, theme_bevel + 1); - x += theme_button_size + theme_bevel + 1; + XMoveWindow(ob_display, self->close, x, ob_rr_theme->bevel + 1); + x += ob_rr_theme->button_size + ob_rr_theme->bevel + 1; break; } } diff --git a/openbox/framerender.c b/openbox/framerender.c index 0781c8c7..01dc75b1 100644 --- a/openbox/framerender.c +++ b/openbox/framerender.c @@ -16,10 +16,10 @@ void framerender_frame(Frame *self) { if (self->focused) XSetWindowBorder(ob_display, self->plate, - theme_cb_focused_color->pixel); + ob_rr_theme->cb_focused_color->pixel); else XSetWindowBorder(ob_display, self->plate, - theme_cb_unfocused_color->pixel); + ob_rr_theme->cb_unfocused_color->pixel); if (self->client->decorations & Decor_Titlebar) { RrAppearance *t, *l, *m, *n, *i, *d, *s, *c; @@ -30,82 +30,83 @@ void framerender_frame(Frame *self) self->a_focused_label : self->a_unfocused_label); m = (self->focused ? (self->client->max_vert || self->client->max_horz ? - theme_a_focused_pressed_set_max : + ob_rr_theme->a_focused_pressed_set_max : (self->max_press ? - theme_a_focused_pressed_max : theme_a_focused_unpressed_max)) : + ob_rr_theme->a_focused_pressed_max : + ob_rr_theme->a_focused_unpressed_max)) : (self->client->max_vert || self->client->max_horz ? - theme_a_unfocused_pressed_set_max : + ob_rr_theme->a_unfocused_pressed_set_max : (self->max_press ? - theme_a_unfocused_pressed_max : - theme_a_unfocused_unpressed_max))); + ob_rr_theme->a_unfocused_pressed_max : + ob_rr_theme->a_unfocused_unpressed_max))); n = self->a_icon; i = (self->focused ? (self->iconify_press ? - theme_a_focused_pressed_iconify : - theme_a_focused_unpressed_iconify) : + ob_rr_theme->a_focused_pressed_iconify : + ob_rr_theme->a_focused_unpressed_iconify) : (self->iconify_press ? - theme_a_unfocused_pressed_iconify : - theme_a_unfocused_unpressed_iconify)); + ob_rr_theme->a_unfocused_pressed_iconify : + ob_rr_theme->a_unfocused_unpressed_iconify)); d = (self->focused ? (self->client->desktop == DESKTOP_ALL ? - theme_a_focused_pressed_set_desk : + ob_rr_theme->a_focused_pressed_set_desk : (self->desk_press ? - theme_a_focused_pressed_desk : - theme_a_focused_unpressed_desk)) : + ob_rr_theme->a_focused_pressed_desk : + ob_rr_theme->a_focused_unpressed_desk)) : (self->client->desktop == DESKTOP_ALL ? - theme_a_unfocused_pressed_set_desk : + ob_rr_theme->a_unfocused_pressed_set_desk : (self->desk_press ? - theme_a_unfocused_pressed_desk : - theme_a_unfocused_unpressed_desk))); + ob_rr_theme->a_unfocused_pressed_desk : + ob_rr_theme->a_unfocused_unpressed_desk))); s = (self->focused ? (self->client->shaded ? - theme_a_focused_pressed_set_shade : + ob_rr_theme->a_focused_pressed_set_shade : (self->shade_press ? - theme_a_focused_pressed_shade : - theme_a_focused_unpressed_shade)) : + ob_rr_theme->a_focused_pressed_shade : + ob_rr_theme->a_focused_unpressed_shade)) : (self->client->shaded ? - theme_a_unfocused_pressed_set_shade : + ob_rr_theme->a_unfocused_pressed_set_shade : (self->shade_press ? - theme_a_unfocused_pressed_shade : - theme_a_unfocused_unpressed_shade))); + ob_rr_theme->a_unfocused_pressed_shade : + ob_rr_theme->a_unfocused_unpressed_shade))); c = (self->focused ? (self->close_press ? - theme_a_focused_pressed_close : - theme_a_focused_unpressed_close) : + ob_rr_theme->a_focused_pressed_close : + ob_rr_theme->a_focused_unpressed_close) : (self->close_press ? - theme_a_unfocused_pressed_close : - theme_a_unfocused_unpressed_close)); + ob_rr_theme->a_unfocused_pressed_close : + ob_rr_theme->a_unfocused_unpressed_close)); - RrPaint(t, self->title, self->width, theme_title_height); + RrPaint(t, self->title, self->width, ob_rr_theme->title_height); /* set parents for any parent relative guys */ l->surface.parent = t; l->surface.parentx = self->label_x; - l->surface.parenty = theme_bevel; + l->surface.parenty = ob_rr_theme->bevel; m->surface.parent = t; m->surface.parentx = self->max_x; - m->surface.parenty = theme_bevel + 1; + m->surface.parenty = ob_rr_theme->bevel + 1; n->surface.parent = t; n->surface.parentx = self->icon_x; - n->surface.parenty = theme_bevel; + n->surface.parenty = ob_rr_theme->bevel; i->surface.parent = t; i->surface.parentx = self->iconify_x; - i->surface.parenty = theme_bevel + 1; + i->surface.parenty = ob_rr_theme->bevel + 1; d->surface.parent = t; d->surface.parentx = self->desk_x; - d->surface.parenty = theme_bevel + 1; + d->surface.parenty = ob_rr_theme->bevel + 1; s->surface.parent = t; s->surface.parentx = self->shade_x; - s->surface.parenty = theme_bevel + 1; + s->surface.parenty = ob_rr_theme->bevel + 1; c->surface.parent = t; c->surface.parentx = self->close_x; - c->surface.parenty = theme_bevel + 1; + c->surface.parenty = ob_rr_theme->bevel + 1; framerender_label(self, l); framerender_max(self, m); @@ -122,10 +123,10 @@ void framerender_frame(Frame *self) h = (self->focused ? self->a_focused_handle : self->a_unfocused_handle); - RrPaint(h, self->handle, self->width, theme_handle_height); + RrPaint(h, self->handle, self->width, ob_rr_theme->handle_height); g = (self->focused ? - theme_a_focused_grip : theme_a_unfocused_grip); + ob_rr_theme->a_focused_grip : ob_rr_theme->a_unfocused_grip); if (g->surface.grad == RR_SURFACE_PARENTREL) g->surface.parent = h; @@ -133,12 +134,14 @@ void framerender_frame(Frame *self) g->surface.parentx = 0; g->surface.parenty = 0; - RrPaint(g, self->lgrip, theme_grip_width, theme_handle_height); + RrPaint(g, self->lgrip, + ob_rr_theme->grip_width, ob_rr_theme->handle_height); - g->surface.parentx = self->width - theme_grip_width; + g->surface.parentx = self->width - ob_rr_theme->grip_width; g->surface.parenty = 0; - RrPaint(g, self->rgrip, theme_grip_width, theme_handle_height); + RrPaint(g, self->rgrip, + ob_rr_theme->grip_width, ob_rr_theme->handle_height); } } @@ -147,7 +150,7 @@ static void framerender_label(Frame *self, RrAppearance *a) if (self->label_x < 0) return; /* set the texture's text! */ a->texture[0].data.text.string = self->client->title; - RrPaint(a, self->label, self->label_width, theme_label_height); + RrPaint(a, self->label, self->label_width, ob_rr_theme->label_height); } static void framerender_icon(Frame *self, RrAppearance *a) @@ -156,7 +159,8 @@ static void framerender_icon(Frame *self, RrAppearance *a) if (self->client->nicons) { Icon *icon = client_icon(self->client, - theme_button_size + 2, theme_button_size + 2); + ob_rr_theme->button_size + 2, + ob_rr_theme->button_size + 2); a->texture[0].type = RR_TEXTURE_RGBA; a->texture[0].data.rgba.width = icon->width; a->texture[0].data.rgba.height = icon->height; @@ -164,35 +168,39 @@ static void framerender_icon(Frame *self, RrAppearance *a) } else a->texture[0].type = RR_TEXTURE_NONE; - RrPaint(a, self->icon, theme_button_size + 2, theme_button_size + 2); + RrPaint(a, self->icon, + ob_rr_theme->button_size + 2, ob_rr_theme->button_size + 2); } static void framerender_max(Frame *self, RrAppearance *a) { if (self->max_x < 0) return; - RrPaint(a, self->max, theme_button_size, theme_button_size); + RrPaint(a, self->max, ob_rr_theme->button_size, ob_rr_theme->button_size); } static void framerender_iconify(Frame *self, RrAppearance *a) { if (self->iconify_x < 0) return; - RrPaint(a, self->iconify, theme_button_size, theme_button_size); + RrPaint(a, self->iconify, + ob_rr_theme->button_size, ob_rr_theme->button_size); } static void framerender_desk(Frame *self, RrAppearance *a) { if (self->desk_x < 0) return; - RrPaint(a, self->desk, theme_button_size, theme_button_size); + RrPaint(a, self->desk, ob_rr_theme->button_size, ob_rr_theme->button_size); } static void framerender_shade(Frame *self, RrAppearance *a) { if (self->shade_x < 0) return; - RrPaint(a, self->shade, theme_button_size, theme_button_size); + RrPaint(a, self->shade, + ob_rr_theme->button_size, ob_rr_theme->button_size); } static void framerender_close(Frame *self, RrAppearance *a) { if (self->close_x < 0) return; - RrPaint(a, self->close, theme_button_size, theme_button_size); + RrPaint(a, self->close, + ob_rr_theme->button_size, ob_rr_theme->button_size); } diff --git a/openbox/menu.c b/openbox/menu.c index 86291768..8e2a8583 100644 --- a/openbox/menu.c +++ b/openbox/menu.c @@ -164,17 +164,17 @@ Menu *menu_new_full(char *label, char *name, Menu *parent, self->title = createWindow(self->frame, CWEventMask, &attrib); self->items = createWindow(self->frame, 0, &attrib); - XSetWindowBorderWidth(ob_display, self->frame, theme_bwidth); - XSetWindowBackground(ob_display, self->frame, theme_b_color->pixel); - XSetWindowBorderWidth(ob_display, self->title, theme_bwidth); - XSetWindowBorder(ob_display, self->frame, theme_b_color->pixel); - XSetWindowBorder(ob_display, self->title, theme_b_color->pixel); + XSetWindowBorderWidth(ob_display, self->frame, ob_rr_theme->bwidth); + XSetWindowBackground(ob_display, self->frame, ob_rr_theme->b_color->pixel); + XSetWindowBorderWidth(ob_display, self->title, ob_rr_theme->bwidth); + XSetWindowBorder(ob_display, self->frame, ob_rr_theme->b_color->pixel); + XSetWindowBorder(ob_display, self->title, ob_rr_theme->b_color->pixel); XMapWindow(ob_display, self->title); XMapWindow(ob_display, self->items); - self->a_title = RrAppearanceCopy(theme_a_menu_title); - self->a_items = RrAppearanceCopy(theme_a_menu); + self->a_title = RrAppearanceCopy(ob_rr_theme->a_menu_title); + self->a_items = RrAppearanceCopy(ob_rr_theme->a_menu); g_hash_table_insert(window_map, &self->frame, self); g_hash_table_insert(window_map, &self->title, self); @@ -234,9 +234,9 @@ void menu_add_entry(Menu *menu, MenuEntry *entry) attrib.event_mask = ENTRY_EVENTMASK; entry->item = createWindow(menu->items, CWEventMask, &attrib); XMapWindow(ob_display, entry->item); - entry->a_item = RrAppearanceCopy(theme_a_menu_item); - entry->a_disabled = RrAppearanceCopy(theme_a_menu_disabled); - entry->a_hilite = RrAppearanceCopy(theme_a_menu_hilite); + entry->a_item = RrAppearanceCopy(ob_rr_theme->a_menu_item); + entry->a_disabled = RrAppearanceCopy(ob_rr_theme->a_menu_disabled); + entry->a_hilite = RrAppearanceCopy(ob_rr_theme->a_menu_hilite); menu->invalid = TRUE; @@ -363,14 +363,14 @@ void menu_control_mouseover(MenuEntry *self, gboolean enter) { /* TODO: I don't understand why these bevels should be here. Something must be wrong in the width calculation */ x = self->parent->location.x + self->parent->size.width + - theme_bevel; + ob_rr_theme->bevel; /* need to get the width. is this bad?*/ menu_render(self->submenu); if (self->submenu->size.width + x > screen_physical_size.width) x = self->parent->location.x - self->submenu->size.width - - theme_bevel; + ob_rr_theme->bevel; menu_show_full(self->submenu, x, self->parent->location.y + self->y, diff --git a/openbox/menu_render.c b/openbox/menu_render.c index 55819cd4..2ca1c773 100644 --- a/openbox/menu_render.c +++ b/openbox/menu_render.c @@ -30,8 +30,8 @@ void menu_render_full(Menu *self) { if (self->label) { self->a_title->texture[0].data.text.string = self->label; RrMinsize(self->a_title, &self->title_min_w, &self->title_h); - self->title_min_w += theme_bevel * 2; - self->title_h += theme_bevel * 2; + self->title_min_w += ob_rr_theme->bevel * 2; + self->title_h += ob_rr_theme->bevel * 2; self->size.width = MAX(self->size.width, self->title_min_w); } @@ -53,22 +53,23 @@ void menu_render_full(Menu *self) { self->item_h = MAX(self->item_h, h); self->size.width = MAX(self->size.width, e->min_w); - e->min_w += theme_bevel * 2; + e->min_w += ob_rr_theme->bevel * 2; ++nitems; } - self->bullet_w = self->item_h + theme_bevel; - self->size.width += 2 * self->bullet_w + 2 * theme_bevel; - self->item_h += theme_bevel * 2; + self->bullet_w = self->item_h + ob_rr_theme->bevel; + self->size.width += 2 * self->bullet_w + 2 * ob_rr_theme->bevel; + self->item_h += ob_rr_theme->bevel * 2; items_h = self->item_h * MAX(nitems, 1); XResizeWindow(ob_display, self->frame, self->size.width, MAX(self->title_h + items_h, 1)); if (self->label) - XMoveResizeWindow(ob_display, self->title, -theme_bwidth, - -theme_bwidth, self->size.width, self->title_h); + XMoveResizeWindow(ob_display, self->title, -ob_rr_theme->bwidth, + -ob_rr_theme->bwidth, + self->size.width, self->title_h); XMoveResizeWindow(ob_display, self->items, 0, - self->title_h + theme_bwidth, self->size.width, + self->title_h + ob_rr_theme->bwidth, self->size.width, items_h); if (self->label) diff --git a/openbox/moveresize.c b/openbox/moveresize.c index 4b1ee6ea..287d4ec0 100644 --- a/openbox/moveresize.c +++ b/openbox/moveresize.c @@ -61,7 +61,7 @@ void moveresize_startup() /* a GC to invert stuff */ gcv.function = GXxor; - gcv.line_width = theme_bwidth; + gcv.line_width = ob_rr_theme->bwidth; gcv.foreground = (WhitePixel(ob_display, ob_screen) ^ BlackPixel(ob_display, ob_screen)); opaque_gc = XCreateGC(ob_display, opaque_window.win, diff --git a/openbox/openbox.c b/openbox/openbox.c index 6cde2c0e..d63c67b8 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -20,7 +20,6 @@ #include "gettext.h" #include "parser/parse.h" #include "render/render.h" -#include "render/font.h" #include "render/theme.h" #ifdef HAVE_FCNTL_H @@ -46,6 +45,7 @@ #include <X11/cursorfont.h> RrInstance *ob_rr_inst = NULL; +RrTheme *ob_rr_theme = NULL; Display *ob_display = NULL; int ob_screen; Window ob_root; @@ -66,7 +66,6 @@ int main(int argc, char **argv) struct sigaction action; sigset_t sigset; char *path; - char *theme; xmlDocPtr doc; xmlNodePtr node; @@ -178,7 +177,6 @@ int main(int argc, char **argv) in this group */ timer_startup(); font_startup(); - theme_startup(ob_rr_inst); event_startup(); grab_startup(); plugin_startup(); @@ -194,9 +192,11 @@ int main(int argc, char **argv) parse_shutdown(); /* load the theme specified in the rc file */ - theme = theme_load(config_theme); - g_free(theme); - if (!theme) return 1; + ob_rr_theme = RrThemeNew(ob_rr_inst, config_theme); + if (ob_rr_theme == NULL) { + g_critical("Unable to load a theme."); + exit(1); + } window_startup(); menu_startup(); @@ -234,13 +234,13 @@ int main(int argc, char **argv) window_shutdown(); grab_shutdown(); event_shutdown(); - theme_shutdown(); timer_shutdown(); config_shutdown(); } dispatch_shutdown(); + RrThemeFree(ob_rr_theme); RrInstanceFree(ob_rr_inst); XCloseDisplay(ob_display); diff --git a/openbox/openbox.h b/openbox/openbox.h index eec3fd7c..7723035e 100644 --- a/openbox/openbox.h +++ b/openbox/openbox.h @@ -2,6 +2,7 @@ #define __openbox_h #include "render/render.h" +#include "render/theme.h" #ifdef USE_LIBSN # define SN_API_NOT_YET_FROZEN @@ -12,6 +13,7 @@ #include <X11/Xlib.h> extern RrInstance *ob_rr_inst; +extern RrTheme *ob_rr_theme; /*! The X display */ extern Display *ob_display; diff --git a/openbox/popup.c b/openbox/popup.c index 2e65570e..fa003ec8 100644 --- a/openbox/popup.c +++ b/openbox/popup.c @@ -74,16 +74,16 @@ void popup_size_to_string(Popup *self, char *text) int iconw; if (!self->a_text) - self->a_text = RrAppearanceCopy(theme_app_hilite_label); + self->a_text = RrAppearanceCopy(ob_rr_theme->app_hilite_label); self->a_text->texture[0].data.text.string = text; RrMinsize(self->a_text, &textw, &texth); - textw += theme_bevel * 2; - texth += theme_bevel * 2; + textw += ob_rr_theme->bevel * 2; + texth += ob_rr_theme->bevel * 2; - self->h = texth + theme_bevel * 2; + self->h = texth + ob_rr_theme->bevel * 2; iconw = (self->hasicon ? texth : 0); - self->w = textw + iconw + theme_bevel * (self->hasicon ? 3 : 2); + self->w = textw + iconw + ob_rr_theme->bevel * (self->hasicon ? 3 : 2); } void popup_show(Popup *self, char *text, Icon *icon) @@ -101,8 +101,8 @@ void popup_show(Popup *self, char *text, Icon *icon) InputOutput, RrVisual(ob_rr_inst), CWOverrideRedirect, &attrib); - XSetWindowBorderWidth(ob_display, self->bg, theme_bwidth); - XSetWindowBorder(ob_display, self->bg, theme_b_color->pixel); + XSetWindowBorderWidth(ob_display, self->bg, ob_rr_theme->bwidth); + XSetWindowBorder(ob_display, self->bg, ob_rr_theme->b_color->pixel); self->text = XCreateWindow(ob_display, self->bg, 0, 0, 1, 1, 0, RrDepth(ob_rr_inst), @@ -116,12 +116,12 @@ void popup_show(Popup *self, char *text, Icon *icon) XMapWindow(ob_display, self->text); XMapWindow(ob_display, self->icon); - self->a_bg = RrAppearanceCopy(theme_app_hilite_bg); + self->a_bg = RrAppearanceCopy(ob_rr_theme->app_hilite_bg); if (self->hasicon) - self->a_icon = RrAppearanceCopy(theme_app_icon); + self->a_icon = RrAppearanceCopy(ob_rr_theme->app_icon); } if (!self->a_text) - self->a_text = RrAppearanceCopy(theme_app_hilite_label); + self->a_text = RrAppearanceCopy(ob_rr_theme->app_hilite_label); /* set up the textures */ self->a_text->texture[0].data.text.string = text; @@ -137,22 +137,22 @@ void popup_show(Popup *self, char *text, Icon *icon) /* measure the shit out */ RrMinsize(self->a_text, &textw, &texth); - textw += theme_bevel * 2; - texth += theme_bevel * 2; + textw += ob_rr_theme->bevel * 2; + texth += ob_rr_theme->bevel * 2; /* set the sizes up and reget the text sizes from the calculated outer sizes */ if (self->h) { h = self->h; - texth = h - (theme_bevel * 2); + texth = h - (ob_rr_theme->bevel * 2); } else - h = texth + theme_bevel * 2; + h = texth + ob_rr_theme->bevel * 2; iconw = (self->hasicon ? texth : 0); if (self->w) { w = self->w; - textw = w - (iconw + theme_bevel * (self->hasicon ? 3 : 2)); + textw = w - (iconw + ob_rr_theme->bevel * (self->hasicon ? 3 : 2)); } else - w = textw + iconw + theme_bevel * (self->hasicon ? 3 : 2); + w = textw + iconw + ob_rr_theme->bevel * (self->hasicon ? 3 : 2); /* sanity checks to avoid crashes! */ if (w < 1) w = 1; if (h < 1) h = 1; @@ -194,19 +194,20 @@ void popup_show(Popup *self, char *text, Icon *icon) self->a_text->surface.parent = self->a_bg; self->a_text->surface.parentx = iconw + - theme_bevel * (self->hasicon ? 2 : 1); - self->a_text->surface.parenty = theme_bevel; + ob_rr_theme->bevel * (self->hasicon ? 2 : 1); + self->a_text->surface.parenty = ob_rr_theme->bevel; XMoveResizeWindow(ob_display, self->text, - iconw + theme_bevel * (self->hasicon ? 2 : 1), - theme_bevel, textw, texth); + iconw + ob_rr_theme->bevel * (self->hasicon ? 2 : 1), + ob_rr_theme->bevel, textw, texth); if (self->hasicon) { if (iconw < 1) iconw = 1; /* sanity check for crashes */ self->a_icon->surface.parent = self->a_bg; - self->a_icon->surface.parentx = theme_bevel; - self->a_icon->surface.parenty = theme_bevel; + self->a_icon->surface.parentx = ob_rr_theme->bevel; + self->a_icon->surface.parenty = ob_rr_theme->bevel; XMoveResizeWindow(ob_display, self->icon, - theme_bevel, theme_bevel, iconw, texth); + ob_rr_theme->bevel, ob_rr_theme->bevel, + iconw, texth); } RrPaint(self->a_bg, self->bg, w, h); |