Merge branch 'hotfix'

Merge pull request #414 from RedBearAK/patch-1
Tweak GUI app menu to be more like tray icon menu
2025-08-05 18:38:26 +02:00 · 2021-03-11 00:06:19 -06:00 · 2021-03-10 22:02:29 -08:00 · 2021-03-10 23:59:34 -06:00 · 2021-03-06 19:03:52 -09:00 · 2021-03-06 19:44:12 -06:00
6 changed files with 114 additions and 34 deletions
--- a/README.md
+++ b/README.md
@@ -115,10 +115,12 @@ RDP fully works as long as the entire keyboard input is being captured. RDP had
 |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 +242,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)
--- 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
@@ -17,7 +17,7 @@ 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
@@ -44,6 +44,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 +210,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")
+})

 # Keybindings for Nautilus
 define_keymap(re.compile("org.gnome.nautilus", re.IGNORECASE),{
@@ -212,7 +218,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")
+})

 # Keybindings for Browsers
 define_keymap(re.compile(browserStr, re.IGNORECASE),{
@@ -228,15 +234,15 @@ 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")
+})

 # 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")
+})
 define_keymap(re.compile(chromeStr, re.IGNORECASE),{
    K("C-comma"): [K("M-e"), K("s"),K("Enter")],
-},"Chrome Based Web Browsers")
+})
 # Opera C-F12

 # None referenced here originally
@@ -294,6 +300,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
@@ -314,7 +322,7 @@ define_keymap(lambda wm_class: wm_class.casefold() not in remotes,{
    K("Alt-Delete"): K("C-Delete"),               # Default not-chromebook - Delete Right Word of Cursor
    # K(""): pass_through_key,                      # cancel
    # K(""): K(""),                                 #
-},"General GUI Apps")
+})

 define_keymap(lambda wm_class: wm_class.casefold() not in mscodes,{
    # Wordwise remaining - for Everything but VS Code
@@ -337,7 +345,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")
+})

 # Keybindings for VS Code
 define_keymap(re.compile(codeStr, re.IGNORECASE),{
@@ -366,8 +374,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 +388,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
--- a/setup.py
+++ b/setup.py
@@ -55,11 +55,11 @@ 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...")
--- 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
@@ -244,7 +244,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 +261,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 +337,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 +346,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,6 +361,54 @@ 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
        ; emacs style
@@ -374,6 +426,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 +588,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 +608,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
--- a/xkeysnail_service.sh
+++ b/xkeysnail_service.sh
@@ -470,7 +470,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	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