x11vnc: scale cursors, speed up some scaling, alt arrows, -norepeat N

ChangeLog

@@ -1,3 +1,7 @@
+2005-03-19  Karl Runge <runge@karlrunge.com>
+	* x11vnc: scale cursors by default, -scale_cursor to tune,
+	  -arrow n, -norepeat n, speed up integer magnification. 
+
 2005-03-12  Karl Runge <runge@karlrunge.com>
 	* x11vnc: X DAMAGE support, -clip WxH+X+Y, identd.
 

x11vnc/ChangeLog

@@ -1,3 +1,12 @@
+2005-03-19  Karl Runge <runge@karlrunge.com>
+	* scale cursors along with display. Use -scale_cursor to change
+	  or disable cursor scaling.
+	* speed up scaling in some cases, :nb and integer magnification.
+	* provide alternative arrow cursors (1-6) via -arrow n.
+	* reset no autorepeat a couple times if something turns it off,
+	  set with -norepeat N.
+	* do not take a nap if DAMAGE seems to be doing its job.
+
 2005-03-12  Karl Runge <runge@karlrunge.com>
 	* support for the X DAMAGE extension to receive damage
 	  rectangle reports from the X server.  On by default, disable

x11vnc/tkx11vnc

@@ -107,6 +107,7 @@ Screen
 	id:
 	sid:
 	=D scale:
+	scale_cursor:
 	--
 	overlay
 	overlay_nocursor
@@ -140,6 +141,7 @@ Keyboard
 
 Pointer
 	=D-C:none,arrow,X,some,most cursor:
+	=-C:1,2,3,4,5,6 arrow:
 	--
 	cursorpos
 	=D nocursorshape
@@ -239,9 +241,8 @@ Tuning
 	snapfb
 	--
 	xdamage
-	xd_mem:
 	xd_area:
-	xd_width:
+	xd_mem:
 	--
 	threads
 	--

x11vnc/tkx11vnc.h

@@ -113,6 +113,7 @@
 "	id:\n"
 "	sid:\n"
 "	=D scale:\n"
+"	scale_cursor:\n"
 "	--\n"
 "	overlay\n"
 "	overlay_nocursor\n"
@@ -146,6 +147,7 @@
 "\n"
 "Pointer\n"
 "	=D-C:none,arrow,X,some,most cursor:\n"
+"	=-C:1,2,3,4,5,6 arrow:\n"
 "	--\n"
 "	cursorpos\n"
 "	=D nocursorshape\n"
@@ -245,9 +247,8 @@
 "	snapfb\n"
 "	--\n"
 "	xdamage\n"
-"	xd_mem:\n"
 "	xd_area:\n"
-"	xd_width:\n"
+"	xd_mem:\n"
 "	--\n"
 "	threads\n"
 "	--\n"

x11vnc/x11vnc.1

@@ -2,7 +2,7 @@
 .TH X11VNC "1" "March 2005" "x11vnc " "User Commands"
 .SH NAME
 x11vnc - allow VNC connections to real X11 displays
-         version: 0.7.2pre, lastmod: 2005-03-12
+         version: 0.7.2pre, lastmod: 2005-03-19
 .SH SYNOPSIS
 .B x11vnc
 [OPTION]...
@@ -119,7 +119,7 @@ or 0x hex.  Run
 .IR xdpyinfo (1)
 for the values.  One may
 also use "TrueColor", etc. see <X11/X.h> for a list.
-If the string ends in ":m" the for better or for
+If the string ends in ":m" then for better or for
 worse the visual depth is forced to be m.
 .PP
 \fB-overlay\fR
@@ -163,9 +163,8 @@ cursor shape using the overlay mechanism.
 \fB-scale\fR \fIfraction\fR
 .IP
 Scale the framebuffer by factor \fIfraction\fR.  Values
-less than 1 shrink the fb, larger ones expand it.
+less than 1 shrink the fb, larger ones expand it.  Note:
-Note: image may not be sharp and response may be
+image may not be sharp and response may be slower.
-slower.  Currently the cursor shape is not scaled.
 If \fIfraction\fR contains a decimal point "." it
 is taken as a floating point number, alternatively
 the notation "m/n" may be used to denote fractions
@@ -182,6 +181,17 @@ interpolation scheme even when shrinking, ":pad",
 pad scaled width and height to be multiples of scaling
 denominator (e.g. 3 for 2/3).
 .PP
+\fB-scale_cursor\fR \fIfrac\fR
+.IP
+By default if \fB-scale\fR is supplied the cursor shape is
+scaled by the same factor.  Depending on your usage,
+you may want to scale the cursor independently of the
+screen or not at all.  If you specify \fB-scale_cursor\fR
+the cursor will be scaled by that factor.  When using
+\fB-scale\fR mode to keep the cursor at its "natural" size
+use "\fB-scale_cursor\fR \fI1\fR".  Most of the ":" scaling
+options apply here as well.
+.PP
 \fB-viewonly\fR
 .IP
 All VNC clients can only watch (default off).
@@ -686,6 +696,11 @@ either from large screen changes or high latency).
 Note: your VNC viewer side will likely do autorepeating,
 so this is no loss unless someone is simultaneously at
 the real X display.  Default: \fB-norepeat\fR
+.IP
+Use "\fB-norepeat\fR \fIN\fR" to set how many times norepeat will
+be reset if something else (e.g. X session manager)
+disables it.  The default is 2.  Use a negative value
+for unlimited resets.
 .PP
 \fB-nofb\fR
 .IP
@@ -780,6 +795,11 @@ unless the display has overlay visuals or XFIXES
 extensions available.  On Solaris and IRIX if XFIXES
 is not available, \fB-overlay\fR mode will be attempted.
 .PP
+\fB-arrow\fR \fIn\fR
+.IP
+Choose an alternate "arrow" cursor from a set of
+some common ones.  n can be 1 to 6.  Default is: 1
+.PP
 \fB-noxfixes\fR
 .IP
 Do not use the XFIXES extension to draw the exact cursor
@@ -1195,6 +1215,10 @@ id:windowid     set \fB-id\fR window to "windowid". empty
 .IP
 sid:windowid    set \fB-sid\fR window to "windowid"
 .IP
+waitmapped      wait until subwin is mapped.
+.IP
+nowaitmapped    do not wait until subwin is mapped.
+.IP
 clip:WxH+X+Y    set \fB-clip\fR mode to "WxH+X+Y"
 .IP
 flashcmap       enable  \fB-flashcmap\fR mode.
@@ -1218,6 +1242,8 @@ visual:vis      set \fB-visual\fR to "vis"
 .IP
 scale:frac      set \fB-scale\fR to "frac"
 .IP
+scale_cursor:f  set \fB-scale_cursor\fR to "f"
+.IP
 viewonly        enable  \fB-viewonly\fR mode.
 .IP
 noviewonly      disable \fB-viewonly\fR mode.
@@ -1375,6 +1401,8 @@ show_cursor     enable  showing a cursor.
 noshow_cursor   disable showing a cursor. (same as
                 "nocursor")
 .IP
+arrow:n         set \fB-arrow\fR to alternate n.
+.IP
 xfixes          enable  xfixes cursor shape mode.
 .IP
 noxfixes        disable xfixes cursor shape mode.
@@ -1546,27 +1574,27 @@ remote command, we hope the name makes it obvious what
 the returned value corresponds to (hint: the ext_*
 variables correspond to the presence of X extensions):
 .IP
-ans= stop quit exit shutdown ping blacken zero
+ans= stop quit exit shutdown ping blacken zero refresh
-refresh reset close disconnect id sid clip waitmapped
+reset close disconnect id sid waitmapped nowaitmapped
-nowaitmapped flashcmap noflashcmap truecolor notruecolor
+clip flashcmap noflashcmap truecolor notruecolor
 overlay nooverlay overlay_cursor overlay_yescursor
 nooverlay_nocursor nooverlay_cursor nooverlay_yescursor
-overlay_nocursor visual scale viewonly noviewonly
+overlay_nocursor visual scale scale_cursor viewonly
-shared noshared forever noforever once timeout deny
+noviewonly shared noshared forever noforever once
-lock nodeny unlock connect allowonce allow localhost
+timeout deny lock nodeny unlock connect allowonce
-nolocalhost listen accept gone shm noshm flipbyteorder
+allow localhost nolocalhost listen accept gone
-noflipbyteorder onetile noonetile solid_color solid
+shm noshm flipbyteorder noflipbyteorder onetile
-nosolid blackout xinerama noxinerama xrandr noxrandr
+noonetile solid_color solid nosolid blackout xinerama
-xrandr_mode padgeom quiet q noquiet modtweak nomodtweak
+noxinerama xrandr noxrandr xrandr_mode padgeom quiet
-xkb noxkb skip_keycodes add_keysyms noadd_keysyms
+q noquiet modtweak nomodtweak xkb noxkb skip_keycodes
-clear_mods noclear_mods clear_keys noclear_keys
+add_keysyms noadd_keysyms clear_mods noclear_mods
-remap repeat norepeat fb nofb bell nobell sel
+clear_keys noclear_keys remap repeat norepeat fb nofb
-nosel primary noprimary cursorshape nocursorshape
+bell nobell sel nosel primary noprimary cursorshape
-cursorpos nocursorpos cursor show_cursor noshow_cursor
+nocursorshape cursorpos nocursorpos cursor show_cursor
-nocursor xfixes noxfixes xdamage noxdamage xd_area
+noshow_cursor nocursor arrow xfixes noxfixes xdamage
-xd_mem alphacut alphafrac alpharemove noalpharemove
+noxdamage xd_area xd_mem alphacut alphafrac alpharemove
-alphablend noalphablend xwarp xwarppointer noxwarp
+noalpharemove alphablend noalphablend xwarp xwarppointer
-noxwarppointer buttonmap dragging nodragging
+noxwarp noxwarppointer buttonmap dragging nodragging
 pointer_mode pm input_skip input client_input speeds
 debug_pointer dp nodebug_pointer nodp debug_keyboard dk
 nodebug_keyboard nodk deferupdate defer wait rfbwait