summaryrefslogtreecommitdiffstats
path: root/x11vnc/xinerama.c
diff options
context:
space:
mode:
authorrunge <runge@karlrunge.com>2009-12-02 22:09:51 -0500
committerrunge <runge@karlrunge.com>2009-12-02 22:09:51 -0500
commit00a9a0ea4d0f642b34b4423ea867099b52edf078 (patch)
treec9df2a624681358103c80e79847fd415cf3a8e2f /x11vnc/xinerama.c
parentf40b0111827677625d81b7b7fcd001ce285adf69 (diff)
downloadlibtdevnc-00a9a0ea.tar.gz
libtdevnc-00a9a0ea.zip
x11vnc: -appshare mode for sharing an application windows instead of the
entire desktop. map port + 5500 in reverse connect. Add id_cmd remote control functions for id (and other) windows. Allow zero port in SSL reverse connections. Adjust delays between multiple reverse connections; X11VNC_REVERSE_SLEEP_MAX env var. Add some missing mutex locks; add INPUT_LOCK and threads_drop_input. More safety in -threads mode for new framebuffer change. Fix some stderr leaking in -inetd mode.
Diffstat (limited to 'x11vnc/xinerama.c')
-rw-r--r--x11vnc/xinerama.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/x11vnc/xinerama.c b/x11vnc/xinerama.c
index 9e123f9..8a1c0b5 100644
--- a/x11vnc/xinerama.c
+++ b/x11vnc/xinerama.c
@@ -344,12 +344,14 @@ static void initialize_xinerama (void) {
RAWFB_RET_VOID
+ X_LOCK;
if (! XineramaQueryExtension(dpy, &ev, &er)) {
if (verbose) {
rfbLog("Xinerama: disabling: display does not support it.\n");
}
xinerama = 0;
xinerama_present = 0;
+ X_UNLOCK;
return;
}
if (! XineramaIsActive(dpy)) {
@@ -359,6 +361,7 @@ static void initialize_xinerama (void) {
}
xinerama = 0;
xinerama_present = 0;
+ X_UNLOCK;
return;
}
xinerama_present = 1;
@@ -385,6 +388,7 @@ static void initialize_xinerama (void) {
rfbLog("\n");
}
XFree_wr(xineramas);
+ X_UNLOCK;
return; /* must be OK w/o change */
}
@@ -406,6 +410,7 @@ static void initialize_xinerama (void) {
sc++;
}
XFree_wr(xineramas);
+ X_UNLOCK;
if (sraRgnEmpty(black_region)) {