crash: switch to cpptrace from breakpad

.clang-tidy

@@ -20,7 +20,6 @@ Checks: >
   -cppcoreguidelines-avoid-do-while,
   -cppcoreguidelines-pro-type-reinterpret-cast,
   -cppcoreguidelines-pro-type-vararg,
-  -cppcoreguidelines-pro-type-union-access,
   -cppcoreguidelines-use-enum-class,
   google-global-names-in-headers,
   google-readability-casting,

.github/ISSUE_TEMPLATE/crash.yml

@@ -1,17 +1,82 @@
 name: Crash Report (v1)
-description: Quickshell has crashed (old)
-labels: ["unactionable"]
+description: Quickshell has crashed
+labels: ["bug", "crash"]
 body:
-  - type: markdown
+  - type: textarea
+    id: crashinfo
     attributes:
-      value: |
-        Thank you for taking the time to click the report button.
-        At this point most of the worst issues in 0.2.1 and before have been fixed and we are
-        preparing for a new release. Please do not submit this report.
-  - type: checkboxes
-    id: donotcheck
+      label: General crash information
+      description: |
+        Paste the contents of the `info.txt` file in your crash folder here.
+      value: "<details> <summary>General information</summary>
+
+
+        ```
+
+        <Paste the contents of the file here inside of the triple backticks>
+
+        ```
+
+
+        </details>"
+    validations:
+        required: true
+  - type: textarea
+    id: userinfo
     attributes:
-      label: Read the text above. Do not submit the report.
-      options:
-        - label: Yes I want this report to be deleted.
-          required: true
+      label: What caused the crash
+      description: |
+        Any information likely to help debug the crash. What were you doing when the crash occurred,
+        what changes did you make, can you get it to happen again?
+  - type: textarea
+    id: dump
+    attributes:
+      label: Minidump
+      description: |
+        Attach `minidump.dmp.log` here. If it is too big to upload, compress it.
+
+        You may skip this step if quickshell crashed while processing a password
+        or other sensitive information. If you skipped it write why instead.
+    validations:
+        required: true
+  - type: textarea
+    id: logs
+    attributes:
+      label: Log file
+      description: |
+        Attach `log.qslog.log` here. If it is too big to upload, compress it.
+
+        You can preview the log if you'd like using `quickshell read-log <path-to-log>`.
+    validations:
+        required: true
+  - type: textarea
+    id: config
+    attributes:
+      label: Configuration
+      description: |
+        Attach your configuration here, preferrably in full (not just one file).
+        Compress it into a zip, tar, etc.
+
+        This will help us reproduce the crash ourselves.
+  - type: textarea
+    id: bt
+    attributes:
+      label: Backtrace
+      description: |
+        If you have gdb installed and use systemd, or otherwise know how to get a backtrace,
+        we would appreciate one. (You may have gdb installed without knowing it)
+
+        1. Run `coredumpctl debug <pid>` where `pid` is the number shown after "Crashed process ID"
+        in the crash reporter.
+        2. Once it loads, type `bt -full` (then enter)
+        3. Copy the output and attach it as a file or in a spoiler.
+  - type: textarea
+    id: exe
+    attributes:
+      label: Executable
+      description: |
+        If the crash folder contains a executable.txt file, upload it here. If not you can ignore this field.
+        If it is too big to upload, compress it.
+
+        Note: executable.txt is the quickshell binary. It has a .txt extension due to github's limitations on
+        filetypes.

.github/ISSUE_TEMPLATE/crash2.yml

@@ -9,21 +9,21 @@ body:
       description: |
         Any information likely to help debug the crash. What were you doing when the crash occurred,
         what changes did you make, can you get it to happen again?
-  - type: upload
+  - type: textarea
     id: report
     attributes:
       label: Report file
       description: Attach `report.txt` here.
     validations:
         required: true
-  - type: upload
+  - type: textarea
     id: logs
     attributes:
       label: Log file
       description: |
         Attach `log.qslog.log` here. If it is too big to upload, compress it.
 
-        You can preview the log if you'd like using `qs log <path-to-log> -r '*=true'`.
+        You can preview the log if you'd like using `quickshell read-log <path-to-log>`.
     validations:
         required: true
   - type: textarea
@@ -31,7 +31,7 @@ body:
     attributes:
       label: Configuration
       description: |
-        Attach or link your configuration here, preferrably in full (not just one file).
+        Attach your configuration here, preferrably in full (not just one file).
         Compress it into a zip, tar, etc.
 
         This will help us reproduce the crash ourselves.

BUILD.md

@@ -15,7 +15,15 @@ Please make this descriptive enough to identify your specific package, for examp
 - `Nixpkgs`
 - `Fedora COPR (errornointernet/quickshell)`
 
-If you are forking quickshell, please change `CRASHREPORT_URL` to your own issue tracker.
+`-DDISTRIBUTOR_DEBUGINFO_AVAILABLE=YES/NO`
+
+If we can retrieve binaries and debug information for the package without actually running your
+distribution (e.g. from an website), and you would like to strip the binary, please set this to `YES`.
+
+If we cannot retrieve debug information, please set this to `NO` and
+**ensure you aren't distributing stripped (non debuggable) binaries**.
+
+In both cases you should build with `-DCMAKE_BUILD_TYPE=RelWithDebInfo` (then split or keep the debuginfo).
 
 ### QML Module dir
 Currently all QML modules are statically linked to quickshell, but this is where
@@ -33,7 +41,6 @@ Quickshell has a set of base dependencies you will always need, names vary by di
 - `cmake`
 - `qt6base`
 - `qt6declarative`
-- `libdrm`
 - `qtshadertools` (build-time)
 - `spirv-tools` (build-time)
 - `pkg-config` (build-time)
@@ -67,14 +74,7 @@ To disable: `-DCRASH_HANDLER=OFF`
 Dependencies: `cpptrace`
 
 Note: `-DVENDOR_CPPTRACE=ON` can be set to vendor cpptrace using FetchContent.
-
-When using FetchContent, `libunwind` is required, and `libdwarf` can be provided by the
-package manager or fetched with FetchContent.
-
-*Please ensure binaries have usable symbols.* We do not necessarily need full debuginfo, but
-leaving symbols in the binary is extremely helpful. You can check if symbols are useful
-by sending a SIGSEGV to the process and ensuring symbols for the quickshell binary are present
-in the trace.
+This still requires `libunwind` to build.
 
 ### Jemalloc
 We recommend leaving Jemalloc enabled as it will mask memory fragmentation caused
@@ -147,6 +147,7 @@ Enables streaming video from monitors and toplevel windows through various proto
 To disable: `-DSCREENCOPY=OFF`
 
 Dependencies:
+- `libdrm`
 - `libgbm`
 - `vulkan-headers` (build-time)
 
@@ -242,7 +243,7 @@ Only `ninja` builds are tested, but makefiles may work.
 
 #### Configuring the build
 ```sh
-$ cmake -GNinja -B build -DCMAKE_BUILD_TYPE=Release [additional disable flags from above here]
+$ cmake -GNinja -B build -DCMAKE_BUILD_TYPE=RelWithDebInfo [additional disable flags from above here]
 ```
 
 Note that features you do not supply dependencies for MUST be disabled with their associated flags

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.20)
-project(quickshell VERSION "0.3.0" LANGUAGES CXX C)
+project(quickshell VERSION "0.2.1" LANGUAGES CXX C)
 
 set(UNRELEASED_FEATURES)
 
@@ -9,9 +9,6 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 set(QS_BUILD_OPTIONS "")
 
-# should be changed for forks
-set(CRASHREPORT_URL "https://github.com/outfoxxed/quickshell/issues/new?template=crash2.yml" CACHE STRING "Bugreport URL")
-
 function(boption VAR NAME DEFAULT)
 	cmake_parse_arguments(PARSE_ARGV 3 arg "" "REQUIRES" "")
 
@@ -43,6 +40,7 @@ string(APPEND QS_BUILD_OPTIONS "  Distributor: ${DISTRIBUTOR}")
 
 message(STATUS "Quickshell configuration")
 message(STATUS "  Distributor: ${DISTRIBUTOR}")
+boption(DISTRIBUTOR_DEBUGINFO_AVAILABLE "Distributor provided debuginfo" NO)
 boption(NO_PCH "Disable precompild headers (dev)" OFF)
 boption(BUILD_TESTING "Build tests (dev)" OFF)
 boption(ASAN "ASAN (dev)" OFF) # note: better output with gcc than clang
@@ -87,9 +85,8 @@ include(cmake/util.cmake)
 
 add_compile_options(-Wall -Wextra -Wno-vla-cxx-extension)
 
-# pipewire defines these, breaking PCH
+# pipewire defines this, breaking PCH
 add_compile_definitions(_REENTRANT)
-add_compile_options(-fno-strict-overflow)
 
 if (FRAME_POINTERS)
 	add_compile_options(-fno-omit-frame-pointer)

CONTRIBUTING.md

@@ -1,40 +1,235 @@
-# Contributing
+# Contributing / Development
+Instructions for development setup and upstreaming patches.
 
-Thank you for taking the time to contribute.
-To ensure nobody's time is wasted, please follow the rules below.
+If you just want to build or package quickshell see [BUILD.md](BUILD.md).
 
-## Acceptable Code Contributions
+## Development
 
-- All changes submitted MUST be **fully understood by the submitter**. If you do not know why or how
-  your change works, do not submit it to be merged. You must be able to explain your reasoning
-  for every change.
+Install the dependencies listed in [BUILD.md](BUILD.md).
+You probably want all of them even if you don't use all of them
+to ensure tests work correctly and avoid passing a bunch of configure
+flags when you need to wipe the build directory.
 
-- Changes MUST be submitted by a human who will be responsible for them. Changes submitted without
-  a human in the loop such as automated tooling and AI Agents are **strictly disallowed**. Accounts
-  responsible for such contribution attempts **will be banned**.
+Quickshell also uses `just` for common development command aliases.
 
-- Changes MUST respect Quickshell's license and the license of any source works. Changes including
-  code from any other works must disclose the source of the code, explain why it was used, and
-  ensure the license is compatible.
+The dependencies are also available as a nix shell or nix flake which we recommend
+using with nix-direnv.
 
-- Changes must follow the guidelines outlined in [HACKING.md](HACKING.md) for style and substance.
+Common aliases:
+- `just configure [<debug|release> [extra cmake args]]` (note that you must specify debug/release to specify extra args)
+- `just build` - runs the build, configuring if not configured already.
+- `just run [args]` - runs quickshell with the given arguments
+- `just clean` - clean up build artifacts. `just clean build` is somewhat common.
 
-- Changes must stand on their own as a unit. Do not make multiple unrelated changes in one PR.
-  Changes depending on prior merges should be marked as a draft.
+### Formatting
+All contributions should be formatted similarly to what already exists.
+Group related functionality together.
 
-## Acceptable Non-code Contributions
+Run the formatter using `just fmt`.
+If the results look stupid, fix the clang-format file if possible,
+or disable clang-format in the affected area
+using `// clang-format off` and `// clang-format on`.
 
-- Bug and crash reports. You must follow the instructions in the issue templates and provide the
-  information requested.
+#### Style preferences not caught by clang-format
+These are flexible. You can ignore them if it looks or works better to
+for one reason or another.
 
-- Feature requests can be made via Issues. Please check to ensure nobody else has requested the same feature.
+Use `auto` if the type of a variable can be deduced automatically, instead of
+redeclaring the returned value's type. Additionally, auto should be used when a
+constructor takes arguments.
 
-- Do not make insubstantial or pointless changes.
+```cpp
+auto x = <expr>; // ok
+auto x = QString::number(3); // ok
+QString x; // ok
+QString x = "foo"; // ok
+auto x = QString("foo"); // ok
 
-- Changes to project rules / policy / governance will not be entertained, except from significant
-  long-term contributors. These changes should not be addressed through contribution channels.
+auto x = QString(); // avoid
+QString x(); // avoid
+QString x("foo"); // avoid
+```
 
-## Merge timelines
+Put newlines around logical units of code, and after closing braces. If the
+most reasonable logical unit of code takes only a single line, it should be
+merged into the next single line logical unit if applicable.
+```cpp
+// multiple units
+auto x = <expr>; // unit 1
+auto y = <expr>; // unit 2
 
-We handle work for the most part on a push basis. If your PR has been ignored for a while
-and is still relevant please bump it.
+auto x = <expr>; // unit 1
+emit this->y(); // unit 2
+
+auto x1 = <expr>; // unit 1
+auto x2 = <expr>; // unit 1
+auto x3 = <expr>; // unit 1
+
+auto y1 = <expr>; // unit 2
+auto y2 = <expr>; // unit 2
+auto y3 = <expr>; // unit 2
+
+// one unit
+auto x = <expr>;
+if (x...) {
+  // ...
+}
+
+// if more than one variable needs to be used then add a newline
+auto x = <expr>;
+auto y = <expr>;
+
+if (x && y) {
+  // ...
+}
+```
+
+Class formatting:
+```cpp
+//! Doc comment summary
+/// Doc comment body
+class Foo: public QObject {
+  // The Q_OBJECT macro comes first. Macros are ; terminated.
+  Q_OBJECT;
+  QML_ELEMENT;
+  QML_CLASSINFO(...);
+  // Properties must stay on a single line or the doc generator won't be able to pick them up
+  Q_PROPERTY(...);
+  /// Doc comment
+  Q_PROPERTY(...);
+  /// Doc comment
+  Q_PROPERTY(...);
+
+public:
+  // Classes should have explicit constructors if they aren't intended to
+  // implicitly cast. The constructor can be inline in the header if it has no body.
+  explicit Foo(QObject* parent = nullptr): QObject(parent) {}
+
+  // Instance functions if applicable.
+  static Foo* instance();
+
+  // Member functions unrelated to properties come next
+  void function();
+  void function();
+  void function();
+
+  // Then Q_INVOKABLEs
+  Q_INVOKABLE function();
+  /// Doc comment
+  Q_INVOKABLE function();
+  /// Doc comment
+  Q_INVOKABLE function();
+
+  // Then property related functions, in the order (bindable, getter, setter).
+  // Related functions may be included here as well. Function bodies may be inline
+  // if they are a single expression. There should be a newline between each
+  // property's methods.
+  [[nodiscard]] QBindable<T> bindableFoo() { return &this->bFoo; }
+  [[nodiscard]] T foo() const { return this->foo; }
+  void setFoo();
+
+  [[nodiscard]] T bar() const { return this->foo; }
+  void setBar();
+
+signals:
+  // Signals that are not property change related go first.
+  // Property change signals go in property definition order.
+  void asd();
+  void asd2();
+  void fooChanged();
+  void barChanged();
+
+public slots:
+  // generally Q_INVOKABLEs are preferred to public slots.
+  void slot();
+
+private slots:
+  // ...
+
+private:
+  // statics, then functions, then fields
+  static const foo BAR;
+  static void foo();
+
+  void foo();
+  void bar();
+
+  // property related members are prefixed with `m`.
+  QString mFoo;
+  QString bar;
+
+  // Bindables go last and should be prefixed with `b`.
+  Q_OBJECT_BINDABLE_PROPERTY(Foo, QString, bFoo, &Foo::fooChanged);
+};
+```
+
+### Linter
+All contributions should pass the linter.
+
+Note that running the linter requires disabling precompiled
+headers and including the test codepaths:
+```sh
+$ just configure debug -DNO_PCH=ON -DBUILD_TESTING=ON
+$ just lint-changed
+```
+
+If the linter is complaining about something that you think it should not,
+please disable the lint in your MR and explain your reasoning if it isn't obvious.
+
+### Tests
+If you feel like the feature you are working on is very complex or likely to break,
+please write some tests. We will ask you to directly if you send in an MR for an
+overly complex or breakable feature.
+
+At least all tests that passed before your changes should still be passing
+by the time your contribution is ready.
+
+You can run the tests using `just test` but you must enable them first
+using `-DBUILD_TESTING=ON`.
+
+### Documentation
+Most of quickshell's documentation is automatically generated from the source code.
+You should annotate `Q_PROPERTY`s and `Q_INVOKABLE`s with doc comments. Note that the parser
+cannot handle random line breaks and will usually require you to disable clang-format if the
+lines are too long.
+
+Before submitting an MR, if adding new features please make sure the documentation is generated
+reasonably using the `quickshell-docs` repo. We recommend checking it out at `/docs` in this repo.
+
+Doc comments take the form `///` or `///!` (summary) and work with markdown.
+You can reference other types using the `@@[Module.][Type.][member]` shorthand
+where all parts are optional. If module or type are not specified they will
+be inferred as the current module. Member can be a `property`, `function()` or `signal(s)`.
+Look at existing code for how it works.
+
+Quickshell modules additionally have a `module.md` file which contains a summary, description,
+and list of headers to scan for documentation.
+
+## Contributing
+
+### Commits
+Please structure your commit messages as `scope[!]: commit` where
+the scope is something like `core` or `service/mpris`. (pick what has been
+used historically or what makes sense if new). Add `!` for changes that break
+existing APIs or functionality.
+
+Commit descriptions should contain a summary of the changes if they are not
+sufficiently addressed in the commit message.
+
+Please squash/rebase additions or edits to previous changes and follow the
+commit style to keep the history easily searchable at a glance.
+Depending on the change, it is often reasonable to squash it into just
+a single commit. (If you do not follow this we will squash your changes
+for you.)
+
+### Sending patches
+You may contribute by submitting a pull request on github, asking for
+an account on our git server, or emailing patches / git bundles
+directly to `[email protected]`.
+
+### Getting help
+If you're getting stuck, you can come talk to us in the
+[quickshell-development matrix room](https://matrix.to/#/#quickshell-development:outfoxxed.me)
+for help on implementation, conventions, etc.
+Feel free to ask for advice early in your implementation if you are
+unsure.

HACKING.md

@@ -1,226 +0,0 @@
-## Development
-
-Install the dependencies listed in [BUILD.md](BUILD.md).
-You probably want all of them even if you don't use all of them
-to ensure tests work correctly and avoid passing a bunch of configure
-flags when you need to wipe the build directory.
-
-The dependencies are also available as a nix shell or nix flake which we recommend
-using with nix-direnv.
-
-Quickshell uses `just` for common development command aliases.
-
-Common aliases:
-- `just configure [<debug|release> [extra cmake args]]` (note that you must specify debug/release to specify extra args)
-- `just build` - runs the build, configuring if not configured already.
-- `just run [args]` - runs quickshell with the given arguments
-- `just clean` - clean up build artifacts. `just clean build` is somewhat common.
-
-### Formatting
-All contributions should be formatted similarly to what already exists.
-Group related functionality together.
-
-Run the formatter using `just fmt`.
-If the results look stupid, fix the clang-format file if possible,
-or disable clang-format in the affected area
-using `// clang-format off` and `// clang-format on`.
-
-#### Style preferences not caught by clang-format
-These are flexible. You can ignore them if it looks or works better to
-for one reason or another.
-
-Use `auto` if the type of a variable can be deduced automatically, instead of
-redeclaring the returned value's type. Additionally, auto should be used when a
-constructor takes arguments.
-
-```cpp
-auto x = <expr>; // ok
-auto x = QString::number(3); // ok
-QString x; // ok
-QString x = "foo"; // ok
-auto x = QString("foo"); // ok
-
-auto x = QString(); // avoid
-QString x(); // avoid
-QString x("foo"); // avoid
-```
-
-Put newlines around logical units of code, and after closing braces. If the
-most reasonable logical unit of code takes only a single line, it should be
-merged into the next single line logical unit if applicable.
-```cpp
-// multiple units
-auto x = <expr>; // unit 1
-auto y = <expr>; // unit 2
-
-auto x = <expr>; // unit 1
-emit this->y(); // unit 2
-
-auto x1 = <expr>; // unit 1
-auto x2 = <expr>; // unit 1
-auto x3 = <expr>; // unit 1
-
-auto y1 = <expr>; // unit 2
-auto y2 = <expr>; // unit 2
-auto y3 = <expr>; // unit 2
-
-// one unit
-auto x = <expr>;
-if (x...) {
-  // ...
-}
-
-// if more than one variable needs to be used then add a newline
-auto x = <expr>;
-auto y = <expr>;
-
-if (x && y) {
-  // ...
-}
-```
-
-Class formatting:
-```cpp
-//! Doc comment summary
-/// Doc comment body
-class Foo: public QObject {
-  // The Q_OBJECT macro comes first. Macros are ; terminated.
-  Q_OBJECT;
-  QML_ELEMENT;
-  QML_CLASSINFO(...);
-  // Properties must stay on a single line or the doc generator won't be able to pick them up
-  Q_PROPERTY(...);
-  /// Doc comment
-  Q_PROPERTY(...);
-  /// Doc comment
-  Q_PROPERTY(...);
-
-public:
-  // Classes should have explicit constructors if they aren't intended to
-  // implicitly cast. The constructor can be inline in the header if it has no body.
-  explicit Foo(QObject* parent = nullptr): QObject(parent) {}
-
-  // Instance functions if applicable.
-  static Foo* instance();
-
-  // Member functions unrelated to properties come next
-  void function();
-  void function();
-  void function();
-
-  // Then Q_INVOKABLEs
-  Q_INVOKABLE function();
-  /// Doc comment
-  Q_INVOKABLE function();
-  /// Doc comment
-  Q_INVOKABLE function();
-
-  // Then property related functions, in the order (bindable, getter, setter).
-  // Related functions may be included here as well. Function bodies may be inline
-  // if they are a single expression. There should be a newline between each
-  // property's methods.
-  [[nodiscard]] QBindable<T> bindableFoo() { return &this->bFoo; }
-  [[nodiscard]] T foo() const { return this->foo; }
-  void setFoo();
-
-  [[nodiscard]] T bar() const { return this->foo; }
-  void setBar();
-
-signals:
-  // Signals that are not property change related go first.
-  // Property change signals go in property definition order.
-  void asd();
-  void asd2();
-  void fooChanged();
-  void barChanged();
-
-public slots:
-  // generally Q_INVOKABLEs are preferred to public slots.
-  void slot();
-
-private slots:
-  // ...
-
-private:
-  // statics, then functions, then fields
-  static const foo BAR;
-  static void foo();
-
-  void foo();
-  void bar();
-
-  // property related members are prefixed with `m`.
-  QString mFoo;
-  QString bar;
-
-  // Bindables go last and should be prefixed with `b`.
-  Q_OBJECT_BINDABLE_PROPERTY(Foo, QString, bFoo, &Foo::fooChanged);
-};
-```
-
-Use lowercase .h suffixed Qt headers, e.g. `<qwindow.h>` over `<QWindow>`.
-
-### Linter
-All contributions should pass the linter.
-
-Note that running the linter requires disabling precompiled
-headers and including the test codepaths:
-```sh
-$ just configure debug -DNO_PCH=ON -DBUILD_TESTING=ON
-$ just lint-changed
-```
-
-If the linter is complaining about something that you think it should not,
-please disable the lint in your MR and explain your reasoning if it isn't obvious.
-
-### Tests
-If you feel like the feature you are working on is very complex or likely to break,
-please write some tests. We will ask you to directly if you send in an MR for an
-overly complex or breakable feature.
-
-At least all tests that passed before your changes should still be passing
-by the time your contribution is ready.
-
-You can run the tests using `just test` but you must enable them first
-using `-DBUILD_TESTING=ON`.
-
-### Documentation
-Most of quickshell's documentation is automatically generated from the source code.
-You should annotate `Q_PROPERTY`s and `Q_INVOKABLE`s with doc comments. Note that the parser
-cannot handle random line breaks and will usually require you to disable clang-format if the
-lines are too long.
-
-Make sure new files containing doc comments are added to a `module.md` file.
-See existing module files for reference.
-
-Doc comments take the form `///` or `///!` (summary) and work with markdown.
-You can reference other types using the `@@[Module.][Type.][member]` shorthand
-where all parts are optional. If module or type are not specified they will
-be inferred as the current module. Member can be a `property`, `function()` or `signal(s)`.
-Look at existing code for how it works.
-
-If you have made a user visible change since the last tagged release, describe it in
-[changelog/next.md](changelog/next.md).
-
-## Contributing
-
-### Commits
-Please structure your commit messages as `scope: commit` where
-the scope is something like `core` or `service/mpris`. (pick what has been
-used historically or what makes sense if new).
-
-Commit descriptions should contain a summary of the changes if they are not
-sufficiently addressed in the commit message.
-
-Please squash/rebase additions or edits to previous changes and follow the
-commit style to keep the history easily searchable at a glance.
-Depending on the change, it is often reasonable to squash it into just
-a single commit. (If you do not follow this we will squash your changes
-for you.)
-
-### Getting help
-If you're getting stuck, you can come talk to us in the
-[quickshell-development matrix room](https://matrix.to/#/#quickshell-development:outfoxxed.me)
-for help on implementation, conventions, etc. There is also a bridged [discord server](https://discord.gg/UtZeT3xNyT).
-Feel free to ask for advice early in your implementation if you are
-unsure.

Justfile

@@ -13,7 +13,7 @@ lint-changed:
 	git diff --name-only HEAD | grep "^.*\.cpp\$" |  parallel -j$(nproc) --no-notice --will-cite --tty --bar clang-tidy --load={{ env_var("TIDYFOX") }}
 
 lint-staged:
-	git diff --staged --name-only --diff-filter=d HEAD | grep "^.*\.cpp\$" |  parallel -j$(nproc) --no-notice --will-cite --tty --bar clang-tidy --load={{ env_var("TIDYFOX") }}
+	git diff --staged --name-only HEAD | grep "^.*\.cpp\$" |  parallel -j$(nproc) --no-notice --will-cite --tty --bar clang-tidy --load={{ env_var("TIDYFOX") }}
 
 configure target='debug' *FLAGS='':
 	cmake -GNinja -B {{builddir}} \

README.md

@@ -7,9 +7,7 @@ This repo is hosted at:
 - https://github.com/quickshell-mirror/quickshell
 
 # Contributing / Development
-- [HACKING.md](HACKING.md) - Development instructions and policy.
-- [CONTRIBUTING.md](CONTRIBUTING.md) - Contribution policy.
-- [BUILD.md](BUILD.md) - Packaging and build instructions.
+See [CONTRIBUTING.md](CONTRIBUTING.md) for details.
 
 #### License
 

changelog/next.md

@@ -20,32 +20,19 @@ set shell id.
 - Added the ability to handle move and resize events to FloatingWindow.
 - Pipewire service now reconnects if pipewire dies or a protocol error occurs.
 - Added pipewire audio peak detection.
-- Added network management support.
+- Added initial support for network management.
 - Added support for grabbing focus from popup windows.
 - Added support for IPC signal listeners.
 - Added Quickshell version checking and version gated preprocessing.
 - Added a way to detect if an icon is from the system icon theme or not.
 - Added vulkan support to screencopy.
-- Added generic WindowManager interface implementing ext-workspace.
-- Added ext-background-effect window blur support.
-- Added per-corner radius support to Region.
-- Added ColorQuantizer region selection.
-- Added dialog window support to FloatingWindow.
-- Added lua config support to Hyprland module.
 
 ## Other Changes
 
+- FreeBSD is now partially supported.
 - IPC operations filter available instances to the current display connection by default.
 - PwNodeLinkTracker ignores sound level monitoring programs.
 - Replaced breakpad with cpptrace.
-- Reloads are prevented if no file content has changed.
-- Added `QS_DISABLE_FILE_WATCHER` environment variable to disable file watching.
-- Added `QS_DISABLE_CRASH_HANDLER` environment variable to disable crash handling.
-- Added `QS_CRASHREPORT_URL` environment variable to allow overriding the crash reporter link.
-- Added `AppId` pragma and `QS_APP_ID` environment variable to allow overriding the desktop application ID.
-- Added `DropExpensiveFonts` pragma and `QS_DROP_EXPENSIVE_FONTS` environment variable which avoids loading fonts which may cause lag and excessive memory usage if many variants are used.
-- Added `DefaultEnv` pragma which sets an environment variable if not already set.
-- Unrecognized pragmas are no longer a hard error for future backward compatibility.
 
 ## Bug Fixes
 
@@ -56,7 +43,6 @@ set shell id.
 - Fixed volumes not initializing if a pipewire device was already loaded before its node.
 - Fixed hyprland active toplevel not resetting after window closes.
 - Fixed hyprland ipc window names and titles being reversed.
-- Fixed a hyprland ipc crash when refreshing toplevels before workspaces.
 - Fixed missing signals for system tray item title and description updates.
 - Fixed asynchronous loaders not working after reload.
 - Fixed asynchronous loaders not working before window creation.
@@ -64,26 +50,9 @@ set shell id.
 - Fixed ClippingRectangle related crashes.
 - Fixed crashes when monitors are unplugged.
 - Fixed crashes when default pipewire devices are lost.
-- Fixed ToplevelManager not clearing activeToplevel on deactivation.
-- Desktop action order is now preserved.
-- Fixed partial socket reads in greetd and hyprland on slow machines.
-- Worked around Qt bug causing crashes when plugging and unplugging monitors.
-- Fixed HyprlandFocusGrab crashing if windows were destroyed after being passed to it.
-- Fixed ScreencopyView pixelation when scaled.
-- Fixed JsonAdapter crashing and providing bad data on read when using JsonObject.
-- Fixed JsonAdapter sending unnecessary property changes for primitive values.
-- Fixed JsonAdapter serialization for lists.
-- Fixed pipewire crashes after hotplugging devices and changing default outputs.
-- Fixed launches failing for `--daemonize` on some systems.
-- Fixed screencopy crashing when used across GPUs.
-- Fixed pipewire volumes not working for some pw-pulse clients.
-- Fixed nulls in Toplevel.screens after unplugging a monitor.
-- Fixed some DbusMenu updates being dropped from apps.
 
 ## Packaging Changes
 
 - `glib` and `polkit` have been added as dependencies when compiling with polkit agent support.
 - `vulkan-headers` has been added as a build-time dependency for screencopy (Vulkan backend support).
 - `breakpad` has been replaced by `cpptrace`, which is far easier to package, and the `CRASH_REPORTER` cmake variable has been replaced with `CRASH_HANDLER` to stop this from being easy to ignore.
-- `DISTRIBUTOR_DEBUGINFO_AVAILABLE` was removed as it is no longer important without breakpad.
-- `libdrm` is now unconditionally required as a direct dependency.

default.nix

@@ -19,7 +19,6 @@
   wayland-protocols,
   wayland-scanner,
   xorg,
-  libxcb ? xorg.libxcb,
   libdrm,
   libgbm ? null,
   vulkan-headers,
@@ -56,7 +55,7 @@
 
   unwrapped = stdenv.mkDerivation {
     pname = "quickshell${lib.optionalString debug "-debug"}";
-    version = "0.3.0";
+    version = "0.2.1";
     src = nix-gitignore.gitignoreSource "/default.nix\n" ./.;
 
     dontWrapQtApps = true; # see wrappers
@@ -76,21 +75,24 @@
     buildInputs = [
       qt6.qtbase
       qt6.qtdeclarative
-      libdrm
       cli11
     ]
     ++ lib.optional withQtSvg qt6.qtsvg
-    ++ lib.optional withCrashHandler (cpptrace.overrideAttrs (prev: {
-      cmakeFlags = prev.cmakeFlags ++ [
-        "-DCPPTRACE_UNWIND_WITH_LIBUNWIND=TRUE"
-      ];
-      buildInputs = prev.buildInputs ++ [ libunwind ];
-    }))
+    ++ lib.optionals withCrashHandler [
+      (cpptrace.overrideAttrs (prev: {
+        cmakeFlags = prev.cmakeFlags ++ [
+          "-DCPPTRACE_UNWIND_WITH_LIBUNWIND=TRUE"
+        ];
+        buildInputs = prev.buildInputs ++ [ libunwind ];
+      }))
+      libunwind
+      libdwarf
+    ]
     ++ lib.optional withJemalloc jemalloc
     ++ lib.optional (withWayland && lib.strings.compareVersions qt6.qtbase.version "6.10.0" == -1) qt6.qtwayland
     ++ lib.optionals withWayland [ wayland wayland-protocols ]
-    ++ lib.optionals (withWayland && libgbm != null) [ libgbm vulkan-headers ]
-    ++ lib.optional withX11 libxcb
+    ++ lib.optionals (withWayland && libgbm != null) [ libdrm libgbm vulkan-headers ]
+    ++ lib.optional withX11 xorg.libxcb
     ++ lib.optional withPam pam
     ++ lib.optional withPipewire pipewire
     ++ lib.optionals withPolkit [ polkit glib ];

quickshell.scm

@@ -0,0 +1,77 @@
+(define-module (quickshell)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (gnu packages cpp)
+  #:use-module (gnu packages freedesktop)
+  #:use-module (gnu packages gcc)
+  #:use-module (gnu packages gl)
+  #:use-module (gnu packages jemalloc)
+  #:use-module (gnu packages linux)
+  #:use-module (gnu packages ninja)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages qt)
+  #:use-module (gnu packages vulkan)
+  #:use-module (gnu packages xdisorg)
+  #:use-module (gnu packages xorg)
+  #:use-module (guix build-system cmake)
+  #:use-module (guix download)
+  #:use-module (guix gexp)
+  #:use-module (guix git-download)
+  #:use-module (guix packages)
+  #:use-module (guix packages)
+  #:use-module (guix utils))
+
+(define-public quickshell-git
+  (package
+    (name "quickshell")
+    (version "git")
+    (source (local-file "." "quickshell-checkout"
+                        #:recursive? #t
+                        #:select? (or (git-predicate (current-source-directory))
+                                      (const #t))))
+    (build-system cmake-build-system)
+    (propagated-inputs (list qtbase qtdeclarative qtsvg))
+    (native-inputs (list ninja
+                         gcc-14
+                         pkg-config
+                         qtshadertools
+                         spirv-tools
+                         wayland-protocols
+                         cli11))
+    (inputs (list jemalloc
+                  libdrm
+                  libxcb
+                  libxkbcommon
+                  linux-pam
+                  polkit
+                  mesa
+                  pipewire
+                  qtbase
+                  qtdeclarative
+                  qtwayland
+                  vulkan-headers
+                  wayland))
+    (arguments
+     (list #:tests? #f
+           #:configure-flags
+           #~(list "-GNinja"
+                   "-DDISTRIBUTOR=\"In-tree Guix channel\""
+                   "-DDISTRIBUTOR_DEBUGINFO_AVAILABLE=NO"
+                   "-DCRASH_HANDLER=OFF")
+           #:phases
+           #~(modify-phases %standard-phases
+               (replace 'build (lambda _ (invoke "cmake" "--build" ".")))
+               (replace 'install (lambda _ (invoke "cmake" "--install" ".")))
+               (add-after 'install 'wrap-program
+                 (lambda* (#:key inputs #:allow-other-keys)
+                   (wrap-program (string-append #$output "/bin/quickshell")
+                     `("QML_IMPORT_PATH" ":"
+                       = (,(getenv "QML_IMPORT_PATH")))))))))
+    (home-page "https://quickshell.outfoxxed.me")
+    (synopsis "QtQuick-based desktop shell toolkit")
+    (description
+     "Quickshell is a flexible QtQuick-based toolkit for creating and
+customizing toolbars, notification centers, and other desktop
+environment tools in a live programming environment.")
+    (license license:lgpl3)))
+
+quickshell-git

src/CMakeLists.txt

@@ -11,7 +11,6 @@ add_subdirectory(window)
 add_subdirectory(io)
 add_subdirectory(widgets)
 add_subdirectory(ui)
-add_subdirectory(windowmanager)
 
 if (CRASH_HANDLER)
 	add_subdirectory(crash)

src/build/CMakeLists.txt

@@ -15,6 +15,12 @@ else()
 	set(CRASH_HANDLER_DEF 0)
 endif()
 
+if (DISTRIBUTOR_DEBUGINFO_AVAILABLE)
+	set(DEBUGINFO_AVAILABLE 1)
+else()
+	set(DEBUGINFO_AVAILABLE 0)
+endif()
+
 configure_file(build.hpp.in build.hpp @ONLY ESCAPE_QUOTES)
 
 target_include_directories(quickshell-build INTERFACE ${CMAKE_CURRENT_BINARY_DIR})

src/build/build.hpp.in

@@ -8,10 +8,10 @@
 #define QS_UNRELEASED_FEATURES "@UNRELEASED_FEATURES@"
 #define GIT_REVISION "@GIT_REVISION@"
 #define DISTRIBUTOR "@DISTRIBUTOR@"
+#define DISTRIBUTOR_DEBUGINFO_AVAILABLE @DEBUGINFO_AVAILABLE@
 #define CRASH_HANDLER @CRASH_HANDLER_DEF@
 #define BUILD_TYPE "@CMAKE_BUILD_TYPE@"
 #define COMPILER "@CMAKE_CXX_COMPILER_ID@ (@CMAKE_CXX_COMPILER_VERSION@)"
 #define COMPILE_FLAGS "@CMAKE_CXX_FLAGS@"
 #define BUILD_CONFIGURATION "@QS_BUILD_OPTIONS@"
-#define CRASHREPORT_URL "@CRASHREPORT_URL@"
 // NOLINTEND

src/core/CMakeLists.txt

@@ -1,4 +1,3 @@
-pkg_check_modules(libdrm REQUIRED IMPORTED_TARGET libdrm)
 qt_add_library(quickshell-core STATIC
 	plugin.cpp
 	shell.cpp
@@ -41,8 +40,6 @@ qt_add_library(quickshell-core STATIC
 	scriptmodel.cpp
 	colorquantizer.cpp
 	toolsupport.cpp
-	streamreader.cpp
-	debuginfo.cpp
 )
 
 qt_add_qml_module(quickshell-core
@@ -55,7 +52,7 @@ qt_add_qml_module(quickshell-core
 
 install_qml_module(quickshell-core)
 
-target_link_libraries(quickshell-core PRIVATE Qt::Quick Qt::QuickPrivate Qt::Widgets quickshell-build PkgConfig::libdrm)
+target_link_libraries(quickshell-core PRIVATE Qt::Quick Qt::QuickPrivate Qt::Widgets quickshell-build)
 
 qs_module_pch(quickshell-core SET large)
 

src/core/colorquantizer.cpp

@@ -13,7 +13,6 @@
 #include <qnumeric.h>
 #include <qobject.h>
 #include <qqmllist.h>
-#include <qrect.h>
 #include <qrgb.h>
 #include <qthreadpool.h>
 #include <qtmetamacros.h>
@@ -25,15 +24,9 @@ namespace {
 QS_LOGGING_CATEGORY(logColorQuantizer, "quickshell.colorquantizer", QtWarningMsg);
 }
 
-ColorQuantizerOperation::ColorQuantizerOperation(
-    QUrl* source,
-    qreal depth,
-    QRect imageRect,
-    qreal rescaleSize
-)
+ColorQuantizerOperation::ColorQuantizerOperation(QUrl* source, qreal depth, qreal rescaleSize)
     : source(source)
     , maxDepth(depth)
-    , imageRect(imageRect)
     , rescaleSize(rescaleSize) {
 	this->setAutoDelete(false);
 }
@@ -44,11 +37,6 @@ void ColorQuantizerOperation::quantizeImage(const QAtomicInteger<bool>& shouldCa
 	this->colors.clear();
 
 	auto image = QImage(this->source->toLocalFile());
-
-	if (this->imageRect.isValid()) {
-		image = image.copy(this->imageRect);
-	}
-
 	if ((image.width() > this->rescaleSize || image.height() > this->rescaleSize)
 	    && this->rescaleSize > 0)
 	{
@@ -210,27 +198,16 @@ void ColorQuantizer::setDepth(qreal depth) {
 		this->mDepth = depth;
 		emit this->depthChanged();
 
-		if (this->componentCompleted && !this->mSource.isEmpty()) this->quantizeAsync();
+		if (this->componentCompleted) this->quantizeAsync();
 	}
 }
 
-void ColorQuantizer::setImageRect(QRect imageRect) {
-	if (this->mImageRect != imageRect) {
-		this->mImageRect = imageRect;
-		emit this->imageRectChanged();
-
-		if (this->componentCompleted && !this->mSource.isEmpty()) this->quantizeAsync();
-	}
-}
-
-void ColorQuantizer::resetImageRect() { this->setImageRect(QRect()); }
-
 void ColorQuantizer::setRescaleSize(int rescaleSize) {
 	if (this->mRescaleSize != rescaleSize) {
 		this->mRescaleSize = rescaleSize;
 		emit this->rescaleSizeChanged();
 
-		if (this->componentCompleted && !this->mSource.isEmpty()) this->quantizeAsync();
+		if (this->componentCompleted) this->quantizeAsync();
 	}
 }
 
@@ -244,13 +221,8 @@ void ColorQuantizer::quantizeAsync() {
 	if (this->liveOperation) this->cancelAsync();
 
 	qCDebug(logColorQuantizer) << "Starting color quantization asynchronously";
-
-	this->liveOperation = new ColorQuantizerOperation(
-	    &this->mSource,
-	    this->mDepth,
-	    this->mImageRect,
-	    this->mRescaleSize
-	);
+	this->liveOperation =
+	    new ColorQuantizerOperation(&this->mSource, this->mDepth, this->mRescaleSize);
 
 	QObject::connect(
 	    this->liveOperation,

src/core/colorquantizer.hpp

@@ -5,7 +5,6 @@
 #include <qproperty.h>
 #include <qqmlintegration.h>
 #include <qqmlparserstatus.h>
-#include <qrect.h>
 #include <qrunnable.h>
 #include <qtmetamacros.h>
 #include <qtypes.h>
@@ -17,7 +16,7 @@ class ColorQuantizerOperation
 	Q_OBJECT;
 
 public:
-	explicit ColorQuantizerOperation(QUrl* source, qreal depth, QRect imageRect, qreal rescaleSize);
+	explicit ColorQuantizerOperation(QUrl* source, qreal depth, qreal rescaleSize);
 
 	void run() override;
 	void tryCancel();
@@ -45,7 +44,6 @@ private:
 	QList<QColor> colors;
 	QUrl* source;
 	qreal maxDepth;
-	QRect imageRect;
 	qreal rescaleSize;
 };
 
@@ -80,16 +78,9 @@ class ColorQuantizer
 	/// binary split of the color space
 	Q_PROPERTY(qreal depth READ depth WRITE setDepth NOTIFY depthChanged);
 
-	// clang-format off
-	/// Rectangle that the source image is cropped to.
-	///
-	/// Can be set to `undefined` to reset.
-	Q_PROPERTY(QRect imageRect READ imageRect WRITE setImageRect RESET resetImageRect NOTIFY imageRectChanged);
-	// clang-format on
-
 	/// The size to rescale the image to, when rescaleSize is 0 then no scaling will be done.
 	/// > [!NOTE] Results from color quantization doesn't suffer much when rescaling, it's
-	/// > recommended to rescale, otherwise the quantization process will take much longer.
+	/// > reccommended to rescale, otherwise the quantization process will take much longer.
 	Q_PROPERTY(qreal rescaleSize READ rescaleSize WRITE setRescaleSize NOTIFY rescaleSizeChanged);
 
 public:
@@ -106,10 +97,6 @@ public:
 	[[nodiscard]] qreal depth() const { return this->mDepth; }
 	void setDepth(qreal depth);
 
-	[[nodiscard]] QRect imageRect() const { return this->mImageRect; }
-	void setImageRect(QRect imageRect);
-	void resetImageRect();
-
 	[[nodiscard]] qreal rescaleSize() const { return this->mRescaleSize; }
 	void setRescaleSize(int rescaleSize);
 
@@ -117,7 +104,6 @@ signals:
 	void colorsChanged();
 	void sourceChanged();
 	void depthChanged();
-	void imageRectChanged();
 	void rescaleSizeChanged();
 
 public slots:
@@ -131,7 +117,6 @@ private:
 	ColorQuantizerOperation* liveOperation = nullptr;
 	QUrl mSource;
 	qreal mDepth = 0;
-	QRect mImageRect;
 	qreal mRescaleSize = 0;
 
 	Q_OBJECT_BINDABLE_PROPERTY(

src/core/debuginfo.cpp

@@ -1,176 +0,0 @@
-#include "debuginfo.hpp"
-#include <array>
-#include <cstring>
-#include <string_view>
-
-#include <fcntl.h>
-#include <qconfig.h>
-#include <qcontainerfwd.h>
-#include <qdebug.h>
-#include <qfile.h>
-#include <qfloat16.h>
-#include <qhashfunctions.h>
-#include <qscopeguard.h>
-#include <qtversion.h>
-#include <unistd.h>
-#include <xf86drm.h>
-
-#include "build.hpp"
-
-extern char** environ; // NOLINT
-
-namespace qs::debuginfo {
-
-QString qsVersion() {
-	return QS_VERSION " (revision " GIT_REVISION ", distributed by " DISTRIBUTOR ")";
-}
-
-QString qtVersion() { return qVersion() % QStringLiteral(" (built against " QT_VERSION_STR ")"); }
-
-QString gpuInfo() {
-	auto deviceCount = drmGetDevices2(0, nullptr, 0);
-	if (deviceCount < 0) return "Failed to get DRM device count: " % QString::number(deviceCount);
-	auto* devices = new drmDevicePtr[deviceCount];
-	auto devicesArrayGuard = qScopeGuard([&] { delete[] devices; });
-	auto r = drmGetDevices2(0, devices, deviceCount);
-	if (deviceCount < 0) return "Failed to get DRM devices: " % QString::number(r);
-	auto devicesGuard = qScopeGuard([&] {
-		for (auto i = 0; i != deviceCount; ++i) drmFreeDevice(&devices[i]); // NOLINT
-	});
-
-	QString info;
-	auto stream = QTextStream(&info);
-
-	for (auto i = 0; i != deviceCount; ++i) {
-		auto* device = devices[i]; // NOLINT
-
-		int deviceNodeType = -1;
-		if (device->available_nodes & (1 << DRM_NODE_RENDER)) deviceNodeType = DRM_NODE_RENDER;
-		else if (device->available_nodes & (1 << DRM_NODE_PRIMARY)) deviceNodeType = DRM_NODE_PRIMARY;
-
-		if (deviceNodeType == -1) continue;
-
-		auto* deviceNode = device->nodes[DRM_NODE_RENDER]; // NOLINT
-
-		auto driver = [&]() -> QString {
-			auto fd = open(deviceNode, O_RDWR | O_CLOEXEC);
-			if (fd == -1) return "<failed to open device node>";
-			auto fdGuard = qScopeGuard([&] { close(fd); });
-			auto* ver = drmGetVersion(fd);
-			if (!ver) return "<drmGetVersion failed>";
-			auto verGuard = qScopeGuard([&] { drmFreeVersion(ver); });
-
-			// clang-format off
-			return QString(ver->name)
-				% ' ' % QString::number(ver->version_major)
-				% '.' % QString::number(ver->version_minor)
-				% '.' % QString::number(ver->version_patchlevel)
-				% " (" % ver->desc % ')';
-			// clang-format on
-		}();
-
-		QString product = "unknown";
-		QString address = "unknown";
-
-		auto hex = [](int num, int pad) { return QString::number(num, 16).rightJustified(pad, '0'); };
-
-		switch (device->bustype) {
-		case DRM_BUS_PCI: {
-			auto* b = device->businfo.pci;
-			auto* d = device->deviceinfo.pci;
-			address = "PCI " % hex(b->bus, 2) % ':' % hex(b->dev, 2) % '.' % hex(b->func, 1);
-			product = hex(d->vendor_id, 4) % ':' % hex(d->device_id, 4);
-		} break;
-		case DRM_BUS_USB: {
-			auto* b = device->businfo.usb;
-			auto* d = device->deviceinfo.usb;
-			address = "USB " % QString::number(b->bus) % ':' % QString::number(b->dev);
-			product = hex(d->vendor, 4) % ':' % hex(d->product, 4);
-		} break;
-		default: break;
-		}
-
-		stream << "GPU " << deviceNode << "\n  Driver: " << driver << "\n  Model: " << product
-		       << "\n  Address: " << address << '\n';
-	}
-
-	return info;
-}
-
-QString systemInfo() {
-	QString info;
-	auto stream = QTextStream(&info);
-
-	stream << gpuInfo() << '\n';
-
-	stream << "/etc/os-release:";
-	auto osReleaseFile = QFile("/etc/os-release");
-	if (osReleaseFile.open(QFile::ReadOnly)) {
-		stream << '\n' << osReleaseFile.readAll() << '\n';
-		osReleaseFile.close();
-	} else {
-		stream << "FAILED TO OPEN\n";
-	}
-
-	stream << "/etc/lsb-release:";
-	auto lsbReleaseFile = QFile("/etc/lsb-release");
-	if (lsbReleaseFile.open(QFile::ReadOnly)) {
-		stream << '\n' << lsbReleaseFile.readAll();
-		lsbReleaseFile.close();
-	} else {
-		stream << "FAILED TO OPEN\n";
-	}
-
-	return info;
-}
-
-QString envInfo() {
-	QString info;
-	auto stream = QTextStream(&info);
-
-	for (auto** envp = environ; *envp != nullptr; ++envp) { // NOLINT
-		auto prefixes = std::array<std::string_view, 6> {
-		    "QS_",
-		    "QT_",
-		    "QML_",
-		    "QML2_",
-		    "QSG_",
-		    "XDG_CURRENT_DESKTOP=",
-		};
-
-		for (const auto& prefix: prefixes) {
-			if (strncmp(prefix.data(), *envp, prefix.length()) == 0) goto print;
-		}
-		continue;
-
-	print:
-		stream << *envp << '\n';
-	}
-
-	return info;
-}
-
-QString combinedInfo() {
-	QString info;
-	auto stream = QTextStream(&info);
-
-	stream << "===== Version Information =====\n";
-	stream << "Quickshell: " << qsVersion() << '\n';
-	stream << "Qt: " << qtVersion() << '\n';
-
-	stream << "\n===== Build Information =====\n";
-	stream << "Build Type: " << BUILD_TYPE << '\n';
-	stream << "Compiler: " << COMPILER << '\n';
-	stream << "Compile Flags: " << COMPILE_FLAGS << '\n';
-	stream << "Configuration:\n" << BUILD_CONFIGURATION << '\n';
-
-	stream << "\n===== System Information =====\n";
-	stream << systemInfo();
-
-	stream << "\n===== Environment (trimmed) =====\n";
-	stream << envInfo();
-
-	return info;
-}
-
-} // namespace qs::debuginfo

src/core/debuginfo.hpp

@@ -1,14 +0,0 @@
-#pragma once
-
-#include <qcontainerfwd.h>
-
-namespace qs::debuginfo {
-
-QString qsVersion();
-QString qtVersion();
-QString gpuInfo();
-QString systemInfo();
-QString envInfo();
-QString combinedInfo();
-
-} // namespace qs::debuginfo

src/core/desktopentry.cpp

@@ -107,10 +107,7 @@ ParsedDesktopEntryData DesktopEntry::parseText(const QString& id, const QString&
 	auto groupName = QString();
 	auto entries = QHash<QString, QPair<Locale, QString>>();
 
-	auto actionOrder = QStringList();
-	auto pendingActions = QHash<QString, DesktopActionData>();
-
-	auto finishCategory = [&data, &groupName, &entries, &actionOrder, &pendingActions]() {
+	auto finishCategory = [&data, &groupName, &entries]() {
 		if (groupName == "Desktop Entry") {
 			if (entries.value("Type").second != "Application") return;
 
@@ -132,10 +129,9 @@ ParsedDesktopEntryData DesktopEntry::parseText(const QString& id, const QString&
 				else if (key == "Terminal") data.terminal = value == "true";
 				else if (key == "Categories") data.categories = value.split(u';', Qt::SkipEmptyParts);
 				else if (key == "Keywords") data.keywords = value.split(u';', Qt::SkipEmptyParts);
-				else if (key == "Actions") actionOrder = value.split(u';', Qt::SkipEmptyParts);
 			}
 		} else if (groupName.startsWith("Desktop Action ")) {
-			auto actionName = groupName.sliced(15);
+			auto actionName = groupName.sliced(16);
 			DesktopActionData action;
 			action.id = actionName;
 
@@ -151,7 +147,7 @@ ParsedDesktopEntryData DesktopEntry::parseText(const QString& id, const QString&
 				}
 			}
 
-			pendingActions.insert(actionName, action);
+			data.actions.insert(actionName, action);
 		}
 
 		entries.clear();
@@ -197,13 +193,6 @@ ParsedDesktopEntryData DesktopEntry::parseText(const QString& id, const QString&
 	}
 
 	finishCategory();
-
-	for (const auto& actionId: actionOrder) {
-		if (pendingActions.contains(actionId)) {
-			data.actions.append(pendingActions.value(actionId));
-		}
-	}
-
 	return data;
 }
 
@@ -227,18 +216,17 @@ void DesktopEntry::updateState(const ParsedDesktopEntryData& newState) {
 	this->updateActions(newState.actions);
 }
 
-void DesktopEntry::updateActions(const QVector<DesktopActionData>& newActions) {
+void DesktopEntry::updateActions(const QHash<QString, DesktopActionData>& newActions) {
 	auto old = this->mActions;
-	this->mActions.clear();
 
-	for (const auto& d: newActions) {
+	for (const auto& [key, d]: newActions.asKeyValueRange()) {
 		DesktopAction* act = nullptr;
-		auto found = std::ranges::find(old, d.id, &DesktopAction::mId);
-		if (found != old.end()) {
-			act = *found;
+		if (auto found = old.find(key); found != old.end()) {
+			act = found.value();
 			old.erase(found);
 		} else {
 			act = new DesktopAction(d.id, this);
+			this->mActions.insert(key, act);
 		}
 
 		Qt::beginPropertyUpdateGroup();
@@ -249,7 +237,6 @@ void DesktopEntry::updateActions(const QVector<DesktopActionData>& newActions) {
 		Qt::endPropertyUpdateGroup();
 
 		act->mEntries = d.entries;
-		this->mActions.append(act);
 	}
 
 	for (auto* leftover: old) {
@@ -263,7 +250,7 @@ void DesktopEntry::execute() const {
 
 bool DesktopEntry::isValid() const { return !this->bName.value().isEmpty(); }
 
-QVector<DesktopAction*> DesktopEntry::actions() const { return this->mActions; }
+QVector<DesktopAction*> DesktopEntry::actions() const { return this->mActions.values(); }
 
 QVector<QString> DesktopEntry::parseExecString(const QString& execString) {
 	QVector<QString> arguments;

src/core/desktopentry.hpp

@@ -43,7 +43,7 @@ struct ParsedDesktopEntryData {
 	QVector<QString> categories;
 	QVector<QString> keywords;
 	QHash<QString, QString> entries;
-	QVector<DesktopActionData> actions;
+	QHash<QString, DesktopActionData> actions;
 };
 
 /// A desktop entry. See @@DesktopEntries for details.
@@ -164,10 +164,10 @@ public:
 	// clang-format on
 
 private:
-	void updateActions(const QVector<DesktopActionData>& newActions);
+	void updateActions(const QHash<QString, DesktopActionData>& newActions);
 
 	ParsedDesktopEntryData state;
-	QVector<DesktopAction*> mActions;
+	QHash<QString, DesktopAction*> mActions;
 
 	friend class DesktopAction;
 };

src/core/generation.cpp

@@ -209,8 +209,6 @@ bool EngineGeneration::setExtraWatchedFiles(const QVector<QString>& files) {
 	for (const auto& file: files) {
 		if (!this->scanner.scannedFiles.contains(file)) {
 			this->extraWatchedFiles.append(file);
-			QByteArray data;
-			this->scanner.readAndHashFile(file, data);
 		}
 	}
 
@@ -231,11 +229,6 @@ void EngineGeneration::onFileChanged(const QString& name) {
 		auto fileInfo = QFileInfo(name);
 		if (fileInfo.isFile() && fileInfo.size() == 0) return;
 
-		if (!this->scanner.hasFileContentChanged(name)) {
-			qCDebug(logQmlScanner) << "Ignoring file change with unchanged content:" << name;
-			return;
-		}
-
 		emit this->filesChanged();
 	}
 }
@@ -244,11 +237,6 @@ void EngineGeneration::onDirectoryChanged() {
 	// try to find any files that were just deleted from a replace operation
 	for (auto& file: this->deletedWatchedFiles) {
 		if (QFileInfo(file).exists()) {
-			if (!this->scanner.hasFileContentChanged(file)) {
-				qCDebug(logQmlScanner) << "Ignoring restored file with unchanged content:" << file;
-				continue;
-			}
-
 			emit this->filesChanged();
 			break;
 		}

src/core/iconprovider.cpp

@@ -14,7 +14,7 @@
 
 #include "generation.hpp"
 
-// QMenu re-calls pixmap() every time the mouse moves so it's important to cache it.
+// QMenu re-calls pixmap() every time the mouse moves so its important to cache it.
 class PixmapCacheIconEngine: public QIconEngine {
 	void paint(
 	    QPainter* /*unused*/,

src/core/instanceinfo.cpp

@@ -3,14 +3,14 @@
 #include <qdatastream.h>
 
 QDataStream& operator<<(QDataStream& stream, const InstanceInfo& info) {
-	stream << info.instanceId << info.configPath << info.shellId << info.appId << info.launchTime
-	       << info.pid << info.display;
+	stream << info.instanceId << info.configPath << info.shellId << info.launchTime << info.pid
+	       << info.display;
 	return stream;
 }
 
 QDataStream& operator>>(QDataStream& stream, InstanceInfo& info) {
-	stream >> info.instanceId >> info.configPath >> info.shellId >> info.appId >> info.launchTime
-	    >> info.pid >> info.display;
+	stream >> info.instanceId >> info.configPath >> info.shellId >> info.launchTime >> info.pid
+	    >> info.display;
 	return stream;
 }
 

src/core/instanceinfo.hpp

@@ -9,7 +9,6 @@ struct InstanceInfo {
 	QString instanceId;
 	QString configPath;
 	QString shellId;
-	QString appId;
 	QDateTime launchTime;
 	pid_t pid = -1;
 	QString display;

src/core/logging.cpp

@@ -14,7 +14,6 @@
 #include <qlist.h>
 #include <qlogging.h>
 #include <qloggingcategory.h>
-#include <qmutex.h>
 #include <qnamespace.h>
 #include <qobject.h>
 #include <qobjectdefs.h>
@@ -32,9 +31,6 @@
 #include <sys/sendfile.h>
 #include <sys/types.h>
 #endif
-#ifdef __FreeBSD__
-#include <unistd.h>
-#endif
 
 #include "instanceinfo.hpp"
 #include "logcat.hpp"
@@ -71,7 +67,7 @@ bool copyFileData(int sourceFd, int destFd, qint64 size) {
 	return true;
 #else
 	std::array<char, 64 * 1024> buffer = {};
-	auto remaining = usize;
+	auto remaining = totalTarget;
 
 	while (remaining > 0) {
 		auto chunk = std::min(remaining, buffer.size());
@@ -221,7 +217,6 @@ void LogManager::messageHandler(
 	}
 
 	if (display) {
-		auto locker = QMutexLocker(&self->stdoutMutex);
 		LogMessage::formatMessage(
 		    self->stdoutStream,
 		    message,
@@ -257,21 +252,9 @@ void LogManager::filterCategory(QLoggingCategory* category) {
 		filter.warn = filter.info || instance->mDefaultLevel == QtWarningMsg || defaultLevel == QtWarningMsg;
 		filter.critical = filter.warn || instance->mDefaultLevel == QtCriticalMsg || defaultLevel == QtCriticalMsg;
 		// clang-format on
-	} else {
-		if (instance->lastCategoryFilter) {
-			instance->lastCategoryFilter(category);
-			filter = CategoryFilter(category);
-		}
-
-		// Hides virtual/override property warnings.
-		// Getting rid of this is blocked by https://qt-project.atlassian.net/browse/QTBUG-145977
-		// for internal Quickshell types, and may still be desired for shells that want to maintain
-		// compatibility with Qt versions prior to 6.11.
-		if (categoryName == QLatin1StringView("qt.qml.propertyCache.append")
-		    && !qEnvironmentVariableIsSet("QS_NO_FILTER_QT_LOGS"))
-		{
-			filter.warn = false;
-		}
+	} else if (instance->lastCategoryFilter) {
+		instance->lastCategoryFilter(category);
+		filter = CategoryFilter(category);
 	}
 
 	for (const auto& rule: *instance->rules) {
@@ -322,15 +305,10 @@ void LogManager::init(
 		instance->rules->append(parser.rules());
 	}
 
-	instance->lastCategoryFilter = QLoggingCategory::installFilter(&LogManager::filterCategory);
-
-	if (instance->lastCategoryFilter == &LogManager::filterCategory) {
-		qCFatal(logLogging) << "Quickshell's log filter has been installed twice. This is a bug.";
-		instance->lastCategoryFilter = nullptr;
-	}
-
 	qInstallMessageHandler(&LogManager::messageHandler);
 
+	instance->lastCategoryFilter = QLoggingCategory::installFilter(&LogManager::filterCategory);
+
 	qCDebug(logLogging) << "Creating offthread logger...";
 	auto* thread = new QThread();
 	instance->threadProxy.moveToThread(thread);
@@ -542,7 +520,7 @@ void ThreadLogging::initFs() {
 	    Qt::QueuedConnection
 	);
 
-	qCDebug(logLogging) << "Switched threaded logger to queued event loop connection.";
+	qCDebug(logLogging) << "Switched threaded logger to queued eventloop connection.";
 }
 
 void ThreadLogging::onMessage(const LogMessage& msg, bool showInSparse) {

src/core/logging.hpp

@@ -10,7 +10,6 @@
 #include <qlatin1stringview.h>
 #include <qlogging.h>
 #include <qloggingcategory.h>
-#include <qmutex.h>
 #include <qobject.h>
 #include <qtmetamacros.h>
 
@@ -136,7 +135,6 @@ private:
 	QHash<QLatin1StringView, CategoryFilter> allFilters;
 
 	QTextStream stdoutStream;
-	QMutex stdoutMutex;
 	LoggingThreadProxy threadProxy;
 
 	friend void initLogCategoryLevel(const char* name, QtMsgType defaultLevel);

src/core/model.hpp

@@ -138,10 +138,6 @@ public:
 		qsizetype oi = 0;
 		for (auto* object: newValues) {
 			if (this->mValuesList.length() == oi || this->mValuesList.at(oi) != object) {
-				// object may already be present further down (reorder case);
-				// drop the old row first so the same pointer is not inserted twice.
-				auto old = this->mValuesList.indexOf(object, oi);
-				if (old != -1) this->removeAt(old);
 				this->insertObject(object, oi);
 			}
 

src/core/paths.cpp

@@ -1,7 +1,6 @@
 #include "paths.hpp"
 #include <cerrno>
 #include <cstdio>
-#include <tuple>
 #include <utility>
 
 #include <fcntl.h>
@@ -10,6 +9,7 @@
 #include <qdir.h>
 #include <qlogging.h>
 #include <qloggingcategory.h>
+#include <qpair.h>
 #include <qstandardpaths.h>
 #include <qtenvironmentvariables.h>
 #include <qtversionchecks.h>
@@ -64,7 +64,7 @@ QDir* QsPaths::baseRunDir() {
 	if (this->baseRunState == DirState::Unknown) {
 		auto runtimeDir = qEnvironmentVariable("XDG_RUNTIME_DIR");
 		if (runtimeDir.isEmpty()) {
-			runtimeDir = QString("/run/user/%1").arg(getuid());
+			runtimeDir = QString("/run/user/$1").arg(getuid());
 			qCInfo(logPaths) << "XDG_RUNTIME_DIR was not set, defaulting to" << runtimeDir;
 		}
 
@@ -412,11 +412,10 @@ bool QsPaths::checkLock(const QString& path, InstanceLockInfo* info, bool allowD
 	return true;
 }
 
-std::tuple<QVector<InstanceLockInfo>, QVector<InstanceLockInfo>, QVector<InstanceLockInfo>>
+QPair<QVector<InstanceLockInfo>, QVector<InstanceLockInfo>>
 QsPaths::collectInstances(const QString& path, const QString& display) {
 	qCDebug(logPaths) << "Collecting instances from" << path;
 	auto liveInstances = QVector<InstanceLockInfo>();
-	auto mismatchedInstances = QVector<InstanceLockInfo>();
 	auto deadInstances = QVector<InstanceLockInfo>();
 	auto dir = QDir(path);
 
@@ -428,22 +427,20 @@ QsPaths::collectInstances(const QString& path, const QString& display) {
 			qCDebug(logPaths).nospace() << "Found instance " << info.instance.instanceId << " (pid "
 			                            << info.pid << ") at " << path;
 
-			if (info.pid == -1) {
-				deadInstances.push_back(info);
-				continue;
-			}
-
 			if (!display.isEmpty() && info.instance.display != display) {
 				qCDebug(logPaths) << "Skipped instance with mismatched display at" << path;
-				mismatchedInstances.push_back(info);
 				continue;
 			}
 
-			liveInstances.push_back(info);
+			if (info.pid == -1) {
+				deadInstances.push_back(info);
+			} else {
+				liveInstances.push_back(info);
+			}
 		} else {
 			qCDebug(logPaths) << "Skipped potential instance at" << path;
 		}
 	}
 
-	return {liveInstances, mismatchedInstances, deadInstances};
+	return qMakePair(liveInstances, deadInstances);
 }

src/core/paths.hpp

@@ -1,7 +1,4 @@
 #pragma once
-#include <tuple>
-
-#include <qcontainerfwd.h>
 #include <qdatetime.h>
 #include <qdir.h>
 #include <qpair.h>
@@ -32,7 +29,7 @@ public:
 	static QString ipcPath(const QString& id);
 	static bool
 	checkLock(const QString& path, InstanceLockInfo* info = nullptr, bool allowDead = false);
-	static std::tuple<QVector<InstanceLockInfo>, QVector<InstanceLockInfo>, QVector<InstanceLockInfo>>
+	static QPair<QVector<InstanceLockInfo>, QVector<InstanceLockInfo>>
 	collectInstances(const QString& path, const QString& display);
 
 	QDir* baseRunDir();

src/core/platformmenu.cpp

@@ -18,6 +18,7 @@
 #include <qwindow.h>
 
 #include "../window/proxywindow.hpp"
+#include "../window/windowinterface.hpp"
 #include "iconprovider.hpp"
 #include "model.hpp"
 #include "platformmenu_p.hpp"
@@ -90,8 +91,10 @@ bool PlatformMenuEntry::display(QObject* parentWindow, int relativeX, int relati
 	} else if (parentWindow == nullptr) {
 		qCritical() << "Cannot display PlatformMenuEntry with null parent window.";
 		return false;
-	} else if (auto* proxy = ProxyWindowBase::forObject(parentWindow)) {
+	} else if (auto* proxy = qobject_cast<ProxyWindowBase*>(parentWindow)) {
 		window = proxy->backingWindow();
+	} else if (auto* interface = qobject_cast<WindowInterface*>(parentWindow)) {
+		window = interface->proxyWindow()->backingWindow();
 	} else {
 		qCritical() << "PlatformMenuEntry.display() must be called with a window.";
 		return false;

src/core/plugin.cpp

@@ -9,18 +9,6 @@ static QVector<QsEnginePlugin*> plugins; // NOLINT
 
 void QsEnginePlugin::registerPlugin(QsEnginePlugin& plugin) { plugins.push_back(&plugin); }
 
-void QsEnginePlugin::preinitPluginsOnly() {
-	plugins.removeIf([](QsEnginePlugin* plugin) { return !plugin->applies(); });
-
-	std::ranges::sort(plugins, [](QsEnginePlugin* a, QsEnginePlugin* b) {
-		return b->dependencies().contains(a->name());
-	});
-
-	for (QsEnginePlugin* plugin: plugins) {
-		plugin->preinit();
-	}
-}
-
 void QsEnginePlugin::initPlugins() {
 	plugins.removeIf([](QsEnginePlugin* plugin) { return !plugin->applies(); });
 
@@ -28,10 +16,6 @@ void QsEnginePlugin::initPlugins() {
 		return b->dependencies().contains(a->name());
 	});
 
-	for (QsEnginePlugin* plugin: plugins) {
-		plugin->preinit();
-	}
-
 	for (QsEnginePlugin* plugin: plugins) {
 		plugin->init();
 	}

src/core/plugin.hpp

@@ -18,14 +18,12 @@ public:
 	virtual QString name() { return QString(); }
 	virtual QList<QString> dependencies() { return {}; }
 	virtual bool applies() { return true; }
-	virtual void preinit() {}
 	virtual void init() {}
 	virtual void registerTypes() {}
 	virtual void constructGeneration(EngineGeneration& /*unused*/) {} // NOLINT
 	virtual void onReload() {}
 
 	static void registerPlugin(QsEnginePlugin& plugin);
-	static void preinitPluginsOnly();
 	static void initPlugins();
 	static void runConstructGeneration(EngineGeneration& generation);
 	static void runOnReload();

src/core/popupanchor.cpp

@@ -11,6 +11,7 @@
 #include <qwindow.h>
 
 #include "../window/proxywindow.hpp"
+#include "../window/windowinterface.hpp"
 #include "types.hpp"
 
 bool PopupAnchorState::operator==(const PopupAnchorState& other) const {
@@ -39,8 +40,10 @@ void PopupAnchor::setWindowInternal(QObject* window) {
 	}
 
 	if (window) {
-		if (auto* proxy = ProxyWindowBase::forObject(window)) {
+		if (auto* proxy = qobject_cast<ProxyWindowBase*>(window)) {
 			this->bProxyWindow = proxy;
+		} else if (auto* interface = qobject_cast<WindowInterface*>(window)) {
+			this->bProxyWindow = interface->proxyWindow();
 		} else {
 			qWarning() << "Tried to set popup anchor window to" << window
 			           << "which is not a quickshell window.";

src/core/qmlglobal.cpp

@@ -18,17 +18,14 @@
 #include <qscreen.h>
 #include <qtenvironmentvariables.h>
 #include <qtmetamacros.h>
-#include <qtversion.h>
 #include <qtypes.h>
 #include <qvariant.h>
-#include <qversionnumber.h>
 #include <qwindowdefs.h>
 #include <unistd.h>
 
 #include "../io/processcore.hpp"
 #include "generation.hpp"
 #include "iconimageprovider.hpp"
-#include "instanceinfo.hpp"
 #include "paths.hpp"
 #include "qmlscreen.hpp"
 #include "rootwrapper.hpp"
@@ -63,9 +60,7 @@ void QuickshellSettings::setWorkingDirectory(QString workingDirectory) { // NOLI
 	emit this->workingDirectoryChanged();
 }
 
-bool QuickshellSettings::watchFiles() const {
-	return this->mWatchFiles && qEnvironmentVariableIsEmpty("QS_DISABLE_FILE_WATCHER");
-}
+bool QuickshellSettings::watchFiles() const { return this->mWatchFiles; }
 
 void QuickshellSettings::setWatchFiles(bool watchFiles) {
 	if (watchFiles == this->mWatchFiles) return;
@@ -156,22 +151,6 @@ qint32 QuickshellGlobal::processId() const { // NOLINT
 	return getpid();
 }
 
-QString QuickshellGlobal::instanceId() const { // NOLINT
-	return InstanceInfo::CURRENT.instanceId;
-}
-
-QString QuickshellGlobal::shellId() const { // NOLINT
-	return InstanceInfo::CURRENT.shellId;
-}
-
-QString QuickshellGlobal::appId() const { // NOLINT
-	return InstanceInfo::CURRENT.appId;
-}
-
-QDateTime QuickshellGlobal::launchTime() const { // NOLINT
-	return InstanceInfo::CURRENT.launchTime;
-}
-
 qsizetype QuickshellGlobal::screensCount(QQmlListProperty<QuickshellScreenInfo>* /*unused*/) {
 	return QuickshellTracked::instance()->screens.size();
 }
@@ -345,12 +324,6 @@ bool QuickshellGlobal::hasVersion(qint32 major, qint32 minor) {
 	return QuickshellGlobal::hasVersion(major, minor, QStringList());
 }
 
-bool QuickshellGlobal::hasQtVersion(int major, int minor) {
-	auto qtVersion = QVersionNumber::fromString(qVersion());
-	auto requiredVersion = QVersionNumber(major, minor);
-	return qtVersion >= requiredVersion;
-}
-
 QuickshellGlobal* QuickshellGlobal::create(QQmlEngine* engine, QJSEngine* /*unused*/) {
 	auto* qsg = new QuickshellGlobal();
 	auto* generation = EngineGeneration::findEngineGeneration(engine);

src/core/qmlglobal.hpp

@@ -17,7 +17,6 @@
 
 #include "../io/processcore.hpp"
 #include "doc.hpp"
-#include "instanceinfo.hpp"
 #include "qmlscreen.hpp"
 
 ///! Accessor for some options under the Quickshell type.
@@ -84,21 +83,6 @@ class QuickshellGlobal: public QObject {
 	// clang-format off
 	/// Quickshell's process id.
 	Q_PROPERTY(qint32 processId READ processId CONSTANT);
-	/// A unique identifier for this Quickshell instance
-	Q_PROPERTY(QString instanceId READ instanceId CONSTANT)
-	/// The shell ID, used to differentiate between different shell configurations.
-	///
-	/// Defaults to a stable value derived from the config path.
-	/// Can be overridden with `//@ pragma ShellId <id>` in the root qml file.
-	Q_PROPERTY(QString shellId READ shellId CONSTANT)
-	/// The desktop application ID.
-	///
-	/// Defaults to `org.quickshell`.
-	/// Can be overridden with `//@ pragma AppId <id>` in the root qml file
-	/// or the `QS_APP_ID` environment variable.
-	Q_PROPERTY(QString appId READ appId CONSTANT)
-	/// The time at which this Quickshell instance was launched.
-	Q_PROPERTY(QDateTime launchTime READ launchTime CONSTANT)
 	/// All currently connected screens.
 	///
 	/// This property updates as connected screens change.
@@ -165,10 +149,6 @@ class QuickshellGlobal: public QObject {
 
 public:
 	[[nodiscard]] qint32 processId() const;
-	[[nodiscard]] QString instanceId() const;
-	[[nodiscard]] QString shellId() const;
-	[[nodiscard]] QString appId() const;
-	[[nodiscard]] QDateTime launchTime() const;
 
 	QQmlListProperty<QuickshellScreenInfo> screens();
 
@@ -244,7 +224,7 @@ public:
 	/// it is assumed that all unreleased features are present. The unreleased feature list
 	/// may be omitted.
 	///
-	/// > [!NOTE] You can version gate code blocks using Quickshell's preprocessor which
+	/// > [!NOTE] You can feature gate code blocks using Quickshell's preprocessor which
 	/// > has the same function available.
 	/// >
 	/// > ```qml
@@ -254,17 +234,6 @@ public:
 	/// > ```
 	Q_INVOKABLE static bool hasVersion(qint32 major, qint32 minor, const QStringList& features);
 	Q_INVOKABLE static bool hasVersion(qint32 major, qint32 minor);
-	/// Check if Qt's version is at least `major.minor`.
-	///
-	/// > [!NOTE] You can version gate code blocks using Quickshell's preprocessor which
-	/// > has the same function available.
-	/// >
-	/// > ```qml
-	/// > //@ if hasVersion(6, 10)
-	/// > ...
-	/// > //@ endif
-	/// > ```
-	Q_INVOKABLE static bool hasQtVersion(qint32 major, qint32 minor);
 
 	void clearReloadPopupInhibit() { this->mInhibitReloadPopup = false; }
 	[[nodiscard]] bool isReloadPopupInhibited() const { return this->mInhibitReloadPopup; }

src/core/qmlscreen.hpp

@@ -15,7 +15,7 @@
 /// Monitor object useful for setting the monitor for a @@QsWindow
 /// or querying information about the monitor.
 ///
-/// > [!WARNING] If the monitor is disconnected, then any stored copies of its ShellMonitor will
+/// > [!WARNING] If the monitor is disconnected than any stored copies of its ShellMonitor will
 /// > be marked as dangling and all properties will return default values.
 /// > Reconnecting the monitor will not reconnect it to the ShellMonitor object.
 ///

src/core/region.cpp

@@ -1,5 +1,4 @@
 #include "region.hpp"
-#include <algorithm>
 #include <cmath>
 
 #include <qobject.h>
@@ -19,11 +18,6 @@ PendingRegion::PendingRegion(QObject* parent): QObject(parent) {
 	QObject::connect(this, &PendingRegion::yChanged, this, &PendingRegion::changed);
 	QObject::connect(this, &PendingRegion::widthChanged, this, &PendingRegion::changed);
 	QObject::connect(this, &PendingRegion::heightChanged, this, &PendingRegion::changed);
-	QObject::connect(this, &PendingRegion::radiusChanged, this, &PendingRegion::changed);
-	QObject::connect(this, &PendingRegion::topLeftRadiusChanged, this, &PendingRegion::changed);
-	QObject::connect(this, &PendingRegion::topRightRadiusChanged, this, &PendingRegion::changed);
-	QObject::connect(this, &PendingRegion::bottomLeftRadiusChanged, this, &PendingRegion::changed);
-	QObject::connect(this, &PendingRegion::bottomRightRadiusChanged, this, &PendingRegion::changed);
 	QObject::connect(this, &PendingRegion::childrenChanged, this, &PendingRegion::changed);
 }
 
@@ -51,79 +45,6 @@ void PendingRegion::onItemDestroyed() { this->mItem = nullptr; }
 
 void PendingRegion::onChildDestroyed() { this->mRegions.removeAll(this->sender()); }
 
-qint32 PendingRegion::radius() const { return this->mRadius; }
-
-void PendingRegion::setRadius(qint32 radius) {
-	if (radius == this->mRadius) return;
-	this->mRadius = radius;
-	emit this->radiusChanged();
-
-	if (!(this->mCornerOverrides & TopLeft)) emit this->topLeftRadiusChanged();
-	if (!(this->mCornerOverrides & TopRight)) emit this->topRightRadiusChanged();
-	if (!(this->mCornerOverrides & BottomLeft)) emit this->bottomLeftRadiusChanged();
-	if (!(this->mCornerOverrides & BottomRight)) emit this->bottomRightRadiusChanged();
-}
-
-qint32 PendingRegion::topLeftRadius() const {
-	return (this->mCornerOverrides & TopLeft) ? this->mTopLeftRadius : this->mRadius;
-}
-
-void PendingRegion::setTopLeftRadius(qint32 radius) {
-	this->mTopLeftRadius = radius;
-	this->mCornerOverrides |= TopLeft;
-	emit this->topLeftRadiusChanged();
-}
-
-void PendingRegion::resetTopLeftRadius() {
-	this->mCornerOverrides &= ~TopLeft;
-	emit this->topLeftRadiusChanged();
-}
-
-qint32 PendingRegion::topRightRadius() const {
-	return (this->mCornerOverrides & TopRight) ? this->mTopRightRadius : this->mRadius;
-}
-
-void PendingRegion::setTopRightRadius(qint32 radius) {
-	this->mTopRightRadius = radius;
-	this->mCornerOverrides |= TopRight;
-	emit this->topRightRadiusChanged();
-}
-
-void PendingRegion::resetTopRightRadius() {
-	this->mCornerOverrides &= ~TopRight;
-	emit this->topRightRadiusChanged();
-}
-
-qint32 PendingRegion::bottomLeftRadius() const {
-	return (this->mCornerOverrides & BottomLeft) ? this->mBottomLeftRadius : this->mRadius;
-}
-
-void PendingRegion::setBottomLeftRadius(qint32 radius) {
-	this->mBottomLeftRadius = radius;
-	this->mCornerOverrides |= BottomLeft;
-	emit this->bottomLeftRadiusChanged();
-}
-
-void PendingRegion::resetBottomLeftRadius() {
-	this->mCornerOverrides &= ~BottomLeft;
-	emit this->bottomLeftRadiusChanged();
-}
-
-qint32 PendingRegion::bottomRightRadius() const {
-	return (this->mCornerOverrides & BottomRight) ? this->mBottomRightRadius : this->mRadius;
-}
-
-void PendingRegion::setBottomRightRadius(qint32 radius) {
-	this->mBottomRightRadius = radius;
-	this->mCornerOverrides |= BottomRight;
-	emit this->bottomRightRadiusChanged();
-}
-
-void PendingRegion::resetBottomRightRadius() {
-	this->mCornerOverrides &= ~BottomRight;
-	emit this->bottomRightRadiusChanged();
-}
-
 QQmlListProperty<PendingRegion> PendingRegion::regions() {
 	return QQmlListProperty<PendingRegion>(
 	    this,
@@ -169,60 +90,6 @@ QRegion PendingRegion::build() const {
 		region = QRegion(this->mX, this->mY, this->mWidth, this->mHeight, type);
 	}
 
-	if (this->mShape == RegionShape::Rect && !region.isEmpty()) {
-		auto tl = std::max(this->topLeftRadius(), 0);
-		auto tr = std::max(this->topRightRadius(), 0);
-		auto bl = std::max(this->bottomLeftRadius(), 0);
-		auto br = std::max(this->bottomRightRadius(), 0);
-
-		if (tl > 0 || tr > 0 || bl > 0 || br > 0) {
-			auto rect = region.boundingRect();
-			auto x = rect.x();
-			auto y = rect.y();
-			auto w = rect.width();
-			auto h = rect.height();
-
-			// Normalize so adjacent corners don't exceed their shared edge.
-			// Each corner is scaled by the tightest constraint of its two edges.
-			auto topScale = tl + tr > w ? static_cast<double>(w) / (tl + tr) : 1.0;
-			auto bottomScale = bl + br > w ? static_cast<double>(w) / (bl + br) : 1.0;
-			auto leftScale = tl + bl > h ? static_cast<double>(h) / (tl + bl) : 1.0;
-			auto rightScale = tr + br > h ? static_cast<double>(h) / (tr + br) : 1.0;
-
-			tl = static_cast<qint32>(tl * std::min(topScale, leftScale));
-			tr = static_cast<qint32>(tr * std::min(topScale, rightScale));
-			bl = static_cast<qint32>(bl * std::min(bottomScale, leftScale));
-			br = static_cast<qint32>(br * std::min(bottomScale, rightScale));
-
-			// Unlock each corner: subtract (cornerBox - quarterEllipse) from the
-			// full rect. Each corner only modifies pixels inside its own box,
-			// so no diagonal overlap is possible.
-			if (tl > 0) {
-				auto box = QRegion(x, y, tl, tl);
-				auto ellipse = QRegion(x, y, tl * 2, tl * 2, QRegion::Ellipse);
-				region -= box - (ellipse & box);
-			}
-
-			if (tr > 0) {
-				auto box = QRegion(x + w - tr, y, tr, tr);
-				auto ellipse = QRegion(x + w - tr * 2, y, tr * 2, tr * 2, QRegion::Ellipse);
-				region -= box - (ellipse & box);
-			}
-
-			if (bl > 0) {
-				auto box = QRegion(x, y + h - bl, bl, bl);
-				auto ellipse = QRegion(x, y + h - bl * 2, bl * 2, bl * 2, QRegion::Ellipse);
-				region -= box - (ellipse & box);
-			}
-
-			if (br > 0) {
-				auto box = QRegion(x + w - br, y + h - br, br, br);
-				auto ellipse = QRegion(x + w - br * 2, y + h - br * 2, br * 2, br * 2, QRegion::Ellipse);
-				region -= box - (ellipse & box);
-			}
-		}
-	}
-
 	for (const auto& childRegion: this->mRegions) {
 		region = childRegion->applyTo(region);
 	}
@@ -242,7 +109,7 @@ QRegion PendingRegion::applyTo(QRegion& region) const {
 }
 
 QRegion PendingRegion::applyTo(const QRect& rect) const {
-	// if left as the default, don't combine it with the whole rect area, leave it as is.
+	// if left as the default, dont combine it with the whole rect area, leave it as is.
 	if (this->mIntersection == Intersection::Combine) {
 		return this->build();
 	} else {

src/core/region.hpp

@@ -66,29 +66,6 @@ class PendingRegion: public QObject {
 	Q_PROPERTY(qint32 width MEMBER mWidth NOTIFY widthChanged);
 	/// Defaults to 0. Does nothing if @@item is set.
 	Q_PROPERTY(qint32 height MEMBER mHeight NOTIFY heightChanged);
-	// clang-format off
-	/// Corner radius for rounded rectangles. Only applies when @@shape is `Rect`. Defaults to 0.
-	///
-	/// Acts as the default for @@topLeftRadius, @@topRightRadius, @@bottomLeftRadius,
-	/// and @@bottomRightRadius.
-	Q_PROPERTY(qint32 radius READ radius WRITE setRadius NOTIFY radiusChanged);
-	/// Top-left corner radius. Only applies when @@shape is `Rect`.
-	///
-	/// Defaults to @@radius, and may be reset by assigning `undefined`.
-	Q_PROPERTY(qint32 topLeftRadius READ topLeftRadius WRITE setTopLeftRadius RESET resetTopLeftRadius NOTIFY topLeftRadiusChanged);
-	/// Top-right corner radius. Only applies when @@shape is `Rect`.
-	///
-	/// Defaults to @@radius, and may be reset by assigning `undefined`.
-	Q_PROPERTY(qint32 topRightRadius READ topRightRadius WRITE setTopRightRadius RESET resetTopRightRadius NOTIFY topRightRadiusChanged);
-	/// Bottom-left corner radius. Only applies when @@shape is `Rect`.
-	///
-	/// Defaults to @@radius, and may be reset by assigning `undefined`.
-	Q_PROPERTY(qint32 bottomLeftRadius READ bottomLeftRadius WRITE setBottomLeftRadius RESET resetBottomLeftRadius NOTIFY bottomLeftRadiusChanged);
-	/// Bottom-right corner radius. Only applies when @@shape is `Rect`.
-	///
-	/// Defaults to @@radius, and may be reset by assigning `undefined`.
-	Q_PROPERTY(qint32 bottomRightRadius READ bottomRightRadius WRITE setBottomRightRadius RESET resetBottomRightRadius NOTIFY bottomRightRadiusChanged);
-	// clang-format on
 
 	/// Regions to apply on top of this region.
 	///
@@ -114,25 +91,6 @@ public:
 
 	void setItem(QQuickItem* item);
 
-	[[nodiscard]] qint32 radius() const;
-	void setRadius(qint32 radius);
-
-	[[nodiscard]] qint32 topLeftRadius() const;
-	void setTopLeftRadius(qint32 radius);
-	void resetTopLeftRadius();
-
-	[[nodiscard]] qint32 topRightRadius() const;
-	void setTopRightRadius(qint32 radius);
-	void resetTopRightRadius();
-
-	[[nodiscard]] qint32 bottomLeftRadius() const;
-	void setBottomLeftRadius(qint32 radius);
-	void resetBottomLeftRadius();
-
-	[[nodiscard]] qint32 bottomRightRadius() const;
-	void setBottomRightRadius(qint32 radius);
-	void resetBottomRightRadius();
-
 	QQmlListProperty<PendingRegion> regions();
 
 	[[nodiscard]] bool empty() const;
@@ -151,11 +109,6 @@ signals:
 	void yChanged();
 	void widthChanged();
 	void heightChanged();
-	void radiusChanged();
-	void topLeftRadiusChanged();
-	void topRightRadiusChanged();
-	void bottomLeftRadiusChanged();
-	void bottomRightRadiusChanged();
 	void childrenChanged();
 
 	/// Triggered when the region's geometry changes.
@@ -177,25 +130,12 @@ private:
 	static void
 	regionsReplace(QQmlListProperty<PendingRegion>* prop, qsizetype i, PendingRegion* region);
 
-	enum CornerOverride : quint8 {
-		TopLeft = 0b1,
-		TopRight = 0b10,
-		BottomLeft = 0b100,
-		BottomRight = 0b1000,
-	};
-
 	QQuickItem* mItem = nullptr;
 
 	qint32 mX = 0;
 	qint32 mY = 0;
 	qint32 mWidth = 0;
 	qint32 mHeight = 0;
-	qint32 mRadius = 0;
-	qint32 mTopLeftRadius = 0;
-	qint32 mTopRightRadius = 0;
-	qint32 mBottomLeftRadius = 0;
-	qint32 mBottomRightRadius = 0;
-	quint8 mCornerOverrides = 0;
 
 	QList<PendingRegion*> mRegions;
 };

src/core/reload.cpp

@@ -116,7 +116,7 @@ QObject* Reloadable::getChildByReloadId(QObject* parent, const QString& reloadId
 		auto* reloadable = qobject_cast<Reloadable*>(child);
 		if (reloadable != nullptr) {
 			if (reloadable->mReloadableId == reloadId) return reloadable;
-			// if not then don't check its children as that's a separate reload scope.
+			// if not then don't check its children as thats a seperate reload scope.
 		} else {
 			auto* reloadable = Reloadable::getChildByReloadId(child, reloadId);
 			if (reloadable != nullptr) return reloadable;

src/core/reload.hpp

@@ -21,7 +21,7 @@ class Reloadable
 	/// previous state.
 	///
 	/// Simply keeping a stable identifier across config versions (saves) is
-	/// enough to help the reloader figure out which object in the old revision corresponds to
+	/// enough to help the reloader figure out which object in the old revision corrosponds to
 	/// this object in the current revision, and facilitate smoother reloading.
 	///
 	/// Note that identifiers are scoped, and will try to do the right thing in context.

src/core/scan.cpp

@@ -3,7 +3,6 @@
 #include <utility>
 
 #include <qcontainerfwd.h>
-#include <qcryptographichash.h>
 #include <qdir.h>
 #include <qfileinfo.h>
 #include <qjsengine.h>
@@ -22,25 +21,6 @@
 
 QS_LOGGING_CATEGORY(logQmlScanner, "quickshell.qmlscanner", QtWarningMsg);
 
-bool QmlScanner::readAndHashFile(const QString& path, QByteArray& data) {
-	auto file = QFile(path);
-	if (!file.open(QFile::ReadOnly)) return false;
-	data = file.readAll();
-	this->fileHashes.insert(path, QCryptographicHash::hash(data, QCryptographicHash::Md5));
-	return true;
-}
-
-bool QmlScanner::hasFileContentChanged(const QString& path) const {
-	auto it = this->fileHashes.constFind(path);
-	if (it == this->fileHashes.constEnd()) return true;
-
-	auto file = QFile(path);
-	if (!file.open(QFile::ReadOnly)) return true;
-
-	auto newHash = QCryptographicHash::hash(file.readAll(), QCryptographicHash::Md5);
-	return newHash != it.value();
-}
-
 void QmlScanner::scanDir(const QDir& dir) {
 	if (this->scannedDirs.contains(dir)) return;
 	this->scannedDirs.push_back(dir);
@@ -89,7 +69,7 @@ void QmlScanner::scanDir(const QDir& dir) {
 		QString qmldir;
 		auto stream = QTextStream(&qmldir);
 
-		// can't derive a module name if not in shell path
+		// cant derive a module name if not in shell path
 		if (path.startsWith(this->rootPath.path())) {
 			auto end = path.sliced(this->rootPath.path().length());
 
@@ -129,13 +109,13 @@ bool QmlScanner::scanQmlFile(const QString& path, bool& singleton, bool& interna
 
 	qCDebug(logQmlScanner) << "Scanning qml file" << path;
 
-	QByteArray fileData;
-	if (!this->readAndHashFile(path, fileData)) {
+	auto file = QFile(path);
+	if (!file.open(QFile::ReadOnly | QFile::Text)) {
 		qCWarning(logQmlScanner) << "Failed to open file" << path;
 		return false;
 	}
 
-	auto stream = QTextStream(&fileData);
+	auto stream = QTextStream(&file);
 	auto imports = QVector<QString>();
 
 	bool inHeader = true;
@@ -145,7 +125,10 @@ bool QmlScanner::scanQmlFile(const QString& path, bool& singleton, bool& interna
 	QString overrideText;
 	bool isOverridden = false;
 
-	auto& pragmaEngine = *QmlScanner::preprocEngine();
+	auto pragmaEngine = QJSEngine();
+	pragmaEngine.globalObject().setPrototype(
+	    pragmaEngine.newQObject(new qs::scan::env::PreprocEnv())
+	);
 
 	auto postError = [&, this](QString error) {
 		this->scanErrors.append({.file = path, .message = std::move(error), .line = lineNum});
@@ -160,7 +143,7 @@ bool QmlScanner::scanQmlFile(const QString& path, bool& singleton, bool& interna
 			if (!singleton && line == "pragma Singleton") {
 				singleton = true;
 			} else if (line.startsWith("import")) {
-				// we don't care about "import qs" as we always load the root folder
+				// we dont care about "import qs" as we always load the root folder
 				if (auto importCursor = line.indexOf(" qs."); importCursor != -1) {
 					importCursor += 4;
 					QString path;
@@ -211,7 +194,7 @@ bool QmlScanner::scanQmlFile(const QString& path, bool& singleton, bool& interna
 				mask = false;
 			}
 			if (!sourceMasked && mask) hideMask = true;
-			mask = sourceMasked || mask; // can't unmask if a nested if passes
+			mask = sourceMasked || mask; // cant unmask if a nested if passes
 			ifScopes.append(mask);
 			if (mask) isOverridden = true;
 			sourceMasked = mask;
@@ -236,6 +219,8 @@ bool QmlScanner::scanQmlFile(const QString& path, bool& singleton, bool& interna
 		postError("unclosed preprocessor if block");
 	}
 
+	file.close();
+
 	if (isOverridden) {
 		this->fileIntercepts.insert(path, overrideText);
 	}
@@ -272,11 +257,8 @@ bool QmlScanner::scanQmlFile(const QString& path, bool& singleton, bool& interna
 			continue;
 		}
 
-		if (import.endsWith(".js")) {
-			this->scannedFiles.push_back(cpath);
-			QByteArray jsData;
-			this->readAndHashFile(cpath, jsData);
-		} else this->scanDir(cpath);
+		if (import.endsWith(".js")) this->scannedFiles.push_back(cpath);
+		else this->scanDir(cpath);
 	}
 
 	return true;
@@ -291,12 +273,14 @@ void QmlScanner::scanQmlRoot(const QString& path) {
 bool QmlScanner::scanQmlJson(const QString& path) {
 	qCDebug(logQmlScanner) << "Scanning qml.json file" << path;
 
-	QByteArray data;
-	if (!this->readAndHashFile(path, data)) {
+	auto file = QFile(path);
+	if (!file.open(QFile::ReadOnly | QFile::Text)) {
 		qCWarning(logQmlScanner) << "Failed to open file" << path;
 		return false;
 	}
 
+	auto data = file.readAll();
+
 	// Importing this makes CI builds fail for some reason.
 	QJsonParseError error; // NOLINT (misc-include-cleaner)
 	auto json = QJsonDocument::fromJson(data, &error);
@@ -367,13 +351,3 @@ QPair<QString, QString> QmlScanner::jsonToQml(const QJsonValue& value, int inden
 		return qMakePair(QStringLiteral("var"), "null");
 	}
 }
-
-QJSEngine* QmlScanner::preprocEngine() {
-	static auto* engine = [] {
-		auto* engine = new QJSEngine();
-		engine->globalObject().setPrototype(engine->newQObject(new qs::scan::env::PreprocEnv()));
-		return engine;
-	}();
-
-	return engine;
-}

src/core/scan.hpp

@@ -1,10 +1,8 @@
 #pragma once
 
-#include <qbytearray.h>
 #include <qcontainerfwd.h>
 #include <qdir.h>
 #include <qhash.h>
-#include <qjsengine.h>
 #include <qloggingcategory.h>
 #include <qvector.h>
 
@@ -23,7 +21,6 @@ public:
 
 	QVector<QDir> scannedDirs;
 	QVector<QString> scannedFiles;
-	QHash<QString, QByteArray> fileHashes;
 	QHash<QString, QString> fileIntercepts;
 
 	struct ScanError {
@@ -34,15 +31,10 @@ public:
 
 	QVector<ScanError> scanErrors;
 
-	bool readAndHashFile(const QString& path, QByteArray& data);
-	[[nodiscard]] bool hasFileContentChanged(const QString& path) const;
-
 private:
 	QDir rootPath;
 
 	bool scanQmlFile(const QString& path, bool& singleton, bool& internal);
 	bool scanQmlJson(const QString& path);
 	[[nodiscard]] static QPair<QString, QString> jsonToQml(const QJsonValue& value, int indent = 0);
-
-	static QJSEngine* preprocEngine();
 };

src/core/scanenv.cpp

@@ -2,8 +2,6 @@
 
 #include <qcontainerfwd.h>
 #include <qtenvironmentvariables.h>
-#include <qtversion.h>
-#include <qversionnumber.h>
 
 #include "build.hpp"
 
@@ -22,12 +20,6 @@ bool PreprocEnv::hasVersion(int major, int minor, const QStringList& features) {
 	return QS_VERSION_MAJOR == major && QS_VERSION_MINOR == minor;
 }
 
-bool PreprocEnv::hasQtVersion(int major, int minor) {
-	auto qtVersion = QVersionNumber::fromString(qVersion());
-	auto requiredVersion = QVersionNumber(major, minor);
-	return qtVersion >= requiredVersion;
-}
-
 QString PreprocEnv::env(const QString& variable) {
 	return qEnvironmentVariable(variable.toStdString().c_str());
 }

src/core/scanenv.hpp

@@ -12,7 +12,6 @@ class PreprocEnv: public QObject {
 public:
 	Q_INVOKABLE static bool
 	hasVersion(int major, int minor, const QStringList& features = QStringList());
-	Q_INVOKABLE static bool hasQtVersion(int major, int minor);
 
 	Q_INVOKABLE static QString env(const QString& variable);
 	Q_INVOKABLE static bool isEnvSet(const QString& variable);

src/core/streamreader.cpp

@@ -1,98 +0,0 @@
-#include "streamreader.hpp"
-#include <cstring>
-
-#include <qbytearray.h>
-#include <qiodevice.h>
-#include <qtypes.h>
-
-void StreamReader::setDevice(QIODevice* device) {
-	this->reset();
-	this->device = device;
-}
-
-void StreamReader::startTransaction() {
-	this->cursor = 0;
-	this->failed = false;
-}
-
-bool StreamReader::fill() {
-	auto available = this->device->bytesAvailable();
-	if (available <= 0) return false;
-	auto oldSize = this->buffer.size();
-	this->buffer.resize(oldSize + available);
-	auto bytesRead = this->device->read(this->buffer.data() + oldSize, available); // NOLINT
-
-	if (bytesRead <= 0) {
-		this->buffer.resize(oldSize);
-		return false;
-	}
-
-	this->buffer.resize(oldSize + bytesRead);
-	return true;
-}
-
-QByteArray StreamReader::readBytes(qsizetype count) {
-	if (this->failed) return {};
-
-	auto needed = this->cursor + count;
-
-	while (this->buffer.size() < needed) {
-		if (!this->fill()) {
-			this->failed = true;
-			return {};
-		}
-	}
-
-	auto result = this->buffer.mid(this->cursor, count);
-	this->cursor += count;
-	return result;
-}
-
-QByteArray StreamReader::readUntil(char terminator) {
-	if (this->failed) return {};
-
-	auto searchFrom = this->cursor;
-	auto idx = this->buffer.indexOf(terminator, searchFrom);
-
-	while (idx == -1) {
-		searchFrom = this->buffer.size();
-		if (!this->fill()) {
-			this->failed = true;
-			return {};
-		}
-
-		idx = this->buffer.indexOf(terminator, searchFrom);
-	}
-
-	auto length = idx - this->cursor + 1;
-	auto result = this->buffer.mid(this->cursor, length);
-	this->cursor += length;
-	return result;
-}
-
-void StreamReader::readInto(char* ptr, qsizetype count) {
-	auto data = this->readBytes(count);
-	if (!data.isEmpty()) memcpy(ptr, data.data(), count);
-}
-
-qint32 StreamReader::readI32() {
-	qint32 value = 0;
-	this->readInto(reinterpret_cast<char*>(&value), sizeof(qint32));
-	return value;
-}
-
-bool StreamReader::commitTransaction() {
-	if (this->failed) {
-		this->cursor = 0;
-		return false;
-	}
-
-	this->buffer.remove(0, this->cursor);
-	this->cursor = 0;
-	return true;
-}
-
-void StreamReader::reset() {
-	this->buffer.clear();
-	this->cursor = 0;
-}

src/core/streamreader.hpp

@@ -1,26 +0,0 @@
-#pragma once
-
-#include <qbytearray.h>
-#include <qiodevice.h>
-#include <qtypes.h>
-
-class StreamReader {
-public:
-	void setDevice(QIODevice* device);
-
-	void startTransaction();
-	QByteArray readBytes(qsizetype count);
-	QByteArray readUntil(char terminator);
-	void readInto(char* ptr, qsizetype count);
-	qint32 readI32();
-	bool commitTransaction();
-	void reset();
-
-private:
-	bool fill();
-
-	QIODevice* device = nullptr;
-	QByteArray buffer;
-	qsizetype cursor = 0;
-	bool failed = false;
-};

src/core/test/CMakeLists.txt

@@ -8,4 +8,3 @@ qs_test(transformwatcher transformwatcher.cpp)
 qs_test(ringbuffer ringbuf.cpp)
 qs_test(scriptmodel scriptmodel.cpp)
 qs_test(stacklist stacklist.cpp)
-qs_test(objectmodel objectmodel.cpp)

src/core/test/objectmodel.cpp

@@ -1,47 +0,0 @@
-#include "objectmodel.hpp"
-
-#include <qlist.h>
-#include <qobject.h>
-#include <qtest.h>
-#include <qtestcase.h>
-
-#include "../model.hpp"
-
-void TestObjectModel::diffUpdateInsertRemove() {
-	QObject a;
-	QObject b;
-	QObject c;
-	QObject d;
-
-	auto model = ObjectModel<QObject>(nullptr);
-	model.insertObject(&a);
-	model.insertObject(&b);
-	model.insertObject(&c);
-	QCOMPARE(model.valueList(), (QList<QObject*> {&a, &b, &c}));
-
-	// drop b, append d — relative order of survivors unchanged
-	model.diffUpdate({&a, &c, &d});
-	QCOMPARE(model.valueList(), (QList<QObject*> {&a, &c, &d}));
-}
-
-void TestObjectModel::diffUpdateReorder() {
-	QObject a;
-	QObject b;
-	QObject c;
-	QObject d;
-
-	auto model = ObjectModel<QObject>(nullptr);
-	model.insertObject(&d);
-	model.insertObject(&a);
-	model.insertObject(&b);
-	model.insertObject(&c);
-	QCOMPARE(model.valueList(), (QList<QObject*> {&d, &a, &b, &c}));
-
-	// pure permutation: same elements, different order. Previously turned
-	// [d,a,b,c] into [a,b,c,d,a,b,c] because the old row was never removed
-	// before inserting at the new index.
-	model.diffUpdate({&a, &b, &c, &d});
-	QCOMPARE(model.valueList(), (QList<QObject*> {&a, &b, &c, &d}));
-}
-
-QTEST_MAIN(TestObjectModel);

src/core/test/objectmodel.hpp

@@ -1,12 +0,0 @@
-#pragma once
-
-#include <qobject.h>
-#include <qtmetamacros.h>
-
-class TestObjectModel: public QObject {
-	Q_OBJECT;
-
-private slots:
-	static void diffUpdateInsertRemove();
-	static void diffUpdateReorder();
-};

src/core/test/scriptmodel.cpp

@@ -90,7 +90,7 @@ void TestScriptModel::unique_data() {
 	QTest::addRow("move_overlapping")
 	    << "ABCDEFG" << "ABDEFCG" << OpList({{ModelOperation::Move, 3, 3, 2}});
 
-	// Ensure iterators aren't skipping anything at the end of operations by performing
+	// Ensure iterators arent skipping anything at the end of operations by performing
 	// multiple back to back.
 
 	QTest::addRow("insert_state_ok") << "ABCDEFG" << "ABXXEFG"

src/core/toolsupport.cpp

@@ -177,8 +177,6 @@ void QmlToolingSupport::updateToolingFs(
 		auto fileInfo = QFileInfo(path);
 		if (!fileInfo.isFile()) continue;
 
-		if (scanner.fileIntercepts.contains(path)) continue;
-
 		auto spath = linkDir.filePath(name);
 		auto sFileInfo = QFileInfo(spath);
 
@@ -207,10 +205,8 @@ void QmlToolingSupport::updateToolingFs(
 		}
 
 		auto spath = linkDir.filePath(name);
-		QFile::remove(spath);
-
 		auto file = QFile(spath);
-		if (!file.open(QFile::ReadWrite | QFile::Text | QFile::NewOnly)) {
+		if (!file.open(QFile::ReadWrite | QFile::Text)) {
 			qCCritical(logTooling) << "Failed to open injected file" << spath;
 			continue;
 		}

src/core/variants.cpp

@@ -145,7 +145,7 @@ void Variants::updateVariants() {
 
 		{
 			if (this->mInstances.contains(variant)) {
-				continue; // we don't need to recreate this one
+				continue; // we dont need to recreate this one
 			}
 
 			auto variantMap = QVariantMap();

src/core/variants.hpp

@@ -43,7 +43,7 @@ class Variants: public Reloadable {
 	Q_OBJECT;
 	/// The component to create instances of.
 	///
-	/// The delegate should define a `modelData` property that will be populated with a value
+	/// The delegate should define a `modelData` property that will be popuplated with a value
 	/// from the @@model.
 	Q_PROPERTY(QQmlComponent* delegate MEMBER mDelegate);
 	/// The list of sets of properties to create instances with.

src/crash/handler.cpp

@@ -1,15 +1,12 @@
 #include "handler.hpp"
 #include <algorithm>
 #include <array>
-#include <cerrno>
 #include <csignal>
 #include <cstdio>
 #include <cstring>
-#include <exception>
 
 #include <cpptrace/basic.hpp>
 #include <cpptrace/forward.hpp>
-#include <cpptrace/utils.hpp>
 #include <qdatastream.h>
 #include <qfile.h>
 #include <qlogging.h>
@@ -60,12 +57,6 @@ void signalHandler(
     siginfo_t* /*info*/, // NOLINT (misc-include-cleaner)
     void*                /*context*/
 ) {
-	// NOLINTBEGIN (misc-include-cleaner)
-	sigset_t set;
-	sigfillset(&set);
-	sigprocmask(SIG_UNBLOCK, &set, nullptr);
-	// NOLINTEND
-
 	if (CrashInfo::INSTANCE.traceFd != -1) {
 		auto traceBuffer = std::array<cpptrace::frame_ptr, 1024>();
 		auto frameCount = cpptrace::safe_generate_raw_trace(traceBuffer.data(), traceBuffer.size(), 1);
@@ -73,21 +64,10 @@ void signalHandler(
 		for (size_t i = 0; i < static_cast<size_t>(frameCount); i++) {
 			auto frame = cpptrace::safe_object_frame();
 			cpptrace::get_safe_object_frame(traceBuffer[i], &frame);
-
-			auto* wptr = reinterpret_cast<char*>(&frame);
-			auto* end = wptr + sizeof(cpptrace::safe_object_frame); // NOLINT
-			while (wptr != end) {
-				auto r = write(CrashInfo::INSTANCE.traceFd, &frame, sizeof(cpptrace::safe_object_frame));
-				if (r < 0 && errno == EINTR) continue;
-				if (r <= 0) goto fail;
-				wptr += r; // NOLINT
-			}
+			write(CrashInfo::INSTANCE.traceFd, &frame, sizeof(cpptrace::safe_object_frame));
 		}
-
-	fail:;
 	}
 
-	// TODO: coredump fork and crash reporter remain as zombies, fix
 	auto coredumpPid = fork();
 	if (coredumpPid == 0) {
 		raise(sig);
@@ -135,6 +115,7 @@ void signalHandler(
 		perror("Failed to fork and launch crash reporter.\n");
 		_exit(-1);
 	} else if (pid == 0) {
+
 		// dup to remove CLOEXEC
 		auto dumpFdStr = std::array<char, 48>();
 		auto logFdStr = std::array<char, 48>();
@@ -158,21 +139,6 @@ void signalHandler(
 	}
 }
 
-void handleCppTerminate() {
-	if (auto ptr = std::current_exception()) {
-		try {
-			std::rethrow_exception(ptr);
-		} catch (std::exception& e) {
-			qFatal().nospace() << "Terminate called with C++ exception ("
-			                   << cpptrace::demangle(typeid(e).name()).data() << "): " << e.what();
-		} catch (...) {
-			qFatal() << "Terminate called with non exception object";
-		}
-	}
-
-	qFatal() << "Terminate called without active C++ exception";
-}
-
 } // namespace
 
 void CrashHandler::init() {
@@ -202,6 +168,7 @@ void CrashHandler::init() {
 	// Set up alternate signal stack for stack overflow handling
 	auto ss = stack_t();
 	ss.ss_sp = new char[SIGSTKSZ];
+	;
 	ss.ss_size = SIGSTKSZ;
 	ss.ss_flags = 0;
 	sigaltstack(&ss, nullptr);
@@ -221,8 +188,6 @@ void CrashHandler::init() {
 
 	// NOLINTEND (misc-include-cleaner)
 
-	std::set_terminate(&handleCppTerminate);
-
 	qCInfo(logCrashHandler) << "Crash handler initialized.";
 }
 

src/crash/interface.cpp

@@ -5,7 +5,6 @@
 #include <qapplication.h>
 #include <qboxlayout.h>
 #include <qconfig.h>
-#include <qcontainerfwd.h>
 #include <qdesktopservices.h>
 #include <qfont.h>
 #include <qfontinfo.h>
@@ -13,22 +12,11 @@
 #include <qnamespace.h>
 #include <qobject.h>
 #include <qpushbutton.h>
-#include <qtenvironmentvariables.h>
 #include <qtversion.h>
 #include <qwidget.h>
 
 #include "build.hpp"
 
-namespace {
-QString crashreportUrl() {
-	if (auto url = qEnvironmentVariable("QS_CRASHREPORT_URL"); !url.isEmpty()) {
-		return url;
-	}
-
-	return CRASHREPORT_URL;
-}
-} // namespace
-
 class ReportLabel: public QWidget {
 public:
 	ReportLabel(const QString& label, const QString& content, QWidget* parent): QWidget(parent) {
@@ -79,16 +67,22 @@ CrashReporterGui::CrashReporterGui(QString reportFolder, int pid)
 
 	if (qtVersionMatches) {
 		mainLayout->addWidget(
-		    new QLabel("Please open a bug report for this issue on the issue tracker.")
+		    new QLabel("Please open a bug report for this issue via github or email.")
 		);
 	} else {
 		mainLayout->addWidget(new QLabel(
 		    "Please rebuild Quickshell against the current Qt version.\n"
-		    "If this does not solve the problem, please open a bug report on the issue tracker."
+		    "If this does not solve the problem, please open a bug report via github or email."
 		));
 	}
 
-	mainLayout->addWidget(new ReportLabel("Tracker:", crashreportUrl(), this));
+	mainLayout->addWidget(new ReportLabel(
+	    "Github:",
+	    "https://github.com/quickshell-mirror/quickshell/issues/new?template=crash2.yml",
+	    this
+	));
+
+	mainLayout->addWidget(new ReportLabel("Email:", "[email protected]", this));
 
 	auto* buttons = new QWidget(this);
 	buttons->setMinimumWidth(900);
@@ -118,5 +112,10 @@ void CrashReporterGui::openFolder() {
 	QDesktopServices::openUrl(QUrl::fromLocalFile(this->reportFolder));
 }
 
-void CrashReporterGui::openReportUrl() { QDesktopServices::openUrl(QUrl(crashreportUrl())); }
+void CrashReporterGui::openReportUrl() {
+	QDesktopServices::openUrl(
+	    QUrl("https://github.com/outfoxxed/quickshell/issues/new?template=crash2.yml")
+	);
+}
+
 void CrashReporterGui::cancel() { QApplication::quit(); }

src/crash/main.cpp

@@ -6,6 +6,7 @@
 #include <cpptrace/basic.hpp>
 #include <cpptrace/formatting.hpp>
 #include <qapplication.h>
+#include <qconfig.h>
 #include <qcoreapplication.h>
 #include <qdatastream.h>
 #include <qdir.h>
@@ -14,19 +15,19 @@
 #include <qloggingcategory.h>
 #include <qtenvironmentvariables.h>
 #include <qtextstream.h>
+#include <qtversion.h>
 #include <qtypes.h>
 #include <sys/sendfile.h>
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "../core/debuginfo.hpp"
 #include "../core/instanceinfo.hpp"
 #include "../core/logcat.hpp"
 #include "../core/logging.hpp"
 #include "../core/logging_p.hpp"
 #include "../core/paths.hpp"
-#include "../core/plugin.hpp"
 #include "../core/ringbuf.hpp"
+#include "build.hpp"
 #include "interface.hpp"
 
 namespace {
@@ -170,15 +171,41 @@ void recordCrashInfo(const QDir& crashDir, const InstanceInfo& instance) {
 			qCCritical(logCrashReporter) << "Failed to open crash info file for writing.";
 		} else {
 			auto stream = QTextStream(&extraInfoFile);
-			stream << qs::debuginfo::combinedInfo();
+			stream << "===== Build Information =====\n";
+			stream << "Git Revision: " << GIT_REVISION << '\n';
+			stream << "Buildtime Qt Version: " << QT_VERSION_STR << "\n";
+			stream << "Build Type: " << BUILD_TYPE << '\n';
+			stream << "Compiler: " << COMPILER << '\n';
+			stream << "Complie Flags: " << COMPILE_FLAGS << "\n\n";
+			stream << "Build configuration:\n" << BUILD_CONFIGURATION << "\n";
 
-			stream << "\n===== Instance Information =====\n";
+			stream << "\n===== Runtime Information =====\n";
+			stream << "Runtime Qt Version: " << qVersion() << '\n';
 			stream << "Signal: " << strsignal(crashSignal) << " (" << crashSignal << ")\n"; // NOLINT
 			stream << "Crashed process ID: " << crashProc << '\n';
 			stream << "Run ID: " << instance.instanceId << '\n';
 			stream << "Shell ID: " << instance.shellId << '\n';
 			stream << "Config Path: " << instance.configPath << '\n';
 
+			stream << "\n===== System Information =====\n\n";
+			stream << "/etc/os-release:";
+			auto osReleaseFile = QFile("/etc/os-release");
+			if (osReleaseFile.open(QFile::ReadOnly)) {
+				stream << '\n' << osReleaseFile.readAll() << '\n';
+				osReleaseFile.close();
+			} else {
+				stream << "FAILED TO OPEN\n";
+			}
+
+			stream << "/etc/lsb-release:";
+			auto lsbReleaseFile = QFile("/etc/lsb-release");
+			if (lsbReleaseFile.open(QFile::ReadOnly)) {
+				stream << '\n' << lsbReleaseFile.readAll();
+				lsbReleaseFile.close();
+			} else {
+				stream << "FAILED TO OPEN\n";
+			}
+
 			stream << "\n===== Stacktrace =====\n";
 			if (stacktrace.empty()) {
 				stream << "(no trace available)\n";
@@ -231,17 +258,12 @@ void qsCheckCrash(int argc, char** argv) {
 	);
 
 	auto app = QApplication(argc, argv);
-	auto desktopId =
-	    info.instance.appId.isEmpty() ? QStringLiteral("org.quickshell") : info.instance.appId;
-	QApplication::setDesktopFileName(desktopId);
+	QApplication::setDesktopFileName("org.quickshell");
 
 	auto crashDir = QsPaths::crashDir(info.instance.instanceId);
 
 	qCInfo(logCrashReporter) << "Starting crash reporter...";
 
-	// Required platform compatibility hooks
-	QsEnginePlugin::preinitPluginsOnly();
-
 	recordCrashInfo(crashDir, info.instance);
 
 	auto gui = CrashReporterGui(crashDir.path(), crashProc);

src/dbus/dbusmenu/dbusmenu.cpp

@@ -301,13 +301,6 @@ DBusMenu::DBusMenu(const QString& service, const QString& path, QObject* parent)
 	    &DBusMenu::onLayoutUpdated
 	);
 
-	QObject::connect(
-	    this->interface,
-	    &DBusMenuInterface::ItemsPropertiesUpdated,
-	    this,
-	    &DBusMenu::onItemPropertiesUpdated
-	);
-
 	this->properties.setInterface(this->interface);
 	this->properties.updateAllViaGetAll();
 }

src/io/datastream.cpp

@@ -51,7 +51,7 @@ void SplitParser::parseBytes(QByteArray& incoming, QByteArray& buffer) {
 		return;
 	}
 
-	// make sure we don't miss any delimiters in the buffer if the delimiter changes
+	// make sure we dont miss any delimiters in the buffer if the delimiter changes
 	if (this->mSplitMarkerChanged) {
 		this->mSplitMarkerChanged = false;
 		this->parseBytes(buffer, buffer);

src/io/fileview.hpp

@@ -29,9 +29,9 @@ class FileViewError: public QObject {
 
 public:
 	enum Enum : quint8 {
-		/// No error occurred.
+		/// No error occured.
 		Success = 0,
-		/// An unknown error occurred. Check the logs for details.
+		/// An unknown error occured. Check the logs for details.
 		Unknown = 1,
 		/// The file to read does not exist.
 		FileNotFound = 2,

src/io/jsonadapter.cpp

@@ -1,13 +1,11 @@
 #include "jsonadapter.hpp"
 
-#include <qassociativeiterable.h>
 #include <qcontainerfwd.h>
 #include <qjsonarray.h>
 #include <qjsondocument.h>
 #include <qjsonobject.h>
 #include <qjsonvalue.h>
 #include <qjsvalue.h>
-#include <qmetacontainer.h>
 #include <qmetaobject.h>
 #include <qnamespace.h>
 #include <qobject.h>
@@ -16,7 +14,6 @@
 #include <qqmlengine.h>
 #include <qqmlinfo.h>
 #include <qqmllist.h>
-#include <qsequentialiterable.h>
 #include <qstringview.h>
 #include <qvariant.h>
 
@@ -134,22 +131,13 @@ QJsonObject JsonAdapter::serializeRec(const QObject* obj, const QMetaObject* bas
 				}
 
 				json.insert(prop.name(), array);
+			} else if (val.canConvert<QJSValue>()) {
+				auto variant = val.value<QJSValue>().toVariant();
+				auto jv = QJsonValue::fromVariant(variant);
+				json.insert(prop.name(), jv);
 			} else {
-				if (val.canConvert<QJSValue>()) val = val.value<QJSValue>().toVariant();
-
-				auto jsonVal = QJsonValue::fromVariant(val);
-
-				if (jsonVal.isNull() && !val.isNull() && val.isValid()) {
-					if (val.canConvert<QAssociativeIterable>()) {
-						val.convert(QMetaType::fromType<QVariantMap>());
-					} else if (val.canConvert<QSequentialIterable>()) {
-						val.convert(QMetaType::fromType<QVariantList>());
-					}
-
-					jsonVal = QJsonValue::fromVariant(val);
-				}
-
-				json.insert(prop.name(), jsonVal);
+				auto jv = QJsonValue::fromVariant(val);
+				json.insert(prop.name(), jv);
 			}
 		}
 	}
@@ -166,16 +154,14 @@ void JsonAdapter::deserializeRec(const QJsonObject& json, QObject* obj, const QM
 			auto jval = json.value(prop.name());
 
 			if (prop.metaType() == QMetaType::fromType<QVariant>()) {
-				auto newVariant = jval.toVariant();
-				auto oldValue = prop.read(obj);
-				auto oldVariant =
-				    oldValue.canConvert<QJSValue>() ? oldValue.value<QJSValue>().toVariant() : oldValue;
+				auto variant = jval.toVariant();
+				auto oldValue = prop.read(this).value<QJSValue>();
 
 				// Calling prop.write with a new QJSValue will cause a property update
 				// even if content is identical.
-				if (newVariant != oldVariant) {
-					auto jsValue = qmlEngine(this)->fromVariant<QJSValue>(newVariant);
-					prop.write(obj, QVariant::fromValue(jsValue));
+				if (jval.toVariant() != oldValue.toVariant()) {
+					auto jsValue = qmlEngine(this)->fromVariant<QJSValue>(jval.toVariant());
+					prop.write(this, QVariant::fromValue(jsValue));
 				}
 			} else if (QMetaType::canView(prop.metaType(), QMetaType::fromType<JsonObject*>())) {
 				// FIXME: This doesn't support creating descendants of JsonObject, as QMetaType.metaObject()
@@ -210,7 +196,7 @@ void JsonAdapter::deserializeRec(const QJsonObject& json, QObject* obj, const QM
 			               QMetaType::fromType<QQmlListProperty<JsonObject>>()
 			           ))
 			{
-				auto pval = prop.read(obj);
+				auto pval = prop.read(this);
 
 				if (pval.canConvert<QQmlListProperty<JsonObject>>()) {
 					auto lp = pval.value<QQmlListProperty<JsonObject>>();
@@ -261,35 +247,12 @@ void JsonAdapter::deserializeRec(const QJsonObject& json, QObject* obj, const QM
 				}
 			} else {
 				auto variant = jval.toVariant();
-				auto convVariant = variant;
 
-				if (convVariant.convert(prop.metaType())) {
-					prop.write(obj, convVariant);
+				if (variant.convert(prop.metaType())) {
+					prop.write(obj, variant);
 				} else {
-					auto pval = prop.read(obj);
-					if (variant.canConvert<QSequentialIterable>() && pval.canView<QSequentialIterable>()) {
-						auto targetv = QVariant(pval.metaType());
-						auto target = targetv.view<QSequentialIterable>().metaContainer();
-						auto valueType = target.valueMetaType();
-						auto i = 0;
-
-						for (QVariant item: variant.value<QSequentialIterable>()) {
-							if (item.convert(valueType)) {
-								target.addValueAtEnd(targetv.data(), item.constData());
-							} else {
-								qmlWarning(this) << "Failed to deserialize list member " << i << " of property "
-								                 << prop.name() << ": expected " << valueType.name() << " but got "
-								                 << item.typeName();
-							}
-
-							++i;
-						}
-						prop.write(obj, targetv);
-					} else {
-						qmlWarning(this) << "Failed to deserialize property " << prop.name() << ": expected "
-						                 << prop.metaType().name() << " but got "
-						                 << jval.toVariant().typeName();
-					}
+					qmlWarning(this) << "Failed to deserialize property " << prop.name() << ": expected "
+					                 << prop.metaType().name() << " but got " << jval.toVariant().typeName();
 				}
 			}
 		}

src/io/socket.hpp

@@ -96,7 +96,7 @@ class SocketServer: public Reloadable {
 	Q_OBJECT;
 	/// If the socket server is currently active. Defaults to false.
 	///
-	/// Setting this to false will destroy all active connections and delete
+	/// Setting this to false will destory all active connections and delete
 	/// the socket file on disk.
 	///
 	/// If path is empty setting this property will have no effect.
@@ -105,7 +105,7 @@ class SocketServer: public Reloadable {
 	///
 	/// Setting this property while the server is active will have no effect.
 	Q_PROPERTY(QString path READ path WRITE setPath NOTIFY pathChanged);
-	/// Connection handler component. Must create a @@Socket.
+	/// Connection handler component. Must creeate a @@Socket.
 	///
 	/// The created socket should not set @@connected or @@path or the incoming
 	/// socket connection will be dropped (they will be set by the socket server.)

src/ipc/ipc.cpp

@@ -3,7 +3,6 @@
 #include <variant>
 
 #include <qbuffer.h>
-#include <qcoreapplication.h>
 #include <qlocalserver.h>
 #include <qlocalsocket.h>
 #include <qlogging.h>
@@ -128,9 +127,7 @@ int IpcClient::connect(const QString& id, const std::function<void(IpcClient& cl
 
 void IpcKillCommand::exec(IpcServerConnection* /*unused*/) {
 	qInfo() << "Exiting due to IPC request.";
-	auto* generation = EngineGeneration::currentGeneration();
-	if (generation) generation->quit();
-	else QCoreApplication::exit(0);
+	EngineGeneration::currentGeneration()->quit();
 }
 
 } // namespace qs::ipc

src/ipc/ipc.hpp

@@ -19,7 +19,7 @@
 
 template <typename... Types>
 constexpr void assertSerializable() {
-	// monostate being zero ensures transactional reads won't break
+	// monostate being zero ensures transactional reads wont break
 	static_assert(
 	    std::is_same_v<std::variant_alternative_t<0, std::variant<Types...>>, std::monostate>,
 	    "Serialization of variants without std::monostate at index 0 is disallowed."

src/launch/command.cpp

@@ -12,6 +12,7 @@
 #include <qdebug.h>
 #include <qdir.h>
 #include <qfileinfo.h>
+#include <qguiapplication.h>
 #include <qjsonarray.h>
 #include <qjsondocument.h>
 #include <qjsonobject.h>
@@ -24,12 +25,12 @@
 #include <qtversion.h>
 #include <unistd.h>
 
-#include "../core/debuginfo.hpp"
 #include "../core/instanceinfo.hpp"
 #include "../core/logging.hpp"
 #include "../core/paths.hpp"
 #include "../io/ipccomm.hpp"
 #include "../ipc/ipc.hpp"
+#include "build.hpp"
 #include "launch_p.hpp"
 
 namespace qs::launch {
@@ -119,7 +120,7 @@ int locateConfigFile(CommandState& cmd, QString& path) {
 					return -1;
 				}
 			} else {
-				qCCritical(logBare) << "Could not open manifest at path" << *cmd.config.manifest;
+				qCCritical(logBare) << "Could not open maifest at path" << *cmd.config.manifest;
 				return -1;
 			}
 		} else {
@@ -178,17 +179,13 @@ int selectInstance(CommandState& cmd, InstanceLockInfo* instance, bool deadFallb
 		}
 	} else if (!cmd.instance.id->isEmpty()) {
 		path = basePath->filePath("by-pid");
-		auto [liveInstances, mismatchedInstances, deadInstances] =
+		auto [liveInstances, deadInstances] =
 		    QsPaths::collectInstances(path, cmd.config.anyDisplay ? "" : getDisplayConnection());
 
 		liveInstances.removeIf([&](const InstanceLockInfo& info) {
 			return !info.instance.instanceId.startsWith(*cmd.instance.id);
 		});
 
-		mismatchedInstances.removeIf([&](const InstanceLockInfo& info) {
-			return !info.instance.instanceId.startsWith(*cmd.instance.id);
-		});
-
 		deadInstances.removeIf([&](const InstanceLockInfo& info) {
 			return !info.instance.instanceId.startsWith(*cmd.instance.id);
 		});
@@ -196,18 +193,6 @@ int selectInstance(CommandState& cmd, InstanceLockInfo* instance, bool deadFallb
 		auto instances = liveInstances.isEmpty() && deadFallback ? deadInstances : liveInstances;
 
 		if (instances.isEmpty()) {
-			if (!mismatchedInstances.isEmpty()) {
-				qCInfo(logBare) << "No running instances on the current display" << getDisplayConnection()
-				                << "start with" << *cmd.instance.id;
-
-				qCInfo(logBare) << "Some instances on other displays match:";
-
-				for (auto& instance: mismatchedInstances) {
-					qCInfo(logBare).noquote().nospace()
-					    << " - " << instance.instance.instanceId << " (" << instance.instance.display << ')';
-				}
-			}
-
 			if (deadFallback) {
 				qCInfo(logBare) << "No instances start with" << *cmd.instance.id;
 			} else {
@@ -228,7 +213,7 @@ int selectInstance(CommandState& cmd, InstanceLockInfo* instance, bool deadFallb
 
 			for (auto& instance: instances) {
 				qCInfo(logBare).noquote() << " -" << instance.instance.instanceId
-				                          << (instance.pid == -1 ? "(dead)" : "");
+				                          << (instance.pid == -1 ? " (dead)" : "");
 			}
 
 			return -1;
@@ -245,7 +230,7 @@ int selectInstance(CommandState& cmd, InstanceLockInfo* instance, bool deadFallb
 
 		path = QDir(basePath->filePath("by-path")).filePath(pathId);
 
-		auto [liveInstances, mismatchedInstances, deadInstances] =
+		auto [liveInstances, deadInstances] =
 		    QsPaths::collectInstances(path, cmd.config.anyDisplay ? "" : getDisplayConnection());
 
 		auto instances = liveInstances;
@@ -266,16 +251,6 @@ int selectInstance(CommandState& cmd, InstanceLockInfo* instance, bool deadFallb
 				for (auto& instance: deadInstances) {
 					qCInfo(logBare).noquote() << " -" << instance.instance.instanceId;
 				}
-			} else if (!mismatchedInstances.isEmpty()) {
-				qCInfo(logBare) << "No running instances for" << configFilePath
-				                << " present on the current display" << getDisplayConnection();
-
-				qCInfo(logBare) << "Some instances on other displays match:";
-
-				for (auto& instance: mismatchedInstances) {
-					qCInfo(logBare).noquote().nospace()
-					    << " - " << instance.instance.instanceId << " (" << instance.instance.display << ')';
-				}
 			} else {
 				qCInfo(logBare) << "No running instances for" << configFilePath;
 			}
@@ -339,7 +314,7 @@ int listInstances(CommandState& cmd) {
 		path = QDir(basePath->filePath("by-path")).filePath(pathId);
 	}
 
-	auto [liveInstances, mismatchedInstances, deadInstances] = QsPaths::collectInstances(
+	auto [liveInstances, deadInstances] = QsPaths::collectInstances(
 	    path,
 	    cmd.config.anyDisplay || cmd.instance.all ? "" : getDisplayConnection()
 	);
@@ -544,10 +519,20 @@ int runCommand(int argc, char** argv, QCoreApplication* coreApplication) {
 	}
 
 	if (state.misc.printVersion) {
-		if (state.log.verbosity == 0) {
-			qCInfo(logBare).noquote() << "Quickshell" << qs::debuginfo::qsVersion();
-		} else {
-			qCInfo(logBare).noquote() << qs::debuginfo::combinedInfo();
+		qCInfo(logBare).noquote().nospace() << "quickshell " << QS_VERSION << ", revision "
+		                                    << GIT_REVISION << ", distributed by: " << DISTRIBUTOR;
+
+		if (state.log.verbosity > 1) {
+			qCInfo(logBare).noquote() << "\nBuildtime Qt Version:" << QT_VERSION_STR;
+			qCInfo(logBare).noquote() << "Runtime Qt Version:" << qVersion();
+			qCInfo(logBare).noquote() << "Compiler:" << COMPILER;
+			qCInfo(logBare).noquote() << "Compile Flags:" << COMPILE_FLAGS;
+		}
+
+		if (state.log.verbosity > 0) {
+			qCInfo(logBare).noquote() << "\nBuild Type:" << BUILD_TYPE;
+			qCInfo(logBare).noquote() << "Build configuration:";
+			qCInfo(logBare).noquote().nospace() << BUILD_CONFIGURATION;
 		}
 	} else if (*state.subcommand.log) {
 		return readLogFile(state);
@@ -572,17 +557,16 @@ int runCommand(int argc, char** argv, QCoreApplication* coreApplication) {
 }
 
 QString getDisplayConnection() {
-	// Doesn't actually have to match what qt picks, but will 99% of the time.
-	// Running quickshell under wayland in x11 mode doesn't really make any sense.
+	auto platform = qEnvironmentVariable("QT_QPA_PLATFORM");
 	auto wlDisplay = qEnvironmentVariable("WAYLAND_DISPLAY");
 	auto xDisplay = qEnvironmentVariable("DISPLAY");
 
-	if (!wlDisplay.isEmpty()) {
-		return "wayland/" + wlDisplay;
-	} else if (!xDisplay.isEmpty()) {
-		return "x11/" + xDisplay;
+	if (platform == "wayland" || (platform.isEmpty() && !wlDisplay.isEmpty())) {
+		return "wayland," + wlDisplay;
+	} else if (platform == "xcb" || (platform.isEmpty() && !xDisplay.isEmpty())) {
+		return "x11," + xDisplay;
 	} else {
-		return "unk";
+		return "unk," + QGuiApplication::platformName();
 	}
 }
 

src/launch/launch.cpp

@@ -76,9 +76,6 @@ int launch(const LaunchArgs& args, char** argv, QCoreApplication* coreApplicatio
 		bool useSystemStyle = false;
 		QString iconTheme = qEnvironmentVariable("QS_ICON_THEME");
 		QHash<QString, QString> envOverrides;
-		QHash<QString, QString> defaultEnv;
-		QString appId = qEnvironmentVariable("QS_APP_ID");
-		bool dropExpensiveFonts = false;
 		QString dataDir;
 		QString stateDir;
 		QString cacheDir;
@@ -90,31 +87,23 @@ int launch(const LaunchArgs& args, char** argv, QCoreApplication* coreApplicatio
 		if (line.startsWith("//@ pragma ")) {
 			auto pragma = line.sliced(11).trimmed();
 
-			auto isEnv = pragma.startsWith("Env ");
-			auto isDefaultEnv = pragma.startsWith("DefaultEnv ");
-
-			if (isEnv || isDefaultEnv) {
-				auto content = pragma.sliced(isDefaultEnv ? 11 : 4);
-				auto splitIdx = content.indexOf('=');
+			if (pragma == "UseQApplication") pragmas.useQApplication = true;
+			else if (pragma == "NativeTextRendering") pragmas.nativeTextRendering = true;
+			else if (pragma == "IgnoreSystemSettings") pragmas.desktopSettingsAware = false;
+			else if (pragma == "RespectSystemStyle") pragmas.useSystemStyle = true;
+			else if (pragma.startsWith("IconTheme ")) pragmas.iconTheme = pragma.sliced(10);
+			else if (pragma.startsWith("Env ")) {
+				auto envPragma = pragma.sliced(4);
+				auto splitIdx = envPragma.indexOf('=');
 
 				if (splitIdx == -1) {
 					qCritical() << "Env pragma" << pragma << "not in the form 'VAR = VALUE'";
 					return -1;
 				}
 
-				auto var = content.sliced(0, splitIdx).trimmed();
-				auto val = content.sliced(splitIdx + 1).trimmed();
-
-				if (isDefaultEnv) pragmas.defaultEnv.insert(var, val);
-				else pragmas.envOverrides.insert(var, val);
-			} else if (pragma == "UseQApplication") pragmas.useQApplication = true;
-			else if (pragma == "NativeTextRendering") pragmas.nativeTextRendering = true;
-			else if (pragma == "IgnoreSystemSettings") pragmas.desktopSettingsAware = false;
-			else if (pragma == "RespectSystemStyle") pragmas.useSystemStyle = true;
-			else if (pragma == "DropExpensiveFonts") pragmas.dropExpensiveFonts = true;
-			else if (pragma.startsWith("IconTheme ")) pragmas.iconTheme = pragma.sliced(10);
-			else if (pragma.startsWith("AppId ")) {
-				pragmas.appId = pragma.sliced(6).trimmed();
+				auto var = envPragma.sliced(0, splitIdx).trimmed();
+				auto val = envPragma.sliced(splitIdx + 1).trimmed();
+				pragmas.envOverrides.insert(var, val);
 			} else if (pragma.startsWith("ShellId ")) {
 				shellId = pragma.sliced(8).trimmed();
 			} else if (pragma.startsWith("DataDir ")) {
@@ -124,7 +113,8 @@ int launch(const LaunchArgs& args, char** argv, QCoreApplication* coreApplicatio
 			} else if (pragma.startsWith("CacheDir ")) {
 				pragmas.cacheDir = pragma.sliced(9).trimmed();
 			} else {
-				qWarning() << "Unrecognized pragma" << pragma;
+				qCritical() << "Unrecognized pragma" << pragma;
+				return -1;
 			}
 		} else if (line.startsWith("import")) break;
 	}
@@ -138,24 +128,19 @@ int launch(const LaunchArgs& args, char** argv, QCoreApplication* coreApplicatio
 	qInfo() << "Shell ID:" << shellId << "Path ID" << pathId;
 
 	auto launchTime = qs::Common::LAUNCH_TIME.toSecsSinceEpoch();
-	auto appId = pragmas.appId.isEmpty() ? QStringLiteral("org.quickshell") : pragmas.appId;
-
 	InstanceInfo::CURRENT = InstanceInfo {
 	    .instanceId = base36Encode(getpid()) + base36Encode(launchTime),
 	    .configPath = args.configPath,
 	    .shellId = shellId,
-	    .appId = appId,
 	    .launchTime = qs::Common::LAUNCH_TIME,
 	    .pid = getpid(),
 	    .display = getDisplayConnection(),
 	};
 
 #if CRASH_HANDLER
-	if (qEnvironmentVariableIsSet("QS_DISABLE_CRASH_HANDLER")) {
-		qInfo() << "Crash handling disabled.";
-	} else {
-		crash::CrashHandler::init();
+	crash::CrashHandler::init();
 
+	{
 		auto* log = LogManager::instance();
 		crash::CrashHandler::setRelaunchInfo({
 		    .instance = InstanceInfo::CURRENT,
@@ -180,56 +165,10 @@ int launch(const LaunchArgs& args, char** argv, QCoreApplication* coreApplicatio
 		qputenv("QT_QUICK_CONTROLS_STYLE", "Fusion");
 	}
 
-	for (auto [var, val]: pragmas.defaultEnv.asKeyValueRange()) {
-		if (!qEnvironmentVariableIsSet(var.toUtf8())) qputenv(var.toUtf8(), val.toUtf8());
-	}
-
 	for (auto [var, val]: pragmas.envOverrides.asKeyValueRange()) {
 		qputenv(var.toUtf8(), val.toUtf8());
 	}
 
-	pragmas.dropExpensiveFonts |= qEnvironmentVariableIntValue("QS_DROP_EXPENSIVE_FONTS") == 1;
-
-	if (pragmas.dropExpensiveFonts) {
-		if (auto* runDir = QsPaths::instance()->instanceRunDir()) {
-			auto baseConfigPath = qEnvironmentVariable("FONTCONFIG_FILE");
-			if (baseConfigPath.isEmpty()) baseConfigPath = "/etc/fonts/fonts.conf";
-
-			auto filterPath = runDir->filePath("fonts-override.conf");
-			auto filterFile = QFile(filterPath);
-			if (filterFile.open(QFile::WriteOnly | QFile::Truncate | QFile::Text)) {
-				auto filterTemplate = QStringLiteral(R"(<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
-<fontconfig>
-	<include ignore_missing="no">%1</include>
-	<selectfont>
-		<rejectfont>
-			<pattern>
-				<patelt name="fontwrapper">
-					<string>woff</string>
-				</patelt>
-			</pattern>
-			<pattern>
-				<patelt name="fontwrapper">
-					<string>woff2</string>
-				</patelt>
-			</pattern>
-		</rejectfont>
-	</selectfont>
-</fontconfig>
-)");
-
-				QTextStream(&filterFile) << filterTemplate.arg(baseConfigPath);
-				filterFile.close();
-				qputenv("FONTCONFIG_FILE", filterPath.toUtf8());
-			} else {
-				qCritical() << "Could not write fontconfig filter to" << filterPath;
-			}
-		} else {
-			qCritical() << "Could not create fontconfig filter: instance run directory unavailable";
-		}
-	}
-
 	// The qml engine currently refuses to cache non file (qsintercept) paths.
 
 	// if (auto* cacheDir = QsPaths::instance()->cacheDir()) {
@@ -290,7 +229,7 @@ int launch(const LaunchArgs& args, char** argv, QCoreApplication* coreApplicatio
 		app = new QGuiApplication(qArgC, argv);
 	}
 
-	QGuiApplication::setDesktopFileName(appId);
+	QGuiApplication::setDesktopFileName("org.quickshell");
 
 	if (args.debugPort != -1) {
 		QQmlDebuggingEnabler::enableDebugging(true);

src/launch/main.cpp

@@ -84,29 +84,21 @@ void exitDaemon(int code) {
 
 	close(DAEMON_PIPE);
 
-	auto fd = open("/dev/null", O_RDWR);
-	if (fd == -1) {
-		qCritical().nospace() << "Failed to open /dev/null for daemon stdio" << errno << ": "
-		                      << qt_error_string();
-		return;
+	close(STDIN_FILENO);
+	close(STDOUT_FILENO);
+	close(STDERR_FILENO);
+
+	if (open("/dev/null", O_RDONLY) != STDIN_FILENO) { // NOLINT
+		qFatal() << "Failed to open /dev/null on stdin";
 	}
 
-	if (dup2(fd, STDIN_FILENO) != STDIN_FILENO) { // NOLINT
-		qCritical().nospace() << "Failed to set daemon stdin to /dev/null" << errno << ": "
-		                      << qt_error_string();
+	if (open("/dev/null", O_WRONLY) != STDOUT_FILENO) { // NOLINT
+		qFatal() << "Failed to open /dev/null on stdout";
 	}
 
-	if (dup2(fd, STDOUT_FILENO) != STDOUT_FILENO) { // NOLINT
-		qCritical().nospace() << "Failed to set daemon stdout to /dev/null" << errno << ": "
-		                      << qt_error_string();
+	if (open("/dev/null", O_WRONLY) != STDERR_FILENO) { // NOLINT
+		qFatal() << "Failed to open /dev/null on stderr";
 	}
-
-	if (dup2(fd, STDERR_FILENO) != STDERR_FILENO) { // NOLINT
-		qCritical().nospace() << "Failed to set daemon stderr to /dev/null" << errno << ": "
-		                      << qt_error_string();
-	}
-
-	close(fd);
 }
 
 int main(int argc, char** argv) {

src/network/CMakeLists.txt

@@ -3,10 +3,7 @@ add_subdirectory(nm)
 qt_add_library(quickshell-network STATIC
 	network.cpp
 	device.cpp
-	wired.cpp
 	wifi.cpp
-	enums.cpp
-	qml.cpp
 )
 
 target_include_directories(quickshell-network PRIVATE 

src/network/device.cpp

@@ -8,8 +8,6 @@
 #include <qtmetamacros.h>
 
 #include "../core/logcat.hpp"
-#include "enums.hpp"
-#include "network.hpp"
 
 namespace qs::network {
 
@@ -17,9 +15,49 @@ namespace {
 QS_LOGGING_CATEGORY(logNetworkDevice, "quickshell.network.device", QtWarningMsg);
 } // namespace
 
+QString DeviceConnectionState::toString(DeviceConnectionState::Enum state) {
+	switch (state) {
+	case Unknown: return QStringLiteral("Unknown");
+	case Connecting: return QStringLiteral("Connecting");
+	case Connected: return QStringLiteral("Connected");
+	case Disconnecting: return QStringLiteral("Disconnecting");
+	case Disconnected: return QStringLiteral("Disconnected");
+	default: return QStringLiteral("Unknown");
+	}
+}
+
+QString DeviceType::toString(DeviceType::Enum type) {
+	switch (type) {
+	case None: return QStringLiteral("None");
+	case Wifi: return QStringLiteral("Wifi");
+	default: return QStringLiteral("Unknown");
+	}
+}
+
+QString NMDeviceState::toString(NMDeviceState::Enum state) {
+	switch (state) {
+	case Unknown: return QStringLiteral("Unknown");
+	case Unmanaged: return QStringLiteral("Not managed by NetworkManager");
+	case Unavailable: return QStringLiteral("Unavailable");
+	case Disconnected: return QStringLiteral("Disconnected");
+	case Prepare: return QStringLiteral("Preparing to connect");
+	case Config: return QStringLiteral("Connecting to a network");
+	case NeedAuth: return QStringLiteral("Waiting for authentication");
+	case IPConfig: return QStringLiteral("Requesting IPv4 and/or IPv6 addresses from the network");
+	case IPCheck:
+		return QStringLiteral("Checking if further action is required for the requested connection");
+	case Secondaries:
+		return QStringLiteral("Waiting for a required secondary connection to activate");
+	case Activated: return QStringLiteral("Connected");
+	case Deactivating: return QStringLiteral("Disconnecting");
+	case Failed: return QStringLiteral("Failed to connect");
+	default: return QStringLiteral("Unknown");
+	};
+}
+
 NetworkDevice::NetworkDevice(DeviceType::Enum type, QObject* parent): QObject(parent), mType(type) {
 	this->bindableConnected().setBinding([this]() {
-		return this->bState == ConnectionState::Connected;
+		return this->bState == DeviceConnectionState::Connected;
 	});
 };
 
@@ -28,17 +66,12 @@ void NetworkDevice::setAutoconnect(bool autoconnect) {
 	emit this->requestSetAutoconnect(autoconnect);
 }
 
-void NetworkDevice::setNmManaged(bool managed) {
-	if (this->bNmManaged == managed) return;
-	emit this->requestSetNmManaged(managed);
-}
-
 void NetworkDevice::disconnect() {
-	if (this->bState == ConnectionState::Disconnected) {
+	if (this->bState == DeviceConnectionState::Disconnected) {
 		qCCritical(logNetworkDevice) << "Device" << this << "is already disconnected";
 		return;
 	}
-	if (this->bState == ConnectionState::Disconnecting) {
+	if (this->bState == DeviceConnectionState::Disconnecting) {
 		qCCritical(logNetworkDevice) << "Device" << this << "is already disconnecting";
 		return;
 	}
@@ -46,7 +79,4 @@ void NetworkDevice::disconnect() {
 	this->requestDisconnect();
 }
 
-void NetworkDevice::networkAdded(Network* net) { this->mNetworks.insertObject(net); }
-void NetworkDevice::networkRemoved(Network* net) { this->mNetworks.removeObject(net); }
-
 } // namespace qs::network

src/network/device.hpp

@@ -6,44 +6,88 @@
 #include <qtmetamacros.h>
 #include <qtypes.h>
 
-#include "../core/doc.hpp"
-#include "../core/model.hpp"
-#include "enums.hpp"
-#include "network.hpp"
-
 namespace qs::network {
 
+///! Connection state of a NetworkDevice.
+class DeviceConnectionState: public QObject {
+	Q_OBJECT;
+	QML_ELEMENT;
+	QML_SINGLETON;
+
+public:
+	enum Enum : quint8 {
+		Unknown = 0,
+		Connecting = 1,
+		Connected = 2,
+		Disconnecting = 3,
+		Disconnected = 4,
+	};
+	Q_ENUM(Enum);
+	Q_INVOKABLE static QString toString(DeviceConnectionState::Enum state);
+};
+
+///! Type of network device.
+class DeviceType: public QObject {
+	Q_OBJECT;
+	QML_ELEMENT;
+	QML_SINGLETON;
+
+public:
+	enum Enum : quint8 {
+		None = 0,
+		Wifi = 1,
+	};
+	Q_ENUM(Enum);
+	Q_INVOKABLE static QString toString(DeviceType::Enum type);
+};
+
+///! NetworkManager-specific device state.
+/// In sync with https://networkmanager.dev/docs/api/latest/nm-dbus-types.html#NMDeviceState.
+class NMDeviceState: public QObject {
+	Q_OBJECT;
+	QML_ELEMENT;
+	QML_SINGLETON;
+
+public:
+	enum Enum : quint8 {
+		Unknown = 0,
+		Unmanaged = 10,
+		Unavailable = 20,
+		Disconnected = 30,
+		Prepare = 40,
+		Config = 50,
+		NeedAuth = 60,
+		IPConfig = 70,
+		IPCheck = 80,
+		Secondaries = 90,
+		Activated = 100,
+		Deactivating = 110,
+		Failed = 120,
+	};
+	Q_ENUM(Enum);
+	Q_INVOKABLE static QString toString(NMDeviceState::Enum state);
+};
+
 ///! A network device.
-/// The @@type property may be used to determine if this device is a @@WifiDevice or @@WiredDevice.
+/// When @@type is `Wifi`, the device is a @@WifiDevice, which can be used to scan for and connect to access points.
 class NetworkDevice: public QObject {
 	Q_OBJECT;
 	QML_ELEMENT;
 	QML_UNCREATABLE("Devices can only be acquired through Network");
 	// clang-format off
 	/// The device type.
-	///
-	/// When the device type is `Wifi`, the device object is a @@WifiDevice.
-	/// When the device type is `Wired`, the device object is a @@WiredDevice.
-	/// connection and scanning.
 	Q_PROPERTY(DeviceType::Enum type READ type CONSTANT);
 	/// The name of the device's control interface.
 	Q_PROPERTY(QString name READ name NOTIFY nameChanged BINDABLE bindableName);
-	/// A list of available or connected networks for this device.
-	///
-	/// When the device type is 'Wifi', this model will only contain @@WifiNetwork.
-	QSDOC_TYPE_OVERRIDE(ObjectModel<Network>*);
-	Q_PROPERTY(UntypedObjectModel* networks READ networks CONSTANT);
 	/// The hardware address of the device in the XX:XX:XX:XX:XX:XX format.
 	Q_PROPERTY(QString address READ default NOTIFY addressChanged BINDABLE bindableAddress);
 	/// True if the device is connected.
 	Q_PROPERTY(bool connected READ default NOTIFY connectedChanged BINDABLE bindableConnected);
 	/// Connection state of the device.
-	Q_PROPERTY(qs::network::ConnectionState::Enum state READ default NOTIFY stateChanged BINDABLE bindableState);
-	/// True if the device is managed by NetworkManager.
-	///
-	/// > [!WARNING] Only valid for the NetworkManager backend.
-	Q_PROPERTY(bool nmManaged READ nmManaged WRITE setNmManaged NOTIFY nmManagedChanged)
-	/// True if the device is allowed to autoconnect to a network.
+	Q_PROPERTY(qs::network::DeviceConnectionState::Enum state READ default NOTIFY stateChanged BINDABLE bindableState);
+	/// A more specific device state when the backend is NetworkManager.
+	Q_PROPERTY(qs::network::NMDeviceState::Enum nmState READ default NOTIFY nmStateChanged BINDABLE bindableNmState);
+	/// True if the device is allowed to autoconnect.
 	Q_PROPERTY(bool autoconnect READ autoconnect WRITE setAutoconnect NOTIFY autoconnectChanged);
 	// clang-format on
 
@@ -53,45 +97,35 @@ public:
 	/// Disconnects the device and prevents it from automatically activating further connections.
 	Q_INVOKABLE void disconnect();
 
-	virtual void networkAdded(Network* net);
-	virtual void networkRemoved(Network* net);
-
-	[[nodiscard]] ObjectModel<Network>* networks() { return &this->mNetworks; }
-	[[nodiscard]] DeviceType::Enum type() const { return this->mType; }
-	QBindable<QString> bindableName() { return &this->bName; }
-	[[nodiscard]] QString name() const { return this->bName; }
-	QBindable<QString> bindableAddress() { return &this->bAddress; }
-	QBindable<bool> bindableConnected() { return &this->bConnected; }
-	QBindable<ConnectionState::Enum> bindableState() { return &this->bState; }
-	QBindable<bool> bindableNmManaged() { return &this->bNmManaged; }
-	[[nodiscard]] bool nmManaged() { return this->bNmManaged; }
-	void setNmManaged(bool managed);
-	QBindable<bool> bindableAutoconnect() { return &this->bAutoconnect; }
-	[[nodiscard]] bool autoconnect() { return this->bAutoconnect; }
+	[[nodiscard]] DeviceType::Enum type() const { return this->mType; };
+	QBindable<QString> bindableName() { return &this->bName; };
+	[[nodiscard]] QString name() const { return this->bName; };
+	QBindable<QString> bindableAddress() { return &this->bAddress; };
+	QBindable<bool> bindableConnected() { return &this->bConnected; };
+	QBindable<DeviceConnectionState::Enum> bindableState() { return &this->bState; };
+	QBindable<NMDeviceState::Enum> bindableNmState() { return &this->bNmState; };
+	[[nodiscard]] bool autoconnect() const { return this->bAutoconnect; };
+	QBindable<bool> bindableAutoconnect() { return &this->bAutoconnect; };
 	void setAutoconnect(bool autoconnect);
 
 signals:
-	QSDOC_HIDE void requestDisconnect();
-	QSDOC_HIDE void requestSetAutoconnect(bool autoconnect);
-	QSDOC_HIDE void requestSetNmManaged(bool managed);
+	void requestDisconnect();
+	void requestSetAutoconnect(bool autoconnect);
 	void nameChanged();
 	void addressChanged();
 	void connectedChanged();
 	void stateChanged();
-	void nmManagedChanged();
+	void nmStateChanged();
 	void autoconnectChanged();
 
-protected:
-	ObjectModel<Network> mNetworks {this};
-
 private:
 	DeviceType::Enum mType;
 	// clang-format off
 	Q_OBJECT_BINDABLE_PROPERTY(NetworkDevice, QString, bName, &NetworkDevice::nameChanged);
 	Q_OBJECT_BINDABLE_PROPERTY(NetworkDevice, QString, bAddress, &NetworkDevice::addressChanged);
 	Q_OBJECT_BINDABLE_PROPERTY(NetworkDevice, bool, bConnected, &NetworkDevice::connectedChanged);
-	Q_OBJECT_BINDABLE_PROPERTY(NetworkDevice, ConnectionState::Enum, bState, &NetworkDevice::stateChanged);
-	Q_OBJECT_BINDABLE_PROPERTY(NetworkDevice, bool, bNmManaged, &NetworkDevice::nmManagedChanged);
+	Q_OBJECT_BINDABLE_PROPERTY(NetworkDevice, DeviceConnectionState::Enum, bState, &NetworkDevice::stateChanged);
+	Q_OBJECT_BINDABLE_PROPERTY(NetworkDevice, NMDeviceState::Enum, bNmState, &NetworkDevice::nmStateChanged);
 	Q_OBJECT_BINDABLE_PROPERTY(NetworkDevice, bool, bAutoconnect, &NetworkDevice::autoconnectChanged);
 	// clang-format on
 };

src/network/enums.cpp

@@ -1,87 +0,0 @@
-#include "enums.hpp"
-
-#include <qstring.h>
-
-namespace qs::network {
-
-QString NetworkConnectivity::toString(NetworkConnectivity::Enum conn) {
-	switch (conn) {
-	case Unknown: return QStringLiteral("Unknown");
-	case None: return QStringLiteral("Not connected to a network");
-	case Portal: return QStringLiteral("Connection intercepted by a captive portal");
-	case Limited: return QStringLiteral("Partial internet connectivity");
-	case Full: return QStringLiteral("Full internet connectivity");
-	default: return QStringLiteral("Unknown");
-	}
-}
-
-QString NetworkBackendType::toString(NetworkBackendType::Enum type) {
-	switch (type) {
-	case NetworkBackendType::None: return "None";
-	case NetworkBackendType::NetworkManager: return "NetworkManager";
-	default: return "Unknown";
-	}
-}
-
-QString ConnectionState::toString(ConnectionState::Enum state) {
-	switch (state) {
-	case Unknown: return QStringLiteral("Unknown");
-	case Connecting: return QStringLiteral("Connecting");
-	case Connected: return QStringLiteral("Connected");
-	case Disconnecting: return QStringLiteral("Disconnecting");
-	case Disconnected: return QStringLiteral("Disconnected");
-	default: return QStringLiteral("Unknown");
-	}
-}
-
-QString ConnectionFailReason::toString(ConnectionFailReason::Enum reason) {
-	switch (reason) {
-	case Unknown: return QStringLiteral("Unknown");
-	case NoSecrets: return QStringLiteral("Secrets were required but not provided");
-	case WifiClientDisconnected: return QStringLiteral("Wi-Fi supplicant disconnected");
-	case WifiClientFailed: return QStringLiteral("Wi-Fi supplicant failed");
-	case WifiAuthTimeout: return QStringLiteral("Wi-Fi connection took too long to authenticate");
-	case WifiNetworkLost: return QStringLiteral("Wi-Fi network could not be found");
-	default: return QStringLiteral("Unknown");
-	}
-}
-
-QString DeviceType::toString(DeviceType::Enum type) {
-	switch (type) {
-	case None: return QStringLiteral("None");
-	case Wifi: return QStringLiteral("Wifi");
-	case Wired: return QStringLiteral("Wired");
-	default: return QStringLiteral("Unknown");
-	}
-}
-
-QString WifiSecurityType::toString(WifiSecurityType::Enum type) {
-	switch (type) {
-	case Unknown: return QStringLiteral("Unknown");
-	case Wpa3SuiteB192: return QStringLiteral("WPA3 Suite B 192-bit");
-	case Sae: return QStringLiteral("WPA3");
-	case Wpa2Eap: return QStringLiteral("WPA2 Enterprise");
-	case Wpa2Psk: return QStringLiteral("WPA2");
-	case WpaEap: return QStringLiteral("WPA Enterprise");
-	case WpaPsk: return QStringLiteral("WPA");
-	case StaticWep: return QStringLiteral("WEP");
-	case DynamicWep: return QStringLiteral("Dynamic WEP");
-	case Leap: return QStringLiteral("LEAP");
-	case Owe: return QStringLiteral("OWE");
-	case Open: return QStringLiteral("Open");
-	default: return QStringLiteral("Unknown");
-	}
-}
-
-QString WifiDeviceMode::toString(WifiDeviceMode::Enum mode) {
-	switch (mode) {
-	case Unknown: return QStringLiteral("Unknown");
-	case AdHoc: return QStringLiteral("Ad-Hoc");
-	case Station: return QStringLiteral("Station");
-	case AccessPoint: return QStringLiteral("Access Point");
-	case Mesh: return QStringLiteral("Mesh");
-	default: return QStringLiteral("Unknown");
-	};
-}
-
-} // namespace qs::network

src/network/enums.hpp

@@ -1,155 +0,0 @@
-#pragma once
-
-#include <qobject.h>
-#include <qqmlintegration.h>
-#include <qtypes.h>
-
-namespace qs::network {
-
-///! The degree to which the host can reach the internet.
-class NetworkConnectivity: public QObject {
-	Q_OBJECT;
-	QML_ELEMENT;
-	QML_SINGLETON;
-
-public:
-	enum Enum : quint8 {
-		/// Network connectivity is unknown. This means the connectivity checks are disabled or have not run yet.
-		Unknown = 0,
-		/// The host is not connected to any network.
-		None = 1,
-		/// The internet connection is hijacked by a captive portal gateway.
-		/// This indicates the shell should open a sandboxed web browser window for the purpose of authenticating to a gateway.
-		Portal = 2,
-		/// The host is connected to a network but does not appear to be able to reach the full internet.
-		Limited = 3,
-		/// The host is connected to a network and appears to be able to reach the full internet.
-		Full = 4,
-	};
-	Q_ENUM(Enum);
-	Q_INVOKABLE static QString toString(NetworkConnectivity::Enum conn);
-};
-
-///! The backend supplying the Network service.
-class NetworkBackendType: public QObject {
-	Q_OBJECT;
-	QML_ELEMENT;
-	QML_SINGLETON;
-
-public:
-	enum Enum : quint8 {
-		None = 0,
-		NetworkManager = 1,
-	};
-	Q_ENUM(Enum);
-	Q_INVOKABLE static QString toString(NetworkBackendType::Enum type);
-};
-
-///! The connection state of a device or network.
-class ConnectionState: public QObject {
-	Q_OBJECT;
-	QML_ELEMENT;
-	QML_SINGLETON;
-
-public:
-	enum Enum : quint8 {
-		Unknown = 0,
-		Connecting = 1,
-		Connected = 2,
-		Disconnecting = 3,
-		Disconnected = 4,
-	};
-	Q_ENUM(Enum);
-	Q_INVOKABLE static QString toString(ConnectionState::Enum state);
-};
-
-///! The reason a connection failed.
-class ConnectionFailReason: public QObject {
-	Q_OBJECT;
-	QML_ELEMENT;
-	QML_SINGLETON;
-
-public:
-	enum Enum : quint8 {
-		/// The connection failed for an unknown reason.
-		Unknown = 0,
-		/// Secrets were required, but not provided.
-		NoSecrets = 1,
-		/// The Wi-Fi supplicant disconnected.
-		WifiClientDisconnected = 2,
-		/// The Wi-Fi supplicant failed.
-		WifiClientFailed = 3,
-		/// The Wi-Fi connection took too long to authenticate.
-		WifiAuthTimeout = 4,
-		/// The Wi-Fi network could not be found.
-		WifiNetworkLost = 5,
-	};
-	Q_ENUM(Enum);
-	Q_INVOKABLE static QString toString(ConnectionFailReason::Enum reason);
-};
-
-///! Type of a @@NetworkDevice.
-class DeviceType: public QObject {
-	Q_OBJECT;
-	QML_ELEMENT;
-	QML_SINGLETON;
-
-public:
-	enum Enum : quint8 {
-		None = 0,
-		Wifi = 1,
-		Wired = 2,
-	};
-	Q_ENUM(Enum);
-	Q_INVOKABLE static QString toString(DeviceType::Enum type);
-};
-
-///! The security type of a @@WifiNetwork.
-class WifiSecurityType: public QObject {
-	Q_OBJECT;
-	QML_ELEMENT;
-	QML_SINGLETON;
-
-public:
-	enum Enum : quint8 {
-		Wpa3SuiteB192 = 0,
-		Sae = 1,
-		Wpa2Eap = 2,
-		Wpa2Psk = 3,
-		WpaEap = 4,
-		WpaPsk = 5,
-		StaticWep = 6,
-		DynamicWep = 7,
-		Leap = 8,
-		Owe = 9,
-		Open = 10,
-		Unknown = 11,
-	};
-	Q_ENUM(Enum);
-	Q_INVOKABLE static QString toString(WifiSecurityType::Enum type);
-};
-
-///! The 802.11 mode of a @@WifiDevice.
-class WifiDeviceMode: public QObject {
-	Q_OBJECT;
-	QML_ELEMENT;
-	QML_SINGLETON;
-
-public:
-	enum Enum : quint8 {
-		/// The device is part of an Ad-Hoc network without a central access point.
-		AdHoc = 0,
-		/// The device is a station that can connect to networks.
-		Station = 1,
-		/// The device is a local hotspot/access point.
-		AccessPoint = 2,
-		/// The device is an 802.11s mesh point.
-		Mesh = 3,
-		/// The device mode is unknown.
-		Unknown = 4,
-	};
-	Q_ENUM(Enum);
-	Q_INVOKABLE static QString toString(WifiDeviceMode::Enum mode);
-};
-
-} // namespace qs::network

src/network/module.md

@@ -1,13 +1,9 @@
 name = "Quickshell.Networking"
 description = "Network API"
 headers = [
-	"qml.hpp",
 	"network.hpp",
 	"device.hpp",
 	"wifi.hpp",
-	"wired.hpp",
-	"enums.hpp",
-	"nm/settings.hpp",
 ]
 -----
 This module exposes Network management APIs provided by a supported network backend.

src/network/network.cpp

@@ -1,15 +1,15 @@
 #include "network.hpp"
 #include <utility>
 
-#include <qdebug.h>
 #include <qlogging.h>
 #include <qloggingcategory.h>
 #include <qobject.h>
 #include <qstring.h>
+#include <qtmetamacros.h>
 
 #include "../core/logcat.hpp"
-#include "enums.hpp"
-#include "nm/settings.hpp"
+#include "device.hpp"
+#include "nm/backend.hpp"
 
 namespace qs::network {
 
@@ -17,54 +17,49 @@ namespace {
 QS_LOGGING_CATEGORY(logNetwork, "quickshell.network", QtWarningMsg);
 } // namespace
 
-Network::Network(QString name, NetworkDevice* device, QObject* parent)
-    : QObject(parent)
-    , bName(std::move(name))
-    , mDevice(device) {
+QString NetworkState::toString(NetworkState::Enum state) {
+	switch (state) {
+	case NetworkState::Connecting: return QStringLiteral("Connecting");
+	case NetworkState::Connected: return QStringLiteral("Connected");
+	case NetworkState::Disconnecting: return QStringLiteral("Disconnecting");
+	case NetworkState::Disconnected: return QStringLiteral("Disconnected");
+	default: return QStringLiteral("Unknown");
+	}
+}
+
+Networking::Networking(QObject* parent): QObject(parent) {
+	// Try to create the NetworkManager backend and bind to it.
+	auto* nm = new NetworkManager(this);
+	if (nm->isAvailable()) {
+		QObject::connect(nm, &NetworkManager::deviceAdded, this, &Networking::deviceAdded);
+		QObject::connect(nm, &NetworkManager::deviceRemoved, this, &Networking::deviceRemoved);
+		QObject::connect(this, &Networking::requestSetWifiEnabled, nm, &NetworkManager::setWifiEnabled);
+		this->bindableWifiEnabled().setBinding([nm]() { return nm->wifiEnabled(); });
+		this->bindableWifiHardwareEnabled().setBinding([nm]() { return nm->wifiHardwareEnabled(); });
+
+		this->mBackend = nm;
+		this->mBackendType = NetworkBackendType::NetworkManager;
+		return;
+	} else {
+		delete nm;
+	}
+
+	qCCritical(logNetwork) << "Network will not work. Could not find an available backend.";
+}
+
+void Networking::deviceAdded(NetworkDevice* dev) { this->mDevices.insertObject(dev); }
+void Networking::deviceRemoved(NetworkDevice* dev) { this->mDevices.removeObject(dev); }
+
+void Networking::setWifiEnabled(bool enabled) {
+	if (this->bWifiEnabled == enabled) return;
+	emit this->requestSetWifiEnabled(enabled);
+}
+
+Network::Network(QString name, QObject* parent): QObject(parent), mName(std::move(name)) {
 	this->bStateChanging.setBinding([this] {
 		auto state = this->bState.value();
-		return state == ConnectionState::Connecting || state == ConnectionState::Disconnecting;
+		return state == NetworkState::Connecting || state == NetworkState::Disconnecting;
 	});
 };
 
-void Network::connect() {
-	if (this->bConnected) {
-		qCCritical(logNetwork) << this << "is already connected.";
-		return;
-	}
-	this->requestConnect();
-}
-
-void Network::connectWithSettings(NMSettings* settings) {
-	if (this->bConnected) {
-		qCCritical(logNetwork) << this << "is already connected.";
-		return;
-	}
-	if (this->bNmSettings.value().indexOf(settings) == -1) return;
-	this->requestConnectWithSettings(settings);
-}
-
-void Network::disconnect() {
-	if (!this->bConnected) {
-		qCCritical(logNetwork) << this << "is not currently connected";
-		return;
-	}
-	this->requestDisconnect();
-}
-
-void Network::forget() { this->requestForget(); }
-
-void Network::settingsAdded(NMSettings* settings) {
-	auto list = this->bNmSettings.value();
-	if (list.contains(settings)) return;
-	list.append(settings);
-	this->bNmSettings = list;
-}
-
-void Network::settingsRemoved(NMSettings* settings) {
-	auto list = this->bNmSettings.value();
-	list.removeOne(settings);
-	this->bNmSettings = list;
-}
-
 } // namespace qs::network

src/network/network.hpp

@@ -6,102 +6,137 @@
 #include <qtmetamacros.h>
 #include <qtypes.h>
 
-#include "../core/doc.hpp"
-#include "enums.hpp"
-#include "nm/settings.hpp"
+#include "../core/model.hpp"
+#include "device.hpp"
 
 namespace qs::network {
-class NetworkDevice;
-}
 
-namespace qs::network {
+///! The connection state of a Network.
+class NetworkState: public QObject {
+	Q_OBJECT;
+	QML_ELEMENT;
+	QML_SINGLETON;
+
+public:
+	enum Enum : quint8 {
+		Unknown = 0,
+		Connecting = 1,
+		Connected = 2,
+		Disconnecting = 3,
+		Disconnected = 4,
+	};
+	Q_ENUM(Enum);
+	Q_INVOKABLE static QString toString(NetworkState::Enum state);
+};
+
+///! The backend supplying the Network service.
+class NetworkBackendType: public QObject {
+	Q_OBJECT;
+	QML_ELEMENT;
+	QML_SINGLETON;
+
+public:
+	enum Enum : quint8 {
+		None = 0,
+		NetworkManager = 1,
+	};
+	Q_ENUM(Enum);
+};
+
+class NetworkBackend: public QObject {
+	Q_OBJECT;
+
+public:
+	[[nodiscard]] virtual bool isAvailable() const = 0;
+
+protected:
+	explicit NetworkBackend(QObject* parent = nullptr): QObject(parent) {};
+};
+
+///! The Network service.
+/// An interface to a network backend (currently only NetworkManager),
+/// which can be used to view, configure, and connect to various networks.
+class Networking: public QObject {
+	Q_OBJECT;
+	QML_SINGLETON;
+	QML_ELEMENT;
+	// clang-format off
+	/// A list of all network devices.
+	QSDOC_TYPE_OVERRIDE(ObjectModel<qs::network::NetworkDevice>*);
+	Q_PROPERTY(UntypedObjectModel* devices READ devices CONSTANT);
+	/// The backend being used to power the Network service.
+	Q_PROPERTY(qs::network::NetworkBackendType::Enum backend READ backend CONSTANT);
+	/// Switch for the rfkill software block of all wireless devices.
+	Q_PROPERTY(bool wifiEnabled READ wifiEnabled WRITE setWifiEnabled NOTIFY wifiEnabledChanged);
+	/// State of the rfkill hardware block of all wireless devices.
+	Q_PROPERTY(bool wifiHardwareEnabled READ default NOTIFY wifiHardwareEnabledChanged BINDABLE bindableWifiHardwareEnabled);
+	// clang-format on
+
+public:
+	explicit Networking(QObject* parent = nullptr);
+
+	[[nodiscard]] ObjectModel<NetworkDevice>* devices() { return &this->mDevices; };
+	[[nodiscard]] NetworkBackendType::Enum backend() const { return this->mBackendType; };
+	QBindable<bool> bindableWifiEnabled() { return &this->bWifiEnabled; };
+	[[nodiscard]] bool wifiEnabled() const { return this->bWifiEnabled; };
+	void setWifiEnabled(bool enabled);
+	QBindable<bool> bindableWifiHardwareEnabled() { return &this->bWifiHardwareEnabled; };
+
+signals:
+	void requestSetWifiEnabled(bool enabled);
+	void wifiEnabledChanged();
+	void wifiHardwareEnabledChanged();
+
+private slots:
+	void deviceAdded(NetworkDevice* dev);
+	void deviceRemoved(NetworkDevice* dev);
+
+private:
+	ObjectModel<NetworkDevice> mDevices {this};
+	NetworkBackend* mBackend = nullptr;
+	NetworkBackendType::Enum mBackendType = NetworkBackendType::None;
+	// clang-format off
+	Q_OBJECT_BINDABLE_PROPERTY(Networking, bool, bWifiEnabled, &Networking::wifiEnabledChanged);
+	Q_OBJECT_BINDABLE_PROPERTY(Networking, bool, bWifiHardwareEnabled, &Networking::wifiHardwareEnabledChanged);
+	// clang-format on
+};
 
 ///! A network.
-/// A network. Networks derived from a @@WifiDevice are @@WifiNetwork instances.
 class Network: public QObject {
 	Q_OBJECT;
 	QML_ELEMENT;
-	QML_UNCREATABLE("Network can only be aqcuired through networking devices");
+	QML_UNCREATABLE("BaseNetwork can only be aqcuired through network devices");
 
 	// clang-format off
 	/// The name of the network.
-	Q_PROPERTY(QString name READ default NOTIFY nameChanged BINDABLE bindableName);
-	/// The device this network belongs to.
-	Q_PROPERTY(NetworkDevice* device READ device CONSTANT);
-	/// A list of NetworkManager connection settings profiles for this network.
-	///
-	/// > [!WARNING] Only valid for the NetworkManager backend. 
-	Q_PROPERTY(QList<NMSettings*> nmSettings READ default NOTIFY nmSettingsChanged BINDABLE bindableNmSettings);
+	Q_PROPERTY(QString name READ name CONSTANT);
 	/// True if the network is connected.
 	Q_PROPERTY(bool connected READ default NOTIFY connectedChanged BINDABLE bindableConnected);
-	/// True if the wifi network has known connection settings saved.
-	Q_PROPERTY(bool known READ default NOTIFY knownChanged BINDABLE bindableKnown);
 	/// The connectivity state of the network.
-	Q_PROPERTY(ConnectionState::Enum state READ default NOTIFY stateChanged BINDABLE bindableState);
+	Q_PROPERTY(NetworkState::Enum state READ default NOTIFY stateChanged BINDABLE bindableState);
 	/// If the network is currently connecting or disconnecting. Shorthand for checking @@state.
 	Q_PROPERTY(bool stateChanging READ default NOTIFY stateChangingChanged BINDABLE bindableStateChanging);
 	// clang-format on
 
 public:
-	explicit Network(QString name, NetworkDevice* device, QObject* parent = nullptr);
-	/// Attempt to connect to the network.
-	///
-	/// > [!NOTE] If the network is a @@WifiNetwork and requires secrets, a @@connectionFailed(s)
-	/// > signal will be emitted with `NoSecrets`.
-	/// > @@WifiNetwork.connectWithPsk() can be used to provide secrets.
-	Q_INVOKABLE void connect();
-	/// Attempt to connect to the network with a specific @@nmSettings entry.
-	///
-	/// > [!WARNING] Only valid for the NetworkManager backend.
-	Q_INVOKABLE void connectWithSettings(NMSettings* settings);
-	/// Disconnect from the network.
-	Q_INVOKABLE void disconnect();
-	/// Forget all connection settings for this network.
-	Q_INVOKABLE void forget();
+	explicit Network(QString name, QObject* parent = nullptr);
 
-	void settingsAdded(NMSettings* settings);
-	void settingsRemoved(NMSettings* settings);
-
-	// clang-format off
-	[[nodiscard]] QString name() const { return this->bName; }
-	[[nodiscard]] QBindable<QString> bindableName() { return &this->bName; }
-	[[nodiscard]] NetworkDevice* device() const { return this->mDevice; }
- 	[[nodiscard]] const QList<NMSettings*>& nmSettings() const { return this->bNmSettings; }
-	QBindable<QList<NMSettings*>> bindableNmSettings() const { return &this->bNmSettings; }
+	[[nodiscard]] QString name() const { return this->mName; };
 	QBindable<bool> bindableConnected() { return &this->bConnected; }
-	QBindable<bool> bindableKnown() { return &this->bKnown; }
-	[[nodiscard]] ConnectionState::Enum state() const { return this->bState; }
-	QBindable<ConnectionState::Enum> bindableState() { return &this->bState; }
+	QBindable<NetworkState::Enum> bindableState() { return &this->bState; }
 	QBindable<bool> bindableStateChanging() { return &this->bStateChanging; }
-	// clang-format on
 
 signals:
-	/// Signals that a connection to the network has failed because of the given @@ConnectionFailReason.
-	void connectionFailed(ConnectionFailReason::Enum reason);
-
-	void nameChanged();
 	void connectedChanged();
-	void knownChanged();
 	void stateChanged();
 	void stateChangingChanged();
-	void nmSettingsChanged();
-	QSDOC_HIDE void requestConnect();
-	QSDOC_HIDE void requestConnectWithSettings(NMSettings* settings);
-	QSDOC_HIDE void requestDisconnect();
-	QSDOC_HIDE void requestForget();
 
 protected:
-	// clang-format off
-	Q_OBJECT_BINDABLE_PROPERTY(Network, QString, bName, &Network::nameChanged);
-	Q_OBJECT_BINDABLE_PROPERTY(Network, bool, bConnected, &Network::connectedChanged);
-	Q_OBJECT_BINDABLE_PROPERTY(Network, bool, bKnown, &Network::knownChanged);
-	Q_OBJECT_BINDABLE_PROPERTY(Network, ConnectionState::Enum, bState, &Network::stateChanged);
-	Q_OBJECT_BINDABLE_PROPERTY(Network, bool, bStateChanging, &Network::stateChangingChanged);
-	Q_OBJECT_BINDABLE_PROPERTY(Network, QList<NMSettings*>, bNmSettings, &Network::nmSettingsChanged);
-	// clang-format on
+	QString mName;
 
-private:
-	NetworkDevice* mDevice;
+	Q_OBJECT_BINDABLE_PROPERTY(Network, bool, bConnected, &Network::connectedChanged);
+	Q_OBJECT_BINDABLE_PROPERTY(Network, NetworkState::Enum, bState, &Network::stateChanged);
+	Q_OBJECT_BINDABLE_PROPERTY(Network, bool, bStateChanging, &Network::stateChangingChanged);
 };
 
 } // namespace qs::network

src/network/nm/CMakeLists.txt

@@ -29,16 +29,6 @@ qt_add_dbus_interface(NM_DBUS_INTERFACES
 	dbus_nm_wireless
 )
 
-set_source_files_properties(org.freedesktop.NetworkManager.Device.Wired.xml PROPERTIES
-	CLASSNAME DBusNMWiredProxy
-	NO_NAMESPACE TRUE
-)
-
-qt_add_dbus_interface(NM_DBUS_INTERFACES
-	org.freedesktop.NetworkManager.Device.Wired.xml
-	dbus_nm_wired
-)
-
 set_source_files_properties(org.freedesktop.NetworkManager.AccessPoint.xml PROPERTIES
 	CLASSNAME DBusNMAccessPointProxy
 	NO_NAMESPACE TRUE
@@ -73,14 +63,10 @@ qt_add_dbus_interface(NM_DBUS_INTERFACES
 qt_add_library(quickshell-network-nm STATIC
 	backend.cpp
 	device.cpp
-	active_connection.cpp
-	settings.cpp
+	connection.cpp
 	accesspoint.cpp
 	wireless.cpp
-	wired.cpp
 	utils.cpp
-	dbus_types.cpp
-	network.cpp
 	enums.hpp
 	${NM_DBUS_INTERFACES}
 )
@@ -91,4 +77,3 @@ target_include_directories(quickshell-network-nm PUBLIC
 
 target_link_libraries(quickshell-network-nm PRIVATE Qt::Qml Qt::DBus)
 qs_add_link_dependencies(quickshell-network-nm quickshell-dbus)
-qs_add_link_dependencies(quickshell-network-nm quickshell-network)

src/network/nm/accesspoint.hpp

@@ -7,7 +7,7 @@
 #include <qtypes.h>
 
 #include "../../dbus/properties.hpp"
-#include "../enums.hpp"
+#include "../wifi.hpp"
 #include "dbus_nm_accesspoint.h"
 #include "enums.hpp"
 
@@ -48,14 +48,14 @@ public:
 	[[nodiscard]] bool isValid() const;
 	[[nodiscard]] QString path() const;
 	[[nodiscard]] QString address() const;
-	[[nodiscard]] QByteArray ssid() const { return this->bSsid; }
-	[[nodiscard]] quint8 signalStrength() const { return this->bSignalStrength; }
-	[[nodiscard]] NM80211ApFlags::Enum flags() const { return this->bFlags; }
-	[[nodiscard]] NM80211ApSecurityFlags::Enum wpaFlags() const { return this->bWpaFlags; }
-	[[nodiscard]] NM80211ApSecurityFlags::Enum rsnFlags() const { return this->bRsnFlags; }
-	[[nodiscard]] NM80211Mode::Enum mode() const { return this->bMode; }
-	[[nodiscard]] QBindable<WifiSecurityType::Enum> bindableSecurity() { return &this->bSecurity; }
-	[[nodiscard]] WifiSecurityType::Enum security() const { return this->bSecurity; }
+	[[nodiscard]] QByteArray ssid() const { return this->bSsid; };
+	[[nodiscard]] quint8 signalStrength() const { return this->bSignalStrength; };
+	[[nodiscard]] NM80211ApFlags::Enum flags() const { return this->bFlags; };
+	[[nodiscard]] NM80211ApSecurityFlags::Enum wpaFlags() const { return this->bWpaFlags; };
+	[[nodiscard]] NM80211ApSecurityFlags::Enum rsnFlags() const { return this->bRsnFlags; };
+	[[nodiscard]] NM80211Mode::Enum mode() const { return this->bMode; };
+	[[nodiscard]] QBindable<WifiSecurityType::Enum> bindableSecurity() { return &this->bSecurity; };
+	[[nodiscard]] WifiSecurityType::Enum security() const { return this->bSecurity; };
 
 signals:
 	void loaded();

src/network/nm/active_connection.cpp

@@ -1,68 +0,0 @@
-#include "active_connection.hpp"
-
-#include <qcontainerfwd.h>
-#include <qdbusconnection.h>
-#include <qdbuspendingcall.h>
-#include <qlogging.h>
-#include <qloggingcategory.h>
-#include <qnamespace.h>
-#include <qobject.h>
-#include <qstring.h>
-#include <qtypes.h>
-
-#include "../../core/logcat.hpp"
-#include "../../dbus/properties.hpp"
-#include "dbus_nm_active_connection.h"
-#include "enums.hpp"
-
-namespace qs::network {
-using namespace qs::dbus;
-
-namespace {
-QS_LOGGING_CATEGORY(logNetworkManager, "quickshell.network.networkmanager", QtWarningMsg);
-}
-
-NMActiveConnection::NMActiveConnection(const QString& path, QObject* parent): QObject(parent) {
-	this->proxy = new DBusNMActiveConnectionProxy(
-	    "org.freedesktop.NetworkManager",
-	    path,
-	    QDBusConnection::systemBus(),
-	    this
-	);
-
-	if (!this->proxy->isValid()) {
-		qCWarning(logNetworkManager) << "Cannot create DBus interface for connection at" << path;
-		return;
-	}
-
-	// clang-format off
-	QObject::connect(&this->activeConnectionProperties, &DBusPropertyGroup::getAllFinished, this, &NMActiveConnection::loaded, Qt::SingleShotConnection);
-	QObject::connect(this->proxy, &DBusNMActiveConnectionProxy::StateChanged, this, &NMActiveConnection::onStateChanged);
-	// clang-format on
-
-	this->activeConnectionProperties.setInterface(this->proxy);
-	this->activeConnectionProperties.updateAllViaGetAll();
-}
-
-void NMActiveConnection::onStateChanged(quint32 /*state*/, quint32 reason) {
-	auto enumReason = static_cast<NMConnectionStateReason::Enum>(reason);
-	if (this->bStateReason == enumReason) return;
-	this->bStateReason = enumReason;
-}
-
-bool NMActiveConnection::isValid() const { return this->proxy && this->proxy->isValid(); }
-QString NMActiveConnection::address() const {
-	return this->proxy ? this->proxy->service() : QString();
-}
-QString NMActiveConnection::path() const { return this->proxy ? this->proxy->path() : QString(); }
-
-} // namespace qs::network
-
-namespace qs::dbus {
-
-DBusResult<qs::network::NMConnectionState::Enum>
-DBusDataTransform<qs::network::NMConnectionState::Enum>::fromWire(quint32 wire) {
-	return DBusResult(static_cast<qs::network::NMConnectionState::Enum>(wire));
-}
-
-} // namespace qs::dbus

src/network/nm/backend.cpp

@@ -1,6 +1,5 @@
 #include "backend.hpp"
 
-#include <qbytearray.h>
 #include <qdbusconnection.h>
 #include <qdbusextratypes.h>
 #include <qdbusmetatype.h>
@@ -15,13 +14,14 @@
 
 #include "../../core/logcat.hpp"
 #include "../../dbus/properties.hpp"
-#include "../qml.hpp"
+#include "../device.hpp"
+#include "../network.hpp"
+#include "../wifi.hpp"
 #include "dbus_nm_backend.h"
 #include "dbus_nm_device.h"
 #include "dbus_types.hpp"
 #include "device.hpp"
 #include "enums.hpp"
-#include "wired.hpp"
 #include "wireless.hpp"
 
 namespace qs::network {
@@ -31,8 +31,7 @@ QS_LOGGING_CATEGORY(logNetworkManager, "quickshell.network.networkmanager", QtWa
 }
 
 NetworkManager::NetworkManager(QObject* parent): NetworkBackend(parent) {
-	qCDebug(logNetworkManager) << "Connecting to NetworkManager";
-	qDBusRegisterMetaType<NMSettingsMap>();
+	qDBusRegisterMetaType<ConnectionSettingsMap>();
 
 	auto bus = QDBusConnection::systemBus();
 	if (!bus.isConnected()) {
@@ -70,23 +69,6 @@ void NetworkManager::init() {
 	this->registerDevices();
 }
 
-void NetworkManager::checkConnectivity() {
-	auto pending = this->proxy->CheckConnectivity();
-	auto* call = new QDBusPendingCallWatcher(pending, this);
-
-	auto responseCallback = [](QDBusPendingCallWatcher* call) {
-		const QDBusPendingReply<quint32> reply = *call;
-
-		if (reply.isError()) {
-			qCInfo(logNetworkManager) << "Failed to check connectivity: " << reply.error().message();
-		}
-
-		delete call;
-	};
-
-	QObject::connect(call, &QDBusPendingCallWatcher::finished, this, responseCallback);
-}
-
 void NetworkManager::registerDevices() {
 	auto pending = this->proxy->GetAllDevices();
 	auto* call = new QDBusPendingCallWatcher(pending, this);
@@ -131,27 +113,27 @@ void NetworkManager::registerDevice(const QString& path) {
 
 			switch (type) {
 			case NMDeviceType::Wifi: dev = new NMWirelessDevice(path); break;
-			case NMDeviceType::Ethernet: dev = new NMWiredDevice(path); break;
 			default: break;
 			}
 
 			if (dev) {
-				qCDebug(logNetworkManager) << "Device added:" << path;
 				if (!dev->isValid()) {
 					qCWarning(logNetworkManager) << "Ignoring invalid registration of" << path;
 					delete dev;
 				} else {
 					this->mDevices[path] = dev;
+					// Only register a frontend device while it's managed by NM.
+					auto onManagedChanged = [this, dev, type](bool managed) {
+						managed ? this->registerFrontendDevice(type, dev) : this->removeFrontendDevice(dev);
+					};
 					// clang-format off
 					QObject::connect(dev, &NMDevice::addAndActivateConnection, this, &NetworkManager::addAndActivateConnection);
 					QObject::connect(dev, &NMDevice::activateConnection, this, &NetworkManager::activateConnection);
+					QObject::connect(dev, &NMDevice::managedChanged, this, onManagedChanged);
 					// clang-format on
-					QObject::connect(dev, &NMDevice::loaded, this, [this, dev]() {
-						emit this->deviceAdded(dev->frontend());
-					});
+
+					if (dev->managed()) this->registerFrontendDevice(type, dev);
 				}
-			} else {
-				qCDebug(logNetworkManager) << "Ignoring registration of unsupported device:" << path;
 			}
 			temp->deleteLater();
 		}
@@ -160,6 +142,66 @@ void NetworkManager::registerDevice(const QString& path) {
 	qs::dbus::asyncReadProperty<uint>(*temp, "DeviceType", callback);
 }
 
+void NetworkManager::registerFrontendDevice(NMDeviceType::Enum type, NMDevice* dev) {
+	NetworkDevice* frontendDev = nullptr;
+	switch (type) {
+	case NMDeviceType::Wifi: {
+		auto* frontendWifiDev = new WifiDevice(dev);
+		auto* wifiDev = qobject_cast<NMWirelessDevice*>(dev);
+		// Bind WifiDevice-specific properties
+		auto translateMode = [wifiDev]() {
+			switch (wifiDev->mode()) {
+			case NM80211Mode::Unknown: return WifiDeviceMode::Unknown;
+			case NM80211Mode::Adhoc: return WifiDeviceMode::AdHoc;
+			case NM80211Mode::Infra: return WifiDeviceMode::Station;
+			case NM80211Mode::Ap: return WifiDeviceMode::AccessPoint;
+			case NM80211Mode::Mesh: return WifiDeviceMode::Mesh;
+			}
+		};
+		// clang-format off
+		frontendWifiDev->bindableMode().setBinding(translateMode);
+		wifiDev->bindableScanning().setBinding([frontendWifiDev]() { return frontendWifiDev->scannerEnabled(); });
+		QObject::connect(wifiDev, &NMWirelessDevice::networkAdded, frontendWifiDev, &WifiDevice::networkAdded);
+		QObject::connect(wifiDev, &NMWirelessDevice::networkRemoved, frontendWifiDev, &WifiDevice::networkRemoved);
+		// clang-format on
+		frontendDev = frontendWifiDev;
+		break;
+	}
+	default: return;
+	}
+
+	// Bind generic NetworkDevice properties
+	auto translateState = [dev]() {
+		switch (dev->state()) {
+		case 0 ... 20: return DeviceConnectionState::Unknown;
+		case 30: return DeviceConnectionState::Disconnected;
+		case 40 ... 90: return DeviceConnectionState::Connecting;
+		case 100: return DeviceConnectionState::Connected;
+		case 110 ... 120: return DeviceConnectionState::Disconnecting;
+		}
+	};
+	// clang-format off
+	frontendDev->bindableName().setBinding([dev]() { return dev->interface(); });
+	frontendDev->bindableAddress().setBinding([dev]() { return dev->hwAddress(); });
+	frontendDev->bindableNmState().setBinding([dev]() { return dev->state(); });
+	frontendDev->bindableState().setBinding(translateState);
+	frontendDev->bindableAutoconnect().setBinding([dev]() { return dev->autoconnect(); });
+	QObject::connect(frontendDev, &WifiDevice::requestDisconnect, dev, &NMDevice::disconnect);
+	QObject::connect(frontendDev, &NetworkDevice::requestSetAutoconnect, dev, &NMDevice::setAutoconnect);
+	// clang-format on
+
+	this->mFrontendDevices.insert(dev->path(), frontendDev);
+	emit this->deviceAdded(frontendDev);
+}
+
+void NetworkManager::removeFrontendDevice(NMDevice* dev) {
+	auto* frontendDev = this->mFrontendDevices.take(dev->path());
+	if (frontendDev) {
+		emit this->deviceRemoved(frontendDev);
+		frontendDev->deleteLater();
+	}
+}
+
 void NetworkManager::onDevicePathAdded(const QDBusObjectPath& path) {
 	this->registerDevice(path.path());
 }
@@ -173,8 +215,7 @@ void NetworkManager::onDevicePathRemoved(const QDBusObjectPath& path) {
 		auto* dev = iter.value();
 		this->mDevices.erase(iter);
 		if (dev) {
-			qCDebug(logNetworkManager) << "Device removed:" << path.path();
-			emit this->deviceRemoved(dev->frontend());
+			this->removeFrontendDevice(dev);
 			delete dev;
 		}
 	}
@@ -199,7 +240,7 @@ void NetworkManager::activateConnection(
 }
 
 void NetworkManager::addAndActivateConnection(
-    const NMSettingsMap& settings,
+    const ConnectionSettingsMap& settings,
     const QDBusObjectPath& devPath,
     const QDBusObjectPath& specificObjectPath
 ) {
@@ -218,12 +259,6 @@ void NetworkManager::addAndActivateConnection(
 	QObject::connect(call, &QDBusPendingCallWatcher::finished, this, responseCallback);
 }
 
-void NetworkManager::setConnectivityCheckEnabled(bool enabled) {
-	if (enabled == this->bConnectivityCheckEnabled) return;
-	this->bConnectivityCheckEnabled = enabled;
-	this->pConnectivityCheckEnabled.write();
-}
-
 void NetworkManager::setWifiEnabled(bool enabled) {
 	if (enabled == this->bWifiEnabled) return;
 	this->bWifiEnabled = enabled;
@@ -233,12 +268,3 @@ void NetworkManager::setWifiEnabled(bool enabled) {
 bool NetworkManager::isAvailable() const { return this->proxy && this->proxy->isValid(); };
 
 } // namespace qs::network
-
-namespace qs::dbus {
-
-DBusResult<qs::network::NMConnectivityState::Enum>
-DBusDataTransform<qs::network::NMConnectivityState::Enum>::fromWire(quint32 wire) {
-	return DBusResult(static_cast<qs::network::NMConnectivityState::Enum>(wire));
-}
-
-} // namespace qs::dbus

src/network/nm/backend.hpp

@@ -8,22 +8,9 @@
 #include <qtypes.h>
 
 #include "../../dbus/properties.hpp"
-#include "../qml.hpp"
+#include "../network.hpp"
 #include "dbus_nm_backend.h"
-#include "dbus_types.hpp"
 #include "device.hpp"
-#include "enums.hpp"
-
-namespace qs::dbus {
-
-template <>
-struct DBusDataTransform<qs::network::NMConnectivityState::Enum> {
-	using Wire = quint32;
-	using Data = qs::network::NMConnectivityState::Enum;
-	static DBusResult<Data> fromWire(Wire wire);
-};
-
-} // namespace qs::dbus
 
 namespace qs::network {
 
@@ -34,34 +21,24 @@ public:
 	explicit NetworkManager(QObject* parent = nullptr);
 
 	[[nodiscard]] bool isAvailable() const override;
-	[[nodiscard]] bool wifiEnabled() const { return this->bWifiEnabled; }
-	[[nodiscard]] bool wifiHardwareEnabled() const { return this->bWifiHardwareEnabled; }
-	[[nodiscard]] bool connectivityCheckAvailable() const {
-		return this->bConnectivityCheckAvailable;
-	};
-	[[nodiscard]] bool connectivityCheckEnabled() const { return this->bConnectivityCheckEnabled; }
-	[[nodiscard]] NMConnectivityState::Enum connectivity() const { return this->bConnectivity; }
+	[[nodiscard]] bool wifiEnabled() const { return this->bWifiEnabled; };
+	[[nodiscard]] bool wifiHardwareEnabled() const { return this->bWifiHardwareEnabled; };
 
 signals:
 	void deviceAdded(NetworkDevice* device);
 	void deviceRemoved(NetworkDevice* device);
 	void wifiEnabledChanged(bool enabled);
 	void wifiHardwareEnabledChanged(bool enabled);
-	void connectivityStateChanged(NMConnectivityState::Enum state);
-	void connectivityCheckAvailableChanged(bool available);
-	void connectivityCheckEnabledChanged(bool enabled);
 
 public slots:
 	void setWifiEnabled(bool enabled);
-	void setConnectivityCheckEnabled(bool enabled);
-	void checkConnectivity();
 
 private slots:
 	void onDevicePathAdded(const QDBusObjectPath& path);
 	void onDevicePathRemoved(const QDBusObjectPath& path);
 	void activateConnection(const QDBusObjectPath& connPath, const QDBusObjectPath& devPath);
 	void addAndActivateConnection(
-	    const NMSettingsMap& settings,
+	    const ConnectionSettingsMap& settings,
 	    const QDBusObjectPath& devPath,
 	    const QDBusObjectPath& specificObjectPath
 	);
@@ -70,22 +47,19 @@ private:
 	void init();
 	void registerDevices();
 	void registerDevice(const QString& path);
+	void registerFrontendDevice(NMDeviceType::Enum type, NMDevice* dev);
+	void removeFrontendDevice(NMDevice* dev);
 
 	QHash<QString, NMDevice*> mDevices;
+	QHash<QString, NetworkDevice*> mFrontendDevices;
 
 	// clang-format off
 	Q_OBJECT_BINDABLE_PROPERTY(NetworkManager, bool, bWifiEnabled, &NetworkManager::wifiEnabledChanged);
 	Q_OBJECT_BINDABLE_PROPERTY(NetworkManager, bool, bWifiHardwareEnabled, &NetworkManager::wifiHardwareEnabledChanged);
-	Q_OBJECT_BINDABLE_PROPERTY(NetworkManager, NMConnectivityState::Enum, bConnectivity, &NetworkManager::connectivityStateChanged);
-	Q_OBJECT_BINDABLE_PROPERTY(NetworkManager, bool, bConnectivityCheckAvailable, &NetworkManager::connectivityCheckAvailableChanged);
-	Q_OBJECT_BINDABLE_PROPERTY(NetworkManager, bool, bConnectivityCheckEnabled, &NetworkManager::connectivityCheckEnabledChanged);
 
 	QS_DBUS_BINDABLE_PROPERTY_GROUP(NetworkManager, dbusProperties);
 	QS_DBUS_PROPERTY_BINDING(NetworkManager, pWifiEnabled, bWifiEnabled, dbusProperties, "WirelessEnabled");
 	QS_DBUS_PROPERTY_BINDING(NetworkManager, pWifiHardwareEnabled, bWifiHardwareEnabled, dbusProperties, "WirelessHardwareEnabled");
-	QS_DBUS_PROPERTY_BINDING(NetworkManager, pConnectivity, bConnectivity, dbusProperties, "Connectivity");
-	QS_DBUS_PROPERTY_BINDING(NetworkManager, pConnectivityCheckAvailable, bConnectivityCheckAvailable, dbusProperties, "ConnectivityCheckAvailable");
-	QS_DBUS_PROPERTY_BINDING(NetworkManager, pConnectivityCheckEnabled, bConnectivityCheckEnabled, dbusProperties, "ConnectivityCheckEnabled");
 	// clang-format on
 	DBusNetworkManagerProxy* proxy = nullptr;
 };

src/network/nm/connection.cpp

@@ -0,0 +1,151 @@
+#include "connection.hpp"
+
+#include <qdbusconnection.h>
+#include <qdbusmetatype.h>
+#include <qdbuspendingcall.h>
+#include <qdbuspendingreply.h>
+#include <qlogging.h>
+#include <qloggingcategory.h>
+#include <qnamespace.h>
+#include <qobject.h>
+#include <qstring.h>
+#include <qtmetamacros.h>
+#include <qtypes.h>
+
+#include "../../core/logcat.hpp"
+#include "../../dbus/properties.hpp"
+#include "../wifi.hpp"
+#include "dbus_nm_active_connection.h"
+#include "dbus_nm_connection_settings.h"
+#include "dbus_types.hpp"
+#include "enums.hpp"
+#include "utils.hpp"
+
+namespace qs::network {
+using namespace qs::dbus;
+
+namespace {
+QS_LOGGING_CATEGORY(logNetworkManager, "quickshell.network.networkmanager", QtWarningMsg);
+}
+
+NMConnectionSettings::NMConnectionSettings(const QString& path, QObject* parent): QObject(parent) {
+	qDBusRegisterMetaType<ConnectionSettingsMap>();
+
+	this->proxy = new DBusNMConnectionSettingsProxy(
+	    "org.freedesktop.NetworkManager",
+	    path,
+	    QDBusConnection::systemBus(),
+	    this
+	);
+
+	if (!this->proxy->isValid()) {
+		qCWarning(logNetworkManager) << "Cannot create DBus interface for connection at" << path;
+		return;
+	}
+
+	QObject::connect(
+	    this->proxy,
+	    &DBusNMConnectionSettingsProxy::Updated,
+	    this,
+	    &NMConnectionSettings::updateSettings
+	);
+	this->bSecurity.setBinding([this]() { return securityFromConnectionSettings(this->bSettings); });
+
+	this->connectionSettingsProperties.setInterface(this->proxy);
+	this->connectionSettingsProperties.updateAllViaGetAll();
+
+	this->updateSettings();
+}
+
+void NMConnectionSettings::updateSettings() {
+	auto pending = this->proxy->GetSettings();
+	auto* call = new QDBusPendingCallWatcher(pending, this);
+
+	auto responseCallback = [this](QDBusPendingCallWatcher* call) {
+		const QDBusPendingReply<ConnectionSettingsMap> reply = *call;
+
+		if (reply.isError()) {
+			qCWarning(logNetworkManager)
+			    << "Failed to get" << this->path() << "settings:" << reply.error().message();
+		} else {
+			this->bSettings = reply.value();
+		}
+
+		if (!this->mLoaded) {
+			emit this->loaded();
+			this->mLoaded = true;
+		}
+		delete call;
+	};
+
+	QObject::connect(call, &QDBusPendingCallWatcher::finished, this, responseCallback);
+}
+
+void NMConnectionSettings::forget() {
+	auto pending = this->proxy->Delete();
+	auto* call = new QDBusPendingCallWatcher(pending, this);
+
+	auto responseCallback = [this](QDBusPendingCallWatcher* call) {
+		const QDBusPendingReply<> reply = *call;
+
+		if (reply.isError()) {
+			qCWarning(logNetworkManager)
+			    << "Failed to forget" << this->path() << ":" << reply.error().message();
+		}
+		delete call;
+	};
+
+	QObject::connect(call, &QDBusPendingCallWatcher::finished, this, responseCallback);
+}
+
+bool NMConnectionSettings::isValid() const { return this->proxy && this->proxy->isValid(); }
+QString NMConnectionSettings::address() const {
+	return this->proxy ? this->proxy->service() : QString();
+}
+QString NMConnectionSettings::path() const { return this->proxy ? this->proxy->path() : QString(); }
+
+NMActiveConnection::NMActiveConnection(const QString& path, QObject* parent): QObject(parent) {
+	this->proxy = new DBusNMActiveConnectionProxy(
+	    "org.freedesktop.NetworkManager",
+	    path,
+	    QDBusConnection::systemBus(),
+	    this
+	);
+
+	if (!this->proxy->isValid()) {
+		qCWarning(logNetworkManager) << "Cannot create DBus interface for connection at" << path;
+		return;
+	}
+
+	// clang-format off
+	QObject::connect(&this->activeConnectionProperties, &DBusPropertyGroup::getAllFinished, this, &NMActiveConnection::loaded, Qt::SingleShotConnection);
+	QObject::connect(this->proxy, &DBusNMActiveConnectionProxy::StateChanged, this, &NMActiveConnection::onStateChanged);
+	// clang-format on
+
+	this->activeConnectionProperties.setInterface(this->proxy);
+	this->activeConnectionProperties.updateAllViaGetAll();
+}
+
+void NMActiveConnection::onStateChanged(quint32 /*state*/, quint32 reason) {
+	auto enumReason = static_cast<NMConnectionStateReason::Enum>(reason);
+	if (this->mStateReason == enumReason) return;
+	this->mStateReason = enumReason;
+	emit this->stateReasonChanged(enumReason);
+}
+
+bool NMActiveConnection::isValid() const { return this->proxy && this->proxy->isValid(); }
+QString NMActiveConnection::address() const {
+	return this->proxy ? this->proxy->service() : QString();
+}
+QString NMActiveConnection::path() const { return this->proxy ? this->proxy->path() : QString(); }
+
+} // namespace qs::network
+
+namespace qs::dbus {
+
+DBusResult<qs::network::NMConnectionState::Enum>
+DBusDataTransform<qs::network::NMConnectionState::Enum>::fromWire(quint32 wire) {
+	return DBusResult(static_cast<qs::network::NMConnectionState::Enum>(wire));
+}
+
+} // namespace qs::dbus

src/network/nm/connection.hpp

@@ -1,16 +1,18 @@
 #pragma once
 
-#include <qbytearray.h>
 #include <qdbusextratypes.h>
 #include <qdbuspendingcall.h>
+#include <qdbuspendingreply.h>
 #include <qobject.h>
 #include <qproperty.h>
-#include <qqmlintegration.h>
-#include <qstringlist.h>
+#include <qtmetamacros.h>
 #include <qtypes.h>
 
 #include "../../dbus/properties.hpp"
+#include "../wifi.hpp"
 #include "dbus_nm_active_connection.h"
+#include "dbus_nm_connection_settings.h"
+#include "dbus_types.hpp"
 #include "enums.hpp"
 
 namespace qs::dbus {
@@ -26,6 +28,40 @@ struct DBusDataTransform<qs::network::NMConnectionState::Enum> {
 
 namespace qs::network {
 
+// Proxy of a /org/freedesktop/NetworkManager/Settings/Connection/* object.
+class NMConnectionSettings: public QObject {
+	Q_OBJECT;
+
+public:
+	explicit NMConnectionSettings(const QString& path, QObject* parent = nullptr);
+
+	void forget();
+
+	[[nodiscard]] bool isValid() const;
+	[[nodiscard]] QString path() const;
+	[[nodiscard]] QString address() const;
+	[[nodiscard]] ConnectionSettingsMap settings() const { return this->bSettings; };
+	[[nodiscard]] WifiSecurityType::Enum security() const { return this->bSecurity; };
+	[[nodiscard]] QBindable<WifiSecurityType::Enum> bindableSecurity() { return &this->bSecurity; };
+
+signals:
+	void loaded();
+	void settingsChanged(ConnectionSettingsMap settings);
+	void securityChanged(WifiSecurityType::Enum security);
+	void ssidChanged(QString ssid);
+
+private:
+	bool mLoaded = false;
+	void updateSettings();
+	// clang-format off
+	Q_OBJECT_BINDABLE_PROPERTY(NMConnectionSettings, ConnectionSettingsMap, bSettings, &NMConnectionSettings::settingsChanged);
+	Q_OBJECT_BINDABLE_PROPERTY(NMConnectionSettings, WifiSecurityType::Enum, bSecurity, &NMConnectionSettings::securityChanged);
+	QS_DBUS_BINDABLE_PROPERTY_GROUP(NMConnectionSettings, connectionSettingsProperties);
+	// clang-format on
+
+	DBusNMConnectionSettingsProxy* proxy = nullptr;
+};
+
 // Proxy of a /org/freedesktop/NetworkManager/ActiveConnection/* object.
 class NMActiveConnection: public QObject {
 	Q_OBJECT;
@@ -36,27 +72,31 @@ public:
 	[[nodiscard]] bool isValid() const;
 	[[nodiscard]] QString path() const;
 	[[nodiscard]] QString address() const;
-	[[nodiscard]] QDBusObjectPath connection() const { return this->bConnection; }
-	[[nodiscard]] NMConnectionState::Enum state() const { return this->bState; }
-	[[nodiscard]] NMConnectionStateReason::Enum stateReason() const { return this->bStateReason; }
+	[[nodiscard]] QDBusObjectPath connection() const { return this->bConnection; };
+	[[nodiscard]] NMConnectionState::Enum state() const { return this->bState; };
+	[[nodiscard]] NMConnectionStateReason::Enum stateReason() const { return this->mStateReason; };
 
 signals:
 	void loaded();
 	void connectionChanged(QDBusObjectPath path);
 	void stateChanged(NMConnectionState::Enum state);
 	void stateReasonChanged(NMConnectionStateReason::Enum reason);
+	void uuidChanged(const QString& uuid);
 
 private slots:
 	void onStateChanged(quint32 state, quint32 reason);
 
 private:
+	NMConnectionStateReason::Enum mStateReason = NMConnectionStateReason::Unknown;
+
 	// clang-format off
 	Q_OBJECT_BINDABLE_PROPERTY(NMActiveConnection, QDBusObjectPath, bConnection, &NMActiveConnection::connectionChanged);
+	Q_OBJECT_BINDABLE_PROPERTY(NMActiveConnection, QString, bUuid, &NMActiveConnection::uuidChanged);
 	Q_OBJECT_BINDABLE_PROPERTY(NMActiveConnection, NMConnectionState::Enum, bState, &NMActiveConnection::stateChanged);
-	Q_OBJECT_BINDABLE_PROPERTY(NMActiveConnection, NMConnectionStateReason::Enum, bStateReason, &NMActiveConnection::stateReasonChanged);
 
 	QS_DBUS_BINDABLE_PROPERTY_GROUP(NMActiveConnection, activeConnectionProperties);
 	QS_DBUS_PROPERTY_BINDING(NMActiveConnection, pConnection, bConnection, activeConnectionProperties, "Connection");
+	QS_DBUS_PROPERTY_BINDING(NMActiveConnection, pUuid, bUuid, activeConnectionProperties, "Uuid");
 	QS_DBUS_PROPERTY_BINDING(NMActiveConnection, pState, bState, activeConnectionProperties, "State");
 	// clang-format on
 	DBusNMActiveConnectionProxy* proxy = nullptr;

src/network/nm/dbus_types.cpp

@@ -1,69 +0,0 @@
-#include "dbus_types.hpp"
-
-#include <qbytearray.h>
-#include <qcontainerfwd.h>
-#include <qdbusargument.h>
-#include <qmap.h>
-#include <qmetatype.h>
-#include <qstring.h>
-
-namespace qs::network {
-
-const QDBusArgument& operator>>(const QDBusArgument& argument, NMSettingsMap& map) {
-	argument.beginMap();
-	while (!argument.atEnd()) {
-		argument.beginMapEntry();
-		QString groupName;
-		argument >> groupName;
-
-		QVariantMap group;
-		argument >> group;
-
-		map.insert(groupName, group);
-		argument.endMapEntry();
-	}
-	argument.endMap();
-	return argument;
-}
-
-const QDBusArgument& operator<<(QDBusArgument& argument, const NMSettingsMap& map) {
-	argument.beginMap(qMetaTypeId<QString>(), qMetaTypeId<QVariantMap>());
-	for (auto it = map.constBegin(); it != map.constEnd(); ++it) {
-		argument.beginMapEntry();
-		argument << it.key();
-		argument << it.value();
-		argument.endMapEntry();
-	}
-	argument.endMap();
-	return argument;
-}
-
-const QDBusArgument& operator>>(const QDBusArgument& argument, NMIPv6Address& addr) {
-	argument.beginStructure();
-	argument >> addr.address >> addr.prefix >> addr.gateway;
-	argument.endStructure();
-	return argument;
-}
-
-const QDBusArgument& operator<<(QDBusArgument& argument, const NMIPv6Address& addr) {
-	argument.beginStructure();
-	argument << addr.address << addr.prefix << addr.gateway;
-	argument.endStructure();
-	return argument;
-}
-
-const QDBusArgument& operator>>(const QDBusArgument& argument, NMIPv6Route& route) {
-	argument.beginStructure();
-	argument >> route.destination >> route.prefix >> route.nexthop >> route.metric;
-	argument.endStructure();
-	return argument;
-}
-
-const QDBusArgument& operator<<(QDBusArgument& argument, const NMIPv6Route& route) {
-	argument.beginStructure();
-	argument << route.destination << route.prefix << route.nexthop << route.metric;
-	argument.endStructure();
-	return argument;
-}
-
-} // namespace qs::network

src/network/nm/dbus_types.hpp

@@ -1,40 +1,9 @@
 #pragma once
 
-#include <qbytearray.h>
-#include <qdbusargument.h>
+#include <qdbusextratypes.h>
 #include <qmap.h>
 #include <qstring.h>
-#include <qtypes.h>
 #include <qvariant.h>
 
-namespace qs::network {
-
-using NMSettingsMap = QMap<QString, QVariantMap>;
-
-const QDBusArgument& operator>>(const QDBusArgument& argument, NMSettingsMap& map);
-const QDBusArgument& operator<<(QDBusArgument& argument, const NMSettingsMap& map);
-
-struct NMIPv6Address {
-	QByteArray address;
-	quint32 prefix = 0;
-	QByteArray gateway;
-};
-
-const QDBusArgument& operator>>(const QDBusArgument& argument, qs::network::NMIPv6Address& addr);
-const QDBusArgument& operator<<(QDBusArgument& argument, const qs::network::NMIPv6Address& addr);
-
-struct NMIPv6Route {
-	QByteArray destination;
-	quint32 prefix = 0;
-	QByteArray nexthop;
-	quint32 metric = 0;
-};
-
-const QDBusArgument& operator>>(const QDBusArgument& argument, qs::network::NMIPv6Route& route);
-const QDBusArgument& operator<<(QDBusArgument& argument, const qs::network::NMIPv6Route& route);
-
-} // namespace qs::network
-
-Q_DECLARE_METATYPE(qs::network::NMSettingsMap);
-Q_DECLARE_METATYPE(qs::network::NMIPv6Address);
-Q_DECLARE_METATYPE(qs::network::NMIPv6Route);
+using ConnectionSettingsMap = QMap<QString, QVariantMap>;
+Q_DECLARE_METATYPE(ConnectionSettingsMap);

src/network/nm/device.cpp

@@ -15,13 +15,8 @@
 #include "../../core/logcat.hpp"
 #include "../../dbus/properties.hpp"
 #include "../device.hpp"
-#include "../enums.hpp"
-#include "active_connection.hpp"
+#include "connection.hpp"
 #include "dbus_nm_device.h"
-#include "dbus_types.hpp"
-#include "enums.hpp"
-#include "network.hpp"
-#include "settings.hpp"
 
 namespace qs::network {
 using namespace qs::dbus;
@@ -44,68 +39,19 @@ NMDevice::NMDevice(const QString& path, QObject* parent): QObject(parent) {
 	}
 
 	// clang-format off
-	QObject::connect(this, &NMDevice::availableSettingsPathsChanged, this, &NMDevice::onAvailableSettingsPathsChanged);
+	QObject::connect(this, &NMDevice::availableConnectionPathsChanged, this, &NMDevice::onAvailableConnectionPathsChanged);
 	QObject::connect(this, &NMDevice::activeConnectionPathChanged, this, &NMDevice::onActiveConnectionPathChanged);
-	QObject::connect(this->deviceProxy, &DBusNMDeviceProxy::StateChanged, this, &NMDevice::onStateChanged);
 	// clang-format on
 
 	this->deviceProperties.setInterface(this->deviceProxy);
 	this->deviceProperties.updateAllViaGetAll();
 }
 
-void NMDevice::bindFrontend(NetworkDevice* frontend) {
-	auto translateState = [this]() {
-		switch (this->state()) {
-		case 0 ... 20: return ConnectionState::Unknown;
-		case 30: return ConnectionState::Disconnected;
-		case 40 ... 90: return ConnectionState::Connecting;
-		case 100: return ConnectionState::Connected;
-		case 110 ... 120: return ConnectionState::Disconnecting;
-		}
-	};
-	// clang-format off
-	frontend->bindableName().setBinding([this]() { return this->interface(); });
-	frontend->bindableAddress().setBinding([this]() { return this->hwAddress(); });
-	frontend->bindableState().setBinding(translateState);
-	frontend->bindableAutoconnect().setBinding([this]() { return this->autoconnect(); });
-	frontend->bindableNmManaged().setBinding([this]() { return this->managed(); });
-	QObject::connect(frontend, &NetworkDevice::requestDisconnect, this, &NMDevice::disconnect);
-	QObject::connect(frontend, &NetworkDevice::requestSetAutoconnect, this, &NMDevice::setAutoconnect);
-	QObject::connect(frontend, &NetworkDevice::requestSetNmManaged, this, &NMDevice::setManaged);
-	QObject::connect(this, &NMDevice::networkAdded, frontend, &NetworkDevice::networkAdded);
-	QObject::connect(this, &NMDevice::networkRemoved, frontend, &NetworkDevice::networkRemoved);
-}
-
-void NMDevice::onStateChanged(quint32 newState, quint32 /*oldState*/, quint32 reason) {
-	auto enumReason = static_cast<NMDeviceStateReason::Enum>(reason);
-	auto enumNewState = static_cast<NMDeviceState::Enum>(newState);
-	if (enumNewState == NMDeviceState::Failed) this->bLastFailReason = enumReason;
-	if (this->bStateReason == enumReason) return;
-	this->bStateReason = enumReason;
-}
-
-void NMDevice::bindNetwork(NMNetwork* net) {
-	net->bindableDeviceFailReason().setBinding([this]() { return this->lastFailReason(); });
-	QObject::connect(net, &NMNetwork::requestDisconnect, this, &NMDevice::disconnect);
-	QObject::connect(net, &NMNetwork::requestActivateConnection, this, [this](const QString& settingsPath){
-		emit this->activateConnection(QDBusObjectPath(settingsPath), QDBusObjectPath(this->path()));	
-	});
-	QObject::connect(net, &NMNetwork::requestAddAndActivateConnection, this, [this](const NMSettingsMap& settingsMap, const QString& specificObject){
-		emit this->addAndActivateConnection(settingsMap, QDBusObjectPath(this->path()), QDBusObjectPath(specificObject));	
-	});
-	QObject::connect(net, &NMNetwork::visibilityChanged, this, [this, net](bool visible) {
-		if (visible) emit this->networkAdded(net->frontend());
-		else emit this->networkRemoved(net->frontend());
-	});
-	if (net->visible()) emit this->networkAdded(net->frontend());
-}
-
 void NMDevice::onActiveConnectionPathChanged(const QDBusObjectPath& path) {
 	const QString stringPath = path.path();
 
 	// Remove old active connection
 	if (this->mActiveConnection) {
-		qCDebug(logNetworkManager) << "Active connection removed:" << this->mActiveConnection->path();
 		QObject::disconnect(this->mActiveConnection, nullptr, this, nullptr);
 		delete this->mActiveConnection;
 		this->mActiveConnection = nullptr;
@@ -118,7 +64,6 @@ void NMDevice::onActiveConnectionPathChanged(const QDBusObjectPath& path) {
 			qCWarning(logNetworkManager) << "Ignoring invalid registration of" << stringPath;
 			delete active;
 		} else {
-			qCDebug(logNetworkManager) << "Active connection added:" << stringPath;
 			this->mActiveConnection = active;
 			QObject::connect(
 			    active,
@@ -131,44 +76,42 @@ void NMDevice::onActiveConnectionPathChanged(const QDBusObjectPath& path) {
 	}
 }
 
-void NMDevice::onAvailableSettingsPathsChanged(const QList<QDBusObjectPath>& paths) {
+void NMDevice::onAvailableConnectionPathsChanged(const QList<QDBusObjectPath>& paths) {
 	QSet<QString> newPathSet;
 	for (const QDBusObjectPath& path: paths) {
 		newPathSet.insert(path.path());
 	}
-	const auto existingPaths = this->mSettings.keys();
+	const auto existingPaths = this->mConnections.keys();
 	const QSet<QString> existingPathSet(existingPaths.begin(), existingPaths.end());
 
-	const auto addedSettings = newPathSet - existingPathSet;
-	const auto removedSettings = existingPathSet - newPathSet;
+	const auto addedConnections = newPathSet - existingPathSet;
+	const auto removedConnections = existingPathSet - newPathSet;
 
-	for (const QString& path: addedSettings) {
-		this->registerSettings(path);
+	for (const QString& path: addedConnections) {
+		this->registerConnection(path);
 	}
-	for (const QString& path: removedSettings) {
-		auto* connection = this->mSettings.take(path);
+	for (const QString& path: removedConnections) {
+		auto* connection = this->mConnections.take(path);
 		if (!connection) {
 			qCDebug(logNetworkManager) << "Sent removal signal for" << path << "which is not registered.";
 		} else {
-			qCDebug(logNetworkManager) << "Connection settings removed:" << path;
 			delete connection;
 		}
 	};
 }
 
-void NMDevice::registerSettings(const QString& path) {
-	auto* settings = new NMSettings(path, this);
-	if (!settings->isValid()) {
+void NMDevice::registerConnection(const QString& path) {
+	auto* connection = new NMConnectionSettings(path, this);
+	if (!connection->isValid()) {
 		qCWarning(logNetworkManager) << "Ignoring invalid registration of" << path;
-		delete settings;
+		delete connection;
 	} else {
-		qCDebug(logNetworkManager) << "Connection settings added:" << path;
-		this->mSettings.insert(path, settings);
+		this->mConnections.insert(path, connection);
 		QObject::connect(
-		    settings,
-		    &NMSettings::loaded,
+		    connection,
+		    &NMConnectionSettings::loaded,
 		    this,
-		    [this, settings]() { emit this->settingsLoaded(settings); },
+		    [this, connection]() { emit this->connectionLoaded(connection); },
 		    Qt::SingleShotConnection
 		);
 	}
@@ -182,12 +125,6 @@ void NMDevice::setAutoconnect(bool autoconnect) {
 	this->pAutoconnect.write();
 }
 
-void NMDevice::setManaged(bool managed) {
-	if (managed == this->bManaged) return;
-	this->bManaged = managed;
-	this->pManaged.write();
-}
-
 bool NMDevice::isValid() const { return this->deviceProxy && this->deviceProxy->isValid(); }
 QString NMDevice::address() const {
 	return this->deviceProxy ? this->deviceProxy->service() : QString();
@@ -203,9 +140,4 @@ DBusDataTransform<qs::network::NMDeviceState::Enum>::fromWire(quint32 wire) {
 	return DBusResult(static_cast<qs::network::NMDeviceState::Enum>(wire));
 }
 
-DBusResult<qs::network::NMDeviceInterfaceFlags::Enum>
-DBusDataTransform<qs::network::NMDeviceInterfaceFlags::Enum>::fromWire(quint32 wire) {
-	return DBusResult(static_cast<qs::network::NMDeviceInterfaceFlags::Enum>(wire));
-}
-
 } // namespace qs::dbus

src/network/nm/device.hpp

@@ -8,12 +8,8 @@
 #include <qtypes.h>
 
 #include "../../dbus/properties.hpp"
-#include "../device.hpp"
-#include "active_connection.hpp"
+#include "connection.hpp"
 #include "dbus_nm_device.h"
-#include "enums.hpp"
-#include "network.hpp"
-#include "settings.hpp"
 
 namespace qs::dbus {
 
@@ -24,13 +20,6 @@ struct DBusDataTransform<qs::network::NMDeviceState::Enum> {
 	static DBusResult<Data> fromWire(Wire wire);
 };
 
-template <>
-struct DBusDataTransform<qs::network::NMDeviceInterfaceFlags::Enum> {
-	using Wire = quint32;
-	using Data = qs::network::NMDeviceInterfaceFlags::Enum;
-	static DBusResult<Data> fromWire(Wire wire);
-};
-
 } // namespace qs::dbus
 
 namespace qs::network {
@@ -47,61 +36,43 @@ public:
 	[[nodiscard]] virtual bool isValid() const;
 	[[nodiscard]] QString path() const;
 	[[nodiscard]] QString address() const;
-	[[nodiscard]] QString interface() const { return this->bInterface; }
-	[[nodiscard]] QString hwAddress() const { return this->bHwAddress; }
-	[[nodiscard]] bool managed() const { return this->bManaged; }
-	[[nodiscard]] NMDeviceState::Enum state() const { return this->bState; }
-	[[nodiscard]] NMDeviceStateReason::Enum stateReason() const { return this->bStateReason; }
-	[[nodiscard]] NMDeviceStateReason::Enum lastFailReason() const { return this->bLastFailReason; }
-	[[nodiscard]] NMDeviceInterfaceFlags::Enum interfaceFlags() const {
-		return this->bInterfaceFlags;
-	}
-	[[nodiscard]] bool autoconnect() const { return this->bAutoconnect; }
-	[[nodiscard]] NMActiveConnection* activeConnection() const { return this->mActiveConnection; }
-	[[nodiscard]] virtual NetworkDevice* frontend() = 0;
+	[[nodiscard]] QString interface() const { return this->bInterface; };
+	[[nodiscard]] QString hwAddress() const { return this->bHwAddress; };
+	[[nodiscard]] bool managed() const { return this->bManaged; };
+	[[nodiscard]] NMDeviceState::Enum state() const { return this->bState; };
+	[[nodiscard]] bool autoconnect() const { return this->bAutoconnect; };
+	[[nodiscard]] NMActiveConnection* activeConnection() const { return this->mActiveConnection; };
 
 signals:
-	void loaded();
 	void activateConnection(const QDBusObjectPath& connPath, const QDBusObjectPath& devPath);
 	void addAndActivateConnection(
-	    const NMSettingsMap& settings,
+	    const ConnectionSettingsMap& settings,
 	    const QDBusObjectPath& devPath,
-	    const QDBusObjectPath& specificObjectPath
+	    const QDBusObjectPath& apPath
 	);
-	void networkAdded(Network* net);
-	void networkRemoved(Network* net);
-	void settingsLoaded(NMSettings* settings);
-	void settingsRemoved(NMSettings* settings);
-	void availableSettingsPathsChanged(QList<QDBusObjectPath> paths);
+	void connectionLoaded(NMConnectionSettings* connection);
+	void connectionRemoved(NMConnectionSettings* connection);
+	void availableConnectionPathsChanged(QList<QDBusObjectPath> paths);
 	void activeConnectionPathChanged(const QDBusObjectPath& connection);
 	void activeConnectionLoaded(NMActiveConnection* active);
 	void interfaceChanged(const QString& interface);
 	void hwAddressChanged(const QString& hwAddress);
 	void managedChanged(bool managed);
 	void stateChanged(NMDeviceState::Enum state);
-	void stateReasonChanged(NMDeviceStateReason::Enum reason);
-	void lastFailReasonChanged(NMDeviceStateReason::Enum reason);
 	void autoconnectChanged(bool autoconnect);
-	void interfaceFlagsChanged(NMDeviceInterfaceFlags::Enum flags);
 
 public slots:
 	void disconnect();
 	void setAutoconnect(bool autoconnect);
-	void setManaged(bool managed);
-
-protected:
-	void bindFrontend(NetworkDevice* frontend);
-	void bindNetwork(NMNetwork* net);
 
 private slots:
-	void onStateChanged(quint32 newState, quint32 oldState, quint32 reason);
-	void onAvailableSettingsPathsChanged(const QList<QDBusObjectPath>& paths);
+	void onAvailableConnectionPathsChanged(const QList<QDBusObjectPath>& paths);
 	void onActiveConnectionPathChanged(const QDBusObjectPath& path);
 
 private:
-	void registerSettings(const QString& path);
+	void registerConnection(const QString& path);
 
-	QHash<QString, NMSettings*> mSettings;
+	QHash<QString, NMConnectionSettings*> mConnections;
 	NMActiveConnection* mActiveConnection = nullptr;
 
 	// clang-format off
@@ -109,12 +80,9 @@ private:
 	Q_OBJECT_BINDABLE_PROPERTY(NMDevice, QString, bHwAddress, &NMDevice::hwAddressChanged);
 	Q_OBJECT_BINDABLE_PROPERTY(NMDevice, bool, bManaged, &NMDevice::managedChanged);
 	Q_OBJECT_BINDABLE_PROPERTY(NMDevice, NMDeviceState::Enum, bState, &NMDevice::stateChanged);
-	Q_OBJECT_BINDABLE_PROPERTY(NMDevice, NMDeviceStateReason::Enum, bStateReason, &NMDevice::stateReasonChanged);
-	Q_OBJECT_BINDABLE_PROPERTY(NMDevice, NMDeviceStateReason::Enum, bLastFailReason, &NMDevice::lastFailReasonChanged);
 	Q_OBJECT_BINDABLE_PROPERTY(NMDevice, bool, bAutoconnect, &NMDevice::autoconnectChanged);
-	Q_OBJECT_BINDABLE_PROPERTY(NMDevice, QList<QDBusObjectPath>, bAvailableConnections, &NMDevice::availableSettingsPathsChanged);
+	Q_OBJECT_BINDABLE_PROPERTY(NMDevice, QList<QDBusObjectPath>, bAvailableConnections, &NMDevice::availableConnectionPathsChanged);
 	Q_OBJECT_BINDABLE_PROPERTY(NMDevice, QDBusObjectPath, bActiveConnection, &NMDevice::activeConnectionPathChanged);
-	Q_OBJECT_BINDABLE_PROPERTY(NMDevice, NMDeviceInterfaceFlags::Enum, bInterfaceFlags, &NMDevice::interfaceFlagsChanged);
 
 	QS_DBUS_BINDABLE_PROPERTY_GROUP(NMDeviceAdapter, deviceProperties);
 	QS_DBUS_PROPERTY_BINDING(NMDevice, pName, bInterface, deviceProperties, "Interface");
@@ -124,7 +92,6 @@ private:
 	QS_DBUS_PROPERTY_BINDING(NMDevice, pAutoconnect, bAutoconnect, deviceProperties, "Autoconnect");
 	QS_DBUS_PROPERTY_BINDING(NMDevice, pAvailableConnections, bAvailableConnections, deviceProperties, "AvailableConnections");
 	QS_DBUS_PROPERTY_BINDING(NMDevice, pActiveConnection, bActiveConnection, deviceProperties, "ActiveConnection");
-	QS_DBUS_PROPERTY_BINDING(NMDevice, pInterfaceFlags, bInterfaceFlags, deviceProperties, "InterfaceFlags");
 	// clang-format on
 
 	DBusNMDeviceProxy* deviceProxy = nullptr;

src/network/nm/enums.hpp

@@ -7,20 +7,6 @@
 
 namespace qs::network {
 
-// In sync with https://networkmanager.dev/docs/api/latest/nm-dbus-types.html#NMConnectivityState
-class NMConnectivityState: public QObject {
-	Q_OBJECT;
-
-public:
-	enum Enum : quint8 {
-		Unknown = 0,
-		None = 1,
-		Portal = 2,
-		Limited = 3,
-		Full = 4,
-	};
-};
-
 // Indicates the type of hardware represented by a device object.
 class NMDeviceType: public QObject {
 	Q_OBJECT;
@@ -66,140 +52,6 @@ public:
 	Q_ENUM(Enum);
 };
 
-// In sync with https://networkmanager.dev/docs/api/latest/nm-dbus-types.html#NMDeviceState.
-class NMDeviceState: public QObject {
-	Q_OBJECT;
-	QML_ELEMENT;
-	QML_SINGLETON;
-
-public:
-	enum Enum : quint8 {
-		Unknown = 0,
-		Unmanaged = 10,
-		Unavailable = 20,
-		Disconnected = 30,
-		Prepare = 40,
-		Config = 50,
-		NeedAuth = 60,
-		IPConfig = 70,
-		IPCheck = 80,
-		Secondaries = 90,
-		Activated = 100,
-		Deactivating = 110,
-		Failed = 120,
-	};
-	Q_ENUM(Enum);
-};
-
-// Device state change reason codes.
-// In sync with https://networkmanager.dev/docs/api/latest/nm-dbus-types.html#NMDeviceStateReason.
-class NMDeviceStateReason: public QObject {
-	Q_OBJECT;
-	QML_ELEMENT;
-	QML_SINGLETON;
-
-public:
-	enum Enum : quint8 {
-		None = 0,
-		Unknown = 1,
-		NowManaged = 2,
-		NowUnmanaged = 3,
-		ConfigFailed = 4,
-		IpConfigUnavailable = 5,
-		IpConfigExpired = 6,
-		NoSecrets = 7,
-		SupplicantDisconnect = 8,
-		SupplicantConfigFailed = 9,
-		SupplicantFailed = 10,
-		SupplicantTimeout = 11,
-		PppStartFailed = 12,
-		PppDisconnect = 13,
-		PppFailed = 14,
-		DhcpStartFailed = 15,
-		DhcpError = 16,
-		DhcpFailed = 17,
-		SharedStartFailed = 18,
-		SharedFailed = 19,
-		AutoIpStartFailed = 20,
-		AutoIpError = 21,
-		AutoIpFailed = 22,
-		ModemBusy = 23,
-		ModemNoDialTone = 24,
-		ModemNoCarrier = 25,
-		ModemDialTimeout = 26,
-		ModemDialFailed = 27,
-		ModemInitFailed = 28,
-		GsmApnFailed = 29,
-		GsmRegistrationNotSearching = 30,
-		GsmRegistrationDenied = 31,
-		GsmRegistrationTimeout = 32,
-		GsmRegistrationFailed = 33,
-		GsmPinCheckFailed = 34,
-		FirmwareMissing = 35,
-		Removed = 36,
-		Sleeping = 37,
-		ConnectionRemoved = 38,
-		UserRequested = 39,
-		Carrier = 40,
-		ConnectionAssumed = 41,
-		SupplicantAvailable = 42,
-		ModemNotFound = 43,
-		BtFailed = 44,
-		GsmSimNotInserted = 45,
-		GsmSimPinRequired = 46,
-		GsmSimPukRequired = 47,
-		GsmSimWrong = 48,
-		InfinibandMode = 49,
-		DependencyFailed = 50,
-		Br2684Failed = 51,
-		ModemManagerUnavailable = 52,
-		SsidNotFound = 53,
-		SecondaryConnectionFailed = 54,
-		DcbFcoeFailed = 55,
-		TeamdControlFailed = 56,
-		ModemFailed = 57,
-		ModemAvailable = 58,
-		SimPinIncorrect = 59,
-		NewActivation = 60,
-		ParentChanged = 61,
-		ParentManagedChanged = 62,
-		OvsdbFailed = 63,
-		IpAddressDuplicate = 64,
-		IpMethodUnsupported = 65,
-		SriovConfigurationFailed = 66,
-		PeerNotFound = 67,
-		DeviceHandlerFailed = 68,
-		UnmanagedByDefault = 69,
-		UnmanagedExternalDown = 70,
-		UnmanagedLinkNotInit = 71,
-		UnmanagedQuitting = 72,
-		UnmanagedManagerDisabled = 73,
-		UnmanagedUserConf = 74,
-		UnmanagedUserExplicit = 75,
-		UnmanagedUserSettings = 76,
-		UnmanagedUserUdev = 77,
-		NetworkingOff = 78,
-	};
-	Q_ENUM(Enum);
-};
-
-// Flags for a network interface.
-// In sync with https://networkmanager.dev/docs/api/latest/nm-dbus-types.html#NMDeviceInterfaceFlags.
-class NMDeviceInterfaceFlags: public QObject {
-	Q_OBJECT;
-
-public:
-	enum Enum : quint32 {
-		None = 0x0,
-		Up = 0x1,
-		LowerUp = 0x2,
-		Promisc = 0x4,
-		Carrier = 0x10000,
-		LldpClientEnabled = 0x20000,
-	};
-	Q_ENUM(Enum);
-};
-
 // 802.11 specific device encryption and authentication capabilities.
 // In sync with https://networkmanager.dev/docs/api/latest/nm-dbus-types.html#NMDeviceWifiCapabilities.
 class NMWirelessCapabilities: public QObject {
@@ -301,31 +153,4 @@ public:
 	Q_ENUM(Enum);
 };
 
-/// In sync with https://networkmanager.dev/docs/api/latest/nm-dbus-types.html#NMActiveConnectionStateReason.
-class NMConnectionStateReason: public QObject {
-	Q_OBJECT;
-	QML_ELEMENT;
-	QML_SINGLETON;
-
-public:
-	enum Enum : quint8 {
-		Unknown = 0,
-		None = 1,
-		UserDisconnected = 2,
-		DeviceDisconnected = 3,
-		ServiceStopped = 4,
-		IpConfigInvalid = 5,
-		ConnectTimeout = 6,
-		ServiceStartTimeout = 7,
-		ServiceStartFailed = 8,
-		NoSecrets = 9,
-		LoginFailed = 10,
-		ConnectionRemoved = 11,
-		DependencyFailed = 12,
-		DeviceRealizeFailed = 13,
-		DeviceRemoved = 14
-	};
-	Q_ENUM(Enum);
-};
-
 } // namespace qs::network

src/network/nm/network.cpp

@@ -1,308 +0,0 @@
-#include "network.hpp"
-#include <utility>
-
-#include <qdbusconnection.h>
-#include <qdbusextratypes.h>
-#include <qdbuspendingcall.h>
-#include <qdbuspendingreply.h>
-#include <qlogging.h>
-#include <qloggingcategory.h>
-#include <qobject.h>
-#include <qpointer.h>
-#include <qtmetamacros.h>
-#include <qtypes.h>
-
-#include "../../core/logcat.hpp"
-#include "../enums.hpp"
-#include "../network.hpp"
-#include "../wifi.hpp"
-#include "accesspoint.hpp"
-#include "active_connection.hpp"
-#include "enums.hpp"
-#include "settings.hpp"
-#include "utils.hpp"
-
-namespace qs::network {
-
-namespace {
-QS_LOGGING_CATEGORY(logNetworkManager, "quickshell.network.networkmanager", QtWarningMsg);
-}
-
-NMNetwork::NMNetwork(QObject* parent)
-    : QObject(parent)
-    , bKnown(false)
-    , bReason(NMConnectionStateReason::None)
-    , bState(NMConnectionState::Deactivated) {}
-
-void NMNetwork::updateReferenceSettings() {
-	// If the network has no connections, the reference is nullptr.
-	if (this->mSettings.isEmpty()) {
-		this->bReferenceSettings = nullptr;
-		return;
-	};
-
-	// If the network has an active connection, use its settings as the reference.
-	if (this->mActiveConnection) {
-		auto* settings = this->mSettings.value(this->mActiveConnection->connection().path());
-		if (settings && settings != this->bReferenceSettings) {
-			this->bReferenceSettings = settings;
-		}
-		return;
-	}
-
-	// Otherwise, choose the settings responsible for the last successful connection.
-	NMSettings* selectedSettings = nullptr;
-	quint64 selectedTimestamp = 0;
-	for (auto* settings: this->mSettings.values()) {
-		const quint64 timestamp = settings->map()["connection"]["timestamp"].toULongLong();
-		if (!selectedSettings || timestamp > selectedTimestamp) {
-			selectedSettings = settings;
-			selectedTimestamp = timestamp;
-		}
-	}
-
-	if (this->bReferenceSettings != selectedSettings) {
-		this->bReferenceSettings = selectedSettings;
-	}
-}
-
-void NMNetwork::addSettings(NMSettings* settings) {
-	if (this->mSettings.contains(settings->path())) return;
-	this->mSettings.insert(settings->path(), settings);
-
-	auto onDestroyed = [this, settings]() {
-		if (this->mSettings.take(settings->path())) {
-			emit this->settingsRemoved(settings);
-			this->updateReferenceSettings();
-			if (this->mSettings.isEmpty()) this->bKnown = false;
-		}
-	};
-	QObject::connect(settings, &NMSettings::destroyed, this, onDestroyed);
-	this->bKnown = true;
-	this->updateReferenceSettings();
-	emit this->settingsAdded(settings);
-};
-
-void NMNetwork::addActiveConnection(NMActiveConnection* active) {
-	if (this->mActiveConnection) return;
-	this->mActiveConnection = active;
-
-	this->bState.setBinding([active]() { return active->state(); });
-	this->bReason.setBinding([active]() { return active->stateReason(); });
-	auto onDestroyed = [this, active]() {
-		if (this->mActiveConnection && this->mActiveConnection == active) {
-			this->mActiveConnection = nullptr;
-			this->updateReferenceSettings();
-			this->bState = NMConnectionState::Deactivated;
-			this->bReason = NMConnectionStateReason::None;
-		}
-	};
-	QObject::connect(active, &NMActiveConnection::destroyed, this, onDestroyed);
-	this->updateReferenceSettings();
-};
-
-void NMNetwork::forget() {
-	if (this->mSettings.isEmpty()) return;
-	for (auto* conn: this->mSettings.values()) {
-		conn->forget();
-	}
-}
-
-void NMNetwork::bindFrontend(Network* frontend) {
-	auto translateState = [this]() { return this->state() == NMConnectionState::Activated; };
-	frontend->bindableConnected().setBinding(translateState);
-	frontend->bindableKnown().setBinding([this]() { return this->known(); });
-	frontend->bindableState().setBinding([this]() {
-		return static_cast<ConnectionState::Enum>(this->state());
-	});
-	frontend->bindableStateChanging().setBinding([this]() {
-		auto s = static_cast<ConnectionState::Enum>(this->state());
-		return s == ConnectionState::Connecting || s == ConnectionState::Disconnecting;
-	});
-
-	QObject::connect(this, &NMNetwork::reasonChanged, this, [this, frontend]() {
-		if (this->reason() == NMConnectionStateReason::DeviceDisconnected) {
-			auto deviceReason = this->deviceFailReason();
-			if (deviceReason == NMDeviceStateReason::NoSecrets)
-				emit frontend->connectionFailed(ConnectionFailReason::NoSecrets);
-			if (deviceReason == NMDeviceStateReason::SupplicantDisconnect)
-				emit frontend->connectionFailed(ConnectionFailReason::WifiClientDisconnected);
-			if (deviceReason == NMDeviceStateReason::SupplicantFailed)
-				emit frontend->connectionFailed(ConnectionFailReason::WifiClientFailed);
-			if (deviceReason == NMDeviceStateReason::SupplicantTimeout)
-				emit frontend->connectionFailed(ConnectionFailReason::WifiAuthTimeout);
-			if (deviceReason == NMDeviceStateReason::SsidNotFound)
-				emit frontend->connectionFailed(ConnectionFailReason::WifiNetworkLost);
-		}
-	});
-
-	QObject::connect(
-	    frontend,
-	    &Network::requestConnectWithSettings,
-	    this,
-	    [this](NMSettings* settings) {
-		    if (settings) {
-			    emit this->requestActivateConnection(settings->path());
-			    return;
-		    }
-		    qCInfo(
-		        logNetworkManager
-		    ) << "Failed to connectWithSettings: The provided settings no longer exist.";
-	    }
-	);
-
-	// clang-format off
-	QObject::connect(frontend, &Network::requestForget, this, &NMNetwork::forget);
-	QObject::connect(frontend, &Network::requestDisconnect, this, &NMNetwork::requestDisconnect);
-	QObject::connect(this, &NMNetwork::settingsAdded, frontend, &Network::settingsAdded);
-	QObject::connect(this, &NMNetwork::settingsRemoved, frontend, &Network::settingsRemoved);
-	// clang-format on
-}
-
-NMGenericNetwork::NMGenericNetwork(QString name, NetworkDevice* device, QObject* parent)
-    : NMNetwork(parent)
-    , mFrontend(new Network(std::move(name), device, this)) {
-	// Regiter and bind the frontend Network.
-	this->bindFrontend();
-}
-
-void NMGenericNetwork::bindFrontend() {
-	auto* frontend = this->mFrontend;
-	this->NMNetwork::bindFrontend(frontend);
-	QObject::connect(frontend, &Network::requestConnect, this, [this]() {
-		if (auto* settingsRef = this->referenceSettings()) {
-			emit this->requestActivateConnection(settingsRef->path());
-			return;
-		}
-		emit this->requestAddAndActivateConnection(NMSettingsMap(), "/");
-		return;
-	});
-}
-
-NMWirelessNetwork::NMWirelessNetwork(const QString& ssid, NetworkDevice* device, QObject* parent)
-    : NMNetwork(parent)
-    , mSsid(ssid)
-    , bSecurity(WifiSecurityType::Unknown) {
-
-	auto updateSecurity = [this]() {
-		if (NMSettings* settings = this->bReferenceSettings) {
-			this->bSecurity.setBinding([settings]() { return securityFromSettingsMap(settings->map()); });
-		} else if (NMAccessPoint* ap = this->bReferenceAp) {
-			this->bSecurity.setBinding([ap]() { return ap->security(); });
-		} else {
-			this->bSecurity = WifiSecurityType::Unknown;
-		}
-		return;
-	};
-
-	auto checkDisappeared = [this]() {
-		if (this->mAccessPoints.isEmpty() && this->mSettings.isEmpty()) emit this->disappeared();
-	};
-
-	QObject::connect(this, &NMWirelessNetwork::referenceSettingsChanged, this, updateSecurity);
-	QObject::connect(this, &NMWirelessNetwork::referenceApChanged, this, updateSecurity);
-	QObject::connect(this, &NMWirelessNetwork::settingsRemoved, this, checkDisappeared);
-	QObject::connect(this, &NMWirelessNetwork::apRemoved, this, checkDisappeared);
-
-	// Register and bind the frontend WifiNetwork.
-	this->mFrontend = new WifiNetwork(ssid, device, this);
-	this->bindFrontend();
-}
-
-void NMWirelessNetwork::updateReferenceAp() {
-	// If the network has no APs, the reference is a nullptr.
-	if (this->mAccessPoints.isEmpty()) {
-		this->bReferenceAp = nullptr;
-		this->bSignalStrength = 0;
-		return;
-	}
-
-	// Otherwise, choose the AP with the strongest signal.
-	NMAccessPoint* selectedAp = nullptr;
-	for (auto* ap: this->mAccessPoints.values()) {
-		// Always prefer the active AP.
-		if (ap->path() == this->bActiveApPath) {
-			selectedAp = ap;
-			break;
-		}
-		if (!selectedAp || ap->signalStrength() > selectedAp->signalStrength()) {
-			selectedAp = ap;
-		}
-	}
-	if (this->bReferenceAp != selectedAp) {
-		this->bReferenceAp = selectedAp;
-		this->bSignalStrength.setBinding([selectedAp]() { return selectedAp->signalStrength(); });
-	}
-}
-
-void NMWirelessNetwork::addAccessPoint(NMAccessPoint* ap) {
-	if (this->mAccessPoints.contains(ap->path())) return;
-	this->mAccessPoints.insert(ap->path(), ap);
-	auto onDestroyed = [this, ap]() {
-		if (this->mAccessPoints.take(ap->path())) {
-			emit this->apRemoved(ap);
-			this->updateReferenceAp();
-		}
-	};
-	// clang-format off
-	QObject::connect(ap, &NMAccessPoint::signalStrengthChanged, this, &NMWirelessNetwork::updateReferenceAp);
-	QObject::connect(ap, &NMAccessPoint::destroyed, this, onDestroyed);
-	// clang-format on
-	this->updateReferenceAp();
-};
-
-void NMWirelessNetwork::bindFrontend() {
-	auto* frontend = this->mFrontend;
-	this->NMNetwork::bindFrontend(frontend);
-
-	auto translateSignal = [this]() { return this->signalStrength() / 100.0; };
-	frontend->bindableSignalStrength().setBinding(translateSignal);
-	frontend->bindableSecurity().setBinding([this]() { return this->security(); });
-
-	QObject::connect(frontend, &WifiNetwork::requestConnect, this, [this]() {
-		if (auto* settingsRef = this->referenceSettings()) {
-			emit this->requestActivateConnection(settingsRef->path());
-			return;
-		}
-		if (auto* apRef = this->referenceAp()) {
-			emit this->requestAddAndActivateConnection(NMSettingsMap(), apRef->path());
-			return;
-		}
-		emit this->requestAddAndActivateConnection(NMSettingsMap(), "/");
-		return;
-	});
-
-	QObject::connect(frontend, &WifiNetwork::requestConnectWithPsk, this, [this](const QString& psk) {
-		NMSettingsMap settings;
-		settings["802-11-wireless-security"]["psk"] = psk;
-		if (const QPointer<NMSettings> ref = this->referenceSettings()) {
-			auto* call = ref->updateSettings(settings);
-			QObject::connect(
-			    call,
-			    &QDBusPendingCallWatcher::finished,
-			    this,
-			    [this, ref](QDBusPendingCallWatcher* call) {
-				    const QDBusPendingReply<> reply = *call;
-				    if (reply.isError()) {
-					    qCInfo(logNetworkManager) << "Failed to write PSK: " << reply.error().message();
-				    } else {
-					    if (!ref) {
-						    qCInfo(logNetworkManager) << "Failed to connectWithPsk: The settings disappeared.";
-					    } else {
-						    emit this->requestActivateConnection(ref->path());
-					    }
-				    }
-				    delete call;
-			    }
-			);
-			return;
-		}
-		if (auto* apRef = this->referenceAp()) {
-			emit this->requestAddAndActivateConnection(settings, apRef->path());
-			return;
-		}
-		qCInfo(logNetworkManager) << "Failed to connectWithPsk: The network disappeared.";
-	});
-}
-
-} // namespace qs::network

src/network/nm/network.hpp

@@ -1,138 +0,0 @@
-#pragma once
-
-#include <qobject.h>
-
-#include "../enums.hpp"
-#include "../network.hpp"
-#include "../wifi.hpp"
-#include "accesspoint.hpp"
-#include "active_connection.hpp"
-#include "enums.hpp"
-#include "settings.hpp"
-
-namespace qs::network {
-
-// NMNetwork aggregates NMActiveConnections and NMSettings of the same network.
-class NMNetwork: public QObject {
-	Q_OBJECT;
-
-public:
-	explicit NMNetwork(QObject* parent = nullptr);
-
-	void addSettings(NMSettings* settings);
-	void addActiveConnection(NMActiveConnection* active);
-	void forget();
-	void connect(const QString& devPath);
-	void connectWithSettings(const QString& devPath, NMSettings* settings);
-
-	// clang-format off
-	[[nodiscard]] NMConnectionState::Enum state() const { return this->bState; }
-	[[nodiscard]] bool known() const { return this->bKnown; }
-	[[nodiscard]] NMConnectionStateReason::Enum reason() const { return this->bReason; }
-	QBindable<NMDeviceStateReason::Enum> bindableDeviceFailReason() { return &this->bDeviceFailReason; }
-	[[nodiscard]] NMDeviceStateReason::Enum deviceFailReason() const { return this->bDeviceFailReason; }
-	[[nodiscard]] QList<NMSettings*> settings() const { return this->mSettings.values(); }
-	[[nodiscard]] NMSettings* referenceSettings() const { return this->bReferenceSettings; }
-	[[nodiscard]] virtual Network* frontend() = 0;
-	QBindable<bool> bindableVisible() { return &this->bVisible; }
-	[[nodiscard]] bool visible() const { return this->bVisible; }
-	// clang-format on
-
-signals:
-	void requestDisconnect();
-	void requestActivateConnection(const QString& settingsPath);
-	void
-	requestAddAndActivateConnection(const NMSettingsMap& settingsMap, const QString& specificObject);
-
-	void settingsAdded(NMSettings* settings);
-	void settingsRemoved(NMSettings* settings);
-	void stateChanged(NMConnectionState::Enum state);
-	void knownChanged(bool known);
-	void reasonChanged(NMConnectionStateReason::Enum reason);
-	void deviceFailReasonChanged(NMDeviceStateReason::Enum reason);
-	void referenceSettingsChanged(NMSettings* settings);
-	void visibilityChanged(bool visible);
-
-protected:
-	void bindFrontend(Network* frontend);
-	QHash<QString, NMSettings*> mSettings;
-	Q_OBJECT_BINDABLE_PROPERTY(
-	    NMNetwork,
-	    NMSettings*,
-	    bReferenceSettings,
-	    &NMNetwork::referenceSettingsChanged
-	);
-
-private:
-	void updateReferenceSettings();
-
-	NMActiveConnection* mActiveConnection = nullptr;
-
-	// clang-format off
-	Q_OBJECT_BINDABLE_PROPERTY(NMNetwork, bool, bVisible, &NMNetwork::visibilityChanged);
-	Q_OBJECT_BINDABLE_PROPERTY(NMNetwork, bool, bKnown, &NMNetwork::knownChanged);
-	Q_OBJECT_BINDABLE_PROPERTY(NMNetwork, NMConnectionStateReason::Enum, bReason, &NMNetwork::reasonChanged);
-	Q_OBJECT_BINDABLE_PROPERTY(NMNetwork, NMConnectionState::Enum, bState, &NMNetwork::stateChanged);
-	Q_OBJECT_BINDABLE_PROPERTY(NMNetwork, NMDeviceStateReason::Enum, bDeviceFailReason, &NMNetwork::deviceFailReasonChanged);
-	// clang-format on
-};
-
-// NMGenericNetwork extends NMNetwork to bind and handle the lifetime of a frontend Network.
-// This is useful for devices with one network that don't need to extend the base Network class.
-class NMGenericNetwork: public NMNetwork {
-	Q_OBJECT;
-
-public:
-	explicit NMGenericNetwork(QString name, NetworkDevice* device, QObject* parent = nullptr);
-	[[nodiscard]] Network* frontend() override { return this->mFrontend; }
-
-private:
-	void bindFrontend();
-	Network* mFrontend;
-};
-
-// NMWirelessNetwork extends NMNetwork to also aggregate NMAccessPoints of the same network and scanning functionality.
-class NMWirelessNetwork: public NMNetwork {
-	Q_OBJECT;
-
-public:
-	explicit NMWirelessNetwork(const QString& ssid, NetworkDevice* device, QObject* parent = nullptr);
-
-	void addAccessPoint(NMAccessPoint* ap);
-
-	// clang-format off
-	[[nodiscard]] QString ssid() const { return this->mSsid; }
-	[[nodiscard]] quint8 signalStrength() const { return this->bSignalStrength; }
-	[[nodiscard]] WifiSecurityType::Enum security() const { return this->bSecurity; }
-	[[nodiscard]] NMAccessPoint* referenceAp() const { return this->bReferenceAp; }
-	[[nodiscard]] QList<NMAccessPoint*> accessPoints() const { return this->mAccessPoints.values(); }
-	QBindable<QString> bindableActiveApPath() { return &this->bActiveApPath; }
-	[[nodiscard]] WifiNetwork* frontend() override { return this->mFrontend; };
-	// clang-format on
-
-signals:
-	void disappeared();
-	void signalStrengthChanged(quint8 signal);
-	void securityChanged(WifiSecurityType::Enum security);
-	void activeApPathChanged(QString path);
-	void referenceApChanged(NMAccessPoint* ap);
-	void capabilitiesChanged(NMWirelessCapabilities::Enum caps);
-	void apRemoved(NMAccessPoint* ap);
-
-private:
-	void updateReferenceAp();
-	void bindFrontend();
-
-	WifiNetwork* mFrontend;
-	QString mSsid;
-	QHash<QString, NMAccessPoint*> mAccessPoints;
-
-	// clang-format off
-	Q_OBJECT_BINDABLE_PROPERTY(NMWirelessNetwork, WifiSecurityType::Enum, bSecurity, &NMWirelessNetwork::securityChanged);
-	Q_OBJECT_BINDABLE_PROPERTY(NMWirelessNetwork, quint8, bSignalStrength, &NMWirelessNetwork::signalStrengthChanged);
-	Q_OBJECT_BINDABLE_PROPERTY(NMWirelessNetwork, QString, bActiveApPath, &NMWirelessNetwork::activeApPathChanged);
-	Q_OBJECT_BINDABLE_PROPERTY(NMWirelessNetwork, NMAccessPoint*, bReferenceAp, &NMWirelessNetwork::referenceApChanged);
-	// clang-format on
-};
-
-} // namespace qs::network

src/network/nm/org.freedesktop.NetworkManager.Device.Wired.xml

@@ -1,4 +0,0 @@
-<node>
-  <interface name="org.freedesktop.NetworkManager.Device.Wired">
-  </interface>
-</node>

src/network/nm/org.freedesktop.NetworkManager.Device.xml

@@ -1,10 +1,5 @@
 <node>
   <interface name="org.freedesktop.NetworkManager.Device">
     <method name="Disconnect"/>
-		<signal name="StateChanged">
-			<arg name="new_state" type="u"/>
-			<arg name="old_state" type="u"/>
-			<arg name="reason" type="u"/>
-		</signal>
   </interface>
 </node>

src/network/nm/org.freedesktop.NetworkManager.Settings.Connection.xml

@@ -2,18 +2,8 @@
   <interface name="org.freedesktop.NetworkManager.Settings.Connection">
     <method name="GetSettings">
 			<arg name="settings" type="a{sa{sv}}" direction="out"/>
-    	<annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="qs::network::NMSettingsMap"/>
+    	<annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="ConnectionSettingsMap"/>
     </method>
-    <method name="GetSecrets">
-			<arg name="setting_name" type="s" direction="in"/>
-			<arg name="secrets" type="a{sa{sv}}" direction="out"/>
-    	<annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="qs::network::NMSettingsMap"/>
-    </method>
-    <method name="Update">
-			<arg name="properties" type="a{sa{sv}}" direction="in"/>
-    	<annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="qs::network::NMSettingsMap"/>
-    </method>
-		<method name="ClearSecrets"/>
 		<method name="Delete"/>
     <signal name="Updated"/>
 		<signal name="Removed"/>

src/network/nm/org.freedesktop.NetworkManager.xml

@@ -1,8 +1,5 @@
 <node>
 	<interface name="org.freedesktop.NetworkManager">
-		<method name="CheckConnectivity">
-			<arg direction="out" type="u" name="connectivity"/>
-		</method>
 		<method name="GetAllDevices">
 			<arg direction="out" type="ao" name="devices"/>
 		</method>
@@ -14,7 +11,7 @@
 		</method>
 		<method name="AddAndActivateConnection">
 		<arg direction="in" type="a{sa{sv}}" name="connection"/>
-    	<annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="qs::network::NMSettingsMap"/>
+    	<annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="ConnectionSettingsMap"/>
 			<arg direction="in" type="o" name="device"/>
 			<arg direction="in" type="o" name="specific_object"/>
 			<arg direction="out" type="o" name="path"/>

src/network/nm/settings.cpp

@@ -1,228 +0,0 @@
-#include "settings.hpp"
-
-#include <qcontainerfwd.h>
-#include <qdbusconnection.h>
-#include <qdbusmetatype.h>
-#include <qdbuspendingcall.h>
-#include <qdbuspendingreply.h>
-#include <qdebug.h>
-#include <qlogging.h>
-#include <qloggingcategory.h>
-#include <qmetatype.h>
-#include <qobject.h>
-#include <qstring.h>
-#include <qtmetamacros.h>
-#include <qtypes.h>
-
-#include "../../core/logcat.hpp"
-#include "../../dbus/properties.hpp"
-#include "dbus_nm_connection_settings.h"
-#include "dbus_types.hpp"
-#include "utils.hpp"
-
-namespace qs::network {
-using namespace qs::dbus;
-
-namespace {
-QS_LOGGING_CATEGORY(logNetworkManager, "quickshell.network", QtWarningMsg);
-QS_LOGGING_CATEGORY(logNMSettings, "quickshell.network.nm_settings", QtWarningMsg);
-} // namespace
-
-NMSettings::NMSettings(const QString& path, QObject* parent): QObject(parent) {
-	qDBusRegisterMetaType<QList<QVariantMap>>();
-	qDBusRegisterMetaType<QList<quint32>>();
-	qDBusRegisterMetaType<QList<QList<quint32>>>();
-	qDBusRegisterMetaType<QList<QByteArray>>();
-	qDBusRegisterMetaType<NMIPv6Address>();
-	qDBusRegisterMetaType<QList<NMIPv6Address>>();
-	qDBusRegisterMetaType<NMIPv6Route>();
-	qDBusRegisterMetaType<QList<NMIPv6Route>>();
-	qDBusRegisterMetaType<QMap<QString, QString>>();
-
-	this->proxy = new DBusNMConnectionSettingsProxy(
-	    "org.freedesktop.NetworkManager",
-	    path,
-	    QDBusConnection::systemBus(),
-	    this
-	);
-
-	if (!this->proxy->isValid()) {
-		qCWarning(logNetworkManager) << "Cannot create DBus interface for connection settings at"
-		                             << path;
-		return;
-	}
-
-	QObject::connect(
-	    this->proxy,
-	    &DBusNMConnectionSettingsProxy::Updated,
-	    this,
-	    &NMSettings::getSettings
-	);
-
-	this->bId.setBinding([this]() { return this->bSettings.value()["connection"]["id"].toString(); });
-	this->bUuid.setBinding([this]() {
-		return this->bSettings.value()["connection"]["uuid"].toString();
-	});
-
-	this->settingsProperties.setInterface(this->proxy);
-	this->settingsProperties.updateAllViaGetAll();
-
-	this->getSettings();
-}
-
-void NMSettings::getSettings() {
-	auto pending = this->proxy->GetSettings();
-	auto* call = new QDBusPendingCallWatcher(pending, this);
-
-	auto responseCallback = [this](QDBusPendingCallWatcher* call) {
-		const QDBusPendingReply<NMSettingsMap> reply = *call;
-
-		if (reply.isError()) {
-			qCWarning(logNetworkManager)
-			    << "Failed to get settings for" << this->path() << ":" << reply.error().message();
-		} else {
-			auto settings = reply.value();
-			manualSettingDemarshall(settings);
-			this->bSettings = settings;
-			qCDebug(logNetworkManager) << "Settings map updated for" << this->path();
-
-			if (!this->mLoaded) {
-				emit this->loaded();
-				this->mLoaded = true;
-			}
-		};
-
-		delete call;
-	};
-
-	QObject::connect(call, &QDBusPendingCallWatcher::finished, this, responseCallback);
-}
-
-QDBusPendingCallWatcher* NMSettings::updateSettings(
-    const NMSettingsMap& settingsToChange,
-    const NMSettingsMap& settingsToRemove
-) {
-	auto settings = removeSettingsInMap(this->bSettings, settingsToRemove);
-	settings = mergeSettingsMaps(settings, settingsToChange);
-	auto pending = this->proxy->Update(settings);
-	auto* call = new QDBusPendingCallWatcher(pending, this);
-
-	return call;
-}
-
-void NMSettings::clearSecrets() {
-	auto pending = this->proxy->ClearSecrets();
-	auto* call = new QDBusPendingCallWatcher(pending, this);
-
-	auto responseCallback = [this](QDBusPendingCallWatcher* call) {
-		const QDBusPendingReply<> reply = *call;
-
-		if (reply.isError()) {
-			qCWarning(logNetworkManager)
-			    << "Failed to clear secrets for" << this->path() << ":" << reply.error().message();
-		} else {
-			qCDebug(logNetworkManager) << "Cleared secrets for" << this->path();
-		}
-		delete call;
-	};
-
-	QObject::connect(call, &QDBusPendingCallWatcher::finished, this, responseCallback);
-}
-
-void NMSettings::forget() {
-	auto pending = this->proxy->Delete();
-	auto* call = new QDBusPendingCallWatcher(pending, this);
-
-	auto responseCallback = [this](QDBusPendingCallWatcher* call) {
-		const QDBusPendingReply<> reply = *call;
-
-		if (reply.isError()) {
-			qCWarning(logNetworkManager)
-			    << "Failed to forget" << this->path() << ":" << reply.error().message();
-		} else {
-			qCDebug(logNetworkManager) << "Successfully deletion of" << this->path();
-		}
-		delete call;
-	};
-
-	QObject::connect(call, &QDBusPendingCallWatcher::finished, this, responseCallback);
-}
-
-QVariantMap NMSettings::read() {
-	QVariantMap result;
-	const auto& settings = this->bSettings.value();
-	for (auto it = settings.constBegin(); it != settings.constEnd(); ++it) {
-		QVariantMap group;
-		for (auto jt = it.value().constBegin(); jt != it.value().constEnd(); ++jt) {
-			group.insert(jt.key(), settingTypeToQml(jt.value()));
-		}
-		result.insert(it.key(), group);
-	}
-	return result;
-}
-
-void NMSettings::write(const QVariantMap& settings) {
-	NMSettingsMap changedSettings;
-	NMSettingsMap removedSettings;
-	QStringList failedSettings;
-
-	for (auto it = settings.constBegin(); it != settings.constEnd(); ++it) {
-		if (!it.value().canConvert<QVariantMap>()) continue;
-
-		auto group = it.value().toMap();
-		QVariantMap toChange;
-		QVariantMap toRemove;
-		for (auto jt = group.constBegin(); jt != group.constEnd(); ++jt) {
-			if (jt.value().isNull()) {
-				toRemove.insert(jt.key(), QVariant());
-			} else {
-				auto converted = settingTypeFromQml(it.key(), jt.key(), jt.value());
-				if (!converted.isValid()) failedSettings.append(it.key() + "." + jt.key());
-				else toChange.insert(jt.key(), converted);
-			}
-		}
-		if (!toChange.isEmpty()) changedSettings.insert(it.key(), toChange);
-		if (!toRemove.isEmpty()) removedSettings.insert(it.key(), toRemove);
-	}
-
-	if (!failedSettings.isEmpty()) {
-		qCWarning(logNMSettings) << "A write to" << this
-		                         << "has received bad types for the following settings:"
-		                         << failedSettings.join(", ");
-	}
-
-	auto* call = this->updateSettings(changedSettings, removedSettings);
-
-	auto responseCallback = [this](QDBusPendingCallWatcher* call) {
-		const QDBusPendingReply<> reply = *call;
-
-		if (reply.isError()) {
-			qCWarning(logNetworkManager)
-			    << "Failed to update settings for" << this->path() << ":" << reply.error().message();
-		} else {
-			qCDebug(logNMSettings) << "Successful write to" << this;
-		}
-		delete call;
-	};
-
-	QObject::connect(call, &QDBusPendingCallWatcher::finished, this, responseCallback);
-}
-
-bool NMSettings::isValid() const { return this->proxy && this->proxy->isValid(); }
-QString NMSettings::address() const { return this->proxy ? this->proxy->service() : QString(); }
-QString NMSettings::path() const { return this->proxy ? this->proxy->path() : QString(); }
-
-} // namespace qs::network
-
-QDebug operator<<(QDebug debug, const qs::network::NMSettings* settings) {
-	auto saver = QDebugStateSaver(debug);
-
-	if (settings) {
-		debug.nospace() << "NMSettings(" << static_cast<const void*>(settings)
-		                << ", uuid=" << settings->uuid() << ")";
-	} else {
-		debug << "WifiNetwork(nullptr)";
-	}
-
-	return debug;
-}

src/network/nm/settings.hpp

@@ -1,82 +0,0 @@
-#pragma once
-
-#include <qbytearray.h>
-#include <qdbusextratypes.h>
-#include <qdbuspendingcall.h>
-#include <qdbuspendingreply.h>
-#include <qobject.h>
-#include <qproperty.h>
-#include <qqmlintegration.h>
-#include <qstringlist.h>
-#include <qtmetamacros.h>
-#include <qtypes.h>
-
-#include "../../dbus/properties.hpp"
-#include "dbus_nm_connection_settings.h"
-#include "dbus_types.hpp"
-
-namespace qs::network {
-
-// Proxy of a /org/freedesktop/NetworkManager/Settings/Connection/* object.
-///! A NetworkManager connection settings profile.
-class NMSettings: public QObject {
-	Q_OBJECT;
-	QML_ELEMENT;
-	QML_UNCREATABLE("");
-
-	/// The human-readable unique identifier for the connection.
-	Q_PROPERTY(QString id READ default NOTIFY idChanged BINDABLE bindableId);
-	/// A universally unique identifier for the connection.
-	Q_PROPERTY(QString uuid READ uuid NOTIFY uuidChanged BINDABLE bindableUuid);
-
-public:
-	explicit NMSettings(const QString& path, QObject* parent = nullptr);
-
-	/// Clear all of the secrets belonging to the settings.
-	Q_INVOKABLE void clearSecrets();
-	/// Delete the settings.
-	Q_INVOKABLE void forget();
-	/// Update the connection with new settings and save the connection to disk.
-	/// Only changed fields need to be included.
-	/// Writing a setting to `null` will remove the setting or reset it to its default.
-	///
-	/// > [!NOTE] Secrets may be part of the update request,
-	/// > and will be either stored in persistent storage or sent to a Secret Agent for storage,
-	/// > depending on the flags associated with each secret.
-	Q_INVOKABLE void write(const QVariantMap& settings);
-	/// Get the settings map describing this network configuration.
-	///
-	/// > [!NOTE] This will never include any secrets required for connection to the network, as those are often protected.
-	Q_INVOKABLE QVariantMap read();
-
-	[[nodiscard]] bool isValid() const;
-	[[nodiscard]] QString path() const;
-	[[nodiscard]] QString address() const;
-	[[nodiscard]] NMSettingsMap map() { return this->bSettings; }
-	QDBusPendingCallWatcher*
-	updateSettings(const NMSettingsMap& settingsToChange, const NMSettingsMap& settingsToRemove = {});
-	QBindable<QString> bindableId() { return &this->bId; }
-	[[nodiscard]] QString uuid() const { return this->bUuid; }
-	QBindable<QString> bindableUuid() { return &this->bUuid; }
-
-signals:
-	void loaded();
-	void settingsChanged(NMSettingsMap settings);
-	void idChanged(QString id);
-	void uuidChanged(QString uuid);
-
-private:
-	bool mLoaded = false;
-
-	void getSettings();
-
-	Q_OBJECT_BINDABLE_PROPERTY(NMSettings, NMSettingsMap, bSettings, &NMSettings::settingsChanged);
-	Q_OBJECT_BINDABLE_PROPERTY(NMSettings, QString, bId, &NMSettings::idChanged);
-	Q_OBJECT_BINDABLE_PROPERTY(NMSettings, QString, bUuid, &NMSettings::uuidChanged);
-	QS_DBUS_BINDABLE_PROPERTY_GROUP(NMSettings, settingsProperties);
-	DBusNMConnectionSettingsProxy* proxy = nullptr;
-};
-
-} // namespace qs::network
-
-QDebug operator<<(QDebug debug, const qs::network::NMSettings* settings);

src/network/nm/utils.cpp

@@ -1,28 +1,27 @@
 #include "utils.hpp"
-#include <cmath>
+
 // We depend on non-std Linux extensions that ctime doesn't put in the global namespace
 // NOLINTNEXTLINE(modernize-deprecated-headers)
 #include <time.h>
 
 #include <qcontainerfwd.h>
 #include <qdatetime.h>
-#include <qdbusargument.h>
 #include <qdbusservicewatcher.h>
 #include <qobject.h>
 #include <qqmlintegration.h>
 #include <qtypes.h>
 
-#include "../enums.hpp"
+#include "../wifi.hpp"
 #include "dbus_types.hpp"
 #include "enums.hpp"
 
 namespace qs::network {
 
-WifiSecurityType::Enum securityFromSettingsMap(const NMSettingsMap& settings) {
-	const QString mapName = "802-11-wireless-security";
-	if (!settings.contains(mapName)) return WifiSecurityType::Unknown;
-	const QVariantMap& security = settings.value(mapName);
-	if (security.isEmpty()) return WifiSecurityType::Open;
+WifiSecurityType::Enum securityFromConnectionSettings(const ConnectionSettingsMap& settings) {
+	const QVariantMap& security = settings.value("802-11-wireless-security");
+	if (security.isEmpty()) {
+		return WifiSecurityType::Open;
+	};
 
 	const QString keyMgmt = security["key-mgmt"].toString();
 	const QString authAlg = security["auth-alg"].toString();
@@ -46,8 +45,6 @@ WifiSecurityType::Enum securityFromSettingsMap(const NMSettingsMap& settings) {
 		return WifiSecurityType::Sae;
 	} else if (keyMgmt == "wpa-eap-suite-b-192") {
 		return WifiSecurityType::Wpa3SuiteB192;
-	} else if (keyMgmt == "owe") {
-		return WifiSecurityType::Owe;
 	}
 	return WifiSecurityType::Open;
 }
@@ -227,304 +224,6 @@ WifiSecurityType::Enum findBestWirelessSecurity(
 	return WifiSecurityType::Unknown;
 }
 
-NMSettingsMap mergeSettingsMaps(const NMSettingsMap& target, const NMSettingsMap& source) {
-	NMSettingsMap result = target;
-	for (auto iter = source.constBegin(); iter != source.constEnd(); ++iter) {
-		result[iter.key()].insert(iter.value());
-	}
-	return result;
-}
-
-NMSettingsMap removeSettingsInMap(const NMSettingsMap& target, const NMSettingsMap& toRemove) {
-	NMSettingsMap result = target;
-	for (auto iter = toRemove.constBegin(); iter != toRemove.constEnd(); ++iter) {
-		const QString& group = iter.key();
-		const QVariantMap& keysToRemove = iter.value();
-
-		if (!result.contains(group)) continue;
-
-		for (auto jt = keysToRemove.constBegin(); jt != keysToRemove.constEnd(); ++jt) {
-			result[group].remove(jt.key());
-		}
-
-		// Remove the group entirely if it's now empty
-		if (result[group].isEmpty()) {
-			result.remove(group);
-		}
-	}
-	return result;
-}
-
-// Some NMSettingsMap settings remain QDBusArguments after autodemarshalling.
-// Manually demarshall these for any complex signature we have registered.
-void manualSettingDemarshall(NMSettingsMap& map) {
-	auto demarshallValue = [](const QVariant& value) -> QVariant {
-		if (value.userType() != qMetaTypeId<QDBusArgument>()) {
-			return value;
-		}
-
-		auto arg = value.value<QDBusArgument>();
-		auto signature = arg.currentSignature();
-
-		if (signature == "ay") return QVariant::fromValue(qdbus_cast<QByteArray>(arg));
-		if (signature == "aay") return QVariant::fromValue(qdbus_cast<QList<QByteArray>>(arg));
-		if (signature == "au") return QVariant::fromValue(qdbus_cast<QList<quint32>>(arg));
-		if (signature == "aau") return QVariant::fromValue(qdbus_cast<QList<QList<quint32>>>(arg));
-		if (signature == "aa{sv}") return QVariant::fromValue(qdbus_cast<QList<QVariantMap>>(arg));
-		if (signature == "a(ayuay)") return QVariant::fromValue(qdbus_cast<QList<NMIPv6Address>>(arg));
-		if (signature == "a(ayuayu)") return QVariant::fromValue(qdbus_cast<QList<NMIPv6Route>>(arg));
-		if (signature == "a{ss}") return QVariant::fromValue(qdbus_cast<QMap<QString, QString>>(arg));
-
-		return value;
-	};
-
-	for (auto it = map.begin(); it != map.end(); ++it)
-		for (auto jt = it.value().begin(); jt != it.value().end(); ++jt)
-			jt.value() = demarshallValue(jt.value());
-}
-
-// Some NMSettingsMap setting types can't be expressed in QML.
-// Convert these settings to their correct type or return an invalid QVariant.
-QVariant settingTypeFromQml(const QString& group, const QString& key, const QVariant& value) {
-	auto s = group + "." + key;
-
-	// QString -> QByteArray
-	if (s == "802-1x.ca-cert" || s == "802-1x.client-cert" || s == "802-1x.private-key"
-	    || s == "802-1x.password-raw" || s == "802-1x.phase2-ca-cert"
-	    || s == "802-1x.phase2-client-cert" || s == "802-1x.phase2-private-key"
-	    || s == "802-11-wireless.ssid" || s == "802-3-ethernet.cloned-mac-address"
-	    || s == "802-3-ethernet.mac-address")
-	{
-		if (value.typeId() == QMetaType::QString) {
-			return value.toString().toUtf8();
-		}
-		if (value.typeId() == QMetaType::QByteArray) {
-			return value;
-		}
-		return QVariant();
-	}
-
-	// QVariantList -> QList<QByteArray>
-	if (s == "ipv6.dns") {
-		if (value.typeId() == QMetaType::QVariantList) {
-			QList<QByteArray> r;
-			for (const auto& v: value.toList()) {
-				if (v.typeId() == QMetaType::QString) {
-					r.append(v.toString().toUtf8());
-				} else {
-					r.append(v.toByteArray());
-				}
-			}
-			return QVariant::fromValue(r);
-		}
-		return QVariant();
-	}
-
-	// QVariantList -> QList<quint32>
-	if (s == "ipv4.dns") {
-		if (value.typeId() == QMetaType::QVariantList) {
-			QList<quint32> r;
-			for (const auto& v: value.toList()) {
-				r.append(v.value<quint32>());
-			}
-			return QVariant::fromValue(r);
-		}
-		return QVariant();
-	}
-
-	// QVariantList -> QList<QList<quint32>>
-	if (s == "ipv4.addresses" || s == "ipv4.routes") {
-		if (value.typeId() == QMetaType::QVariantList) {
-			QList<QList<quint32>> r;
-			for (const auto& v: value.toList()) {
-				if (v.typeId() != QMetaType::QVariantList) {
-					continue;
-				}
-				QList<quint32> inner;
-				for (const auto& u: v.toList()) {
-					inner.append(u.value<quint32>());
-				}
-				r.append(inner);
-			}
-			return QVariant::fromValue(r);
-		}
-		return QVariant();
-	}
-
-	// QVariantList -> QList<QVariantMap>
-	if (s == "ipv4.address-data" || s == "ipv4.route-data" || s == "ipv4.routing-rules"
-	    || s == "ipv6.address-data" || s == "ipv6.route-data" || s == "ipv6.routing-rules")
-	{
-		if (value.typeId() == QMetaType::QVariantList) {
-			QList<QVariantMap> r;
-			for (const auto& v: value.toList()) {
-				if (!v.canConvert<QVariantMap>()) {
-					continue;
-				}
-				r.append(v.toMap());
-			}
-			return QVariant::fromValue(r);
-		}
-		return QVariant();
-	}
-
-	// QVariantList -> QList<NMIPv6Address>
-	if (s == "ipv6.addresses") {
-		if (value.typeId() == QMetaType::QVariantList) {
-			QList<NMIPv6Address> r;
-			for (const auto& v: value.toList()) {
-				if (v.typeId() != QMetaType::QVariantList) {
-					continue;
-				}
-				auto fields = v.toList();
-				if (fields.size() != 3) {
-					continue;
-				}
-				const QByteArray address = fields[0].typeId() == QMetaType::QString
-				                             ? fields[0].toString().toUtf8()
-				                             : fields[0].toByteArray();
-				const QByteArray gateway = fields[2].typeId() == QMetaType::QString
-				                             ? fields[2].toString().toUtf8()
-				                             : fields[2].toByteArray();
-				r.append({.address = address, .prefix = fields[1].value<quint32>(), .gateway = gateway});
-			}
-			return QVariant::fromValue(r);
-		}
-		return QVariant();
-	}
-
-	// QVariantList -> QList<NMIPv6Route>
-	if (s == "ipv6.routes") {
-		if (value.typeId() == QMetaType::QVariantList) {
-			QList<NMIPv6Route> r;
-			for (const auto& v: value.toList()) {
-				if (v.typeId() != QMetaType::QVariantList) {
-					continue;
-				}
-				auto fields = v.toList();
-				if (fields.size() != 4) {
-					continue;
-				}
-				const QByteArray destination = fields[0].typeId() == QMetaType::QString
-				                                 ? fields[0].toString().toUtf8()
-				                                 : fields[0].toByteArray();
-				const QByteArray nexthop = fields[2].typeId() == QMetaType::QString
-				                             ? fields[2].toString().toUtf8()
-				                             : fields[2].toByteArray();
-				r.append(
-				    {.destination = destination,
-				     .prefix = fields[1].value<quint32>(),
-				     .nexthop = nexthop,
-				     .metric = fields[3].value<quint32>()}
-				);
-			}
-			return QVariant::fromValue(r);
-		}
-		return QVariant();
-	}
-
-	// QVariantList -> QStringList
-	if (s == "connection.permissions" || s == "ipv4.dns-search" || s == "ipv6.dns-search"
-	    || s == "802-11-wireless.seen-bssids" || s == "802-3-ethernet.mac-address-blacklist"
-	    || s == "802-3-ethernet.mac-address-denylist" || s == "802-3-ethernet.s390-subchannels")
-	{
-		if (value.typeId() == QMetaType::QVariantList) {
-			QStringList stringList;
-			for (const auto& item: value.toList()) {
-				stringList.append(item.toString());
-			}
-			return stringList;
-		}
-		return QVariant();
-	}
-
-	// QVariantMap -> QMap<QString, QString>
-	if (s == "802-3-ethernet.s390-options") {
-		if (value.canConvert<QVariantMap>()) {
-			QMap<QString, QString> r;
-			for (const auto& [key, val]: value.toMap().asKeyValueRange()) {
-				r.insert(key, val.toString());
-			}
-			return QVariant::fromValue(r);
-		}
-		return QVariant();
-	}
-
-	// double (whole number) -> qint32
-	if (value.typeId() == QMetaType::Double) {
-		auto num = value.toDouble();
-		if (std::isfinite(num) && num == std::trunc(num)) {
-			return QVariant::fromValue(static_cast<qint32>(num));
-		}
-	}
-
-	return value;
-}
-
-// Some NMSettingsMap setting types must be converted to a type that is supported by QML.
-// Although QByteArrays can be represented in QML, we convert them to strings for convenience.
-QVariant settingTypeToQml(const QVariant& value) {
-	// QByteArray -> QString
-	if (value.typeId() == QMetaType::QByteArray) {
-		return QString::fromUtf8(value.toByteArray());
-	}
-
-	// QList<QByteArray> -> QVariantList
-	if (value.userType() == qMetaTypeId<QList<QByteArray>>()) {
-		QVariantList out;
-		for (const auto& ba: value.value<QList<QByteArray>>()) {
-			out.append(QString::fromUtf8(ba));
-		}
-		return out;
-	}
-
-	// QList<NMIPv6Address> -> QVariantList
-	if (value.userType() == qMetaTypeId<QList<NMIPv6Address>>()) {
-		QVariantList out;
-		for (const auto& addr: value.value<QList<NMIPv6Address>>()) {
-			out.append(
-			    QVariant::fromValue(
-			        QVariantList {
-			            QString::fromUtf8(addr.address),
-			            addr.prefix,
-			            QString::fromUtf8(addr.gateway),
-			        }
-			    )
-			);
-		}
-		return out;
-	}
-
-	// QList<NMIPv6Route> -> QVariantList
-	if (value.userType() == qMetaTypeId<QList<NMIPv6Route>>()) {
-		QVariantList out;
-		for (const auto& route: value.value<QList<NMIPv6Route>>()) {
-			out.append(
-			    QVariant::fromValue(
-			        QVariantList {
-			            QString::fromUtf8(route.destination),
-			            route.prefix,
-			            QString::fromUtf8(route.nexthop),
-			            route.metric,
-			        }
-			    )
-			);
-		}
-		return out;
-	}
-
-	// QMap<QString, QString> -> QVariantMap
-	if (value.userType() == qMetaTypeId<QMap<QString, QString>>()) {
-		QVariantMap out;
-		for (const auto& [key, val]: value.value<QMap<QString, QString>>().asKeyValueRange()) {
-			out.insert(key, val);
-		}
-		return out;
-	}
-
-	return value;
-}
-
 // NOLINTBEGIN
 QDateTime clockBootTimeToDateTime(qint64 clockBootTime) {
 	clockid_t clkId = CLOCK_BOOTTIME;

src/network/nm/utils.hpp

@@ -3,14 +3,15 @@
 #include <qcontainerfwd.h>
 #include <qdbusservicewatcher.h>
 #include <qobject.h>
+#include <qqmlintegration.h>
 
-#include "../enums.hpp"
+#include "../wifi.hpp"
 #include "dbus_types.hpp"
 #include "enums.hpp"
 
 namespace qs::network {
 
-WifiSecurityType::Enum securityFromSettingsMap(const NMSettingsMap& settings);
+WifiSecurityType::Enum securityFromConnectionSettings(const ConnectionSettingsMap& settings);
 
 bool deviceSupportsApCiphers(
     NMWirelessCapabilities::Enum caps,
@@ -39,16 +40,6 @@ WifiSecurityType::Enum findBestWirelessSecurity(
     NM80211ApSecurityFlags::Enum apRsn
 );
 
-NMSettingsMap mergeSettingsMaps(const NMSettingsMap& target, const NMSettingsMap& source);
-
-NMSettingsMap removeSettingsInMap(const NMSettingsMap& target, const NMSettingsMap& toRemove);
-
-void manualSettingDemarshall(NMSettingsMap& map);
-
-QVariant settingTypeFromQml(const QString& group, const QString& key, const QVariant& value);
-
-QVariant settingTypeToQml(const QVariant& value);
-
 QDateTime clockBootTimeToDateTime(qint64 clockBootTime);
 
 } // namespace qs::network

src/network/nm/wired.cpp

@@ -1,101 +0,0 @@
-#include "wired.hpp"
-
-#include <qdbusconnection.h>
-#include <qlogging.h>
-#include <qloggingcategory.h>
-#include <qnamespace.h>
-#include <qobject.h>
-#include <qstring.h>
-#include <qtmetamacros.h>
-
-#include "../../core/logcat.hpp"
-#include "../../dbus/properties.hpp"
-#include "../wired.hpp"
-#include "active_connection.hpp"
-#include "dbus_nm_wired.h"
-#include "device.hpp"
-#include "enums.hpp"
-#include "network.hpp"
-#include "settings.hpp"
-
-namespace qs::network {
-using namespace qs::dbus;
-
-namespace {
-QS_LOGGING_CATEGORY(logNetworkManager, "quickshell.network.networkmanager", QtWarningMsg);
-}
-
-NMWiredDevice::NMWiredDevice(const QString& path, QObject* parent): NMDevice(path, parent) {
-	this->wiredProxy = new DBusNMWiredProxy(
-	    "org.freedesktop.NetworkManager",
-	    path,
-	    QDBusConnection::systemBus(),
-	    this
-	);
-
-	if (!this->wiredProxy->isValid()) {
-		qCWarning(logNetworkManager) << "Cannot create DBus interface for wired device at" << path;
-		return;
-	}
-
-	// Wait to create the NMGenericNetwork/Network
-	// until the dbus properties load because the network requires the interface name.
-	QObject::connect(
-	    &this->wiredProperties,
-	    &DBusPropertyGroup::getAllFinished,
-	    this,
-	    &NMWiredDevice::initWired,
-	    Qt::SingleShotConnection
-	);
-
-	this->wiredProperties.setInterface(this->wiredProxy);
-	this->wiredProperties.updateAllViaGetAll();
-
-	// Register and bind the frontend WiredDevice.
-	this->mFrontend = new WiredDevice(this);
-	this->bindFrontend();
-};
-
-void NMWiredDevice::initWired() {
-	// Register the NMGenericNetwork and bind the frontend Network.
-	// For wired networking, there is only one Network and it should exist for the lifetime of the device.
-	auto* net = new NMGenericNetwork(QString(), this->frontend(), this);
-	net->frontend()->bindableName().setBinding([this]() { return this->interface(); });
-
-	auto visible = [this]() {
-		return (this->interfaceFlags() & NMDeviceInterfaceFlags::Carrier) != 0;
-	};
-	net->bindableVisible().setBinding(visible);
-	this->NMDevice::bindNetwork(net);
-	this->mNetwork = net;
-
-	// clang-format off
-	QObject::connect(this, &NMWiredDevice::settingsLoaded, this, &NMWiredDevice::onSettingsLoaded);
-	QObject::connect(this, &NMWiredDevice::activeConnectionLoaded, this, &NMWiredDevice::onActiveConnectionLoaded);
-	// clang-format on
-
-	emit this->loaded();
-}
-
-void NMWiredDevice::bindFrontend() {
-	auto* frontend = this->mFrontend;
-	this->NMDevice::bindFrontend(frontend);
-	frontend->bindableLinkSpeed().setBinding([this]() { return this->bSpeed.value(); });
-	frontend->bindableHasLink().setBinding([this]() {
-		return (this->interfaceFlags() & NMDeviceInterfaceFlags::Carrier) != 0;
-	});
-}
-
-void NMWiredDevice::onSettingsLoaded(NMSettings* settings) {
-	this->mNetwork->addSettings(settings);
-}
-
-void NMWiredDevice::onActiveConnectionLoaded(NMActiveConnection* active) {
-	this->mNetwork->addActiveConnection(active);
-}
-
-bool NMWiredDevice::isValid() const {
-	return this->NMDevice::isValid() && (this->wiredProxy && this->wiredProxy->isValid());
-}
-
-} // namespace qs::network

src/network/nm/wired.hpp

@@ -1,53 +0,0 @@
-#pragma once
-
-#include <qdbusextratypes.h>
-#include <qhash.h>
-#include <qobject.h>
-#include <qproperty.h>
-#include <qtmetamacros.h>
-#include <qtypes.h>
-
-#include "../wired.hpp"
-#include "active_connection.hpp"
-#include "dbus_nm_wired.h"
-#include "device.hpp"
-#include "network.hpp"
-#include "settings.hpp"
-
-namespace qs::network {
-
-// Proxy of a /org/freedesktop/NetworkManager/Device/* object.
-// Extends NMDevice to also include members from the org.freedesktop.NetworkManager.Device.Wired interface
-// Owns the lifetime of a NMGenericNetwork, and a frontend WiredDevice.
-class NMWiredDevice: public NMDevice {
-	Q_OBJECT;
-
-public:
-	explicit NMWiredDevice(const QString& path, QObject* parent = nullptr);
-
-	[[nodiscard]] bool isValid() const override;
-	[[nodiscard]] WiredDevice* frontend() override { return this->mFrontend; };
-
-signals:
-	void speedChanged(quint32 speed);
-
-private slots:
-	void onSettingsLoaded(NMSettings* settings);
-	void onActiveConnectionLoaded(NMActiveConnection* active);
-
-private:
-	void initWired();
-	void bindFrontend();
-
-	WiredDevice* mFrontend = nullptr;
-	NMGenericNetwork* mNetwork = nullptr;
-
-	Q_OBJECT_BINDABLE_PROPERTY(NMWiredDevice, quint32, bSpeed, &NMWiredDevice::speedChanged);
-
-	QS_DBUS_BINDABLE_PROPERTY_GROUP(NMWireless, wiredProperties);
-	QS_DBUS_PROPERTY_BINDING(NMWiredDevice, pSpeed, bSpeed, wiredProperties, "Speed");
-
-	DBusNMWiredProxy* wiredProxy = nullptr;
-};
-
-}; // namespace qs::network