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

Manual merge with latest from berlios

Browse source
This commit is contained in:
Joshua Fuhs 2012-12-03 21:52:43 -05:00
parent e9e5a853cc
commit fe1f4793f4
3 changed files with 1081 additions and 867 deletions
Download patch file Download diff file Expand all files Collapse all files

897
src/Manager.ahk
View file

File diff suppressed because it is too large Load diff

224
src/Monitor.ahk
View file

@ -1,38 +1,42 @@
/** /*
* bug.n - tiling window management bug.n -- tiling window management
* Copyright (c) 2010-2012 joten Copyright (c) 2010-2012 Joshua Fuhs, joten
*
* This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* @version 8.3.0 @version 8.3.0
*/ */
Monitor_init(m) { Monitor_init(m)
{
Global Global
Monitor_#%m%_aView_#1 := 1 Monitor_#%m%_aView_#1 := 1
Monitor_#%m%_aView_#2 := 1 Monitor_#%m%_aView_#2 := 1
Monitor_#%m%_showBar := Config_showBar Monitor_#%m%_showBar := Config_showBar
Loop, % Config_viewCount Loop, % Config_viewCount
{
View_init(m, A_Index) View_init(m, A_Index)
}
Config_restoreLayout(Main_autoLayout, m) Config_restoreLayout(Main_autoLayout, m)
Monitor_getWorkArea(m) Monitor_getWorkArea(m)
Bar_init(m) Bar_init(m)
} }
Monitor_activateView(v) { Monitor_activateView(v)
Local aView, aWndClass, aWndId, aWndTitle, m, n, wndId, wndIds {
Local aView, aWndId, m, n, wndId, wndIds
If (v = -1) If (v = -1)
v := Monitor_#%Manager_aMonitor%_aView_#2 v := Monitor_#%Manager_aMonitor%_aView_#2
@ -41,54 +45,53 @@ Monitor_activateView(v) {
Else If (v = "<") Else If (v = "<")
v := Manager_loop(Monitor_#%Manager_aMonitor%_aView_#1, -1, 1, Config_viewCount) v := Manager_loop(Monitor_#%Manager_aMonitor%_aView_#1, -1, 1, Config_viewCount)
Debug_logMessage("Monitor_activateView(" . v . ") Manager_aMonitor: " . Manager_aMonitor . "; wndIds: " . View_#%m%_#%aView%_wndIds, 1) Debug_logMessage("DEBUG[1] Monitor_activateView(" . v . ") Manager_aMonitor: " . Manager_aMonitor . "; wndIds: " . View_#%Manager_aMonitor%_#%v%_wndIds, 1)
If (v <= 0) Or (v > Config_viewCount) Or Manager_hideShow If (v <= 0) Or (v > Config_viewCount) Or Manager_hideShow
Return Return
; Re-arrange the windows on the view. ;; Re-arrange the windows on the active view.
If (v = Monitor_#%Manager_aMonitor%_aView_#1) { If (v = Monitor_#%Manager_aMonitor%_aView_#1)
{
View_arrange(Manager_aMonitor, v) View_arrange(Manager_aMonitor, v)
Return Return
} }
aView := Monitor_#%Manager_aMonitor%_aView_#1 aView := Monitor_#%Manager_aMonitor%_aView_#1
WinGet, aWndId, ID, A aWndId := View_getActiveWindow(Manager_aMonitor, aView)
If WinExist("ahk_id" aWndId) And InStr(View_#%Manager_aMonitor%_#%aView%_wndIds, aWndId ";") { If aWndId
WinGetClass, aWndClass, ahk_id %aWndId% View_#%Manager_aMonitor%_#%aView%_aWndId := aWndId
WinGetTitle, aWndTitle, ahk_id %aWndId%
If Not (aWndClass = "Progman") And Not (aWndClass = "AutoHotkeyGui" And SubStr(aWndTitle, 1, 10) = "bug.n_BAR_") And Not (aWndClass = "DesktopBackgroundClass")
View_#%Manager_aMonitor%_#%aView%_aWndId := aWndId
}
n := 1 n := Config_syncMonitorViews
If (Config_syncMonitorViews > 0) If (n = 1)
n := Manager_monitorCount n := Manager_monitorCount
Loop, % n { Else If (n < 1)
n := 1
Loop, % n
{
If (n = 1) If (n = 1)
m := Manager_aMonitor m := Manager_aMonitor
Else Else
m := A_Index m := A_Index
Monitor_#%m%_aView_#2 := aView Monitor_#%m%_aView_#2 := aView
Monitor_#%m%_aView_#1 := v Monitor_#%m%_aView_#1 := v
Manager_hideShow := True Manager_hideShow := True
; Most of the operations here are dispersed to multiple _different_ windows.
; Delays in this part of the code are extremely noticeable and the users
; do a lot of view switching.
SetWinDelay, 0 SetWinDelay, 0
StringTrimRight, wndIds, View_#%m%_#%aView%_wndIds, 1 StringTrimRight, wndIds, View_#%m%_#%aView%_wndIds, 1
Loop, PARSE, wndIds, `; Loop, PARSE, wndIds, `;
{
If Not (Manager_#%A_LoopField%_tags & (1 << v - 1)) If Not (Manager_#%A_LoopField%_tags & (1 << v - 1))
Manager_winHide(A_LoopField) Manager_winHide(A_LoopField)
}
SetWinDelay, 10 SetWinDelay, 10
DetectHiddenWindows, On DetectHiddenWindows, On
View_arrange(m, v) View_arrange(m, v)
DetectHiddenWindows, Off DetectHiddenWindows, Off
StringTrimRight, wndIds, View_#%m%_#%v%_wndIds, 1 StringTrimRight, wndIds, View_#%m%_#%v%_wndIds, 1
SetWinDelay, 0 SetWinDelay, 0
Loop, PARSE, wndIds, `; Loop, PARSE, wndIds, `;
{
Manager_winShow(A_LoopField) Manager_winShow(A_LoopField)
}
SetWinDelay, 10 SetWinDelay, 10
Manager_hideShow := False Manager_hideShow := False
@ -97,30 +100,38 @@ Monitor_activateView(v) {
} }
wndId := View_#%Manager_aMonitor%_#%v%_aWndId wndId := View_#%Manager_aMonitor%_#%v%_aWndId
If Not (wndId And WinExist("ahk_id" wndId)) { If Not (wndId And WinExist("ahk_id" wndId))
If View_#%Manager_aMonitor%_#%v%_wndIds { {
If View_#%Manager_aMonitor%_#%v%_wndIds
{
wndId := SubStr(View_#%Manager_aMonitor%_#%v%_wndIds, 1, InStr(View_#%Manager_aMonitor%_#%v%_wndIds, ";")-1) wndId := SubStr(View_#%Manager_aMonitor%_#%v%_wndIds, 1, InStr(View_#%Manager_aMonitor%_#%v%_wndIds, ";")-1)
View_#%Manager_aMonitor%_#%v%_aWndId := wndId View_#%Manager_aMonitor%_#%v%_aWndId := wndId
} Else }
Else
wndId := 0 wndId := 0
} }
Manager_winActivate(wndId) Manager_winActivate(wndId)
} }
Monitor_get(x, y) { Monitor_get(x, y)
{
Local m Local m
m := 0 m := 0
Loop, % Manager_monitorCount ; Check if the window is on this monitor. Loop, % Manager_monitorCount
If (x >= Monitor_#%A_Index%_x && x <= Monitor_#%A_Index%_x+Monitor_#%A_Index%_width && y >= Monitor_#%A_Index%_y && y <= Monitor_#%A_Index%_y+Monitor_#%A_Index%_height) { { ;; Check if the window is on this monitor.
If (x >= Monitor_#%A_Index%_x && x <= Monitor_#%A_Index%_x+Monitor_#%A_Index%_width && y >= Monitor_#%A_Index%_y && y <= Monitor_#%A_Index%_y+Monitor_#%A_Index%_height)
{
m := A_Index m := A_Index
Break Break
} }
}
Return, m Return, m
} }
Monitor_getWorkArea(m) { Monitor_getWorkArea(m)
{
Local bTop, x, y Local bTop, x, y
Local monitor, monitorBottom, monitorLeft, monitorRight, monitorTop Local monitor, monitorBottom, monitorLeft, monitorRight, monitorTop
Local wndClasses, wndHeight, wndId, wndWidth, wndX, wndY Local wndClasses, wndHeight, wndId, wndWidth, wndX, wndY
@ -133,27 +144,40 @@ Monitor_getWorkArea(m) {
Loop, PARSE, wndClasses, `; Loop, PARSE, wndClasses, `;
{ {
wndId := WinExist("ahk_class " A_LoopField) wndId := WinExist("ahk_class " A_LoopField)
If wndId { If wndId
{
WinGetPos, wndX, wndY, wndWidth, wndHeight, ahk_id %wndId% WinGetPos, wndX, wndY, wndWidth, wndHeight, ahk_id %wndId%
x := wndX + wndWidth / 2 x := wndX + wndWidth / 2
y := wndY + wndHeight / 2 y := wndY + wndHeight / 2
If (x >= monitorLeft && x <= monitorRight && y >= monitorTop && y <= monitorBottom) { If (x >= monitorLeft && x <= monitorRight && y >= monitorTop && y <= monitorBottom)
{
If (A_LoopField = "Shell_TrayWnd") If (A_LoopField = "Shell_TrayWnd")
Manager_taskBarMonitor := m Manager_taskBarMonitor := m
If (wndHeight < wndWidth) { ; Horizontal If (wndHeight < wndWidth)
If (wndY <= monitorTop) { ; Top { ;; Horizontal
If (wndY <= monitorTop)
{ ;; Top
wndHeight += wndY - monitorTop wndHeight += wndY - monitorTop
monitorTop += wndHeight monitorTop += wndHeight
} Else { ; Bottom If (A_LoopField = "Shell_TrayWnd")
Manager_taskBarPos := "top"
}
Else
{ ;; Bottom
wndHeight := monitorBottom - wndY wndHeight := monitorBottom - wndY
monitorBottom -= wndHeight monitorBottom -= wndHeight
} }
} Else { ; Vertical }
If (wndX <= monitorLeft) { ; Left Else
{ ;; Vertical
If (wndX <= monitorLeft)
{ ;; Left
wndWidth += wndX wndWidth += wndX
monitorLeft += wndWidth monitorLeft += wndWidth
} Else { ; Right }
Else
{ ;; Right
wndWidth := monitorRight - wndX wndWidth := monitorRight - wndX
monitorRight -= wndWidth monitorRight -= wndWidth
} }
@ -161,11 +185,16 @@ Monitor_getWorkArea(m) {
} }
} }
} }
If Monitor_#%m%_showBar { bTop := 0
If (Config_verticalBarPos = "top" Or (Config_verticalBarPos = "tray" And Not m = Manager_taskBarMonitor)) { If Monitor_#%m%_showBar
{
If (Config_verticalBarPos = "top" Or (Config_verticalBarPos = "tray" And Not m = Manager_taskBarMonitor))
{
bTop := monitorTop bTop := monitorTop
monitorTop += Bar_height monitorTop += Bar_height
} Else If (Config_verticalBarPos = "bottom") { }
Else If (Config_verticalBarPos = "bottom")
{
bTop := monitorBottom - Bar_height bTop := monitorBottom - Bar_height
monitorBottom -= Bar_height monitorBottom -= Bar_height
} }
@ -178,13 +207,15 @@ Monitor_getWorkArea(m) {
Monitor_#%m%_barY := bTop Monitor_#%m%_barY := bTop
} }
Monitor_moveWindow(m, wndId) { Monitor_moveWindow(m, wndId)
{
Global Global
Manager_#%wndId%_monitor := m Manager_#%wndId%_monitor := m
} }
Monitor_setWindowTag(t) { Monitor_setWindowTag(t)
{
Local aView, aWndId, wndId Local aView, aWndId, wndId
If (t = ">") If (t = ">")
@ -193,22 +224,32 @@ Monitor_setWindowTag(t) {
t := Manager_loop(Monitor_#%Manager_aMonitor%_aView_#1, -1, 1, Config_viewCount) t := Manager_loop(Monitor_#%Manager_aMonitor%_aView_#1, -1, 1, Config_viewCount)
WinGet, aWndId, ID, A WinGet, aWndId, ID, A
If (InStr(Manager_managedWndIds, aWndId ";") And t >= 0 And t <= Config_viewCount) { If (InStr(Manager_managedWndIds, aWndId ";") And t >= 0 And t <= Config_viewCount)
If (t = 0) { {
Loop, % Config_viewCount If (t = 0)
If Not (Manager_#%aWndId%_tags & (1 << A_Index - 1)) { {
Loop, % Config_viewCount
{
If Not (Manager_#%aWndId%_tags & (1 << A_Index - 1))
{
View_#%Manager_aMonitor%_#%A_Index%_wndIds := aWndId ";" View_#%Manager_aMonitor%_#%A_Index%_wndIds View_#%Manager_aMonitor%_#%A_Index%_wndIds := aWndId ";" View_#%Manager_aMonitor%_#%A_Index%_wndIds
View_#%Manager_aMonitor%_#%A_Index%_aWndId := aWndId View_#%Manager_aMonitor%_#%A_Index%_aWndId := aWndId
Bar_updateView(Manager_aMonitor, A_Index) Bar_updateView(Manager_aMonitor, A_Index)
Manager_#%aWndId%_tags += 1 << A_Index - 1 Manager_#%aWndId%_tags += 1 << A_Index - 1
} }
} Else { }
Loop, % Config_viewCount }
If Not (A_index = t) { Else
{
Loop, % Config_viewCount
{
If Not (A_index = t)
{
StringReplace, View_#%Manager_aMonitor%_#%A_Index%_wndIds, View_#%Manager_aMonitor%_#%A_Index%_wndIds, %aWndId%`;, StringReplace, View_#%Manager_aMonitor%_#%A_Index%_wndIds, View_#%Manager_aMonitor%_#%A_Index%_wndIds, %aWndId%`;,
View_#%Manager_aMonitor%_#%A_Index%_aWndId := 0 View_#%Manager_aMonitor%_#%A_Index%_aWndId := 0
Bar_updateView(Manager_aMonitor, A_Index) Bar_updateView(Manager_aMonitor, A_Index)
} }
}
If Not (Manager_#%aWndId%_tags & (1 << t - 1)) If Not (Manager_#%aWndId%_tags & (1 << t - 1))
View_#%Manager_aMonitor%_#%t%_wndIds := aWndId ";" View_#%Manager_aMonitor%_#%t%_wndIds View_#%Manager_aMonitor%_#%t%_wndIds := aWndId ";" View_#%Manager_aMonitor%_#%t%_wndIds
@ -216,14 +257,16 @@ Monitor_setWindowTag(t) {
Manager_#%aWndId%_tags := 1 << t - 1 Manager_#%aWndId%_tags := 1 << t - 1
aView := Monitor_#%Manager_aMonitor%_aView_#1 aView := Monitor_#%Manager_aMonitor%_aView_#1
If Not (t = aView) { If Not (t = aView)
{
Manager_hideShow := True Manager_hideShow := True
wndId := SubStr(View_#%Manager_aMonitor%_#%aView%_wndIds, 1, InStr(View_#%Manager_aMonitor%_#%aView%_wndIds, ";")-1) wndId := SubStr(View_#%Manager_aMonitor%_#%aView%_wndIds, 1, InStr(View_#%Manager_aMonitor%_#%aView%_wndIds, ";")-1)
Manager_winActivate(wndId) Manager_winActivate(wndId)
Manager_hideShow := False Manager_hideShow := False
If Config_viewFollowsTagged If Config_viewFollowsTagged
Monitor_activateView(t) Monitor_activateView(t)
Else { Else
{
Manager_hideShow := True Manager_hideShow := True
Manager_winHide(aWndId) Manager_winHide(aWndId)
Manager_hideShow := False Manager_hideShow := False
@ -235,7 +278,8 @@ Monitor_setWindowTag(t) {
} }
} }
Monitor_toggleBar() { Monitor_toggleBar()
{
Global Global
Monitor_#%Manager_aMonitor%_showBar := Not Monitor_#%Manager_aMonitor%_showBar Monitor_#%Manager_aMonitor%_showBar := Not Monitor_#%Manager_aMonitor%_showBar
@ -245,17 +289,22 @@ Monitor_toggleBar() {
Manager_winActivate(Bar_aWndId) Manager_winActivate(Bar_aWndId)
} }
Monitor_toggleTaskBar() { Monitor_toggleTaskBar()
{
Local m Local m
m := Manager_aMonitor m := Manager_aMonitor
If (m = Manager_taskBarMonitor) { If (m = Manager_taskBarMonitor)
{
Manager_showTaskBar := Not Manager_showTaskBar Manager_showTaskBar := Not Manager_showTaskBar
Manager_hideShow := True Manager_hideShow := True
If Not Manager_showTaskBar { If Not Manager_showTaskBar
{
WinHide, Start ahk_class Button WinHide, Start ahk_class Button
WinHide, ahk_class Shell_TrayWnd WinHide, ahk_class Shell_TrayWnd
} Else { }
Else
{
WinShow, Start ahk_class Button WinShow, Start ahk_class Button
WinShow, ahk_class Shell_TrayWnd WinShow, ahk_class Shell_TrayWnd
} }
@ -266,17 +315,22 @@ Monitor_toggleTaskBar() {
} }
} }
Monitor_toggleWindowTag(t) { Monitor_toggleWindowTag(t)
{
Local aWndId, wndId Local aWndId, wndId
WinGet, aWndId, ID, A WinGet, aWndId, ID, A
If (InStr(Manager_managedWndIds, aWndId ";") And t >= 0 And t <= Config_viewCount) { If (InStr(Manager_managedWndIds, aWndId ";") And t >= 0 And t <= Config_viewCount)
If (Manager_#%aWndId%_tags & (1 << t - 1)) { {
If Not ((Manager_#%aWndId%_tags - (1 << t - 1)) = 0) { If (Manager_#%aWndId%_tags & (1 << t - 1))
{
If Not ((Manager_#%aWndId%_tags - (1 << t - 1)) = 0)
{
Manager_#%aWndId%_tags -= 1 << t - 1 Manager_#%aWndId%_tags -= 1 << t - 1
StringReplace, View_#%Manager_aMonitor%_#%t%_wndIds, View_#%Manager_aMonitor%_#%t%_wndIds, %aWndId%`;, StringReplace, View_#%Manager_aMonitor%_#%t%_wndIds, View_#%Manager_aMonitor%_#%t%_wndIds, %aWndId%`;,
Bar_updateView(Manager_aMonitor, t) Bar_updateView(Manager_aMonitor, t)
If (t = Monitor_#%Manager_aMonitor%_aView_#1) { If (t = Monitor_#%Manager_aMonitor%_aView_#1)
{
Manager_hideShow := True Manager_hideShow := True
Manager_winHide(aWndId) Manager_winHide(aWndId)
Manager_hideShow := False Manager_hideShow := False
@ -285,7 +339,9 @@ Monitor_toggleWindowTag(t) {
View_arrange(Manager_aMonitor, t) View_arrange(Manager_aMonitor, t)
} }
} }
} Else { }
Else
{
View_#%Manager_aMonitor%_#%t%_wndIds := aWndId ";" View_#%Manager_aMonitor%_#%t%_wndIds View_#%Manager_aMonitor%_#%t%_wndIds := aWndId ";" View_#%Manager_aMonitor%_#%t%_wndIds
View_#%Manager_aMonitor%_#%t%_aWndId := aWndId View_#%Manager_aMonitor%_#%t%_aWndId := aWndId
Bar_updateView(Manager_aMonitor, t) Bar_updateView(Manager_aMonitor, t)

827
src/View.ahk
View file

File diff suppressed because it is too large Load diff