mirror of
https://github.com/AvengeMedia/DankMaterialShell.git
synced 2025-12-09 23:15:38 -05:00
niri: connect directly to socket rather than running commands
This commit is contained in:
bbedward
@@ -7,371 +7,293 @@ import Quickshell.Io
|
||||
|
||||
Singleton {
|
||||
id: root
|
||||
|
||||
|
||||
// Workspace management
|
||||
property var workspaces: ({})
|
||||
property var allWorkspaces: []
|
||||
property int focusedWorkspaceIndex: 0
|
||||
property string focusedWorkspaceId: ""
|
||||
property var currentOutputWorkspaces: []
|
||||
property string currentOutput: ""
|
||||
|
||||
|
||||
// Window management
|
||||
property var windows: []
|
||||
property int focusedWindowIndex: -1
|
||||
property string focusedWindowTitle: "(No active window)"
|
||||
property string focusedWindowId: ""
|
||||
|
||||
|
||||
// Overview state
|
||||
property bool inOverview: false
|
||||
|
||||
|
||||
signal windowOpenedOrChanged(var windowData)
|
||||
|
||||
|
||||
// Feature availability
|
||||
property bool niriAvailable: false
|
||||
|
||||
Component.onCompleted: {
|
||||
console.log("NiriService: Component.onCompleted - initializing service")
|
||||
checkNiriAvailability()
|
||||
}
|
||||
|
||||
// Check if niri is available
|
||||
|
||||
readonly property string socketPath: Quickshell.env("NIRI_SOCKET")
|
||||
|
||||
Component.onCompleted: checkNiriAvailability()
|
||||
|
||||
Process {
|
||||
id: niriCheck
|
||||
command: ["which", "niri"]
|
||||
|
||||
onExited: (exitCode) => {
|
||||
root.niriAvailable = exitCode === 0
|
||||
command: ["test", "-S", root.socketPath]
|
||||
|
||||
onExited: exitCode => {
|
||||
root.niriAvailable = exitCode === 0;
|
||||
if (root.niriAvailable) {
|
||||
console.log("NiriService: niri found, starting event stream and loading initial data")
|
||||
eventStreamProcess.running = true
|
||||
loadInitialWorkspaceData()
|
||||
} else {
|
||||
console.log("NiriService: niri not found, workspace features disabled")
|
||||
eventStreamSocket.connected = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
function checkNiriAvailability() {
|
||||
niriCheck.running = true
|
||||
niriCheck.running = true;
|
||||
}
|
||||
|
||||
// Load initial workspace data
|
||||
Process {
|
||||
id: initialDataQuery
|
||||
command: ["niri", "msg", "-j", "workspaces"]
|
||||
running: false
|
||||
|
||||
stdout: StdioCollector {
|
||||
onStreamFinished: {
|
||||
if (text && text.trim()) {
|
||||
try {
|
||||
console.log("NiriService: Loaded initial workspace data")
|
||||
const workspaces = JSON.parse(text.trim())
|
||||
// Initial query returns array directly, event stream wraps it in WorkspacesChanged
|
||||
handleWorkspacesChanged({ workspaces: workspaces })
|
||||
} catch (e) {
|
||||
console.warn("NiriService: Failed to parse initial workspace data:", e)
|
||||
}
|
||||
}
|
||||
|
||||
Socket {
|
||||
id: eventStreamSocket
|
||||
path: root.socketPath
|
||||
connected: false
|
||||
|
||||
onConnectionStateChanged: {
|
||||
if (connected) {
|
||||
write('"EventStream"\n');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Load initial windows data
|
||||
Process {
|
||||
id: initialWindowsQuery
|
||||
command: ["niri", "msg", "-j", "windows"]
|
||||
running: false
|
||||
|
||||
stdout: StdioCollector {
|
||||
onStreamFinished: {
|
||||
if (text && text.trim()) {
|
||||
try {
|
||||
const windowsData = JSON.parse(text.trim())
|
||||
if (windowsData && windowsData.windows) {
|
||||
handleWindowsChanged(windowsData)
|
||||
console.log("NiriService: Loaded", windowsData.windows.length, "initial windows")
|
||||
}
|
||||
} catch (e) {
|
||||
console.warn("NiriService: Failed to parse initial windows data:", e)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Load initial focused window data
|
||||
Process {
|
||||
id: initialFocusedWindowQuery
|
||||
command: ["niri", "msg", "-j", "focused-window"]
|
||||
running: false
|
||||
|
||||
stdout: StdioCollector {
|
||||
onStreamFinished: {
|
||||
if (text && text.trim()) {
|
||||
try {
|
||||
const focusedData = JSON.parse(text.trim())
|
||||
if (focusedData && focusedData.id) {
|
||||
handleWindowFocusChanged({ id: focusedData.id })
|
||||
console.log("NiriService: Loaded initial focused window:", focusedData.id)
|
||||
}
|
||||
} catch (e) {
|
||||
console.warn("NiriService: Failed to parse initial focused window data:", e)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function loadInitialWorkspaceData() {
|
||||
console.log("NiriService: Loading initial workspace data...")
|
||||
initialDataQuery.running = true
|
||||
initialWindowsQuery.running = true
|
||||
initialFocusedWindowQuery.running = true
|
||||
}
|
||||
|
||||
// Event stream for real-time updates
|
||||
Process {
|
||||
id: eventStreamProcess
|
||||
command: ["niri", "msg", "-j", "event-stream"]
|
||||
running: false // Will be enabled after niri check
|
||||
|
||||
stdout: SplitParser {
|
||||
onRead: data => {
|
||||
|
||||
parser: SplitParser {
|
||||
onRead: line => {
|
||||
try {
|
||||
const event = JSON.parse(data.trim())
|
||||
handleNiriEvent(event)
|
||||
const event = JSON.parse(line);
|
||||
handleNiriEvent(event);
|
||||
} catch (e) {
|
||||
console.warn("NiriService: Failed to parse event:", data, e)
|
||||
console.warn("NiriService: Failed to parse event:", line, e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
onExited: (exitCode) => {
|
||||
if (exitCode !== 0 && root.niriAvailable) {
|
||||
console.warn("NiriService: Event stream exited with code", exitCode, "restarting immediately")
|
||||
eventStreamProcess.running = true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
Socket {
|
||||
id: requestSocket
|
||||
path: root.socketPath
|
||||
connected: root.niriAvailable
|
||||
}
|
||||
|
||||
function handleNiriEvent(event) {
|
||||
if (event.WorkspacesChanged) {
|
||||
handleWorkspacesChanged(event.WorkspacesChanged)
|
||||
handleWorkspacesChanged(event.WorkspacesChanged);
|
||||
} else if (event.WorkspaceActivated) {
|
||||
handleWorkspaceActivated(event.WorkspaceActivated)
|
||||
handleWorkspaceActivated(event.WorkspaceActivated);
|
||||
} else if (event.WindowsChanged) {
|
||||
handleWindowsChanged(event.WindowsChanged)
|
||||
handleWindowsChanged(event.WindowsChanged);
|
||||
} else if (event.WindowClosed) {
|
||||
handleWindowClosed(event.WindowClosed)
|
||||
handleWindowClosed(event.WindowClosed);
|
||||
} else if (event.WindowFocusChanged) {
|
||||
handleWindowFocusChanged(event.WindowFocusChanged)
|
||||
handleWindowFocusChanged(event.WindowFocusChanged);
|
||||
} else if (event.WindowOpenedOrChanged) {
|
||||
handleWindowOpenedOrChanged(event.WindowOpenedOrChanged)
|
||||
handleWindowOpenedOrChanged(event.WindowOpenedOrChanged);
|
||||
} else if (event.OverviewOpenedOrClosed) {
|
||||
handleOverviewChanged(event.OverviewOpenedOrClosed)
|
||||
handleOverviewChanged(event.OverviewOpenedOrClosed);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
function handleWorkspacesChanged(data) {
|
||||
allWorkspaces = [...data.workspaces].sort((a, b) => a.idx - b.idx)
|
||||
|
||||
// Update focused workspace
|
||||
focusedWorkspaceIndex = allWorkspaces.findIndex(w => w.is_focused)
|
||||
if (focusedWorkspaceIndex >= 0) {
|
||||
var focusedWs = allWorkspaces[focusedWorkspaceIndex]
|
||||
focusedWorkspaceId = focusedWs.id
|
||||
currentOutput = focusedWs.output || ""
|
||||
} else {
|
||||
focusedWorkspaceIndex = 0
|
||||
focusedWorkspaceId = ""
|
||||
const workspaces = {};
|
||||
|
||||
for (const ws of data.workspaces) {
|
||||
workspaces[ws.id] = ws;
|
||||
}
|
||||
|
||||
updateCurrentOutputWorkspaces()
|
||||
|
||||
root.workspaces = workspaces;
|
||||
allWorkspaces = [...data.workspaces].sort((a, b) => a.idx - b.idx);
|
||||
|
||||
focusedWorkspaceIndex = allWorkspaces.findIndex(w => w.is_focused);
|
||||
if (focusedWorkspaceIndex >= 0) {
|
||||
var focusedWs = allWorkspaces[focusedWorkspaceIndex];
|
||||
focusedWorkspaceId = focusedWs.id;
|
||||
currentOutput = focusedWs.output || "";
|
||||
} else {
|
||||
focusedWorkspaceIndex = 0;
|
||||
focusedWorkspaceId = "";
|
||||
}
|
||||
|
||||
updateCurrentOutputWorkspaces();
|
||||
}
|
||||
|
||||
|
||||
function handleWorkspaceActivated(data) {
|
||||
// Update focused workspace
|
||||
focusedWorkspaceId = data.id
|
||||
focusedWorkspaceIndex = allWorkspaces.findIndex(w => w.id === data.id)
|
||||
|
||||
if (focusedWorkspaceIndex >= 0) {
|
||||
var activatedWs = allWorkspaces[focusedWorkspaceIndex]
|
||||
|
||||
// Update workspace states properly
|
||||
// First, deactivate all workspaces on this output
|
||||
for (var i = 0; i < allWorkspaces.length; i++) {
|
||||
if (allWorkspaces[i].output === activatedWs.output) {
|
||||
allWorkspaces[i].is_active = false
|
||||
allWorkspaces[i].is_focused = false
|
||||
}
|
||||
const ws = root.workspaces[data.id];
|
||||
if (!ws)
|
||||
return;
|
||||
const output = ws.output;
|
||||
|
||||
for (const id in root.workspaces) {
|
||||
const workspace = root.workspaces[id];
|
||||
const got_activated = workspace.id === data.id;
|
||||
|
||||
if (workspace.output === output) {
|
||||
workspace.is_active = got_activated;
|
||||
}
|
||||
|
||||
if (data.focused) {
|
||||
workspace.is_focused = got_activated;
|
||||
}
|
||||
|
||||
// Then activate the new workspace
|
||||
allWorkspaces[focusedWorkspaceIndex].is_active = true
|
||||
allWorkspaces[focusedWorkspaceIndex].is_focused = data.focused || false
|
||||
|
||||
currentOutput = activatedWs.output || ""
|
||||
|
||||
updateCurrentOutputWorkspaces()
|
||||
|
||||
// Force property change notifications
|
||||
allWorkspacesChanged()
|
||||
} else {
|
||||
focusedWorkspaceIndex = 0
|
||||
}
|
||||
|
||||
focusedWorkspaceId = data.id;
|
||||
focusedWorkspaceIndex = allWorkspaces.findIndex(w => w.id === data.id);
|
||||
|
||||
if (focusedWorkspaceIndex >= 0) {
|
||||
currentOutput = allWorkspaces[focusedWorkspaceIndex].output || "";
|
||||
}
|
||||
|
||||
allWorkspaces = Object.values(root.workspaces).sort((a, b) => a.idx - b.idx);
|
||||
|
||||
updateCurrentOutputWorkspaces();
|
||||
workspacesChanged();
|
||||
}
|
||||
|
||||
|
||||
function handleWindowsChanged(data) {
|
||||
windows = [...data.windows].sort((a, b) => a.id - b.id)
|
||||
updateFocusedWindow()
|
||||
windows = [...data.windows].sort((a, b) => a.id - b.id);
|
||||
updateFocusedWindow();
|
||||
}
|
||||
|
||||
|
||||
function handleWindowClosed(data) {
|
||||
windows = windows.filter(w => w.id !== data.id)
|
||||
updateFocusedWindow()
|
||||
windows = windows.filter(w => w.id !== data.id);
|
||||
updateFocusedWindow();
|
||||
}
|
||||
|
||||
|
||||
function handleWindowFocusChanged(data) {
|
||||
if (data.id) {
|
||||
focusedWindowId = data.id
|
||||
focusedWindowIndex = windows.findIndex(w => w.id === data.id)
|
||||
focusedWindowId = data.id;
|
||||
focusedWindowIndex = windows.findIndex(w => w.id === data.id);
|
||||
} else {
|
||||
focusedWindowId = ""
|
||||
focusedWindowIndex = -1
|
||||
focusedWindowId = "";
|
||||
focusedWindowIndex = -1;
|
||||
}
|
||||
updateFocusedWindow()
|
||||
updateFocusedWindow();
|
||||
}
|
||||
|
||||
|
||||
function handleWindowOpenedOrChanged(data) {
|
||||
if (!data.window) return;
|
||||
|
||||
if (!data.window)
|
||||
return;
|
||||
|
||||
const window = data.window;
|
||||
const existingIndex = windows.findIndex(w => w.id === window.id);
|
||||
|
||||
|
||||
if (existingIndex >= 0) {
|
||||
// Update existing window - create new array to trigger property change
|
||||
let updatedWindows = [...windows];
|
||||
updatedWindows[existingIndex] = window;
|
||||
windows = updatedWindows.sort((a, b) => a.id - b.id);
|
||||
} else {
|
||||
// Add new window
|
||||
windows = [...windows, window].sort((a, b) => a.id - b.id);
|
||||
}
|
||||
|
||||
// Update focused window if this window is focused
|
||||
|
||||
if (window.is_focused) {
|
||||
focusedWindowId = window.id;
|
||||
focusedWindowIndex = windows.findIndex(w => w.id === window.id);
|
||||
}
|
||||
|
||||
|
||||
updateFocusedWindow();
|
||||
|
||||
// Emit signal for other services to listen to
|
||||
|
||||
windowOpenedOrChanged(window);
|
||||
}
|
||||
|
||||
function handleOverviewChanged(data) {
|
||||
inOverview = data.is_open
|
||||
inOverview = data.is_open;
|
||||
}
|
||||
|
||||
|
||||
function updateCurrentOutputWorkspaces() {
|
||||
if (!currentOutput) {
|
||||
currentOutputWorkspaces = allWorkspaces
|
||||
return
|
||||
currentOutputWorkspaces = allWorkspaces;
|
||||
return;
|
||||
}
|
||||
|
||||
// Filter workspaces for current output
|
||||
var outputWs = allWorkspaces.filter(w => w.output === currentOutput)
|
||||
currentOutputWorkspaces = outputWs
|
||||
|
||||
var outputWs = allWorkspaces.filter(w => w.output === currentOutput);
|
||||
currentOutputWorkspaces = outputWs;
|
||||
}
|
||||
|
||||
|
||||
function updateFocusedWindow() {
|
||||
if (focusedWindowIndex >= 0 && focusedWindowIndex < windows.length) {
|
||||
var focusedWin = windows[focusedWindowIndex]
|
||||
focusedWindowTitle = focusedWin.title || "(Unnamed window)"
|
||||
var focusedWin = windows[focusedWindowIndex];
|
||||
focusedWindowTitle = focusedWin.title || "(Unnamed window)";
|
||||
} else {
|
||||
focusedWindowTitle = "(No active window)"
|
||||
focusedWindowTitle = "(No active window)";
|
||||
}
|
||||
}
|
||||
|
||||
// Public API functions
|
||||
function switchToWorkspace(workspaceId) {
|
||||
if (!niriAvailable) return false
|
||||
|
||||
Quickshell.execDetached(["niri", "msg", "action", "focus-workspace", workspaceId.toString()])
|
||||
return true
|
||||
|
||||
function send(request) {
|
||||
if (!niriAvailable || !requestSocket.connected)
|
||||
return false;
|
||||
requestSocket.write(JSON.stringify(request) + "\n");
|
||||
return true;
|
||||
}
|
||||
|
||||
function switchToWorkspaceByIndex(index) {
|
||||
if (!niriAvailable || index < 0 || index >= allWorkspaces.length) return false
|
||||
|
||||
var workspace = allWorkspaces[index]
|
||||
return switchToWorkspace(workspace.id)
|
||||
|
||||
function switchToWorkspace(workspaceIndex) {
|
||||
return send({
|
||||
Action: {
|
||||
FocusWorkspace: {
|
||||
reference: {
|
||||
Index: workspaceIndex
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
function switchToWorkspaceByNumber(number, output) {
|
||||
if (!niriAvailable) return false
|
||||
|
||||
var targetOutput = output || currentOutput
|
||||
if (!targetOutput) {
|
||||
console.warn("NiriService: No output specified for workspace switching")
|
||||
return false
|
||||
}
|
||||
|
||||
// Get workspaces for the target output, sorted by idx
|
||||
var outputWorkspaces = allWorkspaces.filter(w => w.output === targetOutput).sort((a, b) => a.idx - b.idx)
|
||||
|
||||
// Use sequential index (number is 1-based, array is 0-based)
|
||||
if (number >= 1 && number <= outputWorkspaces.length) {
|
||||
var workspace = outputWorkspaces[number - 1]
|
||||
return switchToWorkspace(workspace.id)
|
||||
}
|
||||
|
||||
console.warn("NiriService: No workspace", number, "found on output", targetOutput)
|
||||
return false
|
||||
}
|
||||
|
||||
|
||||
function getCurrentOutputWorkspaceNumbers() {
|
||||
return currentOutputWorkspaces.map(w => w.idx + 1) // niri uses 0-based, UI shows 1-based
|
||||
return currentOutputWorkspaces.map(w => w.idx + 1); // niri uses 0-based, UI shows 1-based
|
||||
}
|
||||
|
||||
|
||||
function getCurrentWorkspaceNumber() {
|
||||
if (focusedWorkspaceIndex >= 0 && focusedWorkspaceIndex < allWorkspaces.length) {
|
||||
return allWorkspaces[focusedWorkspaceIndex].idx + 1
|
||||
return allWorkspaces[focusedWorkspaceIndex].idx + 1;
|
||||
}
|
||||
return 1
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
function focusWindow(windowId) {
|
||||
if (!niriAvailable) return false
|
||||
|
||||
console.log("NiriService: Focusing window with command:", ["niri", "msg", "action", "focus-window", "--id", windowId.toString()])
|
||||
Quickshell.execDetached(["niri", "msg", "action", "focus-window", "--id", windowId.toString()])
|
||||
return true
|
||||
return send({
|
||||
Action: {
|
||||
FocusWindow: {
|
||||
id: windowId
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
function closeWindow(windowId) {
|
||||
if (!niriAvailable) return false
|
||||
|
||||
console.log("NiriService: Closing window with command:", ["niri", "msg", "action", "close-window", "--id", windowId.toString()])
|
||||
Quickshell.execDetached(["niri", "msg", "action", "close-window", "--id", windowId.toString()])
|
||||
return true
|
||||
return send({
|
||||
Action: {
|
||||
CloseWindow: {
|
||||
id: windowId
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
function quit() {
|
||||
return send({
|
||||
Action: {
|
||||
Quit: {
|
||||
skip_confirmation: true
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
function getWindowsByAppId(appId) {
|
||||
if (!appId) return []
|
||||
return windows.filter(w => w.app_id && w.app_id.toLowerCase() === appId.toLowerCase())
|
||||
if (!appId)
|
||||
return [];
|
||||
return windows.filter(w => w.app_id && w.app_id.toLowerCase() === appId.toLowerCase());
|
||||
}
|
||||
|
||||
|
||||
function getRunningAppIds() {
|
||||
var appIds = new Set()
|
||||
var appIds = new Set();
|
||||
windows.forEach(w => {
|
||||
if (w.app_id) {
|
||||
appIds.add(w.app_id.toLowerCase())
|
||||
appIds.add(w.app_id.toLowerCase());
|
||||
}
|
||||
})
|
||||
return Array.from(appIds)
|
||||
});
|
||||
return Array.from(appIds);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user