/* get the initial size */
screen_resize();
+ screen_num_desktops = 0;
screen_set_num_desktops(4);
+ screen_desktop = 0;
screen_set_desktop(0);
/* don't start in showing-desktop mode */
{
guint i, old;
gulong *viewport;
-
+ GSList *it;
+
g_assert(num > 0);
-
- /* move windows on desktops that will no longer exist! */
- /* XXX
- std::list<Client*>::iterator it, end = clients.end();
- for (it = clients.begin(); it != end; ++it) {
- unsigned int d = (*it)->desktop();
- if (d >= num && d != 0xffffffff) {
- XEvent ce;
- ce.xclient.type = ClientMessage;
- ce.xclient.message_type = otk::Property::atoms.net_wm_desktop;
- ce.xclient.display = **otk::display;
- ce.xclient.window = (*it)->window();
- ce.xclient.format = 32;
- ce.xclient.data.l[0] = num - 1;
- XSendEvent(**otk::display, _info->rootWindow(), false,
- SubstructureNotifyMask | SubstructureRedirectMask, &ce);
- }
- }
- */
old = screen_num_desktops;
screen_num_desktops = num;
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) {
+ Client *c = it->data;
+ if (c->desktop >= num)
+ client_set_desktop(c, num - 1, FALSE);
+ }
+
dispatch_ob(Event_Ob_NumDesktops, num, old);
/* change our desktop if we're on one that no longer exists! */
{
GList *it;
guint old;
+ XEvent e;
g_assert(num < screen_num_desktops);
- g_message("Moving to desktop %u", num);
-
old = screen_desktop;
screen_desktop = num;
PROP_SET32(ob_root, net_current_desktop, cardinal, num);
if (old == num) return;
+ g_message("Moving to desktop %d", num+1);
+
/* show windows before hiding the rest to lessen the enter/leave events */
/* show windows from top to bottom */
engine_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 */
+ XSync(ob_display, FALSE);
+ while (XCheckTypedEvent(ob_display, EnterNotify, &e));
+ focus_fallback(TRUE);
+
dispatch_ob(Event_Ob_Desktop, num, old);
}
g_free(strut);
strut = g_new0(Strut, screen_num_desktops + 1);
- for (it = client_list; it; it = it->next) {
+ for (it = client_list; it != NULL; it = it->next) {
Client *c = it->data;
if (c->iconic) continue; /* these dont count in the strut */