#63767
Pulled from xorg CVS
Donnie Berkholz <spyderous@gentoo.org>

Index: xc/programs/xkbcomp/rules/xorg
===================================================================
RCS file: /cvs/xorg/xc/programs/xkbcomp/rules/xorg,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -B -r1.2 -r1.3
--- xc/programs/xkbcomp/rules/xorg	23 Apr 2004 19:54:52 -0000	1.2
+++ xc/programs/xkbcomp/rules/xorg	12 Oct 2004 19:13:44 -0000	1.3
@@ -100,7 +100,7 @@
 ! $inetkbds = airkey acpi scorpius azonaRF2300 \
               brother \
               btc5113rf btc5126t btc9000 btc9000a btc9001ah btc5090\
-              cherryblue cherrybluea \
+              cherryblue cherrybluea cherryblueb \
               chicony chicony9885 \
               compaqeak8 compaqik7 compaqik13 compaqik18 armada presario ipaq \
               dell inspiron dtk2000 \
@@ -122,8 +122,11 @@
               sk1300 sk2500 sk6200 sk7100 \
               sven symplon toshiba_s3000 trust trustda yahoo
 
+! $specialkbds = ibm_space_saver
+
 ! model         =       symbols
   $inetkbds     =       +inet(%m)
+  $specialkbds  =       +us_group3(%m)
 
 ! model		layout	=	compat
   pc98		nec/jp	=	pc98(basic)
Index: xc/programs/xkbcomp/rules/xorg.lst
===================================================================
RCS file: /cvs/xorg/xc/programs/xkbcomp/rules/xorg.lst,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -B -r1.2 -r1.3
--- xc/programs/xkbcomp/rules/xorg.lst	23 Apr 2004 19:54:52 -0000	1.2
+++ xc/programs/xkbcomp/rules/xorg.lst	12 Oct 2004 19:13:44 -0000	1.3
@@ -1,4 +1,4 @@
-// $XdotOrg: xc/programs/xkbcomp/rules/xorg.lst,v 1.2 2004/04/23 19:54:52 eich Exp $
+// $XdotOrg: xc/programs/xkbcomp/rules/xorg.lst,v 1.3 2004/10/12 19:13:44 eich Exp $
 // $Xorg: xfree86.lst,v 1.3 2000/08/17 19:54:42 cpqbld Exp $
 
 //
@@ -31,6 +31,7 @@
   btc9000a	BTC 9000A
   cherryblue	Cherry Blue Line CyBo@rd
   cherrybluea	Cherry Blue Line CyBo@rd (alternate option)
+  cherryblueb   Cherry CyMotion Master XPress
   chicony	Chicony Internet Keyboard
   chicony9885	Chicony KB-9885
   compaqeak8	Compaq Easy Access Keyboard
@@ -100,6 +101,7 @@
   trust		Trust Wireless Keyboard Classic
   trustda	Trust Direct Access Keyboard
   yahoo		Yahoo! Internet Keyboard
+  ibm_space_saver IBM Space Saver
 
 
 // The entries here should be ordered as follows:
Index: xc/programs/xkbcomp/rules/xorg.xml
===================================================================
RCS file: /cvs/xorg/xc/programs/xkbcomp/rules/xorg.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -B -r1.2 -r1.3
--- xc/programs/xkbcomp/rules/xorg.xml	23 Apr 2004 19:54:52 -0000	1.2
+++ xc/programs/xkbcomp/rules/xorg.xml	12 Oct 2004 19:13:45 -0000	1.3
@@ -275,6 +275,18 @@
     </model>
     <model>
       <configItem>
+        <name>ibm_space_saver</name>
+        <description>IBM Space Saver</description>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
+        <name>cherryblueb</name>
+        <description>Cherry CyMotion Master XPress</description>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
         <name>cherrybluea</name>
         <description>Cherry Blue Line CyBo@rd (alternate option)</description>
         <description xml:lang="cs">Cherry Blue Line CyBo@rd (alternativní volba)</description>
Index: xc/programs/xkbcomp/symbols/inet
===================================================================
RCS file: /cvs/xorg/xc/programs/xkbcomp/symbols/inet,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -B -r1.2 -r1.3
--- xc/programs/xkbcomp/symbols/inet	23 Apr 2004 19:54:52 -0000	1.2
+++ xc/programs/xkbcomp/symbols/inet	12 Oct 2004 19:13:45 -0000	1.3
@@ -288,6 +288,48 @@
 };
 
 partial alphanumeric_keys
+xkb_symbols "cherryblueb" {
+    name[Group1]= "Cherry CyMotion Master XPress";
+
+    key <I0B>	{	[ XF86ScrollUp		]	};
+    key <I12>   {       [ XF86ScrollDown        ]       };
+    key <I17>   {       [ XF86Cut               ]       };
+    key <I0A>   {       [ XF86Copy              ]       };
+    key <I18>   {       [ XF86Paste             ]       };
+    key <I71>   {       [ XF86Book              ]       };
+    key <I2C>   {       [ XF86Book              ]       };
+    key <I72>   {       [ XF86Book              ]       };
+    key <I07>   {       [ XF86Forward           ]       };
+    key <I08>   {       [ XF86Back              ]       };
+    key <I2E>   {       [ XF86AudioLowerVolume  ]       };
+    key <I30>   {       [ XF86AudioRaiseVolume  ]       };
+    key <I20>   {       [ XF86AudioMute         ]       };
+    key <I6D>   {       [ XF86AudioMedia        ]       };
+    key <I67>   {       [ XF86AudioRewind       ]       };
+    key <I10>   {       [ XF86Back              ]       };
+    key <I19>   {       [ XF86Forward           ]       };
+    key <I70>   {       [ XF86Eject             ]       };
+    key <I32>   {       [ XF86Finance           ]       };
+    key <I6A>   {       [ XF86Back              ]       };
+    key <I69>   {       [ XF86Forward           ]       };
+    key <I68>   {       [ XF86Stop              ]       };
+    key <FK16>  {       [ XF86Reload            ]       };
+    key <I65>   {       [ XF86Search            ]       };
+    key <I66>   {       [ XF86MyComputer        ]       };
+    key <I02>   {       [ XF86HomePage          ]       };
+    key <I6C>   {       [ XF86Mail              ]       };
+    key <PRSC>  {       [ XF86Terminal          ]       };
+    key <I21>   {       [ XF86Calculator        ]       };
+    key <I1E>   {       [ XF86AudioRaiseVolume  ]       };
+    key <I26>   {       [ XF86AudioMute         ]       };
+    key <I25>   {       [ XF86AudioLowerVolume  ]       };
+    key <XFER>  {       [ XF86Go                ]       };
+    key <I24>   {       [ XF86AudioStop                 ] };
+    key <I22>   {       [ XF86AudioPlay, XF86AudioPause ] };
+    key <I63>   {       [ XF86Standby                   ] };
+};
+
+partial alphanumeric_keys
 xkb_symbols "cherrybluea" {
     name[Group1]= "Cherry Blue Line CyBo@rd (alternate option)";