attrib.override_redirect = TRUE;
focus_backup = XCreateWindow(ob_display, ob_root,
- -100, -100, 1, 1, 0, 0, InputOnly,
- CopyFromParent, CWOverrideRedirect, &attrib);
+ -100, -100, 1, 1, 0,
+ CopyFromParent, InputOutput, CopyFromParent,
+ CWOverrideRedirect, &attrib);
XMapRaised(ob_display, focus_backup);
/* start with nothing focused */
Client *old;
guint desktop;
- if (client == focus_client) return;
-
/* uninstall the old colormap, and install the new one */
screen_install_colormap(focus_client, FALSE);
screen_install_colormap(client, TRUE);
/* when nothing will be focused, send focus to the backup target */
XSetInputFocus(ob_display, focus_backup, RevertToPointerRoot,
event_lasttime);
+ XSync(ob_display, FALSE);
}
old = focus_client;
guint u;
GList *it;
- if (XQueryPointer(ob_display, ob_root, &w, &w, &x, &y, &i, &i, &u))
- {
+ if (XQueryPointer(ob_display, ob_root, &w, &w, &x, &y, &i, &i, &u)) {
for (it = stacking_list; it != NULL; it = it->next) {
Client *c = it->data;
if (c->desktop == screen_desktop &&
RECT_CONTAINS(c->frame->area, x, y))
break;
}
- if (it != NULL) {
- g_message("fallback (pointer) trying %lx", ((Client*)it->data)->window);
+ if (it != NULL)
return client_normal(it->data) && client_focus(it->data);
- }
}
return FALSE;
}
{
ConfigValue focus_follow;
GList *it;
- gboolean fallback = TRUE;
+ gboolean under = FALSE;
+ Client *old = NULL;
+
+ old = focus_client;
- if (!switching_desks) {
+ /* 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.
+ */
+ focus_set_client(NULL);
+
+ if (switching_desks) {
+ /* don't skip any windows when switching desktops */
+ old = NULL;
+ } else {
if (!config_get("focusFollowsMouse", Config_Bool, &focus_follow))
g_assert_not_reached();
if (focus_follow.bool)
- fallback = !focus_under_pointer();
+ under = focus_under_pointer();
}
- if (fallback) {
+ if (!under) {
for (it = focus_order[screen_desktop]; it != NULL; it = it->next)
- if (it->data != focus_client && client_normal(it->data)) {
- g_message("fallback trying %lx", ((Client*)it->data)->window);
+ if (it->data != old && client_normal(it->data))
if (client_focus(it->data))
break;
- }
+ if (it == NULL) /* nothing to focus */
+ focus_set_client(NULL);
}
-
- if (it == NULL) /* nothing to focus */
- focus_set_client(NULL);
}