keyboard and cron fixes

[distro-setup] / stretch-x2-11-2016.xkb

diff --git a/stretch-9-2016.xkb b/stretch-x2-11-2016.xkb
similarity index 99%
rename from stretch-9-2016.xkb
rename to stretch-x2-11-2016.xkb
index e6001cd088eae284a7c295d8dd30f0c7675e8cdf..c2b1f0d97404a044624340779b86a4736bf85436 100644 (file)
--- a/stretch-9-2016.xkb
+++ b/stretch-x2-11-2016.xkb
@@ -1,5 +1,5 @@
 xkb_keymap {
-xkb_keycodes "evdev_aliases(qwerty)" {
+xkb_keycodes "evdev+aliases(qwerty)" {
     minimum = 8;
     maximum = 255;
      <ESC> = 9;
@@ -30,7 +30,7 @@ xkb_keycodes "evdev_aliases(qwerty)" {
     <AD11> = 34;
     <AD12> = 35;
     <RTRN> = 36;
-    <LALT> = 37;
+    <LCTL> = 37;
     <AC01> = 38;
     <AC02> = 39;
     <AC03> = 40;
@@ -57,7 +57,7 @@ xkb_keycodes "evdev_aliases(qwerty)" {
     <AB10> = 61;
     <RTSH> = 62;
     <KPMU> = 63;
-    <LCTL> = 64;
+    <LALT> = 64;
     <SPCE> = 65;
     <CAPS> = 66;
     <FK01> = 67;
@@ -387,6 +387,7 @@ xkb_types "complete" {
     };
     type "LOCAL_EIGHT_LEVEL" {
         modifiers= Shift+Lock+Control+LevelThree;
+        map[Shift+Lock]= Level1;
         map[Shift]= Level2;
         map[Lock]= Level2;
         map[LevelThree]= Level3;
@@ -616,6 +617,7 @@ xkb_types "complete" {
     };
     type "FOUR_LEVEL_MIXED_KEYPAD" {
         modifiers= Shift+NumLock+LevelThree;
+        map[Shift+NumLock]= Level1;
         map[NumLock]= Level2;
         map[Shift]= Level2;
         map[LevelThree]= Level3;
@@ -1174,7 +1176,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)";
 
@@ -1191,7 +1193,10 @@ xkb_symbols "pc_us_inet(evdev)" {
     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",
@@ -1236,7 +1241,7 @@ xkb_symbols "pc_us_inet(evdev)" {
     key <AD11> {         [     bracketleft,       braceleft ] };
     key <AD12> {         [    bracketright,      braceright ] };
     key <RTRN> {         [          Return ] };
-    key <LALT> {         [           Alt_L,          Meta_L ] };
+    key <LCTL> {         [       Control_L ] };
     key <AC01> {
         type= "ALPHABETIC",
         symbols[Group1]= [               a,               A ]
@@ -1314,9 +1319,9 @@ xkb_symbols "pc_us_inet(evdev)" {
         type= "CTRL+ALT",
         symbols[Group1]= [     KP_Multiply,     KP_Multiply,     KP_Multiply,     KP_Multiply,   XF86ClearGrab ]
     };
-    key <LCTL> {         [       Control_L ] };
+    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 ]
@@ -1536,11 +1541,11 @@ xkb_symbols "pc_us_inet(evdev)" {
     key <I244> {         [     XF86Battery ] };
     key <I245> {         [   XF86Bluetooth ] };
     key <I246> {         [        XF86WLAN ] };
-    modifier_map Mod1 { <LALT> };
+    modifier_map Control { <LCTL> };
     modifier_map Shift { <LFSH> };
     modifier_map Shift { <RTSH> };
-    modifier_map Control { <LCTL> };
-    modifier_map Lock { <CAPS> };
+    modifier_map Mod1 { <LALT> };
+    modifier_map Control { <CAPS> };
     modifier_map Mod2 { <NMLK> };
     modifier_map Mod5 { <LVL3> };
     modifier_map Control { <RCTL> };