feat: clickable workspaces, per monitor workspaces, hyprland support
This commit is contained in:
parent
a9e9dcab18
commit
67eade1c1f
4 changed files with 500 additions and 164 deletions
194
Services/WorkspaceManager.qml
Normal file
194
Services/WorkspaceManager.qml
Normal file
|
|
@ -0,0 +1,194 @@
|
|||
pragma Singleton
|
||||
pragma ComponentBehavior: Bound
|
||||
|
||||
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 {
|
||||
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 (let 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 (let 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
|
||||
});
|
||||
}
|
||||
|
||||
const tempArray = [];
|
||||
for (let i = 0; i < workspaces.count; i++) {
|
||||
tempArray.push({
|
||||
id: workspaces.get(i).id,
|
||||
idx: workspaces.get(i).idx,
|
||||
name: workspaces.get(i).name,
|
||||
output: workspaces.get(i).output,
|
||||
isActive: workspaces.get(i).isActive,
|
||||
isFocused: workspaces.get(i).isFocused,
|
||||
isUrgent: workspaces.get(i).isUrgent
|
||||
});
|
||||
}
|
||||
|
||||
const outputPositions = {};
|
||||
if (isNiri && Niri.outputs) {
|
||||
for (let i = 0; i < Niri.outputs.length; i++) {
|
||||
const output = Niri.outputs[i];
|
||||
outputPositions[output.connector] = output.x;
|
||||
}
|
||||
}
|
||||
|
||||
tempArray.sort((a, b) => {
|
||||
if (a.output !== b.output) {
|
||||
if (isNiri && Niri.outputs && Niri.outputs.length > 0) {
|
||||
const outputA = Niri.outputs.find(o => o.connector === a.output);
|
||||
const outputB = Niri.outputs.find(o => o.connector === b.output);
|
||||
|
||||
if (outputA && outputB) {
|
||||
return outputA.x - outputB.x;
|
||||
}
|
||||
}
|
||||
|
||||
return a.output.localeCompare(b.output);
|
||||
}
|
||||
|
||||
return a.id - b.id;
|
||||
});
|
||||
|
||||
workspaces.clear();
|
||||
for (let i = 0; i < tempArray.length; i++) {
|
||||
const ws = tempArray[i];
|
||||
workspaces.append(ws);
|
||||
}
|
||||
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