From 4140a06d53e3e47b535f7da32c283a3654883ee5 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sat, 29 Feb 2020 00:38:09 -0600 Subject: [PATCH] - Updated mac_gui and setup for app cycle --- .xkb/symbols/mac_gui | 64 ++++++++++++++++++++++++++++++++++++++++++++ defaults.json | 12 ++++----- setup.py | 8 +++--- 3 files changed, 74 insertions(+), 10 deletions(-) diff --git a/.xkb/symbols/mac_gui b/.xkb/symbols/mac_gui index 4690b83..3e55f07 100644 --- a/.xkb/symbols/mac_gui +++ b/.xkb/symbols/mac_gui @@ -259,6 +259,70 @@ partial xkb_symbols "mac_browsers" { Redirect(key=,mods=Control,clearmods=Mod4+Super+Shift) ] }; + //Up to Mac Home + replace key { + type[Group1]= "ONE_LEVEL_CTRL", + symbols[Group1]= [ + Up, + Up, + Up, + Up, + NoSymbol, + NoSymbol, + Up + ], + actions[Group1]= [ + NoAction(), + NoAction(), + // Wordwise + RedirectKey(key=,clearmods=Mod1), + RedirectKey(key=,clearmods=Mod1), + RedirectKey(key=), + RedirectKey(key=), + // Wordwise - Sublime? + RedirectKey(key=,clearmods=Super), + RedirectKey(key=,modifiers=Mod1,clearmods=Super) + ] + }; + // Down to Mac End + replace key { + type[Group1]= "ONE_LEVEL_CTRL", + symbols[Group1]= [ + Down, + Down, + Down, + Down, + NoSymbol, + NoSymbol, + Down + ], + actions[Group1]= [ + NoAction(), + NoAction(), + // Wordwise + RedirectKey(key=,clearmods=Mod1), + RedirectKey(key=,clearmods=Mod1), + RedirectKey(key=), + RedirectKey(key=), + // Wordwise - Sublime? + RedirectKey(key=,clearmods=Super), + RedirectKey(key=,modifiers=Mod1,clearmods=Super) + ] + }; + // Alt BKSP to DELETE + replace key { + type[Group1]= "ONE_LEVEL_CTRL", + symbols[Group1]= [ + BackSpace, + BackSpace, + BackSpace + ], + actions[Group1]= [ + NoAction(), + NoAction(), + RedirectKey(key=,clearmods=Mod1) + ] + }; }; partial xkb_symbols "mac_chrome" { // Back Button diff --git a/defaults.json b/defaults.json index f22e501..273f1ad 100644 --- a/defaults.json +++ b/defaults.json @@ -11,7 +11,7 @@ "description":"Standard Windows 104 Keyboards", "gui":"setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.gui $DISPLAY", "term":"setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.term $DISPLAY", - "xkb_symbols_gui":"+altwin(ctrl_alt_win)+mac_gui(mac_levelssym)", + "xkb_symbols_gui":"+altwin(ctrl_alt_win)+mac_gui(mac_levelssym)+mac_gui(mac_appcycle)", "xkb_symbols_term":"+altwin(swap_alt_win)+mac_term(mac_win)+mac_term(mac_global)", "xkb_types_gui":"+mac_gui(addmac_levels)", "xkb_types_term":"+mac_term(addmac_levels)" @@ -24,7 +24,7 @@ "description":"Standard Mac Keyboards with Apple driver", "gui":"setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.gui $DISPLAY", "term":"setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.term $DISPLAY", - "xkb_symbols_gui":"+altwin(ctrl_alt_win)+mac_gui(mac_levelssym)", + "xkb_symbols_gui":"+altwin(ctrl_alt_win)+mac_gui(mac_levelssym)+mac_gui(mac_appcycle)", "xkb_symbols_term":"+altwin(swap_alt_win)+mac_term(mac_win)+mac_term(mac_global)", "xkb_types_gui":"+mac_gui(addmac_levels)", "xkb_types_term":"+mac_term(addmac_levels)", @@ -38,7 +38,7 @@ "description":"Standard Mac Keyboards", "gui":"setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.gui $DISPLAY", "term":"setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.term $DISPLAY", - "xkb_symbols_gui":"+ctrl(swap_lwin_lctl)+ctrl(swap_rwin_rctl)+mac_gui(mac_levelssym)", + "xkb_symbols_gui":"+ctrl(swap_lwin_lctl)+ctrl(swap_rwin_rctl)+mac_gui(mac_levelssym)+mac_gui(mac_appcycle)", "xkb_symbols_term":"+altwin(alt_super_win)+mac_term(mac_apple)+mac_term(mac_global)", "xkb_types_gui":"+mac_gui(addmac_levels)", "xkb_types_term":"+mac_term(addmac_levels)" @@ -51,7 +51,7 @@ "description":"Standard Chromebook Keyboards", "gui":"setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.gui $DISPLAY", "term":"setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.term $DISPLAY", - "xkb_symbols_gui":"+chromebook(swap_lalt_lctrl)+mac_gui(mac_levelssym)", + "xkb_symbols_gui":"+chromebook(swap_lalt_lctrl)+mac_gui(mac_levelssym)+mac_gui(mac_appcycle)", "xkb_symbols_term":"+altwin(swap_alt_win)+mac_term_chromebook(mac_levelssym)", "xkb_types_gui":"+mac_gui(addmac_levels)", "xkb_types_term":"+mac_term(addmac_levels)" @@ -65,7 +65,7 @@ "gui":"setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.gui $DISPLAY; setxkbmap -device $usbid -option altwin:ctrl_alt_win", "term":"setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.term $DISPLAY", "fallbackgui":"setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.gui $DISPLAY", - "xkb_symbols_gui":"+chromebook(swap_lalt_lctrl)+mac_gui(mac_levelssym)", + "xkb_symbols_gui":"+chromebook(swap_lalt_lctrl)+mac_gui(mac_levelssym)+mac_gui(mac_appcycle)", "xkb_symbols_term":"+altwin(swap_alt_win)+mac_term_chromebook(mac_levelssym)", "xkb_types_gui":"+mac_gui(addmac_levels)", "xkb_types_term":"+mac_term(addmac_levels)" @@ -78,7 +78,7 @@ "description":"Chromebook with Mac Keyboard", "gui":"setxkbmap -option;setxkbmap -option ctrl:swap_lwin_lctl; xkbcomp -w0 -i $internalid -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.gui $DISPLAY", "term":"setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.term $DISPLAY", - "xkb_symbols_gui":"+chromebook(swap_lalt_lctrl)+mac_gui(mac_levelssym)", + "xkb_symbols_gui":"+chromebook(swap_lalt_lctrl)+mac_gui(mac_levelssym)+mac_gui(mac_appcycle)", "xkb_symbols_term":"+altwin(swap_alt_win)+mac_term_chromebook(mac_levelssym)", "xkb_types_gui":"+mac_gui(addmac_levels)", "xkb_types_term":"+mac_term(addmac_levels)" diff --git a/setup.py b/setup.py index 9a767eb..75fb109 100755 --- a/setup.py +++ b/setup.py @@ -212,8 +212,8 @@ if os.path.isdir(homedir + "/.xkb/keymap") == False: time.sleep(0.5) os.system('setxkbmap -option') os.system('setxkbmap -print > ~/.xkb/keymap/kbd.mac.gui') -os.system('setxkbmap -print > ~/.xkb/keymap/kbd.mac.gui.nw') os.system('setxkbmap -print > ~/.xkb/keymap/kbd.mac.gui.chrome') +os.system('setxkbmap -print > ~/.xkb/keymap/kbd.mac.gui.browsers') os.system('setxkbmap -print > ~/.xkb/keymap/kbd.mac.term') time.sleep(0.5) @@ -225,9 +225,9 @@ cmdline('sed -i '' -e "' + types_line + 's/\\"/' + keyboardconfigs[defaultkb-1][ cmdline('sed -i '' -e "' + symbols_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_symbols_term'] + '\\"/2" ~/.xkb/keymap/kbd.mac.term') cmdline('sed -i '' -e "' + types_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_types_term'] + '\\"/2" ~/.xkb/keymap/kbd.mac.term') -cmdline('sed -i '' -e "' + symbols_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_symbols_gui'].replace("+mac_gui(mac_levelssym)","") + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.nw') -cmdline('sed -i '' -e "' + symbols_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_symbols_gui'].replace("+mac_gui(mac_levelssym)","+mac_gui(mac_chrome)") + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.chrome') -cmdline('sed -i '' -e "' + types_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_types_gui'] + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.nw') +cmdline('sed -i '' -e "' + symbols_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_symbols_gui'].replace("+mac_gui(mac_levelssym)+mac_gui(mac_appcycle)","+mac_gui(mac_levelssym)+mac_gui(mac_browsers)") + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.browsers') +cmdline('sed -i '' -e "' + symbols_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_symbols_gui'].replace("+mac_gui(mac_levelssym)+mac_gui(mac_appcycle)","+mac_gui(mac_browsers)+mac_gui(mac_chrome)") + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.chrome') +cmdline('sed -i '' -e "' + types_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_types_gui'] + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.browsers') cmdline('sed -i '' -e "' + types_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_types_gui'] + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.chrome')