From 3389c512e2d0f7f7bc3c7bed161aed6820758506 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Wed, 1 Apr 2020 02:08:47 -0500 Subject: [PATCH 01/15] - Updated readme to include debug mode --- README.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/README.md b/README.md index 4ccba4b..ba609f9 100644 --- a/README.md +++ b/README.md @@ -481,6 +481,16 @@ cd ~/.config/kinto ./kintox11 ``` +## Debug + +If all else fails you can now run Kinto in debug mode as of 1.0.6-2. The output will become more verbose and I'd recommend running this directly after stopping the service. + +``` +systemctl --user stop keyswap +cd ~/.config/kinto +./kintox11 --debug +``` + ## Language Support I'd appreciate any help from people with non-US based keyboards, to help ensure that these keymaps and keyswap methods work in all or most languages. From d670579db8d0a3810b584eeb81112a3b715765b7 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Wed, 1 Apr 2020 02:21:03 -0500 Subject: [PATCH 02/15] Update issue templates --- .github/ISSUE_TEMPLATE/bug_report.md | 32 ++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 0000000..c10b476 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,32 @@ +--- +name: Bug report +about: Create a report to help us improve +title: '' +labels: bug +assignees: rbreaves + +--- + +**Describe the bug** +A clear and concise description of what the bug is. + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Screenshots** +If applicable, add screenshots to help explain your problem. + +**Install Type:** Bare Metal or VM +**Distro:** Name + Version +**DE:** Gnome, XFCE, KDE +**Branch:** master, dev +**Commit:** git rev-parse --short HEAD + +If applicable include kinto log and the status of your input caret +``` +cat /tmp/kinto/caret +journalctl --user-unit=keyswap.service -b +``` + +**Additional context** +Add any other context about the problem here. From d7433092ffa8b323cae117c75be2644e6c09e78c Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Wed, 1 Apr 2020 02:25:29 -0500 Subject: [PATCH 03/15] Update issue templates --- .github/ISSUE_TEMPLATE/feature_request.md | 20 ++++++++++++++++++++ .github/ISSUE_TEMPLATE/gratitude.md | 10 ++++++++++ .github/ISSUE_TEMPLATE/question.md | 10 ++++++++++ 3 files changed, 40 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md create mode 100644 .github/ISSUE_TEMPLATE/gratitude.md create mode 100644 .github/ISSUE_TEMPLATE/question.md diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 0000000..376557a --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,20 @@ +--- +name: Feature request +about: Suggest an idea for this project +title: '' +labels: enhancement +assignees: rbreaves + +--- + +**Is your feature request related to a problem? Please describe.** +A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] + +**Describe the solution you'd like** +A clear and concise description of what you want to happen. + +**Describe alternatives you've considered** +A clear and concise description of any alternative solutions or features you've considered. + +**Additional context** +Add any other context or screenshots about the feature request here. diff --git a/.github/ISSUE_TEMPLATE/gratitude.md b/.github/ISSUE_TEMPLATE/gratitude.md new file mode 100644 index 0000000..d0ad607 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/gratitude.md @@ -0,0 +1,10 @@ +--- +name: Gratitude +about: Just wants to give a shout out! +title: '' +labels: gratitude +assignees: rbreaves + +--- + + diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md new file mode 100644 index 0000000..399371a --- /dev/null +++ b/.github/ISSUE_TEMPLATE/question.md @@ -0,0 +1,10 @@ +--- +name: Question +about: Question about Kinto functionality +title: '' +labels: question +assignees: rbreaves + +--- + + From 6a887ebdeab1610d7809f9a138485184b5d6fe77 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Wed, 1 Apr 2020 02:27:53 -0500 Subject: [PATCH 04/15] Update issue templates --- .github/ISSUE_TEMPLATE/bug_report.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index c10b476..4bae2d4 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -7,15 +7,6 @@ assignees: rbreaves --- -**Describe the bug** -A clear and concise description of what the bug is. - -**Expected behavior** -A clear and concise description of what you expected to happen. - -**Screenshots** -If applicable, add screenshots to help explain your problem. - **Install Type:** Bare Metal or VM **Distro:** Name + Version **DE:** Gnome, XFCE, KDE @@ -28,5 +19,14 @@ cat /tmp/kinto/caret journalctl --user-unit=keyswap.service -b ``` +**Describe the bug** +A clear and concise description of what the bug is. + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Screenshots** +If applicable, add screenshots to help explain your problem. + **Additional context** Add any other context about the problem here. From b50522c5b1c3af387f00d17179295b1a0e4c32c0 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Wed, 1 Apr 2020 02:32:41 -0500 Subject: [PATCH 05/15] Update issue templates --- .github/ISSUE_TEMPLATE/bug_report.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 4bae2d4..4e004e6 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -19,6 +19,13 @@ cat /tmp/kinto/caret journalctl --user-unit=keyswap.service -b ``` +You may also run kinto in debug mode as of 1.0.6-2. This could help me resolve your problem faster. +``` +systemctl --user stop keyswap +cd ~/.config/kinto +./kintox11 --debug +``` + **Describe the bug** A clear and concise description of what the bug is. From 7e6f87298366ac75406355cb1c19c495d904da27 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Wed, 1 Apr 2020 02:38:30 -0500 Subject: [PATCH 06/15] Update issue templates --- .github/ISSUE_TEMPLATE/bug_report.md | 41 +++++++++++++++------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 4e004e6..97fac0c 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -7,31 +7,34 @@ assignees: rbreaves --- -**Install Type:** Bare Metal or VM -**Distro:** Name + Version -**DE:** Gnome, XFCE, KDE -**Branch:** master, dev -**Commit:** git rev-parse --short HEAD - -If applicable include kinto log and the status of your input caret -``` -cat /tmp/kinto/caret -journalctl --user-unit=keyswap.service -b -``` - -You may also run kinto in debug mode as of 1.0.6-2. This could help me resolve your problem faster. -``` -systemctl --user stop keyswap -cd ~/.config/kinto -./kintox11 --debug -``` - **Describe the bug** A clear and concise description of what the bug is. **Expected behavior** A clear and concise description of what you expected to happen. +**Install Type:** Bare Metal or VM +**Distro:** Name + Version +**DE:** Gnome, XFCE, KDE +**Branch:** master, dev +**Commit:** git rev-parse --short HEAD + +**Kinto Input Caret Status** +``` +cat /tmp/kinto/caret +``` + +**Kinto Standard Log** +``` +journalctl --user-unit=keyswap.service -b +``` +**Kinto Debug Log (1.0.6-2+)** +``` +systemctl --user stop keyswap +cd ~/.config/kinto +./kintox11 --debug +``` + **Screenshots** If applicable, add screenshots to help explain your problem. From e892f045f55cda7c6b1ada9d3e898dd305198665 Mon Sep 17 00:00:00 2001 From: Indrek Juhkam Date: Thu, 2 Apr 2020 14:58:47 +0300 Subject: [PATCH 07/15] Add kitty to terminal emulators list See: https://sw.kovidgoyal.net/kitty/ --- README.md | 2 +- defaults.json | 2 +- user_config.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ba609f9..b108f3e 100644 --- a/README.md +++ b/README.md @@ -363,7 +363,7 @@ You can also add additional Desktop Environment related tweaks to user_config.js "name":"term", "run":"setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.term $DISPLAY", "de":[2], - "appnames":[ "Gnome-terminal","konsole","io.elementary.terminal","terminator","sakura","guake","tilda","xterm","eterm" ], + "appnames":[ "Gnome-terminal","konsole","io.elementary.terminal","terminator","sakura","guake","tilda","xterm","eterm","kitty" ], "run_onInput":"", "run_offInput": "killall xbindkeys > /dev/null 2>&1", "symbols":"", diff --git a/defaults.json b/defaults.json index 77f8075..d14e642 100644 --- a/defaults.json +++ b/defaults.json @@ -1,6 +1,6 @@ {"defaultapps":[{ "name":"term", - "appnames":[ "Gnome-terminal","konsole","io.elementary.terminal","terminator","sakura","guake","tilda","xterm","eterm" ] + "appnames":[ "Gnome-terminal","konsole","io.elementary.terminal","terminator","sakura","guake","tilda","xterm","eterm","kitty" ] }], "defaulttypes":["windows","mac","chromebook"], "defaults":[{ diff --git a/user_config.json b/user_config.json index 9652547..92268c2 100644 --- 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" ] + "appnames":[ "Gnome-terminal","konsole","io.elementary.terminal","terminator","sakura","guake","tilda","xterm","eterm","kitty" ] }, { "name": "firefox", From ccc081adbabdbe4d80b40ad74992ea9a9838054a Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sat, 4 Apr 2020 22:00:24 -0500 Subject: [PATCH 08/15] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ff3d96c..b924a32 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ [![GitHub release](https://img.shields.io/github/release/rbreaves/kinto.svg)](https://github.com/rbreaves/kinto/releases/latest) -\- Type in Linux like it's a Mac. \- +\- Type in Linux & Windows like it's a Mac. \- Seamless copy and paste with all apps and terminals. Also the only linux remapper that is aware of your cursor/caret status - meaning it avoids shortcut conflicts within an app versus wordwise shortcuts when a text field is in use. From 192a640e6ca05452eabc657f61b3532cf75e42f0 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sat, 4 Apr 2020 22:02:27 -0500 Subject: [PATCH 09/15] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index b924a32..3f5e792 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,7 @@ Kinto works for standard Windows, Apple and Chromebook keyboards. The following - Fedora/RHEL/Manjaro/Arch/Debian/Ubuntu based distro 16.04+ - Windows 10 & WSL is now supported +- WSL Ubuntu edition (you can modify windows/kinto.ahk to support more) - Powershell - run as Administrator (for install) - Chocolatey (for install) - Python (for install) From 1a07a55fa9cc2fba727699b8e5bb4d17bd1eb3dd Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sat, 4 Apr 2020 22:05:43 -0500 Subject: [PATCH 10/15] Update README.md --- README.md | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 3f5e792..900221d 100644 --- a/README.md +++ b/README.md @@ -28,13 +28,6 @@ Kinto works for standard Windows, Apple and Chromebook keyboards. The following - IBus* - Fedora/RHEL/Manjaro/Arch/Debian/Ubuntu based distro 16.04+ -- Windows 10 & WSL is now supported -- WSL Ubuntu edition (you can modify windows/kinto.ahk to support more) -- Powershell - run as Administrator (for install) -- Chocolatey (for install) -- Python (for install) -- Autohotkey - Binary is included and will be installed, but you can also compile kintox11.c on your system. You will need to compile and install json-c first as its libraries will be required to compile and run the program. *IBus is needed to support wordwise during browser app usage as the keymap will need to change slightly depending if the cursor/caret is on screen waiting for input. Setup.py will set it but you can manually set it as well or check your current Input Method. @@ -43,6 +36,16 @@ On most distros you can confirm navigate to your "Language Support" and set "Key Wayland support is planned, but not ready yet. +## Kinto for Windows 10 Requirements + +- WSL Ubuntu edition (you can modify windows/kinto.ahk to support more) +- Powershell - run as Administrator +- Chocolatey (setup takes care of it) +- Python (setup takes care of it) +- Autohotkey (setup takes care of it) + +Does not have complete parity with the Linux edition, but it does work and can be built on and added to as needed. + ## How to install 1. clone this repo From e755c84b27adcf21f05093b4475cd27d38e8c6dd Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sat, 4 Apr 2020 22:07:49 -0500 Subject: [PATCH 11/15] Update README.md --- README.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 900221d..e9fe19a 100644 --- a/README.md +++ b/README.md @@ -38,13 +38,15 @@ Wayland support is planned, but not ready yet. ## Kinto for Windows 10 Requirements -- WSL Ubuntu edition (you can modify windows/kinto.ahk to support more) +- WSL Ubuntu edition - Powershell - run as Administrator -- Chocolatey (setup takes care of it) -- Python (setup takes care of it) -- Autohotkey (setup takes care of it) -Does not have complete parity with the Linux edition, but it does work and can be built on and added to as needed. +Does not have complete parity with the Linux edition, but it does work and can be built on and added to as needed. Modify ./windows/kinto.ahk if you want to add more WSL editions or other terminals. + +Other programs that will be installed when you run ./setup.py +- Chocolatey +- Python3 +- Autohotkey ## How to install From 087d7a7d0e18a7ba447fe6753cf1e9bc09660cc3 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sat, 4 Apr 2020 22:08:48 -0500 Subject: [PATCH 12/15] Update README.md --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index e9fe19a..fc337c7 100644 --- a/README.md +++ b/README.md @@ -40,14 +40,13 @@ Wayland support is planned, but not ready yet. - WSL Ubuntu edition - Powershell - run as Administrator - -Does not have complete parity with the Linux edition, but it does work and can be built on and added to as needed. Modify ./windows/kinto.ahk if you want to add more WSL editions or other terminals. - Other programs that will be installed when you run ./setup.py - Chocolatey - Python3 - Autohotkey +Does not have complete parity with the Linux edition, but it does work and can be built on and added to as needed. Modify ./windows/kinto.ahk if you want to add more WSL editions or other terminals. + ## How to install 1. clone this repo From deac0cfb0abd712d431b9641c88185384be60124 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sat, 4 Apr 2020 22:09:30 -0500 Subject: [PATCH 13/15] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index fc337c7..4aa7bac 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,7 @@ Wayland support is planned, but not ready yet. - WSL Ubuntu edition - Powershell - run as Administrator + Other programs that will be installed when you run ./setup.py - Chocolatey - Python3 From 05ead513222dda646dedd1f6e1633f49b50f48df Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sat, 4 Apr 2020 22:14:00 -0500 Subject: [PATCH 14/15] Update README.md --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 4aa7bac..a334a46 100644 --- a/README.md +++ b/README.md @@ -509,6 +509,11 @@ I'd appreciate any help from people with non-US based keyboards, to help ensure If you would like to attempt adding additional custom keymaps for other languages then I strongly recommend reading Glen Whitney's post here. https://superuser.com/questions/385748/binding-superc-superv-to-copy-and-paste +## Notes about Windows 10 +Sharpkeys was used to create the layout/reg files to swap the Ctrl, Win and Alt keys. Sharpkeys was not required however because the reg keys were extracted. Autohotkey is used to manage keyswaps needed for terminal usage. Autohotkey is also used to add additional mac like keybinds for Sublime text and can be used for other apps as well. + +Microsoft is working on a new Powertoy Keyboard Manager that could be used with an easier to use GUI interface, but this approach should be fully sufficient for a mac like experience and autohotkeys appears to be more than capable enough to handle complex rebinding of any or most mac like shortcuts. + ## Contributing I welcome any and all contributors who want to contribute something to this project. From 4849fb55ac7a8e6af41dacbe2414bd0202be14b3 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sat, 4 Apr 2020 23:28:00 -0500 Subject: [PATCH 15/15] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a334a46..bffdd3d 100644 --- a/README.md +++ b/README.md @@ -40,10 +40,10 @@ Wayland support is planned, but not ready yet. - WSL Ubuntu edition - Powershell - run as Administrator +- Python3 Other programs that will be installed when you run ./setup.py - Chocolatey -- Python3 - Autohotkey Does not have complete parity with the Linux edition, but it does work and can be built on and added to as needed. Modify ./windows/kinto.ahk if you want to add more WSL editions or other terminals.