X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fframerender.c;h=e4db2a06e6734812a8cfbcc60c0e038490a4bf80;hb=c313b219a226c3b968ff312b96120eef0c527d91;hp=f122eef87d038e11b0493d0bcb45e420639cf41a;hpb=439d2c62fa83e4a233ea44f3eb5d706c6edfc3df;p=chaz%2Fopenbox diff --git a/openbox/framerender.c b/openbox/framerender.c index f122eef8..e4db2a06 100644 --- a/openbox/framerender.c +++ b/openbox/framerender.c @@ -34,6 +34,14 @@ static void framerender_close(ObFrame *self, RrAppearance *a); void framerender_frame(ObFrame *self) { + if (frame_iconify_animating(self)) + return; /* delay redrawing until the animation is done */ + if (!self->need_render) + return; + if (!self->visible) + return; + self->need_render = FALSE; + { gulong px; @@ -51,6 +59,14 @@ void framerender_frame(ObFrame *self) XClearWindow(ob_display, self->innerright); XSetWindowBackground(ob_display, self->innerbottom, px); XClearWindow(ob_display, self->innerbottom); + XSetWindowBackground(ob_display, self->innerbll, px); + XClearWindow(ob_display, self->innerbll); + XSetWindowBackground(ob_display, self->innerbrr, px); + XClearWindow(ob_display, self->innerbrr); + XSetWindowBackground(ob_display, self->innerblb, px); + XClearWindow(ob_display, self->innerblb); + XSetWindowBackground(ob_display, self->innerbrb, px); + XClearWindow(ob_display, self->innerbrb); px = (self->focused ? RrColorPixel(ob_rr_theme->frame_focused_border_color) : @@ -95,9 +111,11 @@ void framerender_frame(ObFrame *self) XSetWindowBackground(ob_display, self->rgripbottom, px); XClearWindow(ob_display, self->rgripbottom); - px = (self->focused ? - RrColorPixel(ob_rr_theme->title_separator_focused_color) : - RrColorPixel(ob_rr_theme->title_separator_unfocused_color)); + /* don't use the separator color for shaded windows */ + if (!self->client->shaded) + px = (self->focused ? + RrColorPixel(ob_rr_theme->title_separator_focused_color) : + RrColorPixel(ob_rr_theme->title_separator_unfocused_color)); XSetWindowBackground(ob_display, self->titlebottom, px); XClearWindow(ob_display, self->titlebottom); @@ -106,30 +124,28 @@ void framerender_frame(ObFrame *self) if (self->decorations & OB_FRAME_DECOR_TITLEBAR) { RrAppearance *t, *l, *m, *n, *i, *d, *s, *c, *clear; if (self->focused) { - - t = self->a_focused_title; - l = self->a_focused_label; - + t = ob_rr_theme->a_focused_title; + l = ob_rr_theme->a_focused_label; m = (!(self->decorations & OB_FRAME_DECOR_MAXIMIZE) ? ob_rr_theme->a_disabled_focused_max : (self->client->max_vert || self->client->max_horz ? (self->max_press ? ob_rr_theme->a_toggled_focused_pressed_max : (self->max_hover ? - ob_rr_theme->a_toggled_hover_focused_max : + ob_rr_theme->a_toggled_hover_focused_max : ob_rr_theme->a_toggled_focused_unpressed_max)) : (self->max_press ? ob_rr_theme->a_focused_pressed_max : (self->max_hover ? - ob_rr_theme->a_hover_focused_max : + ob_rr_theme->a_hover_focused_max : ob_rr_theme->a_focused_unpressed_max)))); - n = self->a_icon; + n = ob_rr_theme->a_icon; i = (!(self->decorations & OB_FRAME_DECOR_ICONIFY) ? ob_rr_theme->a_disabled_focused_iconify : (self->iconify_press ? ob_rr_theme->a_focused_pressed_iconify : (self->iconify_hover ? - ob_rr_theme->a_hover_focused_iconify : + ob_rr_theme->a_hover_focused_iconify : ob_rr_theme->a_focused_unpressed_iconify))); d = (!(self->decorations & OB_FRAME_DECOR_ALLDESKTOPS) ? ob_rr_theme->a_disabled_focused_desk : @@ -137,12 +153,12 @@ void framerender_frame(ObFrame *self) (self->desk_press ? ob_rr_theme->a_toggled_focused_pressed_desk : (self->desk_hover ? - ob_rr_theme->a_toggled_hover_focused_desk : + ob_rr_theme->a_toggled_hover_focused_desk : ob_rr_theme->a_toggled_focused_unpressed_desk)) : (self->desk_press ? ob_rr_theme->a_focused_pressed_desk : (self->desk_hover ? - ob_rr_theme->a_hover_focused_desk : + ob_rr_theme->a_hover_focused_desk : ob_rr_theme->a_focused_unpressed_desk)))); s = (!(self->decorations & OB_FRAME_DECOR_SHADE) ? ob_rr_theme->a_disabled_focused_shade : @@ -150,43 +166,43 @@ void framerender_frame(ObFrame *self) (self->shade_press ? ob_rr_theme->a_toggled_focused_pressed_shade : (self->shade_hover ? - ob_rr_theme->a_toggled_hover_focused_shade : + ob_rr_theme->a_toggled_hover_focused_shade : ob_rr_theme->a_toggled_focused_unpressed_shade)) : (self->shade_press ? ob_rr_theme->a_focused_pressed_shade : (self->shade_hover ? - ob_rr_theme->a_hover_focused_shade : + ob_rr_theme->a_hover_focused_shade : ob_rr_theme->a_focused_unpressed_shade)))); c = (!(self->decorations & OB_FRAME_DECOR_CLOSE) ? ob_rr_theme->a_disabled_focused_close : (self->close_press ? ob_rr_theme->a_focused_pressed_close : (self->close_hover ? - ob_rr_theme->a_hover_focused_close : + ob_rr_theme->a_hover_focused_close : ob_rr_theme->a_focused_unpressed_close))); } else { - t = self->a_unfocused_title; - l = self->a_unfocused_label; + t = ob_rr_theme->a_unfocused_title; + l = ob_rr_theme->a_unfocused_label; m = (!(self->decorations & OB_FRAME_DECOR_MAXIMIZE) ? ob_rr_theme->a_disabled_unfocused_max : (self->client->max_vert || self->client->max_horz ? (self->max_press ? ob_rr_theme->a_toggled_unfocused_pressed_max : (self->max_hover ? - ob_rr_theme->a_toggled_hover_unfocused_max : + ob_rr_theme->a_toggled_hover_unfocused_max : ob_rr_theme->a_toggled_unfocused_unpressed_max)) : (self->max_press ? ob_rr_theme->a_unfocused_pressed_max : (self->max_hover ? - ob_rr_theme->a_hover_unfocused_max : + ob_rr_theme->a_hover_unfocused_max : ob_rr_theme->a_unfocused_unpressed_max)))); - n = self->a_icon; + n = ob_rr_theme->a_icon; i = (!(self->decorations & OB_FRAME_DECOR_ICONIFY) ? ob_rr_theme->a_disabled_unfocused_iconify : (self->iconify_press ? ob_rr_theme->a_unfocused_pressed_iconify : (self->iconify_hover ? - ob_rr_theme->a_hover_unfocused_iconify : + ob_rr_theme->a_hover_unfocused_iconify : ob_rr_theme->a_unfocused_unpressed_iconify))); d = (!(self->decorations & OB_FRAME_DECOR_ALLDESKTOPS) ? ob_rr_theme->a_disabled_unfocused_desk : @@ -194,12 +210,12 @@ void framerender_frame(ObFrame *self) (self->desk_press ? ob_rr_theme->a_toggled_unfocused_pressed_desk : (self->desk_hover ? - ob_rr_theme->a_toggled_hover_unfocused_desk : + ob_rr_theme->a_toggled_hover_unfocused_desk : ob_rr_theme->a_toggled_unfocused_unpressed_desk)) : (self->desk_press ? ob_rr_theme->a_unfocused_pressed_desk : (self->desk_hover ? - ob_rr_theme->a_hover_unfocused_desk : + ob_rr_theme->a_hover_unfocused_desk : ob_rr_theme->a_unfocused_unpressed_desk)))); s = (!(self->decorations & OB_FRAME_DECOR_SHADE) ? ob_rr_theme->a_disabled_unfocused_shade : @@ -207,19 +223,19 @@ void framerender_frame(ObFrame *self) (self->shade_press ? ob_rr_theme->a_toggled_unfocused_pressed_shade : (self->shade_hover ? - ob_rr_theme->a_toggled_hover_unfocused_shade : + ob_rr_theme->a_toggled_hover_unfocused_shade : ob_rr_theme->a_toggled_unfocused_unpressed_shade)) : (self->shade_press ? ob_rr_theme->a_unfocused_pressed_shade : (self->shade_hover ? - ob_rr_theme->a_hover_unfocused_shade : + ob_rr_theme->a_hover_unfocused_shade : ob_rr_theme->a_unfocused_unpressed_shade)))); c = (!(self->decorations & OB_FRAME_DECOR_CLOSE) ? ob_rr_theme->a_disabled_unfocused_close : (self->close_press ? ob_rr_theme->a_unfocused_pressed_close : (self->close_hover ? - ob_rr_theme->a_hover_unfocused_close : + ob_rr_theme->a_hover_unfocused_close : ob_rr_theme->a_unfocused_unpressed_close))); } clear = ob_rr_theme->a_clear; @@ -300,7 +316,7 @@ void framerender_frame(ObFrame *self) RrAppearance *h, *g; h = (self->focused ? - self->a_focused_handle : self->a_unfocused_handle); + ob_rr_theme->a_focused_handle : ob_rr_theme->a_unfocused_handle); RrPaint(h, self->handle, self->width, ob_rr_theme->handle_height);