typo from code i removed

[chaz/openbox] / openbox / focus_cycle_popup.c

diff --git a/openbox/focus_cycle_popup.c b/openbox/focus_cycle_popup.c
index 807680af1f89962e8196c50bcdc7141041c8610d..89468493470b044cbfb0727614e30c957e1ad05d 100644 (file)
--- a/openbox/focus_cycle_popup.c
+++ b/openbox/focus_cycle_popup.c
@@ -25,15 +25,17 @@
 #include "focus_cycle.h"
 #include "openbox.h"
 #include "window.h"
+#include "event.h"
 #include "render/render.h"
 
 #include <X11/Xlib.h>
 #include <glib.h>
 
-#define ICON_SIZE 48
+#define ICON_SIZE 40
 #define ICON_HILITE_WIDTH 2
 #define ICON_HILITE_MARGIN 1
 #define OUTSIDE_BORDER 3
+#define TEXT_BORDER 2
 
 typedef struct _ObFocusCyclePopup       ObFocusCyclePopup;
 typedef struct _ObFocusCyclePopupTarget ObFocusCyclePopupTarget;
@@ -111,9 +113,9 @@ void focus_cycle_popup_startup(gboolean reconfig)
     popup.a_bg->texture[0].type = RR_TEXTURE_RGBA;
 
     attrib.override_redirect = True;
-    attrib.border_pixel=RrColorPixel(ob_rr_theme->frame_focused_border_color);
+    attrib.border_pixel=RrColorPixel(ob_rr_theme->osd_border_color);
     popup.bg = create_window(RootWindow(ob_display, ob_screen),
-                             ob_rr_theme->fbwidth,
+                             ob_rr_theme->obwidth,
                              CWOverrideRedirect | CWBorderPixel, &attrib);
 
     popup.text = create_window(popup.bg, 0, 0, NULL);
@@ -286,7 +288,7 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c)
 
     /* get the text dimensions */
     textw = w - l - r;
-    texth = RrMinHeight(p->a_text);
+    texth = RrMinHeight(p->a_text) + TEXT_BORDER * 2;
 
     /* find the height of the dialog */
     h = t + b + (icon_rows * ICON_SIZE) + (OUTSIDE_BORDER + texth);
@@ -297,9 +299,9 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c)
 
     /* find the position for the popup (include the outer borders) */
     x = screen_area->x + (screen_area->width -
-                          (w + ob_rr_theme->fbwidth * 2)) / 2;
+                          (w + ob_rr_theme->obwidth * 2)) / 2;
     y = screen_area->y + (screen_area->height -
-                          (h + ob_rr_theme->fbwidth * 2)) / 2;
+                          (h + ob_rr_theme->obwidth * 2)) / 2;
 
     /* get the dimensions of the target hilite texture */
     rgbax = ml;
@@ -320,6 +322,7 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c)
         /* set up the hilite texture for the background */
         p->a_bg->texture[0].data.rgba.width = rgbaw;
         p->a_bg->texture[0].data.rgba.height = rgbah;
+        p->a_bg->texture[0].data.rgba.alpha = 0xff;
         p->hilite_rgba = g_new(RrPixel32, rgbaw * rgbah);
         p->a_bg->texture[0].data.rgba.data = p->hilite_rgba;
 
@@ -419,6 +422,8 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c)
             icon = client_icon(target->client, innerw, innerh);
             p->a_icon->texture[0].data.rgba.width = icon->width;
             p->a_icon->texture[0].data.rgba.height = icon->height;
+            p->a_icon->texture[0].data.rgba.alpha =
+                target->client->iconic ? OB_ICONIC_ALPHA : 0xff;
             p->a_icon->texture[0].data.rgba.data = icon->data;
 
             /* draw the icon */
@@ -461,9 +466,15 @@ void focus_cycle_popup_show(ObClient *c, gboolean iconic_windows,
 
 void focus_cycle_popup_hide()
 {
+    gulong ignore_start;
+
+    ignore_start = event_start_ignore_all_enters();
+
     XUnmapWindow(ob_display, popup.bg);
     XFlush(ob_display);
 
+    event_end_ignore_all_enters(ignore_start);
+
     popup.mapped = FALSE;
 
     while(popup.targets) {