From 031eaf7e9f11da75b939d85c2b4a44478482b91f Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Thu, 5 Mar 2020 23:42:09 -0600 Subject: [PATCH 1/8] Updated Readme with uninstall info --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 4a640d3..201af3c 100644 --- a/README.md +++ b/README.md @@ -57,6 +57,12 @@ sudo apt install python3 ./setup.py ``` +To Uninstall Kinto + +``` +./uninstall.sh +``` + ## How to Add or Change keymaps for Applications **First it is important to understand how Kinto operates.** From e7f0db4107f1e733260abbb5c38477dd10175a6a Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Fri, 6 Mar 2020 13:14:17 -0600 Subject: [PATCH 2/8] - Updated readme --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 201af3c..7150202 100644 --- a/README.md +++ b/README.md @@ -65,6 +65,8 @@ To Uninstall Kinto ## How to Add or Change keymaps for Applications +Note: All of the following is already done in Kinto (but may also change as improvements are made). The following is purely for documentation and example sake as they are real examples of how to leverage the json config to support additional keymaps. + **First it is important to understand how Kinto operates.** 1. It listens for any focus/active window changes From 7a706305c149da186bf4da595fb404429104295a Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Fri, 6 Mar 2020 14:14:46 -0600 Subject: [PATCH 3/8] - Added capslock swap option to mac_gui --- .xkb/symbols/mac_gui | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.xkb/symbols/mac_gui b/.xkb/symbols/mac_gui index 005649b..ff36458 100644 --- a/.xkb/symbols/mac_gui +++ b/.xkb/symbols/mac_gui @@ -1,3 +1,8 @@ +hidden partial modifier_keys +xkb_symbols "swapescape" { + key { [ Escape ] }; + key { [ Caps_Lock ] }; +}; default partial xkb_symbols "mac_levelssym" { // LEFT to Begin Line or Beginning of word replace key { From 332607765e7a574285cf0231730d86472072e0ab Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Fri, 6 Mar 2020 15:24:36 -0600 Subject: [PATCH 4/8] Updated readme, how to add setxkbmap options --- README.md | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/README.md b/README.md index 7150202..34da9a2 100644 --- a/README.md +++ b/README.md @@ -63,6 +63,29 @@ To Uninstall Kinto ./uninstall.sh ``` +## How to Add an additional setxkbmap option inside Kinto + +To summarize you'll need to pull the partial out of the symbols file the option resides in and the add that to the ~/.xkb/symbols/mac_gui file and lastly reference it in the keymap file(s) you want it in. + +symbols directory +``` +/usr/share/X11/xkb/symbols/ +``` + +symbols file +``` +~/.xkb/symbols/mac_gui +``` + +keymap files +``` +~/.xkb/keymap/kbd.mac.gui +~/.xkb/keymap/kbd.mac.term +``` + +A more detailed explaination is here. +https://github.com/rbreaves/kinto/issues/50#issuecomment-595953373 + ## How to Add or Change keymaps for Applications Note: All of the following is already done in Kinto (but may also change as improvements are made). The following is purely for documentation and example sake as they are real examples of how to leverage the json config to support additional keymaps. From f0851a949ce1587b8e8933a566885ab468a7f06f Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Fri, 6 Mar 2020 15:26:07 -0600 Subject: [PATCH 5/8] - Typo correction --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 34da9a2..898b4a2 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,7 @@ To Uninstall Kinto ## How to Add an additional setxkbmap option inside Kinto -To summarize you'll need to pull the partial out of the symbols file the option resides in and the add that to the ~/.xkb/symbols/mac_gui file and lastly reference it in the keymap file(s) you want it in. +To summarize you'll need to pull the partial out of the symbols file the option resides in and then add that to the ~/.xkb/symbols/mac_gui file and lastly reference it in the keymap file(s) you want it in. symbols directory ``` From c5ff1f2513cd9676b08ade5eee2bb772490a91f7 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Fri, 6 Mar 2020 15:29:02 -0600 Subject: [PATCH 6/8] - Revisions to readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 898b4a2..8916351 100644 --- a/README.md +++ b/README.md @@ -63,9 +63,9 @@ To Uninstall Kinto ./uninstall.sh ``` -## How to Add an additional setxkbmap option inside Kinto +## How to Add Setxkbmap Option inside Kinto -To summarize you'll need to pull the partial out of the symbols file the option resides in and then add that to the ~/.xkb/symbols/mac_gui file and lastly reference it in the keymap file(s) you want it in. +To summarize you'll need to pull the partial out of the symbols file the option resides in and then add that to the mac_gui file and lastly reference it in the keymap file(s) you want it in. symbols directory ``` From 6631cd25a9f9d7f390c99e25cb3b2514ec493ce7 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sun, 1 Mar 2020 20:15:53 -0600 Subject: [PATCH 7/8] - Added ibus-setup fix for some distros and added Epiphany to chrome --- setup.py | 3 +++ user_config.json | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 66071d0..442a593 100755 --- a/setup.py +++ b/setup.py @@ -25,9 +25,12 @@ def requirements(pkgm): def install_ibus(): print(bcolors.CYELLOW + "You need to set IBus as the default Input Method for full word-wise support and re-run this installer.\n" + bcolors.ENDC) + print(bcolors.CYELLOW + "Confirm the IBus Setup by saying Yes and then closing the window.\n" + bcolors.ENDC) + print("ibus-setup\n") print("im-config -n ibus\n") run_install = yn_choice(bcolors.CYELLOW + "Would you like to run it now? (Will require logoff and logon.)\n" + bcolors.ENDC) if(run_install): + os.system("ibus-setup") os.system("im-config -n ibus") print("\n") input("IBus has been set as the default Input Method.\nPress any key to exit and re-run after logoff & logon...") diff --git a/user_config.json b/user_config.json index 17bbbff..9652547 100644 --- a/user_config.json +++ b/user_config.json @@ -36,7 +36,7 @@ "symbols": "", "types": "", "de": [], - "appnames": [ "Chromium","Chromium-browser","Google-chrome" ] + "appnames": [ "Chromium","Chromium-browser","Google-chrome","Epiphany" ] }], "init": [], "detypes":["gnome2","gnome3","kde4","kde5","xfce","i3wm"], From 7c74dcca7101bf91e366af03e8c43ddd6ef6b87f Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Mon, 9 Mar 2020 11:53:30 -0500 Subject: [PATCH 8/8] - Added package install of ibus for manjaro --- setup.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/setup.py b/setup.py index 442a593..dc4d2c7 100755 --- a/setup.py +++ b/setup.py @@ -45,20 +45,21 @@ if len(check_x11) == 0: check_xbind = cmdline("which xbindkeys 2>/dev/null").strip() check_xdotool = cmdline("which xdotool 2>/dev/null").strip() +check_ibus = cmdline("which ibus-setup 2>/dev/null").strip() -pkgm = cmdline("which apt 2>/dev/null").strip() +pkgm = cmdline("which apt-get 2>/dev/null").strip() if len(pkgm) == 0: pkgm = cmdline("which dnf 2>/dev/null").strip() if len(pkgm) > 0: - pkgm += " install -y " + pkgm += " check-update;sudo dnf install -y " else: - pkgm += " install -y " + pkgm += " update; sudo apt-get install -y " if len(pkgm) == 0: pkgm = cmdline("which pacman 2>/dev/null").strip() if len(pkgm) > 0: - pkgm += " -S " + pkgm += " -Syy; sudo pacman -S " if len(pkgm) == 0: @@ -69,14 +70,18 @@ if len(pkgm) == 0: runpkg = 0 run_pkg = "" -if len(check_xbind) > 0 and len(check_xdotool) > 0: - print("Xbindkeys, and xdotool requirement is installed.") +if len(check_xbind) > 0 and len(check_xdotool) > 0 and len(check_ibus) > 0: + print("Xbindkeys, xdotool and IBus requirement is installed.") if len(check_xbind) == 0: run_pkg = "xbindkeys" runpkg = 1 if len(check_xdotool) == 0: run_pkg += " xdotool" runpkg = 1 +if len(check_ibus) == 0: + # may differ with distro, but for now + run_pkg += " ibus" + runpkg = 1 if runpkg != 0: requirements(pkgm)