From 3bd45bc627583ec1cd76a195b66a5f2a34acdb7c Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sun, 12 Apr 2020 02:43:40 -0500 Subject: [PATCH] - Resolved instability issue under KDE and xkb keymaps --- .xkb/symbols/mac_gui | 118 ++++++++++++++++++++++++++++++++++++++---- .xkb/symbols/mac_term | 8 ++- .xkb/types/mac_term | 10 ++++ 3 files changed, 124 insertions(+), 12 deletions(-) diff --git a/.xkb/symbols/mac_gui b/.xkb/symbols/mac_gui index 469a967..8e76041 100644 --- a/.xkb/symbols/mac_gui +++ b/.xkb/symbols/mac_gui @@ -1,4 +1,19 @@ // Template +// +// ONE_LEVEL_CTRL +// Base +// Shift +// Alt +// Shift Alt +// Control +// Shift Control +// Super +// Shift Super +// Control Alt +// Super Control +// Super Alt +// Super Control Alt +// // replace key { // type[Group1]= "ONE_LEVEL_CTRL", // symbols[Group1]= [ @@ -163,17 +178,27 @@ default partial xkb_symbols "mac_levelssym" { replace key { type[Group1]= "ONE_LEVEL_CTRL", symbols[Group1]= [ + // Base q, + // Shift Q, + // Alt q, + // Shift Alt Q, + // Control F4 ], actions[Group1]= [ + // Base NoAction(), + // Shift NoAction(), + // Alt NoAction(), + // Shift Alt NoAction(), + // Control RedirectKey(key=,modifiers=Mod1,clearmods=Control) ] }; @@ -181,10 +206,15 @@ default partial xkb_symbols "mac_levelssym" { replace key { type[Group1]= "ONE_LEVEL_CTRL", symbols[Group1]= [ + // Base F3, + // Shift F3, + // Alt F3, + // Shift Alt F3, + // Control d ], actions[Group1]= [ @@ -199,17 +229,29 @@ default partial xkb_symbols "mac_levelssym" { replace key { type[Group1]= "ONE_LEVEL_CTRL", symbols[Group1]= [ + // Base g, + // Shift G, + // Alt g, + // Shift Alt G, + // Control g, + // Shift Control G, + // Super NoSymbol, + // Shift Super NoSymbol, + // Control Alt g, + // Super Control g, + // Super Alt g, + // Super Control Alt g ], actions[Group1]= [ @@ -237,99 +279,155 @@ default partial xkb_symbols "mac_levelssym" { replace key { type[Group1]= "ONE_LEVEL_CTRL", symbols[Group1]= [ + // Base Left, + // Shift Left, + // Alt Left, + // Shift Alt Left, + // Control NoSymbol, + // Shift Control NoSymbol, + // Super Left ], actions[Group1]= [ + // Base NoAction(), + // Shift NoAction(), - // Wordwise + // Alt - Wordwise RedirectKey(key=,mods=Control,clearmods=Mod1), + // Shift Alt RedirectKey(key=,mods=Control,clearmods=Mod1), + // Control RedirectKey(key=,clearmods=Control), + // Shift Control RedirectKey(key=,clearmods=Control), - // Change workspace - NoAction(), // Super - Change workspace NoAction() ] }; + // Right to End of Line or end of word replace key { type[Group1]= "ONE_LEVEL_CTRL", symbols[Group1]= [ + // Base Right, + // Shift Right, + // Alt Right, + // Shift Alt Right, + // Control NoSymbol, - NoSymbol + // Shift Control + NoSymbol, + // Super + Right ], actions[Group1]= [ + // Base NoAction(), + // Shift NoAction(), - // Wordwise + // Alt - Wordwise RedirectKey(key=,mods=Control,clearmods=Mod1), + // Shift Alt RedirectKey(key=,mods=Control,clearmods=Mod1), + // Control RedirectKey(key=,clearmods=Control), + // Shift Control RedirectKey(key=,clearmods=Control), - // Change workspace + // Super - Change workspace NoAction() ] }; + //Up to Mac Home replace key { type[Group1]= "ONE_LEVEL_CTRL", symbols[Group1]= [ + // Base Up, + // Shift Up, + // Alt Up, + // Shift Alt Up, + // Control NoSymbol, + // Shift Control NoSymbol, + // Super + Up, + // Shift Super Up ], actions[Group1]= [ + // Base NoAction(), + // Shift NoAction(), - // Wordwise + // Alt - Wordwise RedirectKey(key=,clearmods=Mod1), + // Shift Alt // RedirectKey(key=), // Chromebook multicursor RedirectKey(key=,clearmods=Mod1), // Default multicursor + // Control RedirectKey(key=), + // Shift Control RedirectKey(key=), - // Wordwise - Sublime? + // Super - Wordwise - Sublime? RedirectKey(key=,clearmods=Super), + // Shift Super RedirectKey(key=,modifiers=Mod1,clearmods=Super) ] }; + // Down to Mac End replace key { type[Group1]= "ONE_LEVEL_CTRL", symbols[Group1]= [ + // Base Down, + // Shift Down, + // Alt Down, + // Shift Alt Down, + // Control NoSymbol, + // Shift Control NoSymbol, + // Super + Down, + // Shift Super Down ], actions[Group1]= [ + // Base NoAction(), + // Shift NoAction(), - // Wordwise + // Alt - Wordwise RedirectKey(key=,clearmods=Mod1), + // Shift Alt RedirectKey(key=,clearmods=Mod1), + // Control RedirectKey(key=), + // Shift Control RedirectKey(key=), - // Wordwise - Sublime? + // Super - Wordwise - Sublime? RedirectKey(key=,clearmods=Super), + // Shift Super RedirectKey(key=,modifiers=Mod1,clearmods=Super) ] }; diff --git a/.xkb/symbols/mac_term b/.xkb/symbols/mac_term index a48d571..73e38cc 100644 --- a/.xkb/symbols/mac_term +++ b/.xkb/symbols/mac_term @@ -93,9 +93,11 @@ partial xkb_symbols "mac_global" { RedirectKey(key=,modifiers=Super,clearmods=Control+Shift) ] }; + // Cycle App and In App Tab Switching key { [ F13 ] }; key { [ F14 ] }; + replace key { type[Group1]= "ONE_LEVEL_CMD", symbols[Group1]= [ @@ -113,9 +115,10 @@ partial xkb_symbols "mac_global" { Redirect(key=,mods=Control,clearmods=Mod4+Super) // Default ] }; + // Page Up replace key { - type[Group1]= "ONE_LEVEL_CMD", + type[Group1]= "ONE_LEVEL_CTRL", symbols[Group1]= [ Up, Up, @@ -127,9 +130,10 @@ partial xkb_symbols "mac_global" { RedirectKey(key=,clearmods=Shift+Control) ] }; + // Page Down replace key { - type[Group1]= "ONE_LEVEL_CMD", + type[Group1]= "ONE_LEVEL_CTRL", symbols[Group1]= [ Down, Down, diff --git a/.xkb/types/mac_term b/.xkb/types/mac_term index de34832..10fa367 100644 --- a/.xkb/types/mac_term +++ b/.xkb/types/mac_term @@ -40,4 +40,14 @@ default partial xkb_types "addmac_levels" { level_name[Level5] = "Super"; level_name[Level6] = "Super Shift"; }; + type "ONE_LEVEL_SUPER" { + modifiers = Shift+Super; + map[Shift] = Level2; + map[Super] = Level3; + map[Shift+Super] = Level4; + level_name[Level1] = "Base"; + level_name[Level2] = "Shift"; + level_name[Level3] = "Super"; + level_name[Level4] = "Super Shift"; + }; };