Merge branch 'master' into chaz

[chaz/openbox] / openbox / popup.c

diff --git a/openbox/popup.c b/openbox/popup.c
index 8793accc45ac4dbf9f0f1a1e860afbfdeb074e5f..5ecf2fa50843eb38b2a73a7bdeafa29ea7d42076 100644 (file)
--- a/openbox/popup.c
+++ b/openbox/popup.c
@@ -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,7 @@ 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 const *area;
+    const Rect *area;
     Rect mon;
     gboolean hasicon = self->hasicon;
 
@@ -199,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
@@ -249,16 +250,22 @@ void popup_delay_show(ObPopup *self, gulong usec, gchar *text)
         break;
     }
 
-    /* Find the monitor which contains the biggest part of the popup.
-     * If the popup is completely off screen, limit it to the intersection
-     * of all monitors and then try again. If it's still off screen, put it
-     * on monitor 0. */
-    RECT_SET(mon, x, y, w, h);
-    m = screen_find_monitor(&mon);
+    /* If the popup belongs to a client (eg, the moveresize popup), get
+     * the monitor for that client, otherwise do other stuff */
+    if (self->client) {
+        m = client_monitor(self->client);
+    } else {
+        /* Find the monitor which contains the biggest part of the popup.
+         * If the popup is completely off screen, limit it to the intersection
+         * of all monitors and then try again. If it's still off screen, put it
+         * on monitor 0. */
+        RECT_SET(mon, x, y, w, h);
+        m = screen_find_monitor(&mon);
+    }
     area = screen_physical_area_monitor(m);
 
-    x=MAX(MIN(x, area->x+area->width-w),area->x);
-    y=MAX(MIN(y, area->y+area->height-h),area->y);
+    x = MAX(MIN(x, area->x+area->width-w), area->x);
+    y = MAX(MIN(y, area->y+area->height-h), area->y);
 
     if (m == screen_num_monitors) {
         RECT_SET(mon, x, y, w, h);
@@ -267,8 +274,8 @@ void popup_delay_show(ObPopup *self, gulong usec, gchar *text)
             m = 0;
         area = screen_physical_area_monitor(m);
 
-        x=MAX(MIN(x, area->x+area->width-w),area->x);
-        y=MAX(MIN(y, area->y+area->height-h),area->y);
+        x = MAX(MIN(x, area->x+area->width-w), area->x);
+        y = MAX(MIN(y, area->y+area->height-h), area->y);
     }
 
     /* set the windows/appearances up */
@@ -292,12 +299,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 {
@@ -319,7 +325,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;
     }
 }
@@ -365,7 +372,7 @@ void icon_popup_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) {
@@ -378,7 +385,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)
@@ -528,7 +535,7 @@ void pager_popup_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;
@@ -557,7 +564,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)