diff options
| author | runge <runge> | 2007-12-16 02:26:38 +0000 |
|---|---|---|
| committer | runge <runge> | 2007-12-16 02:26:38 +0000 |
| commit | 3d0bd73627f7aa19d45488eeee49781ca9faa0f8 (patch) | |
| tree | 6afda9c91d0be9cf6be2d0db0a094c0e76c38097 /x11vnc/x11vnc.c | |
| parent | 2689647d6c7a9ab9c88faacf5dbc0200e9bc4a24 (diff) | |
| download | libtdevnc-3d0bd73627f7aa19d45488eeee49781ca9faa0f8.tar.gz libtdevnc-3d0bd73627f7aa19d45488eeee49781ca9faa0f8.zip | |
x11vnc: fix find_display and usleep() prototype on macosx.
-display console and check DISPLAY /tmp/...:0 on macosx.
implement -noxinerama.
Diffstat (limited to 'x11vnc/x11vnc.c')
| -rw-r--r-- | x11vnc/x11vnc.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/x11vnc/x11vnc.c b/x11vnc/x11vnc.c index 33953cd..e738cfa 100644 --- a/x11vnc/x11vnc.c +++ b/x11vnc/x11vnc.c @@ -2860,6 +2860,8 @@ int main(int argc, char* argv[]) { blackout_str = strdup(argv[++i]); } else if (!strcmp(arg, "-xinerama")) { xinerama = 1; + } else if (!strcmp(arg, "-noxinerama")) { + xinerama = 0; } else if (!strcmp(arg, "-xtrap")) { xtrap_input = 1; } else if (!strcmp(arg, "-xrandr")) { @@ -4106,8 +4108,20 @@ if (0) fprintf(stderr, "XA: %s\n", getenv("XAUTHORITY")); } } +#ifdef MACOSX + if (use_dpy && !strcmp(use_dpy, "console")) { + ; + } else +#endif if (use_dpy) { dpy = XOpenDisplay_wr(use_dpy); +#ifdef MACOSX + } else if (!subwin && getenv("DISPLAY") + && strstr(getenv("DISPLAY"), "/tmp/") ) { + /* e.g. /tmp/launch-XlspvM/:0 on leopard */ + rfbLog("MacOSX: Ignoring $DISPLAY '%s'\n", getenv("DISPLAY")); + rfbLog("MacOSX: Use -display $DISPLAY to force it.\n"); +#endif } else if ( (use_dpy = getenv("DISPLAY")) ) { dpy = XOpenDisplay_wr(use_dpy); } else { |