X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fframerender.c;h=1f783a5402aed6725496ec08393e67ac7a45ce27;hb=dbd3e9b6b2b452e853a17352560b5a4b4c568e84;hp=01dc75b10408fa803bb5a8cb44d6e2f887e7a2aa;hpb=b1f5555218ecaa3827450125dc47b4bf0d404ee4;p=chaz%2Fopenbox

diff --git a/openbox/framerender.c b/openbox/framerender.c
index 01dc75b1..1f783a54 100644
--- a/openbox/framerender.c
+++ b/openbox/framerender.c
@@ -1,112 +1,170 @@
 #include "frame.h"
 #include "openbox.h"
 #include "screen.h"
+#include "client.h"
 #include "framerender.h"
 #include "render/theme.h"
 
-static void framerender_label(Frame *self, RrAppearance *a);
-static void framerender_icon(Frame *self, RrAppearance *a);
-static void framerender_max(Frame *self, RrAppearance *a);
-static void framerender_iconify(Frame *self, RrAppearance *a);
-static void framerender_desk(Frame *self, RrAppearance *a);
-static void framerender_shade(Frame *self, RrAppearance *a);
-static void framerender_close(Frame *self, RrAppearance *a);
+static void framerender_label(ObFrame *self, RrAppearance *a);
+static void framerender_icon(ObFrame *self, RrAppearance *a);
+static void framerender_max(ObFrame *self, RrAppearance *a);
+static void framerender_iconify(ObFrame *self, RrAppearance *a);
+static void framerender_desk(ObFrame *self, RrAppearance *a);
+static void framerender_shade(ObFrame *self, RrAppearance *a);
+static void framerender_close(ObFrame *self, RrAppearance *a);
 
-void framerender_frame(Frame *self)
+void framerender_frame(ObFrame *self)
 {
-    if (self->focused)
-        XSetWindowBorder(ob_display, self->plate,
-                         ob_rr_theme->cb_focused_color->pixel);
-    else
-        XSetWindowBorder(ob_display, self->plate,
-                         ob_rr_theme->cb_unfocused_color->pixel);
-
-    if (self->client->decorations & Decor_Titlebar) {
+    {
+        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;
 
         t = (self->focused ?
              self->a_focused_title : self->a_unfocused_title);
         l = (self->focused ?
              self->a_focused_label : self->a_unfocused_label);
-        m = (self->focused ?
-             (self->client->max_vert || self->client->max_horz ?
-              ob_rr_theme->a_focused_pressed_set_max :
-              (self->max_press ?
-               ob_rr_theme->a_focused_pressed_max :
-               ob_rr_theme->a_focused_unpressed_max)) :
-             (self->client->max_vert || self->client->max_horz ?
-              ob_rr_theme->a_unfocused_pressed_set_max :
-              (self->max_press ?
-               ob_rr_theme->a_unfocused_pressed_max :
-               ob_rr_theme->a_unfocused_unpressed_max)));
+        m = (!(self->decorations & OB_FRAME_DECOR_MAXIMIZE) ?
+             (self->focused ?
+              ob_rr_theme->a_disabled_focused_max :
+              ob_rr_theme->a_disabled_unfocused_max) :
+             (self->focused ?
+              (self->client->max_vert || self->client->max_horz ?
+               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_toggled_unfocused_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_unfocused_unpressed_max)))));
         n = self->a_icon;
-        i = (self->focused ?
-             (self->iconify_press ?
-              ob_rr_theme->a_focused_pressed_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));
-        d = (self->focused ?
-             (self->client->desktop == DESKTOP_ALL ?
-              ob_rr_theme->a_focused_pressed_set_desk :
-              (self->desk_press ?
-               ob_rr_theme->a_focused_pressed_desk :
-               ob_rr_theme->a_focused_unpressed_desk)) :
-             (self->client->desktop == DESKTOP_ALL ?
-              ob_rr_theme->a_unfocused_pressed_set_desk :
-              (self->desk_press ?
-               ob_rr_theme->a_unfocused_pressed_desk :
-               ob_rr_theme->a_unfocused_unpressed_desk)));
-        s = (self->focused ?
-             (self->client->shaded ?
-              ob_rr_theme->a_focused_pressed_set_shade :
-              (self->shade_press ?
-               ob_rr_theme->a_focused_pressed_shade :
-               ob_rr_theme->a_focused_unpressed_shade)) :
-             (self->client->shaded ?
-              ob_rr_theme->a_unfocused_pressed_set_shade :
-              (self->shade_press ?
-               ob_rr_theme->a_unfocused_pressed_shade :
-               ob_rr_theme->a_unfocused_unpressed_shade)));
-        c = (self->focused ?
-             (self->close_press ?
-              ob_rr_theme->a_focused_pressed_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));
+        i = (!(self->decorations & OB_FRAME_DECOR_ICONIFY) ?
+             (self->focused ?
+              ob_rr_theme->a_disabled_focused_iconify :
+              ob_rr_theme->a_disabled_unfocused_iconify) :
+             (self->focused ?
+              (self->iconify_press ?
+               ob_rr_theme->a_focused_pressed_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 :
+               (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_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_toggled_unfocused_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_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_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_toggled_unfocused_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_unfocused_unpressed_shade)))));
+        c = (!(self->decorations & OB_FRAME_DECOR_CLOSE) ?
+             (self->focused ?
+              ob_rr_theme->a_disabled_focused_close :
+              ob_rr_theme->a_disabled_unfocused_close) :
+             (self->focused ?
+              (self->close_press ?
+               ob_rr_theme->a_focused_pressed_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 :
+               (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);
@@ -117,7 +175,7 @@ void framerender_frame(Frame *self)
         framerender_close(self, c);
     }
 
-    if (self->client->decorations & Decor_Handle) {
+    if (self->decorations & OB_FRAME_DECOR_HANDLE) {
         RrAppearance *h, *g;
 
         h = (self->focused ?
@@ -125,27 +183,31 @@ void framerender_frame(Frame *self)
 
         RrPaint(h, self->handle, self->width, ob_rr_theme->handle_height);
 
-        g = (self->focused ?
-             ob_rr_theme->a_focused_grip : ob_rr_theme->a_unfocused_grip);
+        if (self->decorations & OB_FRAME_DECOR_GRIPS) {
+            g = (self->focused ?
+                 ob_rr_theme->a_focused_grip : ob_rr_theme->a_unfocused_grip);
 
-        if (g->surface.grad == RR_SURFACE_PARENTREL)
-            g->surface.parent = h;
+            if (g->surface.grad == RR_SURFACE_PARENTREL)
+                g->surface.parent = h;
 
-        g->surface.parentx = 0;
-        g->surface.parenty = 0;
+            g->surface.parentx = 0;
+            g->surface.parenty = 0;
 
-        RrPaint(g, self->lgrip,
-                ob_rr_theme->grip_width, ob_rr_theme->handle_height);
+            RrPaint(g, self->lgrip,
+                    ob_rr_theme->grip_width, ob_rr_theme->handle_height);
 
-        g->surface.parentx = self->width - ob_rr_theme->grip_width;
-        g->surface.parenty = 0;
+            g->surface.parentx = self->width - ob_rr_theme->grip_width;
+            g->surface.parenty = 0;
 
-        RrPaint(g, self->rgrip,
-                ob_rr_theme->grip_width, ob_rr_theme->handle_height);
+            RrPaint(g, self->rgrip,
+                    ob_rr_theme->grip_width, ob_rr_theme->handle_height);
+        }
     }
+
+    XFlush(ob_display);
 }
 
-static void framerender_label(Frame *self, RrAppearance *a)
+static void framerender_label(ObFrame *self, RrAppearance *a)
 {
     if (self->label_x < 0) return;
     /* set the texture's text! */
@@ -153,14 +215,14 @@ static void framerender_label(Frame *self, RrAppearance *a)
     RrPaint(a, self->label, self->label_width, ob_rr_theme->label_height);
 }
 
-static void framerender_icon(Frame *self, RrAppearance *a)
+static void framerender_icon(ObFrame *self, RrAppearance *a)
 {
     if (self->icon_x < 0) return;
 
     if (self->client->nicons) {
-        Icon *icon = client_icon(self->client,
-                                 ob_rr_theme->button_size + 2,
-                                 ob_rr_theme->button_size + 2);
+        ObClientIcon *icon = client_icon(self->client,
+                                         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;
@@ -172,33 +234,33 @@ static void framerender_icon(Frame *self, RrAppearance *a)
             ob_rr_theme->button_size + 2, ob_rr_theme->button_size + 2);
 }
 
-static void framerender_max(Frame *self, RrAppearance *a)
+static void framerender_max(ObFrame *self, RrAppearance *a)
 {
     if (self->max_x < 0) return;
     RrPaint(a, self->max, ob_rr_theme->button_size, ob_rr_theme->button_size);
 }
 
-static void framerender_iconify(Frame *self, RrAppearance *a)
+static void framerender_iconify(ObFrame *self, RrAppearance *a)
 {
     if (self->iconify_x < 0) return;
     RrPaint(a, self->iconify,
             ob_rr_theme->button_size, ob_rr_theme->button_size);
 }
 
-static void framerender_desk(Frame *self, RrAppearance *a)
+static void framerender_desk(ObFrame *self, RrAppearance *a)
 {
     if (self->desk_x < 0) return;
     RrPaint(a, self->desk, ob_rr_theme->button_size, ob_rr_theme->button_size);
 }
 
-static void framerender_shade(Frame *self, RrAppearance *a)
+static void framerender_shade(ObFrame *self, RrAppearance *a)
 {
     if (self->shade_x < 0) return;
     RrPaint(a, self->shade,
             ob_rr_theme->button_size, ob_rr_theme->button_size);
 }
 
-static void framerender_close(Frame *self, RrAppearance *a)
+static void framerender_close(ObFrame *self, RrAppearance *a)
 {
     if (self->close_x < 0) return;
     RrPaint(a, self->close,