From 79310af7e7a289d2baf1bdc295daefdcc76ecc0e Mon Sep 17 00:00:00 2001
From: runge <runge>
Date: Sat, 25 Feb 2006 05:10:37 +0000
Subject:  x11vnc: -unixpw and -stunnel.  Add clipboard to input control.

---
 x11vnc/xevents.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'x11vnc/xevents.c')

diff --git a/x11vnc/xevents.c b/x11vnc/xevents.c
index e25a118..58b9a55 100644
--- a/x11vnc/xevents.c
+++ b/x11vnc/xevents.c
@@ -11,6 +11,7 @@
 #include "cursor.h"
 #include "gui.h"
 #include "connections.h"
+#include "unixpw.h"
 
 /* XXX CHECK BEFORE RELEASE */
 int grab_buster = 0;
@@ -553,6 +554,8 @@ void check_keycode_state(void) {
 
 	if (raw_fb && ! dpy) return;	/* raw_fb hack */
 
+	if (unixpw_in_progress) return;
+
 	/*
 	 * periodically update our model of the keycode_state[]
 	 * by correlating with the Xserver.  wait for a pause in
@@ -578,6 +581,9 @@ void check_autorepeat(void) {
 	if (now <= last_check + 1) {
 		return;
 	}
+
+	if (unixpw_in_progress) return;
+
 	last_check = now;
 
 	autorepeat_is_on = get_autorepeat_state();
@@ -651,6 +657,8 @@ void check_xevents(void) {
 
 	if (raw_fb && ! dpy) return;	/* raw_fb hack */
 
+	if (unixpw_in_progress) return;
+
 	if (now > last_init_check+1) {
 		last_init_check = now;
 		initialize_xevents();
@@ -935,6 +943,8 @@ void xcut_receive(char *text, int len, rfbClientPtr cl) {
 
 	if (raw_fb && ! dpy) return;	/* raw_fb hack */
 
+	if (unixpw_in_progress) return;
+
 	if (!watch_selection) {
 		return;
 	}
@@ -945,8 +955,7 @@ void xcut_receive(char *text, int len, rfbClientPtr cl) {
 		return;
 	}
 	get_allowed_input(cl, &input);
-	if (!input.keystroke && !input.motion && !input.button) {
-		/* maybe someday KMBC for cut text... */
+	if (!input.clipboard) {
 		return;
 	}
 
-- 
cgit v1.2.1