Adds workaround for Powertoys remapper within RDP. Related #532

Make window maximize toggle shortcut work in terminals too

README.md

@@ -13,6 +13,10 @@ v1.2 Release - Kinto now includes a system tray and simple wizard to setup the i
 
 Kinto is powered by [xkeysnail](https://github.com/mooz/xkeysnail) for Linux & by [Autohotkey](https://github.com/Lexikos/AutoHotkey_L) for Windows 10.
 
+Note: If you plan to remote into Linux via VNC, xRDP, Synergy or other remote desktop solutions then remove the current release, or create a new user, & try an earlier [v1.0.7-3](https://github.com/rbreaves/kinto/releases/tag/1.0.7-3) release. It uses xkb so it'll work with virtual xinput devices. Some v1.1-x releases may offer both, but all v1.2.x releases ended support for xkb. I do plan to bring offical support back for virtual input devices.
+
+Additionally VMware, Virtualbox, KVM and other virtualization technologies work best with the current release - so *this note only applies to remote desktop into Linux* - not virtualization.
+
 ### [Table of Contents ](#Table-of-Contents)
 
 ## Donations
@@ -36,12 +40,12 @@ Video Tutorial: [Install Kinto.sh for Linux in less than a minute](https://www.y
 
 Paste the following into your Terminal
 ```
-/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/rbreaves/kinto/HEAD/install/linux.sh)"
+/bin/bash -c "$(wget -qO- https://raw.githubusercontent.com/rbreaves/kinto/HEAD/install/linux.sh || curl -fsSL https://raw.githubusercontent.com/rbreaves/kinto/HEAD/install/linux.sh)"
 ```
 
 Uninstall
 ```
-/bin/bash <( curl https://raw.githubusercontent.com/rbreaves/kinto/HEAD/install/linux.sh ) -r
+/bin/bash <( wget -qO- https://raw.githubusercontent.com/rbreaves/kinto/HEAD/install/linux.sh || curl -fsSL https://raw.githubusercontent.com/rbreaves/kinto/HEAD/install/linux.sh ) -r
 ```
 
 ### Old Install Method
@@ -76,7 +80,7 @@ Try toggling numlock on & off (clear key on official mac keyboards). If it still
 If you want a global menu app similar to what mac users have then I strongly recommend Ubuntu Budgie as it has the Vala Appmenu built in and ready for activation. Short of that Vala-AppMenu can be installed in various distros, mileage will vary. If you try to activate it in the latest 20.xx releases with XFCE then you may need to run the following commands.
 
 ```
-sudo apt install xfce4-appmenu-plugin vala-panel-appmenu-common
+sudo apt install xfce4-appmenu-plugin vala-panel-appmenu-common appmenu-gtk2-module appmenu-gtk3-module appmenu-gtk-module-common
 xfconf-query -c xsettings -p /Gtk/Modules -n -t string -s "appmenu-gtk-module"
 ```
 
@@ -140,6 +144,7 @@ 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 ⇒| 🐧Linux  | ✅ Yes| Note: [v1.0.7-3 Only](https://github.com/rbreaves/kinto/releases/tag/1.0.7-3). Should work for xRDP/VNC and other remote server protocols.  |
 |Official MS RDP (mstsc.exe)| ❖Windows ⇒| ❖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"|
@@ -252,7 +257,7 @@ Additionally, if you are using a cross-platform app and if it happens to have a
 ## What does Kinto require?
 
 - Python
-- systemd
+- systemd or sysvinit
 - x11
 - xkeysnail
 
@@ -310,10 +315,16 @@ In the above example I am also showing that you can define a single shortcut to
 
 You can also make changes to the file in your /tmp/kinto/xkeysnail/kinto.py location and see them take affect in real time, but for your changes to be permanent you will need to make your changes in the ~/.config/kinto/kinto.py location & restart the xkeysnail service.
 
+systemd
 ```
 sudo systemctl restart xkeysnail
 ```
 
+sysvinit
+```
+sudo -E /etc/init.d/kinto restart
+```
+
 More information can be seen on the readme page of [xkeysnail](https://github.com/mooz/xkeysnail).
 
 ## Windows (Autohotkey)
@@ -375,25 +386,53 @@ git pull origin master
 This info is now superceded by the fact that linux has a full fledge GUI and system tray app that is very easy to use, but I will keep the command line options for those that want to know what they are.
 
 Status
+
+systemd
 ```
 sudo systemctl status xkeysnail
 ```
 
+sysvinit
+```
+tail -f /tmp/kinto.log
+```
+
 Stop (your keymap will return to normal)
+
+systemd
 ```
 sudo systemctl stop xkeysnail
 ```
 
+sysvinit
+```
+sudo -E /etc/init.d/kinto stop
+```
+
 Start
+
+systemd
 ```
 sudo systemctl start xkeysnail
 ```
 
+sysvinit
+```
+sudo -E /etc/init.d/kinto start
+```
+
 Restart
+
+systemd
 ```
 sudo systemctl restart xkeysnail
 ```
 
+sysvinit
+```
+sudo -E /etc/init.d/kinto restart
+```
+
 ## Troubleshooting
 
 ### Installed successfully, but modifier keys are not properly remapped?

install/linux.sh

@@ -2,11 +2,11 @@
 
 # /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
+wget https://github.com/rbreaves/kinto/archive/refs/heads/master.zip -O ~/Downloads/kinto.zip || 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 \",`
+kintorelease=`wget -qO- https://api.github.com/repos/rbreaves/kinto/releases/latest | awk -F'tag_name": ' '{if ($2) print $2}' | tr -d \", || 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}
 

linux/gui/kinto-gui.py

@@ -1,6 +1,8 @@
 #!/usr/bin/env python3
 
 import gi,os,time,fcntl,argparse,re
+import warnings
+warnings.filterwarnings("ignore")
 gi.require_version('Gtk', '3.0')
 gi.require_version('Vte', '2.91')
 from gi.repository import Gtk,Gdk,GdkPixbuf
@@ -48,12 +50,20 @@ class MyWindow(Gtk.Window):
     page = 1
 
     label = Gtk.Label()
-    label.set_alignment(1, 0)
+    label.set_halign(Gtk.Align.END)
     ostype = os.environ.get('XDG_CURRENT_DESKTOP')
     global openWin
     openWin = False
 
     global child_pid
+    global sysv
+    try:
+        sysv = int(Popen("pidof systemd >/dev/null 2>&1 && echo '0' || echo '1'", stdout=PIPE, shell=True).communicate()[0].strip().decode('UTF-8'))
+    except:
+        sysv = 2
+    if sysv:
+        kinto_status = Popen("while :; do clear; pgrep 'xkeysnail' && echo 'active'; sleep 2; done", stdout=PIPE, shell=True)
+    else:
         kinto_status = Popen("while :; do clear; systemctl is-active xkeysnail; sleep 2; done", stdout=PIPE, shell=True)
     child_pid = kinto_status.pid
 
@@ -114,7 +124,13 @@ class MyWindow(Gtk.Window):
             None,
         )
         if self.args.debug:
+            if sysv:
+                self.command = 'sudo /etc/init.d/kinto stop && sudo pkill -f bin/xkeysnail && sudo xkeysnail ~/.config/kinto/kinto.py\n'
+            else:
                 self.command = 'sudo systemctl stop xkeysnail && sudo pkill -f bin/xkeysnail && sudo xkeysnail ~/.config/kinto/kinto.py\n'
+        else:
+            if sysv:
+                self.command = "tail -f /tmp/kinto.log\n"
             else:
                 self.command = "journalctl -f --unit=xkeysnail.service -b\n"
         
@@ -181,19 +197,19 @@ class MyWindow(Gtk.Window):
         menubar.append(menuitem_edit)
         submenu_edit = Gtk.Menu()
         menuitem_edit.set_submenu(submenu_edit)
-        edititem_tweaks = Gtk.MenuItem("Tweaks")
+        edititem_tweaks = Gtk.MenuItem(label="Tweaks")
         edititem_tweaks.connect('activate',self.setTweaks)
         submenu_edit.append(edititem_tweaks)
-        edititem_config = Gtk.MenuItem("Kinto Config (shortcuts)")
+        edititem_config = Gtk.MenuItem(label="Kinto Config (shortcuts)")
         edititem_config.connect('activate',self.setConfig)
         submenu_edit.append(edititem_config)
-        edititem_service = Gtk.MenuItem("Kinto Service")
+        edititem_service = Gtk.MenuItem(label="Kinto Service")
         edititem_service.connect('activate',self.setService)
         submenu_edit.append(edititem_service)
-        edititem_shortcuts = Gtk.MenuItem("System Shortcuts")
+        edititem_shortcuts = Gtk.MenuItem(label="System Shortcuts")
         edititem_shortcuts.connect('activate',self.setSysKB)
         submenu_edit.append(edititem_shortcuts)
-        edititem_language = Gtk.MenuItem("Change Language")
+        edititem_language = Gtk.MenuItem(label="Change Language")
         edititem_language.connect('activate',self.setRegion)
         submenu_edit.append(edititem_language)
 
@@ -207,11 +223,11 @@ class MyWindow(Gtk.Window):
         helpitem_debug = Gtk.MenuItem(label="Debug")
         helpitem_debug.connect('activate',self.runDebug)
         submenu_help.append(helpitem_debug)
-        helpitem_support = Gtk.MenuItem("Support")
+        helpitem_support = Gtk.MenuItem(label="Support")
         helpitem_support.connect('activate',self.openSupport)
         submenu_help.append(helpitem_support)
         menuitem_help.set_submenu(submenu_help)
-        helpitem_about = Gtk.MenuItem("About")
+        helpitem_about = Gtk.MenuItem(label="About")
         helpitem_about.connect('activate',self.runAbout)
         submenu_help.append(helpitem_about)
 
@@ -344,7 +360,6 @@ class MyWindow(Gtk.Window):
 
         restartsvc = True
     
-    
     def initSetup(self):
         global win,openWin,restartsvc
         
@@ -420,21 +435,20 @@ class MyWindow(Gtk.Window):
             pixbuf = GdkPixbuf.Pixbuf.new_from_file(os.environ['HOME']+'/.config/kinto/gui/tuxcry4.png')
             pixbuf = pixbuf.scale_simple(600, 360, GdkPixbuf.InterpType.BILINEAR)
             self.bgsuccess4 = self.bgsuccess4.new_from_pixbuf(pixbuf)
-            self.bgsuccess4.set_alignment(0, 1)
+            self.bgsuccess4.set_valign(Gtk.Align.END)
 
             pixbuf = GdkPixbuf.Pixbuf.new_from_file(os.environ['HOME']+'/.config/kinto/gui/tuxuninstall.png')
             pixbuf = pixbuf.scale_simple(600, 360, GdkPixbuf.InterpType.BILINEAR)
             self.bguninstall = self.bguninstall.new_from_pixbuf(pixbuf)
-            self.bguninstall.set_alignment(0, 1)
+            self.bguninstall.set_valign(Gtk.Align.END)
 
             pixbuf = GdkPixbuf.Pixbuf.new_from_file(os.environ['HOME']+'/.config/kinto/gui/tuxbg.png')
             pixbuf = pixbuf.scale_simple(600, 360, GdkPixbuf.InterpType.BILINEAR)
             self.background = self.background.new_from_pixbuf(pixbuf)
-            self.background.set_alignment(0, 1)
+            self.background.set_valign(Gtk.Align.END)
             self.bgcaps = self.bgcaps.new_from_pixbuf(pixbuf2)
-            self.bgcaps.set_alignment(0, 1)
             self.bgspace = self.bgspace.new_from_pixbuf(pixbuf3)
-            self.bgspace.set_alignment(0, 1)
+            self.bgspace.set_valign(Gtk.Align.END)
             self.overlay.add(self.background)
             self.overlay.add_overlay(self.container)
             self.setupwin.add(self.container)
@@ -456,7 +470,7 @@ class MyWindow(Gtk.Window):
     def image2pixbuf(self,im):
         data = im.tobytes()
         w, h = im.size
-        print(im.size)
+        # print(im.size)
         data = GLib.Bytes.new(data)
         pix = GdkPixbuf.Pixbuf.new_from_bytes(data, GdkPixbuf.Colorspace.RGB,True, 8, w, h, w * 4)
         return pix
@@ -517,6 +531,9 @@ class MyWindow(Gtk.Window):
         return
 
     def runDebug(self,button):
+        if sysv:
+            command = 'send \003 sudo /etc/init.d/kinto stop && sudo pkill -f bin/xkeysnail && sudo xkeysnail ~/.config/kinto/kinto.py\n'
+        else:
             command = 'send \003 sudo systemctl stop xkeysnail && sudo pkill -f bin/xkeysnail && sudo xkeysnail ~/.config/kinto/kinto.py\n'
         self.InputToTerm(command)
 
@@ -610,7 +627,10 @@ class MyWindow(Gtk.Window):
             self.queryConfig(killspawn)
             time.sleep(1)
             global child_pid
-            self.kinto_status = Popen("while :; do clear; systemctl is-active xkeysnail; sleep 2; done", stdout=PIPE, shell=True)
+            if sysv:
+                self.kinto_status = Popen("export TERM=xterm-color;while :; do clear; pgrep 'xkeysnail'; sleep 2; done", stdout=PIPE, shell=True)
+            else:
+                self.kinto_status = Popen("export TERM=xterm-color;while :; do clear; systemctl is-active xkeysnail; sleep 2; done", stdout=PIPE, shell=True)
             child_pid = self.kinto_status.pid
             self.menuitem_systray.disconnect(self.menuitem_systray.signal_id)
             self.menuitem_systray.set_active(False)
@@ -618,6 +638,7 @@ class MyWindow(Gtk.Window):
         return
 
     def setKB(self,button,kbtype):
+        global sysv
         try:
             if kbtype == "win":
                 setkb = 's/^(\s{3})(\s{1}#)(.*# WinMac.*)|^(?!\s{4}#)(\s{3})(\s{1})(.*)( # )(Mac.*)|^(?!\s{4}#)(\s{3})(\s{1})(.*)( # )(IBM.*)|^(?!\s{4}#)(\s{3})(\s{1})(.*)( # )(Chromebook.*)|^(\s{3})(\s{1}# )(-)( Default Win)|^(\s{3})(\s{1}# )(-)(- Default Mac*)/   $3$7$6$7$8$12$11$12$13$17$16$17$18$20$21$21$22$24$26/g'
@@ -654,6 +675,9 @@ class MyWindow(Gtk.Window):
             elif kbtype == "ibm":
                 setkb ='s/^(\s{3})(\s{1}#)(.*# IBM.*)|^(?!\s{4}#)(\s{3})(\s{1})(.*)( # )(WinMac.*)|^(?!\s{4}#)(\s{3})(\s{1})(.*)( # )(Mac.*)|^(?!\s{4}#)(\s{3})(\s{1})(.*)( # )(Chromebook.*)|^(\s{3})(\s{1}# )(-)(- Default (Win|Mac.*))/   $3$7$6$7$8$12$11$12$13$17$16$17$18$20$22/g'
 
+            if sysv:
+                restart = ['sudo', '-E','/etc/init.d/kinto','restart']
+            else:
                 restart = ['sudo', 'systemctl','restart','xkeysnail']
             cmds = ['perl','-pi','-e',setkb,self.kconfig]
 
@@ -746,10 +770,13 @@ class MyWindow(Gtk.Window):
     }
 
     def on_delete_event(event, self, widget):
-        global restartsvc, openWin
+        global restartsvc, openWin, sysv
         
         if restartsvc == True:
             try:
+                if sysv:
+                    restartcmd = ['sudo', '-E','/etc/init.d/kinto','restart']
+                else:
                     restartcmd = ['sudo', 'systemctl','restart','xkeysnail']
                 Popen(restartcmd)
                 restartsvc = False
@@ -870,7 +897,11 @@ class MyWindow(Gtk.Window):
         return
 
     def runRestart(self,button):
+        global sysv
         try:
+            if sysv:
+                stop = Popen(['sudo', '-E','/etc/init.d/kinto','stop'])
+            else:
                 stop = Popen(['sudo', 'systemctl','stop','xkeysnail'])
             stop.wait()
             time.sleep(1)
@@ -880,14 +911,22 @@ class MyWindow(Gtk.Window):
             if res.returncode == 0:
                 pkillxkey = Popen(['sudo', 'pkill','-f','bin/xkeysnail'])
                 pkillxkey.wait()
-            Popen(['sudo', 'systemctl','start','xkeysnail'])
+            if sysv:
+                Popen(['sudo','-E','/etc/init.d/kinto','start'])
+                self.command = "send \003 tail -f /tmp/kinto.log\n"
+            else:
+                Popen(['sudo','systemctl','start','xkeysnail'])
                 self.command = "send \003 journalctl -f --unit=xkeysnail.service -b\n"
             self.InputToTerm(self.command)
         except:
             Popen(['notify-send','Kinto: Errror restarting Kinto!'])
 
     def runStop(self,button):
+        global sysv
         try:
+            if sysv:
+                stop = Popen(['sudo', '-E','/etc/init.d/kinto','stop'])
+            else:
                 stop = Popen(['sudo', 'systemctl','stop','xkeysnail'])
             stop.wait()
             time.sleep(1)
@@ -1077,7 +1116,7 @@ class MyWindow(Gtk.Window):
             except:
                 pass
 
-        print(Vte.get_minor_version())
+        # print(Vte.get_minor_version())
 
     # def on_menu_auto(self, widget):
     #     print("add file open dialog")
@@ -1106,34 +1145,36 @@ class UninstallPage(Gtk.Box):
 
         label_start = Gtk.Label()
         label_start.set_markup('<b>Uninstall</b>\n\n\n\nWould you like to uninstall kinto?\n\n If you need support please visit <a href="http://kinto.sh">kinto.sh</a>.')
-        label_start.set_alignment(0,0)
+        label_start.set_valign(Gtk.Align.START)
+        label_start.set_halign(Gtk.Align.START)
+
         label_start.set_line_wrap(True)
         vbox.add(label_start)
         scroller.add(vbox)
 
         hbox = Gtk.HBox()
-        previous = Gtk.Button("Uninstall")
+        previous = Gtk.Button(label="Uninstall")
         previous.connect("clicked", self.goback)
-        previous.set_margin_right(206)
+        previous.set_margin_end(206)
         hbox.add(previous)
 
-        onward = Gtk.Button("Continue")
+        onward = Gtk.Button(label="Continue")
         onward.connect("clicked", self.forward)
         hbox.add(onward)
 
         hbox.set_hexpand(False)
         hbox.set_vexpand(False)
         hbox.set_margin_bottom(6)
-        hbox.set_margin_right(25)
+        hbox.set_margin_end(25)
 
         scroller.set_hexpand(True)
         scroller.set_vexpand(True)
         vbox_container.add(scroller)
         vbox_container.set_margin_top(55)
-        vbox_container.set_margin_right(25)
+        vbox_container.set_margin_end(25)
-        self.grid.set_margin_left(157)
+        self.grid.set_margin_start(157)
         vbox_container.set_margin_bottom(18)
-        vbox.set_margin_right(10)
+        vbox.set_margin_end(10)
         vbox.set_margin_bottom(18)
         self.grid.add(vbox_container)
         self.grid.attach_next_to(hbox, vbox_container, Gtk.PositionType.BOTTOM, 2, 1)
@@ -1165,18 +1206,19 @@ class FirstPage(Gtk.Box):
 
         label_start = Gtk.Label()
         label_start.set_markup("Before we continue please make sure you do not have any other remappers running. Kinto works best when it is the only application remapping your keys.\n\nBy continuing you also agree that Kinto is not held liable for any harm, damage(s) or unexpected behaviors.\nThis software is free, open-source, and provided as-is.\n\n<sup><b>© 2019, 2020 by Ben Reaves ~ Kinto is licensed on GPLv2.</b></sup>")
-        label_start.set_alignment(0,0)
+        label_start.set_valign(Gtk.Align.START)
+        label_start.set_halign(Gtk.Align.START)
         label_start.set_line_wrap(True)
         vbox.add(label_start)
         scroller.add(vbox)
 
         hbox = Gtk.HBox()
-        previous = Gtk.Button("")
+        previous = Gtk.Button(label="")
         for child in previous.get_children():
             child.set_label("<b>Decline</b>")
             child.set_use_markup(True)
         previous.connect("clicked", self.goback)
-        previous.set_margin_right(245)
+        previous.set_margin_end(245)
         hbox.add(previous)
 
         self.__parent_window.first_onward.set_label("")
@@ -1190,16 +1232,16 @@ class FirstPage(Gtk.Box):
         hbox.set_hexpand(False)
         hbox.set_vexpand(False)
         hbox.set_margin_bottom(6)
-        hbox.set_margin_right(25)
+        hbox.set_margin_end(25)
 
         scroller.set_hexpand(True)
         scroller.set_vexpand(True)
         vbox_container.add(scroller)
         vbox_container.set_margin_top(55)
-        vbox_container.set_margin_right(28)
+        vbox_container.set_margin_end(28)
-        self.grid.set_margin_left(157)
+        self.grid.set_margin_start(157)
         vbox_container.set_margin_bottom(18)
-        vbox.set_margin_right(10)
+        vbox.set_margin_end(10)
         vbox.set_margin_bottom(18)
         self.grid.add(vbox_container)
         self.grid.attach_next_to(hbox, vbox_container, Gtk.PositionType.BOTTOM, 2, 1)
@@ -1238,37 +1280,38 @@ class SecondPage(Gtk.Box):
         label_start = Gtk.Label()
         
         label_start.set_markup('<b>Identifying your Keyboard...</b>\n\nPress the <b>2nd</b> key <b>Left</b> of the spacebar.\n\n<sub>If stuck here then unset Overlay (Super) key on your DE.</sub>')
-        label_start.set_alignment(0,0)
+        label_start.set_valign(Gtk.Align.START)
+        label_start.set_halign(Gtk.Align.START)
         label_start.set_line_wrap(True)
         vbox.add(label_start)
         scroller.add(vbox)
 
         hbox = Gtk.HBox()
-        previous = Gtk.Button("")
+        previous = Gtk.Button(label="")
         for child in previous.get_children():
             child.set_label("<b>Go Back</b>")
             child.set_use_markup(True)
         previous.connect("clicked", self.goback)
-        previous.set_margin_right(315)
+        previous.set_margin_end(315)
         hbox.add(previous)
 
-        # onward = Gtk.Button("Continue")
+        # onward = Gtk.Button(label="Continue")
         # onward.connect("clicked", self.forward)
         # hbox.add(onward)
 
         hbox.set_hexpand(False)
         hbox.set_vexpand(False)
         hbox.set_margin_bottom(6)
-        hbox.set_margin_right(25)
+        hbox.set_margin_end(25)
 
         scroller.set_hexpand(True)
         scroller.set_vexpand(True)
         vbox_container.add(scroller)
         vbox_container.set_margin_top(55)
-        vbox_container.set_margin_right(25)
+        vbox_container.set_margin_end(25)
-        self.grid.set_margin_left(157)
+        self.grid.set_margin_start(157)
         vbox_container.set_margin_bottom(18)
-        vbox.set_margin_right(10)
+        vbox.set_margin_end(10)
         vbox.set_margin_bottom(18)
         self.grid.add(vbox_container)
         self.grid.attach_next_to(hbox, vbox_container, Gtk.PositionType.BOTTOM, 2, 1)
@@ -1322,37 +1365,38 @@ class CapsPage(Gtk.Box):
 
         label_start = Gtk.Label()
         label_start.set_markup('<b>Identifying your Keyboard...</b>\n\nPress the <b>capslock</b> key twice.')
-        label_start.set_alignment(0,0)
+        label_start.set_valign(Gtk.Align.START)
+        label_start.set_halign(Gtk.Align.START)
         label_start.set_line_wrap(True)
         vbox.add(label_start)
         scroller.add(vbox)
 
         hbox = Gtk.HBox()
-        previous = Gtk.Button("")
+        previous = Gtk.Button(label="")
         for child in previous.get_children():
             child.set_label("<b>Go Back</b>")
             child.set_use_markup(True)
         previous.connect("clicked", self.goback)
-        previous.set_margin_right(315)
+        previous.set_margin_end(315)
         hbox.add(previous)
 
-        # onward = Gtk.Button("Continue")
+        # onward = Gtk.Button(label="Continue")
         # onward.connect("clicked", self.forward)
         # hbox.add(onward)
 
         hbox.set_hexpand(False)
         hbox.set_vexpand(False)
         hbox.set_margin_bottom(6)
-        hbox.set_margin_right(25)
+        hbox.set_margin_end(25)
 
         scroller.set_hexpand(True)
         scroller.set_vexpand(True)
         vbox_container.add(scroller)
         vbox_container.set_margin_top(55)
-        vbox_container.set_margin_right(25)
+        vbox_container.set_margin_end(25)
-        self.grid.set_margin_left(157)
+        self.grid.set_margin_start(157)
         vbox_container.set_margin_bottom(18)
-        vbox.set_margin_right(10)
+        vbox.set_margin_end(10)
         vbox.set_margin_bottom(18)
         self.grid.add(vbox_container)
         self.grid.attach_next_to(hbox, vbox_container, Gtk.PositionType.BOTTOM, 2, 1)
@@ -1389,9 +1433,9 @@ class SuccessPage(Gtk.Box):
         self.grid = Gtk.Grid()
 
         hbox = Gtk.HBox()
-        previous = Gtk.Button("       ")
+        previous = Gtk.Button(label="       ")
         previous.props.relief = Gtk.ReliefStyle.NONE
-        previous.set_margin_right(245)
+        previous.set_margin_end(245)
         hbox.add(previous)
 
         self.__parent_window.last_onward.set_label("")
@@ -1404,7 +1448,7 @@ class SuccessPage(Gtk.Box):
         hbox.set_hexpand(False)
         hbox.set_vexpand(False)
         hbox.set_margin_bottom(6)
-        hbox.set_margin_right(25)
+        hbox.set_margin_end(25)
 
         scroller = Gtk.ScrolledWindow()
         scroller.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.NEVER)
@@ -1413,11 +1457,11 @@ class SuccessPage(Gtk.Box):
         vbox = Gtk.VBox()
         vbox_container = Gtk.VBox()
         vbox_container.set_margin_top(55)
-        vbox_container.set_margin_right(28)
+        vbox_container.set_margin_end(28)
         vbox_container.add(scroller)
-        self.grid.set_margin_left(157)
+        self.grid.set_margin_start(157)
         vbox_container.set_margin_bottom(18)
-        vbox.set_margin_right(10)
+        vbox.set_margin_end(10)
         vbox.set_margin_bottom(18)
         self.grid.add(vbox_container)
         self.grid.attach_next_to(hbox, vbox_container, Gtk.PositionType.BOTTOM, 2, 1)

linux/kinto-service.sh

@@ -0,0 +1,57 @@
+#!/bin/bash
+#
+# chkconfig: 35 90 12
+# description: Kinto service
+#
+
+# Get function from functions library
+# . /etc/init.d/functions
+
+# Start the service
+start() {
+        echo -n "Starting Kinto (xkeynsail)" | logger
+        xkeycount=$(pgrep 'xkeysnail' | wc -l)
+
+        if [[ $xkeycount -eq 0 ]]; then
+            /usr/bin/xhost +SI:localuser:root && script -q -c "xkeysnail --quiet --watch `echo $HOME`/.config/kinto/kinto.py" /dev/null | tee -a /tmp/kinto.log &
+            ### Create the lock file ###
+            touch /var/lock/subsys/kinto
+            success $"Kinto (xkeynsail) started"
+        else
+            echo "Kinto (xkeynsail) service is already running."
+        fi
+        
+        echo
+}
+
+# Restart the service
+stop() {
+        echo -n "Stopping Kinto (xkeynsail)" | logger
+        sudo pkill -f bin/xkeysnail >/dev/null 2>&1
+        ### Now, delete the lock file ###
+        rm -f /var/lock/subsys/kinto
+        echo
+}
+
+### main logic ###
+case "$1" in
+  start)
+        start
+        ;;
+  stop)
+        stop
+        ;;
+  status)
+        status
+        ;;
+  restart|reload|condrestart)
+        stop
+        sleep 5
+        start
+        ;;
+  *)
+        echo $"Usage: $0 {start|stop|restart|reload|status}"
+        exit 1
+esac
+
+exit 0

linux/kinto.py

@@ -21,24 +21,33 @@ terminals = [
     "lxterminal",
     "mate-terminal",
     "qterminal",
+    "st",
     "sakura",
+    "station",
     "terminator",
+    "termite",
     "tilda",
     "tilix",
+    "urxvt",
     "xfce4-terminal",
     "xterm",
 ]
 terminals = [term.casefold() for term in terminals]
-termStr = "|".join(str(x) for x in terminals)
+termStr = "|".join(str('^'+x+'$') for x in terminals)
 
 mscodes = ["code","vscodium"]
-codeStr = "|".join(str(x) for x in mscodes)
+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 = [
+    "Gnome-boxes",
     "org.remmina.Remmina",
+    "qemu-system-.*",
+    "Virt-manager",
+    "VirtualBox",
+    "VirtualBox Machine",
     "xfreerdp",
 ]
 remotes = [client.casefold() for client in remotes]
@@ -59,7 +68,7 @@ browsers = [
     "microsoft-edge-dev",
 ]
 browsers = [browser.casefold() for browser in browsers]
-browserStr = "|".join(str(x) for x in browsers)
+browserStr = "|".join(str('^'+x+'$') for x in browsers)
 
 chromes = [
     "Chromium",
@@ -69,11 +78,11 @@ chromes = [
     "microsoft-edge-dev",
 ]
 chromes = [chrome.casefold() for chrome in chromes]
-chromeStr = "|".join(str(x) for x in chromes)
+chromeStr = "|".join(str('^'+x+'$') for x in chromes)
 
 # edges = ["microsoft-edge-dev","microsoft-edge"]
 # edges = [edge.casefold() for edge in edges]
-# edgeStr = "|".join(str(x) for x in edges)
+# edgeStr = "|".join(str('^'+x+'$') for x in edges)
 
 define_multipurpose_modmap(
     # {Key.ENTER: [Key.ENTER, Key.RIGHT_CTRL]   # Enter2Cmd
@@ -264,20 +273,21 @@ define_keymap(re.compile("caja", re.IGNORECASE),{
 # (overrides some bindings from general file manager code block below)
 define_keymap(re.compile("dde-file-manager", re.IGNORECASE),{
     K("RC-i"): K("RC-i"),                   # File properties dialog (Get Info)
-    K("RC-comma"): K("RC-comma"),       # Open preferences dialog (doesn't work, no shortcut available?)
+    K("RC-comma"): None,                    # Disable preferences shortcut (no shortcut available)
     K("RC-Up"): K("RC-Up"),                 # Go Up dir
 },"Overrides for DDE File Manager - Finder")
 
 # Keybindings overrides for Dolphin
 # (overrides some bindings from general file manager code block below)
 define_keymap(re.compile("dolphin", re.IGNORECASE),{
-    K("RC-Super-o"): K("RC-Shift-o"), # Open in new window (or new tab, user's choice)
+    ##########################################################################################
-    # "Open in new window" requires manually setting custom shortcut of Ctrl+Shift+o 
+    ### "Open in new window" requires manually setting custom shortcut of Ctrl+Shift+o
-    # in Dolphin's keyboard shortcuts. There is no default shortcut set for this function.
+    ### in Dolphin's keyboard shortcuts. There is no default shortcut set for this function.
-    ### 
+    ##########################################################################################
-    # "Open in new tab" requires manually setting custom shortcut of Ctrl+Shift+o in 
+    ### "Open in new tab" requires manually setting custom shortcut of Ctrl+Shift+o in
-    # Dolphin's keyboard shortcuts. There is no default shortcut set for this function. 
+    ### Dolphin's keyboard shortcuts. There is no default shortcut set for this function.
-    ### 
+    ##########################################################################################
+    K("RC-Super-o"): K("RC-Shift-o"),           # Open in new window (or new tab, user's choice, see above)
     K("RC-Shift-N"): K("F10"),                  # Create new folder
     K("RC-comma"): K("RC-Shift-comma"),         # Open preferences dialog
 },"Overrides for Dolphin - Finder")
@@ -286,7 +296,7 @@ define_keymap(re.compile("dolphin", re.IGNORECASE),{
 # (overrides some bindings from general file manager code block below)
 define_keymap(re.compile("io.elementary.files", re.IGNORECASE),{
     # K("RC-Super-o"): K("Shift-Enter"),          # Open folder in new tab
-    K("RC-Comma"): None,                        # Disable preferences shortcut since none availabe
+    K("RC-Comma"): None,                        # Disable preferences shortcut since none available
 },"Overrides for Pantheon - Finder")
 
 # Keybindings overrides for Nautilus
@@ -297,9 +307,9 @@ define_keymap(re.compile("org.gnome.nautilus|nautilus", re.IGNORECASE),{
     K("RC-comma"): K("RC-comma"),               # Overrides "Open preferences dialog" shortcut below
 },"Overrides for Nautilus - Finder")
 
-# Keybindings overrides for PCManFM 
+# Keybindings overrides for PCManFM and PCManFM-Qt
 # (overrides some bindings from general file manager code block below)
-define_keymap(re.compile("pcmanfm", re.IGNORECASE),{
+define_keymap(re.compile("pcmanfm|pcmanfm-qt", re.IGNORECASE),{
     K("RC-Backspace"): [K("Delete"),K("Enter")],    # Move to Trash (delete, bypass dialog)
 },"Overrides for PCManFM - Finder")
 
@@ -334,7 +344,7 @@ filemanagers = [
     "thunar",
 ]
 filemanagers = [filemanager.casefold() for filemanager in filemanagers]
-filemanagerStr = "|".join(str(x) for x in filemanagers)
+filemanagerStr = "|".join(str('^'+x+'$') for x in filemanagers)
 
 # Currently supported Linux file managers (file browsers):
 #
@@ -431,11 +441,13 @@ define_keymap(lambda wm_class: wm_class.casefold() not in remotes,{
     # K("Super-Left"):K("C-M-Left"),                # Default SL - Change workspace (budgie)
     K("RC-Q"): K("M-F4"),                         # Default SL - not-popos
     K("RC-H"):K("Super-h"),                       # Default SL - Minimize app (gnome/budgie/popos/fedora)
-    K("M-Tab"): pass_through_key,                 # Default not-xfce4 - Cmd Tab - App Switching Default
+    K("M-Tab"): pass_through_key,                 # Default - Cmd Tab - App Switching Default
-    K("RC-Tab"): K("M-Tab"),                      # Default not-xfce4 - Cmd Tab - App Switching Default
+    K("RC-Tab"): K("M-Tab"),                      # Default - Cmd Tab - App Switching Default
-    K("RC-Shift-Tab"): K("M-Shift-Tab"),          # Default not-xfce4 - Cmd Tab - App Switching Default
+    K("RC-Shift-Tab"): K("M-Shift-Tab"),          # Default - Cmd Tab - App Switching Default
     K("RC-Grave"): K("M-Grave"),                  # Default not-xfce4 - Cmd ` - Same App Switching
     K("RC-Shift-Grave"): K("M-Shift-Grave"),      # Default not-xfce4 - Cmd ` - Same App Switching
+    # K("RC-Grave"): K("Super-Tab"),                # xfce4 Switch within app group
+    # K("RC-Shift-Grave"): K("Super-Shift-Tab"),    # xfce4 Switch within app group
     # K("Super-Right"):K("Super-Page_Up"),          # SL - Change workspace (ubuntu/fedora)
     # K("Super-Left"):K("Super-Page_Down"),         # SL - Change workspace (ubuntu/fedora)
     # K("Super-Right"):K("Super-C-Up"),             # SL - Change workspace (popos)
@@ -451,10 +463,6 @@ define_keymap(lambda wm_class: wm_class.casefold() not in remotes,{
     # Basic App hotkey functions
     # K("RC-H"):K("M-F9"),                          # SL - Minimize app xfce4
     # K("RC-LC-f"):K("Super-PAGE_DOWN"),            # SL - Minimize app manjaro
-    # Cmd Tab - App Switching Default
-    # 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/IBM - In-App Tab switching
     # K("M-Shift-Tab"): K("C-Shift-Tab"),           # Chromebook/IBM - In-App Tab switching
@@ -650,6 +658,9 @@ define_keymap(re.compile("Io.elementary.terminal|kitty", re.IGNORECASE),{
 }, "Elementary Terminal tab switching")
 
 define_keymap(re.compile(termStr, re.IGNORECASE),{
+    K("LC-RC-f"): K("M-F10"),                       # Toggle window maximized state
+    # K("RC-Grave"): K("Super-Tab"),                # xfce4 Switch within app group
+    # K("RC-Shift-Grave"): K("Super-Shift-Tab"),    # xfce4 Switch within app group
     # K("LC-Right"):K("C-M-Right"),                 # Default SL - Change workspace (budgie)
     # K("LC-Left"):K("C-M-Left"),                   # Default SL - Change workspace (budgie)
     # K("LC-Left"):K("C-M-End"),                    # SL - Change workspace xfce4
@@ -664,15 +675,11 @@ define_keymap(re.compile(termStr, re.IGNORECASE),{
     K("LC-Tab") : K("LC-PAGE_DOWN"),
     K("LC-Shift-Tab") : K("LC-PAGE_UP"),
     K("LC-Grave") : K("LC-PAGE_UP"),
-    # K("M-Tab"): pass_through_key,                 # Default not-xfce4 - Cmd Tab - App Switching Default
+    # K("M-Tab"): pass_through_key,                 # Default - Cmd Tab - App Switching Default
-    # K("RC-Tab"): K("M-Tab"),                      # Default not-xfce4 - Cmd Tab - App Switching Default
+    # K("RC-Tab"): K("M-Tab"),                      # Default - Cmd Tab - App Switching Default
-    # K("RC-Shift-Tab"): K("M-Shift-Tab"),          # Default not-xfce4 - Cmd Tab - App Switching Default
+    # K("RC-Shift-Tab"): K("M-Shift-Tab"),          # Default - Cmd Tab - App Switching Default
-    # Cmd Tab - App Switching Default
-    # K("RC-Tab"): K("RC-backslash"),               # xfce4
-    # 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-MINUS"): K("C-Shift-MINUS"),
+    K("RC-MINUS"): K("C-MINUS"),
     K("RC-EQUAL"): K("C-Shift-EQUAL"),
     K("RC-BACKSPACE"): K("C-Shift-BACKSPACE"),
     K("RC-W"): K("C-Shift-W"),
@@ -698,7 +705,6 @@ define_keymap(re.compile(termStr, re.IGNORECASE),{
     K("RC-SEMICOLON"): K("C-Shift-SEMICOLON"),
     K("RC-APOSTROPHE"): K("C-Shift-APOSTROPHE"),
     K("RC-GRAVE"): K("C-Shift-GRAVE"),
-    K("RC-BACKSLASH"): K("C-Shift-BACKSLASH"),
     K("RC-Z"): K("C-Shift-Z"),
     K("RC-X"): K("C-Shift-X"),
     K("RC-C"): K("C-Shift-C"),

linux/limitedadmins

@@ -1,4 +1,7 @@
 # /etc/sudoers.d/limitedadmins
+Defaults    secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/X11/bin"
+Defaults!/etc/init.d/kinto setenv,env_reset,env_delete+=PATH,env_delete+=LD_PRELOAD,env_delete+=LD_LIBRARY_PATH,env_delete+=SSH_AUTH_SOCK,env_delete+=PYTHONPATH,env_delete+=PERL5LIB
+%{username} ALL=NOPASSWD: /etc/init.d/kinto *
 %{username} ALL=NOPASSWD: {systemctl} restart xkeysnail
 %{username} ALL=NOPASSWD: {systemctl} start xkeysnail
 %{username} ALL=NOPASSWD: {systemctl} stop xkeysnail
@@ -6,5 +9,5 @@
 %{username} ALL=(root) NOPASSWD: /usr/local/bin/logoff.sh
 %{username} ALL=NOPASSWD: {pkill} -f logoff
 %{username} ALL=NOPASSWD: {pkill} -f bin/xkeysnail
-%{username} ALL=NOPASSWD: {xkeysnail} /home/{username}/.config/kinto/kinto.py
+%{username} ALL=NOPASSWD: {xkeysnail} *
 %{username} ALL=NOPASSWD: {systemctl} is-active --quiet xkeysnail

linux/trayapps/appindicator/kintotray.py

@@ -29,7 +29,15 @@ APPINDICATOR_ID = 'Kinto'
 class Indicator():
 
     global child_pid
-    kinto_status = Popen("while :; do clear; systemctl is-active xkeysnail; sleep 2s; done", stdout=PIPE, shell=True)
+    global sysv
+    try:
+        sysv = int(Popen("pidof systemd >/dev/null 2>&1 && echo '0' || echo '1'", stdout=PIPE, shell=True).communicate()[0].strip().decode('UTF-8'))
+    except:
+        sysv = 2
+    if sysv:
+        kinto_status = Popen("export TERM=xterm-color;while :; do clear; pgrep 'xkeysnail' && echo 'active'; sleep 2; done", stdout=PIPE, shell=True)
+    else:
+        kinto_status = Popen("export TERM=xterm-color;while :; do clear; systemctl is-active xkeysnail; sleep 2; done", stdout=PIPE, shell=True)
     child_pid = kinto_status.pid
 
     homedir = os.path.expanduser("~")
@@ -42,43 +50,51 @@ class Indicator():
     autostart_bool = False
     menu = Gtk.Menu()
     menukb = Gtk.Menu()
-    checkbox_autostart = Gtk.CheckMenuItem('Autostart')
+    checkbox_autostart = Gtk.CheckMenuItem(label='Autostart')
-    restart = Gtk.MenuItem('Restart')
+    restart = Gtk.MenuItem(label='Restart')
-    stop = Gtk.MenuItem('Stop')
+    stop = Gtk.MenuItem(label='Stop')
-    keyboards = Gtk.MenuItem('Keyboard Types')
+    keyboards = Gtk.MenuItem(label='Keyboard Types')
     keyboards.set_submenu(menukb)
     winkb = Gtk.RadioMenuItem(label='Windows')
     mackb = Gtk.RadioMenuItem(label='Apple',group=winkb)
     chromekb = Gtk.RadioMenuItem(label='Chromebook',group=winkb)
     ibmkb = Gtk.RadioMenuItem(label='IBM (No Super/Win key)',group=winkb)
     winmackb = Gtk.RadioMenuItem(label='Windows & Apple*',group=winkb)
-    edit = Gtk.MenuItem('Customize')
+    edit = Gtk.MenuItem(label='Customize')
     edit_submenu = Gtk.Menu()
     edit.set_submenu(edit_submenu)
-    tweaks = Gtk.MenuItem('Tweaks')
+    tweaks = Gtk.MenuItem(label='Tweaks')
-    rightmod =  Gtk.CheckButton('AltGr on Right Cmd')
+    rightmod =  Gtk.CheckButton(label='AltGr on Right Cmd')
-    vsc2st3 = Gtk.CheckButton('ST3 hotkeys for VS Code')
+    vsc2st3 = Gtk.CheckButton(label='ST3 hotkeys for VS Code')
-    caps2esc = Gtk.CheckButton('Capslock is Escape when tapped, Cmd when held')
+    caps2esc = Gtk.CheckButton(label='Capslock is Escape when tapped, Cmd when held')
-    caps2cmd = Gtk.CheckButton('Capslock is Cmd')
+    caps2cmd = Gtk.CheckButton(label='Capslock is Cmd')
-    button_config = Gtk.MenuItem('Kinto Config (shortcuts)')
+    button_config = Gtk.MenuItem(label='Kinto Config (shortcuts)')
-    service = Gtk.MenuItem('Kinto Service')
+    service = Gtk.MenuItem(label='Kinto Service')
     # Keyboard type set below
-    button_syskb = Gtk.MenuItem('System Shortcuts')
+    button_syskb = Gtk.MenuItem(label='System Shortcuts')
-    button_region = Gtk.MenuItem('Change Language')
+    button_region = Gtk.MenuItem(label='Change Language')
-    systray = Gtk.CheckMenuItem('Tray Enabled')
+    systray = Gtk.CheckMenuItem(label='Tray Enabled')
-    helpm = Gtk.MenuItem('Help')
+    helpm = Gtk.MenuItem(label='Help')
     help_submenu = Gtk.Menu()
     helpm.set_submenu(help_submenu)
-    debug = Gtk.MenuItem('Debug')
+    debug = Gtk.MenuItem(label='Debug')
-    opengui = Gtk.MenuItem('Open Kinto')
+    opengui = Gtk.MenuItem(label='Open Kinto')
-    support = Gtk.MenuItem("Support")
+    support = Gtk.MenuItem(label='Support')
-    about = Gtk.MenuItem('About')
+    about = Gtk.MenuItem(label='About')
     global restartsvc
     restartsvc = False
     unixts = int(time.time())
-    last_status = ""
+    last_status = ''
 
     def __init__(self):
+        global sysv
+        try:
+            sysv = int(Popen("pidof systemd >/dev/null 2>&1 && echo '0' || echo '1'", stdout=PIPE, shell=True).communicate()[0].strip().decode('UTF-8'))
+        except:
+            sysv = 1
+        if sysv:
+            res = Popen(['pgrep','xkeysnail'])
+        else:
             res = Popen(['sudo', 'systemctl','is-active','--quiet','xkeysnail'])
         res.wait()
 
@@ -183,7 +199,7 @@ class Indicator():
         # self.button_region.connect('activate',self.setRegion)
         # self.menu.append(self.button_region)
 
-        item_quit = Gtk.MenuItem('Close')
+        item_quit = Gtk.MenuItem(label='Close')
         item_quit.connect('activate', quit)
         self.menu.append(item_quit)
         self.menu.show_all()
@@ -401,10 +417,10 @@ class Indicator():
         self.lbl = Gtk.Label()
         global restartsvc 
         restartsvc = False
-        self.rightmod =  Gtk.CheckButton('AltGr on Right Cmd')
+        self.rightmod =  Gtk.CheckButton(label='AltGr on Right Cmd')
-        self.vsc2st3 = Gtk.CheckButton('ST3 hotkeys for VS Code')
+        self.vsc2st3 = Gtk.CheckButton(label='ST3 hotkeys for VS Code')
-        self.caps2esc = Gtk.CheckButton('Capslock is Escape when tapped, Cmd when held')
+        self.caps2esc = Gtk.CheckButton(label='Capslock is Escape when tapped, Cmd when held')
-        self.caps2cmd = Gtk.CheckButton('Capslock is Cmd')
+        self.caps2cmd = Gtk.CheckButton(label='Capslock is Cmd')
         
         if rightmod_result == 0:
             self.rightmod.set_active(True)
@@ -446,6 +462,9 @@ class Indicator():
         global restartsvc 
         if restartsvc == True:
             try:
+                if sysv:
+                    restartcmd = ['sudo', '-E','/etc/init.d/kinto','restart']
+                else:
                     restartcmd = ['sudo', 'systemctl','restart','xkeysnail']
                 Popen(restartcmd)
                 restartsvc = False
@@ -555,7 +574,11 @@ class Indicator():
         return
 
     def runRestart(self,button):
+        global sysv
         try:
+            if sysv:
+                stop = Popen(['sudo', '-E','/etc/init.d/kinto','stop'])
+            else:
                 stop = Popen(['sudo', 'systemctl','stop','xkeysnail'])
             stop.wait()
             time.sleep(1)
@@ -567,12 +590,19 @@ class Indicator():
                 pkillxkey = Popen(['sudo', 'pkill','-f','bin/xkeysnail'])
                 pkillxkey.wait()
             
+            if sysv:
+                Popen(['sudo', '-E','/etc/init.d/kinto','start'])
+            else:
                 Popen(['sudo', 'systemctl','start','xkeysnail'])
         except:
             Popen(['notify-send','Kinto: Error restarting Kinto!'])
 
     def runStop(self,button):
+        global sysv
         try:
+            if sysv:
+                stop = Popen(['sudo', '-E','/etc/init.d/kinto','stop'])
+            else:
                 stop = Popen(['sudo', 'systemctl','stop','xkeysnail'])
             stop.wait()
             time.sleep(1)
@@ -689,6 +719,9 @@ class Indicator():
             cmdsTerm = Popen(cmds)
             cmdsTerm.wait()
 
+            if sysv:
+                restart = ['sudo', '-E','/etc/init.d/kinto','restart']
+            else:
                 restart = ['sudo', 'systemctl','restart','xkeysnail']
             Popen(restart)
 

linux/xkeysnail_sysv.desktop

@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Kinto_xkey
+GenericName=Kinto_xkey
+Comment=Make Linux Type Like it's a Mac
+Exec=/bin/bash -c "grep -q 'autostart = true' {homedir}/.config/kinto/kinto.py && sudo -E /etc/init.d/kinto restart"
+Terminal=false
+Type=Application
+X-GNOME-Autostart-enabled=true

windows/kinto.ahk

@@ -172,8 +172,10 @@ GroupAdd, browsers, ahk_exe msedge.exe
 
 ; Disable Key Remapping for Virtual Machines
 ; Disable for Remote desktop solutions too
-GroupAdd, virtm, ahk_exe VirtualBoxVM.exe
+GroupAdd, remotes, ahk_exe VirtualBoxVM.exe
-GroupAdd, virtm, ahk_exe mstsc.exe
+GroupAdd, remotes, ahk_exe mstsc.exe
+GroupAdd, remotes, ahk_exe msrdc.exe
+GroupAdd, remotes, ahk_exe nxplayer.bin
 
 ; Disabled Edge for now - no ability to close all instances
 ; GroupAdd, browsers, Microsoft Edge ahk_class ApplicationFrameWindow
@@ -188,7 +190,30 @@ GroupAdd, intellij, ahk_exe idea64.exe
 
 ; SetCapsLockState, AlwaysOff ; CB/IBM
 
-#IfWinNotActive ahk_group virtm
+; Keyboards w/o media keys can use this Remap
+; This will replace unneeded dedicated keys
+; with most commonly used media keys
+;
+; Insert::SoundSet, +1, , mute  ; Toggles Speaker
+; +Insert::Insert               ; Shift Insert maps to Insert
+; Home::SoundSetWaveVolume, -10 ; Decrease volume
+; PgUp::SoundSetWaveVolume, +10 ; Increase volume
+; Delete::Send {Media_Prev}     ; Previous
+; End::Send {Media_Play_Pause}  ; Pause/Play
+; PgDn::Send {Media_Next}       ; Next
+
+; Temporary fix that allows for full remapping via Powertoys
+; useful for destinations where you cannot install Kinto
+; and you are using a Mac based keyboard
+; NOTE: Do not fully maximize the RDP window for this to work.
+#IfWinActive ahk_group remotes                  ; MacOnly
+; #IfWinActive ahk_exe msrdc.exe                ; MacOnly
+    $LWin::LAlt                                 ; MacOnly
+    $LAlt::RAlt                                 ; MacOnly
+    $LWin up::Send {LWin up}{LAlt up}{LCtrl up} ; MacOnly
+#If                                             ; MacOnly
+
+#IfWinNotActive ahk_group remotes
 
     ; New AltTab and CtrlTab fix
     *tab:: 

xkeysnail_service.sh

@@ -3,11 +3,18 @@
 # set about:config?filter=ui.key.menuAccessKeyFocuses
 # to false for wordwise to work in Firefox
 
+function pause(){
+ read -s -n 1 -p "Press any key to continue . . ."
+ echo ""
+}
+
 typeset -l distro
 distro=$(awk -F= '$1=="NAME" { gsub("[\",!,_, ]","",$2);print $2 ;}' /etc/os-release)
 typeset -l dename
 dename=$(./linux/system-config/dename.sh | cut -d " " -f1)
 
+sysv=$(pidof systemd >/dev/null 2>&1 && echo "1" || echo "0")
+
 function uninstall {
 
 	echo -e "\nNote: Restoring keys is only relevant if you had installed a version prior to 1.2 of Kinto. You should skip this step if 1.2+ is all you have installed."
@@ -38,8 +45,12 @@ function uninstall {
 			mv ~/.config/kglobalshortcutsrc ~/.config/kglobalshortcutsrc.kinto
 		elif [ "$dename" == "xfce" ];then
 			echo "Resetting DE hotkeys..."
+			if test -f "/etc/mx-version";then
+				cp /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml ~/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
+			else
 				cp /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml ~/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
 			fi
+		fi
 	elif [ "$yn" == "r" ]; then
 		echo "Restore original user shortcuts"
 		if [[ $dename == "gnome" || $dename == "budgie" ]]; then
@@ -77,6 +88,12 @@ function uninstall {
 		echo -e "\nWill still be restoring the overlay key"
 		echo -e "gsettings set org.gnome.mutter overlay-key 'super'\n"
 		gsettings set org.gnome.mutter overlay-key 'super'
+	# Repetitive - xfce restore factory or backup does this
+	# Also needs to check if whiskermenu is even being used
+	# elif [[ $dename == "xfce" ]]; then
+	# 	echo -e "\nWill still be restoring the overlay key"
+	# 	echo -e "xfconf-query --channel xfce4-keyboard-shortcuts --property \"/commands/custom/Super_L\" --create --type string --set \"xfce4-popup-whiskermenu\""
+	# 	xfconf-query --channel xfce4-keyboard-shortcuts --property "/commands/custom/Super_L" --create --type string --set "xfce4-popup-whiskermenu"
 	fi
 }
 
@@ -189,6 +206,7 @@ if [[ $1 == "5" || $1 == "uninstall" || $1 == "Uninstall" ]]; then
 	echo "rm /etc/systemd/system/graphical.target.wants/xkeysnail.service"
 	echo "rm /usr/lib/systemd/system/xkeysnail.service"
 	echo "rm /lib/systemd/system/xkeysnail.service"
+	sudo rm /etc/init.d/kinto >/dev/null 2>&1
 	sudo rm /etc/systemd/system/xkeysnail.service >/dev/null 2>&1
 	sudo rm /etc/systemd/system/graphical.target.wants/xkeysnail.service >/dev/null 2>&1
 	sudo rm /usr/lib/systemd/system/xkeysnail.service >/dev/null 2>&1
@@ -207,6 +225,9 @@ fi
 sudo systemctl stop xkeysnail >/dev/null 2>&1
 sudo systemctl disable xkeysnail >/dev/null 2>&1
 sudo pkill -f bin/xkeysnail >/dev/null 2>&1
+sudo pkill -f kinto-gui.py >/dev/null 2>&1
+sudo pkill -f kintotray.py >/dev/null 2>&1
+ps aux | awk '/[s]h -c while/ {print $2}' | xargs -r -n1 sudo kill
 sudo pkill -f "is-active xkeysnail" >/dev/null 2>&1
 
 if [ "$distro" == "manjarolinux" ]; then
@@ -236,6 +257,34 @@ if [[ $dename == 'gnome' || $dename == 'budgie' ]];then
 		echo "Overlay key, " $bound ", detected. Will be removing so Super-Space can remap to Cmd-Space for app launching.."
 		gsettings set org.gnome.mutter overlay-key ''
 	fi
+elif [[ $dename == 'xfce' ]];then
+	launcher=$(cat ~/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml | grep 'name="Super_L"' | sed 's:.*="::')
+	# echo "${#launcher}"
+	if [[ "${#launcher}" -eq 0 ]]; then
+		xfconf-query --channel xfce4-keyboard-shortcuts --property "/commands/custom/Super_L" --create --type string --set "xfce4-popup-whiskermenu"
+		echo "Resetting Super_L, please wait..."
+		sleep 6
+		launcher=$(cat ~/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml | grep 'name="Super_L"' | sed 's:.*="::')
+		if [[ "${#launcher}" -gt 0 ]]; then
+			echo "Success."
+		else
+			echo "Failed. Skipping setup of Cmd-Space."
+		fi
+	fi
+	if [[ "${#launcher}" -gt 0 ]]; then
+		nlauncher=${launcher::-3}
+		# Replace Alt-F1 help file w/ whisker menu alternative hotkey
+		xfconf-query --channel xfce4-keyboard-shortcuts --property "/commands/custom/<Alt>F1" --reset
+		# Clear Alt-F3 App Finder for sublime text global replace
+		xfconf-query --channel xfce4-keyboard-shortcuts --property "/commands/custom/<Alt>F3" --reset
+		xfconf-query --channel xfce4-keyboard-shortcuts --property "/commands/custom/<Alt>F1" --create --type string --set "$nlauncher" && echo "$nlauncher has been set to Alt-F1 for Cmd-Space to work."
+		# Unset Super_L to avoid issues during setup, will re-apply at the end
+		xfconf-query --channel xfce4-keyboard-shortcuts --property "/commands/custom/Super_L" --reset
+		# xfconf-query --channel xfce4-keyboard-shortcuts --property "/commands/custom/<Super>grave" --create --type string --set "switch_window_key"
+
+	fi
+	# Unset Super-Tab, breaks Ctrl-Tab. switch_window_key
+	sed -i '/.*name=\"&lt;Super&gt;Tab.*$/d' ~/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
 fi
 
 # if ls /etc/apt/sources.list.d/system76* 1> /dev/null 2>&1; then
@@ -352,12 +401,12 @@ if ! [ -x "$(command -v pip3)" ]; then
 	sudo ./linux/system-config/unipkg.sh python3-pip
 fi
 if ! [ -x "$(command -v python3-config)" ]; then
-	if [ "$distro" == "ubuntu" ] || [ "$distro" == "debian" ] || [ "$distro" == 'linuxmint' ]; then
+	if [ "$distro" == "ubuntu" ] || [ "${distro::6}" == "debian" ] || [ "$distro" == 'linuxmint' ]; then
 		pydev="python3-dev"
 	elif [ "$distro" == "fedora" ]; then
 		pydev="python3-devel"
 	fi
-	if [ "$distro" == "gnome" ] || [ "$distro" == "fedora" ] || [ "$distro" == "debian" ] || [ "$distro" == 'linuxmint' ]; then
+	if [ "$distro" == "gnome" ] || [ "$distro" == "fedora" ] || [ "${distro::6}" == "debian" ] || [ "$distro" == 'linuxmint' ]; then
 		echo "Will need to install $pydev..."
 		sudo ./linux/system-config/unipkg.sh "$pydev"
 	fi
@@ -370,8 +419,10 @@ if ! [ -x "$(command -v xhost)" ] || ! [ -x "$(command -v gcc)" ]; then
 		sudo ./linux/system-config/unipkg.sh "xorg-xhost gcc"
 	fi
 fi
-if [ "$distro" == 'linuxmint' ]; then
+if [ "$distro" == 'linuxmint' ] ; then
 	pip3 install setuptools
+elif [ "${distro::6}" == "debian" ]; then
+	sudo pip3 install setuptools wheel
 fi
 
 pip3 install pillow
@@ -386,7 +437,11 @@ mkdir -p ~/.config/kinto
 
 # KDE startup - xhost fix
 mkdir -p ~/.config/autostart
-yes | cp -rf ./linux/xkeysnail.desktop ~/.config/kinto/xkeysnail.desktop
+if [ ! "$sysv" -eq 0 ];then
+	yes | cp -rf ./linux/xkeysnail.desktop ~/.config/kinto/xkeysnail.desktop
+else
+	yes | cp -rf ./linux/xkeysnail_sysv.desktop ~/.config/kinto/xkeysnail.desktop
+fi
 
 # yes | cp -rf ./linux/xkeystart.sh ~/.config/kinto/xkeystart.sh
 
@@ -411,7 +466,6 @@ else
 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/
 yes | cp -nrf ./linux/initkb ~/.config/kinto/initkb
 yes | cp -rf ./linux/killdups.sh ~/.config/kinto/killdups.sh
@@ -424,29 +478,36 @@ yes | cp -rf ./linux/trayapps/appindicator/icons/kinto-invert-16.svg ~/.config/k
 yes | cp -rf ./linux/trayapps/appindicator/icons/kinto-solid-16.svg ~/.config/kinto/kinto-solid.svg
 yes | cp -rf ./linux/trayapps/appindicator/icons/kinto.svg ~/.config/kinto/kinto.svg
 # yes | cp -rf ./linux/system-config/caret_status_xkey.sh ~/.config/kinto/caret_status_xkey.sh
-yes | cp -rf ./linux/xkeysnail.service ./linux/xkeysnail.service.new
+
-# yes | cp -rf ./linux/xkeysnail.timer ~/.config/systemd/user/xkeysnail.timer
+yes | cp -rf ./linux/limitedadmins ./linux/limitedadmins.new
-sed -i "s#{experimental-caret}#$exp#g" ./linux/xkeysnail.service.new
+sed -i "s/{username}/`whoami`/g" ./linux/limitedadmins.new
-if [ "$expsh" != " " ];then
+sed -i "s#{systemctl}#`\\which systemctl`#g" ./linux/limitedadmins.new
+sed -i "s#{pkill}#`\\which pkill`#g" ./linux/limitedadmins.new
+if [ ! "$sysv" -eq 0 ];then
+	echo "Using systemd..."
+	yes | cp -rf ./linux/xkeysnail.service ./linux/xkeysnail.service.new
+	# yes | cp -rf ./linux/xkeysnail.timer ~/.config/systemd/user/xkeysnail.timer
+	sed -i "s#{experimental-caret}#$exp#g" ./linux/xkeysnail.service.new
+	if [ "$expsh" != " " ];then
 		sed -i "s#{kill-caret}#/usr/bin/pkill -f $expsh#g" ./linux/xkeysnail.service.new
-else
+	else
 		sed -i "s#{kill-caret}#$expsh#g" ./linux/xkeysnail.service.new
+	fi
+	sed -i "s/{username}/`whoami`/g" ./linux/xkeysnail.service.new
+	sed -i "s#{homedir}#`echo "$HOME"`#g" ./linux/xkeysnail.service.new
+	sed -i "s#{xhost}#`\\which xhost`#g" ./linux/xkeysnail.service.new
+	sed -i "s/{displayid}/`echo "$DISPLAY"`/g" ./linux/xkeysnail.service.new
+else
+	echo "Using sysvinit..."
 fi
-sed -i "s/{username}/`whoami`/g" ./linux/xkeysnail.service.new
-sed -i "s#{homedir}#`echo "$HOME"`#g" ./linux/xkeysnail.service.new
 sed -i "s#{homedir}#`echo "$HOME"`#g" ~/.config/kinto/kintotray.desktop
 sed -i "s#{homedir}#`echo "$HOME"`#g" ~/.config/kinto/gui/kinto-gui.py
 sed -i "s#{homedir}#`echo "$HOME"`#g" ./linux/gui/kinto.desktop.new
 sudo mv ./linux/gui/kinto.desktop.new /usr/share/applications/kinto.desktop
-sed -i "s#{xhost}#`\\which xhost`#g" ./linux/xkeysnail.service.new
-sed -i "s/{username}/`whoami`/g" ./linux/limitedadmins.new
-sed -i "s#{systemctl}#`\\which systemctl`#g" ./linux/limitedadmins.new
-sed -i "s#{pkill}#`\\which pkill`#g" ./linux/limitedadmins.new
 sed -i "s#{systemctl}#`\\which systemctl`#g" ~/.config/kinto/xkeysnail.desktop
 sed -i "s#{xhost}#`\\which xhost`#g" ~/.config/kinto/xkeysnail.desktop
 sed -i "s#{homedir}#`echo "$HOME"`#g" ~/.config/kinto/xkeysnail.desktop
 # sed -i "s#{homedir}#`echo "$HOME"`#g" ~/.config/kinto/prexk.sh
-sed -i "s/{displayid}/`echo "$DISPLAY"`/g" ./linux/xkeysnail.service.new
 # sed -i "s/{displayid}/`echo "$DISPLAY"`/g" ~/.config/kinto/prexk.sh
 
 if [[ $dename == "budgie" ]]; then
@@ -491,9 +552,16 @@ if [[ $dename == "xfce" ]] && ls /etc/apt/sources.list.d/enso* 1> /dev/null 2>&1
 fi
 
 if ! [[ $1 == "5" || $1 == "uninstall" || $1 == "Uninstall" ]]; then
+
 	mv ./linux/kinto.py.new ~/.config/kinto/kinto.py
 	# if [ "$distro" == "fedora" ];then
+	if [ ! "$sysv" -eq 0 ];then
+		# echo "Using systemd..."
 		sudo rm /etc/systemd/system/xkeysnail.service >/dev/null 2>&1
+	else
+		# echo "Using sysvinit..."
+		echo ""
+	fi
 	if [ -d /usr/lib/systemd/system ];then
 		xkeypath="/usr/lib/systemd/system/"
 	elif [ -d /lib/systemd/system ];then
@@ -521,12 +589,15 @@ if ! [[ $1 == "5" || $1 == "uninstall" || $1 == "Uninstall" ]]; then
 		echo -e "Run 'sudo pip3 install --upgrade .' to debug issue"
 		exit 0
 	fi
-	sed -i "s#{xkeysnail}#`which xkeysnail`#g" ./linux/xkeysnail.service.new
 	sed -i "s#{xkeysnail}#`which xkeysnail`#g" ./linux/limitedadmins.new
-	sudo mv ./linux/xkeysnail.service.new "$xkeypath"xkeysnail.service && echo "Service file added to "$xkeypath"xkeysnail.service"
 	sudo chown root:root ./linux/limitedadmins.new
 	# Add a check here for xkeysnail path resolving
 	sudo mv ./linux/limitedadmins.new /etc/sudoers.d/limitedadmins
+	if [ ! "$sysv" -eq 0 ];then
+		# echo "Using systemd..."
+		sed -i "s#{xkeysnail}#`which xkeysnail`#g" ./linux/xkeysnail.service.new
+		sudo mv ./linux/xkeysnail.service.new "$xkeypath"xkeysnail.service && echo "Service file added to "$xkeypath"xkeysnail.service"
+
 		sudo chown -R root:root "$xkeypath"xkeysnail.service && echo "Ownership set for root..." || echo "Failed to set ownership..."
 		sudo chmod 644 "$xkeypath"xkeysnail.service && echo "Permissions set to 644..." || echo "Failed to set permissions..."
 		sudo ln -s "$xkeypath"xkeysnail.service /etc/systemd/system/xkeysnail.service && echo "Created soft symlink..." || echo "Failed to create soft symlink..."
@@ -534,6 +605,13 @@ if ! [[ $1 == "5" || $1 == "uninstall" || $1 == "Uninstall" ]]; then
 		sudo systemctl daemon-reload
 		sudo systemctl disable xkeysnail
 		sudo systemctl stop xkeysnail
+	else
+		# echo "Using sysvinit..."
+		echo ""
+		sudo cp ./linux/kinto-service.sh /etc/init.d/kinto
+		sudo -E /etc/init.d/kinto stop
+		mv /tmp/kinto.log /tmp/kinto.log.bak
+	fi
 	# sudo systemctl --state=not-found --all | grep xkeysnail
 	# if [ "$distro" == "fedora" ];then
 	# 	systemctl enable xkeysnail.service
@@ -541,8 +619,9 @@ if ! [[ $1 == "5" || $1 == "uninstall" || $1 == "Uninstall" ]]; then
 	# 	sudo systemctl enable xkeysnail.service
 	# fi
 	# sudo systemctl restart xkeysnail
-	sudo pkill -f kintotray >/dev/null 2>&1
+	sudo pkill -f kintotray &
-	if [[ $dename == "gnome" || $dename == "kde" ]];then
+	# >/dev/null 2>&1
+	if [[ $dename == "kde" ]];then
 		sed -i "s/systray = true/systray = false/g" ~/.config/kinto/initkb
 	fi
 	nohup python3 ~/.config/kinto/gui/kinto-gui.py >/dev/null 2>&1 &
@@ -573,6 +652,24 @@ if ! [[ $1 == "5" || $1 == "uninstall" || $1 == "Uninstall" ]]; then
 	echo -e "~/.config/kinto/gui/kinto-gui.py\n"
 	echo -e "You can then either \e]8;;https://google.com\a\e[1m\e[36mG\033[0;91mo\033[0;93mo\e[1m\e[36mg\e[1m\e[32ml\033[0;91me\e[0m\e]8;;\a what dependencies you may be missing\nor \e]8;;https://github.com/rbreaves/kinto/issues/new\?assignees=rbreaves&labels=bug&template=bug_report.md&title=\aopen an issue ticket.\e]8;;\a\n"
 
+	# echo -e "\033[0;91mAfter the installer completes press Any key to re-apply your overlay (Super key) menu launcher.\e[0m\n"
+
+	# if [[ $dename == 'gnome' || $dename == 'budgie' ]];then
+	# 	echo "GNOME: gsettings set org.gnome.mutter overlay-key 'super'"
+	# elif [[ $dename == 'xfce' ]];then
+	# 	echo "XFCE: xfconf-query --channel xfce4-keyboard-shortcuts --property \"/commands/custom/Super_L\" --create --type string --set \"$nlauncher\""
+	# fi
+
+	# read -n 1 -s -r -p ""
+
+	# if [[ $dename == 'gnome' || $dename == 'budgie' ]];then
+	# 	gsettings set org.gnome.mutter overlay-key 'super'
+	# elif [[ $dename == 'xfce' ]];then
+	# 	echo -e "\nSetting xfce4 launcher $nlauncher back to Super_L."
+	# 	xfconf-query --channel xfce4-keyboard-shortcuts --property "/commands/custom/Super_L" --create --type string --set "$nlauncher" && echo "Success."
+	# fi
+	
+
 	if [ "$distro" == "manjarolinux" ]; then
 		echo "If you are using Manjaro and see an error about 'GLIBC_2.xx not found' appears then please update your system."
 		echo "sudo pacman -Syu"