diff options
| author | runge <runge> | 2006-06-18 23:59:45 +0000 |
|---|---|---|
| committer | runge <runge> | 2006-06-18 23:59:45 +0000 |
| commit | 64e731a9da82e3cc614e274d6fca6f855d0359b7 (patch) | |
| tree | 540bca0a021f3e74b768a747bc3d75435848ca0d /x11vnc/xwrappers.c | |
| parent | 363ae71df0f25b018136d19eed20be954e1dd088 (diff) | |
| download | libtdevnc-64e731a9da82e3cc614e274d6fca6f855d0359b7.tar.gz libtdevnc-64e731a9da82e3cc614e274d6fca6f855d0359b7.zip | |
x11vnc: --grabkbd, -grabptr, -env, -allowedcmds, unixpw+WAIT user fred:options
Diffstat (limited to 'x11vnc/xwrappers.c')
| -rw-r--r-- | x11vnc/xwrappers.c | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/x11vnc/xwrappers.c b/x11vnc/xwrappers.c index 88413b6..d58e914 100644 --- a/x11vnc/xwrappers.c +++ b/x11vnc/xwrappers.c @@ -3,6 +3,7 @@ #include "x11vnc.h" #include "xrecord.h" #include "keyboard.h" +#include "xevents.h" int xshm_present = 0; int xtest_present = 0; @@ -601,8 +602,15 @@ void XTestFakeKeyEvent_wr(Display* dpy, KeyCode key, Bool down, last_keyboard_keycode = key; } + if (grab_kbd) { + XUngrabKeyboard(dpy, CurrentTime); + } + if (xtrap_input) { XTRAP_FakeKeyEvent_wr(dpy, key, down, delay); + if (grab_kbd) { + adjust_grabs(1, 1); + } return; } @@ -616,6 +624,9 @@ void XTestFakeKeyEvent_wr(Display* dpy, KeyCode key, Bool down, } #if LIBVNCSERVER_HAVE_XTEST XTestFakeKeyEvent(dpy, key, down, delay); + if (grab_kbd) { + adjust_grabs(1, 1); + } if (debug_keyboard) { upup_downdown_warning(key, down); } @@ -648,8 +659,15 @@ void XTestFakeButtonEvent_wr(Display* dpy, unsigned int button, Bool is_press, RAWFB_RET_VOID + if (grab_ptr) { + XUngrabPointer(dpy, CurrentTime); + } + if (xtrap_input) { XTRAP_FakeButtonEvent_wr(dpy, button, is_press, delay); + if (grab_ptr) { + adjust_grabs(1, 1); + } return; } @@ -664,6 +682,9 @@ void XTestFakeButtonEvent_wr(Display* dpy, unsigned int button, Bool is_press, #if LIBVNCSERVER_HAVE_XTEST XTestFakeButtonEvent(dpy, button, is_press, delay); #endif + if (grab_ptr) { + adjust_grabs(1, 1); + } } void XTRAP_FakeMotionEvent_wr(Display* dpy, int screen, int x, int y, @@ -690,8 +711,15 @@ void XTestFakeMotionEvent_wr(Display* dpy, int screen, int x, int y, RAWFB_RET_VOID + if (grab_ptr) { + XUngrabPointer(dpy, CurrentTime); + } + if (xtrap_input) { XTRAP_FakeMotionEvent_wr(dpy, screen, x, y, delay); + if (grab_ptr) { + adjust_grabs(1, 1); + } return; } @@ -702,6 +730,9 @@ void XTestFakeMotionEvent_wr(Display* dpy, int screen, int x, int y, #if LIBVNCSERVER_HAVE_XTEST XTestFakeMotionEvent(dpy, screen, x, y, delay); #endif + if (grab_ptr) { + adjust_grabs(1, 1); + } } Bool XTestCompareCurrentCursorWithWindow_wr(Display* dpy, Window w) { |