X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fframerender.c;h=4115ceba06073d088a2d52cdd2a76aed86c7551d;hb=b972055c9a46ba797e524c1952f20ad450aaebbf;hp=5f2f25945fec3ad07560a747595eec9ca474f272;hpb=81af5a8b0caadc0a82ff2304c315f816c9576e93;p=chaz%2Fopenbox

diff --git a/openbox/framerender.c b/openbox/framerender.c
index 5f2f2594..4115ceba 100644
--- a/openbox/framerender.c
+++ b/openbox/framerender.c
@@ -35,15 +35,19 @@ 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 :
-                ob_rr_theme->a_focused_unpressed_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 :
-                ob_rr_theme->a_unfocused_unpressed_max))));
+                (self->max_hover ?
+                 ob_rr_theme->a_hover_unfocused_max : 
+                 ob_rr_theme->a_unfocused_unpressed_max)))));
         n = self->a_icon;
         i = (!(self->decorations & OB_FRAME_DECOR_ICONIFY) ?
              (self->focused ?
@@ -52,40 +56,52 @@ void framerender_frame(ObFrame *self)
              (self->focused ?
               (self->iconify_press ?
                ob_rr_theme->a_focused_pressed_iconify :
-               ob_rr_theme->a_focused_unpressed_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 :
-               ob_rr_theme->a_unfocused_unpressed_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 :
+               ob_rr_theme->a_toggled_focused_desk :
                (self->desk_press ?
                 ob_rr_theme->a_focused_pressed_desk :
-                ob_rr_theme->a_focused_unpressed_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 :
-                ob_rr_theme->a_unfocused_unpressed_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 :
+               ob_rr_theme->a_toggled_focused_shade :
                (self->shade_press ?
                 ob_rr_theme->a_focused_pressed_shade :
-                ob_rr_theme->a_focused_unpressed_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 :
-                ob_rr_theme->a_unfocused_unpressed_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 :
@@ -93,10 +109,14 @@ void framerender_frame(ObFrame *self)
              (self->focused ?
               (self->close_press ?
                ob_rr_theme->a_focused_pressed_close :
-               ob_rr_theme->a_focused_unpressed_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 :
-               ob_rr_theme->a_unfocused_unpressed_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);