X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fgrab.c;h=214666e58de9909df8bd15470772fca2d3253972;hb=ba1ac214dfdbc0539c922e84c2318c1bf2566c0c;hp=b81254a3972626cb1e187cd5ae23e953a4b72613;hpb=4c672be2e1f39e72eb7d7e99f129e61338f481b2;p=chaz%2Fopenbox diff --git a/openbox/grab.c b/openbox/grab.c index b81254a3..214666e5 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 @@ -37,11 +39,13 @@ static guint kgrabs = 0; static guint pgrabs = 0; /*! The time at which the last grab was made */ static Time grab_time = CurrentTime; +static gint passive_count = 0; -static Time ungrab_time() +static Time ungrab_time(void) { Time t = event_curtime; - if (!(t == CurrentTime || event_time_after(t, grab_time))) + if (grab_time == CurrentTime || + !(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. @@ -54,17 +58,17 @@ static Time ungrab_time() return t; } -gboolean grab_on_keyboard() +gboolean grab_on_keyboard(void) { return kgrabs > 0; } -gboolean grab_on_pointer() +gboolean grab_on_pointer(void) { return pgrabs > 0; } -gboolean grab_keyboard(gboolean grab) +gboolean grab_keyboard_full(gboolean grab) { gboolean ret = FALSE; @@ -75,8 +79,10 @@ gboolean grab_keyboard(gboolean grab) event_curtime) == Success; if (!ret) --kgrabs; - else + else { + passive_count = 0; grab_time = event_curtime; + } } else ret = TRUE; } else if (kgrabs > 0) { @@ -89,7 +95,8 @@ gboolean grab_keyboard(gboolean grab) return ret; } -gboolean grab_pointer(gboolean grab, gboolean owner_events, ObCursor cur) +gboolean grab_pointer_full(gboolean grab, gboolean owner_events, + gboolean confine, ObCursor cur) { gboolean ret = FALSE; @@ -97,7 +104,9 @@ gboolean grab_pointer(gboolean grab, gboolean owner_events, ObCursor cur) if (pgrabs++ == 0) { ret = XGrabPointer(ob_display, screen_support_win, owner_events, GRAB_PTR_MASK, - GrabModeAsync, GrabModeAsync, None, + GrabModeAsync, GrabModeAsync, + (confine ? RootWindow(ob_display, ob_screen) : + None), ob_cursor(cur), event_curtime) == Success; if (!ret) --pgrabs; @@ -134,17 +143,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); } @@ -152,8 +164,8 @@ void grab_shutdown(gboolean reconfig) { if (reconfig) return; - while (grab_keyboard(FALSE)); - while (grab_pointer(FALSE, FALSE, OB_CURSOR_NONE)); + while (ungrab_keyboard()); + while (ungrab_pointer()); while (grab_server(FALSE)); } @@ -162,19 +174,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) @@ -196,10 +203,27 @@ 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) { XUngrabKey(ob_display, AnyKey, AnyModifier, win); } + +void grab_key_passive_count(int change) +{ + if (grab_on_keyboard()) return; + passive_count += change; + if (passive_count < 0) passive_count = 0; +} + +void ungrab_passive_key(void) +{ + /*ob_debug("ungrabbing %d passive grabs\n", passive_count);*/ + if (passive_count) { + /* kill our passive grab */ + XUngrabKeyboard(ob_display, event_curtime); + passive_count = 0; + } +}