summaryrefslogtreecommitdiffstats
path: root/x11vnc/help.c
diff options
context:
space:
mode:
authorrunge <runge>2007-02-12 23:44:39 +0000
committerrunge <runge>2007-02-12 23:44:39 +0000
commit241f3ed566d34bf5b6c67ebebcc00727134d93b2 (patch)
treee42ddc70dc6a50503a2e22aef238c7a1fde7fb43 /x11vnc/help.c
parent0016cd4280ee9a0d088454a508a9c7f6bde33f62 (diff)
downloadlibtdevnc-241f3ed566d34bf5b6c67ebebcc00727134d93b2.tar.gz
libtdevnc-241f3ed566d34bf5b6c67ebebcc00727134d93b2.zip
x11vnc: add avahi (aka mDNS/Zeroconf/Bonjour...) support thanks to Diego Petteno. add -find -create
Diffstat (limited to 'x11vnc/help.c')
-rw-r--r--x11vnc/help.c68
1 files changed, 46 insertions, 22 deletions
diff --git a/x11vnc/help.c b/x11vnc/help.c
index 8d60c93..cce3e2e 100644
--- a/x11vnc/help.c
+++ b/x11vnc/help.c
@@ -70,8 +70,13 @@ void print_help(int mode) {
"-display disp X11 server display to connect to, usually :0. The X\n"
" server process must be running on same machine and\n"
" support MIT-SHM. Equivalent to setting the DISPLAY\n"
-" environment variable to \"disp\". See the description\n"
-" below of the \"-display WAIT:...\" extensions.\n"
+" environment variable to \"disp\".\n"
+"\n"
+" See the description below of the \"-display WAIT:...\"\n"
+" extensions, where alias \"-find\" will find the user's\n"
+" display automatically, and \"-create\" will create a\n"
+" Xvfb session if no session is found.\n"
+"\n"
"-auth file Set the X authority file to be \"file\", equivalent to\n"
" setting the XAUTHORITY environment variable to \"file\"\n"
" before startup. Same as -xauth file. See Xsecurity(7),\n"
@@ -365,6 +370,13 @@ void print_help(int mode) {
"-http_ssl As -http, but force lookup for ssl classes subdir.\n"
#endif
"\n"
+"-avahi Use the Avahi/mDNS ZeroConf protocol to advertize\n"
+" this VNC server to the local network. (Related terms:\n"
+" Rendezvous, Bonjour). Depending on your setup, you\n"
+" may need to start avahi-daemon and open udp port 5353\n"
+" in your firewall.\n"
+"-mdns Same as -avahi.\n"
+"\n"
"-connect string For use with \"vncviewer -listen\" reverse connections.\n"
" If \"string\" has the form \"host\" or \"host:port\"\n"
" the connection is made once at startup. Use commas\n"
@@ -711,11 +723,19 @@ void print_help(int mode) {
" in addition to this option.\n"
"\n"
#endif
-"-svc Terminal services mode. Also \"-service\", implies\n"
+"-find Find the user's display using FINDDISPLAY. It is an\n"
+" alias for \"-display WAIT:cmd=FINDDISPLAY\".\n"
+"\n"
+"-create First try to find the user's display using FINDDISPLAY,\n"
+" if that doesn't work create an X session via the\n"
+" FINDCREATEDISPLAY method. This is an alias for\n"
+" \"-display WAIT:cmd=FINDCREATEDISPLAY-Xvfb\".\n"
+"\n"
+"-svc Terminal services mode. Also \"-service\". Alias for\n"
" -display WAIT:cmd=FINDCREATEDISPLAY-Xvfb -unixpw\n"
" -users unixpw= -ssl SAVE\n"
"\n"
-"-xdmsvc Terminal services mode. Also \"-xdm_service\", implies\n"
+"-xdmsvc Terminal services mode. Also \"-xdm_service\". Alias for\n"
" -display WAIT:cmd=FINDCREATEDISPLAY-Xvfb.xdmcp -unixpw\n"
" -users unixpw= -ssl SAVE\n"
"\n"
@@ -3373,6 +3393,10 @@ void print_help(int mode) {
" nohttp disable http client connections.\n"
" deny deny any new connections, same as \"lock\"\n"
" nodeny allow new connections, same as \"unlock\"\n"
+" avahi enable avahi service advertizing.\n"
+" noavahi disable avahi service advertizing.\n"
+" mdns enable avahi service advertizing.\n"
+" nomdns disable avahi service advertizing.\n"
/* access, filename */
" connect:host do reverse connection to host, \"host\"\n"
" may be a comma separated list of hosts\n"
@@ -3676,24 +3700,24 @@ void print_help(int mode) {
" nooverlay_yescursor overlay_nocursor 8to24 no8to24\n"
" 8to24_opts 24to32 no24to32 visual scale scale_cursor\n"
" viewonly noviewonly shared noshared forever noforever\n"
-" once timeout filexfer nofilexfer deny lock nodeny\n"
-" unlock connect allowonce allow localhost nolocalhost\n"
-" listen lookup nolookup accept afteraccept gone shm\n"
-" noshm flipbyteorder noflipbyteorder onetile noonetile\n"
-" solid_color solid nosolid blackout xinerama noxinerama\n"
-" xtrap noxtrap xrandr noxrandr xrandr_mode rotate padgeom\n"
-" quiet q noquiet modtweak nomodtweak xkb noxkb capslock\n"
-" nocapslock skip_lockkeys noskip_lockkeys skip_keycodes\n"
-" sloppy_keys nosloppy_keys skip_dups noskip_dups\n"
-" add_keysyms noadd_keysyms clear_mods noclear_mods\n"
-" clear_keys noclear_keys remap repeat norepeat fb nofb\n"
-" bell nobell sel nosel primary noprimary setprimary\n"
-" nosetprimary clipboard noclipboard setclipboard\n"
-" nosetclipboard seldir cursorshape nocursorshape\n"
-" cursorpos nocursorpos cursor_drag nocursor_drag cursor\n"
-" show_cursor noshow_cursor nocursor arrow xfixes\n"
-" noxfixes xdamage noxdamage xd_area xd_mem alphacut\n"
-" alphafrac alpharemove noalpharemove alphablend\n"
+" once timeout filexfer nofilexfer deny lock nodeny unlock\n"
+" avahi mdns noavahi nomdns connect allowonce allow\n"
+" localhost nolocalhost listen lookup nolookup accept\n"
+" afteraccept gone shm noshm flipbyteorder noflipbyteorder\n"
+" onetile noonetile solid_color solid nosolid blackout\n"
+" xinerama noxinerama xtrap noxtrap xrandr noxrandr\n"
+" xrandr_mode rotate padgeom quiet q noquiet modtweak\n"
+" nomodtweak xkb noxkb capslock nocapslock skip_lockkeys\n"
+" noskip_lockkeys skip_keycodes sloppy_keys nosloppy_keys\n"
+" skip_dups noskip_dups add_keysyms noadd_keysyms\n"
+" clear_mods noclear_mods clear_keys noclear_keys remap\n"
+" repeat norepeat fb nofb bell nobell sel nosel primary\n"
+" noprimary setprimary nosetprimary clipboard noclipboard\n"
+" setclipboard nosetclipboard seldir cursorshape\n"
+" nocursorshape cursorpos nocursorpos cursor_drag\n"
+" nocursor_drag cursor show_cursor noshow_cursor nocursor\n"
+" arrow xfixes noxfixes xdamage noxdamage xd_area xd_mem\n"
+" alphacut alphafrac alpharemove noalpharemove alphablend\n"
" noalphablend xwarppointer xwarp noxwarppointer\n"
" noxwarp buttonmap dragging nodragging ncache_cr\n"
" noncache_cr ncache_no_moveraise noncache_no_moveraise\n"