From a6149f349e6b3f4d8666af051390757b1b910a37 Mon Sep 17 00:00:00 2001 From: runge Date: Tue, 13 Apr 2004 23:56:54 +0000 Subject: x11vnc: do not send selection unless all clients are in RFB_NORMAL state. increase rfbMaxClientWait when threaded to avoid ReadExact() timeouts for some viewers. --- ChangeLog | 6 ++++++ contrib/ChangeLog | 6 ++++++ contrib/x11vnc.c | 52 +++++++++++++++++++++++++++++++++++++++++++++------- 3 files changed, 57 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index b45437c..e468106 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-03-13 Karl Runge + * x11vnc: do not send selection unless all clients + are in RFB_NORMAL state. + * increase rfbMaxClientWait when threaded to avoid + ReadExact() timeouts for some viewers. + 2004-03-10 Karl Runge * x11vnc options -blackout, -xinerama, -xwarppointer * modify configure.ac to pick up -lXinerama diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 5ac9f10..7691e94 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,9 @@ +2004-04-13 Karl Runge + * solve problem with sending selection when client initializing + (not yet in RFB_NORMAL state). Increase delay to 15s as well. + * when threaded: limit rfbMaxClientWait to >= 20 secs and + increase it to a huge value unless -rfbwait is supplied. + 2004-04-08 Karl Runge * added support for blacking out regions of the screen, primarily for Xinerama usage, options: -blackout -xinerama diff --git a/contrib/x11vnc.c b/contrib/x11vnc.c index 06505b4..12a23e1 100644 --- a/contrib/x11vnc.c +++ b/contrib/x11vnc.c @@ -1323,7 +1323,7 @@ int watch_selection = 1; /* normal selection/cutbuffer maintenance */ int watch_primary = 1; /* more dicey, poll for changes in PRIMARY */ int own_selection = 0; /* whether we currently own PRIMARY or not */ int set_cutbuffer = 0; /* to avoid bouncing the CutText right back */ -int sel_waittime = 5; /* some seconds to skip before first send */ +int sel_waittime = 15; /* some seconds to skip before first send */ Window selwin; /* special window for our selection */ /* @@ -1406,6 +1406,23 @@ void selection_request(XEvent *ev) { XFlush(dpy); } +int all_clients_initialized() { + rfbClientIteratorPtr iter; + rfbClientPtr cl; + int ok = 1; + + iter = rfbGetClientIterator(screen); + while( (cl = rfbClientIteratorNext(iter)) ) { + if (cl->state != RFB_NORMAL) { + ok = 0; + break; + } + } + rfbReleaseClientIterator(iter); + + return ok; +} + /* * CUT_BUFFER0 property on the local display has changed, we read and * store it and send it out to any connected VNC clients. @@ -1445,6 +1462,11 @@ void cutbuffer_send() { selection_str[PROP_MAX] = '\0'; + if (! all_clients_initialized()) { + rfbLog("cutbuffer_send: no send: uninitialized clients\n"); + return; /* some clients initializing, cannot send */ + } + /* now send it to any connected VNC clients (rfbServerCutText) */ rfbSendServerCutText(screen, selection_str, strlen(selection_str)); } @@ -1531,6 +1553,11 @@ void selection_send(XEvent *ev) { return; } + if (! all_clients_initialized()) { + rfbLog("selection_send: no send: uninitialized clients\n"); + return; /* some clients initializing, cannot send */ + } + /* now send it to any connected VNC clients (rfbServerCutText) */ rfbSendServerCutText(screen, selection_str, newlen); } @@ -4069,8 +4096,8 @@ void ping_clients(int tile_cnt) { static time_t last_send = 0; time_t now = time(0); - if (rfbMaxClientWait <= 3000) { - rfbMaxClientWait = 3000; + if (rfbMaxClientWait < 20000) { + rfbMaxClientWait = 20000; rfbLog("reset rfbMaxClientWait to %d ms.\n", rfbMaxClientWait); } @@ -4777,9 +4804,11 @@ void print_help() { " on touchscreens or other non-standard setups).\n" "-buttonmap str String to remap mouse buttons. Format: IJK-LMN, this\n" " maps buttons I -> L, etc., e.g. -buttonmap 13-31\n" -"-nodragging Do not update the display during mouse dragging events.\n" -" Greatly improves response on slow setups, but you lose\n" -" all visual feedback for drags and some menu traversals.\n" +"-nodragging Do not update the display during mouse dragging events\n" +" (mouse motion with a button held down). Greatly\n" +" improves response on slow setups, but you lose all\n" +" visual feedback for drags, text selection, and some\n" +" menu traversals.\n" "-old_pointer Do not use the new pointer input handling mechanisms.\n" " See check_input() and pointer() for details.\n" "-input_skip n For the old pointer handling when non-threaded: try to\n" @@ -4886,7 +4915,7 @@ int main(int argc, char** argv) { int pw_loc = -1; int dt = 0; int bg = 0; - int got_waitms = 0; + int got_waitms = 0, got_rfbwait = 0; /* used to pass args we do not know about to rfbGetScreen(): */ int argc2 = 1; char *argv2[100]; @@ -5030,6 +5059,9 @@ int main(int argc, char** argv) { if (!strcmp(arg, "-passwd")) { pw_loc = i; } + if (!strcmp(arg, "-rfbwait")) { + got_rfbwait = 1; + } /* otherwise copy it for use below. */ if (! quiet && i != pw_loc && i != pw_loc+1) { fprintf(stderr, "passing arg to libvncserver: %s\n", @@ -5076,6 +5108,12 @@ int main(int argc, char** argv) { bg = 0; } + /* increase rfbwait if threaded */ + if (use_threads && ! got_rfbwait) { + argv2[argc2++] = "-rfbwait"; + argv2[argc2++] = "604800000"; /* one week... */ + } + if (! quiet) { fprintf(stderr, "\n"); fprintf(stderr, "viewonly: %d\n", view_only); -- cgit v1.2.3