Try to fix the popup only showing up on monitor 0.

[chaz/openbox] / openbox / popup.c

diff --git a/openbox/popup.c b/openbox/popup.c
index 2fb275cafaffe2f5737448b9ed6c75dc9a93b2ff..071f5b62e2c5d9a40208170d40a27cb449a7450f 100644 (file)
--- a/openbox/popup.c
+++ b/openbox/popup.c
@@ -29,7 +29,7 @@
 #include "render/render.h"
 #include "render/theme.h"
 
-ObPopup *popup_new()
+ObPopup *popup_new(void)
 {
     XSetWindowAttributes attrib;
     ObPopup *self = g_new0(ObPopup, 1);
@@ -46,7 +46,7 @@ ObPopup *popup_new()
                              0, 0, 1, 1, 0, RrDepth(ob_rr_inst),
                              InputOutput, RrVisual(ob_rr_inst),
                              CWOverrideRedirect, &attrib);
-    
+
     self->text = XCreateWindow(ob_display, self->bg,
                                0, 0, 1, 1, 0, RrDepth(ob_rr_inst),
                                InputOutput, RrVisual(ob_rr_inst), 0, NULL);
@@ -110,7 +110,7 @@ void popup_text_width_to_string(ObPopup *self, gchar *text)
         self->a_text->texture[0].data.text.string = text;
         self->textw = RrMinWidth(self->a_text);
     } else
-        self->textw = 0;    
+        self->textw = 0;
 }
 
 void popup_height_to_string(ObPopup *self, gchar *text)
@@ -138,7 +138,7 @@ void popup_set_text_align(ObPopup *self, RrJustify align)
 static gboolean popup_show_timeout(gpointer data)
 {
     ObPopup *self = data;
-    
+
     XMapWindow(ob_display, self->bg);
     stacking_raise(INTERNAL_AS_WINDOW(self));
     self->mapped = TRUE;
@@ -151,14 +151,13 @@ void popup_delay_show(ObPopup *self, gulong usec, gchar *text)
 {
     gint l, t, r, b;
     gint x, y, w, h;
+    guint m;
     gint emptyx, emptyy; /* empty space between elements */
     gint textx, texty, textw, texth;
     gint iconx, icony, iconw, iconh;
-    Rect *area;
+    Rect *area, mon;
 
-    area = screen_physical_area();
-
-    /* when there is no icon and the text is not parent relative, then 
+    /* when there is no icon and the text is not parent relative, then
        fill the whole dialog with the text appearance, don't use the bg at all
     */
     if (self->hasicon || self->a_text->surface.grad == RR_SURFACE_PARENTREL)
@@ -185,7 +184,6 @@ void popup_delay_show(ObPopup *self, gulong usec, gchar *text)
 
     if (self->textw)
         textw = self->textw;
-    else
 
     iconx = textx = l + ob_rr_theme->paddingx;
 
@@ -202,10 +200,10 @@ void popup_delay_show(ObPopup *self, gulong usec, gchar *text)
     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 and the text is not parent relative, then 
-       fill the whole dialog with the text appearance, don't use the bg at all
+    /* when there is no icon, then fill the whole dialog with the text
+       appearance
     */
-    if (!(self->hasicon || self->a_text->surface.grad == RR_SURFACE_PARENTREL))
+    if (!self->hasicon)
     {
         textx = texty = 0;
         texth += emptyy;
@@ -246,12 +244,31 @@ void popup_delay_show(ObPopup *self, gulong usec, gchar *text)
         break;
     }
 
-    x=MAX(MIN(x, area->width-w),0);
-    y=MAX(MIN(y, area->height-h),0);
-    
+    /* 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);
+
+    if (m == screen_num_monitors) {
+        RECT_SET(mon, x, y, w, h);
+        m = screen_find_monitor(&mon);
+        if (m == screen_num_monitors)
+            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);
+    }
+
     /* set the windows/appearances up */
     XMoveResizeWindow(ob_display, self->bg, x, y, w, h);
-    /* when there is no icon and the text is not parent relative, then 
+    /* when there is no icon and the text is not parent relative, then
        fill the whole dialog with the text appearance, don't use the bg at all
     */
     if (self->hasicon || self->a_text->surface.grad == RR_SURFACE_PARENTREL)
@@ -282,6 +299,8 @@ void popup_delay_show(ObPopup *self, gulong usec, gchar *text)
             popup_show_timeout(self);
         }
     }
+
+    g_free(area);
 }
 
 void popup_hide(ObPopup *self)
@@ -313,12 +332,12 @@ static void icon_popup_draw_icon(gint x, gint y, gint w, gint h, gpointer data)
     RrPaint(self->a_icon, self->icon, w, h);
 }
 
-ObIconPopup *icon_popup_new()
+ObIconPopup *icon_popup_new(void)
 {
     ObIconPopup *self;
 
     self = g_new0(ObIconPopup, 1);
-    self->popup = popup_new(TRUE);
+    self->popup = popup_new();
     self->a_icon = RrAppearanceCopy(ob_rr_theme->a_clear_tex);
     self->icon = XCreateWindow(ob_display, self->popup->bg,
                                0, 0, 1, 1, 0,
@@ -471,12 +490,12 @@ static void pager_popup_draw_icon(gint px, gint py, gint w, gint h,
     }
 }
 
-ObPagerPopup *pager_popup_new()
+ObPagerPopup *pager_popup_new(void)
 {
     ObPagerPopup *self;
 
     self = g_new(ObPagerPopup, 1);
-    self->popup = popup_new(TRUE);
+    self->popup = popup_new();
 
     self->desks = 0;
     self->wins = g_new(Window, self->desks);
@@ -521,7 +540,7 @@ void pager_popup_delay_show(ObPagerPopup *self, gulong usec,
         for (i = self->desks; i < screen_num_desktops; ++i) {
             XSetWindowAttributes attr;
 
-            attr.border_pixel = 
+            attr.border_pixel =
                 RrColorPixel(ob_rr_theme->osd_border_color);
             self->wins[i] = XCreateWindow(ob_display, self->popup->bg,
                                           0, 0, 1, 1, ob_rr_theme->obwidth,