never/noctalia-shell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CompositorService: improved Hyprland detection so there is no warning on Niri.

Browse source
This commit is contained in:
LemmyCook 2025-09-12 22:55:13 -04:00
parent b66bb46fc1
commit dd4641eedd
1 changed files with 44 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

79
Services/CompositorService.qml
View file

@ -15,6 +15,8 @@ Singleton {
property bool isHyprland: false
property bool isNiri: false
readonly property string hyprlandSignature: Quickshell.env("HYPRLAND_INSTANCE_SIGNATURE")
// Generic workspace and window data
property ListModel workspaces: ListModel {}
property var windows: []
@ -50,42 +52,49 @@ Singleton {
}
// Hyprland connections
Connections {
target: Hyprland.workspaces
enabled: isHyprland
function onValuesChanged() {
try {
updateHyprlandWorkspaces()
workspaceChanged()
} catch (e) {
Logger.error("Compositor", "Error in workspaces onValuesChanged:", e)
}
}
}
Loader {
active: isHyprland
sourceComponent: Component {
Item {
Connections {
target: Hyprland.workspaces
enabled: isHyprland
function onValuesChanged() {
try {
updateHyprlandWorkspaces()
workspaceChanged()
} catch (e) {
Logger.error("Compositor", "Error in workspaces onValuesChanged:", e)
}
}
}
Connections {
target: Hyprland.toplevels
enabled: isHyprland
function onValuesChanged() {
try {
// Use debounced update to prevent too frequent calls
updateTimer.restart()
} catch (e) {
Logger.error("Compositor", "Error in toplevels onValuesChanged:", e)
}
}
}
Connections {
target: Hyprland.toplevels
enabled: isHyprland
function onValuesChanged() {
try {
// Use debounced update to prevent too frequent calls
updateTimer.restart()
} catch (e) {
Logger.error("Compositor", "Error in toplevels onValuesChanged:", e)
}
}
}
Connections {
target: Hyprland
enabled: isHyprland
function onRawEvent(event) {
try {
updateHyprlandWorkspaces()
workspaceChanged()
updateTimer.restart()
} catch (e) {
Logger.error("Compositor", "Error in rawEvent:", e)
Connections {
target: Hyprland
enabled: isHyprland
function onRawEvent(event) {
try {
updateHyprlandWorkspaces()
workspaceChanged()
updateTimer.restart()
} catch (e) {
Logger.error("Compositor", "Error in rawEvent:", e)
}
}
}
}
}
}
@ -93,7 +102,7 @@ Singleton {
function detectCompositor() {
try {
// Try Hyprland first
if (Hyprland.eventSocketPath) {
if (hyprlandSignature && hyprlandSignature.length > 0) {
compositorType = "hyprland"
isHyprland = true
isNiri = false