Bring back "Show desktop switch popup on every monitor"

This time remembering that screen_num_monitors can change.

diff --git a/openbox/screen.c b/openbox/screen.c
index bcedbff86b79f105c6aced66388f66f4539ade7b..9652397ae5daadb759167c3ee4d33a0fc4f071f1 100644 (file)
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -80,7 +80,7 @@ static GSList *struts_left = NULL;
 static GSList *struts_right = NULL;
 static GSList *struts_bottom = NULL;
 
-static ObPagerPopup *desktop_popup;
+static ObPagerPopup **desktop_popup;
 static guint         desktop_popup_timer = 0;
 static gboolean      desktop_popup_perm;
 
@@ -361,23 +361,40 @@ static void screen_tell_ksplash(void)
                False, SubstructureNotifyMask, &e);
 }
 #endif
+
+static void desktop_popup_new()
+{
+        guint i;
+        desktop_popup = g_new(ObPagerPopup*, screen_num_monitors);
+        for (i = 0; i < screen_num_monitors; i++) {
+            desktop_popup[i] = pager_popup_new();
+            desktop_popup[i]->popup->a_text->texture[0].data.text.font = ob_rr_theme->menu_title_font;
+            pager_popup_height(desktop_popup[i], POPUP_HEIGHT);
+
+            /* update the pager popup's width */
+            if (screen_desktop_names)
+                pager_popup_text_width_to_strings(desktop_popup[i],
+                                                  screen_desktop_names,
+                                                  screen_num_desktops);
+        }
+
+}
+
 void screen_startup(gboolean reconfig)
 {
     gchar **names = NULL;
     guint32 d;
     gboolean namesexist = FALSE;
 
-    desktop_popup = pager_popup_new();
-    desktop_popup->popup->a_text->texture[0].data.text.font = ob_rr_theme->menu_title_font;
     desktop_popup_perm = FALSE;
-    pager_popup_height(desktop_popup, POPUP_HEIGHT);
 
     if (reconfig) {
-        /* update the pager popup's width */
-        pager_popup_text_width_to_strings(desktop_popup,
-                                          screen_desktop_names,
-                                          screen_num_desktops);
+        desktop_popup_new();
         return;
+    } else {
+        if (desktop_popup)
+            ob_debug("desktop_popup wasn't NULL when expected %x", desktop_popup);
+        desktop_popup = NULL;
     }
 
     /* get the initial size */
@@ -468,9 +485,19 @@ void screen_startup(gboolean reconfig)
         screen_update_layout();
 }
 
+static void desktop_popup_free(guint n)
+{
+    guint i;
+    for (i = 0; i < n; i++) {
+        pager_popup_free(desktop_popup[i]);
+    }
+    g_free(desktop_popup);
+    desktop_popup = NULL;
+}
+
 void screen_shutdown(gboolean reconfig)
 {
-    pager_popup_free(desktop_popup);
+    desktop_popup_free(screen_num_monitors);
 
     if (reconfig)
         return;
@@ -951,30 +978,37 @@ static guint translate_row_col(guint r, guint c)
 
 static gboolean hide_desktop_popup_func(gpointer data)
 {
-    pager_popup_hide(desktop_popup);
+    guint i;
+
     desktop_popup_timer = 0;
+
+    for (i = 0; i < screen_num_monitors; i++) {
+        pager_popup_hide(desktop_popup[i]);
+    }
     return FALSE; /* don't repeat */
 }
 
 void screen_show_desktop_popup(guint d, gboolean perm)
 {
     const Rect *a;
+    guint i;
 
     /* 0 means don't show the popup */
     if (!config_desktop_popup_time) return;
 
-    a = screen_physical_area_primary(FALSE);
-    pager_popup_position(desktop_popup, CenterGravity,
-                         a->x + a->width / 2, a->y + a->height / 2);
-    pager_popup_icon_size_multiplier(desktop_popup,
-                                     (screen_desktop_layout.columns /
-                                      screen_desktop_layout.rows) / 2,
-                                     (screen_desktop_layout.rows/
-                                      screen_desktop_layout.columns) / 2);
-    pager_popup_max_width(desktop_popup,
-                          MAX(a->width/3, POPUP_WIDTH));
-    pager_popup_show(desktop_popup, screen_desktop_names[d], d);
-
+    for (i = 0; i < screen_num_monitors; i++) {
+        a = screen_physical_area_monitor(i);
+        pager_popup_position(desktop_popup[i], CenterGravity,
+                             a->x + a->width / 2, a->y + a->height / 2);
+        pager_popup_icon_size_multiplier(desktop_popup[i],
+                                         (screen_desktop_layout.columns /
+                                          screen_desktop_layout.rows) / 2,
+                                         (screen_desktop_layout.rows/
+                                          screen_desktop_layout.columns) / 2);
+        pager_popup_max_width(desktop_popup[i],
+                              MAX(a->width/3, POPUP_WIDTH));
+        pager_popup_show(desktop_popup[i], screen_desktop_names[d], d);
+    }
     if (desktop_popup_timer) g_source_remove(desktop_popup_timer);
     desktop_popup_timer = 0;
     if (!perm && !desktop_popup_perm)
@@ -990,8 +1024,12 @@ void screen_hide_desktop_popup(void)
 {
     if (desktop_popup_timer) g_source_remove(desktop_popup_timer);
     desktop_popup_timer = 0;
-    pager_popup_hide(desktop_popup);
     desktop_popup_perm = FALSE;
+    guint i;
+
+    for (i = 0; i < screen_num_monitors; i++) {
+        pager_popup_hide(desktop_popup[i]);
+    }
 }
 
 guint screen_find_desktop(guint from, ObDirection dir,
@@ -1226,9 +1264,11 @@ void screen_update_desktop_names(void)
     }
 
     /* resize the pager for these names */
-    pager_popup_text_width_to_strings(desktop_popup,
-                                      screen_desktop_names,
-                                      screen_num_desktops);
+    for (i = 0; i < screen_num_monitors; i++) {
+        pager_popup_text_width_to_strings(desktop_popup[i],
+                                          screen_desktop_names,
+                                          screen_num_desktops);
+    }
 }
 
 void screen_show_desktop(ObScreenShowDestopMode show_mode, ObClient *show_only)
@@ -1444,7 +1484,7 @@ static void get_xinerama_screens(Rect **xin_areas, guint *nxin)
 
 void screen_update_areas(void)
 {
-    guint i;
+    guint i, old_num_monitors = screen_num_monitors;
     gulong *dims;
     GList *it, *onscreen;
 
@@ -1457,6 +1497,11 @@ void screen_update_areas(void)
 
     g_free(monitor_area);
     get_xinerama_screens(&monitor_area, &screen_num_monitors);
+    if (screen_num_monitors != old_num_monitors) {
+        if (desktop_popup)
+            desktop_popup_free(old_num_monitors);
+        desktop_popup_new();
+    }
 
     /* set up the user-specified margins */
     config_margins.top_start = RECT_LEFT(monitor_area[screen_num_monitors]);