X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fframerender.c;h=1f783a5402aed6725496ec08393e67ac7a45ce27;hb=8fe0cb8989c1fe12b30b9030b446345f25340d35;hp=d5269c00eec35c1083a61c6c052b2d645a952e57;hpb=742106511fbaca5ebef385a9c60c427e8dd7a6dd;p=chaz%2Fopenbox

diff --git a/openbox/framerender.c b/openbox/framerender.c
index d5269c00..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,14 +38,14 @@ 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 :
                 (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 :
                 (self->max_hover ?
@@ -70,14 +73,14 @@ void framerender_frame(ObFrame *self)
               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 :
                 (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 :
                 (self->desk_hover ?
@@ -89,14 +92,14 @@ void framerender_frame(ObFrame *self)
               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 :
                 (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 :
                 (self->shade_hover ?
@@ -120,34 +123,48 @@ void framerender_frame(ObFrame *self)
 
         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);
@@ -186,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)