#include "prop.h"
#include "grab.h"
#include "startupnotify.h"
+#include "moveresize.h"
#include "config.h"
#include "screen.h"
#include "client.h"
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()
{
GSList *it;
guint i;
- desktop_cycle_popup = popup_new(FALSE);
+ desktop_cycle_popup = pager_popup_new(FALSE);
if (!reconfig)
/* get the initial size */
{
Rect **r;
- popup_free(desktop_cycle_popup);
+ pager_popup_free(desktop_cycle_popup);
if (!reconfig) {
XSelectInput(ob_display, RootWindow(ob_display, ob_screen),
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),
/* may be some unnamed desktops that we need to fill in with names */
screen_update_desktop_names();
- /* update the focus lists */
- /* free our lists for the desktops which have disappeared */
- for (i = num; i < old; ++i)
- g_list_free(focus_order[i]);
- /* realloc the array */
- focus_order = g_renew(GList*, focus_order, num);
- /* set the new lists to be empty */
- for (i = old; i < num; ++i)
- focus_order[i] = NULL;
-
/* move windows on desktops that will no longer exist! */
for (it = client_list; it != NULL; it = it->next) {
ObClient *c = it->data;
if (c->desktop >= num && c->desktop != DESKTOP_ALL)
client_set_desktop(c, num - 1, FALSE);
}
-
+
/* change our struts/area to match (after moving windows) */
screen_update_areas();
/* change our desktop if we're on one that no longer exists! */
if (screen_desktop >= screen_num_desktops)
screen_set_desktop(num - 1);
+
+ /* update the focus lists */
+ /* free our lists for the desktops which have disappeared */
+ for (i = num; i < old; ++i)
+ g_list_free(focus_order[i]);
+ /* realloc the array */
+ focus_order = g_renew(GList*, focus_order, num);
+ /* set the new lists to be empty */
+ for (i = old; i < num; ++i)
+ focus_order[i] = NULL;
}
void screen_set_desktop(guint num)
{
GList *it;
guint old;
- XEvent e;
g_assert(num < screen_num_desktops);
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 */
frame_hide(c->frame);
}
}
-
- /* 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)
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);
}
}
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;