.clang-format

@@ -1,6 +1,6 @@
 AlignArrayOfStructures: None
 AlignAfterOpenBracket: BlockIndent
-AllowShortBlocksOnASingleLine: Empty
+AllowShortBlocksOnASingleLine: Always
 AllowShortCaseLabelsOnASingleLine: true
 AllowShortEnumsOnASingleLine: true
 AllowShortFunctionsOnASingleLine: All

.clang-tidy

@@ -20,8 +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,
   google-runtime-int,
@@ -65,8 +63,6 @@ CheckOptions:
   readability-identifier-naming.ParameterCase: camelBack
   readability-identifier-naming.VariableCase: camelBack
 
-  misc-const-correctness.WarnPointersAsPointers: false
-
   # does not appear to work
   readability-operators-representation.BinaryOperators: '&&;&=;&;|;~;!;!=;||;|=;^;^='
   readability-operators-representation.OverloadedOperators: '&&;&=;&;|;~;!;!=;||;|=;^;^='

.github/ISSUE_TEMPLATE/crash.yml

@@ -1,17 +1,82 @@
-name: Crash Report (v1)
+name: Crash Report
-description: Quickshell has crashed (old)
+description: Quickshell has crashed
-labels: ["unactionable"]
+labels: ["bug", "crash"]
 body:
-  - type: markdown
+  - type: textarea
+    id: crashinfo
     attributes:
-      value: |
+      label: General crash information
-        Thank you for taking the time to click the report button.
+      description: |
-        At this point most of the worst issues in 0.2.1 and before have been fixed and we are
+        Paste the contents of the `info.txt` file in your crash folder here.
-        preparing for a new release. Please do not submit this report.
+      value: "<details> <summary>General information</summary>
-  - type: checkboxes
+
-    id: donotcheck
+
-    attributes:
+        ```
-      label: Read the text above. Do not submit the report.
+
-      options:
+        <Paste the contents of the file here inside of the triple backticks>
-        - label: Yes I want this report to be deleted.
+
+        ```
+
+
+        </details>"
+    validations:
         required: true
+  - type: textarea
+    id: userinfo
+    attributes:
+      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

@@ -1,49 +0,0 @@
-name: Crash Report (v2)
-description: Quickshell has crashed
-labels: ["bug", "crash"]
-body:
-  - type: textarea
-    id: userinfo
-    attributes:
-      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: upload
-    id: report
-    attributes:
-      label: Report file
-      description: Attach `report.txt` here.
-    validations:
-        required: true
-  - type: upload
-    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'`.
-    validations:
-        required: true
-  - type: textarea
-    id: config
-    attributes:
-      label: Configuration
-      description: |
-        Attach or link 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: |
-        GDB usually produces better stacktraces than quickshell can. Consider attaching a gdb backtrace
-        following the instructions below.
-
-        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.

.github/workflows/build.yml

@@ -6,23 +6,17 @@ jobs:
     name: Nix
     strategy:
       matrix:
-        qtver: [qt6.10.1, qt6.10.0, qt6.9.2, qt6.9.1, qt6.9.0, qt6.8.3, qt6.8.2, qt6.8.1, qt6.8.0, qt6.7.3, qt6.7.2, qt6.7.1, qt6.7.0, qt6.6.3, qt6.6.2, qt6.6.1, qt6.6.0]
+        qtver: [qt6.9.0, qt6.8.3, qt6.8.2, qt6.8.1, qt6.8.0, qt6.7.3, qt6.7.2, qt6.7.1, qt6.7.0, qt6.6.3, qt6.6.2, qt6.6.1, qt6.6.0]
         compiler: [clang, gcc]
     runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      id-token: write
     steps:
       - uses: actions/checkout@v4
       # Use cachix action over detsys for testing with act.
       # - uses: cachix/install-nix-action@v27
       - uses: DeterminateSystems/nix-installer-action@main
-      - uses: DeterminateSystems/magic-nix-cache-action@main
-        with:
-          use-flakehub: false
 
       - name: Download Dependencies
-        run: nix-build --no-out-link --expr '((import ./ci/matrix.nix) { qtver = "${{ matrix.qtver }}"; compiler = "${{ matrix.compiler }}"; }).unwrapped.inputDerivation'
+        run: nix-build --no-out-link --expr '((import ./ci/matrix.nix) { qtver = "${{ matrix.qtver }}"; compiler = "${{ matrix.compiler }}"; }).inputDerivation'
 
       - name: Build
         run: nix-build --no-out-link --expr '(import ./ci/matrix.nix) { qtver = "${{ matrix.qtver }}"; compiler = "${{ matrix.compiler }}"; }'
@@ -50,16 +44,13 @@ jobs:
             wayland-protocols \
             wayland \
             libdrm \
-            vulkan-headers \
             libxcb \
             libpipewire \
             cli11 \
-            polkit \
+            jemalloc
-            jemalloc \
-            libunwind \
-            git # for cpptrace clone
 
       - name: Build
+        # breakpad is annoying to build in ci due to makepkg not running as root
         run: |
-          cmake -GNinja -B build -DVENDOR_CPPTRACE=ON
+          cmake -GNinja -B build -DCRASH_REPORTER=OFF
           cmake --build build

.github/workflows/lint.yml

@@ -5,17 +5,11 @@ jobs:
   lint:
     name: Lint
     runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      id-token: write
     steps:
       - uses: actions/checkout@v4
       # Use cachix action over detsys for testing with act.
       # - uses: cachix/install-nix-action@v27
       - uses: DeterminateSystems/nix-installer-action@main
-      - uses: DeterminateSystems/magic-nix-cache-action@main
-        with:
-          use-flakehub: false
       - uses: nicknovitski/nix-develop@v1
 
       - name: Check formatting

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)
@@ -48,7 +55,7 @@ On some distros, private Qt headers are in separate packages which you may have
 We currently require private headers for the following libraries:
 
 - `qt6declarative`
-- `qt6wayland` (for Qt versions prior to 6.10)
+- `qt6wayland`
 
 We recommend an implicit dependency on `qt6svg`. If it is not installed, svg images and
 svg icons will not work, including system ones.
@@ -57,24 +64,14 @@ At least Qt 6.6 is required.
 
 All features are enabled by default and some have their own dependencies.
 
-### Crash Handler
+### Crash Reporter
-The crash reporter catches crashes, restarts Quickshell when it crashes,
+The crash reporter catches crashes, restarts quickshell when it crashes,
 and collects useful crash information in one place. Leaving this enabled will
 enable us to fix bugs far more easily.
 
-To disable: `-DCRASH_HANDLER=OFF`
+To disable: `-DCRASH_REPORTER=OFF`
 
-Dependencies: `cpptrace`
+Dependencies: `google-breakpad` (static library)
-
-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.
 
 ### Jemalloc
 We recommend leaving Jemalloc enabled as it will mask memory fragmentation caused
@@ -107,7 +104,7 @@ Currently supported Qt versions: `6.6`, `6.7`.
 To disable: `-DWAYLAND=OFF`
 
 Dependencies:
- - `qt6wayland` (for Qt versions prior to 6.10)
+ - `qt6wayland`
  - `wayland` (libwayland-client)
  - `wayland-scanner` (build time)
  - `wayland-protocols` (static library)
@@ -147,8 +144,8 @@ Enables streaming video from monitors and toplevel windows through various proto
 To disable: `-DSCREENCOPY=OFF`
 
 Dependencies:
+- `libdrm`
 - `libgbm`
-- `vulkan-headers` (build-time)
 
 Specific protocols can also be disabled:
 - `DSCREENCOPY_ICC=OFF` - Disable screencopy via [ext-image-copy-capture-v1]
@@ -195,13 +192,6 @@ To disable: `-DSERVICE_PAM=OFF`
 
 Dependencies: `pam`
 
-### Polkit
-This feature enables creating Polkit agents that can prompt user for authentication.
-
-To disable: `-DSERVICE_POLKIT=OFF`
-
-Dependencies: `polkit`, `glib`
-
 ### Hyprland
 This feature enables hyprland specific integrations. It requires wayland support
 but has no extra dependencies.
@@ -242,7 +232,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,11 +1,5 @@
 cmake_minimum_required(VERSION 3.20)
-project(quickshell VERSION "0.2.1" LANGUAGES CXX C)
+project(quickshell VERSION "0.2.0" LANGUAGES CXX C)
-
-set(UNRELEASED_FEATURES
-	"network.2"
-	"colorquant-imagerect"
-	"window-parent"
-)
 
 set(QT_MIN_VERSION "6.6.0")
 set(CMAKE_CXX_STANDARD 20)
@@ -13,9 +7,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" "")
 
@@ -47,17 +38,14 @@ 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
 boption(FRAME_POINTERS "Keep Frame Pointers (dev)" ${ASAN})
 
-if (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+boption(CRASH_REPORTER "Crash Handling" ON)
-	boption(USE_JEMALLOC "Use jemalloc" OFF)
+boption(USE_JEMALLOC "Use jemalloc" ON)
-else()
-	boption(USE_JEMALLOC "Use jemalloc" ON)
-endif()
-boption(CRASH_HANDLER "Crash Handling" ON)
 boption(SOCKETS "Unix Sockets" ON)
 boption(WAYLAND "Wayland" ON)
 boption(WAYLAND_WLR_LAYERSHELL "  Wlroots Layer-Shell" ON REQUIRES WAYLAND)
@@ -79,21 +67,18 @@ boption(SERVICE_STATUS_NOTIFIER "System Tray" ON)
 boption(SERVICE_PIPEWIRE "PipeWire" ON)
 boption(SERVICE_MPRIS "Mpris" ON)
 boption(SERVICE_PAM "Pam" ON)
-boption(SERVICE_POLKIT "Polkit" ON)
 boption(SERVICE_GREETD "Greetd" ON)
 boption(SERVICE_UPOWER "UPower" ON)
 boption(SERVICE_NOTIFICATIONS "Notifications" ON)
 boption(BLUETOOTH "Bluetooth" ON)
-boption(NETWORK "Network" ON)
 
 include(cmake/install-qml-module.cmake)
 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)
@@ -115,7 +100,6 @@ if (NOT CMAKE_BUILD_TYPE)
 endif()
 
 set(QT_FPDEPS Gui Qml Quick QuickControls2 Widgets ShaderTools)
-set(QT_PRIVDEPS QuickPrivate)
 
 include(cmake/pch.cmake)
 
@@ -131,10 +115,9 @@ endif()
 
 if (WAYLAND)
 	list(APPEND QT_FPDEPS WaylandClient)
-	list(APPEND QT_PRIVDEPS WaylandClientPrivate)
 endif()
 
-if (SERVICE_STATUS_NOTIFIER OR SERVICE_MPRIS OR SERVICE_UPOWER OR SERVICE_NOTIFICATIONS OR BLUETOOTH OR NETWORK)
+if (SERVICE_STATUS_NOTIFIER OR SERVICE_MPRIS OR SERVICE_UPOWER OR SERVICE_NOTIFICATIONS OR BLUETOOTH)
 	set(DBUS ON)
 endif()
 
@@ -144,13 +127,6 @@ endif()
 
 find_package(Qt6 REQUIRED COMPONENTS ${QT_FPDEPS})
 
-# In Qt 6.10, private dependencies are required to be explicit,
-# but they could not be explicitly depended on prior to 6.9.
-if (Qt6_VERSION VERSION_GREATER_EQUAL "6.9.0")
-	set(QT_NO_PRIVATE_MODULE_WARNING ON)
-	find_package(Qt6 REQUIRED COMPONENTS ${QT_PRIVDEPS})
-endif()
-
 set(CMAKE_AUTOUIC OFF)
 qt_standard_project_setup(REQUIRES 6.6)
 set(QT_QML_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/qml_modules)

CONTRIBUTING.md

@@ -1,40 +1,235 @@
-# Contributing
+# Contributing / Development
+Instructions for development setup and upstreaming patches.
 
-Thank you for taking the time to contribute.
+If you just want to build or package quickshell see [BUILD.md](BUILD.md).
-To ensure nobody's time is wasted, please follow the rules below.
 
-## Acceptable Code Contributions
+## Development
 
-- All changes submitted MUST be **fully understood by the submitter**. If you do not know why or how
+Install the dependencies listed in [BUILD.md](BUILD.md).
-  your change works, do not submit it to be merged. You must be able to explain your reasoning
+You probably want all of them even if you don't use all of them
-  for every change.
+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
+Quickshell also uses `just` for common development command aliases.
-  a human in the loop such as automated tooling and AI Agents are **strictly disallowed**. Accounts
-  responsible for such contribution attempts **will be banned**.
 
-- Changes MUST respect Quickshell's license and the license of any source works. Changes including
+The dependencies are also available as a nix shell or nix flake which we recommend
-  code from any other works must disclose the source of the code, explain why it was used, and
+using with nix-direnv.
-  ensure the license is compatible.
 
-- 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.
+### Formatting
-  Changes depending on prior merges should be marked as a draft.
+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
+#### Style preferences not caught by clang-format
-  information requested.
+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
+auto x = QString(); // avoid
-  long-term contributors. These changes should not be addressed through contribution channels.
+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
+auto x = <expr>; // unit 1
-and is still relevant please bump it.
+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 `outfoxxed@outfoxxed.me`.
+
+### 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

@@ -12,9 +12,6 @@ lint-ci:
 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") }}
-
 configure target='debug' *FLAGS='':
 	cmake -GNinja -B {{builddir}} \
 		-DCMAKE_BUILD_TYPE={{ if target == "debug" { "Debug" } else { "RelWithDebInfo" } }} \

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.
+See [CONTRIBUTING.md](CONTRIBUTING.md) for details.
-- [CONTRIBUTING.md](CONTRIBUTING.md) - Contribution policy.
-- [BUILD.md](BUILD.md) - Packaging and build instructions.
 
 #### License
 

changelog/next.md

@@ -1,84 +0,0 @@
-## Breaking Changes
-
-### Config paths are no longer canonicalized
-
-This fixes nix configs changing shell-ids on rebuild as the shell id is now derived from
-the symlink path. Configs with a symlink in their path will have a different shell id.
-
-Shell ids are used to derive the default config / state / cache folders, so those files
-will need to be manually moved if using a config behind a symlinked path without an explicitly
-set shell id.
-
-## New Features
-
-- Added support for creating Polkit agents.
-- Added support for creating wayland idle inhibitors.
-- Added support for wayland idle timeouts.
-- Added support for inhibiting wayland compositor shortcuts for focused windows.
-- Added the ability to override Quickshell.cacheDir with a custom path.
-- Added minimized, maximized, and fullscreen properties to FloatingWindow.
-- 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 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.
-
-## 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.
-- Unrecognized pragmas are no longer a hard error for future backward compatibility.
-
-## Bug Fixes
-
-- Fixed volume control breaking with pipewire pro audio mode.
-- Fixed volume control breaking with bluez streams and potentially others.
-- Fixed volume control breaking for devices without route definitions.
-- Fixed escape sequence handling in desktop entries.
-- 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.
-- Fixed memory leak in IPC handlers.
-- 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.
-
-## 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.

changelog/v0.2.1.md

@@ -1,17 +0,0 @@
-## New Features
-
-- Changes to desktop entries are now tracked in real time.
-
-## Other Changes
-
-- Added support for Qt 6.10
-
-## Bug Fixes
-
-- Fixed volumes getting stuck on change for pipewire devices with few volume steps.
-- Fixed a crash when running out of disk space to write log files.
-- Fixed a rare crash when disconnecting a monitor.
-- Fixed build issues preventing cross compilation from working.
-- Fixed dekstop entries with lower priority than a hidden entry not being hidden.
-- Fixed desktop entry keys with mismatched modifier or country not being discarded.
-- Fixed greetd hanging when authenticating with a fingerprint.

ci/matrix.nix

@@ -2,10 +2,7 @@
   qtver,
   compiler,
 }: let
-  checkouts = import ./nix-checkouts.nix;
+  nixpkgs = (import ./nix-checkouts.nix).${builtins.replaceStrings ["."] ["_"] qtver};
-  nixpkgs = checkouts.${builtins.replaceStrings ["."] ["_"] qtver};
   compilerOverride = (nixpkgs.callPackage ./variations.nix {}).${compiler};
-  pkg = (nixpkgs.callPackage ../default.nix {}).override (compilerOverride // {
+  pkg = (nixpkgs.callPackage ../default.nix {}).override compilerOverride;
-    wayland-protocols = checkouts.latest.wayland-protocols;
-  });
 in pkg

ci/nix-checkouts.nix

@@ -7,28 +7,9 @@ let
     url = "https://github.com/nixos/nixpkgs/archive/${commit}.tar.gz";
     inherit sha256;
   }) {};
-in rec {
+in {
-  latest = qt6_10_0;
+  # For old qt versions, grab the commit before the version bump that has all the patches
-
+  # instead of the bumped version.
-  qt6_10_1 = byCommit {
-    commit = "ffbc9f8cbaacfb331b6017d5a5abb21a492c9a38";
-    sha256 = "0fvbizl7j5rv2rf8j76yw0xb3d9l06hahkjys2a7k1yraznvnafm";
-  };
-
-  qt6_10_0 = byCommit {
-    commit = "c5ae371f1a6a7fd27823bc500d9390b38c05fa55";
-    sha256 = "18g0f8cb9m8mxnz9cf48sks0hib79b282iajl2nysyszph993yp0";
-  };
-
-  qt6_9_2 = byCommit {
-    commit = "e9f00bd893984bc8ce46c895c3bf7cac95331127";
-    sha256 = "0s2mhbrgzxlgkg2yxb0q0hpk8lby1a7w67dxvfmaz4gsmc0bnvfj";
-  };
-
-  qt6_9_1 = byCommit {
-    commit = "4c202d26483c5ccf3cb95e0053163facde9f047e";
-    sha256 = "06l2w4bcgfw7dfanpzpjcf25ydf84in240yplqsss82qx405y9di";
-  };
 
   qt6_9_0 = byCommit {
     commit = "546c545bd0594809a28ab7e869b5f80dd7243ef6";

ci/variations.nix

@@ -2,6 +2,6 @@
   clangStdenv,
   gccStdenv,
 }: {
-  clang = { stdenv = clangStdenv; };
+  clang = { buildStdenv = clangStdenv; };
-  gcc = { stdenv = gccStdenv; };
+  gcc = { buildStdenv = gccStdenv; };
 }

default.nix

@@ -2,31 +2,25 @@
   lib,
   nix-gitignore,
   pkgs,
-  stdenv,
   keepDebugInfo,
+  buildStdenv ? pkgs.clangStdenv,
 
   pkg-config,
   cmake,
   ninja,
   spirv-tools,
   qt6,
-  cpptrace ? null,
+  breakpad,
-  libunwind,
-  libdwarf,
   jemalloc,
   cli11,
   wayland,
   wayland-protocols,
   wayland-scanner,
   xorg,
-  libxcb ? xorg.libxcb,
   libdrm,
   libgbm ? null,
-  vulkan-headers,
   pipewire,
   pam,
-  polkit,
-  glib,
 
   gitRev ? (let
     headExists = builtins.pathExists ./.git/HEAD;
@@ -49,14 +43,10 @@
   withPam ? true,
   withHyprland ? true,
   withI3 ? true,
-  withPolkit ? true,
-  withNetworkManager ? true,
 }: let
-  withCrashHandler = withCrashReporter && cpptrace != null && lib.strings.compareVersions cpptrace.version "0.7.2" >= 0;
+  unwrapped = buildStdenv.mkDerivation {
-
-  unwrapped = stdenv.mkDerivation {
     pname = "quickshell${lib.optionalString debug "-debug"}";
-    version = "0.2.1";
+    version = "0.2.0";
     src = nix-gitignore.gitignoreSource "/default.nix\n" ./.;
 
     dontWrapQtApps = true; # see wrappers
@@ -64,36 +54,25 @@
     nativeBuildInputs = [
       cmake
       ninja
+      qt6.qtshadertools
       spirv-tools
       pkg-config
     ]
-    ++ lib.optional (withWayland && lib.strings.compareVersions qt6.qtbase.version "6.10.0" == -1) qt6.qtwayland
+    ++ lib.optional withWayland wayland-scanner;
-    ++ lib.optionals withWayland [
-      qt6.qtwayland # qtwaylandscanner required at build time
-      wayland-scanner
-    ];
 
     buildInputs = [
       qt6.qtbase
       qt6.qtdeclarative
-      libdrm
       cli11
     ]
     ++ lib.optional withQtSvg qt6.qtsvg
-    ++ lib.optional withCrashHandler (cpptrace.overrideAttrs (prev: {
+    ++ lib.optional withCrashReporter breakpad
-      cmakeFlags = prev.cmakeFlags ++ [
-        "-DCPPTRACE_UNWIND_WITH_LIBUNWIND=TRUE"
-      ];
-      buildInputs = prev.buildInputs ++ [ libunwind ];
-    }))
     ++ lib.optional withJemalloc jemalloc
-    ++ lib.optional (withWayland && lib.strings.compareVersions qt6.qtbase.version "6.10.0" == -1) qt6.qtwayland
+    ++ lib.optionals withWayland [ qt6.qtwayland wayland wayland-protocols ]
-    ++ lib.optionals withWayland [ wayland wayland-protocols ]
+    ++ lib.optionals (withWayland && libgbm != null) [ libdrm libgbm ]
-    ++ lib.optionals (withWayland && libgbm != null) [ libgbm vulkan-headers ]
+    ++ lib.optional withX11 xorg.libxcb
-    ++ lib.optional withX11 libxcb
     ++ lib.optional withPam pam
-    ++ lib.optional withPipewire pipewire
+    ++ lib.optional withPipewire pipewire;
-    ++ lib.optionals withPolkit [ polkit glib ];
 
     cmakeBuildType = if debug then "Debug" else "RelWithDebInfo";
 
@@ -102,14 +81,12 @@
       (lib.cmakeFeature "INSTALL_QML_PREFIX" qt6.qtbase.qtQmlPrefix)
       (lib.cmakeBool "DISTRIBUTOR_DEBUGINFO_AVAILABLE" true)
       (lib.cmakeFeature "GIT_REVISION" gitRev)
-      (lib.cmakeBool "CRASH_HANDLER" withCrashHandler)
+      (lib.cmakeBool "CRASH_REPORTER" withCrashReporter)
       (lib.cmakeBool "USE_JEMALLOC" withJemalloc)
       (lib.cmakeBool "WAYLAND" withWayland)
       (lib.cmakeBool "SCREENCOPY" (libgbm != null))
       (lib.cmakeBool "SERVICE_PIPEWIRE" withPipewire)
       (lib.cmakeBool "SERVICE_PAM" withPam)
-      (lib.cmakeBool "SERVICE_NETWORKMANAGER" withNetworkManager)
-      (lib.cmakeBool "SERVICE_POLKIT" withPolkit)
       (lib.cmakeBool "HYPRLAND" withHyprland)
       (lib.cmakeBool "I3" withI3)
     ];

flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1768127708,
+        "lastModified": 1749285348,
-        "narHash": "sha256-1Sm77VfZh3mU0F5OqKABNLWxOuDeHIlcFjsXeeiPazs=",
+        "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ffbc9f8cbaacfb331b6017d5a5abb21a492c9a38",
+        "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f",
         "type": "github"
       },
       "original": {

flake.nix

@@ -4,28 +4,23 @@
   };
 
   outputs = { self, nixpkgs }: let
-    overlayPkgs = p: p.appendOverlays [ self.overlays.default ];
-
     forEachSystem = fn:
       nixpkgs.lib.genAttrs
         nixpkgs.lib.platforms.linux
-        (system: fn system (overlayPkgs nixpkgs.legacyPackages.${system}));
+        (system: fn system nixpkgs.legacyPackages.${system});
   in {
-    overlays.default = import ./overlay.nix {
+    packages = forEachSystem (system: pkgs: rec {
-      rev = self.rev or self.dirtyRev;
+      quickshell = pkgs.callPackage ./default.nix {
+        gitRev = self.rev or self.dirtyRev;
       };
 
-    packages = forEachSystem (system: pkgs: rec {
-      quickshell = pkgs.quickshell;
       default = quickshell;
     });
 
     devShells = forEachSystem (system: pkgs: rec {
       default = import ./shell.nix {
         inherit pkgs;
-        quickshell = self.packages.${system}.quickshell.override {
+        inherit (self.packages.${system}) quickshell;
-          stdenv = pkgs.clangStdenv;
-        };
       };
     });
   };

overlay.nix

@@ -1,5 +0,0 @@
-{ rev ? null }: (final: prev: {
-  quickshell = final.callPackage ./default.nix {
-    gitRev = rev;
-  };
-})

quickshell.scm

@@ -42,7 +42,6 @@
                   libxcb
                   libxkbcommon
                   linux-pam
-                  polkit
                   mesa
                   pipewire
                   qtbase
@@ -56,7 +55,8 @@
            #~(list "-GNinja"
                    "-DDISTRIBUTOR=\"In-tree Guix channel\""
                    "-DDISTRIBUTOR_DEBUGINFO_AVAILABLE=NO"
-                   "-DCRASH_HANDLER=OFF")
+                   ;; Breakpad is not currently packaged for Guix.
+                   "-DCRASH_REPORTER=OFF")
            #:phases
            #~(modify-phases %standard-phases
                (replace 'build (lambda _ (invoke "cmake" "--build" ".")))

shell.nix

@@ -1,15 +1,14 @@
 {
   pkgs ? import <nixpkgs> {},
-  stdenv ? pkgs.clangStdenv, # faster compiles than gcc
+  quickshell ? pkgs.callPackage ./default.nix {},
-  quickshell ? pkgs.callPackage ./default.nix { inherit stdenv; },
   ...
 }: let
   tidyfox = import (pkgs.fetchFromGitea {
     domain = "git.outfoxxed.me";
     owner = "outfoxxed";
     repo = "tidyfox";
-    rev = "9d85d7e7dea2602aa74ec3168955fee69967e92f";
+    rev = "1f062cc198d1112d13e5128fa1f2ee3dbffe613b";
-    hash = "sha256-77ERiweF6lumonp2c/124rAoVG6/o9J+Aajhttwtu0w=";
+    sha256 = "kbt0Zc1qHE5fhqBkKz8iue+B+ZANjF1AR/RdgmX1r0I=";
   }) { inherit pkgs; };
 in pkgs.mkShell.override { stdenv = quickshell.stdenv; } {
   inputsFrom = [ quickshell ];

src/CMakeLists.txt

@@ -11,9 +11,8 @@ add_subdirectory(window)
 add_subdirectory(io)
 add_subdirectory(widgets)
 add_subdirectory(ui)
-add_subdirectory(windowmanager)
 
-if (CRASH_HANDLER)
+if (CRASH_REPORTER)
 	add_subdirectory(crash)
 endif()
 
@@ -34,7 +33,3 @@ add_subdirectory(services)
 if (BLUETOOTH)
 	add_subdirectory(bluetooth)
 endif()
-
-if (NETWORK)
-	add_subdirectory(network)
-endif()

src/bluetooth/adapter.cpp

@@ -9,6 +9,7 @@
 #include <qlogging.h>
 #include <qloggingcategory.h>
 #include <qstring.h>
+#include <qstringliteral.h>
 #include <qtypes.h>
 
 #include "../core/logcat.hpp"

src/bluetooth/device.cpp

@@ -8,6 +8,7 @@
 #include <qlogging.h>
 #include <qloggingcategory.h>
 #include <qstring.h>
+#include <qstringliteral.h>
 #include <qtmetamacros.h>
 #include <qtypes.h>
 

src/build/CMakeLists.txt

@@ -9,10 +9,16 @@ if (NOT DEFINED GIT_REVISION)
 	)
 endif()
 
-if (CRASH_HANDLER)
+if (CRASH_REPORTER)
-	set(CRASH_HANDLER_DEF 1)
+	set(CRASH_REPORTER_DEF 1)
 else()
-	set(CRASH_HANDLER_DEF 0)
+	set(CRASH_REPORTER_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)

src/build/build.hpp.in

@@ -1,17 +1,12 @@
 #pragma once
 
 // NOLINTBEGIN
-#define QS_VERSION "@quickshell_VERSION@"
-#define QS_VERSION_MAJOR @quickshell_VERSION_MAJOR@
-#define QS_VERSION_MINOR @quickshell_VERSION_MINOR@
-#define QS_VERSION_PATCH @quickshell_VERSION_PATCH@
-#define QS_UNRELEASED_FEATURES "@UNRELEASED_FEATURES@"
 #define GIT_REVISION "@GIT_REVISION@"
 #define DISTRIBUTOR "@DISTRIBUTOR@"
-#define CRASH_HANDLER @CRASH_HANDLER_DEF@
+#define DISTRIBUTOR_DEBUGINFO_AVAILABLE @DEBUGINFO_AVAILABLE@
+#define CRASH_REPORTER @CRASH_REPORTER_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
@@ -13,7 +12,6 @@ qt_add_library(quickshell-core STATIC
 	singleton.cpp
 	generation.cpp
 	scan.cpp
-	scanenv.cpp
 	qsintercept.cpp
 	incubator.cpp
 	lazyloader.cpp
@@ -25,7 +23,7 @@ qt_add_library(quickshell-core STATIC
 	model.cpp
 	elapsedtimer.cpp
 	desktopentry.cpp
-	desktopentrymonitor.cpp
+	objectrepeater.cpp
 	platformmenu.cpp
 	qsmenu.cpp
 	retainable.cpp
@@ -41,8 +39,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 +51,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::Widgets)
 
 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,43 +24,30 @@ namespace {
 QS_LOGGING_CATEGORY(logColorQuantizer, "quickshell.colorquantizer", QtWarningMsg);
 }
 
-ColorQuantizerOperation::ColorQuantizerOperation(
+ColorQuantizerOperation::ColorQuantizerOperation(QUrl* source, qreal depth, qreal rescaleSize)
-    QUrl* source,
-    qreal depth,
-    QRect imageRect,
-    qreal rescaleSize
-)
     : source(source)
     , maxDepth(depth)
-    , imageRect(imageRect)
     , rescaleSize(rescaleSize) {
-	this->setAutoDelete(false);
+	setAutoDelete(false);
 }
 
 void ColorQuantizerOperation::quantizeImage(const QAtomicInteger<bool>& shouldCancel) {
-	if (shouldCancel.loadAcquire() || this->source->isEmpty()) return;
+	if (shouldCancel.loadAcquire() || source->isEmpty()) return;
 
-	this->colors.clear();
+	colors.clear();
 
-	auto image = QImage(this->source->toLocalFile());
+	auto image = QImage(source->toLocalFile());
-
+	if ((image.width() > rescaleSize || image.height() > rescaleSize) && rescaleSize > 0) {
-	if (this->imageRect.isValid()) {
-		image = image.copy(this->imageRect);
-	}
-
-	if ((image.width() > this->rescaleSize || image.height() > this->rescaleSize)
-	    && this->rescaleSize > 0)
-	{
 		image = image.scaled(
-		    static_cast<int>(this->rescaleSize),
+		    static_cast<int>(rescaleSize),
-		    static_cast<int>(this->rescaleSize),
+		    static_cast<int>(rescaleSize),
 		    Qt::KeepAspectRatio,
 		    Qt::SmoothTransformation
 		);
 	}
 
 	if (image.isNull()) {
-		qCWarning(logColorQuantizer) << "Failed to load image from" << this->source->toString();
+		qCWarning(logColorQuantizer) << "Failed to load image from" << source->toString();
 		return;
 	}
 
@@ -77,7 +63,7 @@ void ColorQuantizerOperation::quantizeImage(const QAtomicInteger<bool>& shouldCa
 
 	auto startTime = QDateTime::currentDateTime();
 
-	this->colors = this->quantization(pixels, 0);
+	colors = quantization(pixels, 0);
 
 	auto endTime = QDateTime::currentDateTime();
 	auto milliseconds = startTime.msecsTo(endTime);
@@ -91,7 +77,7 @@ QList<QColor> ColorQuantizerOperation::quantization(
 ) {
 	if (shouldCancel.loadAcquire()) return QList<QColor>();
 
-	if (depth >= this->maxDepth || rgbValues.isEmpty()) {
+	if (depth >= maxDepth || rgbValues.isEmpty()) {
 		if (rgbValues.isEmpty()) return QList<QColor>();
 
 		auto totalR = 0;
@@ -128,8 +114,8 @@ QList<QColor> ColorQuantizerOperation::quantization(
 	auto rightHalf = rgbValues.mid(mid);
 
 	QList<QColor> result;
-	result.append(this->quantization(leftHalf, depth + 1));
+	result.append(quantization(leftHalf, depth + 1));
-	result.append(this->quantization(rightHalf, depth + 1));
+	result.append(quantization(rightHalf, depth + 1));
 
 	return result;
 }
@@ -173,7 +159,7 @@ void ColorQuantizerOperation::finishRun() {
 }
 
 void ColorQuantizerOperation::finished() {
-	emit this->done(this->colors);
+	emit this->done(colors);
 	delete this;
 }
 
@@ -192,50 +178,39 @@ void ColorQuantizerOperation::run() {
 void ColorQuantizerOperation::tryCancel() { this->shouldCancel.storeRelease(true); }
 
 void ColorQuantizer::componentComplete() {
-	this->componentCompleted = true;
+	componentCompleted = true;
-	if (!this->mSource.isEmpty()) this->quantizeAsync();
+	if (!mSource.isEmpty()) quantizeAsync();
 }
 
 void ColorQuantizer::setSource(const QUrl& source) {
-	if (this->mSource != source) {
+	if (mSource != source) {
-		this->mSource = source;
+		mSource = source;
 		emit this->sourceChanged();
 
-		if (this->componentCompleted && !this->mSource.isEmpty()) this->quantizeAsync();
+		if (this->componentCompleted && !mSource.isEmpty()) quantizeAsync();
 	}
 }
 
 void ColorQuantizer::setDepth(qreal depth) {
-	if (this->mDepth != depth) {
+	if (mDepth != depth) {
-		this->mDepth = depth;
+		mDepth = depth;
 		emit this->depthChanged();
 
-		if (this->componentCompleted && !this->mSource.isEmpty()) this->quantizeAsync();
+		if (this->componentCompleted) 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) {
+	if (mRescaleSize != rescaleSize) {
-		this->mRescaleSize = rescaleSize;
+		mRescaleSize = rescaleSize;
 		emit this->rescaleSizeChanged();
 
-		if (this->componentCompleted && !this->mSource.isEmpty()) this->quantizeAsync();
+		if (this->componentCompleted) quantizeAsync();
 	}
 }
 
 void ColorQuantizer::operationFinished(const QList<QColor>& result) {
-	this->bColors = result;
+	bColors = result;
 	this->liveOperation = nullptr;
 	emit this->colorsChanged();
 }
@@ -244,13 +219,7 @@ void ColorQuantizer::quantizeAsync() {
 	if (this->liveOperation) this->cancelAsync();
 
 	qCDebug(logColorQuantizer) << "Starting color quantization asynchronously";
-
+	this->liveOperation = new ColorQuantizerOperation(&mSource, mDepth, mRescaleSize);
-	this->liveOperation = new ColorQuantizerOperation(
-	    &this->mSource,
-	    this->mDepth,
-	    this->mImageRect,
-	    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,13 +78,6 @@ 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
 	/// > reccommended to rescale, otherwise the quantization process will take much longer.
@@ -100,24 +91,19 @@ public:
 
 	[[nodiscard]] QBindable<QList<QColor>> bindableColors() { return &this->bColors; }
 
-	[[nodiscard]] QUrl source() const { return this->mSource; }
+	[[nodiscard]] QUrl source() const { return mSource; }
 	void setSource(const QUrl& source);
 
-	[[nodiscard]] qreal depth() const { return this->mDepth; }
+	[[nodiscard]] qreal depth() const { return mDepth; }
 	void setDepth(qreal depth);
 
-	[[nodiscard]] QRect imageRect() const { return this->mImageRect; }
+	[[nodiscard]] qreal rescaleSize() const { return mRescaleSize; }
-	void setImageRect(QRect imageRect);
-	void resetImageRect();
-
-	[[nodiscard]] qreal rescaleSize() const { return this->mRescaleSize; }
 	void setRescaleSize(int rescaleSize);
 
 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

@@ -1,27 +1,22 @@
 #include "desktopentry.hpp"
 #include <algorithm>
-#include <utility>
 
 #include <qcontainerfwd.h>
 #include <qdebug.h>
 #include <qdir.h>
-#include <qfile.h>
 #include <qfileinfo.h>
+#include <qhash.h>
+#include <qlist.h>
 #include <qlogging.h>
 #include <qloggingcategory.h>
 #include <qnamespace.h>
 #include <qobject.h>
-#include <qobjectdefs.h>
 #include <qpair.h>
-#include <qproperty.h>
+#include <qstringview.h>
-#include <qscopeguard.h>
 #include <qtenvironmentvariables.h>
-#include <qthreadpool.h>
-#include <qtmetamacros.h>
 #include <ranges>
 
 #include "../io/processcore.hpp"
-#include "desktopentrymonitor.hpp"
 #include "logcat.hpp"
 #include "model.hpp"
 #include "qmlglobal.hpp"
@@ -61,14 +56,12 @@ struct Locale {
 
 	[[nodiscard]] int matchScore(const Locale& other) const {
 		if (this->language != other.language) return 0;
-
+		auto territoryMatches = !this->territory.isEmpty() && this->territory == other.territory;
-		if (!other.modifier.isEmpty() && this->modifier != other.modifier) return 0;
+		auto modifierMatches = !this->modifier.isEmpty() && this->modifier == other.modifier;
-		if (!other.territory.isEmpty() && this->territory != other.territory) return 0;
 
 		auto score = 1;
-
+		if (territoryMatches) score += 2;
-		if (!other.territory.isEmpty()) score += 2;
+		if (modifierMatches) score += 1;
-		if (!other.modifier.isEmpty()) score += 1;
 
 		return score;
 	}
@@ -94,64 +87,57 @@ struct Locale {
 QDebug operator<<(QDebug debug, const Locale& locale) {
 	auto saver = QDebugStateSaver(debug);
 	debug.nospace() << "Locale(language=" << locale.language << ", territory=" << locale.territory
-	                << ", modifier=" << locale.modifier << ')';
+	                << ", modifier" << locale.modifier << ')';
 
 	return debug;
 }
 
-ParsedDesktopEntryData DesktopEntry::parseText(const QString& id, const QString& text) {
+void DesktopEntry::parseEntry(const QString& text) {
-	ParsedDesktopEntryData data;
-	data.id = id;
 	const auto& system = Locale::system();
 
 	auto groupName = QString();
 	auto entries = QHash<QString, QPair<Locale, QString>>();
 
-	auto actionOrder = QStringList();
+	auto finishCategory = [this, &groupName, &entries]() {
-	auto pendingActions = QHash<QString, DesktopActionData>();
-
-	auto finishCategory = [&data, &groupName, &entries, &actionOrder, &pendingActions]() {
 		if (groupName == "Desktop Entry") {
-			if (entries.value("Type").second != "Application") return;
+			if (entries["Type"].second != "Application") return;
+			if (entries.contains("Hidden") && entries["Hidden"].second == "true") return;
 
 			for (const auto& [key, pair]: entries.asKeyValueRange()) {
 				auto& [_, value] = pair;
-				data.entries.insert(key, value);
+				this->mEntries.insert(key, value);
 
-				if (key == "Name") data.name = value;
+				if (key == "Name") this->mName = value;
-				else if (key == "GenericName") data.genericName = value;
+				else if (key == "GenericName") this->mGenericName = value;
-				else if (key == "StartupWMClass") data.startupClass = value;
+				else if (key == "StartupWMClass") this->mStartupClass = value;
-				else if (key == "NoDisplay") data.noDisplay = value == "true";
+				else if (key == "NoDisplay") this->mNoDisplay = value == "true";
-				else if (key == "Hidden") data.hidden = value == "true";
+				else if (key == "Comment") this->mComment = value;
-				else if (key == "Comment") data.comment = value;
+				else if (key == "Icon") this->mIcon = value;
-				else if (key == "Icon") data.icon = value;
 				else if (key == "Exec") {
-					data.execString = value;
+					this->mExecString = value;
-					data.command = DesktopEntry::parseExecString(value);
+					this->mCommand = DesktopEntry::parseExecString(value);
-				} else if (key == "Path") data.workingDirectory = value;
+				} else if (key == "Path") this->mWorkingDirectory = value;
-				else if (key == "Terminal") data.terminal = value == "true";
+				else if (key == "Terminal") this->mTerminal = value == "true";
-				else if (key == "Categories") data.categories = value.split(u';', Qt::SkipEmptyParts);
+				else if (key == "Categories") this->mCategories = value.split(u';', Qt::SkipEmptyParts);
-				else if (key == "Keywords") data.keywords = value.split(u';', Qt::SkipEmptyParts);
+				else if (key == "Keywords") this->mKeywords = 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;
+			auto* action = new DesktopAction(actionName, this);
-			action.id = actionName;
 
 			for (const auto& [key, pair]: entries.asKeyValueRange()) {
 				const auto& [_, value] = pair;
-				action.entries.insert(key, value);
+				action->mEntries.insert(key, value);
 
-				if (key == "Name") action.name = value;
+				if (key == "Name") action->mName = value;
-				else if (key == "Icon") action.icon = value;
+				else if (key == "Icon") action->mIcon = value;
 				else if (key == "Exec") {
-					action.execString = value;
+					action->mExecString = value;
-					action.command = DesktopEntry::parseExecString(value);
+					action->mCommand = DesktopEntry::parseExecString(value);
 				}
 			}
 
-			pendingActions.insert(actionName, action);
+			this->mActions.insert(actionName, action);
 		}
 
 		entries.clear();
@@ -197,73 +183,16 @@ 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;
-}
-
-void DesktopEntry::updateState(const ParsedDesktopEntryData& newState) {
-	Qt::beginPropertyUpdateGroup();
-	this->bName = newState.name;
-	this->bGenericName = newState.genericName;
-	this->bStartupClass = newState.startupClass;
-	this->bNoDisplay = newState.noDisplay;
-	this->bComment = newState.comment;
-	this->bIcon = newState.icon;
-	this->bExecString = newState.execString;
-	this->bCommand = newState.command;
-	this->bWorkingDirectory = newState.workingDirectory;
-	this->bRunInTerminal = newState.terminal;
-	this->bCategories = newState.categories;
-	this->bKeywords = newState.keywords;
-	Qt::endPropertyUpdateGroup();
-
-	this->state = newState;
-	this->updateActions(newState.actions);
-}
-
-void DesktopEntry::updateActions(const QVector<DesktopActionData>& newActions) {
-	auto old = this->mActions;
-	this->mActions.clear();
-
-	for (const auto& d: newActions) {
-		DesktopAction* act = nullptr;
-		auto found = std::ranges::find(old, d.id, &DesktopAction::mId);
-		if (found != old.end()) {
-			act = *found;
-			old.erase(found);
-		} else {
-			act = new DesktopAction(d.id, this);
-		}
-
-		Qt::beginPropertyUpdateGroup();
-		act->bName = d.name;
-		act->bIcon = d.icon;
-		act->bExecString = d.execString;
-		act->bCommand = d.command;
-		Qt::endPropertyUpdateGroup();
-
-		act->mEntries = d.entries;
-		this->mActions.append(act);
-	}
-
-	for (auto* leftover: old) {
-		leftover->deleteLater();
-	}
 }
 
 void DesktopEntry::execute() const {
-	DesktopEntry::doExec(this->bCommand.value(), this->bWorkingDirectory.value());
+	DesktopEntry::doExec(this->mCommand, this->mWorkingDirectory);
 }
 
-bool DesktopEntry::isValid() const { return !this->bName.value().isEmpty(); }
+bool DesktopEntry::isValid() const { return !this->mName.isEmpty(); }
+bool DesktopEntry::noDisplay() const { return this->mNoDisplay; }
 
-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;
@@ -282,22 +211,16 @@ QVector<QString> DesktopEntry::parseExecString(const QString& execString) {
 					currentArgument += '\\';
 					escape = 0;
 				}
-			} else if (escape == 2) {
-				currentArgument += c;
-				escape = 0;
 			} else if (escape != 0) {
-				switch (c.unicode()) {
+				if (escape != 2) {
-				case 's': currentArgument += u' '; break;
+					// Technically this is an illegal state, but the spec has a terrible double escape
-				case 'n': currentArgument += u'\n'; break;
+					// rule in strings for no discernable reason. Assuming someone might understandably
-				case 't': currentArgument += u'\t'; break;
+					// misunderstand it, treat it as a normal escape and log it.
-				case 'r': currentArgument += u'\r'; break;
-				case '\\': currentArgument += u'\\'; break;
-				default:
 					qCWarning(logDesktopEntry).noquote()
 					    << "Illegal escape sequence in desktop entry exec string:" << execString;
-					currentArgument += c;
-					break;
 				}
+
+				currentArgument += c;
 				escape = 0;
 			} else if (c == u'"' || c == u'\'') {
 				parsingString = false;
@@ -343,44 +266,59 @@ void DesktopEntry::doExec(const QList<QString>& execString, const QString& worki
 }
 
 void DesktopAction::execute() const {
-	DesktopEntry::doExec(this->bCommand.value(), this->entry->bWorkingDirectory.value());
+	DesktopEntry::doExec(this->mCommand, this->entry->mWorkingDirectory);
 }
 
-DesktopEntryScanner::DesktopEntryScanner(DesktopEntryManager* manager): manager(manager) {
+DesktopEntryManager::DesktopEntryManager() {
-	this->setAutoDelete(true);
+	this->scanDesktopEntries();
+	this->populateApplications();
 }
 
-void DesktopEntryScanner::run() {
+void DesktopEntryManager::scanDesktopEntries() {
-	const auto& desktopPaths = DesktopEntryManager::desktopPaths();
+	QList<QString> dataPaths;
-	auto scanResults = QList<ParsedDesktopEntryData>();
 
-	for (const auto& path: desktopPaths | std::views::reverse) {
+	if (qEnvironmentVariableIsSet("XDG_DATA_HOME")) {
-		auto file = QFileInfo(path);
+		dataPaths.push_back(qEnvironmentVariable("XDG_DATA_HOME"));
-		if (!file.isDir()) continue;
+	} else if (qEnvironmentVariableIsSet("HOME")) {
-
+		dataPaths.push_back(qEnvironmentVariable("HOME") + "/.local/share");
-		this->scanDirectory(QDir(path), QString(), scanResults);
 	}
 
-	QMetaObject::invokeMethod(
+	if (qEnvironmentVariableIsSet("XDG_DATA_DIRS")) {
-	    this->manager,
+		auto var = qEnvironmentVariable("XDG_DATA_DIRS");
-	    "onScanCompleted",
+		dataPaths += var.split(u':', Qt::SkipEmptyParts);
-	    Qt::QueuedConnection,
+	} else {
-	    Q_ARG(QList<ParsedDesktopEntryData>, scanResults)
+		dataPaths.push_back("/usr/local/share");
-	);
+		dataPaths.push_back("/usr/share");
+	}
+
+	qCDebug(logDesktopEntry) << "Creating desktop entry scanners";
+
+	for (auto& path: std::ranges::reverse_view(dataPaths)) {
+		auto p = QDir(path).filePath("applications");
+		auto file = QFileInfo(p);
+
+		if (!file.isDir()) {
+			qCDebug(logDesktopEntry) << "Not scanning path" << p << "as it is not a directory";
+			continue;
+		}
+
+		qCDebug(logDesktopEntry) << "Scanning path" << p;
+		this->scanPath(p);
+	}
 }
 
-void DesktopEntryScanner::scanDirectory(
+void DesktopEntryManager::populateApplications() {
-    const QDir& dir,
+	for (auto& entry: this->desktopEntries.values()) {
-    const QString& idPrefix,
+		if (!entry->noDisplay()) this->mApplications.insertObject(entry);
-    QList<ParsedDesktopEntryData>& entries
+	}
-) {
+}
-	auto dirEntries = dir.entryInfoList(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot);
 
-	for (auto& entry: dirEntries) {
+void DesktopEntryManager::scanPath(const QDir& dir, const QString& prefix) {
-		if (entry.isDir()) {
+	auto entries = dir.entryInfoList(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot);
-			auto subdirPrefix = idPrefix.isEmpty() ? entry.fileName() : idPrefix + '-' + entry.fileName();
+
-			this->scanDirectory(QDir(entry.absoluteFilePath()), subdirPrefix, entries);
+	for (auto& entry: entries) {
-		} else if (entry.isFile()) {
+		if (entry.isDir()) this->scanPath(entry.absoluteFilePath(), prefix + dir.dirName() + "-");
+		else if (entry.isFile()) {
 			auto path = entry.filePath();
 			if (!path.endsWith(".desktop")) {
 				qCDebug(logDesktopEntry) << "Skipping file" << path << "as it has no .desktop extension";
@@ -393,40 +331,44 @@ void DesktopEntryScanner::scanDirectory(
 				continue;
 			}
 
-			auto basename = QFileInfo(entry.fileName()).completeBaseName();
+			auto id = prefix + entry.fileName().sliced(0, entry.fileName().length() - 8);
-			auto id = idPrefix.isEmpty() ? basename : idPrefix + '-' + basename;
+			auto lowerId = id.toLower();
-			auto content = QString::fromUtf8(file.readAll());
 
-			auto data = DesktopEntry::parseText(id, content);
+			auto text = QString::fromUtf8(file.readAll());
-			entries.append(std::move(data));
+			auto* dentry = new DesktopEntry(id, this);
-		}
+			dentry->parseEntry(text);
-	}
-}
 
-DesktopEntryManager::DesktopEntryManager(): monitor(new DesktopEntryMonitor(this)) {
+			if (!dentry->isValid()) {
-	QObject::connect(
+				qCDebug(logDesktopEntry) << "Skipping desktop entry" << path;
-	    this->monitor,
+				delete dentry;
-	    &DesktopEntryMonitor::desktopEntriesChanged,
+				continue;
-	    this,
-	    &DesktopEntryManager::handleFileChanges
-	);
-
-	DesktopEntryScanner(this).run();
-}
-
-void DesktopEntryManager::scanDesktopEntries() {
-	qCDebug(logDesktopEntry) << "Starting desktop entry scan";
-
-	if (this->scanInProgress) {
-		qCDebug(logDesktopEntry) << "Scan already in progress, queuing another scan";
-		this->scanQueued = true;
-		return;
 			}
 
-	this->scanInProgress = true;
+			qCDebug(logDesktopEntry) << "Found desktop entry" << id << "at" << path;
-	this->scanQueued = false;
+
-	auto* scanner = new DesktopEntryScanner(this);
+			auto conflictingId = this->desktopEntries.contains(id);
-	QThreadPool::globalInstance()->start(scanner);
+
+			if (conflictingId) {
+				qCDebug(logDesktopEntry) << "Replacing old entry for" << id;
+				delete this->desktopEntries.value(id);
+				this->desktopEntries.remove(id);
+				this->lowercaseDesktopEntries.remove(lowerId);
+			}
+
+			this->desktopEntries.insert(id, dentry);
+
+			if (this->lowercaseDesktopEntries.contains(lowerId)) {
+				qCInfo(logDesktopEntry).nospace()
+				    << "Multiple desktop entries have the same lowercased id " << lowerId
+				    << ". This can cause ambiguity when byId requests are not made with the correct case "
+				       "already.";
+
+				this->lowercaseDesktopEntries.remove(lowerId);
+			}
+
+			this->lowercaseDesktopEntries.insert(lowerId, dentry);
+		}
+	}
 }
 
 DesktopEntryManager* DesktopEntryManager::instance() {
@@ -449,14 +391,14 @@ DesktopEntry* DesktopEntryManager::heuristicLookup(const QString& name) {
 
 	auto list = this->desktopEntries.values();
 
-	auto iter = std::ranges::find_if(list, [&](DesktopEntry* entry) {
+	auto iter = std::ranges::find_if(list, [&](const DesktopEntry* entry) {
-		return name == entry->bStartupClass.value();
+		return name == entry->mStartupClass;
 	});
 
 	if (iter != list.end()) return *iter;
 
-	iter = std::ranges::find_if(list, [&](DesktopEntry* entry) {
+	iter = std::ranges::find_if(list, [&](const DesktopEntry* entry) {
-		return name.toLower() == entry->bStartupClass.value().toLower();
+		return name.toLower() == entry->mStartupClass.toLower();
 	});
 
 	if (iter != list.end()) return *iter;
@@ -465,137 +407,7 @@ DesktopEntry* DesktopEntryManager::heuristicLookup(const QString& name) {
 
 ObjectModel<DesktopEntry>* DesktopEntryManager::applications() { return &this->mApplications; }
 
-void DesktopEntryManager::handleFileChanges() {
+DesktopEntries::DesktopEntries() { DesktopEntryManager::instance(); }
-	qCDebug(logDesktopEntry) << "Directory change detected, performing full rescan";
-
-	if (this->scanInProgress) {
-		qCDebug(logDesktopEntry) << "Scan already in progress, queuing another scan";
-		this->scanQueued = true;
-		return;
-	}
-
-	this->scanInProgress = true;
-	this->scanQueued = false;
-	auto* scanner = new DesktopEntryScanner(this);
-	QThreadPool::globalInstance()->start(scanner);
-}
-
-const QStringList& DesktopEntryManager::desktopPaths() {
-	static const auto paths = []() {
-		auto dataPaths = QStringList();
-
-		auto dataHome = qEnvironmentVariable("XDG_DATA_HOME");
-		if (dataHome.isEmpty() && qEnvironmentVariableIsSet("HOME"))
-			dataHome = qEnvironmentVariable("HOME") + "/.local/share";
-		if (!dataHome.isEmpty()) dataPaths.append(dataHome + "/applications");
-
-		auto dataDirs = qEnvironmentVariable("XDG_DATA_DIRS");
-		if (dataDirs.isEmpty()) dataDirs = "/usr/local/share:/usr/share";
-
-		for (const auto& dir: dataDirs.split(':', Qt::SkipEmptyParts)) {
-			dataPaths.append(dir + "/applications");
-		}
-
-		return dataPaths;
-	}();
-
-	return paths;
-}
-
-void DesktopEntryManager::onScanCompleted(const QList<ParsedDesktopEntryData>& scanResults) {
-	auto guard = qScopeGuard([this] {
-		this->scanInProgress = false;
-		if (this->scanQueued) {
-			this->scanQueued = false;
-			this->scanDesktopEntries();
-		}
-	});
-
-	auto oldEntries = this->desktopEntries;
-	auto newEntries = QHash<QString, DesktopEntry*>();
-	auto newLowercaseEntries = QHash<QString, DesktopEntry*>();
-
-	for (const auto& data: scanResults) {
-		auto lowerId = data.id.toLower();
-
-		if (data.hidden) {
-			if (auto* victim = newEntries.take(data.id)) victim->deleteLater();
-			newLowercaseEntries.remove(lowerId);
-
-			if (auto it = oldEntries.find(data.id); it != oldEntries.end()) {
-				it.value()->deleteLater();
-				oldEntries.erase(it);
-			}
-
-			qCDebug(logDesktopEntry) << "Masking hidden desktop entry" << data.id;
-			continue;
-		}
-
-		DesktopEntry* dentry = nullptr;
-
-		if (auto it = oldEntries.find(data.id); it != oldEntries.end()) {
-			dentry = it.value();
-			oldEntries.erase(it);
-			dentry->updateState(data);
-		} else {
-			dentry = new DesktopEntry(data.id, this);
-			dentry->updateState(data);
-		}
-
-		if (!dentry->isValid()) {
-			qCDebug(logDesktopEntry) << "Skipping desktop entry" << data.id;
-			if (!oldEntries.contains(data.id)) {
-				dentry->deleteLater();
-			}
-			continue;
-		}
-
-		qCDebug(logDesktopEntry) << "Found desktop entry" << data.id;
-
-		auto conflictingId = newEntries.contains(data.id);
-
-		if (conflictingId) {
-			qCDebug(logDesktopEntry) << "Replacing old entry for" << data.id;
-			if (auto* victim = newEntries.take(data.id)) victim->deleteLater();
-			newLowercaseEntries.remove(lowerId);
-		}
-
-		newEntries.insert(data.id, dentry);
-
-		if (newLowercaseEntries.contains(lowerId)) {
-			qCInfo(logDesktopEntry).nospace()
-			    << "Multiple desktop entries have the same lowercased id " << lowerId
-			    << ". This can cause ambiguity when byId requests are not made with the correct case "
-			       "already.";
-
-			newLowercaseEntries.remove(lowerId);
-		}
-
-		newLowercaseEntries.insert(lowerId, dentry);
-	}
-
-	this->desktopEntries = newEntries;
-	this->lowercaseDesktopEntries = newLowercaseEntries;
-
-	auto newApplications = QVector<DesktopEntry*>();
-	for (auto* entry: this->desktopEntries.values())
-		if (!entry->bNoDisplay) newApplications.append(entry);
-
-	this->mApplications.diffUpdate(newApplications);
-
-	emit this->applicationsChanged();
-
-	for (auto* e: oldEntries) e->deleteLater();
-}
-
-DesktopEntries::DesktopEntries() {
-	QObject::connect(
-	    DesktopEntryManager::instance(),
-	    &DesktopEntryManager::applicationsChanged,
-	    this,
-	    &DesktopEntries::applicationsChanged
-	);
-}
 
 DesktopEntry* DesktopEntries::byId(const QString& id) {
 	return DesktopEntryManager::instance()->byId(id);

src/core/desktopentry.hpp

@@ -6,68 +6,35 @@
 #include <qdir.h>
 #include <qhash.h>
 #include <qobject.h>
-#include <qproperty.h>
 #include <qqmlintegration.h>
-#include <qrunnable.h>
 #include <qtmetamacros.h>
 
-#include "desktopentrymonitor.hpp"
 #include "doc.hpp"
 #include "model.hpp"
 
 class DesktopAction;
-class DesktopEntryMonitor;
-
-struct DesktopActionData {
-	QString id;
-	QString name;
-	QString icon;
-	QString execString;
-	QVector<QString> command;
-	QHash<QString, QString> entries;
-};
-
-struct ParsedDesktopEntryData {
-	QString id;
-	QString name;
-	QString genericName;
-	QString startupClass;
-	bool noDisplay = false;
-	bool hidden = false;
-	QString comment;
-	QString icon;
-	QString execString;
-	QVector<QString> command;
-	QString workingDirectory;
-	bool terminal = false;
-	QVector<QString> categories;
-	QVector<QString> keywords;
-	QHash<QString, QString> entries;
-	QVector<DesktopActionData> actions;
-};
 
 /// A desktop entry. See @@DesktopEntries for details.
 class DesktopEntry: public QObject {
 	Q_OBJECT;
 	Q_PROPERTY(QString id MEMBER mId CONSTANT);
 	/// Name of the specific application, such as "Firefox".
-	// clang-format off
+	Q_PROPERTY(QString name MEMBER mName CONSTANT);
-	Q_PROPERTY(QString name READ default WRITE default NOTIFY nameChanged BINDABLE bindableName);
 	/// Short description of the application, such as "Web Browser". May be empty.
-	Q_PROPERTY(QString genericName READ default WRITE default NOTIFY genericNameChanged BINDABLE bindableGenericName);
+	Q_PROPERTY(QString genericName MEMBER mGenericName CONSTANT);
 	/// Initial class or app id the app intends to use. May be useful for matching running apps
 	/// to desktop entries.
-	Q_PROPERTY(QString startupClass READ default WRITE default NOTIFY startupClassChanged BINDABLE bindableStartupClass);
+	Q_PROPERTY(QString startupClass MEMBER mStartupClass CONSTANT);
 	/// If true, this application should not be displayed in menus and launchers.
-	Q_PROPERTY(bool noDisplay READ default WRITE default NOTIFY noDisplayChanged BINDABLE bindableNoDisplay);
+	Q_PROPERTY(bool noDisplay MEMBER mNoDisplay CONSTANT);
 	/// Long description of the application, such as "View websites on the internet". May be empty.
-	Q_PROPERTY(QString comment READ default WRITE default NOTIFY commentChanged BINDABLE bindableComment);
+	Q_PROPERTY(QString comment MEMBER mComment CONSTANT);
 	/// Name of the icon associated with this application. May be empty.
-	Q_PROPERTY(QString icon READ default WRITE default NOTIFY iconChanged BINDABLE bindableIcon);
+	Q_PROPERTY(QString icon MEMBER mIcon CONSTANT);
 	/// The raw `Exec` string from the desktop entry.
 	///
 	/// > [!WARNING] This cannot be reliably run as a command. See @@command for one you can run.
-	Q_PROPERTY(QString execString READ default WRITE default NOTIFY execStringChanged BINDABLE bindableExecString);
+	Q_PROPERTY(QString execString MEMBER mExecString CONSTANT);
 	/// The parsed `Exec` command in the desktop entry.
 	///
 	/// The entry can be run with @@execute(), or by using this command in
@@ -76,14 +43,13 @@ class DesktopEntry: public QObject {
 	/// the invoked process. See @@execute() for details.
 	///
 	/// > [!NOTE]	The provided command does not invoke a terminal even if @@runInTerminal is true.
-	Q_PROPERTY(QVector<QString> command READ default WRITE default NOTIFY commandChanged BINDABLE bindableCommand);
+	Q_PROPERTY(QVector<QString> command MEMBER mCommand CONSTANT);
 	/// The working directory to execute from.
-	Q_PROPERTY(QString workingDirectory READ default WRITE default NOTIFY workingDirectoryChanged BINDABLE bindableWorkingDirectory);
+	Q_PROPERTY(QString workingDirectory MEMBER mWorkingDirectory CONSTANT);
 	/// If the application should run in a terminal.
-	Q_PROPERTY(bool runInTerminal READ default WRITE default NOTIFY runInTerminalChanged BINDABLE bindableRunInTerminal);
+	Q_PROPERTY(bool runInTerminal MEMBER mTerminal CONSTANT);
-	Q_PROPERTY(QVector<QString> categories READ default WRITE default NOTIFY categoriesChanged BINDABLE bindableCategories);
+	Q_PROPERTY(QVector<QString> categories MEMBER mCategories CONSTANT);
-	Q_PROPERTY(QVector<QString> keywords READ default WRITE default NOTIFY keywordsChanged BINDABLE bindableKeywords);
+	Q_PROPERTY(QVector<QString> keywords MEMBER mKeywords CONSTANT);
-	// clang-format on
 	Q_PROPERTY(QVector<DesktopAction*> actions READ actions CONSTANT);
 	QML_ELEMENT;
 	QML_UNCREATABLE("DesktopEntry instances must be retrieved from DesktopEntries");
@@ -91,8 +57,7 @@ class DesktopEntry: public QObject {
 public:
 	explicit DesktopEntry(QString id, QObject* parent): QObject(parent), mId(std::move(id)) {}
 
-	static ParsedDesktopEntryData parseText(const QString& id, const QString& text);
+	void parseEntry(const QString& text);
-	void updateState(const ParsedDesktopEntryData& newState);
 
 	/// Run the application. Currently ignores @@runInTerminal and field codes.
 	///
@@ -108,66 +73,31 @@ public:
 	Q_INVOKABLE void execute() const;
 
 	[[nodiscard]] bool isValid() const;
+	[[nodiscard]] bool noDisplay() const;
 	[[nodiscard]] QVector<DesktopAction*> actions() const;
 
-	[[nodiscard]] QBindable<QString> bindableName() const { return &this->bName; }
-	[[nodiscard]] QBindable<QString> bindableGenericName() const { return &this->bGenericName; }
-	[[nodiscard]] QBindable<QString> bindableStartupClass() const { return &this->bStartupClass; }
-	[[nodiscard]] QBindable<bool> bindableNoDisplay() const { return &this->bNoDisplay; }
-	[[nodiscard]] QBindable<QString> bindableComment() const { return &this->bComment; }
-	[[nodiscard]] QBindable<QString> bindableIcon() const { return &this->bIcon; }
-	[[nodiscard]] QBindable<QString> bindableExecString() const { return &this->bExecString; }
-	[[nodiscard]] QBindable<QVector<QString>> bindableCommand() const { return &this->bCommand; }
-	[[nodiscard]] QBindable<QString> bindableWorkingDirectory() const {
-		return &this->bWorkingDirectory;
-	}
-	[[nodiscard]] QBindable<bool> bindableRunInTerminal() const { return &this->bRunInTerminal; }
-	[[nodiscard]] QBindable<QVector<QString>> bindableCategories() const {
-		return &this->bCategories;
-	}
-	[[nodiscard]] QBindable<QVector<QString>> bindableKeywords() const { return &this->bKeywords; }
-
 	// currently ignores all field codes.
 	static QVector<QString> parseExecString(const QString& execString);
 	static void doExec(const QList<QString>& execString, const QString& workingDirectory);
 
-signals:
-	void nameChanged();
-	void genericNameChanged();
-	void startupClassChanged();
-	void noDisplayChanged();
-	void commentChanged();
-	void iconChanged();
-	void execStringChanged();
-	void commandChanged();
-	void workingDirectoryChanged();
-	void runInTerminalChanged();
-	void categoriesChanged();
-	void keywordsChanged();
-
 public:
 	QString mId;
-
+	QString mName;
-	// clang-format off
+	QString mGenericName;
-	Q_OBJECT_BINDABLE_PROPERTY(DesktopEntry, QString, bName, &DesktopEntry::nameChanged);
+	QString mStartupClass;
-	Q_OBJECT_BINDABLE_PROPERTY(DesktopEntry, QString, bGenericName, &DesktopEntry::genericNameChanged);
+	bool mNoDisplay = false;
-	Q_OBJECT_BINDABLE_PROPERTY(DesktopEntry, QString, bStartupClass, &DesktopEntry::startupClassChanged);
+	QString mComment;
-	Q_OBJECT_BINDABLE_PROPERTY(DesktopEntry, bool, bNoDisplay, &DesktopEntry::noDisplayChanged);
+	QString mIcon;
-	Q_OBJECT_BINDABLE_PROPERTY(DesktopEntry, QString, bComment, &DesktopEntry::commentChanged);
+	QString mExecString;
-	Q_OBJECT_BINDABLE_PROPERTY(DesktopEntry, QString, bIcon, &DesktopEntry::iconChanged);
+	QVector<QString> mCommand;
-	Q_OBJECT_BINDABLE_PROPERTY(DesktopEntry, QString, bExecString, &DesktopEntry::execStringChanged);
+	QString mWorkingDirectory;
-	Q_OBJECT_BINDABLE_PROPERTY(DesktopEntry, QVector<QString>, bCommand, &DesktopEntry::commandChanged);
+	bool mTerminal = false;
-	Q_OBJECT_BINDABLE_PROPERTY(DesktopEntry, QString, bWorkingDirectory, &DesktopEntry::workingDirectoryChanged);
+	QVector<QString> mCategories;
-	Q_OBJECT_BINDABLE_PROPERTY(DesktopEntry, bool, bRunInTerminal, &DesktopEntry::runInTerminalChanged);
+	QVector<QString> mKeywords;
-	Q_OBJECT_BINDABLE_PROPERTY(DesktopEntry, QVector<QString>, bCategories, &DesktopEntry::categoriesChanged);
-	Q_OBJECT_BINDABLE_PROPERTY(DesktopEntry, QVector<QString>, bKeywords, &DesktopEntry::keywordsChanged);
-	// clang-format on
 
 private:
-	void updateActions(const QVector<DesktopActionData>& newActions);
+	QHash<QString, QString> mEntries;
-
+	QHash<QString, DesktopAction*> mActions;
-	ParsedDesktopEntryData state;
-	QVector<DesktopAction*> mActions;
 
 	friend class DesktopAction;
 };
@@ -176,13 +106,12 @@ private:
 class DesktopAction: public QObject {
 	Q_OBJECT;
 	Q_PROPERTY(QString id MEMBER mId CONSTANT);
-	// clang-format off
+	Q_PROPERTY(QString name MEMBER mName CONSTANT);
-	Q_PROPERTY(QString name READ default WRITE default NOTIFY nameChanged BINDABLE bindableName);
+	Q_PROPERTY(QString icon MEMBER mIcon CONSTANT);
-	Q_PROPERTY(QString icon READ default WRITE default NOTIFY iconChanged BINDABLE bindableIcon);
 	/// The raw `Exec` string from the action.
 	///
 	/// > [!WARNING] This cannot be reliably run as a command. See @@command for one you can run.
-	Q_PROPERTY(QString execString READ default WRITE default NOTIFY execStringChanged BINDABLE bindableExecString);
+	Q_PROPERTY(QString execString MEMBER mExecString CONSTANT);
 	/// The parsed `Exec` command in the action.
 	///
 	/// The entry can be run with @@execute(), or by using this command in
@@ -191,8 +120,7 @@ class DesktopAction: public QObject {
 	/// the invoked process.
 	///
 	/// > [!NOTE]	The provided command does not invoke a terminal even if @@runInTerminal is true.
-	Q_PROPERTY(QVector<QString> command READ default WRITE default NOTIFY commandChanged BINDABLE bindableCommand);
+	Q_PROPERTY(QVector<QString> command MEMBER mCommand CONSTANT);
-	// clang-format on
 	QML_ELEMENT;
 	QML_UNCREATABLE("DesktopAction instances must be retrieved from a DesktopEntry");
 
@@ -208,47 +136,18 @@ public:
 	/// and @@DesktopEntry.workingDirectory.
 	Q_INVOKABLE void execute() const;
 
-	[[nodiscard]] QBindable<QString> bindableName() const { return &this->bName; }
-	[[nodiscard]] QBindable<QString> bindableIcon() const { return &this->bIcon; }
-	[[nodiscard]] QBindable<QString> bindableExecString() const { return &this->bExecString; }
-	[[nodiscard]] QBindable<QVector<QString>> bindableCommand() const { return &this->bCommand; }
-
-signals:
-	void nameChanged();
-	void iconChanged();
-	void execStringChanged();
-	void commandChanged();
-
 private:
 	DesktopEntry* entry;
 	QString mId;
+	QString mName;
+	QString mIcon;
+	QString mExecString;
+	QVector<QString> mCommand;
 	QHash<QString, QString> mEntries;
 
-	// clang-format off
-	Q_OBJECT_BINDABLE_PROPERTY(DesktopAction, QString, bName, &DesktopAction::nameChanged);
-	Q_OBJECT_BINDABLE_PROPERTY(DesktopAction, QString, bIcon, &DesktopAction::iconChanged);
-	Q_OBJECT_BINDABLE_PROPERTY(DesktopAction, QString, bExecString, &DesktopAction::execStringChanged);
-	Q_OBJECT_BINDABLE_PROPERTY(DesktopAction, QVector<QString>, bCommand, &DesktopAction::commandChanged);
-	// clang-format on
-
 	friend class DesktopEntry;
 };
 
-class DesktopEntryManager;
-
-class DesktopEntryScanner: public QRunnable {
-public:
-	explicit DesktopEntryScanner(DesktopEntryManager* manager);
-
-	void run() override;
-	// clang-format off
-	void scanDirectory(const QDir& dir, const QString& idPrefix, QList<ParsedDesktopEntryData>& entries);
-	// clang-format on
-
-private:
-	DesktopEntryManager* manager;
-};
-
 class DesktopEntryManager: public QObject {
 	Q_OBJECT;
 
@@ -262,26 +161,15 @@ public:
 
 	static DesktopEntryManager* instance();
 
-	static const QStringList& desktopPaths();
-
-signals:
-	void applicationsChanged();
-
-private slots:
-	void handleFileChanges();
-	void onScanCompleted(const QList<ParsedDesktopEntryData>& scanResults);
-
 private:
 	explicit DesktopEntryManager();
 
+	void populateApplications();
+	void scanPath(const QDir& dir, const QString& prefix = QString());
+
 	QHash<QString, DesktopEntry*> desktopEntries;
 	QHash<QString, DesktopEntry*> lowercaseDesktopEntries;
 	ObjectModel<DesktopEntry> mApplications {this};
-	DesktopEntryMonitor* monitor = nullptr;
-	bool scanInProgress = false;
-	bool scanQueued = false;
-
-	friend class DesktopEntryScanner;
 };
 
 ///! Desktop entry index.
@@ -313,7 +201,4 @@ public:
 	Q_INVOKABLE [[nodiscard]] static DesktopEntry* heuristicLookup(const QString& name);
 
 	[[nodiscard]] static ObjectModel<DesktopEntry>* applications();
-
-signals:
-	void applicationsChanged();
 };

src/core/desktopentrymonitor.cpp

@@ -1,68 +0,0 @@
-#include "desktopentrymonitor.hpp"
-
-#include <qdir.h>
-#include <qfileinfo.h>
-#include <qfilesystemwatcher.h>
-#include <qobject.h>
-#include <qstring.h>
-#include <qtmetamacros.h>
-
-#include "desktopentry.hpp"
-
-namespace {
-void addPathAndParents(QFileSystemWatcher& watcher, const QString& path) {
-	watcher.addPath(path);
-
-	auto p = QFileInfo(path).absolutePath();
-	while (!p.isEmpty()) {
-		watcher.addPath(p);
-		const auto parent = QFileInfo(p).dir().absolutePath();
-		if (parent == p) break;
-		p = parent;
-	}
-}
-} // namespace
-
-DesktopEntryMonitor::DesktopEntryMonitor(QObject* parent): QObject(parent) {
-	this->debounceTimer.setSingleShot(true);
-	this->debounceTimer.setInterval(100);
-
-	QObject::connect(
-	    &this->watcher,
-	    &QFileSystemWatcher::directoryChanged,
-	    this,
-	    &DesktopEntryMonitor::onDirectoryChanged
-	);
-	QObject::connect(
-	    &this->debounceTimer,
-	    &QTimer::timeout,
-	    this,
-	    &DesktopEntryMonitor::processChanges
-	);
-
-	this->startMonitoring();
-}
-
-void DesktopEntryMonitor::startMonitoring() {
-	for (const auto& path: DesktopEntryManager::desktopPaths()) {
-		if (!QDir(path).exists()) continue;
-		addPathAndParents(this->watcher, path);
-		this->scanAndWatch(path);
-	}
-}
-
-void DesktopEntryMonitor::scanAndWatch(const QString& dirPath) {
-	auto dir = QDir(dirPath);
-	if (!dir.exists()) return;
-
-	this->watcher.addPath(dirPath);
-
-	auto subdirs = dir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot | QDir::NoSymLinks);
-	for (const auto& subdir: subdirs) this->watcher.addPath(subdir.absoluteFilePath());
-}
-
-void DesktopEntryMonitor::onDirectoryChanged(const QString& /*path*/) {
-	this->debounceTimer.start();
-}
-
-void DesktopEntryMonitor::processChanges() { emit this->desktopEntriesChanged(); }

src/core/desktopentrymonitor.hpp

@@ -1,32 +0,0 @@
-#pragma once
-
-#include <qfilesystemwatcher.h>
-#include <qobject.h>
-#include <qstringlist.h>
-#include <qtimer.h>
-
-class DesktopEntryMonitor: public QObject {
-	Q_OBJECT
-
-public:
-	explicit DesktopEntryMonitor(QObject* parent = nullptr);
-	~DesktopEntryMonitor() override = default;
-	DesktopEntryMonitor(const DesktopEntryMonitor&) = delete;
-	DesktopEntryMonitor& operator=(const DesktopEntryMonitor&) = delete;
-	DesktopEntryMonitor(DesktopEntryMonitor&&) = delete;
-	DesktopEntryMonitor& operator=(DesktopEntryMonitor&&) = delete;
-
-signals:
-	void desktopEntriesChanged();
-
-private slots:
-	void onDirectoryChanged(const QString& path);
-	void processChanges();
-
-private:
-	void startMonitoring();
-	void scanAndWatch(const QString& dirPath);
-
-	QFileSystemWatcher watcher;
-	QTimer debounceTimer;
-};

src/core/generation.cpp

@@ -11,12 +11,12 @@
 #include <qlist.h>
 #include <qlogging.h>
 #include <qloggingcategory.h>
+#include <qnamespace.h>
 #include <qobject.h>
 #include <qqmlcontext.h>
 #include <qqmlengine.h>
 #include <qqmlerror.h>
 #include <qqmlincubator.h>
-#include <qquickwindow.h>
 #include <qtmetamacros.h>
 
 #include "iconimageprovider.hpp"
@@ -49,8 +49,7 @@ EngineGeneration::EngineGeneration(const QDir& rootPath, QmlScanner scanner)
 	this->engine->addImportPath("qs:@/");
 
 	this->engine->setNetworkAccessManagerFactory(&this->interceptNetFactory);
-	this->incubationController.initLoop();
+	this->engine->setIncubationController(&this->delayedIncubationController);
-	this->engine->setIncubationController(&this->incubationController);
 
 	this->engine->addImageProvider("icon", new IconImageProvider());
 	this->engine->addImageProvider("qsimage", new QsImageProvider());
@@ -135,7 +134,7 @@ void EngineGeneration::onReload(EngineGeneration* old) {
 		// new generation acquires it then incubators will hang intermittently
 		qCDebug(logIncubator) << "Locking incubation controllers of old generation" << old;
 		old->incubationControllersLocked = true;
-		old->updateIncubationMode();
+		old->assignIncubationController();
 	}
 
 	QObject::connect(this->engine, &QQmlEngine::quit, this, &EngineGeneration::quit);
@@ -209,8 +208,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 +228,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,17 +236,96 @@ 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;
 		}
 	}
 }
 
+void EngineGeneration::registerIncubationController(QQmlIncubationController* controller) {
+	// We only want controllers that we can swap out if destroyed.
+	// This happens if the window owning the active controller dies.
+	auto* obj = dynamic_cast<QObject*>(controller);
+	if (!obj) {
+		qCWarning(logIncubator) << "Could not register incubation controller as it is not a QObject"
+		                        << controller;
+
+		return;
+	}
+
+	QObject::connect(
+	    obj,
+	    &QObject::destroyed,
+	    this,
+	    &EngineGeneration::incubationControllerDestroyed,
+	    Qt::UniqueConnection
+	);
+
+	this->incubationControllers.push_back(obj);
+	qCDebug(logIncubator) << "Registered incubation controller" << obj << "to generation" << this;
+
+	// This function can run during destruction.
+	if (this->engine == nullptr) return;
+
+	if (this->engine->incubationController() == &this->delayedIncubationController) {
+		this->assignIncubationController();
+	}
+}
+
+// Multiple controllers may be destroyed at once. Dynamic casts must be performed before working
+// with any controllers. The QQmlIncubationController destructor will already have run by the
+// point QObject::destroyed is called, so we can't cast to that.
+void EngineGeneration::deregisterIncubationController(QQmlIncubationController* controller) {
+	auto* obj = dynamic_cast<QObject*>(controller);
+	if (!obj) {
+		qCCritical(logIncubator) << "Deregistering incubation controller which is not a QObject, "
+		                            "however only QObject controllers should be registered.";
+	}
+
+	QObject::disconnect(obj, nullptr, this, nullptr);
+
+	if (this->incubationControllers.removeOne(obj)) {
+		qCDebug(logIncubator) << "Deregistered incubation controller" << obj << "from" << this;
+	} else {
+		qCCritical(logIncubator) << "Failed to deregister incubation controller" << obj << "from"
+		                         << this << "as it was not registered to begin with";
+		qCCritical(logIncubator) << "Current registered incuabation controllers"
+		                         << this->incubationControllers;
+	}
+
+	// This function can run during destruction.
+	if (this->engine == nullptr) return;
+
+	if (this->engine->incubationController() == controller) {
+		qCDebug(logIncubator
+		) << "Destroyed incubation controller was currently active, reassigning from pool";
+		this->assignIncubationController();
+	}
+}
+
+void EngineGeneration::incubationControllerDestroyed() {
+	auto* sender = this->sender();
+
+	if (this->incubationControllers.removeAll(sender) != 0) {
+		qCDebug(logIncubator) << "Destroyed incubation controller" << sender << "deregistered from"
+		                      << this;
+	} else {
+		qCCritical(logIncubator) << "Destroyed incubation controller" << sender
+		                         << "was not registered, but its destruction was observed by" << this;
+
+		return;
+	}
+
+	// This function can run during destruction.
+	if (this->engine == nullptr) return;
+
+	if (dynamic_cast<QObject*>(this->engine->incubationController()) == sender) {
+		qCDebug(logIncubator
+		) << "Destroyed incubation controller was currently active, reassigning from pool";
+		this->assignIncubationController();
+	}
+}
+
 void EngineGeneration::onEngineWarnings(const QList<QQmlError>& warnings) {
 	for (const auto& error: warnings) {
 		const auto& url = error.url();
@@ -296,23 +367,20 @@ void EngineGeneration::exit(int code) {
 	this->destroy();
 }
 
-void EngineGeneration::trackWindowIncubationController(QQuickWindow* window) {
+void EngineGeneration::assignIncubationController() {
-	if (this->trackedWindows.contains(window)) return;
+	QQmlIncubationController* controller = nullptr;
 
-	QObject::connect(window, &QObject::destroyed, this, &EngineGeneration::onTrackedWindowDestroyed);
+	if (this->incubationControllersLocked || this->incubationControllers.isEmpty()) {
-	this->trackedWindows.append(window);
+		controller = &this->delayedIncubationController;
-	this->updateIncubationMode();
+	} else {
-}
+		controller = dynamic_cast<QQmlIncubationController*>(this->incubationControllers.first());
+	}
 
-void EngineGeneration::onTrackedWindowDestroyed(QObject* object) {
+	qCDebug(logIncubator) << "Assigning incubation controller" << controller << "to generation"
-	this->trackedWindows.removeAll(static_cast<QQuickWindow*>(object)); // NOLINT
+	                      << this
-	this->updateIncubationMode();
+	                      << "fallback:" << (controller == &this->delayedIncubationController);
-}
 
-void EngineGeneration::updateIncubationMode() {
+	this->engine->setIncubationController(controller);
-	// If we're in a situation with only hidden but tracked windows this might be wrong,
-	// but it seems to at least work.
-	this->incubationController.setIncubationMode(!this->trackedWindows.empty());
 }
 
 EngineGeneration* EngineGeneration::currentGeneration() {

src/core/generation.hpp

@@ -9,7 +9,6 @@
 #include <qqmlengine.h>
 #include <qqmlerror.h>
 #include <qqmlincubator.h>
-#include <qquickwindow.h>
 #include <qtclasshelpermacros.h>
 
 #include "incubator.hpp"
@@ -41,7 +40,8 @@ public:
 	void setWatchingFiles(bool watching);
 	bool setExtraWatchedFiles(const QVector<QString>& files);
 
-	void trackWindowIncubationController(QQuickWindow* window);
+	void registerIncubationController(QQmlIncubationController* controller);
+	void deregisterIncubationController(QQmlIncubationController* controller);
 
 	// takes ownership
 	void registerExtension(const void* key, EngineGenerationExt* extension);
@@ -65,7 +65,7 @@ public:
 	QFileSystemWatcher* watcher = nullptr;
 	QVector<QString> deletedWatchedFiles;
 	QVector<QString> extraWatchedFiles;
-	QsIncubationController incubationController;
+	DelayedQmlIncubationController delayedIncubationController;
 	bool reloadComplete = false;
 	QuickshellGlobal* qsgInstance = nullptr;
 
@@ -84,13 +84,13 @@ public slots:
 private slots:
 	void onFileChanged(const QString& name);
 	void onDirectoryChanged();
-	void onTrackedWindowDestroyed(QObject* object);
+	void incubationControllerDestroyed();
 	static void onEngineWarnings(const QList<QQmlError>& warnings);
 
 private:
 	void postReload();
-	void updateIncubationMode();
+	void assignIncubationController();
-	QVector<QQuickWindow*> trackedWindows;
+	QVector<QObject*> incubationControllers;
 	bool incubationControllersLocked = false;
 	QHash<const void*, EngineGenerationExt*> extensions;
 

src/core/iconimageprovider.cpp

@@ -19,7 +19,8 @@ IconImageProvider::requestPixmap(const QString& id, QSize* size, const QSize& re
 	if (splitIdx != -1) {
 		iconName = id.sliced(0, splitIdx);
 		path = id.sliced(splitIdx + 6);
-		path = QString("/%1/%2").arg(path, iconName.sliced(iconName.lastIndexOf('/') + 1));
+		qWarning() << "Searching custom icon paths is not yet supported. Icon path will be ignored for"
+		           << id;
 	} else {
 		splitIdx = id.indexOf("?fallback=");
 		if (splitIdx != -1) {
@@ -31,8 +32,7 @@ IconImageProvider::requestPixmap(const QString& id, QSize* size, const QSize& re
 	}
 
 	auto icon = QIcon::fromTheme(iconName);
-	if (icon.isNull() && !fallbackName.isEmpty()) icon = QIcon::fromTheme(fallbackName);
+	if (icon.isNull()) icon = QIcon::fromTheme(fallbackName);
-	if (icon.isNull() && !path.isEmpty()) icon = QPixmap(path);
 
 	auto targetSize = requestedSize.isValid() ? requestedSize : QSize(100, 100);
 	if (targetSize.width() == 0 || targetSize.height() == 0) targetSize = QSize(2, 2);

src/core/iconprovider.cpp

@@ -22,8 +22,8 @@ class PixmapCacheIconEngine: public QIconEngine {
 	    QIcon::Mode /*unused*/,
 	    QIcon::State /*unused*/
 	) override {
-		qFatal()
+		qFatal(
-		    << "Unexpected icon paint request bypassed pixmap method. Please report this as a bug.";
+		) << "Unexpected icon paint request bypassed pixmap method. Please report this as a bug.";
 	}
 
 	QPixmap pixmap(const QSize& size, QIcon::Mode /*unused*/, QIcon::State /*unused*/) override {

src/core/incubator.cpp

@@ -1,16 +1,7 @@
 #include "incubator.hpp"
 
-#include <private/qsgrenderloop_p.h>
-#include <qabstractanimation.h>
-#include <qguiapplication.h>
 #include <qlogging.h>
-#include <qloggingcategory.h>
-#include <qminmax.h>
-#include <qnamespace.h>
-#include <qobject.h>
-#include <qobjectdefs.h>
 #include <qqmlincubator.h>
-#include <qscreen.h>
 #include <qtmetamacros.h>
 
 #include "logcat.hpp"
@@ -24,112 +15,3 @@ void QsQmlIncubator::statusChanged(QQmlIncubator::Status status) {
 	default: break;
 	}
 }
-
-void QsIncubationController::initLoop() {
-	auto* app = static_cast<QGuiApplication*>(QGuiApplication::instance()); // NOLINT
-	this->renderLoop = QSGRenderLoop::instance();
-
-	QObject::connect(
-	    app,
-	    &QGuiApplication::screenAdded,
-	    this,
-	    &QsIncubationController::updateIncubationTime
-	);
-
-	QObject::connect(
-	    app,
-	    &QGuiApplication::screenRemoved,
-	    this,
-	    &QsIncubationController::updateIncubationTime
-	);
-
-	this->updateIncubationTime();
-
-	QObject::connect(
-	    this->renderLoop,
-	    &QSGRenderLoop::timeToIncubate,
-	    this,
-	    &QsIncubationController::incubate
-	);
-
-	QAnimationDriver* animationDriver = this->renderLoop->animationDriver();
-	if (animationDriver) {
-		QObject::connect(
-		    animationDriver,
-		    &QAnimationDriver::stopped,
-		    this,
-		    &QsIncubationController::animationStopped
-		);
-	} else {
-		qCInfo(logIncubator) << "Render loop does not have animation driver, animationStopped cannot "
-		                        "be used to trigger incubation.";
-	}
-}
-
-void QsIncubationController::setIncubationMode(bool render) {
-	if (render == this->followRenderloop) return;
-	this->followRenderloop = render;
-
-	if (render) {
-		qCDebug(logIncubator) << "Incubation mode changed: render loop driven";
-	} else {
-		qCDebug(logIncubator) << "Incubation mode changed: event loop driven";
-	}
-
-	if (!render && this->incubatingObjectCount()) this->incubateLater();
-}
-
-void QsIncubationController::timerEvent(QTimerEvent* /*event*/) {
-	this->killTimer(this->timerId);
-	this->timerId = 0;
-	this->incubate();
-}
-
-void QsIncubationController::incubateLater() {
-	if (this->followRenderloop) {
-		if (this->timerId != 0) {
-			this->killTimer(this->timerId);
-			this->timerId = 0;
-		}
-
-		// Incubate again at the end of the event processing queue
-		QMetaObject::invokeMethod(this, &QsIncubationController::incubate, Qt::QueuedConnection);
-	} else if (this->timerId == 0) {
-		// Wait for a while before processing the next batch. Using a
-		// timer to avoid starvation of system events.
-		this->timerId = this->startTimer(this->incubationTime);
-	}
-}
-
-void QsIncubationController::incubate() {
-	if ((!this->followRenderloop || this->renderLoop) && this->incubatingObjectCount()) {
-		if (!this->followRenderloop) {
-			this->incubateFor(10);
-			if (this->incubatingObjectCount()) this->incubateLater();
-		} else if (this->renderLoop->interleaveIncubation()) {
-			this->incubateFor(this->incubationTime);
-		} else {
-			this->incubateFor(this->incubationTime * 2);
-			if (this->incubatingObjectCount()) this->incubateLater();
-		}
-	}
-}
-
-void QsIncubationController::animationStopped() { this->incubate(); }
-
-void QsIncubationController::incubatingObjectCountChanged(int count) {
-	if (count
-	    && (!this->followRenderloop
-	        || (this->renderLoop && !this->renderLoop->interleaveIncubation())))
-	{
-		this->incubateLater();
-	}
-}
-
-void QsIncubationController::updateIncubationTime() {
-	auto* screen = QGuiApplication::primaryScreen();
-	if (!screen) return;
-
-	// 1/3 frame on primary screen
-	this->incubationTime = qMax(1, static_cast<int>(1000 / screen->refreshRate() / 3));
-}

src/core/incubator.hpp

@@ -1,7 +1,6 @@
 #pragma once
 
 #include <qobject.h>
-#include <qpointer.h>
 #include <qqmlincubator.h>
 #include <qtmetamacros.h>
 
@@ -26,37 +25,7 @@ signals:
 	void failed();
 };
 
-class QSGRenderLoop;
+class DelayedQmlIncubationController: public QQmlIncubationController {
-
+	// Do nothing.
-class QsIncubationController
+	// This ensures lazy loaders don't start blocking before onReload creates windows.
-    : public QObject
-    , public QQmlIncubationController {
-	Q_OBJECT
-
-public:
-	void initLoop();
-	void setIncubationMode(bool render);
-	void incubateLater();
-
-protected:
-	void timerEvent(QTimerEvent* event) override;
-
-public slots:
-	void incubate();
-	void animationStopped();
-	void updateIncubationTime();
-
-protected:
-	void incubatingObjectCountChanged(int count) override;
-
-private:
-// QPointer did not work with forward declarations prior to 6.7
-#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
-	QPointer<QSGRenderLoop> renderLoop = nullptr;
-#else
-	QSGRenderLoop* renderLoop = nullptr;
-#endif
-	int incubationTime = 0;
-	int timerId = 0;
-	bool followRenderloop = false;
 };

src/core/instanceinfo.cpp

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

src/core/instanceinfo.hpp

@@ -9,10 +9,8 @@ struct InstanceInfo {
 	QString instanceId;
 	QString configPath;
 	QString shellId;
-	QString appId;
 	QDateTime launchTime;
 	pid_t pid = -1;
-	QString display;
 
 	static InstanceInfo CURRENT; // NOLINT
 };
@@ -36,8 +34,6 @@ namespace qs::crash {
 
 struct CrashInfo {
 	int logFd = -1;
-	int traceFd = -1;
-	int infoFd = -1;
 
 	static CrashInfo INSTANCE; // NOLINT
 };

src/core/lazyloader.hpp

@@ -82,6 +82,9 @@
 /// > Notably, @@Variants does not corrently support asynchronous
 /// > loading, meaning using it inside a LazyLoader will block similarly to not
 /// > having a loader to start with.
+///
+/// > [!WARNING] LazyLoaders do not start loading before the first window is created,
+/// > meaning if you create all windows inside of lazy loaders, none of them will ever load.
 class LazyLoader: public Reloadable {
 	Q_OBJECT;
 	/// The fully loaded item if the loader is @@loading or @@active, or `null`

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>
@@ -28,13 +27,7 @@
 #include <qtmetamacros.h>
 #include <qtypes.h>
 #include <sys/mman.h>
-#ifdef __linux__
 #include <sys/sendfile.h>
-#include <sys/types.h>
-#endif
-#ifdef __FreeBSD__
-#include <unistd.h>
-#endif
 
 #include "instanceinfo.hpp"
 #include "logcat.hpp"
@@ -50,57 +43,6 @@ using namespace qt_logging_registry;
 
 QS_LOGGING_CATEGORY(logLogging, "quickshell.logging", QtWarningMsg);
 
-namespace {
-bool copyFileData(int sourceFd, int destFd, qint64 size) {
-	auto usize = static_cast<size_t>(size);
-
-#ifdef __linux__
-	off_t offset = 0;
-	auto remaining = usize;
-
-	while (remaining > 0) {
-		auto r = sendfile(destFd, sourceFd, &offset, remaining);
-		if (r == -1) {
-			if (errno == EINTR) continue;
-			return false;
-		}
-		if (r == 0) break;
-		remaining -= static_cast<size_t>(r);
-	}
-
-	return true;
-#else
-	std::array<char, 64 * 1024> buffer = {};
-	auto remaining = usize;
-
-	while (remaining > 0) {
-		auto chunk = std::min(remaining, buffer.size());
-		auto r = ::read(sourceFd, buffer.data(), chunk);
-		if (r == -1) {
-			if (errno == EINTR) continue;
-			return false;
-		}
-		if (r == 0) break;
-
-		auto readBytes = static_cast<size_t>(r);
-		size_t written = 0;
-		while (written < readBytes) {
-			auto w = ::write(destFd, buffer.data() + written, readBytes - written);
-			if (w == -1) {
-				if (errno == EINTR) continue;
-				return false;
-			}
-			written += static_cast<size_t>(w);
-		}
-
-		remaining -= readBytes;
-	}
-
-	return true;
-#endif
-}
-} // namespace
-
 bool LogMessage::operator==(const LogMessage& other) const {
 	// note: not including time
 	return this->type == other.type && this->category == other.category && this->body == other.body;
@@ -221,7 +163,6 @@ void LogManager::messageHandler(
 	}
 
 	if (display) {
-		auto locker = QMutexLocker(&self->stdoutMutex);
 		LogMessage::formatMessage(
 		    self->stdoutStream,
 		    message,
@@ -310,15 +251,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);
@@ -377,12 +313,8 @@ void ThreadLogging::init() {
 
 	if (logMfd != -1) {
 		this->file = new QFile();
-
+		this->file->open(logMfd, QFile::ReadWrite, QFile::AutoCloseHandle);
-		if (this->file->open(logMfd, QFile::ReadWrite, QFile::AutoCloseHandle)) {
 		this->fileStream.setDevice(this->file);
-		} else {
-			qCCritical(logLogging) << "Failed to open early logging memfd.";
-		}
 	}
 
 	if (dlogMfd != -1) {
@@ -390,9 +322,7 @@ void ThreadLogging::init() {
 
 		this->detailedFile = new QFile();
 		// buffered by WriteBuffer
-		if (this->detailedFile
+		this->detailedFile->open(dlogMfd, QFile::ReadWrite | QFile::Unbuffered, QFile::AutoCloseHandle);
-		        ->open(dlogMfd, QFile::ReadWrite | QFile::Unbuffered, QFile::AutoCloseHandle))
-		{
 		this->detailedWriter.setDevice(this->detailedFile);
 
 		if (!this->detailedWriter.writeHeader()) {
@@ -401,9 +331,6 @@ void ThreadLogging::init() {
 			delete this->detailedFile;
 			this->detailedFile = nullptr;
 		}
-		} else {
-			qCCritical(logLogging) << "Failed to open early detailed logging memfd.";
-		}
 	}
 
 	// This connection is direct so it works while the event loop is destroyed between
@@ -425,8 +352,7 @@ void ThreadLogging::initFs() {
 	auto* runDir = QsPaths::instance()->instanceRunDir();
 
 	if (!runDir) {
-		qCCritical(
+		qCCritical(logLogging
-		    logLogging
 		) << "Could not start filesystem logging as the runtime directory could not be created.";
 		return;
 	}
@@ -437,8 +363,7 @@ void ThreadLogging::initFs() {
 	auto* detailedFile = new QFile(detailedPath);
 
 	if (!file->open(QFile::ReadWrite | QFile::Truncate)) {
-		qCCritical(
+		qCCritical(logLogging
-		    logLogging
 		) << "Could not start filesystem logger as the log file could not be created:"
 		  << path;
 		delete file;
@@ -449,14 +374,13 @@ void ThreadLogging::initFs() {
 
 	// buffered by WriteBuffer
 	if (!detailedFile->open(QFile::ReadWrite | QFile::Truncate | QFile::Unbuffered)) {
-		qCCritical(
+		qCCritical(logLogging
-		    logLogging
 		) << "Could not start detailed filesystem logger as the log file could not be created:"
 		  << detailedPath;
 		delete detailedFile;
 		detailedFile = nullptr;
 	} else {
-		struct flock lock = {
+		auto lock = flock {
 		    .l_type = F_WRLCK,
 		    .l_whence = SEEK_SET,
 		    .l_start = 0,
@@ -478,11 +402,7 @@ void ThreadLogging::initFs() {
 		auto* oldFile = this->file;
 		if (oldFile) {
 			oldFile->seek(0);
-
+			sendfile(file->handle(), oldFile->handle(), nullptr, oldFile->size());
-			if (!copyFileData(oldFile->handle(), file->handle(), oldFile->size())) {
-				qCritical(logLogging) << "Failed to copy log from memfd with error code " << errno
-				                      << qt_error_string(errno);
-			}
 		}
 
 		this->file = file;
@@ -494,10 +414,7 @@ void ThreadLogging::initFs() {
 		auto* oldFile = this->detailedFile;
 		if (oldFile) {
 			oldFile->seek(0);
-			if (!copyFileData(oldFile->handle(), detailedFile->handle(), oldFile->size())) {
+			sendfile(detailedFile->handle(), oldFile->handle(), nullptr, oldFile->size());
-				qCritical(logLogging) << "Failed to copy detailed log from memfd with error code " << errno
-				                      << qt_error_string(errno);
-			}
 		}
 
 		crash::CrashInfo::INSTANCE.logFd = detailedFile->handle();
@@ -541,13 +458,13 @@ void ThreadLogging::onMessage(const LogMessage& msg, bool showInSparse) {
 	}
 
 	if (!this->detailedWriter.write(msg) || (this->detailedFile && !this->detailedFile->flush())) {
-		this->detailedWriter.setDevice(nullptr);
-
 		if (this->detailedFile) {
-			this->detailedFile->close();
-			this->detailedFile = nullptr;
 			qCCritical(logLogging) << "Detailed logger failed to write. Ending detailed logs.";
 		}
+
+		this->detailedWriter.setDevice(nullptr);
+		this->detailedFile->close();
+		this->detailedFile = nullptr;
 	}
 }
 
@@ -820,11 +737,11 @@ bool EncodedLogReader::readVarInt(quint32* slot) {
 		if (!this->reader.skip(1)) return false;
 		*slot = qFromLittleEndian(n);
 	} else if ((bytes[1] != 0xff || bytes[2] != 0xff) && readLength >= 3) {
-		auto n = *reinterpret_cast<quint16*>(bytes.data() + 1); // NOLINT
+		auto n = *reinterpret_cast<quint16*>(bytes.data() + 1);
 		if (!this->reader.skip(3)) return false;
 		*slot = qFromLittleEndian(n);
 	} else if (readLength == 7) {
-		auto n = *reinterpret_cast<quint32*>(bytes.data() + 3); // NOLINT
+		auto n = *reinterpret_cast<quint32*>(bytes.data() + 3);
 		if (!this->reader.skip(7)) return false;
 		*slot = qFromLittleEndian(n);
 	} else return false;
@@ -960,7 +877,7 @@ bool LogReader::continueReading() {
 }
 
 void LogFollower::FcntlWaitThread::run() {
-	struct flock lock = {
+	auto lock = flock {
 	    .l_type = F_RDLCK, // won't block other read locks when we take it
 	    .l_whence = SEEK_SET,
 	    .l_start = 0,

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.cpp

@@ -1,14 +1,81 @@
 #include "model.hpp"
 
-#include <qbytearray.h>
+#include <qabstractitemmodel.h>
 #include <qhash.h>
 #include <qnamespace.h>
+#include <qobject.h>
+#include <qqmllist.h>
+#include <qtmetamacros.h>
+#include <qtypes.h>
+#include <qvariant.h>
+
+qint32 UntypedObjectModel::rowCount(const QModelIndex& parent) const {
+	if (parent != QModelIndex()) return 0;
+	return static_cast<qint32>(this->valuesList.length());
+}
+
+QVariant UntypedObjectModel::data(const QModelIndex& index, qint32 role) const {
+	if (role != Qt::UserRole) return QVariant();
+	return QVariant::fromValue(this->valuesList.at(index.row()));
+}
 
 QHash<int, QByteArray> UntypedObjectModel::roleNames() const {
 	return {{Qt::UserRole, "modelData"}};
 }
 
+void UntypedObjectModel::insertObject(QObject* object, qsizetype index) {
+	auto iindex = index == -1 ? this->valuesList.length() : index;
+	emit this->objectInsertedPre(object, iindex);
+
+	auto intIndex = static_cast<qint32>(iindex);
+	this->beginInsertRows(QModelIndex(), intIndex, intIndex);
+	this->valuesList.insert(iindex, object);
+	this->endInsertRows();
+
+	emit this->valuesChanged();
+	emit this->objectInsertedPost(object, iindex);
+}
+
+void UntypedObjectModel::removeAt(qsizetype index) {
+	auto* object = this->valuesList.at(index);
+	emit this->objectRemovedPre(object, index);
+
+	auto intIndex = static_cast<qint32>(index);
+	this->beginRemoveRows(QModelIndex(), intIndex, intIndex);
+	this->valuesList.removeAt(index);
+	this->endRemoveRows();
+
+	emit this->valuesChanged();
+	emit this->objectRemovedPost(object, index);
+}
+
+bool UntypedObjectModel::removeObject(const QObject* object) {
+	auto index = this->valuesList.indexOf(object);
+	if (index == -1) return false;
+
+	this->removeAt(index);
+	return true;
+}
+
+void UntypedObjectModel::diffUpdate(const QVector<QObject*>& newValues) {
+	for (qsizetype i = 0; i < this->valuesList.length();) {
+		if (newValues.contains(this->valuesList.at(i))) i++;
+		else this->removeAt(i);
+	}
+
+	qsizetype oi = 0;
+	for (auto* object: newValues) {
+		if (this->valuesList.length() == oi || this->valuesList.at(oi) != object) {
+			this->insertObject(object, oi);
+		}
+
+		oi++;
+	}
+}
+
+qsizetype UntypedObjectModel::indexOf(QObject* object) { return this->valuesList.indexOf(object); }
+
 UntypedObjectModel* UntypedObjectModel::emptyInstance() {
-	static auto* instance = new ObjectModel<void>(nullptr);
+	static auto* instance = new UntypedObjectModel(nullptr); // NOLINT
 	return instance;
 }

src/core/model.hpp

@@ -2,7 +2,7 @@
 
 #include <functional>
 
-#include <QtCore/qtmetamacros.h>
+#include <bit>
 #include <qabstractitemmodel.h>
 #include <qcontainerfwd.h>
 #include <qobject.h>
@@ -49,11 +49,14 @@ class UntypedObjectModel: public QAbstractListModel {
 public:
 	explicit UntypedObjectModel(QObject* parent): QAbstractListModel(parent) {}
 
+	[[nodiscard]] qint32 rowCount(const QModelIndex& parent) const override;
+	[[nodiscard]] QVariant data(const QModelIndex& index, qint32 role) const override;
 	[[nodiscard]] QHash<int, QByteArray> roleNames() const override;
 
-	[[nodiscard]] virtual QList<QObject*> values() = 0;
+	[[nodiscard]] QList<QObject*> values() const { return this->valuesList; }
+	void removeAt(qsizetype index);
 
-	Q_INVOKABLE virtual qsizetype indexOf(QObject* object) const = 0;
+	Q_INVOKABLE qsizetype indexOf(QObject* object);
 
 	static UntypedObjectModel* emptyInstance();
 
@@ -68,6 +71,15 @@ signals:
 	/// Sent immediately after an object is removed from the list.
 	void objectRemovedPost(QObject* object, qsizetype index);
 
+protected:
+	void insertObject(QObject* object, qsizetype index = -1);
+	bool removeObject(const QObject* object);
+
+	// Assumes only one instance of a specific value
+	void diffUpdate(const QVector<QObject*>& newValues);
+
+	QVector<QObject*> valuesList;
+
 private:
 	static qsizetype valuesCount(QQmlListProperty<QObject>* property);
 	static QObject* valueAt(QQmlListProperty<QObject>* property, qsizetype index);
@@ -78,20 +90,14 @@ class ObjectModel: public UntypedObjectModel {
 public:
 	explicit ObjectModel(QObject* parent): UntypedObjectModel(parent) {}
 
-	[[nodiscard]] const QList<T*>& valueList() const { return this->mValuesList; }
+	[[nodiscard]] QVector<T*>& valueList() { return *std::bit_cast<QVector<T*>*>(&this->valuesList); }
-	[[nodiscard]] QList<T*>& valueList() { return this->mValuesList; }
+
+	[[nodiscard]] const QVector<T*>& valueList() const {
+		return *std::bit_cast<const QVector<T*>*>(&this->valuesList);
+	}
 
 	void insertObject(T* object, qsizetype index = -1) {
-		auto iindex = index == -1 ? this->mValuesList.length() : index;
+		this->UntypedObjectModel::insertObject(object, index);
-		emit this->objectInsertedPre(object, iindex);
-
-		auto intIndex = static_cast<qint32>(iindex);
-		this->beginInsertRows(QModelIndex(), intIndex, intIndex);
-		this->mValuesList.insert(iindex, object);
-		this->endInsertRows();
-
-		emit this->valuesChanged();
-		emit this->objectInsertedPost(object, iindex);
 	}
 
 	void insertObjectSorted(T* object, const std::function<bool(T*, T*)>& compare) {
@@ -104,71 +110,17 @@ public:
 		}
 
 		auto idx = iter - list.begin();
-		this->insertObject(object, idx);
+		this->UntypedObjectModel::insertObject(object, idx);
 	}
 
-	bool removeObject(const T* object) {
+	void removeObject(const T* object) { this->UntypedObjectModel::removeObject(object); }
-		auto index = this->mValuesList.indexOf(object);
-		if (index == -1) return false;
-
-		this->removeAt(index);
-		return true;
-	}
-
-	void removeAt(qsizetype index) {
-		auto* object = this->mValuesList.at(index);
-		emit this->objectRemovedPre(object, index);
-
-		auto intIndex = static_cast<qint32>(index);
-		this->beginRemoveRows(QModelIndex(), intIndex, intIndex);
-		this->mValuesList.removeAt(index);
-		this->endRemoveRows();
-
-		emit this->valuesChanged();
-		emit this->objectRemovedPost(object, index);
-	}
 
 	// Assumes only one instance of a specific value
-	void diffUpdate(const QList<T*>& newValues) {
+	void diffUpdate(const QVector<T*>& newValues) {
-		for (qsizetype i = 0; i < this->mValuesList.length();) {
+		this->UntypedObjectModel::diffUpdate(*std::bit_cast<const QVector<QObject*>*>(&newValues));
-			if (newValues.contains(this->mValuesList.at(i))) i++;
-			else this->removeAt(i);
-		}
-
-		qsizetype oi = 0;
-		for (auto* object: newValues) {
-			if (this->mValuesList.length() == oi || this->mValuesList.at(oi) != object) {
-				this->insertObject(object, oi);
-			}
-
-			oi++;
-		}
 	}
 
 	static ObjectModel<T>* emptyInstance() {
 		return static_cast<ObjectModel<T>*>(UntypedObjectModel::emptyInstance());
 	}
-
-	[[nodiscard]] qint32 rowCount(const QModelIndex& parent) const override {
-		if (parent != QModelIndex()) return 0;
-		return static_cast<qint32>(this->mValuesList.length());
-	}
-
-	[[nodiscard]] QVariant data(const QModelIndex& index, qint32 role) const override {
-		if (role != Qt::UserRole) return QVariant();
-		// Values must be QObject derived, but we can't assert that here without breaking forward decls,
-		// so no static_cast.
-		return QVariant::fromValue(reinterpret_cast<QObject*>(this->mValuesList.at(index.row())));
-	}
-
-	qsizetype indexOf(QObject* object) const override {
-		return this->mValuesList.indexOf(reinterpret_cast<T*>(object));
-	}
-
-	[[nodiscard]] QList<QObject*> values() override {
-		return *reinterpret_cast<QList<QObject*>*>(&this->mValuesList);
-	}
-
-private:
-	QList<T*> mValuesList;
 };

src/core/module.md

@@ -21,6 +21,7 @@ headers = [
 	"model.hpp",
 	"elapsedtimer.hpp",
 	"desktopentry.hpp",
+	"objectrepeater.hpp",
 	"qsmenu.hpp",
 	"retainable.hpp",
 	"popupanchor.hpp",

src/core/objectrepeater.cpp

@@ -0,0 +1,190 @@
+#include "objectrepeater.hpp"
+#include <utility>
+
+#include <qabstractitemmodel.h>
+#include <qcontainerfwd.h>
+#include <qhash.h>
+#include <qlogging.h>
+#include <qobject.h>
+#include <qqmlcomponent.h>
+#include <qqmlcontext.h>
+#include <qqmlengine.h>
+#include <qqmllist.h>
+#include <qtmetamacros.h>
+#include <qtypes.h>
+#include <qvariant.h>
+
+QVariant ObjectRepeater::model() const { return this->mModel; }
+
+void ObjectRepeater::setModel(QVariant model) {
+	if (model == this->mModel) return;
+
+	if (this->itemModel != nullptr) {
+		QObject::disconnect(this->itemModel, nullptr, this, nullptr);
+	}
+
+	this->mModel = std::move(model);
+	emit this->modelChanged();
+	this->reloadElements();
+}
+
+void ObjectRepeater::onModelDestroyed() {
+	this->mModel.clear();
+	this->itemModel = nullptr;
+	emit this->modelChanged();
+	this->reloadElements();
+}
+
+QQmlComponent* ObjectRepeater::delegate() const { return this->mDelegate; }
+
+void ObjectRepeater::setDelegate(QQmlComponent* delegate) {
+	if (delegate == this->mDelegate) return;
+
+	if (this->mDelegate != nullptr) {
+		QObject::disconnect(this->mDelegate, nullptr, this, nullptr);
+	}
+
+	this->mDelegate = delegate;
+
+	if (delegate != nullptr) {
+		QObject::connect(
+		    this->mDelegate,
+		    &QObject::destroyed,
+		    this,
+		    &ObjectRepeater::onDelegateDestroyed
+		);
+	}
+
+	emit this->delegateChanged();
+	this->reloadElements();
+}
+
+void ObjectRepeater::onDelegateDestroyed() {
+	this->mDelegate = nullptr;
+	emit this->delegateChanged();
+	this->reloadElements();
+}
+
+void ObjectRepeater::reloadElements() {
+	for (auto i = this->valuesList.length() - 1; i >= 0; i--) {
+		this->removeComponent(i);
+	}
+
+	if (this->mDelegate == nullptr || !this->mModel.isValid()) return;
+
+	if (this->mModel.canConvert<QAbstractItemModel*>()) {
+		auto* model = this->mModel.value<QAbstractItemModel*>();
+		this->itemModel = model;
+
+		this->insertModelElements(model, 0, model->rowCount() - 1); // -1 is fine
+
+		// clang-format off
+		QObject::connect(model, &QObject::destroyed, this, &ObjectRepeater::onModelDestroyed);
+		QObject::connect(model, &QAbstractItemModel::rowsInserted, this, &ObjectRepeater::onModelRowsInserted);
+		QObject::connect(model, &QAbstractItemModel::rowsRemoved, this, &ObjectRepeater::onModelRowsRemoved);
+		QObject::connect(model, &QAbstractItemModel::rowsMoved, this, &ObjectRepeater::onModelRowsMoved);
+		QObject::connect(model, &QAbstractItemModel::modelAboutToBeReset, this, &ObjectRepeater::onModelAboutToBeReset);
+		// clang-format on
+	} else if (this->mModel.canConvert<QQmlListReference>()) {
+		auto values = this->mModel.value<QQmlListReference>();
+		auto len = values.count();
+
+		for (auto i = 0; i != len; i++) {
+			this->insertComponent(i, {{"modelData", QVariant::fromValue(values.at(i))}});
+		}
+	} else if (this->mModel.canConvert<QVector<QVariant>>()) {
+		auto values = this->mModel.value<QVector<QVariant>>();
+
+		for (auto& value: values) {
+			this->insertComponent(this->valuesList.length(), {{"modelData", value}});
+		}
+	} else {
+		qCritical() << this
+		            << "Cannot create components as the model is not compatible:" << this->mModel;
+	}
+}
+
+void ObjectRepeater::insertModelElements(QAbstractItemModel* model, int first, int last) {
+	auto roles = model->roleNames();
+	auto roleDataVec = QVector<QModelRoleData>();
+	for (auto id: roles.keys()) {
+		roleDataVec.push_back(QModelRoleData(id));
+	}
+
+	auto values = QModelRoleDataSpan(roleDataVec);
+	auto props = QVariantMap();
+
+	for (auto i = first; i != last + 1; i++) {
+		auto index = model->index(i, 0);
+		model->multiData(index, values);
+
+		for (auto [id, name]: roles.asKeyValueRange()) {
+			props.insert(name, *values.dataForRole(id));
+		}
+
+		this->insertComponent(i, props);
+
+		props.clear();
+	}
+}
+
+void ObjectRepeater::onModelRowsInserted(const QModelIndex& parent, int first, int last) {
+	if (parent != QModelIndex()) return;
+
+	this->insertModelElements(this->itemModel, first, last);
+}
+
+void ObjectRepeater::onModelRowsRemoved(const QModelIndex& parent, int first, int last) {
+	if (parent != QModelIndex()) return;
+
+	for (auto i = last; i != first - 1; i--) {
+		this->removeComponent(i);
+	}
+}
+
+void ObjectRepeater::onModelRowsMoved(
+    const QModelIndex& sourceParent,
+    int sourceStart,
+    int sourceEnd,
+    const QModelIndex& destParent,
+    int destStart
+) {
+	auto hasSource = sourceParent != QModelIndex();
+	auto hasDest = destParent != QModelIndex();
+
+	if (!hasSource && !hasDest) return;
+
+	if (hasSource) {
+		this->onModelRowsRemoved(sourceParent, sourceStart, sourceEnd);
+	}
+
+	if (hasDest) {
+		this->onModelRowsInserted(destParent, destStart, destStart + (sourceEnd - sourceStart));
+	}
+}
+
+void ObjectRepeater::onModelAboutToBeReset() {
+	auto last = static_cast<int>(this->valuesList.length() - 1);
+	this->onModelRowsRemoved(QModelIndex(), 0, last); // -1 is fine
+}
+
+void ObjectRepeater::insertComponent(qsizetype index, const QVariantMap& properties) {
+	auto* context = QQmlEngine::contextForObject(this);
+	auto* instance = this->mDelegate->createWithInitialProperties(properties, context);
+
+	if (instance == nullptr) {
+		qWarning().noquote() << this->mDelegate->errorString();
+		qWarning() << this << "failed to create object for model data" << properties;
+	} else {
+		QQmlEngine::setObjectOwnership(instance, QQmlEngine::CppOwnership);
+		instance->setParent(this);
+	}
+
+	this->insertObject(instance, index);
+}
+
+void ObjectRepeater::removeComponent(qsizetype index) {
+	auto* instance = this->valuesList.at(index);
+	this->removeAt(index);
+	delete instance;
+}

src/core/objectrepeater.hpp

@@ -0,0 +1,85 @@
+#pragma once
+
+#include <qabstractitemmodel.h>
+#include <qobject.h>
+#include <qqmlcomponent.h>
+#include <qqmlintegration.h>
+#include <qtmetamacros.h>
+#include <qtypes.h>
+#include <qvariant.h>
+
+#include "model.hpp"
+
+///! A Repeater / for loop / map for non Item derived objects.
+/// > [!ERROR] Removed in favor of @@QtQml.Models.Instantiator
+///
+/// The ObjectRepeater creates instances of the provided delegate for every entry in the
+/// given model, similarly to a @@QtQuick.Repeater but for non visual types.
+class ObjectRepeater: public ObjectModel<QObject> {
+	Q_OBJECT;
+	/// The model providing data to the ObjectRepeater.
+	///
+	/// Currently accepted model types are `list<T>` lists, javascript arrays,
+	/// and [QAbstractListModel] derived models, though only one column will be repeated
+	/// from the latter.
+	///
+	/// Note: @@ObjectModel is a [QAbstractListModel] with a single column.
+	///
+	/// [QAbstractListModel]: https://doc.qt.io/qt-6/qabstractlistmodel.html
+	Q_PROPERTY(QVariant model READ model WRITE setModel NOTIFY modelChanged);
+	/// The delegate component to repeat.
+	///
+	/// The delegate is given the same properties as in a Repeater, except `index` which
+	/// is not currently implemented.
+	///
+	/// If the model is a `list<T>` or javascript array, a `modelData` property will be
+	/// exposed containing the entry from the model. If the model is a [QAbstractListModel],
+	/// the roles from the model will be exposed.
+	///
+	/// Note: @@ObjectModel has a single role named `modelData` for compatibility with normal lists.
+	///
+	/// [QAbstractListModel]: https://doc.qt.io/qt-6/qabstractlistmodel.html
+	Q_PROPERTY(QQmlComponent* delegate READ delegate WRITE setDelegate NOTIFY delegateChanged);
+	Q_CLASSINFO("DefaultProperty", "delegate");
+	QML_ELEMENT;
+	QML_UNCREATABLE("ObjectRepeater has been removed in favor of QtQml.Models.Instantiator.");
+
+public:
+	explicit ObjectRepeater(QObject* parent = nullptr): ObjectModel(parent) {}
+
+	[[nodiscard]] QVariant model() const;
+	void setModel(QVariant model);
+
+	[[nodiscard]] QQmlComponent* delegate() const;
+	void setDelegate(QQmlComponent* delegate);
+
+signals:
+	void modelChanged();
+	void delegateChanged();
+
+private slots:
+	void onDelegateDestroyed();
+	void onModelDestroyed();
+	void onModelRowsInserted(const QModelIndex& parent, int first, int last);
+	void onModelRowsRemoved(const QModelIndex& parent, int first, int last);
+
+	void onModelRowsMoved(
+	    const QModelIndex& sourceParent,
+	    int sourceStart,
+	    int sourceEnd,
+	    const QModelIndex& destParent,
+	    int destStart
+	);
+
+	void onModelAboutToBeReset();
+
+private:
+	void reloadElements();
+	void insertModelElements(QAbstractItemModel* model, int first, int last);
+	void insertComponent(qsizetype index, const QVariantMap& properties);
+	void removeComponent(qsizetype index);
+
+	QVariant mModel;
+	QAbstractItemModel* itemModel = nullptr;
+	QQmlComponent* mDelegate = nullptr;
+};

src/core/paths.cpp

@@ -27,19 +27,12 @@ QsPaths* QsPaths::instance() {
 	return instance;
 }
 
-void QsPaths::init(
+void QsPaths::init(QString shellId, QString pathId, QString dataOverride, QString stateOverride) {
-    QString shellId,
-    QString pathId,
-    QString dataOverride,
-    QString stateOverride,
-    QString cacheOverride
-) {
 	auto* instance = QsPaths::instance();
 	instance->shellId = std::move(shellId);
 	instance->pathId = std::move(pathId);
 	instance->shellDataOverride = std::move(dataOverride);
 	instance->shellStateOverride = std::move(stateOverride);
-	instance->shellCacheOverride = std::move(cacheOverride);
 }
 
 QDir QsPaths::crashDir(const QString& id) {
@@ -64,7 +57,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;
 		}
 
@@ -175,8 +168,7 @@ void QsPaths::linkRunDir() {
 		auto* shellDir = this->shellRunDir();
 
 		if (!shellDir) {
-			qCCritical(
+			qCCritical(logPaths
-			    logPaths
 			) << "Could not create by-id symlink as the shell runtime path could not be created.";
 		} else {
 			auto shellPath = shellDir->filePath(runDir->dirName());
@@ -324,16 +316,9 @@ QDir QsPaths::shellStateDir() {
 
 QDir QsPaths::shellCacheDir() {
 	if (this->shellCacheState == DirState::Unknown) {
-		QDir dir;
+		auto dir = QDir(QStandardPaths::writableLocation(QStandardPaths::CacheLocation));
-		if (this->shellCacheOverride.isEmpty()) {
-			dir = QDir(QStandardPaths::writableLocation(QStandardPaths::CacheLocation));
 		dir = QDir(dir.filePath("by-shell"));
 		dir = QDir(dir.filePath(this->shellId));
-		} else {
-			auto basedir = QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation);
-			dir = QDir(this->shellCacheOverride.replace("$BASE", basedir));
-		}
-
 		this->mShellCacheDir = dir;
 
 		qCDebug(logPaths) << "Initialized cache path:" << dir.path();
@@ -361,7 +346,7 @@ void QsPaths::createLock() {
 			return;
 		}
 
-		struct flock lock = {
+		auto lock = flock {
 		    .l_type = F_WRLCK,
 		    .l_whence = SEEK_SET,
 		    .l_start = 0,
@@ -379,8 +364,7 @@ void QsPaths::createLock() {
 			qCDebug(logPaths) << "Created instance lock at" << path;
 		}
 	} else {
-		qCCritical(
+		qCCritical(logPaths
-		    logPaths
 		) << "Could not create instance lock, as the instance runtime directory could not be created.";
 	}
 }
@@ -389,7 +373,7 @@ bool QsPaths::checkLock(const QString& path, InstanceLockInfo* info, bool allowD
 	auto file = QFile(QDir(path).filePath("instance.lock"));
 	if (!file.open(QFile::ReadOnly)) return false;
 
-	struct flock lock = {
+	auto lock = flock {
 	    .l_type = F_WRLCK,
 	    .l_whence = SEEK_SET,
 	    .l_start = 0,
@@ -413,7 +397,7 @@ bool QsPaths::checkLock(const QString& path, InstanceLockInfo* info, bool allowD
 }
 
 QPair<QVector<InstanceLockInfo>, QVector<InstanceLockInfo>>
-QsPaths::collectInstances(const QString& path, const QString& display) {
+QsPaths::collectInstances(const QString& path) {
 	qCDebug(logPaths) << "Collecting instances from" << path;
 	auto liveInstances = QVector<InstanceLockInfo>();
 	auto deadInstances = QVector<InstanceLockInfo>();
@@ -427,11 +411,6 @@ QsPaths::collectInstances(const QString& path, const QString& display) {
 			qCDebug(logPaths).nospace() << "Found instance " << info.instance.instanceId << " (pid "
 			                            << info.pid << ") at " << path;
 
-			if (!display.isEmpty() && info.instance.display != display) {
-				qCDebug(logPaths) << "Skipped instance with mismatched display at" << path;
-				continue;
-			}
-
 			if (info.pid == -1) {
 				deadInstances.push_back(info);
 			} else {

src/core/paths.hpp

@@ -17,20 +17,14 @@ QDataStream& operator>>(QDataStream& stream, InstanceLockInfo& info);
 class QsPaths {
 public:
 	static QsPaths* instance();
-	static void init(
+	static void init(QString shellId, QString pathId, QString dataOverride, QString stateOverride);
-	    QString shellId,
-	    QString pathId,
-	    QString dataOverride,
-	    QString stateOverride,
-	    QString cacheOverride
-	);
 	static QDir crashDir(const QString& id);
 	static QString basePath(const QString& id);
 	static QString ipcPath(const QString& id);
 	static bool
 	checkLock(const QString& path, InstanceLockInfo* info = nullptr, bool allowDead = false);
 	static QPair<QVector<InstanceLockInfo>, QVector<InstanceLockInfo>>
-	collectInstances(const QString& path, const QString& display);
+	collectInstances(const QString& path);
 
 	QDir* baseRunDir();
 	QDir* shellRunDir();
@@ -71,5 +65,4 @@ private:
 
 	QString shellDataOverride;
 	QString shellStateOverride;
-	QString shellCacheOverride;
 };

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 {
@@ -27,7 +28,7 @@ void PopupAnchor::markClean() { this->lastState = this->state; }
 void PopupAnchor::markDirty() { this->lastState.reset(); }
 
 QWindow* PopupAnchor::backingWindow() const {
-	return this->bProxyWindow ? this->bProxyWindow->backingWindow() : nullptr;
+	return this->mProxyWindow ? this->mProxyWindow->backingWindow() : nullptr;
 }
 
 void PopupAnchor::setWindowInternal(QObject* window) {
@@ -35,12 +36,14 @@ void PopupAnchor::setWindowInternal(QObject* window) {
 
 	if (this->mWindow) {
 		QObject::disconnect(this->mWindow, nullptr, this, nullptr);
-		QObject::disconnect(this->bProxyWindow, nullptr, this, nullptr);
+		QObject::disconnect(this->mProxyWindow, nullptr, this, nullptr);
 	}
 
 	if (window) {
-		if (auto* proxy = ProxyWindowBase::forObject(window)) {
+		if (auto* proxy = qobject_cast<ProxyWindowBase*>(window)) {
-			this->bProxyWindow = proxy;
+			this->mProxyWindow = proxy;
+		} else if (auto* interface = qobject_cast<WindowInterface*>(window)) {
+			this->mProxyWindow = interface->proxyWindow();
 		} else {
 			qWarning() << "Tried to set popup anchor window to" << window
 			           << "which is not a quickshell window.";
@@ -52,7 +55,7 @@ void PopupAnchor::setWindowInternal(QObject* window) {
 		QObject::connect(this->mWindow, &QObject::destroyed, this, &PopupAnchor::onWindowDestroyed);
 
 		QObject::connect(
-		    this->bProxyWindow,
+		    this->mProxyWindow,
 		    &ProxyWindowBase::backerVisibilityChanged,
 		    this,
 		    &PopupAnchor::backingWindowVisibilityChanged
@@ -67,7 +70,7 @@ void PopupAnchor::setWindowInternal(QObject* window) {
 setnull:
 	if (this->mWindow) {
 		this->mWindow = nullptr;
-		this->bProxyWindow = nullptr;
+		this->mProxyWindow = nullptr;
 
 		emit this->windowChanged();
 		emit this->backingWindowVisibilityChanged();
@@ -97,7 +100,7 @@ void PopupAnchor::setItem(QQuickItem* item) {
 
 void PopupAnchor::onWindowDestroyed() {
 	this->mWindow = nullptr;
-	this->bProxyWindow = nullptr;
+	this->mProxyWindow = nullptr;
 	emit this->windowChanged();
 	emit this->backingWindowVisibilityChanged();
 }
@@ -183,11 +186,11 @@ void PopupAnchor::updatePlacement(const QPoint& anchorpoint, const QSize& size)
 }
 
 void PopupAnchor::updateAnchor() {
-	if (this->mItem && this->bProxyWindow) {
+	if (this->mItem && this->mProxyWindow) {
 		auto baseRect =
 		    this->mUserRect.isEmpty() ? this->mItem->boundingRect() : this->mUserRect.qrect();
 
-		auto rect = this->bProxyWindow->contentItem()->mapFromItem(
+		auto rect = this->mProxyWindow->contentItem()->mapFromItem(
 		    this->mItem,
 		    baseRect.marginsRemoved(this->mMargins.qmargins())
 		);

src/core/popupanchor.hpp

@@ -6,7 +6,6 @@
 #include <qnamespace.h>
 #include <qobject.h>
 #include <qpoint.h>
-#include <qproperty.h>
 #include <qqmlintegration.h>
 #include <qquickitem.h>
 #include <qsize.h>
@@ -140,9 +139,7 @@ public:
 	void markDirty();
 
 	[[nodiscard]] QObject* window() const { return this->mWindow; }
-	[[nodiscard]] QBindable<ProxyWindowBase*> bindableProxyWindow() const {
+	[[nodiscard]] ProxyWindowBase* proxyWindow() const { return this->mProxyWindow; }
-		return &this->bProxyWindow;
-	}
 	[[nodiscard]] QWindow* backingWindow() const;
 	void setWindowInternal(QObject* window);
 	void setWindow(QObject* window);
@@ -196,12 +193,11 @@ private slots:
 private:
 	QObject* mWindow = nullptr;
 	QQuickItem* mItem = nullptr;
+	ProxyWindowBase* mProxyWindow = nullptr;
 	PopupAnchorState state;
 	Box mUserRect;
 	Margins mMargins;
 	std::optional<PopupAnchorState> lastState;
-
-	Q_OBJECT_BINDABLE_PROPERTY(PopupAnchor, ProxyWindowBase*, bProxyWindow);
 };
 
 class PopupPositioner {

src/core/qmlglobal.cpp

@@ -26,11 +26,9 @@
 #include "../io/processcore.hpp"
 #include "generation.hpp"
 #include "iconimageprovider.hpp"
-#include "instanceinfo.hpp"
 #include "paths.hpp"
 #include "qmlscreen.hpp"
 #include "rootwrapper.hpp"
-#include "scanenv.hpp"
 
 QuickshellSettings::QuickshellSettings() {
 	QObject::connect(
@@ -61,9 +59,7 @@ void QuickshellSettings::setWorkingDirectory(QString workingDirectory) { // NOLI
 	emit this->workingDirectoryChanged();
 }
 
-bool QuickshellSettings::watchFiles() const {
+bool QuickshellSettings::watchFiles() const { return this->mWatchFiles; }
-	return this->mWatchFiles && qEnvironmentVariableIsEmpty("QS_DISABLE_FILE_WATCHER");
-}
 
 void QuickshellSettings::setWatchFiles(bool watchFiles) {
 	if (watchFiles == this->mWatchFiles) return;
@@ -154,22 +150,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();
 }
@@ -333,16 +313,6 @@ QString QuickshellGlobal::iconPath(const QString& icon, const QString& fallback)
 	return IconImageProvider::requestString(icon, "", fallback);
 }
 
-bool QuickshellGlobal::hasThemeIcon(const QString& icon) { return QIcon::hasThemeIcon(icon); }
-
-bool QuickshellGlobal::hasVersion(qint32 major, qint32 minor, const QStringList& features) {
-	return qs::scan::env::PreprocEnv::hasVersion(major, minor, features);
-}
-
-bool QuickshellGlobal::hasVersion(qint32 major, qint32 minor) {
-	return QuickshellGlobal::hasVersion(major, minor, QStringList());
-}
-
 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.
@@ -143,21 +127,18 @@ class QuickshellGlobal: public QObject {
 	/// Usually `~/.local/share/quickshell/by-shell/<shell-id>`
 	///
 	/// Can be overridden using `//@ pragma DataDir $BASE/path` in the root qml file, where `$BASE`
-	/// corresponds to `$XDG_DATA_HOME` (usually `~/.local/share`).
+	/// corrosponds to `$XDG_DATA_HOME` (usually `~/.local/share`).
 	Q_PROPERTY(QString dataDir READ dataDir CONSTANT);
 	/// The per-shell state directory.
 	///
 	/// Usually `~/.local/state/quickshell/by-shell/<shell-id>`
 	///
 	/// Can be overridden using `//@ pragma StateDir $BASE/path` in the root qml file, where `$BASE`
-	/// corresponds to `$XDG_STATE_HOME` (usually `~/.local/state`).
+	/// corrosponds to `$XDG_STATE_HOME` (usually `~/.local/state`).
 	Q_PROPERTY(QString stateDir READ stateDir CONSTANT);
 	/// The per-shell cache directory.
 	///
 	/// Usually `~/.cache/quickshell/by-shell/<shell-id>`
-	///
-	/// Can be overridden using `//@ pragma CacheDir $BASE/path` in the root qml file, where `$BASE`
-	/// corresponds to `$XDG_CACHE_HOME` (usually `~/.cache`).
 	Q_PROPERTY(QString cacheDir READ cacheDir CONSTANT);
 	// clang-format on
 	QML_SINGLETON;
@@ -165,10 +146,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();
 
@@ -222,8 +199,6 @@ public:
 	/// Setting the `fallback` parameter of `iconPath` will attempt to load the fallback
 	/// icon if the requested one could not be loaded.
 	Q_INVOKABLE static QString iconPath(const QString& icon, const QString& fallback);
-	/// Check if specified icon has an available icon in your icon theme
-	Q_INVOKABLE static bool hasThemeIcon(const QString& icon);
 	/// Equivalent to `${Quickshell.configDir}/${path}`
 	Q_INVOKABLE [[nodiscard]] QString shellPath(const QString& path) const;
 	/// > [!WARNING] Deprecated: Renamed to @@shellPath() for clarity.
@@ -239,21 +214,6 @@ public:
 	///
 	/// The popup can also be blocked by setting `QS_NO_RELOAD_POPUP=1`.
 	Q_INVOKABLE void inhibitReloadPopup() { this->mInhibitReloadPopup = true; }
-	/// Check if Quickshell's version is at least `major.minor` and the listed
-	/// unreleased features are available. If Quickshell is newer than the given version
-	/// it is assumed that all unreleased features are present. The unreleased feature list
-	/// may be omitted.
-	///
-	/// > [!NOTE] You can feature gate code blocks using Quickshell's preprocessor which
-	/// > has the same function available.
-	/// >
-	/// > ```qml
-	/// > //@ if hasVersion(0, 3, ["feature"])
-	/// > ...
-	/// > //@ endif
-	/// > ```
-	Q_INVOKABLE static bool hasVersion(qint32 major, qint32 minor, const QStringList& features);
-	Q_INVOKABLE static bool hasVersion(qint32 major, qint32 minor);
 
 	void clearReloadPopupInhibit() { this->mInhibitReloadPopup = false; }
 	[[nodiscard]] bool isReloadPopupInhibited() const { return this->mInhibitReloadPopup; }

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);
 	}

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/rootwrapper.cpp

@@ -63,6 +63,9 @@ void RootWrapper::reloadGraph(bool hard) {
 	qs::core::QmlToolingSupport::updateTooling(rootPath, scanner);
 	this->configDirWatcher.addPath(rootPath.path());
 
+	auto* generation = new EngineGeneration(rootPath, std::move(scanner));
+	generation->wrapper = this;
+
 	// todo: move into EngineGeneration
 	if (this->generation != nullptr) {
 		qInfo() << "Reloading configuration...";
@@ -71,33 +74,6 @@ void RootWrapper::reloadGraph(bool hard) {
 
 	QDir::setCurrent(this->originalWorkingDirectory);
 
-	if (!scanner.scanErrors.isEmpty()) {
-		qCritical() << "Failed to load configuration";
-		QString errorString = "Failed to load configuration";
-		for (auto& error: scanner.scanErrors) {
-			const auto& file = error.file;
-			QString rel;
-			if (file.startsWith(rootPath.path() % '/')) {
-				rel = '@' % file.sliced(rootPath.path().length() + 1);
-			} else {
-				rel = file;
-			}
-
-			auto msg = "  error in " % rel % '[' % QString::number(error.line) % ":0]: " % error.message;
-			errorString += '\n' % msg;
-			qCritical().noquote() << msg;
-		}
-
-		if (this->generation != nullptr && this->generation->qsgInstance != nullptr) {
-			emit this->generation->qsgInstance->reloadFailed(errorString);
-		}
-
-		return;
-	}
-
-	auto* generation = new EngineGeneration(rootPath, std::move(scanner));
-	generation->wrapper = this;
-
 	QUrl url;
 	url.setScheme("qs");
 	url.setPath("@/qs/" % rootFile.fileName());

src/core/scan.cpp

@@ -1,12 +1,9 @@
 #include "scan.hpp"
 #include <cmath>
-#include <utility>
 
 #include <qcontainerfwd.h>
-#include <qcryptographichash.h>
 #include <qdir.h>
 #include <qfileinfo.h>
-#include <qjsengine.h>
 #include <qjsonarray.h>
 #include <qjsondocument.h>
 #include <qjsonobject.h>
@@ -15,39 +12,19 @@
 #include <qloggingcategory.h>
 #include <qpair.h>
 #include <qstring.h>
+#include <qstringliteral.h>
 #include <qtextstream.h>
 
 #include "logcat.hpp"
-#include "scanenv.hpp"
 
 QS_LOGGING_CATEGORY(logQmlScanner, "quickshell.qmlscanner", QtWarningMsg);
 
-bool QmlScanner::readAndHashFile(const QString& path, QByteArray& data) {
+void QmlScanner::scanDir(const QString& path) {
-	auto file = QFile(path);
+	if (this->scannedDirs.contains(path)) return;
-	if (!file.open(QFile::ReadOnly)) return false;
+	this->scannedDirs.push_back(path);
-	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);
-
-	const auto& path = dir.path();
 
 	qCDebug(logQmlScanner) << "Scanning directory" << path;
+	auto dir = QDir(path);
 
 	struct Entry {
 		QString name;
@@ -60,8 +37,7 @@ void QmlScanner::scanDir(const QDir& dir) {
 
 	for (auto& name: dir.entryList(QDir::Files | QDir::NoDotAndDotDot)) {
 		if (name == "qmldir") {
-			qCDebug(
+			qCDebug(logQmlScanner
-			    logQmlScanner
 			) << "Found qmldir file, qmldir synthesization will be disabled for directory"
 			  << path;
 			seenQmldir = true;
@@ -129,36 +105,21 @@ bool QmlScanner::scanQmlFile(const QString& path, bool& singleton, bool& interna
 
 	qCDebug(logQmlScanner) << "Scanning qml file" << path;
 
-	QByteArray fileData;
+	auto file = QFile(path);
-	if (!this->readAndHashFile(path, fileData)) {
+	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;
-	auto ifScopes = QVector<bool>();
-	bool sourceMasked = false;
-	int lineNum = 0;
-	QString overrideText;
-	bool isOverridden = false;
-
-	auto& pragmaEngine = *QmlScanner::preprocEngine();
-
-	auto postError = [&, this](QString error) {
-		this->scanErrors.append({.file = path, .message = std::move(error), .line = lineNum});
-	};
-
 	while (!stream.atEnd()) {
-		++lineNum;
+		auto line = stream.readLine().trimmed();
-		bool hideMask = false;
-		auto rawLine = stream.readLine();
-		auto line = rawLine.trimmed();
-		if (!sourceMasked && inHeader) {
 		if (!singleton && line == "pragma Singleton") {
 			singleton = true;
+		} else if (!internal && line == "//@ pragma Internal") {
+			internal = true;
 		} else if (line.startsWith("import")) {
 			// we dont care about "import qs" as we always load the root folder
 			if (auto importCursor = line.indexOf(" qs."); importCursor != -1) {
@@ -191,63 +152,21 @@ bool QmlScanner::scanQmlFile(const QString& path, bool& singleton, bool& interna
 				auto name = line.sliced(startQuot + 1, endQuot - startQuot - 1);
 				imports.push_back(name);
 			}
-			} else if (!internal && line == "//@ pragma Internal") {
+		} else if (line.contains('{')) break;
-				internal = true;
-			} else if (line.contains('{')) {
-				inHeader = false;
-			}
-		}
-
-		if (line.startsWith("//@ if ")) {
-			auto code = line.sliced(7);
-			auto value = pragmaEngine.evaluate(code, path, 1234);
-			bool mask = true;
-
-			if (value.isError()) {
-				postError(QString("Evaluating if: %0").arg(value.toString()));
-			} else if (!value.isBool()) {
-				postError(QString("If expression \"%0\" is not a boolean").arg(value.toString()));
-			} else if (value.toBool()) {
-				mask = false;
-			}
-			if (!sourceMasked && mask) hideMask = true;
-			mask = sourceMasked || mask; // cant unmask if a nested if passes
-			ifScopes.append(mask);
-			if (mask) isOverridden = true;
-			sourceMasked = mask;
-		} else if (line.startsWith("//@ endif")) {
-			if (ifScopes.isEmpty()) {
-				postError("endif without matching if");
-			} else {
-				ifScopes.pop_back();
-
-				if (ifScopes.isEmpty()) sourceMasked = false;
-				else sourceMasked = ifScopes.last();
-			}
-		}
-
-		if (!hideMask && sourceMasked) overrideText.append("// MASKED: " % rawLine % '\n');
-		else overrideText.append(rawLine % '\n');
 
 	next:;
 	}
 
-	if (!ifScopes.isEmpty()) {
+	file.close();
-		postError("unclosed preprocessor if block");
-	}
-
-	if (isOverridden) {
-		this->fileIntercepts.insert(path, overrideText);
-	}
 
 	if (logQmlScanner().isDebugEnabled() && !imports.isEmpty()) {
 		qCDebug(logQmlScanner) << "Found imports" << imports;
 	}
 
-	auto currentdir = QDir(QFileInfo(path).absolutePath());
+	auto currentdir = QDir(QFileInfo(path).canonicalPath());
 
 	// the root can never be a singleton so it dosent matter if we skip it
-	this->scanDir(currentdir);
+	this->scanDir(currentdir.path());
 
 	for (auto& import: imports) {
 		QString ipath;
@@ -260,9 +179,9 @@ bool QmlScanner::scanQmlFile(const QString& path, bool& singleton, bool& interna
 		}
 
 		auto pathInfo = QFileInfo(ipath);
-		auto cpath = pathInfo.absoluteFilePath();
+		auto cpath = pathInfo.canonicalFilePath();
 
-		if (!pathInfo.exists()) {
+		if (cpath.isEmpty()) {
 			qCWarning(logQmlScanner) << "Ignoring unresolvable import" << ipath << "from" << path;
 			continue;
 		}
@@ -272,11 +191,8 @@ bool QmlScanner::scanQmlFile(const QString& path, bool& singleton, bool& interna
 			continue;
 		}
 
-		if (import.endsWith(".js")) {
+		if (import.endsWith(".js")) this->scannedFiles.push_back(cpath);
-			this->scannedFiles.push_back(cpath);
+		else this->scanDir(cpath);
-			QByteArray jsData;
-			this->readAndHashFile(cpath, jsData);
-		} else this->scanDir(cpath);
 	}
 
 	return true;
@@ -291,12 +207,14 @@ void QmlScanner::scanQmlRoot(const QString& path) {
 bool QmlScanner::scanQmlJson(const QString& path) {
 	qCDebug(logQmlScanner) << "Scanning qml.json file" << path;
 
-	QByteArray data;
+	auto file = QFile(path);
-	if (!this->readAndHashFile(path, data)) {
+	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 +285,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>
 
@@ -18,31 +16,19 @@ public:
 	QmlScanner() = default;
 	QmlScanner(const QDir& rootPath): rootPath(rootPath) {}
 
-	void scanDir(const QDir& dir);
+	// path must be canonical
+	void scanDir(const QString& path);
+
 	void scanQmlRoot(const QString& path);
 
-	QVector<QDir> scannedDirs;
+	QVector<QString> scannedDirs;
 	QVector<QString> scannedFiles;
-	QHash<QString, QByteArray> fileHashes;
 	QHash<QString, QString> fileIntercepts;
 
-	struct ScanError {
-		QString file;
-		QString message;
-		int line;
-	};
-
-	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

@@ -1,31 +0,0 @@
-#include "scanenv.hpp"
-
-#include <qcontainerfwd.h>
-#include <qtenvironmentvariables.h>
-
-#include "build.hpp"
-
-namespace qs::scan::env {
-
-bool PreprocEnv::hasVersion(int major, int minor, const QStringList& features) {
-	if (QS_VERSION_MAJOR > major) return true;
-	if (QS_VERSION_MAJOR == major && QS_VERSION_MINOR > minor) return true;
-
-	auto availFeatures = QString(QS_UNRELEASED_FEATURES).split(';');
-
-	for (const auto& feature: features) {
-		if (!availFeatures.contains(feature)) return false;
-	}
-
-	return QS_VERSION_MAJOR == major && QS_VERSION_MINOR == minor;
-}
-
-QString PreprocEnv::env(const QString& variable) {
-	return qEnvironmentVariable(variable.toStdString().c_str());
-}
-
-bool PreprocEnv::isEnvSet(const QString& variable) {
-	return qEnvironmentVariableIsSet(variable.toStdString().c_str());
-}
-
-} // namespace qs::scan::env

src/core/scanenv.hpp

@@ -1,20 +0,0 @@
-#pragma once
-
-#include <qcontainerfwd.h>
-#include <qobject.h>
-#include <qtmetamacros.h>
-
-namespace qs::scan::env {
-
-class PreprocEnv: public QObject {
-	Q_OBJECT;
-
-public:
-	Q_INVOKABLE static bool
-	hasVersion(int major, int minor, const QStringList& features = QStringList());
-
-	Q_INVOKABLE static QString env(const QString& variable);
-	Q_INVOKABLE static bool isEnvSet(const QString& variable);
-};
-
-} // namespace qs::scan::env

src/core/scriptmodel.cpp

@@ -19,7 +19,7 @@ void ScriptModel::updateValuesUnique(const QVariantList& newValues) {
 	auto newIter = newValues.begin();
 
 	// TODO: cache this
-	auto getCmpKey = [this](const QVariant& v) {
+	auto getCmpKey = [&](const QVariant& v) {
 		if (v.canConvert<QVariantMap>()) {
 			auto vMap = v.value<QVariantMap>();
 			if (vMap.contains(this->cmpKey)) {
@@ -30,7 +30,7 @@ void ScriptModel::updateValuesUnique(const QVariantList& newValues) {
 		return v;
 	};
 
-	auto variantCmp = [&, this](const QVariant& a, const QVariant& b) {
+	auto variantCmp = [&](const QVariant& a, const QVariant& b) {
 		if (!this->cmpKey.isEmpty()) return getCmpKey(a) == getCmpKey(b);
 		else return a == b;
 	};
@@ -72,8 +72,8 @@ void ScriptModel::updateValuesUnique(const QVariantList& newValues) {
 					do {
 						++iter;
 					} while (iter != this->mValues.end()
-					         && std::find_if(newIter, newValues.end(), eqPredicate(*iter))
+					         && std::find_if(newIter, newValues.end(), eqPredicate(*iter)) == newValues.end()
-					                == newValues.end());
+					);
 
 					auto index = static_cast<qint32>(std::distance(this->mValues.begin(), iter));
 					auto startIndex = static_cast<qint32>(std::distance(this->mValues.begin(), startIter));

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/toolsupport.cpp

@@ -54,7 +54,7 @@ bool QmlToolingSupport::lockTooling() {
 		return false;
 	}
 
-	struct flock lock = {
+	auto lock = flock {
 	    .l_type = F_WRLCK,
 	    .l_whence = SEEK_SET, // NOLINT (fcntl.h??)
 	    .l_start = 0,
@@ -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/util.hpp

@@ -29,7 +29,7 @@ struct StringLiteral16 {
 	}
 
 	[[nodiscard]] constexpr const QChar* qCharPtr() const noexcept {
-		return std::bit_cast<const QChar*>(&this->value); // NOLINT
+		return std::bit_cast<const QChar*>(&this->value);
 	}
 
 	[[nodiscard]] Q_ALWAYS_INLINE operator QString() const noexcept {
@@ -251,6 +251,37 @@ public:
 	GuardedEmitBlocker block() { return GuardedEmitBlocker(&this->blocked); }
 };
 
+template <auto member, auto destroyedSlot, auto changedSignal>
+class SimpleObjectHandleOps {
+	using Traits = MemberPointerTraits<decltype(member)>;
+
+public:
+	static bool setObject(Traits::Class* parent, Traits::Type value) {
+		if (value == parent->*member) return false;
+
+		if (parent->*member != nullptr) {
+			QObject::disconnect(parent->*member, &QObject::destroyed, parent, destroyedSlot);
+		}
+
+		parent->*member = value;
+
+		if (value != nullptr) {
+			QObject::connect(parent->*member, &QObject::destroyed, parent, destroyedSlot);
+		}
+
+		if constexpr (changedSignal != nullptr) {
+			emit(parent->*changedSignal)();
+		}
+
+		return true;
+	}
+};
+
+template <auto member, auto destroyedSlot, auto changedSignal = nullptr>
+bool setSimpleObjectHandle(auto* parent, auto* value) {
+	return SimpleObjectHandleOps<member, destroyedSlot, changedSignal>::setObject(parent, value);
+}
+
 template <auto methodPtr>
 class MethodFunctor {
 	using PtrMeta = MemberPointerTraits<decltype(methodPtr)>;

src/crash/CMakeLists.txt

@@ -6,51 +6,12 @@ qt_add_library(quickshell-crash STATIC
 
 qs_pch(quickshell-crash SET large)
 
-if (VENDOR_CPPTRACE)
+find_package(PkgConfig REQUIRED)
-	message(STATUS "Vendoring cpptrace...")
+pkg_check_modules(breakpad REQUIRED IMPORTED_TARGET breakpad)
-	include(FetchContent)
+# only need client?? take only includes from pkg config todo
-
+target_link_libraries(quickshell-crash PRIVATE PkgConfig::breakpad -lbreakpad_client)
-	# For use without internet access see: https://cmake.org/cmake/help/latest/module/FetchContent.html#variable:FETCHCONTENT_SOURCE_DIR_%3CuppercaseName%3E
-	FetchContent_Declare(
-  	cpptrace
-  	GIT_REPOSITORY https://github.com/jeremy-rifkin/cpptrace.git
-  	GIT_TAG        v1.0.4
-	)
-
-	set(CPPTRACE_UNWIND_WITH_LIBUNWIND TRUE)
-	FetchContent_MakeAvailable(cpptrace)
-else ()
-	find_package(cpptrace REQUIRED)
-
-	# useful for cross after you have already checked cpptrace is built correctly
-	if (NOT DO_NOT_CHECK_CPPTRACE_USABILITY)
-		try_run(CPPTRACE_SIGNAL_SAFE_UNWIND CPPTRACE_SIGNAL_SAFE_UNWIND_COMP
-			SOURCE_FROM_CONTENT check.cxx "
-				#include <cpptrace/basic.hpp>
-				int main() {
-					return cpptrace::can_signal_safe_unwind() ? 0 : 1;
-				}
-			"
-			LOG_DESCRIPTION "Checking ${CPPTRACE_SIGNAL_SAFE_UNWIND}"
-			LINK_LIBRARIES cpptrace::cpptrace
-			COMPILE_OUTPUT_VARIABLE CPPTRACE_SIGNAL_SAFE_UNWIND_LOG
-			CXX_STANDARD 20
-			CXX_STANDARD_REQUIRED ON
-		)
-
-		if (NOT CPPTRACE_SIGNAL_SAFE_UNWIND_COMP)
-			message(STATUS "${CPPTRACE_SIGNAL_SAFE_UNWIND_LOG}")
-			message(FATAL_ERROR "Failed to compile cpptrace signal safe unwind tester.")
-		endif()
-
-		if (NOT CPPTRACE_SIGNAL_SAFE_UNWIND EQUAL 0)
-			message(STATUS "Cpptrace signal safe unwind test exited with: ${CPPTRACE_SIGNAL_SAFE_UNWIND}")
-			message(FATAL_ERROR "Cpptrace was built without CPPTRACE_UNWIND_WITH_LIBUNWIND set to true. Enable libunwind support in the package or set VENDOR_CPPTRACE to true when building Quickshell.")
-		endif()
-	endif ()
-endif ()
 
 # quick linked for pch compat
-target_link_libraries(quickshell-crash PRIVATE quickshell-build Qt::Quick Qt::Widgets cpptrace::cpptrace)
+target_link_libraries(quickshell-crash PRIVATE quickshell-build Qt::Quick Qt::Widgets)
 
 target_link_libraries(quickshell PRIVATE quickshell-crash)

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 <bits/types/sigset_t.h>
-#include <cpptrace/forward.hpp>
+#include <breakpad/client/linux/handler/exception_handler.h>
-#include <cpptrace/utils.hpp>
+#include <breakpad/client/linux/handler/minidump_descriptor.h>
+#include <breakpad/common/linux/linux_libc_support.h>
 #include <qdatastream.h>
 #include <qfile.h>
 #include <qlogging.h>
@@ -22,78 +19,92 @@
 
 extern char** environ; // NOLINT
 
+using namespace google_breakpad;
+
 namespace qs::crash {
 
 namespace {
-
 QS_LOGGING_CATEGORY(logCrashHandler, "quickshell.crashhandler", QtWarningMsg);
+}
 
-void writeEnvInt(char* buf, const char* name, int value) {
+struct CrashHandlerPrivate {
-	// NOLINTBEGIN (cppcoreguidelines-pro-bounds-pointer-arithmetic)
+	ExceptionHandler* exceptionHandler = nullptr;
-	while (*name != '\0') *buf++ = *name++;
+	int minidumpFd = -1;
-	*buf++ = '=';
+	int infoFd = -1;
 
-	if (value < 0) {
+	static bool minidumpCallback(const MinidumpDescriptor& descriptor, void* context, bool succeeded);
-		*buf++ = '-';
+};
-		value = -value;
+
+CrashHandler::CrashHandler(): d(new CrashHandlerPrivate()) {}
+
+void CrashHandler::init() {
+	// MinidumpDescriptor has no move constructor and the copy constructor breaks fds.
+	auto createHandler = [this](const MinidumpDescriptor& desc) {
+		this->d->exceptionHandler = new ExceptionHandler(
+		    desc,
+		    nullptr,
+		    &CrashHandlerPrivate::minidumpCallback,
+		    this->d,
+		    true,
+		    -1
+		);
+	};
+
+	qCDebug(logCrashHandler) << "Starting crash handler...";
+
+	this->d->minidumpFd = memfd_create("quickshell:minidump", MFD_CLOEXEC);
+
+	if (this->d->minidumpFd == -1) {
+		qCCritical(logCrashHandler
+		) << "Failed to allocate minidump memfd, minidumps will be saved in the working directory.";
+		createHandler(MinidumpDescriptor("."));
+	} else {
+		qCDebug(logCrashHandler) << "Created memfd" << this->d->minidumpFd
+		                         << "for holding possible minidumps.";
+		createHandler(MinidumpDescriptor(this->d->minidumpFd));
 	}
 
-	if (value == 0) {
+	qCInfo(logCrashHandler) << "Crash handler initialized.";
-		*buf++ = '0';
+}
-		*buf = '\0';
+
+void CrashHandler::setRelaunchInfo(const RelaunchInfo& info) {
+	this->d->infoFd = memfd_create("quickshell:instance_info", MFD_CLOEXEC);
+
+	if (this->d->infoFd == -1) {
+		qCCritical(logCrashHandler
+		) << "Failed to allocate instance info memfd, crash recovery will not work.";
 		return;
 	}
 
-	auto* start = buf;
+	QFile file;
-	while (value > 0) {
+	file.open(this->d->infoFd, QFile::ReadWrite);
-		*buf++ = static_cast<char>('0' + (value % 10));
-		value /= 10;
-	}
 
-	*buf = '\0';
+	QDataStream ds(&file);
-	std::reverse(start, buf);
+	ds << info;
-	// NOLINTEND
+	file.flush();
+
+	qCDebug(logCrashHandler) << "Stored instance info in memfd" << this->d->infoFd;
 }
 
-void signalHandler(
+CrashHandler::~CrashHandler() {
-    int sig,
+	delete this->d->exceptionHandler;
-    siginfo_t* /*info*/, // NOLINT (misc-include-cleaner)
+	delete this->d;
-    void*                /*context*/
+}
+
+bool CrashHandlerPrivate::minidumpCallback(
+    const MinidumpDescriptor& /*descriptor*/,
+    void* context,
+    bool /*success*/
 ) {
-	// NOLINTBEGIN (misc-include-cleaner)
+	// A fork that just dies to ensure the coredump is caught by the system.
-	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);
-
-		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
-			}
-		}
-
-	fail:;
-	}
-
-	// TODO: coredump fork and crash reporter remain as zombies, fix
 	auto coredumpPid = fork();
+
 	if (coredumpPid == 0) {
-		raise(sig);
+		return false;
-		_exit(-1);
 	}
 
+	auto* self = static_cast<CrashHandlerPrivate*>(context);
+
 	auto exe = std::array<char, 4096>();
 	if (readlink("/proc/self/exe", exe.data(), exe.size() - 1) == -1) {
 		perror("Failed to find crash reporter executable.\n");
@@ -105,19 +116,17 @@ void signalHandler(
 	auto env = std::array<char*, 4096>();
 	auto envi = 0;
 
-	// dup to remove CLOEXEC
+	auto infoFd = dup(self->infoFd);
-	auto infoFdStr = std::array<char, 48>();
+	auto infoFdStr = std::array<char, 38>();
-	writeEnvInt(infoFdStr.data(), "__QUICKSHELL_CRASH_INFO_FD", dup(CrashInfo::INSTANCE.infoFd));
+	memcpy(infoFdStr.data(), "__QUICKSHELL_CRASH_INFO_FD=-1" /*\0*/, 30);
+	if (infoFd != -1) my_uitos(&infoFdStr[27], infoFd, 10);
 	env[envi++] = infoFdStr.data();
 
-	auto corePidStr = std::array<char, 48>();
+	auto corePidStr = std::array<char, 39>();
-	writeEnvInt(corePidStr.data(), "__QUICKSHELL_CRASH_DUMP_PID", coredumpPid);
+	memcpy(corePidStr.data(), "__QUICKSHELL_CRASH_DUMP_PID=-1" /*\0*/, 31);
+	if (coredumpPid != -1) my_uitos(&corePidStr[28], coredumpPid, 10);
 	env[envi++] = corePidStr.data();
 
-	auto sigStr = std::array<char, 48>();
-	writeEnvInt(sigStr.data(), "__QUICKSHELL_CRASH_SIGNAL", sig);
-	env[envi++] = sigStr.data();
-
 	auto populateEnv = [&]() {
 		auto senvi = 0;
 		while (envi != 4095) {
@@ -129,17 +138,30 @@ void signalHandler(
 		env[envi] = nullptr;
 	};
 
+	sigset_t sigset;
+	sigemptyset(&sigset);                       // NOLINT (include)
+	sigprocmask(SIG_SETMASK, &sigset, nullptr); // NOLINT
+
 	auto pid = fork();
 
 	if (pid == -1) {
 		perror("Failed to fork and launch crash reporter.\n");
-		_exit(-1);
+		return false;
 	} else if (pid == 0) {
 		// dup to remove CLOEXEC
-		auto dumpFdStr = std::array<char, 48>();
+		// if already -1 will return -1
-		auto logFdStr = std::array<char, 48>();
+		auto dumpFd = dup(self->minidumpFd);
-		writeEnvInt(dumpFdStr.data(), "__QUICKSHELL_CRASH_DUMP_FD", dup(CrashInfo::INSTANCE.traceFd));
+		auto logFd = dup(CrashInfo::INSTANCE.logFd);
-		writeEnvInt(logFdStr.data(), "__QUICKSHELL_CRASH_LOG_FD", dup(CrashInfo::INSTANCE.logFd));
+
+		// allow up to 10 digits, which should never happen
+		auto dumpFdStr = std::array<char, 38>();
+		auto logFdStr = std::array<char, 37>();
+
+		memcpy(dumpFdStr.data(), "__QUICKSHELL_CRASH_DUMP_FD=-1" /*\0*/, 30);
+		memcpy(logFdStr.data(), "__QUICKSHELL_CRASH_LOG_FD=-1" /*\0*/, 29);
+
+		if (dumpFd != -1) my_uitos(&dumpFdStr[27], dumpFd, 10);
+		if (logFd != -1) my_uitos(&logFdStr[26], logFd, 10);
 
 		env[envi++] = dumpFdStr.data();
 		env[envi++] = logFdStr.data();
@@ -156,99 +178,8 @@ void signalHandler(
 		perror("Failed to relaunch quickshell.\n");
 		_exit(-1);
 	}
-}
 
-void handleCppTerminate() {
+	return false; // should make sure it hits the system coredump handler
-	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() {
-	qCDebug(logCrashHandler) << "Starting crash handler...";
-
-	CrashInfo::INSTANCE.traceFd = memfd_create("quickshell:trace", MFD_CLOEXEC);
-
-	if (CrashInfo::INSTANCE.traceFd == -1) {
-		qCCritical(logCrashHandler) << "Failed to allocate trace memfd, stack traces will not be "
-		                               "available in crash reports.";
-	} else {
-		qCDebug(logCrashHandler) << "Created memfd" << CrashInfo::INSTANCE.traceFd
-		                         << "for holding possible stack traces.";
-	}
-
-	{
-		// Preload anything dynamically linked to avoid malloc etc in the dynamic loader.
-		// See cpptrace documentation for more information.
-		auto buffer = std::array<cpptrace::frame_ptr, 10>();
-		cpptrace::safe_generate_raw_trace(buffer.data(), buffer.size());
-		auto frame = cpptrace::safe_object_frame();
-		cpptrace::get_safe_object_frame(buffer[0], &frame);
-	}
-
-	// NOLINTBEGIN (misc-include-cleaner)
-
-	// 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);
-
-	// Install signal handlers
-	struct sigaction sa {};
-	sa.sa_sigaction = &signalHandler;
-	sa.sa_flags = SA_SIGINFO | SA_ONSTACK | SA_RESETHAND;
-	sigemptyset(&sa.sa_mask);
-
-	sigaction(SIGSEGV, &sa, nullptr);
-	sigaction(SIGABRT, &sa, nullptr);
-	sigaction(SIGFPE, &sa, nullptr);
-	sigaction(SIGILL, &sa, nullptr);
-	sigaction(SIGBUS, &sa, nullptr);
-	sigaction(SIGTRAP, &sa, nullptr);
-
-	// NOLINTEND (misc-include-cleaner)
-
-	std::set_terminate(&handleCppTerminate);
-
-	qCInfo(logCrashHandler) << "Crash handler initialized.";
-}
-
-void CrashHandler::setRelaunchInfo(const RelaunchInfo& info) {
-	CrashInfo::INSTANCE.infoFd = memfd_create("quickshell:instance_info", MFD_CLOEXEC);
-
-	if (CrashInfo::INSTANCE.infoFd == -1) {
-		qCCritical(
-		    logCrashHandler
-		) << "Failed to allocate instance info memfd, crash recovery will not work.";
-		return;
-	}
-
-	QFile file;
-
-	if (!file.open(CrashInfo::INSTANCE.infoFd, QFile::ReadWrite)) {
-		qCCritical(
-		    logCrashHandler
-		) << "Failed to open instance info memfd, crash recovery will not work.";
-	}
-
-	QDataStream ds(&file);
-	ds << info;
-	file.flush();
-
-	qCDebug(logCrashHandler) << "Stored instance info in memfd" << CrashInfo::INSTANCE.infoFd;
 }
 
 } // namespace qs::crash

src/crash/handler.hpp

@@ -5,10 +5,19 @@
 #include "../core/instanceinfo.hpp"
 namespace qs::crash {
 
+struct CrashHandlerPrivate;
+
 class CrashHandler {
 public:
-	static void init();
+	explicit CrashHandler();
-	static void setRelaunchInfo(const RelaunchInfo& info);
+	~CrashHandler();
+	Q_DISABLE_COPY_MOVE(CrashHandler);
+
+	void init();
+	void setRelaunchInfo(const RelaunchInfo& info);
+
+private:
+	CrashHandlerPrivate* d;
 };
 
 } // namespace qs::crash

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) {
@@ -78,17 +66,22 @@ CrashReporterGui::CrashReporterGui(QString reportFolder, int pid)
 	mainLayout->addSpacing(textHeight);
 
 	if (qtVersionMatches) {
-		mainLayout->addWidget(
+		mainLayout->addWidget(new QLabel("Please open a bug report for this issue via github or email.")
-		    new QLabel("Please open a bug report for this issue on the issue tracker.")
 		);
 	} 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=crash.yml",
+	    this
+	));
+
+	mainLayout->addWidget(new ReportLabel("Email:", "quickshell-bugs@outfoxxed.me", this));
 
 	auto* buttons = new QWidget(this);
 	buttons->setMinimumWidth(900);
@@ -118,5 +111,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=crash.yml")
+	);
+}
+
 void CrashReporterGui::cancel() { QApplication::quit(); }

src/crash/main.cpp

@@ -1,11 +1,9 @@
 #include "main.hpp"
 #include <cerrno>
 #include <cstdlib>
-#include <cstring>
 
-#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 +12,15 @@
 #include <qloggingcategory.h>
 #include <qtenvironmentvariables.h>
 #include <qtextstream.h>
-#include <qtypes.h>
+#include <qtversion.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 "build.hpp"
-#include "../core/ringbuf.hpp"
 #include "interface.hpp"
 
 namespace {
@@ -67,76 +61,6 @@ int tryDup(int fd, const QString& path) {
 	return 0;
 }
 
-QString readRecentLogs(int logFd, int maxLines, qint64 maxAgeSecs) {
-	QFile file;
-	if (!file.open(logFd, QFile::ReadOnly, QFile::AutoCloseHandle)) {
-		return QStringLiteral("(failed to open log fd)\n");
-	}
-
-	file.seek(0);
-
-	qs::log::EncodedLogReader reader;
-	reader.setDevice(&file);
-
-	bool readable = false;
-	quint8 logVersion = 0;
-	quint8 readerVersion = 0;
-	if (!reader.readHeader(&readable, &logVersion, &readerVersion) || !readable) {
-		return QStringLiteral("(failed to read log header)\n");
-	}
-
-	// Read all messages, keeping last maxLines in a ring buffer
-	auto tail = RingBuffer<qs::log::LogMessage>(maxLines);
-	qs::log::LogMessage message;
-	while (reader.read(&message)) {
-		tail.emplace(message);
-	}
-
-	if (tail.size() == 0) {
-		return QStringLiteral("(no logs)\n");
-	}
-
-	// Filter to only messages within maxAgeSecs of the newest message
-	auto cutoff = tail.at(0).time.addSecs(-maxAgeSecs);
-
-	QString result;
-	auto stream = QTextStream(&result);
-	for (auto i = tail.size() - 1; i != -1; i--) {
-		if (tail.at(i).time < cutoff) continue;
-		qs::log::LogMessage::formatMessage(stream, tail.at(i), false, true);
-		stream << '\n';
-	}
-
-	if (result.isEmpty()) {
-		return QStringLiteral("(no recent logs)\n");
-	}
-
-	return result;
-}
-
-cpptrace::stacktrace resolveStacktrace(int dumpFd) {
-	QFile sourceFile;
-	if (!sourceFile.open(dumpFd, QFile::ReadOnly, QFile::AutoCloseHandle)) {
-		qCCritical(logCrashReporter) << "Failed to open trace memfd.";
-		return {};
-	}
-
-	sourceFile.seek(0);
-	auto data = sourceFile.readAll();
-
-	auto frameCount = static_cast<size_t>(data.size()) / sizeof(cpptrace::safe_object_frame);
-	if (frameCount == 0) return {};
-
-	const auto* frames = reinterpret_cast<const cpptrace::safe_object_frame*>(data.constData());
-
-	cpptrace::object_trace objectTrace;
-	for (size_t i = 0; i < frameCount; i++) {
-		objectTrace.frames.push_back(frames[i].resolve()); // NOLINT
-	}
-
-	return objectTrace.resolve();
-}
-
 void recordCrashInfo(const QDir& crashDir, const InstanceInfo& instance) {
 	qCDebug(logCrashReporter) << "Recording crash information at" << crashDir.path();
 
@@ -147,49 +71,74 @@ void recordCrashInfo(const QDir& crashDir, const InstanceInfo& instance) {
 	}
 
 	auto crashProc = qEnvironmentVariable("__QUICKSHELL_CRASH_DUMP_PID").toInt();
-	auto crashSignal = qEnvironmentVariable("__QUICKSHELL_CRASH_SIGNAL").toInt();
 	auto dumpFd = qEnvironmentVariable("__QUICKSHELL_CRASH_DUMP_FD").toInt();
 	auto logFd = qEnvironmentVariable("__QUICKSHELL_CRASH_LOG_FD").toInt();
 
-	qCDebug(logCrashReporter) << "Resolving stacktrace from fd" << dumpFd;
+	qCDebug(logCrashReporter) << "Saving minidump from fd" << dumpFd;
-	auto stacktrace = resolveStacktrace(dumpFd);
+	auto dumpDupStatus = tryDup(dumpFd, crashDir.filePath("minidump.dmp.log"));
+	if (dumpDupStatus != 0) {
+		qCCritical(logCrashReporter) << "Failed to write minidump:" << dumpDupStatus;
+	}
 
-	qCDebug(logCrashReporter) << "Reading recent log lines from fd" << logFd;
+	qCDebug(logCrashReporter) << "Saving log from fd" << logFd;
-	auto logDupFd = dup(logFd);
+	auto logDupStatus = tryDup(logFd, crashDir.filePath("log.qslog.log"));
-	auto recentLogs = readRecentLogs(logFd, 100, 10);
-
-	qCDebug(logCrashReporter) << "Saving log from fd" << logDupFd;
-	auto logDupStatus = tryDup(logDupFd, crashDir.filePath("log.qslog.log"));
 	if (logDupStatus != 0) {
 		qCCritical(logCrashReporter) << "Failed to save log:" << logDupStatus;
 	}
 
+	auto copyBinStatus = 0;
+	if (!DISTRIBUTOR_DEBUGINFO_AVAILABLE) {
+		qCDebug(logCrashReporter) << "Copying binary to crash folder";
+		if (!QFile(QCoreApplication::applicationFilePath()).copy(crashDir.filePath("executable.txt"))) {
+			copyBinStatus = 1;
+			qCCritical(logCrashReporter) << "Failed to copy binary.";
+		}
+	}
+
 	{
-		auto extraInfoFile = QFile(crashDir.filePath("report.txt"));
+		auto extraInfoFile = QFile(crashDir.filePath("info.txt"));
 		if (!extraInfoFile.open(QFile::WriteOnly)) {
 			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 << "Signal: " << strsignal(crashSignal) << " (" << crashSignal << ")\n"; // NOLINT
+			stream << "Runtime Qt Version: " << qVersion() << '\n';
 			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===== Stacktrace =====\n";
+			stream << "\n===== Report Integrity =====\n";
-			if (stacktrace.empty()) {
+			stream << "Minidump save status: " << dumpDupStatus << '\n';
-				stream << "(no trace available)\n";
+			stream << "Log save status: " << logDupStatus << '\n';
+			stream << "Binary copy status: " << copyBinStatus << '\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 {
-				auto formatter = cpptrace::formatter().header(std::string());
+				stream << "FAILED TO OPEN\n";
-				auto traceStr = formatter.format(stacktrace);
-				stream << QString::fromStdString(traceStr) << '\n';
 			}
 
-			stream << "\n===== Log Tail =====\n";
+			stream << "/etc/lsb-release:";
-			stream << recentLogs;
+			auto lsbReleaseFile = QFile("/etc/lsb-release");
+			if (lsbReleaseFile.open(QFile::ReadOnly)) {
+				stream << '\n' << lsbReleaseFile.readAll();
+				lsbReleaseFile.close();
+			} else {
+				stream << "FAILED TO OPEN\n";
+			}
 
 			extraInfoFile.close();
 		}
@@ -212,10 +161,7 @@ void qsCheckCrash(int argc, char** argv) {
 		auto infoFd = qEnvironmentVariable("__QUICKSHELL_CRASH_INFO_FD").toInt();
 
 		QFile file;
-		if (!file.open(infoFd, QFile::ReadOnly, QFile::AutoCloseHandle)) {
+		file.open(infoFd, QFile::ReadOnly, QFile::AutoCloseHandle);
-			qFatal() << "Failed to open instance info fd.";
-		}
-
 		file.seek(0);
 
 		auto ds = QDataStream(&file);
@@ -231,17 +177,12 @@ void qsCheckCrash(int argc, char** argv) {
 	);
 
 	auto app = QApplication(argc, argv);
-	auto desktopId =
+	QApplication::setDesktopFileName("org.quickshell");
-	    info.instance.appId.isEmpty() ? QStringLiteral("org.quickshell") : info.instance.appId;
-	QApplication::setDesktopFileName(desktopId);
 
 	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

@@ -183,7 +183,7 @@ void DBusMenuItem::updateProperties(const QVariantMap& properties, const QString
 		}
 	} else if (removed.isEmpty() || removed.contains("icon-data")) {
 		imageChanged = this->image.hasData();
-		this->image.data.clear();
+		image.data.clear();
 	}
 
 	auto type = properties.value("type");

src/dbus/dbusmenu/dbusmenu.hpp

@@ -36,7 +36,7 @@ class DBusMenuPngImage: public QsIndexedImageHandle {
 public:
 	explicit DBusMenuPngImage(): QsIndexedImageHandle(QQuickImageProvider::Image) {}
 
-	[[nodiscard]] bool hasData() const { return !this->data.isEmpty(); }
+	[[nodiscard]] bool hasData() const { return !data.isEmpty(); }
 	QImage requestImage(const QString& id, QSize* size, const QSize& requestedSize) override;
 
 	QByteArray data;

src/dbus/properties.cpp

@@ -214,10 +214,8 @@ void DBusPropertyGroup::updatePropertySet(const QVariantMap& properties, bool co
 	}
 }
 
-void DBusPropertyGroup::tryUpdateProperty(
+void DBusPropertyGroup::tryUpdateProperty(DBusPropertyCore* property, const QVariant& variant)
-    DBusPropertyCore* property,
+    const {
-    const QVariant& variant
-) const {
 	property->mExists = true;
 
 	auto error = property->store(variant);

src/dbus/properties.hpp

@@ -217,7 +217,7 @@ protected:
 
 private:
 	[[nodiscard]] constexpr Owner* owner() const {
-		auto* self = std::bit_cast<char*>(this);       // NOLINT
+		auto* self = std::bit_cast<char*>(this);
 		return std::bit_cast<Owner*>(self - offset()); // NOLINT
 	}
 

src/debug/lint.cpp

@@ -9,7 +9,7 @@
 #include <qqmlinfo.h>
 #include <qquickitem.h>
 #include <qquickwindow.h>
-#include <qstring.h>
+#include <qstringliteral.h>
 
 #include "../core/logcat.hpp"
 

src/io/CMakeLists.txt

@@ -24,7 +24,7 @@ qt_add_qml_module(quickshell-io
 qs_add_module_deps_light(quickshell-io Quickshell)
 install_qml_module(quickshell-io)
 
-target_link_libraries(quickshell-io PRIVATE Qt::Quick quickshell-ipc)
+target_link_libraries(quickshell-io PRIVATE Qt::Quick)
 target_link_libraries(quickshell PRIVATE quickshell-ioplugin)
 
 qs_module_pch(quickshell-io)

src/io/fileview.cpp

@@ -93,8 +93,7 @@ void FileViewReader::run() {
 		FileViewReader::read(this->owner, this->state, this->doStringConversion, this->shouldCancel);
 
 		if (this->shouldCancel.loadAcquire()) {
-			qCDebug(logFileView) << "Read" << this << "of" << this->state.path << "canceled for"
+			qCDebug(logFileView) << "Read" << this << "of" << state.path << "canceled for" << this->owner;
-			                     << this->owner;
 		}
 	}
 
@@ -207,7 +206,7 @@ void FileViewWriter::run() {
 		FileViewWriter::write(this->owner, this->state, this->doAtomicWrite, this->shouldCancel);
 
 		if (this->shouldCancel.loadAcquire()) {
-			qCDebug(logFileView) << "Write" << this << "of" << this->state.path << "canceled for"
+			qCDebug(logFileView) << "Write" << this << "of" << state.path << "canceled for"
 			                     << this->owner;
 		}
 	}

src/io/ipc.cpp

@@ -190,14 +190,6 @@ QString WirePropertyDefinition::toString() const {
 	return "property " % this->name % ": " % this->type;
 }
 
-QString WireSignalDefinition::toString() const {
-	if (this->rettype.isEmpty()) {
-		return "signal " % this->name % "()";
-	} else {
-		return "signal " % this->name % "(" % this->retname % ": " % this->rettype % ')';
-	}
-}
-
 QString WireTargetDefinition::toString() const {
 	QString accum = "target " % this->name;
 
@@ -209,10 +201,6 @@ QString WireTargetDefinition::toString() const {
 		accum += "\n  " % prop.toString();
 	}
 
-	for (const auto& sig: this->signalFunctions) {
-		accum += "\n  " % sig.toString();
-	}
-
 	return accum;
 }
 

src/io/ipc.hpp

@@ -146,31 +146,14 @@ struct WirePropertyDefinition {
 
 DEFINE_SIMPLE_DATASTREAM_OPS(WirePropertyDefinition, data.name, data.type);
 
-struct WireSignalDefinition {
-	QString name;
-	QString retname;
-	QString rettype;
-
-	[[nodiscard]] QString toString() const;
-};
-
-DEFINE_SIMPLE_DATASTREAM_OPS(WireSignalDefinition, data.name, data.retname, data.rettype);
-
 struct WireTargetDefinition {
 	QString name;
 	QVector<WireFunctionDefinition> functions;
 	QVector<WirePropertyDefinition> properties;
-	QVector<WireSignalDefinition> signalFunctions;
 
 	[[nodiscard]] QString toString() const;
 };
 
-DEFINE_SIMPLE_DATASTREAM_OPS(
+DEFINE_SIMPLE_DATASTREAM_OPS(WireTargetDefinition, data.name, data.functions, data.properties);
-    WireTargetDefinition,
-    data.name,
-    data.functions,
-    data.properties,
-    data.signalFunctions
-);
 
 } // namespace qs::io::ipc

src/io/ipccomm.cpp

@@ -1,11 +1,10 @@
 #include "ipccomm.hpp"
-#include <utility>
+#include <cstdio>
 #include <variant>
 
 #include <qcontainerfwd.h>
 #include <qlogging.h>
 #include <qloggingcategory.h>
-#include <qobject.h>
 #include <qtextstream.h>
 #include <qtypes.h>
 
@@ -20,6 +19,10 @@ using namespace qs::ipc;
 
 namespace qs::io::ipc::comm {
 
+struct NoCurrentGeneration: std::monostate {};
+struct TargetNotFound: std::monostate {};
+struct EntryNotFound: std::monostate {};
+
 using QueryResponse = std::variant<
     std::monostate,
     NoCurrentGeneration,
@@ -311,106 +314,4 @@ int getProperty(IpcClient* client, const QString& target, const QString& propert
 	return -1;
 }
 
-int listenToSignal(IpcClient* client, const QString& target, const QString& signal, bool once) {
-	if (target.isEmpty()) {
-		qCCritical(logBare) << "Target required to listen for signals.";
-		return -1;
-	} else if (signal.isEmpty()) {
-		qCCritical(logBare) << "Signal required to listen.";
-		return -1;
-	}
-
-	client->sendMessage(IpcCommand(SignalListenCommand {.target = target, .signal = signal}));
-
-	while (true) {
-		SignalListenResponse slot;
-		if (!client->waitForResponse(slot)) return -1;
-
-		if (std::holds_alternative<SignalResponse>(slot)) {
-			auto& result = std::get<SignalResponse>(slot);
-			QTextStream(stdout) << result.response << Qt::endl;
-			if (once) return 0;
-			else continue;
-		} else if (std::holds_alternative<TargetNotFound>(slot)) {
-			qCCritical(logBare) << "Target not found.";
-		} else if (std::holds_alternative<EntryNotFound>(slot)) {
-			qCCritical(logBare) << "Signal not found.";
-		} else if (std::holds_alternative<NoCurrentGeneration>(slot)) {
-			qCCritical(logBare) << "Not ready to accept queries yet.";
-		} else {
-			qCCritical(logIpc) << "Received invalid IPC response from" << client;
-		}
-		break;
-	}
-
-	return -1;
-}
-
-void SignalListenCommand::exec(qs::ipc::IpcServerConnection* conn) {
-	auto resp = conn->responseStream<SignalListenResponse>();
-
-	if (auto* generation = EngineGeneration::currentGeneration()) {
-		auto* registry = IpcHandlerRegistry::forGeneration(generation);
-
-		auto* handler = registry->findHandler(this->target);
-		if (!handler) {
-			resp << TargetNotFound();
-			return;
-		}
-
-		auto* signal = handler->findSignal(this->signal);
-		if (!signal) {
-			resp << EntryNotFound();
-			return;
-		}
-
-		new RemoteSignalListener(conn, *this);
-	} else {
-		conn->respond(SignalListenResponse(NoCurrentGeneration()));
-	}
-}
-
-RemoteSignalListener::RemoteSignalListener(
-    qs::ipc::IpcServerConnection* conn,
-    SignalListenCommand command
-)
-    : conn(conn)
-    , command(std::move(command)) {
-	conn->setParent(this);
-
-	QObject::connect(
-	    IpcSignalRemoteListener::instance(),
-	    &IpcSignalRemoteListener::triggered,
-	    this,
-	    &RemoteSignalListener::onSignal
-	);
-
-	QObject::connect(
-	    conn,
-	    &qs::ipc::IpcServerConnection::destroyed,
-	    this,
-	    &RemoteSignalListener::onConnDestroyed
-	);
-
-	qCDebug(logIpc) << "Remote listener created for" << this->command.target << this->command.signal
-	                << ":" << this;
-}
-
-RemoteSignalListener::~RemoteSignalListener() {
-	qCDebug(logIpc) << "Destroying remote listener" << this;
-}
-
-void RemoteSignalListener::onSignal(
-    const QString& target,
-    const QString& signal,
-    const QString& value
-) {
-	if (target != this->command.target || signal != this->command.signal) return;
-	qCDebug(logIpc) << "Remote signal" << signal << "triggered on" << target << "with value" << value;
-
-	this->conn->respond(SignalListenResponse(SignalResponse {.response = value}));
-}
-
-void RemoteSignalListener::onConnDestroyed() { this->deleteLater(); }
-
 } // namespace qs::io::ipc::comm

src/io/ipccomm.hpp

@@ -2,8 +2,6 @@
 
 #include <qcontainerfwd.h>
 #include <qflags.h>
-#include <qobject.h>
-#include <qtmetamacros.h>
 #include <qtypes.h>
 
 #include "../ipc/ipc.hpp"
@@ -50,52 +48,4 @@ DEFINE_SIMPLE_DATASTREAM_OPS(StringPropReadCommand, data.target, data.property);
 
 int getProperty(qs::ipc::IpcClient* client, const QString& target, const QString& property);
 
-struct SignalListenCommand {
-	QString target;
-	QString signal;
-
-	void exec(qs::ipc::IpcServerConnection* conn);
-};
-
-DEFINE_SIMPLE_DATASTREAM_OPS(SignalListenCommand, data.target, data.signal);
-
-int listenToSignal(
-    qs::ipc::IpcClient* client,
-    const QString& target,
-    const QString& signal,
-    bool once
-);
-
-struct NoCurrentGeneration: std::monostate {};
-struct TargetNotFound: std::monostate {};
-struct EntryNotFound: std::monostate {};
-
-struct SignalResponse {
-	QString response;
-};
-
-DEFINE_SIMPLE_DATASTREAM_OPS(SignalResponse, data.response);
-
-using SignalListenResponse = std::
-    variant<std::monostate, NoCurrentGeneration, TargetNotFound, EntryNotFound, SignalResponse>;
-
-class RemoteSignalListener: public QObject {
-	Q_OBJECT;
-
-public:
-	explicit RemoteSignalListener(qs::ipc::IpcServerConnection* conn, SignalListenCommand command);
-
-	~RemoteSignalListener() override;
-
-	Q_DISABLE_COPY_MOVE(RemoteSignalListener);
-
-private slots:
-	void onSignal(const QString& target, const QString& signal, const QString& value);
-	void onConnDestroyed();
-
-private:
-	qs::ipc::IpcServerConnection* conn;
-	SignalListenCommand command;
-};
-
 } // namespace qs::io::ipc::comm

src/io/ipchandler.cpp

@@ -1,7 +1,5 @@
 #include "ipchandler.hpp"
 #include <cstddef>
-#include <memory>
-#include <utility>
 
 #include <qcontainerfwd.h>
 #include <qdebug.h>
@@ -141,75 +139,6 @@ WirePropertyDefinition IpcProperty::wireDef() const {
 	return wire;
 }
 
-WireSignalDefinition IpcSignal::wireDef() const {
-	WireSignalDefinition wire;
-	wire.name = this->signal.name();
-	if (this->targetSlot != IpcSignalListener::SLOT_VOID) {
-		wire.retname = this->signal.parameterNames().value(0);
-		if (this->targetSlot == IpcSignalListener::SLOT_STRING) wire.rettype = "string";
-		else if (this->targetSlot == IpcSignalListener::SLOT_INT) wire.rettype = "int";
-		else if (this->targetSlot == IpcSignalListener::SLOT_BOOL) wire.rettype = "bool";
-		else if (this->targetSlot == IpcSignalListener::SLOT_REAL) wire.rettype = "real";
-		else if (this->targetSlot == IpcSignalListener::SLOT_COLOR) wire.rettype = "color";
-	}
-	return wire;
-}
-
-// NOLINTBEGIN (cppcoreguidelines-interfaces-global-init)
-// clang-format off
-const int IpcSignalListener::SLOT_VOID = IpcSignalListener::staticMetaObject.indexOfSlot("invokeVoid()");
-const int IpcSignalListener::SLOT_STRING = IpcSignalListener::staticMetaObject.indexOfSlot("invokeString(QString)");
-const int IpcSignalListener::SLOT_INT = IpcSignalListener::staticMetaObject.indexOfSlot("invokeInt(int)");
-const int IpcSignalListener::SLOT_BOOL = IpcSignalListener::staticMetaObject.indexOfSlot("invokeBool(bool)");
-const int IpcSignalListener::SLOT_REAL = IpcSignalListener::staticMetaObject.indexOfSlot("invokeReal(double)");
-const int IpcSignalListener::SLOT_COLOR = IpcSignalListener::staticMetaObject.indexOfSlot("invokeColor(QColor)");
-// clang-format on
-// NOLINTEND
-
-bool IpcSignal::resolve(QString& error) {
-	if (this->signal.parameterCount() > 1) {
-		error = "Due to technical limitations, IPC signals can have at most one argument.";
-		return false;
-	}
-
-	auto slot = IpcSignalListener::SLOT_VOID;
-
-	if (this->signal.parameterCount() == 1) {
-		auto paramType = this->signal.parameterType(0);
-		if (paramType == QMetaType::QString) slot = IpcSignalListener::SLOT_STRING;
-		else if (paramType == QMetaType::Int) slot = IpcSignalListener::SLOT_INT;
-		else if (paramType == QMetaType::Bool) slot = IpcSignalListener::SLOT_BOOL;
-		else if (paramType == QMetaType::Double) slot = IpcSignalListener::SLOT_REAL;
-		else if (paramType == QMetaType::QColor) slot = IpcSignalListener::SLOT_COLOR;
-		else {
-			error = QString("Type of argument (%2: %3) cannot be used across IPC.")
-			            .arg(this->signal.parameterNames().value(0))
-			            .arg(QMetaType(paramType).name());
-
-			return false;
-		}
-	}
-
-	this->targetSlot = slot;
-	return true;
-}
-
-void IpcSignal::connectListener(IpcHandler* handler) {
-	if (this->targetSlot == -1) {
-		qFatal() << "Tried to connect unresolved IPC signal";
-	}
-
-	this->listener = std::make_shared<IpcSignalListener>(this->signal.name());
-	QMetaObject::connect(handler, this->signal.methodIndex(), this->listener.get(), this->targetSlot);
-
-	QObject::connect(
-	    this->listener.get(),
-	    &IpcSignalListener::triggered,
-	    handler,
-	    &IpcHandler::onSignalTriggered
-	);
-}
-
 IpcCallStorage::IpcCallStorage(const IpcFunction& function): returnSlot(function.returnType) {
 	for (const auto& arg: function.argumentTypes) {
 		this->argumentSlots.emplace_back(arg);
@@ -243,7 +172,8 @@ void IpcHandler::onPostReload() {
 	// which should handle inheritance on the qml side.
 	for (auto i = smeta.methodCount(); i != meta->methodCount(); i++) {
 		const auto& method = meta->method(i);
-		if (method.methodType() == QMetaMethod::Slot) {
+		if (method.methodType() != QMetaMethod::Slot) continue;
+
 		auto ipcFunc = IpcFunction(method);
 		QString error;
 
@@ -253,19 +183,6 @@ void IpcHandler::onPostReload() {
 		} else {
 			this->functionMap.insert(method.name(), ipcFunc);
 		}
-		} else if (method.methodType() == QMetaMethod::Signal) {
-			qmlDebug(this) << "Signal detected: " << method.name();
-			auto ipcSig = IpcSignal(method);
-			QString error;
-
-			if (!ipcSig.resolve(error)) {
-				qmlWarning(this).nospace().noquote()
-				    << "Error parsing signal \"" << method.name() << "\": " << error;
-			} else {
-				ipcSig.connectListener(this);
-				this->signalMap.emplace(method.name(), std::move(ipcSig));
-			}
-		}
 	}
 
 	for (auto i = smeta.propertyCount(); i != meta->propertyCount(); i++) {
@@ -305,11 +222,6 @@ IpcHandlerRegistry* IpcHandlerRegistry::forGeneration(EngineGeneration* generati
 	return dynamic_cast<IpcHandlerRegistry*>(ext);
 }
 
-void IpcHandler::onSignalTriggered(const QString& signal, const QString& value) const {
-	emit IpcSignalRemoteListener::instance()
-	    -> triggered(this->registeredState.target, signal, value);
-}
-
 void IpcHandler::updateRegistration(bool destroying) {
 	if (!this->complete) return;
 
@@ -412,10 +324,6 @@ WireTargetDefinition IpcHandler::wireDef() const {
 		wire.properties += prop.wireDef();
 	}
 
-	for (const auto& sig: this->signalMap.values()) {
-		wire.signalFunctions += sig.wireDef();
-	}
-
 	return wire;
 }
 
@@ -460,13 +368,6 @@ IpcProperty* IpcHandler::findProperty(const QString& name) {
 	else return &*itr;
 }
 
-IpcSignal* IpcHandler::findSignal(const QString& name) {
-	auto itr = this->signalMap.find(name);
-
-	if (itr == this->signalMap.end()) return nullptr;
-	else return &*itr;
-}
-
 IpcHandler* IpcHandlerRegistry::findHandler(const QString& target) {
 	return this->handlers.value(target);
 }
@@ -481,9 +382,4 @@ QVector<WireTargetDefinition> IpcHandlerRegistry::wireTargets() const {
 	return wire;
 }
 
-IpcSignalRemoteListener* IpcSignalRemoteListener::instance() {
-	static auto* instance = new IpcSignalRemoteListener();
-	return instance;
-}
-
 } // namespace qs::io::ipc

src/io/ipchandler.hpp

@@ -1,10 +1,8 @@
 #pragma once
 
 #include <cstddef>
-#include <memory>
 #include <vector>
 
-#include <qcolor.h>
 #include <qcontainerfwd.h>
 #include <qdebug.h>
 #include <qhash.h>
@@ -69,54 +67,6 @@ public:
 	const IpcType* type = nullptr;
 };
 
-class IpcSignalListener: public QObject {
-	Q_OBJECT;
-
-public:
-	IpcSignalListener(QString signal): signal(std::move(signal)) {}
-
-	static const int SLOT_VOID;
-	static const int SLOT_STRING;
-	static const int SLOT_INT;
-	static const int SLOT_BOOL;
-	static const int SLOT_REAL;
-	static const int SLOT_COLOR;
-
-signals:
-	void triggered(const QString& signal, const QString& value);
-
-private slots:
-	void invokeVoid() { this->triggered(this->signal, "void"); }
-	void invokeString(const QString& value) { this->triggered(this->signal, value); }
-	void invokeInt(int value) { this->triggered(this->signal, QString::number(value)); }
-	void invokeBool(bool value) { this->triggered(this->signal, value ? "true" : "false"); }
-	void invokeReal(double value) { this->triggered(this->signal, QString::number(value)); }
-	void invokeColor(QColor value) { this->triggered(this->signal, value.name(QColor::HexArgb)); }
-
-private:
-	QString signal;
-};
-
-class IpcHandler;
-
-class IpcSignal {
-public:
-	explicit IpcSignal(QMetaMethod signal): signal(signal) {}
-
-	bool resolve(QString& error);
-
-	[[nodiscard]] WireSignalDefinition wireDef() const;
-
-	QMetaMethod signal;
-	int targetSlot = -1;
-
-	void connectListener(IpcHandler* handler);
-
-private:
-	void connectListener(QObject* handler, IpcSignalListener* listener) const;
-	std::shared_ptr<IpcSignalListener> listener;
-};
-
 class IpcHandlerRegistry;
 
 ///! Handler for IPC message calls.
@@ -150,11 +100,6 @@ class IpcHandlerRegistry;
 /// - `real` will be converted to a string and returned.
 /// - `color` will be converted to a hex string in the form `#AARRGGBB` and returned.
 ///
-/// #### Signals
-/// IPC handler signals can be observed remotely using `qs ipc wait` (one call)
-/// and `qs ipc listen` (many calls). IPC signals may have zero or one argument, where
-/// the argument is one of the types listed above, or no arguments for void.
-///
 /// #### Example
 /// The following example creates ipc functions to control and retrieve the appearance
 /// of a Rectangle.
@@ -174,18 +119,10 @@ class IpcHandlerRegistry;
 ///
 ///     function setColor(color: color): void { rect.color = color; }
 ///     function getColor(): color { return rect.color; }
-///
 ///     function setAngle(angle: real): void { rect.rotation = angle; }
 ///     function getAngle(): real { return rect.rotation; }
-///
+///     function setRadius(radius: int): void { rect.radius = radius; }
-///     function setRadius(radius: int): void {
-///       rect.radius = radius;
-///       this.radiusChanged(radius);
-///     }
-///
 ///     function getRadius(): int { return rect.radius; }
-///
-/// 		signal radiusChanged(newRadius: int);
 ///   }
 /// }
 /// ```
@@ -199,7 +136,6 @@ class IpcHandlerRegistry;
 ///   function getAngle(): real
 ///   function setRadius(radius: int): void
 ///   function getRadius(): int
-///   signal radiusChanged(newRadius: int)
 /// ```
 ///
 /// and then invoked using `qs ipc call`.
@@ -243,15 +179,14 @@ public:
 	QString listMembers(qsizetype indent);
 	[[nodiscard]] IpcFunction* findFunction(const QString& name);
 	[[nodiscard]] IpcProperty* findProperty(const QString& name);
-	[[nodiscard]] IpcSignal* findSignal(const QString& name);
 	[[nodiscard]] WireTargetDefinition wireDef() const;
 
 signals:
 	void enabledChanged();
 	void targetChanged();
 
-public slots:
+private slots:
-	void onSignalTriggered(const QString& signal, const QString& value) const;
+	//void handleIpcPropertyChange();
 
 private:
 	void updateRegistration(bool destroying = false);
@@ -269,7 +204,6 @@ private:
 
 	QHash<QString, IpcFunction> functionMap;
 	QHash<QString, IpcProperty> propertyMap;
-	QHash<QString, IpcSignal> signalMap;
 
 	friend class IpcHandlerRegistry;
 };
@@ -293,14 +227,4 @@ private:
 	QHash<QString, QVector<IpcHandler*>> knownHandlers;
 };
 
-class IpcSignalRemoteListener: public QObject {
-	Q_OBJECT;
-
-public:
-	static IpcSignalRemoteListener* instance();
-
-signals:
-	void triggered(const QString& target, const QString& signal, const QString& value);
-};
-
 } // namespace qs::io::ipc

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>
 
@@ -47,7 +44,7 @@ void JsonAdapter::deserializeAdapter(const QByteArray& data) {
 
 	this->deserializeRec(json.object(), this, &JsonAdapter::staticMetaObject);
 
-	for (auto* object: this->oldCreatedObjects) {
+	for (auto* object: oldCreatedObjects) {
 		delete object; // FIXME: QMetaType::destroy?
 	}
 
@@ -59,7 +56,7 @@ void JsonAdapter::deserializeAdapter(const QByteArray& data) {
 
 void JsonAdapter::connectNotifiers() {
 	auto notifySlot = JsonAdapter::staticMetaObject.indexOfSlot("onPropertyChanged()");
-	this->connectNotifiersRec(notifySlot, this, &JsonAdapter::staticMetaObject);
+	connectNotifiersRec(notifySlot, this, &JsonAdapter::staticMetaObject);
 }
 
 void JsonAdapter::connectNotifiersRec(int notifySlot, QObject* obj, const QMetaObject* base) {
@@ -74,7 +71,7 @@ void JsonAdapter::connectNotifiersRec(int notifySlot, QObject* obj, const QMetaO
 			auto val = prop.read(obj);
 			if (val.canView<JsonObject*>()) {
 				auto* pobj = prop.read(obj).view<JsonObject*>();
-				if (pobj) this->connectNotifiersRec(notifySlot, pobj, &JsonObject::staticMetaObject);
+				if (pobj) connectNotifiersRec(notifySlot, pobj, &JsonObject::staticMetaObject);
 			} else if (val.canConvert<QQmlListProperty<JsonObject>>()) {
 				auto listVal = val.value<QQmlListProperty<JsonObject>>();
 
@@ -82,7 +79,7 @@ void JsonAdapter::connectNotifiersRec(int notifySlot, QObject* obj, const QMetaO
 				for (auto i = 0; i != len; i++) {
 					auto* pobj = listVal.at(&listVal, i);
 
-					if (pobj) this->connectNotifiersRec(notifySlot, pobj, &JsonObject::staticMetaObject);
+					if (pobj) connectNotifiersRec(notifySlot, pobj, &JsonObject::staticMetaObject);
 				}
 			}
 		}
@@ -114,7 +111,7 @@ QJsonObject JsonAdapter::serializeRec(const QObject* obj, const QMetaObject* bas
 				auto* pobj = val.view<JsonObject*>();
 
 				if (pobj) {
-					json.insert(prop.name(), this->serializeRec(pobj, &JsonObject::staticMetaObject));
+					json.insert(prop.name(), serializeRec(pobj, &JsonObject::staticMetaObject));
 				} else {
 					json.insert(prop.name(), QJsonValue::Null);
 				}
@@ -127,29 +124,20 @@ QJsonObject JsonAdapter::serializeRec(const QObject* obj, const QMetaObject* bas
 					auto* pobj = listVal.at(&listVal, i);
 
 					if (pobj) {
-						array.push_back(this->serializeRec(pobj, &JsonObject::staticMetaObject));
+						array.push_back(serializeRec(pobj, &JsonObject::staticMetaObject));
 					} else {
 						array.push_back(QJsonValue::Null);
 					}
 				}
 
 				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 jv = QJsonValue::fromVariant(val);
-
+				json.insert(prop.name(), jv);
-				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);
 			}
 		}
 	}
@@ -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 variant = jval.toVariant();
-				auto oldValue = prop.read(obj);
+				auto oldValue = prop.read(this).value<QJSValue>();
-				auto oldVariant =
-				    oldValue.canConvert<QJSValue>() ? oldValue.value<QJSValue>().toVariant() : oldValue;
 
 				// Calling prop.write with a new QJSValue will cause a property update
 				// even if content is identical.
-				if (newVariant != oldVariant) {
+				if (jval.toVariant() != oldValue.toVariant()) {
-					auto jsValue = qmlEngine(this)->fromVariant<QJSValue>(newVariant);
+					auto jsValue = qmlEngine(this)->fromVariant<QJSValue>(jval.toVariant());
-					prop.write(obj, QVariant::fromValue(jsValue));
+					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()
@@ -192,8 +178,8 @@ void JsonAdapter::deserializeRec(const QJsonObject& json, QObject* obj, const QM
 
 						currentValue->setParent(this);
 						this->createdObjects.push_back(currentValue);
-					} else if (this->oldCreatedObjects.removeOne(currentValue)) {
+					} else if (oldCreatedObjects.removeOne(currentValue)) {
-						this->createdObjects.push_back(currentValue);
+						createdObjects.push_back(currentValue);
 					}
 
 					this->deserializeRec(jval.toObject(), currentValue, &JsonObject::staticMetaObject);
@@ -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>>();
@@ -226,8 +212,8 @@ void JsonAdapter::deserializeRec(const QJsonObject& json, QObject* obj, const QM
 						if (jsonValue.isObject()) {
 							if (isNew) {
 								currentValue = lp.at(&lp, i);
-								if (this->oldCreatedObjects.removeOne(currentValue)) {
+								if (oldCreatedObjects.removeOne(currentValue)) {
-									this->createdObjects.push_back(currentValue);
+									createdObjects.push_back(currentValue);
 								}
 							} else {
 								// FIXME: should be the type inside the QQmlListProperty but how can we get that?
@@ -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())) {
+				if (variant.convert(prop.metaType())) {
-					prop.write(obj, convVariant);
+					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 "
+					                 << prop.metaType().name() << " but got " << jval.toVariant().typeName();
-						                 << jval.toVariant().typeName();
-					}
 				}
 			}
 		}

src/io/process.hpp

@@ -102,7 +102,7 @@ class Process: public PostReloadHook {
 	/// If the process is already running changing this property will affect the next
 	/// started process. If the property has been changed after starting a process it will
 	/// return the new value, not the one for the currently running process.
-	Q_PROPERTY(QVariantHash environment READ environment WRITE setEnvironment NOTIFY environmentChanged);
+	Q_PROPERTY(QHash<QString, QVariant> environment READ environment WRITE setEnvironment NOTIFY environmentChanged);
 	/// If the process's environment should be cleared prior to applying @@environment.
 	/// Defaults to false.
 	///

src/io/processcore.hpp

@@ -13,7 +13,7 @@ namespace qs::io::process {
 
 class ProcessContext {
 	Q_PROPERTY(QList<QString> command MEMBER command WRITE setCommand);
-	Q_PROPERTY(QVariantHash environment MEMBER environment WRITE setEnvironment);
+	Q_PROPERTY(QHash<QString, QVariant> environment MEMBER environment WRITE setEnvironment);
 	Q_PROPERTY(bool clearEnvironment MEMBER clearEnvironment WRITE setClearEnvironment);
 	Q_PROPERTY(QString workingDirectory MEMBER workingDirectory WRITE setWorkingDirectory);
 	Q_PROPERTY(bool unbindStdout MEMBER unbindStdout WRITE setUnbindStdout);

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>
@@ -37,8 +36,7 @@ void IpcServer::start() {
 		auto path = run->filePath("ipc.sock");
 		new IpcServer(path);
 	} else {
-		qCCritical(
+		qCCritical(logIpc
-		    logIpc
 		) << "Could not start IPC server as the instance runtime path could not be created.";
 	}
 }
@@ -62,7 +60,6 @@ IpcServerConnection::IpcServerConnection(QLocalSocket* socket, IpcServer* server
 
 void IpcServerConnection::onDisconnected() {
 	qCInfo(logIpc) << "IPC connection disconnected" << this;
-	this->deleteLater();
 }
 
 void IpcServerConnection::onReadyRead() {
@@ -86,11 +83,6 @@ void IpcServerConnection::onReadyRead() {
 	);
 
 	if (!this->stream.commitTransaction()) return;
-
-	// async connections reparent
-	if (dynamic_cast<IpcServer*>(this->parent()) != nullptr) {
-		this->deleteLater();
-	}
 }
 
 IpcClient::IpcClient(const QString& path) {
@@ -128,9 +120,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();
+	EngineGeneration::currentGeneration()->quit();
-	if (generation) generation->quit();
-	else QCoreApplication::exit(0);
 }
 
 } // namespace qs::ipc

src/ipc/ipccommand.hpp

@@ -16,7 +16,6 @@ using IpcCommand = std::variant<
     IpcKillCommand,
     qs::io::ipc::comm::QueryMetadataCommand,
     qs::io::ipc::comm::StringCallCommand,
-    qs::io::ipc::comm::SignalListenCommand,
     qs::io::ipc::comm::StringPropReadCommand>;
 
 } // namespace qs::ipc

src/launch/command.cpp

@@ -1,6 +1,7 @@
 #include <algorithm>
 #include <array>
 #include <cerrno>
+#include <cstdio>
 #include <cstring>
 #include <utility>
 
@@ -12,7 +13,6 @@
 #include <qdebug.h>
 #include <qdir.h>
 #include <qfileinfo.h>
-#include <qguiapplication.h>
 #include <qjsonarray.h>
 #include <qjsondocument.h>
 #include <qjsonobject.h>
@@ -25,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 {
@@ -89,8 +89,8 @@ int locateConfigFile(CommandState& cmd, QString& path) {
 		}
 
 		if (!manifestPath.isEmpty()) {
-			qWarning()
+			qWarning(
-			    << "Config manifests (manifest.conf) are deprecated and will be removed in a future "
+			) << "Config manifests (manifest.conf) are deprecated and will be removed in a future "
 			     "release.";
 			qWarning() << "Consider using symlinks to a subfolder of quickshell's XDG config dirs.";
 
@@ -109,7 +109,7 @@ int locateConfigFile(CommandState& cmd, QString& path) {
 					}
 
 					if (split[0].trimmed() == *cmd.config.name) {
-						path = QDir(QFileInfo(file).absolutePath()).filePath(split[1].trimmed());
+						path = QDir(QFileInfo(file).canonicalPath()).filePath(split[1].trimmed());
 						break;
 					}
 				}
@@ -129,8 +129,7 @@ int locateConfigFile(CommandState& cmd, QString& path) {
 
 			if (path.isEmpty()) {
 				if (name == "default") {
-					qCCritical(
+					qCCritical(logBare
-					    logBare
 					) << "Could not find \"default\" config directory or shell.qml in any valid config path.";
 				} else {
 					qCCritical(logBare) << "Could not find" << name
@@ -140,7 +139,8 @@ int locateConfigFile(CommandState& cmd, QString& path) {
 				return -1;
 			}
 
-			goto rpath;
+			path = QFileInfo(path).canonicalFilePath();
+			return 0;
 		}
 	}
 
@@ -153,8 +153,7 @@ int locateConfigFile(CommandState& cmd, QString& path) {
 		return -1;
 	}
 
-rpath:
+	path = QFileInfo(path).canonicalFilePath();
-	path = QFileInfo(path).absoluteFilePath();
 	return 0;
 }
 
@@ -179,8 +178,7 @@ int selectInstance(CommandState& cmd, InstanceLockInfo* instance, bool deadFallb
 		}
 	} else if (!cmd.instance.id->isEmpty()) {
 		path = basePath->filePath("by-pid");
-		auto [liveInstances, deadInstances] =
+		auto [liveInstances, deadInstances] = QsPaths::collectInstances(path);
-		    QsPaths::collectInstances(path, cmd.config.anyDisplay ? "" : getDisplayConnection());
 
 		liveInstances.removeIf([&](const InstanceLockInfo& info) {
 			return !info.instance.instanceId.startsWith(*cmd.instance.id);
@@ -230,8 +228,7 @@ int selectInstance(CommandState& cmd, InstanceLockInfo* instance, bool deadFallb
 
 		path = QDir(basePath->filePath("by-path")).filePath(pathId);
 
-		auto [liveInstances, deadInstances] =
+		auto [liveInstances, deadInstances] = QsPaths::collectInstances(path);
-		    QsPaths::collectInstances(path, cmd.config.anyDisplay ? "" : getDisplayConnection());
 
 		auto instances = liveInstances;
 		if (instances.isEmpty() && deadFallback) {
@@ -314,10 +311,7 @@ int listInstances(CommandState& cmd) {
 		path = QDir(basePath->filePath("by-path")).filePath(pathId);
 	}
 
-	auto [liveInstances, deadInstances] = QsPaths::collectInstances(
+	auto [liveInstances, deadInstances] = QsPaths::collectInstances(path);
-	    path,
-	    cmd.config.anyDisplay || cmd.instance.all ? "" : getDisplayConnection()
-	);
 
 	sortInstances(liveInstances, cmd.config.newest);
 
@@ -379,7 +373,6 @@ int listInstances(CommandState& cmd) {
 				    << "  Process ID: " << instance.instance.pid << '\n'
 				    << "  Shell ID: " << instance.instance.shellId << '\n'
 				    << "  Config path: " << instance.instance.configPath << '\n'
-				    << "  Display connection: " << instance.instance.display << '\n'
 				    << "  Launch time: " << launchTimeStr
 				    << (isDead ? "" : " (running for " + runtimeStr + ")") << '\n'
 				    << (gray ? "\033[0m" : "");
@@ -411,10 +404,6 @@ int ipcCommand(CommandState& cmd) {
 			return qs::io::ipc::comm::queryMetadata(&client, *cmd.ipc.target, *cmd.ipc.name);
 		} else if (*cmd.ipc.getprop) {
 			return qs::io::ipc::comm::getProperty(&client, *cmd.ipc.target, *cmd.ipc.name);
-		} else if (*cmd.ipc.wait) {
-			return qs::io::ipc::comm::listenToSignal(&client, *cmd.ipc.target, *cmd.ipc.name, true);
-		} else if (*cmd.ipc.listen) {
-			return qs::io::ipc::comm::listenToSignal(&client, *cmd.ipc.target, *cmd.ipc.name, false);
 		} else {
 			QVector<QString> arguments;
 			for (auto& arg: cmd.ipc.arguments) {
@@ -464,7 +453,7 @@ int runCommand(int argc, char** argv, QCoreApplication* coreApplication) {
 			QTextStream(stdout) << "\033[31mCOMPATIBILITY WARNING: Quickshell was built against Qt "
 			                    << QT_VERSION_STR << " but the system has updated to Qt " << qVersion()
 			                    << " without rebuilding the package. This is likely to cause crashes, so "
-			                       "you must rebuild the quickshell package.\n\033[0m";
+			                       "you must rebuild the quickshell package.\n";
 			return 1;
 		}
 
@@ -519,10 +508,20 @@ int runCommand(int argc, char** argv, QCoreApplication* coreApplication) {
 	}
 
 	if (state.misc.printVersion) {
-		if (state.log.verbosity == 0) {
+		qCInfo(logBare).noquote().nospace()
-			qCInfo(logBare).noquote() << "Quickshell" << qs::debuginfo::qsVersion();
+		    << "quickshell 0.2.0, revision " << GIT_REVISION << ", distributed by: " << DISTRIBUTOR;
-		} else {
+
-			qCInfo(logBare).noquote() << qs::debuginfo::combinedInfo();
+		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);
@@ -546,18 +545,4 @@ int runCommand(int argc, char** argv, QCoreApplication* coreApplication) {
 	return 0;
 }
 
-QString getDisplayConnection() {
-	auto platform = qEnvironmentVariable("QT_QPA_PLATFORM");
-	auto wlDisplay = qEnvironmentVariable("WAYLAND_DISPLAY");
-	auto xDisplay = qEnvironmentVariable("DISPLAY");
-
-	if (platform == "wayland" || (platform.isEmpty() && !wlDisplay.isEmpty())) {
-		return "wayland," + wlDisplay;
-	} else if (platform == "xcb" || (platform.isEmpty() && !xDisplay.isEmpty())) {
-		return "x11," + xDisplay;
-	} else {
-		return "unk," + QGuiApplication::platformName();
-	}
-}
-
 } // namespace qs::launch

src/launch/launch.cpp

@@ -27,7 +27,7 @@
 #include "build.hpp"
 #include "launch_p.hpp"
 
-#if CRASH_HANDLER
+#if CRASH_REPORTER
 #include "../crash/handler.hpp"
 #endif
 
@@ -76,11 +76,8 @@ int launch(const LaunchArgs& args, char** argv, QCoreApplication* coreApplicatio
 		bool useSystemStyle = false;
 		QString iconTheme = qEnvironmentVariable("QS_ICON_THEME");
 		QHash<QString, QString> envOverrides;
-		QString appId = qEnvironmentVariable("QS_APP_ID");
-		bool dropExpensiveFonts = false;
 		QString dataDir;
 		QString stateDir;
-		QString cacheDir;
 	} pragmas;
 
 	auto stream = QTextStream(&file);
@@ -93,7 +90,6 @@ int launch(const LaunchArgs& args, char** argv, QCoreApplication* coreApplicatio
 			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("Env ")) {
 				auto envPragma = pragma.sliced(4);
@@ -107,18 +103,15 @@ int launch(const LaunchArgs& args, char** argv, QCoreApplication* coreApplicatio
 				auto var = envPragma.sliced(0, splitIdx).trimmed();
 				auto val = envPragma.sliced(splitIdx + 1).trimmed();
 				pragmas.envOverrides.insert(var, val);
-			} else if (pragma.startsWith("AppId ")) {
-				pragmas.appId = pragma.sliced(6).trimmed();
 			} else if (pragma.startsWith("ShellId ")) {
 				shellId = pragma.sliced(8).trimmed();
 			} else if (pragma.startsWith("DataDir ")) {
 				pragmas.dataDir = pragma.sliced(8).trimmed();
 			} else if (pragma.startsWith("StateDir ")) {
 				pragmas.stateDir = pragma.sliced(9).trimmed();
-			} 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;
 	}
@@ -132,26 +125,21 @@ 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 CRASH_REPORTER
-	if (qEnvironmentVariableIsSet("QS_DISABLE_CRASH_HANDLER")) {
+	auto crashHandler = crash::CrashHandler();
-		qInfo() << "Crash handling disabled.";
+	crashHandler.init();
-	} else {
-		crash::CrashHandler::init();
 
+	{
 		auto* log = LogManager::instance();
-		crash::CrashHandler::setRelaunchInfo({
+		crashHandler.setRelaunchInfo({
 		    .instance = InstanceInfo::CURRENT,
 		    .noColor = !log->colorLogs,
 		    .timestamp = log->timestampLogs,
@@ -162,7 +150,7 @@ int launch(const LaunchArgs& args, char** argv, QCoreApplication* coreApplicatio
 	}
 #endif
 
-	QsPaths::init(shellId, pathId, pragmas.dataDir, pragmas.stateDir, pragmas.cacheDir);
+	QsPaths::init(shellId, pathId, pragmas.dataDir, pragmas.stateDir);
 	QsPaths::instance()->linkRunDir();
 	QsPaths::instance()->linkPathDir();
 	LogManager::initFs();
@@ -178,48 +166,6 @@ int launch(const LaunchArgs& args, char** argv, QCoreApplication* coreApplicatio
 		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()) {
@@ -280,7 +226,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/launch_p.hpp

@@ -50,7 +50,6 @@ struct CommandState {
 		QStringOption manifest;
 		QStringOption name;
 		bool newest = false;
-		bool anyDisplay = false;
 	} config;
 
 	struct {
@@ -74,8 +73,6 @@ struct CommandState {
 		CLI::App* show = nullptr;
 		CLI::App* call = nullptr;
 		CLI::App* getprop = nullptr;
-		CLI::App* wait = nullptr;
-		CLI::App* listen = nullptr;
 		bool showOld = false;
 		QStringOption target;
 		QStringOption name;
@@ -109,8 +106,6 @@ void exitDaemon(int code);
 int parseCommand(int argc, char** argv, CommandState& state);
 int runCommand(int argc, char** argv, QCoreApplication* coreApplication);
 
-QString getDisplayConnection();
-
 int launch(const LaunchArgs& args, char** argv, QCoreApplication* coreApplication);
 
 } // namespace qs::launch