diff --git a/Modules/CPU/main.swift b/Modules/CPU/main.swift index b4a964d7..e6a10729 100644 --- a/Modules/CPU/main.swift +++ b/Modules/CPU/main.swift @@ -63,12 +63,15 @@ public class CPU: Module { self.loadReader = LoadReader() self.loadReader?.store = store - self.processReader = ProcessReader() + self.processReader = ProcessReader(self.config.name, store: store) self.additionalReader = AdditionalReader(smc) self.settingsView.callback = { [unowned self] in self.loadReader?.read() } + self.settingsView.callbackWhenUpdateNumberOfProcesses = { + self.popupView.numberOfProcessesUpdated() + } self.settingsView.setInterval = { [unowned self] value in self.loadReader?.setInterval(value) } diff --git a/Modules/CPU/popup.swift b/Modules/CPU/popup.swift index 19e55d92..91526aa0 100644 --- a/Modules/CPU/popup.swift +++ b/Modules/CPU/popup.swift @@ -20,7 +20,7 @@ internal class Popup: NSView { private let dashboardHeight: CGFloat = 90 private let chartHeight: CGFloat = 90 private let detailsHeight: CGFloat = 22*3 - private let processesHeight: CGFloat = 22*5 + private let processHeight: CGFloat = 22 private var loadField: NSTextField? = nil @@ -39,6 +39,12 @@ internal class Popup: NSView { private var processes: [ProcessView] = [] private var maxFreq: Double = 0 + private var numberOfProcesses: Int { + get { + return self.store.pointee.int(key: "\(self.title)_processes", defaultValue: 8) + } + } + public init(_ title: String, store: UnsafePointer) { self.store = store self.title = title @@ -47,13 +53,22 @@ internal class Popup: NSView { x: 0, y: 0, width: Constants.Popup.width, - height: dashboardHeight + chartHeight + detailsHeight + processesHeight + (Constants.Popup.separatorHeight*3) + height: dashboardHeight + chartHeight + detailsHeight + (Constants.Popup.separatorHeight*3) )) + let h: CGFloat = self.dashboardHeight + self.chartHeight + self.detailsHeight + (self.processHeight*CGFloat(self.numberOfProcesses)) + (Constants.Popup.separatorHeight*3) + self.setFrameSize(NSSize(width: self.frame.width, height: h)) + initDashboard() initChart() initDetails() initProcesses() + + DispatchQueue.main.async(execute: { + if self.frame.size.height != h { + NotificationCenter.default.post(name: .updatePopupSize, object: nil, userInfo: ["module": self.title]) + } + }) } required init?(coder: NSCoder) { @@ -64,6 +79,29 @@ internal class Popup: NSView { self.chart?.display() } + public func numberOfProcessesUpdated() { + if self.processes.count == self.numberOfProcesses { + return + } + + DispatchQueue.main.async(execute: { + self.subviews.forEach{ $0.removeFromSuperview() } + self.processes.forEach { (p: ProcessView) in + p.removeFromSuperview() + } + + let h: CGFloat = self.dashboardHeight + self.chartHeight + self.detailsHeight + (self.processHeight*CGFloat(self.numberOfProcesses)) + (Constants.Popup.separatorHeight*3) + self.setFrameSize(NSSize(width: self.frame.width, height: h)) + + self.initDashboard() + self.initChart() + self.initDetails() + self.initProcesses() + + NotificationCenter.default.post(name: .updatePopupSize, object: nil, userInfo: ["module": self.title]) + }) + } + private func initDashboard() { let view: NSView = NSView(frame: NSRect(x: 0, y: self.frame.height - self.dashboardHeight, width: self.frame.width, height: self.dashboardHeight)) view.wantsLayer = true @@ -121,16 +159,15 @@ internal class Popup: NSView { } private func initProcesses() { - let separator = SeparatorView(LocalizedString("Top processes"), origin: NSPoint(x: 0, y: self.processesHeight), width: self.frame.width) + let height: CGFloat = self.processHeight*CGFloat(self.numberOfProcesses) + let separator = SeparatorView(LocalizedString("Top processes"), origin: NSPoint(x: 0, y: height), width: self.frame.width) self.addSubview(separator) - let view: NSView = NSView(frame: NSRect(x: 0, y: 0, width: self.frame.width, height: self.processesHeight)) + let view: NSView = NSView(frame: NSRect(x: 0, y: 0, width: self.frame.width, height: height)) - self.processes.append(ProcessView(0)) - self.processes.append(ProcessView(1)) - self.processes.append(ProcessView(2)) - self.processes.append(ProcessView(3)) - self.processes.append(ProcessView(4)) + for i in 0...self.numberOfProcesses { + self.processes.append(ProcessView(CGFloat(i))) + } self.processes.forEach{ view.addSubview($0) } diff --git a/Modules/CPU/readers.swift b/Modules/CPU/readers.swift index 5d5909eb..93b64b11 100644 --- a/Modules/CPU/readers.swift +++ b/Modules/CPU/readers.swift @@ -154,6 +154,21 @@ internal class LoadReader: Reader { } public class ProcessReader: Reader<[TopProcess]> { + private let store: UnsafePointer + private let title: String + + private var numberOfProcesses: Int { + get { + return self.store.pointee.int(key: "\(self.title)_processes", defaultValue: 8) + } + } + + init(_ title: String, store: UnsafePointer) { + self.title = title + self.store = store + super.init() + } + public override func setup() { self.popup = true } @@ -207,7 +222,7 @@ public class ProcessReader: Reader<[TopProcess]> { processes.append(TopProcess(pid: pid, command: command, name: name, usage: usage, icon: icon)) } - if index == 5 { stop = true } + if index == self.numberOfProcesses { stop = true } index += 1 } diff --git a/Modules/CPU/settings.swift b/Modules/CPU/settings.swift index db147f7e..3038e08a 100644 --- a/Modules/CPU/settings.swift +++ b/Modules/CPU/settings.swift @@ -17,12 +17,14 @@ internal class Settings: NSView, Settings_v { private var usagePerCoreState: Bool = false private var hyperthreadState: Bool = false private var updateIntervalValue: Int = 1 + private var numberOfProcesses: Int = 8 private let title: String private let store: UnsafePointer private var hasHyperthreadingCores = false public var callback: (() -> Void) = {} + public var callbackWhenUpdateNumberOfProcesses: (() -> Void) = {} public var setInterval: ((_ value: Int) -> Void) = {_ in } private var hyperthreadView: NSView? = nil @@ -33,6 +35,7 @@ internal class Settings: NSView, Settings_v { self.hyperthreadState = store.pointee.bool(key: "\(self.title)_hyperhreading", defaultValue: self.hyperthreadState) self.usagePerCoreState = store.pointee.bool(key: "\(self.title)_usagePerCore", defaultValue: self.usagePerCoreState) self.updateIntervalValue = store.pointee.int(key: "\(self.title)_updateInterval", defaultValue: self.updateIntervalValue) + self.numberOfProcesses = store.pointee.int(key: "\(self.title)_processes", defaultValue: self.numberOfProcesses) if !self.usagePerCoreState { self.hyperthreadState = false } @@ -57,7 +60,7 @@ internal class Settings: NSView, Settings_v { self.subviews.forEach{ $0.removeFromSuperview() } let rowHeight: CGFloat = 30 - let num: CGFloat = widget == .barChart ? self.hasHyperthreadingCores ? 2 : 1 : 0 + let num: CGFloat = widget == .barChart ? self.hasHyperthreadingCores ? 3 : 2 : 1 self.addSubview(SelectTitleRow( frame: NSRect(x: Constants.Settings.margin, y: Constants.Settings.margin + (rowHeight + Constants.Settings.margin) * num, width: self.frame.width - (Constants.Settings.margin*2), height: rowHeight), @@ -90,6 +93,14 @@ internal class Settings: NSView, Settings_v { } } + self.addSubview(SelectTitleRow( + frame: NSRect(x: Constants.Settings.margin, y: Constants.Settings.margin, width: self.frame.width - (Constants.Settings.margin*2), height: rowHeight), + title: LocalizedString("Number of top processes"), + action: #selector(changeNumberOfProcesses), + items: NumbersOfProcesses.map{ "\($0)" }, + selected: "\(self.numberOfProcesses)" + )) + self.setFrameSize(NSSize(width: self.frame.width, height: (rowHeight*(num+1)) + (Constants.Settings.margin*(2+num)))) } @@ -101,6 +112,14 @@ internal class Settings: NSView, Settings_v { } } + @objc private func changeNumberOfProcesses(_ sender: NSMenuItem) { + if let value = Int(sender.title) { + self.numberOfProcesses = value + self.store.pointee.set(key: "\(self.title)_processes", value: value) + self.callbackWhenUpdateNumberOfProcesses() + } + } + @objc func toggleUsagePerCore(_ sender: NSControl) { var state: NSControl.StateValue? = nil if #available(OSX 10.15, *) { diff --git a/Modules/Disk/popup.swift b/Modules/Disk/popup.swift index 1ddcfb79..5d3ef001 100644 --- a/Modules/Disk/popup.swift +++ b/Modules/Disk/popup.swift @@ -49,7 +49,7 @@ internal class Popup: NSView { self.list[d.mediaName]?.update(free: d.free, read: d.stats?.read, write: d.stats?.write) } } - + DispatchQueue.main.async(execute: { let h: CGFloat = ((self.diskFullHeight + Constants.Popup.margins) * CGFloat(self.list.count)) - Constants.Popup.margins if self.frame.size.height != h { diff --git a/StatsKit/helpers.swift b/StatsKit/helpers.swift index d3c16082..11dacd31 100644 --- a/StatsKit/helpers.swift +++ b/StatsKit/helpers.swift @@ -52,6 +52,7 @@ public let SpeedBase: [KeyValue_t] = [ ] public let ReaderUpdateIntervals: [Int] = [1, 2, 3, 5, 10, 15, 30] +public let NumbersOfProcesses: [Int] = [3, 5, 8, 10, 15] public struct Units { public let bytes: Int64