summaryrefslogtreecommitdiff
path: root/openbox/client.c
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2007-05-15 17:38:52 +0000
committerDana Jansens <danakj@orodu.net>2007-05-15 17:38:52 +0000
commitd30809e5faf681a00035d9913a762f25db8de6b5 (patch)
tree87c0473ba291affb368c2fdaeab41f5e62660150 /openbox/client.c
parentd3e524420f87b3aedaf3076f3677cb1c3213f06f (diff)
always ignore errors for client_focus like we used to.
Diffstat (limited to 'openbox/client.c')
-rw-r--r--openbox/client.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/openbox/client.c b/openbox/client.c
index fa4aae95..dba7706b 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -2842,7 +2842,7 @@ void client_fullscreen(ObClient *self, gboolean fs)
if (fs) {
/* try focus us when we go into fullscreen mode */
- client_focus(self, FALSE);
+ client_focus(self);
}
}
@@ -3336,7 +3336,7 @@ gboolean client_can_focus(ObClient *self)
return TRUE;
}
-gboolean client_focus(ObClient *self, gboolean checkinvalid)
+gboolean client_focus(ObClient *self)
{
/* choose the correct target */
self = client_focus_target(self);
@@ -3363,8 +3363,7 @@ gboolean client_focus(ObClient *self, gboolean checkinvalid)
if (keyboard_interactively_grabbed())
keyboard_interactive_cancel();
- if (checkinvalid)
- xerror_set_ignore(TRUE);
+ xerror_set_ignore(TRUE);
xerror_occured = FALSE;
if (self->can_focus) {
@@ -3389,8 +3388,7 @@ gboolean client_focus(ObClient *self, gboolean checkinvalid)
XSendEvent(ob_display, self->window, FALSE, NoEventMask, &ce);
}
- if (checkinvalid)
- xerror_set_ignore(FALSE);
+ xerror_set_ignore(FALSE);
return !xerror_occured;
}
@@ -3426,7 +3424,7 @@ static void client_present(ObClient *self, gboolean here, gboolean raise)
if (raise)
stacking_raise(CLIENT_AS_WINDOW(self));
- client_focus(self, FALSE);
+ client_focus(self);
}
void client_activate(ObClient *self, gboolean here, gboolean user)