From e2e9347946bbaf1bf87c571d4a1fd9115fe90954 Mon Sep 17 00:00:00 2001
From: runge <runge>
Date: Sun, 12 Mar 2006 05:50:01 +0000
Subject:  x11vnc: add -ssl mode using libssl.  Include Xdummy in misc.

---
 x11vnc/x11vnc.h | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

(limited to 'x11vnc/x11vnc.h')

diff --git a/x11vnc/x11vnc.h b/x11vnc/x11vnc.h
index 10355b6..3a969b8 100644
--- a/x11vnc/x11vnc.h
+++ b/x11vnc/x11vnc.h
@@ -56,6 +56,7 @@
  * -DHARDWIRE_PASSWD=...      hardwired passwords, quoting necessary.
  * -DHARDWIRE_VIEWPASSWD=...
  * -DNOPW=1                   make -nopw the default (skip warning)
+ * -DUSEPW=1                  make -usepw the default
  * -DPASSWD_REQUIRED=1        exit unless a password is supplied.
  * -DPASSWD_UNLESS_NOPW=1     exit unless a password is supplied and no -nopw.
  *
@@ -73,6 +74,9 @@
  * -DSMALL_FOOTPRINT=1  for smaller binary size (no help, no gui, etc) 
  *                      use 2 or 3 for even smaller footprint.
  * -DNOGUI  do not include the gui tkx11vnc.
+ * -DSKIP_HELP=1   smaller.
+ * -DSKIP_XKB=1    a little smaller.
+ * -DSKIP_8to24=1  a little smaller.
  * -DPOLL_8TO24_DELAY=N  
  * -DDEBUG_XEVENTS=1  enable printout for X events.
  *
@@ -93,6 +97,10 @@
 #define NOPW 0
 #endif
 
+#ifndef USEPW
+#define USEPW 0
+#endif
+
 #ifndef PASSWD_REQUIRED
 #define PASSWD_REQUIRED 0
 #endif
@@ -116,13 +124,23 @@
 #define SMALL_FOOTPRINT 0
 #endif
 
+#ifndef SKIP_XKB
+#define SKIP_XKB 0
+#endif
+#ifndef SKIP_8TO24
+#define SKIP_8TO24 0
+#endif
+#ifndef SKIP_HELP
+#define SKIP_HELP 0
+#endif
+
 #if SMALL_FOOTPRINT
+#undef  NOGUI
 #define NOGUI
+#undef  SKIP_HELP
+#define SKIP_HELP 0
 #endif
 
-#define SKIP_XKB 0
-#define SKIP_8TO24 0
-
 #if (SMALL_FOOTPRINT > 1)
 #undef SKIP_XKB
 #undef SKIP_8TO24
@@ -447,6 +465,8 @@ typedef struct _ClientData {
 	int login_viewonly;
 	time_t login_time;
 
+	pid_t ssh_helper_pid;
+
 	int had_cursor_shape_updates;
 	int had_cursor_pos_updates;
 
-- 
cgit v1.1