Added quick Windows installer

Merge branch 'hotfix'
Added git dependency install
2025-08-03 17:46:39 +02:00 · 2021-04-03 17:40:31 -05:00 · 2021-04-03 03:36:57 -05:00 · 2021-04-03 03:36:22 -05:00 · 2021-04-03 02:26:02 -05:00 · 2021-04-03 02:25:30 -05:00
8 changed files with 259 additions and 57 deletions
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@

 [![GitHub release](https://img.shields.io/github/release/rbreaves/kinto.svg)](https://github.com/rbreaves/kinto/releases/latest)

-\- Linux & Windows with Mac-style shortcut keys. \-
+\- Mac-style shortcut keys for Linux & Windows. \-

 Seamless copy and paste with all apps and terminals. The zero effort solution.

@@ -32,6 +32,15 @@ Video Tutorial: [Install Kinto.sh for Linux in less than a minute](https://www.y

 <img src="https://user-images.githubusercontent.com/10969616/97070698-179c4500-15a0-11eb-8064-c03aa7f4d4a5.png" width="75%">

+### Quick Install Method
+
+Paste the following into your Terminal
+```
+/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/rbreaves/kinto/master/install/linux.sh)"
+```
+
+### Old Install Method
+
 1. clone this repo
 ```
 git clone https://github.com/rbreaves/kinto.git
@@ -76,12 +85,30 @@ sudo apt install xfce4-appmenu-plugin vala-panel-appmenu-common
 xfconf-query -c xsettings -p /Gtk/Modules -n -t string -s "appmenu-gtk-module"
 ```

+**Perfect HiDPI fractional scaling on Ubuntu Budgie 20.04 under x11**
+
+https://discourse.ubuntubudgie.org/t/ubuntu-budgie-20-04-fractional-hidpi-for-x11/4777
+
 ## How to Install (Windows)

 Video Tutorial: [How to Install Kinto.sh on Windows 10](https://youtu.be/sRk8A8krz40)

 [Windows 10 Requirements](#Kinto-for-Windows-10-Requirements)

+### Quick install
+Open Powershell as Administrator and copy and paste the following. This will download & extract Kinto, install chocolatey, python3 and then install Kinto.
+
+```
+Invoke-WebRequest -Uri https://github.com/rbreaves/kinto/archive/refs/heads/master.zip -OutFile $env:USERPROFILE\Downloads\kinto.zip;Expand-Archive -LiteralPath "$env:USERPROFILE\Downloads\kinto.zip" -DestinationPath "$env:USERPROFILE\Downloads" -Force;Set-ExecutionPolicy Bypass -Scope Process -Force; iwr https://chocolatey.org/install.ps1 -UseBasicParsing | iex; choco install -y python3;cd "$env:USERPROFILE\Downloads\kinto-master";py .\setup.py
+```
+
+Update system tray to show Kinto icon at all times (optional)
+```
+cmd /c "explorer shell:::{05d7b0f4-2121-4eff-bf6b-ed3f69b894d9}"
+```
+
+### Old method
+
 1. Open Powershell (Right click and Run as Administrator)

 2. clone this repo
@@ -110,15 +137,17 @@ Select Uninstall

 ## How to use in Remote Desktop Solutions

-RDP fully works as long as the entire keyboard input is being captured. RDP had been working for awhile with Windows but as of 2/14/2021 Linux is now supported and potentially macOS as well. VNC & other protocols may work, but is likely most dependent on how the keyboard input is captured on the computer running the client.
+RDP fully works as long as the entire keyboard input is being captured. RDP had been working for awhile with Windows but as of 2/14/2021 Linux & macOS is now supported. VNC & other protocols may work, but is likely most dependent on how the keyboard input is captured on the computer running the client.

 |Program|Src/Remote Client ⇒|Dst/Remote Server|Works? |Notes|
 |---|---|---|---|---|
 |Official MS RDP (mstsc.exe)| ❖Windows ⇒| ❖Windows  | ✅ Yes|   |
-|Remmina| 🐧Linux⇒| ❖Windows  | ✅ Yes|Use hover menu to enable "Grab all keyboard events"|
-|FreeRDP| 🐧Linux⇒| ❖Windows  | ✅ Yes | |
+|Official MS RDP| ChromeOS 87+⇒| ❖Windows  | ✅ Yes|May work on earlier versions as well, if they support Android apps|
+|Remmina| 🐧Linux*/ChromeOS 87+⇒| ❖Windows  | ✅ Yes|*Use hover menu to enable "Grab all keyboard events"|
+|FreeRDP| 🐧Linux/ChromeOS 87+⇒| ❖Windows  | ✅ Yes | |
 |FreeRDP| 🍎macOS⇒| ❖Windows  | ✅ Yes| [FreeRDP for macOS](#FreeRDP-for-macOS)|
-|Jump Desktop (RDP)| 🍎macOS ⇒| ❖Windows  | ✅ Yes|Preferences -> Keyboard -> Disable "Key Conversions", Enabled "Send macOS Shortcuts" under Keyboard shortcuts|
+|Remote Desktop Manager Free|🍎iOS⇒| ❖Windows  | ✅ Yes| |
+|Jump Desktop (RDP)| 🍎macOS*/iOS ⇒| ❖Windows  | ✅ Yes|*Preferences -> Keyboard -> Disable "Key Conversions", Enabled "Send macOS Shortcuts" under Keyboard shortcuts|
 |Official MS RDP| 🍎macOS⇒| ❖Windows  | ❌ No|Initial Cmd key press not being passed|
 |Remote Desktop Manager Free| 🍎macOS⇒| ❖Windows  | ❌ No|Initial Cmd key press not being passed|
 |Royal TSX Client| 🍎macOS⇒| ❖Windows  | ❌ No|Initial Cmd key press not being passed|
@@ -240,6 +269,9 @@ Other programs that will be installed when you run ./setup.py
 - Strawberry Perl

 Note: Sublime Text users should disable screen rotation hotkeys as they will interfere with multi-cursor and possibly other combos. See https://windowsloop.com/disable-screen-rotation-keyboard-shortcut/ for details.
+
+You may also want to disable the Xbox Game Bar so that Win+G or other shortcuts will not interfer with any of your remaps. Start menu -> Game bar shortcuts -> toggle Off.
+
 ## Shortcut Creation

 [Linux Shortcut Creation (Xkeysnail)](#Linux-Xkeysnail)
@@ -444,6 +476,10 @@ Windows 10 touchpad to precision touchpad driver

 macOS cursors for Windows

+[QuickLook](https://github.com/QL-Win/QuickLook) for Windows by QL-Win
+
+It allows users to peek into a file content in lightning speed by just pressing the Space key
+
 [fusuma](https://github.com/iberianpig/fusuma) by iberianpig

 Multitouch gestures with libinput driver on Linux
@@ -532,11 +568,9 @@ Vala rewrite of SimplePanel - GitHub mirror (Global Menu for XFCE)

 ## Contributing

-I welcome any and all contributors who want to contribute something to this project.
+I welcome any and all contributors who want to add something to this project.

-If you are specifically wanting to contribute additional custom keymaps to help with aligning Kinto's behavior to that of a mac keyboard then I would strongly recommend that you read Glen Whitney's comment on Superuser (the link is below). You may also look at the .xkb directory, mac_wordwise.sh and xactive.sh files to better understand how Kinto operates so that you can test your own keymaps without having to use the systemd service or running the xactive.sh script.
-
-https://superuser.com/questions/385748/binding-superc-superv-to-copy-and-paste
+You can read the configuration files and the open issue tickets such as [#44 Shortcut Translation Tables](https://github.com/rbreaves/kinto/issues/44), [#115 Shortcut Creation (xkeysnail)](https://github.com/rbreaves/kinto/issues/115), and [#348 Missing Shortcuts: Post them here](https://github.com/rbreaves/kinto/issues/348) to best understand what's currently happening and how best to contribute.

 ## More information about Kinto

--- a/install/linux.sh
+++ b/install/linux.sh
@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+# /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/rbreaves/kinto/master/install/linux.sh)"
+
+curl https://github.com/rbreaves/kinto/archive/refs/heads/master.zip -J -L -o ~/Downloads/kinto.zip
+unzip ~/Downloads/kinto.zip -d ~/Downloads/
+cd ~/Downloads/kinto-master/
+
+kintorelease=`curl -s https://api.github.com/repos/rbreaves/kinto/releases/latest | awk -F'tag_name": ' '{if ($2) print $2}' | tr -d \",`
+kintohash=`unzip -z ~/Downloads/kinto.zip | tail -n1`
+kintoshort=${kintohash::7}
+
+echo "$kintorelease" "build" "$kintoshort" > ./dl_version
+
+if [ $# -eq 0 ];then
+	echo "Installing Kinto..."
+	./setup.py
+elif [ $1 == "-r" ];then
+	echo "Uninstall Kinto..."
+	./setup.py -r
+fi
--- a/install/windows.ps1
+++ b/install/windows.ps1
@@ -0,0 +1,7 @@
+Invoke-WebRequest -Uri https://github.com/rbreaves/kinto/archive/refs/heads/master.zip -OutFile $env:USERPROFILE\Downloads\kinto.zip
+Expand-Archive -LiteralPath "$env:USERPROFILE\Downloads\kinto.zip" -DestinationPath "$env:USERPROFILE\Downloads" -Force
+Set-ExecutionPolicy Bypass -Scope Process -Force
+iwr https://chocolatey.org/install.ps1 -UseBasicParsing | iex
+choco install -y python3
+cd "$env:USERPROFILE\Downloads\kinto-master"
+py .\setup.py
--- a/linux/gui/kinto-gui.py
+++ b/linux/gui/kinto-gui.py
@@ -153,6 +153,14 @@ class MyWindow(Gtk.Window):
        menuitem_file = Gtk.MenuItem(label="File")
        menubar.append(menuitem_file)
        submenu_file = Gtk.Menu()
+
+        menuitem_restart = Gtk.MenuItem(label="Restart")
+        menuitem_restart.connect('activate',self.runRestart)
+        submenu_file.append(menuitem_restart)
+        menuitem_stop = Gtk.MenuItem(label="Stop")
+        menuitem_stop.connect('activate',self.runStop)
+        submenu_file.append(menuitem_stop)
+
        menuitem_file.set_submenu(submenu_file)
        submenu_file.append(self.menuitem_auto)
        kintotray = int(self.queryConfig('ps -aux | grep [k]intotray >/dev/null 2>&1 && echo "1" || echo "0"'))
@@ -164,12 +172,6 @@ class MyWindow(Gtk.Window):
            self.menuitem_systray.signal_id = self.menuitem_systray.connect('activate',self.checkTray,True)
        menuitem_file.connect('activate',self.refreshFile)
        submenu_file.append(self.menuitem_systray)
-        menuitem_restart = Gtk.MenuItem(label="Restart")
-        menuitem_restart.connect('activate',self.runRestart)
-        submenu_file.append(menuitem_restart)
-        menuitem_stop = Gtk.MenuItem(label="Stop")
-        menuitem_stop.connect('activate',self.runStop)
-        submenu_file.append(menuitem_stop)

        menuitem_quit = Gtk.MenuItem(label="Quit")
        submenu_file.append(menuitem_quit)
@@ -1435,4 +1437,4 @@ if openWin:
    win.show_all()
    openWin = False

-Gtk.main()
+Gtk.main()
--- a/linux/kinto.py
+++ b/linux/kinto.py
@@ -7,7 +7,25 @@ from xkeysnail.transform import *
 # Use the following for testing terminal keymaps
 # terminals = [ "", ... ]
 # xbindkeys -mk
-terminals = ["kinto-gui.py","gnome-terminal","konsole","io.elementary.terminal","terminator","sakura","guake","tilda","xterm","eterm","kitty","alacritty","mate-terminal","tilix","xfce4-terminal","hyper"]
+terminals = [
+    "alacritty",
+    "eterm",
+    "gnome-terminal",
+    "guake",
+    "hyper",
+    "io.elementary.terminal",
+    "kinto-gui.py",
+    "kitty",
+    "konsole",
+    "mate-terminal",
+    "qterminal",
+    "sakura",
+    "terminator",
+    "tilda",
+    "tilix",
+    "xfce4-terminal",
+    "xterm",
+]
 terminals = [term.casefold() for term in terminals]
 termStr = "|".join(str(x) for x in terminals)

@@ -17,7 +35,10 @@ codeStr = "|".join(str(x) for x in mscodes)
 # Add remote desktop clients & VM software here
 # Ideally we'd only exclude the client window,
 # but that may not be easily done.
-remotes = ["org.remmina.Remmina"]
+remotes = [
+    "org.remmina.Remmina",
+    "xfreerdp",
+]
 remotes = [client.casefold() for client in remotes]

 # Add remote desktop clients & VMs for no remapping
@@ -25,11 +46,26 @@ terminals.extend(remotes)
 mscodes.extend(remotes)

 # Use for browser specific hotkeys
-browsers = ["Chromium","Chromium-browser","Google-chrome","microsoft-edge-dev","microsoft-edge","Epiphany","Firefox","Discord"]
+browsers = [
+    "Chromium",
+    "Chromium-browser",
+    "Discord",
+    "Epiphany",
+    "Firefox",
+    "Google-chrome",
+    "microsoft-edge",
+    "microsoft-edge-dev",
+]
 browsers = [browser.casefold() for browser in browsers]
 browserStr = "|".join(str(x) for x in browsers)

-chromes = ["Chromium","Chromium-browser","Google-chrome","microsoft-edge-dev","microsoft-edge"]
+chromes = [
+    "Chromium",
+    "Chromium-browser",
+    "Google-chrome",
+    "microsoft-edge",
+    "microsoft-edge-dev",
+]
 chromes = [chrome.casefold() for chrome in chromes]
 chromeStr = "|".join(str(x) for x in chromes)

@@ -44,6 +80,12 @@ define_multipurpose_modmap(
    {                                         # Placeholder
 })

+# Fix for avoiding modmapping when using Synergy keyboard/mouse sharing.
+# Synergy doesn't set a wm_class, so this may cause issues with other
+# applications that also don't set the wm_class.
+# Enable only if you use Synergy.
+# define_conditional_modmap(lambda wm_class: wm_class == '', {})
+
 # [Global modemap] Change modifier keys as in xmodmap
 define_conditional_modmap(lambda wm_class: wm_class.casefold() not in terminals,{

@@ -204,7 +246,7 @@ define_keymap(re.compile("^jetbrains-(?!.*toolbox).*$", re.IGNORECASE),{
    # VCS/Local History
    K("Super-v"): K("M-Grave"),                 # VCS quick popup
    K("Super-c"): K("LC-c"),                    # Sigints - interrupt
-},"JetBrains Products")
+},"Jetbrains")

 # Keybindings for Nautilus
 define_keymap(re.compile("org.gnome.nautilus", re.IGNORECASE),{
@@ -212,7 +254,7 @@ define_keymap(re.compile("org.gnome.nautilus", re.IGNORECASE),{
    K("RC-Down"): K("M-Down"),      # Go Down dir
    K("RC-Left"): K("M-Left"),      # Go Back
    K("RC-Right"): K("M-Right"),    # Go Forward
-},"Nautilus")
+},"Nautilus - Finder")

 # Keybindings for Browsers
 define_keymap(re.compile(browserStr, re.IGNORECASE),{
@@ -228,24 +270,35 @@ define_keymap(re.compile(browserStr, re.IGNORECASE),{
    K("RC-Key_7"): K("M-Key_7"),
    K("RC-Key_8"): K("M-Key_8"),
    K("RC-Key_9"): K("M-Key_9"),    # Jump to last tab
-},"General Web Browsers")
+    K("C-Left_Brace"): K("C-Page_Up"),
+    K("C-Right_Brace"): K("C-Page_Down"),
+})

 # Open preferences in browsers
 define_keymap(re.compile("Firefox", re.IGNORECASE),{
-    K("C-comma"): [K("C-T"),K("a"),K("b"),K("o"),K("u"),K("t"),K("Shift-SEMICOLON"),K("p"),K("r"),K("e"),K("f"),K("e"),K("r"),K("e"),K("n"),K("c"),K("e"),K("s"),K("Enter")],
-},"Firefox")
+    K("C-comma"): [
+        K("C-T"),K("a"),K("b"),K("o"),K("u"),K("t"),
+        K("Shift-SEMICOLON"),K("p"),K("r"),K("e"),K("f"),
+        K("e"),K("r"),K("e"),K("n"),K("c"),K("e"),K("s"),K("Enter")
+    ],
+})
 define_keymap(re.compile(chromeStr, re.IGNORECASE),{
    K("C-comma"): [K("M-e"), K("s"),K("Enter")],
-},"Chrome Based Web Browsers")
+}, "Browsers")
 # Opera C-F12

+# Note: terminals extends to remotes as well
+define_keymap(lambda wm_class: wm_class.casefold() not in terminals,{
+    K("RC-Dot"): K("Esc"),                        # Mimic macOS Cmd+dot = Escape key (not in terminals)
+})
+
 # None referenced here originally
 # - but remote clients and VM software ought to be set here
 # These are the typical remaps for ALL GUI based apps
 define_keymap(lambda wm_class: wm_class.casefold() not in remotes,{
    K("RC-Space"): K("Alt-F1"),                   # Default SL - Launch Application Menu (gnome/kde)
    K("RC-F3"):K("Super-d"),                      # Default SL - Show Desktop (gnome/kde,eos)
-    K("RC-LC-f"):K("M-F10"),                      # Default SL - Maximize app (gnome/kde)
+    K("RC-Super-f"):K("M-F10"),                      # Default SL - Maximize app (gnome/kde)
    # K("Super-Right"):K("C-M-Right"),              # Default SL - Change workspace (budgie)
    # K("Super-Left"):K("C-M-Left"),                # Default SL - Change workspace (budgie)
    K("RC-Q"): K("M-F4"),                         # Default SL - not-popos
@@ -294,6 +347,8 @@ define_keymap(lambda wm_class: wm_class.casefold() not in remotes,{
    K("Super-k"): [K("Shift-End"), K("Backspace")],
    K("Super-d"): K("Delete"),

+    # K("M-RC-Space"): K(""),                   # Open Finder - Placeholder
+
    # Wordwise
    K("RC-Left"): K("Home"),                      # Beginning of Line
    K("RC-Shift-Left"): K("Shift-Home"),          # Select all to Beginning of Line
@@ -307,14 +362,16 @@ define_keymap(lambda wm_class: wm_class.casefold() not in remotes,{
    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"),                # Chromebook/IBM - 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("RM-Backspace"): K("Delete"),               # Chromebook/IBM - Delete
+    K("Super-Backspace"): K("C-Backspace"),       # Delete Left Word of Cursor
+    K("Super-Delete"): K("C-Delete"),             # Delete Right Word of Cursor
+    # K("LM-Backspace"): K("C-Backspace"),          # Chromebook/IBM - Delete Left Word of Cursor
+    K("M-Backspace"): K("C-Backspace"),           # Default not-chromebook
+    K("RC-Backspace"): K("C-Shift-Backspace"),    # Delete Entire Line Left of Cursor
+    K("Alt-Delete"): K("C-Delete"),               # Delete Right Word of Cursor
    # K(""): pass_through_key,                      # cancel
    # K(""): K(""),                                 #
-},"General GUI Apps")
+}, "General GUI")

 define_keymap(lambda wm_class: wm_class.casefold() not in mscodes,{
    # Wordwise remaining - for Everything but VS Code
@@ -337,7 +394,7 @@ define_keymap(lambda wm_class: wm_class.casefold() not in mscodes,{
    #   https://superuser.com/questions/770301/pentadactyl-how-to-disable-menu-bar-toggle-by-alt
    # **
    #
-}, "wordwise for GUI apps")
+}, "Wordwise - not vscode")

 # Keybindings for VS Code
 define_keymap(re.compile(codeStr, re.IGNORECASE),{
@@ -366,8 +423,8 @@ define_keymap(re.compile(codeStr, re.IGNORECASE),{
    K("C-g"): K("f3"),                          # find_next
    K("Shift-f3"): pass_through_key,            # cancel find_prev
    K("C-Shift-g"): K("Shift-f3"),              # find_prev
-    # K("Super-c"): K("LC-c"),                    #  Default - Terminal - Sigint
-    # K("Super-x"): K("LC-x"),                    #  Default - Terminal - Exit nano
+    # K("Super-c"): K("LC-c"),                    # Default - Terminal - Sigint
+    # K("Super-x"): K("LC-x"),                    # Default - Terminal - Exit nano
    # K("M-c"): K("LC-c"),                        #  Chromebook/IBM - Terminal - Sigint
    # K("M-x"): K("LC-x"),                        #  Chromebook/IBM - Terminal - Exit nano
    # K("Super-C-g"): K("C-f2"),                  # Default - Sublime - find_all_under
@@ -380,8 +437,8 @@ define_keymap(re.compile(codeStr, re.IGNORECASE),{

 # Keybindings for Sublime Text
 define_keymap(re.compile("Sublime_text", re.IGNORECASE),{
-    # K("Super-c"): K("LC-c"),                    #  Default - Terminal - Sigint
-    # K("Super-x"): K("LC-x"),                    #  Default - Terminal - Exit nano
+    # K("Super-c"): K("LC-c"),                    # Default - Terminal - Sigint
+    # K("Super-x"): K("LC-x"),                    # Default - Terminal - Exit nano
    # K("M-c"): K("LC-c"),                        #  Chromebook/IBM - Terminal - Sigint
    # K("M-x"): K("LC-x"),                        #  Chromebook/IBM - Terminal - Exit nano
    K("Super-Space"): K("C-Space"),             # Basic code completion
@@ -487,7 +544,6 @@ define_keymap(re.compile(termStr, re.IGNORECASE),{
    # K("RC-Shift-Tab"): K("RC-Shift-backslash"),   # xfce4
    # K("RC-Grave"): K("RC-Shift-backslash"),       # xfce4
    # Converts Cmd to use Ctrl-Shift
-    K("RC-V"): K("C-Shift-V"),
    K("RC-MINUS"): K("C-Shift-MINUS"),
    K("RC-EQUAL"): K("C-Shift-EQUAL"),
    K("RC-BACKSPACE"): K("C-Shift-BACKSPACE"),
@@ -523,7 +579,7 @@ define_keymap(re.compile(termStr, re.IGNORECASE),{
    K("RC-N"): K("C-Shift-N"),
    K("RC-M"): K("C-Shift-M"),
    K("RC-COMMA"): K("C-Shift-COMMA"),
-    K("RC-DOT"): K("C-Shift-DOT"),
+    K("RC-Dot"): K("LC-c"),
    K("RC-SLASH"): K("C-Shift-SLASH"),
    K("RC-KPASTERISK"): K("C-Shift-KPASTERISK"),
 }, "terminals")
--- a/setup.py
+++ b/setup.py
@@ -55,14 +55,14 @@ def windows_setup():
 		os.system('C:\\Strawberry\\perl\\bin\\perl.exe -pi -e "s/(; )(.*)(; Chromebook)/$2$3/g" .\\windows\\kinto-new.ahk')
 		os.system('C:\\Strawberry\\perl\\bin\\perl.exe -pi -e "s/(; )(.*)(; WinModifiers/CB)/$2$3/g" .\\windows\\kinto-new.ahk')
 	if default == 3 or default == 4:
-		os.system('C:\\Strawberry\\perl\\bin\\perl.exe -pi -e "s/(; )(.*)(; CB/IBM)/$2$3/g" .\\windows\\kinto-new.ahk')
+		os.system('C:\\Strawberry\\perl\\bin\\perl.exe -pi -e "s/(; )(.*)(; CB\/IBM)/$2$3/g" .\\windows\\kinto-new.ahk')
+		os.system('C:\\Strawberry\\perl\\bin\\perl.exe -pi -e "s/(; )(.*)(; WinModifiers\/CB\/IBM)/$2$3/g" .\\windows\\kinto-new.ahk')
 	if default == 4:
 		kbtype = "ibm"
 		os.system('C:\\Strawberry\\perl\\bin\\perl.exe -pi -e "s/(; )(.*)(; IBM)/$2$3/g" .\\windows\\kinto-new.ahk')
-		os.system('C:\\Strawberry\\perl\\bin\\perl.exe -pi -e "s/(; )(.*)(; WinModifiers/CB/IBM)/$2$3/g" .\\windows\\kinto-new.ahk')
 	if default > 0 and default < 5:
 		stvscode = yn_choice(bcolors.CYELLOW2 + "Would you like to use Sublime Text 3 keymaps in VS Code?\n" + bcolors.ENDC)
-		print("\nWill now install Ubuntu Termimnal Theme as default...")
+		print("\nWill now install Ubuntu Terminal Theme as default...")
 		os.system('regedit "' + path + '\\windows\\theme_ubuntu.reg"')
 		os.system('robocopy "'+ path + '\\assets" "%userprofile%\\.kinto\\assets" /E')
 		if (stvscode and (default > 0 or default < 3)):
@@ -73,7 +73,7 @@ def windows_setup():
 		os.system('C:\\Strawberry\\perl\\bin\\perl.exe -pi -e "s/{kbtype}/' + kbtype + '/g" "%userprofile%\\.kinto\\kinto-start.vbs"')
 		os.system('copy /Y "' + path + '\\windows\\usb.vbs" "%userprofile%\\.kinto\\usb.vbs"')
 		os.system('copy /Y "' + path + '\\windows\\detectUSB.ahk" "%userprofile%\\.kinto\\detectUSB.ahk"')
-		os.system('mklink "%userprofile%\\Start Menu\\Programs\\Startup\\kinto-start.vbs" "%userprofile%\\.kinto\\kinto-start.vbs"')
+		os.system('mklink "%userprofile%\\AppData\\Roaming\\Microsoft\\Windows\\STARTM~1\\Programs\\Startup\\kinto-start.vbs" "%userprofile%\\.kinto\\kinto-start.vbs"')
 		os.system('copy /Y "'+ path + '\\windows\\NoShell.vbs" "%userprofile%\\.kinto\\NoShell.vbs"')
 		os.system('copy /Y "'+ path + '\\windows\\toggle_kb.bat" "%userprofile%\\.kinto\\toggle_kb.bat"')
 		os.system('copy /Y "'+ path + '\\windows\\kinto-new.ahk" "%userprofile%\\.kinto\\kinto.ahk"')
--- a/windows/kinto.ahk
+++ b/windows/kinto.ahk
@@ -9,7 +9,7 @@
 ; https://www.autohotkey.com/boards/viewtopic.php?t=9501
 OnMessage(0x404, "AHK_NOTIFYICON")

-AHK_NOTIFYICON(wParam, lParam) 
+AHK_NOTIFYICON(wParam, lParam)
 {
    if (lParam = 0x202) { ; user left-clicked tray icon
        ;ADD ANY SUBROUTINE OR FUNCTION HERE
@@ -131,6 +131,7 @@ Exit() {
 SetTitleMatchMode, 2

 GroupAdd, terminals, ahk_exe ubuntu.exe
+GroupAdd, terminals, ahk_exe ubuntu2004.exe
 GroupAdd, terminals, ahk_exe ConEmu.exe
 GroupAdd, terminals, ahk_exe ConEmu64.exe
 GroupAdd, terminals, ahk_exe powershell.exe
@@ -144,6 +145,7 @@ GroupAdd, terminals, Fluent Terminal ahk_class ApplicationFrameWindow
 GroupAdd, terminals, ahk_class Console_2_Main

 GroupAdd, posix, ahk_exe ubuntu.exe
+GroupAdd, posix, ahk_exe ubuntu2004.exe
 GroupAdd, posix, ahk_exe ConEmu.exe
 GroupAdd, posix, ahk_exe ConEmu64.exe
 GroupAdd, posix, ahk_exe Hyper.exe
@@ -244,7 +246,7 @@ GroupAdd, intellij, ahk_exe idea64.exe
    ; Tertiary::LWin

    ; $LAlt::LCtrl     ; CB/IBM
-    ; $RAlt::RCtrl     ; CB/IBM
+    ; $RAlt::RCtrl     ; IBM
    ; $RCtrl::RAlt     ; CB/IBM
    ; $CapsLock::LWin  ; IBM
    ; $LCtrl::LAlt     ; CB/IBM
@@ -261,7 +263,10 @@ GroupAdd, intellij, ahk_exe idea64.exe

    ; Hack to disable start menu on winkey
    ; Static - Does not apply to IBM or Chromebooks
-    ; $LCtrl up::Send {Ctrl down}{LWin up}{Ctrl up} ; Default
+    ; $LCtrl up::Send {Ctrl down}{LWin up}{Ctrl up}            ; Default
+    ; LWin::return                                             ; Chromebook
+    ; RWin::return                                             ; Chromebook
+    ; RAlt::return                                             ; Chromebook

    ; Disable Win-Up/Down - interferes with Sublime text 3 multi-cursors
    #Down::return
@@ -334,7 +339,8 @@ GroupAdd, intellij, ahk_exe idea64.exe
    ^F3::Send #d

    ; Emoji Panel
-    #^Space::Send {LWin down};{LWin up}
+    ; #^Space::Send {LWin down};{LWin up} ; Default
+    ; !^Space::Send {LWin down};{LWin up} ; CB/IBM

    ; Full Screenshot
    ^+3::Send {PrintScreen}
@@ -342,11 +348,11 @@ GroupAdd, intellij, ahk_exe idea64.exe
    ; Region Screenshot
    ^+4::Send #+{S}

+    ; Open File Browser
+    ; !^space::Send #e ; Default
+    ; #^space::Send #e ; CB/IBM
+
    ; wordwise support
-    $^Left::Send {Home}
-    $^+Left::Send +{Home}
-    $^Right::Send {End}
-    $^+Right::Send +{End}
    ^Up::Send ^{Home}
    ^+Up::Send ^+{Home}
    ^Down::Send ^{End}
@@ -357,8 +363,57 @@ GroupAdd, intellij, ahk_exe idea64.exe
    !+Left::Send ^+{Left}
    !Right::Send ^{Right}
    !+Right::Send ^+{Right}
+    $^Left::Send {Home}
+    $^+Left::Send +{Home}
+    $^Right::Send {End}
+    $^+Right::Send +{End}
+
+    ; #if GetKeyState("LWin", "P") || GetKeyState("RAlt", "P") ; Chromebook
+    ;     Space::Send ^{Esc}                                   ; Chromebook
+    ;     0::Send #0                                           ; Chromebook
+    ;     1::Send #1                                           ; Chromebook
+    ;     2::Send #2                                           ; Chromebook
+    ;     3::Send #3                                           ; Chromebook
+    ;     4::Send #4                                           ; Chromebook
+    ;     5::Send #5                                           ; Chromebook
+    ;     6::Send #6                                           ; Chromebook
+    ;     7::Send #7                                           ; Chromebook
+    ;     8::Send #8                                           ; Chromebook
+    ;     9::Send #9                                           ; Chromebook
+    ;     -::Send #-                                           ; Chromebook
+    ;     =::Send #=                                           ; Chromebook
+    ;     `::Send #`                                           ; Chromebook
+    ;     `;::Send #;                                          ; Chromebook
+    ;     a::Send #a                                           ; Chromebook
+    ;     b::Send #b                                           ; Chromebook
+    ;     c::Send #c                                           ; Chromebook
+    ;     d::Send #d                                           ; Chromebook
+    ;     e::Send #e                                           ; Chromebook
+    ;     f::Send #f                                           ; Chromebook
+    ;     g::Send #g                                           ; Chromebook
+    ;     h::Send #h                                           ; Chromebook
+    ;     i::Send #i                                           ; Chromebook
+    ;     j::Send #j                                           ; Chromebook
+    ;     k::Send #k                                           ; Chromebook
+    ;     l::Send #l                                           ; Chromebook
+    ;     m::Send #m                                           ; Chromebook
+    ;     n::Send #n                                           ; Chromebook
+    ;     o::Send #o                                           ; Chromebook
+    ;     p::Send #p                                           ; Chromebook
+    ;     q::Send #q                                           ; Chromebook
+    ;     r::Send #r                                           ; Chromebook
+    ;     s::Send #s                                           ; Chromebook
+    ;     t::Send #t                                           ; Chromebook
+    ;     u::Send #u                                           ; Chromebook
+    ;     v::Send #v                                           ; Chromebook
+    ;     w::Send #w                                           ; Chromebook
+    ;     x::Send #x                                           ; Chromebook
+    ;     y::Send #y                                           ; Chromebook
+    ;     z::Send #z                                           ; Chromebook
+    ; #If                                                      ; Chromebook

    #IfWinNotActive ahk_group terminals
+        ^.::Send {Esc}
        ; emacs style
        #n::Send {Down}
        #p::Send {Up}
@@ -374,6 +429,8 @@ GroupAdd, intellij, ahk_exe idea64.exe
    $^Space::Send ^{Esc}

    #IfWinActive ahk_group intellij
+        ; $#c::Send ^{c}                  ; Default - Sigints interrupt
+        ; $!c::Send ^{c}                  ; CB/IBM
        ; General
        ^0::Send !{0}                   ;Open corresponding tool window
        ^1::Send !{1}                   ;Open corresponding tool window
@@ -534,7 +591,8 @@ GroupAdd, intellij, ahk_exe idea64.exe
        ^!Left::send ^{PgUp}                                    ; prev_view
        Insert::Return                                          ; cancel toggle_overwrite
        ^!O::send {Insert}                                      ; toggle_overwrite
-        !c::Return                                              ; cancel toggle_case_sensitive
+        ; !c::Return                                              ; Default - cancel toggle_case_sensitive
+        ; $!c::send ^{c}                                          ; CB/IBM - Sigint
        ^!c::send !{c}                                          ; toggle_case_sensitive
        ; ^h::Return                                              ; cancel replace
        ^!f::send ^{h}                                          ; replace
@@ -553,6 +611,7 @@ GroupAdd, intellij, ahk_exe idea64.exe
        ^+Down::Return                                          ; cancel swap_line_down
        #!Down::send ^+{Down}                                   ; swap_line_down
        ^Pause::Return                                          ; cancel cancel_build
+        ; #c::send ^{Pause}                                       ; cancel_build
        F9::Return                                              ; cancel sort_lines case_s false
        F5::send {F9}                                           ; sort_lines case_s false
        #F9::Return                                             ; cancel sort_lines case_s true
@@ -616,6 +675,7 @@ GroupAdd, intellij, ahk_exe idea64.exe
        ; Sigints - interrupt
        ; $#c::Send {Ctrl down}c{Ctrl up} ; Default
        ; $!c::Send {Ctrl down}c{Ctrl up} ; CB/IBM
+        $^.::Send {Ctrl down}c{Ctrl up}

        ; Windows Terminal
        ; Ctrl+Shift+C should do nothing
--- a/xkeysnail_service.sh
+++ b/xkeysnail_service.sh
@@ -209,8 +209,6 @@ sudo systemctl disable xkeysnail >/dev/null 2>&1
 sudo pkill -f bin/xkeysnail >/dev/null 2>&1
 sudo pkill -f "is-active xkeysnail" >/dev/null 2>&1

-pip3 install pillow
-
 # Add additional shortcuts if needed, does not modify existing ones

 if [[ $dename == 'gnome' || $dename == 'budgie' ]];then
@@ -326,6 +324,10 @@ expsh=" "
 # 	echo "Will need to install inotify-tools to restart key remapper live for config file changes..."
 # 	sudo ./linux/system-config/unipkg.sh inotify-tools
 # fi
+if ! [ -x "$(command -v git)" ]; then
+	echo "Will need to install git..."
+	sudo ./linux/system-config/unipkg.sh git
+fi
 if ! [ -x "$(command -v pip3)" ]; then
 	echo "Will need to install python3-pip..."
 	sudo ./linux/system-config/unipkg.sh python3-pip
@@ -353,6 +355,8 @@ if [ "$distro" == 'linuxmint' ]; then
 	pip3 install setuptools
 fi

+pip3 install pillow
+
 # echo "Transferring files..."
 mkdir -p ~/.config/kinto

@@ -377,7 +381,16 @@ yes | cp -rf ./linux/xkeysnail.desktop ~/.config/kinto/xkeysnail.desktop
 # logoff fix - not solid for every os. Prevents missed 1 character input on login
 # yes | sudo cp -rf linux/gnome_logoff.sh ~/.config/kinto/logoff.sh

-echo "$(git describe --tag --abbrev=0 | head -n 1)" "build" "$(git rev-parse --short HEAD)" > ~/.config/kinto/version
+if [ -d "./.git" ] 
+then
+	echo "$(git describe --tag --abbrev=0 | head -n 1)" "build" "$(git rev-parse --short HEAD)" > ~/.config/kinto/version
+elif [ -f "./dl_version" ]; then
+	cp ./dl_version  ~/.config/kinto/version
+else
+	# Not a typo - v is built in
+	echo "ersion Unknown"  > ~/.config/kinto/version
+fi
+
 yes | cp -rf ./linux/kinto.py ./linux/kinto.py.new
 yes | cp -rf ./linux/limitedadmins ./linux/limitedadmins.new
 yes | cp -rf ./linux/gui/ ~/.config/kinto/
@@ -470,7 +483,16 @@ if ! [[ $1 == "5" || $1 == "uninstall" || $1 == "Uninstall" ]]; then
 	xhost +SI:localuser:root
 	git clone --depth 10 https://github.com/rbreaves/xkeysnail.git
 	cd xkeysnail
-	git checkout debug
+	git checkout kinto
+	giturl=$(git ls-remote --get-url)
+	if [ "$giturl" != "https://github.com/rbreaves/xkeysnail.git" ];then
+		echo -e "\nreplacing xkeysnail with fork...\n"
+		cd ..
+		rm -rf ./xkeysnail
+		git clone --depth 10 https://github.com/rbreaves/xkeysnail.git
+		cd xkeysnail
+		git checkout kinto
+	fi
 	sudo pip3 install --upgrade .
 	cd ..
 	which xkeysnail
Author	SHA1	Message	Date
Ben Reaves	8fe1bc7772	Added quick Windows installer	2021-04-03 17:40:31 -05:00
Ben Reaves	1ae096daf5	Merge branch 'hotfix'	2021-04-03 03:36:57 -05:00
Ben Reaves	46354a971c	Added git dependency install	2021-04-03 03:36:22 -05:00
Ben Reaves	af6f56d2dc	Merge branch 'hotfix'	2021-04-03 02:26:02 -05:00
Ben Reaves	fbc630f1d5	Updated quick install to pull in release & build correctly	2021-04-03 02:25:30 -05:00
Ben Reaves	e1e9b08442	Update README.md	2021-04-03 01:15:00 -05:00
Ben Reaves	b0ba86623b	Moved pillow dependency to install after pip3 is installed	2021-04-03 01:09:56 -05:00
Ben Reaves	a798b736b6	Merge pull request #456 from rbreaves/feature/setup Quick setup script added for Linux	2021-04-03 00:58:25 -05:00
Ben Reaves	3dc68314f9	Quick setup script added for Linux	2021-04-03 00:56:42 -05:00
Ben Reaves	1529d90918	Fixed breaking some system OS shortcuts w/ Cmd-Dot update on Linux	2021-04-01 01:01:44 -05:00
Ben Reaves	56493b4eec	Merge pull request #441 from RedBearAK/patch-7 Reformat WM_CLASS lists as vertically stacked for easier reading/editing	2021-04-01 00:21:34 -05:00
Ben Reaves	974cd13fae	Merge pull request #448 from rbreaves/feature/cmd-dot-sigint Adds Cmd-Dot sigint to Terminals	2021-04-01 00:18:26 -05:00
Ben Reaves	d8ad4b874f	Added Cmd-Dot for Windows	2021-04-01 00:17:02 -05:00
Ben Reaves	b532a9891d	Updated remotes and terminals groupings for Linux. Adds Cmd-Dot sigint from #442	2021-03-31 23:43:14 -05:00
Ben Reaves	294ba3b89f	Merge pull request #443 from RedBearAK/patch-9 Remove duplicate line for mapping Ctrl+V in terminals	2021-03-31 22:22:54 -05:00
Ben Reaves	c908b00a38	Update README.md	2021-03-30 22:33:41 -05:00
Ben Reaves	56f4f679e4	Update README.md	2021-03-30 21:17:23 -05:00
RedBearAK	ba46c4ff97	Remove duplicate line for mapping Ctrl+V in terminals	2021-03-29 00:35:45 -08:00
RedBearAK	980ae6a237	Mapping Cmd+Dot to Ctrl+C (terminals) and Escape (GUIs)	2021-03-29 00:32:39 -08:00
RedBearAK	1a57dd9a5e	Reformat python lists as vertically stacked for easier reading/editing	2021-03-28 19:31:37 -08:00
Ben Reaves	c9810838a1	Merge pull request #440 from mamercad/browser-prev-next-tab Add shortcuts for browser prev and next tab switching	2021-03-28 20:57:49 -05:00
Mark Mercado	e60f7cffea	Add shortcuts for browser prev and next tab switching	2021-03-28 21:46:45 -04:00
Ben Reaves	c8b169b6a0	Update README.md	2021-03-21 00:34:29 -05:00
Ben Reaves	81c0c52902	Merge pull request #428 from RedBearAK/patch-4 Fix typo	2021-03-18 02:22:59 -07:00
RedBearAK	4d697d9cdc	Fix typo Fixed typo in output, line 65	2021-03-17 19:38:57 -08:00
Ben Reaves	307c9bc2d1	Update README.md	2021-03-16 21:58:00 -05:00
Ben Reaves	7436825c93	Update README.md	2021-03-16 21:57:31 -05:00
Ben Reaves	d680a58d04	Merge pull request #426 from jfsso/fix-win-start-path Fix start script symlink path on Windows install	2021-03-14 10:58:15 -05:00
João Orui	71af27be24	Fix start script symlink path on Windows install Fixes #256	2021-03-14 17:29:40 +09:00
Ben Reaves	2ce4bbdb82	Merge pull request #422 from RedBearAK/patch-2 Fix "toggle maximization state" shortcut for gnome/kde	2021-03-13 03:19:47 -06:00
RedBearAK	085485dcfc	Fix maximize window toggle shortcut for gnome/kde Changed "LC" to "Super" to fix the "toggle maximization state" shortcut. [ K("RC-Super-f"):K("M-F10"), ] Not changing the other three instances, not sure if they need to be changed. (eos, manjaro, manjaro)	2021-03-12 23:47:01 -09:00
Ben Reaves	e7188ca693	Update README.md	2021-03-13 00:21:16 -06:00
Ben Reaves	4cf795619d	- Updated chromebook remap for Backspace combos	2021-03-12 20:52:37 -06:00
Ben Reaves	588fe1a0dc	- Added delete entire line via Cmd-Backspace (Linux)	2021-03-12 20:30:43 -06:00
Ben Reaves	18ae403188	Update README.md	2021-03-12 17:15:53 -06:00
Ben Reaves	de8e674027	Update README.md	2021-03-12 17:14:03 -06:00
Ben Reaves	625f775464	Update README.md	2021-03-12 14:02:00 -06:00
Ben Reaves	4980c4a35e	Merge branch 'hotfix'	2021-03-11 00:06:19 -06:00
Ben Reaves	c09d8b07e4	Merge pull request #414 from RedBearAK/patch-1 Tweak GUI app menu to be more like tray icon menu	2021-03-10 22:02:29 -08:00
Ben Reaves	a34acfb0b5	- Added xfreerdp to Linux	2021-03-10 23:59:34 -06:00
RedBearAK	9f694fd198	Tweak GUI app menu to be more like tray icon menu This tweak moves the "Restart" and "Stop" actions to the top of the File menu in the Kinto.sh GUI. More like the tray icon menu.	2021-03-06 19:03:52 -09:00
Ben Reaves	4349c4f9dd	Merge pull request #412 from m000/patch-1 temporary fix for using kinto with Synergy	2021-03-06 19:44:12 -06:00
Manolis Stamatogiannakis	68395fd91c	temporary fix for using kinto with Synergy If you use kinto and [Synergy](https://symless.com/synergy) at the same time, kinto will apply transformations when Synergy has the focus. This messes up input because the transformed keypresses are consumed by a different desktop. However it is not possible to write a rule to avoid transforming keypresses specifically for Synergy, because Synergy doesn't seem to set the wm_class. The conditional modmap in this commit solves the problem. But it will also affect any other applications not setting the wm_class. For this, the modmap is commented by default, and Synergy users (which shouldn't be too many) need to enable it manually.	2021-03-06 19:33:40 +01:00
Ben Reaves	482de09dcc	- Removed extra spacing on remap comments	2021-02-28 22:29:05 -06:00
Ben Reaves	f075f3a927	Merge branch 'hotfix'	2021-02-26 14:19:27 -06:00
Ben Reaves	00cbd59a4e	- Removed conflict (windows ahk)	2021-02-26 14:17:53 -06:00
Ben Reaves	cbfe1a4141	Merge pull request #407 from rbreaves/hotfix - Added Open File Browser (Windows). Closes #405	2021-02-25 22:24:45 -06:00
Ben Reaves	d44247affb	- Added Open File Browser (Windows). Closes #405	2021-02-25 22:23:23 -06:00
Ben Reaves	4f1adbc358	Merge branch 'hotfix'	2021-02-25 13:25:34 -06:00
Ben Reaves	a362d704c2	- Commented out duplicate hotkey definition	2021-02-25 13:22:42 -06:00
Ben Reaves	6e2631aa3c	Merge pull request #399 from rbreaves/hotfix - Fixes Win key combos on Search key position (Chromebook for Windows)	2021-02-24 20:12:07 -06:00
Ben Reaves	4bcdcdea6a	- Wordwise correctionss, chromebook improvements (RAlt is now Win key)	2021-02-24 20:10:12 -06:00
Ben Reaves	f9d7cba452	Update README.md	2021-02-23 23:57:31 -06:00
Ben Reaves	fb0c476c7f	Update README.md	2021-02-20 20:30:42 -08:00
Ben Reaves	afd7ec47bf	Update README.md	2021-02-19 22:38:59 -06:00
Ben Reaves	6d49644151	- Added in ^C sigint for chromebooks in code editors	2021-02-16 18:24:57 -06:00
Ben Reaves	12efd46dd7	- Fixes Win key combos on Search key position (Chromebook for Windows)	2021-02-15 18:26:40 -06:00