X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus.c;h=a4626bf83af64c900efafb1d45c3695fca832cf3;hb=HEAD;hp=0f399be73e02a21e2817df2ec8fe4ea570a21b17;hpb=7cf4c970ae89f06aa77345900f96a310400c8595;p=chaz%2Fopenbox diff --git a/openbox/focus.c b/openbox/focus.c index 0f399be7..a4626bf8 100644 --- a/openbox/focus.c +++ b/openbox/focus.c @@ -23,12 +23,13 @@ #include "grab.h" #include "client.h" #include "config.h" +#include "group.h" #include "focus_cycle.h" #include "screen.h" -#include "prop.h" #include "keyboard.h" #include "focus.h" #include "stacking.h" +#include "obt/prop.h" #include #include @@ -51,11 +52,19 @@ void focus_shutdown(gboolean reconfig) if (reconfig) return; /* reset focus to root */ - XSetInputFocus(ob_display, PointerRoot, RevertToNone, CurrentTime); + XSetInputFocus(obt_display, PointerRoot, RevertToNone, CurrentTime); } static void push_to_top(ObClient *client) { + ObClient *p; + + /* if it is modal for a single window, then put that window at the top + of the focus order first, so it will be right after ours. the same is + done with stacking */ + if (client->modal && (p = client_direct_parent(client))) + push_to_top(p); + focus_order = g_list_remove(focus_order, client); focus_order = g_list_prepend(focus_order, client); } @@ -65,7 +74,7 @@ void focus_set_client(ObClient *client) Window active; ob_debug_type(OB_DEBUG_FOCUS, - "focus_set_client 0x%lx\n", client ? client->window : 0); + "focus_set_client 0x%lx", client ? client->window : 0); if (focus_client == client) return; @@ -74,9 +83,6 @@ void focus_set_client(ObClient *client) screen_install_colormap(focus_client, FALSE); screen_install_colormap(client, TRUE); - /* in the middle of cycling..? kill it. */ - focus_cycle_stop(); - focus_client = client; if (client != NULL) { @@ -84,76 +90,65 @@ void focus_set_client(ObClient *client) push_to_top(client); /* remove hiliting from the window when it gets focused */ client_hilite(client, FALSE); + + /* make sure the focus cycle popup shows things in the right order */ + focus_cycle_reorder(); } /* set the NET_ACTIVE_WINDOW hint, but preserve it on shutdown */ if (ob_state() != OB_STATE_EXITING) { active = client ? client->window : None; - PROP_SET32(RootWindow(ob_display, ob_screen), - net_active_window, window, active); + OBT_PROP_SET32(obt_root(ob_screen), NET_ACTIVE_WINDOW, WINDOW, active); } + + /* when focus is moved to a new window, the last_user_time timestamp would + no longer be valid, as it applies for the focused window */ + event_reset_user_time(); } -static ObClient* focus_fallback_target(gboolean allow_refocus, ObClient *old, - gboolean send_focus) +static ObClient* focus_fallback_target(gboolean allow_refocus, + gboolean allow_pointer, + gboolean allow_omnipresent, + ObClient *old) { GList *it; ObClient *c; - ob_debug_type(OB_DEBUG_FOCUS, "trying pointer stuff\n"); - if (config_focus_follow && !config_focus_last) + ob_debug_type(OB_DEBUG_FOCUS, "trying pointer stuff"); + if (allow_pointer && config_focus_follow) if ((c = client_under_pointer()) && - (allow_refocus || c != old) && - client_normal(c) && - /* if we're sending focus then try to */ - ((send_focus && client_focus(c)) || - /* if not just see if we could try, or it's already focused */ - (!send_focus && (c == old || client_can_focus(c))))) + (allow_refocus || client_focus_target(c) != old) && + (client_normal(c) && + client_focus(c))) { - ob_debug_type(OB_DEBUG_FOCUS, "found in pointer stuff (%d)\n", - send_focus); + ob_debug_type(OB_DEBUG_FOCUS, "found in pointer stuff"); return c; } - ob_debug_type(OB_DEBUG_FOCUS, "trying omnipresentness\n"); - if (allow_refocus && old && - old->desktop == DESKTOP_ALL && - client_normal(old) && - /* this one is only for when not sending focus, to keep it there */ - !send_focus) - { - ob_debug_type(OB_DEBUG_FOCUS, "found in omnipresentness (%d)\n", - send_focus); - return old; - } - - - ob_debug_type(OB_DEBUG_FOCUS, "trying the focus order\n"); + ob_debug_type(OB_DEBUG_FOCUS, "trying the focus order"); for (it = focus_order; it; it = g_list_next(it)) { c = it->data; /* fallback focus to a window if: 1. it is on the current desktop. this ignores omnipresent - windows, which are problematic in their own rite. - 2. it is a normal type window, don't fall back onto a dock or - a splashscreen or a desktop window (save the desktop as a - backup fallback though) + windows, which are problematic in their own rite, unless they are + specifically allowed + 2. it is a valid auto-focus target + 3. it is not shaded */ - if (c->desktop == screen_desktop && - client_normal(c) && - (allow_refocus || c != old) && - /* if we're sending focus then try to */ - ((send_focus && client_focus(c)) || - /* if not just see if we could try, or it's already focused */ - (!send_focus && (c == old || client_can_focus(c))))) + if ((allow_omnipresent || c->desktop == screen_desktop) && + focus_valid_target(c, screen_desktop, + TRUE, FALSE, FALSE, TRUE, FALSE, FALSE, + FALSE) && + !c->shaded && + (allow_refocus || client_focus_target(c) != old) && + client_focus(c)) { - ob_debug_type(OB_DEBUG_FOCUS, "found in focus order (%d) 0x%x " - "from 0x%x\n", - send_focus, c, old); + ob_debug_type(OB_DEBUG_FOCUS, "found in focus order"); return c; } } - ob_debug_type(OB_DEBUG_FOCUS, "trying a desktop window\n"); + ob_debug_type(OB_DEBUG_FOCUS, "trying a desktop window"); for (it = focus_order; it; it = g_list_next(it)) { c = it->data; /* fallback focus to a window if: @@ -163,15 +158,12 @@ static ObClient* focus_fallback_target(gboolean allow_refocus, ObClient *old, a splashscreen or a desktop window (save the desktop as a backup fallback though) */ - if (c->type == OB_CLIENT_TYPE_DESKTOP && - (allow_refocus || c != old) && - /* if we're sending focus then try to */ - ((send_focus && client_focus(c)) || - /* if not just see if we could try, or it's already focused */ - (!send_focus && (c == old || client_can_focus(c))))) + if (focus_valid_target(c, screen_desktop, + TRUE, FALSE, FALSE, TRUE, FALSE, TRUE, FALSE) && + (allow_refocus || client_focus_target(c) != old) && + client_focus(c)) { - ob_debug_type(OB_DEBUG_FOCUS, "found a desktop window (%d)\n", - send_focus); + ob_debug_type(OB_DEBUG_FOCUS, "found a desktop window"); return c; } } @@ -179,53 +171,64 @@ static ObClient* focus_fallback_target(gboolean allow_refocus, ObClient *old, return NULL; } -ObClient* focus_fallback(gboolean allow_refocus) +ObClient* focus_fallback(gboolean allow_refocus, gboolean allow_pointer, + gboolean allow_omnipresent, gboolean focus_lost) { ObClient *new; ObClient *old = focus_client; - new = focus_fallback_target(allow_refocus, old, FALSE); - if (new == old) return; - /* unfocus any focused clients.. they can be focused by Pointer events and such, and then when we try focus them, we won't get a FocusIn event at all for them. */ - focus_nothing(); + if (focus_lost) + focus_nothing(); - new = focus_fallback_target(allow_refocus, old, TRUE); + new = focus_fallback_target(allow_refocus, allow_pointer, + allow_omnipresent, old); + /* get what was really focused */ + if (new) new = client_focus_target(new); return new; } -void focus_nothing() +void focus_nothing(void) { - /* Install our own colormap */ - if (focus_client != NULL) { - screen_install_colormap(focus_client, FALSE); - screen_install_colormap(NULL, TRUE); - } - /* nothing is focused, update the colormap and _the root property_ */ focus_set_client(NULL); - /* if there is a grab going on, then we need to cancel it. if we move - focus during the grab, applications will get NotifyWhileGrabbed events - and ignore them ! + /* when nothing will be focused, send focus to the backup target */ + XSetInputFocus(obt_display, screen_support_win, RevertToPointerRoot, + event_time()); +} - actions should not rely on being able to move focus during an - interactive grab. - */ - if (keyboard_interactively_grabbed()) - keyboard_interactive_cancel(); +void focus_order_add_new(ObClient *c) +{ + if (c->iconic) + focus_order_to_top(c); + else { + g_assert(!g_list_find(focus_order, c)); + /* if there are only iconic windows, put this above them in the order, + but if there are not, then put it under the currently focused one */ + if (focus_order && ((ObClient*)focus_order->data)->iconic) + focus_order = g_list_insert(focus_order, c, 0); + else + focus_order = g_list_insert(focus_order, c, 1); + } - /* when nothing will be focused, send focus to the backup target */ - XSetInputFocus(ob_display, screen_support_win, RevertToPointerRoot, - event_curtime); + focus_cycle_addremove(c, TRUE); } void focus_order_remove(ObClient *c) { focus_order = g_list_remove(focus_order, c); + + focus_cycle_addremove(c, TRUE); +} + +void focus_order_like_new(struct _ObClient *c) +{ + focus_order = g_list_remove(focus_order, c); + focus_order_add_new(c); } void focus_order_to_top(ObClient *c) @@ -241,6 +244,8 @@ void focus_order_to_top(ObClient *c) it && !((ObClient*)it->data)->iconic; it = g_list_next(it)); focus_order = g_list_insert_before(focus_order, it, c); } + + focus_cycle_reorder(); } void focus_order_to_bottom(ObClient *c) @@ -256,6 +261,8 @@ void focus_order_to_bottom(ObClient *c) it && !((ObClient*)it->data)->iconic; it = g_list_next(it)); focus_order = g_list_insert_before(focus_order, it, c); } + + focus_cycle_reorder(); } ObClient *focus_order_find_first(guint desktop) @@ -268,3 +275,115 @@ ObClient *focus_order_find_first(guint desktop) } return NULL; } + +/*! Returns if a focus target has valid group siblings that can be cycled + to in its place */ +static gboolean focus_target_has_siblings(ObClient *ft, + gboolean iconic_windows, + gboolean all_desktops) + +{ + GSList *it; + + if (!ft->group) return FALSE; + + for (it = ft->group->members; it; it = g_slist_next(it)) { + ObClient *c = it->data; + /* check that it's not a helper window to avoid infinite recursion */ + if (c != ft && c->type == OB_CLIENT_TYPE_NORMAL && + focus_valid_target(c, screen_desktop, + TRUE, iconic_windows, all_desktops, + TRUE, FALSE, FALSE, FALSE)) + { + return TRUE; + } + } + return FALSE; +} + +gboolean focus_valid_target(ObClient *ft, + guint desktop, + gboolean helper_windows, + gboolean iconic_windows, + gboolean all_desktops, + gboolean nonhilite_windows, + gboolean dock_windows, + gboolean desktop_windows, + gboolean user_request) +{ + /* NOTE: if any of these things change on a client, then they should call + focus_cycle_addremove() to make sure the client is not shown/hidden + when it should not be */ + + gboolean ok = FALSE; + + /* see if the window is still managed or is going away */ + if (!ft->managed) return FALSE; + + /* it's on this desktop unless you want all desktops. + + do this check first because it will usually filter out the most + windows */ + ok = (all_desktops || ft->desktop == desktop || + ft->desktop == DESKTOP_ALL); + + /* if we only include hilited windows, check if the window is */ + ok = ok && (nonhilite_windows || ft->demands_attention); + + /* the window can receive focus somehow */ + ok = ok && (ft->can_focus || ft->focus_notify); + + /* the window is not iconic, or we're allowed to go to iconic ones */ + ok = ok && (iconic_windows || !ft->iconic); + + /* it's the right type of window */ + if (dock_windows || desktop_windows) + ok = ok && ((dock_windows && ft->type == OB_CLIENT_TYPE_DOCK) || + (desktop_windows && ft->type == OB_CLIENT_TYPE_DESKTOP)); + /* modal windows are important and can always get focus if they are + visible and stuff, so don't change 'ok' based on their type */ + else if (!ft->modal) + /* normal non-helper windows are valid targets */ + ok = ok && + ((client_normal(ft) && !client_helper(ft)) + || + /* helper windows are valid targets if... */ + (client_helper(ft) && + /* ...a window in its group already has focus and we want to + include helper windows ... */ + ((focus_client && ft->group == focus_client->group && + helper_windows) || + /* ... or if there are no other windows in its group + that can be focused instead */ + !focus_target_has_siblings(ft, iconic_windows, all_desktops)))); + + /* it's not set to skip the taskbar (but this is overridden if the + window is modal or if the user asked for this window to be focused, + or if the window is iconified (and does not have any parents with + which to uniconify it), and it is not used for windows which are + hilited, or dialog windows as these need user interaction and should + not be long-lasting windows */ + ok = ok && (!ft->skip_taskbar || + (ft->modal || user_request || + (ft->iconic && !ft->parents) || + ft->demands_attention || + ft->type == OB_CLIENT_TYPE_DIALOG)); + + /* it's not going to just send focus off somewhere else (modal window), + unless that modal window is not one of our valid targets, then let + you choose this window and bring the modal one here */ + { + ObClient *cft = client_focus_target(ft); + ok = ok && (ft == cft || !focus_valid_target(cft, + screen_desktop, + TRUE, + iconic_windows, + all_desktops, + nonhilite_windows, + dock_windows, + desktop_windows, + FALSE)); + } + + return ok; +}