From 11bb2abd1ef47919d178922d8a4e20acb1e2390a Mon Sep 17 00:00:00 2001
From: Hunter Haugen <h.haugen@gmail.com>
Date: Sun, 13 Dec 2009 01:49:32 +0530
Subject: [PATCH] New keyboard layout, CarpalX, and a few tweaks to dvorak.

---
 keymaps/xkb/hunner-carpalx.xkb | 100 +++++++++++++++++++++++++++++++++
 keymaps/xkb/hunner.xkb         |   6 +-
 2 files changed, 104 insertions(+), 2 deletions(-)
 create mode 100644 keymaps/xkb/hunner-carpalx.xkb

diff --git a/keymaps/xkb/hunner-carpalx.xkb b/keymaps/xkb/hunner-carpalx.xkb
new file mode 100644
index 0000000..ffd8cb1
--- /dev/null
+++ b/keymaps/xkb/hunner-carpalx.xkb
@@ -0,0 +1,100 @@
+xkb_keymap {
+    xkb_keycodes  { include "evdev+aliases(qwerty)" };
+    xkb_types     { include "complete" };
+    xkb_compat    { include "complete" };
+    xkb_geometry  { include "thinkpad(us)" };
+
+    xkb_symbols "hunner" {
+        include "pc+us(dvorak)+inet(evdev)"
+
+        name[group1]="Dvorak";
+        //name[group2]="Colemak";
+        //name[group3]="QGMLWB";
+        // Alphanumeric section
+
+        //             Unmodified       Shift           AltGr            Shift+AltGr
+        key  <ESC> { [ grave,           asciitilde,     dead_grave,      dead_tilde       ] };
+
+        // Number row, left side
+        key <TLDE> { [ Escape ] };
+        key <AE01> { [ 7,               ampersand                                         ] };
+        key <AE02> { [ 5,               percent,        EuroSign,        cent ] };
+        key <AE03> { [ 3,               numbersign,     sterling,        sterling ] };
+        key <AE04> { [ 1,               exclam,         1,               exclamdown       ] };
+        key <AE05> { [ 9,               parenleft,      dead_grave                        ] };
+
+        // Number row, right side
+        key <AE06> { [ 0,               parenright                                        ] };
+        key <AE07> { [ 2,               at                                                ] };
+        key <AE08> { [ 4,               dollar                                            ] };
+        key <AE09> { [ 6,               asciicircum,    dead_circumflex, dead_circumflex  ] };
+        key <AE10> { [ 8,               asterisk                                          ] };
+        key <AE11> { [ minus,           underscore,     endash,          emdash ] };
+        key <AE12> { [ equal,           plus,           multiply,        division         ] };
+        key <BKSP> { [ backslash,       bar ] };
+
+        // Upper row, left side
+        key  <TAB> { [ Tab,             ISO_Left_Tab ] };
+        key <AD01> { [ q,               Q       ] };
+        key <AD02> { [ g,               G,              gcircumflex,     Gcircumflex      ] };
+        key <AD03> { [ m,               M       ] };
+        key <AD04> { [ l,               L ] };
+        key <AD05> { [ w,               W       ] };
+
+        // Upper row, right side
+        key <AD06> { [ b,               B       ] };
+        key <AD07> { [ y,               Y,              yen,             heart            ] };
+        key <AD08> { [ u,               U,              U016D,           U016C       ] };
+        key <AD09> { [ v,               V       ] };
+        key <AD11> { [ semicolon,       colon,          dead_ogonek,     dead_diaeresis ] };
+        key <AD12> { [ bracketleft,     braceleft,      hyphen                            ] };
+        key <AD13> { [ bracketright,    braceright,     dead_tilde                        ] };
+        key <BKSL> { [ BackSpace,       bar,            brokenbar        ] };
+
+        // Home row, left side
+        key <CAPS> { [ Control_L ] };
+        key <AC01> { [ d,               D       ] };
+        key <AC02> { [ s,               S,              scircumflex,     Scircumflex       ] };
+        key <AC03> { [ t,               T,              ssharp,          ssharp            ] };
+        key <AC04> { [ n,               N       ] };
+        key <AC05> { [ r,               R ] };
+
+        // Home row, right side
+        key <AC06> { [ i,               I       ] };
+        key <AC07> { [ a,               A       ] };
+        key <AC08> { [ e,               E,              EuroSign       ] };
+        key <AC09> { [ o,               O       ] };
+        key <AC10> { [ h,               H,              hcircumflex,     Hcircumflex       ] };
+        key <AC11> { [ apostrophe,      quotedbl,       dead_acute,      dead_diaeresis   ] };
+        key <RTRN> { [ Return ] };
+
+        // Lower row, left side
+        key <LFSH> { [ Shift_L ] };
+        key <AB01> { [ z,               Z       ] };
+        key <AB02> { [ x,               X       ] };
+        key <AB03> { [ c,               C,              ccircumflex,     Ccircumflex      ] };
+        key <AB04> { [ f,               F                                                 ] };
+        key <AB05> { [ j,               J,              jcircumflex,     Jcircumflex       ] };
+
+        // Lower row, right side
+        key <AB06> { [ k,               K       ] };
+        key <AB07> { [ p,               P,              paragraph ] };
+        key <AB08> { [ comma,           less,           dead_cedilla,    dead_caron       ] };
+        key <AB09> { [ period,          greater,        dead_breve,      dead_abovedot    ] };
+        key <AB10> { [ slash,           question,       dead_hook,       questiondown     ] };
+        key <RTSH> { [ Shift_R ] };
+
+        // Mod row
+        key <LCTL> { [ Caps_Lock ] };
+        key <LWIN> { [ Super_L ] };
+        key <SPCE> { [ space,           space ] };
+        key <COMP> { [ Super_R ] };
+//        key <COMP> { [ Menu ] };
+
+        modifier_map Lock { <LCTL> };
+        modifier_map Control { <CAPS> };
+
+        include "group(alts_toggle)+level3(ralt_switch_for_alts_toggle)"
+    };
+
+};
diff --git a/keymaps/xkb/hunner.xkb b/keymaps/xkb/hunner.xkb
index a83cee8..cf6a9b7 100644
--- a/keymaps/xkb/hunner.xkb
+++ b/keymaps/xkb/hunner.xkb
@@ -8,6 +8,8 @@ xkb_keymap {
         include "pc+us(dvorak)+inet(evdev)"
 
         name[group1]="Dvorak";
+        //name[group2]="Colemak";
+        //name[group3]="QGMLWB";
         // Alphanumeric section
 
         //             Unmodified       Shift           AltGr            Shift+AltGr
@@ -38,7 +40,6 @@ xkb_keymap {
         key <AD03> { [ period,          greater,        dead_breve,      dead_abovedot    ] };
         key <AD04> { [ p,               P,              paragraph ] };
         key <AD05> { [ y,               Y,              yen,             heart            ] };
-        key <BKSL> { [ BackSpace,       bar,            brokenbar        ] };
 
         // Upper row, right side
         key <AD06> { [ f,               F                                                 ] };
@@ -48,7 +49,7 @@ xkb_keymap {
         key <AD10> { [ l,               L ] };
         key <AD11> { [ slash,           question,       dead_hook,       questiondown     ] };
         key <AD12> { [ equal,           plus,           multiply,        division         ] };
-        key <RTRN> { [ Return ] };
+        key <BKSL> { [ BackSpace,       bar,            brokenbar        ] };
 
         // Home row, left side
         key <CAPS> { [ Control_L ] };
@@ -65,6 +66,7 @@ xkb_keymap {
         key <AC09> { [ n,               N       ] };
         key <AC10> { [ s,               S,              scircumflex,     Scircumflex       ] };
         key <AC11> { [ minus,           underscore,     endash,          emdash ] };
+        key <RTRN> { [ Return ] };
 
         // Lower row, left side
         key <LFSH> { [ Shift_L ] };