X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fgrab.c;h=4518c4339890dc435e744b3d8c996e842a5dce61;hb=HEAD;hp=e92722a6a48e1c0daab0cca054ea9f292bac0fa7;hpb=6372bd7c0d68793c2371ce7b6c1aa8017f913aee;p=chaz%2Fopenbox diff --git a/openbox/grab.c b/openbox/grab.c index e92722a6..4518c433 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 @@ -20,8 +20,10 @@ #include "grab.h" #include "openbox.h" #include "event.h" -#include "xerror.h" #include "screen.h" +#include "debug.h" +#include "obt/display.h" +#include "obt/keyboard.h" #include #include @@ -37,11 +39,14 @@ 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 ObtIC *ic = NULL; -static Time ungrab_time() +static Time ungrab_time(void) { - Time t = event_curtime; - if (!(t == CurrentTime || event_time_after(t, grab_time))) + Time t = event_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,34 +59,46 @@ static Time ungrab_time() return t; } -gboolean grab_on_keyboard() +static Window grab_window(void) +{ + return screen_support_win; +} + +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) +ObtIC *grab_input_context(void) +{ + return ic; +} + +gboolean grab_keyboard_full(gboolean grab) { gboolean ret = FALSE; if (grab) { if (kgrabs++ == 0) { - ret = XGrabKeyboard(ob_display, RootWindow(ob_display, ob_screen), - FALSE, GrabModeAsync, GrabModeAsync, - event_curtime) == Success; + ret = XGrabKeyboard(obt_display, grab_window(), + False, GrabModeAsync, GrabModeAsync, + event_time()) == Success; if (!ret) --kgrabs; - else - grab_time = event_curtime; + else { + passive_count = 0; + grab_time = event_time(); + } } else ret = TRUE; } else if (kgrabs > 0) { if (--kgrabs == 0) { - XUngrabKeyboard(ob_display, ungrab_time()); + XUngrabKeyboard(obt_display, ungrab_time()); } ret = TRUE; } @@ -89,50 +106,27 @@ gboolean grab_keyboard(gboolean grab) return ret; } -gboolean grab_pointer(gboolean grab, 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) { - XUngrabPointer(ob_display, ungrab_time()); - } - ret = TRUE; - } - return ret; -} - -gboolean grab_pointer_window(gboolean grab, ObCursor cur, Window win) +gboolean grab_pointer_full(gboolean grab, gboolean owner_events, + gboolean confine, ObCursor cur) { gboolean ret = FALSE; if (grab) { if (pgrabs++ == 0) { - ret = XGrabPointer(ob_display, win, False, GRAB_PTR_MASK, - GrabModeAsync, GrabModeAsync, None, - ob_cursor(cur), - event_curtime) == Success; + ret = XGrabPointer(obt_display, grab_window(), owner_events, + GRAB_PTR_MASK, + GrabModeAsync, GrabModeAsync, + (confine ? obt_root(ob_screen) : None), + ob_cursor(cur), event_time()) == Success; if (!ret) --pgrabs; else - grab_time = event_curtime; + grab_time = event_time(); } else ret = TRUE; } else if (pgrabs > 0) { if (--pgrabs == 0) { - XUngrabPointer(ob_display, ungrab_time()); + XUngrabPointer(obt_display, ungrab_time()); } ret = TRUE; } @@ -144,13 +138,13 @@ gint grab_server(gboolean grab) static guint sgrabs = 0; if (grab) { if (sgrabs++ == 0) { - XGrabServer(ob_display); - XSync(ob_display, FALSE); + XGrabServer(obt_display); + XSync(obt_display, FALSE); } } else if (sgrabs > 0) { if (--sgrabs == 0) { - XUngrabServer(ob_display); - XFlush(ob_display); + XUngrabServer(obt_display); + XFlush(obt_display); } } return sgrabs; @@ -159,27 +153,34 @@ gint grab_server(gboolean grab) void grab_startup(gboolean reconfig) { guint i = 0; + guint num, caps, scroll; - if (reconfig) return; + num = obt_keyboard_modkey_to_modmask(OBT_KEYBOARD_MODKEY_NUMLOCK); + caps = obt_keyboard_modkey_to_modmask(OBT_KEYBOARD_MODKEY_CAPSLOCK); + scroll = obt_keyboard_modkey_to_modmask(OBT_KEYBOARD_MODKEY_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); + + ic = obt_keyboard_context_new(obt_root(ob_screen), grab_window()); } void grab_shutdown(gboolean reconfig) { + obt_keyboard_context_unref(ic); + ic = NULL; + if (reconfig) return; - while (grab_keyboard(FALSE)); - while (grab_pointer(FALSE, OB_CURSOR_NONE)); - while (grab_pointer_window(FALSE, OB_CURSOR_NONE, None)); + while (ungrab_keyboard()); + while (ungrab_pointer()); while (grab_server(FALSE)); } @@ -188,19 +189,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_occured = FALSE; + /* can get BadAccess from these */ + obt_display_ignore_errors(TRUE); 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)); - 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); + XGrabButton(obt_display, button, state | mask_list[i], win, False, + mask, pointer_mode, GrabModeAsync, None, ob_cursor(cur)); + obt_display_ignore_errors(FALSE); + if (obt_display_error_occured) + ob_debug("Failed to grab button %d modifiers %d", button, state); } void ungrab_button(guint button, guint state, Window win) @@ -208,24 +204,41 @@ void ungrab_button(guint button, guint state, Window win) guint i; for (i = 0; i < MASK_LIST_SIZE; ++i) - XUngrabButton(ob_display, button, state | mask_list[i], win); + XUngrabButton(obt_display, button, state | mask_list[i], win); } void grab_key(guint keycode, guint state, Window win, gint keyboard_mode) { guint i; - xerror_set_ignore(TRUE); /* can get BadAccess' from these */ - xerror_occured = FALSE; + /* can get BadAccess' from these */ + obt_display_ignore_errors(TRUE); for (i = 0; i < MASK_LIST_SIZE; ++i) - XGrabKey(ob_display, keycode, state | mask_list[i], win, FALSE, + XGrabKey(obt_display, keycode, state | mask_list[i], win, FALSE, GrabModeAsync, keyboard_mode); - xerror_set_ignore(FALSE); - if (xerror_occured) - g_warning("failed to grab keycode %d modifiers %d", keycode, state); + obt_display_ignore_errors(FALSE); + if (obt_display_error_occured) + ob_debug("Failed to grab keycode %d modifiers %d", keycode, state); } void ungrab_all_keys(Window win) { - XUngrabKey(ob_display, AnyKey, AnyModifier, win); + XUngrabKey(obt_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(obt_display, event_time()); + passive_count = 0; + } }