base .Xkeymap from stretch-11-2016.xkb

diff --git a/.Xkeymap b/.Xkeymap
index 9bc2bad8e4b67455f93d4bbe6aacd39feadc2a46..b0d4293169c6e8e6e433a3f87417463475995ac1 100644 (file)
--- a/.Xkeymap
+++ b/.Xkeymap
@@ -329,6 +329,12 @@ xkb_types "complete" {
         level_name[Level1]= "Base";
         level_name[Level2]= "Shift+Alt";
     };
+    type "PC_SUPER_LEVEL2" {
+        modifiers= Mod4;
+        map[Mod4]= Level2;
+        level_name[Level1]= "Base";
+        level_name[Level2]= "Super";
+    };
     type "PC_CONTROL_LEVEL2" {
         modifiers= Control;
         map[Control]= Level2;
@@ -456,6 +462,90 @@ xkb_types "complete" {
         level_name[Level7]= "X Alt Base";
         level_name[Level8]= "X Shift Alt";
     };
+    type "EIGHT_LEVEL_LEVEL_FIVE_LOCK" {
+        modifiers= Shift+Lock+NumLock+LevelThree+LevelFive;
+        map[Shift]= Level2;
+        map[LevelThree]= Level3;
+        map[Shift+LevelThree]= Level4;
+        map[LevelFive]= Level5;
+        map[Shift+LevelFive]= Level6;
+        preserve[Shift+LevelFive]= Shift;
+        map[LevelThree+LevelFive]= Level7;
+        map[Shift+LevelThree+LevelFive]= Level8;
+        map[NumLock]= Level5;
+        map[Shift+NumLock]= Level6;
+        preserve[Shift+NumLock]= Shift;
+        map[NumLock+LevelThree]= Level7;
+        map[Shift+NumLock+LevelThree]= Level8;
+        map[Shift+NumLock+LevelFive]= Level2;
+        map[NumLock+LevelThree+LevelFive]= Level3;
+        map[Shift+NumLock+LevelThree+LevelFive]= Level4;
+        map[Shift+Lock]= Level2;
+        map[Lock+LevelThree]= Level3;
+        map[Shift+Lock+LevelThree]= Level4;
+        map[Lock+LevelFive]= Level5;
+        map[Shift+Lock+LevelFive]= Level6;
+        preserve[Shift+Lock+LevelFive]= Shift;
+        map[Lock+LevelThree+LevelFive]= Level7;
+        map[Shift+Lock+LevelThree+LevelFive]= Level8;
+        map[Lock+NumLock]= Level5;
+        map[Shift+Lock+NumLock]= Level6;
+        preserve[Shift+Lock+NumLock]= Shift;
+        map[Lock+NumLock+LevelThree]= Level7;
+        map[Shift+Lock+NumLock+LevelThree]= Level8;
+        map[Shift+Lock+NumLock+LevelFive]= Level2;
+        map[Lock+NumLock+LevelThree+LevelFive]= Level3;
+        map[Shift+Lock+NumLock+LevelThree+LevelFive]= Level4;
+        level_name[Level1]= "Base";
+        level_name[Level2]= "Shift";
+        level_name[Level3]= "Alt Base";
+        level_name[Level4]= "Shift Alt";
+        level_name[Level5]= "X";
+        level_name[Level6]= "X Shift";
+        level_name[Level7]= "X Alt Base";
+        level_name[Level8]= "X Shift Alt";
+    };
+    type "EIGHT_LEVEL_ALPHABETIC_LEVEL_FIVE_LOCK" {
+        modifiers= Shift+Lock+NumLock+LevelThree+LevelFive;
+        map[Shift]= Level2;
+        map[LevelThree]= Level3;
+        map[Shift+LevelThree]= Level4;
+        map[LevelFive]= Level5;
+        map[Shift+LevelFive]= Level6;
+        preserve[Shift+LevelFive]= Shift;
+        map[LevelThree+LevelFive]= Level7;
+        map[Shift+LevelThree+LevelFive]= Level8;
+        map[NumLock]= Level5;
+        map[Shift+NumLock]= Level6;
+        preserve[Shift+NumLock]= Shift;
+        map[NumLock+LevelThree]= Level7;
+        map[Shift+NumLock+LevelThree]= Level8;
+        map[Shift+NumLock+LevelFive]= Level2;
+        map[NumLock+LevelThree+LevelFive]= Level3;
+        map[Shift+NumLock+LevelThree+LevelFive]= Level4;
+        map[Lock]= Level2;
+        map[Lock+LevelThree]= Level3;
+        map[Shift+Lock+LevelThree]= Level4;
+        map[Lock+LevelFive]= Level5;
+        map[Shift+Lock+LevelFive]= Level6;
+        map[Lock+LevelThree+LevelFive]= Level7;
+        map[Shift+Lock+LevelThree+LevelFive]= Level8;
+        map[Lock+NumLock]= Level5;
+        map[Shift+Lock+NumLock]= Level6;
+        map[Lock+NumLock+LevelThree]= Level7;
+        map[Shift+Lock+NumLock+LevelThree]= Level8;
+        map[Lock+NumLock+LevelFive]= Level2;
+        map[Lock+NumLock+LevelThree+LevelFive]= Level4;
+        map[Shift+Lock+NumLock+LevelThree+LevelFive]= Level3;
+        level_name[Level1]= "Base";
+        level_name[Level2]= "Shift";
+        level_name[Level3]= "Alt Base";
+        level_name[Level4]= "Shift Alt";
+        level_name[Level5]= "X";
+        level_name[Level6]= "X Shift";
+        level_name[Level7]= "X Alt Base";
+        level_name[Level8]= "X Shift Alt";
+    };
     type "EIGHT_LEVEL_SEMIALPHABETIC" {
         modifiers= Shift+Lock+LevelThree+LevelFive;
         map[Shift]= Level2;
@@ -470,14 +560,14 @@ xkb_types "complete" {
         map[Shift+LevelFive]= Level6;
         map[Lock+LevelFive]= Level6;
         preserve[Lock+LevelFive]= Lock;
+        map[Shift+Lock+LevelFive]= Level6;
+        preserve[Shift+Lock+LevelFive]= Lock;
         map[LevelThree+LevelFive]= Level7;
         map[Shift+LevelThree+LevelFive]= Level8;
         map[Lock+LevelThree+LevelFive]= Level7;
         preserve[Lock+LevelThree+LevelFive]= Lock;
         map[Shift+Lock+LevelThree+LevelFive]= Level8;
         preserve[Shift+Lock+LevelThree+LevelFive]= Lock;
-        map[Shift+Lock+LevelFive]= Level1;
-        preserve[Shift+Lock+LevelFive]= Lock;
         level_name[Level1]= "Base";
         level_name[Level2]= "Shift";
         level_name[Level3]= "Alt Base";
@@ -612,9 +702,6 @@ xkb_compatibility "complete" {
         virtualModifier= NumLock;
         action= LockMods(modifiers=NumLock);
     };
-    interpret ISO_Lock+AnyOf(all) {
-        action= ISOLock(modifiers=modMapMods,affect=all);
-    };
     interpret ISO_Level3_Shift+AnyOf(all) {
         virtualModifier= LevelThree;
         useModMapMods=level1;
@@ -673,10 +760,12 @@ xkb_compatibility "complete" {
     };
     interpret ISO_Level5_Latch+AnyOf(all) {
         virtualModifier= LevelFive;
+        useModMapMods=level1;
         action= LatchMods(modifiers=LevelFive,clearLocks,latchToLock);
     };
     interpret ISO_Level5_Lock+AnyOf(all) {
         virtualModifier= LevelFive;
+        useModMapMods=level1;
         action= LockMods(modifiers=LevelFive);
     };
     interpret Mode_switch+AnyOfOrNone(all) {
@@ -939,7 +1028,7 @@ xkb_compatibility "complete" {
     };
 };
 
-xkb_symbols "pc+us+inet(evdev)" {
+xkb_symbols "pc+us+inet(evdev)+ctrl(nocaps)+terminate(ctrl_alt_bksp)" {
 
     name[group1]="English (US)";
 
@@ -951,12 +1040,15 @@ xkb_symbols "pc+us+inet(evdev)" {
     key <AE05> {         [               5,         percent ] };
     key <AE06> {         [               6,     asciicircum ] };
     key <AE07> {         [               7,       ampersand ] };
-    key <AE08> {         [               8,      asterisk ] };
+    key <AE08> {         [               8,        asterisk ] };
     key <AE09> {         [               9,       parenleft ] };
     key <AE10> {         [               0,      parenright ] };
     key <AE11> {         [           minus,      underscore ] };
     key <AE12> {         [           equal,            plus ] };
-    key <BKSP> {         [       BackSpace,       BackSpace ] };
+    key <BKSP> {
+        type= "CTRL+ALT",
+        symbols[Group1]= [       BackSpace,       BackSpace,        NoSymbol,        NoSymbol, Terminate_Server ]
+    };
     key  <TAB> {         [             Tab,    ISO_Left_Tab ] };
     key <AD01> {
         type= "ALPHABETIC",
@@ -1081,7 +1173,7 @@ xkb_symbols "pc+us+inet(evdev)" {
     };
     key <LALT> {         [           Alt_L,          Meta_L ] };
     key <SPCE> {         [           space ] };
-    key <CAPS> {         [       Caps_Lock ] };
+    key <CAPS> {         [       Control_L,       Control_L ] };
     key <FK01> {
         type= "CTRL+ALT",
         symbols[Group1]= [              F1,              F1,              F1,              F1, XF86Switch_VT_1 ]
@@ -1211,7 +1303,7 @@ xkb_symbols "pc+us+inet(evdev)" {
     key <UNDO> {         [            Undo ] };
     key <FRNT> {         [        SunFront ] };
     key <COPY> {         [        XF86Copy ] };
-    key <OPEN> {         [         SunOpen ] };
+    key <OPEN> {         [        XF86Open ] };
     key <PAST> {         [       XF86Paste ] };
     key <FIND> {         [            Find ] };
     key  <CUT> {         [         XF86Cut ] };
@@ -1228,7 +1320,8 @@ xkb_symbols "pc+us+inet(evdev)" {
     key <I158> {         [         XF86WWW ] };
     key <I159> {         [         XF86DOS ] };
     key <I160> {         [ XF86ScreenSaver ] };
-    key <I162> {         [ XF86RotateWindows ] };
+    key <I161> {         [ XF86RotateWindows ] };
+    key <I162> {         [    XF86TaskPane ] };
     key <I163> {         [        XF86Mail ] };
     key <I164> {         [   XF86Favorites ] };
     key <I165> {         [  XF86MyComputer ] };
@@ -1306,7 +1399,7 @@ xkb_symbols "pc+us+inet(evdev)" {
     modifier_map Shift { <LFSH> };
     modifier_map Shift { <RTSH> };
     modifier_map Mod1 { <LALT> };
-    modifier_map Lock { <CAPS> };
+    modifier_map Control { <CAPS> };
     modifier_map Mod2 { <NMLK> };
     modifier_map Mod5 { <LVL3> };
     modifier_map Control { <RCTL> };

diff --git a/.Xmodmap b/.Xmodmap
deleted file mode 100644 (file)
index ad8e5a2..0000000
--- a/.Xmodmap
+++ /dev/null
@@ -1 +0,0 @@
-keycode 94 = underscore F10

diff --git a/machine_specific/x2/.Xmodmap b/machine_specific/x2/.Xmodmap
deleted file mode 100644 (file)
index 8f7756f..0000000
--- a/machine_specific/x2/.Xmodmap
+++ /dev/null
@@ -1,22 +0,0 @@
-!keycode 94 = underscore F10
-! on x200:
-! 108 = alt_r
-! 105 = control_r
-! 37 = control_l
-! 64 = alt_l
-! 66 = caps lock
-! instead of keycode, you can say
-! keysym Alt_R = Control_L
-! however, this seems confusing, and not idempotent
-! although I havent tested for idempontency
-
-! this didn't work as expected, disabled temporarily
-!remove Lock = Caps_Lock
-!remove Control = Control_L
-!remove Mod1 = Alt_R
-!remove Control = Control_R
-!keycode 37 = End
-!keycode 105 = KP_Enter
-!keycode 66 = Home
-!keycode 108 = Control_L
-!add Control = Control_L

diff --git a/stretch-x2-11-2016.xkb b/stretch-11-2016.xkb
similarity index 100%
rename from stretch-x2-11-2016.xkb
rename to stretch-11-2016.xkb