#include "screen.h"
#include "group.h"
#include "prop.h"
+#include "keyboard.h"
#include "focus.h"
#include "stacking.h"
#include "popup.h"
#include <glib.h>
#include <assert.h>
-#define FOCUS_INDICATOR_WIDTH 5
+#define FOCUS_INDICATOR_WIDTH 6
ObClient *focus_client = NULL;
GList *focus_order = NULL;
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)
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();
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);
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);
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;
}
}
-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;
- }
+ 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;
+ }
+ }
+
+ 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;
}
+ }
- /* 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;
+ 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()
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,
/* 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 (nametarget) *nametarget = p;
if (c->desktop != DESKTOP_ALL && c->desktop != screen_desktop)
desk = screen_desktop_names[c->desktop];
}
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 all_desktops, gboolean dock_windows,
+ gboolean desktop_windows)
{
gchar *showtext = NULL;
ObClient *showtarget;
icon_popup_position(focus_cycle_popup, CenterGravity,
a->x + a->width / 2, a->y + a->height / 2);
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)) {
+ 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;
- names[i] = popup_get_name(ft, &showtarget);
+ ObClient *ft = it->data, *t;
+ names[i] = popup_get_name(ft, &t);
- /* little optimization.. save this text so we dont have to get it
- again */
- if (ft == c)
+ /* 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_width_to_strings(focus_cycle_popup,
- names, n,
- MAX(a->width/3, POPUP_WIDTH));
+ icon_popup_text_width_to_strings(focus_cycle_popup, names, n);
g_strfreev(names);
}
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()
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)
}
}
+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;
- /* 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 ||
- ((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 application windows in its group */
- !client_has_application_group_siblings(ft))));
+
+ /* 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);
- if (!dock_windows && /* use dock windows that skip taskbar too */
- !(ft->type == OB_CLIENT_TYPE_TOOLBAR || /* also, if we actually are */
- ft->type == OB_CLIENT_TYPE_MENU || /* being allowed to target */
- ft->type == OB_CLIENT_TYPE_UTILITY)) /* one of these, don't let */
- ok = ok && !ft->skip_taskbar; /* skip taskbar stop us */
- if (!all_desktops)
- ok = ok && (ft->desktop == screen_desktop ||
- ft->desktop == DESKTOP_ALL);
- ok = ok && ft == client_focus_target(ft);
- return ok;
-/*
- {
- GSList *it;
- for (it = ft->transients; it; it = g_slist_next(it)) {
- ObClient *c = it->data;
+ /* 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);
- if (frame_visible(c->frame))
- return FALSE;
- }
- return TRUE;
- }
-*/
+ return ok;
}
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)
{
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;
if (interactive) {
focus_cycle_draw_indicator();
- popup_cycle(ft, FALSE, FALSE, FALSE);
+ popup_cycle(ft, FALSE, FALSE, FALSE, FALSE);
}
return;
/* 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;
/* 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
}
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;
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;
}
}
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;
}
focus_cycle_target = NULL;
focus_cycle_draw_indicator();
- popup_cycle(ft, FALSE, FALSE, FALSE);
+ popup_cycle(ft, FALSE, FALSE, FALSE, FALSE);
return;
}
projects / chaz / openbox / blobdiff