nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ignore fake generated enters if they are in the serial-ignore-range too

Browse source
This commit is contained in:
Dana Jansens 2008-02-03 09:29:05 -05:00
parent deb0aa720a
commit 4d5dd00229
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
openbox/event.c
View file

@ -92,7 +92,7 @@ static void event_handle_dock(ObDock *s, XEvent *e);
static void event_handle_dockapp(ObDockApp *app, XEvent *e);
static void event_handle_client(ObClient *c, XEvent *e);
static void event_handle_user_input(ObClient *client, XEvent *e);
static gboolean is_enter_focus_event_ignored(XEvent *e);
static gboolean is_enter_focus_event_ignored(gulong serial);
static void event_ignore_enter_range(gulong start, gulong end);
static void focus_delay_dest(gpointer data);
@ -795,6 +795,12 @@ void event_enter_client(ObClient *client)
{
g_assert(config_focus_follow);
if (is_enter_focus_event_ignored(event_curserial)) {
ob_debug_type(OB_DEBUG_FOCUS, "Ignoring enter event with serial %lu\n"
"on client 0x%x", event_curserial, client->window);
return;
}
if (client_enter_focusable(client) && client_can_focus(client)) {
if (config_focus_delay) {
ObFocusDelayData *data;
@ -1039,8 +1045,7 @@ static void event_handle_client(ObClient *client, XEvent *e)
if (e->xcrossing.mode == NotifyGrab ||
e->xcrossing.mode == NotifyUngrab ||
/*ignore enters when we're already in the window */
e->xcrossing.detail == NotifyInferior ||
is_enter_focus_event_ignored(e))
e->xcrossing.detail == NotifyInferior)
{
ob_debug_type(OB_DEBUG_FOCUS,
"%sNotify mode %d detail %d serial %lu on %lx "
@ -1959,26 +1964,21 @@ void event_end_ignore_all_enters(gulong start)
event_ignore_enter_range(start, NextRequest(ob_display)-1);
}
static gboolean is_enter_focus_event_ignored(XEvent *e)
static gboolean is_enter_focus_event_ignored(gulong serial)
{
GSList *it, *next;
g_assert(e->type == EnterNotify &&
!(e->xcrossing.mode == NotifyGrab ||
e->xcrossing.mode == NotifyUngrab ||
e->xcrossing.detail == NotifyInferior));
for (it = ignore_serials; it; it = next) {
ObSerialRange *r = it->data;
next = g_slist_next(it);
if ((glong)(e->xany.serial - r->end) > 0) {
if ((glong)(serial - r->end) > 0) {
/* past the end */
ignore_serials = g_slist_delete_link(ignore_serials, it);
g_free(r);
}
else if ((glong)(e->xany.serial - r->start) >= 0)
else if ((glong)(serial - r->start) >= 0)
return TRUE;
}
return FALSE;