From 6a6d26a74701179672d59bfd153cc1a2e92e96bd Mon Sep 17 00:00:00 2001
From: runge <runge>
Date: Wed, 5 Sep 2007 03:39:51 +0000
Subject: x11vnc: -autoport, -finddpy, -xdummy. watch xrandr events. 
 check_redir_services() utilities for Terminal services.  Improve Xdummy.

---
 x11vnc/xevents.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'x11vnc/xevents.c')

diff --git a/x11vnc/xevents.c b/x11vnc/xevents.c
index 101bd32..81d5ff6 100644
--- a/x11vnc/xevents.c
+++ b/x11vnc/xevents.c
@@ -43,10 +43,10 @@ void set_server_input(rfbClientPtr cl, int s);
 void set_text_chat(rfbClientPtr cl, int l, char *t);
 int get_keyboard_led_state_hook(rfbScreenInfoPtr s);
 int get_file_transfer_permitted(rfbClientPtr cl);
+void get_prop(char *str, int len, Atom prop);
 
 static void initialize_xevents(int reset);
 static void print_xevent_bases(void);
-static void get_prop(char *str, int len, Atom prop);
 static void bust_grab(int reset);
 static int process_watch(char *str, int parent, int db);
 static void grab_buster_watch(int parent, char *dstr);
@@ -135,7 +135,7 @@ static void initialize_xevents(int reset) {
 		did_xcreate_simple_window = 1;
 	}
 
-	if (xrandr && !did_xrandr) {
+	if ((xrandr || xrandr_maybe) && !did_xrandr) {
 		initialize_xrandr();
 		did_xrandr = 1;
 	}
@@ -178,7 +178,7 @@ static void print_xevent_bases(void) {
 	fprintf(stderr, "  SelClear=%d, Expose=%d\n", SelectionClear, Expose);
 }
 
-static void get_prop(char *str, int len, Atom prop) {
+void get_prop(char *str, int len, Atom prop) {
 	int i;
 #if !NO_X11
 	Atom type;
@@ -949,7 +949,7 @@ void check_xevents(int reset) {
 	}
 
 #if LIBVNCSERVER_HAVE_LIBXRANDR
-	if (xrandr) {
+	if (xrandr || xrandr_maybe) {
 		check_xrandr_event("check_xevents");
 	}
 #endif
-- 
cgit v1.2.3