mirror of
https://github.com/zoriya/noctalia-shell.git
synced 2026-05-30 09:19:08 +00:00
Create SwayService
This is for the most part a copy-paste job of hyprland. Uses ToplevelManager to provide information about toplevels which is not available from the I3 api. Some features like taskbar focus is a bit broken as this happens by app_id which falls apart for XWayland windows and applications with multiple open windows.
This commit is contained in:
@@ -11,6 +11,7 @@ Singleton {
|
||||
// Compositor detection
|
||||
property bool isHyprland: false
|
||||
property bool isNiri: false
|
||||
property bool isSway: false
|
||||
|
||||
// Generic workspace and window data
|
||||
property ListModel workspaces: ListModel {}
|
||||
@@ -31,14 +32,22 @@ Singleton {
|
||||
|
||||
function detectCompositor() {
|
||||
const hyprlandSignature = Quickshell.env("HYPRLAND_INSTANCE_SIGNATURE")
|
||||
const swaySock = Quickshell.env("SWAYSOCK")
|
||||
if (hyprlandSignature && hyprlandSignature.length > 0) {
|
||||
isHyprland = true
|
||||
isNiri = false
|
||||
isSway = false
|
||||
backendLoader.sourceComponent = hyprlandComponent
|
||||
} else if (swaySock && swaySock.length > 0) {
|
||||
isHyprland = false
|
||||
isNiri = false
|
||||
isSway = true
|
||||
backendLoader.sourceComponent = swayComponent
|
||||
} else {
|
||||
// Default to Niri
|
||||
isHyprland = false
|
||||
isNiri = true
|
||||
isSway = false
|
||||
backendLoader.sourceComponent = niriComponent
|
||||
}
|
||||
}
|
||||
@@ -70,6 +79,14 @@ Singleton {
|
||||
}
|
||||
}
|
||||
|
||||
// Sway backend component
|
||||
Component {
|
||||
id: swayComponent
|
||||
SwayService {
|
||||
id: swayBackend
|
||||
}
|
||||
}
|
||||
|
||||
function setupBackendConnections() {
|
||||
if (!backend)
|
||||
return
|
||||
|
||||
@@ -0,0 +1,233 @@
|
||||
import QtQuick
|
||||
import Quickshell
|
||||
import Quickshell.I3
|
||||
import Quickshell.Wayland
|
||||
import qs.Commons
|
||||
|
||||
Item {
|
||||
id: root
|
||||
|
||||
// Properties that match the facade interface
|
||||
property ListModel workspaces: ListModel {}
|
||||
property var windows: []
|
||||
property int focusedWindowIndex: -1
|
||||
|
||||
// Signals that match the facade interface
|
||||
signal workspaceChanged
|
||||
signal activeWindowChanged
|
||||
signal windowListChanged
|
||||
|
||||
// I3-specific properties
|
||||
property bool initialized: false
|
||||
|
||||
// Debounce timer for updates
|
||||
Timer {
|
||||
id: updateTimer
|
||||
interval: 50
|
||||
repeat: false
|
||||
onTriggered: safeUpdate()
|
||||
}
|
||||
|
||||
// Initialization
|
||||
function initialize() {
|
||||
if (initialized)
|
||||
return
|
||||
|
||||
try {
|
||||
I3.refreshWorkspaces()
|
||||
Qt.callLater(() => {
|
||||
safeUpdateWorkspaces()
|
||||
safeUpdateWindows()
|
||||
})
|
||||
initialized = true
|
||||
Logger.log("SwayService", "Initialized successfully")
|
||||
} catch (e) {
|
||||
Logger.error("SwayService", "Failed to initialize:", e)
|
||||
}
|
||||
}
|
||||
|
||||
// Safe update wrapper
|
||||
function safeUpdate() {
|
||||
safeUpdateWindows()
|
||||
safeUpdateWorkspaces()
|
||||
windowListChanged()
|
||||
}
|
||||
|
||||
// Safe workspace update
|
||||
function safeUpdateWorkspaces() {
|
||||
try {
|
||||
workspaces.clear()
|
||||
|
||||
if (!I3.workspaces || !I3.workspaces.values) {
|
||||
return
|
||||
}
|
||||
|
||||
const hlWorkspaces = I3.workspaces.values
|
||||
|
||||
for (var i = 0; i < hlWorkspaces.length; i++) {
|
||||
const ws = hlWorkspaces[i]
|
||||
if (!ws || ws.id < 1)
|
||||
continue
|
||||
|
||||
const wsData = {
|
||||
"id": i,
|
||||
"idx": ws.id,
|
||||
"name": ws.name || "",
|
||||
"output": (ws.monitor && ws.monitor.name) ? ws.monitor.name : "",
|
||||
"isActive": ws.active === true,
|
||||
"isFocused": ws.focused === true,
|
||||
"isUrgent": ws.urgent === true,
|
||||
"isOccupied": true
|
||||
}
|
||||
|
||||
workspaces.append(wsData)
|
||||
}
|
||||
} catch (e) {
|
||||
Logger.error("SwayService", "Error updating workspaces:", e)
|
||||
}
|
||||
}
|
||||
|
||||
// Safe window update
|
||||
function safeUpdateWindows() {
|
||||
try {
|
||||
const windowsList = []
|
||||
|
||||
if (!ToplevelManager.toplevels || !ToplevelManager.toplevels.values) {
|
||||
windows = []
|
||||
focusedWindowIndex = -1
|
||||
return
|
||||
}
|
||||
|
||||
const hlToplevels = ToplevelManager.toplevels.values
|
||||
let newFocusedIndex = -1
|
||||
|
||||
for (var i = 0; i < hlToplevels.length; i++) {
|
||||
const toplevel = hlToplevels[i]
|
||||
if (!toplevel)
|
||||
continue
|
||||
|
||||
const windowData = extractWindowData(toplevel)
|
||||
if (windowData) {
|
||||
windowsList.push(windowData)
|
||||
|
||||
if (windowData.isFocused) {
|
||||
newFocusedIndex = windowsList.length - 1
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
windows = windowsList
|
||||
|
||||
if (newFocusedIndex !== focusedWindowIndex) {
|
||||
focusedWindowIndex = newFocusedIndex
|
||||
activeWindowChanged()
|
||||
}
|
||||
} catch (e) {
|
||||
Logger.error("SwayService", "Error updating windows:", e)
|
||||
}
|
||||
}
|
||||
|
||||
// Extract window data safely from a toplevel
|
||||
function extractWindowData(toplevel) {
|
||||
if (!toplevel)
|
||||
return null
|
||||
|
||||
try {
|
||||
// Safely extract properties
|
||||
const appId = extractAppId(toplevel)
|
||||
const title = safeGetProperty(toplevel, "title", "")
|
||||
const focused = toplevel.activated === true
|
||||
|
||||
return {
|
||||
"title": title,
|
||||
"appId": appId,
|
||||
"isFocused": focused
|
||||
}
|
||||
} catch (e) {
|
||||
return null
|
||||
}
|
||||
}
|
||||
|
||||
// Extract app ID from various possible sources
|
||||
function extractAppId(toplevel) {
|
||||
if (!toplevel)
|
||||
return ""
|
||||
|
||||
return toplevel.appId;
|
||||
}
|
||||
|
||||
// Safe property getter
|
||||
function safeGetProperty(obj, prop, defaultValue) {
|
||||
try {
|
||||
const value = obj[prop]
|
||||
if (value !== undefined && value !== null) {
|
||||
return String(value)
|
||||
}
|
||||
} catch (e) {
|
||||
|
||||
// Property access failed
|
||||
}
|
||||
return defaultValue
|
||||
}
|
||||
|
||||
// Connections to I3
|
||||
Connections {
|
||||
target: I3.workspaces
|
||||
enabled: initialized
|
||||
function onValuesChanged() {
|
||||
safeUpdateWorkspaces()
|
||||
workspaceChanged()
|
||||
}
|
||||
}
|
||||
|
||||
Connections {
|
||||
target: ToplevelManager
|
||||
enabled: initialized
|
||||
function onActiveToplevelChanged() {
|
||||
updateTimer.restart()
|
||||
}
|
||||
}
|
||||
|
||||
Connections {
|
||||
target: I3
|
||||
enabled: initialized
|
||||
function onRawEvent(event) {
|
||||
safeUpdateWorkspaces()
|
||||
workspaceChanged()
|
||||
updateTimer.restart()
|
||||
}
|
||||
}
|
||||
|
||||
// Public functions
|
||||
function switchToWorkspace(workspace) {
|
||||
try {
|
||||
I3.dispatch(`workspace ${workspace.name}`)
|
||||
} catch (e) {
|
||||
Logger.error("SwayService", "Failed to switch workspace:", e)
|
||||
}
|
||||
}
|
||||
|
||||
function focusWindow(window) {
|
||||
try {
|
||||
I3.dispatch(`[app_id="${window.appId}"] focus`)
|
||||
} catch (e) {
|
||||
Logger.error("SwayService", "Failed to switch window:", e)
|
||||
}
|
||||
}
|
||||
|
||||
function closeWindow(window) {
|
||||
try {
|
||||
I3.dispatch(`[app_id="${window.appId}"] kill`)
|
||||
} catch (e) {
|
||||
Logger.error("SwayService", "Failed to close window:", e)
|
||||
}
|
||||
}
|
||||
|
||||
function logout() {
|
||||
try {
|
||||
Quickshell.execDetached(["swaymsg", "exit"])
|
||||
} catch (e) {
|
||||
Logger.error("SwayService", "Failed to logout:", e)
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user