Merge pull request #268 from rbreaves/hotfix

- Additional fixes for Windows 10 user profile spaces

setup.py

@@ -16,13 +16,13 @@ def windows_setup():
 		default = int(input("\nPlease enter your desired keymap (1 - " + str(len(keymaps)) + ") : "))
 	print("")
 	# Short DOS path notation
-	path= cmdline('echo %cd%')[:-1]
+	path= cmdline('echo ''%cd%''')[:-1]
 	if default > 0 and default < 3:
 		print("Will now install chocolatey and autohotkey with elevated privileges...")
 		print("This install will fail if you are not running with elevated privileges")
 		os.system('powershell -executionpolicy bypass ".\\windows\\autohotkey.ps1"')
 		print("Copying autohotkey combinations for Terminals & Editors...")
-		os.system("copy /Y " + path + "\\windows\\kinto.ahk " + path + "\\windows\\kinto-new.ahk")
+		os.system('copy /Y "' + path + '\\windows\\kinto.ahk" "' + path + '\\windows\\kinto-new.ahk"')
 	if default == 1:
 		os.system('C:\\Strawberry\\perl\\bin\\perl.exe -pi -e "s/(; )(.*)(; MacModifiers)/$2$3/g" .\\windows\\kinto-new.ahk')
 	elif default == 2:	
@@ -36,27 +36,28 @@ def windows_setup():
 		print("Ending any running Kinto tasks...")
 		os.system("(taskkill /IM autohotkey.exe) 2> nul")
 		print("Removing Kinto from users profile directory...")
-		os.system('(rd /s /q %userprofile%\\.kinto) 2> nul')
+		os.system('(rd /s /q "%userprofile%\\.kinto") 2> nul')
 		print("")
 		print("Uninstall of Kinto is Complete.")
 	if default > 0 and default < 3:
 		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...")
-		os.system("regedit " + path + "\\windows\\theme_ubuntu.reg")
+		os.system('regedit "' + path + '\\windows\\theme_ubuntu.reg"')
-		os.system('robocopy '+ path + '\\assets "%userprofile%\\.kinto\\assets" /E')
+		os.system('robocopy "'+ path + '\\assets" "%userprofile%\\.kinto\\assets" /E')
 		if(stvscode):
 			os.system('C:\\Strawberry\\perl\\bin\\perl.exe -pi -e "s/(; )(.*)(; ST2CODE)/$2$3/g" .\\windows\\kinto-new.ahk')
-		os.system('copy /Y ' + path + '\\windows\\kinto-start.vbs "%userprofile%\\.kinto\\kinto-start.vbs')
+		os.system('copy /Y "' + path + '\\windows\\kinto-start.vbs" "%userprofile%\\.kinto\\kinto-start.vbs"')
-		os.system('copy /Y ' + path + '\\windows\\usb.vbs "%userprofile%\\.kinto\\usb.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('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('copy /Y '+ path + '\\windows\\NoShell.vbs "%userprofile%\\.kinto\\NoShell.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\\toggle_kb.bat" "%userprofile%\\.kinto\\toggle_kb.bat"')
-		os.system('copy /Y '+ path + '\\windows\\kinto-new.ahk "%userprofile%\\.kinto\\kinto.ahk"')
+		os.system('copy /Y "'+ path + '\\windows\\kinto-new.ahk" "%userprofile%\\.kinto\\kinto.ahk"')
 		os.system("del /f .\\windows\\kinto-new.ahk")
 		os.system("del \"C:\\ProgramData\\Microsoft\\Windows\\Start Menu\\Programs\\StartUp\\kinto.ahk\" 2> nul")
-		os.system("%userprofile%\\AppData\\Roaming\\Microsoft\\Windows\\STARTM~1\\Programs\\Startup\\kinto-start.vbs")
+		userpath = cmdline('cmd /c for %A in ("%userprofile%") do @echo %~sA')[:-1]
-
+		print('Starting... "' + userpath + '\\AppData\\Roaming\\Microsoft\\Windows\\STARTM~1\\Programs\\Startup\\kinto-start.vbs"')
+		os.system('"' + userpath + '\\AppData\\Roaming\\Microsoft\\Windows\\STARTM~1\\Programs\\Startup\\kinto-start.vbs"')
 	# 	# print("\nPlease log off and back on for changes to take full effect.")
 		print("If using WSL then please remember to right click on title bar -> Properties -> Edit Options -> Use Ctrl+Shift+C/V as Copy/Paste and enable it.")
 	else:

windows/detectUSB.ahk

@@ -11,13 +11,12 @@ WinHide % "ahk_id " DllCall("GetConsoleWindow", "ptr")
 notify_change(wParam, lParam, msg, hwnd) 
 {
 	global lastkb
-	; kbtype = % ComObjCreate("WScript.Shell").Exec("cscript /nologo usb.vbs").StdOut.ReadAll()
 	DetectHiddenWindows On
 	Run %ComSpec%,, Hide, pid
 	WinWait ahk_pid %pid%
 	DllCall("AttachConsole", "UInt", pid)
 	WshShell := ComObjCreate("Wscript.Shell")
-	exec := WshShell.Exec("cscript /nologo usb.vbs")
+	exec := WshShell.Exec("cscript /nologo ""%userprofile%\.kinto\usb.vbs""")
 	kbtype := exec.StdOut.ReadAll()
 	DllCall("FreeConsole")
 	Process Close, %pid%
@@ -27,11 +26,11 @@ notify_change(wParam, lParam, msg, hwnd)
 		if InStr(kbtype, "Apple")
 		{
 			; MsgBox, Apple
-			Run, %A_ScriptDir%\NoShell.vbs %A_ScriptDir%\toggle_kb.bat mac, %A_ScriptDir%
+			Run, "%A_ScriptDir%\NoShell.vbs" "%A_ScriptDir%\toggle_kb.bat" mac, "%A_ScriptDir%"
 		}
 		else{
 			; MsgBox, Windows
-			Run, %A_ScriptDir%\NoShell.vbs %A_ScriptDir%\toggle_kb.bat win, %A_ScriptDir%
+			Run, "%A_ScriptDir%\NoShell.vbs" "%A_ScriptDir%\toggle_kb.bat" win, "%A_ScriptDir%"
 		}
 		; MsgBox % kbtype
 	}

windows/kinto-start.vbs

@@ -2,6 +2,6 @@ Set oShell = CreateObject("Shell.Application")
 Set wShell = WScript.CreateObject("WScript.Shell")
 Set fso = CreateObject("Scripting.FileSystemObject")
 
-path = wShell.ExpandEnvironmentStrings("%userprofile%")
+path = wShell.ExpandEnvironmentStrings("""%userprofile%")
-strFolder = fso.BuildPath(path, "\.kinto\kinto.ahk")
+strFolder = fso.BuildPath( path, "\.kinto\kinto.ahk""")
 oShell.ShellExecute "C:\Program Files\AutoHotkey\AutoHotkey.exe", strFolder, , "runas", 0

windows/kinto.ahk

@@ -5,6 +5,25 @@
 DetectHiddenWindows, On
 Run, %A_ScriptDir%\detectUSB.ahk
 
+; Enable Left clicks on Kinto Icon
+; https://www.autohotkey.com/boards/viewtopic.php?t=9501
+OnMessage(0x404, "AHK_NOTIFYICON")
+
+AHK_NOTIFYICON(wParam, lParam) 
+{
+    if (lParam = 0x202) { ; user left-clicked tray icon
+        ;ADD ANY SUBROUTINE OR FUNCTION HERE
+        Menu, Tray, Show
+        return
+    }
+    else if (lParam = 0x203) { ; user double left-clicked tray icon
+        ;ADD ANY SUBROUTINE OR FUNCTION HERE
+        Menu, Tray, Show
+        return
+    }
+}
+; End Enable Left clicks
+
 ; I_Icon = %A_ScriptDir%\assets\kinto-white.ico           ; MacModifiers
 ; IfExist, %I_Icon%                                       ; MacModifiers
 ; Menu, Tray, Icon, %I_Icon%,, 1                          ; MacModifiers
@@ -27,11 +46,11 @@ Menu, Tray, Add, Close, Exit
 Menu, Tray, Click, 1
 
 winkb(){
-    Run, %A_ScriptDir%\NoShell.vbs %A_ScriptDir%\toggle_kb.bat win, %A_ScriptDir%
+    Run, "%A_ScriptDir%\NoShell.vbs" "%A_ScriptDir%\toggle_kb.bat" win, "%A_ScriptDir%"
 }
 
 mackb(){
-    Run, %A_ScriptDir%\NoShell.vbs %A_ScriptDir%\toggle_kb.bat mac, %A_ScriptDir%
+    Run, "%A_ScriptDir%\NoShell.vbs" "%A_ScriptDir%\toggle_kb.bat" mac, "%A_ScriptDir%"
 }
 
 min(){
@@ -107,6 +126,9 @@ GroupAdd, vscode, ahk_exe Code.exe
 
 GroupAdd, vstudio, ahk_exe devenv.exe
 
+GroupAdd, intellij, ahk_exe idea.exe
+GroupAdd, intellij, ahk_exe idea64.exe
+
 ; New AltTab and CtrlTab fix
 *tab:: 
 {
@@ -236,7 +258,7 @@ $^+Right::Send +{End}
 ^+Up::Send ^+{Home}
 ^Down::Send ^{End}
 ^+Down::Send ^+{End}
-^Backspace::Send +{Home}{Delete}
+$^Backspace::Send +{Home}{Delete}
 !Backspace::Send ^{Backspace}
 !Left::Send ^{Left}
 !+Left::Send ^+{Left}
@@ -244,7 +266,7 @@ $^+Right::Send +{End}
 !+Right::Send ^+{Right}
 
 ; Cmd+Space Alternative
-^Space::Send ^{Esc}
+$^Space::Send ^{Esc}
 
 #IfWinActive ahk_group intellij
     ; General
@@ -281,7 +303,7 @@ $^+Right::Send +{End}
     #+q::Send !q                    ;Context info
     #!o::Send ^!o                   ;Optimize imports
     #!i::Send ^!i                   ;Auto-indent line(s)
-    ^Backspace::Send ^y             ;Delete line at caret
+    $^Backspace::Send ^y             ;Delete line at caret
     #+j::Send ^+j                   ;Smart line join
     !Delete::Send ^{Delete}         ;Delete to word end
     !Backspace::Send ^{Backspace}   ;Delete to word start
@@ -341,6 +363,7 @@ $^+Right::Send +{End}
 
 ; Sublime Text Remaps for VS Code
 #IfWinActive ahk_group vscode
+    #Space::Send ^{Space}                                ; Basic code completion
     ; Remap Ctrl+Shift to behave like macOS Sublimetext
     ; Will extend cursor to multiple lines
 ;    #+Up::send ^!{Up}                                   ; ST2CODE
@@ -353,6 +376,7 @@ $^+Right::Send +{End}
 #If
 
 #IfWinActive ahk_exe sublime_text.exe
+    #Space::Send ^{Space}                                   ; Basic code completion
     #^Up::send !{O}                                         ; Switch file
     #^f::send {F11}                                         ; toggle_full_screen
     ^!v::send {Ctrl Down}k{Ctrl Up}{Ctrl Down}v{Ctrl Up}    ; paste_from_history

windows/usb.vbs

@@ -1,5 +1,5 @@
 Option Explicit
-Dim oWMISrv, collDvcs, iUSBDvc , iDvc, sDvcID, sPID, sVID
+Dim oWMISrv, collDvcs, iUSBDvc , iDvc, sDvcID, sPID, sVID, deviceID
 
 ' add item to array
 Function AddItem(arr, val)
@@ -49,21 +49,23 @@ Dim nonApple: nonApple = 0
 Dim i
 
 If vcount = 1 Then
+	deviceID = deviceVID(0)
 	If StrComp(deviceVID(0), "05AC") = 0 Then
-		Wscript.Echo "Apple"
+		Wscript.Echo "Apple " & deviceID
 	Else
-		Wscript.Echo "Windows"
+		Wscript.Echo "Windows " & deviceID
 	End If
 Else
 	For i = 0 To counter-1
+		deviceID = deviceVID(i)
     	If StrComp(deviceVID(i), "05AC") = -1 Then
     		nonApple = 1
     	End If
 	Next
 	If nonApple = 1 Then
-		Wscript.Echo "Windows"
+		Wscript.Echo "Windows " & deviceID
 	Else
-		Wscript.Echo "Apple"
+		Wscript.Echo "Apple " & deviceID
 	End If
 End If
 

xkeysnail-config/kinto.py

@@ -213,6 +213,7 @@ define_keymap(None,{
 })
 
 define_keymap(lambda wm_class: wm_class.casefold() not in mscodes,{
+    K("Super-Space"): K("C-Space"),         # Basic code completion
     # Wordwise remaining - for Everything but VS Code
     K("M-Left"): K("C-Left"),               # Left of Word
     K("M-Shift-Left"): K("C-Shift-Left"),   # Select Left of Word
@@ -272,6 +273,7 @@ define_keymap(re.compile(codeStr, re.IGNORECASE),{
 
 # Keybindings for Sublime Text
 define_keymap(re.compile("Sublime_text", re.IGNORECASE),{
+    K("Super-Space"): K("C-Space"),             # Basic code completion
     K("C-Super-up"): K("M-o"),                  # Switch file
     K("Super-RC-f"): K("f11"),                  # toggle_full_screen
     K("C-M-v"): [K("C-k"), K("C-v")],           # paste_from_history