X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fgrab.c;h=e7bd41d957deb1a75ee05587c9195a6a9681a41b;hb=2442cdfd85e5229c7ee4ac49ca66a7d55ffcb919;hp=f42ea67348fdc5562eab75b822d3fb58b8ac8f0e;hpb=c4e4760c41f10aae6af19a4363cb247c71edee4b;p=chaz%2Fopenbox diff --git a/openbox/grab.c b/openbox/grab.c index f42ea673..e7bd41d9 100644 --- a/openbox/grab.c +++ b/openbox/grab.c @@ -1,7 +1,8 @@ -/* -*- indent-tabs-mode: t; tab-width: 4; c-basic-offset: 4; -*- +/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- grab.c for the Openbox window manager - Copyright (c) 2003 Ben Jansens + Copyright (c) 2006 Mikael Magnusson + 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 @@ -21,6 +22,7 @@ #include "event.h" #include "xerror.h" #include "screen.h" +#include "debug.h" #include #include @@ -31,66 +33,83 @@ #define MASK_LIST_SIZE 8 /*! A list of all possible combinations of keyboard lock masks */ -static unsigned int mask_list[MASK_LIST_SIZE]; +static guint mask_list[MASK_LIST_SIZE]; +static guint kgrabs = 0; +static guint pgrabs = 0; +/*! The time at which the last grab was made */ +static Time grab_time = CurrentTime; -gboolean grab_keyboard(gboolean grab) +static Time ungrab_time() { - static guint kgrabs = 0; - gboolean ret = FALSE; + 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; +} - if (grab) { - if (kgrabs++ == 0) - ret = XGrabKeyboard(ob_display, RootWindow(ob_display, ob_screen), - FALSE, GrabModeAsync, GrabModeAsync, - event_lasttime) == Success; - else - ret = TRUE; - } else if (kgrabs > 0) { - if (--kgrabs == 0) - XUngrabKeyboard(ob_display, event_lasttime); - ret = TRUE; - } +gboolean grab_on_keyboard() +{ + return kgrabs > 0; +} - return ret; +gboolean grab_on_pointer() +{ + return pgrabs > 0; } -gboolean grab_pointer(gboolean grab, ObCursor cur) +gboolean grab_keyboard(gboolean grab) { - static guint pgrabs = 0; gboolean ret = FALSE; if (grab) { - 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 (kgrabs++ == 0) { + ret = XGrabKeyboard(ob_display, RootWindow(ob_display, ob_screen), + False, GrabModeAsync, GrabModeAsync, + event_curtime) == Success; + if (!ret) + --kgrabs; + else + grab_time = event_curtime; + } else ret = TRUE; - } else if (pgrabs > 0) { - if (--pgrabs == 0) - XUngrabPointer(ob_display, event_lasttime); + } else if (kgrabs > 0) { + if (--kgrabs == 0) { + XUngrabKeyboard(ob_display, ungrab_time()); + } ret = TRUE; } + return ret; } -gboolean grab_pointer_window(gboolean grab, ObCursor cur, Window win) +gboolean grab_pointer(gboolean grab, gboolean owner_events, ObCursor cur) { - static guint pgrabs = 0; gboolean ret = FALSE; if (grab) { - if (pgrabs++ == 0) - ret = XGrabPointer(ob_display, win, False, GRAB_PTR_MASK, - GrabModeAsync, GrabModeAsync, TRUE, - ob_cursor(cur), - event_lasttime) == Success; - else + if (pgrabs++ == 0) { + ret = XGrabPointer(ob_display, screen_support_win, owner_events, + 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, event_lasttime); + if (--pgrabs == 0) { + XUngrabPointer(ob_display, ungrab_time()); + } ret = TRUE; } return ret; @@ -135,24 +154,23 @@ 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)); } void grab_button_full(guint button, guint state, Window win, guint mask, - int pointer_mode, ObCursor cur) + gint pointer_mode, ObCursor cur) { 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)); xerror_set_ignore(FALSE); if (xerror_occured) - g_warning("failed to grab button %d modifiers %d", button, state); + ob_debug("Failed to grab button %d modifiers %d", button, state); } void grab_button(guint button, guint state, Window win, guint mask) @@ -168,7 +186,7 @@ void ungrab_button(guint button, guint state, Window win) XUngrabButton(ob_display, button, state | mask_list[i], win); } -void grab_key(guint keycode, guint state, Window win, int keyboard_mode) +void grab_key(guint keycode, guint state, Window win, gint keyboard_mode) { guint i; @@ -179,7 +197,7 @@ void grab_key(guint keycode, guint state, Window win, int 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)