x11vnc: add zeroconf external helpers (avahi-publish and

dns-sd).  Alias -zeroconf.  Close pipeinput_fh on exit.
Kludge to make -solid work on MacOSX console.  Attempt at
cpp macros to disable newer libvncserver interfaces.

1 files changed, 115 insertions, 0 deletions

diff --git a/x11vnc/ssltools.h b/x11vnc/ssltools.h
index a238afe..0531ce2 100644
--- a/x11vnc/ssltools.h
+++ b/x11vnc/ssltools.h
@@ -2066,4 +2066,119 @@ char create_display[] =
 "exit 1\n"
 ;
 
+char macosx_solid_background[] = 
+"#!/bin/sh\n"
+"\n"
+"#set -xv\n"
+"\n"
+"# This is where the user's screen/slide savers are stored:\n"
+"#\n"
+"SS_DIR=\"$HOME/Library/Screen Savers\"\n"
+"\n"
+"if [ ! -d \"$SS_DIR\" ]; then\n"
+"	exit\n"
+"fi\n"
+"\n"
+"PATH=/bin:/usr/bin:$PATH; export PATH\n"
+"\n"
+"# Check to see if our tarball has already been unpacked.  If it has been\n"
+"# we don't unpack it again.  This lets the user overwrite the png with\n"
+"# a different color if they want.  At some point we could try to create\n"
+"# or own PPM file or something on the fly...\n"
+"#\n"
+"test_file=\"$SS_DIR/VncSolidColor.slideSaver/Contents/Resources/VncSolidColor01.png\"\n"
+"if [ ! -f \"$test_file\" ]; then\n"
+"	# get the line number the tarball data starts at:\n"
+"	N=`grep -n ^void_func \"$0\" | awk -F: '{print $1}' | head -n 1`\n"
+"	if echo \"$N\" | grep '^[0-9][0-9]*$' > /dev/null; then\n"
+"		:\n"
+"	else\n"
+"		exit\n"
+"	fi\n"
+"	N=`expr $N + 1`\n"
+"\n"
+"	# pipe the bottom of this file through uudecode and tar:\n"
+"	tail -n +$N \"$0\" | (cd \"$SS_DIR\" || exit 1; uudecode -o /dev/stdout | tar xzf -)\n"
+"fi\n"
+"if [ ! -f \"$test_file\" ]; then\n"
+"	# some problem unpacking...\n"
+"	exit\n"
+"fi\n"
+"\n"
+"# on exit or interrupt, we kill the screen saver we started:\n"
+"#\n"
+"trap 'kill -CONT $SS_PID >/dev/null 2>&1; kill -TERM $SS_PID >/dev/null 2>&1' 0 2 15\n"
+"SS_PID=9999999\n"
+"\n"
+"# start the screensaver and record its pid:\n"
+"#\n"
+"/System/Library/Frameworks/ScreenSaver.framework/Resources/ScreenSaverEngine.app/Contents/MacOS/ScreenSaverEngine -background -module VncSolidColor &\n"
+"SS_PID=$!\n"
+"\n"
+"# wait a bit for it to get started...\n"
+"#\n"
+"sleep 10\n"
+"\n"
+"# loop forever waiting for some change:\n"
+"#\n"
+"while [ 1 ]\n"
+"do\n"
+"	if kill -0 $SS_PID >/dev/null 2>&1; then\n"
+"		:\n"
+"	else\n"
+"		# screen saver is gone, exit.\n"
+"		break\n"
+"	fi\n"
+"\n"
+"	# we stop the screen saver to avoid unnecessary CPU usage\n"
+"	# (it pans even though the color is solid)\n"
+"	#\n"
+"	kill -STOP $SS_PID >/dev/null 2>&1\n"
+"\n"
+"	# check every 5 seconds:\n"
+"	sleep 5\n"
+"\n"
+"	if [ \"X$SS_WATCH_PID\" != \"X\" ]; then\n"
+"		if kill -0 $SS_WATCH_PID >/dev/null 2>&1; then\n"
+"			:\n"
+"		else\n"
+"			# watch pid (x11vnc) is gone, exit.\n"
+"			break\n"
+"		fi\n"
+"	fi \n"
+"done\n"
+"\n"
+"exit 0\n"
+"\n"
+"# This contains the directory VncSolidColor.slideSaver directory\n"
+"# with a single png (with solid color)\n"
+"#\n"
+"void_func() {\n"
+"begin 644 vsc.tar.gz\n"
+"M'XL(`$+,#TD``^V706_32!2`714*%)!6@@,@D*9!2,NAMB=V;+9*4Y(X+1%M\n"
+"M&NJT`B'06O;$]=:QC3UIVA,5)T#\\`M0+?P!QWE-7NQ*'E?;`826N'.\"`]@\\L\n"
+"M%YZ3\"*EI32ATLR#FDYR)Q^^]&<][;^9YR3-UWW6LHN_Z(1_!/Z(;JR04N/U#\n"
+"M!-1,IM.J8KL5TW*G[<!AC$5)E66<D3@1RXHJ<RBSCW-(I!E1(T2(\"YN>33XB\n"
+"M!V+U^B`F-%B6DOQ?]#U*/!KM0R#LP?]I6<3@?T56).;_0=#?_V6O[O.!ZT3T\n"
+"M<\\>(':S(<I+_L:2F/_A?4B!.TJ(LJQP2]_-%D_C._9^=6FNX\"!P>.;XWF<*\\\n"
+"MF$+$,WW+\\>S)U&)M>OQ2:BHWFAW3YHNU&]42:D<\"JBX69LM%E!H7A'P0N$00\n"
+"MM)J&JK-EO8;`AB\"4*BF46J8TF!\"$5JO%&[$4;_J-6#`2JJ$?D)\"NSX*Q<5#@\n"
+"M+6JE8)B.]6W3@5[+,6EN]$AVA:SGBM.%IF>Y1\".KQ/6#!L3H`K%!.BO$CT$J\n"
+"MHB%,/E?R;#\"VG!6Z]SWZ,X3&D:VW'_;JME,\"F7%.H,@,\"?%0%&<%:OA6TR6H\n"
+"M#OU+E6*2[;(%LW+J#@E[#<,\"=)>B8[9ME=^6A(E&8;8:+`2\\JA&N+W66J->^\n"
+"MPHM)^A6C07K%I_V01#1)HVJ8*X9-:NO!#L5\"19M-4M.7_9!VY[?[\\F(>)RH[\n"
+"MMF?09KACQ\"D@22EA,;8-DQ4Z4905VC&6&_V_,^_KH/_^OT`BOQF:Y/,K@;W4\n"
+"M?QG<W?\\S[/P?!'OQ_S99$?.!9W_2&'W.?X@-M>M_J`324/]#%2A+[/P?!`^J\n"
+"ME9GCHV?BW?!X^8JV`.U&?!T>@=_?<\\:?T!RP\\W-YCGLY7/A[_@G<'PFNW(@X\n"
+"M[NB)^!KB'F^>@LXQ6KI.=;].6T9(N&M-QURI.0V\",G\"X*^C'.<.<UR]ROSXL\n"
+"MG07A0[0\\5SKTXL\"9DQ,7+Z2OPEA#U\\I:OK:V^<\\+/+2%N*UG.+K^&_=O?F3F\n"
+"MQ,')B=>WWYQ_>_?<ULV1^]+ES:%7QWZP-RX-_W$:_<7=85V[=]V*IH?//WK^\n"
+"M\\EWLYG*IHCTM_'QOA__[YW^W&/N\"3X\"^^0_??%A4U(R\"TZJD0/[C-*O_!\\,W\n"
+"M5_\\7FHYK)11\\JB3])T7II]27'0UXKU^(27>KM?5V;BW[K:A726^?KPF#_!1G\n"
+"?\"\"MC&0P&@\\%@,!@,!H/!8#`8#,;>>0_24O15`\"@`````\n"
+"`\n"
+"end\n"
+"}\n"
+;
+
 #endif /* _SSLTOOLS_H */