x11vnc: -rotate option

1 files changed, 44 insertions, 11 deletions

diff --git a/x11vnc/help.c b/x11vnc/help.c
index 28e9498..60aa9df 100644
--- a/x11vnc/help.c
+++ b/x11vnc/help.c
@@ -326,7 +326,7 @@ void print_help(int mode) {
 "                       to the program location and in standard locations\n"
 "                       (/usr/local/share/x11vnc/classes, etc).  Under -ssl or\n"
 "                       -stunnel the ssl classes subdirectory is sought.\n"
-#ifndef REL8x
+#ifndef NO_SSL_OR_UNIXPW
 "-http_ssl              As -http, but force lookup for ssl classes subdir.\n"
 #endif
 "\n"
@@ -458,7 +458,7 @@ void print_help(int mode) {
 "                       and last line be \"__BEGIN_VIEWONLY__\" to have 2\n"
 "                       full-access passwords)\n"
 "\n"
-#ifndef REL8x
+#ifndef NO_SSL_OR_UNIXPW
 "-unixpw [list]         Use Unix username and password authentication.  x11vnc\n"
 "                       uses the su(1) program to verify the user's password.\n"
 "                       [list] is an optional comma separated list of allowed\n"
@@ -615,7 +615,7 @@ void print_help(int mode) {
 "                       of the form XAUTHORITY=<file> or raw xauthority data for\n"
 "                       the display (e.g. \"xauth extract - $DISPLAY\" output).\n"
 "\n"
-#ifndef REL8x
+#ifndef NO_SSL_OR_UNIXPW
 "                       In the case of -unixpw (but not -unixpw_nis), then the\n"
 "                       above command is run as the user who just authenticated\n"
 "                       via the login and password prompt.\n"
@@ -624,8 +624,8 @@ void print_help(int mode) {
 "                       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=), or readtimeout=\n"
-"                       (or rd=) separated by commas if there is more than one.\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"
 "\n"
@@ -682,7 +682,7 @@ void print_help(int mode) {
 "                       the VNC client first attaches to since some VNC viewers\n"
 "                       will not automatically adjust to a new framebuffer size.\n"
 "\n"
-#ifndef REL8x
+#ifndef NO_SSL_OR_UNIXPW
 "-ssl [pem]             Use the openssl library (www.openssl.org) to provide a\n"
 "                       built-in encrypted SSL tunnel between VNC viewers and\n"
 "                       x11vnc.  This requires libssl support to be compiled\n"
@@ -1450,6 +1450,38 @@ void print_help(int mode) {
 "                       encoding, and then resize the framebuffer.  \"exit\"\n"
 "                       means disconnect all viewer clients, and then terminate\n"
 "                       x11vnc.\n"
+"\n"
+"-rotate string         Rotate and/or flip the framebuffer view exported by VNC.\n"
+"                       This transformation is independent of XRANDR and is\n"
+"                       done in software in main memory and so may be slower.\n"
+"                       This mode could be useful on a handheld with portrait or\n"
+"                       landscape modes that do not correspond to the scanline\n"
+"                       order of the actual framebuffer.  \"string\" can be:\n"
+"\n"
+"                             x     flip along x-axis\n"
+"                             y     flip along y-axis\n"
+"                            xy     flip along x- and y-axes\n"
+"                           +90     rotate 90 degrees clockwise\n"
+"                           -90     rotate 90 degrees counter-clockwise\n"
+"                          +90x     rotate 90 degrees CW, then flip along x\n"
+"                          +90y     rotate 90 degrees CW, then flip along y\n"
+"\n"
+"                       these give all possible rotations and reflections.\n"
+"\n"
+"                       Aliases: same as xy:  yx, +180, -180, 180\n"
+"                                same as -90: +270, 270\n"
+"                                same as +90: 90, (ditto for 90x, 90y)\n"
+"\n"
+"                       Like -scale, this transformation is applied at the very\n"
+"                       end of any chain of framebuffer transformations and so\n"
+"                       any options with geometries, e.g. -blackout, -clip, etc.\n"
+"                       are relative to the original X (or -rawfb) framebuffer,\n"
+"                       not the final one sent to VNC viewers.\n"
+"\n"
+"                       If you do not want the cursor shape to be rotated\n"
+"                       prefix \"string\" with \"nc:\", e.g. \"nc:+90\",\n"
+"                       \"nc:xy\", etc.\n"
+"\n"
 "-padgeom WxH           Whenever a new vncviewer connects, the framebuffer is\n"
 "                       replaced with a fake, solid black one of geometry WxH.\n"
 "                       Shortly afterwards the framebuffer is replaced with the\n"
@@ -2565,7 +2597,7 @@ void print_help(int mode) {
 "\n"
 "                       If you do not want x11vnc to guess the framebuffer's\n"
 "                       WxHxB and masks automatically (sometimes the kernel\n"
-"                       given inaccurate information), specify them with a\n"
+"                       gives inaccurate information), specify them with a\n"
 "                       @WxHxB at the end of the string.\n"
 "\n"
 "                       Examples:\n"
@@ -2923,6 +2955,7 @@ void print_help(int mode) {
 "                       xrandr          enable  -xrandr mode. (if applicable)\n"
 "                       noxrandr        disable -xrandr mode.\n"
 "                       xrandr_mode:mode set the -xrandr mode to \"mode\".\n"
+"                       rotate:mode     set the -rotate mode to \"mode\".\n"
 "                       padgeom:WxH     set -padgeom to WxH (empty to disable)\n"
 "                                       If WxH is \"force\" or \"do\" the padded\n"
 "                                       geometry fb is immediately applied.\n"
@@ -3126,7 +3159,7 @@ void print_help(int mode) {
 "                       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 padgeom\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"
@@ -3149,9 +3182,9 @@ void print_help(int mode) {
 "                       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"
+"                       wait_bog nowait_bog slow_fb wait readtimeout nap nonap\n"
+"                       sb screen_blank fbpm nofbpm fs gaps grow fuzz snapfb\n"
+"                       nosnapfb rawfb uinput_accel uinput_thresh uinput_reset\n"
 "                       uinput_always progressive rfbport http nohttp httpport\n"
 "                       httpdir enablehttpproxy noenablehttpproxy alwaysshared\n"
 "                       noalwaysshared nevershared noalwaysshared dontdisconnect\n"