mirror of
https://github.com/noctalia-dev/noctalia-shell.git
synced 2026-05-11 17:08:27 +08:00
e4d321e1af
Fixes #1427 The regex for parsing DRM connector from ddcutil output only matched "DRM connector:" (with space), but newer versions of ddcutil output "DRM_connector:" (with underscore). This caused the connector field to be empty for all DDC monitors, making it impossible to distinguish between multiple identical monitors (e.g., two "Mi Monitor" displays on DP-2 and DP-3). The fix uses a character class [_ ] to match both formats. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
412 lines
15 KiB
QML
412 lines
15 KiB
QML
pragma Singleton
|
|
|
|
import QtQuick
|
|
import Quickshell
|
|
import Quickshell.Io
|
|
import qs.Commons
|
|
|
|
Singleton {
|
|
id: root
|
|
|
|
property list<var> ddcMonitors: []
|
|
readonly property list<Monitor> monitors: variants.instances
|
|
property bool appleDisplayPresent: false
|
|
|
|
function getMonitorForScreen(screen: ShellScreen): var {
|
|
return monitors.find(m => m.modelData === screen);
|
|
}
|
|
|
|
// Signal emitted when a specific monitor's brightness changes, includes monitor context
|
|
signal monitorBrightnessChanged(var monitor, real newBrightness)
|
|
|
|
function getAvailableMethods(): list<string> {
|
|
var methods = [];
|
|
if (Settings.data.brightness.enableDdcSupport && monitors.some(m => m.isDdc))
|
|
methods.push("ddcutil");
|
|
if (monitors.some(m => !m.isDdc))
|
|
methods.push("internal");
|
|
if (appleDisplayPresent)
|
|
methods.push("apple");
|
|
return methods;
|
|
}
|
|
|
|
// Global helpers for IPC and shortcuts
|
|
function increaseBrightness(): void {
|
|
monitors.forEach(m => m.increaseBrightness());
|
|
}
|
|
|
|
function decreaseBrightness(): void {
|
|
monitors.forEach(m => m.decreaseBrightness());
|
|
}
|
|
|
|
function setBrightness(value: real): void {
|
|
monitors.forEach(m => m.setBrightnessDebounced(value));
|
|
}
|
|
|
|
function getDetectedDisplays(): list<var> {
|
|
return detectedDisplays;
|
|
}
|
|
|
|
reloadableId: "brightness"
|
|
|
|
Component.onCompleted: {
|
|
Logger.i("Brightness", "Service started");
|
|
if (Settings.data.brightness.enableDdcSupport) {
|
|
ddcProc.running = true;
|
|
}
|
|
}
|
|
|
|
onMonitorsChanged: {
|
|
ddcMonitors = [];
|
|
if (Settings.data.brightness.enableDdcSupport) {
|
|
ddcProc.running = true;
|
|
}
|
|
}
|
|
|
|
Connections {
|
|
target: Settings.data.brightness
|
|
function onEnableDdcSupportChanged() {
|
|
if (Settings.data.brightness.enableDdcSupport) {
|
|
// Re-detect DDC monitors when enabled
|
|
ddcMonitors = [];
|
|
ddcProc.running = true;
|
|
} else {
|
|
// Clear DDC monitors when disabled
|
|
ddcMonitors = [];
|
|
}
|
|
}
|
|
}
|
|
|
|
Variants {
|
|
id: variants
|
|
model: Quickshell.screens
|
|
Monitor {}
|
|
}
|
|
|
|
// Check for Apple Display support
|
|
Process {
|
|
running: true
|
|
command: ["sh", "-c", "which asdbctl >/dev/null 2>&1 && asdbctl get || echo ''"]
|
|
stdout: StdioCollector {
|
|
onStreamFinished: root.appleDisplayPresent = text.trim().length > 0
|
|
}
|
|
}
|
|
|
|
// Detect DDC monitors
|
|
Process {
|
|
id: ddcProc
|
|
property list<var> ddcMonitors: []
|
|
command: ["ddcutil", "detect", "--sleep-multiplier=0.5"]
|
|
stdout: StdioCollector {
|
|
onStreamFinished: {
|
|
var displays = text.trim().split("\n\n");
|
|
ddcProc.ddcMonitors = displays.map(d => {
|
|
var ddcModelMatch = d.match(/(This monitor does not support DDC\/CI|Invalid display)/);
|
|
var modelMatch = d.match(/Model:\s*(.*)/);
|
|
var busMatch = d.match(/I2C bus:[ ]*\/dev\/i2c-([0-9]+)/);
|
|
var connectorMatch = d.match(/DRM[_ ]connector:\s*card\d+-(.+)/);
|
|
var ddcModel = ddcModelMatch ? ddcModelMatch.length > 0 : false;
|
|
var model = modelMatch ? modelMatch[1] : "Unknown";
|
|
var bus = busMatch ? busMatch[1] : "Unknown";
|
|
var connector = connectorMatch ? connectorMatch[1].trim() : "";
|
|
Logger.i("Brightness", "Detected DDC Monitor:", model, "connector:", connector, "bus:", bus, "is DDC:", !ddcModel);
|
|
return {
|
|
"model": model,
|
|
"busNum": bus,
|
|
"connector": connector,
|
|
"isDdc": !ddcModel
|
|
};
|
|
});
|
|
root.ddcMonitors = ddcProc.ddcMonitors.filter(m => m.isDdc);
|
|
}
|
|
}
|
|
}
|
|
|
|
component Monitor: QtObject {
|
|
id: monitor
|
|
|
|
required property ShellScreen modelData
|
|
readonly property bool isDdc: Settings.data.brightness.enableDdcSupport && root.ddcMonitors.some(m => m.connector === modelData.name)
|
|
readonly property string busNum: root.ddcMonitors.find(m => m.connector === modelData.name)?.busNum ?? ""
|
|
readonly property bool isAppleDisplay: root.appleDisplayPresent && modelData.model.startsWith("StudioDisplay")
|
|
readonly property string method: isAppleDisplay ? "apple" : (isDdc ? "ddcutil" : "internal")
|
|
|
|
// Check if brightness control is available for this monitor
|
|
readonly property bool brightnessControlAvailable: {
|
|
if (isAppleDisplay)
|
|
return true;
|
|
if (isDdc)
|
|
return true;
|
|
// For internal displays, check if we have a brightness path
|
|
return brightnessPath !== "";
|
|
}
|
|
|
|
property real brightness
|
|
property real lastBrightness: 0
|
|
property real queuedBrightness: NaN
|
|
property bool commandRunning: false
|
|
|
|
// For internal displays - store the backlight device path
|
|
property string backlightDevice: ""
|
|
property string brightnessPath: ""
|
|
property string maxBrightnessPath: ""
|
|
property int maxBrightness: 100
|
|
property bool ignoreNextChange: false
|
|
|
|
// Signal for brightness changes
|
|
signal brightnessUpdated(real newBrightness)
|
|
|
|
// Execute a system command to get the current brightness value directly
|
|
readonly property Process refreshProc: Process {
|
|
stdout: StdioCollector {
|
|
onStreamFinished: {
|
|
var dataText = text.trim();
|
|
if (dataText === "") {
|
|
return;
|
|
}
|
|
|
|
var newBrightness = NaN;
|
|
|
|
if (monitor.isAppleDisplay) {
|
|
// Apple display format: single integer (0-101)
|
|
var val = parseInt(dataText);
|
|
if (!isNaN(val)) {
|
|
newBrightness = val / 101;
|
|
}
|
|
} else if (monitor.isDdc) {
|
|
// DDC format: "VCP 10 C 100 100" (space-separated)
|
|
var parts = dataText.split(" ");
|
|
if (parts.length >= 4) {
|
|
var current = parseInt(parts[3]);
|
|
var max = parseInt(parts[4]);
|
|
if (!isNaN(current) && !isNaN(max) && max > 0) {
|
|
monitor.maxBrightness = max;
|
|
newBrightness = current / max;
|
|
}
|
|
}
|
|
} else {
|
|
// Internal display format: two lines (current\nmax)
|
|
var lines = dataText.split("\n");
|
|
if (lines.length >= 2) {
|
|
var current = parseInt(lines[0].trim());
|
|
var max = parseInt(lines[1].trim());
|
|
if (!isNaN(current) && !isNaN(max) && max > 0) {
|
|
newBrightness = current / max;
|
|
}
|
|
}
|
|
}
|
|
|
|
// Update if we got a valid brightness value and it's different
|
|
if (!isNaN(newBrightness) && Math.abs(newBrightness - monitor.brightness) > 0.01) {
|
|
monitor.brightness = newBrightness;
|
|
monitor.brightnessUpdated(monitor.brightness);
|
|
root.monitorBrightnessChanged(monitor, monitor.brightness);
|
|
Logger.d("Brightness", "Refreshed brightness from system:", monitor.modelData.name, monitor.brightness);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
readonly property Process setBrightnessProc: Process {
|
|
stdout: StdioCollector {}
|
|
onExited: (exitCode, exitStatus) => {
|
|
monitor.commandRunning = false;
|
|
// If there's a queued brightness change, process it now
|
|
if (!isNaN(monitor.queuedBrightness)) {
|
|
Qt.callLater(() => {
|
|
monitor.setBrightness(monitor.queuedBrightness);
|
|
monitor.queuedBrightness = NaN;
|
|
});
|
|
}
|
|
}
|
|
}
|
|
|
|
// Function to actively refresh the brightness from system
|
|
function refreshBrightnessFromSystem() {
|
|
if (!monitor.isDdc && !monitor.isAppleDisplay) {
|
|
// For internal displays, query the system directly
|
|
refreshProc.command = ["sh", "-c", "cat " + monitor.brightnessPath + " && " + "cat " + monitor.maxBrightnessPath];
|
|
refreshProc.running = true;
|
|
} else if (monitor.isDdc) {
|
|
// For DDC displays, get the current value
|
|
refreshProc.command = ["ddcutil", "-b", monitor.busNum, "getvcp", "10", "--brief"];
|
|
refreshProc.running = true;
|
|
} else if (monitor.isAppleDisplay) {
|
|
// For Apple displays, get the current value
|
|
refreshProc.command = ["asdbctl", "get"];
|
|
refreshProc.running = true;
|
|
}
|
|
}
|
|
|
|
// FileView to watch for external brightness changes (internal displays only)
|
|
readonly property FileView brightnessWatcher: FileView {
|
|
id: brightnessWatcher
|
|
// Only set path for internal displays with a valid brightness path
|
|
path: (!monitor.isDdc && !monitor.isAppleDisplay && monitor.brightnessPath !== "") ? monitor.brightnessPath : ""
|
|
watchChanges: path !== ""
|
|
onFileChanged: {
|
|
// When a file change is detected, actively refresh from system
|
|
// to ensure we get the most up-to-date value
|
|
Qt.callLater(() => {
|
|
monitor.refreshBrightnessFromSystem();
|
|
});
|
|
}
|
|
}
|
|
|
|
// Initialize brightness
|
|
readonly property Process initProc: Process {
|
|
stdout: StdioCollector {
|
|
onStreamFinished: {
|
|
var dataText = text.trim();
|
|
if (dataText === "") {
|
|
return;
|
|
}
|
|
|
|
//Logger.i("Brightness", "Raw brightness data for", monitor.modelData.name + ":", dataText)
|
|
if (monitor.isAppleDisplay) {
|
|
var val = parseInt(dataText);
|
|
if (!isNaN(val)) {
|
|
monitor.brightness = val / 101;
|
|
Logger.d("Brightness", "Apple display brightness:", monitor.brightness);
|
|
}
|
|
} else if (monitor.isDdc) {
|
|
var parts = dataText.split(" ");
|
|
if (parts.length >= 4) {
|
|
var current = parseInt(parts[3]);
|
|
var max = parseInt(parts[4]);
|
|
if (!isNaN(current) && !isNaN(max) && max > 0) {
|
|
monitor.maxBrightness = max;
|
|
monitor.brightness = current / max;
|
|
Logger.d("Brightness", "DDC brightness:", current + "/" + max + " =", monitor.brightness);
|
|
}
|
|
}
|
|
} else {
|
|
// Internal backlight - parse the response which includes device path
|
|
var lines = dataText.split("\n");
|
|
if (lines.length >= 3) {
|
|
monitor.backlightDevice = lines[0];
|
|
monitor.brightnessPath = monitor.backlightDevice + "/brightness";
|
|
monitor.maxBrightnessPath = monitor.backlightDevice + "/max_brightness";
|
|
|
|
var current = parseInt(lines[1]);
|
|
var max = parseInt(lines[2]);
|
|
if (!isNaN(current) && !isNaN(max) && max > 0) {
|
|
monitor.maxBrightness = max;
|
|
monitor.brightness = current / max;
|
|
Logger.d("Brightness", "Internal brightness:", current + "/" + max + " =", monitor.brightness);
|
|
Logger.d("Brightness", "Using backlight device:", monitor.backlightDevice);
|
|
}
|
|
}
|
|
}
|
|
|
|
// Always update
|
|
monitor.brightnessUpdated(monitor.brightness);
|
|
root.monitorBrightnessChanged(monitor, monitor.brightness);
|
|
}
|
|
}
|
|
}
|
|
|
|
readonly property real stepSize: Settings.data.brightness.brightnessStep / 100.0
|
|
readonly property real minBrightnessValue: (Settings.data.brightness.enforceMinimum ? 0.01 : 0.0)
|
|
|
|
// Timer for debouncing rapid changes
|
|
readonly property Timer timer: Timer {
|
|
interval: 100
|
|
onTriggered: {
|
|
if (!isNaN(monitor.queuedBrightness)) {
|
|
monitor.setBrightness(monitor.queuedBrightness);
|
|
monitor.queuedBrightness = NaN;
|
|
}
|
|
}
|
|
}
|
|
|
|
// Timer for polling DDC monitor brightness (every 30 seconds)
|
|
readonly property Timer pollTimer: Timer {
|
|
interval: 30000
|
|
repeat: true
|
|
running: monitor.isDdc
|
|
triggeredOnStart: true
|
|
onTriggered: {
|
|
// Only refresh if not currently setting brightness
|
|
if (!monitor.commandRunning && isNaN(monitor.queuedBrightness)) {
|
|
monitor.refreshBrightnessFromSystem();
|
|
}
|
|
}
|
|
}
|
|
|
|
function setBrightnessDebounced(value: real): void {
|
|
monitor.queuedBrightness = value;
|
|
timer.start();
|
|
}
|
|
|
|
function increaseBrightness(): void {
|
|
const value = !isNaN(monitor.queuedBrightness) ? monitor.queuedBrightness : monitor.brightness;
|
|
// Enforce minimum brightness if enabled
|
|
if (Settings.data.brightness.enforceMinimum && value < minBrightnessValue) {
|
|
setBrightnessDebounced(Math.max(stepSize, minBrightnessValue));
|
|
} else {
|
|
// Normal brightness increase
|
|
setBrightnessDebounced(value + stepSize);
|
|
}
|
|
}
|
|
|
|
function decreaseBrightness(): void {
|
|
const value = !isNaN(monitor.queuedBrightness) ? monitor.queuedBrightness : monitor.brightness;
|
|
setBrightnessDebounced(value - stepSize);
|
|
}
|
|
|
|
function setBrightness(value: real): void {
|
|
value = Math.max(minBrightnessValue, Math.min(1, value));
|
|
var rounded = Math.round(value * 100);
|
|
|
|
// Always update internal value and trigger UI feedback immediately
|
|
monitor.brightness = value;
|
|
monitor.brightnessUpdated(value);
|
|
root.monitorBrightnessChanged(monitor, monitor.brightness);
|
|
|
|
if (timer.running) {
|
|
monitor.queuedBrightness = value;
|
|
return;
|
|
}
|
|
|
|
// If a command is already running, queue this value
|
|
if (monitor.commandRunning) {
|
|
monitor.queuedBrightness = value;
|
|
return;
|
|
}
|
|
|
|
// Execute the brightness change command
|
|
monitor.commandRunning = true;
|
|
monitor.ignoreNextChange = true;
|
|
|
|
if (isAppleDisplay) {
|
|
setBrightnessProc.command = ["asdbctl", "set", rounded];
|
|
setBrightnessProc.running = true;
|
|
} else if (isDdc) {
|
|
var ddcValue = Math.round(value * monitor.maxBrightness);
|
|
setBrightnessProc.command = ["ddcutil", "-b", busNum, "--sleep-multiplier=0.05", "setvcp", "10", ddcValue];
|
|
setBrightnessProc.running = true;
|
|
} else {
|
|
setBrightnessProc.command = ["brightnessctl", "s", rounded + "%"];
|
|
setBrightnessProc.running = true;
|
|
}
|
|
}
|
|
|
|
function initBrightness(): void {
|
|
if (isAppleDisplay) {
|
|
initProc.command = ["asdbctl", "get"];
|
|
} else if (isDdc) {
|
|
initProc.command = ["ddcutil", "-b", busNum, "getvcp", "10", "--brief"];
|
|
} else {
|
|
// Internal backlight - find the first available backlight device and get its info
|
|
// This now returns: device_path, current_brightness, max_brightness (on separate lines)
|
|
initProc.command = ["sh", "-c", "for dev in /sys/class/backlight/*; do " + " if [ -f \"$dev/brightness\" ] && [ -f \"$dev/max_brightness\" ]; then " + " echo \"$dev\"; " + " cat \"$dev/brightness\"; " + " cat \"$dev/max_brightness\"; " + " break; " + " fi; " + "done"];
|
|
}
|
|
initProc.running = true;
|
|
}
|
|
|
|
onBusNumChanged: initBrightness()
|
|
Component.onCompleted: initBrightness()
|
|
}
|
|
}
|