initial fork commit

This commit is contained in:
Cynthia Foxwell 2022-02-15 14:38:14 -07:00
parent 914c47c506
commit 0f6580b372
7 changed files with 563 additions and 80 deletions

28
CHANGES.md Normal file
View file

@ -0,0 +1,28 @@
# Changes
Required by license to disclose changes.
## Bar
* Disabled shebang
* Icon support
* Time and date can be combined and clicked on to change between states
* MusicBee integration via MusicBeeIPC plugin
* Proper text resizing
* Clicking items no longer repositions mouse cursor
* Bar elements no longer have progress element
* Time has optional binary clock mode
## Config
* Renamed `Config_readinMemoryUsage` to `Config_readinRam`
* Added `Config_readinMusic`, only supports MusicBee currently
* Added `Config_readinTimeBinary` for enabling binary clock
* Removed `Config_readinDiskLoad` and `Config_readinNetworkLoad`
* Added `Config_barItemSpacing`, `Config_barIconSpacing` and `Config_iconFontYOffset`
* Added `Config_barIcons`: `<time>;<date>;<ram>;<cpu>;<battery>;<volume>;<music>`
* Added `Config_combineDateAndTime`
## ResourceMonitor
* RAM is now in MB
* Different CPU load getting functions
## Window
* Implement [#283](https://github.com/fuhsjr00/bug.n/pull/283)

View file

@ -1,4 +1,4 @@
/* /*
bug.n -- tiling window management bug.n -- tiling window management
Copyright (c) 2010-2019 Joshua Fuhs, joten Copyright (c) 2010-2019 Joshua Fuhs, joten
@ -43,7 +43,7 @@ Bar_init(m) {
Debug_logMessage("DEBUG[6] Bar_init(): Gui, " . GuiN . ": Default", 6) Debug_logMessage("DEBUG[6] Bar_init(): Gui, " . GuiN . ": Default", 6)
Gui, %GuiN%: Default Gui, %GuiN%: Default
Gui, Destroy Gui, Destroy
Gui, +AlwaysOnTop -Caption +LabelBar_Gui +LastFound +ToolWindow Gui, -Caption +LabelBar_Gui +LastFound +ToolWindow
Gui, Color, %Config_backColor_#1_#3% Gui, Color, %Config_backColor_#1_#3%
Gui, Font, c%Config_fontColor_#1_#3% s%Config_fontSize%, %Config_fontName% Gui, Font, c%Config_fontColor_#1_#3% s%Config_fontSize%, %Config_fontName%
@ -61,47 +61,65 @@ Bar_init(m) {
x1 += w x1 += w
;; The x-position and width of the sub-windows right of the window title are set from the right. ;; The x-position and width of the sub-windows right of the window title are set from the right.
;; <view>;<layout>;<title>;<shebang>;<time>;<date>;<anyText>;<batteryStatus>;<volumeLevel> ;; <view>;<layout>;<title>;<shebang>;<time>;<date>;<anyText>;<battery>;<volumeLevel>
color := "4" ;color := "4"
id := "shebang" ;id := "shebang"
text := " #! " ;text := " #! "
color := ""
id := ""
text := ""
If Config_readinTime { If Config_readinTime {
color .= ";5" color .= "4"
id .= ";time" id .= "time"
text .= "; " . Config_readinTimeFormat . " " text .= "" . Config_readinTimeFormat
} }
If Config_readinDate { If (Config_readinDate And !Config_combineDateAndTime) {
color .= ";6" color .= ";5"
id .= ";date" id .= ";date"
text .= "; " . Config_readinDateFormat . " " text .= ";" . Config_readinDateFormat
} }
If Config_readinVolume { If Config_readinVolume {
color .= ";9" color .= ";9"
id .= ";volume" id .= ";volume"
text .= "; VOL: ???% " text .= ";VOL: ???%"
} }
anyText := Config_readinAny() If Config_readinRam {
If anyText { color .= ";6"
id .= ";ram"
text .= ";" . ResourceMonitor_getRamText()
}
If Config_readinCpu {
color .= ";7" color .= ";7"
id .= ";anyText" id .= ";cpu"
text .= ";" anyText text .= ";" . ResourceMonitor_getCpuText()
} }
If Config_readinBat { If Config_readinBat {
color .= ";8" color .= ";8"
id .= ";batteryStatus" id .= ";battery"
text .= "; BAT: ???% " text .= ";BAT: ???%"
}
If Config_readinMusic {
color .= ";10"
id .= ";music"
text .= ";" . MusicBee_GetNowPlaying()
} }
StringSplit, color, color, `; StringSplit, color, color, `;
StringSplit, id, id, `; StringSplit, id, id, `;
StringSplit, text, text, `; StringSplit, text, text, `;
Loop, % id0 { Loop, % id0 {
If (id%A_Index% = "shebang") elemId := id%A_Index%
If (elemId = "shebang")
Gui, -Disabled Gui, -Disabled
w := Bar_getTextWidth(text%A_Index%) w := Bar_getTextWidth(text%A_Index%)
x2 -= w x2 -= w
titleWidth -= w titleWidth -= w
i := color%A_Index% i := color%A_Index%
Bar_addElement(m, id%A_Index%, text%A_Index%, x2, y1, w, Config_backColor_#1_#%i%, Config_foreColor_#1_#%i%, Config_fontColor_#1_#%i%) iconIndex := i - 3
icon := Config_barIcon_#%iconIndex%
iconId := % elemId "_icon"
Bar_addElement(m, elemId, text%A_Index%, x2, y1, wndWidth, Config_backColor_#1_#%i%, Config_foreColor_#1_#%i%, Config_fontColor_#1_#%i%)
Bar_addElement(m, iconId, icon, x2, y1, wndWidth, Config_backColor_#1_#%i%, Config_foreColor_#1_#%i%, Config_fontColor_#1_#%i%, Config_iconFontSize, Config_iconFontName)
GuiControl, -Center, Bar_#%m%_%elemId%
} }
;; Window title (remaining space) ;; Window title (remaining space)
@ -161,6 +179,9 @@ Bar_init(m) {
DllCall("Shell32.dll\SHAppBarMessage", "UInt", (ABM_SETPOS := 0x3) , "UInt", &Bar_appBarData) DllCall("Shell32.dll\SHAppBarMessage", "UInt", (ABM_SETPOS := 0x3) , "UInt", &Bar_appBarData)
;; SKAN: Crazy Scripting : Quick Launcher for Portable Apps (http://www.autohotkey.com/forum/topic22398.html) ;; SKAN: Crazy Scripting : Quick Launcher for Portable Apps (http://www.autohotkey.com/forum/topic22398.html)
} }
Bar_BinaryClockChars := ["","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","",""]
Bar_TimeDateState := 0
} }
Bar_initCmdGui() Bar_initCmdGui()
@ -188,15 +209,23 @@ Bar_initCmdGui()
Gui, Show, Hide w%Bar_#0_#0W% h%Bar_#0_#0H%, %wndTitle% Gui, Show, Hide w%Bar_#0_#0W% h%Bar_#0_#0H%, %wndTitle%
} }
Bar_addElement(m, id, text, x, y1, width, backColor, foreColor, fontColor) { Bar_addElement(m, id, text, x, y1, width, backColor, foreColor, fontColor, fontSize="", fontName="") {
Local y2 Local y2
if (fontSize == "") {
fontSize = %Config_fontSize%
}
if (fontName == "") {
fontName = %Config_fontName%
}
y2 := y1 + (Bar_ctrlHeight - Bar_textHeight) / 2 y2 := y1 + (Bar_ctrlHeight - Bar_textHeight) / 2
Gui, Add, Text, x%x% y%y1% w%width% h%Bar_ctrlHeight% BackgroundTrans vBar_#%m%_%id%_event gBar_GuiClick, Gui, Add, Text, x%x% y%y1% w%width% h%Bar_ctrlHeight% BackgroundTrans vBar_#%m%_%id%_event gBar_GuiClick,
Gui, Add, Progress, x%x% y%y1% w%width% h%Bar_ctrlHeight% Background%backColor% c%foreColor% vBar_#%m%_%id%_highlighted ;Gui, Add, Progress, x%x% y%y1% w%width% h%Bar_ctrlHeight% Background%backColor% c%foreColor% vBar_#%m%_%id%_highlighted
GuiControl, , Bar_#%m%_%id%_highlighted, 100 ;GuiControl, , Bar_#%m%_%id%_highlighted, 100
Gui, Font, c%fontColor% Gui, Font, c%fontColor% s%fontSize%, %fontName%
Gui, Add, Text, x%x% y%y2% w%width% h%Bar_textHeight% BackgroundTrans Center vBar_#%m%_%id%, %text% Gui, Add, Text, x%x% y%y2% w%width% h%Bar_textHeight% BackgroundTrans Center vBar_#%m%_%id% HwndBar_#%m%_%id%_hwnd, %text%
} }
Bar_cmdGuiEnter: Bar_cmdGuiEnter:
@ -289,14 +318,46 @@ Bar_getTextWidth(x, reverse=False)
Return, textWidth Return, textWidth
} }
Bar_getTrueTextWidth(controlHwnd, newText) {
dc := DllCall("GetDC", "Ptr", controlHwnd)
; 0x31 = WM_GETFONT
SendMessage 0x31,,,, ahk_id %controlHwnd%
hFont := ErrorLevel
oldFont := 0
if (hFont != "FAIL")
oldFont := DllCall("SelectObject", "Ptr", dc, "Ptr", hFont)
VarSetCapacity(rect, 16, 0)
; 0x440 = DT_CALCRECT | DT_EXPANDTABS
h := DllCall("DrawText", "Ptr", dc, "Ptr", &newText, "Int", -1, "Ptr", &rect, "UInt", 0x440)
; width = rect.right - rect.left
w := NumGet(rect, 8, "Int") - NumGet(rect, 0, "Int")
if oldFont
DllCall("SelectObject", "Ptr", dc, "Ptr", oldFont)
DllCall("ReleaseDC", "Ptr", controlHwnd, "Ptr", dc)
return w
}
Bar_GuiClick: Bar_GuiClick:
Manager_winActivate(Bar_aWndId) Manager_winActivate(Bar_aWndId)
If (A_GuiEvent = "Normal") { If (A_GuiEvent = "Normal") {
If (SubStr(A_GuiControl, -13) = "_shebang_event") { ;If (SubStr(A_GuiControl, -13) = "_shebang_event") {
If Not Bar_cmdGuiIsVisible ; If Not Bar_cmdGuiIsVisible
If Not (SubStr(A_GuiControl, 6, InStr(A_GuiControl, "_", False, 6) - 6) = Manager_aMonitor) ; If Not (SubStr(A_GuiControl, 6, InStr(A_GuiControl, "_", False, 6) - 6) = Manager_aMonitor)
Manager_activateMonitor(SubStr(A_GuiControl, 6, InStr(A_GuiControl, "_", False, 6) - 6)) ; Manager_activateMonitor(SubStr(A_GuiControl, 6, InStr(A_GuiControl, "_", False, 6) - 6))
Bar_toggleCommandGui() ; Bar_toggleCommandGui()
;} Else
If (SubStr(A_GuiControl, -10) = "_time_event") {
If (Config_combineDateAndTime) {
If (Bar_TimeDateState == 0) {
Bar_TimeDateState := 1
} Else {
Bar_TimeDateState := 0
}
}
} Else { } Else {
If Not (SubStr(A_GuiControl, 6, InStr(A_GuiControl, "_", False, 6) - 6) = Manager_aMonitor) If Not (SubStr(A_GuiControl, 6, InStr(A_GuiControl, "_", False, 6) - 6) = Manager_aMonitor)
Manager_activateMonitor(SubStr(A_GuiControl, 6, InStr(A_GuiControl, "_", False, 6) - 6)) Manager_activateMonitor(SubStr(A_GuiControl, 6, InStr(A_GuiControl, "_", False, 6) - 6))
@ -348,17 +409,17 @@ Bar_toggleCommandGui() {
Manager_winActivate(Bar_aWndId) Manager_winActivate(Bar_aWndId)
} Else { } Else {
Bar_cmdGuiIsVisible := True Bar_cmdGuiIsVisible := True
If (Config_verticalBarPos = "tray") If (Config_verticalBarPos = "tray")
x := Monitor_#%Manager_aMonitor%_x + Monitor_#%Manager_aMonitor%_barX + Monitor_#%Manager_aMonitor%_barWidth - Bar_#0_#0W x := Monitor_#%Manager_aMonitor%_x + Monitor_#%Manager_aMonitor%_barX + Monitor_#%Manager_aMonitor%_barWidth - Bar_#0_#0W
Else Else
x := Monitor_#%Manager_aMonitor%_barX + Monitor_#%Manager_aMonitor%_barWidth - Bar_#0_#0W ;; x := mX + (mBarX - mX) + mBarW - w x := Monitor_#%Manager_aMonitor%_barX + Monitor_#%Manager_aMonitor%_barWidth - Bar_#0_#0W ;; x := mX + (mBarX - mX) + mBarW - w
If (Config_verticalBarPos = "top") Or (Config_verticalBarPos = "tray") And (Monitor_#%Manager_aMonitor%_taskBarPos = "top" Or Not Monitor_#%Manager_aMonitor%_taskBarClass) If (Config_verticalBarPos = "top") Or (Config_verticalBarPos = "tray") And (Monitor_#%Manager_aMonitor%_taskBarPos = "top" Or Not Monitor_#%Manager_aMonitor%_taskBarClass)
y := Monitor_#%Manager_aMonitor%_y y := Monitor_#%Manager_aMonitor%_y
Else Else
y := Monitor_#%Manager_aMonitor%_y + Monitor_#%Manager_aMonitor%_height - Bar_#0_#0H y := Monitor_#%Manager_aMonitor%_y + Monitor_#%Manager_aMonitor%_height - Bar_#0_#0H
Gui, Show Gui, Show
WinGet, wndId, ID, bug.n_BAR_0 WinGet, wndId, ID, bug.n_BAR_0
WinMove, ahk_id %wndId%, , %x%, %y% WinMove, ahk_id %wndId%, , %x%, %y%
@ -397,12 +458,13 @@ Bar_updateStatic(m) {
} }
Bar_updateStatus() { Bar_updateStatus() {
Local anyText, bat1, bat2, bat3, GuiN, m, mute, time, vol Local bat1, bat2, bat3, GuiN, m, mute, time, vol, hours, minutes, seconds, text, textWidth, statusWidth, iconWidth, iconY
iconY := (Bar_ctrlHeight - Bar_textHeight) / 2 - %Config_iconFontYOffset%
anyText := Config_readinAny()
If Config_readinBat { If Config_readinBat {
ResourceMonitor_getBatteryStatus(bat1, bat2) ResourceMonitor_getBatteryStatus(bat1, bat2)
bat3 := SubStr(" " bat1, -2) bat3 := bat1
} }
If Config_readinVolume { If Config_readinVolume {
SoundGet, vol, MASTER, VOLUME SoundGet, vol, MASTER, VOLUME
@ -415,49 +477,236 @@ Bar_updateStatus() {
GuiN := (m - 1) + 1 GuiN := (m - 1) + 1
Debug_logMessage("DEBUG[6] Bar_updateStatus(): Gui, " . GuiN . ": Default", 6) Debug_logMessage("DEBUG[6] Bar_updateStatus(): Gui, " . GuiN . ": Default", 6)
Gui, %GuiN%: Default Gui, %GuiN%: Default
If Config_readinBat {
If (bat1 < 10) And (bat2 = "off") { statusWidth := Monitor_#%m%_barWidth
;; Change the color, if the battery level is below 10% statusWidth -= %Config_barItemSpacing%
GuiControl, +Background%Config_backColor_#3_#8% +c%Config_foreColor_#3_#8%, Bar_#%m%_batteryStatus_highlighted
GuiControl, +c%Config_fontColor_#3_#8%, Bar_#%m%_batteryStatus If Config_readinTime {
} Else If (bat2 = "off") { If Config_readinTimeBinary {
;; Change the color, if the pc is not plugged in FormatTime, hours,, H
GuiControl, +Background%Config_backColor_#2_#8% +c%Config_foreColor_#2_#8%, Bar_#%m%_batteryStatus_highlighted FormatTime, minutes,, m
GuiControl, +c%Config_fontColor_#2_#8%, Bar_#%m%_batteryStatus FormatTime, seconds,, s
If (Config_combineDateAndTime) {
If (Bar_TimeDateState == 0) {
time := % Bar_BinaryClockChars[hours + 1] " " Bar_BinaryClockChars[minutes + 1] " " Bar_BinaryClockChars[seconds + 1]
} Else {
FormatTime, time, , % Config_readinDateFormat
}
} else {
time := % Bar_BinaryClockChars[hours + 1] " " Bar_BinaryClockChars[minutes + 1] " " Bar_BinaryClockChars[seconds + 1]
}
} Else { } Else {
GuiControl, +Background%Config_backColor_#1_#8% +c%Config_foreColor_#1_#8%, Bar_#%m%_batteryStatus_highlighted If (Config_combineDateAndTime) {
GuiControl, +c%Config_fontColor_#1_#8%, Bar_#%m%_batteryStatus If (Bar_TimeDateState == 0) {
FormatTime, time, , % Config_readinTimeFormat
} Else {
FormatTime, time, , % Config_readinDateFormat
}
} else {
FormatTime, time, , % Config_readinTimeFormat
}
} }
GuiControl, , Bar_#%m%_batteryStatus_highlighted, %bat3% textWidth := Bar_getTrueTextWidth(Bar_#%m%_time_hwnd, time)
GuiControl, , Bar_#%m%_batteryStatus, % " BAT: " bat3 "% " statusWidth -= textWidth
GuiControl,, Bar_#%m%_time, % time
GuiControl, Move, Bar_#%m%_time, % "w" textWidth " x" statusWidth
GuiControl, Move, Bar_#%m%_time_event, % "w" textWidth " x" statusWidth
;GuiControl, Move, Bar_#%m%_time_highlighted, % "w" textWidth " x" statusWidth
statusWidth -= %Config_barIconSpacing%
If (Config_combineDateAndTime) {
If (Bar_TimeDateState == 0) {
iconWidth := Bar_getTrueTextWidth(Bar_#%m%_time_icon_hwnd, Config_barIcon_#1)
} Else {
iconWidth := Bar_getTrueTextWidth(Bar_#%m%_time_icon_hwnd, Config_barIcon_#2)
}
} Else {
iconWidth := Bar_getTrueTextWidth(Bar_#%m%_time_icon_hwnd, Config_barIcon_#1)
}
statusWidth -= iconWidth
If (Config_combineDateAndTime) {
If (Bar_TimeDateState == 0) {
GuiControl,, Bar_#%m%_time_icon, %Config_barIcon_#1%
} Else {
GuiControl,, Bar_#%m%_time_icon, %Config_barIcon_#2%
}
} Else {
GuiControl,, Bar_#%m%_time_icon, %Config_barIcon_#1%
}
GuiControl, Move, Bar_#%m%_time_icon, % "w" iconWidth " x" statusWidth " h" Bar_ctrlHeight " y" iconY
GuiControl, Move, Bar_#%m%_time_icon_event, % "w" iconWidth " x" statusWidth
;GuiControl, Move, Bar_#%m%_time_icon_highlighted, % "w" iconWidth " x" statusWidth
statusWidth -= %Config_barItemSpacing%
}
If Config_readinDate And !Config_combineDateAndTime {
FormatTime, time, , % Config_readinDateFormat
textWidth := Bar_getTrueTextWidth(Bar_#%m%_date_hwnd, time)
statusWidth -= textWidth
GuiControl,, Bar_#%m%_date, % time
GuiControl, Move, Bar_#%m%_date, % "w" textWidth " x" statusWidth
GuiControl, Move, Bar_#%m%_date_event, % "w" textWidth " x" statusWidth
;GuiControl, Move, Bar_#%m%_date_highlighted, % "w" textWidth " x" statusWidth
statusWidth -= %Config_barIconSpacing%
iconWidth := Bar_getTrueTextWidth(Bar_#%m%_date_icon_hwnd, Config_barIcon_#2)
statusWidth -= iconWidth
GuiControl,, Bar_#%m%_date_icon, %Config_barIcon_#2%
GuiControl, Move, Bar_#%m%_date_icon, % "w" iconWidth " x" statusWidth " h" Bar_ctrlHeight " y" iconY
GuiControl, Move, Bar_#%m%_date_icon_event, % "w" iconWidth " x" statusWidth
;GuiControl, Move, Bar_#%m%_date_icon_highlighted, % "w" iconWidth " x" statusWidth
statusWidth -= %Config_barItemSpacing%
} }
If anyText
GuiControl, , Bar_#%m%_anyText, % anyText
If Config_readinVolume { If Config_readinVolume {
If (mute = "On") { If (mute = "On") {
;; Change the color, if the mute is on ;; Change the color, if the mute is on
GuiControl, +Background%Config_backColor_#1_#9% +c%Config_foreColor_#1_#9%, Bar_#%m%_volume_highlighted ;GuiControl, +Background%Config_backColor_#1_#9% +c%Config_foreColor_#1_#9%, Bar_#%m%_volume_highlighted
GuiControl, +c%Config_fontColor_#1_#9%, Bar_#%m%_volume
} Else {
GuiControl, +Background%Config_backColor_#2_#9% +c%Config_foreColor_#2_#9%, Bar_#%m%_volume_highlighted
GuiControl, +c%Config_fontColor_#2_#9%, Bar_#%m%_volume GuiControl, +c%Config_fontColor_#2_#9%, Bar_#%m%_volume
GuiControl, +c%Config_fontColor_#2_#9%, Bar_#%m%_volume_icon
} Else {
;GuiControl, +Background%Config_backColor_#2_#9% +c%Config_foreColor_#2_#9%, Bar_#%m%_volume_highlighted
GuiControl, +c%Config_fontColor_#1_#9%, Bar_#%m%_volume
GuiControl, +c%Config_fontColor_#1_#9%, Bar_#%m%_volume_icon
} }
GuiControl, , Bar_#%m%_volume_highlighted, %vol%
GuiControl, , Bar_#%m%_volume, % " VOL: " SubStr(" " vol, -2) "% " text := % vol "%"
textWidth := Bar_getTrueTextWidth(Bar_#%m%_volume_hwnd, text)
statusWidth -= textWidth
GuiControl,, Bar_#%m%_volume, % text
GuiControl, Move, Bar_#%m%_volume, % "w" textWidth " x" statusWidth
GuiControl, Move, Bar_#%m%_volume_event, % "w" textWidth " x" statusWidth
;GuiControl, Move, Bar_#%m%_volume_highlighted, % "w" textWidth " x" statusWidth
statusWidth -= %Config_barIconSpacing%
iconWidth := Bar_getTrueTextWidth(Bar_#%m%_volume_icon_hwnd, Config_barIcon_#6)
statusWidth -= iconWidth
GuiControl,, Bar_#%m%_volume_icon, %Config_barIcon_#6%
GuiControl, Move, Bar_#%m%_volume_icon, % "w" iconWidth " x" statusWidth " h" Bar_ctrlHeight " y" iconY
GuiControl, Move, Bar_#%m%_volume_icon_event, % "w" iconWidth " x" statusWidth
;GuiControl, Move, Bar_#%m%_volume_icon_highlighted, % "w" iconWidth " x" statusWidth
statusWidth -= %Config_barItemSpacing%
} }
If Config_readinDate { If Config_readinRam {
FormatTime, time, , % Config_readinDateFormat text := ResourceMonitor_getRamText()
GuiControl, , Bar_#%m%_date, % time textWidth := Bar_getTrueTextWidth(Bar_#%m%_ram_hwnd, text)
statusWidth -= textWidth
GuiControl,, Bar_#%m%_ram, % text
GuiControl, Move, Bar_#%m%_ram, % "w" textWidth " x" statusWidth
GuiControl, Move, Bar_#%m%_ram_event, % "w" textWidth " x" statusWidth
;GuiControl, Move, Bar_#%m%_ram_highlighted, % "w" textWidth " x" statusWidth
statusWidth -= %Config_barIconSpacing%
iconWidth := Bar_getTrueTextWidth(Bar_#%m%_ram_icon_hwnd, Config_barIcon_#3)
statusWidth -= iconWidth
GuiControl,, Bar_#%m%_ram_icon, %Config_barIcon_#3%
GuiControl, Move, Bar_#%m%_ram_icon, % "w" iconWidth " x" statusWidth " h" Bar_ctrlHeight " y" iconY
GuiControl, Move, Bar_#%m%_ram_icon_event, % "w" iconWidth " x" statusWidth
;GuiControl, Move, Bar_#%m%_ram_icon_highlighted, % "w" iconWidth " x" statusWidth
statusWidth -= %Config_barItemSpacing%
} }
If Config_readinTime { If Config_readinCpu {
FormatTime, time, , % Config_readinTimeFormat text := ResourceMonitor_getCpuText()
GuiControl, , Bar_#%m%_time, % time textWidth := Bar_getTrueTextWidth(Bar_#%m%_cpu_hwnd, text)
statusWidth -= textWidth
GuiControl,, Bar_#%m%_cpu, % text
GuiControl, Move, Bar_#%m%_cpu, % "w" textWidth " x" statusWidth
GuiControl, Move, Bar_#%m%_cpu_event, % "w" textWidth " x" statusWidth
;GuiControl, Move, Bar_#%m%_cpu_highlighted, % "w" textWidth " x" statusWidth
statusWidth -= %Config_barIconSpacing%
iconWidth := Bar_getTrueTextWidth(Bar_#%m%_cpu_icon_hwnd, Config_barIcon_#4)
statusWidth -= iconWidth
GuiControl,, Bar_#%m%_cpu_icon, %Config_barIcon_#4%
GuiControl, Move, Bar_#%m%_cpu_icon, % "w" iconWidth " x" statusWidth " h" Bar_ctrlHeight " y" iconY
GuiControl, Move, Bar_#%m%_cpu_icon_event, % "w" iconWidth " x" statusWidth
;GuiControl, Move, Bar_#%m%_cpu_icon_highlighted, % "w" iconWidth " x" statusWidth
statusWidth -= %Config_barItemSpacing%
}
If Config_readinBat {
If (bat1 < 10) And (bat2 = "off") {
;; Change the color, if the battery level is below 10%
;GuiControl, +Background%Config_backColor_#3_#8% +c%Config_foreColor_#3_#8%, Bar_#%m%_battery_highlighted
GuiControl, +c%Config_fontColor_#3_#8%, Bar_#%m%_battery
} Else If (bat2 = "off") {
;; Change the color, if the pc is not plugged in
;GuiControl, +Background%Config_backColor_#2_#8% +c%Config_foreColor_#2_#8%, Bar_#%m%_battery_highlighted
GuiControl, +c%Config_fontColor_#2_#8%, Bar_#%m%_battery
} Else {
;GuiControl, +Background%Config_backColor_#1_#8% +c%Config_foreColor_#1_#8%, Bar_#%m%_battery_highlighted
GuiControl, +c%Config_fontColor_#1_#8%, Bar_#%m%_battery
}
text := % bat3 "%"
textWidth := Bar_getTrueTextWidth(Bar_#%m%_battery_hwnd, text)
statusWidth -= textWidth
GuiControl,, Bar_#%m%_battery, % text
GuiControl, Move, Bar_#%m%_battery, % "w" textWidth " x" statusWidth
GuiControl, Move, Bar_#%m%_battery_event, % "w" textWidth " x" statusWidth
;GuiControl, Move, Bar_#%m%_battery_highlighted, % "w" textWidth " x" statusWidth
statusWidth -= %Config_barIconSpacing%
iconWidth := Bar_getTrueTextWidth(Bar_#%m%_battery_icon_hwnd, Config_barIcon_#5)
statusWidth -= iconWidth
GuiControl,, Bar_#%m%_battery_icon, %Config_barIcon_#5%
GuiControl, Move, Bar_#%m%_battery_icon, % "w" iconWidth " x" statusWidth " h" Bar_ctrlHeight " y" iconY
GuiControl, Move, Bar_#%m%_battery_icon_event, % "w" iconWidth " x" statusWidth
;GuiControl, Move, Bar_#%m%_battery_icon_highlighted, % "w" iconWidth " x" statusWidth
statusWidth -= %Config_barItemSpacing%
}
If Config_readinMusic {
text := MusicBee_GetNowPlaying()
textWidth := Bar_getTrueTextWidth(Bar_#%m%_music_hwnd, text)
statusWidth -= textWidth
GuiControl,, Bar_#%m%_music, % text
GuiControl, Move, Bar_#%m%_music, % "w" textWidth " x" statusWidth
GuiControl, Move, Bar_#%m%_music_event, % "w" textWidth " x" statusWidth
;GuiControl, Move, Bar_#%m%_music_highlighted, % "w" textWidth " x" statusWidth
statusWidth -= %Config_barIconSpacing%
if (text == "") {
iconWidth := Bar_getTrueTextWidth(Bar_#%m%_music_icon_hwnd, "")
} else {
iconWidth := Bar_getTrueTextWidth(Bar_#%m%_music_icon_hwnd, Config_barIcon_#7)
}
statusWidth -= iconWidth
GuiControl,, Bar_#%m%_music_icon, %Config_barIcon_#7%
GuiControl, Move, Bar_#%m%_music_icon, % "w" iconWidth " x" statusWidth " h" Bar_ctrlHeight " y" iconY
GuiControl, Move, Bar_#%m%_music_icon_event, % "w" iconWidth " x" statusWidth
;GuiControl, Move, Bar_#%m%_music_icon_highlighted, % "w" iconWidth " x" statusWidth
statusWidth -= %Config_barItemSpacing%
} }
} }
} }
Bar_updateTitle() { Bar_updateTitle() {
Local aWndId, aWndTitle, content, GuiN, i, title Local aWndId, aWndTitle, content, GuiN, i, title, titleWidth, barWidth, titleX
WinGet, aWndId, ID, A WinGet, aWndId, ID, A
WinGetTitle, aWndTitle, ahk_id %aWndId% WinGetTitle, aWndTitle, ahk_id %aWndId%
@ -467,24 +716,33 @@ Bar_updateTitle() {
aWndTitle := "~ " aWndTitle aWndTitle := "~ " aWndTitle
If (Manager_monitorCount > 1) If (Manager_monitorCount > 1)
aWndTitle := "[" Manager_aMonitor "] " aWndTitle aWndTitle := "[" Manager_aMonitor "] " aWndTitle
title := " " . aWndTitle . " "
If (Bar_getTextWidth(title) > Bar_#%Manager_aMonitor%_titleWidth) { title := aWndTitle
;; Shorten the window title if its length exceeds the width of the bar
i := Bar_getTextWidth(Bar_#%Manager_aMonitor%_titleWidth, True) - 6 ;If (Bar_getTextWidth(title) > 768) {
StringLeft, title, aWndTitle, i ; ;; Shorten the window title if its length exceeds the width of the bar
title := " " . title . " ... " ; i := Bar_getTextWidth(Bar_#%Manager_aMonitor%_titleWidth, True) - 6
} ; StringLeft, title, aWndTitle, i
; title := " " . title . " ... "
;}
StringReplace, title, title, &, &&, All ;; Special character '&', which would underline the next letter. StringReplace, title, title, &, &&, All ;; Special character '&', which would underline the next letter.
Loop, % Manager_monitorCount { Loop, % Manager_monitorCount {
barWidth := Monitor_#%A_Index%_barWidth
titleWidth := Bar_getTrueTextWidth(Bar_#%A_Index%_title_hwnd, title)
titleX := barWidth / 2 - titleWidth / 2
GuiN := (A_Index - 1) + 1 GuiN := (A_Index - 1) + 1
Debug_logMessage("DEBUG[6] Bar_updateTitle(): Gui, " . GuiN . ": Default", 6) Debug_logMessage("DEBUG[6] Bar_updateTitle(): Gui, " . GuiN . ": Default", 6)
Gui, %GuiN%: Default Gui, %GuiN%: Default
GuiControlGet, content, , Bar_#%A_Index%_title GuiControlGet, content, , Bar_#%A_Index%_title
If (A_Index = Manager_aMonitor) { If (A_Index = Manager_aMonitor) {
If Not (content = title) If Not (content = title)
GuiControl, , Bar_#%A_Index%_title, % title GuiControl,, Bar_#%A_Index%_title, % title
GuiControl, Move, Bar_#%A_Index%_title, % "w" titleWidth "x" titleX
GuiControl, Move, Bar_#%A_Index%_title_event, % "w" titleWidth "x" titleX
GuiControl, Move, Bar_#%A_Index%_title_highlighted, % "w" titleWidth "x" titleX
} Else If Not (content = "") } Else If Not (content = "")
GuiControl, , Bar_#%A_Index%_title, GuiControl, , Bar_#%A_Index%_title,
} }
@ -503,18 +761,18 @@ Bar_updateView(m, v) {
If (v = Monitor_#%m%_aView_#1) { If (v = Monitor_#%m%_aView_#1) {
;; Set foreground/background colors if the view is the current view. ;; Set foreground/background colors if the view is the current view.
GuiControl, +Background%Config_backColor_#2_#1% +c%Config_foreColor_#2_#1%, Bar_#%m%_view_#%v%_highlighted ;GuiControl, +Background%Config_backColor_#2_#1% +c%Config_foreColor_#2_#1%, Bar_#%m%_view_#%v%_highlighted
GuiControl, +c%Config_fontColor_#2_#1%, Bar_#%m%_view_#%v% GuiControl, +c%Config_fontColor_#2_#1%, Bar_#%m%_view_#%v%
} Else { } Else {
;; Set foreground/background colors. ;; Set foreground/background colors.
GuiControl, +Background%Config_backColor_#1_#1% +c%Config_foreColor_#1_#1%, Bar_#%m%_view_#%v%_highlighted ;GuiControl, +Background%Config_backColor_#1_#1% +c%Config_foreColor_#1_#1%, Bar_#%m%_view_#%v%_highlighted
GuiControl, +c%Config_fontColor_#1_#1%, Bar_#%m%_view_#%v% GuiControl, +c%Config_fontColor_#1_#1%, Bar_#%m%_view_#%v%
} }
Loop, % Config_viewCount { Loop, % Config_viewCount {
StringTrimRight, wndIds, View_#%m%_#%A_Index%_wndIds, 1 StringTrimRight, wndIds, View_#%m%_#%A_Index%_wndIds, 1
StringSplit, wndId, wndIds, `; StringSplit, wndId, wndIds, `;
GuiControl, , Bar_#%m%_view_#%A_Index%_highlighted, % wndId0 / managedWndId0 * 100 ;; Update the percentage fill for the view. ;GuiControl, , Bar_#%m%_view_#%A_Index%_highlighted, % wndId0 / managedWndId0 * 100 ;; Update the percentage fill for the view.
GuiControl, , Bar_#%m%_view_#%A_Index%, % Config_viewNames_#%A_Index% ;; Refresh the number on the bar. GuiControl, , Bar_#%m%_view_#%A_Index%, % Config_viewNames_#%A_Index% ;; Refresh the number on the bar.
} }
} }

View file

@ -37,13 +37,16 @@ Config_init() {
Config_readinCpu := False Config_readinCpu := False
Config_readinDate := True Config_readinDate := True
Config_readinDateFormat := "ddd, dd. MMM. yyyy" Config_readinDateFormat := "ddd, dd. MMM. yyyy"
Config_readinDiskLoad := False Config_readinRam := False
Config_readinMemoryUsage := False Config_readinMusic := False
Config_readinNetworkLoad := False
Config_readinTime := True Config_readinTime := True
Config_readinTimeBinary := False
Config_readinTimeFormat := "HH:mm" Config_readinTimeFormat := "HH:mm"
Config_readinVolume := False Config_readinVolume := False
Config_readinInterval := 30000 Config_readinInterval := 30000
Config_barItemSpacing := 8
Config_barIconSpacing := 4
Config_iconFontYOffset := 3
;; Windows ui elements ;; Windows ui elements
Config_bbCompatibility := False Config_bbCompatibility := False
@ -117,6 +120,7 @@ Config_init() {
Config_getSystemSettings() Config_getSystemSettings()
Config_initColors() Config_initColors()
Config_initBarIcons()
Loop, % Config_layoutCount { Loop, % Config_layoutCount {
StringSplit, layout, Config_layout_#%A_Index%, `; StringSplit, layout, Config_layout_#%A_Index%, `;
Config_layoutFunction_#%A_Index% := layout2 Config_layoutFunction_#%A_Index% := layout2
@ -152,6 +156,12 @@ Config_initColors() {
} }
} }
Config_initBarIcons() {
Global
StringSplit, Config_barIcon_#, Config_barIcons, `;
}
Config_convertSystemColor(systemColor) Config_convertSystemColor(systemColor)
{ ;; systemColor format: 0xBBGGRR { ;; systemColor format: 0xBBGGRR
rr := SubStr(systemColor, 7, 2) rr := SubStr(systemColor, 7, 2)

View file

@ -192,3 +192,4 @@ Return
#Include View.ahk #Include View.ahk
#Include Window.ahk #Include Window.ahk
#Include %A_ScriptDir%\MonitorManager.ahk #Include %A_ScriptDir%\MonitorManager.ahk
#Include %A_ScriptDir%\MusicBee.ahk

153
src/MusicBee.ahk Normal file
View file

@ -0,0 +1,153 @@
MusicBee_FormatTime(time) {
seconds := time / 1000
hours := Floor(seconds / 3600)
seconds := Mod(seconds, 3600)
minutes := Floor(seconds / 60)
seconds := Mod(seconds, 60)
seconds := Floor(seconds)
if (seconds < 10) {
seconds := % "0" seconds
}
if (minutes < 10) {
minutes := % "0" minutes
}
if (hours != 0) {
return % hours ":" minutes ":" seconds
} else {
return % minutes ":" seconds
}
}
MusicBee_GetNowPlaying() {
detectHidden := A_DetectHiddenWindows
DetectHiddenWindows, On
ipcId := WinExist("MusicBee IPC Interface")
SendMessage, 0x0400, 999, 0,, ahk_id %ipcId%
probeState := ErrorLevel
SendMessage, 0x0400, 109, 0,, ahk_id %ipcId%
playState := ErrorLevel
SendMessage, 0x0400, 110, 0,, ahk_id %ipcId%
position := ErrorLevel
SendMessage, 0x0400, 141, 16,, ahk_id %ipcId%
durationData := ErrorLevel
MBIPC_Unpack_s(MBIPC_GetLResult(durationData), displayDuration)
SendMessage, 0x0400, 900, %durationData%,, ahk_id %ipcId%
SendMessage, 0x0400, 142, 32,, ahk_id %ipcId%
artistData := ErrorLevel
MBIPC_Unpack_s(MBIPC_GetLResult(artistData), artist)
SendMessage, 0x0400, 900, %artistData%,, ahk_id %ipcId%
SendMessage, 0x0400, 142, 31,, ahk_id %ipcId%
albumArtistData := ErrorLevel
MBIPC_Unpack_s(MBIPC_GetLResult(albumArtistData), albumArtist)
SendMessage, 0x0400, 900, %albumArtistData%,, ahk_id %ipcId%
SendMessage, 0x0400, 142, 65,, ahk_id %ipcId%
titleData := ErrorLevel
MBIPC_Unpack_s(MBIPC_GetLResult(titleData), title)
SendMessage, 0x0400, 900, %titleData%,, ahk_id %ipcId%
displayArtist := artist
if (StrLen(artist) > 64) {
displayArtist := albumArtist
}
state := ""
if (playState = 6) {
state := " [paused]"
}
duration := 0
splitDuration := StrSplit(displayDuration, ":")
duration += splitDuration[1] * 60
duration += splitDuration[2]
duration *= 1000
DetectHiddenWindows, %detectHidden%
StringReplace, displayArtist, displayArtist, &, &&, All
StringReplace, title, title, &, &&, All
if (probeState = 1) {
return % displayArtist " - " title " [" MusicBee_FormatTime(position) "/" MusicBee_FormatTime(duration) "]" state
} else {
return ""
}
}
;;;;
MBIPC_Unpack_s(Byref lr, ByRef string_1)
{
string_1 := ""
mmf := MBIPC_OpenMmf(lr)
if !mmf
return 0
view := MBIPC_MapMmfView(mmf, lr, ptr)
if !view
{
MBIPC_CloseMmf(mmf)
return 0
}
byteCount := NumGet(ptr+0, 0, "Int")
ptr += 4
if byteCount > 0
string_1 := StrGet(ptr, byteCount // 2, "UTF-16")
MBIPC_UnmapMmfView(view)
MBIPC_CloseMmf(mmf)
return 1
}
MBIPC_OpenMmf(ByRef lr)
{
if !lr
return 0
; FILE_MAP_READ = 0x0004 = 4
; FALSE = 0
return DllCall("OpenFileMapping", UInt, 4, Int, 0, Str, "mbipc_mmf_" . NumGet(lr, 0, "UShort"), UInt)
}
MBIPC_CloseMmf(mmf)
{
DllCall("CloseHandle", UInt, mmf)
}
MBIPC_MapMmfView(mmf, ByRef lr, ByRef ptr)
{
; FILE_MAP_READ = 0x0004 = 4
view := DllCall("MapViewOfFile", UInt, mmf, UInt, 4, UInt, 0, UInt, 0, UInt, 0, UInt)
ptr := view + NumGet(lr, 2, "UShort") + 8
return view
}
MBIPC_UnmapMmfView(view)
{
DllCall("UnmapViewOfFile", UInt, view)
}
MBIPC_GetLResult(el)
{
if el = FAIL
return 0
VarSetCapacity(lr, 4)
NumPut(el, lr, 0, "Int")
return lr
}

View file

@ -126,7 +126,7 @@ ResourceMonitor_getSystemTimes() {
oldUserTime := newUserTime oldUserTime := newUserTime
DllCall("GetSystemTimes", "Int64P", newIdleTime, "Int64P", newKrnlTime, "Int64P", newUserTime) DllCall("GetSystemTimes", "Int64P", newIdleTime, "Int64P", newKrnlTime, "Int64P", newUserTime)
sysTime := SubStr(" " . Round((1 - (newIdleTime - oldIdleTime) / (newKrnlTime - oldKrnlTime+newUserTime - oldUserTime)) * 100), -2) sysTime := Round((1 - (newIdleTime - oldIdleTime) / (newKrnlTime - oldKrnlTime+newUserTime - oldUserTime)) * 100)
Return, sysTime ;; system time in percent Return, sysTime ;; system time in percent
} }
;; Sean: CPU LoadTimes (http://www.autohotkey.com/forum/topic18913.html) ;; Sean: CPU LoadTimes (http://www.autohotkey.com/forum/topic18913.html)
@ -157,3 +157,35 @@ ResourceMonitor_getText() {
Return, text Return, text
} }
ResourceMonitor_getSystemTimes2(ByRef IdleTime) {
DllCall("GetSystemTimes", "Int64P", IdleTime, "Int64P", KernelTime, "Int64P", UserTime)
Return KernelTime + UserTime
}
ResourceMonitor_getCpuLoad(period := 500) {
total := ResourceMonitor_getSystemTimes2(idle)
Sleep, % period
total2 := ResourceMonitor_getSystemTimes2(idle2)
Return 100*(1 - (idle2 - idle)/(total2 - total))
}
ResourceMonitor_getCpuText() {
Return, Floor(ResourceMonitor_getCpuLoad()) . "%"
}
ResourceMonitor_GlobalMemoryStatusEx()
{
static MSEX, init := NumPut(VarSetCapacity(MSEX, 64, 0), MSEX, "uint")
if !(DllCall("GlobalMemoryStatusEx", "ptr", &MSEX))
throw Exception("Call to GlobalMemoryStatusEx failed: " A_LastError, -1)
return { MemoryLoad: NumGet(MSEX, 4, "uint"), TotalPhys: NumGet(MSEX, 8, "uint64"), AvailPhys: NumGet(MSEX, 16, "uint64") }
}
ResourceMonitor_getRamText() {
GMSEx := ResourceMonitor_GlobalMemoryStatusEx()
TotalMem := GMSEx.TotalPhys
AvailMem := GMSEx.AvailPhys
mem := RegExReplace(Floor((TotalMem - AvailMem) / 1048576), "(\d)(?=(?:\d{3})+(?:\.|$))", "$1,")
Return, mem . " MB"
}

View file

@ -18,6 +18,7 @@ Window_activate(wndId) {
Debug_logMessage("DEBUG[2] Window_activate: Potentially hung window " . wndId, 2) Debug_logMessage("DEBUG[2] Window_activate: Potentially hung window " . wndId, 2)
Return, 1 Return, 1
} Else { } Else {
WinActivate, ahk_class Progman
WinActivate, ahk_id %wndId% WinActivate, ahk_id %wndId%
WinGet, aWndId, ID, A WinGet, aWndId, ID, A
If (wndId != aWndId) If (wndId != aWndId)