X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fscreen.c;h=e5640256689949044a8c9f7b02dfda77b5043746;hb=c1b2fc5324522f74a14a5cfa210c95e1509a6e7f;hp=656206bf712d94420821126f69a85564112ba1d4;hpb=50d70283347236df2ce43718c73b0568067b9629;p=chaz%2Fopenbox

diff --git a/openbox/screen.c b/openbox/screen.c
index 656206bf..e5640256 100644
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -5,6 +5,7 @@
 #include "prop.h"
 #include "grab.h"
 #include "startupnotify.h"
+#include "moveresize.h"
 #include "config.h"
 #include "screen.h"
 #include "client.h"
@@ -40,7 +41,7 @@ Window   screen_support_win;
 static Rect  **area; /* array of desktop holding array of xinerama areas */
 static Rect  *monitor_area;
 
-static Popup *desktop_cycle_popup;
+static ObPagerPopup *desktop_cycle_popup;
 
 static gboolean replace_wm()
 {
@@ -251,7 +252,7 @@ void screen_startup(gboolean reconfig)
     GSList *it;
     guint i;
 
-    desktop_cycle_popup = popup_new(FALSE);
+    desktop_cycle_popup = pager_popup_new(FALSE);
 
     if (!reconfig)
         /* get the initial size */
@@ -287,7 +288,7 @@ void screen_shutdown(gboolean reconfig)
 {
     Rect **r;
 
-    popup_free(desktop_cycle_popup);
+    pager_popup_free(desktop_cycle_popup);
 
     if (!reconfig) {
         XSelectInput(ob_display, RootWindow(ob_display, ob_screen),
@@ -349,6 +350,8 @@ void screen_set_num_desktops(guint num)
 
     g_assert(num > 0);
 
+    if (screen_num_desktops == num) return;
+
     old = screen_num_desktops;
     screen_num_desktops = num;
     PROP_SET32(RootWindow(ob_display, ob_screen),
@@ -395,7 +398,6 @@ void screen_set_desktop(guint num)
 {
     GList *it;
     guint old;
-    XEvent e;
      
     g_assert(num < screen_num_desktops);
 
@@ -410,6 +412,9 @@ void screen_set_desktop(guint num)
 
     ob_debug("Moving to desktop %d\n", num+1);
 
+    if (moveresize_client)
+        client_set_desktop(moveresize_client, num, TRUE);
+
     /* show windows before hiding the rest to lessen the enter/leave events */
 
     /* show windows from top to bottom */
@@ -429,18 +434,6 @@ void screen_set_desktop(guint num)
                 frame_hide(c->frame);
         }
     }
-
-    XSync(ob_display, FALSE);
-    /* focus the last focused window on the desktop, and ignore enter events
-       from the switch so it doesnt mess with the focus */
-    while (XCheckTypedEvent(ob_display, EnterNotify, &e));
-#ifdef DEBUG_FOCUS
-    ob_debug("switch fallback\n");
-#endif
-    focus_fallback(OB_FOCUS_FALLBACK_DESKTOP);
-#ifdef DEBUG_FOCUS
-    ob_debug("/switch fallback\n");
-#endif
 }
 
 static void get_row_col(guint d, guint *r, guint *c)
@@ -556,19 +549,18 @@ static void popup_cycle(guint d, gboolean show)
     Rect *a;
 
     if (!show) {
-        popup_hide(desktop_cycle_popup);
+        pager_popup_hide(desktop_cycle_popup);
     } else {
         a = screen_physical_area_monitor(0);
-        popup_position(desktop_cycle_popup, CenterGravity,
-                       a->x + a->width / 2, a->y + a->height / 2);
+        pager_popup_position(desktop_cycle_popup, CenterGravity,
+                             a->x + a->width / 2, a->y + a->height / 2);
         /* XXX the size and the font extents need to be related on some level
          */
-        popup_size(desktop_cycle_popup, POPUP_WIDTH, POPUP_HEIGHT);
+        pager_popup_size(desktop_cycle_popup, POPUP_WIDTH, POPUP_HEIGHT);
 
-        popup_set_text_align(desktop_cycle_popup, RR_JUSTIFY_CENTER);
+        pager_popup_set_text_align(desktop_cycle_popup, RR_JUSTIFY_CENTER);
 
-        popup_show(desktop_cycle_popup,
-                   screen_desktop_names[d], NULL);
+        pager_popup_show(desktop_cycle_popup, screen_desktop_names[d], d);
     }
 }
 
@@ -719,31 +711,39 @@ void screen_update_layout()
                     goto screen_update_layout_bail;
             }
 
+            cols = data[1];
+            rows = data[2];
+
             /* fill in a zero rows/columns */
-            if ((data[1] == 0 && data[2] == 0) || /* both 0's is bad data.. */
-                (data[1] != 0 && data[2] != 0)) { /* no 0's is bad data.. */
+            if ((cols == 0 && rows == 0)) { /* both 0's is bad data.. */
                 goto screen_update_layout_bail;
             } else {
-                if (data[1] == 0) {
-                    data[1] = (screen_num_desktops +
-                               screen_num_desktops % data[2]) / data[2];
-                } else if (data[2] == 0) {
-                    data[2] = (screen_num_desktops +
-                               screen_num_desktops % data[1]) / data[1];
+                if (cols == 0) {
+                    cols = screen_num_desktops / rows;
+                    if (rows * cols < screen_num_desktops)
+                        cols++;
+                    if (rows * cols >= screen_num_desktops + cols)
+                        rows--;
+                } else if (rows == 0) {
+                    rows = screen_num_desktops / rows;
+                    if (cols * rows < screen_num_desktops)
+                        rows++;
+                    if (cols * rows >= screen_num_desktops + rows)
+                        cols--;
                 }
-                cols = data[1];
-                rows = data[2];
             }
 
             /* bounds checking */
             if (orient == OB_ORIENTATION_HORZ) {
-                rows = MIN(rows, screen_num_desktops);
-                cols = MIN(cols, ((screen_num_desktops +
-                                     (screen_num_desktops % rows)) / rows));
+                cols = MIN(screen_num_desktops, cols);
+                rows = MIN(rows, (screen_num_desktops + cols - 1) / cols);
+                cols = screen_num_desktops / rows +
+                    !!(screen_num_desktops % rows);
             } else {
-                cols = MIN(cols, screen_num_desktops);
-                rows = MIN(rows, ((screen_num_desktops +
-                                     (screen_num_desktops % cols)) / cols));
+                rows = MIN(screen_num_desktops, rows);
+                cols = MIN(cols, (screen_num_desktops + rows - 1) / rows);
+                rows = screen_num_desktops / cols +
+                    !!(screen_num_desktops % cols);
             }
 
             valid = TRUE;