X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fgrab.c;h=3e1066ba0f31eda4379ce8321778123c2047a4c6;hb=7e946f68d9f8ec7c880664b437edbbaa5d49ac10;hp=f63da5e94f3829b72b68a8f3c9f13c353538ec2a;hpb=0ec2282e2ca6b80fa8c85dc366596cd009acc8a9;p=chaz%2Fopenbox diff --git a/openbox/grab.c b/openbox/grab.c index f63da5e9..3e1066ba 100644 --- a/openbox/grab.c +++ b/openbox/grab.c @@ -2,7 +2,7 @@ grab.c for the Openbox window manager Copyright (c) 2006 Mikael Magnusson - Copyright (c) 2003 Ben Jansens + Copyright (c) 2003-2007 Dana Jansens This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,10 +18,12 @@ */ #include "grab.h" +#include "modkeys.h" #include "openbox.h" #include "event.h" #include "xerror.h" #include "screen.h" +#include "debug.h" #include #include @@ -38,6 +40,22 @@ static guint pgrabs = 0; /*! The time at which the last grab was made */ static Time grab_time = CurrentTime; +static Time ungrab_time() +{ + Time t = event_curtime; + if (!(t == CurrentTime || event_time_after(t, grab_time))) + /* When the time moves backward on the server, then we can't use + the grab time because that will be in the future. So instead we + have to use CurrentTime. + + "XUngrabPointer does not release the pointer if the specified time + is earlier than the last-pointer-grab time or is later than the + current X server time." + */ + t = CurrentTime; /*grab_time;*/ + return t; +} + gboolean grab_on_keyboard() { return kgrabs > 0; @@ -55,7 +73,7 @@ gboolean grab_keyboard(gboolean grab) if (grab) { if (kgrabs++ == 0) { ret = XGrabKeyboard(ob_display, RootWindow(ob_display, ob_screen), - FALSE, GrabModeAsync, GrabModeAsync, + False, GrabModeAsync, GrabModeAsync, event_curtime) == Success; if (!ret) --kgrabs; @@ -65,10 +83,7 @@ gboolean grab_keyboard(gboolean grab) ret = TRUE; } else if (kgrabs > 0) { if (--kgrabs == 0) { - Time t = event_curtime; - if (t != 0 && t < grab_time) - t = grab_time; - XUngrabKeyboard(ob_display, t); + XUngrabKeyboard(ob_display, ungrab_time()); } ret = TRUE; } @@ -76,44 +91,16 @@ gboolean grab_keyboard(gboolean grab) return ret; } -gboolean grab_pointer(gboolean grab, ObCursor cur) +gboolean grab_pointer(gboolean grab, gboolean owner_events, ObCursor cur) { gboolean ret = FALSE; if (grab) { if (pgrabs++ == 0) { - ret = XGrabPointer(ob_display, screen_support_win, - False, GRAB_PTR_MASK, GrabModeAsync, - GrabModeAsync, None, - ob_cursor(cur), event_curtime) == Success; - if (!ret) - --pgrabs; - else - grab_time = event_curtime; - } else - ret = TRUE; - } else if (pgrabs > 0) { - if (--pgrabs == 0) { - Time t = event_curtime; - if (t != 0 && t < grab_time) - t = grab_time; - XUngrabPointer(ob_display, event_curtime); - } - ret = TRUE; - } - return ret; -} - -gboolean grab_pointer_window(gboolean grab, ObCursor cur, Window win) -{ - gboolean ret = FALSE; - - if (grab) { - if (pgrabs++ == 0) { - ret = XGrabPointer(ob_display, win, False, GRAB_PTR_MASK, + ret = XGrabPointer(ob_display, screen_support_win, owner_events, + GRAB_PTR_MASK, GrabModeAsync, GrabModeAsync, None, - ob_cursor(cur), - event_curtime) == Success; + ob_cursor(cur), event_curtime) == Success; if (!ret) --pgrabs; else @@ -122,10 +109,7 @@ gboolean grab_pointer_window(gboolean grab, ObCursor cur, Window win) ret = TRUE; } else if (pgrabs > 0) { if (--pgrabs == 0) { - Time t = event_curtime; - if (t != 0 && t < grab_time) - t = grab_time; - XUngrabPointer(ob_display, event_curtime); + XUngrabPointer(ob_display, ungrab_time()); } ret = TRUE; } @@ -152,17 +136,20 @@ gint grab_server(gboolean grab) void grab_startup(gboolean reconfig) { guint i = 0; + guint num, caps, scroll; - if (reconfig) return; + num = modkeys_key_to_mask(OB_MODKEY_KEY_NUMLOCK); + caps = modkeys_key_to_mask(OB_MODKEY_KEY_CAPSLOCK); + scroll = modkeys_key_to_mask(OB_MODKEY_KEY_SCROLLLOCK); mask_list[i++] = 0; - mask_list[i++] = LockMask; - mask_list[i++] = NumLockMask; - mask_list[i++] = LockMask | NumLockMask; - mask_list[i++] = ScrollLockMask; - mask_list[i++] = ScrollLockMask | LockMask; - mask_list[i++] = ScrollLockMask | NumLockMask; - mask_list[i++] = ScrollLockMask | LockMask | NumLockMask; + mask_list[i++] = num; + mask_list[i++] = caps; + mask_list[i++] = scroll; + mask_list[i++] = num | caps; + mask_list[i++] = num | scroll; + mask_list[i++] = caps | scroll; + mask_list[i++] = num | caps | scroll; g_assert(i == MASK_LIST_SIZE); } @@ -171,8 +158,7 @@ void grab_shutdown(gboolean reconfig) if (reconfig) return; while (grab_keyboard(FALSE)); - while (grab_pointer(FALSE, OB_CURSOR_NONE)); - while (grab_pointer_window(FALSE, OB_CURSOR_NONE, None)); + while (grab_pointer(FALSE, FALSE, OB_CURSOR_NONE)); while (grab_server(FALSE)); } @@ -181,19 +167,14 @@ void grab_button_full(guint button, guint state, Window win, guint mask, { guint i; - xerror_set_ignore(TRUE); /* can get BadAccess' from these */ + xerror_set_ignore(TRUE); /* can get BadAccess from these */ xerror_occured = FALSE; for (i = 0; i < MASK_LIST_SIZE; ++i) - XGrabButton(ob_display, button, state | mask_list[i], win, FALSE, mask, - pointer_mode, GrabModeSync, None, ob_cursor(cur)); + XGrabButton(ob_display, button, state | mask_list[i], win, False, mask, + pointer_mode, GrabModeAsync, None, ob_cursor(cur)); xerror_set_ignore(FALSE); if (xerror_occured) - g_warning("failed to grab button %d modifiers %d", button, state); -} - -void grab_button(guint button, guint state, Window win, guint mask) -{ - grab_button_full(button, state, win, mask, GrabModeAsync, OB_CURSOR_NONE); + ob_debug("Failed to grab button %d modifiers %d", button, state); } void ungrab_button(guint button, guint state, Window win) @@ -215,7 +196,7 @@ void grab_key(guint keycode, guint state, Window win, gint keyboard_mode) GrabModeAsync, keyboard_mode); xerror_set_ignore(FALSE); if (xerror_occured) - g_warning("failed to grab keycode %d modifiers %d", keycode, state); + ob_debug("Failed to grab keycode %d modifiers %d", keycode, state); } void ungrab_all_keys(Window win)