summaryrefslogtreecommitdiffstats
path: root/x11vnc/scan.c
diff options
context:
space:
mode:
authorrunge <runge>2006-02-25 05:10:37 +0000
committerrunge <runge>2006-02-25 05:10:37 +0000
commit79310af7e7a289d2baf1bdc295daefdcc76ecc0e (patch)
treeda68674a1beef5ce0ba807187657ca5fe215f68c /x11vnc/scan.c
parentb7773ea6e683e5fcfae5bf020828596c5f90b7d3 (diff)
downloadlibtdevnc-79310af7e7a289d2baf1bdc295daefdcc76ecc0e.tar.gz
libtdevnc-79310af7e7a289d2baf1bdc295daefdcc76ecc0e.zip
x11vnc: -unixpw and -stunnel. Add clipboard to input control.
Diffstat (limited to 'x11vnc/scan.c')
-rw-r--r--x11vnc/scan.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/x11vnc/scan.c b/x11vnc/scan.c
index fd408ce..6a50748 100644
--- a/x11vnc/scan.c
+++ b/x11vnc/scan.c
@@ -10,6 +10,7 @@
#include "screen.h"
#include "pointer.h"
#include "cleanup.h"
+#include "unixpw.h"
/*
* routines for scanning and reading the X11 display for changes, and
@@ -1951,6 +1952,7 @@ int copy_screen(void) {
if (! fs_factor) {
return 0;
}
+ if (unixpw_in_progress) return 0;
block_size = (dpy_x * (dpy_y/fs_factor) * pixelsize);
@@ -2398,6 +2400,8 @@ int scan_for_updates(int count_only) {
double frac3 = 0.02; /* do scan_display() again after copy_tiles() */
static double last_poll = 0.0;
+ if (unixpw_in_progress) return 0;
+
if (slow_fb > 0.0) {
double now = dnow();
if (now < last_poll + slow_fb) {