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

watch for errors while setting focus on windows, return false if there was an error, so fallback and keep looking

Browse source
This commit is contained in:
Dana Jansens 2007-05-14 22:52:40 +00:00
parent 2e7359a2fd
commit 415ce6e5de
1 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
openbox/client.c
View file

@ -3355,6 +3355,8 @@ gboolean client_can_focus(ObClient *self)
gboolean client_focus(ObClient *self) gboolean client_focus(ObClient *self)
{ {
gboolean error;
/* choose the correct target */ /* choose the correct target */
self = client_focus_target(self); self = client_focus_target(self);
@ -3380,13 +3382,14 @@ gboolean client_focus(ObClient *self)
if (keyboard_interactively_grabbed()) if (keyboard_interactively_grabbed())
keyboard_interactive_cancel(); keyboard_interactive_cancel();
error = FALSE;
xerror_set_ignore(TRUE);
if (self->can_focus) { if (self->can_focus) {
/* This can cause a BadMatch error with CurrentTime, or if an app /* This can cause a BadMatch error with CurrentTime, or if an app
passed in a bad time for _NET_WM_ACTIVE_WINDOW. */ passed in a bad time for _NET_WM_ACTIVE_WINDOW. */
xerror_set_ignore(TRUE);
XSetInputFocus(ob_display, self->window, RevertToPointerRoot, XSetInputFocus(ob_display, self->window, RevertToPointerRoot,
event_curtime); event_curtime);
xerror_set_ignore(FALSE);
} }
if (self->focus_notify) { if (self->focus_notify) {
@ -3404,17 +3407,13 @@ gboolean client_focus(ObClient *self)
XSendEvent(ob_display, self->window, FALSE, NoEventMask, &ce); XSendEvent(ob_display, self->window, FALSE, NoEventMask, &ce);
} }
#ifdef DEBUG_FOCUS /* This calls XSync, which will cause the FocusIn to come back to us.
ob_debug("%sively focusing %lx at %d\n", That's important for desktop switches, since otherwise we'll have no
(self->can_focus ? "act" : "pass"), FocusIn on the queue and end up falling back again. */
self->window, (gint) event_curtime); xerror_set_ignore(FALSE);
#endif if (!xerror_occured) error = TRUE;
/* Cause the FocusIn to come back to us. Important for desktop switches, return !error;
since otherwise we'll have no FocusIn on the queue and send it off to
the focus_backup. */
XSync(ob_display, FALSE);
return TRUE;
} }
/*! Present the client to the user. /*! Present the client to the user.