nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make sure the ungrab happens after the grab. fracking X server doesn't have a monatomic clock..

Browse source
This commit is contained in:
Dana Jansens 2007-03-28 01:11:40 +00:00
parent 35c8d482fc
commit 0ec2282e2c
1 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
openbox/grab.c
View file

@ -35,6 +35,8 @@
static guint mask_list[MASK_LIST_SIZE]; static guint mask_list[MASK_LIST_SIZE];
static guint kgrabs = 0; static guint kgrabs = 0;
static guint pgrabs = 0; static guint pgrabs = 0;
/*! The time at which the last grab was made */
static Time grab_time = CurrentTime;
gboolean grab_on_keyboard() gboolean grab_on_keyboard()
{ {
@ -57,11 +59,17 @@ gboolean grab_keyboard(gboolean grab)
event_curtime) == Success; event_curtime) == Success;
if (!ret) if (!ret)
--kgrabs; --kgrabs;
else
grab_time = event_curtime;
} else } else
ret = TRUE; ret = TRUE;
} else if (kgrabs > 0) { } else if (kgrabs > 0) {
if (--kgrabs == 0) if (--kgrabs == 0) {
XUngrabKeyboard(ob_display, event_curtime); Time t = event_curtime;
if (t != 0 && t < grab_time)
t = grab_time;
XUngrabKeyboard(ob_display, t);
}
ret = TRUE; ret = TRUE;
} }
@ -80,10 +88,15 @@ gboolean grab_pointer(gboolean grab, ObCursor cur)
ob_cursor(cur), event_curtime) == Success; ob_cursor(cur), event_curtime) == Success;
if (!ret) if (!ret)
--pgrabs; --pgrabs;
else
grab_time = event_curtime;
} else } else
ret = TRUE; ret = TRUE;
} else if (pgrabs > 0) { } else if (pgrabs > 0) {
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, event_curtime);
} }
ret = TRUE; ret = TRUE;
@ -103,10 +116,15 @@ gboolean grab_pointer_window(gboolean grab, ObCursor cur, Window win)
event_curtime) == Success; event_curtime) == Success;
if (!ret) if (!ret)
--pgrabs; --pgrabs;
else
grab_time = event_curtime;
} else } else
ret = TRUE; ret = TRUE;
} else if (pgrabs > 0) { } else if (pgrabs > 0) {
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, event_curtime);
} }
ret = TRUE; ret = TRUE;