focus_left_screen = FALSE;
- focus_fallback(FALSE, FALSE);
+ focus_fallback(FALSE, config_focus_under_mouse, TRUE);
/* We don't get a FocusOut for this case, because it's just moving
from our Inferior up to us. This happens when iconifying a
*/
if (!focus_left_screen)
- focus_fallback(FALSE, FALSE);
+ focus_fallback(FALSE, config_focus_under_mouse, TRUE);
}
}
else if (!client)
ob_debug_type(OB_DEBUG_FOCUS,
"Focus went to an unmanaged window 0x%x !\n",
ce.xfocus.window);
- focus_fallback(TRUE, FALSE);
+ focus_fallback(TRUE, config_focus_under_mouse, TRUE);
}
}
} else if (msgtype == prop_atoms.net_showing_desktop) {
screen_show_desktop(e->xclient.data.l[0] != 0, NULL);
} else if (msgtype == prop_atoms.ob_control) {
+ ob_debug("OB_CONTROL: %d\n", e->xclient.data.l[0]);
if (e->xclient.data.l[0] == 1)
ob_reconfigure();
else if (e->xclient.data.l[0] == 2)
}
break;
case PropertyNotify:
- if (e->xproperty.atom == prop_atoms.net_desktop_names)
+ if (e->xproperty.atom == prop_atoms.net_desktop_names) {
+ ob_debug("UPDATE DESKTOP NAMES\n");
screen_update_desktop_names();
+ }
else if (e->xproperty.atom == prop_atoms.net_desktop_layout)
screen_update_layout();
break;
if (e->xconfigurerequest.value_mask & CWStackMode) {
ObClient *sibling = NULL;
+ gulong ignore_start;
/* get the sibling */
if (e->xconfigurerequest.value_mask & CWSibling) {
}
/* activate it rather than just focus it */
+ if (!config_focus_under_mouse)
+ ignore_start = event_start_ignore_all_enters();
stacking_restack_request(client, sibling,
e->xconfigurerequest.detail,
TRUE);
+ if (!config_focus_under_mouse)
+ event_end_ignore_all_enters(ignore_start);
/* if a stacking change moves the window without resizing */
move = TRUE;
e->xclient.data.l[2] == TopIf ||
e->xclient.data.l[2] == Opposite)
{
+ gulong ignore_start;
+
+ if (!config_focus_under_mouse)
+ ignore_start = event_start_ignore_all_enters();
/* just raise, don't activate */
stacking_restack_request(client, sibling,
e->xclient.data.l[2], FALSE);
+ if (!config_focus_under_mouse)
+ event_end_ignore_all_enters(ignore_start);
+
/* send a synthetic ConfigureNotify, cuz this is supposed
to be like a ConfigureRequest. */
client_reconfigure(client);
r->start = start;
r->end = LastKnownRequestProcessed(ob_display);
ignore_serials = g_slist_prepend(ignore_serials, r);
- ob_debug("ignoring serials %u-%u\n", r->start, r->end);
/* increment the serial so we don't ignore events we weren't meant to */
XSync(ob_display, FALSE);
- ob_debug("now last serial %u\n", LastKnownRequestProcessed(ob_display));
}
static gboolean is_enter_focus_event_ignored(XEvent *e)
e->xcrossing.mode == NotifyUngrab ||
e->xcrossing.detail == NotifyInferior));
- ob_debug("checking serial %u\n", e->xany.serial);
for (it = ignore_serials; it; it = next) {
ObSerialRange *r = it->data;
next = g_slist_next(it);
- /* XXX wraparound... */
- ob_debug(" ignore range %u-%u\n", r->start, r->end);
if ((glong)(e->xany.serial - r->end) > 0) {
/* past the end */
ignore_serials = g_slist_delete_link(ignore_serials, it);