X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus_cycle_popup.c;h=096f5c6375077ce4591a034d7c964a07d0da9b8c;hb=9a4ce94579bc7161d4ed55b20f00b3f76deff3e2;hp=8ce2c161058afe8890987af5af001c04d4450df0;hpb=c12d09bde85e40fdfbb36225a1b596b5f27c2335;p=chaz%2Fopenbox

diff --git a/openbox/focus_cycle_popup.c b/openbox/focus_cycle_popup.c
index 8ce2c161..096f5c63 100644
--- a/openbox/focus_cycle_popup.c
+++ b/openbox/focus_cycle_popup.c
@@ -87,7 +87,7 @@ static void   popup_render   (ObFocusCyclePopup *p,
 static Window create_window(Window parent, guint bwidth, gulong mask,
                             XSetWindowAttributes *attr)
 {
-    return XCreateWindow(ob_display, parent, 0, 0, 1, 1, bwidth,
+    return XCreateWindow(obt_display, parent, 0, 0, 1, 1, bwidth,
                          RrDepth(ob_rr_inst), InputOutput,
                          RrVisual(ob_rr_inst), mask, attr);
 }
@@ -98,7 +98,7 @@ void focus_cycle_popup_startup(gboolean reconfig)
 
     single_popup = icon_popup_new();
 
-    popup.obwin.type = Window_Internal;
+    popup.obwin.type = OB_WINDOW_CLASS_INTERNAL;
     popup.a_bg = RrAppearanceCopy(ob_rr_theme->osd_hilite_bg);
     popup.a_text = RrAppearanceCopy(ob_rr_theme->osd_hilite_label);
     popup.a_icon = RrAppearanceCopy(ob_rr_theme->a_clear_tex);
@@ -113,8 +113,7 @@ void focus_cycle_popup_startup(gboolean reconfig)
 
     attrib.override_redirect = True;
     attrib.border_pixel=RrColorPixel(ob_rr_theme->osd_border_color);
-    popup.bg = create_window(RootWindow(ob_display, ob_screen),
-                             ob_rr_theme->obwidth,
+    popup.bg = create_window(obt_root(ob_screen), ob_rr_theme->obwidth,
                              CWOverrideRedirect | CWBorderPixel, &attrib);
 
     popup.text = create_window(popup.bg, 0, 0, NULL);
@@ -125,30 +124,33 @@ void focus_cycle_popup_startup(gboolean reconfig)
 
     popup.hilite_rgba = NULL;
 
-    XMapWindow(ob_display, popup.text);
+    XMapWindow(obt_display, popup.text);
 
     stacking_add(INTERNAL_AS_WINDOW(&popup));
+    window_add(&popup.bg, INTERNAL_AS_WINDOW(&popup));
 }
 
 void focus_cycle_popup_shutdown(gboolean reconfig)
 {
     icon_popup_free(single_popup);
 
+    window_remove(popup.bg);
     stacking_remove(INTERNAL_AS_WINDOW(&popup));
 
     while(popup.targets) {
         ObFocusCyclePopupTarget *t = popup.targets->data;
 
         g_free(t->text);
-        XDestroyWindow(ob_display, t->win);
+        XDestroyWindow(obt_display, t->win);
 
         popup.targets = g_list_delete_link(popup.targets, popup.targets);
     }
 
     g_free(popup.hilite_rgba);
+    popup.hilite_rgba = NULL;
 
-    XDestroyWindow(ob_display, popup.text);
-    XDestroyWindow(ob_display, popup.bg);
+    XDestroyWindow(obt_display, popup.text);
+    XDestroyWindow(obt_display, popup.bg);
 
     RrAppearanceFree(popup.a_icon);
     RrAppearanceFree(popup.a_text);
@@ -195,7 +197,7 @@ static void popup_setup(ObFocusCyclePopup *p, gboolean create_targets,
                 t->text = text;
                 t->win = create_window(p->bg, 0, 0, NULL);
 
-                XMapWindow(ob_display, t->win);
+                XMapWindow(obt_display, t->win);
 
                 p->targets = g_list_prepend(p->targets, t);
                 ++n;
@@ -310,7 +312,7 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c)
 
     if (!p->mapped) {
         /* position the background but don't draw it*/
-        XMoveResizeWindow(ob_display, p->bg, x, y, w, h);
+        XMoveResizeWindow(obt_display, p->bg, x, y, w, h);
 
         /* set up the hilite texture for the background */
         p->a_bg->texture[0].data.rgba.width = rgbaw;
@@ -320,7 +322,7 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c)
         p->a_bg->texture[0].data.rgba.data = p->hilite_rgba;
 
         /* position the text, but don't draw it */
-        XMoveResizeWindow(ob_display, p->text, textx, texty, textw, texth);
+        XMoveResizeWindow(obt_display, p->text, textx, texty, textw, texth);
         p->a_text->surface.parentx = textx;
         p->a_text->surface.parenty = texty;
     }
@@ -408,7 +410,7 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c)
             innery += ICON_HILITE_WIDTH + ICON_HILITE_MARGIN;
 
             /* move the icon */
-            XMoveResizeWindow(ob_display, target->win,
+            XMoveResizeWindow(obt_display, target->win,
                               innerx, innery, innerw, innerh);
 
             /* get the icon from the client */
@@ -453,21 +455,21 @@ void focus_cycle_popup_show(ObClient *c, gboolean iconic_windows,
 
     if (!popup.mapped) {
         /* show the dialog */
-        XMapWindow(ob_display, popup.bg);
-        XFlush(ob_display);
+        XMapWindow(obt_display, popup.bg);
+        XFlush(obt_display);
         popup.mapped = TRUE;
         screen_hide_desktop_popup();
     }
 }
 
-void focus_cycle_popup_hide()
+void focus_cycle_popup_hide(void)
 {
     gulong ignore_start;
 
     ignore_start = event_start_ignore_all_enters();
 
-    XUnmapWindow(ob_display, popup.bg);
-    XFlush(ob_display);
+    XUnmapWindow(obt_display, popup.bg);
+    XFlush(obt_display);
 
     event_end_ignore_all_enters(ignore_start);
 
@@ -477,7 +479,8 @@ void focus_cycle_popup_hide()
         ObFocusCyclePopupTarget *t = popup.targets->data;
 
         g_free(t->text);
-        XDestroyWindow(ob_display, t->win);
+        XDestroyWindow(obt_display, t->win);
+        g_free(t);
 
         popup.targets = g_list_delete_link(popup.targets, popup.targets);
     }
@@ -523,7 +526,7 @@ void focus_cycle_popup_single_show(struct _ObClient *c,
     screen_hide_desktop_popup();
 }
 
-void focus_cycle_popup_single_hide()
+void focus_cycle_popup_single_hide(void)
 {
     icon_popup_hide(single_popup);
 }