X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fframerender.c;h=1f783a5402aed6725496ec08393e67ac7a45ce27;hb=dbd3e9b6b2b452e853a17352560b5a4b4c568e84;hp=5f2f25945fec3ad07560a747595eec9ca474f272;hpb=81af5a8b0caadc0a82ff2304c315f816c9576e93;p=chaz%2Fopenbox diff --git a/openbox/framerender.c b/openbox/framerender.c index 5f2f2594..1f783a54 100644 --- a/openbox/framerender.c +++ b/openbox/framerender.c @@ -15,12 +15,15 @@ static void framerender_close(ObFrame *self, RrAppearance *a); void framerender_frame(ObFrame *self) { - if (self->focused) - XSetWindowBorder(ob_display, self->plate, - RrColorPixel(ob_rr_theme->cb_focused_color)); - else - XSetWindowBorder(ob_display, self->plate, - RrColorPixel(ob_rr_theme->cb_unfocused_color)); + { + unsigned long px; + + px = (self->focused ? + RrColorPixel(ob_rr_theme->cb_focused_color) : + RrColorPixel(ob_rr_theme->cb_unfocused_color)); + XSetWindowBackground(ob_display, self->plate, px); + XClearWindow(ob_display, self->plate); + } if (self->decorations & OB_FRAME_DECOR_TITLEBAR) { RrAppearance *t, *l, *m, *n, *i, *d, *s, *c; @@ -35,15 +38,19 @@ void framerender_frame(ObFrame *self) ob_rr_theme->a_disabled_unfocused_max) : (self->focused ? (self->client->max_vert || self->client->max_horz ? - ob_rr_theme->a_focused_pressed_set_max : + ob_rr_theme->a_toggled_focused_max : (self->max_press ? ob_rr_theme->a_focused_pressed_max : - ob_rr_theme->a_focused_unpressed_max)) : + (self->max_hover ? + ob_rr_theme->a_hover_focused_max : + ob_rr_theme->a_focused_unpressed_max))) : (self->client->max_vert || self->client->max_horz ? - ob_rr_theme->a_unfocused_pressed_set_max : + ob_rr_theme->a_toggled_unfocused_max : (self->max_press ? ob_rr_theme->a_unfocused_pressed_max : - ob_rr_theme->a_unfocused_unpressed_max)))); + (self->max_hover ? + ob_rr_theme->a_hover_unfocused_max : + ob_rr_theme->a_unfocused_unpressed_max))))); n = self->a_icon; i = (!(self->decorations & OB_FRAME_DECOR_ICONIFY) ? (self->focused ? @@ -52,40 +59,52 @@ void framerender_frame(ObFrame *self) (self->focused ? (self->iconify_press ? ob_rr_theme->a_focused_pressed_iconify : - ob_rr_theme->a_focused_unpressed_iconify) : + (self->iconify_hover ? + ob_rr_theme->a_hover_focused_iconify : + ob_rr_theme->a_focused_unpressed_iconify)) : (self->iconify_press ? ob_rr_theme->a_unfocused_pressed_iconify : - ob_rr_theme->a_unfocused_unpressed_iconify))); + (self->iconify_hover ? + ob_rr_theme->a_hover_unfocused_iconify : + ob_rr_theme->a_unfocused_unpressed_iconify)))); d = (!(self->decorations & OB_FRAME_DECOR_ALLDESKTOPS) ? (self->focused ? ob_rr_theme->a_disabled_focused_desk : ob_rr_theme->a_disabled_unfocused_desk) : (self->focused ? (self->client->desktop == DESKTOP_ALL ? - ob_rr_theme->a_focused_pressed_set_desk : + ob_rr_theme->a_toggled_focused_desk : (self->desk_press ? ob_rr_theme->a_focused_pressed_desk : - ob_rr_theme->a_focused_unpressed_desk)) : + (self->desk_hover ? + ob_rr_theme->a_hover_focused_desk : + ob_rr_theme->a_focused_unpressed_desk))) : (self->client->desktop == DESKTOP_ALL ? - ob_rr_theme->a_unfocused_pressed_set_desk : + ob_rr_theme->a_toggled_unfocused_desk : (self->desk_press ? ob_rr_theme->a_unfocused_pressed_desk : - ob_rr_theme->a_unfocused_unpressed_desk)))); + (self->desk_hover ? + ob_rr_theme->a_hover_unfocused_desk : + ob_rr_theme->a_unfocused_unpressed_desk))))); s = (!(self->decorations & OB_FRAME_DECOR_SHADE) ? (self->focused ? ob_rr_theme->a_disabled_focused_shade : ob_rr_theme->a_disabled_unfocused_shade) : (self->focused ? (self->client->shaded ? - ob_rr_theme->a_focused_pressed_set_shade : + ob_rr_theme->a_toggled_focused_shade : (self->shade_press ? ob_rr_theme->a_focused_pressed_shade : - ob_rr_theme->a_focused_unpressed_shade)) : + (self->shade_hover ? + ob_rr_theme->a_hover_focused_shade : + ob_rr_theme->a_focused_unpressed_shade))) : (self->client->shaded ? - ob_rr_theme->a_unfocused_pressed_set_shade : + ob_rr_theme->a_toggled_unfocused_shade : (self->shade_press ? ob_rr_theme->a_unfocused_pressed_shade : - ob_rr_theme->a_unfocused_unpressed_shade)))); + (self->shade_hover ? + ob_rr_theme->a_hover_unfocused_shade : + ob_rr_theme->a_unfocused_unpressed_shade))))); c = (!(self->decorations & OB_FRAME_DECOR_CLOSE) ? (self->focused ? ob_rr_theme->a_disabled_focused_close : @@ -93,41 +112,59 @@ void framerender_frame(ObFrame *self) (self->focused ? (self->close_press ? ob_rr_theme->a_focused_pressed_close : - ob_rr_theme->a_focused_unpressed_close) : + (self->close_hover ? + ob_rr_theme->a_hover_focused_close : + ob_rr_theme->a_focused_unpressed_close)) : (self->close_press ? ob_rr_theme->a_unfocused_pressed_close : - ob_rr_theme->a_unfocused_unpressed_close))); + (self->close_hover ? + ob_rr_theme->a_hover_unfocused_close : + ob_rr_theme->a_unfocused_unpressed_close)))); RrPaint(t, self->title, self->width, ob_rr_theme->title_height); + ob_rr_theme->a_clear->surface.parent = t; + ob_rr_theme->a_clear->surface.parentx = 0; + ob_rr_theme->a_clear->surface.parenty = 0; + + RrPaint(ob_rr_theme->a_clear, self->tlresize, + ob_rr_theme->grip_width, ob_rr_theme->handle_height); + + ob_rr_theme->a_clear->surface.parentx = + self->width - ob_rr_theme->grip_width; + + RrPaint(ob_rr_theme->a_clear, self->trresize, + ob_rr_theme->grip_width, ob_rr_theme->handle_height); + + /* set parents for any parent relative guys */ l->surface.parent = t; l->surface.parentx = self->label_x; - l->surface.parenty = ob_rr_theme->bevel; + l->surface.parenty = ob_rr_theme->padding; m->surface.parent = t; m->surface.parentx = self->max_x; - m->surface.parenty = ob_rr_theme->bevel + 1; + m->surface.parenty = ob_rr_theme->padding + 1; n->surface.parent = t; n->surface.parentx = self->icon_x; - n->surface.parenty = ob_rr_theme->bevel; + n->surface.parenty = ob_rr_theme->padding; i->surface.parent = t; i->surface.parentx = self->iconify_x; - i->surface.parenty = ob_rr_theme->bevel + 1; + i->surface.parenty = ob_rr_theme->padding + 1; d->surface.parent = t; d->surface.parentx = self->desk_x; - d->surface.parenty = ob_rr_theme->bevel + 1; + d->surface.parenty = ob_rr_theme->padding + 1; s->surface.parent = t; s->surface.parentx = self->shade_x; - s->surface.parenty = ob_rr_theme->bevel + 1; + s->surface.parenty = ob_rr_theme->padding + 1; c->surface.parent = t; c->surface.parentx = self->close_x; - c->surface.parenty = ob_rr_theme->bevel + 1; + c->surface.parenty = ob_rr_theme->padding + 1; framerender_label(self, l); framerender_max(self, m); @@ -166,6 +203,8 @@ void framerender_frame(ObFrame *self) ob_rr_theme->grip_width, ob_rr_theme->handle_height); } } + + XFlush(ob_display); } static void framerender_label(ObFrame *self, RrAppearance *a)