Bring backs most services
This commit is contained in:
parent
71cb79b08b
commit
ec3bff68ac
16 changed files with 1038 additions and 13 deletions
156
Services/Workspaces.qml
Normal file
156
Services/Workspaces.qml
Normal file
|
|
@ -0,0 +1,156 @@
|
|||
pragma Singleton
|
||||
|
||||
pragma ComponentBehavior
|
||||
|
||||
import QtQuick
|
||||
import Quickshell
|
||||
import Quickshell.Io
|
||||
import Quickshell.Hyprland
|
||||
import qs.Services
|
||||
|
||||
Singleton {
|
||||
id: root
|
||||
|
||||
property ListModel workspaces: ListModel {}
|
||||
property bool isHyprland: false
|
||||
property bool isNiri: false
|
||||
property var hlWorkspaces: Hyprland.workspaces.values
|
||||
// Detect which compositor we're using
|
||||
Component.onCompleted: {
|
||||
console.log("WorkspaceManager initializing...")
|
||||
detectCompositor()
|
||||
}
|
||||
|
||||
function detectCompositor() {
|
||||
try {
|
||||
try {
|
||||
if (Hyprland.eventSocketPath) {
|
||||
console.log("Detected Hyprland compositor")
|
||||
isHyprland = true
|
||||
isNiri = false
|
||||
initHyprland()
|
||||
return
|
||||
}
|
||||
} catch (e) {
|
||||
console.log("Hyprland not available:", e)
|
||||
}
|
||||
|
||||
if (typeof Niri !== "undefined") {
|
||||
console.log("Detected Niri service")
|
||||
isHyprland = false
|
||||
isNiri = true
|
||||
initNiri()
|
||||
return
|
||||
}
|
||||
|
||||
console.log("No supported compositor detected")
|
||||
} catch (e) {
|
||||
console.error("Error detecting compositor:", e)
|
||||
}
|
||||
}
|
||||
|
||||
// Initialize Hyprland integration
|
||||
function initHyprland() {
|
||||
try {
|
||||
// Fixes the odd workspace issue.
|
||||
Hyprland.refreshWorkspaces()
|
||||
// hlWorkspaces = Hyprland.workspaces.values;
|
||||
// updateHyprlandWorkspaces();
|
||||
return true
|
||||
} catch (e) {
|
||||
console.error("Error initializing Hyprland:", e)
|
||||
isHyprland = false
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
onHlWorkspacesChanged: {
|
||||
updateHyprlandWorkspaces()
|
||||
}
|
||||
|
||||
Connections {
|
||||
target: Hyprland.workspaces
|
||||
function onValuesChanged() {
|
||||
updateHyprlandWorkspaces()
|
||||
}
|
||||
}
|
||||
|
||||
Connections {
|
||||
target: Hyprland
|
||||
function onRawEvent(event) {
|
||||
updateHyprlandWorkspaces()
|
||||
}
|
||||
}
|
||||
|
||||
function updateHyprlandWorkspaces() {
|
||||
workspaces.clear()
|
||||
try {
|
||||
for (var i = 0; i < hlWorkspaces.length; i++) {
|
||||
const ws = hlWorkspaces[i]
|
||||
workspaces.append({
|
||||
"id": i,
|
||||
"idx": ws.id,
|
||||
"name": ws.name || "",
|
||||
"output": ws.monitor?.name || "",
|
||||
"isActive": ws.active === true,
|
||||
"isFocused": ws.focused === true,
|
||||
"isUrgent": ws.urgent === true
|
||||
})
|
||||
}
|
||||
workspacesChanged()
|
||||
} catch (e) {
|
||||
console.error("Error updating Hyprland workspaces:", e)
|
||||
}
|
||||
}
|
||||
|
||||
function initNiri() {
|
||||
updateNiriWorkspaces()
|
||||
}
|
||||
|
||||
Connections {
|
||||
target: Niri
|
||||
function onWorkspacesChanged() {
|
||||
updateNiriWorkspaces()
|
||||
}
|
||||
}
|
||||
|
||||
function updateNiriWorkspaces() {
|
||||
const niriWorkspaces = Niri.workspaces || []
|
||||
workspaces.clear()
|
||||
for (var i = 0; i < niriWorkspaces.length; i++) {
|
||||
const ws = niriWorkspaces[i]
|
||||
workspaces.append({
|
||||
"id": ws.id,
|
||||
"idx": ws.idx || 1,
|
||||
"name": ws.name || "",
|
||||
"output": ws.output || "",
|
||||
"isFocused": ws.isFocused === true,
|
||||
"isActive": ws.isActive === true,
|
||||
"isUrgent": ws.isUrgent === true,
|
||||
"isOccupied": ws.isOccupied === true
|
||||
})
|
||||
}
|
||||
|
||||
workspacesChanged()
|
||||
}
|
||||
|
||||
function switchToWorkspace(workspaceId) {
|
||||
if (isHyprland) {
|
||||
try {
|
||||
Hyprland.dispatch(`workspace ${workspaceId}`)
|
||||
} catch (e) {
|
||||
console.error("Error switching Hyprland workspace:", e)
|
||||
}
|
||||
} else if (isNiri) {
|
||||
try {
|
||||
Quickshell.execDetached(
|
||||
["niri", "msg", "action", "focus-workspace", workspaceId.toString(
|
||||
)])
|
||||
} catch (e) {
|
||||
console.error("Error switching Niri workspace:", e)
|
||||
}
|
||||
} else {
|
||||
console.warn("No supported compositor detected for workspace switching")
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue