x11vnc: first pass at touchscreens via uinput.

1 files changed, 37 insertions, 23 deletions

diff --git a/x11vnc/help.c b/x11vnc/help.c
index ae00940..9c4134b 100644
--- a/x11vnc/help.c
+++ b/x11vnc/help.c
@@ -620,34 +620,38 @@ void print_help(int mode) {
 "                       above command is run as the user who just authenticated\n"
 "                       via the login and password prompt.\n"
 "\n"
-"                       Also in the case of -unixpw, the user logging in\n"
-"                       can place a colon at the end of his username and\n"
-"                       supply a few options: scale=, scale_cursor= (or sc=),\n"
-"                       solid (or so), id=, clear_mods (or cm), clear_keys\n"
-"                       (or ck), repeat, speeds= (or sp=), readtimeout=\n"
-"                       (or rd=), or rotate= (or ro=) separated by commas if there is more than one.\n"
-"                       After the user logs in successfully, these options will\n"
-"                       be applied to the VNC screen.  For example,\n"
+"                       Also in the case of -unixpw, the user logging in can\n"
+"                       place a colon at the end of his username and supply\n"
+"                       a few options: scale=, scale_cursor= (or sc=), solid\n"
+"                       (or so), id=, clear_mods (or cm), clear_keys (or ck),\n"
+"                       repeat, speeds= (or sp=), readtimeout= (or rd=), or\n"
+"                       rotate= (or ro=) separated by commas if there is more\n"
+"                       than one.  After the user logs in successfully, these\n"
+"                       options will be applied to the VNC screen.  For example,\n"
 "\n"
 "                          login: fred:scale=3/4,sc=1,repeat\n"
 "                          Password: ...\n"
 "\n"
-"                          login: runge:sp=modem,rd=120,solid=root:\n"
+"                          login: runge:sp=modem,rd=120,solid\n"
 "\n"
-"                       for convenience m/n implies scale= e.g. fred:3/4\n"
-"                       To disable this set the environment variable\n"
-"                       X11VNC_NO_UNIXPW_OPTS=1.  To set any other options,\n"
-"                       the user can use the gui (x11vnc -gui connect) or the\n"
-"                       remote control method (x11vnc -R opt:val) during his\n"
-"                       VNC session.\n"
+"                       for convenience m/n implies scale= e.g. fred:3/4  If you\n"
+"                       type and enter your password incorrectly, to retrieve\n"
+"                       your long \"login:\" line press the Up arrow once\n"
+"                       (before typing anything else).\n"
 "\n"
-"                       So the combination of -display WAIT:cmd=... and\n"
-"                       -unixpw allows automatic pairing of an unix\n"
-"                       authenticated VNC user with his desktop.  This could\n"
-"                       be very useful on SunRays and also any system where\n"
-"                       multiple users share a given machine.  The user does\n"
-"                       not need to remember special ports or passwords set up\n"
-"                       for his desktop and VNC.\n"
+"                       To disable the option setting set the environment\n"
+"                       variable X11VNC_NO_UNIXPW_OPTS=1 before starting x11vnc.\n"
+"                       To set any other options, the user can use the gui\n"
+"                       (x11vnc -gui connect) or the remote control method\n"
+"                       (x11vnc -R opt:val) during his VNC session.\n"
+"\n"
+"                       The combination of -display WAIT:cmd=... and -unixpw\n"
+"                       allows automatic pairing of an unix authenticated VNC\n"
+"                       user with his desktop.  This could be very useful on\n"
+"                       SunRays and also any system where multiple users share\n"
+"                       a given machine.  The user does not need to remember\n"
+"                       special ports or passwords set up for his desktop\n"
+"                       and VNC.\n"
 "\n"
 "                       A nice way to use WAIT:cmd=... is out of inetd(8)\n"
 "                       (it automatically forks a new x11vnc for each user).\n"
@@ -1181,7 +1185,7 @@ void print_help(int mode) {
 "                       unreliable (especially if the user takes much time to\n"
 "                       ponder the Certificate dialogs in his browser, Java VM,\n"
 "                       or VNC Viewer applet.  That's right 3 separate \"Are\n"
-"                       you sure you want to connect\" dialogs!)\n"
+"                       you sure you want to connect?\" dialogs!)\n"
 "\n"
 "                       So use the -https option to provide a separate, more\n"
 "                       reliable HTTPS port that x11vnc will listen on.  If\n"
@@ -2714,6 +2718,16 @@ void print_help(int mode) {
 "                       cause jerkiness or unexpected behavior with menus, etc.\n"
 "                       Use reset=0 to disable.\n"
 "\n"
+"                       If the uinput device has an absolute pointer (as opposed\n"
+"                       to a normal mouse that is a relative pointer) you can\n"
+"                       specify the option \"abs\".  Note that a touchpad\n"
+"                       on a laptop is an absolute device t some degree.\n"
+"                       This (usually) avoids all the problems with mouse\n"
+"                       acceleration.  If x11vnc has trouble deducing the size\n"
+"                       of the device, use \"abs=WxH\".  Furthermore, if the\n"
+"                       device is a touchscreen (assumed to have an absolute\n"
+"                       pointer) use \"touch\" or \"touch=WxH\".\n"
+"\n"
 "                       If you set the env. var X11VNC_UINPUT_THRESHOLDS then\n"
 "                       the thresh=n mode will be enabled.  It it currently\n"
 "                       not working well.  If |dx| <= thresh and |dy| < thresh\n"