X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus.c;h=e88b68882f3dc204be7897087a51337190bce97f;hb=6d2650263193aaa7e94b29261c6ba249c0be3fd3;hp=b473686aea5a49b970e76dc303436c0502a41cd5;hpb=cc2ad0a823a918e826c7cf77f0b61e63c21910c3;p=chaz%2Fopenbox diff --git a/openbox/focus.c b/openbox/focus.c index b473686a..e88b6888 100644 --- a/openbox/focus.c +++ b/openbox/focus.c @@ -28,6 +28,7 @@ #include "screen.h" #include "group.h" #include "prop.h" +#include "keyboard.h" #include "focus.h" #include "stacking.h" #include "popup.h" @@ -37,7 +38,7 @@ #include #include -#define FOCUS_INDICATOR_WIDTH 5 +#define FOCUS_INDICATOR_WIDTH 6 ObClient *focus_client = NULL; GList *focus_order = NULL; @@ -57,8 +58,9 @@ static ObIconPopup *focus_cycle_popup; static gboolean valid_focus_target(ObClient *ft, gboolean all_desktops, - gboolean dock_windows); -static void focus_cycle_destructor(ObClient *client, gpointer data); + gboolean dock_windows, + gboolean desktop_windows); +static void focus_cycle_destroy_notify(ObClient *client, gpointer data); static Window createWindow(Window parent, gulong mask, XSetWindowAttributes *attrib) @@ -76,7 +78,7 @@ void focus_startup(gboolean reconfig) if (!reconfig) { XSetWindowAttributes attr; - client_add_destructor(focus_cycle_destructor, NULL); + client_add_destroy_notify(focus_cycle_destroy_notify, NULL); /* start with nothing focused */ focus_nothing(); @@ -129,7 +131,7 @@ void focus_shutdown(gboolean reconfig) icon_popup_free(focus_cycle_popup); if (!reconfig) { - client_remove_destructor(focus_cycle_destructor); + client_remove_destroy_notify(focus_cycle_destroy_notify); /* reset focus to root */ XSetInputFocus(ob_display, PointerRoot, RevertToNone, CurrentTime); @@ -158,6 +160,9 @@ void focus_set_client(ObClient *client) ob_debug_type(OB_DEBUG_FOCUS, "focus_set_client 0x%lx\n", client ? client->window : 0); + if (focus_client == client) + return; + /* uninstall the old colormap, and install the new one */ screen_install_colormap(focus_client, FALSE); screen_install_colormap(client, TRUE); @@ -166,7 +171,7 @@ void focus_set_client(ObClient *client) be used. */ if (focus_cycle_target) - focus_cycle(TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE); + focus_cycle(TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE); focus_client = client; @@ -185,89 +190,88 @@ void focus_set_client(ObClient *client) } } -ObClient* focus_fallback_target(gboolean allow_refocus, ObClient *old) +static ObClient* focus_fallback_target(gboolean allow_refocus) { GList *it; - ObClient *target = NULL; - ObClient *desktop = NULL; + ObClient *c; + ObClient *old = focus_client; ob_debug_type(OB_DEBUG_FOCUS, "trying pointer stuff\n"); if (config_focus_follow && !config_focus_last) - { - if ((target = client_under_pointer())) - if (allow_refocus || target != old) - if (client_normal(target) && client_can_focus(target)) { - ob_debug_type(OB_DEBUG_FOCUS, "found in pointer stuff\n"); - return target; - } - } - -#if 0 - /* try for group relations */ - if (old->group) { - GSList *sit; - - for (it = focus_order[screen_desktop]; it; it = g_list_next(it)) - for (sit = old->group->members; sit; sit = g_slist_next(sit)) - if (sit->data == it->data) - if (sit->data != old && client_normal(sit->data)) - if (client_can_focus(sit->data)) - return sit->data; + if ((c = client_under_pointer()) && + (allow_refocus || c != old) && + (client_normal(c) && + client_focus(c))) + { + ob_debug_type(OB_DEBUG_FOCUS, "found in pointer stuff\n"); + return c; } -#endif ob_debug_type(OB_DEBUG_FOCUS, "trying omnipresentness\n"); - if (allow_refocus && old && old->desktop == DESKTOP_ALL && - client_normal(old)) + if (allow_refocus && old && + old->desktop == DESKTOP_ALL && + client_normal(old) && + client_focus(old)) { + ob_debug_type(OB_DEBUG_FOCUS, "found in omnipresentness\n"); return old; } ob_debug_type(OB_DEBUG_FOCUS, "trying the focus order\n"); - for (it = focus_order; it; it = g_list_next(it)) - if (allow_refocus || it->data != old) { - ObClient *c = it->data; - /* fallback focus to a window if: - 1. it is actually focusable, cuz if it's not then we're sending - focus off to nothing. this includes if it is visible right now - 2. it is on the current desktop. this ignores omnipresent - windows, which are problematic in their own rite. - 3. 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) - */ - if (client_can_focus(c)) - { - if (c->desktop == screen_desktop && client_normal(c)) { - ob_debug_type(OB_DEBUG_FOCUS, "found in focus order\n"); - return it->data; - } else if (c->type == OB_CLIENT_TYPE_DESKTOP && - desktop == NULL) - desktop = c; - } + 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) + */ + if (c->desktop == screen_desktop && + client_normal(c) && + (allow_refocus || c != old) && + client_focus(c)) + { + ob_debug_type(OB_DEBUG_FOCUS, "found in focus order\n"); + return c; } + } - /* as a last resort fallback to the desktop window if there is one. - (if there's more than one, then the one most recently focused.) - */ - ob_debug_type(OB_DEBUG_FOCUS, "found desktop: \n", !!desktop); - return desktop; + ob_debug_type(OB_DEBUG_FOCUS, "trying a desktop window\n"); + 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) + */ + if (c->type == OB_CLIENT_TYPE_DESKTOP && + (allow_refocus || c != old) && + client_focus(c)) + { + ob_debug_type(OB_DEBUG_FOCUS, "found a desktop window\n"); + return c; + } + } + + return NULL; } -void focus_fallback(gboolean allow_refocus) +ObClient* focus_fallback(gboolean allow_refocus) { ObClient *new; - ObClient *old = focus_client; /* unfocus any focused clients.. they can be focused by Pointer events - and such, and then when I try focus them, I won't get a FocusIn event - at all for them. - */ + and such, and then when we try focus them, we won't get a FocusIn + event at all for them. */ focus_nothing(); - if ((new = focus_fallback_target(allow_refocus, old))) - client_focus(new); + new = focus_fallback_target(allow_refocus); + + return new; } void focus_nothing() @@ -278,7 +282,22 @@ void focus_nothing() screen_install_colormap(NULL, TRUE); } + /* Don't set focus_client to NULL here. It will be set to NULL when the + FocusOut event comes. Otherwise, if we focus nothing and then focus the + same window again, The focus code says nothing changed, but focus_client + ends up being NULL anyways. focus_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 ! + + actions should not rely on being able to move focus during an + interactive grab. + */ + if (keyboard_interactively_grabbed()) + keyboard_interactive_cancel(); /* when nothing will be focused, send focus to the backup target */ XSetInputFocus(ob_display, screen_support_win, RevertToPointerRoot, @@ -320,7 +339,8 @@ static gchar *popup_get_name(ObClient *c, ObClient **nametarget) } static void popup_cycle(ObClient *c, gboolean show, - gboolean all_desktops, gboolean dock_windows) + gboolean all_desktops, gboolean dock_windows, + gboolean desktop_windows) { gchar *showtext = NULL; ObClient *showtarget; @@ -354,7 +374,9 @@ static void popup_cycle(ObClient *c, gboolean show, /* build a list of all the valid focus targets */ for (it = focus_order; it; it = g_list_next(it)) { ObClient *ft = it->data; - if (valid_focus_target(ft, all_desktops, dock_windows)) { + if (valid_focus_target(ft, all_desktops, dock_windows + , desktop_windows)) + { targets = g_list_prepend(targets, ft); ++n; } @@ -385,13 +407,13 @@ static void popup_cycle(ObClient *c, gboolean show, g_free(showtext); } -static void focus_cycle_destructor(ObClient *client, gpointer data) +static void focus_cycle_destroy_notify(ObClient *client, gpointer data) { /* end cycling if the target disappears. CurrentTime is fine, time won't be used */ if (focus_cycle_target == client) - focus_cycle(TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE); + focus_cycle(TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE); } void focus_cycle_draw_indicator() @@ -403,7 +425,7 @@ void focus_cycle_draw_indicator() XUnmapWindow(ob_display, focus_indicator.bottom.win); /* kill enter events cause by this unmapping */ - event_ignore_queued_enters(); + event_ignore_all_queued_enters(); } else { /* if (focus_cycle_target) @@ -528,9 +550,32 @@ void focus_cycle_draw_indicator() } } +static gboolean has_valid_group_siblings_on_desktop(ObClient *ft, + 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 && !client_helper(c) && + valid_focus_target(c, all_desktops, FALSE, FALSE)) + { + return TRUE; + } + } + return FALSE; +} + +/*! @param allow_helpers This is used for calling itself recursively while + checking helper windows. */ static gboolean valid_focus_target(ObClient *ft, gboolean all_desktops, - gboolean dock_windows) + gboolean dock_windows, + gboolean desktop_windows) { gboolean ok = FALSE; @@ -545,23 +590,26 @@ static gboolean valid_focus_target(ObClient *ft, ok = ok && (ft->can_focus || ft->focus_notify); /* it's the right type of window */ - if (dock_windows) - ok = ok && ft->type == OB_CLIENT_TYPE_DOCK; + if (dock_windows || desktop_windows) + ok = ok && ((dock_windows && ft->type == OB_CLIENT_TYPE_DOCK) || + (desktop_windows && ft->type == OB_CLIENT_TYPE_DESKTOP)); else - ok = ok && (ft->type == OB_CLIENT_TYPE_NORMAL || - ft->type == OB_CLIENT_TYPE_DIALOG || - ((ft->type == OB_CLIENT_TYPE_TOOLBAR || - ft->type == OB_CLIENT_TYPE_MENU || - ft->type == OB_CLIENT_TYPE_UTILITY) && - /* let alt-tab go to these windows when a window in its - group already has focus ... */ - ((focus_client && ft->group == focus_client->group) || - /* ... or if there are no main windows in its group */ - !client_has_non_helper_group_siblings(ft)))); + /* normal non-helper windows are valid targets */ + ok = ok && + ((client_normal(ft) && !client_helper(ft)) + || + /* helper windows are valid targets it... */ + (client_helper(ft) && + /* ...a window in its group already has focus ... */ + ((focus_client && ft->group == focus_client->group) || + /* ... or if there are no other windows in its group + that can be cycled to instead */ + !has_valid_group_siblings_on_desktop(ft, all_desktops)))); /* it's not set to skip the taskbar (unless it is a type that would be expected to set this hint */ ok = ok && ((ft->type == OB_CLIENT_TYPE_DOCK || + ft->type == OB_CLIENT_TYPE_DESKTOP || ft->type == OB_CLIENT_TYPE_TOOLBAR || ft->type == OB_CLIENT_TYPE_MENU || ft->type == OB_CLIENT_TYPE_UTILITY) || @@ -574,7 +622,7 @@ static gboolean valid_focus_target(ObClient *ft, } void focus_cycle(gboolean forward, gboolean all_desktops, - gboolean dock_windows, + gboolean dock_windows, gboolean desktop_windows, gboolean linear, gboolean interactive, gboolean dialog, gboolean done, gboolean cancel) { @@ -619,14 +667,17 @@ void focus_cycle(gboolean forward, gboolean all_desktops, if (it == NULL) it = g_list_last(list); } ft = it->data; - if (valid_focus_target(ft, all_desktops, dock_windows)) { + if (valid_focus_target(ft, all_desktops, dock_windows, + desktop_windows)) + { if (interactive) { if (ft != focus_cycle_target) { /* prevents flicker */ focus_cycle_target = ft; focus_cycle_draw_indicator(); } /* same arguments as valid_focus_target */ - popup_cycle(ft, dialog, all_desktops, dock_windows); + popup_cycle(ft, dialog, all_desktops, dock_windows, + desktop_windows); return; } else if (ft != focus_cycle_target) { focus_cycle_target = ft; @@ -648,7 +699,7 @@ done_cycle: if (interactive) { focus_cycle_draw_indicator(); - popup_cycle(ft, FALSE, FALSE, FALSE); + popup_cycle(ft, FALSE, FALSE, FALSE, FALSE); } return; @@ -656,7 +707,8 @@ done_cycle: /* this be mostly ripped from fvwm */ static ObClient *focus_find_directional(ObClient *c, ObDirection dir, - gboolean dock_windows) + gboolean dock_windows, + gboolean desktop_windows) { gint my_cx, my_cy, his_cx, his_cy; gint offset = 0; @@ -681,9 +733,13 @@ static ObClient *focus_find_directional(ObClient *c, ObDirection dir, /* the currently selected window isn't interesting */ if(cur == c) continue; - if (!dock_windows && !client_normal(cur)) + if (cur->type == OB_CLIENT_TYPE_DOCK && !dock_windows) + continue; + if (cur->type == OB_CLIENT_TYPE_DESKTOP && !desktop_windows) continue; - if (dock_windows && cur->type != OB_CLIENT_TYPE_DOCK) + if (!client_normal(cur) && + cur->type != OB_CLIENT_TYPE_DOCK && + cur->type != OB_CLIENT_TYPE_DESKTOP) continue; /* using c->desktop instead of screen_desktop doesn't work if the * current window was omnipresent, hope this doesn't have any other @@ -759,7 +815,7 @@ static ObClient *focus_find_directional(ObClient *c, ObDirection dir, } void focus_directional_cycle(ObDirection dir, gboolean dock_windows, - gboolean interactive, + gboolean desktop_windows, gboolean interactive, gboolean dialog, gboolean done, gboolean cancel) { static ObClient *first = NULL; @@ -781,12 +837,14 @@ void focus_directional_cycle(ObDirection dir, gboolean dock_windows, if (!focus_cycle_target) focus_cycle_target = focus_client; if (focus_cycle_target) - ft = focus_find_directional(focus_cycle_target, dir, dock_windows); + ft = focus_find_directional(focus_cycle_target, dir, dock_windows, + desktop_windows); else { GList *it; for (it = focus_order; it; it = g_list_next(it)) - if (valid_focus_target(it->data, FALSE, dock_windows)) + if (valid_focus_target(it->data, FALSE, dock_windows, + desktop_windows)) ft = it->data; } @@ -798,7 +856,8 @@ void focus_directional_cycle(ObDirection dir, gboolean dock_windows, } if (focus_cycle_target) { /* same arguments as valid_focus_target */ - popup_cycle(focus_cycle_target, dialog, FALSE, dock_windows); + popup_cycle(focus_cycle_target, dialog, FALSE, dock_windows, + desktop_windows); if (dialog) return; } @@ -812,7 +871,7 @@ done_cycle: focus_cycle_target = NULL; focus_cycle_draw_indicator(); - popup_cycle(ft, FALSE, FALSE, FALSE); + popup_cycle(ft, FALSE, FALSE, FALSE, FALSE); return; }