X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus.c;h=e88b68882f3dc204be7897087a51337190bce97f;hb=6d2650263193aaa7e94b29261c6ba249c0be3fd3;hp=4c663c3f124eabd30a223489263f1f24b6eb2120;hpb=6e83a82e5b5206c8199e392df5f089c0b4122fe1;p=chaz%2Fopenbox diff --git a/openbox/focus.c b/openbox/focus.c index 4c663c3f..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,6 +38,8 @@ #include #include +#define FOCUS_INDICATOR_WIDTH 6 + ObClient *focus_client = NULL; GList *focus_order = NULL; ObClient *focus_cycle_target = NULL; @@ -53,14 +56,11 @@ RrColor *color_white; static ObIconPopup *focus_cycle_popup; -static void focus_cycle_destructor(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); -} +static gboolean valid_focus_target(ObClient *ft, + gboolean all_desktops, + 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) @@ -78,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(); @@ -131,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); @@ -160,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); @@ -168,7 +171,7 @@ void focus_set_client(ObClient *client) be used. */ if (focus_cycle_target) - focus_cycle(TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE); + focus_cycle(TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE); focus_client = client; @@ -187,94 +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 - 2. it is validated. if the window is about to disappear, then - don't try focus it. - 3. it is visible on the current desktop. this ignores - omnipresent windows, which are problematic in their own rite. - 4. it's not iconic - 5. 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) && !c->iconic) - { - 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->desktop == screen_desktop || - c->desktop == DESKTOP_ALL) && - c->type == OB_CLIENT_TYPE_DESKTOP && - desktop == NULL) - desktop = c; - } + ob_debug_type(OB_DEBUG_FOCUS, "trying the focus order\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->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() @@ -285,50 +282,138 @@ 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, event_curtime); } -static void popup_cycle(ObClient *c, gboolean show) +static gchar *popup_get_name(ObClient *c, ObClient **nametarget) +{ + ObClient *p; + gchar *title = NULL; + const gchar *desk = NULL; + gchar *ret; + + /* find our highest direct parent, including non-normal windows */ + for (p = c; p->transient_for && p->transient_for != OB_TRAN_GROUP; + p = p->transient_for); + + if (c->desktop != DESKTOP_ALL && c->desktop != screen_desktop) + desk = screen_desktop_names[c->desktop]; + + /* use the transient's parent's title/icon if we don't have one */ + if (p != c && !strcmp("", (c->iconic ? c->icon_title : c->title))) + title = g_strdup(p->iconic ? p->icon_title : p->title); + + if (title == NULL) + title = g_strdup(c->iconic ? c->icon_title : c->title); + + if (desk) + ret = g_strdup_printf("%s [%s]", title, desk); + else { + ret = title; + title = NULL; + } + g_free(title); + + /* set this only if we're returning true and they asked for it */ + if (ret && nametarget) *nametarget = p; + return ret; +} + +static void popup_cycle(ObClient *c, gboolean show, + gboolean all_desktops, gboolean dock_windows, + gboolean desktop_windows) { + gchar *showtext = NULL; + ObClient *showtarget; + if (!show) { icon_popup_hide(focus_cycle_popup); - } else { + return; + } + + /* do this stuff only when the dialog is first showing */ + if (!focus_cycle_popup->popup->mapped && + !focus_cycle_popup->popup->delay_mapped) + { Rect *a; - ObClient *p = c; - gchar *title = NULL; + gchar **names; + GList *targets = NULL, *it; + gint n = 0, i; + /* position the popup */ a = screen_physical_area_monitor(0); icon_popup_position(focus_cycle_popup, CenterGravity, a->x + a->width / 2, a->y + a->height / 2); -/* icon_popup_size(focus_cycle_popup, a->height/2, a->height/16); - icon_popup_show(focus_cycle_popup, c->title, - client_icon(c, a->height/16, a->height/16)); -*/ - /* XXX the size and the font extents need to be related on some level - */ - icon_popup_size(focus_cycle_popup, POPUP_WIDTH, POPUP_HEIGHT); - - /* use the transient's parent's title/icon */ - while (p->transient_for && p->transient_for != OB_TRAN_GROUP) - p = p->transient_for; - - if (p != c && !strcmp("", (c->iconic ? c->icon_title : c->title))) - title = g_strdup(p->iconic ? p->icon_title : p->title); - /*title = g_strconcat((c->iconic ? c->icon_title : c->title), - " - ", - (p->iconic ? p->icon_title : p->title), - NULL); - */ - icon_popup_show(focus_cycle_popup, - (title ? title : - (c->iconic ? c->icon_title : c->title)), - client_icon(p, 48, 48)); - g_free(title); + icon_popup_height(focus_cycle_popup, POPUP_HEIGHT); + icon_popup_min_width(focus_cycle_popup, POPUP_WIDTH); + icon_popup_max_width(focus_cycle_popup, + MAX(a->width/3, POPUP_WIDTH)); + + + /* make its width to be the width of all the possible titles */ + + /* 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 + , desktop_windows)) + { + targets = g_list_prepend(targets, ft); + ++n; + } + } + /* make it null terminated so we can use g_strfreev */ + names = g_new(char*, n+1); + for (it = targets, i = 0; it; it = g_list_next(it), ++i) { + ObClient *ft = it->data, *t; + names[i] = popup_get_name(ft, &t); + + /* little optimization.. save this text and client, so we dont + have to get it again */ + if (ft == c) { + showtext = g_strdup(names[i]); + showtarget = t; + } + } + names[n] = NULL; + + icon_popup_text_width_to_strings(focus_cycle_popup, names, n); + g_strfreev(names); } + + + if (!showtext) showtext = popup_get_name(c, &showtarget); + icon_popup_show(focus_cycle_popup, showtext, + client_icon(showtarget, 48, 48)); + g_free(showtext); +} + +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, TRUE); } void focus_cycle_draw_indicator() @@ -340,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) @@ -350,10 +435,7 @@ void focus_cycle_draw_indicator() gint x, y, w, h; gint wt, wl, wr, wb; - wt = wl = wr = wb = MAX(3, - MAX(1, MAX(ob_rr_theme->paddingx, - ob_rr_theme->paddingy)) * 2 + - ob_rr_theme->fbwidth * 2); + wt = wl = wr = wb = FOCUS_INDICATOR_WIDTH; x = focus_cycle_target->frame->area.x; y = focus_cycle_target->frame->area.y; @@ -468,43 +550,79 @@ void focus_cycle_draw_indicator() } } -static gboolean valid_focus_target(ObClient *ft, gboolean dock_windows) +static gboolean has_valid_group_siblings_on_desktop(ObClient *ft, + gboolean all_desktops) + { - gboolean ok = FALSE; - /* we don't use client_can_focus here, because that doesn't let you - focus an iconic window, but we want to be able to, so we just check - if the focus flags on the window allow it, and its on the current - desktop */ - if (dock_windows) - ok = ft->type == OB_CLIENT_TYPE_DOCK; - else - ok = (ft->type == OB_CLIENT_TYPE_NORMAL || - ft->type == OB_CLIENT_TYPE_DIALOG || - (!client_has_group_siblings(ft) && - (ft->type == OB_CLIENT_TYPE_TOOLBAR || - ft->type == OB_CLIENT_TYPE_MENU || - ft->type == OB_CLIENT_TYPE_UTILITY))); - ok = ok && (ft->can_focus || ft->focus_notify); - ok = ok && !ft->skip_pager; - ok = ok && (ft->desktop == screen_desktop || ft->desktop == DESKTOP_ALL); - ok = ok && ft == client_focus_target(ft); - return ok; -/* - { - GSList *it; + GSList *it; - for (it = ft->transients; it; it = g_slist_next(it)) { - ObClient *c = it->data; + if (!ft->group) return FALSE; - if (c->frame->visible) - 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 TRUE; } -*/ + return FALSE; } -void focus_cycle(gboolean forward, gboolean dock_windows, +/*! @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 desktop_windows) +{ + gboolean ok = 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 == screen_desktop || + ft->desktop == DESKTOP_ALL); + + /* the window can receive focus somehow */ + ok = ok && (ft->can_focus || ft->focus_notify); + + /* 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)); + else + /* 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) || + !ft->skip_taskbar); + + /* it's not going to just send fous off somewhere else (modal window) */ + ok = ok && ft == client_focus_target(ft); + + return ok; +} + +void focus_cycle(gboolean forward, gboolean all_desktops, + gboolean dock_windows, gboolean desktop_windows, gboolean linear, gboolean interactive, gboolean dialog, gboolean done, gboolean cancel) { @@ -549,13 +667,17 @@ void focus_cycle(gboolean forward, gboolean dock_windows, if (it == NULL) it = g_list_last(list); } ft = it->data; - if (valid_focus_target(ft, 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(); } - popup_cycle(ft, dialog); + /* same arguments as valid_focus_target */ + popup_cycle(ft, dialog, all_desktops, dock_windows, + desktop_windows); return; } else if (ft != focus_cycle_target) { focus_cycle_target = ft; @@ -577,15 +699,16 @@ done_cycle: if (interactive) { focus_cycle_draw_indicator(); - popup_cycle(ft, FALSE); + popup_cycle(ft, FALSE, FALSE, FALSE, FALSE); } return; } /* this be mostly ripped from fvwm */ -ObClient *focus_find_directional(ObClient *c, ObDirection dir, - gboolean dock_windows) +static ObClient *focus_find_directional(ObClient *c, ObDirection dir, + gboolean dock_windows, + gboolean desktop_windows) { gint my_cx, my_cy, his_cx, his_cy; gint offset = 0; @@ -610,9 +733,13 @@ 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 @@ -688,7 +815,7 @@ 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; @@ -710,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, dock_windows)) + if (valid_focus_target(it->data, FALSE, dock_windows, + desktop_windows)) ft = it->data; } @@ -726,7 +855,9 @@ void focus_directional_cycle(ObDirection dir, gboolean dock_windows, } } if (focus_cycle_target) { - popup_cycle(focus_cycle_target, dialog); + /* same arguments as valid_focus_target */ + popup_cycle(focus_cycle_target, dialog, FALSE, dock_windows, + desktop_windows); if (dialog) return; } @@ -740,7 +871,7 @@ done_cycle: focus_cycle_target = NULL; focus_cycle_draw_indicator(); - popup_cycle(ft, FALSE); + popup_cycle(ft, FALSE, FALSE, FALSE, FALSE); return; }