mirror of
https://github.com/AvengeMedia/DankMaterialShell.git
synced 2026-10-15 07:44: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
1128 lines
38 KiB
JavaScript
1128 lines
38 KiB
JavaScript
.pragma library
|
|
|
|
const TRANSFORM_NAMES = ["Normal", "90", "180", "270", "Flipped", "Flipped90", "Flipped180", "Flipped270"];
|
|
const WLR_SCALE_STEP = 1 / 256;
|
|
const SCALE_DENOMINATOR = 120;
|
|
const MIN_SCALE = 0.25;
|
|
const MIN_PRESET_SCALE = 0.5;
|
|
const MAX_SCALE = 4;
|
|
const GAP_FILL_MIN = 1;
|
|
const GAP_FILL_MAX = 2;
|
|
const GAP_FILL_STEP = 6;
|
|
const GAP_FILL_CLEARANCE = 4;
|
|
const LOGICAL_PIXEL_TOLERANCE = 0.01;
|
|
const FALLBACK_SCALE_PRESETS = [0.5, 0.75, 1, 1.25, 1.5, 1.75, 2, 2.5, 3];
|
|
const NIRI_TRANSFORMS = ["normal", "90", "180", "270", "flipped", "flipped-90", "flipped-180", "flipped-270"];
|
|
|
|
function transformName(index) {
|
|
if (!Number.isInteger(index))
|
|
return "Normal";
|
|
return TRANSFORM_NAMES[index] ?? "Normal";
|
|
}
|
|
|
|
function transformIndex(name) {
|
|
const index = TRANSFORM_NAMES.indexOf(name);
|
|
return index < 0 ? 0 : index;
|
|
}
|
|
|
|
function niriTransform(name) {
|
|
const index = TRANSFORM_NAMES.indexOf(name);
|
|
return index < 0 ? "normal" : NIRI_TRANSFORMS[index];
|
|
}
|
|
|
|
function isRotated(name) {
|
|
return ["90", "270", "Flipped90", "Flipped270"].includes(name);
|
|
}
|
|
|
|
function niriIdentifier(output, name, displayNameMode) {
|
|
if (displayNameMode !== "model" || !output?.make || !output?.model)
|
|
return name;
|
|
return output.make + " " + output.model + " " + (output.serial || "Unknown");
|
|
}
|
|
|
|
function hyprlandIdentifier(output, name, displayNameMode) {
|
|
if (displayNameMode !== "model" || !output?.make || !output?.model)
|
|
return name;
|
|
return ("desc:" + [output.make, output.model, output.serial].filter(p => p).join(" ")).replace(/,/g, "");
|
|
}
|
|
|
|
function modelIdentifier(output) {
|
|
return output.make + " " + output.model;
|
|
}
|
|
|
|
function profileIdentifier(output, name, displayNameMode, compositor) {
|
|
if (displayNameMode !== "model" || !output?.make || !output?.model)
|
|
return name;
|
|
switch (compositor) {
|
|
case "niri":
|
|
return niriIdentifier(output, name, displayNameMode);
|
|
default:
|
|
return modelIdentifier(output);
|
|
}
|
|
}
|
|
|
|
function extractNiriOutputBlocks(content) {
|
|
const blocks = [];
|
|
const headerRegex = /output\s+"([^"]+)"\s*\{/g;
|
|
let match;
|
|
while ((match = headerRegex.exec(content)) !== null) {
|
|
const start = headerRegex.lastIndex;
|
|
let depth = 1;
|
|
let i = start;
|
|
while (i < content.length && depth > 0) {
|
|
const ch = content[i];
|
|
if (ch === '{')
|
|
depth++;
|
|
else if (ch === '}')
|
|
depth--;
|
|
i++;
|
|
}
|
|
blocks.push({
|
|
"name": match[1],
|
|
"body": content.slice(start, i - 1)
|
|
});
|
|
headerRegex.lastIndex = i;
|
|
}
|
|
return blocks;
|
|
}
|
|
|
|
function stripNestedBlocks(body) {
|
|
let stripped = body;
|
|
let prev;
|
|
do {
|
|
prev = stripped;
|
|
stripped = stripped.replace(/[\w-]+\s*\{[^{}]*\}/g, "");
|
|
} while (stripped !== prev)
|
|
return stripped;
|
|
}
|
|
|
|
function hyprLuaField(line, field) {
|
|
const re = new RegExp("\\b" + field + "\\s*=\\s*(\\\"(?:\\\\\\\\.|[^\\\"])*\\\"|'(?:\\\\\\\\.|[^'])*'|\\[\\[.*?\\]\\]|[^,}\\s]+)");
|
|
const match = line.match(re);
|
|
if (!match)
|
|
return undefined;
|
|
const raw = match[1].trim();
|
|
if (raw.startsWith("[[") && raw.endsWith("]]"))
|
|
return raw.slice(2, -2);
|
|
if (raw.startsWith("\"")) {
|
|
try {
|
|
return JSON.parse(raw);
|
|
} catch (e) {
|
|
return raw.slice(1, -1);
|
|
}
|
|
}
|
|
if (raw.startsWith("'") && raw.endsWith("'"))
|
|
return raw.slice(1, -1).replace(/\\'/g, "'");
|
|
if (raw === "true")
|
|
return true;
|
|
if (raw === "false")
|
|
return false;
|
|
const num = Number(raw);
|
|
return isNaN(num) ? raw : num;
|
|
}
|
|
|
|
function parsedMode(width, height, refresh) {
|
|
return {
|
|
"width": parseInt(width),
|
|
"height": parseInt(height),
|
|
"refresh_rate": Math.round(parseFloat(refresh) * 1000)
|
|
};
|
|
}
|
|
|
|
function parseNiriOutputs(content) {
|
|
const result = {};
|
|
for (const block of extractNiriOutputBlocks(content)) {
|
|
const name = block.name;
|
|
const body = block.body;
|
|
|
|
// top-level off only, nested hot-corners { off } must not count (#2966)
|
|
const disabled = /^\s*off\s*$/m.test(stripNestedBlocks(body));
|
|
const modeMatch = body.match(/mode\s+"(\d+)x(\d+)@([\d.]+)"/);
|
|
const posMatch = body.match(/position\s+x=(-?\d+)\s+y=(-?\d+)/);
|
|
const scaleMatch = body.match(/scale\s+([\d.]+)/);
|
|
const transformMatch = body.match(/transform\s+"([^"]+)"/);
|
|
const vrrMatch = body.match(/variable-refresh-rate/);
|
|
const vrrOnDemandMatch = body.match(/variable-refresh-rate\s+on-demand=true/);
|
|
|
|
result[name] = {
|
|
"name": name,
|
|
"disabled": disabled,
|
|
"logical": {
|
|
"x": posMatch ? parseInt(posMatch[1]) : 0,
|
|
"y": posMatch ? parseInt(posMatch[2]) : 0,
|
|
"scale": scaleMatch ? parseFloat(scaleMatch[1]) : 1.0,
|
|
"transform": transformMatch ? transformMatch[1] : "Normal"
|
|
},
|
|
"modes": modeMatch ? [parsedMode(modeMatch[1], modeMatch[2], modeMatch[3])] : [],
|
|
"current_mode": 0,
|
|
"vrr_enabled": !!vrrMatch,
|
|
"vrr_on_demand": !!vrrOnDemandMatch,
|
|
"vrr_supported": true
|
|
};
|
|
}
|
|
return result;
|
|
}
|
|
|
|
function hyprLuaSettings(line, disabled, vrrMode) {
|
|
return {
|
|
"disabled": disabled || undefined,
|
|
"bitdepth": hyprLuaField(line, "bitdepth"),
|
|
"colorManagement": hyprLuaField(line, "cm"),
|
|
"sdrBrightness": hyprLuaField(line, "sdrbrightness"),
|
|
"sdrSaturation": hyprLuaField(line, "sdrsaturation"),
|
|
"supportsWideColor": hyprLuaField(line, "supports_wide_color"),
|
|
"supportsHdr": hyprLuaField(line, "supports_hdr"),
|
|
"sdrEotf": hyprLuaField(line, "sdr_eotf"),
|
|
"icc": hyprLuaField(line, "icc"),
|
|
"sdrMinLuminance": hyprLuaField(line, "sdr_min_luminance"),
|
|
"sdrMaxLuminance": hyprLuaField(line, "sdr_max_luminance"),
|
|
"minLuminance": hyprLuaField(line, "min_luminance"),
|
|
"maxLuminance": hyprLuaField(line, "max_luminance"),
|
|
"maxAvgLuminance": hyprLuaField(line, "max_avg_luminance"),
|
|
"vrrFullscreenOnly": vrrMode === 2 ? true : undefined
|
|
};
|
|
}
|
|
|
|
function parseHyprlandLuaMonitorLine(line) {
|
|
if (!line.match(/^\s*hl\.monitor\s*\(/))
|
|
return null;
|
|
const name = hyprLuaField(line, "output");
|
|
if (name === undefined)
|
|
return null;
|
|
const disabled = hyprLuaField(line, "disabled") === true;
|
|
const mode = hyprLuaField(line, "mode") || "preferred";
|
|
const position = hyprLuaField(line, "position") || "0x0";
|
|
const scaleValue = hyprLuaField(line, "scale");
|
|
const transform = Number(hyprLuaField(line, "transform") ?? 0);
|
|
const vrrMode = Number(hyprLuaField(line, "vrr") ?? 0);
|
|
const posMatch = String(position).match(/^(-?\d+)x(-?\d+)$/);
|
|
const modeMatch = String(mode).match(/^(\d+)x(\d+)@([\d.]+)/);
|
|
return {
|
|
"name": String(name),
|
|
"logical": {
|
|
"x": posMatch ? parseInt(posMatch[1]) : 0,
|
|
"y": posMatch ? parseInt(posMatch[2]) : 0,
|
|
"scale": typeof scaleValue === "number" ? scaleValue : 1.0,
|
|
"transform": transformName(transform)
|
|
},
|
|
"modes": modeMatch ? [parsedMode(modeMatch[1], modeMatch[2], modeMatch[3])] : [],
|
|
"current_mode": modeMatch ? 0 : -1,
|
|
"vrr_enabled": vrrMode >= 1,
|
|
"vrr_supported": vrrMode > 0,
|
|
"hyprlandSettings": hyprLuaSettings(line, disabled, vrrMode),
|
|
"mirror": hyprLuaField(line, "mirror") || ""
|
|
};
|
|
}
|
|
|
|
function parseHyprlandDisableLine(line) {
|
|
const disableMatch = line.match(/^\s*monitor\s*=\s*([^,]+),\s*disable\s*$/);
|
|
if (!disableMatch)
|
|
return null;
|
|
return {
|
|
"name": disableMatch[1].trim(),
|
|
"logical": {
|
|
"x": 0,
|
|
"y": 0,
|
|
"scale": 1.0,
|
|
"transform": "Normal"
|
|
},
|
|
"modes": [],
|
|
"current_mode": -1,
|
|
"vrr_enabled": false,
|
|
"vrr_supported": false,
|
|
"hyprlandSettings": {
|
|
"disabled": true
|
|
}
|
|
};
|
|
}
|
|
|
|
function hyprlandConfExtras(rest) {
|
|
const transformMatch = rest.match(/,\s*transform,\s*(\d+)/);
|
|
const vrrMatch = rest.match(/,\s*vrr,\s*(\d+)/);
|
|
const bitdepthMatch = rest.match(/,\s*bitdepth,\s*(\d+)/);
|
|
const cmMatch = rest.match(/,\s*cm,\s*(\w+)/);
|
|
const sdrBrightnessMatch = rest.match(/,\s*sdrbrightness,\s*([\d.]+)/);
|
|
const sdrSaturationMatch = rest.match(/,\s*sdrsaturation,\s*([\d.]+)/);
|
|
const mirrorMatch = rest.match(/,\s*mirror,\s*([^,\s]+)/);
|
|
const vrrMode = vrrMatch ? parseInt(vrrMatch[1]) : 0;
|
|
return {
|
|
"transform": transformMatch ? parseInt(transformMatch[1]) : 0,
|
|
"vrrMode": vrrMode,
|
|
"mirror": mirrorMatch ? mirrorMatch[1] : "",
|
|
"settings": {
|
|
"bitdepth": bitdepthMatch ? parseInt(bitdepthMatch[1]) : undefined,
|
|
"colorManagement": cmMatch ? cmMatch[1] : undefined,
|
|
"sdrBrightness": sdrBrightnessMatch ? parseFloat(sdrBrightnessMatch[1]) : undefined,
|
|
"sdrSaturation": sdrSaturationMatch ? parseFloat(sdrSaturationMatch[1]) : undefined,
|
|
"vrrFullscreenOnly": vrrMode === 2 ? true : undefined
|
|
}
|
|
};
|
|
}
|
|
|
|
function parseHyprlandMonitorLine(line) {
|
|
const match = line.match(/^\s*monitor\s*=\s*([^,]+),\s*(\d+)x(\d+)@([\d.]+),\s*(-?\d+)x(-?\d+),\s*([\d.]+)/);
|
|
if (!match)
|
|
return null;
|
|
const extras = hyprlandConfExtras(line.substring(line.indexOf(match[7]) + match[7].length));
|
|
return {
|
|
"name": match[1].trim(),
|
|
"logical": {
|
|
"x": parseInt(match[5]),
|
|
"y": parseInt(match[6]),
|
|
"scale": parseFloat(match[7]),
|
|
"transform": transformName(extras.transform)
|
|
},
|
|
"modes": [parsedMode(match[2], match[3], match[4])],
|
|
"current_mode": 0,
|
|
"vrr_enabled": extras.vrrMode >= 1,
|
|
"vrr_supported": true,
|
|
"hyprlandSettings": extras.settings,
|
|
"mirror": extras.mirror
|
|
};
|
|
}
|
|
|
|
function parseHyprlandOutputs(content) {
|
|
const result = {};
|
|
for (const line of content.split("\n")) {
|
|
const entry = parseHyprlandLuaMonitorLine(line) || parseHyprlandDisableLine(line) || parseHyprlandMonitorLine(line);
|
|
if (!entry)
|
|
continue;
|
|
result[entry.name] = entry;
|
|
}
|
|
return result;
|
|
}
|
|
|
|
function parseMangoRule(rule) {
|
|
const params = {};
|
|
for (const pair of rule.split(",")) {
|
|
const colonIdx = pair.indexOf(":");
|
|
if (colonIdx < 0)
|
|
continue;
|
|
params[pair.substring(0, colonIdx).trim()] = pair.substring(colonIdx + 1).trim();
|
|
}
|
|
const name = (params.name || "").replace(/^\^/, "").replace(/\$$/, "");
|
|
if (!name)
|
|
return null;
|
|
return {
|
|
"name": name,
|
|
"logical": {
|
|
"x": parseInt(params.x || "0"),
|
|
"y": parseInt(params.y || "0"),
|
|
"scale": parseFloat(params.scale || "1"),
|
|
"transform": transformName(parseInt(params.rr || "0"))
|
|
},
|
|
"modes": [
|
|
{
|
|
"width": parseInt(params.width || "1920"),
|
|
"height": parseInt(params.height || "1080"),
|
|
"refresh_rate": parseFloat(params.refresh || "60") * 1000
|
|
}
|
|
],
|
|
"current_mode": 0,
|
|
"vrr_enabled": parseInt(params.vrr || "0") === 1,
|
|
"vrr_supported": true
|
|
};
|
|
}
|
|
|
|
function parseMangoOutputs(content) {
|
|
const result = {};
|
|
for (const line of content.split("\n")) {
|
|
const trimmed = line.trim();
|
|
if (!trimmed.startsWith("monitorrule="))
|
|
continue;
|
|
const entry = parseMangoRule(trimmed.substring("monitorrule=".length));
|
|
if (!entry)
|
|
continue;
|
|
result[entry.name] = entry;
|
|
}
|
|
return result;
|
|
}
|
|
|
|
function outputsFromWlr(wlrOutputs, liveMonitors) {
|
|
const map = {};
|
|
for (const output of wlrOutputs) {
|
|
const normalizedModes = (output.modes || []).map(m => ({
|
|
"id": m.id,
|
|
"width": m.width,
|
|
"height": m.height,
|
|
"refresh_rate": m.refresh,
|
|
"preferred": m.preferred ?? false
|
|
}));
|
|
map[output.name] = {
|
|
"name": output.name,
|
|
"enabled": output.enabled ?? true,
|
|
"make": output.make || "",
|
|
"model": output.model || "",
|
|
"serial": output.serialNumber || "",
|
|
"modes": normalizedModes,
|
|
"current_mode": normalizedModes.findIndex(m => m.id === output.currentMode?.id),
|
|
"vrr_supported": output.adaptiveSyncSupported ?? false,
|
|
"vrr_enabled": output.adaptiveSync === 1,
|
|
"logical": {
|
|
"x": output.x ?? 0,
|
|
"y": output.y ?? 0,
|
|
"width": output.currentMode?.width ?? 1920,
|
|
"height": output.currentMode?.height ?? 1080,
|
|
"scale": output.scale || 1.0,
|
|
"transform": transformName(output.transform)
|
|
}
|
|
};
|
|
const live = liveMonitors[output.name];
|
|
if (!live)
|
|
continue;
|
|
map[output.name].logical.x = live.x;
|
|
map[output.name].logical.y = live.y;
|
|
map[output.name].logical.scale = live.scale || 1.0;
|
|
map[output.name].logical.transform = transformName(live.transformIndex ?? 0);
|
|
}
|
|
return map;
|
|
}
|
|
|
|
function outputNeutralConfig(outputName, outputData, niriSettings, hyprlandSettings, displayNameMode, compositor) {
|
|
const modeData = (outputData.modes && outputData.current_mode !== undefined) ? outputData.modes[outputData.current_mode] : null;
|
|
const modeStr = modeData ? modeData.width + "x" + modeData.height + "@" + (modeData.refresh_rate / 1000).toFixed(3) : null;
|
|
const cfg = {
|
|
"mode": modeStr,
|
|
"position": {
|
|
"x": outputData.logical?.x ?? 0,
|
|
"y": outputData.logical?.y ?? 0
|
|
},
|
|
"scale": outputData.logical?.scale || 1.0,
|
|
"transform": outputData.logical?.transform ?? "Normal",
|
|
"vrr": outputData.vrr_enabled ?? false,
|
|
"disabled": false
|
|
};
|
|
switch (compositor) {
|
|
case "niri":
|
|
cfg.niri = Object.assign({}, niriSettings?.[niriIdentifier(outputData, outputName, displayNameMode)] || {});
|
|
if (cfg.niri.disabled) {
|
|
delete cfg.niri.disabled;
|
|
cfg.disabled = true;
|
|
}
|
|
return cfg;
|
|
case "hyprland":
|
|
cfg.hyprland = Object.assign({}, hyprlandSettings?.[hyprlandIdentifier(outputData, outputName, displayNameMode)] || {});
|
|
if (outputData.mirror)
|
|
cfg.hyprland.mirror = outputData.mirror;
|
|
if (cfg.hyprland.disabled) {
|
|
delete cfg.hyprland.disabled;
|
|
cfg.disabled = true;
|
|
}
|
|
return cfg;
|
|
default:
|
|
return cfg;
|
|
}
|
|
}
|
|
|
|
function profileKeyMatchesOutput(outputId, output, name, displayNameMode, compositor) {
|
|
if (name === outputId || profileIdentifier(output, name, displayNameMode, compositor) === outputId)
|
|
return true;
|
|
if (!outputId.startsWith("desc:") || !output?.make)
|
|
return false;
|
|
const want = outputId.slice(5).trim();
|
|
const full = [output.make, output.model, output.serial].filter(p => p).join(" ").replace(/,/g, "");
|
|
const noSerial = [output.make, output.model].filter(p => p).join(" ").replace(/,/g, "");
|
|
return want === full || want === noSerial || full.startsWith(want + " ");
|
|
}
|
|
|
|
function liveOutputForKey(outputId, outputs, displayNameMode, compositor) {
|
|
for (const name in outputs) {
|
|
if (profileKeyMatchesOutput(outputId, outputs[name], name, displayNameMode, compositor))
|
|
return outputs[name];
|
|
}
|
|
return null;
|
|
}
|
|
|
|
function outputsDataFromConfigEntry(configEntry, outputs, displayNameMode, compositor) {
|
|
const result = {};
|
|
const cfgOutputs = configEntry.outputs || {};
|
|
for (const outputId in cfgOutputs) {
|
|
const cfg = cfgOutputs[outputId];
|
|
const liveOutput = liveOutputForKey(outputId, outputs, displayNameMode, compositor);
|
|
const liveModes = liveOutput?.modes || [];
|
|
const currentMode = liveModes.findIndex(m => {
|
|
const s = m.width + "x" + m.height + "@" + (m.refresh_rate / 1000).toFixed(3);
|
|
return s === cfg.mode;
|
|
});
|
|
const entry = {
|
|
"name": outputId,
|
|
"explicitIdentifier": true,
|
|
"configured_mode": cfg.mode || "",
|
|
"make": liveOutput?.make || "",
|
|
"model": liveOutput?.model || "",
|
|
"serial": liveOutput?.serial || "",
|
|
"modes": liveModes,
|
|
"current_mode": currentMode,
|
|
"vrr_supported": liveOutput?.vrr_supported ?? false,
|
|
"vrr_enabled": cfg.vrr ?? false,
|
|
"logical": {
|
|
"x": cfg.position?.x ?? 0,
|
|
"y": cfg.position?.y ?? 0,
|
|
"scale": cfg.scale ?? 1.0,
|
|
"transform": cfg.transform ?? "Normal"
|
|
}
|
|
};
|
|
if (cfg.hyprland?.mirror)
|
|
entry.mirror = cfg.hyprland.mirror;
|
|
result[outputId] = entry;
|
|
}
|
|
return result;
|
|
}
|
|
|
|
function configFingerprint(configEntry) {
|
|
return Object.keys(configEntry.outputs || {}).sort().join("+");
|
|
}
|
|
|
|
function outputSetFingerprint(outputIdentifiers) {
|
|
return [...outputIdentifiers].sort().join("+");
|
|
}
|
|
|
|
function findConfigEntryById(data, id) {
|
|
const configs = data.configurations || [];
|
|
for (let i = 0; i < configs.length; i++) {
|
|
if (configs[i].id === id)
|
|
return {
|
|
entry: configs[i],
|
|
index: i
|
|
};
|
|
}
|
|
return null;
|
|
}
|
|
|
|
function findConfigEntryByFingerprint(data, outputIdentifiers, autoOnly) {
|
|
const targetKey = outputSetFingerprint(outputIdentifiers);
|
|
const configs = data.configurations || [];
|
|
let firstUnnamed = null;
|
|
for (let i = 0; i < configs.length; i++) {
|
|
if (configFingerprint(configs[i]) !== targetKey)
|
|
continue;
|
|
if (configs[i].name && !autoOnly)
|
|
return {
|
|
entry: configs[i],
|
|
index: i
|
|
};
|
|
if (!configs[i].name && !firstUnnamed)
|
|
firstUnnamed = {
|
|
entry: configs[i],
|
|
index: i
|
|
};
|
|
}
|
|
return firstUnnamed;
|
|
}
|
|
|
|
function profileOutputIsReal(outputId, outputs, displayNameMode, compositor) {
|
|
const live = liveOutputForKey(outputId, outputs, displayNameMode, compositor);
|
|
if (!live)
|
|
return true;
|
|
return !!(live.make && live.model);
|
|
}
|
|
|
|
function ensureEnabledOutput(configEntry, outputs, displayNameMode, compositor) {
|
|
const outputKeys = Object.keys(configEntry.outputs || {});
|
|
if (outputKeys.length === 0)
|
|
return false;
|
|
const isReal = k => profileOutputIsReal(k, outputs, displayNameMode, compositor);
|
|
const hasEnabledReal = outputKeys.some(k => !configEntry.outputs[k].disabled && isReal(k));
|
|
if (hasEnabledReal)
|
|
return false;
|
|
const firstReal = outputKeys.find(isReal);
|
|
if (!firstReal)
|
|
return false;
|
|
delete configEntry.outputs[firstReal].disabled;
|
|
return true;
|
|
}
|
|
|
|
function outputFingerprint(outputs) {
|
|
return JSON.stringify(outputs.map(o => ({
|
|
name: o.name,
|
|
id: o.id,
|
|
enabled: o.enabled,
|
|
x: o.x,
|
|
y: o.y,
|
|
scale: o.scale,
|
|
transform: o.transform,
|
|
mode: o.currentMode ? [o.currentMode.width, o.currentMode.height, o.currentMode.refresh] : null,
|
|
adaptiveSync: o.adaptiveSync
|
|
})).sort((a, b) => a.name.localeCompare(b.name)));
|
|
}
|
|
|
|
function outputHeads(outputs) {
|
|
return outputs.map(o => ({
|
|
name: o.name,
|
|
enabled: o.enabled,
|
|
modeId: o.currentMode?.id,
|
|
position: {
|
|
x: o.x,
|
|
y: o.y
|
|
},
|
|
scale: o.scale,
|
|
transform: o.transform,
|
|
adaptiveSync: o.adaptiveSync
|
|
}));
|
|
}
|
|
|
|
function outputHeadsMatch(candidate, actual, original) {
|
|
if (candidate.length !== actual.length || original.length !== actual.length || original.some(o => !actual.some(a => a.id === o.id && a.name === o.name)))
|
|
return false;
|
|
return candidate.every(h => {
|
|
const output = actual.find(o => o.name === h.name);
|
|
if (!output || output.enabled !== h.enabled)
|
|
return false;
|
|
if (!h.enabled)
|
|
return true;
|
|
const mode = h.customMode || original.find(o => o.name === h.name)?.modes?.find(m => m.id === h.modeId);
|
|
return output.x === h.position.x && output.y === h.position.y && Math.abs(output.scale - h.scale) < 0.0001 && output.transform === h.transform && (h.adaptiveSync === undefined || output.adaptiveSync === h.adaptiveSync) && !!mode && output.currentMode?.width === mode.width && output.currentMode?.height === mode.height && output.currentMode?.refresh === mode.refresh;
|
|
});
|
|
}
|
|
|
|
function configEntryMatchesLiveLayout(configEntry, outputs, displayNameMode, compositor) {
|
|
const cfgOutputs = configEntry.outputs || {};
|
|
for (const outputId in cfgOutputs) {
|
|
const cfg = cfgOutputs[outputId];
|
|
const live = liveOutputForKey(outputId, outputs, displayNameMode, compositor);
|
|
if (!live)
|
|
return false;
|
|
if ((cfg.disabled ?? false) !== !(live.enabled ?? true))
|
|
return false;
|
|
if (cfg.disabled)
|
|
continue;
|
|
const mode = (live.modes && live.current_mode >= 0) ? live.modes[live.current_mode] : null;
|
|
const modeStr = mode ? mode.width + "x" + mode.height + "@" + (mode.refresh_rate / 1000).toFixed(3) : null;
|
|
if (cfg.mode && modeStr !== cfg.mode)
|
|
return false;
|
|
if ((cfg.position?.x ?? 0) !== (live.logical?.x ?? 0) || (cfg.position?.y ?? 0) !== (live.logical?.y ?? 0))
|
|
return false;
|
|
if (Math.abs((cfg.scale ?? 1.0) - (live.logical?.scale ?? 1.0)) > WLR_SCALE_STEP)
|
|
return false;
|
|
if ((cfg.transform ?? "Normal") !== (live.logical?.transform ?? "Normal"))
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
function currentOutputSet(outputs, displayNameMode, compositor) {
|
|
const connected = [];
|
|
for (const name in outputs)
|
|
connected.push(profileIdentifier(outputs[name], name, displayNameMode, compositor));
|
|
return connected.sort();
|
|
}
|
|
|
|
function liveIdentifiers(outputs, displayNameMode, compositor) {
|
|
const identifiers = {};
|
|
for (const name in outputs) {
|
|
const o = outputs[name];
|
|
identifiers[name] = true;
|
|
if (!o?.make || !o?.model)
|
|
continue;
|
|
identifiers[(o.make + " " + o.model + " " + (o.serial || "Unknown")).trim()] = true;
|
|
identifiers[(o.make + " " + o.model).trim()] = true;
|
|
switch (compositor) {
|
|
case "hyprland":
|
|
identifiers[hyprlandIdentifier(o, name, displayNameMode).trim()] = true;
|
|
break;
|
|
}
|
|
}
|
|
return identifiers;
|
|
}
|
|
|
|
function filterDisconnectedOnly(parsedOutputs, outputs, displayNameMode, compositor) {
|
|
const result = {};
|
|
const live = liveIdentifiers(outputs, displayNameMode, compositor);
|
|
for (const savedName in parsedOutputs) {
|
|
if (!live[savedName.trim()])
|
|
result[savedName] = parsedOutputs[savedName];
|
|
}
|
|
return result;
|
|
}
|
|
|
|
function physicalSize(output) {
|
|
if (!output)
|
|
return {
|
|
"w": 1920,
|
|
"h": 1080
|
|
};
|
|
|
|
let w = 1920, h = 1080;
|
|
if (output.modes && output.current_mode !== undefined) {
|
|
const mode = output.modes[output.current_mode];
|
|
if (mode) {
|
|
w = mode.width || 1920;
|
|
h = mode.height || 1080;
|
|
}
|
|
} else if (output.logical) {
|
|
const scale = output.logical.scale || 1.0;
|
|
w = Math.round((output.logical.width || 1920) * scale);
|
|
h = Math.round((output.logical.height || 1080) * scale);
|
|
}
|
|
|
|
if (output.logical && isRotated(output.logical.transform))
|
|
return {
|
|
"w": h,
|
|
"h": w
|
|
};
|
|
return {
|
|
"w": w,
|
|
"h": h
|
|
};
|
|
}
|
|
|
|
function logicalSize(output, compositor) {
|
|
if (!output)
|
|
return {
|
|
"w": 1920,
|
|
"h": 1080
|
|
};
|
|
const phys = physicalSize(output);
|
|
const scale = output.logical?.scale || 1.0;
|
|
switch (compositor) {
|
|
case "niri":
|
|
// niri floors logical sizes, rounding up by one leaves a dead seam at snapped edges (#2526)
|
|
return {
|
|
"w": Math.floor(phys.w / scale),
|
|
"h": Math.floor(phys.h / scale)
|
|
};
|
|
default:
|
|
return {
|
|
"w": Math.round(phys.w / scale),
|
|
"h": Math.round(phys.h / scale)
|
|
};
|
|
}
|
|
}
|
|
|
|
function defaultBounds() {
|
|
return {
|
|
"minX": 0,
|
|
"minY": 0,
|
|
"maxX": 1920,
|
|
"maxY": 1080,
|
|
"width": 1920,
|
|
"height": 1080
|
|
};
|
|
}
|
|
|
|
function outputBounds(allOutputs, compositor) {
|
|
if (!allOutputs || Object.keys(allOutputs).length === 0)
|
|
return defaultBounds();
|
|
|
|
let minX = Infinity, minY = Infinity, maxX = -Infinity, maxY = -Infinity;
|
|
for (const name in allOutputs) {
|
|
const output = allOutputs[name];
|
|
if (!output.logical)
|
|
continue;
|
|
const size = logicalSize(output, compositor);
|
|
minX = Math.min(minX, output.logical.x);
|
|
minY = Math.min(minY, output.logical.y);
|
|
maxX = Math.max(maxX, output.logical.x + size.w);
|
|
maxY = Math.max(maxY, output.logical.y + size.h);
|
|
}
|
|
|
|
if (minX === Infinity)
|
|
return defaultBounds();
|
|
return {
|
|
"minX": minX,
|
|
"minY": minY,
|
|
"maxX": maxX,
|
|
"maxY": maxY,
|
|
"width": maxX - minX,
|
|
"height": maxY - minY
|
|
};
|
|
}
|
|
|
|
function neighborNames(layout, testName) {
|
|
return Object.keys(layout.outputs).filter(name => name !== testName && !layout.disabled[name] && layout.outputs[name].logical);
|
|
}
|
|
|
|
function checkOverlap(layout, testName, testX, testY, testW, testH) {
|
|
for (const name of neighborNames(layout, testName)) {
|
|
const output = layout.outputs[name];
|
|
const x = output.logical.x;
|
|
const y = output.logical.y;
|
|
const size = logicalSize(output, layout.compositor);
|
|
if (!(testX + testW <= x || testX >= x + size.w || testY + testH <= y || testY >= y + size.h))
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
function axisSnaps(edge, extent, pos, testExtent) {
|
|
const far = edge + extent;
|
|
const testFar = pos + testExtent;
|
|
return [
|
|
{
|
|
"val": far,
|
|
"dist": Math.abs(pos - far)
|
|
},
|
|
{
|
|
"val": edge - testExtent,
|
|
"dist": Math.abs(testFar - edge)
|
|
},
|
|
{
|
|
"val": edge,
|
|
"dist": Math.abs(pos - edge)
|
|
},
|
|
{
|
|
"val": far - testExtent,
|
|
"dist": Math.abs(testFar - far)
|
|
}
|
|
];
|
|
}
|
|
|
|
function nearestSnap(snaps, value, dist) {
|
|
for (const snap of snaps) {
|
|
if (snap.dist < dist) {
|
|
dist = snap.dist;
|
|
value = snap.val;
|
|
}
|
|
}
|
|
return {
|
|
"value": value,
|
|
"dist": dist
|
|
};
|
|
}
|
|
|
|
function snapToEdges(layout, testName, posX, posY, testW, testH) {
|
|
const snapThreshold = 200;
|
|
let snappedX = posX;
|
|
let snappedY = posY;
|
|
let bestXDist = snapThreshold;
|
|
let bestYDist = snapThreshold;
|
|
|
|
for (const name of neighborNames(layout, testName)) {
|
|
const output = layout.outputs[name];
|
|
const size = logicalSize(output, layout.compositor);
|
|
const x = nearestSnap(axisSnaps(output.logical.x, size.w, posX, testW), snappedX, bestXDist);
|
|
snappedX = x.value;
|
|
bestXDist = x.dist;
|
|
const y = nearestSnap(axisSnaps(output.logical.y, size.h, posY, testH), snappedY, bestYDist);
|
|
snappedY = y.value;
|
|
bestYDist = y.dist;
|
|
}
|
|
|
|
if (!checkOverlap(layout, testName, snappedX, snappedY, testW, testH))
|
|
return {
|
|
"x": snappedX,
|
|
"y": snappedY
|
|
};
|
|
if (!checkOverlap(layout, testName, snappedX, posY, testW, testH))
|
|
return {
|
|
"x": snappedX,
|
|
"y": posY
|
|
};
|
|
if (!checkOverlap(layout, testName, posX, snappedY, testW, testH))
|
|
return {
|
|
"x": posX,
|
|
"y": snappedY
|
|
};
|
|
return {
|
|
"x": posX,
|
|
"y": posY
|
|
};
|
|
}
|
|
|
|
function recalculateAdjacentPositions(outputs, pendingChanges, changedOutput, newScale, compositor) {
|
|
const output = outputs[changedOutput];
|
|
if (!output?.logical)
|
|
return [];
|
|
const oldPhys = physicalSize(output);
|
|
const oldLogicalW = Math.round(oldPhys.w / (output.logical.scale || 1.0));
|
|
const newLogicalW = Math.round(oldPhys.w / newScale);
|
|
const changedX = pendingChanges[changedOutput]?.position?.x ?? output.logical.x;
|
|
const changedY = pendingChanges[changedOutput]?.position?.y ?? output.logical.y;
|
|
const moves = [];
|
|
|
|
for (const name in outputs) {
|
|
if (name === changedOutput)
|
|
continue;
|
|
const other = outputs[name];
|
|
if (!other?.logical)
|
|
continue;
|
|
const otherX = pendingChanges[name]?.position?.x ?? other.logical.x;
|
|
const otherY = pendingChanges[name]?.position?.y ?? other.logical.y;
|
|
const otherRight = otherX + logicalSize(other, compositor).w;
|
|
|
|
if (Math.abs(changedX - otherRight) < 5) {
|
|
moves.push({
|
|
"name": changedOutput,
|
|
"x": otherRight,
|
|
"y": changedY
|
|
});
|
|
return moves;
|
|
}
|
|
|
|
if (Math.abs(otherX - (changedX + oldLogicalW)) < 5)
|
|
moves.push({
|
|
"name": name,
|
|
"x": changedX + newLogicalW,
|
|
"y": otherY
|
|
});
|
|
}
|
|
return moves;
|
|
}
|
|
|
|
function normalizeOutputPositions(outputsData) {
|
|
const names = Object.keys(outputsData);
|
|
if (names.length === 0)
|
|
return outputsData;
|
|
|
|
let minX = Infinity;
|
|
let minY = Infinity;
|
|
|
|
for (const name of names) {
|
|
const output = outputsData[name];
|
|
if (!output.logical)
|
|
continue;
|
|
minX = Math.min(minX, output.logical.x);
|
|
minY = Math.min(minY, output.logical.y);
|
|
}
|
|
|
|
if (minX === Infinity || (minX === 0 && minY === 0))
|
|
return outputsData;
|
|
|
|
const normalized = JSON.parse(JSON.stringify(outputsData));
|
|
for (const name of names) {
|
|
if (!normalized[name].logical)
|
|
continue;
|
|
normalized[name].logical.x -= minX;
|
|
normalized[name].logical.y -= minY;
|
|
}
|
|
|
|
return normalized;
|
|
}
|
|
|
|
function formatMode(mode) {
|
|
if (!mode)
|
|
return "";
|
|
return mode.width + "x" + mode.height + "@" + (mode.refresh_rate / 1000).toFixed(3);
|
|
}
|
|
|
|
function formatScaleLabel(scale) {
|
|
const value = Number(scale);
|
|
if (!isFinite(value))
|
|
return "1";
|
|
return parseFloat(value.toFixed(2)).toString();
|
|
}
|
|
|
|
function scaleFromNumerator(numerator) {
|
|
return parseFloat((numerator / SCALE_DENOMINATOR).toFixed(6));
|
|
}
|
|
|
|
function scaleNumeratorStep(compositor) {
|
|
switch (compositor) {
|
|
case "niri":
|
|
case "hyprland":
|
|
return 1;
|
|
default:
|
|
return SCALE_DENOMINATOR / 8;
|
|
}
|
|
}
|
|
|
|
function cleanScaleNumerators(mode, compositor, minScale, maxScale) {
|
|
const width = Number(mode?.width || 0) * SCALE_DENOMINATOR;
|
|
const height = Number(mode?.height || 0) * SCALE_DENOMINATOR;
|
|
if (width <= 0 || height <= 0)
|
|
return [];
|
|
const step = scaleNumeratorStep(compositor);
|
|
const first = Math.ceil(minScale * SCALE_DENOMINATOR / step) * step;
|
|
const last = Math.floor(maxScale * SCALE_DENOMINATOR / step) * step;
|
|
const numerators = [];
|
|
for (let n = first; n <= last; n += step) {
|
|
if (width % n === 0 && height % n === 0)
|
|
numerators.push(n);
|
|
}
|
|
return numerators;
|
|
}
|
|
|
|
function allowsInexactScale(compositor) {
|
|
return compositor !== "hyprland";
|
|
}
|
|
|
|
function nearestNumerator(numerators, target) {
|
|
let best = numerators[0];
|
|
for (const n of numerators) {
|
|
if (Math.abs(n - target) < Math.abs(best - target))
|
|
best = n;
|
|
}
|
|
return best;
|
|
}
|
|
|
|
function gapFillNumerators(clean, compositor) {
|
|
if (!allowsInexactScale(compositor))
|
|
return [];
|
|
const step = Math.max(GAP_FILL_STEP, scaleNumeratorStep(compositor));
|
|
const fills = [];
|
|
for (let n = GAP_FILL_MIN * SCALE_DENOMINATOR; n <= GAP_FILL_MAX * SCALE_DENOMINATOR; n += step) {
|
|
if (clean.length === 0 || Math.abs(nearestNumerator(clean, n) - n) >= GAP_FILL_CLEARANCE)
|
|
fills.push(n);
|
|
}
|
|
return fills;
|
|
}
|
|
|
|
function scalePresetValues(outputData, pendingMode, compositor) {
|
|
const mode = modeForScalePresets(outputData, pendingMode);
|
|
if (!mode)
|
|
return FALLBACK_SCALE_PRESETS.slice();
|
|
const clean = cleanScaleNumerators(mode, compositor, MIN_PRESET_SCALE, MAX_SCALE);
|
|
return clean.concat(gapFillNumerators(clean, compositor)).sort((a, b) => a - b).map(scaleFromNumerator);
|
|
}
|
|
|
|
function snapScaleToMode(outputData, pendingMode, compositor, scale) {
|
|
const value = Number(scale);
|
|
if (!isFinite(value) || value < MIN_SCALE || value > MAX_SCALE)
|
|
return NaN;
|
|
const mode = modeForScalePresets(outputData, pendingMode);
|
|
const clean = mode ? cleanScaleNumerators(mode, compositor, MIN_SCALE, MAX_SCALE) : [];
|
|
if (clean.length === 0)
|
|
return parseFloat(value.toFixed(6));
|
|
const target = value * SCALE_DENOMINATOR;
|
|
const nearestClean = nearestNumerator(clean, target);
|
|
if (!allowsInexactScale(compositor) || Math.abs(nearestClean - target) < GAP_FILL_CLEARANCE)
|
|
return scaleFromNumerator(nearestClean);
|
|
const step = scaleNumeratorStep(compositor);
|
|
return scaleFromNumerator(Math.round(target / step) * step);
|
|
}
|
|
|
|
function logicalSizeForScale(outputData, pendingMode, scale) {
|
|
const mode = modeForScalePresets(outputData, pendingMode);
|
|
if (!mode || !(scale > 0))
|
|
return null;
|
|
const w = mode.width / scale;
|
|
const h = mode.height / scale;
|
|
return {
|
|
"w": Math.round(w),
|
|
"h": Math.round(h),
|
|
"exact": Math.abs(w - Math.round(w)) < LOGICAL_PIXEL_TOLERANCE && Math.abs(h - Math.round(h)) < LOGICAL_PIXEL_TOLERANCE
|
|
};
|
|
}
|
|
|
|
function formatScaleOption(outputData, pendingMode, scale) {
|
|
const label = parseFloat(Number(scale).toFixed(3)) + "x";
|
|
const size = logicalSizeForScale(outputData, pendingMode, scale);
|
|
if (!size)
|
|
return label;
|
|
return label + " · " + (size.exact ? "" : "~") + size.w + "x" + size.h;
|
|
}
|
|
|
|
function modeForScalePresets(outputData, pendingMode) {
|
|
const modes = outputData?.modes || [];
|
|
if (pendingMode) {
|
|
for (const mode of modes) {
|
|
if (formatMode(mode) === pendingMode)
|
|
return mode;
|
|
}
|
|
}
|
|
const currentMode = outputData?.current_mode;
|
|
if (currentMode !== undefined && modes[currentMode])
|
|
return modes[currentMode];
|
|
return null;
|
|
}
|
|
|
|
function modeWidth(mode) {
|
|
return mode?.width ?? 0;
|
|
}
|
|
|
|
function modeHeight(mode) {
|
|
return mode?.height ?? 0;
|
|
}
|
|
|
|
function modeRefresh(mode) {
|
|
return mode?.refresh_rate ?? mode?.refresh ?? 0;
|
|
}
|
|
|
|
function formatModeString(mode) {
|
|
if (!mode)
|
|
return "";
|
|
return modeWidth(mode) + "x" + modeHeight(mode) + "@" + (modeRefresh(mode) / 1000).toFixed(3);
|
|
}
|
|
|
|
function formatNiriMode(mode) {
|
|
return mode.width + "x" + mode.height + "@" + (modeRefresh(mode) / 1000).toFixed(3);
|
|
}
|
|
|
|
function parseModeString(modeString) {
|
|
const match = (modeString || "").match(/^(\d+)x(\d+)@([\d.]+)$/);
|
|
if (!match)
|
|
return null;
|
|
return {
|
|
"width": parseInt(match[1]),
|
|
"height": parseInt(match[2]),
|
|
"refresh": Math.round(parseFloat(match[3]) * 1000)
|
|
};
|
|
}
|
|
|
|
function findModeByString(modes, modeString, tolerance) {
|
|
for (const mode of modes) {
|
|
if (formatModeString(mode) === modeString)
|
|
return mode;
|
|
}
|
|
|
|
const parsed = parseModeString(modeString);
|
|
if (!parsed)
|
|
return null;
|
|
|
|
for (const mode of modes) {
|
|
if (modeWidth(mode) === parsed.width && modeHeight(mode) === parsed.height && Math.abs(modeRefresh(mode) - parsed.refresh) <= tolerance)
|
|
return mode;
|
|
}
|
|
|
|
return null;
|
|
}
|
|
|
|
function modeAlreadyCurrent(currentMode, targetMode, tolerance) {
|
|
if (!currentMode || !targetMode)
|
|
return true;
|
|
return modeWidth(currentMode) === modeWidth(targetMode) && modeHeight(currentMode) === modeHeight(targetMode) && Math.abs(modeRefresh(currentMode) - modeRefresh(targetMode)) <= tolerance;
|
|
}
|
|
|
|
function restoreModeValue(mode, backend) {
|
|
if (!mode)
|
|
return null;
|
|
if (backend === "wlr")
|
|
return mode.id ?? null;
|
|
return formatNiriMode(mode);
|
|
}
|
|
|
|
function outputVrrEnabled(output) {
|
|
return output.vrr_enabled === true || output.adaptiveSync === 1;
|
|
}
|
|
|
|
function niriCurrentMode(output) {
|
|
if (!output || !output.modes || output.current_mode === undefined)
|
|
return null;
|
|
return output.modes[output.current_mode] || null;
|
|
}
|
|
|
|
function batteryRefreshMode(output, currentMode, backend, target, tolerance) {
|
|
if (!output || !currentMode || (backend === "wlr" && !output.enabled))
|
|
return null;
|
|
|
|
if (outputVrrEnabled(output))
|
|
return null;
|
|
|
|
const modes = output.modes || [];
|
|
const sameResolutionModes = modes.filter(m => modeWidth(m) === modeWidth(currentMode) && modeHeight(m) === modeHeight(currentMode));
|
|
const uniqueRefreshRates = [];
|
|
for (const mode of sameResolutionModes) {
|
|
const refresh = modeRefresh(mode);
|
|
if (!uniqueRefreshRates.some(r => Math.abs(r - refresh) <= tolerance))
|
|
uniqueRefreshRates.push(refresh);
|
|
}
|
|
|
|
if (uniqueRefreshRates.length <= 1)
|
|
return null;
|
|
|
|
let bestMode = null;
|
|
let bestDiff = Infinity;
|
|
for (const mode of sameResolutionModes) {
|
|
const diff = Math.abs(modeRefresh(mode) - target);
|
|
if (diff < bestDiff) {
|
|
bestMode = mode;
|
|
bestDiff = diff;
|
|
}
|
|
}
|
|
|
|
if (!bestMode || bestDiff > tolerance)
|
|
return null;
|
|
|
|
return bestMode;
|
|
}
|