summaryrefslogtreecommitdiff
path: root/accounts/gkleen@sif/shell/quickshell
diff options
context:
space:
mode:
Diffstat (limited to 'accounts/gkleen@sif/shell/quickshell')
-rw-r--r--accounts/gkleen@sif/shell/quickshell/ActiveWindowDisplay.qml94
-rw-r--r--accounts/gkleen@sif/shell/quickshell/Bar.qml327
-rw-r--r--accounts/gkleen@sif/shell/quickshell/Clock.qml283
-rw-r--r--accounts/gkleen@sif/shell/quickshell/KeyboardLayout.qml106
-rw-r--r--accounts/gkleen@sif/shell/quickshell/LockSurface.qml223
-rw-r--r--accounts/gkleen@sif/shell/quickshell/Lockscreen.qml77
-rw-r--r--accounts/gkleen@sif/shell/quickshell/Services/NiriService.qml20
-rw-r--r--accounts/gkleen@sif/shell/quickshell/Services/WallpaperSelector.qml8
-rw-r--r--accounts/gkleen@sif/shell/quickshell/SystemTray.qml159
-rw-r--r--accounts/gkleen@sif/shell/quickshell/WallpaperBackground.qml85
-rw-r--r--accounts/gkleen@sif/shell/quickshell/WorkspaceSwitcher.qml201
-rw-r--r--accounts/gkleen@sif/shell/quickshell/displaymanager.qml115
-rw-r--r--accounts/gkleen@sif/shell/quickshell/shell.qml33
13 files changed, 1405 insertions, 326 deletions
diff --git a/accounts/gkleen@sif/shell/quickshell/ActiveWindowDisplay.qml b/accounts/gkleen@sif/shell/quickshell/ActiveWindowDisplay.qml
new file mode 100644
index 00000000..57ade488
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell/ActiveWindowDisplay.qml
@@ -0,0 +1,94 @@
1import QtQuick
2import qs.Services
3import Quickshell
4import Quickshell.Widgets
5
6Item {
7 id: activeWindowDisplay
8
9 required property int maxWidth
10 required property var screen
11
12 property var activeWindow: {
13 let currWindowId = Array.from(NiriService.workspaces).find(ws => {
14 return ws.output === screen.name && ws.is_active;
15 })?.active_window_id;
16
17 return currWindowId ? Array.from(NiriService.windows).find(win => win.id == currWindowId) : null;
18 }
19 property var windowEntry: activeWindow ? DesktopEntries.heuristicLookup(activeWindow.app_id) : null
20
21 anchors.verticalCenter: parent.verticalCenter
22 width: activeWindowDisplayContent.width
23 height: parent.height
24
25 Row {
26 id: activeWindowDisplayContent
27
28 width: childrenRect.width
29 height: parent.height
30 anchors.verticalCenter: parent.verticalCenter
31 spacing: 8
32
33 IconImage {
34 id: activeWindowIcon
35
36 height: 14
37 width: 14
38
39 anchors.verticalCenter: parent.verticalCenter
40
41 source: {
42 let icon = activeWindowDisplay.windowEntry?.icon
43 if (typeof icon === 'string' || icon instanceof String) {
44 if (icon.includes("?path=")) {
45 const split = icon.split("?path=")
46 if (split.length !== 2)
47 return icon
48 const name = split[0]
49 const path = split[1]
50 const fileName = name.substring(
51 name.lastIndexOf("/") + 1)
52 return `file://${path}/${fileName}`
53 } else
54 icon = Quickshell.iconPath(icon);
55 return icon
56 }
57 return ""
58 }
59 asynchronous: true
60 smooth: true
61 mipmap: true
62 }
63
64 Text {
65 id: windowTitle
66
67 width: Math.min(implicitWidth, activeWindowDisplay.maxWidth - activeWindowIcon.width - activeWindowDisplayContent.spacing)
68
69 property var appAliases: { "Firefox": "Mozilla Firefox", "mpv Media Player": "mpv", "Thunderbird": "Mozilla Thunderbird", "Thunderbird (LMU)": "Mozilla Thunderbird" }
70
71 elide: Text.ElideRight
72 maximumLineCount: 1
73 color: "white"
74 anchors.verticalCenter: parent.verticalCenter
75 text: {
76 if (!activeWindowDisplay.activeWindow)
77 return "";
78
79 var title = activeWindowDisplay.activeWindow.title;
80 var appName = activeWindowDisplay.windowEntry?.name;
81 if (appAliases[appName])
82 appName = appAliases[appName];
83 if (appName && title.endsWith(appName)) {
84 const oldTitle = title;
85 title = title.substring(0, title.length - appName.length);
86 title = title.replace(/\s*(—|-)\s*$/, "");
87 if (!title)
88 title = oldTitle;
89 }
90 return title;
91 }
92 }
93 }
94}
diff --git a/accounts/gkleen@sif/shell/quickshell/Bar.qml b/accounts/gkleen@sif/shell/quickshell/Bar.qml
index 52f875da..38225d74 100644
--- a/accounts/gkleen@sif/shell/quickshell/Bar.qml
+++ b/accounts/gkleen@sif/shell/quickshell/Bar.qml
@@ -1,16 +1,11 @@
1import Quickshell 1import Quickshell
2import Quickshell.Io
3import Quickshell.Services.SystemTray
4import Quickshell.Widgets
5import Custom as Custom
6import QtQuick 2import QtQuick
7import qs.Services
8 3
9 4
10PanelWindow { 5PanelWindow {
11 id: bar 6 id: bar
12 7
13 property var modelData 8 required property var screen
14 9
15 anchors { 10 anchors {
16 top: true 11 top: true
@@ -22,12 +17,11 @@ PanelWindow {
22 right: 26 + 8 17 right: 26 + 8
23 } 18 }
24 19
25 screen: modelData
26 implicitHeight: 21 20 implicitHeight: 21
27 color: "transparent" 21 color: "transparent"
28 22
29 Rectangle { 23 Rectangle {
30 color: Qt.rgba(0, 0, 0, 0.66) 24 color: Qt.rgba(0, 0, 0, 0.75)
31 anchors.fill: parent 25 anchors.fill: parent
32 // bottomLeftRadius: 8 26 // bottomLeftRadius: 8
33 // bottomRightRadius: 8 27 // bottomRightRadius: 8
@@ -43,74 +37,7 @@ PanelWindow {
43 anchors.verticalCenter: parent.verticalCenter 37 anchors.verticalCenter: parent.verticalCenter
44 spacing: 8 38 spacing: 8
45 39
46 Row { 40 WorkspaceSwitcher {}
47 id: workspaces
48
49 property var ignoreWorkspaces: @ignore_workspaces@
50
51 height: parent.height
52 anchors.verticalCenter: parent.verticalCenter
53 spacing: 0
54
55 Repeater {
56 model: {
57 let currWorkspaces = NiriService.workspaces;
58 const ignoreWorkspaces = Array.from(workspaces.ignoreWorkspaces);
59 currWorkspaces = currWorkspaces.filter(ws => ws.is_active || ignoreWorkspaces.every(iws => iws !== ws.name));
60 currWorkspaces.sort((a, b) => {
61 if (NiriService.outputs?.[a.output]?.logical?.x !== NiriService.outputs?.[b.output]?.logical?.x)
62 return NiriService.outputs?.[a.output]?.logical?.x - NiriService.outputs?.[b.output]?.logical?.x
63 if (NiriService.outputs?.[a.output]?.logical?.y !== NiriService.outputs?.[b.output]?.logical?.y)
64 return NiriService.outputs?.[a.output]?.logical?.y - NiriService.outputs?.[b.output]?.logical?.y
65 return a.idx - b.idx;
66 });
67 return currWorkspaces;
68 }
69
70 Rectangle {
71 property var workspaceData: modelData
72
73 width: wsLabel.contentWidth + 8
74 color: {
75 if (mouseArea.containsMouse) {
76 return "#33808080";
77 }
78 return "transparent";
79 }
80 height: parent.height
81 anchors.verticalCenter: parent.verticalCenter
82
83 MouseArea {
84 id: mouseArea
85
86 anchors.fill: parent
87 hoverEnabled: true
88 cursorShape: Qt.PointingHandCursor
89 enabled: true
90 onClicked: {
91 NiriService.sendCommand({ "Action": { "FocusWorkspace": { "reference": { "Id": workspaceData.id } } } }, _ => {})
92 }
93 }
94
95 Text {
96 id: wsLabel
97
98 font.pointSize: 10
99 font.family: "Fira Sans"
100 color: {
101 if (workspaceData.is_active)
102 return "#23fd00";
103 if (workspaceData.active_window_id === null)
104 return "#555";
105 return "white";
106 }
107 anchors.centerIn: parent
108
109 text: workspaceData.name ? workspaceData.name : workspaceData.idx
110 }
111 }
112 }
113 }
114 } 41 }
115 42
116 Row { 43 Row {
@@ -121,91 +48,9 @@ PanelWindow {
121 anchors.centerIn: parent 48 anchors.centerIn: parent
122 spacing: 5 49 spacing: 5
123 50
124 Item { 51 ActiveWindowDisplay {
125 id: activeWindowDisplay 52 screen: bar.screen
126 53 maxWidth: bar.width - 2*Math.max(left.width, right.width) - 2*8
127 property var activeWindow: {
128 let currWindowId = Array.from(NiriService.workspaces).find(ws => {
129 return ws.output === bar.screen.name && ws.is_active;
130 })?.active_window_id;
131
132 return currWindowId ? Array.from(NiriService.windows).find(win => win.id == currWindowId) : null;
133 }
134 property var windowEntry: activeWindow ? DesktopEntries.heuristicLookup(activeWindow.app_id) : null
135
136 anchors.verticalCenter: parent.verticalCenter
137 width: activeWindowDisplayContent.width
138 height: parent.height
139
140 Row {
141 id: activeWindowDisplayContent
142
143 width: childrenRect.width
144 height: parent.height
145 anchors.verticalCenter: parent.verticalCenter
146 spacing: 8
147
148 IconImage {
149 id: activeWindowIcon
150
151 height: 14
152 width: 14
153
154 anchors.verticalCenter: parent.verticalCenter
155
156 source: {
157 let icon = activeWindowDisplay.windowEntry?.icon
158 if (typeof icon === 'string' || icon instanceof String) {
159 if (icon.includes("?path=")) {
160 const split = icon.split("?path=")
161 if (split.length !== 2)
162 return icon
163 const name = split[0]
164 const path = split[1]
165 const fileName = name.substring(
166 name.lastIndexOf("/") + 1)
167 return `file://${path}/${fileName}`
168 } else
169 icon = Quickshell.iconPath(icon);
170 return icon
171 }
172 return ""
173 }
174 asynchronous: true
175 smooth: true
176 mipmap: true
177 }
178
179 Text {
180 id: windowTitle
181
182 width: Math.min(implicitWidth, bar.width - 2*Math.max(left.width, right.width) - 2*8 - activeWindowIcon.width - activeWindowDisplayContent.spacing)
183
184 property var appAliases: { "Firefox": "Mozilla Firefox", "mpv Media Player": "mpv", "Thunderbird": "Mozilla Thunderbird", "Thunderbird (LMU)": "Mozilla Thunderbird" }
185
186 elide: Text.ElideRight
187 maximumLineCount: 1
188 color: "white"
189 anchors.verticalCenter: parent.verticalCenter
190 text: {
191 if (!activeWindowDisplay.activeWindow)
192 return "";
193
194 var title = activeWindowDisplay.activeWindow.title;
195 var appName = activeWindowDisplay.windowEntry?.name;
196 if (appAliases[appName])
197 appName = appAliases[appName];
198 if (appName && title.endsWith(appName)) {
199 const oldTitle = title;
200 title = title.substring(0, title.length - appName.length);
201 title = title.replace(/\s*(—|-)\s*$/, "");
202 if (!title)
203 title = oldTitle;
204 }
205 return title;
206 }
207 }
208 }
209 } 54 }
210 } 55 }
211 56
@@ -219,170 +64,20 @@ PanelWindow {
219 anchors.verticalCenter: parent.verticalCenter 64 anchors.verticalCenter: parent.verticalCenter
220 spacing: 0 65 spacing: 0
221 66
222 Item { 67 SystemTray {}
223 anchors.verticalCenter: parent.verticalCenter
224 width: systemTrayRow.childrenRect.width
225 height: parent.height
226 clip: true
227
228 Row {
229 id: systemTrayRow
230 anchors.centerIn: parent
231 width: childrenRect.width
232 height: parent.height
233 spacing: 0
234
235 Repeater {
236 model: SystemTray.items.values
237
238 delegate: Item {
239 property var trayItem: modelData
240 property string iconSource: {
241 let icon = trayItem && trayItem.icon
242 if (typeof icon === 'string' || icon instanceof String) {
243 if (icon.includes("?path=")) {
244 const split = icon.split("?path=")
245 if (split.length !== 2)
246 return icon
247 const name = split[0]
248 const path = split[1]
249 const fileName = name.substring(
250 name.lastIndexOf("/") + 1)
251 return `file://${path}/${fileName}`
252 }
253 return icon
254 }
255 return ""
256 }
257
258 width: 16
259 height: parent.height
260 anchors.verticalCenter: parent.verticalCenter
261
262 IconImage {
263 anchors.centerIn: parent
264 width: parent.width
265 height: parent.width
266 source: parent.iconSource
267 asynchronous: true
268 smooth: true
269 mipmap: true
270 }
271 68
272 MouseArea { 69 Item {
273 id: trayItemArea
274
275 anchors.fill: parent
276 acceptedButtons: Qt.LeftButton | Qt.RightButton
277 hoverEnabled: true
278 cursorShape: Qt.PointingHandCursor
279 onClicked: mouse => {
280 if (!trayItem)
281 return
282
283 if (mouse.button === Qt.LeftButton
284 && !trayItem.onlyMenu) {
285 trayItem.activate()
286 return
287 }
288
289 if (trayItem.hasMenu) {
290 var globalPos = mapToGlobal(0, 0)
291 var currentScreen = screen || Screen
292 var screenX = currentScreen.x || 0
293 var relativeX = globalPos.x - screenX
294 menuAnchor.menu = trayItem.menu
295 menuAnchor.anchor.window = bar
296 menuAnchor.anchor.rect = Qt.rect(
297 relativeX,
298 21,
299 parent.width, 1)
300 menuAnchor.open()
301 }
302 }
303 }
304 }
305 }
306 }
307 QsMenuAnchor {
308 id: menuAnchor
309 }
310 }
311
312 Rectangle {
313 height: parent.height 70 height: parent.height
314 width: 4 71 width: 4
315 color: "transparent"
316 } 72 }
317 73
318 Rectangle { 74 KeyboardLayout {}
319 id: kbdWidget
320
321 property var keyboardAbbrev: { "English (programmer Dvorak)": "dvp", "English (US)": "us" }
322 75
323 width: kbdLabel.contentWidth + 8 76 Item {
324 color: {
325 if (kbdMouseArea.containsMouse) {
326 return "#33808080";
327 }
328 return "transparent";
329 }
330 height: parent.height
331 anchors.verticalCenter: parent.verticalCenter
332
333 MouseArea {
334 id: kbdMouseArea
335
336 anchors.fill: parent
337 hoverEnabled: true
338 cursorShape: Qt.PointingHandCursor
339 enabled: true
340 onClicked: {
341 NiriService.sendCommand({ "Action": { "SwitchLayout": { "layout": "Next" } } }, _ => {})
342 }
343 }
344
345 Text {
346 id: kbdLabel
347
348 font.pointSize: 10
349 font.family: "Fira Sans"
350 color: {
351 if (NiriService.keyboardLayouts?.current_idx === 0)
352 return "#555";
353 return "white";
354 }
355 anchors.centerIn: parent
356
357 text: {
358 const currentLayout = NiriService.keyboardLayouts?.names?.[NiriService.keyboardLayouts.current_idx];
359 return kbdWidget.keyboardAbbrev[currentLayout] ? kbdWidget.keyboardAbbrev[currentLayout] : currentLayout;
360 }
361 }
362 }
363
364 Rectangle {
365 height: parent.height 77 height: parent.height
366 width: 4 78 width: 4
367 color: "transparent"
368 } 79 }
369 80
370 Text { 81 Clock {}
371 id: clock
372 color: "white"
373
374 anchors.verticalCenter: parent.verticalCenter
375
376 Custom.Chrono {
377 id: chrono
378 format: "W{0:%V-%u} {0:%F} {0:%H:%M:%S%Ez}"
379 }
380
381 text: chrono.date
382
383 font.pointSize: 10
384 font.family: "Fira Sans"
385 font.features: { "tnum": 1 }
386 }
387 } 82 }
388} \ No newline at end of file 83} \ No newline at end of file
diff --git a/accounts/gkleen@sif/shell/quickshell/Clock.qml b/accounts/gkleen@sif/shell/quickshell/Clock.qml
new file mode 100644
index 00000000..382af168
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell/Clock.qml
@@ -0,0 +1,283 @@
1import QtQml
2import QtQuick
3import Quickshell
4import Custom as Custom
5import QtQuick.Controls
6import QtQuick.Layouts
7import Quickshell.Widgets
8
9Item {
10 id: clockItem
11
12 property bool calendarPopup: true
13
14 width: clock.contentWidth
15 height: parent.height
16 anchors.verticalCenter: parent.verticalCenter
17
18 WrapperMouseArea {
19 id: clockMouseArea
20
21 anchors.fill: parent
22 hoverEnabled: true
23 enabled: clockItem.calendarPopup
24
25 Item {
26 anchors.fill: parent
27
28 Text {
29 id: clock
30 color: "white"
31
32 anchors.verticalCenter: parent.verticalCenter
33
34 Custom.Chrono {
35 id: chrono
36
37 onDateChanged: clock.text = format("W{0:%V-%u} {0:%F} {0:%H:%M:%S%Ez}")
38 }
39
40 font.pointSize: 10
41 font.family: "Fira Sans"
42 font.features: { "tnum": 1 }
43 }
44 }
45 }
46
47 Loader {
48 id: tooltipLoader
49
50 active: false
51
52 Connections {
53 target: clockMouseArea
54 function onContainsMouseChanged() {
55 if (clockMouseArea.containsMouse)
56 tooltipLoader.active = true;
57 }
58 }
59
60 sourceComponent: PopupWindow {
61 id: tooltip
62
63 property bool nextVisible: clockMouseArea.containsMouse || tooltipMouseArea.containsMouse
64
65 anchor {
66 item: clockMouseArea
67 edges: Edges.Bottom | Edges.Left
68 }
69 visible: false
70
71 onNextVisibleChanged: hangTimer.restart()
72
73 Timer {
74 id: hangTimer
75 interval: 100
76 onTriggered: tooltip.visible = tooltip.nextVisible
77 }
78
79 implicitWidth: clockTooltipContent.width
80 implicitHeight: clockTooltipContent.height
81 color: "black"
82
83 onVisibleChanged: {
84 yearCalendar.year = chrono.date.getFullYear();
85 yearCalendar.angleRem = 0;
86 }
87
88 WrapperMouseArea {
89 id: tooltipMouseArea
90
91 hoverEnabled: true
92 enabled: true
93
94 onWheel: event => yearCalendar.scrollYear(event)
95
96 anchors.fill: parent
97
98 WrapperItem {
99 id: clockTooltipContent
100
101 margin: 8
102 leftMargin: 0
103
104 ColumnLayout {
105 Text {
106 id: yearLabel
107
108 horizontalAlignment: Text.AlignHCenter
109
110 font.pointSize: 14
111 font.family: "Fira Sans"
112 font.features: { "tnum": 1 }
113 color: "white"
114
115 text: yearCalendar.year
116
117 Layout.fillWidth: true
118 Layout.bottomMargin: 8
119 }
120
121 GridLayout {
122 property int year: chrono.date.getFullYear()
123
124 id: yearCalendar
125
126 columns: 3
127 columnSpacing: 16
128 rowSpacing: 16
129
130 Layout.alignment: Qt.AlignHCenter
131 Layout.fillWidth: false
132
133 property real angleRem: 0
134 property real sensitivity: 1 / 120
135
136 function scrollYear(event) {
137 angleRem += event.angleDelta.y;
138 const d = Math.round(angleRem * sensitivity);
139 yearCalendar.year += d;
140 angleRem -= d / sensitivity;
141 }
142
143 Connections {
144 target: clockMouseArea
145 function onWheel(event) { yearCalendar.scrollYear(event); }
146 }
147
148 Repeater {
149 model: 12
150
151 GridLayout {
152 columns: 2
153
154 required property int index
155 property int month: index
156
157 id: monthCalendar
158
159 Layout.alignment: Qt.AlignTop | Qt.AlignRight
160 Layout.fillWidth: false
161
162 Text {
163 Layout.column: 1
164 Layout.fillWidth: true
165
166 horizontalAlignment: Text.AlignHCenter
167
168 font.pointSize: 10
169 font.family: "Fira Sans"
170
171 text: new Date(yearCalendar.year, monthCalendar.month, 1).toLocaleString(Qt.locale("en_DK"), "MMMM")
172
173 color: "#ffead3"
174 }
175
176 DayOfWeekRow {
177 locale: grid.locale
178
179 Layout.row: 1
180 Layout.column: 1
181 Layout.fillWidth: true
182
183 delegate: WrapperItem {
184 required property string shortName
185
186 width: dowLabel.contentWidth + 6
187
188 Text {
189 id: dowLabel
190
191 anchors.fill: parent
192
193 font.pointSize: 10
194 font.family: "Fira Sans"
195
196 text: parent.shortName
197 color: "#ffcc66"
198
199 horizontalAlignment: Text.AlignHCenter
200 verticalAlignment: Text.AlignVCenter
201 }
202 }
203 }
204
205 WeekNumberColumn {
206 month: grid.month
207 year: grid.year
208 locale: grid.locale
209
210 Layout.fillHeight: true
211
212 delegate: Text {
213 required property int weekNumber
214
215 opacity: {
216 const simple = new Date(weekNumber == 1 && monthCalendar.month == 12 ? yearCalendar.year + 1 : yearCalendar.year, 0, 1 + (weekNumber - 1) * 7);
217 const dayOfWeek = simple.getDay();
218 const isoWeekStart = simple;
219
220 isoWeekStart.setDate(simple.getDate() - dayOfWeek + 1);
221 if (dayOfWeek > 4) {
222 isoWeekStart.setDate(isoWeekStart.getDate() + 7);
223 }
224
225 for (let i = 0; i < 7; i++) {
226 const dayInWeek = new Date(isoWeekStart);
227 dayInWeek.setDate(dayInWeek.getDate() + i);
228 if (dayInWeek.getMonth() == monthCalendar.month)
229 return 1;
230 }
231
232 return 0;
233 }
234
235 font.pointSize: 10
236 font.family: "Fira Sans"
237 font.features: { "tnum": 1 }
238
239 text: weekNumber
240 color: "#99ffdd"
241
242 horizontalAlignment: Text.AlignRight
243 verticalAlignment: Text.AlignVCenter
244 }
245 }
246
247 MonthGrid {
248 id: grid
249
250 year: yearCalendar.year
251 month: monthCalendar.month
252 locale: Qt.locale("en_DK")
253
254 Layout.fillWidth: true
255 Layout.fillHeight: true
256
257 delegate: Text {
258 required property var model
259
260 opacity: model.month === monthCalendar.month ? 1 : 0
261
262 font.pointSize: 10
263 font.family: "Fira Sans"
264 font.features: { "tnum": 1 }
265
266 property bool today: chrono.date.getFullYear() == model.year && chrono.date.getMonth() == model.month && chrono.date.getDate() == model.day
267
268 text: model.day
269 color: today ? "#ff6699" : "white"
270
271 horizontalAlignment: Text.AlignRight
272 verticalAlignment: Text.AlignVCenter
273 }
274 }
275 }
276 }
277 }
278 }
279 }
280 }
281 }
282 }
283}
diff --git a/accounts/gkleen@sif/shell/quickshell/KeyboardLayout.qml b/accounts/gkleen@sif/shell/quickshell/KeyboardLayout.qml
new file mode 100644
index 00000000..bc3750f9
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell/KeyboardLayout.qml
@@ -0,0 +1,106 @@
1import Quickshell
2import QtQuick
3import qs.Services
4import Quickshell.Widgets
5
6Item {
7 width: kbdLabel.contentWidth + 8
8 height: parent.height
9 anchors.verticalCenter: parent.verticalCenter
10
11 WrapperMouseArea {
12 id: kbdMouseArea
13
14 anchors.fill: parent
15
16 hoverEnabled: true
17 cursorShape: Qt.PointingHandCursor
18 enabled: true
19 onClicked: {
20 NiriService.sendCommand({ "Action": { "SwitchLayout": { "layout": "Next" } } }, _ => {})
21 }
22 onWheel: event => {
23 NiriService.sendCommand({ "Action": { "SwitchLayout": { "layout": event.angleDelta > 0 ? "Next" : "Prev" } } }, _ => {})
24 }
25
26 Rectangle {
27 id: kbdWidget
28
29 property var keyboardAbbrev: { "English (programmer Dvorak)": "dvp", "English (US)": "us" }
30
31 anchors.fill: parent
32 color: {
33 if (kbdMouseArea.containsMouse) {
34 return "#33808080";
35 }
36 return "transparent";
37 }
38
39 Text {
40 id: kbdLabel
41
42 font.pointSize: 10
43 font.family: "Fira Sans"
44 color: {
45 if (NiriService.keyboardLayouts?.current_idx === 0)
46 return "#555";
47 return "white";
48 }
49 anchors.centerIn: parent
50
51 text: {
52 const currentLayout = NiriService.keyboardLayouts?.names?.[NiriService.keyboardLayouts.current_idx];
53 if (!currentLayout)
54 return "";
55 return kbdWidget.keyboardAbbrev[currentLayout] ? kbdWidget.keyboardAbbrev[currentLayout] : currentLayout;
56 }
57 }
58 }
59 }
60
61 PopupWindow {
62 id: tooltip
63
64 property bool nextVisible: kbdMouseArea.containsMouse || tooltipMouseArea.containsMouse
65
66 anchor {
67 item: kbdMouseArea
68 edges: Edges.Bottom | Edges.Left
69 }
70 visible: false
71
72 onNextVisibleChanged: hangTimer.restart()
73
74 Timer {
75 id: hangTimer
76 interval: 100
77 onTriggered: tooltip.visible = tooltip.nextVisible
78 }
79
80 implicitWidth: kbdTooltipText.contentWidth + 16
81 implicitHeight: kbdTooltipText.contentHeight + 16
82 color: "black"
83
84 WrapperMouseArea {
85 id: tooltipMouseArea
86
87 hoverEnabled: true
88 enabled: true
89
90 anchors.centerIn: parent
91
92 Text {
93 id: kbdTooltipText
94
95 font.pointSize: 10
96 font.family: "Fira Sans"
97 color: "white"
98
99 text: {
100 const currentLayout = NiriService.keyboardLayouts?.names?.[NiriService.keyboardLayouts.current_idx];
101 return currentLayout || "";
102 }
103 }
104 }
105 }
106}
diff --git a/accounts/gkleen@sif/shell/quickshell/LockSurface.qml b/accounts/gkleen@sif/shell/quickshell/LockSurface.qml
new file mode 100644
index 00000000..18698725
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell/LockSurface.qml
@@ -0,0 +1,223 @@
1import Quickshell.Widgets
2import QtQuick.Effects
3import QtQuick.Layouts
4import QtQuick
5import QtQuick.Controls
6import QtQuick.Controls.Fusion
7import qs.Services
8import QtQml
9
10Item {
11 id: lockSurface
12
13 property var screen
14 property list<var> messages: []
15 property bool responseRequired: false
16 property bool responseVisible: false
17 property string currentText: ""
18 property bool authRunning: false
19
20 signal response(string responseText)
21
22 anchors.fill: parent
23
24 Item {
25 id: background
26
27 anchors.fill: parent
28
29 property Img current: one
30 property string source: selector.selected
31
32 WallpaperSelector {
33 id: selector
34 seed: lockSurface.screen?.name || ""
35 }
36
37 onSourceChanged: {
38 if (!source)
39 current = null;
40 else if (current === one)
41 two.update()
42 else
43 one.update()
44 }
45
46 Img { id: one }
47 Img { id: two }
48
49 component Img: Item {
50 id: img
51
52 property string source
53
54 function update() {
55 source = background.source || ""
56 }
57
58 anchors.fill: parent
59
60 Image {
61 id: imageSource
62
63 source: img.source
64 sourceSize: Qt.size(parent.width, parent.height)
65 fillMode: Image.PreserveAspectCrop
66 smooth: true
67 visible: false
68 asynchronous: true
69 cache: false
70
71 onStatusChanged: {
72 if (status === Image.Ready) {
73 background.current = img
74 }
75 }
76 }
77
78 MultiEffect {
79 id: imageEffect
80
81 source: imageSource
82 anchors.fill: parent
83 blurEnabled: true
84 blur: 1
85 blurMax: 64
86 blurMultiplier: 2
87
88 opacity: 0
89
90 states: State {
91 name: "visible"
92 when: background.current === img
93
94 PropertyChanges {
95 imageEffect.opacity: 1
96 }
97 StateChangeScript {
98 name: "unloadOther"
99 script: {
100 if (img === one)
101 two.source = ""
102 if (img === two)
103 one.source = ""
104 }
105 }
106 }
107
108 transitions: Transition {
109 SequentialAnimation {
110 NumberAnimation {
111 target: imageEffect
112 properties: "opacity"
113 duration: 5000
114 easing.type: Easing.OutCubic
115 }
116 ScriptAction {
117 scriptName: "unloadOther"
118 }
119 }
120 }
121 }
122 }
123 }
124
125 Item {
126 anchors {
127 top: lockSurface.top
128 left: lockSurface.left
129 right: lockSurface.right
130 }
131
132 implicitWidth: lockSurface.width
133 implicitHeight: 21
134
135 Rectangle {
136 anchors.fill: parent
137 color: Qt.rgba(0, 0, 0, 0.75)
138 }
139
140 Clock {
141 anchors.centerIn: parent
142 calendarPopup: false
143 }
144 }
145
146 WrapperRectangle {
147 id: unlockUi
148
149 Keys.onPressed: event => {
150 if (!lockSurface.authRunning) {
151 event.accepted = true;
152 lockSurface.authRunning = true;
153 }
154 }
155 focus: !passwordBox.visible
156
157 visible: lockSurface.authRunning
158
159 color: Qt.rgba(0, 0, 0, 0.75)
160 margin: 8
161
162 anchors.centerIn: parent
163
164 ColumnLayout {
165 spacing: 4
166
167 BusyIndicator {
168 visible: running
169 running: !Array.from(lockSurface.messages).length && !lockSurface.responseRequired
170 }
171
172 Repeater {
173 model: lockSurface.messages
174
175 Text {
176 required property var modelData
177
178 font.pointSize: 10
179 font.family: "Fira Sans"
180 color: modelData.error ? "#f28a21" : "#ffffff"
181
182 text: String(modelData.text).trim()
183
184 Layout.fillWidth: true
185 horizontalAlignment: Text.AlignHCenter
186 }
187 }
188
189 TextField {
190 id: passwordBox
191
192 visible: lockSurface.responseRequired
193 echoMode: lockSurface.responseVisible ? TextInput.Normal : TextInput.Password
194 inputMethodHints: Qt.ImhSensitiveData
195
196 onTextChanged: lockSurface.currentText = passwordBox.text
197 onAccepted: {
198 passwordBox.readOnly = true;
199 lockSurface.response(lockSurface.currentText);
200 }
201
202 Connections {
203 target: lockSurface
204 function onCurrentTextChanged() {
205 passwordBox.text = lockSurface.currentText
206 }
207 }
208 Connections {
209 target: lockSurface
210 function onResponseRequiredChanged() {
211 if (lockSurface.responseRequired)
212 passwordBox.readOnly = false;
213 passwordBox.focus = true;
214 passwordBox.selectAll();
215 }
216 }
217
218 Layout.topMargin: 4
219 Layout.fillWidth: true
220 }
221 }
222 }
223}
diff --git a/accounts/gkleen@sif/shell/quickshell/Lockscreen.qml b/accounts/gkleen@sif/shell/quickshell/Lockscreen.qml
new file mode 100644
index 00000000..cc82a275
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell/Lockscreen.qml
@@ -0,0 +1,77 @@
1import Quickshell
2import Quickshell.Wayland
3import Quickshell.Io
4import Quickshell.Services.Pam
5import QtQml
6
7Scope {
8 id: lockscreen
9
10 property string currentText: ""
11
12 PamContext {
13 id: pam
14
15 property list<var> messages: []
16
17 config: "quickshell"
18 onCompleted: result => {
19 if (result === PamResult.Success) {
20 lock.locked = false;
21 }
22 }
23 onPamMessage: {
24 messages = Array.from(messages).concat([{ "text": pam.message, "error": pam.messageIsError }])
25 }
26 onActiveChanged: {
27 messages = [];
28 }
29 }
30
31 IpcHandler {
32 target: "Lockscreen"
33
34 function setLocked(locked: bool): void { lock.locked = locked; }
35 function getLocked(): bool { return lock.locked; }
36 }
37
38 WlSessionLock {
39 id: lock
40
41 onLockedChanged: {
42 if (!locked && pam.active)
43 pam.abort();
44 }
45
46 WlSessionLockSurface {
47 id: lockSurface
48
49 color: "black"
50
51 LockSurface {
52 id: surfaceContent
53
54 onResponse: responseText => pam.respond(responseText)
55 onAuthRunningChanged: {
56 if (authRunning)
57 pam.start();
58 }
59 Connections {
60 target: pam
61 function onMessagesChanged() { surfaceContent.messages = pam.messages; }
62 function onResponseRequiredChanged() { surfaceContent.responseRequired = pam.responseRequired; }
63 function onActiveChanged() { surfaceContent.authRunning = pam.active; }
64 }
65 onCurrentTextChanged: lockscreen.currentText = currentText
66 Connections {
67 target: lockscreen
68 function onCurrentTextChanged() { surfaceContent.currentText = lockscreen.currentText; }
69 }
70 Connections {
71 target: lockSurface
72 function onScreenChanged() { surfaceContent.screen = lockSurface.screen; }
73 }
74 }
75 }
76 }
77}
diff --git a/accounts/gkleen@sif/shell/quickshell/Services/NiriService.qml b/accounts/gkleen@sif/shell/quickshell/Services/NiriService.qml
index 914152e1..af522ec4 100644
--- a/accounts/gkleen@sif/shell/quickshell/Services/NiriService.qml
+++ b/accounts/gkleen@sif/shell/quickshell/Services/NiriService.qml
@@ -13,10 +13,6 @@ Singleton {
13 property var windows: [] 13 property var windows: []
14 readonly property string socketPath: Quickshell.env("NIRI_SOCKET") 14 readonly property string socketPath: Quickshell.env("NIRI_SOCKET")
15 15
16 onKeyboardLayoutsChanged: {
17 console.log(JSON.stringify(keyboardLayouts));
18 }
19
20 function refreshOutputs() { 16 function refreshOutputs() {
21 commandSocket.sendCommand("Outputs", data => { 17 commandSocket.sendCommand("Outputs", data => {
22 outputs = data.Ok.Outputs; 18 outputs = data.Ok.Outputs;
@@ -32,9 +28,12 @@ Singleton {
32 path: root.socketPath 28 path: root.socketPath
33 connected: true 29 connected: true
34 30
31 property bool acked: false
32
35 onConnectionStateChanged: { 33 onConnectionStateChanged: {
36 if (connected) { 34 if (connected) {
37 write('"EventStream"\n') 35 acked = false;
36 write('"EventStream"\n');
38 } 37 }
39 } 38 }
40 39
@@ -70,6 +69,11 @@ Singleton {
70 eventWindowUrgencyChanged(event.WindowUrgencyChanged); 69 eventWindowUrgencyChanged(event.WindowUrgencyChanged);
71 else if (event.WindowLayoutsChanged) 70 else if (event.WindowLayoutsChanged)
72 eventWindowLayoutsChanged(event.WindowLayoutsChanged); 71 eventWindowLayoutsChanged(event.WindowLayoutsChanged);
72 else if (event.Ok && !eventStreamSocket.acked) { eventStreamSocket.acked = true; }
73 else if (event.OverviewOpenedOrClosed) {}
74 else if (event.ConfigLoaded) {}
75 else
76 console.log(JSON.stringify(event));
73 } catch (e) { 77 } catch (e) {
74 console.warn("NiriService: Failed to parse event:", line, e) 78 console.warn("NiriService: Failed to parse event:", line, e)
75 } 79 }
@@ -157,10 +161,10 @@ Singleton {
157 } 161 }
158 function eventWindowOpenedOrChanged(data) { 162 function eventWindowOpenedOrChanged(data) {
159 root.windows = Array.from(root.windows).map(win => { 163 root.windows = Array.from(root.windows).map(win => {
160 if (win.id === data.window.id) 164 if (data.window.is_focused)
161 return data.window; 165 win.is_focused = false;
162 return win; 166 return win;
163 }); 167 }).filter(win => win.id !== data.window.id).concat([data.window]);
164 } 168 }
165 function eventWindowClosed(data) { 169 function eventWindowClosed(data) {
166 root.windows = Array.from(root.windows).filter(win => win.id !== data.id); 170 root.windows = Array.from(root.windows).filter(win => win.id !== data.id);
diff --git a/accounts/gkleen@sif/shell/quickshell/Services/WallpaperSelector.qml b/accounts/gkleen@sif/shell/quickshell/Services/WallpaperSelector.qml
new file mode 100644
index 00000000..3c524955
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell/Services/WallpaperSelector.qml
@@ -0,0 +1,8 @@
1import Custom as Custom
2
3Custom.FileSelector {
4 id: root
5
6 directory: @wallpapers@
7 epoch: 72000000
8}
diff --git a/accounts/gkleen@sif/shell/quickshell/SystemTray.qml b/accounts/gkleen@sif/shell/quickshell/SystemTray.qml
new file mode 100644
index 00000000..55b1690e
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell/SystemTray.qml
@@ -0,0 +1,159 @@
1import QtQuick
2import Quickshell
3import Quickshell.Widgets
4import Quickshell.Services.SystemTray
5
6Item {
7 anchors.verticalCenter: parent.verticalCenter
8 width: systemTrayRow.childrenRect.width
9 height: parent.height
10 clip: true
11
12 Row {
13 id: systemTrayRow
14 anchors.centerIn: parent
15 width: childrenRect.width
16 height: parent.height
17 spacing: 0
18
19 Repeater {
20 model: ScriptModel {
21 values: {
22 var trayItems = Array.from(SystemTray.items.values).filter(item => item.status !== Status.Passive);
23 trayItems.sort((a, b) => a.category !== b.category ? b.category - a.category : a.id.localeCompare(b.id))
24 return trayItems;
25 }
26 }
27
28 delegate: Item {
29 id: trayItemWrapper
30
31 property var trayItem: modelData
32 property string iconSource: {
33 let icon = trayItem && trayItem.icon
34 if (typeof icon === 'string' || icon instanceof String) {
35 if (icon.includes("?path=")) {
36 const split = icon.split("?path=")
37 if (split.length !== 2)
38 return icon
39 const name = split[0]
40 const path = split[1]
41 const fileName = name.substring(
42 name.lastIndexOf("/") + 1)
43 return `file://${path}/${fileName}`
44 }
45 return icon
46 }
47 return ""
48 }
49
50 width: 16
51 height: parent.height
52 anchors.verticalCenter: parent.verticalCenter
53
54 WrapperMouseArea {
55 id: trayItemArea
56
57 anchors.fill: parent
58 acceptedButtons: Qt.LeftButton | Qt.RightButton
59 hoverEnabled: true
60 cursorShape: trayItem.onlyMenu ? Qt.ArrowCursor : Qt.PointingHandCursor
61 onClicked: mouse => {
62 if (!trayItem)
63 return
64
65 if (mouse.button === Qt.LeftButton
66 && !trayItem.onlyMenu) {
67 trayItem.activate()
68 return
69 }
70
71 if (trayItem.hasMenu) {
72 var globalPos = mapToGlobal(0, 0)
73 var currentScreen = screen || Screen
74 var screenX = currentScreen.x || 0
75 var relativeX = globalPos.x - screenX
76 menuAnchor.menu = trayItem.menu
77 menuAnchor.anchor.window = bar
78 menuAnchor.anchor.rect = Qt.rect(
79 relativeX,
80 21,
81 parent.width, 1)
82 menuAnchor.open()
83 }
84 }
85
86 IconImage {
87 anchors.centerIn: parent
88 width: parent.width
89 height: parent.width
90 source: trayItemWrapper.iconSource
91 asynchronous: true
92 smooth: true
93 mipmap: true
94 }
95 }
96
97 PopupWindow {
98 id: tooltip
99
100 property bool nextVisible: (trayItem.tooltipTitle || trayItem.tooltipDescription) && (trayItemArea.containsMouse || tooltipMouseArea.containsMouse) && !menuAnchor.visible
101
102 anchor {
103 item: trayItemArea
104 edges: Edges.Bottom
105 }
106
107 visible: false
108 onNextVisibleChanged: hangTimer.restart()
109
110 Timer {
111 id: hangTimer
112 interval: 100
113 onTriggered: tooltip.visible = tooltip.nextVisible
114 }
115
116 color: "black"
117
118 implicitWidth: Math.max(tooltipTitle.contentWidth, tooltipDescription.contentWidth) + 16
119 implicitHeight: tooltipTitle.contentHeight + tooltipDescription.contentHeight + 16
120
121 WrapperMouseArea {
122 id: tooltipMouseArea
123
124 hoverEnabled: true
125 enabled: true
126
127 margin: 8
128
129 Column {
130 Text {
131 id: tooltipTitle
132
133 font.pointSize: 10
134 font.family: "Fira Sans"
135 font.bold: true
136 color: "white"
137
138 text: trayItem.tooltipTitle
139 }
140
141 Text {
142 id: tooltipDescription
143
144 font.pointSize: 10
145 font.family: "Fira Sans"
146 color: "white"
147
148 text: trayItem.tooltipDescription
149 }
150 }
151 }
152 }
153 }
154 }
155 }
156 QsMenuAnchor {
157 id: menuAnchor
158 }
159}
diff --git a/accounts/gkleen@sif/shell/quickshell/WallpaperBackground.qml b/accounts/gkleen@sif/shell/quickshell/WallpaperBackground.qml
new file mode 100644
index 00000000..de31915f
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell/WallpaperBackground.qml
@@ -0,0 +1,85 @@
1import QtQuick
2import Quickshell
3import qs.Services
4
5Item {
6 id: root
7
8 anchors.fill: parent
9
10 required property string screen
11
12 property Img current: one
13 property string source: selector.selected
14
15 WallpaperSelector {
16 id: selector
17 seed: screen
18 }
19
20 onSourceChanged: {
21 if (!source)
22 current = null;
23 else if (current === one)
24 two.update()
25 else
26 one.update()
27 }
28
29 Img { id: one }
30 Img { id: two }
31
32 component Img: Image {
33 id: img
34
35 function update() {
36 source = root.source || ""
37 }
38
39 anchors.fill: parent
40 fillMode: Image.PreserveAspectCrop
41 smooth: true
42 asynchronous: true
43 cache: false
44
45 opacity: 0
46
47 onStatusChanged: {
48 if (status === Image.Ready) {
49 root.current = this
50 }
51 }
52
53 states: State {
54 name: "visible"
55 when: root.current === img
56
57 PropertyChanges {
58 img.opacity: 1
59 }
60 StateChangeScript {
61 name: "unloadOther"
62 script: {
63 if (img === one)
64 two.source = ""
65 if (img === two)
66 one.source = ""
67 }
68 }
69 }
70
71 transitions: Transition {
72 SequentialAnimation {
73 NumberAnimation {
74 target: img
75 properties: "opacity"
76 duration: 5000
77 easing.type: Easing.OutCubic
78 }
79 ScriptAction {
80 scriptName: "unloadOther"
81 }
82 }
83 }
84 }
85}
diff --git a/accounts/gkleen@sif/shell/quickshell/WorkspaceSwitcher.qml b/accounts/gkleen@sif/shell/quickshell/WorkspaceSwitcher.qml
new file mode 100644
index 00000000..c8c017c3
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell/WorkspaceSwitcher.qml
@@ -0,0 +1,201 @@
1import Quickshell
2import QtQuick
3import qs.Services
4import Quickshell.Widgets
5import QtQuick.Layouts
6
7Row {
8 id: workspaces
9
10 property var ignoreWorkspaces: @ignore_workspaces@
11
12 height: parent.height
13 anchors.verticalCenter: parent.verticalCenter
14 spacing: 0
15
16 Repeater {
17 model: ScriptModel {
18 values: {
19 let currWorkspaces = NiriService.workspaces;
20 const ignoreWorkspaces = Array.from(workspaces.ignoreWorkspaces);
21 currWorkspaces = currWorkspaces.filter(ws => ws.is_active || ignoreWorkspaces.every(iws => iws !== ws.name));
22 currWorkspaces.sort((a, b) => {
23 if (NiriService.outputs?.[a.output]?.logical?.x !== NiriService.outputs?.[b.output]?.logical?.x)
24 return NiriService.outputs?.[a.output]?.logical?.x - NiriService.outputs?.[b.output]?.logical?.x
25 if (NiriService.outputs?.[a.output]?.logical?.y !== NiriService.outputs?.[b.output]?.logical?.y)
26 return NiriService.outputs?.[a.output]?.logical?.y - NiriService.outputs?.[b.output]?.logical?.y
27 return a.idx - b.idx;
28 });
29 return currWorkspaces;
30 }
31 }
32
33 Item {
34 id: wsItem
35
36 property var workspaceData: modelData
37
38 width: wsLabel.contentWidth + 8
39 height: parent.height
40 anchors.verticalCenter: parent.verticalCenter
41
42 WrapperMouseArea {
43 id: mouseArea
44
45 anchors.fill: parent
46
47 hoverEnabled: true
48 cursorShape: Qt.PointingHandCursor
49 enabled: true
50 onClicked: {
51 NiriService.sendCommand({ "Action": { "FocusWorkspace": { "reference": { "Id": workspaceData.id } } } }, _ => {})
52 }
53
54 Rectangle {
55 anchors.fill: parent
56
57 color: {
58 if (mouseArea.containsMouse) {
59 return "#33808080";
60 }
61 return "transparent";
62 }
63
64 Text {
65 id: wsLabel
66
67 anchors.centerIn: parent
68
69 font.pointSize: 10
70 font.family: "Fira Sans"
71 color: {
72 if (workspaceData.is_active)
73 return "#23fd00";
74 if (workspaceData.active_window_id === null)
75 return "#555";
76 return "white";
77 }
78
79 text: workspaceData.name ? workspaceData.name : workspaceData.idx
80 }
81 }
82 }
83
84 PopupWindow {
85 id: tooltip
86
87 property bool nextVisible: (mouseArea.containsMouse || tooltipMouseArea.containsMouse) && [...windowsModel.values].length > 0
88
89 anchor {
90 item: mouseArea
91 edges: Edges.Bottom | Edges.Left
92 }
93 visible: false
94
95 onNextVisibleChanged: hangTimer.restart()
96
97 Timer {
98 id: hangTimer
99 interval: 100
100 onTriggered: tooltip.visible = tooltip.nextVisible
101 }
102
103 implicitWidth: tooltipContent.implicitWidth
104 implicitHeight: tooltipContent.implicitHeight
105 color: "black"
106
107 WrapperMouseArea {
108 id: tooltipMouseArea
109
110 hoverEnabled: true
111 enabled: true
112
113 anchors.fill: parent
114
115 WrapperItem {
116 id: tooltipContent
117
118 margin: 0
119
120 ColumnLayout {
121 spacing: 0
122
123 Repeater {
124 model: ScriptModel {
125 id: windowsModel
126
127 values: {
128 let currWindows = Array.from(NiriService.windows).filter(win => win.workspace_id == wsItem.workspaceData.id);
129 currWindows.sort((a, b) => {
130 if (a.is_floating !== b.is_floating)
131 return b.is_floating - a.is_floating;
132 if (a.layout.tile_pos_in_workspace_view?.[0] !== b.layout.tile_pos_in_workspace_view?.[0])
133 return a.layout.tile_pos_in_workspace_view?.[0] - b.layout.tile_pos_in_workspace_view?.[0]
134 if (a.layout.tile_pos_in_workspace_view?.[1] !== b.layout.tile_pos_in_workspace_view?.[1])
135 return a.layout.tile_pos_in_workspace_view?.[1] - b.layout.tile_pos_in_workspace_view?.[1]
136 if (a.layout.pos_in_scrolling_layout?.[0] !== b.layout.pos_in_scrolling_layout?.[0])
137 return a.layout.pos_in_scrolling_layout?.[0] - b.layout.pos_in_scrolling_layout?.[0]
138 if (a.layout.pos_in_scrolling_layout?.[1] !== b.layout.pos_in_scrolling_layout?.[1])
139 return a.layout.pos_in_scrolling_layout?.[1] - b.layout.pos_in_scrolling_layout?.[1]
140 if (a.app_id !== b.app_id)
141 return a.app_id.localeCompare(b.app_id);
142
143 return a.title.localeCompare(b.title);
144 });
145 return currWindows;
146 }
147 }
148
149 WrapperMouseArea {
150 id: windowMouseArea
151
152 property var windowData: modelData
153
154 hoverEnabled: true
155 cursorShape: Qt.PointingHandCursor
156 enabled: true
157
158 Layout.fillWidth: true
159
160 onClicked: {
161 NiriService.sendCommand({ "Action": { "FocusWindow": { "id": windowData.id } } }, _ => {})
162 }
163
164 WrapperRectangle {
165 color: windowMouseArea.containsMouse ? "#33808080" : "transparent";
166
167 anchors.fill: parent
168
169 WrapperItem {
170 anchors.fill: parent
171
172 margin: 4
173
174 Text {
175 id: windowLabel
176
177 font.pointSize: 10
178 font.family: "Fira Sans"
179 color: {
180 if (windowData.is_focused)
181 return "#23fd00";
182 if (NiriService.workspaces.find(ws => ws.id == windowData.workspace_id)?.active_window_id == windowData.id)
183 return "white";
184 return "#555";
185 }
186
187 text: windowData.title
188
189 horizontalAlignment: Text.AlignLeft
190 }
191 }
192 }
193 }
194 }
195 }
196 }
197 }
198 }
199 }
200 }
201}
diff --git a/accounts/gkleen@sif/shell/quickshell/displaymanager.qml b/accounts/gkleen@sif/shell/quickshell/displaymanager.qml
new file mode 100644
index 00000000..b452c03d
--- /dev/null
+++ b/accounts/gkleen@sif/shell/quickshell/displaymanager.qml
@@ -0,0 +1,115 @@
1//@ pragma UseQApplication
2
3import Quickshell
4import Quickshell.Wayland
5import Quickshell.Io
6import Quickshell.Services.Greetd
7import QtQml
8
9
10ShellRoot {
11 id: displaymanager
12
13 settings.watchFiles: false
14
15 property string currentText: ""
16 property string username: @username@
17 property list<string> command: @niri_session@
18 property list<var> messages: []
19 property bool responseRequired: false
20 property bool responseVisible: false
21
22 signal startAuth()
23
24 onStartAuth: {
25 if (Greetd.state !== GreetdState.Inactive)
26 Greetd.cancelSession();
27 displaymanager.messages = [];
28 Greetd.createSession(displaymanager.username);
29 }
30
31 Connections {
32 target: Greetd
33 function onStateChanged() {
34 console.log("greetd state: ", GreetdState.toString(Greetd.state));
35 if (Greetd.state === GreetdState.ReadyToLaunch)
36 Greetd.launch(displaymanager.command);
37 }
38 function onAuthMessage(message: string, error: bool, responseRequired: bool, echoResponse: bool) {
39 displaymanager.responseVisible = echoResponse;
40 displaymanager.responseRequired = responseRequired;
41 displaymanager.messages = Array.from(displaymanager.messages).concat([{ "text": message, "error": error }]);
42 }
43 function onAuthFailure(message: string) {
44 displaymanager.responseRequired = false;
45 displaymanager.messages = Array.from(displaymanager.messages).concat([{ "text": message, "error": true }]);
46 }
47 }
48
49 Component.onCompleted: {
50 if (Greetd.state !== GreetdState.Inactive)
51 Greetd.cancelSession();
52 }
53
54 Variants {
55 model: Quickshell.screens
56
57 delegate: Scope {
58 id: screenScope
59
60 required property var modelData
61
62 PanelWindow {
63 color: "black"
64
65 screen: screenScope.modelData
66
67 WlrLayershell.keyboardFocus: WlrKeyboardFocus.Exclusive
68
69 anchors.top: true
70 anchors.bottom: true
71 anchors.left: true
72 anchors.right: true
73
74 LockSurface {
75 id: surfaceContent
76
77 screen: screenScope.modelData
78
79 onCurrentTextChanged: displaymanager.currentText = currentText
80 Connections {
81 target: displaymanager
82 function onCurrentTextChanged() { surfaceContent.currentText = displaymanager.currentText; }
83 function onMessagesChanged() { surfaceContent.messages = Array.from(displaymanager.messages); }
84 function onResponseRequiredChanged() { surfaceContent.responseRequired = displaymanager.responseRequired; }
85 function onResponseVisibleChanged() { surfaceContent.responseVisible = displaymanager.responseVisible; }
86 }
87
88 onResponse: responseText => Greetd.respond(responseText);
89 Connections {
90 target: Greetd
91 function onStateChanged() {
92 if (Greetd.state === GreetdState.Authenticating) {
93 surfaceContent.authRunning = true;
94 } else {
95 surfaceContent.authRunning = false;
96 }
97 }
98 }
99
100 onAuthRunningChanged: {
101 if (surfaceContent.authRunning && Greetd.state !== GreetdState.Authenticating)
102 displaymanager.startAuth();
103 }
104 Component.onCompleted: {
105 surfaceContent.authRunning = Greetd.state === GreetdState.Authenticating
106 surfaceContent.messages = Array.from(displaymanager.messages);
107 surfaceContent.responseVisible = displaymanager.responseVisible;
108 surfaceContent.responseRequired = displaymanager.responseRequired;
109 surfaceContent.currentText = displaymanager.currentText;
110 }
111 }
112 }
113 }
114 }
115}
diff --git a/accounts/gkleen@sif/shell/quickshell/shell.qml b/accounts/gkleen@sif/shell/quickshell/shell.qml
index 2abd1fef..1da9457d 100644
--- a/accounts/gkleen@sif/shell/quickshell/shell.qml
+++ b/accounts/gkleen@sif/shell/quickshell/shell.qml
@@ -1,6 +1,7 @@
1//@ pragma UseQApplication 1//@ pragma UseQApplication
2 2
3import Quickshell 3import Quickshell
4import Quickshell.Wayland
4 5
5ShellRoot { 6ShellRoot {
6 settings.watchFiles: false 7 settings.watchFiles: false
@@ -8,8 +9,36 @@ ShellRoot {
8 Variants { 9 Variants {
9 model: Quickshell.screens 10 model: Quickshell.screens
10 11
11 delegate: Bar { 12 delegate: Scope {
12 modelData: item 13 id: screenScope
14
15 required property var modelData
16
17 PanelWindow {
18 id: bgWindow
19
20 screen: screenScope.modelData
21
22 WlrLayershell.layer: WlrLayer.Background
23 WlrLayershell.exclusionMode: ExclusionMode.Ignore
24
25 anchors.top: true
26 anchors.bottom: true
27 anchors.left: true
28 anchors.right: true
29
30 color: "black"
31
32 WallpaperBackground {
33 screen: bgWindow.screen.name
34 }
35 }
36
37 Bar {
38 screen: screenScope.modelData
39 }
13 } 40 }
14 } 41 }
42
43 Lockscreen {}
15} 44}
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-07 11:43:50 +0000