X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fscreen.c;h=a9a4dd0550a0105a79b797f09e41ac8ce13edce6;hb=7582194997541c831f10a7097ca11be5fb56e453;hp=d37288fa8da3ad2b784e9e4f7361b7259b442474;hpb=35dd3065a93bfed213bc7b8602d945b93f7edfb4;p=chaz%2Fopenbox diff --git a/openbox/screen.c b/openbox/screen.c index d37288fa..a9a4dd05 100644 --- a/openbox/screen.c +++ b/openbox/screen.c @@ -74,6 +74,8 @@ static gboolean replace_wm() g_free(wm_sn); current_wm_sn_owner = XGetSelectionOwner(ob_display, wm_sn_atom); + if (current_wm_sn_owner == screen_support_win) + current_wm_sn_owner = None; if (current_wm_sn_owner) { if (!ob_replace_wm) { g_warning("A window manager is already running on screen %d", @@ -438,16 +440,16 @@ void screen_set_desktop(guint num) /* show windows before hiding the rest to lessen the enter/leave events */ /* show windows from top to bottom */ - for (it = stacking_list; it != NULL; it = it->next) { + for (it = stacking_list; it; it = g_list_next(it)) { if (WINDOW_IS_CLIENT(it->data)) { ObClient *c = it->data; - if (!c->frame->visible && client_should_show(c)) + if (client_should_show(c)) frame_show(c->frame); } } /* hide windows from bottom to top */ - for (it = g_list_last(stacking_list); it != NULL; it = it->prev) { + for (it = g_list_last(stacking_list); it; it = g_list_previous(it)) { if (WINDOW_IS_CLIENT(it->data)) { ObClient *c = it->data; if (c->frame->visible && !client_should_show(c)) @@ -457,7 +459,18 @@ void screen_set_desktop(guint num) event_ignore_queued_enters(); - focus_fallback(OB_FOCUS_FALLBACK_NOFOCUS); + focus_hilite = focus_fallback_target(OB_FOCUS_FALLBACK_NOFOCUS); + 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, sometmies the window you click on + another desktop ends up losing focus cuz of the focus change here. + */ + /*if (!focus_client)*/ + client_focus(focus_hilite); + } } static void get_row_col(guint d, guint *r, guint *c) @@ -568,7 +581,7 @@ static guint translate_row_col(guint r, guint c) return 0; } -static void popup_cycle(guint d, gboolean show) +void screen_desktop_popup(guint d, gboolean show) { Rect *a; @@ -633,49 +646,81 @@ guint screen_cycle_desktop(ObDirection dir, gboolean wrap, gboolean linear, case OB_DIRECTION_EAST: ++c; if (c >= screen_desktop_layout.columns) { - if (!wrap) return d = screen_desktop; - c = 0; + if (wrap) { + c = 0; + } else { + d = screen_desktop; + goto show_cycle_dialog; + } } d = translate_row_col(r, c); if (d >= screen_num_desktops) { - if (!wrap) return d = screen_desktop; - ++c; + if (wrap) { + ++c; + } else { + d = screen_desktop; + goto show_cycle_dialog; + } } break; case OB_DIRECTION_WEST: --c; if (c >= screen_desktop_layout.columns) { - if (!wrap) return d = screen_desktop; - c = screen_desktop_layout.columns - 1; + if (wrap) { + c = screen_desktop_layout.columns - 1; + } else { + d = screen_desktop; + goto show_cycle_dialog; + } } d = translate_row_col(r, c); if (d >= screen_num_desktops) { - if (!wrap) return d = screen_desktop; - --c; + if (wrap) { + --c; + } else { + d = screen_desktop; + goto show_cycle_dialog; + } } break; case OB_DIRECTION_SOUTH: ++r; if (r >= screen_desktop_layout.rows) { - if (!wrap) return d = screen_desktop; - r = 0; + if (wrap) { + r = 0; + } else { + d = screen_desktop; + goto show_cycle_dialog; + } } d = translate_row_col(r, c); if (d >= screen_num_desktops) { - if (!wrap) return d = screen_desktop; - ++r; + if (wrap) { + ++r; + } else { + d = screen_desktop; + goto show_cycle_dialog; + } } break; case OB_DIRECTION_NORTH: --r; if (r >= screen_desktop_layout.rows) { - if (!wrap) return d = screen_desktop; - r = screen_desktop_layout.rows - 1; + if (wrap) { + r = screen_desktop_layout.rows - 1; + } else { + d = screen_desktop; + goto show_cycle_dialog; + } } d = translate_row_col(r, c); if (d >= screen_num_desktops) { - if (!wrap) return d = screen_desktop; - --r; + if (wrap) { + --r; + } else { + d = screen_desktop; + goto show_cycle_dialog; + } } break; default: @@ -686,15 +731,16 @@ guint screen_cycle_desktop(ObDirection dir, gboolean wrap, gboolean linear, d = translate_row_col(r, c); } +show_cycle_dialog: if (dialog) { - popup_cycle(d, TRUE); + screen_desktop_popup(d, TRUE); return d; } done_cycle: first = TRUE; - popup_cycle(0, FALSE); + screen_desktop_popup(0, FALSE); return d; } @@ -821,23 +867,23 @@ void screen_show_desktop(gboolean show) screen_showing_desktop = show; if (show) { - /* bottom to top */ - for (it = g_list_last(stacking_list); it != NULL; it = it->prev) { + /* bottom to top */ + for (it = g_list_last(stacking_list); it != NULL; it = it->prev) { if (WINDOW_IS_CLIENT(it->data)) { ObClient *client = it->data; if (client->frame->visible && !client_should_show(client)) frame_hide(client->frame); } - } + } } else { /* top to bottom */ - for (it = stacking_list; it != NULL; it = it->next) { + for (it = stacking_list; it != NULL; it = it->next) { if (WINDOW_IS_CLIENT(it->data)) { ObClient *client = it->data; if (!client->frame->visible && client_should_show(client)) frame_show(client->frame); } - } + } } if (show) { @@ -860,10 +906,10 @@ void screen_install_colormap(ObClient *client, gboolean install) XWindowAttributes wa; if (client == NULL) { - if (install) - XInstallColormap(RrDisplay(ob_rr_inst), RrColormap(ob_rr_inst)); - else - XUninstallColormap(RrDisplay(ob_rr_inst), RrColormap(ob_rr_inst)); + if (install) + XInstallColormap(RrDisplay(ob_rr_inst), RrColormap(ob_rr_inst)); + else + XUninstallColormap(RrDisplay(ob_rr_inst), RrColormap(ob_rr_inst)); } else { if (XGetWindowAttributes(ob_display, client->window, &wa) && wa.colormap != None) {