Index: rules/xorg
===================================================================
RCS file: /cvs/xorg/xc/programs/xkbcomp/rules/xorg,v
retrieving revision 1.3
diff -u -3 -p -r1.3 xorg
--- rules/xorg	12 Oct 2004 19:13:44 -0000	1.3
+++ rules/xorg	14 Jan 2005 11:29:37 -0000
@@ -104,7 +104,7 @@
               chicony chicony9885 \
               compaqeak8 compaqik7 compaqik13 compaqik18 armada presario ipaq \
               dell inspiron dtk2000 \
-              dexxa diamond genius geniuscomfy2 \
+              dexxa diamond genius geniuscomfy geniuscomfy2 \
               ennyah_dkb1008 \
               hpi6 hp2501 hp2505 hp5181 hpxe3gc hpxe3gf hpxe4xxx hpzt11xx \
               hp500fa hp5xx hp5185 \
Index: rules/xorg.lst
===================================================================
RCS file: /cvs/xorg/xc/programs/xkbcomp/rules/xorg.lst,v
retrieving revision 1.3
diff -u -3 -p -r1.3 xorg.lst
--- rules/xorg.lst	12 Oct 2004 19:13:44 -0000	1.3
+++ rules/xorg.lst	14 Jan 2005 11:29:37 -0000
@@ -48,6 +48,7 @@
   dtk2000	DTK2000
   ennyah_dkb1008 Ennyah DKB-1008
   genius	Genius Comfy KB-16M / Genius MM Keyboard KWD-910
+  geniuscomfy  Genius Comfy KB-12e
   geniuscomfy2	Genius Comfy KB-21e-Scroll
   hpi6		Hewlett-Packard Internet Keyboard
   hp2501	Hewlett-Packard SK-2501 Multimedia Keyboard
Index: rules/xorg.xml
===================================================================
RCS file: /cvs/xorg/xc/programs/xkbcomp/rules/xorg.xml,v
retrieving revision 1.3
diff -u -3 -p -r1.3 xorg.xml
--- rules/xorg.xml	12 Oct 2004 19:13:45 -0000	1.3
+++ rules/xorg.xml	14 Jan 2005 11:29:43 -0000
@@ -497,6 +497,12 @@
     </model>
     <model>
       <configItem>
+        <name>geniuscomfy</name>
+        <description>Genius Comfy KB-12e</description>
+      </configItem>
+    </model>
+    <model>
+      <configItem>
         <name>geniuscomfy2</name>
         <description>Genius Comfy KB-21e-Scroll</description>
       </configItem>
Index: symbols/inet
===================================================================
RCS file: /cvs/xorg/xc/programs/xkbcomp/symbols/inet,v
retrieving revision 1.4
diff -u -3 -p -r1.4 inet
--- symbols/inet	18 Oct 2004 14:21:47 -0000	1.4
+++ symbols/inet	14 Jan 2005 11:29:44 -0000
@@ -685,6 +685,30 @@ xkb_symbols "genius" {
     key <I63>   {	[ XF86WakeUp		]	};
 };
 
+
+
+partial alphanumeric_keys
+xkb_symbols "geniuscomfy" {
+    // From Jurica Vukadin <jura@webit.hr>
+    // Describes the extra keys on a Genius Comfy KB-12e
+
+    name[Group1]= "GeniusComfy12e";
+
+    key <I2E>   {       [ XF86AudioLowerVolume  ]       };
+    key <I21>   {       [ XF86Calculator        ]       };
+    key <I22>   {       [ XF86AudioPlay, XF86AudioPause ]       };
+    key <I24>   {       [ XF86AudioStop         ]       };
+    key <I30>   {       [ XF86AudioRaiseVolume  ]       };
+    key <I32>   {       [ XF86WWW	        ]       };
+    key <I5F>   {       [ XF86Sleep             ]       };
+    key <I69>   {       [ XF86Forward           ]       };
+    key <I6A>   {       [ XF86Back              ]       };
+    key <I6B>   {       [ XF86MyComputer        ]       };
+    key <I6C>   {       [ XF86Mail              ]       };
+    key <I6D>   {       [ XF86AudioMedia        ]       };
+};
+
+
 partial alphanumeric_keys
 xkb_symbols "geniuscomfy2" {
     // From Radics Laszlo <garaboncias@mailbox.hu>