diff options
| author | runge <runge> | 2008-01-15 04:27:11 +0000 |
|---|---|---|
| committer | runge <runge> | 2008-01-15 04:27:11 +0000 |
| commit | c07091b3900ad1d66bb9665a892bf93c685d031a (patch) | |
| tree | 13be8939702009f53bffec7d85ff61a5fe13789a /x11vnc/x11vnc.c | |
| parent | 649f5b2b4615ae67d97eff7f3fa246a1ac41edf9 (diff) | |
| download | libtdevnc-c07091b3900ad1d66bb9665a892bf93c685d031a.tar.gz libtdevnc-c07091b3900ad1d66bb9665a892bf93c685d031a.zip | |
x11vnc: -ping option, fix memory corruption in copy_tiles after xrandr resize.
Diffstat (limited to 'x11vnc/x11vnc.c')
| -rw-r--r-- | x11vnc/x11vnc.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/x11vnc/x11vnc.c b/x11vnc/x11vnc.c index df2c11b..e5b0589 100644 --- a/x11vnc/x11vnc.c +++ b/x11vnc/x11vnc.c @@ -1873,6 +1873,7 @@ static void print_settings(int try_http, int bg, char *gui_str) { fprintf(stderr, " shared: %d\n", shared); fprintf(stderr, " conn_once: %d\n", connect_once); fprintf(stderr, " timeout: %d\n", first_conn_timeout); + fprintf(stderr, " ping: %d\n", ping_interval); fprintf(stderr, " inetd: %d\n", inetd); fprintf(stderr, " tightfilexfer: %d\n", tightfilexfer); fprintf(stderr, " http: %d\n", try_http); @@ -2265,6 +2266,9 @@ char msg2[] = if (raw_fb_str && !macosx_console) { return; } + if (quiet) { + return; + } if (nofb) { return; } @@ -3221,6 +3225,9 @@ int main(int argc, char* argv[]) { } else if (!strcmp(arg, "-readtimeout")) { CHECK_ARGC rfbMaxClientWait = atoi(argv[++i]) * 1000; + } else if (!strcmp(arg, "-ping")) { + CHECK_ARGC + ping_interval = atoi(argv[++i]); } else if (!strcmp(arg, "-nap")) { take_naps = 1; } else if (!strcmp(arg, "-nonap")) { |