summaryrefslogtreecommitdiffstats
path: root/x11vnc/help.c
diff options
context:
space:
mode:
Diffstat (limited to 'x11vnc/help.c')
-rw-r--r--x11vnc/help.c63
1 files changed, 34 insertions, 29 deletions
diff --git a/x11vnc/help.c b/x11vnc/help.c
index 41dbeca..456cfeb 100644
--- a/x11vnc/help.c
+++ b/x11vnc/help.c
@@ -2528,16 +2528,17 @@ void print_help(int mode) {
" active VT, to indicate one explicitly, use \"cons2\",\n"
" etc. using the VT number.\n"
"\n"
-" If the Linux version seems to be 2.6 or later and the\n"
-" \"uinput\" module appears to be present, then the uinput\n"
-" method will be used instead of /dev/ttyN. uinput allows\n"
-" insertion of BOTH keystrokes and mouse input and so it\n"
-" preferred when accessing graphical (e.g. QT-embedded)\n"
-" linux console apps. See -pipeinput UINPUT below\n"
-" for more information on this mode (you may want to\n"
-" also use the -nodragging and -cursor none options).\n"
-" Use \"cons0\", etc or -pipeinput CONS to force the\n"
-" /dev/ttyN method.\n"
+" If the Linux version seems to be 2.6 or later and\n"
+" the \"uinput\" module appears to be present, then\n"
+" the uinput method will be used instead of /dev/ttyN.\n"
+" uinput allows insertion of BOTH keystrokes and mouse\n"
+" input and so it preferred when accessing graphical\n"
+" (e.g. QT-embedded) linux console apps. See -pipeinput\n"
+" UINPUT below for more information on this mode; you\n"
+" will have to use -pipeinput if you want to tweak any\n"
+" UINPUT parameters. You may also want to also use the\n"
+" -nodragging and -cursor none options. Use \"cons0\",\n"
+" etc or -pipeinput CONS to force the /dev/ttyN method.\n"
"\n"
" Note you can change VT remotely using the chvt(1)\n"
" command. Sometimes switching out and back corrects\n"
@@ -2591,7 +2592,7 @@ void print_help(int mode) {
" value is stored in X11VNC_RAWFB_STR for the pipe command\n"
" to use if it wants. Do 'env | grep X11VNC' for more.\n"
"\n"
-" Built-in pipeinput modes:\n"
+" Built-in pipeinput modes (no external program required):\n"
"\n"
" If cmd is \"VID\" and you are using the -rawfb for a\n"
" video capture device, then an internal list of keyboard\n"
@@ -2655,16 +2656,25 @@ void print_help(int mode) {
" will get out of sync (probably due to a mouse\n"
" \"threshold\" setting where the acceleration doe not\n"
" apply, set xset(1)). The option reset=N sets the\n"
-" number of ms (default 500) after which the cursor is\n"
+" number of ms (default 150) after which the cursor is\n"
" attempted to be reset (by forcing the mouse to (0,\n"
" 0) via small increments and then back out to (x, y)\n"
" in 1 jump), This correction seems to be needed but can\n"
" cause jerkiness or unexpected behavior with menus, etc.\n"
" Use reset=0 to disable.\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"
+" no acceleration is applied. Use \"thresh=+n\" |dx| +\n"
+" |dy| <= thresh to be used instead (X11?)\n"
+"\n"
" Example:\n"
" -pipeinput UINPUT:accel=4.0 -cursor none\n"
"\n"
+" You can also set the env. var X11VNC_UINPUT_DEBUG=1 or\n"
+" higher to get debugging output for UINPUT mode.\n"
+"\n"
"-gui [gui-opts] Start up a simple tcl/tk gui based on the the remote\n"
" control options -remote/-query described below.\n"
" Requires the \"wish\" program to be installed on the\n"
@@ -3024,6 +3034,7 @@ void print_help(int mode) {
" rawfb:str set -rawfb mode to \"str\".\n"
" uinput_accel:f set uinput_accel to f.\n"
" uinput_reset:n set uinput_reset to n ms.\n"
+" uinput_always:n set uinput_always to 1/0.\n"
" progressive:n set libvncserver -progressive slice\n"
" height parameter to n.\n"
" desktop:str set -desktop name to str for new clients.\n"
@@ -3090,13 +3101,6 @@ void print_help(int mode) {
" query straight to the X11VNC_REMOTE property or connect\n"
" file use \"qry=...\" instead of \"cmd=...\"\n"
"\n"
-" Here is the current list of \"variables\" that can\n"
-" be supplied to the -query command. This includes the\n"
-" \"N/A\" ones that return no useful info. For variables\n"
-" names that do not correspond to an x11vnc option or\n"
-" remote command, we hope the name makes it obvious what\n"
-" the returned value corresponds to (hint: the ext_*\n"
-" variables correspond to the presence of X extensions):\n"
" ans= stop quit exit shutdown ping blacken zero\n"
" refresh reset close disconnect id sid waitmapped\n"
" nowaitmapped clip flashcmap noflashcmap shiftcmap\n"
@@ -3127,16 +3131,16 @@ void print_help(int mode) {
" nodragging wireframe_mode wireframe wf nowireframe\n"
" nowf wirecopyrect wcr nowirecopyrect nowcr scr_area\n"
" scr_skip scr_inc scr_keys scr_term scr_keyrepeat\n"
-" scr_parms scrollcopyrect scr noscrollcopyrect\n"
-" noscr fixscreen noxrecord xrecord reset_record\n"
-" pointer_mode pm input_skip allinput noallinput input\n"
-" grabkbd nograbkbd grabptr nograbptr client_input\n"
-" speeds wmdt debug_pointer dp nodebug_pointer nodp\n"
-" debug_keyboard dk nodebug_keyboard nodk deferupdate\n"
-" defer wait_ui wait_bog nowait_bog slow_fb wait\n"
-" readtimeout nap nonap sb screen_blank fbpm nofbpm\n"
-" fs gaps grow fuzz snapfb nosnapfb rawfb uinput_accel\n"
-" uinput_reset progressive rfbport http nohttp httpport\n"
+" scr_parms scrollcopyrect scr noscrollcopyrect noscr\n"
+" fixscreen noxrecord xrecord reset_record pointer_mode\n"
+" pm input_skip allinput noallinput input grabkbd\n"
+" nograbkbd grabptr nograbptr client_input speeds wmdt\n"
+" debug_pointer dp nodebug_pointer nodp debug_keyboard\n"
+" dk nodebug_keyboard nodk deferupdate defer wait_ui\n"
+" wait_bog nowait_bog slow_fb wait readtimeout nap\n"
+" nonap sb screen_blank fbpm nofbpm fs gaps grow\n"
+" fuzz snapfb nosnapfb rawfb uinput_accel uinput_reset\n"
+" uinput_always progressive rfbport http nohttp httpport\n"
" httpdir enablehttpproxy noenablehttpproxy alwaysshared\n"
" noalwaysshared nevershared noalwaysshared dontdisconnect\n"
" nodontdisconnect desktop debug_xevents nodebug_xevents\n"
@@ -3162,6 +3166,7 @@ void print_help(int mode) {
" mouse_x mouse_y bpp depth indexed_color dpy_x dpy_y\n"
" wdpy_x wdpy_y off_x off_y cdpy_x cdpy_y coff_x coff_y\n"
" rfbauth passwd viewpasswd\n"
+"\n"
"-QD variable Just like -query variable, but returns the default\n"
" value for that parameter (no running x11vnc server\n"
" is consulted)\n"