GList *focus_order = NULL;
ObClient *focus_cycle_target = NULL;
+/*! This variable is used for focus fallback. If we fallback to a window, we
+ set this to the window. And when focus goes somewhere after that, it will
+ be set to NULL. If between falling back to that window and something
+ getting focused, the window gets unmanaged, then if there are no incoming
+ FocusIn events, we fallback again because focus has just gotten itself lost.
+ */
+static ObClient *focus_tried = NULL;
+
struct {
InternalWindow top;
InternalWindow left;
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 void focus_tried_hide_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);
+ client_add_destroy_notify(focus_tried_hide_notify, NULL);
+ client_add_hide_notify(focus_tried_hide_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);
+ client_remove_destroy_notify(focus_tried_hide_notify);
+ client_remove_hide_notify(focus_tried_hide_notify);
/* reset focus to root */
XSetInputFocus(ob_display, PointerRoot, RevertToNone, CurrentTime);
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;
PROP_SET32(RootWindow(ob_display, ob_screen),
net_active_window, window, active);
}
+
+
+ focus_tried = NULL; /* focus isn't "trying" to go anywhere now */
}
-ObClient* focus_fallback_target(gboolean allow_refocus, ObClient *old)
+static ObClient* focus_fallback_target(gboolean allow_refocus, ObClient *old)
{
GList *it;
ObClient *target = NULL;
return desktop;
}
-void focus_fallback(gboolean allow_refocus)
+ObClient* focus_fallback(gboolean allow_refocus)
{
ObClient *new;
- ObClient *old = focus_client;
+ ObClient *old;
+
+ old = focus_client;
+ new = focus_fallback_target(allow_refocus, 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)))
+ if (new) {
client_focus(new);
+ /* remember that we tried to send focus here */
+ focus_tried = new;
+ }
+
+ return new;
}
void focus_nothing()
}
focus_client = NULL;
+ focus_tried = NULL; /* focus isn't "trying" to go anywhere now */
+
+ /* 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,
}
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;
/* 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;
}
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()
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(ft) &&
- valid_focus_target(ft, all_desktops, FALSE))
+ if (c != ft && !client_helper(c) &&
+ valid_focus_target(c, all_desktops, FALSE, FALSE))
{
return TRUE;
}
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;
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
/* normal non-helper windows are valid targets */
ok = ok &&
/* 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) ||
}
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 (dock_windows && cur->type != OB_CLIENT_TYPE_DOCK)
+ if (cur->type == OB_CLIENT_TYPE_DESKTOP && !desktop_windows)
+ continue;
+ 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;
}
}
return NULL;
}
+
+static void focus_tried_hide_notify(ObClient *client, gpointer data)
+{
+ XEvent ce;
+
+ if (client == focus_tried) {
+ /* we were trying to focus this window but it's gone */
+
+ focus_tried = NULL;
+
+ ob_debug_type(OB_DEBUG_FOCUS, "Tried to focus window 0x%x and it "
+ "is being unmanaged:\n");
+ if (XCheckIfEvent(ob_display, &ce, event_look_for_focusin_client,NULL))
+ {
+ XPutBackEvent(ob_display, &ce);
+ ob_debug_type(OB_DEBUG_FOCUS, " but another FocusIn is coming\n");
+ } else {
+ ob_debug_type(OB_DEBUG_FOCUS, " so falling back focus again.\n");
+ focus_fallback(TRUE);
+ }
+ }
+}
projects / chaz / openbox / blobdiff