From 23f156b38bfb480e9d3d8cee9c86634da97b0c07 Mon Sep 17 00:00:00 2001
From: svu <svu>
Date: Sun, 2 Oct 2005 22:48:20 +0000
Subject: [PATCH] Adding Genius Comfy, closing #2275

---
 ChangeLog             |  7 +++++++
 rules/base.lists.part |  2 +-
 rules/base.xml.in     |  6 ++++++
 symbols/inet          | 36 ++++++++++++++++++++++++------------
 4 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d529b6f..5f69eaa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-10-02 svu
+
+	* rules/base.lists.part, rules/base.xml.in, 
+	symbols/inet:
+	adding Genius Comfy, closing
+	https://bugs.freedesktop.org/show_bug.cgi?id=2275
+
 2005-10-02 svu
 
 	* rules/Makefile.am, rules/HDR, 
diff --git a/rules/base.lists.part b/rules/base.lists.part
index 9e6778a..eb84930 100644
--- a/rules/base.lists.part
+++ b/rules/base.lists.part
@@ -20,7 +20,7 @@
               compaqeak8 compaqik7 compaqik13 compaqik18 cymotionlinux \
               armada presario ipaq \
               dell inspiron dtk2000 \
-              dexxa diamond genius geniuscomfy2 \
+              dexxa diamond genius geniuscomfy geniuscomfy2 \
               emachines ennyah_dkb1008 gyration \
               hpi6 hp2501 hp2505 hp5181 hpxe3gc hpxe3gf hpxe4xxx hpzt11xx \
               hp500fa hp5xx hp5185 \
diff --git a/rules/base.xml.in b/rules/base.xml.in
index 1852912..b10f70e 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -284,6 +284,12 @@
         <_description>Genius Comfy KB-16M / Genius MM Keyboard KWD-910</_description>
       </configItem>
     </model>
+    <model>
+      <configItem>
+        <name>geniuscomfy</name>
+        <_description>Genius Comfy KB-12e</_description>
+      </configItem>
+    </model>
     <model>
       <configItem>
         <name>geniuscomfy2</name>
diff --git a/symbols/inet b/symbols/inet
index 3c0f5eb..97ca4be 100644
--- a/symbols/inet
+++ b/symbols/inet
@@ -712,33 +712,45 @@ 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
+
+    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        ]       };
+};
+
+
 // GeniusComfy21e
 partial alphanumeric_keys
 xkb_symbols "geniuscomfy2" {
     // From Radics Laszlo <garaboncias@mailbox.hu>
     // Describes the extra keys on a Genius Comfy KB-21e-Scroll
+
+    include "inet(geniuscomfy)"
+
     key <I10>   {       [ XF86AudioPrev         ]       };
     key <I13>   {       [ XF86Word              ]       };
     key <I14>   {       [ XF86Excel             ]       };
     key <I19>   {       [ XF86AudioNext         ]       };
     key <I20>   {       [ XF86AudioMute         ]       };
-    key <I2E>   {       [ XF86AudioLowerVolume  ]       };
-    key <I21>   {       [ XF86Calculator        ]       };
-    key <I22>   {       [ XF86AudioPlay, XF86AudioPause ]       };
     key <I23>   {       [ Return                ]       };
-    key <I24>   {       [ XF86AudioStop         ]       };
-    key <I30>   {       [ XF86AudioRaiseVolume  ]       };
-    key <I32>   {       [ XF86HomePage          ]       };
-    key <I5F>   {       [ XF86Sleep             ]       };
     key <I65>   {       [ XF86Search            ]       };
     key <I66>   {       [ XF86Favorites         ]       };
     key <I67>   {       [ XF86Refresh           ]       };
     key <I68>   {       [ XF86Stop              ]       };
-    key <I69>   {       [ XF86Forward           ]       };
-    key <I6A>   {       [ XF86Back              ]       };
-    key <I6B>   {       [ XF86MyComputer        ]       };
-    key <I6C>   {       [ XF86Mail              ]       };
-    key <I6D>   {       [ XF86AudioMedia        ]       };
 };
 
 
-- 
2.32.0.93.g670b81a890