X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fframerender.c;h=1f783a5402aed6725496ec08393e67ac7a45ce27;hb=11e28eaa5c9e3ace49758345eac2f6c4b701659b;hp=52001c111e587f2c308d81ea4dda6aaf1abadb7a;hpb=960a7f0184a84f99545fa2d3dd22cefc77f2cbc6;p=chaz%2Fopenbox diff --git a/openbox/framerender.c b/openbox/framerender.c index 52001c11..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; @@ -137,31 +140,31 @@ void framerender_frame(ObFrame *self) /* 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); @@ -200,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)