mirror of
https://github.com/AvengeMedia/DankMaterialShell.git
synced 2026-10-14 23:34:01 -04:00
commit f9bcdfdce1ab4a028cd9ccc08bc5fc6748e2d9e8 Author: bbedward <[email protected]> Date: Thu Sep 17 16:37:31 2026 -0400 wallpaper: regenerate colors when the active light/dark wallpaper changes commit 0b2dd37971a7b360f26b1a302297335963282313 Author: bbedward <[email protected]> Date: Thu Sep 17 16:16:03 2026 -0400 lyrics: keep the active line in place when rows above resize, remember the lyrics view commit db56722c7af9cb50a9c779a39e12a54dc5a607a6 Author: bbedward <[email protected]> Date: Thu Sep 17 16:04:33 2026 -0400 lyrics: emphasize vocals per part instead of per group commit 934e0676d9d63f6a7cb314c693ac256c1b56e057 Author: bbedward <[email protected]> Date: Thu Sep 17 15:59:56 2026 -0400 lyrics: drop focus from overlapping lines when their vocals end commit 3fe092446b1f27d7acc1a0a2a2ecc5d19f455275 Author: bbedward <[email protected]> Date: Thu Sep 17 15:17:28 2026 -0400 media: add lyrics attribution, unison provider, shrink album art slightly when its low res commit f54b3e2c1dc589451f449218d4985758b88757b4 Author: bbedward <[email protected]> Date: Thu Sep 17 14:35:52 2026 -0400 media/zurvan: style changes commit 9ea5aecfba4c638e2f08ab288706d2fb3143ea0b Author: bbedward <[email protected]> Date: Thu Sep 17 14:02:03 2026 -0400 rebase fixes commit b2b04d12d2e9118346d0e5950b348aa222d58e50 Author: bbedward <[email protected]> Date: Thu Sep 17 13:46:03 2026 -0400 i18n: overhaul battery popout: redesign clipboard: fix style of pinned button and remove number sidebar commit 3057940bb28a29de22f90f5630a2c68113707d16 Author: bbedward <[email protected]> Date: Thu Sep 17 11:48:16 2026 -0400 displayconfig: show valid fractional scales only, fix custom setter commit 2bbe9e4b4c4278d1aca8632d650feba912a1c0af Author: bbedward <[email protected]> Date: Thu Sep 17 10:47:43 2026 -0400 media/zurvan: restyle commit 33299ef45261c4f0a7e8e663c1ed2f0996e3ac78 Author: purian23 <[email protected]> Date: Thu Sep 17 02:50:08 2026 -0400 refactor(clipboard): add click to open image previews & misc adjustments commit 9809aad3c466bf4974b887a37a806039e58b47ed Author: purian23 <[email protected]> Date: Thu Sep 17 02:35:20 2026 -0400 add(media): dynamic sizing - tests: start the fixture bus with dbus-broker or dbus-daemon commit 75a20eeb5a1299af1b0dd0d99cb374b4c5c8f15f Author: purian23 <[email protected]> Date: Thu Sep 17 00:30:04 2026 -0400 fix(dash): position bar-triggered popout once commit 1536691beb0bf2cd58fa3e1b2106eeeb9317a39c Author: purian23 <[email protected]> Date: Wed Sep 16 23:58:50 2026 -0400 dash & cc: operation freedom commit f3a2ae13bffbbdb92134af23138dc9a253f69e09 Author: bbedward <[email protected]> Date: Wed Sep 16 23:12:58 2026 -0400 lyrics: keep track identity independent of mpris length commit a59dd84908486f23e07172a6fca4c76eed27d31f Author: bbedward <[email protected]> Date: Wed Sep 16 22:41:44 2026 -0400 more zurvan changes commit fda890225576e6fc740946486c5c05cdc58ebd77 Author: bbedward <[email protected]> Date: Wed Sep 16 22:10:55 2026 -0400 media: more style changes commit 2170f055e3700466f87c0f6a072cb67e5e610574 Author: bbedward <[email protected]> Date: Wed Sep 16 20:00:36 2026 -0400 zurvan style tweaks commit 10795b2f2c41fcd1c24f5625324ff0ea7dd3e4ae Author: bbedward <[email protected]> Date: Wed Sep 16 18:32:48 2026 -0400 media: adjust styling of zurvan player commit 363eb10f7f53681d8f36fc6e9648205c9d5879d2 Author: bbedward <[email protected]> Date: Wed Sep 16 17:30:05 2026 -0400 lyrics: dont classify 401s as failures commit 0267c7110e14285fe4a611dbc78aee93e77e6ec8 Author: bbedward <[email protected]> Date: Wed Sep 16 17:07:34 2026 -0400 media: create the dank lyrics engine with multiple providers and priority support media: add zurvan style player and make it default commit 0aae835377cc96c5ec8383650df914058f604a42 Author: bbedward <[email protected]> Date: Wed Sep 16 10:22:36 2026 -0400 remove dumb test commit 8610121b1cb20b4b4b557170b7df52af39f4efff Author: bbedward <[email protected]> Date: Wed Sep 16 10:16:00 2026 -0400 notifications: redesign card header commit 868b73740a575d51577fa3aaff5abc1ccd53043c Author: bbedward <[email protected]> Date: Wed Sep 16 09:24:13 2026 -0400 clipboard: tweak image preview style commit 6de9a1ba7c306269889227b892703dc822049ac9 Author: purian23 <[email protected]> Date: Tue Sep 15 22:52:40 2026 -0400 clipboard: new size variants & image previews commit 05909190a2fb93a3a2c68fc711c07c3ffc09a529 Author: bbedward <[email protected]> Date: Tue Sep 15 19:14:41 2026 -0400 qs: drop the delegates the layout and output migrations left behind commit 6ca48caf7c2141e7e5f55a7d4634e0803a90c6b9 Author: bbedward <[email protected]> Date: Tue Sep 15 19:03:03 2026 -0400 config: one implementation of the compositor fragment mechanics commit 9f024c001e0c661a19c35b92bb36a6a9758f9d4d Author: bbedward <[email protected]> Date: Tue Sep 15 18:34:03 2026 -0400 compositor: name capabilities instead of checking identity in the ui commit 90067f14ed38e0cbf919e35cbf333f62240bc585 Author: bbedward <[email protected]> Date: Tue Sep 15 18:19:57 2026 -0400 settings: read every default from the spec commit 7f7ae95ed3093c5df7cb4bf5d23b718497a769ff Author: bbedward <[email protected]> Date: Tue Sep 15 15:47:13 2026 -0400 notifications: watch screen sharing from the service side commit a470ed448cbddb849922e80afdd2b13eb85f08f9 Author: bbedward <[email protected]> Date: Tue Sep 15 15:15:38 2026 -0400 rebase fix commit dc8f05fa0ca4650a40e32fb59614ca1b7df75f38 Author: bbedward <[email protected]> Date: Tue Sep 15 10:57:38 2026 -0400 dash: keep cards still when edit mode opens commit bc2001359613fd9b47ba0000a8f8f081d412a166 Author: bbedward <[email protected]> Date: Tue Sep 15 10:16:48 2026 -0400 settings: own the full spec again and merge the shared greeter keys settings: drop sidebar hints that repeat their own label cc/dash: change edit interface design slightly commit ee963f54b259eced7ec23701194539441b264db0 Author: purian23 <[email protected]> Date: Mon Sep 14 23:43:56 2026 -0400 settings: update island notification handling to use bar context commit 4d6f9fde4401001625f0352f97821ce5034a7e1c Author: bbedward <[email protected]> Date: Mon Sep 14 23:21:28 2026 -0400 greeter: read the shared settings schema instead of a duplicated one commit 70e4bdaec84efa3d68438ef235e46762cee38101 Author: bbedward <[email protected]> Date: Mon Sep 14 22:42:31 2026 -0400 osd, toast, launcher: start open motion after onFrameSwapped signal commit ddfd28b7be6dd4b0940512897d835107dbab1f23 Author: bbedward <[email protected]> Date: Mon Sep 14 21:12:37 2026 -0400 notifications: wait for onFrameSwapped signal before showing notification popup Lets the layer-surface map before rendering the body, resulting in better animation appearance commit 24efe6f8a18b36bb42c6b399086ffa5c5e2aa9c5 Author: purian23 <[email protected]> Date: Mon Sep 14 18:55:46 2026 -0400 notifications: adjust animation durations - Mapped the layer-shell surface - Fixed group chevron/dismiss button commit 52389ecf5cc586e912c26a345004814e37f4048a Author: bbedward <[email protected]> Date: Mon Sep 14 18:10:33 2026 -0400 dash: spacing tweak of tabbart commit 0285a70c1b07d09558c450c1eeb925a5c903069f Author: bbedward <[email protected]> Date: Mon Sep 14 17:55:43 2026 -0400 blah commit a1abc7a8df94032b01b51189b214aa21543f7218 Author: bbedward <[email protected]> Date: Mon Sep 14 17:40:10 2026 -0400 shrink window CSD height commit db20f7e9bb93c7dce503e410e82e15e7a03b1e7d Author: bbedward <[email protected]> Date: Mon Sep 14 17:16:16 2026 -0400 windows: center titles commit 7268712bdf58c5c1903606f24a392d64655a4ad5 Author: purian23 <[email protected]> Date: Mon Sep 14 16:45:44 2026 -0400 notifications: updated entry/exit paths - Added popout option in island mode - Fixed cards getting stuck & out of place when multiples arise at once commit 3a3f0b3061bd0a7ce895152ec5a056600e41e7e8 Author: bbedward <[email protected]> Date: Mon Sep 14 16:34:36 2026 -0400 battery: make cc variant consistent commit ee569ddef3bf2875d42347d18b57f493f492b243 Author: bbedward <[email protected]> Date: Mon Sep 14 16:15:42 2026 -0400 battery: remove bottom text footer thing commit 817c4e46eac52c95d91f418e3ddbafdab0888b5c Author: purian23 <[email protected]> Date: Mon Sep 14 15:34:18 2026 -0400 settings: rework interface style and bar hub layouts - Separate global surface styling from per-surface overrides on Interface style - Move bar management into the hub header and render island settings inline - Cut redirect banners down to one per page and point them at the right row commit 03a4e45d65aec83c927c7419a4a0f3f252e0e955 Author: bbedward <[email protected]> Date: Mon Sep 14 14:52:20 2026 -0400 launcher: fix inconsistency in niri overview variant commit e74246d058a5db215200606eb9f9c662706d8689 Author: bbedward <[email protected]> Date: Mon Sep 14 14:21:10 2026 -0400 plugins: eval symlinks in repo lookup commit 7dd2cddebf4819da51ff7da792560372f5d9a03e Author: bbedward <[email protected]> Date: Mon Sep 14 09:09:46 2026 -0400 update common commit a8c1f77fe2d952b1ec33e622b2951e5382860c9e Author: purian23 <[email protected]> Date: Mon Sep 14 02:05:09 2026 -0400 island: fix search input focus on launcher commit 2d1f8bf5338ca5e0a4a58f0f18b54b92dfe5e5ee Author: purian23 <[email protected]> Date: Mon Sep 14 01:29:05 2026 -0400 tooltips: add further label & accessibility parity commit 3ebfe85d57553b4803b52d5e5ea417b8abec5bcf Author: bbedward <[email protected]> Date: Sun Sep 13 23:28:29 2026 -0400 ui: drop tooltips from obvious icon buttons, keep labels on Accessible.name commit a8e7a072b2bad394c5c5d9fd60eaff5240ce37d4 Author: bbedward <[email protected]> Date: Sun Sep 13 22:55:28 2026 -0400 widgets: dim filled action buttons when disabled commit 0dc58825344ebfc5479d2a3bc75b5d2ae014131a Author: bbedward <[email protected]> Date: Sun Sep 13 22:45:34 2026 -0400 settings: one compositor include workflow for outputs, layout, input, window rules, cursor and binds commit 9fc8c8e53c18de18b33ccdfe1e1abed84e01b219 Author: purian23 <[email protected]> Date: Sun Sep 13 22:27:28 2026 -0400 theme: add focus ring settings & replace text fields w/search fields aligned to m3e specs commit 8359fea68230172b1c10df08831efdf944fbbd64 Author: bbedward <[email protected]> Date: Sun Sep 13 20:37:49 2026 -0400 auth: share one pam stack parser between the greeter, lock probe and polkit commit bf05136e78aada16e41a7d0b7164a7f543d65760 Author: bbedward <[email protected]> Date: Sun Sep 13 20:24:01 2026 -0400 tests: replace golden files and dump-only fixtures with hand-written assertions commit f2cd6a877b561a5078e7b6cbad8348e9165158ca Author: bbedward <[email protected]> Date: Sun Sep 13 19:15:02 2026 -0400 display: split DisplayService into brightness, night mode and refresh rate services commit fa7ce5fe836e4f00646c80eb3cb50ecc004f4524 Author: bbedward <[email protected]> Date: Sun Sep 13 18:19:26 2026 -0400 battery: m3e redesign commit 04576106158c009374d9564d18852cf7ea1f9284 Author: bbedward <[email protected]> Date: Sun Sep 13 17:21:32 2026 -0400 shell: one window model and one keyboard layout source hosts: put change handlers on the observed object instead of proxy properties commit e4750c767b27d4650b95d42930410ad090d6ca87 Author: bbedward <[email protected]> Date: Sun Sep 13 15:39:10 2026 -0400 shell: replace connections with bound property handlers in per-item and per-screen components commit 8efb05dc014f0d09b36d6112b03e6f4e1f60d1d2 Author: bbedward <[email protected]> Date: Sun Sep 13 13:43:10 2026 -0400 display config: move output parsing, identifiers and geometry into a pure model commit e9b8174812b2da316eeae42e3989f2f269ef5649 Author: bbedward <[email protected]> Date: Sun Sep 13 12:52:46 2026 -0400 slideout: build content on first open commit b899f307650cf5cc646de90ac666b6e1731bbc4f Author: bbedward <[email protected]> Date: Sun Sep 13 12:28:11 2026 -0400 services: stop using weakmap for workspace, window and term caches commit b90e9a4c2a72744685f79cf613ab80660721389f Author: bbedward <[email protected]> Date: Sun Sep 13 10:35:48 2026 -0400 workspaces: one model with per-compositor adapters, no compositor branches in widgets shell: stop hot reload while the session lock is held commit e200e17e96e06b4fd7e0dd596b50dcbbc254494a Author: purian23 <[email protected]> Date: Sun Sep 13 02:36:41 2026 -0400 dock: mix widgets between pinned apps - Pinned apps become individual units in edit mode with a saved per-dock order, while running windows stay one unit in compositor order. - Fix the Window.window Connections crash - Add right-click-to-edit empty dock space option and dock edit / editFor ipc commands commit cad3ba78727695419a4fe8a96c90146bbf5e6120 Author: bbedward <[email protected]> Date: Sun Sep 13 00:51:35 2026 -0400 launcher: create plugin instances only when a query needs them commit aed25c3c75d0c24a17a940c162a6956a372c4e0f Author: bbedward <[email protected]> Date: Sat Sep 12 23:45:19 2026 -0400 settings: rebuild about, printer, wifi, display and window rules pages on settings blocks popouts: drop inconsistent headers commit 3a20c2c9528fe1fed3464085492af3bebdcdf809 Author: bbedward <[email protected]> Date: Sat Sep 12 17:41:18 2026 -0400 launcher: consolidate host code and logic commit 4e53b470d5beaffa54687c8164e492ee41472e49 Author: bbedward <[email protected]> Date: Sat Sep 12 15:37:44 2026 -0400 surfaces: collapse connected/standalone popout and modal hosts typography: make font weight work and follow m3 weights settings: fix reset to default shifting rows commit ce71b5dc3ca0e96ee11b906b1ea3399d3d7d93ac Author: bbedward <[email protected]> Date: Sat Sep 12 15:02:25 2026 -0400 dock: move widgets, launcher, apps and trash as units in edit mode commit 6ebaef52d885744a45f3db7d48c3b6d0924993b2 Author: bbedward <[email protected]> Date: Sat Sep 12 13:24:31 2026 -0400 plugins: add examples for dash and dock commit 067cabc95991f5676a19746d3cad0700eb525082 Author: bbedward <[email protected]> Date: Sat Sep 12 12:25:59 2026 -0400 settings: fix v18 migration commit 55d07f3bba352972c768acdd7b6705f80fac4e0f Author: bbedward <[email protected]> Date: Sat Sep 12 12:09:56 2026 -0400 ci: fix fails commit 2e81531dd6980f0331af80fe5beca1d695c58f06 Author: bbedward <[email protected]> Date: Sat Sep 12 11:49:39 2026 -0400 surfaces: add windowRadius token to make surfaces actually follow settings and match the compositor windows surfaces: change default radius (Strength 50) from 12->16 settings: add result to default for everything settings: further re-organization and re-structuring position of things settings: remove dead keys dock: remove hardcoded border and respect border setting bar: add a third style and color options ci: hookup QML testing commit a2fd8abd37e0ff1ef67af9bfa4e7679e7aa338bd Author: bbedward <[email protected]> Date: Sat Sep 12 09:20:00 2026 -0400 dash: size surface width to the width of the largest tab commit 93394549a2cb3f7647b564ba71621e113c83e106 Author: bbedward <[email protected]> Date: Sat Sep 12 00:11:15 2026 -0400 bar/workspaces: restore old style, respect color choices, make pills default > segments commit 71f8351a3b11f8d06e45dd28db4d501e54a27f9a Author: purian23 <[email protected]> Date: Fri Sep 11 23:48:04 2026 -0400 dbar: initial M3E remaster pass on shared chrome w/dock & island commit 1711716073f660afd519ab0af88d3c8177f1a8c8 Author: bbedward <[email protected]> Date: Fri Sep 11 21:44:31 2026 -0400 dash: only show focus ring when KB navigating commit 6037de06471e7fa80ec36088e9e86cbf2e4d3941 Author: bbedward <[email protected]> Date: Fri Sep 11 21:41:53 2026 -0400 launcher: scope plugin and clipboard refreshes, paint the keystroke before plugin search commit 78c9ab990b7665e76762dadd65d1a1d23275a405 Author: bbedward <[email protected]> Date: Fri Sep 11 21:16:36 2026 -0400 launcher: one open-session reset, faster keystroke settle commit 01b15051363715bfb2bfe1d905b4b573fb4e49ac Author: bbedward <[email protected]> Date: Fri Sep 11 20:47:45 2026 -0400 dash: fix kb navigation on overview commit 27465074e1fa395a844cc3b804a362ee7a4e4f70 Author: bbedward <[email protected]> Date: Fri Sep 11 16:58:53 2026 -0400 dash: replace material shapes on resource cards with a ring gauge commit 5e41b85a1df69885c57a41ab44a43ef38b0c5560 Author: bbedward <[email protected]> Date: Fri Sep 11 16:33:48 2026 -0400 qml: share bases for registry browsers, fade windows and plugin list settings Fixes fade window focus, list setting load write-back and the missing Theme.onError commit be3542ab8fc1949a256d6498b5c4a0379b86e023 Author: bbedward <[email protected]> Date: Fri Sep 11 16:11:15 2026 -0400 popout: fix pixel jumps commit 2ad0e9e2f5b12f13f0acc9733c29c4c42d640df7 Author: bbedward <[email protected]> Date: Fri Sep 11 15:52:52 2026 -0400 popout: fade the surface fill with the content commit 4b11e21b1a09895f67ca1b6b858fe772500e4a2c Author: bbedward <[email protected]> Date: Fri Sep 11 15:13:14 2026 -0400 desktop widgets: read and write saved geometry through one path commit 21ed01bbb20627d4d68bbb704b9f2bb50b45c911 Author: bbedward <[email protected]> Date: Fri Sep 11 15:10:02 2026 -0400 surfaces: bind modal and popout backends to their handle commit 362859d810b768621061f0429c39b17ff3b00184 Author: bbedward <[email protected]> Date: Fri Sep 11 14:30:27 2026 -0400 notifications: move the popup context menu onto DankContextMenu commit 8942b622f5929e854fbcf145e7f34f4637904731 Author: bbedward <[email protected]> Date: Fri Sep 11 14:20:49 2026 -0400 colorpicker: design changes consolidate context menus commit 29be554d488aefd9a8f6e4e5f5d094147e3b214d Author: bbedward <[email protected]> Date: Fri Sep 11 12:48:02 2026 -0400 dash: add analog clock option commit 43748726983a466e19e4b642399ea040d4095de9 Author: bbedward <[email protected]> Date: Fri Sep 11 12:12:51 2026 -0400 popouts: fix spacing inconsistencies dash: redesign overview media card osd: more redesign dash/overview: remove row cap and make it dynamic commit 14a3a315d94336cac6e8eb77e08965503717d780 Author: bbedward <[email protected]> Date: Fri Sep 11 09:23:53 2026 -0400 shell: dedupe bar ipc handlers, weather resets, color options, launcher icons commit 9f2b6d4bbe6f5954a33b5853ecea0ef0ac4b483e Author: purian23 <[email protected]> Date: Thu Sep 10 23:52:39 2026 -0400 dock: add spacing option & update defaults commit 3e6cb55488a42ade23728bcf4d8608efab2e6e0f Author: bbedward <[email protected]> Date: Thu Sep 10 23:29:07 2026 -0400 session: collapse the monitor cycling setters onto one helper commit 613e756d8bf88b3c2e6ae7edcede4c680da72456 Author: bbedward <[email protected]> Date: Thu Sep 10 21:56:38 2026 -0400 dock: share the hover bounce animation across dock buttons commit 8d8f801874ddf5dcc3b299405de458183e758c7c Author: bbedward <[email protected]> Date: Thu Sep 10 21:46:44 2026 -0400 settings: share one picker window for bar and desktop widgets commit e3c90efbce4d7d11adf0cceefb8e9758e7d9099c Author: bbedward <[email protected]> Date: Thu Sep 10 21:24:10 2026 -0400 network: merge wired and wifi info modals commit 43f75e6a3dfc988f3adc8c7d659fff5529ed6db8 Author: purian23 <[email protected]> Date: Thu Sep 10 21:22:06 2026 -0400 island: unify new dashboard dynamic sizing & activities - New wallpaper carousel and Colum/Row options - Fixed island controller overlap in bar widget settings - Fixed island widgets click to hide activity - Expanded island IPC cyle targets commit 805611efca91bea029894436dad9baa6dd492461 Author: bbedward <[email protected]> Date: Thu Sep 10 19:40:27 2026 -0400 bar: share context menu window and tooltip offset across widgets also fix Media art glitches and things commit 17a08c4c7e56312d0b3a7732978223f569828aaf Author: bbedward <[email protected]> Date: Thu Sep 10 19:00:48 2026 -0400 osd/media: respect follow album accent option commit 6a753a7ab6304568f178bc3ec0910a9132020dd2 Author: bbedward <[email protected]> Date: Thu Sep 10 18:57:15 2026 -0400 theme: fix surface elevation commit af4f44eba649923bfb0928423a24fc6d115518c4 Author: bbedward <[email protected]> Date: Thu Sep 10 18:45:09 2026 -0400 m3e: redesign OSDs, Forms, etc. commit 1d2add180a661157b3c06a1221edae21bdbcb765 Author: bbedward <[email protected]> Date: Thu Sep 10 17:19:07 2026 -0400 rebase fixes commit ac39a7745cfe88bcfd3826f64cfd55ed41b18b3e Author: bbedward <[email protected]> Date: Thu Sep 10 16:51:16 2026 -0400 tray: share one item delegate and icon for both bar orientations commit 642eeb0f4b5d0a912fc44c134fc10adf8a5b5291 Author: bbedward <[email protected]> Date: Thu Sep 10 16:33:36 2026 -0400 bar: share one delegate for running apps in both orientations commit 7f69e42f3bef9025d411acfc768deb3865338922 Author: bbedward <[email protected]> Date: Thu Sep 10 15:56:33 2026 -0400 bar: share one monitor pill for cpu, ram, temp and disk widgets commit f5507dc3b2df6929521e87cd820eb45a3e3077ad Author: bbedward <[email protected]> Date: Thu Sep 10 14:03:00 2026 -0400 island: reuse widget model, surface palette and layout metrics in hosts commit aceac03ba0c9a2b0aa1a47f1b62a380fc785ec6d Author: bbedward <[email protected]> Date: Thu Sep 10 13:36:47 2026 -0400 osd: share one level osd for volume, brightness, mic and media commit 1b4a68d10c5b59f3ecf3e7c44974a2cb83964246 Author: bbedward <[email protected]> Date: Thu Sep 10 13:12:30 2026 -0400 shell: consolidate connected surface state into one slot store commit d7edc23cf14a10cd275fdf3888d24482d43a15f3 Author: bbedward <[email protected]> Date: Thu Sep 10 12:19:30 2026 -0400 shell: restore centered dash popout for center-section widgets commit d2f9405de9e7ade7db402826cfb0520249c58a2b Author: bbedward <[email protected]> Date: Thu Sep 10 12:11:29 2026 -0400 dash/media: always show placeholder player when no players are playing commit 55535082f53163914440e1e858aa78246bc4e40a Author: bbedward <[email protected]> Date: Thu Sep 10 12:08:10 2026 -0400 dock: fix sizing, exclusive zone, edit mode and multi-instance settings commit c82cc738ca2d20e7a4363b7abb86ad6d9e7bb172 Author: bbedward <[email protected]> Date: Thu Sep 10 11:08:40 2026 -0400 settings/plugins: redesign page commit 9c283e0f6c4b7d812362124fdd36fc15327ef03c Author: bbedward <[email protected]> Date: Wed Sep 9 20:44:26 2026 -0400 shell: route widget instances and support same-edge layouts commit 405a3b397c264688b2271d6acec881a4aea4864f Author: bbedward <[email protected]> Date: Wed Sep 9 18:05:37 2026 -0400 shell: share bar content and clock presentation commit 65a6d2df8e870af259b1542c896fce60be4f6cb6 Author: bbedward <[email protected]> Date: Wed Sep 9 15:49:23 2026 -0400 shell: centralize layout ownership commit 585aeb4e1cba737cc4007fc214ac1e109d3e0f19 Author: purian23 <[email protected]> Date: Wed Sep 9 18:05:13 2026 -0400 dock: initial m3e remaster commit a2e646f2fb364f042fb134e74e9014386b80971b Author: bbedward <[email protected]> Date: Wed Sep 9 14:58:38 2026 -0400 plugins: consolidate upgrade path commit 139253504c5f62d522fbc6109689c11ccaec7493 Author: bbedward <[email protected]> Date: Wed Sep 9 14:43:28 2026 -0400 settings: use icons on all outlined text fields commit a9c1e569b8428e4f3748da345200e8a62c90ba20 Author: bbedward <[email protected]> Date: Wed Sep 9 14:32:33 2026 -0400 launcher: fix KB navigation focus and modes commit ac64eb52d360322a0e952844b41b58532d5ae32f Author: bbedward <[email protected]> Date: Wed Sep 9 14:05:10 2026 -0400 m3e: remove inconsistent widget usage, adjust SystemUpdater rredesign, fix window decoration inconsistencies commit 0eac1d3e22cb879c7b7e9205fba0ed9c17b89dcd Author: bbedward <[email protected]> Date: Wed Sep 9 13:25:44 2026 -0400 server: consolidate ipc routing and subscription forwarding commit ed289e5c2c867eb2d6e1319d9517885e6e80d1a3 Author: bbedward <[email protected]> Date: Wed Sep 9 12:56:29 2026 -0400 plugins: redesign management and browsers with m3 expressive commit 7f3a526e2d38c24edbb5d51c4c9c550a0bc93752 Author: bbedward <[email protected]> Date: Wed Sep 9 11:00:07 2026 -0400 settings: fix inconsistent ripple effect radius commit 8f1fb8a11e92b1811808325c136199fef10d4a53 Author: bbedward <[email protected]> Date: Wed Sep 9 10:26:39 2026 -0400 aqueous: fix variant terms commit 2ba861947092cb657d983702c842e88ffc6fb0fa Author: bbedward <[email protected]> Date: Wed Sep 9 10:01:50 2026 -0400 running apps: fix delegate bug commit b37c925e85cb6902bbb3005d92a5b522e3648116 Author: bbedward <[email protected]> Date: Wed Sep 9 00:18:57 2026 -0400 bump dml-common commit 5e83c40c56c624df74306efc839d707ec8d6aa14 Author: bbedward <[email protected]> Date: Wed Sep 9 00:12:16 2026 -0400 settings: incorporate user & accounts tab, consolidate security, add M3E textfield commit 278370c7909226ca42f0a53cbd9ca2bd5f2fb4e7 Author: bbedward <[email protected]> Date: Tue Sep 8 18:17:25 2026 -0400 m3e: unify shell surfaces and refresh process monitoring commit e2d5860d3952da717ba9073e857133f2538a70b0 Author: bbedward <[email protected]> Date: Tue Sep 8 15:15:17 2026 -0400 notifications: fix expansion timing and simplify the header commit d8f29c221474c2884ec482d26c827de09d581539 Author: bbedward <[email protected]> Date: Tue Sep 8 14:53:11 2026 -0400 icon: install app icon under the conventional name (app id) commit ebeebb70fd4c7538ef5ea867116d9fa7118eee27 Author: bbedward <[email protected]> Date: Tue Sep 8 14:47:09 2026 -0400 notifications: refine card styling and separate app icons from image previews commit d6133d93ed314ca02a9a3b634872ee32484a0bb3 Author: bbedward <[email protected]> Date: Tue Sep 8 14:27:18 2026 -0400 settings: unify expressive rows and drag and drop commit 0a4d14752a2a1e8dd60b3056fd006d02d818d6a4 Author: bbedward <[email protected]> Date: Tue Sep 8 12:32:16 2026 -0400 settings: use native action button hover state commit dc8c4564cc964ab50ed28a3e9e4ca7b13ebfbcb1 Author: bbedward <[email protected]> Date: Tue Sep 8 09:55:42 2026 -0400 shell: refine weather, slider controls, and tooltips commit bec5c6ad0119e22a3cb69975d135d3b72654f77e Author: bbedward <[email protected]> Date: Mon Sep 7 18:43:39 2026 -0400 theme: tweak token values commit 8519cbc4bbb396a8b6779764ff0f5a0945156dcf Author: bbedward <[email protected]> Date: Mon Sep 7 13:43:53 2026 -0400 dankdash: fix grid sizing, controls, notifications, and popout blur commit f2405f2925aa63eba480cff4ddc55119818f8057 Author: bbedward <[email protected]> Date: Mon Sep 7 10:38:07 2026 -0400 dash: redesign media player and migrate its appearance options commit cb57ce04fbd50920a17d9a8ad33e4d20fc856021 Author: bbedward <[email protected]> Date: Mon Sep 7 09:07:01 2026 -0400 lock: add lock m3e redesign commit e89909e3743993dad1bdf17d57ab17f1122dfa3c Author: bbedward <[email protected]> Date: Sun Sep 6 21:24:48 2026 -0400 qs: more loaders, less repetition commit 288335fef67b523f51e22bb234c81bd8b88e7e2c Author: bbedward <[email protected]> Date: Sun Sep 6 20:16:41 2026 -0400 launcher: initial m3e redesign commit 5b7fc75c473491bf086b65a41416325697ae330c Author: purian23 <[email protected]> Date: Sun Sep 6 19:50:14 2026 -0400 feat(motion): new fluid animation variant - Refactored Popouts/Modals for performance passes commit 0fc4f51f4d0b1d297c1886b19be8062d279c505b Author: bbedward <[email protected]> Date: Sun Sep 6 15:36:22 2026 -0400 notifications: tweak animnation stacking behavior on popups commit 4369233794e3bebd890a2b830c6450d0a65eb31a Author: bbedward <[email protected]> Date: Sun Sep 6 15:15:55 2026 -0400 notifications: initial M3E redesign commit eb67a51779c543038ad885ecd406bfe21aecd1e2 Author: bbedward <[email protected]> Date: Sat Sep 5 15:10:37 2026 -0400 ddash: exhaustive overhaul of even more pieces of the system commit 14554a39effd677206f7a3c4b5944d2ae47c2b03 Author: bbedward <[email protected]> Date: Sat Sep 5 12:47:06 2026 -0400 settings: rebase fixes commit d6e0bb604bdb15ed94d77f9e1d85a26381ed6836 Author: bbedward <[email protected]> Date: Sat Sep 5 10:18:38 2026 -0400 ddash: initial rewrite commit 29903114d0d8849b25c6f6e9161765b0ad03da49 Author: bbedward <[email protected]> Date: Fri Sep 4 16:48:23 2026 -0400 cc: tweak s lider size commit 8d14a07864972e4b705e77b371d21f5fdb7c4c07 Author: bbedward <[email protected]> Date: Fri Sep 4 16:44:53 2026 -0400 cc: initial M3E re-design commit 976f968967166c61cec423f3bb3f7a28a5a9ac76 Author: bbedward <[email protected]> Date: Fri Sep 4 15:00:35 2026 -0400 settings: continue to iterate commit a99a1c5ad183e34435a20dd90f19ed84099a1070 Author: bbedward <[email protected]> Date: Fri Sep 4 09:44:55 2026 -0400 stash m3e work
1972 lines
75 KiB
QML
1972 lines
75 KiB
QML
pragma Singleton
|
|
pragma ComponentBehavior: Bound
|
|
|
|
import QtCore
|
|
import QtQuick
|
|
import Quickshell
|
|
import Quickshell.Io
|
|
import qs.Common
|
|
import qs.Services
|
|
import qs.Modules.Settings.Widgets
|
|
import "../../../Common/ConfigIncludeResolve.js" as ConfigIncludeResolve
|
|
import "../../../Common/OutputModel.js" as OutputModel
|
|
|
|
Singleton {
|
|
id: root
|
|
readonly property var log: Log.scoped("DisplayConfigState")
|
|
|
|
readonly property bool hasOutputBackend: WlrOutputService.wlrOutputAvailable
|
|
readonly property var wlrOutputs: WlrOutputService.outputs
|
|
property var outputs: ({})
|
|
property var savedOutputs: ({})
|
|
property var savedParsedOutputs: ({})
|
|
property var allOutputs: buildAllOutputsMap()
|
|
|
|
readonly property ConfigInclude include: ConfigInclude {
|
|
includeKind: "outputs"
|
|
warningCategory: "display-config"
|
|
onFixed: root.writeOutputsAfterIncludeFix()
|
|
}
|
|
readonly property var includeStatus: include.status
|
|
readonly property bool readOnly: include.readOnly
|
|
readonly property bool checkingInclude: include.checking
|
|
readonly property bool fixingInclude: include.fixing
|
|
|
|
property var pendingChanges: ({})
|
|
property var pendingNiriChanges: ({})
|
|
property var pendingHyprlandChanges: ({})
|
|
property var originalNiriSettings: null
|
|
property var originalHyprlandSettings: null
|
|
property var originalOutputs: null
|
|
property string originalDisplayNameMode: ""
|
|
property bool formatChanged: originalDisplayNameMode !== "" && originalDisplayNameMode !== SettingsData.displayNameMode
|
|
property bool hasPendingChanges: Object.keys(pendingChanges).length > 0 || Object.keys(pendingNiriChanges).length > 0 || Object.keys(pendingHyprlandChanges).length > 0 || formatChanged
|
|
|
|
property bool validatingConfig: false
|
|
property var _cancelOutputWrite: null
|
|
property var aqueousPreview: null
|
|
|
|
function outputFingerprint(outputs) {
|
|
return OutputModel.outputFingerprint(outputs);
|
|
}
|
|
|
|
function outputHeads(outputs) {
|
|
return OutputModel.outputHeads(outputs);
|
|
}
|
|
|
|
function outputHeadsMatch(candidate, actual, original) {
|
|
return OutputModel.outputHeadsMatch(candidate, actual, original);
|
|
}
|
|
|
|
function freshAqueousOutputs(callback) {
|
|
DMSService.sendRequest("wlroutput.getState", null, response => {
|
|
callback(response.result?.outputs || null, response.error || "");
|
|
}, 5000);
|
|
}
|
|
|
|
function aqueousDisplayError(message) {
|
|
validatingConfig = false;
|
|
validationError = AqueousService.errorMessage(message);
|
|
ToastService.showError(I18n.tr("Error"), validationError, message);
|
|
}
|
|
|
|
function discardAqueousPreview() {
|
|
if (validatingConfig)
|
|
return;
|
|
aqueousPreview = null;
|
|
restoreDisplayNameMode();
|
|
validationError = "";
|
|
clearPendingChanges();
|
|
WlrOutputService.requestState();
|
|
}
|
|
|
|
function previewAqueousOutputs(descriptions) {
|
|
if (validatingConfig)
|
|
return;
|
|
if (!AqueousService.available) {
|
|
aqueousDisplayError("unavailable: compositor state");
|
|
return;
|
|
}
|
|
if (aqueousPreview) {
|
|
observeAqueousPreview(aqueousPreview, descriptions, "");
|
|
return;
|
|
}
|
|
const session = AqueousService.session;
|
|
validatingConfig = true;
|
|
AqueousConfigService.load((snapshot, error) => {
|
|
if (!snapshot) {
|
|
aqueousDisplayError(error);
|
|
return;
|
|
}
|
|
freshAqueousOutputs((original, error) => {
|
|
if (AqueousService.session !== session) {
|
|
aqueousDisplayError("conflict: compositor session changed");
|
|
return;
|
|
}
|
|
if (!original) {
|
|
aqueousDisplayError(error);
|
|
return;
|
|
}
|
|
const candidate = WlrOutputService.outputsConfigHeads(buildOutputsWithPendingChanges(), outputs);
|
|
WlrOutputService.testConfiguration(candidate, (success, message) => {
|
|
if (AqueousService.session !== session) {
|
|
aqueousDisplayError("conflict: compositor session changed");
|
|
return;
|
|
}
|
|
if (!success) {
|
|
aqueousDisplayError(message);
|
|
return;
|
|
}
|
|
const preview = {
|
|
snapshot: snapshot,
|
|
original: original,
|
|
heads: candidate,
|
|
fingerprint: null,
|
|
session: session
|
|
};
|
|
aqueousPreview = preview;
|
|
WlrOutputService.applyConfiguration(candidate, (success, message) => {
|
|
observeAqueousPreview(preview, descriptions, success ? "" : message);
|
|
});
|
|
});
|
|
});
|
|
});
|
|
}
|
|
|
|
function observeAqueousPreview(preview, descriptions, applyError) {
|
|
validatingConfig = true;
|
|
freshAqueousOutputs((actual, error) => {
|
|
if (aqueousPreview !== preview)
|
|
return;
|
|
if (!actual || AqueousService.session !== preview.session || !outputHeadsMatch(preview.heads, actual, preview.original)) {
|
|
if (actual && outputFingerprint(actual) === outputFingerprint(preview.original))
|
|
aqueousPreview = null;
|
|
aqueousDisplayError(error || applyError || "conflict: display preview changed externally");
|
|
return;
|
|
}
|
|
preview.fingerprint = outputFingerprint(actual);
|
|
validatingConfig = false;
|
|
validationError = applyError ? AqueousService.errorMessage(applyError) : "";
|
|
changesApplied(descriptions);
|
|
});
|
|
}
|
|
|
|
function finishAqueousPreview(keep) {
|
|
if (validatingConfig || !aqueousPreview)
|
|
return;
|
|
const preview = aqueousPreview;
|
|
validatingConfig = true;
|
|
freshAqueousOutputs((actual, error) => {
|
|
if (!actual || AqueousService.session !== preview.session || outputFingerprint(actual) !== preview.fingerprint) {
|
|
aqueousDisplayError(error || "conflict: output configuration changed after preview");
|
|
return;
|
|
}
|
|
if (keep) {
|
|
let draft;
|
|
try {
|
|
draft = AqueousConfigService.buildOutputsConfig(preview.snapshot, actual, preview.original);
|
|
} catch (e) {
|
|
aqueousDisplayError(String(e));
|
|
return;
|
|
}
|
|
AqueousConfigService.apply(draft, (snapshot, message) => {
|
|
if (!snapshot) {
|
|
aqueousDisplayError(message);
|
|
return;
|
|
}
|
|
aqueousPreview = null;
|
|
if (formatChanged)
|
|
SettingsData.saveSettings();
|
|
clearPendingChanges();
|
|
freshAqueousOutputs((live, error) => {
|
|
validatingConfig = false;
|
|
if (!live || AqueousService.session !== preview.session || outputFingerprint(live) !== preview.fingerprint) {
|
|
aqueousDisplayError("conflict: configuration saved but live display state changed");
|
|
return;
|
|
}
|
|
changesConfirmed();
|
|
});
|
|
});
|
|
return;
|
|
}
|
|
WlrOutputService.applyConfiguration(outputHeads(preview.original), (success, message) => {
|
|
if (!success) {
|
|
aqueousDisplayError(message);
|
|
return;
|
|
}
|
|
validatingConfig = false;
|
|
aqueousPreview = null;
|
|
restoreDisplayNameMode();
|
|
clearPendingChanges();
|
|
WlrOutputService.requestState();
|
|
changesReverted();
|
|
});
|
|
});
|
|
}
|
|
property string validationError: ""
|
|
|
|
property var currentOutputSet: []
|
|
property string matchedProfile: ""
|
|
property bool profilesLoading: false
|
|
property var validatedProfiles: ({})
|
|
property bool manualActivation: false
|
|
property bool profilesReady: false
|
|
property var monitorsCache: ({
|
|
"version": 1,
|
|
"configurations": []
|
|
})
|
|
property bool _monitorsSelfWrite: false
|
|
// Last config entry that was applied (set by applyConfigEntry / confirmChanges).
|
|
// Used to recover position, scale, and transform for disabled outputs that wlr
|
|
// no longer reports a logical viewport for.
|
|
property var lastAppliedEntry: null
|
|
|
|
signal changesApplied(var changeDescriptions)
|
|
signal changesConfirmed
|
|
signal changesReverted
|
|
signal profileActivated(string profileId, string profileName)
|
|
signal profileSaved(string profileId, string profileName)
|
|
signal profileDeleted(string profileId)
|
|
signal profileError(string message)
|
|
|
|
function buildCurrentOutputSet() {
|
|
return OutputModel.currentOutputSet(outputs, SettingsData.displayNameMode, CompositorService.compositor);
|
|
}
|
|
|
|
function getOutputIdentifier(output, outputName) {
|
|
return OutputModel.profileIdentifier(output, outputName, SettingsData.displayNameMode, CompositorService.compositor);
|
|
}
|
|
|
|
FileView {
|
|
id: monitorsFile
|
|
|
|
path: Paths.strip(Paths.config) + "/monitors.json"
|
|
blockLoading: true
|
|
blockWrites: true
|
|
atomicWrites: true
|
|
watchChanges: true
|
|
printErrors: false
|
|
onLoaded: root._reparseMonitorsJson(monitorsFile.text())
|
|
onLoadFailed: root._reparseMonitorsJson("")
|
|
onFileChanged: {
|
|
if (root._monitorsSelfWrite) {
|
|
root._monitorsSelfWrite = false;
|
|
return;
|
|
}
|
|
monitorsFile.reload();
|
|
}
|
|
onSaveFailed: error => {
|
|
root._monitorsSelfWrite = false;
|
|
log.warn("Failed to save monitors.json:", error);
|
|
}
|
|
}
|
|
|
|
function _reparseMonitorsJson(text) {
|
|
if (!text || !text.trim()) {
|
|
monitorsCache = {
|
|
"version": 1,
|
|
"configurations": []
|
|
};
|
|
} else {
|
|
try {
|
|
const parsed = JSON.parse(text);
|
|
if (!Array.isArray(parsed.configurations))
|
|
parsed.configurations = [];
|
|
monitorsCache = parsed;
|
|
} catch (e) {
|
|
log.warn("Failed to parse monitors.json, using empty config");
|
|
monitorsCache = {
|
|
"version": 1,
|
|
"configurations": []
|
|
};
|
|
}
|
|
}
|
|
_initializeProfiles();
|
|
}
|
|
|
|
function _initializeProfiles() {
|
|
if (!profilesReady && _shouldMigrateLegacyProfiles()) {
|
|
_migrateLegacyProfiles();
|
|
return;
|
|
}
|
|
validateProfiles();
|
|
}
|
|
|
|
function _shouldMigrateLegacyProfiles() {
|
|
if ((monitorsCache.configurations || []).length > 0)
|
|
return false;
|
|
const legacy = SettingsData.displayProfiles || {};
|
|
for (const c in legacy) {
|
|
if (Object.keys(legacy[c] || {}).length > 0)
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
function _migrateLegacyProfiles() {
|
|
const legacy = SettingsData.displayProfiles || {};
|
|
const configDir = Paths.strip(StandardPaths.writableLocation(StandardPaths.ConfigLocation));
|
|
const compositorDirs = {
|
|
"niri": configDir + "/niri/dms/profiles",
|
|
"hyprland": configDir + "/hypr/dms/profiles",
|
|
"dwl": configDir + "/mango/dms/profiles",
|
|
"mango": configDir + "/mango/dms/profiles"
|
|
};
|
|
const compositorExts = {
|
|
"niri": ".kdl",
|
|
"hyprland": ".conf",
|
|
"dwl": ".conf",
|
|
"mango": ".conf"
|
|
};
|
|
|
|
const tasks = [];
|
|
for (const compositor in legacy) {
|
|
const dir = compositorDirs[compositor];
|
|
const ext = compositorExts[compositor];
|
|
if (!dir || !ext)
|
|
continue;
|
|
for (const profileId in (legacy[compositor] || {})) {
|
|
tasks.push({
|
|
compositor: compositor,
|
|
id: profileId,
|
|
name: legacy[compositor][profileId]?.name || "",
|
|
file: dir + "/" + profileId + ext
|
|
});
|
|
}
|
|
}
|
|
|
|
if (tasks.length === 0) {
|
|
validateProfiles();
|
|
return;
|
|
}
|
|
|
|
log.info("Migrating", tasks.length, "legacy display profiles to monitors.json");
|
|
|
|
const migrated = [];
|
|
let pending = tasks.length;
|
|
const tryFinish = () => {
|
|
pending--;
|
|
if (pending > 0)
|
|
return;
|
|
const data = monitorsCache;
|
|
data.configurations = (data.configurations || []).concat(migrated);
|
|
writeMonitorsJson(data, success => {
|
|
if (success) {
|
|
SettingsData.displayProfiles = {};
|
|
SettingsData.saveSettings();
|
|
log.info("Migrated", migrated.length, "of", tasks.length, "legacy profiles");
|
|
} else {
|
|
log.warn("Failed to write migrated monitors.json");
|
|
}
|
|
validateProfiles();
|
|
});
|
|
};
|
|
|
|
for (const task of tasks) {
|
|
(function (t) {
|
|
Proc.runCommand("migrate-read-" + t.id, ["cat", t.file], (content, exitCode) => {
|
|
if (exitCode !== 0 || !content) {
|
|
log.warn("Skipping migration of profile", t.id, "- can't read", t.file);
|
|
tryFinish();
|
|
return;
|
|
}
|
|
let parsed;
|
|
switch (t.compositor) {
|
|
case "niri":
|
|
parsed = OutputModel.parseNiriOutputs(content);
|
|
break;
|
|
case "hyprland":
|
|
parsed = OutputModel.parseHyprlandOutputs(content);
|
|
break;
|
|
case "dwl":
|
|
case "mango":
|
|
parsed = OutputModel.parseMangoOutputs(content);
|
|
break;
|
|
default:
|
|
parsed = {};
|
|
}
|
|
const niriSettings = SessionData.niriOutputSettings || {};
|
|
const hyprSettings = SessionData.hyprlandOutputSettings || {};
|
|
const profileOutputs = {};
|
|
for (const outputName in parsed) {
|
|
const od = parsed[outputName];
|
|
profileOutputs[outputName] = extractOutputNeutralConfig(outputName, od, niriSettings, hyprSettings);
|
|
}
|
|
if (Object.keys(profileOutputs).length > 0)
|
|
migrated.push({
|
|
"id": t.id,
|
|
"name": t.name,
|
|
"outputs": profileOutputs
|
|
});
|
|
tryFinish();
|
|
});
|
|
})(task);
|
|
}
|
|
}
|
|
|
|
function readMonitorsJson(callback) {
|
|
callback(monitorsCache);
|
|
}
|
|
|
|
function writeMonitorsJson(data, callback) {
|
|
monitorsCache = data;
|
|
_monitorsSelfWrite = true;
|
|
monitorsFile.setText(JSON.stringify(data, null, 2));
|
|
if (callback)
|
|
callback(true);
|
|
}
|
|
|
|
function publishActiveProfileModes() {
|
|
const compositor = CompositorService.compositor;
|
|
const profileId = SessionData.getActiveDisplayProfile(compositor);
|
|
const profile = profileId ? validatedProfiles[profileId] : null;
|
|
const outputs = profile?.outputs || {};
|
|
const modes = {};
|
|
|
|
for (const outputId in outputs) {
|
|
const mode = outputs[outputId]?.mode;
|
|
if (mode)
|
|
modes[outputId] = {
|
|
"mode": mode
|
|
};
|
|
}
|
|
|
|
SessionData.setActiveDisplayProfileModes(compositor, modes);
|
|
}
|
|
|
|
function generateProfileId() {
|
|
return "profile_" + Date.now() + "_" + Math.random().toString(36).slice(2, 9);
|
|
}
|
|
|
|
function generateAutoProfileId(outputIdentifiers) {
|
|
const fp = outputSetFingerprint(outputIdentifiers);
|
|
let hash = 0;
|
|
for (let i = 0; i < fp.length; i++) {
|
|
hash = ((hash << 5) - hash) + fp.charCodeAt(i);
|
|
}
|
|
const hashStr = (hash >>> 0).toString(16);
|
|
return "auto_" + hashStr;
|
|
}
|
|
|
|
function configFingerprint(configEntry) {
|
|
return OutputModel.configFingerprint(configEntry);
|
|
}
|
|
|
|
function outputSetFingerprint(outputIdentifiers) {
|
|
return OutputModel.outputSetFingerprint(outputIdentifiers);
|
|
}
|
|
|
|
function findConfigEntryById(data, id) {
|
|
return OutputModel.findConfigEntryById(data, id);
|
|
}
|
|
|
|
function findConfigEntryByFingerprint(data, outputIdentifiers, autoOnly) {
|
|
return OutputModel.findConfigEntryByFingerprint(data, outputIdentifiers, autoOnly);
|
|
}
|
|
|
|
function getProfileMonitorInclusion(profileId) {
|
|
const profile = validatedProfiles[profileId];
|
|
const profileOutputIds = new Set(Object.keys(profile?.outputs || {}));
|
|
const result = {};
|
|
for (const rawName in allOutputs) {
|
|
const od = allOutputs[rawName];
|
|
const id = od ? getOutputIdentifier(od, rawName) : rawName;
|
|
result[rawName] = profileOutputIds.has(id);
|
|
}
|
|
return result;
|
|
}
|
|
|
|
function updateProfileMonitors(profileId, enabledRawNames) {
|
|
readMonitorsJson(data => {
|
|
const match = findConfigEntryById(data, profileId);
|
|
if (!match) {
|
|
profileError(I18n.tr("Profile not found"));
|
|
return;
|
|
}
|
|
const profileName = match.entry.name;
|
|
const existingOutputs = match.entry.outputs || {};
|
|
const mergedAll = buildOutputsWithPendingChanges();
|
|
const niriSettings = buildMergedNiriSettings();
|
|
const hyprlandSettings = buildMergedHyprlandSettings();
|
|
const newOutputConfigs = {};
|
|
for (const rawName of enabledRawNames) {
|
|
const od = mergedAll[rawName] || allOutputs[rawName];
|
|
if (!od)
|
|
continue;
|
|
const outputId = getOutputIdentifier(od, rawName);
|
|
newOutputConfigs[outputId] = existingOutputs[outputId] || extractOutputNeutralConfig(rawName, od, niriSettings, hyprlandSettings);
|
|
}
|
|
data.configurations[match.index] = {
|
|
"id": profileId,
|
|
"name": profileName,
|
|
"outputs": newOutputConfigs
|
|
};
|
|
writeMonitorsJson(data, success => {
|
|
if (!success)
|
|
return;
|
|
const updated = JSON.parse(JSON.stringify(validatedProfiles));
|
|
updated[profileId] = {
|
|
id: profileId,
|
|
name: profileName,
|
|
outputs: newOutputConfigs
|
|
};
|
|
validatedProfiles = updated;
|
|
matchedProfile = findMatchingProfile();
|
|
publishActiveProfileModes();
|
|
profileSaved(profileId, profileName);
|
|
});
|
|
});
|
|
}
|
|
|
|
function extractOutputNeutralConfig(outputName, outputData, niriSettings, hyprlandSettings) {
|
|
return OutputModel.outputNeutralConfig(outputName, outputData, niriSettings, hyprlandSettings, SettingsData.displayNameMode, CompositorService.compositor);
|
|
}
|
|
|
|
function profileKeyMatchesOutput(outputId, output, name) {
|
|
return OutputModel.profileKeyMatchesOutput(outputId, output, name, SettingsData.displayNameMode, CompositorService.compositor);
|
|
}
|
|
|
|
function generateOutputsDataFromConfig(configEntry) {
|
|
return OutputModel.outputsDataFromConfigEntry(configEntry, outputs, SettingsData.displayNameMode, CompositorService.compositor);
|
|
}
|
|
|
|
function getNiriSettingsFromConfig(configEntry) {
|
|
const result = {};
|
|
for (const outputId in (configEntry.outputs || {})) {
|
|
const cfg = configEntry.outputs[outputId];
|
|
const settings = Object.assign({}, cfg.niri || {});
|
|
if (cfg.disabled)
|
|
settings.disabled = true;
|
|
if (Object.keys(settings).length > 0)
|
|
result[outputId] = settings;
|
|
}
|
|
return result;
|
|
}
|
|
|
|
function getHyprlandSettingsFromConfig(configEntry) {
|
|
const result = {};
|
|
for (const outputId in (configEntry.outputs || {})) {
|
|
const cfg = configEntry.outputs[outputId];
|
|
const settings = Object.assign({}, cfg.hyprland || {});
|
|
if (cfg.disabled)
|
|
settings.disabled = true;
|
|
if (Object.keys(settings).length > 0)
|
|
result[outputId] = settings;
|
|
}
|
|
return result;
|
|
}
|
|
|
|
function backendSettingsFromConfig(configEntry) {
|
|
switch (CompositorService.compositor) {
|
|
case "niri":
|
|
return getNiriSettingsFromConfig(configEntry);
|
|
case "hyprland":
|
|
return getHyprlandSettingsFromConfig(configEntry);
|
|
default:
|
|
return null;
|
|
}
|
|
}
|
|
|
|
function backendMergedSettings() {
|
|
switch (CompositorService.compositor) {
|
|
case "niri":
|
|
return buildMergedNiriSettings();
|
|
case "hyprland":
|
|
return buildMergedHyprlandSettings();
|
|
default:
|
|
return null;
|
|
}
|
|
}
|
|
|
|
function ensureEnabledOutput(configEntry) {
|
|
return OutputModel.ensureEnabledOutput(configEntry, outputs, SettingsData.displayNameMode, CompositorService.compositor);
|
|
}
|
|
|
|
function profileOutputIsReal(outputId) {
|
|
return OutputModel.profileOutputIsReal(outputId, outputs, SettingsData.displayNameMode, CompositorService.compositor);
|
|
}
|
|
|
|
function applyConfigEntry(configEntry, configId, profileName, isManual) {
|
|
if (CompositorService.isHyprland && readOnly) {
|
|
if (isManual) {
|
|
profilesLoading = false;
|
|
manualActivation = false;
|
|
profileError(I18n.tr("Hyprland conf mode is read-only in Settings"));
|
|
}
|
|
showHyprlandReadOnlyWarning();
|
|
return;
|
|
}
|
|
const onWriteFailed = () => {
|
|
if (isManual) {
|
|
profilesLoading = false;
|
|
manualActivation = false;
|
|
profileError(I18n.tr("Failed to apply profile"));
|
|
}
|
|
};
|
|
|
|
ensureEnabledOutput(configEntry);
|
|
if (!Object.keys(configEntry.outputs || {}).some(k => profileOutputIsReal(k))) {
|
|
log.warn("Profile", configId, "has no real outputs, not applying");
|
|
onWriteFailed();
|
|
return;
|
|
}
|
|
// Capture the entry being applied so disabled-output settings fields can read
|
|
// scale/position/transform back even when wlr reports no logical viewport.
|
|
root.lastAppliedEntry = JSON.parse(JSON.stringify(configEntry));
|
|
const outputsData = generateOutputsDataFromConfig(configEntry);
|
|
const onWriteSuccess = () => {
|
|
SessionData.setActiveDisplayProfile(CompositorService.compositor, configId);
|
|
publishActiveProfileModes();
|
|
if (isManual) {
|
|
profilesLoading = false;
|
|
profileActivated(configId, profileName);
|
|
manualActivationTimer.restart();
|
|
}
|
|
WlrOutputService.requestState();
|
|
};
|
|
|
|
backendWriteOutputsConfig(outputsData, backendSettingsFromConfig(configEntry), success => {
|
|
if (success)
|
|
onWriteSuccess();
|
|
else
|
|
onWriteFailed();
|
|
});
|
|
}
|
|
|
|
function validateProfiles() {
|
|
log.info("Validating profiles against current outputs...");
|
|
readMonitorsJson(data => {
|
|
const validated = {};
|
|
let dirty = false;
|
|
for (const entry of (data.configurations || [])) {
|
|
const fp = configFingerprint(entry);
|
|
if (!fp)
|
|
continue;
|
|
if (!entry.id) {
|
|
entry.id = generateProfileId();
|
|
dirty = true;
|
|
}
|
|
if (ensureEnabledOutput(entry))
|
|
dirty = true;
|
|
validated[entry.id] = {
|
|
id: entry.id,
|
|
name: entry?.name || "",
|
|
outputs: entry.outputs
|
|
};
|
|
}
|
|
if (dirty)
|
|
writeMonitorsJson(data, null);
|
|
validatedProfiles = validated;
|
|
matchedProfile = findMatchingProfile();
|
|
publishActiveProfileModes();
|
|
if (!profilesReady) {
|
|
profilesReady = true;
|
|
applyAutoConfig();
|
|
}
|
|
});
|
|
}
|
|
|
|
function findMatchingProfile() {
|
|
const currentKey = currentOutputSet.join("+");
|
|
for (const id in validatedProfiles) {
|
|
const p = validatedProfiles[id];
|
|
if (p.name === "")
|
|
continue;
|
|
if (Object.keys(p.outputs || {}).sort().join("+") === currentKey)
|
|
return id;
|
|
}
|
|
return "";
|
|
}
|
|
|
|
function createProfile(profileName) {
|
|
const outputConfigs = buildCurrentOutputConfigs();
|
|
const id = generateProfileId();
|
|
|
|
profilesLoading = true;
|
|
readMonitorsJson(data => {
|
|
data.configurations.push({
|
|
"id": id,
|
|
"name": profileName,
|
|
"outputs": outputConfigs
|
|
});
|
|
|
|
writeMonitorsJson(data, success => {
|
|
profilesLoading = false;
|
|
if (!success) {
|
|
profileError(I18n.tr("Failed to save profile"));
|
|
return;
|
|
}
|
|
const updated = JSON.parse(JSON.stringify(validatedProfiles));
|
|
updated[id] = {
|
|
id: id,
|
|
name: profileName,
|
|
outputs: outputConfigs
|
|
};
|
|
validatedProfiles = updated;
|
|
currentOutputSet = buildCurrentOutputSet();
|
|
matchedProfile = findMatchingProfile();
|
|
SessionData.setActiveDisplayProfile(CompositorService.compositor, id);
|
|
publishActiveProfileModes();
|
|
profileSaved(id, profileName);
|
|
});
|
|
});
|
|
}
|
|
|
|
function renameProfile(profileId, newName) {
|
|
readMonitorsJson(data => {
|
|
const match = findConfigEntryById(data, profileId);
|
|
if (!match) {
|
|
profileError(I18n.tr("Profile not found"));
|
|
return;
|
|
}
|
|
match.entry.name = newName;
|
|
data.configurations[match.index] = match.entry;
|
|
writeMonitorsJson(data, success => {
|
|
if (!success)
|
|
return;
|
|
const updated = JSON.parse(JSON.stringify(validatedProfiles));
|
|
if (updated[profileId])
|
|
updated[profileId].name = newName;
|
|
validatedProfiles = updated;
|
|
});
|
|
});
|
|
}
|
|
|
|
function deleteProfile(profileId) {
|
|
const compositor = CompositorService.compositor;
|
|
const isActive = SessionData.getActiveDisplayProfile(compositor) === profileId;
|
|
|
|
profilesLoading = true;
|
|
readMonitorsJson(data => {
|
|
const match = findConfigEntryById(data, profileId);
|
|
if (match)
|
|
data.configurations.splice(match.index, 1);
|
|
writeMonitorsJson(data, success => {
|
|
profilesLoading = false;
|
|
SettingsData.removeDisplayProfile(compositor, profileId);
|
|
if (isActive) {
|
|
SessionData.setActiveDisplayProfile(compositor, "");
|
|
backendWriteOutputsConfig(allOutputs);
|
|
}
|
|
const updated = JSON.parse(JSON.stringify(validatedProfiles));
|
|
delete updated[profileId];
|
|
validatedProfiles = updated;
|
|
matchedProfile = findMatchingProfile();
|
|
publishActiveProfileModes();
|
|
profileDeleted(profileId);
|
|
});
|
|
});
|
|
}
|
|
|
|
function activateProfile(profileId) {
|
|
manualActivation = true;
|
|
profilesLoading = true;
|
|
readMonitorsJson(data => {
|
|
const match = findConfigEntryById(data, profileId);
|
|
if (!match) {
|
|
profilesLoading = false;
|
|
manualActivation = false;
|
|
profileError(I18n.tr("Profile not found in monitors.json"));
|
|
return;
|
|
}
|
|
applyConfigEntry(match.entry, profileId, match.entry.name || profileId, true);
|
|
});
|
|
}
|
|
|
|
Timer {
|
|
id: manualActivationTimer
|
|
interval: 2000
|
|
onTriggered: root.manualActivation = false
|
|
}
|
|
|
|
Timer {
|
|
id: autoSelectDebounceTimer
|
|
interval: 400
|
|
onTriggered: {
|
|
if (root.hasPendingChanges)
|
|
return;
|
|
root.applyAutoConfig();
|
|
}
|
|
}
|
|
|
|
function configEntryMatchesLiveLayout(configEntry) {
|
|
return OutputModel.configEntryMatchesLiveLayout(configEntry, outputs, SettingsData.displayNameMode, CompositorService.compositor);
|
|
}
|
|
|
|
function applyAutoConfig() {
|
|
if (!profilesReady || !SettingsData.displayProfileAutoSelect || manualActivation || !currentOutputSet.length)
|
|
return;
|
|
|
|
readMonitorsJson(data => {
|
|
const match = findConfigEntryByFingerprint(data, currentOutputSet, false);
|
|
if (match) {
|
|
if (configEntryMatchesLiveLayout(match.entry)) {
|
|
SessionData.setActiveDisplayProfile(CompositorService.compositor, match.entry.id);
|
|
return;
|
|
}
|
|
applyConfigEntry(match.entry, match.entry.id, "", false);
|
|
return;
|
|
}
|
|
|
|
const outputConfigs = buildCurrentOutputConfigs();
|
|
const id = generateAutoProfileId(currentOutputSet);
|
|
const entry = {
|
|
"id": id,
|
|
"name": "",
|
|
"outputs": outputConfigs
|
|
};
|
|
ensureEnabledOutput(entry);
|
|
const existingIdx = data.configurations.findIndex(c => c.id === id);
|
|
if (existingIdx >= 0)
|
|
data.configurations[existingIdx] = entry;
|
|
else
|
|
data.configurations.push(entry);
|
|
writeMonitorsJson(data, success => {
|
|
if (!success)
|
|
return;
|
|
const updated = JSON.parse(JSON.stringify(validatedProfiles));
|
|
updated[id] = {
|
|
id: id,
|
|
name: "",
|
|
outputs: outputConfigs
|
|
};
|
|
validatedProfiles = updated;
|
|
matchedProfile = "";
|
|
const match = findConfigEntryById(data, id);
|
|
if (match)
|
|
applyConfigEntry(match.entry, id, "", false);
|
|
});
|
|
});
|
|
}
|
|
|
|
function buildCurrentOutputConfigs() {
|
|
const mergedAll = buildOutputsWithPendingChanges();
|
|
const niriSettings = buildMergedNiriSettings();
|
|
const hyprlandSettings = buildMergedHyprlandSettings();
|
|
const outputConfigs = {};
|
|
for (const name in outputs) {
|
|
const od = mergedAll[name];
|
|
if (od)
|
|
outputConfigs[getOutputIdentifier(od, name)] = extractOutputNeutralConfig(name, od, niriSettings, hyprlandSettings);
|
|
}
|
|
return outputConfigs;
|
|
}
|
|
|
|
function deleteDisconnectedOutput(outputName) {
|
|
if (outputs[outputName]?.connected)
|
|
return;
|
|
|
|
const updated = JSON.parse(JSON.stringify(savedOutputs));
|
|
delete updated[outputName];
|
|
savedOutputs = updated;
|
|
|
|
const mergedOutputs = {};
|
|
for (const name in outputs)
|
|
mergedOutputs[name] = outputs[name];
|
|
for (const name in updated)
|
|
mergedOutputs[name] = updated[name];
|
|
|
|
backendWriteOutputsConfig(mergedOutputs);
|
|
}
|
|
|
|
function buildAllOutputsMap() {
|
|
const result = {};
|
|
for (const name in savedOutputs) {
|
|
result[name] = Object.assign({}, savedOutputs[name], {
|
|
"connected": false
|
|
});
|
|
}
|
|
for (const name in outputs) {
|
|
const entry = JSON.parse(JSON.stringify(outputs[name]));
|
|
entry.connected = true;
|
|
// For disabled outputs wlr reports scale=0 (no logical viewport).
|
|
// Overlay scale/position/transform from the last applied profile so
|
|
// the settings UI can display meaningful values.
|
|
if (!(entry.logical?.scale > 0)) {
|
|
const profileCfg = getProfileOutputConfig(name);
|
|
if (profileCfg) {
|
|
if (!entry.logical)
|
|
entry.logical = {};
|
|
entry.logical.scale = profileCfg.scale ?? 1.0;
|
|
entry.logical.x = profileCfg.position?.x ?? entry.logical.x ?? 0;
|
|
entry.logical.y = profileCfg.position?.y ?? entry.logical.y ?? 0;
|
|
if (profileCfg.transform)
|
|
entry.logical.transform = profileCfg.transform;
|
|
} else if (entry.logical) {
|
|
entry.logical.scale = entry.logical.scale || 1.0;
|
|
}
|
|
}
|
|
result[name] = entry;
|
|
}
|
|
return result;
|
|
}
|
|
|
|
function getProfileOutputConfig(outputName) {
|
|
const sourceEntry = lastAppliedEntry || (matchedProfile ? validatedProfiles[matchedProfile] : null);
|
|
if (!sourceEntry)
|
|
return null;
|
|
const cfgOutputs = sourceEntry.outputs || {};
|
|
const outputId = getOutputIdentifier(outputs[outputName] || {}, outputName);
|
|
return Object.entries(cfgOutputs).find(([key]) => key === outputId)?.[1] ?? null;
|
|
}
|
|
|
|
onOutputsChanged: {
|
|
allOutputs = buildAllOutputsMap();
|
|
const newOutputSet = buildCurrentOutputSet();
|
|
if (JSON.stringify(newOutputSet) === JSON.stringify(currentOutputSet))
|
|
return;
|
|
// Physical output set changed — pending tweaks belong to the previous setup
|
|
if (hasPendingChanges)
|
|
clearPendingChanges();
|
|
currentOutputSet = newOutputSet;
|
|
autoSelectDebounceTimer.restart();
|
|
}
|
|
onSavedOutputsChanged: allOutputs = buildAllOutputsMap()
|
|
onLastAppliedEntryChanged: allOutputs = buildAllOutputsMap()
|
|
|
|
Connections {
|
|
target: WlrOutputService
|
|
function onStateChanged() {
|
|
root.outputs = root.buildOutputsMap();
|
|
root.reloadSavedOutputs();
|
|
}
|
|
}
|
|
|
|
Connections {
|
|
target: HyprlandService
|
|
function onMonitorLayoutChanged() {
|
|
root.outputs = root.buildOutputsMap();
|
|
}
|
|
}
|
|
|
|
Connections {
|
|
target: CompositorService
|
|
function onCompositorChanged() {
|
|
root.include.check();
|
|
root.publishActiveProfileModes();
|
|
}
|
|
}
|
|
|
|
Connections {
|
|
target: SessionData
|
|
function onActiveDisplayProfileChanged() {
|
|
root.publishActiveProfileModes();
|
|
}
|
|
}
|
|
|
|
Connections {
|
|
target: NiriService
|
|
enabled: CompositorService.isNiri
|
|
function onConfigReloaded() {
|
|
root.include.check();
|
|
}
|
|
}
|
|
|
|
Component.onCompleted: {
|
|
outputs = buildOutputsMap();
|
|
reloadSavedOutputs();
|
|
}
|
|
|
|
function reloadSavedOutputs() {
|
|
const outputsFile = outputsConfigFile();
|
|
if (!outputsFile) {
|
|
savedOutputs = {};
|
|
savedParsedOutputs = {};
|
|
return;
|
|
}
|
|
|
|
Proc.runCommand("load-saved-outputs", ["cat", outputsFile], (content, exitCode) => {
|
|
if (exitCode !== 0 || !content.trim()) {
|
|
savedOutputs = {};
|
|
savedParsedOutputs = {};
|
|
return;
|
|
}
|
|
const parsed = parseOutputsConfig(content);
|
|
savedParsedOutputs = parsed;
|
|
const filtered = filterDisconnectedOnly(parsed);
|
|
savedOutputs = filtered;
|
|
|
|
if (CompositorService.isHyprland) {
|
|
initHyprlandSettingsFromConfig(parsed);
|
|
syncHyprlandVrrFromConfig(parsed);
|
|
syncHyprlandDisabledFromConfig(parsed);
|
|
}
|
|
if (CompositorService.isNiri) {
|
|
syncNiriVrrFromConfig(parsed);
|
|
syncNiriDisabledFromConfig(parsed);
|
|
}
|
|
});
|
|
}
|
|
|
|
function initHyprlandSettingsFromConfig(parsedOutputs) {
|
|
const importedFields = ["colorManagement", "bitdepth", "sdrBrightness", "sdrSaturation", "supportsWideColor", "supportsHdr", "sdrEotf", "icc", "sdrMinLuminance", "sdrMaxLuminance", "minLuminance", "maxLuminance", "maxAvgLuminance"];
|
|
const current = JSON.parse(JSON.stringify(SessionData.hyprlandOutputSettings));
|
|
let changed = false;
|
|
|
|
for (const outputName in parsedOutputs) {
|
|
const settings = parsedOutputs[outputName]?.hyprlandSettings;
|
|
if (!settings)
|
|
continue;
|
|
|
|
const entry = current[outputName] ?? {};
|
|
let imported = false;
|
|
for (const field of importedFields) {
|
|
if (settings[field] === undefined || entry[field] !== undefined)
|
|
continue;
|
|
entry[field] = settings[field];
|
|
imported = true;
|
|
}
|
|
if (!imported)
|
|
continue;
|
|
|
|
current[outputName] = entry;
|
|
changed = true;
|
|
}
|
|
|
|
if (changed) {
|
|
SessionData.hyprlandOutputSettings = current;
|
|
SessionData.saveSettings();
|
|
}
|
|
}
|
|
|
|
function syncHyprlandVrrFromConfig(parsedOutputs) {
|
|
const current = JSON.parse(JSON.stringify(SessionData.hyprlandOutputSettings));
|
|
let changed = false;
|
|
for (const outputName in parsedOutputs) {
|
|
const settings = parsedOutputs[outputName]?.hyprlandSettings;
|
|
const fromConfig = settings?.vrrFullscreenOnly ?? false;
|
|
const stored = current[outputName]?.vrrFullscreenOnly ?? false;
|
|
if (fromConfig === stored)
|
|
continue;
|
|
if (!current[outputName])
|
|
current[outputName] = {};
|
|
if (fromConfig)
|
|
current[outputName].vrrFullscreenOnly = true;
|
|
else
|
|
delete current[outputName].vrrFullscreenOnly;
|
|
changed = true;
|
|
}
|
|
if (changed) {
|
|
SessionData.hyprlandOutputSettings = current;
|
|
SessionData.saveSettings();
|
|
}
|
|
}
|
|
|
|
function syncNiriVrrFromConfig(parsedOutputs) {
|
|
for (const outputName in parsedOutputs) {
|
|
const output = parsedOutputs[outputName];
|
|
const current = SessionData.getNiriOutputSetting(outputName, "vrrOnDemand", false);
|
|
const fromConfig = output.vrr_on_demand ?? false;
|
|
if (current === fromConfig)
|
|
continue;
|
|
SessionData.setNiriOutputSetting(outputName, "vrrOnDemand", fromConfig || undefined);
|
|
}
|
|
}
|
|
|
|
function syncHyprlandDisabledFromConfig(parsedOutputs) {
|
|
const current = JSON.parse(JSON.stringify(SessionData.hyprlandOutputSettings));
|
|
let changed = false;
|
|
for (const outputName in parsedOutputs) {
|
|
const settings = parsedOutputs[outputName]?.hyprlandSettings;
|
|
const fromConfig = settings?.disabled ?? false;
|
|
const stored = current[outputName]?.disabled ?? false;
|
|
if (fromConfig === stored)
|
|
continue;
|
|
if (!current[outputName])
|
|
current[outputName] = {};
|
|
if (fromConfig)
|
|
current[outputName].disabled = true;
|
|
else
|
|
delete current[outputName].disabled;
|
|
changed = true;
|
|
}
|
|
if (changed) {
|
|
SessionData.hyprlandOutputSettings = current;
|
|
SessionData.saveSettings();
|
|
}
|
|
}
|
|
|
|
function syncNiriDisabledFromConfig(parsedOutputs) {
|
|
for (const outputName in parsedOutputs) {
|
|
const output = parsedOutputs[outputName];
|
|
const fromConfig = output.disabled ?? false;
|
|
const current = SessionData.getNiriOutputSetting(outputName, "disabled", false);
|
|
if (current === fromConfig)
|
|
continue;
|
|
SessionData.setNiriOutputSetting(outputName, "disabled", fromConfig || undefined);
|
|
}
|
|
}
|
|
|
|
function filterDisconnectedOnly(parsedOutputs) {
|
|
return OutputModel.filterDisconnectedOnly(parsedOutputs, outputs, SettingsData.displayNameMode, CompositorService.compositor);
|
|
}
|
|
|
|
function parseOutputsConfig(content) {
|
|
switch (CompositorService.compositor) {
|
|
case "niri":
|
|
return OutputModel.parseNiriOutputs(content);
|
|
case "hyprland":
|
|
return OutputModel.parseHyprlandOutputs(content);
|
|
case "mango":
|
|
return OutputModel.parseMangoOutputs(content);
|
|
default:
|
|
return {};
|
|
}
|
|
}
|
|
|
|
function outputsConfigFile() {
|
|
const configDir = Paths.strip(StandardPaths.writableLocation(StandardPaths.ConfigLocation));
|
|
const paths = ConfigIncludeResolve.includePaths("outputs", CompositorService.compositor, configDir);
|
|
return paths ? paths.fragmentFiles[0] : "";
|
|
}
|
|
|
|
function fixOutputsInclude() {
|
|
include.fix();
|
|
}
|
|
|
|
function writeOutputsAfterIncludeFix() {
|
|
const liveOutputs = buildOutputsMap();
|
|
if (Object.keys(liveOutputs).length > 0) {
|
|
outputs = liveOutputs;
|
|
include.fixing = true;
|
|
backendWriteOutputsConfig(liveOutputs, backendMergedSettings(), success => {
|
|
include.fixing = false;
|
|
if (!success)
|
|
ToastService.showError(I18n.tr("Display setup failed"), I18n.tr("Failed to write outputs config."), "", "display-config");
|
|
include.check();
|
|
WlrOutputService.requestState();
|
|
});
|
|
return;
|
|
}
|
|
include.check();
|
|
WlrOutputService.requestState();
|
|
}
|
|
|
|
function showHyprlandReadOnlyWarning() {
|
|
ToastService.showWarning(I18n.tr("Hyprland conf mode"), I18n.tr("This install is still using hyprland.conf. Run dms setup to migrate before changing these settings."), "dms setup", "display-config");
|
|
}
|
|
|
|
function buildOutputsMap() {
|
|
const liveMonitors = {};
|
|
for (const output of wlrOutputs) {
|
|
const live = HyprlandService.liveMonitor(output.name);
|
|
if (!live)
|
|
continue;
|
|
liveMonitors[output.name] = {
|
|
"x": live.x,
|
|
"y": live.y,
|
|
"scale": live.scale,
|
|
"transformIndex": live.lastIpcObject?.transform ?? 0
|
|
};
|
|
}
|
|
return OutputModel.outputsFromWlr(wlrOutputs, liveMonitors);
|
|
}
|
|
|
|
function backendFetchOutputs() {
|
|
WlrOutputService.requestState();
|
|
}
|
|
|
|
function backendWriteOutputsConfig(outputsData, settingsOrCallback, maybeCallback) {
|
|
const settings = typeof settingsOrCallback === "function" ? null : settingsOrCallback;
|
|
const callback = typeof settingsOrCallback === "function" ? settingsOrCallback : maybeCallback;
|
|
const hasExplicitSettings = settings !== null && settings !== undefined;
|
|
|
|
function finish(success) {
|
|
if (callback)
|
|
callback(success);
|
|
}
|
|
|
|
switch (CompositorService.compositor) {
|
|
case "niri":
|
|
{
|
|
const niriSettings = hasExplicitSettings ? settings : buildMergedNiriSettings();
|
|
NiriService.generateOutputsConfig(outputsData, niriSettings, success => {
|
|
if (!success) {
|
|
finish(false);
|
|
return;
|
|
}
|
|
reloadAndApplyNiriLiveOutputsConfig(outputsData, niriSettings, finish);
|
|
});
|
|
break;
|
|
}
|
|
case "hyprland":
|
|
{
|
|
if (readOnly) {
|
|
showHyprlandReadOnlyWarning();
|
|
finish(false);
|
|
return;
|
|
}
|
|
const hyprlandSettings = hasExplicitSettings ? settings : buildMergedHyprlandSettings();
|
|
HyprlandService.generateOutputsConfig(outputsData, hyprlandSettings, finish);
|
|
break;
|
|
}
|
|
case "mango":
|
|
MangoService.generateOutputsConfig(outputsData, finish);
|
|
break;
|
|
default:
|
|
{
|
|
if (_cancelOutputWrite)
|
|
_cancelOutputWrite();
|
|
let completed = false;
|
|
const complete = success => {
|
|
if (completed)
|
|
return;
|
|
completed = true;
|
|
root._cancelOutputWrite = null;
|
|
finish(success);
|
|
};
|
|
_cancelOutputWrite = () => complete(false);
|
|
WlrOutputService.applyOutputsConfig(outputsData, outputs, complete);
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
function getLiveNiriOutputName(outputName, outputData) {
|
|
if (outputs[outputName])
|
|
return outputName;
|
|
const targetId = getNiriOutputIdentifier(outputData, outputName);
|
|
for (const liveName in outputs) {
|
|
if (getNiriOutputIdentifier(outputs[liveName], liveName) === targetId)
|
|
return liveName;
|
|
}
|
|
return "";
|
|
}
|
|
|
|
function applyNiriLiveOutputsConfig(outputsData, niriSettings, callback) {
|
|
const names = Object.keys(outputsData || {});
|
|
let pending = 0;
|
|
let failed = false;
|
|
|
|
function done(success) {
|
|
if (callback)
|
|
callback(success);
|
|
}
|
|
|
|
for (const outputName of names) {
|
|
const output = outputsData[outputName];
|
|
if (!output)
|
|
continue;
|
|
const liveName = getLiveNiriOutputName(outputName, output);
|
|
if (!liveName)
|
|
continue;
|
|
|
|
const identifier = getNiriOutputIdentifier(output, outputName);
|
|
const settings = niriSettings?.[outputName] || niriSettings?.[identifier] || {};
|
|
const config = {};
|
|
|
|
if (settings.disabled === true)
|
|
config.disabled = true;
|
|
else if (settings.disabled === false)
|
|
config.disabled = false;
|
|
|
|
if (!config.disabled) {
|
|
if (output.current_mode !== undefined && output.modes && output.modes[output.current_mode]) {
|
|
const mode = output.modes[output.current_mode];
|
|
config.mode = mode.width + "x" + mode.height + "@" + (mode.refresh_rate / 1000).toFixed(3);
|
|
}
|
|
if (output.logical) {
|
|
config.scale = output.logical.scale ?? 1.0;
|
|
config.position = {
|
|
"x": output.logical.x ?? 0,
|
|
"y": output.logical.y ?? 0
|
|
};
|
|
config.transform = OutputModel.niriTransform(output.logical.transform);
|
|
}
|
|
if (settings.vrrOnDemand !== undefined)
|
|
config.vrrOnDemand = settings.vrrOnDemand;
|
|
else if (output.vrr_enabled !== undefined)
|
|
config.vrr = output.vrr_enabled;
|
|
}
|
|
|
|
pending++;
|
|
NiriService.applyOutputConfig(liveName, config, success => {
|
|
failed = failed || !success;
|
|
pending--;
|
|
if (pending === 0) {
|
|
WlrOutputService.requestState();
|
|
done(!failed);
|
|
}
|
|
});
|
|
}
|
|
|
|
if (pending === 0)
|
|
done(true);
|
|
}
|
|
|
|
function reloadAndApplyNiriLiveOutputsConfig(outputsData, niriSettings, callback) {
|
|
Proc.runCommand("niri-reload-output-config", ["niri", "msg", "action", "load-config-file"], () => {
|
|
applyNiriLiveOutputsConfig(outputsData, niriSettings, callback);
|
|
});
|
|
}
|
|
|
|
function normalizeOutputPositions(outputsData) {
|
|
return OutputModel.normalizeOutputPositions(outputsData);
|
|
}
|
|
|
|
function findSavedParsedOutput(outputName) {
|
|
const output = outputs[outputName];
|
|
const candidates = [outputName];
|
|
if (output?.make && output?.model) {
|
|
candidates.push(output.make + " " + output.model + " " + (output.serial || "Unknown"));
|
|
candidates.push(output.make + " " + output.model);
|
|
}
|
|
for (const savedName in savedParsedOutputs) {
|
|
if (candidates.includes(savedName.trim()))
|
|
return savedParsedOutputs[savedName];
|
|
}
|
|
return null;
|
|
}
|
|
|
|
// A disabled wlr head reports no current mode, scale 0 and position 0,0 —
|
|
// overlay the last written config so rewrites don't discard real settings.
|
|
function overlaySavedDisabledOutput(entry, outputName) {
|
|
const saved = findSavedParsedOutput(outputName);
|
|
if (!saved)
|
|
return;
|
|
|
|
const savedMode = saved.modes?.[saved.current_mode ?? 0];
|
|
if (savedMode && !entry.configured_mode)
|
|
entry.configured_mode = savedMode.width + "x" + savedMode.height + "@" + (savedMode.refresh_rate / 1000).toFixed(3);
|
|
if (saved.vrr_enabled !== undefined)
|
|
entry.vrr_enabled = saved.vrr_enabled;
|
|
if (!saved.logical || !entry.logical)
|
|
return;
|
|
|
|
entry.logical.x = saved.logical.x;
|
|
entry.logical.y = saved.logical.y;
|
|
entry.logical.scale = saved.logical.scale;
|
|
entry.logical.transform = saved.logical.transform;
|
|
}
|
|
|
|
function buildOutputsWithPendingChanges() {
|
|
const result = {};
|
|
|
|
for (const outputName in savedOutputs) {
|
|
if (!outputs[outputName])
|
|
result[outputName] = JSON.parse(JSON.stringify(savedOutputs[outputName]));
|
|
}
|
|
|
|
for (const outputName in outputs) {
|
|
const entry = JSON.parse(JSON.stringify(outputs[outputName]));
|
|
if (entry.enabled === false)
|
|
overlaySavedDisabledOutput(entry, outputName);
|
|
result[outputName] = entry;
|
|
}
|
|
|
|
for (const outputName in pendingChanges) {
|
|
if (!result[outputName])
|
|
continue;
|
|
const changes = pendingChanges[outputName];
|
|
if (changes.position && result[outputName].logical) {
|
|
result[outputName].logical.x = changes.position.x;
|
|
result[outputName].logical.y = changes.position.y;
|
|
}
|
|
if (changes.mode !== undefined && result[outputName].modes) {
|
|
if (result[outputName].configured_mode)
|
|
result[outputName].configured_mode = changes.mode;
|
|
for (var i = 0; i < result[outputName].modes.length; i++) {
|
|
if (formatMode(result[outputName].modes[i]) === changes.mode) {
|
|
result[outputName].current_mode = i;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
if (changes.scale !== undefined && result[outputName].logical)
|
|
result[outputName].logical.scale = changes.scale;
|
|
if (changes.transform !== undefined && result[outputName].logical)
|
|
result[outputName].logical.transform = changes.transform;
|
|
if (changes.vrr !== undefined)
|
|
result[outputName].vrr_enabled = changes.vrr;
|
|
if (changes.mirror !== undefined)
|
|
result[outputName].mirror = changes.mirror;
|
|
}
|
|
return normalizeOutputPositions(result);
|
|
}
|
|
|
|
function backendUpdateOutputPosition(outputName, x, y) {
|
|
if (!outputs || !outputs[outputName])
|
|
return;
|
|
const updatedOutputs = {};
|
|
for (const name in outputs) {
|
|
const output = outputs[name];
|
|
if (name === outputName && output.logical) {
|
|
updatedOutputs[name] = JSON.parse(JSON.stringify(output));
|
|
updatedOutputs[name].logical.x = x;
|
|
updatedOutputs[name].logical.y = y;
|
|
} else {
|
|
updatedOutputs[name] = output;
|
|
}
|
|
}
|
|
outputs = updatedOutputs;
|
|
}
|
|
|
|
function backendUpdateOutputScale(outputName, scale) {
|
|
if (!outputs || !outputs[outputName])
|
|
return;
|
|
const updatedOutputs = {};
|
|
for (const name in outputs) {
|
|
const output = outputs[name];
|
|
if (name === outputName && output.logical) {
|
|
updatedOutputs[name] = JSON.parse(JSON.stringify(output));
|
|
updatedOutputs[name].logical.scale = scale;
|
|
} else {
|
|
updatedOutputs[name] = output;
|
|
}
|
|
}
|
|
outputs = updatedOutputs;
|
|
}
|
|
|
|
function getOutputDisplayName(output, outputName) {
|
|
return getOutputIdentifier(output, outputName);
|
|
}
|
|
|
|
function getNiriOutputIdentifier(output, outputName) {
|
|
return OutputModel.niriIdentifier(output, outputName, SettingsData.displayNameMode);
|
|
}
|
|
|
|
function getNiriSetting(output, outputName, key, defaultValue) {
|
|
if (!CompositorService.isNiri)
|
|
return defaultValue;
|
|
const identifier = getNiriOutputIdentifier(output, outputName);
|
|
const pending = pendingNiriChanges[identifier];
|
|
if (pending && pending[key] !== undefined)
|
|
return pending[key];
|
|
return SessionData.getNiriOutputSetting(identifier, key, defaultValue);
|
|
}
|
|
|
|
function setNiriSetting(output, outputName, key, value) {
|
|
if (!CompositorService.isNiri)
|
|
return;
|
|
initOriginalNiriSettings();
|
|
const identifier = getNiriOutputIdentifier(output, outputName);
|
|
const newPending = JSON.parse(JSON.stringify(pendingNiriChanges));
|
|
if (!newPending[identifier])
|
|
newPending[identifier] = {};
|
|
newPending[identifier][key] = value;
|
|
pendingNiriChanges = newPending;
|
|
}
|
|
|
|
function initOriginalNiriSettings() {
|
|
if (originalNiriSettings)
|
|
return;
|
|
originalNiriSettings = JSON.parse(JSON.stringify(SessionData.niriOutputSettings));
|
|
}
|
|
|
|
function getHyprlandOutputIdentifier(output, outputName) {
|
|
return OutputModel.hyprlandIdentifier(output, outputName, SettingsData.displayNameMode);
|
|
}
|
|
|
|
function getHyprlandSetting(output, outputName, key, defaultValue) {
|
|
if (!CompositorService.isHyprland)
|
|
return defaultValue;
|
|
const identifier = getHyprlandOutputIdentifier(output, outputName);
|
|
const pending = pendingHyprlandChanges[identifier];
|
|
if (pending && (key in pending)) {
|
|
const val = pending[key];
|
|
return (val !== null && val !== undefined) ? val : defaultValue;
|
|
}
|
|
return SessionData.getHyprlandOutputSetting(identifier, key, defaultValue);
|
|
}
|
|
|
|
function setHyprlandSetting(output, outputName, key, value) {
|
|
if (!CompositorService.isHyprland)
|
|
return;
|
|
initOriginalHyprlandSettings();
|
|
const identifier = getHyprlandOutputIdentifier(output, outputName);
|
|
const newPending = JSON.parse(JSON.stringify(pendingHyprlandChanges));
|
|
if (!newPending[identifier])
|
|
newPending[identifier] = {};
|
|
newPending[identifier][key] = value;
|
|
pendingHyprlandChanges = newPending;
|
|
}
|
|
|
|
function initOriginalHyprlandSettings() {
|
|
if (originalHyprlandSettings)
|
|
return;
|
|
originalHyprlandSettings = JSON.parse(JSON.stringify(SessionData.hyprlandOutputSettings));
|
|
}
|
|
|
|
function initOriginalOutputs() {
|
|
if (!originalOutputs)
|
|
originalOutputs = JSON.parse(JSON.stringify(outputs));
|
|
}
|
|
|
|
function setPendingChange(outputName, key, value) {
|
|
initOriginalOutputs();
|
|
const newPending = JSON.parse(JSON.stringify(pendingChanges));
|
|
if (!newPending[outputName])
|
|
newPending[outputName] = {};
|
|
newPending[outputName][key] = value;
|
|
pendingChanges = newPending;
|
|
|
|
if (key === "scale") {
|
|
recalculateAdjacentPositions(outputName, value);
|
|
backendUpdateOutputScale(outputName, value);
|
|
}
|
|
}
|
|
|
|
function recalculateAdjacentPositions(changedOutput, newScale) {
|
|
const moves = OutputModel.recalculateAdjacentPositions(outputs, pendingChanges, changedOutput, newScale, CompositorService.compositor);
|
|
for (const move of moves) {
|
|
const newPending = JSON.parse(JSON.stringify(pendingChanges));
|
|
if (!newPending[move.name])
|
|
newPending[move.name] = {};
|
|
newPending[move.name].position = {
|
|
"x": move.x,
|
|
"y": move.y
|
|
};
|
|
pendingChanges = newPending;
|
|
backendUpdateOutputPosition(move.name, move.x, move.y);
|
|
}
|
|
}
|
|
|
|
function getPendingValue(outputName, key) {
|
|
if (!pendingChanges[outputName])
|
|
return undefined;
|
|
return pendingChanges[outputName][key];
|
|
}
|
|
|
|
function getEffectiveValue(outputName, key, originalValue) {
|
|
const pending = getPendingValue(outputName, key);
|
|
return pending !== undefined ? pending : originalValue;
|
|
}
|
|
|
|
// Prevents disabling all outputs and prevents disabling the only output
|
|
// in a single-display configuration.
|
|
function canDisableOutput() {
|
|
if (!CompositorService.isNiri && !CompositorService.isHyprland)
|
|
return false;
|
|
const totalOutputs = Object.keys(outputs).length;
|
|
if (totalOutputs <= 1)
|
|
return false;
|
|
let enabledCount = 0;
|
|
for (const name in outputs) {
|
|
let disabled = false;
|
|
if (CompositorService.isNiri)
|
|
disabled = getNiriSetting(outputs[name], name, "disabled", false);
|
|
else if (CompositorService.isHyprland)
|
|
disabled = getHyprlandSetting(outputs[name], name, "disabled", false);
|
|
if (!disabled)
|
|
enabledCount++;
|
|
}
|
|
return enabledCount >= 2;
|
|
}
|
|
|
|
function clearPendingChanges() {
|
|
pendingChanges = {};
|
|
pendingNiriChanges = {};
|
|
pendingHyprlandChanges = {};
|
|
originalOutputs = null;
|
|
originalNiriSettings = null;
|
|
originalHyprlandSettings = null;
|
|
originalDisplayNameMode = "";
|
|
}
|
|
|
|
function restoreDisplayNameMode() {
|
|
if (originalDisplayNameMode === "")
|
|
return;
|
|
SettingsData.displayNameMode = originalDisplayNameMode;
|
|
SettingsData.saveSettings();
|
|
}
|
|
|
|
function discardChanges() {
|
|
restoreDisplayNameMode();
|
|
backendFetchOutputs();
|
|
clearPendingChanges();
|
|
}
|
|
|
|
function applyChanges() {
|
|
if (!hasPendingChanges)
|
|
return;
|
|
if (CompositorService.isHyprland && readOnly) {
|
|
showHyprlandReadOnlyWarning();
|
|
return;
|
|
}
|
|
const changeDescriptions = [];
|
|
|
|
if (formatChanged) {
|
|
const formatLabel = SettingsData.displayNameMode === "model" ? I18n.tr("Model") : I18n.tr("Name");
|
|
changeDescriptions.push(I18n.tr("Config Format") + " → " + formatLabel);
|
|
}
|
|
|
|
for (const outputName in pendingChanges) {
|
|
const changes = pendingChanges[outputName];
|
|
if (changes.position)
|
|
changeDescriptions.push(outputName + ": " + I18n.tr("Position") + " → " + changes.position.x + ", " + changes.position.y);
|
|
if (changes.mode)
|
|
changeDescriptions.push(outputName + ": " + I18n.tr("Mode") + " → " + changes.mode);
|
|
if (changes.scale !== undefined)
|
|
changeDescriptions.push(outputName + ": " + I18n.tr("Scale") + " → " + changes.scale);
|
|
if (changes.transform)
|
|
changeDescriptions.push(outputName + ": " + I18n.tr("Transform") + " → " + getTransformLabel(changes.transform));
|
|
if (changes.vrr !== undefined)
|
|
changeDescriptions.push(outputName + ": " + "VRR" + " → " + (changes.vrr ? I18n.tr("Enabled") : I18n.tr("Disabled")));
|
|
}
|
|
|
|
for (const outputId in pendingNiriChanges) {
|
|
const changes = pendingNiriChanges[outputId];
|
|
if (changes.disabled !== undefined)
|
|
changeDescriptions.push(outputId + ": " + I18n.tr("Disabled") + " → " + (changes.disabled ? I18n.tr("Yes") : I18n.tr("No")));
|
|
if (changes.vrrOnDemand !== undefined)
|
|
changeDescriptions.push(outputId + ": " + I18n.tr("VRR On-Demand") + " → " + (changes.vrrOnDemand ? I18n.tr("Enabled") : I18n.tr("Disabled")));
|
|
if (changes.focusAtStartup !== undefined)
|
|
changeDescriptions.push(outputId + ": " + I18n.tr("Focus at startup") + " → " + (changes.focusAtStartup ? I18n.tr("Yes") : I18n.tr("No")));
|
|
if (changes.hotCorners !== undefined)
|
|
changeDescriptions.push(outputId + ": " + I18n.tr("Hot corners") + " → " + I18n.tr("Modified"));
|
|
if (changes.layout !== undefined)
|
|
changeDescriptions.push(outputId + ": " + I18n.tr("Layout") + " → " + I18n.tr("Modified"));
|
|
}
|
|
|
|
for (const outputId in pendingHyprlandChanges) {
|
|
const changes = pendingHyprlandChanges[outputId];
|
|
if (changes.disabled !== undefined)
|
|
changeDescriptions.push(outputId + ": " + I18n.tr("Disabled") + " → " + (changes.disabled ? I18n.tr("Yes") : I18n.tr("No")));
|
|
if (changes.bitdepth !== undefined)
|
|
changeDescriptions.push(outputId + ": " + I18n.tr("Bit Depth") + " → " + changes.bitdepth);
|
|
if (changes.colorManagement !== undefined)
|
|
changeDescriptions.push(outputId + ": " + I18n.tr("Color Management") + " → " + changes.colorManagement);
|
|
if (changes.sdrBrightness !== undefined)
|
|
changeDescriptions.push(outputId + ": " + I18n.tr("SDR brightness") + " → " + changes.sdrBrightness);
|
|
if (changes.sdrSaturation !== undefined)
|
|
changeDescriptions.push(outputId + ": " + I18n.tr("SDR saturation") + " → " + changes.sdrSaturation);
|
|
if (changes.supportsHdr !== undefined)
|
|
changeDescriptions.push(outputId + ": " + I18n.tr("Force HDR") + " → " + (changes.supportsHdr ? I18n.tr("Yes") : I18n.tr("No")));
|
|
if (changes.supportsWideColor !== undefined)
|
|
changeDescriptions.push(outputId + ": " + I18n.tr("Force Wide Color") + " → " + (changes.supportsWideColor ? I18n.tr("Yes") : I18n.tr("No")));
|
|
if (changes.vrrFullscreenOnly !== undefined)
|
|
changeDescriptions.push(outputId + ": " + I18n.tr("VRR Fullscreen Only") + " → " + (changes.vrrFullscreenOnly ? I18n.tr("Enabled") : I18n.tr("Disabled")));
|
|
}
|
|
|
|
if (CompositorService.isNiri) {
|
|
validateAndApplyNiriConfig(changeDescriptions);
|
|
return;
|
|
}
|
|
|
|
if (CompositorService.isAqueous) {
|
|
previewAqueousOutputs(changeDescriptions);
|
|
return;
|
|
}
|
|
|
|
const mergedOutputs = buildOutputsWithPendingChanges();
|
|
if (CompositorService.isHyprland || CompositorService.isMango) {
|
|
changesApplied(changeDescriptions);
|
|
if (formatChanged)
|
|
SettingsData.saveSettings();
|
|
if (CompositorService.isHyprland)
|
|
commitHyprlandSettingsChanges();
|
|
backendWriteOutputsConfig(mergedOutputs);
|
|
return;
|
|
}
|
|
validatingConfig = true;
|
|
backendWriteOutputsConfig(mergedOutputs, success => {
|
|
validatingConfig = false;
|
|
if (!success) {
|
|
ToastService.showError(I18n.tr("Error"), I18n.tr("Failed to apply profile"));
|
|
return;
|
|
}
|
|
if (formatChanged)
|
|
SettingsData.saveSettings();
|
|
changesApplied(changeDescriptions);
|
|
});
|
|
}
|
|
|
|
function validateAndApplyNiriConfig(changeDescriptions) {
|
|
validatingConfig = true;
|
|
validationError = "";
|
|
|
|
const mergedOutputs = buildOutputsWithPendingChanges();
|
|
const mergedNiriSettings = buildMergedNiriSettings();
|
|
const configContent = NiriService.buildOutputsConfig(mergedOutputs, mergedNiriSettings);
|
|
|
|
const configDir = Paths.strip(StandardPaths.writableLocation(StandardPaths.ConfigLocation));
|
|
const tempFile = configDir + "/niri/dms/.outputs-validate-tmp.kdl";
|
|
|
|
Proc.runCommand("niri-validate-write-tmp", ["sh", "-c", `mkdir -p "$(dirname "${tempFile}")" && cat > "${tempFile}" << 'EOF'\n${configContent}EOF`], (output, writeExitCode) => {
|
|
if (writeExitCode !== 0) {
|
|
validatingConfig = false;
|
|
validationError = I18n.tr("Failed to write temp file for validation");
|
|
ToastService.showError(I18n.tr("Config validation failed"), validationError, "", "display-config");
|
|
return;
|
|
}
|
|
Proc.runCommand("niri-validate-config", ["sh", "-c", `niri validate -c "${tempFile}" 2>&1`], (validateOutput, validateExitCode) => {
|
|
validatingConfig = false;
|
|
Proc.runCommand("niri-validate-cleanup", ["rm", "-f", tempFile], () => {});
|
|
if (validateExitCode !== 0) {
|
|
validationError = validateOutput.trim() || I18n.tr("Invalid configuration");
|
|
ToastService.showError(I18n.tr("Config validation failed"), validationError, "", "display-config");
|
|
return;
|
|
}
|
|
changesApplied(changeDescriptions);
|
|
if (formatChanged)
|
|
SettingsData.saveSettings();
|
|
commitNiriSettingsChanges();
|
|
backendWriteOutputsConfig(mergedOutputs, mergedNiriSettings);
|
|
});
|
|
});
|
|
}
|
|
|
|
function buildMergedNiriSettings() {
|
|
const merged = JSON.parse(JSON.stringify(SessionData.niriOutputSettings));
|
|
for (const outputId in pendingNiriChanges) {
|
|
if (!merged[outputId])
|
|
merged[outputId] = {};
|
|
for (const key in pendingNiriChanges[outputId]) {
|
|
merged[outputId][key] = pendingNiriChanges[outputId][key];
|
|
}
|
|
}
|
|
// Never disable the only connected output — clear any stale flag
|
|
if (Object.keys(outputs).length <= 1) {
|
|
for (const id in merged)
|
|
delete merged[id].disabled;
|
|
}
|
|
return merged;
|
|
}
|
|
|
|
function commitNiriSettingsChanges() {
|
|
for (const outputId in pendingNiriChanges) {
|
|
for (const key in pendingNiriChanges[outputId]) {
|
|
SessionData.setNiriOutputSetting(outputId, key, pendingNiriChanges[outputId][key]);
|
|
}
|
|
}
|
|
// Clear stale disabled from SettingsData so NiriService reads clean state
|
|
if (Object.keys(outputs).length <= 1) {
|
|
for (const id in SessionData.niriOutputSettings) {
|
|
if (SessionData.niriOutputSettings[id]?.disabled)
|
|
SessionData.setNiriOutputSetting(id, "disabled", null);
|
|
}
|
|
}
|
|
}
|
|
|
|
function buildMergedHyprlandSettings() {
|
|
const merged = JSON.parse(JSON.stringify(SessionData.hyprlandOutputSettings));
|
|
for (const outputId in pendingHyprlandChanges) {
|
|
if (!merged[outputId])
|
|
merged[outputId] = {};
|
|
for (const key in pendingHyprlandChanges[outputId]) {
|
|
const val = pendingHyprlandChanges[outputId][key];
|
|
if (val === null || val === undefined)
|
|
delete merged[outputId][key];
|
|
else
|
|
merged[outputId][key] = val;
|
|
}
|
|
}
|
|
// Never disable the only connected output — clear any stale flag
|
|
if (Object.keys(outputs).length <= 1) {
|
|
for (const id in merged)
|
|
delete merged[id].disabled;
|
|
}
|
|
return merged;
|
|
}
|
|
|
|
function commitHyprlandSettingsChanges() {
|
|
for (const outputId in pendingHyprlandChanges) {
|
|
for (const key in pendingHyprlandChanges[outputId]) {
|
|
const val = pendingHyprlandChanges[outputId][key];
|
|
if (val === null || val === undefined)
|
|
SessionData.removeHyprlandOutputSetting(outputId, key);
|
|
else
|
|
SessionData.setHyprlandOutputSetting(outputId, key, val);
|
|
}
|
|
}
|
|
// Clear stale disabled from SettingsData so HyprlandService reads clean state
|
|
if (Object.keys(outputs).length <= 1) {
|
|
for (const id in SessionData.hyprlandOutputSettings) {
|
|
if (SessionData.hyprlandOutputSettings[id]?.disabled)
|
|
SessionData.removeHyprlandOutputSetting(id, "disabled");
|
|
}
|
|
}
|
|
}
|
|
|
|
function confirmChanges(profileId) {
|
|
if (CompositorService.isAqueous) {
|
|
finishAqueousPreview(true);
|
|
return;
|
|
}
|
|
const outputConfigs = buildCurrentOutputConfigs();
|
|
lastAppliedEntry = {
|
|
outputs: outputConfigs
|
|
};
|
|
|
|
readMonitorsJson(data => {
|
|
const match = profileId ? findConfigEntryById(data, profileId) : findConfigEntryByFingerprint(data, currentOutputSet, true);
|
|
if (!match)
|
|
return;
|
|
data.configurations[match.index] = {
|
|
"id": match.entry.id,
|
|
"name": match.entry.name || "",
|
|
"outputs": outputConfigs
|
|
};
|
|
writeMonitorsJson(data, success => {
|
|
if (!success || !profileId)
|
|
return;
|
|
const updated = JSON.parse(JSON.stringify(validatedProfiles));
|
|
if (updated[profileId]) {
|
|
updated[profileId].outputs = outputConfigs;
|
|
validatedProfiles = updated;
|
|
publishActiveProfileModes();
|
|
}
|
|
});
|
|
});
|
|
|
|
clearPendingChanges();
|
|
changesConfirmed();
|
|
}
|
|
|
|
function revertChanges() {
|
|
if (CompositorService.isAqueous && aqueousPreview) {
|
|
finishAqueousPreview(false);
|
|
return;
|
|
}
|
|
const hadFormatChange = originalDisplayNameMode !== "";
|
|
const hadNiriChanges = originalNiriSettings !== null;
|
|
const hadHyprlandChanges = originalHyprlandSettings !== null;
|
|
|
|
restoreDisplayNameMode();
|
|
|
|
if (hadNiriChanges) {
|
|
SessionData.niriOutputSettings = JSON.parse(JSON.stringify(originalNiriSettings));
|
|
SessionData.saveSettings();
|
|
}
|
|
|
|
if (hadHyprlandChanges) {
|
|
SessionData.hyprlandOutputSettings = JSON.parse(JSON.stringify(originalHyprlandSettings));
|
|
SessionData.saveSettings();
|
|
}
|
|
|
|
pendingHyprlandChanges = {};
|
|
pendingNiriChanges = {};
|
|
|
|
if (!originalOutputs && !hadNiriChanges && !hadHyprlandChanges) {
|
|
if (hadFormatChange)
|
|
backendWriteOutputsConfig(buildOutputsWithPendingChanges());
|
|
clearPendingChanges();
|
|
changesReverted();
|
|
return;
|
|
}
|
|
|
|
const original = originalOutputs ? JSON.parse(JSON.stringify(originalOutputs)) : buildOutputsWithPendingChanges();
|
|
for (const name in savedOutputs) {
|
|
if (!original[name])
|
|
original[name] = JSON.parse(JSON.stringify(savedOutputs[name]));
|
|
}
|
|
backendWriteOutputsConfig(original);
|
|
clearPendingChanges();
|
|
// clearPendingChanges() resets originalOutputs, so restore the model from the snapshot.
|
|
outputs = original;
|
|
changesReverted();
|
|
}
|
|
|
|
function getOutputBounds() {
|
|
return OutputModel.outputBounds(allOutputs, CompositorService.compositor);
|
|
}
|
|
|
|
function getPhysicalSize(output) {
|
|
return OutputModel.physicalSize(output);
|
|
}
|
|
|
|
function getLogicalSize(output) {
|
|
return OutputModel.logicalSize(output, CompositorService.compositor);
|
|
}
|
|
|
|
function isOutputDisabled(outputName) {
|
|
if (!outputs[outputName])
|
|
return false;
|
|
if (CompositorService.isHyprland)
|
|
return getHyprlandSetting(outputs[outputName], outputName, "disabled", false);
|
|
if (CompositorService.isNiri)
|
|
return getNiriSetting(outputs[outputName], outputName, "disabled", false);
|
|
return false;
|
|
}
|
|
|
|
function canvasLayout() {
|
|
const disabled = {};
|
|
for (const name in outputs) {
|
|
if (isOutputDisabled(name))
|
|
disabled[name] = true;
|
|
}
|
|
return {
|
|
"outputs": outputs,
|
|
"disabled": disabled,
|
|
"compositor": CompositorService.compositor
|
|
};
|
|
}
|
|
|
|
function checkOverlap(testName, testX, testY, testW, testH) {
|
|
return OutputModel.checkOverlap(canvasLayout(), testName, testX, testY, testW, testH);
|
|
}
|
|
|
|
function snapToEdges(testName, posX, posY, testW, testH) {
|
|
const snapped = OutputModel.snapToEdges(canvasLayout(), testName, posX, posY, testW, testH);
|
|
return Qt.point(snapped.x, snapped.y);
|
|
}
|
|
|
|
function formatMode(mode) {
|
|
return OutputModel.formatMode(mode);
|
|
}
|
|
|
|
function formatScaleLabel(scale) {
|
|
return OutputModel.formatScaleLabel(scale);
|
|
}
|
|
|
|
function getScalePresetValues(outputName, outputData) {
|
|
return OutputModel.scalePresetValues(outputData, getPendingValue(outputName, "mode"), CompositorService.compositor);
|
|
}
|
|
|
|
function snapScale(outputName, outputData, scale) {
|
|
return OutputModel.snapScaleToMode(outputData, getPendingValue(outputName, "mode"), CompositorService.compositor, scale);
|
|
}
|
|
|
|
function formatScaleOption(outputName, outputData, scale) {
|
|
return OutputModel.formatScaleOption(outputData, getPendingValue(outputName, "mode"), scale);
|
|
}
|
|
|
|
function getTransformLabel(transform) {
|
|
switch (transform) {
|
|
case "Normal":
|
|
return I18n.tr("Normal", "display rotation option", true);
|
|
case "90":
|
|
return "90°";
|
|
case "180":
|
|
return "180°";
|
|
case "270":
|
|
return "270°";
|
|
case "Flipped":
|
|
return I18n.tr("Flipped");
|
|
case "Flipped90":
|
|
return I18n.tr("Flipped 90°");
|
|
case "Flipped180":
|
|
return I18n.tr("Flipped 180°");
|
|
case "Flipped270":
|
|
return I18n.tr("Flipped 270°");
|
|
default:
|
|
return I18n.tr("Normal", "display rotation option", true);
|
|
}
|
|
}
|
|
|
|
function getTransformValue(label) {
|
|
if (label === I18n.tr("Normal", "display rotation option", true))
|
|
return "Normal";
|
|
if (label === "90°")
|
|
return "90";
|
|
if (label === "180°")
|
|
return "180";
|
|
if (label === "270°")
|
|
return "270";
|
|
if (label === I18n.tr("Flipped"))
|
|
return "Flipped";
|
|
if (label === I18n.tr("Flipped 90°"))
|
|
return "Flipped90";
|
|
if (label === I18n.tr("Flipped 180°"))
|
|
return "Flipped180";
|
|
if (label === I18n.tr("Flipped 270°"))
|
|
return "Flipped270";
|
|
return "Normal";
|
|
}
|
|
|
|
function setOriginalDisplayNameMode(mode) {
|
|
if (originalDisplayNameMode === "")
|
|
originalDisplayNameMode = mode;
|
|
}
|
|
}
|