Merge branch 'backport' into work

[mikachu/openbox.git] / openbox / screen.c

diff --git a/openbox/screen.c b/openbox/screen.c
index 5050a68..5074f18 100644 (file)
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -77,6 +77,7 @@ static GSList *struts_right = NULL;
 static GSList *struts_bottom = NULL;
 
 static ObPagerPopup *desktop_popup;
+static gboolean      desktop_popup_perm;
 
 /*! The number of microseconds that you need to be on a desktop before it will
   replace the remembered "last desktop" */
@@ -347,6 +348,7 @@ void screen_startup(gboolean reconfig)
     gboolean namesexist = FALSE;
 
     desktop_popup = pager_popup_new();
+    desktop_popup_perm = FALSE;
     pager_popup_height(desktop_popup, POPUP_HEIGHT);
 
     if (reconfig) {
@@ -677,7 +679,7 @@ void screen_set_desktop(guint num, gboolean dofocus)
     ob_debug("Moving to desktop %d", num+1);
 
     if (ob_state() == OB_STATE_RUNNING)
-        screen_show_desktop_popup(screen_desktop);
+        screen_show_desktop_popup(screen_desktop, FALSE);
 
     /* ignore enter events caused by the move */
     ignore_start = event_start_ignore_all_enters();
@@ -701,8 +703,7 @@ void screen_set_desktop(guint num, gboolean dofocus)
     for (it = g_list_last(stacking_list); it; it = g_list_previous(it)) {
         if (WINDOW_IS_CLIENT(it->data)) {
             ObClient *c = it->data;
-            client_hide(c);
-            if (c == focus_client) {
+            if (client_hide(c) && c == focus_client) {
                 /* c was focused and we didn't do fallback clearly so make sure
                    openbox doesnt still consider the window focused.
                    this happens when using NextWindow with allDesktops, since
@@ -922,7 +923,7 @@ static gboolean hide_desktop_popup_func(gpointer data)
     return FALSE; /* don't repeat */
 }
 
-void screen_show_desktop_popup(guint d)
+void screen_show_desktop_popup(guint d, gboolean perm)
 {
     Rect *a;
 
@@ -942,9 +943,13 @@ void screen_show_desktop_popup(guint d)
     pager_popup_show(desktop_popup, screen_desktop_names[d], d);
 
     obt_main_loop_timeout_remove(ob_main_loop, hide_desktop_popup_func);
-    obt_main_loop_timeout_add(ob_main_loop, config_desktop_popup_time * 1000,
-                              hide_desktop_popup_func, desktop_popup,
-                              g_direct_equal, NULL);
+    if (!perm && !desktop_popup_perm)
+        /* only hide if its not already being show permanently */
+        obt_main_loop_timeout_add(ob_main_loop,
+                                  config_desktop_popup_time * 1000,
+                                  hide_desktop_popup_func, desktop_popup,
+                                  g_direct_equal, NULL);
+
     g_free(a);
 }
 
@@ -953,6 +958,7 @@ void screen_hide_desktop_popup(void)
     obt_main_loop_timeout_remove_data(ob_main_loop, hide_desktop_popup_func,
                                       desktop_popup, FALSE);
     pager_popup_hide(desktop_popup);
+    desktop_popup_perm = FALSE;
 }
 
 guint screen_find_desktop(guint from, ObDirection dir,
@@ -1346,10 +1352,9 @@ static void get_xinerama_screens(Rect **xin_areas, guint *nxin)
 
 void screen_update_areas(void)
 {
-    guint j;
+    guint i;
     gulong *dims;
     GList *it;
-    GSList *sit;
 
     g_free(monitor_area);
     get_xinerama_screens(&monitor_area, &screen_num_monitors);
@@ -1364,8 +1369,6 @@ void screen_update_areas(void)
     config_margins.right_start = RECT_TOP(monitor_area[screen_num_monitors]);
     config_margins.right_end = RECT_BOTTOM(monitor_area[screen_num_monitors]);
 
-    dims = g_new(gulong, 4 * screen_num_desktops);
-
     RESET_STRUT_LIST(struts_left);
     RESET_STRUT_LIST(struts_top);
     RESET_STRUT_LIST(struts_right);
@@ -1410,48 +1413,14 @@ void screen_update_areas(void)
     VALIDATE_STRUTS(struts_bottom, bottom,
                     monitor_area[screen_num_monitors].height / 2);
 
-    /* set up the work area to be full screen across all monitors */
-    for (j = 0; j < screen_num_desktops; ++j) {
-        dims[j*4 + 0] =
-            monitor_area[screen_num_monitors].x;
-        dims[j*4 + 1] =
-            monitor_area[screen_num_monitors].y;
-        dims[j*4 + 2] =
-            monitor_area[screen_num_monitors].width;
-        dims[j*4 + 3] =
-            monitor_area[screen_num_monitors].height;
-    }
-
-    /* calculate the work area from the struts */
-    for (j = 0; j < screen_num_desktops; ++j) {
-        gint l = 0, r = 0, t = 0, b = 0;
-
-        for (sit = struts_left; sit; sit = g_slist_next(sit)) {
-            ObScreenStrut *s = sit->data;
-            if (s->desktop == j || s->desktop == DESKTOP_ALL)
-                l = MAX(l, s->strut->left);
-        }
-        for (sit = struts_top; sit; sit = g_slist_next(sit)) {
-            ObScreenStrut *s = sit->data;
-            if (s->desktop == j || s->desktop == DESKTOP_ALL)
-                t = MAX(t, s->strut->top);
-        }
-        for (sit = struts_right; sit; sit = g_slist_next(sit)) {
-            ObScreenStrut *s = sit->data;
-            if (s->desktop == j || s->desktop == DESKTOP_ALL)
-                r = MAX(r, s->strut->right);
-        }
-        for (sit = struts_bottom; sit; sit = g_slist_next(sit)) {
-            ObScreenStrut *s = sit->data;
-            if (s->desktop == j || s->desktop == DESKTOP_ALL)
-                b = MAX(b, s->strut->bottom);
-        }
-
-        /* based on these margins, set the work area for the desktop */
-        dims[j*4 + 0] += l;
-        dims[j*4 + 1] += t;
-        dims[j*4 + 2] -= l + r;
-        dims[j*4 + 3] -= t + b;
+    dims = g_new(gulong, 4 * screen_num_desktops);
+    for (i = 0; i < screen_num_desktops; ++i) {
+        Rect *area = screen_area(i, SCREEN_AREA_ALL_MONITORS, NULL);
+        dims[i*4+0] = area->x;
+        dims[i*4+1] = area->y;
+        dims[i*4+2] = area->width;
+        dims[i*4+3] = area->height;
+        g_free(area);
     }
 
     /* set the legacy workarea hint to the union of all the monitors */