Revised getting and setting the active window

src/Debug.ahk

@@ -105,7 +105,7 @@ Debug_logWindowInfo(wndId) {
   Else
     isWinFocus := " "
   v := Monitor_#%Manager_aMonitor%_aView_#1
-  If View_#%Manager_aMonitor%_#%v%_aWndId = %wndId%
+  If (View_getActiveWindow(Manager_aMonitor, v) = wndId)
     isBugnActive := "*"
   Else
     isBugnActive := " "

src/Manager.ahk

@@ -70,11 +70,11 @@ Manager_activateMonitor(i, d = 0) {
 
   If (Manager_monitorCount > 1) {
     aView := Monitor_#%Manager_aMonitor%_aView_#1
-    aWndId := View_getActiveWindow(Manager_aMonitor, aView)
+    WinGet, aWndId, ID, A
-    If aWndId {
+    If WinExist("ahk_id" aWndId) And InStr(View_#%Manager_aMonitor%_#%aView%_wndIds, aWndId ";") And Window_isProg(aWndId) {
       WinGetPos, aWndX, aWndY, aWndWidth, aWndHeight, ahk_id %aWndId%
       If (Monitor_get(aWndX + aWndWidth / 2, aWndY + aWndHeight / 2) = Manager_aMonitor)
-        View_#%Manager_aMonitor%_#%aView%_aWndId := aWndId
+        View_setActiveWindow(Manager_aMonitor, aView, aWndId)
     }
 
     ;; Manually set the active monitor.
@@ -82,7 +82,7 @@ Manager_activateMonitor(i, d = 0) {
       i := Manager_aMonitor
     Manager_aMonitor := Manager_loop(i, d, 1, Manager_monitorCount)
     v := Monitor_#%Manager_aMonitor%_aView_#1
-    wndId := View_#%Manager_aMonitor%_#%v%_aWndId
+    wndId := View_getActiveWindow(Manager_aMonitor, v)
     If Not (wndId And WinExist("ahk_id" wndId)) {
       If View_#%Manager_aMonitor%_#%v%_wndIds
         wndId := SubStr(View_#%Manager_aMonitor%_#%v%_wndIds, 1, InStr(View_#%Manager_aMonitor%_#%v%_wndIds, ";") - 1)
@@ -247,7 +247,7 @@ Manager_getWindowList()
   Local text, v, aWndId, wndIds, aWndTitle
 
   v := Monitor_#%Manager_aMonitor%_aView_#1
-  aWndId := View_#%Manager_aMonitor%_#%v%_aWndId
+  aWndId := View_getActiveWindow(Manager_aMonitor, v)
   WinGetTitle, aWndTitle, ahk_id %aWndId%
   text := "Active Window`n" aWndId ":`t" aWndTitle
 
@@ -572,7 +572,7 @@ Manager_onShellMessage(wParam, lParam) {
           {
             wndId := wndId%A_Index%
             View_#%Manager_aMonitor%_#%t%_wndIds := wndId ";" View_#%Manager_aMonitor%_#%t%_wndIds
-            View_#%Manager_aMonitor%_#%t%_aWndId := wndId
+            View_setActiveWindow(Manager_aMonitor, t, wndId)
             Window_#%wndId%_tags += 1 << t - 1
           }
           Bar_updateView(Manager_aMonitor, t)
@@ -633,7 +633,7 @@ Manager_resetMonitorConfiguration() {
           {
             Loop, % Config_viewCount {
               StringReplace, View_#%i%_#%A_Index%_wndIds, View_#%i%_#%A_Index%_wndIds, %A_LoopField%`;,
-              View_#%i%_#%A_Index%_aWndId := 0
+              View_setActiveWindow(i, A_Index, 0)
             }
             Monitor_moveWindow(1, A_LoopField)
           }
@@ -907,7 +907,7 @@ Manager_setViewMonitor(i, d = 0) {
     {
       Loop, % Config_viewCount {
         StringReplace, View_#%Manager_aMonitor%_#%A_Index%_wndIds, View_#%Manager_aMonitor%_#%A_Index%_wndIds, %A_LoopField%`;,
-        View_#%Manager_aMonitor%_#%A_Index%_aWndId := 0
+        View_setActiveWindow(Manager_aMonitor, A_Index, 0)
       }
 
       Monitor_moveWindow(i, A_LoopField)
@@ -960,8 +960,8 @@ Manager_setWindowMonitor(i, d = 0) {
   If (Manager_monitorCount > 1 And InStr(Manager_managedWndIds, aWndId ";")) {
     Loop, % Config_viewCount {
       StringReplace, View_#%Manager_aMonitor%_#%A_Index%_wndIds, View_#%Manager_aMonitor%_#%A_Index%_wndIds, %aWndId%`;,
-      If (aWndId = View_#%Manager_aMonitor%_#%A_Index%_aWndId)
+      If (View_getActiveWindow(Manager_aMonitor, A_Index) = aWndId)
-        View_#%Manager_aMonitor%_#%A_Index%_aWndId := 0
+        View_setActiveWindow(Manager_aMonitor, A_Index, 0)
       Bar_updateView(Manager_aMonitor, A_Index)
     }
     If Config_dynamicTiling
@@ -975,7 +975,7 @@ Manager_setWindowMonitor(i, d = 0) {
     v := Monitor_#%Manager_aMonitor%_aView_#1
     Window_#%aWndId%_tags := 1 << v - 1
     View_#%Manager_aMonitor%_#%v%_wndIds := aWndId ";" View_#%Manager_aMonitor%_#%v%_wndIds
-    View_#%Manager_aMonitor%_#%v%_aWndId := aWndId
+    View_setActiveWindow(Manager_aMonitor, v, aWndId)
     If Config_dynamicTiling
       View_arrange(Manager_aMonitor, v)
     Manager_winActivate(aWndId)

src/Monitor.ahk

@@ -51,9 +51,9 @@ Monitor_activateView(i, d = 0) {
   }
 
   aView := Monitor_#%Manager_aMonitor%_aView_#1
-  aWndId := View_getActiveWindow(Manager_aMonitor, aView)
+  WinGet, aWndId, ID, A
-  If aWndId
+  If WinExist("ahk_id" aWndId) And InStr(View_#%Manager_aMonitor%_#%aView%_wndIds, aWndId ";") And Window_isProg(aWndId)
-    View_#%Manager_aMonitor%_#%aView%_aWndId := aWndId
+    View_setActiveWindow(Manager_aMonitor, aView, aWndId)
 
   n := Config_syncMonitorViews
   If (n = 1)
@@ -79,7 +79,7 @@ Monitor_activateView(i, d = 0) {
     SetWinDelay, 10
     detectHidden := A_DetectHiddenWindows
     DetectHiddenWindows, On
-    wndId := View_#%m%_#%i%_aWndId
+    wndId := View_getActiveWindow(m, i)
     If wndId
       Window_set(wndId, "AlwaysOnTop", "On")
     View_arrange(m, i)
@@ -98,11 +98,11 @@ Monitor_activateView(i, d = 0) {
     Bar_updateView(m, i)
   }
 
-  wndId := View_#%Manager_aMonitor%_#%i%_aWndId
+  wndId := View_getActiveWindow(Manager_aMonitor, i)
   If Not (wndId And WinExist("ahk_id" wndId)) {
     If View_#%Manager_aMonitor%_#%i%_wndIds {
       wndId := SubStr(View_#%Manager_aMonitor%_#%i%_wndIds, 1, InStr(View_#%Manager_aMonitor%_#%i%_wndIds, ";")-1)
-      View_#%Manager_aMonitor%_#%i%_aWndId := wndId
+      View_setActiveWindow(Manager_aMonitor, i, wndId)
     } Else
       wndId := 0
   }
@@ -216,7 +216,7 @@ Monitor_setWindowTag(i, d = 0) {
       Loop, % Config_viewCount {
         If Not (Window_#%aWndId%_tags & (1 << A_Index - 1)) {
           View_#%Manager_aMonitor%_#%A_Index%_wndIds := aWndId ";" View_#%Manager_aMonitor%_#%A_Index%_wndIds
-          View_#%Manager_aMonitor%_#%A_Index%_aWndId := aWndId
+          View_setActiveWindow(Manager_aMonitor, A_Index, aWndId)
           Bar_updateView(Manager_aMonitor, A_Index)
           Window_#%aWndId%_tags += 1 << A_Index - 1
         }
@@ -225,14 +225,14 @@ Monitor_setWindowTag(i, d = 0) {
       Loop, % Config_viewCount {
         If Not (A_index = i) {
           StringReplace, View_#%Manager_aMonitor%_#%A_Index%_wndIds, View_#%Manager_aMonitor%_#%A_Index%_wndIds, %aWndId%`;,
-          View_#%Manager_aMonitor%_#%A_Index%_aWndId := 0
+          View_setActiveWindow(Manager_aMonitor, A_Index, 0)
           Bar_updateView(Manager_aMonitor, A_Index)
         }
       }
 
       If Not (Window_#%aWndId%_tags & (1 << i - 1))
         View_#%Manager_aMonitor%_#%i%_wndIds := aWndId ";" View_#%Manager_aMonitor%_#%i%_wndIds
-      View_#%Manager_aMonitor%_#%i%_aWndId := aWndId
+      View_setActiveWindow(Manager_aMonitor, i, aWndId)
       Window_#%aWndId%_tags := 1 << i - 1
 
       aView := Monitor_#%Manager_aMonitor%_aView_#1
@@ -326,7 +326,7 @@ Monitor_toggleWindowTag(i, d = 0) {
       }
     } Else {
       View_#%Manager_aMonitor%_#%i%_wndIds := aWndId ";" View_#%Manager_aMonitor%_#%i%_wndIds
-      View_#%Manager_aMonitor%_#%i%_aWndId := aWndId
+      View_setActiveWindow(Manager_aMonitor, i, aWndId)
       Bar_updateView(Manager_aMonitor, i)
       Window_#%aWndId%_tags += 1 << i - 1
     }

src/View.ahk

@@ -144,13 +144,9 @@ View_arrange(m, v, setLayout = False) {
 }
 
 View_getActiveWindow(m, v) {
-  Local aWndId
+  Global
 
-  WinGet, aWndId, ID, A
+  Return, View_#%m%_#%v%_aWndId
-  If WinExist("ahk_id" aWndId) And InStr(View_#%m%_#%v%_wndIds, aWndId ";") And Window_isProg(aWndId)
-    Return, aWndId
-  Else
-    Return, 0
 }
 
 View_getTiledWndIds(m, v)
@@ -197,6 +193,12 @@ View_moveWindow(i=0, d=0) {
   }
 }
 
+View_setActiveWindow(m, v, wndId) {
+  Global
+
+  View_#%m%_#%v%_aWndId := wndId
+}
+
 View_setGapWidth(i, d = 0) {
   Local v