fix manpage and examples to reflect recent key changes

2 files changed, 24 insertions, 28 deletions

diff --git a/config/50-x11-input-joystick.fdi b/config/50-x11-input-joystick.fdi
index 0364362..aec77b0 100644
--- a/config/50-x11-input-joystick.fdi
+++ b/config/50-x11-input-joystick.fdi
@@ -33,13 +33,13 @@
 	<!-- EXAMPLES
 	<merge key="input.x11_options.DebugLevel" type="string">5</merge>
 	<merge key="input.x11_options.AutoRepeat" type="string">500 4</merge>
-	<merge key="input.x11_options.MapButton4" type="string">key=Alt_L+Tab</merge>
+	<merge key="input.x11_options.MapButton4" type="string">key=64+23</merge>
 	<merge key="input.x11_options.MapButton8" type="string">amplify=0.3</merge>
 	<merge key="input.x11_options.MapButton9" type="string">disable-mouse</merge>
-	<merge key="input.x11_options.MapButton10" type="string">key=space</merge>
+	<merge key="input.x11_options.MapButton10" type="string">key=65</merge>
 
-	<merge key="input.x11_options.MapAxis1" type="string">mode=accelerated keylow=Left keyhigh=Right</merge>
-	<merge key="input.x11_options.MapAxis2" type="string">mode=accelerated keylow=Up keyhigh=Down</merge>
+	<merge key="input.x11_options.MapAxis1" type="string">mode=accelerated keylow=113 keyhigh=114</merge>
+	<merge key="input.x11_options.MapAxis2" type="string">mode=accelerated keylow=111 keyhigh=116</merge>
 	-->
       </match>
     </match>
diff --git a/man/joystick.man b/man/joystick.man
index 03f9800..97e3ba3 100644
--- a/man/joystick.man
+++ b/man/joystick.man
@@ -93,10 +93,10 @@ Use positive and negative values to control the direction. Default: 1.0
 Amplifies the movement of all axes by the given factor when pressed. Different
 factors can be combined.
 .TP 7
-.BI "\*qkey="<keysym>[,<keysym>[,<keysym>[,<keysym>]]]
-When button is pressed, a series of keydown events with the specified keysym is
+.BI "\*qkey="<scancode>[,<scancode>[,<scancode>[,<scancode>]]]
+When button is pressed, a series of keydown events with the specified scancode is
 generated. When the button is released, keyup events in the opposite
-order are generated. You can specify up to 4 keysyms per button.
+order are generated. You can specify up to 4 scancodes per button.
 
 See special section about key events below.
 .TP 7
@@ -150,12 +150,12 @@ is an optional amplifier of the axis, like
 .B -, +, -5, 0.4, 1.3, ...
 Negative values will invert the movement. Default: 1.0
 .TP 7
-.BI "\*qkeylow= "<keysym>[,<keysym>[,<keysym>[,<keysym>]]]
+.BI "\*qkeylow= "<scancode>[,<scancode>[,<scancode>[,<scancode>]]]
 .TP 7
-.BI "\*qkeyhigh="<keysym>[,<keysym>[,<keysym>[,<keysym>]]]
+.BI "\*qkeyhigh="<scancode>[,<scancode>[,<scancode>[,<scancode>]]]
 When the axis is moved out of the deadzone, a series of keydown events according 
 to the direction of the movement is generated. When the axis is released, keyup 
-events will be generated. You can specify up to 4 keysyms for each direction. 
+events will be generated. You can specify up to 4 scancodes for each direction. 
 
 .B keylow
 defines the keys to be generated when the axis is moved in negative direction (ie. left or up),
@@ -270,45 +270,41 @@ total range of 200 pixels, 100 to the top and 100 to the bottom:
 .fi
 
 .SH "GENERATING KEY EVENTS"
-Providing a \*qkey=<keysym>[,<keysym>[...]]\*q option will generate X Events with the specified keysyms
+Providing a \*qkey=<scancode>[,<scancode>[...]]\*q option will generate X Events with the specified scancodes
 when the joystick button is pressed or the axis changed it's position. When the button/axis is released, the keys are released in the reverse order.
 
-The keysym parameter can be defined as a numerical value, which can be looked up in the file
-.IR /usr/include/X11/keysymdef.h ,
-or as the symbolic identifier (case sensitive, without the leading XK_).
+To lookup keycodes for KeySyms, you can use
+.BR "xmodmap -pk" .
+You can use unused keycodes and map them to a KeySym of your choice using xmodmap(1).
 
-You can specify up to 4 keysyms per joystick button/axis, which is useful to use modificators. Make sure you use the modificators
+You can specify up to 4 scancodes per joystick button/axis, which is useful to use modificators. Make sure you use modificators
 that are necessary to get a certain keysym.
 
 Examples:
 .nf
-.BI "  Option \*qMapButton1\*q     \*q" "key=0xffe9,0xff09" \*q
-.BI "  Option \*qMapButton1\*q     \*q" "key=Alt_L,Tab" \*q
+.BI "  Option \*qMapButton1\*q     \*q" "key=64,23" \*q
 .fi
 will generate
 .I "Alt_L+Tab"
 when the button is pressed.
 
 .nf
-.BI "  Option \*qMapButton1\*q     \*q" "key=0xffe1,0x0064" \*q
-.BI "  Option \*qMapButton1\*q     \*q" "key=Shift_L,d" \*q
+.BI "  Option \*qMapButton1\*q     \*q" "key=50,40" \*q
 .fi
-will generate an uppercase 
+will generate a Shift_L+d which will be an uppercase 
 .IR d .
 
 .nf
-.BI "  Option \*qMapButton1\*q     \*q" "key=0x0020" \*q
-.BI "  Option \*qMapButton1\*q     \*q" "key=32" \*q
-.BI "  Option \*qMapButton1\*q     \*q" "key=space" \*q
+.BI "  Option \*qMapButton1\*q     \*q" "key=65" \*q
 .fi
 is for the  
 .IR "space " key.
 
 .nf
-.BI "  Option  \*qMapAxis1\*q      \*q" "mode=relative    keylow=Left keyhigh=Right axis=0.5key" \*q
-.BI "  Option  \*qMapAxis2\*q      \*q" "mode=relative    keylow=Up   keyhigh=Down" \*q
-.BI "  Option  \*qMapAxis3\*q      \*q" "mode=accelerated keylow=Left keyhigh=Right" \*q
-.BI "  Option  \*qMapAxis4\*q      \*q" "mode=accelerated keylow=Up   keyhigh=Down" \*q
+.BI "  Option  \*qMapAxis1\*q      \*q" "mode=relative    keylow=113  keyhigh=114 axis=0.5key" \*q
+.BI "  Option  \*qMapAxis2\*q      \*q" "mode=relative    keylow=111  keyhigh=116" \*q
+.BI "  Option  \*qMapAxis3\*q      \*q" "mode=accelerated keylow=113  keyhigh=114" \*q
+.BI "  Option  \*qMapAxis4\*q      \*q" "mode=accelerated keylow=111  keyhigh=116" \*q
 .fi
 will map the first and third axis to the arrow keys
 .IR left " and " right
@@ -345,6 +341,6 @@ Example:
 .SH "SEE ALSO"
 __xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__), xmodmap(1)
 .SH AUTHORS
-Sascha Hlusiak (2007-2008),
+Sascha Hlusiak (2007-2009),
 .fi
 Frederic Lepied (1995-1999)