Cynosphere
/
bug.n
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Added some debugging" 

This reverts commit 2fcad88aa9.
This commit is contained in:
joten 2015-02-27 21:57:25 +01:00
parent 7ef630cdd7
commit da67ca14e8
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Manager.ahk
View File

@ -673,8 +673,7 @@ Manager_restoreWindowBorders()
;; If the state is completely different, this function won't do much. However, if restoring from a crash ;; If the state is completely different, this function won't do much. However, if restoring from a crash
;; or simply restarting bug.n, it should completely recover the window state. ;; or simply restarting bug.n, it should completely recover the window state.
Manager__restoreWindowState(filename) { Manager__restoreWindowState(filename) {
Local candidate_set, detectHiddenWindows, excluded_view_set, hideTitle, i, isDecorated, isFloating, isManaged, items0, j, m, v Local vidx, widx, i, j, m, v, candidate_set, view_set, excluded_view_set, view_m0, view_v0, view_list0, wnds0, items0, wndPName, view_var, isManaged, isFloating, isDecorated, hideTitle
Local vidx, view_list0, view_m0, view_set, view_v0, view_var, widx, wndPName, wnds0
If Not FileExist(filename) If Not FileExist(filename)
Return Return
@ -732,10 +731,9 @@ Manager__restoreWindowState(filename) {
i := items%i% i := items%i%
j := 2 j := 2
detectHiddenWindows := DetectHiddenWindows
DetectHiddenWindows, On DetectHiddenWindows, On
WinGet, wndPName, ProcessName, ahk_id %i% WinGet, wndPName, ProcessName, ahk_id %i%
DetectHiddenWindows, %detectHiddenWindows% DetectHiddenWindows, Off
If Not ( items%j% = wndPName ) { If Not ( items%j% = wndPName ) {
Debug_logMessage("Window ahk_id " . i . " process '" . wndPName . "' doesn't match expected '" . items%j% . "', forgetting this window", 0) Debug_logMessage("Window ahk_id " . i . " process '" . wndPName . "' doesn't match expected '" . items%j% . "', forgetting this window", 0)
Continue Continue
@ -811,7 +809,7 @@ Manager_saveState() {
} }
Manager_saveWindowState(filename, nm, nv) { Manager_saveWindowState(filename, nm, nv) {
Local allWndId0, allWndIds, detectHiddenWindows, isManaged, isTitleHidden, monitor, text, title, wndId, view, wndPName Local allWndId0, allWndIds, wndPName, title, text, monitor, wndId, view, isManaged, isTitleHidden
text := "; bug.n - tiling window management`n; @version " VERSION "`n`n" text := "; bug.n - tiling window management`n; @version " VERSION "`n`n"
@ -822,7 +820,6 @@ Manager_saveWindowState(filename, nm, nv) {
; to recover that window. ; to recover that window.
StringTrimRight, allWndIds, Manager_allWndIds, 1 StringTrimRight, allWndIds, Manager_allWndIds, 1
StringSplit, allWndId, allWndIds, `; StringSplit, allWndId, allWndIds, `;
detectHiddenWindows := DetectHiddenWindows
DetectHiddenWindows, On DetectHiddenWindows, On
Loop, % allWndId0 { Loop, % allWndId0 {
wndId := allWndId%A_Index% wndId := allWndId%A_Index%
@ -837,7 +834,7 @@ Manager_saveWindowState(filename, nm, nv) {
text .= "Window " . wndId . ";" . wndPName . ";" . Window_#%wndId%_monitor . ";" . Window_#%wndId%_tags . ";" . Window_#%wndId%_isFloating . ";" . Window_#%wndId%_isDecorated . ";" . isTitleHidden . ";" . isManaged . ";" . title . "`n" text .= "Window " . wndId . ";" . wndPName . ";" . Window_#%wndId%_monitor . ";" . Window_#%wndId%_tags . ";" . Window_#%wndId%_isFloating . ";" . Window_#%wndId%_isDecorated . ";" . isTitleHidden . ";" . isManaged . ";" . title . "`n"
} }
DetectHiddenWindows, %detectHiddenWindows% DetectHiddenWindows, Off
text .= "`n" text .= "`n"
@ -1022,18 +1019,11 @@ Manager_initial_sync(doRestore) {
} }
Manager_unmanage(wndId) { Manager_unmanage(wndId) {
Local a, aView, aWndId, detectHiddenWindows, wndClass, wndTitle Local a, aView, aWndId
aView := Monitor_#%Manager_aMonitor%_aView_#1 aView := Monitor_#%Manager_aMonitor%_aView_#1
a := Window_#%wndId%_tags & 1 << aView - 1 a := Window_#%wndId%_tags & 1 << aView - 1
detectHiddenWindows := DetectHiddenWindows
DetectHiddenWindows, On
WinGetClass, wndClass, ahk_id %wndId%
WinGetTitle, wndTitle, ahk_id %wndId%
DetectHiddenWindows, %detectHiddenWindows%
Debug_logMessage("DEBUG[3] Manager_unmanage(wndId: " wndId "); class: " wndClass ", title: " wndTitle, 3)
Loop, % Config_viewCount { Loop, % Config_viewCount {
If (Window_#%wndId%_tags & 1 << A_Index - 1) { If (Window_#%wndId%_tags & 1 << A_Index - 1) {
StringReplace, View_#%Manager_aMonitor%_#%A_Index%_wndIds, View_#%Manager_aMonitor%_#%A_Index%_wndIds, % wndId ";",, All StringReplace, View_#%Manager_aMonitor%_#%A_Index%_wndIds, View_#%Manager_aMonitor%_#%A_Index%_wndIds, % wndId ";",, All