summaryrefslogtreecommitdiffstats
path: root/x11vnc/xwrappers.c
diff options
context:
space:
mode:
authorrunge <runge>2009-02-04 03:05:32 +0000
committerrunge <runge>2009-02-04 03:05:32 +0000
commite59f78c5eaae3d7d0f98db064df0c85b1da1c7b9 (patch)
tree8ea60591ff85ae29c6134e04baedd8cf8373c60a /x11vnc/xwrappers.c
parent3998c18e263b0c73af7451e2af2f40fb305520bf (diff)
downloadlibvncserver-e59f78c5eaae3d7d0f98db064df0c85b1da1c7b9.zip
libvncserver-e59f78c5eaae3d7d0f98db064df0c85b1da1c7b9.tar.gz
x11vnc: Add "sendbell" remote cmd. Fix copyrect updates under
-reflect. Workaround that checks valid window of selection requestor. Wait on some ssl helper pids earlier. Workaround XAUTHLOCALHOSTNAME for some new usage modes. Set fake fb to requested bpp with correct masks. -padgeom once:... mode. Set LIBXCB_ALLOW_SLOPPY_LOCK by default. rfbRandomBytes earlier. classes/ssl: Update jars. Add "TOP_" dropdown customization to ultravnc java viewer applet FTP panel.
Diffstat (limited to 'x11vnc/xwrappers.c')
-rw-r--r--x11vnc/xwrappers.c18
1 files changed, 18 insertions, 0 deletions
diff --git a/x11vnc/xwrappers.c b/x11vnc/xwrappers.c
index 282c221..04b727c 100644
--- a/x11vnc/xwrappers.c
+++ b/x11vnc/xwrappers.c
@@ -1262,6 +1262,24 @@ Display *XOpenDisplay_wr(char *display_name) {
d = XOpenDisplay(display_name);
if (db) fprintf(stderr, "XOpenDisplay_wr: %s %p\n", display_name, (void *)d);
+ if (d == NULL) {
+ if (!getenv("NO_XAUTHLOCALHOSTNAME")) {
+ if (!getenv("XAUTHLOCALHOSTNAME")) {
+ rfbLog("XOpenDisplay(\"%s\") failed.\n",
+ display_name ? display_name : "");
+ rfbLog("Trying again with XAUTHLOCALHOSTNAME=localhost ...\n");
+ set_env("XAUTHLOCALHOSTNAME", "localhost");
+ d = XOpenDisplay(display_name);
+ if (0) {
+ char *ptr = getenv("XAUTHLOCALHOSTNAME");
+ if (ptr) {
+ *(ptr-2) = '_'; /* yow */
+ }
+ }
+ }
+ }
+ }
+
xauth_raw(0);
return d;
OpenPOWER on IntegriCloud