Use local Firefox installation

Installing Firefox at this location avoids annoyances with admin
privileges as Firefox regularly wants to update itself on launch.

Moonlander Window Manager.ahk

@@ -7,7 +7,7 @@
 
 try TraySetIcon("img\win_manager.ico")
 
-TERMINAL_EXE := "ahk_exe mintty.exe"
+TERMINAL_WIN := "ahk_class mintty"
 TERMINAL_CMD := "
 (LTrim Join`s
     C:\Users\fernando.schauenburg\AppData\Local\wsltty\bin\mintty.exe
@@ -17,8 +17,9 @@ TERMINAL_CMD := "
     -
 )"
 
-BROWSER_EXE := "ahk_exe librewolf.exe"
+BROWSER_WIN:= "ahk_class MozillaWindowClass"
-BROWSER_CMD := "C:\Program Files\LibreWolf\librewolf.exe"
+; BROWSER_CMD:= "C:\Program Files\Mozilla Firefox\firefox.exe"
+BROWSER_CMD:= "C:\Users\fernando.schauenburg\AppData\Local\Mozilla\Firefox\firefox.exe"
 
 ; Returns the rectangle (position & size) of a given monitor.
 MonitorGetRect(N)
@@ -108,40 +109,41 @@ WinSetMonitor(target, WinTitle:="A")
     WinSetRelativeRect(WinGetRelativeRect(WinTitle), target, WinTitle)
 }
 
-openProgram(WinExe, Target, WorkingDir, rect?)
+openProgram(WinTitle, Target, WorkingDir, rect?)
 {
-    if WinExist(WinExe) {
+    if WinExist(WinTitle) {
-        WinActivate(WinExe)
+        WinActivate(WinTitle)
     } else {
         Run(Target, WorkingDir)
         if IsSet(rect)
-            if WinWait(WinExe,,5)
+            if WinWait(WinTitle,,5)
-                WinSetRelativeRect(rect, 1, WinExe)
+                WinSetRelativeRect(rect, 1, WinTitle)
     }
 }
 
 POS := {
     ; 2x3 matrix
-    upperLeft   : {pos: {x:   0, y:   0}, size: {width: 1/3, height: 1/2 }},
+    upperLeft     : {pos: {x:   0, y:   0}, size: {width: 1/4, height: 1/2 }},
-    upperMiddle : {pos: {x: 1/3, y:   0}, size: {width: 1/3, height: 1/2 }},
+    upperMidLeft  : {pos: {x: 1/4, y:   0}, size: {width: 1/4, height: 1/2 }},
-    upperRight  : {pos: {x: 2/3, y:   0}, size: {width: 1/3, height: 1/2 }},
+    upperMidRight : {pos: {x: 2/4, y:   0}, size: {width: 1/4, height: 1/2 }},
-    lowerLeft   : {pos: {x:   0, y: 1/2}, size: {width: 1/3, height: 1/2 }},
+    upperRight    : {pos: {x: 3/4, y:   0}, size: {width: 1/4, height: 1/2 }},
-    lowerMiddle : {pos: {x: 1/3, y: 1/2}, size: {width: 1/3, height: 1/2 }},
+    lowerLeft     : {pos: {x:   0, y: 1/2}, size: {width: 1/4, height: 1/2 }},
-    lowerRight  : {pos: {x: 2/3, y: 1/2}, size: {width: 1/3, height: 1/2 }},
+    lowerMidLeft  : {pos: {x: 1/4, y: 1/2}, size: {width: 1/4, height: 1/2 }},
+    lowerMidRight : {pos: {x: 2/4, y: 1/2}, size: {width: 1/4, height: 1/2 }},
+    lowerRight    : {pos: {x: 3/4, y: 1/2}, size: {width: 1/4, height: 1/2 }},
 
-    ; Full Height Thirds
+    ; Full Height Thirds & Quarters
-    thirdLeft   : {pos: {x:   0, y:   0}, size: {width: 1/3, height:   1 }},
+    leftNarrow  : {pos: {x:   0, y:   0}, size: {width: 1/4, height:   1 }},
-    doubleLeft  : {pos: {x:   0, y:   0}, size: {width: 2/3, height:   1 }},
+    leftNormal  : {pos: {x:   0, y:   0}, size: {width: 1/3, height:   1 }},
-    thirdRight  : {pos: {x: 2/3, y:   0}, size: {width: 1/3, height:   1 }},
+    rightNormal : {pos: {x: 2/3, y:   0}, size: {width: 1/3, height:   1 }},
-    doubleRight : {pos: {x: 1/3, y:   0}, size: {width: 2/3, height:   1 }},
+    rightNarrow : {pos: {x: 3/4, y:   0}, size: {width: 1/4, height:   1 }},
 
     ; Full Height Halves
     halfLeft    : {pos: {x:   0, y:   0}, size: {width: 1/2, height:   1 }},
     halfRight   : {pos: {x: 1/2, y:   0}, size: {width: 1/2, height:   1 }},
 
     ; Center
-    mainFocus   : {pos: {x: 0.18, y:  0}, size: {width: 0.64, height:  1 }},
+    mainFocus   : {pos: {x: 0.25, y:  0}, size: {width: 0.5, height:  1 }},
-    fullScreen  : {pos: {x:    0, y:  0}, size: {width:    1, height:  1 }},
 }
 
 ; Uncomment the following line while making changes for easy reload.
@@ -150,28 +152,28 @@ POS := {
 ; Make sure NumLock is active so that Numpad mappinfs below will work.
 SetNumLockState True
 
-; 2x3 matrix
+; 2x4 matrix
 !#Numpad7::     WinSetRelativeRect(POS.upperLeft)
-!#NumpadDiv::   WinSetRelativeRect(POS.upperMiddle)
+!#NumpadDiv::   WinSetRelativeRect(POS.upperMidLeft)
-!#Numpad8::     WinSetRelativeRect(POS.upperMiddle)
+!#Numpad8::     WinSetRelativeRect(POS.upperMidRight)
 !#Numpad9::     WinSetRelativeRect(POS.upperRight)
 !#Numpad1::     WinSetRelativeRect(POS.lowerLeft)
-!#NumpadSub::   WinSetRelativeRect(POS.lowerMiddle)
+!#NumpadSub::   WinSetRelativeRect(POS.lowerMidLeft)
-!#Numpad2::     WinSetRelativeRect(POS.lowerMiddle)
+!#Numpad2::     WinSetRelativeRect(POS.lowerMidRight)
 !#Numpad3::     WinSetRelativeRect(POS.lowerRight)
 
 ; Full height thirds
-!#Numpad4::     WinSetRelativeRect(POS.thirdLeft)
+!#Numpad4::     WinSetRelativeRect(POS.leftNarrow)
-!#NumpadMult::  WinSetRelativeRect(POS.doubleLeft)
+!#NumpadMult::  WinSetRelativeRect(POS.leftNormal)
-!#Numpad5::     WinSetRelativeRect(POS.doubleRight)
+!#Numpad5::     WinSetRelativeRect(POS.rightNormal)
-!#Numpad6::     WinSetRelativeRect(POS.thirdRight)
+!#Numpad6::     WinSetRelativeRect(POS.rightNarrow)
 
 ; Full height halves
 !^Numpad1::     WinSetRelativeRect(POS.halfLeft)
 !^Numpad3::     WinSetRelativeRect(POS.halfRight)
 
 ; Center and...
-!#NumpadAdd::   WinSetRelativeRect(POS.fullScreen)  ; ... make full screen.
+!#NumpadAdd::   WinSetRelativeRect(POS.mainFocus)   ; ... resize to default.
 !^Numpad5::     WinCenter()                         ; ... keep size.
 
 ; Move to other monitor (FIXME this is a hack, but works on my current setup)
@@ -186,6 +188,6 @@ step := 50                 ;    dx     dy
 !^Numpad6::     WinTranslate( step,     0) ; right (L)
 
 ; Launch programs
-!^+t::openProgram(TERMINAL_EXE, TERMINAL_CMD, A_Temp, POS.mainFocus)
+!^+t::openProgram(TERMINAL_WIN, TERMINAL_CMD, A_Temp, POS.mainFocus)
-!^+b::openProgram(BROWSER_EXE, BROWSER_CMD, A_Temp, POS.mainFocus)
+!^+b::openProgram(BROWSER_WIN, BROWSER_CMD, A_Temp, POS.mainFocus)