Revert "add XFlush to g_timeout callbacks"

[dana/openbox.git] / openbox / popup.c

diff --git a/openbox/popup.c b/openbox/popup.c
index a419281..2a83d7b 100644 (file)
--- a/openbox/popup.c
+++ b/openbox/popup.c
@@ -25,13 +25,13 @@
 #include "stacking.h"
 #include "event.h"
 #include "screen.h"
-#include "render/render.h"
-#include "render/theme.h"
+#include "obrender/render.h"
+#include "obrender/theme.h"
 
 ObPopup *popup_new(void)
 {
     XSetWindowAttributes attrib;
-    ObPopup *self = g_new0(ObPopup, 1);
+    ObPopup *self = g_slice_new0(ObPopup);
 
     self->obwin.type = OB_WINDOW_CLASS_INTERNAL;
     self->gravity = NorthWestGravity;
@@ -72,7 +72,7 @@ void popup_free(ObPopup *self)
         RrAppearanceFree(self->a_text);
         window_remove(self->bg);
         stacking_remove(self);
-        g_free(self);
+        g_slice_free(ObPopup, self);
     }
 }
 
@@ -146,11 +146,12 @@ static gboolean popup_show_timeout(gpointer data)
     stacking_raise(INTERNAL_AS_WINDOW(self));
     self->mapped = TRUE;
     self->delay_mapped = FALSE;
+    self->delay_timer = 0;
 
     return FALSE; /* don't repeat */
 }
 
-void popup_delay_show(ObPopup *self, gulong usec, gchar *text)
+void popup_delay_show(ObPopup *self, gulong msec, gchar *text)
 {
     gint l, t, r, b;
     gint x, y, w, h;
@@ -158,7 +159,8 @@ void popup_delay_show(ObPopup *self, gulong usec, gchar *text)
     gint emptyx, emptyy; /* empty space between elements */
     gint textx, texty, textw, texth;
     gint iconx, icony, iconw, iconh;
-    Rect *area, mon;
+    const Rect *area;
+    Rect mon;
     gboolean hasicon = self->hasicon;
 
     /* when there is no icon and the text is not parent relative, then
@@ -198,11 +200,11 @@ void popup_delay_show(ObPopup *self, gulong usec, gchar *text)
         textx += iconw + ob_rr_theme->paddingx;
         if (textw)
             emptyx += ob_rr_theme->paddingx; /* between the icon and text */
+        icony = (h - iconh - emptyy) / 2 + t + ob_rr_theme->paddingy;
     } else
         iconw = 0;
 
     texty = (h - texth - emptyy) / 2 + t + ob_rr_theme->paddingy;
-    icony = (h - iconh - emptyy) / 2 + t + ob_rr_theme->paddingy;
 
     /* when there is no icon, then fill the whole dialog with the text
        appearance
@@ -259,8 +261,6 @@ void popup_delay_show(ObPopup *self, gulong usec, gchar *text)
     x=MAX(MIN(x, area->x+area->width-w),area->x);
     y=MAX(MIN(y, area->y+area->height-h),area->y);
 
-    g_free(area);
-
     if (m == screen_num_monitors) {
         RECT_SET(mon, x, y, w, h);
         m = screen_find_monitor(&mon);
@@ -270,8 +270,6 @@ void popup_delay_show(ObPopup *self, gulong usec, gchar *text)
 
         x=MAX(MIN(x, area->x+area->width-w),area->x);
         y=MAX(MIN(y, area->y+area->height-h),area->y);
-
-        g_free(area);
     }
 
     /* set the windows/appearances up */
@@ -295,12 +293,11 @@ void popup_delay_show(ObPopup *self, gulong usec, gchar *text)
 
     /* do the actual showing */
     if (!self->mapped) {
-        if (usec) {
+        if (msec) {
             /* don't kill previous show timers */
             if (!self->delay_mapped) {
-                obt_main_loop_timeout_add(ob_main_loop, usec,
-                                          popup_show_timeout, self,
-                                          g_direct_equal, NULL);
+                self->delay_timer =
+                    g_timeout_add(msec, popup_show_timeout, self);
                 self->delay_mapped = TRUE;
             }
         } else {
@@ -322,7 +319,8 @@ void popup_hide(ObPopup *self)
 
         event_end_ignore_all_enters(ignore_start);
     } else if (self->delay_mapped) {
-        obt_main_loop_timeout_remove_data(ob_main_loop, popup_show_timeout, self, FALSE);
+        g_source_remove(self->delay_timer);
+        self->delay_timer = 0;
         self->delay_mapped = FALSE;
     }
 }
@@ -342,7 +340,7 @@ ObIconPopup *icon_popup_new(void)
 {
     ObIconPopup *self;
 
-    self = g_new0(ObIconPopup, 1);
+    self = g_slice_new0(ObIconPopup);
     self->popup = popup_new();
     self->a_icon = RrAppearanceCopy(ob_rr_theme->a_clear_tex);
     self->icon = XCreateWindow(obt_display, self->popup->bg,
@@ -364,11 +362,11 @@ void icon_popup_free(ObIconPopup *self)
         XDestroyWindow(obt_display, self->icon);
         RrAppearanceFree(self->a_icon);
         popup_free(self->popup);
-        g_free(self);
+        g_slice_free(ObIconPopup, self);
     }
 }
 
-void icon_popup_delay_show(ObIconPopup *self, gulong usec,
+void icon_popup_delay_show(ObIconPopup *self, gulong msec,
                            gchar *text, RrImage *icon)
 {
     if (icon) {
@@ -381,7 +379,7 @@ void icon_popup_delay_show(ObIconPopup *self, gulong usec,
         self->a_icon->texture[0].type = RR_TEXTURE_NONE;
     }
 
-    popup_delay_show(self->popup, usec, text);
+    popup_delay_show(self->popup, msec, text);
 }
 
 void icon_popup_icon_size_multiplier(ObIconPopup *self, guint wm, guint hm)
@@ -501,7 +499,7 @@ ObPagerPopup *pager_popup_new(void)
 {
     ObPagerPopup *self;
 
-    self = g_new(ObPagerPopup, 1);
+    self = g_slice_new(ObPagerPopup);
     self->popup = popup_new();
 
     self->desks = 0;
@@ -527,11 +525,11 @@ void pager_popup_free(ObPagerPopup *self)
         RrAppearanceFree(self->hilight);
         RrAppearanceFree(self->unhilight);
         popup_free(self->popup);
-        g_free(self);
+        g_slice_free(ObPagerPopup, self);
     }
 }
 
-void pager_popup_delay_show(ObPagerPopup *self, gulong usec,
+void pager_popup_delay_show(ObPagerPopup *self, gulong msec,
                             gchar *text, guint desk)
 {
     guint i;
@@ -560,7 +558,7 @@ void pager_popup_delay_show(ObPagerPopup *self, gulong usec,
     self->desks = screen_num_desktops;
     self->curdesk = desk;
 
-    popup_delay_show(self->popup, usec, text);
+    popup_delay_show(self->popup, msec, text);
 }
 
 void pager_popup_icon_size_multiplier(ObPagerPopup *self, guint wm, guint hm)