diff options
author | runge <runge> | 2006-12-28 05:24:25 +0000 |
---|---|---|
committer | runge <runge> | 2006-12-28 05:24:25 +0000 |
commit | 56eb45a5f8ab93abb1e15d4c0b8214d06a3d6d18 (patch) | |
tree | 34da978baeba2c625611bcaaf8cba8571ab00f8b /x11vnc/connections.c | |
parent | 8aa6fb9523957c7f4a3f14fb2c90ea9f9292a41f (diff) | |
download | libvncserver-56eb45a5f8ab93abb1e15d4c0b8214d06a3d6d18.zip libvncserver-56eb45a5f8ab93abb1e15d4c0b8214d06a3d6d18.tar.gz |
x11vnc: more work on -ncache.
Diffstat (limited to 'x11vnc/connections.c')
-rw-r--r-- | x11vnc/connections.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/x11vnc/connections.c b/x11vnc/connections.c index 006b819..fd44018 100644 --- a/x11vnc/connections.c +++ b/x11vnc/connections.c @@ -1033,7 +1033,7 @@ static unsigned char t2x2_bits[] = { XSetStandardProperties(dpy, awin, sprop, "x11vnc query", ico, NULL, 0, &hints); - XSelectInput(dpy, awin, evmask); + XSelectInput_wr(dpy, awin, evmask); if (! font_info && (font_info = XLoadQueryFont(dpy, "fixed")) == NULL) { rfbLogEnable(1); @@ -1209,7 +1209,7 @@ static unsigned char t2x2_bits[] = { } if (out != -1) { ret = out; - XSelectInput(dpy, awin, 0); + XSelectInput_wr(dpy, awin, 0); XUnmapWindow(dpy, awin); XFree_wr(gc); XDestroyWindow(dpy, awin); @@ -1554,7 +1554,7 @@ static void check_connect_file(char *file) { rfbLog("read connect file: %s\n", str); } if (!strcmp(str, "cmd=stop") && - dnow() - x11vnc_start < 3.0) { + dnowx() < 3.0) { rfbLog("ignoring stale cmd=stop\n"); } else { client_connect = str; @@ -2131,6 +2131,10 @@ enum rfbNewClientAction new_client(rfbClientPtr client) { accepted_client = 1; last_client = time(NULL); + if (ncache) { + check_ncache(1, 0); + } + if (unixpw) { unixpw_in_progress = 1; unixpw_client = client; |