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

diff --git a/openbox/framerender.c b/openbox/framerender.c
index d5d3ac8d..d5269c00 100644
--- a/openbox/framerender.c
+++ b/openbox/framerender.c
@@ -1,111 +1,153 @@
 #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, Appearance *a);
-static void framerender_icon(Frame *self, Appearance *a);
-static void framerender_max(Frame *self, Appearance *a);
-static void framerender_iconify(Frame *self, Appearance *a);
-static void framerender_desk(Frame *self, Appearance *a);
-static void framerender_shade(Frame *self, Appearance *a);
-static void framerender_close(Frame *self, Appearance *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,
-                         theme_cb_focused_color->pixel);
+                         RrColorPixel(ob_rr_theme->cb_focused_color));
     else
         XSetWindowBorder(ob_display, self->plate,
-                         theme_cb_unfocused_color->pixel);
+                         RrColorPixel(ob_rr_theme->cb_unfocused_color));
 
-    if (self->client->decorations & Decor_Titlebar) {
-        Appearance *t, *l, *m, *n, *i, *d, *s, *c;
+    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 ?
-              theme_a_focused_pressed_set_max :
-              (self->max_press ?
-               theme_a_focused_pressed_max : theme_a_focused_unpressed_max)) :
-             (self->client->max_vert || self->client->max_horz ?
-              theme_a_unfocused_pressed_set_max :
-              (self->max_press ?
-               theme_a_unfocused_pressed_max :
-               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_focused_pressed_set_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 :
+               (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 ?
-              theme_a_focused_pressed_iconify :
-              theme_a_focused_unpressed_iconify) :
-             (self->iconify_press ?
-              theme_a_unfocused_pressed_iconify :
-              theme_a_unfocused_unpressed_iconify));
-        d = (self->focused ?
-             (self->client->desktop == DESKTOP_ALL ?
-              theme_a_focused_pressed_set_desk :
-              (self->desk_press ?
-               theme_a_focused_pressed_desk :
-               theme_a_focused_unpressed_desk)) :
-             (self->client->desktop == DESKTOP_ALL ?
-              theme_a_unfocused_pressed_set_desk :
-              (self->desk_press ?
-               theme_a_unfocused_pressed_desk :
-               theme_a_unfocused_unpressed_desk)));
-        s = (self->focused ?
-             (self->client->shaded ?
-              theme_a_focused_pressed_set_shade :
-              (self->shade_press ?
-               theme_a_focused_pressed_shade :
-               theme_a_focused_unpressed_shade)) :
-             (self->client->shaded ?
-              theme_a_unfocused_pressed_set_shade :
-              (self->shade_press ?
-               theme_a_unfocused_pressed_shade :
-               theme_a_unfocused_unpressed_shade)));
-        c = (self->focused ?
-             (self->close_press ?
-              theme_a_focused_pressed_close :
-              theme_a_focused_unpressed_close) :
-             (self->close_press ?
-              theme_a_unfocused_pressed_close :
-              theme_a_unfocused_unpressed_close));
-
-        paint(self->title, t, self->width, theme_title_height);
+        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_focused_pressed_set_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 :
+               (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_focused_pressed_set_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 :
+               (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);
 
         /* set parents for any parent relative guys */
         l->surface.parent = t;
         l->surface.parentx = self->label_x;
-        l->surface.parenty = theme_bevel;
+        l->surface.parenty = ob_rr_theme->bevel;
 
         m->surface.parent = t;
         m->surface.parentx = self->max_x;
-        m->surface.parenty = theme_bevel + 1;
+        m->surface.parenty = ob_rr_theme->bevel + 1;
 
         n->surface.parent = t;
         n->surface.parentx = self->icon_x;
-        n->surface.parenty = theme_bevel;
+        n->surface.parenty = ob_rr_theme->bevel;
 
         i->surface.parent = t;
         i->surface.parentx = self->iconify_x;
-        i->surface.parenty = theme_bevel + 1;
+        i->surface.parenty = ob_rr_theme->bevel + 1;
 
         d->surface.parent = t;
         d->surface.parentx = self->desk_x;
-        d->surface.parenty = theme_bevel + 1;
+        d->surface.parenty = ob_rr_theme->bevel + 1;
 
         s->surface.parent = t;
         s->surface.parentx = self->shade_x;
-        s->surface.parenty = theme_bevel + 1;
+        s->surface.parenty = ob_rr_theme->bevel + 1;
 
         c->surface.parent = t;
         c->surface.parentx = self->close_x;
-        c->surface.parenty = theme_bevel + 1;
+        c->surface.parenty = ob_rr_theme->bevel + 1;
 
         framerender_label(self, l);
         framerender_max(self, m);
@@ -116,83 +158,92 @@ void framerender_frame(Frame *self)
         framerender_close(self, c);
     }
 
-    if (self->client->decorations & Decor_Handle) {
-        Appearance *h, *g;
+    if (self->decorations & OB_FRAME_DECOR_HANDLE) {
+        RrAppearance *h, *g;
 
         h = (self->focused ?
              self->a_focused_handle : self->a_unfocused_handle);
 
-        paint(self->handle, h, self->width, theme_handle_height);
+        RrPaint(h, self->handle, self->width, ob_rr_theme->handle_height);
 
-        g = (self->focused ?
-             theme_a_focused_grip : 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 == Background_ParentRelative)
-            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;
 
-        paint(self->lgrip, g, theme_grip_width, theme_handle_height);
+            RrPaint(g, self->lgrip,
+                    ob_rr_theme->grip_width, ob_rr_theme->handle_height);
 
-        g->surface.parentx = self->width - theme_grip_width;
-        g->surface.parenty = 0;
+            g->surface.parentx = self->width - ob_rr_theme->grip_width;
+            g->surface.parenty = 0;
 
-        paint(self->rgrip, g, theme_grip_width, theme_handle_height);
+            RrPaint(g, self->rgrip,
+                    ob_rr_theme->grip_width, ob_rr_theme->handle_height);
+        }
     }
 }
 
-static void framerender_label(Frame *self, Appearance *a)
+static void framerender_label(ObFrame *self, RrAppearance *a)
 {
     if (self->label_x < 0) return;
     /* set the texture's text! */
     a->texture[0].data.text.string = self->client->title;
-    paint(self->label, a, self->label_width, theme_label_height);
+    RrPaint(a, self->label, self->label_width, ob_rr_theme->label_height);
 }
 
-static void framerender_icon(Frame *self, Appearance *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,
-                                 theme_button_size + 2, theme_button_size + 2);
-        a->texture[0].type = RGBA;
+        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;
         a->texture[0].data.rgba.data = icon->data;
     } else
-        a->texture[0].type = NoTexture;
+        a->texture[0].type = RR_TEXTURE_NONE;
 
-    paint(self->icon, a, theme_button_size + 2, theme_button_size + 2);
+    RrPaint(a, self->icon,
+            ob_rr_theme->button_size + 2, ob_rr_theme->button_size + 2);
 }
 
-static void framerender_max(Frame *self, Appearance *a)
+static void framerender_max(ObFrame *self, RrAppearance *a)
 {
     if (self->max_x < 0) return;
-    paint(self->max, a, theme_button_size, theme_button_size);
+    RrPaint(a, self->max, ob_rr_theme->button_size, ob_rr_theme->button_size);
 }
 
-static void framerender_iconify(Frame *self, Appearance *a)
+static void framerender_iconify(ObFrame *self, RrAppearance *a)
 {
     if (self->iconify_x < 0) return;
-    paint(self->iconify, a, theme_button_size, theme_button_size);
+    RrPaint(a, self->iconify,
+            ob_rr_theme->button_size, ob_rr_theme->button_size);
 }
 
-static void framerender_desk(Frame *self, Appearance *a)
+static void framerender_desk(ObFrame *self, RrAppearance *a)
 {
     if (self->desk_x < 0) return;
-    paint(self->desk, a, theme_button_size, theme_button_size);
+    RrPaint(a, self->desk, ob_rr_theme->button_size, ob_rr_theme->button_size);
 }
 
-static void framerender_shade(Frame *self, Appearance *a)
+static void framerender_shade(ObFrame *self, RrAppearance *a)
 {
     if (self->shade_x < 0) return;
-    paint(self->shade, a, theme_button_size, theme_button_size);
+    RrPaint(a, self->shade,
+            ob_rr_theme->button_size, ob_rr_theme->button_size);
 }
 
-static void framerender_close(Frame *self, Appearance *a)
+static void framerender_close(ObFrame *self, RrAppearance *a)
 {
     if (self->close_x < 0) return;
-    paint(self->close, a, theme_button_size, theme_button_size);
+    RrPaint(a, self->close,
+            ob_rr_theme->button_size, ob_rr_theme->button_size);
 }