- Updated mac_gui and term files to better map keys that only concern shift and/or control.

This commit is contained in:
Ben Reaves
2020-02-26 20:54:23 -06:00
parent c4db31bdf0
commit e8a8c0ed56
3 changed files with 40 additions and 18 deletions

View File

@@ -27,40 +27,46 @@ partial xkb_symbols "mac_win" {
}; };
}; };
partial xkb_symbols "mac_global" { partial xkb_symbols "mac_global" {
// // Cycle App and In App Tab Switching // Cycle App and In App Tab Switching
// replace key <TAB> { // replace key <TAB> {
// type[Group1]= "ONE_LEVEL_CTRL", // type[Group1]= "ONE_LEVEL_CTRL",
// symbols[Group1]= [ // symbols[Group1]= [
// Tab, // Tab,
// Tab, // Tab,
// backslash, // // backslash,
// Tab,
// // NoSymbol, // // NoSymbol,
// NoSymbol, // NoSymbol,
// backslash, // // backslash,
// Tab,
// Tab, // Tab,
// Tab // Tab
// ], // ],
// actions[Group1]= [ // actions[Group1]= [
// NoAction(), // NoAction(),
// NoAction(), // NoAction(),
// RedirectKey(key=<BKSL>,clearmods=Shift), // // RedirectKey(key=<BKSL>,clearmods=Shift),
// NoAction(),
// // FK18 is just to clear Alt // // FK18 is just to clear Alt
// // RedirectKey(key=<FK18>,clearmods=Mod1), // // RedirectKey(key=<FK18>,clearmods=Mod1),
// // Clears Alt + Shift
// RedirectKey(key=<FK18>,clearmods=Mod1), // RedirectKey(key=<FK18>,clearmods=Mod1),
// // Also need to remap on the DE level // // Also need to remap on the DE level
// // to backslash \ for Cmd+Tab // // to backslash \ for Cmd+Tab
// RedirectKey(key=<TAB>), // // RedirectKey(key=<TAB>),
// NoAction(),
// RedirectKey(key=<TAB>,modifiers=Control,clearmods=Mod4), // RedirectKey(key=<TAB>,modifiers=Control,clearmods=Mod4),
// RedirectKey(key=<TAB>,modifiers=Control+Shift,clearmods=Mod4) // RedirectKey(key=<TAB>,modifiers=Control+Shift,clearmods=Mod4)
// ] // ]
// }; // };
// Page Up // Page Up
replace key <UP> { replace key <UP> {
type[Group1]= "ONE_LEVEL_CTRL", type[Group1]= "ONE_LEVEL_CMD",
symbols[Group1]= [ symbols[Group1]= [
Up, Up,
Up, Up,
NoSymbol ], NoSymbol
],
actions[Group1]= [ actions[Group1]= [
NoAction(), NoAction(),
NoAction(), NoAction(),
@@ -69,7 +75,7 @@ partial xkb_symbols "mac_global" {
}; };
// Page Down // Page Down
replace key <DOWN> { replace key <DOWN> {
type[Group1]= "ONE_LEVEL_CTRL", type[Group1]= "ONE_LEVEL_CMD",
symbols[Group1]= [ symbols[Group1]= [
Down, Down,
Down, Down,
@@ -83,7 +89,7 @@ partial xkb_symbols "mac_global" {
}; };
// HOME // HOME
replace key <LEFT> { replace key <LEFT> {
type[Group1]= "ONE_LEVEL_CTRL", type[Group1]= "ONE_LEVEL_CMD",
symbols[Group1]= [ symbols[Group1]= [
Left, Left,
Left, Left,
@@ -97,7 +103,7 @@ partial xkb_symbols "mac_global" {
}; };
// END // END
replace key <RGHT> { replace key <RGHT> {
type[Group1]= "ONE_LEVEL_CTRL", type[Group1]= "ONE_LEVEL_CMD",
symbols[Group1]= [ symbols[Group1]= [
Right, Right,
Right, Right,
@@ -112,7 +118,7 @@ partial xkb_symbols "mac_global" {
// Full Print Screen // Full Print Screen
// Standard Ubuntu // Standard Ubuntu
replace key <AE03> { replace key <AE03> {
type[Group1]= "ONE_LEVEL_CTRL", type[Group1]= "ONE_LEVEL_CMD",
symbols[Group1]= [ symbols[Group1]= [
3, 3,
numbersign, numbersign,
@@ -127,7 +133,7 @@ partial xkb_symbols "mac_global" {
// Region Print Screen // Region Print Screen
// Standard Ubuntu // Standard Ubuntu
replace key <AE04> { replace key <AE04> {
type[Group1]= "ONE_LEVEL_CTRL", type[Group1]= "ONE_LEVEL_CMD",
symbols[Group1]= [ symbols[Group1]= [
4, 4,
dollar, dollar,

View File

@@ -26,4 +26,12 @@ default partial xkb_types "addmac_levels" {
level_name[11] = "Super Alt"; level_name[11] = "Super Alt";
level_name[12] = "Super Control Alt"; level_name[12] = "Super Control Alt";
}; };
type "ONE_LEVEL_CMD" {
modifiers = Shift+Control;
map[Shift] = Level2;
map[Control] = Level2;
level_name[Level1] = "Base";
level_name[Level2] = "Shift";
level_name[Level3] = "Control";
};
}; };

View File

@@ -26,4 +26,12 @@ default partial xkb_types "addmac_levels" {
level_name[11] = "Super Alt"; level_name[11] = "Super Alt";
level_name[12] = "Super Control Alt"; level_name[12] = "Super Control Alt";
}; };
type "ONE_LEVEL_CMD" {
modifiers = Shift+Control;
map[Shift] = Level2;
map[Shift+Control] = Level2;
level_name[Level1] = "Base";
level_name[Level2] = "Shift";
level_name[Level3] = "Shift Control";
};
}; };