summaryrefslogtreecommitdiff
path: root/openbox/grab.c
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2003-09-28 09:24:22 +0000
committerDana Jansens <danakj@orodu.net>2003-09-28 09:24:22 +0000
commitb8ba1cff1fdd5447984e83708865f8ba6c7f223a (patch)
treeefaa67047917efc127b4f39c83e3714e03430cf4 /openbox/grab.c
parentff04a81e62cc9337f89fc913feb29f5295c84217 (diff)
perhaps fix problems of being left in menus without being able to control openbox
Diffstat (limited to 'openbox/grab.c')
-rw-r--r--openbox/grab.c18
1 files changed, 12 insertions, 6 deletions
diff --git a/openbox/grab.c b/openbox/grab.c
index 34fd2302..e2784a2d 100644
--- a/openbox/grab.c
+++ b/openbox/grab.c
@@ -50,11 +50,13 @@ gboolean grab_keyboard(gboolean grab)
gboolean ret = FALSE;
if (grab) {
- if (kgrabs++ == 0)
+ if (kgrabs++ == 0) {
ret = XGrabKeyboard(ob_display, RootWindow(ob_display, ob_screen),
FALSE, GrabModeAsync, GrabModeAsync,
event_lasttime) == Success;
- else
+ if (!ret)
+ --kgrabs;
+ } else
ret = TRUE;
} else if (kgrabs > 0) {
if (--kgrabs == 0)
@@ -70,12 +72,14 @@ gboolean grab_pointer(gboolean grab, ObCursor cur)
gboolean ret = FALSE;
if (grab) {
- if (pgrabs++ == 0)
+ if (pgrabs++ == 0) {
ret = XGrabPointer(ob_display, screen_support_win,
False, GRAB_PTR_MASK, GrabModeAsync,
GrabModeAsync, FALSE,
ob_cursor(cur), event_lasttime) == Success;
- else
+ if (!ret)
+ --pgrabs;
+ } else
ret = TRUE;
} else if (pgrabs > 0) {
if (--pgrabs == 0) {
@@ -91,12 +95,14 @@ gboolean grab_pointer_window(gboolean grab, ObCursor cur, Window win)
gboolean ret = FALSE;
if (grab) {
- if (pgrabs++ == 0)
+ if (pgrabs++ == 0) {
ret = XGrabPointer(ob_display, win, False, GRAB_PTR_MASK,
GrabModeAsync, GrabModeAsync, TRUE,
ob_cursor(cur),
event_lasttime) == Success;
- else
+ if (!ret)
+ --pgrabs;
+ } else
ret = TRUE;
} else if (pgrabs > 0) {
if (--pgrabs == 0) {