Merge pull request #189 from rbreaves/dev

- Added support for Windows 10 Hosts w/ Kinto & running Linux VMs
2025-08-06 02:48:26 +02:00 · 2020-05-26 22:03:57 -07:00 · 2020-05-27 00:02:41 -05:00 · 2020-05-23 16:06:40 -05:00 · 2020-05-23 16:02:32 -05:00 · 2020-05-20 01:29:14 -05:00
5 changed files with 66 additions and 34 deletions
--- a/README.md
+++ b/README.md
@@ -48,7 +48,7 @@ Kinto works for standard Windows, Apple and Chromebook keyboards. The following

 - Cursor/word-wise shortcut keys have been added to align with macOS keyboard shortcuts.

-Does Kinto have to have specific keyamps for individual apps?
+Does Kinto have to have specific keymaps for individual apps?

 I'd say 90+% of the time no, but every OS has their default conventions that sometimes run afoul to macs. For this reason you can easily edit kinto.py or kinto.ahk to support the few shortcut keys Kinto may miss. If you do add additional support please consider forking this project and sharing your new keymaps with the rest of us!

--- a/setup.py
+++ b/setup.py
@@ -110,7 +110,7 @@ def setShortcuts():
 	addhotkeys = yn_choice("\nDo you want to apply system level shortcuts?")
 	if(addhotkeys):
 		distro = distro.lower()
-		if dename == "gnome":
+		if dename == "gnome" or dename == "mate":
 			cmdline('dconf dump /org/gnome/desktop/wm/keybindings/ > keybindings_`date +"%Y.%m.%d-%s"`.conf')
 			cmdline('dconf dump /org/gnome/mutter/keybindings/ > mutter_`date +"%Y.%m.%d-%s"`.conf')
 			if(kintotype == 1):
@@ -121,8 +121,10 @@ def setShortcuts():
 				cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-applications-backward \"['<Primary>F14','<Primary><Shift>F14','<Alt><Shift>Tab']\"")
 			cmdline("gsettings set org.gnome.desktop.wm.keybindings minimize \"['<Super>h','<Alt>F9']\"")
 			cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['<Primary><Shift>Space','<Primary>Space']\"")
-			cmdline("gsettings set org.gnome.mutter overlay-key ''")
-		if distro == "ubuntu" and dename == "gnome":
+			cmdline("gsettings set org.gnome.shell.keybindings toggle-application-view \"['LaunchB']\"")
+			if dename != "mate":
+				cmdline("gsettings set org.gnome.mutter overlay-key ''")
+		if (distro == "ubuntu" and dename == "gnome") or (distro == "linux" and dename == "mate") or (distro == "ubuntu" and dename == "mate"):
 			cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-up \"['<Super>Up','<Super>Left']\"")
 			cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-down \"['<Super>Down','<Super>Right']\"")
 			cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-left ['']")
@@ -156,7 +158,7 @@ def setShortcuts():
 			cmdline('perl -pi -e "s/(\w.*)(\/\/ Default cmdtab)/\/\/ \$1\$2/g" ~/.xkb/symbols/mac_gui')
 		# elif distro == "budgie" and dename == "gnome":
 		# 	print("Apply budgie shortcuts here")
-		elif distro == "galliumos" and dename == "xfce":
+		elif (distro == "galliumos" and dename == "xfce") or (distro == "ubuntu" and dename == "xfce"):
 			print("Applying GalliumOS (xfce) shortcuts...")
 			cmdline('cp ~/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml ./xfce4-keyboard-shortcuts_`date +"%Y.%m.%d-%s"`.xml')
 			# Reset Show desktop
--- a/user_config.json
+++ b/user_config.json
@@ -16,7 +16,7 @@
 		"symbols":"",
 		"types":"",
 		"de":[],
-		"appnames":[ "Gnome-terminal","konsole","io.elementary.terminal","terminator","sakura","guake","tilda","xterm","eterm","kitty","alacritty","mate-terminal","tilix" ]
+		"appnames":[ "Gnome-terminal","konsole","io.elementary.terminal","terminator","sakura","guake","tilda","xterm","eterm","kitty","alacritty","mate-terminal","tilix","xfce4-terminal" ]
 	},
 	{
        "name": "firefox",
--- a/xkeysnail-config/kinto.py
+++ b/xkeysnail-config/kinto.py
@@ -3,7 +3,10 @@
 import re
 from xkeysnail.transform import *

-terminals = ["gnome-terminal","konsole","io.elementary.terminal","terminator","sakura","guake","tilda","xterm","eterm","kitty","alacritty","mate-terminal","tilix"]
+# Use the following for testing terminal keymaps
+# terminals = [ "", ... ]
+# xbindkeys -mk
+terminals = ["gnome-terminal","konsole","io.elementary.terminal","terminator","sakura","guake","tilda","xterm","eterm","kitty","alacritty","mate-terminal","tilix","xfce4-terminal"]
 terminals = [term.casefold() for term in terminals]
 termStr = "|".join(str(x) for x in terminals)

@@ -26,6 +29,8 @@ define_conditional_modmap(lambda wm_class: wm_class.casefold() not in terminals,
    # Key.RIGHT_META: Key.RIGHT_ALT,  # WinMac
    # Key.RIGHT_CTRL: Key.RIGHT_META, # WinMac

+    # # KintoWin
+
    # # Mac Only
    # Key.LEFT_META: Key.RIGHT_CTRL,  # Mac
    # Key.LEFT_CTRL: Key.LEFT_META,   # Mac
@@ -51,6 +56,10 @@ define_conditional_modmap(re.compile(termStr, re.IGNORECASE), {
    # Key.RIGHT_META: Key.RIGHT_ALT,  # WinMac
    # Key.RIGHT_CTRL: Key.LEFT_CTRL,  # WinMac

+    # # KintoWin
+    # Key.LEFT_CTRL: Key.RIGHT_CTRL,   # KintoWin
+    # Key.LEFT_META: Key.LEFT_CTRL,    # KintoWin
+
    # # Mac Only
    # Key.LEFT_META: Key.RIGHT_CTRL,  # Mac
    # # Left Ctrl Stays Left Ctrl
@@ -67,25 +76,30 @@ define_keymap(re.compile("org.gnome.nautilus", re.IGNORECASE),{
 })

 define_keymap(None,{
+    # Basic App hotkey functions
+    K("RC-Q"): K("Alt-F4"),
+    K("RC-H"): K("Alt-F9"),
    # Cmd Tab - App Switching Default
-    K("RC-Tab"): K("RC-F13"),                     # Default
-    K("RC-Shift-Tab"): K("RC-Shift-F13"),         # Default
-    K("RC-Grave"): K("M-F6"),                     # Default
-    K("RC-Shift-Grave"): K("M-Shift-F6"),         # Default
-    # K("RC-Tab"): K("RC-backslash"),               # Chromebook
-    # K("RC-Shift-Tab"): K("RC-Shift-backslash"),   # Chromebook
-    # K("RC-Grave"): K("RC-Shift-backslash"),       # Chromebook
+    K("RC-Tab"): K("RC-F13"),                     # Default not-xfce4
+    K("RC-Shift-Tab"): K("RC-Shift-F13"),         # Default not-xfce4
+    K("RC-Grave"): K("M-F6"),                     # Default not-xfce4
+    K("RC-Shift-Grave"): K("M-Shift-F6"),         # Default not-xfce4
+    # K("RC-Tab"): K("RC-backslash"),               # xfce4
+    # K("RC-Shift-Tab"): K("RC-Shift-backslash"),   # xfce4
+    # K("RC-Grave"): K("RC-Shift-backslash"),       # xfce4
    # In-App Tab switching
    # K("M-Tab"): K("C-Tab"),                       # Chromebook - In-App Tab switching
    # K("M-Shift-Tab"): K("C-Shift-Tab"),           # Chromebook - In-App Tab switching
    # K("M-Grave") : K("C-Shift-Tab"),              # Chromebook - In-App Tab switching
-    K("Super-Tab"): K("LC-Tab"),                  # Default
-    K("Super-Shift-Tab"): K("LC-Shift-Tab"),      # Default
+    K("Super-Tab"): K("LC-Tab"),                  # Default not-chromebook
+    K("Super-Shift-Tab"): K("LC-Shift-Tab"),      # Default not-chromebook

    # Wordwise
    K("RC-Left"): K("Home"),                      # Beginning of Line
+    K("Super-a"): K("Home"),                      # Beginning of Line
    K("RC-Shift-Left"): K("Shift-Home"),          # Select all to Beginning of Line
    K("RC-Right"): K("End"),                      # End of Line
+    K("Super-e"): K("End"),                       # End of Line
    K("RC-Shift-Right"): K("Shift-End"),          # Select all to End of Line
    # K("RC-Left"): K("C-LEFT_BRACE"),              # Firefox-nw - Back
    # K("RC-Right"): K("C-RIGHT_BRACE"),            # Firefox-nw - Forward
@@ -95,7 +109,11 @@ define_keymap(None,{
    K("RC-Shift-Up"): K("C-Shift-Home"),          # Select all to Beginning of File
    K("RC-Down"): K("C-End"),                     # End of File
    K("RC-Shift-Down"): K("C-Shift-End"),         # Select all to End of File
-    K("M-Backspace"): K("Delete"),                # Delete
+    # K("M-Backspace"): K("Delete"),                # Chromebook - Delete
+    K("Super-Backspace"): K("C-Backspace"),       # Default not-chromebook - Delete Left Word of Cursor
+    K("Super-Delete"): K("C-Delete"),             # Default not-chromebook - Delete Right Word of Cursor
+    K("Alt-Backspace"): K("C-Backspace"),       # Default not-chromebook - Delete Left Word of Cursor
+    K("Alt-Delete"): K("C-Delete"),             # Default not-chromebook - Delete Right Word of Cursor
    # K(""): pass_through_key,                      # cancel
    # K(""): K(""),                                 #
 })
@@ -249,7 +267,6 @@ define_keymap(re.compile(termStr, re.IGNORECASE),{
    K("RC-MINUS"): K("C-Shift-MINUS"),
    K("RC-EQUAL"): K("C-Shift-EQUAL"),
    K("RC-BACKSPACE"): K("C-Shift-BACKSPACE"),
-    K("RC-Q"): K("C-Shift-Q"),
    K("RC-W"): K("C-Shift-W"),
    K("RC-E"): K("C-Shift-E"),
    K("RC-R"): K("C-Shift-R"),
--- a/xkeysnail_service.sh
+++ b/xkeysnail_service.sh
@@ -5,10 +5,10 @@

 typeset -l distro
 distro=$(awk -F= '$1=="NAME" { print $2 ;}' /etc/os-release)
+typeset -l dename
+dename=$(./system-config/dename.sh | cut -d " " -f1)

 function uninstall {
-	typeset -l dename
-	dename=$(./system-config/dename.sh | cut -d " " -f1)

 	while true; do
 	read -rep $'\nPress R to restore your original shortcuts.\nPress F to reset to factory shortcuts. (f/r)\n' yn
@@ -140,14 +140,15 @@ if [ $# -eq 0 ]; then
 	echo "  1) Windows & Mac (HID driver)"
 	echo "  2) Mac Only & VMs on Macbooks"
 	echo "  3) Chromebook"
-	# echo "  4) Uninstall"
+	echo "  4) Windows w/ Kinto - aka Linux VM"
+	# echo "  5) Uninstall"

 	read n

 	set "$n"
 fi

-if [[ $1 == "1" || $1 == "2" || $1 == "3" || $1 == "winmac" || $1 == "mac" || $1 == "chromebook" ]]; then
+if [[ $1 == "1" || $1 == "2" || $1 == "3" || $1 == "4" || $1 == "kintowin" || $1 == "winmac" || $1 == "mac" || $1 == "chromebook" ]]; then
 	branch=$(git rev-parse --abbrev-ref HEAD)
 	if [ "$branch" == "dev" ] || [ "$branch" == "alpha" ];then
 		while true; do
@@ -173,12 +174,12 @@ if [[ $1 == "1" || $1 == "2" || $1 == "3" || $1 == "winmac" || $1 == "mac" || $1
 		sudo ./system-config/unipkg.sh python3-pip
 	fi
 	if ! [ -x "$(command -v python3-config)" ]; then
-		if [ "$distro" == "ubuntu" ] || [ "$distro" == "debian" ]; then
+		if [ "$distro" == "ubuntu" ] || [ "$distro" == "debian" ] || [ "$distro" == '"linux mint"' ]; then
 			pydev="python3-dev"
 		elif [ "$distro" == "fedora" ]; then
 			pydev="python3-devel"
 		fi
-		if [ "$distro" == "gnome" ] || [ "$distro" == "fedora" ] || [ "$distro" == "debian" ]; then
+		if [ "$distro" == "gnome" ] || [ "$distro" == "fedora" ] || [ "$distro" == "debian" ] || [ "$distro" == '"linux mint"' ]; then
 			echo "Will need to install $pydev..."
 			sudo ./system-config/unipkg.sh "$pydev"
 		fi
@@ -188,6 +189,9 @@ if [[ $1 == "1" || $1 == "2" || $1 == "3" || $1 == "winmac" || $1 == "mac" || $1
 			sudo ./system-config/unipkg.sh "xorg-xhost gcc"
 		fi
 	fi
+	if [ "$distro" == '"linux mint"' ]; then
+		pip3 install setuptools
+	fi

 	# echo "Transferring files..."
 	mkdir -p ~/.config/kinto
@@ -224,21 +228,30 @@ if [[ $1 == "1" || $1 == "2" || $1 == "3" || $1 == "winmac" || $1 == "mac" || $1
 	sed -i "s/{username}/`whoami`/g" ~/.config/kinto/prexk.sh
 	sed -i "s/{displayid}/`echo "$DISPLAY"`/g" ./xkeysnail-config/xkeysnail.service.new
 	sed -i "s/{displayid}/`echo "$DISPLAY"`/g" ~/.config/kinto/prexk.sh
-elif ! [[ $1 == "4" || $1 == "uninstall" ]]; then
-	echo "Expected argument was not provided"
 fi

 if [[ $1 == "1" || $1 == "winmac" ]]; then
 	echo '1' | sudo tee -a /sys/module/hid_apple/parameters/swap_opt_cmd;echo 'options hid_apple swap_opt_cmd=1' | sudo tee -a /etc/modprobe.d/hid_apple.conf;sudo update-initramfs -u -k all
 	perl -pi -e "s/(# )(.*)(# WinMac)/\$2\$3/g" ./xkeysnail-config/kinto.py.new
+	if [[ $dename == "xfce" ]]; then
+		perl -pi -e "s/(# )(.*)(# xfce4)/\$2\$3/g" ./xkeysnail-config/kinto.py.new
+		perl -pi -e "s/(\w.*)(# Default not-xfce4)/# \$1\$2/g" ./xkeysnail-config/kinto.py.new
+	fi
 elif [[ $1 == "2" || $1 == "mac" ]]; then
 	perl -pi -e "s/(# )(.*)(# Mac)/\$2\$3/g" ./xkeysnail-config/kinto.py.new
+	if [[ $dename == "xfce" ]]; then
+		perl -pi -e "s/(# )(.*)(# xfce4)/\$2\$3/g" ./xkeysnail-config/kinto.py.new
+		perl -pi -e "s/(\w.*)(# Default not-xfce4)/# \$1\$2/g" ./xkeysnail-config/kinto.py.new
+	fi
 elif [[ $1 == "3" || $1 == "chromebook" ]]; then
 	perl -pi -e "s/(# )(.*)(# Chromebook)/\$2\$3/g" ./xkeysnail-config/kinto.py.new
+	perl -pi -e "s/(# )(.*)(# xfce4)/\$2\$3/g" ./xkeysnail-config/kinto.py.new
 	perl -pi -e "s/(\w.*)(# Default)/# \$1\$2/g" ./xkeysnail-config/kinto.py.new
+elif [[ $1 == "4" || $1 == "kintowin" ]]; then
+	perl -pi -e "s/(# )(.*)(# KintoWin)/\$2\$3/g" ./xkeysnail-config/kinto.py.new
 fi

-if [[ $1 == "1" || $1 == "2" || $1 == "3" || $1 == "winmac" || $1 == "mac" || $1 == "chromebook" ]]; then
+if [[ $1 == "1" || $1 == "2" || $1 == "3" || $1 == "4" || $1 == "kintowin" || $1 == "winmac" || $1 == "mac" || $1 == "chromebook" ]]; then
 	mv ./xkeysnail-config/kinto.py.new ~/.config/kinto/kinto.py
 	# if [ "$distro" == "fedora" ];then
 	sudo rm /etc/systemd/system/xkeysnail.service
@@ -253,18 +266,18 @@ if [[ $1 == "1" || $1 == "2" || $1 == "3" || $1 == "winmac" || $1 == "mac" || $1
 	sudo ln -s "$xkeypath"xkeysnail.service /etc/systemd/system/xkeysnail.service && echo "Created soft symlink..." || echo "Failed to create soft symlink..."
 	sudo ln -s "$xkeypath"xkeysnail.service /etc/systemd/system/graphical.target.wants/xkeysnail.service && echo "Created soft symlink for graphical target..." || echo "Failed to create soft symlink for graphical target..."
 	xhost +SI:localuser:root
-	git clone --depth 5 https://github.com/rbreaves/xkeysnail.git
-	git checkout 51c369084e0045a8410d227bab52411bf84fb65b
+	git clone --depth 10 https://github.com/rbreaves/xkeysnail.git || git pull --depth 10
 	cd xkeysnail
+	git checkout 51c369084e0045a8410d227bab52411bf84fb65b
 	giturl=$(git ls-remote --get-url)
-	if [ "$geturl" != "https://github.com/rbreaves/xkeysnail.git" ];then
+	if [ "$giturl" != "https://github.com/rbreaves/xkeysnail.git" ];then
+		echo -e "\nreplacing xkeysnail with fork...\n"
 		cd ..
 		rm -rf ./xkeysnail
-		git clone --depth 5 https://github.com/rbreaves/xkeysnail.git
-		git checkout 51c369084e0045a8410d227bab52411bf84fb65b
+		git clone --depth 10 https://github.com/rbreaves/xkeysnail.git
 		cd xkeysnail
+		git checkout 51c369084e0045a8410d227bab52411bf84fb65b
 	fi
-	git pull origin master
 	sudo pip3 install --upgrade .
 	cd ..
 	sudo systemctl daemon-reload
@@ -309,7 +322,7 @@ if [[ $1 == "1" || $1 == "2" || $1 == "3" || $1 == "winmac" || $1 == "mac" || $1
 		echo "You can run 'sudo systemctl status xkeysnail' for more info"
 		echo "You can also run 'sudo journalctl -u xkeysnail'"
 	fi
-elif [[ $1 == "4" || $1 == "uninstall" || $1 == "Uninstall" ]]; then
+elif [[ $1 == "5" || $1 == "uninstall" || $1 == "Uninstall" ]]; then
 	echo "Uninstalling Kinto - xkeysnail (udev)"
 	uninstall
 	# Undo Apple keyboard cmd & alt swap
Author	SHA1	Message	Date
Ben Reaves	8fdaaf592d	Merge pull request #189 from rbreaves/dev - Added support for Windows 10 Hosts w/ Kinto & running Linux VMs	2020-05-26 22:03:57 -07:00
Ben Reaves	6b4c697dd0	- Added support for Windows 10 Hosts w/ Kinto & running Linux VMs	2020-05-27 00:02:41 -05:00
Ben Reaves	e2a767fbec	Merge pull request #188 from rbreaves/dev - Added proper Ctrl/Alt + Backspace behavior for Linux remap. Closes #187	2020-05-23 16:06:40 -05:00
Ben Reaves	7fe9230b5f	- Added proper Ctrl/Alt + Backspace behavior for Linux remap. Closes #187	2020-05-23 16:02:32 -05:00
Ben Reaves	1d088b2e1d	Typo correction	2020-05-20 01:29:14 -05:00
Ben Reaves	e63d8ee5b5	Merge pull request #184 from rbreaves/dev - Adding basic hotkey functions for apps	2020-05-18 14:23:47 -05:00
Ben Reaves	e3d42651b7	- Adding basic hotkey functions for apps	2020-05-18 14:21:31 -05:00
Ben Reaves	42c04d062e	Merge pull request #183 from rbreaves/dev Extension of #182 merge and added mate support	2020-05-18 14:09:51 -05:00
Ben Reaves	ca54bf89d6	- Part of #182 merge, brings back Ctrl-a/e functionality for GUI apps.	2020-05-18 14:03:43 -05:00
Ben Reaves	772413a9c3	Merge pull request #182 from Mahoney-forks/fix-ctl-a-beginning-of-line Make toggle-application-view shortcut more mac like	2020-05-18 13:44:20 -05:00
Robert Elliot	bbd7b3fc93	Make toggle-application-view shortcut more mac like Toggle-application-view defaults to `<Super-a>` (virtual)/`<Ctrl-a>` (physical) This clashed with using `<Ctrl-a>` for move cursor to beginning of line (OS/X). `LaunchB` seems the closes OS/X analogue - FN-F4.	2020-05-18 11:40:57 +01:00
Ben Reaves	98120062eb	- Added linux mint and mate support	2020-05-16 02:52:25 -05:00
Ben Reaves	637a8fecaa	Merge pull request #178 from rbreaves/dev - Improved xfce4 support, added xfce4-terminal. Fixed xkeysnail issue.	2020-05-16 01:03:40 -05:00
Ben Reaves	ad53b7034d	- Improved support for xfce4 with Ubuntu, xubuntu, voyager. Fixed In-app switching bug.	2020-05-15 20:49:48 -05:00
Ben Reaves	896c6fd6a1	- Added xfce4-terminal	2020-05-15 20:19:15 -05:00
Ben Reaves	dbaf02f884	Merge pull request #177 from rbreaves/dev - Setup fixes for xkeynail install	2020-05-15 13:45:15 -05:00
Ben Reaves	79857af79c	- Setup fixes for xkeynail install	2020-05-15 13:43:21 -05:00