diff options
| author | runge <runge@karlrunge.com> | 2010-04-18 19:37:37 -0400 |
|---|---|---|
| committer | runge <runge@karlrunge.com> | 2010-04-18 19:37:37 -0400 |
| commit | b74c8f4241ec8c3d972ee97d0ce9a399ddd09ce1 (patch) | |
| tree | c8c8aaec90fd51a10790795030777b2dda548fe7 /x11vnc/x11vnc.c | |
| parent | 2a8ba97ec5b0f7fbfcfc8adab6732a95e95c7204 (diff) | |
| download | libtdevnc-b74c8f4241ec8c3d972ee97d0ce9a399ddd09ce1.tar.gz libtdevnc-b74c8f4241ec8c3d972ee97d0ce9a399ddd09ce1.zip | |
Improvements to demo scripts. Alias -coe for -connect_or_exit. Fix HAVE_V4L2. Warn no Xvfb, Xdummy, or Xvnc. Xinerama screens.
Diffstat (limited to 'x11vnc/x11vnc.c')
| -rw-r--r-- | x11vnc/x11vnc.c | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/x11vnc/x11vnc.c b/x11vnc/x11vnc.c index 3d91918..96238b6 100644 --- a/x11vnc/x11vnc.c +++ b/x11vnc/x11vnc.c @@ -2364,8 +2364,8 @@ int main(int argc, char* argv[]) { overlay_cursor = 2; continue; } -#if !SKIP_8TO24 if (!strcmp(arg, "-8to24")) { +#if !SKIP_8TO24 cmap8to24 = 1; if (i < argc-1) { char *s = argv[i+1]; @@ -2374,9 +2374,9 @@ int main(int argc, char* argv[]) { i++; } } +#endif continue; } -#endif if (!strcmp(arg, "-24to32")) { xform24to32 = 1; continue; @@ -2481,10 +2481,13 @@ int main(int argc, char* argv[]) { continue; } if (!strcmp(arg, "-connect") || - !strcmp(arg, "-connect_or_exit")) { + !strcmp(arg, "-connect_or_exit") || + !strcmp(arg, "-coe")) { CHECK_ARGC if (!strcmp(arg, "-connect_or_exit")) { connect_or_exit = 1; + } else if (!strcmp(arg, "-coe")) { + connect_or_exit = 1; } if (strchr(argv[++i], '/') && !strstr(argv[i], "repeater://")) { struct stat sb; @@ -2522,20 +2525,27 @@ int main(int argc, char* argv[]) { continue; } if (!strcmp(arg, "-listen6")) { +#if X11VNC_IPV6 listen_str6 = strdup(argv[++i]); +#endif continue; } if (!strcmp(arg, "-nolookup")) { host_lookup = 0; continue; } -#if X11VNC_IPV6 if (!strcmp(arg, "-6")) { +#if X11VNC_IPV6 ipv6_listen = 1; + got_ipv6_listen = 1; +#endif continue; } if (!strcmp(arg, "-no6")) { +#if X11VNC_IPV6 ipv6_listen = 0; + got_ipv6_listen = 0; +#endif continue; } if (!strcmp(arg, "-noipv6")) { @@ -2546,7 +2556,7 @@ int main(int argc, char* argv[]) { noipv4 = 1; continue; } -#endif + if (!strcmp(arg, "-input")) { CHECK_ARGC allowed_input_str = strdup(argv[++i]); @@ -5785,7 +5795,7 @@ int main(int argc, char* argv[]) { } else { rfbLogEnable(1); rfbLog("Error: could not obtain listening port.\n"); - if (!got_rfbport) { + if (!got_rfbport && !got_ipv6_listen) { rfbLog("If this system is IPv6-only, use the -6 option.\n"); } clean_up_exit(1); |