CopyFromParent, InputOutput,
CopyFromParent,
CWOverrideRedirect, &attrib);
- XMapRaised(ob_display, screen_support_win);
+ XMapWindow(ob_display, screen_support_win);
if (!replace_wm()) {
XDestroyWindow(ob_display, screen_support_win);
screen_num_desktops = 0;
screen_set_num_desktops(config_desktops_num);
if (!reconfig) {
- screen_set_desktop(MIN(config_screen_firstdesk, screen_num_desktops)
- - 1);
+ guint32 d;
+ /* start on the current desktop when a wm was already running */
+ if (PROP_GET32(RootWindow(ob_display, ob_screen),
+ net_current_desktop, cardinal, &d) &&
+ d < screen_num_desktops)
+ {
+ screen_set_desktop(d);
+ } else
+ screen_set_desktop(MIN(config_screen_firstdesk,
+ screen_num_desktops) - 1);
/* don't start in showing-desktop mode */
screen_showing_desktop = FALSE;
/* show windows before hiding the rest to lessen the enter/leave events */
- /* show windows from top to bottom */
+ /* show/hide windows from top to bottom */
for (it = stacking_list; it; it = g_list_next(it)) {
if (WINDOW_IS_CLIENT(it->data)) {
ObClient *c = it->data;
- client_showhide(c);
+ client_show(c);
}
}
for (it = g_list_last(stacking_list); it; it = g_list_previous(it)) {
if (WINDOW_IS_CLIENT(it->data)) {
ObClient *c = it->data;
- client_showhide(c);
+ client_hide(c);
}
}
frame_adjust_focus(focus_hilite->frame, TRUE);
/*!
- When this focus_client check is not used, you can end up with races,
- as demonstrated with gnome-panel, sometmies the window you click on
- another desktop ends up losing focus cuz of the focus change here.
+ When this focus_client check is not used, you can end up with
+ races, as demonstrated with gnome-panel, sometimes the window
+ you click on another desktop ends up losing focus cuz of the
+ focus change here.
*/
/*if (!focus_client)*/
client_focus(focus_hilite);
break;
}
} else {
- focus_fallback(TRUE);
+ /* use NULL for the "old" argument because the desktop was focused
+ and we don't want to fallback to the desktop by default */
+ focus_hilite = focus_fallback_target(TRUE, NULL);
+ if (focus_hilite) {
+ frame_adjust_focus(focus_hilite->frame, TRUE);
+
+ /*!
+ When this focus_client check is not used, you can end up with
+ races, as demonstrated with gnome-panel, sometimes the window
+ you click on another desktop ends up losing focus cuz of the
+ focus change here.
+ */
+ /*if (!focus_client)*/
+ client_focus(focus_hilite);
+ }
}
show = !!show; /* make it boolean */