summaryrefslogtreecommitdiffstats
path: root/x11vnc/cursor.c
diff options
context:
space:
mode:
Diffstat (limited to 'x11vnc/cursor.c')
-rw-r--r--x11vnc/cursor.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/x11vnc/cursor.c b/x11vnc/cursor.c
index 0be77f5..e003ae3 100644
--- a/x11vnc/cursor.c
+++ b/x11vnc/cursor.c
@@ -5,6 +5,7 @@
#include "cleanup.h"
#include "screen.h"
#include "scan.h"
+#include "unixpw.h"
int xfixes_present = 0;
int use_xfixes = 1;
@@ -1569,6 +1570,7 @@ void disable_cursor_shape_updates(rfbScreenInfoPtr s) {
if (! s || ! s->clientHead) {
return;
}
+ if (unixpw_in_progress) return;
iter = rfbGetClientIterator(s);
while( (cl = rfbClientIteratorNext(iter)) ) {
@@ -1760,6 +1762,8 @@ int check_x11_pointer(void) {
if (raw_fb && ! dpy) return 0; /* raw_fb hack */
+ if (unixpw_in_progress) return 0;
+
X_LOCK;
ret = XQueryPointer(dpy, rootwin, &root_w, &child_w, &root_x, &root_y,
&win_x, &win_y, &mask);