props: bump ver to 0.39.0

modified:   src/render/Renderer.cpp

.clang-format-ignore

@@ -0,0 +1 @@
+subprojects/**/*

.github/ISSUE_TEMPLATE/bug.yml

@@ -9,12 +9,23 @@ body:
 
         ---
 
-  - type: input
+  - type: textarea
     id: ver
     attributes:
       label: Hyprland Version
-      description: "Paste here the output of `hyprctl version`."
-      placeholder: Hyprland, built from branch main at commit...
+      description: "Paste the output of `hyprctl systeminfo` here."
+      value: "<details>
+        <summary>System/Version info</summary>
+
+
+        ```sh
+        
+        <Paste the output of the command here>
+
+        ```
+
+
+        </details>"
     validations:
       required: true
 
@@ -52,5 +63,5 @@ body:
       description: |
         Anything that can help. Please always ATTACH and not paste them.
         Logs can be found in /tmp/hypr
-        Crash reports are stored in ~/.hyprland or $XDG_CACHE_HOME/hyprland
+        Crash reports are stored in ~/.cache/hyprland or $XDG_CACHE_HOME/hyprland
 

.github/actions/setup_base/action.yml

@@ -0,0 +1,90 @@
+name: "Setup base"
+
+inputs:
+  INSTALL_XORG_PKGS:
+    description: 'Install xorg dependencies'
+    required: false
+    default: false
+
+runs:
+  using: "composite"
+  steps:
+    - name: Get required pacman pkgs
+      shell: bash
+      run: |
+        sed -i -e "1i [extra-testing]\nInclude = /etc/pacman.d/mirrorlist" "/etc/pacman.conf"
+        sed -i 's/SigLevel    = Required DatabaseOptional/SigLevel    = Optional TrustAll/' /etc/pacman.conf
+        pacman --noconfirm --noprogressbar -Syyu
+        pacman --noconfirm --noprogressbar -Sy \
+          base-devel \
+          cairo \
+          clang \
+          cmake \
+          git \
+          glm \
+          glslang \
+          go \
+          hyprlang \
+          jq \
+          libc++ \
+          libdisplay-info \
+          libdrm \
+          libepoxy \
+          libfontenc \
+          libglvnd \
+          libinput \
+          libliftoff \
+          libxcvt \
+          libxfont2 \
+          libxkbcommon \
+          libxkbfile \
+          lld \
+          meson \
+          ninja \
+          pango \
+          pixman \
+          pkgconf \
+          scdoc \
+          seatd \
+          systemd \
+          tomlplusplus \
+          wayland \
+          wayland-protocols \
+          xcb-util-errors \
+          xcb-util-renderutil \
+          xcb-util-wm \
+          xcb-util \
+          xcb-util-image \
+          libzip \
+          librsvg
+
+    - name: Get hyprcursor-git
+      shell: bash
+      run: |
+        git clone https://github.com/hyprwm/hyprcursor --recursive
+        cd hyprcursor
+        cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:PATH=/usr -S . -B ./build
+        cmake --build ./build --config Release --target all -j`nproc 2>/dev/null || getconf NPROCESSORS_CONF`
+        cmake --install build
+
+    - name: Get Xorg pacman pkgs
+      shell: bash
+      if: inputs.INSTALL_XORG_PKGS == 'true'
+      run: |
+        pacman --noconfirm --noprogressbar -Sy \
+          xorg-fonts-encodings \
+          xorg-server-common \
+          xorg-setxkbmap \
+          xorg-xkbcomp \
+          xorg-xwayland
+
+    - name: Checkout Hyprland
+      uses: actions/checkout@v4
+      with:
+        submodules: recursive
+
+    # Fix an issue with actions/checkout where the checkout repo is not mark as safe
+    - name: Mark directory as safe for git
+      shell: bash
+      run: |
+        git config --global --add safe.directory /__w/Hyprland/Hyprland

.github/workflows/ci.yaml

@@ -8,29 +8,20 @@ jobs:
     container:
       image: archlinux
     steps:
-      - name: Get required pacman pkgs
-        run: |
-           sed -i 's/SigLevel    = Required DatabaseOptional/SigLevel    = Optional TrustAll/' /etc/pacman.conf
-           pacman --noconfirm --noprogressbar -Syyu
-           pacman --noconfirm --noprogressbar -Sy glslang libepoxy libfontenc libxcvt libxfont2 libxkbfile vulkan-headers vulkan-validation-layers xcb-util-errors xcb-util-renderutil xcb-util-wm xorg-fonts-encodings xorg-server-common xorg-setxkbmap xorg-xkbcomp xorg-xwayland git cmake go clang lld libc++ pkgconf meson ninja wayland wayland-protocols libinput libxkbcommon pixman glm libdrm libglvnd cairo pango systemd scdoc base-devel seatd python libliftoff
-      - name: Set up user
-        run: |
-          useradd -m githubuser
-          echo -e "root ALL=(ALL:ALL) ALL\ngithubuser ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers
-      - name: Install libdisplay-info from the AUR
-        run: |
-          su githubuser -c "cd ~ && git clone https://aur.archlinux.org/libdisplay-info.git && cd ./libdisplay-info && makepkg -si --skippgpcheck --noconfirm --noprogressbar"
-      - name: Fix permissions for git
-        run: |
-          git config --global --add safe.directory /__w/Hyprland/Hyprland
-      - name: Checkout Hyprland
-        uses: actions/checkout@v3
+      - name: Checkout repository actions
+        uses: actions/checkout@v4
         with:
-          submodules: recursive
+          sparse-checkout: .github/actions
+
+      - name: Setup base
+        uses: ./.github/actions/setup_base
+        with:
+          INSTALL_XORG_PKGS: true
+
       - name: Build Hyprland
         run: |
-          git submodule sync --recursive && git submodule update --init --force --recursive
           make all
+
       - name: Compress and package artifacts
         run: |
           mkdir x86_64-pc-linux-gnu
@@ -40,11 +31,12 @@ jobs:
           cp ./LICENSE hyprland/
           cp build/Hyprland hyprland/
           cp build/hyprctl/hyprctl hyprland/
-          cp subprojects/wlroots/build/libwlroots.so.12032 hyprland/
+          cp build/hyprpm/hyprpm hyprland/
           cp build/Hyprland hyprland/
           cp -r example/ hyprland/
           cp -r assets/ hyprland/
           tar -cvf Hyprland.tar.xz hyprland
+
       - name: Release
         uses: actions/upload-artifact@v3
         with:
@@ -57,28 +49,19 @@ jobs:
     container:
       image: archlinux
     steps:
-      - name: Download dependencies
-        run: |
-          sed -i 's/SigLevel    = Required DatabaseOptional/SigLevel    = Optional TrustAll/' /etc/pacman.conf
-          pacman --noconfirm --noprogressbar -Syyu
-          pacman --noconfirm --noprogressbar -Sy glslang libepoxy libfontenc libxcvt libxfont2 libxkbfile vulkan-headers vulkan-validation-layers git go clang lld libc++ pkgconf meson ninja wayland wayland-protocols libinput libxkbcommon pixman glm libdrm libglvnd cairo pango systemd scdoc base-devel seatd cmake jq python libliftoff
-      - name: Set up user
-        run: |
-          useradd -m githubuser
-          echo -e "root ALL=(ALL:ALL) ALL\ngithubuser ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers
-      - name: Install libdisplay-info from the AUR
-        run: |
-          su githubuser -c "cd ~ && git clone https://aur.archlinux.org/libdisplay-info.git && cd ./libdisplay-info && makepkg -si --skippgpcheck --noconfirm --noprogressbar"
-      - name: Checkout Hyprland
-        uses: actions/checkout@v3
+      - name: Checkout repository actions
+        uses: actions/checkout@v4
         with:
-          submodules: true
+          sparse-checkout: .github/actions
+
+      - name: Setup base
+        uses: ./.github/actions/setup_base
+
       - name: Configure
-        run: |
-          meson obj-x86_64-pc-linux-gnu \
-            -Ddefault_library=static
+        run: meson setup build -Ddefault_library=static
+
       - name: Compile
-        run: ninja -C obj-x86_64-pc-linux-gnu
+        run: ninja -C build
 
   noxwayland:
     name: "Build Hyprland in pure Wayland (Arch)"
@@ -86,23 +69,36 @@ jobs:
     container:
       image: archlinux
     steps:
-      - name: Download dependencies
-        run: |
-          sed -i 's/SigLevel    = Required DatabaseOptional/SigLevel    = Optional TrustAll/' /etc/pacman.conf
-          pacman --noconfirm --noprogressbar -Syyu
-          pacman --noconfirm --noprogressbar -Sy glslang libepoxy libfontenc libxcvt libxfont2 libxkbfile vulkan-headers vulkan-validation-layers git cmake go clang lld libc++ pkgconf meson ninja wayland wayland-protocols libinput libxkbcommon pixman glm libdrm libglvnd cairo pango systemd scdoc base-devel seatd libliftoff
-      - name: Set up user
-        run: |
-          useradd -m githubuser
-          echo -e "root ALL=(ALL:ALL) ALL\ngithubuser ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers
-      - name: Install libdisplay-info from the AUR
-        run: |
-          su githubuser -c "cd ~ && git clone https://aur.archlinux.org/libdisplay-info.git && cd ./libdisplay-info && makepkg -si --skippgpcheck --noconfirm --noprogressbar"
-      - name: Checkout Hyprland
-        uses: actions/checkout@v3
+      - name: Checkout repository actions
+        uses: actions/checkout@v4
         with:
-          submodules: true
+          sparse-checkout: .github/actions
+
+      - name: Setup base
+        uses: ./.github/actions/setup_base
+
       - name: Configure
         run: mkdir -p build && cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DNO_XWAYLAND:STRING=true -H./ -B./build -G Ninja
+
       - name: Compile
         run: make release
+
+  clang-format:
+    name: "Code Style (Arch)"
+    runs-on: ubuntu-latest
+    container:
+      image: archlinux
+    steps:
+      - name: Checkout repository actions
+        uses: actions/checkout@v4
+        with:
+          sparse-checkout: .github/actions
+
+      - name: Setup base
+        uses: ./.github/actions/setup_base
+
+      - name: Configure
+        run: meson setup build -Ddefault_library=static
+
+      - name: clang-format check
+        run: ninja -C build clang-format-check

.github/workflows/nix-build.yml

@@ -10,7 +10,6 @@ jobs:
       matrix:
         package:
           - hyprland
-          - hyprland-nvidia
           - xdg-desktop-portal-hyprland
 
     runs-on: ubuntu-latest
@@ -20,11 +19,11 @@ jobs:
         with:
           ref: ${{ github.ref }}
 
-      - uses: DeterminateSystems/nix-installer-action@main
+      - uses: cachix/install-nix-action@v25
       - uses: DeterminateSystems/magic-nix-cache-action@main
       - uses: cachix/cachix-action@v12
         with:
           name: hyprland
           authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
 
-      - run: nix build -L ${{ matrix.command }}
+      - run: nix build .#${{ matrix.package }} -L

.github/workflows/security-checks.yml

@@ -24,53 +24,3 @@ jobs:
         uses: github/codeql-action/upload-sarif@v2
         with:
           sarif_file: ${{github.workspace}}/flawfinder_results.sarif
-  
-  codeql:
-    name: CodeQL
-    runs-on: ubuntu-latest
-    container:
-      image: archlinux
-    
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ 'cpp' ]
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v3
-
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
-      with:
-        languages: ${{ matrix.language }}
-
-    - name: Init Hyprland build
-      run: |
-        sed -i 's/SigLevel    = Required DatabaseOptional/SigLevel    = Optional TrustAll/' /etc/pacman.conf
-        pacman --noconfirm --noprogressbar -Syyu
-        pacman --noconfirm --noprogressbar -Sy glslang libepoxy libfontenc libxcvt libxfont2 libxkbfile vulkan-headers vulkan-validation-layers xcb-util-errors xcb-util-renderutil xcb-util-wm xorg-fonts-encodings xorg-server-common xorg-setxkbmap xorg-xkbcomp xorg-xwayland git cmake go clang lld libc++ pkgconf meson ninja wayland wayland-protocols libinput libxkbcommon pixman glm libdrm libglvnd cairo pango systemd scdoc base-devel seatd python libliftoff
-        useradd -m githubuser
-        echo -e "root ALL=(ALL:ALL) ALL\ngithubuser ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers
-        su githubuser -c "cd ~ && git clone https://aur.archlinux.org/libdisplay-info.git && cd ./libdisplay-info && makepkg -si --skippgpcheck --noconfirm --noprogressbar"
-        git config --global --add safe.directory /__w/Hyprland/Hyprland
-    
-    - name: Checkout Hyprland
-      uses: actions/checkout@v3
-      with:
-        submodules: recursive
-
-    - name: Build Hyprland
-      run: |
-        git submodule sync --recursive && git submodule update --init --force --recursive
-        make all
-    
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
-      with:
-        category: "/language:${{matrix.language}}"

.github/workflows/stale.yml

@@ -0,0 +1,28 @@
+# This workflow warns and then closes issues and PRs that have had no activity for a specified amount of time.
+#
+# You can adjust the behavior by modifying this file.
+# For more information, see:
+# https://github.com/actions/stale
+name: Mark stale issues and pull requests
+
+on:
+  schedule:
+  - cron: '7 */4 * * *'
+  workflow_dispatch:
+
+jobs:
+  stale:
+
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+
+    steps:
+    - uses: actions/stale@v5
+      with:
+        repo-token: ${{ secrets.STALEBOT_PAT }}
+        stale-issue-label: 'stale'
+        stale-pr-label: 'stale'
+        operations-per-run: 40
+        days-before-close: -1

.gitignore

@@ -31,3 +31,5 @@ gmon.out
 PKGBUILD
 
 src/version.h
+
+.direnv

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "wlroots"]
-	path = subprojects/wlroots
-	url = https://gitlab.freedesktop.org/wlroots/wlroots.git
 [submodule "subprojects/hyprland-protocols"]
 	path = subprojects/hyprland-protocols
 	url = https://github.com/hyprwm/hyprland-protocols
@@ -10,3 +7,6 @@
 [submodule "subprojects/tracy"]
 	path = subprojects/tracy
 	url = https://github.com/wolfpld/tracy
+[submodule "subprojects/wlroots-hyprland"]
+	path = subprojects/wlroots-hyprland
+	url = https://github.com/hyprwm/wlroots-hyprland

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.19)
+cmake_minimum_required(VERSION 3.27)
 include(CheckIncludeFile)
 
 # Get version
@@ -33,27 +33,43 @@ add_subdirectory("subprojects/udis86")
 message(STATUS "Setting up wlroots")
 
 include(ExternalProject)
-string(TOLOWER ${CMAKE_BUILD_TYPE} BUILDTYPE_LOWER)
+
+if(CMAKE_BUILD_TYPE)
+    string(TOLOWER ${CMAKE_BUILD_TYPE} BUILDTYPE_LOWER)
+    if(BUILDTYPE_LOWER STREQUAL "release")
+        # Pass.
+    elseif(BUILDTYPE_LOWER STREQUAL "debug")
+        # Pass.
+    elseif(BUILDTYPE_LOWER STREQUAL "relwithdebinfo")
+        set(BUILDTYPE_LOWER "debugoptimized")
+    elseif(BUILDTYPE_LOWER STREQUAL "minsizerel")
+        set(BUILDTYPE_LOWER "minsize")
+    elseif(BUILDTYPE_LOWER STREQUAL "none")
+        set(BUILDTYPE_LOWER "plain")
+    else()
+        set(BUILDTYPE_LOWER "release")
+    endif()
+else()
+    set(BUILDTYPE_LOWER "release")
+endif()
+
 ExternalProject_Add(
-    wlroots
-    PREFIX ${CMAKE_SOURCE_DIR}/subprojects/wlroots
-    SOURCE_DIR ${CMAKE_SOURCE_DIR}/subprojects/wlroots
-    PATCH_COMMAND sed -E -i -e "s/(soversion = 12)([^032]|$$)/soversion = 12032/g" meson.build
-    CONFIGURE_COMMAND meson setup build --buildtype=${BUILDTYPE_LOWER} -Dwerror=false -Dexamples=false -Drenderers=gles2 $<IF:$<BOOL:${WITH_ASAN}>,-Db_sanitize=address,-Db_sanitize=none> && meson setup build --buildtype=${BUILDTYPE_LOWER} -Dwerror=false -Dexamples=false -Drenderers=gles2 $<IF:$<BOOL:${WITH_ASAN}>,-Db_sanitize=address,-Db_sanitize=none> --reconfigure
+    wlroots-hyprland
+    PREFIX ${CMAKE_SOURCE_DIR}/subprojects/wlroots-hyprland
+    SOURCE_DIR ${CMAKE_SOURCE_DIR}/subprojects/wlroots-hyprland
+    CONFIGURE_COMMAND meson setup --reconfigure build --buildtype=${BUILDTYPE_LOWER} -Dwerror=false -Dxwayland=$<IF:$<BOOL:${NO_XWAYLAND}>,disabled,enabled> -Dexamples=false -Drenderers=gles2 -Dbackends=drm,libinput $<IF:$<BOOL:${WITH_ASAN}>,-Db_sanitize=address,-Db_sanitize=none>
     BUILD_COMMAND ninja -C build
     BUILD_ALWAYS true
     BUILD_IN_SOURCE true
-    BUILD_BYPRODUCTS ${CMAKE_SOURCE_DIR}/subprojects/wlroots/build/libwlroots.so.12032
-    INSTALL_COMMAND echo "wlroots: install not needed"
+    BUILD_BYPRODUCTS ${CMAKE_SOURCE_DIR}/subprojects/wlroots-hyprland/build/libwlroots.a
+    INSTALL_COMMAND echo "wlroots-hyprland: install not needed"
 )
 
-find_program(WaylandScanner NAMES wayland-scanner)
+find_package(PkgConfig REQUIRED)
+
+pkg_get_variable(WaylandScanner wayland-scanner wayland_scanner)
 message(STATUS "Found WaylandScanner at ${WaylandScanner}")
-execute_process(
-    COMMAND pkg-config --variable=pkgdatadir wayland-protocols
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-    OUTPUT_VARIABLE WAYLAND_PROTOCOLS_DIR
-    OUTPUT_STRIP_TRAILING_WHITESPACE)
+pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir)
 message(STATUS "Found wayland-protocols at ${WAYLAND_PROTOCOLS_DIR}")
 
 if(CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES DEBUG)
@@ -67,28 +83,45 @@ endif()
 include_directories(
   .
   "src/"
-  "subprojects/wlroots/include/"
-  "subprojects/wlroots/build/include/"
+  "subprojects/wlroots-hyprland/include/"
+  "subprojects/wlroots-hyprland/build/include/"
   "subprojects/udis86/"
   "protocols/")
 set(CMAKE_CXX_STANDARD 23)
 add_compile_definitions(WLR_USE_UNSTABLE)
 add_compile_options(-Wall -Wextra -Wno-unused-parameter -Wno-unused-value -Wno-missing-field-initializers -Wno-narrowing -Wno-pointer-arith)
-add_link_options(-rdynamic)
-set(CMAKE_ENABLE_EXPORTS TRUE)
+
+set(CMAKE_EXECUTABLE_ENABLE_EXPORTS TRUE)
 
 message(STATUS "Checking deps...")
 
 find_package(Threads REQUIRED)
 
-find_package(PkgConfig REQUIRED)
-find_package(OpenGL REQUIRED)
-pkg_check_modules(deps REQUIRED IMPORTED_TARGET wayland-server wayland-client wayland-cursor wayland-protocols cairo libdrm xkbcommon libinput pango pangocairo pixman-1) # we do not check for wlroots, as we provide it ourselves
+if(LEGACY_RENDERER)
+    set(GLES_VERSION "GLES2")
+else()
+    set(GLES_VERSION "GLES3")
+endif()
+find_package(OpenGL REQUIRED COMPONENTS ${GLES_VERSION})
+
+pkg_check_modules(deps REQUIRED IMPORTED_TARGET
+    xkbcommon
+    wayland-server wayland-client wayland-cursor wayland-protocols
+    cairo pango pangocairo pixman-1
+    libdrm libinput hwdata libseat libdisplay-info libliftoff libudev gbm
+    hyprlang>=0.3.2 hyprcursor
+)
 
 file(GLOB_RECURSE SRCFILES CONFIGURE_DEPENDS "src/*.cpp")
 
-add_executable(Hyprland ${SRCFILES})
-add_dependencies(Hyprland wlroots)
+set(TRACY_CPP_FILES "")
+if(USE_TRACY)
+    set(TRACY_CPP_FILES "subprojects/tracy/public/TracyClient.cpp")
+    message(STATUS "Tracy enabled, TRACY_CPP_FILES: " ${TRACY_CPP_FILES})
+endif()
+
+add_executable(Hyprland ${SRCFILES} ${TRACY_CPP_FILES})
+add_dependencies(Hyprland wlroots-hyprland)
 
 if(CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES DEBUG)
     message(STATUS "Setting debug flags")
@@ -97,7 +130,7 @@ if(CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES DEBUG)
         message(STATUS "Enabling ASan")
 
         target_link_libraries(Hyprland asan)
-        add_compile_options(-fsanitize=address)
+        target_compile_options(Hyprland PUBLIC -fsanitize=address)
     endif()
 
     if(USE_TRACY)
@@ -141,8 +174,12 @@ if(NO_XWAYLAND)
     add_compile_definitions(NO_XWAYLAND)
 else()
     message(STATUS "XWAYLAND Enabled (NO_XWAYLAND not defined) checking deps...")
-    pkg_check_modules(xcbdep REQUIRED IMPORTED_TARGET xcb)
-    target_link_libraries(Hyprland PkgConfig::xcbdep)
+    pkg_check_modules(xdeps REQUIRED IMPORTED_TARGET xcb xwayland xcb-util xcb-render xcb-image xcb-xfixes xcb-icccm xcb-composite xcb-res xcb-ewmh)
+    pkg_check_modules(xcb_errors IMPORTED_TARGET xcb-errors)
+    target_link_libraries(Hyprland PkgConfig::xdeps)
+    if(xcb_errors_FOUND)
+        target_link_libraries(Hyprland PkgConfig::xcb_errors)
+    endif()
 endif()
 
 if(NO_SYSTEMD)
@@ -164,14 +201,6 @@ else()
     endif()
 endif()
 
-target_compile_definitions(Hyprland
-    PRIVATE
-    "GIT_COMMIT_HASH=\"${GIT_COMMIT_HASH}\""
-    "GIT_BRANCH=\"${GIT_BRANCH}\""
-    "GIT_COMMIT_MESSAGE=\"${GIT_COMMIT_MESSAGE}\""
-    "GIT_DIRTY=\"${GIT_DIRTY}\""
-    "GIT_TAG=\"${GIT_TAG}\"")
-
 set(CPACK_PROJECT_NAME ${PROJECT_NAME})
 set(CPACK_PROJECT_VERSION ${PROJECT_VERSION})
 include(CPack)
@@ -205,7 +234,7 @@ function(protocol protoPath protoName external)
 endfunction()
 
 target_link_libraries(Hyprland
-        ${CMAKE_SOURCE_DIR}/subprojects/wlroots/build/libwlroots.so.12032 # wlroots is provided by us
+        ${CMAKE_SOURCE_DIR}/subprojects/wlroots-hyprland/build/libwlroots.a
         OpenGL::EGL
         OpenGL::GL
         Threads::Threads
@@ -229,5 +258,6 @@ protocol("staging/tearing-control/tearing-control-v1.xml" "tearing-control-v1" f
 protocol("unstable/text-input/text-input-unstable-v1.xml" "text-input-unstable-v1" false)
 protocol("staging/cursor-shape/cursor-shape-v1.xml" "cursor-shape-v1" false)
 
-# hyprctl
+# tools
 add_subdirectory(hyprctl)
+add_subdirectory(hyprpm)

LICENSE

@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2022-2023, vaxerski
+Copyright (c) 2022-2024, vaxerski
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

Makefile

@@ -1,29 +1,29 @@
 PREFIX = /usr/local
 
 legacyrenderer:
-	cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DLEGACY_RENDERER:BOOL=true -S . -B ./build -G Ninja
+	cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:STRING=${PREFIX} -DLEGACY_RENDERER:BOOL=true -S . -B ./build -G Ninja
 	cmake --build ./build --config Release --target all -j`nproc 2>/dev/null || getconf NPROCESSORS_CONF`
 	chmod -R 777 ./build
 
 legacyrendererdebug:
-	cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Debug -DLEGACY_RENDERER:BOOL=true -S . -B ./build -G Ninja
+	cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Debug -DCMAKE_INSTALL_PREFIX:STRING=${PREFIX} -DLEGACY_RENDERER:BOOL=true -S . -B ./build -G Ninja
 	cmake --build ./build --config Release --target all -j`nproc 2>/dev/null || getconf NPROCESSORS_CONF`
 	chmod -R 777 ./build
 
 release:
-	cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -S . -B ./build -G Ninja
+	cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:STRING=${PREFIX} -S . -B ./build -G Ninja
 	cmake --build ./build --config Release --target all -j`nproc 2>/dev/null || getconf NPROCESSORS_CONF`
 	chmod -R 777 ./build
 
 debug:
-	cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Debug -S . -B ./build -G Ninja
+	cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Debug -DCMAKE_INSTALL_PREFIX:STRING=${PREFIX} -S . -B ./build -G Ninja
 	cmake --build ./build --config Debug --target all -j`nproc 2>/dev/null || getconf NPROCESSORS_CONF`
 	chmod -R 777 ./build
 
 clear:
 	rm -rf build
 	rm -f ./protocols/*-protocol.h ./protocols/*-protocol.c
-	rm -rf ./subprojects/wlroots/build
+	rm -rf ./subprojects/wlroots-hyprland/build
 
 all:
 	@if [[ "$EUID" = 0 ]]; then echo -en "Avoid running $(MAKE) all as sudo.\n"; fi
@@ -36,48 +36,65 @@ install:
 
 	mkdir -p ${PREFIX}/share/wayland-sessions
 	mkdir -p ${PREFIX}/bin
+	mkdir -p ${PREFIX}/share/hyprland
+	mkdir -p ${PREFIX}/share/bash-completion/completions
+	mkdir -p ${PREFIX}/share/fish/vendor_completions.d
+	mkdir -p ${PREFIX}/share/zsh/site-functions
 	cp -f ./build/Hyprland ${PREFIX}/bin
 	cp -f ./build/hyprctl/hyprctl ${PREFIX}/bin
+	cp -f ./build/hyprpm/hyprpm ${PREFIX}/bin
+	cp -f ./hyprctl/hyprctl.bash ${PREFIX}/share/bash-completion/completions/hyprctl
+	cp -f ./hyprctl/hyprctl.fish ${PREFIX}/share/fish/vendor_completions.d/hyprctl.fish
+	cp -f ./hyprctl/hyprctl.zsh ${PREFIX}/share/zsh/site-functions/_hyprctl
+	cp -f ./hyprpm/hyprpm.bash ${PREFIX}/share/bash-completion/completions/hyprpm
+	cp -f ./hyprpm/hyprpm.fish ${PREFIX}/share/fish/vendor_completions.d/hyprpm.fish
+	cp -f ./hyprpm/hyprpm.zsh ${PREFIX}/share/zsh/site-functions/_hyprpm
 	chmod 755 ${PREFIX}/bin/Hyprland
 	chmod 755 ${PREFIX}/bin/hyprctl
+	chmod 755 ${PREFIX}/bin/hyprpm
+	cd ${PREFIX}/bin && ln -sf Hyprland hyprland
 	if [ ! -f ${PREFIX}/share/wayland-sessions/hyprland.desktop ]; then cp ./example/hyprland.desktop ${PREFIX}/share/wayland-sessions; fi
-	mkdir -p ${PREFIX}/share/hyprland
-	cp ./assets/wall_* ${PREFIX}/share/hyprland
+	cp ./assets/wall* ${PREFIX}/share/hyprland
 	mkdir -p ${PREFIX}/share/xdg-desktop-portal
 	cp ./assets/hyprland-portals.conf ${PREFIX}/share/xdg-desktop-portal
 
 	mkdir -p ${PREFIX}/share/man/man1
 	install -m644 ./docs/*.1 ${PREFIX}/share/man/man1
 
-	mkdir -p ${PREFIX}/lib/
-	cp ./subprojects/wlroots/build/libwlroots.so.12032 ${PREFIX}/lib/
-
 	$(MAKE) installheaders
 
 uninstall:
 	rm -f ${PREFIX}/share/wayland-sessions/hyprland.desktop
 	rm -f ${PREFIX}/bin/Hyprland
+	rm -f ${PREFIX}/bin/hyprland
 	rm -f ${PREFIX}/bin/hyprctl
-	rm -f ${PREFIX}/lib/libwlroots.so.12032
+	rm -f ${PREFIX}/bin/hyprpm
 	rm -rf ${PREFIX}/share/hyprland
 	rm -f ${PREFIX}/share/man/man1/Hyprland.1
 	rm -f ${PREFIX}/share/man/man1/hyprctl.1
+	rm -f ${PREFIX}/share/bash-completion/completions/hyprctl
+	rm -f ${PREFIX}/share/fish/vendor_completions.d/hyprctl.fish
+	rm -f ${PREFIX}/share/zsh/site-functions/_hyprctl
+	rm -f ${PREFIX}/share/bash-completion/completions/hyprpm
+	rm -f ${PREFIX}/share/fish/vendor_completions.d/hyprpm.fish
+	rm -f ${PREFIX}/share/zsh/site-functions/_hyprpm
 
 pluginenv:
 	@echo -en "$(MAKE) pluginenv has been deprecated.\nPlease run $(MAKE) all && sudo $(MAKE) installheaders\n"
 	@exit 1
 	
 installheaders:
-	@if [ ! -f ./build/Hyprland ]; then echo -en "You need to run $(MAKE) all first.\n" && exit 1; fi
+	@if [ ! -f ./src/version.h ]; then echo -en "You need to run $(MAKE) all first.\n" && exit 1; fi
 
+	rm -fr ${PREFIX}/include/hyprland
 	mkdir -p ${PREFIX}/include/hyprland
 	mkdir -p ${PREFIX}/include/hyprland/protocols
-	mkdir -p ${PREFIX}/include/hyprland/wlroots
+	mkdir -p ${PREFIX}/include/hyprland/wlroots-hyprland
 	mkdir -p ${PREFIX}/share/pkgconfig
 	
 	find src -name '*.h*' -print0 | cpio --quiet -0dump ${PREFIX}/include/hyprland
-	cd subprojects/wlroots/include && find . -name '*.h*' -print0 | cpio --quiet -0dump ${PREFIX}/include/hyprland/wlroots && cd ../../..
-	cd subprojects/wlroots/build/include && find . -name '*.h*' -print0 | cpio --quiet -0dump ${PREFIX}/include/hyprland/wlroots && cd ../../../..
+	cd subprojects/wlroots-hyprland/include && find . -name '*.h*' -print0 | cpio --quiet -0dump ${PREFIX}/include/hyprland/wlroots-hyprland && cd ../../..
+	cd subprojects/wlroots-hyprland/build/include && find . -name '*.h*' -print0 | cpio --quiet -0dump ${PREFIX}/include/hyprland/wlroots-hyprland && cd ../../../..
 	cp ./protocols/*-protocol.h ${PREFIX}/include/hyprland/protocols
 	cp ./build/hyprland.pc ${PREFIX}/share/pkgconfig
 	if [ -d /usr/share/pkgconfig ]; then cp ./build/hyprland.pc /usr/share/pkgconfig 2>/dev/null || true; fi
@@ -101,3 +118,28 @@ man:
 		--variable=section:1 \
 		--from rst \
 		--to man > ./docs/hyprctl.1
+
+asan:
+	@echo -en "!!WARNING!!\nOnly run this in the TTY.\n"
+	@pidof Hyprland > /dev/null && echo -ne "Refusing to run with Hyprland running.\n" || echo ""
+	@pidof Hyprland > /dev/null && exit 1 || echo ""
+
+	rm -rf ./wayland
+	git reset --hard
+
+	@echo -en "If you want to apply a patch, input its path (leave empty for none):\n"
+	@read patchvar
+	@if [-n "$patchvar"]; then patch -p1 < $patchvar || echo ""; else echo "No patch specified"; fi
+
+	git clone --recursive https://gitlab.freedesktop.org/wayland/wayland
+	cd wayland && patch -p1 < ../scripts/waylandStatic.diff && meson setup build --buildtype=debug -Db_sanitize=address -Ddocumentation=false && ninja -C build && cd ..
+	cp ./wayland/build/src/libwayland-server.a .
+	@echo "Wayland done"
+
+	patch -p1 < ./scripts/hyprlandStaticAsan.diff
+	cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Debug -DWITH_ASAN:STRING=True -DUSE_TRACY:STRING=False -DUSE_TRACY_GPU:STRING=False -S . -B ./build -G Ninja
+	cmake --build ./build --config Debug --target all -j`nproc 2>/dev/null || getconf NPROCESSORS_CONF`
+	@echo "Hyprland done"
+
+	ASAN_OPTIONS="detect_odr_violation=0,log_path=asan.log" HYPRLAND_NO_CRASHREPORTER=1 ./build/Hyprland -c ~/.config/hypr/hyprland.conf
+	

README.md

@@ -41,6 +41,7 @@ easy IPC, much more QoL stuff than other wlr-based compositors and more...
 - Much more QoL stuff than other wlr-based compositors
 - Custom bezier curves for the best animations
 - Powerful plugin support
+- Built-in plugin manager
 - Tearing support for better gaming performance
 - Easily expandable and readable codebase
 - Fast and active development
@@ -123,13 +124,13 @@ easy IPC, much more QoL stuff than other wlr-based compositors and more...
 [Wayfire]: https://github.com/WayfireWM/wayfire
 [TinyWl]: https://gitlab.freedesktop.org/wlroots/wlroots/-/blob/master/tinywl/tinywl.c
 [Sway]: https://github.com/swaywm/sway
-[DWL]: https://github.com/djpohly/dwl
+[DWL]: https://codeberg.org/dwl/dwl
 
 <!----------------------------------{ Images }--------------------------------->
 
 [Stars Preview]: https://starchart.cc/vaxerski/Hyprland.svg
-[Preview A]: https://cdn.discordapp.com/attachments/1091569872535814185/1107675866101723277/screenshot-summer.png
-[Preview B]: https://i.ibb.co/SX7GbYR/winter-rice.png
+[Preview A]: https://i.ibb.co/C1yTb0r/falf.png
+[Preview B]: https://linfindel.github.io/cdn/hyprland-preview-b.png
 [Preview C]: https://i.ibb.co/B3GJg28/20221126-20h53m26s-grim.png
 
 

assets/meson.build

@@ -1,9 +1,7 @@
-wallpaper_types = ['', 'anime_', 'anime2_']
+wallpapers = ['0', '1', '2']
 
-foreach type : wallpaper_types
-  foreach size : [2, 4, 8]
-    install_data(f'wall_@type@@size@K.png', install_dir: join_paths(get_option('datadir'), 'hyprland'), install_tag: 'runtime')
-  endforeach
+foreach type : wallpapers
+  install_data(f'wall@type@.png', install_dir: join_paths(get_option('datadir'), 'hyprland'), install_tag: 'runtime')
 endforeach
 
 install_data('hyprland-portals.conf', install_dir: join_paths(get_option('datadir'), 'xdg-desktop-portal'), install_tag: 'runtime')

docs/ISSUE_GUIDELINES.md

@@ -47,7 +47,7 @@ basically, directories in /tmp/hypr are your sessions.
 
 ## Obtaining the Hyprland Crash Report (v0.22.0beta and up)
 
-If you have `$XDG_CACHE_HOME` set, the crash report directory is `$XDG_CACHE_HOME/hyprland`. If not, it's `~/.hyprland`
+If you have `$XDG_CACHE_HOME` set, the crash report directory is `$XDG_CACHE_HOME/hyprland`. If not, it's `$HOME/.cache/hyprland`.
 
 Go to the crash report directory and you should find a file named `hyprlandCrashReport[XXXX].txt` where `[XXXX]` is the PID of the process that crashed.
 

example/examplePlugin/Makefile

@@ -1,8 +0,0 @@
-# compile with HYPRLAND_HEADERS=<path_to_hl> make all
-# make sure that the path above is to the root hl repo directory, NOT src/
-# and that you have ran `make protocols` in the hl dir.
-
-all:
-	$(CXX) -shared -fPIC --no-gnu-unique main.cpp customLayout.cpp customDecoration.cpp -o examplePlugin.so -g `pkg-config --cflags pixman-1 libdrm hyprland` -std=c++2b
-clean:
-	rm ./examplePlugin.so

example/examplePlugin/customDecoration.cpp

@@ -1,74 +0,0 @@
-#include "customDecoration.hpp"
-#include <hyprland/src/Window.hpp>
-#include <hyprland/src/Compositor.hpp>
-#include "globals.hpp"
-
-CCustomDecoration::CCustomDecoration(CWindow* pWindow) {
-    m_pWindow         = pWindow;
-    m_vLastWindowPos  = pWindow->m_vRealPosition.vec();
-    m_vLastWindowSize = pWindow->m_vRealSize.vec();
-}
-
-CCustomDecoration::~CCustomDecoration() {
-    damageEntire();
-}
-
-SWindowDecorationExtents CCustomDecoration::getWindowDecorationExtents() {
-    return m_seExtents;
-}
-
-void CCustomDecoration::draw(CMonitor* pMonitor, float a, const Vector2D& offset) {
-    if (!g_pCompositor->windowValidMapped(m_pWindow))
-        return;
-
-    if (!m_pWindow->m_sSpecialRenderData.decorate)
-        return;
-
-    static auto* const PCOLOR      = &HyprlandAPI::getConfigValue(PHANDLE, "plugin:example:border_color")->intValue;
-    static auto* const PROUNDING   = &HyprlandAPI::getConfigValue(PHANDLE, "decoration:rounding")->intValue;
-    static auto* const PBORDERSIZE = &HyprlandAPI::getConfigValue(PHANDLE, "general:border_size")->intValue;
-
-    const auto         ROUNDING = !m_pWindow->m_sSpecialRenderData.rounding ?
-                0 :
-                (m_pWindow->m_sAdditionalConfigData.rounding.toUnderlying() == -1 ? *PROUNDING : m_pWindow->m_sAdditionalConfigData.rounding.toUnderlying());
-
-    // draw the border
-    wlr_box fullBox = {(int)(m_vLastWindowPos.x - *PBORDERSIZE), (int)(m_vLastWindowPos.y - *PBORDERSIZE), (int)(m_vLastWindowSize.x + 2.0 * *PBORDERSIZE),
-                       (int)(m_vLastWindowSize.y + 2.0 * *PBORDERSIZE)};
-
-    fullBox.x -= pMonitor->vecPosition.x;
-    fullBox.y -= pMonitor->vecPosition.y;
-
-    m_seExtents = {{m_vLastWindowPos.x - fullBox.x - pMonitor->vecPosition.x + 2, m_vLastWindowPos.y - fullBox.y - pMonitor->vecPosition.y + 2},
-                   {fullBox.x + fullBox.width + pMonitor->vecPosition.x - m_vLastWindowPos.x - m_vLastWindowSize.x + 2,
-                    fullBox.y + fullBox.height + pMonitor->vecPosition.y - m_vLastWindowPos.y - m_vLastWindowSize.y + 2}};
-
-    fullBox.x += offset.x;
-    fullBox.y += offset.y;
-
-    if (fullBox.width < 1 || fullBox.height < 1)
-        return; // don't draw invisible shadows
-
-    g_pHyprOpenGL->scissor((wlr_box*)nullptr);
-
-    scaleBox(&fullBox, pMonitor->scale);
-    g_pHyprOpenGL->renderBorder(&fullBox, CColor(*PCOLOR), *PROUNDING * pMonitor->scale + *PBORDERSIZE * 2, a);
-}
-
-eDecorationType CCustomDecoration::getDecorationType() {
-    return DECORATION_CUSTOM;
-}
-
-void CCustomDecoration::updateWindow(CWindow* pWindow) {
-
-    m_vLastWindowPos  = pWindow->m_vRealPosition.vec();
-    m_vLastWindowSize = pWindow->m_vRealSize.vec();
-
-    damageEntire();
-}
-
-void CCustomDecoration::damageEntire() {
-    wlr_box dm = {(int)(m_vLastWindowPos.x - m_seExtents.topLeft.x), (int)(m_vLastWindowPos.y - m_seExtents.topLeft.y),
-                  (int)(m_vLastWindowSize.x + m_seExtents.topLeft.x + m_seExtents.bottomRight.x), (int)m_seExtents.topLeft.y};
-    g_pHyprRenderer->damageBox(&dm);
-}

example/examplePlugin/customDecoration.hpp

@@ -1,29 +0,0 @@
-#pragma once
-
-#define WLR_USE_UNSTABLE
-
-#include <hyprland/src/render/decorations/IHyprWindowDecoration.hpp>
-
-class CCustomDecoration : public IHyprWindowDecoration {
-  public:
-    CCustomDecoration(CWindow*);
-    virtual ~CCustomDecoration();
-
-    virtual SWindowDecorationExtents getWindowDecorationExtents();
-
-    virtual void                     draw(CMonitor*, float a, const Vector2D& offset);
-
-    virtual eDecorationType          getDecorationType();
-
-    virtual void                     updateWindow(CWindow*);
-
-    virtual void                     damageEntire();
-
-  private:
-    SWindowDecorationExtents m_seExtents;
-
-    CWindow*                 m_pWindow = nullptr;
-
-    Vector2D                 m_vLastWindowPos;
-    Vector2D                 m_vLastWindowSize;
-};

example/examplePlugin/customLayout.cpp

@@ -1,80 +0,0 @@
-#include "customLayout.hpp"
-#include <hyprland/src/Compositor.hpp>
-#include "globals.hpp"
-
-void CHyprCustomLayout::onWindowCreatedTiling(CWindow* pWindow) {
-    const auto PMONITOR = g_pCompositor->getMonitorFromID(pWindow->m_iMonitorID);
-    const auto SIZE     = PMONITOR->vecSize;
-
-    // these are used for focus and move calculations, and are *required* to touch for moving focus to work properly.
-    pWindow->m_vPosition = Vector2D{(SIZE.x / 2.0) * (m_vWindowData.size() % 2), (SIZE.y / 2.0) * (int)(m_vWindowData.size() > 1)};
-    pWindow->m_vSize     = SIZE / 2.0;
-
-    // this is the actual pos and size of the window (where it's rendered)
-    pWindow->m_vRealPosition = pWindow->m_vPosition + Vector2D{10, 10};
-    pWindow->m_vRealSize     = pWindow->m_vSize - Vector2D{20, 20};
-
-    const auto PDATA = &m_vWindowData.emplace_back();
-    PDATA->pWindow   = pWindow;
-}
-
-void CHyprCustomLayout::onWindowRemovedTiling(CWindow* pWindow) {
-    std::erase_if(m_vWindowData, [&](const auto& other) { return other.pWindow == pWindow; });
-}
-
-bool CHyprCustomLayout::isWindowTiled(CWindow* pWindow) {
-    return std::find_if(m_vWindowData.begin(), m_vWindowData.end(), [&](const auto& other) { return other.pWindow == pWindow; }) != m_vWindowData.end();
-}
-
-void CHyprCustomLayout::recalculateMonitor(const int& eIdleInhibitMode) {
-    ; // empty
-}
-
-void CHyprCustomLayout::recalculateWindow(CWindow* pWindow) {
-    ; // empty
-}
-
-void CHyprCustomLayout::resizeActiveWindow(const Vector2D& delta, CWindow* pWindow) {
-    ; // empty
-}
-
-void CHyprCustomLayout::fullscreenRequestForWindow(CWindow* pWindow, eFullscreenMode mode, bool on) {
-    ; // empty
-}
-
-std::any CHyprCustomLayout::layoutMessage(SLayoutMessageHeader header, std::string content) {
-    return "";
-}
-
-SWindowRenderLayoutHints CHyprCustomLayout::requestRenderHints(CWindow* pWindow) {
-    return {};
-}
-
-void CHyprCustomLayout::switchWindows(CWindow* pWindowA, CWindow* pWindowB) {
-    ; // empty
-}
-
-void CHyprCustomLayout::alterSplitRatio(CWindow* pWindow, float delta, bool exact) {
-    ; // empty
-}
-
-std::string CHyprCustomLayout::getLayoutName() {
-    return "custom";
-}
-
-void CHyprCustomLayout::replaceWindowDataWith(CWindow* from, CWindow* to) {
-    ; // empty
-}
-
-void CHyprCustomLayout::onEnable() {
-    for (auto& w : g_pCompositor->m_vWindows) {
-        if (w->isHidden() || !w->m_bIsMapped || w->m_bFadingOut || w->m_bIsFloating)
-            continue;
-
-        onWindowCreatedTiling(w.get());
-    }
-}
-
-void CHyprCustomLayout::onDisable() {
-    m_vWindowData.clear();
-}

example/examplePlugin/customLayout.hpp

@@ -1,32 +0,0 @@
-#pragma once
-
-#define WLR_USE_UNSTABLE
-
-#include <hyprland/src/layout/IHyprLayout.hpp>
-
-struct SWindowData {
-    CWindow* pWindow = nullptr;
-};
-
-class CHyprCustomLayout : public IHyprLayout {
-  public:
-    virtual void                     onWindowCreatedTiling(CWindow*);
-    virtual void                     onWindowRemovedTiling(CWindow*);
-    virtual bool                     isWindowTiled(CWindow*);
-    virtual void                     recalculateMonitor(const int&);
-    virtual void                     recalculateWindow(CWindow*);
-    virtual void                     resizeActiveWindow(const Vector2D&, CWindow* pWindow = nullptr);
-    virtual void                     fullscreenRequestForWindow(CWindow*, eFullscreenMode, bool);
-    virtual std::any                 layoutMessage(SLayoutMessageHeader, std::string);
-    virtual SWindowRenderLayoutHints requestRenderHints(CWindow*);
-    virtual void                     switchWindows(CWindow*, CWindow*);
-    virtual void                     alterSplitRatio(CWindow*, float, bool);
-    virtual std::string              getLayoutName();
-    virtual void                     replaceWindowDataWith(CWindow* from, CWindow* to);
-
-    virtual void                     onEnable();
-    virtual void                     onDisable();
-
-  private:
-    std::vector<SWindowData> m_vWindowData;
-};

example/examplePlugin/globals.hpp

@@ -1,5 +0,0 @@
-#pragma once
-
-#include <hyprland/src/plugins/PluginAPI.hpp>
-
-inline HANDLE PHANDLE = nullptr;

example/examplePlugin/main.cpp

@@ -1,99 +0,0 @@
-#define WLR_USE_UNSTABLE
-
-#include "globals.hpp"
-
-#include <hyprland/src/Window.hpp>
-#include <hyprland/src/Compositor.hpp>
-#include "customLayout.hpp"
-#include "customDecoration.hpp"
-
-#include <unistd.h>
-#include <thread>
-
-// Methods
-inline std::unique_ptr<CHyprCustomLayout> g_pCustomLayout;
-inline CFunctionHook*                     g_pFocusHook     = nullptr;
-inline CFunctionHook*                     g_pMotionHook    = nullptr;
-inline CFunctionHook*                     g_pMouseDownHook = nullptr;
-typedef void (*origFocusWindow)(void*, CWindow*, wlr_surface*);
-typedef void (*origMotion)(wlr_seat*, uint32_t, double, double);
-typedef void (*origMouseDownNormal)(void*, wlr_pointer_button_event*);
-
-// Do NOT change this function.
-APICALL EXPORT std::string PLUGIN_API_VERSION() {
-    return HYPRLAND_API_VERSION;
-}
-
-static void onActiveWindowChange(void* self, std::any data) {
-    try {
-        auto* const PWINDOW = std::any_cast<CWindow*>(data);
-
-        HyprlandAPI::addNotification(PHANDLE, "[ExamplePlugin] Active window: " + (PWINDOW ? PWINDOW->m_szTitle : "None"), CColor{0.f, 0.5f, 1.f, 1.f}, 5000);
-    } catch (std::bad_any_cast& e) { HyprlandAPI::addNotification(PHANDLE, "[ExamplePlugin] Active window: None", CColor{0.f, 0.5f, 1.f, 1.f}, 5000); }
-}
-
-static void onNewWindow(void* self, std::any data) {
-    auto* const PWINDOW = std::any_cast<CWindow*>(data);
-
-    HyprlandAPI::addWindowDecoration(PHANDLE, PWINDOW, new CCustomDecoration(PWINDOW));
-}
-
-void hkFocusWindow(void* thisptr, CWindow* pWindow, wlr_surface* pSurface) {
-    // HyprlandAPI::addNotification(PHANDLE, getFormat("FocusWindow with %lx %lx", pWindow, pSurface), CColor{0.f, 1.f, 1.f, 1.f}, 5000);
-    (*(origFocusWindow)g_pFocusHook->m_pOriginal)(thisptr, pWindow, pSurface);
-}
-
-void hkNotifyMotion(wlr_seat* wlr_seat, uint32_t time_msec, double sx, double sy) {
-    // HyprlandAPI::addNotification(PHANDLE, getFormat("NotifyMotion with %lf %lf", sx, sy), CColor{0.f, 1.f, 1.f, 1.f}, 5000);
-    (*(origMotion)g_pMotionHook->m_pOriginal)(wlr_seat, time_msec, sx, sy);
-}
-
-void hkProcessMouseDownNormal(void* thisptr, wlr_pointer_button_event* e) {
-    // HyprlandAPI::addNotification(PHANDLE, "Mouse down normal!", CColor{0.8f, 0.2f, 0.5f, 1.0f}, 5000);
-    (*(origMouseDownNormal)g_pMouseDownHook->m_pOriginal)(thisptr, e);
-}
-
-APICALL EXPORT PLUGIN_DESCRIPTION_INFO PLUGIN_INIT(HANDLE handle) {
-    PHANDLE = handle;
-
-    HyprlandAPI::addNotification(PHANDLE, "Hello World from an example plugin!", CColor{0.f, 1.f, 1.f, 1.f}, 5000);
-
-    HyprlandAPI::registerCallbackDynamic(PHANDLE, "activeWindow", [&](void* self, std::any data) { onActiveWindowChange(self, data); });
-    HyprlandAPI::registerCallbackDynamic(PHANDLE, "openWindow", [&](void* self, std::any data) { onNewWindow(self, data); });
-
-    g_pCustomLayout = std::make_unique<CHyprCustomLayout>();
-
-    HyprlandAPI::addLayout(PHANDLE, "custom", g_pCustomLayout.get());
-
-    HyprlandAPI::addConfigValue(PHANDLE, "plugin:example:border_color", SConfigValue{.intValue = configStringToInt("rgb(44ee44)")});
-
-    HyprlandAPI::addDispatcher(PHANDLE, "example", [](std::string arg) { HyprlandAPI::addNotification(PHANDLE, "Arg passed: " + arg, CColor{0.5f, 0.5f, 0.7f, 1.0f}, 5000); });
-
-    // Hook a public member
-    g_pFocusHook = HyprlandAPI::createFunctionHook(PHANDLE, (void*)&CCompositor::focusWindow, (void*)&hkFocusWindow);
-    // Hook a public non-member
-    g_pMotionHook = HyprlandAPI::createFunctionHook(PHANDLE, (void*)&wlr_seat_pointer_notify_motion, (void*)&hkNotifyMotion);
-    // Hook a private member
-    static const auto METHODS = HyprlandAPI::findFunctionsByName(PHANDLE, "processMouseDownNormal");
-    g_pMouseDownHook          = HyprlandAPI::createFunctionHook(PHANDLE, METHODS[0].address, (void*)&hkProcessMouseDownNormal);
-
-    static auto* const PBORDERCOLOR = HyprlandAPI::getConfigValue(PHANDLE, "plugin:example:border_color");
-
-    // fancy notifications
-    HyprlandAPI::addNotificationV2(
-        PHANDLE,
-        {{"text", "Example hint, color " + std::to_string(PBORDERCOLOR->intValue)}, {"time", (uint64_t)10000}, {"color", CColor{PBORDERCOLOR->intValue}}, {"icon", ICON_HINT}});
-
-    // Enable our hooks
-    g_pFocusHook->hook();
-    g_pMotionHook->hook();
-    g_pMouseDownHook->hook();
-
-    HyprlandAPI::reloadConfig();
-
-    return {"ExamplePlugin", "An example plugin", "Vaxry", "1.0"};
-}
-
-APICALL EXPORT void PLUGIN_EXIT() {
-    HyprlandAPI::invokeHyprctlCommand("seterror", "disable");
-}

example/hyprland.conf

@@ -19,8 +19,14 @@ monitor=,preferred,auto,auto
 # Source a file (multi-file configs)
 # source = ~/.config/hypr/myColors.conf
 
+# Set programs that you use
+$terminal = kitty
+$fileManager = dolphin
+$menu = wofi --show drun
+
 # Some default env vars.
 env = XCURSOR_SIZE,24
+env = QT_QPA_PLATFORMTHEME,qt5ct # change to qt6ct if you have that
 
 # For all categories, see https://wiki.hyprland.org/Configuring/Variables/
 input {
@@ -63,6 +69,8 @@ decoration {
         enabled = true
         size = 3
         passes = 1
+        
+        vibrancy = 0.1696
     }
 
     drop_shadow = true
@@ -104,12 +112,13 @@ gestures {
 
 misc {
     # See https://wiki.hyprland.org/Configuring/Variables/ for more
-    force_default_wallpaper = -1 # Set to 0 to disable the anime mascot wallpapers
+    force_default_wallpaper = -1 # Set to 0 or 1 to disable the anime mascot wallpapers
 }
 
 # Example per-device config
 # See https://wiki.hyprland.org/Configuring/Keywords/#per-device-input-configs for more
-device:epic-mouse-v1 {
+device {
+    name = epic-mouse-v1
     sensitivity = -0.5
 }
 
@@ -118,18 +127,19 @@ device:epic-mouse-v1 {
 # Example windowrule v2
 # windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
 # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
+windowrulev2 = suppressevent maximize, class:.* # You'll probably like this.
 
 
 # See https://wiki.hyprland.org/Configuring/Keywords/ for more
 $mainMod = SUPER
 
 # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
-bind = $mainMod, Q, exec, kitty
+bind = $mainMod, Q, exec, $terminal
 bind = $mainMod, C, killactive,
 bind = $mainMod, M, exit,
-bind = $mainMod, E, exec, dolphin
+bind = $mainMod, E, exec, $fileManager
 bind = $mainMod, V, togglefloating,
-bind = $mainMod, R, exec, wofi --show drun
+bind = $mainMod, R, exec, $menu
 bind = $mainMod, P, pseudo, # dwindle
 bind = $mainMod, J, togglesplit, # dwindle
 
@@ -163,6 +173,10 @@ bind = $mainMod SHIFT, 8, movetoworkspace, 8
 bind = $mainMod SHIFT, 9, movetoworkspace, 9
 bind = $mainMod SHIFT, 0, movetoworkspace, 10
 
+# Example special workspace (scratchpad)
+bind = $mainMod, S, togglespecialworkspace, magic
+bind = $mainMod SHIFT, S, movetoworkspace, special:magic
+
 # Scroll through existing workspaces with mainMod + scroll
 bind = $mainMod, mouse_down, workspace, e+1
 bind = $mainMod, mouse_up, workspace, e-1

flake.lock

@@ -1,5 +1,31 @@
 {
   "nodes": {
+    "hyprcursor": {
+      "inputs": {
+        "hyprlang": [
+          "hyprlang"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "systems": [
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1712434681,
+        "narHash": "sha256-qwmR2p1oc48Bj7gUDvb1oGL19Rjs2PmEmk4ChV01A5o=",
+        "owner": "hyprwm",
+        "repo": "hyprcursor",
+        "rev": "818d8c4b69e0997483d60b75f701fe14b561a7a3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprcursor",
+        "type": "github"
+      }
+    },
     "hyprland-protocols": {
       "inputs": {
         "nixpkgs": [
@@ -23,13 +49,36 @@
         "type": "github"
       }
     },
+    "hyprlang": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "systems": [
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1711671891,
+        "narHash": "sha256-C/Wwsy/RLxHP1axFFl+AnwJRWfd8gxDKKoa8nt8Qk3c=",
+        "owner": "hyprwm",
+        "repo": "hyprlang",
+        "rev": "c1402612146ba06606ebf64963a02bc1efe11e74",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprlang",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1694767346,
-        "narHash": "sha256-5uH27SiVFUwsTsqC5rs3kS7pBoNhtoy9QfTP9BmknGk=",
+        "lastModified": 1712439257,
+        "narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ace5093e36ab1e95cb9463863491bee90d5a4183",
+        "rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599",
         "type": "github"
       },
       "original": {
@@ -41,7 +90,9 @@
     },
     "root": {
       "inputs": {
+        "hyprcursor": "hyprcursor",
         "hyprland-protocols": "hyprland-protocols",
+        "hyprlang": "hyprlang",
         "nixpkgs": "nixpkgs",
         "systems": "systems",
         "wlroots": "wlroots",
@@ -66,20 +117,18 @@
     "wlroots": {
       "flake": false,
       "locked": {
-        "host": "gitlab.freedesktop.org",
-        "lastModified": 1696410538,
-        "narHash": "sha256-ecDhdYLXWHsxMv+EWG36mCNDvzRbu9qfjH7dLxL7aGM=",
-        "owner": "wlroots",
-        "repo": "wlroots",
-        "rev": "3406c1b17a4a7e6d4e2a7d9c1176affa72bce1bc",
-        "type": "gitlab"
+        "lastModified": 1712935342,
+        "narHash": "sha256-zzIbTFNFd/as42jyGx23fil2uBDYYv+8GA5JmRq5y9c=",
+        "owner": "hyprwm",
+        "repo": "wlroots-hyprland",
+        "rev": "62eeffbe233d199f520a5755c344e85f8eab7940",
+        "type": "github"
       },
       "original": {
-        "host": "gitlab.freedesktop.org",
-        "owner": "wlroots",
-        "repo": "wlroots",
-        "rev": "3406c1b17a4a7e6d4e2a7d9c1176affa72bce1bc",
-        "type": "gitlab"
+        "owner": "hyprwm",
+        "repo": "wlroots-hyprland",
+        "rev": "62eeffbe233d199f520a5755c344e85f8eab7940",
+        "type": "github"
       }
     },
     "xdph": {
@@ -87,6 +136,9 @@
         "hyprland-protocols": [
           "hyprland-protocols"
         ],
+        "hyprlang": [
+          "hyprlang"
+        ],
         "nixpkgs": [
           "nixpkgs"
         ],
@@ -95,11 +147,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1694628480,
-        "narHash": "sha256-Qg9hstRw0pvjGu5hStkr2UX1D73RYcQ9Ns/KnZMIm9w=",
+        "lastModified": 1709299639,
+        "narHash": "sha256-jYqJM5khksLIbqSxCLUUcqEgI+O2LdlSlcMEBs39CAU=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "8f45a6435069b9e24ebd3160eda736d7a391cbf2",
+        "rev": "2d2fb547178ec025da643db57d40a971507b82fe",
         "type": "github"
       },
       "original": {

flake.nix

@@ -8,25 +8,38 @@
     systems.url = "github:nix-systems/default-linux";
 
     wlroots = {
-      type = "gitlab";
-      host = "gitlab.freedesktop.org";
-      owner = "wlroots";
-      repo = "wlroots";
-      rev = "3406c1b17a4a7e6d4e2a7d9c1176affa72bce1bc";
+      type = "github";
+      owner = "hyprwm";
+      repo = "wlroots-hyprland";
+      rev = "62eeffbe233d199f520a5755c344e85f8eab7940";
       flake = false;
     };
 
+    hyprcursor = {
+      url = "github:hyprwm/hyprcursor";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.systems.follows = "systems";
+      inputs.hyprlang.follows = "hyprlang";
+    };
+
     hyprland-protocols = {
       url = "github:hyprwm/hyprland-protocols";
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.systems.follows = "systems";
     };
 
+    hyprlang = {
+      url = "github:hyprwm/hyprlang";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.systems.follows = "systems";
+    };
+
     xdph = {
       url = "github:hyprwm/xdg-desktop-portal-hyprland";
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.systems.follows = "systems";
       inputs.hyprland-protocols.follows = "hyprland-protocols";
+      inputs.hyprlang.follows = "hyprlang";
     };
   };
 
@@ -62,13 +75,16 @@
       inherit
         (pkgsFor.${system})
         # hyprland-packages
+        
         hyprland
-        hyprland-unwrapped
         hyprland-debug
-        hyprland-nvidia
+        hyprland-legacy-renderer
+        hyprland-unwrapped
         # hyprland-extras
+        
         xdg-desktop-portal-hyprland
         # dependencies
+        
         hyprland-protocols
         wlroots-hyprland
         udis86
@@ -76,17 +92,19 @@
     });
 
     devShells = eachSystem (system: {
-      default = pkgsFor.${system}.mkShell.override {
-        stdenv = pkgsFor.${system}.gcc13Stdenv;
-      } {
-        name = "hyprland-shell";
-        nativeBuildInputs = with pkgsFor.${system}; [cmake python3];
-        buildInputs = [self.packages.${system}.wlroots-hyprland];
-        inputsFrom = [
-          self.packages.${system}.wlroots-hyprland
-          self.packages.${system}.hyprland
-        ];
-      };
+      default =
+        pkgsFor.${system}.mkShell.override {
+          stdenv = pkgsFor.${system}.gcc13Stdenv;
+        } {
+          name = "hyprland-shell";
+          nativeBuildInputs = with pkgsFor.${system}; [cmake python3 expat libxml2];
+          buildInputs = [self.packages.${system}.wlroots-hyprland];
+          hardeningDisable = ["fortify"];
+          inputsFrom = [
+            self.packages.${system}.wlroots-hyprland
+            self.packages.${system}.hyprland
+          ];
+        };
     });
 
     formatter = eachSystem (system: nixpkgs.legacyPackages.${system}.alejandra);

hyprctl/Makefile

@@ -1,4 +1,4 @@
 all:
-	$(CXX) -std=c++2b ./main.cpp -o ./hyprctl
+	$(CXX) $(CXXFLAGS) -std=c++2b ./main.cpp -o ./hyprctl
 clean:
 	rm ./hyprctl

hyprctl/Strings.hpp

@@ -0,0 +1,158 @@
+#pragma once
+
+const std::string_view USAGE = R"#(usage: hyprctl [flags] <command> [args...|--help]
+
+commands:
+    activewindow        → Gets the active window name and its properties
+    activeworkspace     → Gets the active workspace and its properties
+    animations          → Gets the current config'd info about animations
+                          and beziers
+    binds               → Lists all registered binds
+    clients             → Lists all windows with their properties
+    configerrors        → Lists all current config parsing errors
+    cursorpos           → Gets the current cursor position in global layout
+                          coordinates
+    decorations <window_regex> → Lists all decorations and their info
+    devices             → Lists all connected keyboards and mice
+    dismissnotify [amount] → Dismisses all or up to AMOUNT notifications
+    dispatch <dispatcher> [args] → Issue a dispatch to call a keybind
+                          dispatcher with arguments
+    getoption <option>  → Gets the config option status (values)
+    globalshortcuts     → Lists all global shortcuts
+    hyprpaper ...       → Issue a hyprpaper request
+    instances           → Lists all running instances of Hyprland with
+                          their info
+    keyword <name> <value> → Issue a keyword to call a config keyword
+                          dynamically
+    kill                → Issue a kill to get into a kill mode, where you can
+                          kill an app by clicking on it. You can exit it
+                          with ESCAPE
+    layers              → Lists all the surface layers
+    layouts             → Lists all layouts available (including plugin'd ones)
+    monitors            → Lists active outputs with their properties,
+                          'monitors all' lists active and inactive outputs
+    notify ...          → Sends a notification using the built-in Hyprland
+                          notification system
+    output ...          → Allows you to add and remove fake outputs to your
+                          preferred backend
+    plugin ...          → Issue a plugin request
+    reload [config-only] → Issue a reload to force reload the config. Pass
+                          'config-only' to disable monitor reload
+    rollinglog          → Prints tail of the log
+    setcursor <theme> <size> → Sets the cursor theme and reloads the cursor
+                          manager
+    seterror <color> <message...> → Sets the hyprctl error string. Color has
+                          the same format as in colors in config. Will reset
+                          when Hyprland's config is reloaded
+    setprop ...         → Sets a window property
+    splash              → Get the current splash
+    switchxkblayout ... → Sets the xkb layout index for a keyboard
+    systeminfo          → Get system info
+    version             → Prints the hyprland version, meaning flags, commit
+                          and branch of build.
+    workspacerules      → Lists all workspace rules
+    workspaces          → Lists all workspaces with their properties
+
+flags:
+    -j                  → Output in JSON
+    -r                  → Refresh state after issuing command (e.g. for
+                          updating variables)
+    --batch             → Execute a batch of commands, separated by ';'
+    --instance (-i)     → use a specific instance. Can be either signature or
+                          index in hyprctl instances (0, 1, etc)
+
+--help:
+    Can be used to print command's arguments that did not fit into this page
+    (three dots))#";
+
+const std::string_view HYPRPAPER_HELP = R"#(usage: hyprctl [flags] hyprpaper <request>
+
+requests:
+    listactive      → Lists all active images
+    listloaded      → Lists all loaded images
+    preload <path>  → Preloads image
+    unload <path>   → Unloads image. Pass 'all' as path to unload all images
+    wallpaper       → Issue a wallpaper to call a config wallpaper dynamically
+
+flags:
+    See 'hyprctl --help')#";
+
+const std::string_view NOTIFY_HELP = R"#(usage: hyprctl [flags] notify <icon> <time_ms> <color> <message...>
+
+icon:
+    Integer of value:
+        0       → Warning
+        1       → Info
+        2       → Hint
+        3       → Error
+        4       → Confused
+        5       → Ok
+        6 or -1 → No icon
+
+time_ms:
+    Time to display notification in milliseconds
+
+color:
+    Notification color. Format is the same as for colors in hyprland.conf. Use
+    0 for default color for icon
+
+message:
+    Notification message
+
+flags:
+    See 'hyprctl --help')#";
+
+const std::string_view OUTPUT_HELP = R"#(usage: hyprctl [flags] output <create <backend> | remove <name>>
+
+create <backend>:
+    Creates new virtual output. Possible values for backend: wayland, x11,
+    headless or auto.
+
+remove <name>:
+    Removes virtual output. Pass the output's name, as found in
+    'hyprctl monitors'
+    
+flags:
+    See 'hyprctl --help')#";
+
+const std::string_view PLUGIN_HELP = R"#(usage: hyprctl [flags] plugin <request>
+
+requests:
+    load <path>     → Loads a plugin. Path must be absolute
+    unload <path>   → Unloads a plugin. Path must be absolute
+    list            → Lists all loaded plugins
+
+flags:
+    See 'hyprctl --help')#";
+
+const std::string_view SETPROP_HELP = R"#(usage: hyprctl [flags] setprop <regex> <property> <value> [lock]
+
+regex:
+    Regular expression by which a window will be searched
+
+property:
+    See https://wiki.hyprland.org/Configuring/Using-hyprctl/#setprop for list
+    of properties
+
+value:
+    Property value
+
+lock:
+    Optional argument. If lock is not added, will be unlocked. Locking means a
+    dynamic windowrule cannot override this setting.
+
+flags:
+    See 'hyprctl --help')#";
+
+const std::string_view SWITCHXKBLAYOUT_HELP = R"#(usage: [flags] switchxkblayout <device> <cmd>
+
+device:
+    You can find the device using 'hyprctl devices' command
+
+cmd:
+    'next' for next, 'prev' for previous, or ID for a specific one. IDs are
+    assigned based on their order in config file (keyboard_layout),
+    starting from 0
+
+flags:
+    See 'hyprctl --help')#";

hyprctl/hyprctl.bash

@@ -0,0 +1,127 @@
+_hyprctl_cmd_2 () {
+    hyprctl monitors | grep Monitor | awk '{ print $2 }'
+}
+
+_hyprctl_cmd_1 () {
+    hyprpm list | grep "Plugin" | awk '{print $4}'
+}
+
+_hyprctl_cmd_0 () {
+    hyprctl clients | grep class | awk '{print $2}'
+}
+
+_hyprctl_cmd_3 () {
+    hyprctl devices | sed -n '/Keyboard at/{n; s/^\s\+//; p}'
+}
+
+_hyprctl () {
+    if [[ $(type -t _get_comp_words_by_ref) != function ]]; then
+        echo _get_comp_words_by_ref: function not defined.  Make sure the bash-completions system package is installed
+        return 1
+    fi
+
+    local words cword
+    _get_comp_words_by_ref -n "$COMP_WORDBREAKS" words cword
+
+    local -a literals=("cyclenext" "globalshortcuts" "cursorpos" "bordersize" "renameworkspace" "animationstyle" "focuswindow" "0" "auto" "swapnext" "forceallowsinput" "moveactive" "activebordercolor" "alphafullscreen" "wayland" "layers" "minsize" "monitors" "1" "kill" "settiled" "3" "focusmonitor" "swapwindow" "moveoutofgroup" "notify" "movecursor" "setcursor" "seterror" "movecurrentworkspacetomonitor" "4" "nomaxsize" "forcenoanims" "setprop" "-i" "togglefloating" "workspacerules" "movetoworkspace" "disable" "setignoregrouplock" "workspaces" "movegroupwindow" "closewindow" "0" "--instance" "binds" "movewindow" "splitratio" "alpha" "denywindowfromgroup" "workspace" "configerrors" "togglegroup" "getoption" "forceopaque" "keepaspectratio" "killactive" "pass" "decorations" "devices" "focuscurrentorlast" "submap" "global" "alphafullscreenoverride" "forcerendererreload" "movewindowpixel" "headless" "version" "dpms" "resizeactive" "moveintogroup" "5" "alphaoverride" "setfloating" "rollinglog" "::=" "rounding" "layouts" "moveworkspacetomonitor" "exec" "alphainactiveoverride" "alterzorder" "fakefullscreen" "nofocus" "keyword" "forcenoborder" "forcenodim" "pin" "output" "forcenoblur" "togglespecialworkspace" "fullscreen" "toggleopaque" "focusworkspaceoncurrentmonitor" "next" "changegroupactive" "-j" "instances" "execr" "exit" "clients" "all" "--batch" "dismissnotify" "inactivebordercolor" "switchxkblayout" "movetoworkspacesilent" "movewindoworgroup" "-r" "movefocus" "focusurgentorlast" "remove" "activeworkspace" "dispatch" "create" "centerwindow" "2" "hyprpaper" "-1" "reload" "alphainactive" "systeminfo" "plugin" "dimaround" "activewindow" "swapactiveworkspaces" "splash" "maxsize" "lockactivegroup" "windowdancecompat" "forceopaqueoverriden" "lockgroups" "movecursortocorner" "x11" "prev" "1" "resizewindowpixel" "forcenoshadow")
+
+    declare -A literal_transitions
+    literal_transitions[0]="([103]=1 [74]=2 [33]=3 [1]=2 [2]=2 [77]=2 [105]=4 [36]=2 [108]=5 [40]=2 [45]=2 [112]=2 [84]=6 [113]=8 [51]=2 [53]=2 [88]=9 [117]=2 [119]=2 [121]=2 [15]=2 [58]=10 [59]=2 [17]=11 [122]=12 [19]=2 [124]=2 [126]=2 [25]=13 [67]=2 [96]=5 [97]=2 [27]=2 [28]=14 [100]=2 [102]=5)"
+    literal_transitions[3]="([72]=18 [13]=2 [32]=18 [54]=18 [55]=18 [89]=18 [104]=2 [120]=2 [76]=1 [16]=2 [123]=18 [3]=1 [5]=2 [63]=18 [127]=2 [129]=18 [80]=18 [130]=18 [83]=18 [31]=18 [48]=2 [12]=2 [85]=18 [10]=18 [86]=18 [137]=18)"
+    literal_transitions[7]="([103]=1 [74]=2 [33]=3 [1]=2 [2]=2 [77]=2 [105]=4 [36]=2 [40]=2 [45]=2 [112]=2 [84]=6 [113]=8 [51]=2 [53]=2 [88]=9 [117]=2 [119]=2 [121]=2 [15]=2 [58]=10 [59]=2 [17]=11 [122]=12 [19]=2 [124]=2 [126]=2 [25]=13 [67]=2 [97]=2 [27]=2 [28]=14 [100]=2)"
+    literal_transitions[8]="([128]=2 [131]=2 [0]=2 [73]=2 [35]=2 [106]=2 [37]=2 [107]=2 [4]=2 [78]=2 [39]=2 [79]=2 [110]=2 [6]=2 [41]=2 [42]=2 [81]=2 [82]=2 [46]=2 [47]=2 [9]=2 [109]=2 [50]=2 [52]=2 [11]=2 [115]=2 [87]=2 [49]=2 [56]=2 [90]=2 [57]=2 [91]=2 [92]=2 [60]=2 [61]=2 [125]=2 [93]=2 [62]=2 [20]=2 [95]=2 [22]=2 [23]=2 [64]=2 [65]=2 [24]=2 [132]=2 [26]=2 [68]=2 [98]=2 [69]=2 [29]=2 [136]=2 [70]=2 [99]=2)"
+    literal_transitions[9]="([114]=15 [111]=16)"
+    literal_transitions[11]="([101]=2)"
+    literal_transitions[13]="([21]=1 [116]=1 [30]=1 [135]=1 [118]=1 [43]=1 [71]=1)"
+    literal_transitions[14]="([38]=2)"
+    literal_transitions[15]="([8]=2 [66]=2 [14]=2 [133]=2)"
+    literal_transitions[17]="([75]=19)"
+    literal_transitions[18]="([18]=2 [7]=2)"
+    literal_transitions[19]="([34]=5 [44]=5)"
+    literal_transitions[20]="([134]=2 [94]=2)"
+
+    declare -A match_anything_transitions
+    match_anything_transitions=([1]=2 [0]=7 [6]=2 [20]=2 [10]=2 [2]=17 [7]=7 [12]=2 [14]=17 [16]=2 [4]=20 [11]=17)
+    declare -A subword_transitions
+
+    local state=0
+    local word_index=1
+    while [[ $word_index -lt $cword ]]; do
+        local word=${words[$word_index]}
+
+        if [[ -v "literal_transitions[$state]" ]]; then
+            declare -A state_transitions
+            eval "state_transitions=${literal_transitions[$state]}"
+
+            local word_matched=0
+            for literal_id in $(seq 0 $((${#literals[@]} - 1))); do
+                if [[ ${literals[$literal_id]} = "$word" ]]; then
+                    if [[ -v "state_transitions[$literal_id]" ]]; then
+                        state=${state_transitions[$literal_id]}
+                        word_index=$((word_index + 1))
+                        word_matched=1
+                        break
+                    fi
+                fi
+            done
+            if [[ $word_matched -ne 0 ]]; then
+                continue
+            fi
+        fi
+
+        if [[ -v "match_anything_transitions[$state]" ]]; then
+            state=${match_anything_transitions[$state]}
+            word_index=$((word_index + 1))
+            continue
+        fi
+
+        return 1
+    done
+
+
+    local prefix="${words[$cword]}"
+
+    local shortest_suffix="$word"
+    for ((i=0; i < ${#COMP_WORDBREAKS}; i++)); do
+        local char="${COMP_WORDBREAKS:$i:1}"
+        local candidate="${word##*$char}"
+        if [[ ${#candidate} -lt ${#shortest_suffix} ]]; then
+            shortest_suffix=$candidate
+        fi
+    done
+    local superfluous_prefix=""
+    if [[ "$shortest_suffix" != "$word" ]]; then
+        local superfluous_prefix=${word%$shortest_suffix}
+    fi
+
+    if [[ -v "literal_transitions[$state]" ]]; then
+        local state_transitions_initializer=${literal_transitions[$state]}
+        declare -A state_transitions
+        eval "state_transitions=$state_transitions_initializer"
+
+        for literal_id in "${!state_transitions[@]}"; do
+            local literal="${literals[$literal_id]}"
+            if [[ $literal = "${prefix}"* ]]; then
+                local completion=${literal#"$superfluous_prefix"}
+                COMPREPLY+=("$completion ")
+            fi
+        done
+    fi
+    declare -A commands
+    commands=([16]=2 [4]=3 [12]=1 [10]=0)
+    if [[ -v "commands[$state]" ]]; then
+        local command_id=${commands[$state]}
+        local completions=()
+        mapfile -t completions < <(_hyprctl_cmd_${command_id} "$prefix" | cut -f1)
+        for item in "${completions[@]}"; do
+            if [[ $item = "${prefix}"* ]]; then
+                COMPREPLY+=("$item")
+            fi
+        done
+    fi
+
+
+    return 0
+}
+
+complete -o nospace -F _hyprctl hyprctl

hyprctl/hyprctl.fish

@@ -0,0 +1,216 @@
+function _hyprctl_3
+    set 1 $argv[1]
+    hyprctl monitors | grep Monitor | awk '{ print $2 }'
+end
+
+function _hyprctl_2
+    set 1 $argv[1]
+    hyprpm list | grep "Plugin" | awk '{print $4}'
+end
+
+function _hyprctl_1
+    set 1 $argv[1]
+    hyprctl clients | grep class | awk '{print $2}'
+end
+
+function _hyprctl_4
+    set 1 $argv[1]
+    hyprctl devices | sed -n '/Keyboard at/{n; s/^\s\+//; p}'
+end
+
+function _hyprctl
+    set COMP_LINE (commandline --cut-at-cursor)
+
+    set COMP_WORDS
+    echo $COMP_LINE | read --tokenize --array COMP_WORDS
+    if string match --quiet --regex '.*\s$' $COMP_LINE
+        set COMP_CWORD (math (count $COMP_WORDS) + 1)
+    else
+        set COMP_CWORD (count $COMP_WORDS)
+    end
+
+    set --local literals "cyclenext" "globalshortcuts" "cursorpos" "bordersize" "renameworkspace" "animationstyle" "focuswindow" "0" "auto" "swapnext" "forceallowsinput" "moveactive" "activebordercolor" "alphafullscreen" "wayland" "layers" "minsize" "monitors" "1" "kill" "settiled" "3" "focusmonitor" "swapwindow" "moveoutofgroup" "notify" "movecursor" "setcursor" "seterror" "movecurrentworkspacetomonitor" "4" "nomaxsize" "forcenoanims" "setprop" "-i" "togglefloating" "workspacerules" "movetoworkspace" "disable" "setignoregrouplock" "workspaces" "movegroupwindow" "closewindow" "0" "--instance" "binds" "movewindow" "splitratio" "alpha" "denywindowfromgroup" "workspace" "configerrors" "togglegroup" "getoption" "forceopaque" "keepaspectratio" "killactive" "pass" "decorations" "devices" "focuscurrentorlast" "submap" "global" "alphafullscreenoverride" "forcerendererreload" "movewindowpixel" "headless" "version" "dpms" "resizeactive" "moveintogroup" "5" "alphaoverride" "setfloating" "rollinglog" "::=" "rounding" "layouts" "moveworkspacetomonitor" "exec" "alphainactiveoverride" "alterzorder" "fakefullscreen" "nofocus" "keyword" "forcenoborder" "forcenodim" "pin" "output" "forcenoblur" "togglespecialworkspace" "fullscreen" "toggleopaque" "focusworkspaceoncurrentmonitor" "next" "changegroupactive" "-j" "instances" "execr" "exit" "clients" "all" "--batch" "dismissnotify" "inactivebordercolor" "switchxkblayout" "movetoworkspacesilent" "movewindoworgroup" "-r" "movefocus" "focusurgentorlast" "remove" "activeworkspace" "dispatch" "create" "centerwindow" "2" "hyprpaper" "-1" "reload" "alphainactive" "systeminfo" "plugin" "dimaround" "activewindow" "swapactiveworkspaces" "splash" "maxsize" "lockactivegroup" "windowdancecompat" "forceopaqueoverriden" "lockgroups" "movecursortocorner" "x11" "prev" "1" "resizewindowpixel" "forcenoshadow"
+
+    set --local descriptions
+    set descriptions[1] "Focus the next window on a workspace"
+    set descriptions[3] "Get the current cursor pos in global layout coordinates"
+    set descriptions[5] "Rename a workspace"
+    set descriptions[7] "Focus the first window matching"
+    set descriptions[10] "Swap the focused window with the next window"
+    set descriptions[12] "Move the active window"
+    set descriptions[16] "List the layers"
+    set descriptions[18] "List active outputs with their properties"
+    set descriptions[20] "Get into a kill mode, where you can kill an app by clicking on it"
+    set descriptions[21] "Set the current window's floating state to false"
+    set descriptions[22] "ERROR"
+    set descriptions[23] "Focus a monitor"
+    set descriptions[24] "Swap the active window with another window"
+    set descriptions[25] "Move the active window out of a group"
+    set descriptions[26] "Send a notification using the built-in Hyprland notification system"
+    set descriptions[27] "Move the cursor to a specified position"
+    set descriptions[28] "Set the cursor theme and reloads the cursor manager"
+    set descriptions[29] "Set the hyprctl error string"
+    set descriptions[30] "Move the active workspace to a monitor"
+    set descriptions[31] "CONFUSED"
+    set descriptions[34] "Set a property of a window"
+    set descriptions[35] "Specify the Hyprland instance"
+    set descriptions[36] "Toggle the current window's floating state"
+    set descriptions[37] "Get the list of defined workspace rules"
+    set descriptions[38] "Move the focused window to a workspace"
+    set descriptions[40] "Temporarily enable or disable binds:ignore_group_lock"
+    set descriptions[41] "List all workspaces with their properties"
+    set descriptions[42] "Swap the active window with the next or previous in a group"
+    set descriptions[43] "Close a specified window"
+    set descriptions[44] "WARNING"
+    set descriptions[45] "Specify the Hyprland instance"
+    set descriptions[46] "List all registered binds"
+    set descriptions[47] "Move the active window in a direction or to a monitor"
+    set descriptions[48] "Change the split ratio"
+    set descriptions[50] "Prohibit the active window from becoming or being inserted into group"
+    set descriptions[51] "Change the workspace"
+    set descriptions[52] "List all current config parsing errors"
+    set descriptions[53] "Toggle the current active window into a group"
+    set descriptions[54] "Get the config option status (values)"
+    set descriptions[57] "Close the active window"
+    set descriptions[58] "Pass the key to a specified window"
+    set descriptions[59] "List all decorations and their info"
+    set descriptions[60] "List all connected keyboards and mice"
+    set descriptions[61] "Switch focus from current to previously focused window"
+    set descriptions[62] "Change the current mapping group"
+    set descriptions[63] "Execute a Global Shortcut using the GlobalShortcuts portal"
+    set descriptions[65] "Force the renderer to reload all resources and outputs"
+    set descriptions[66] "Move a selected window"
+    set descriptions[68] "Print the Hyprland version: flags, commit and branch of build"
+    set descriptions[69] "Set all monitors' DPMS status"
+    set descriptions[70] "Resize the active window"
+    set descriptions[71] "Move the active window into a group"
+    set descriptions[72] "OK"
+    set descriptions[74] "Set the current window's floating state to true"
+    set descriptions[75] "Print tail of the log"
+    set descriptions[78] "List all layouts available (including plugin ones)"
+    set descriptions[79] "Move a workspace to a monitor"
+    set descriptions[80] "Execute a shell command"
+    set descriptions[82] "Modify the window stack order of the active or specified window"
+    set descriptions[83] "Toggle the focused window's internal fullscreen state"
+    set descriptions[85] "Issue a keyword to call a config keyword dynamically"
+    set descriptions[88] "Pin a window"
+    set descriptions[89] "Allows adding/removing fake outputs to a specific backend"
+    set descriptions[91] "Toggle a special workspace on/off"
+    set descriptions[92] "Toggle the focused window's fullscreen state"
+    set descriptions[93] "Toggle the current window to always be opaque"
+    set descriptions[94] "Focus the requested workspace"
+    set descriptions[96] "Switch to the next window in a group"
+    set descriptions[97] "Output in JSON format"
+    set descriptions[98] "List all running Hyprland instances and their info"
+    set descriptions[99] "Execute a raw shell command"
+    set descriptions[100] "Exit the compositor with no questions asked"
+    set descriptions[101] "List all windows with their properties"
+    set descriptions[103] "Execute a batch of commands separated by ;"
+    set descriptions[104] "Dismiss all or up to amount of notifications"
+    set descriptions[106] "Set the xkb layout index for a keyboard"
+    set descriptions[107] "Move window doesnt switch to the workspace"
+    set descriptions[108] "Behave as moveintogroup"
+    set descriptions[109] "Refresh state after issuing the command"
+    set descriptions[110] "Move the focus in a direction"
+    set descriptions[111] "Focus the urgent window or the last window"
+    set descriptions[113] "Get the active workspace name and its properties"
+    set descriptions[114] "Issue a dispatch to call a keybind dispatcher with an arg"
+    set descriptions[116] "Center the active window"
+    set descriptions[117] "HINT"
+    set descriptions[118] "Interact with hyprpaper if present"
+    set descriptions[119] "No Icon"
+    set descriptions[120] "Force reload the config"
+    set descriptions[122] "Print system info"
+    set descriptions[123] "Interact with a plugin"
+    set descriptions[125] "Get the active window name and its properties"
+    set descriptions[126] "Swap the active workspaces between two monitors"
+    set descriptions[127] "Print the current random splash"
+    set descriptions[129] "Lock the focused group"
+    set descriptions[132] "Lock the groups"
+    set descriptions[133] "Move the cursor to the corner of the active window"
+    set descriptions[136] "INFO"
+    set descriptions[137] "Resize a selected window"
+
+    set --local literal_transitions
+    set literal_transitions[1] "set inputs 104 75 34 2 3 78 106 37 109 41 46 113 85 114 52 54 89 118 120 122 16 59 60 18 123 20 125 127 26 68 97 98 28 29 101 103; set tos 2 3 4 3 3 3 5 3 6 3 3 3 7 9 3 3 10 3 3 3 3 11 3 12 13 3 3 3 14 3 6 3 3 15 3 6"
+    set literal_transitions[4] "set inputs 73 14 33 55 56 90 105 121 77 17 124 4 6 64 128 130 81 131 84 32 49 13 86 11 87 138; set tos 19 3 19 19 19 19 3 3 2 3 19 2 3 19 3 19 19 19 19 19 3 3 19 19 19 19"
+    set literal_transitions[8] "set inputs 104 75 34 2 3 78 106 37 41 46 113 85 114 52 54 89 118 120 122 16 59 60 18 123 20 125 127 26 68 98 28 29 101; set tos 2 3 4 3 3 3 5 3 3 3 3 7 9 3 3 10 3 3 3 3 11 3 12 13 3 3 3 14 3 3 3 15 3"
+    set literal_transitions[9] "set inputs 129 132 1 74 36 107 38 108 5 79 40 80 111 7 42 43 82 83 47 48 10 110 51 53 12 116 88 50 57 91 58 92 93 61 62 126 94 63 21 96 23 24 65 66 25 133 27 69 99 70 30 137 71 100; set tos 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3"
+    set literal_transitions[10] "set inputs 115 112; set tos 16 17"
+    set literal_transitions[12] "set inputs 102; set tos 3"
+    set literal_transitions[14] "set inputs 22 117 31 136 119 44 72; set tos 2 2 2 2 2 2 2"
+    set literal_transitions[15] "set inputs 39; set tos 3"
+    set literal_transitions[16] "set inputs 9 67 15 134; set tos 3 3 3 3"
+    set literal_transitions[18] "set inputs 76; set tos 20"
+    set literal_transitions[19] "set inputs 19 8; set tos 3 3"
+    set literal_transitions[20] "set inputs 35 45; set tos 6 6"
+    set literal_transitions[21] "set inputs 135 95; set tos 3 3"
+
+    set --local match_anything_transitions_from 2 1 7 21 11 3 8 13 15 17 5 12
+    set --local match_anything_transitions_to 3 8 3 3 3 18 8 3 18 3 21 18
+
+    set --local state 1
+    set --local word_index 2
+    while test $word_index -lt $COMP_CWORD
+        set --local -- word $COMP_WORDS[$word_index]
+
+        if set --query literal_transitions[$state] && test -n $literal_transitions[$state]
+            set --local --erase inputs
+            set --local --erase tos
+            eval $literal_transitions[$state]
+
+            if contains -- $word $literals
+                set --local literal_matched 0
+                for literal_id in (seq 1 (count $literals))
+                    if test $literals[$literal_id] = $word
+                        set --local index (contains --index -- $literal_id $inputs)
+                        set state $tos[$index]
+                        set word_index (math $word_index + 1)
+                        set literal_matched 1
+                        break
+                    end
+                end
+                if test $literal_matched -ne 0
+                    continue
+                end
+            end
+        end
+
+        if set --query match_anything_transitions_from[$state] && test -n $match_anything_transitions_from[$state]
+            set --local index (contains --index -- $state $match_anything_transitions_from)
+            set state $match_anything_transitions_to[$index]
+            set word_index (math $word_index + 1)
+            continue
+        end
+
+        return 1
+    end
+
+    if set --query literal_transitions[$state] && test -n $literal_transitions[$state]
+        set --local --erase inputs
+        set --local --erase tos
+        eval $literal_transitions[$state]
+        for literal_id in $inputs
+            if test -n $descriptions[$literal_id]
+                printf '%s\t%s\n' $literals[$literal_id] $descriptions[$literal_id]
+            else
+                printf '%s\n' $literals[$literal_id]
+            end
+        end
+    end
+
+    set command_states 17 5 13 11
+    set command_ids 3 4 2 1
+    if contains $state $command_states
+        set --local index (contains --index $state $command_states)
+        set --local function_id $command_ids[$index]
+        set --local function_name _hyprctl_$function_id
+        set --local --erase inputs
+        set --local --erase tos
+        $function_name "$COMP_WORDS[$COMP_CWORD]"
+    end
+
+    return 0
+end
+
+complete --command hyprctl --no-files --arguments "(_hyprctl)"

hyprctl/hyprctl.usage

@@ -0,0 +1,148 @@
+# This is a file feeded to complgen to generate bash/fish/zsh completions
+# Repo: https://github.com/adaszko/complgen
+# Generate completion scripts: "complgen aot --bash-script hyprctl.bash --fish-script hyprctl.fish --zsh-script hyprctl.zsh ./hyprctl.usage"
+
+hyprctl [<OPTIONS>]... <ARGUMENTS>           
+
+<OPTIONS>  ::=  (-i | --instance)                                     "Specify the Hyprland instance"
+            |   (-j)                                                  "Output in JSON format"
+            |   (-r)                                                  "Refresh state after issuing the command"
+            |   (--batch)                                             "Execute a batch of commands separated by ;"
+            ;
+
+<WINDOWS> ::= {{{ hyprctl clients | grep class | awk '{print $2}' }}};
+
+<AVAILABLE_PLUGINS> ::= {{{ hyprpm list | grep "Plugin" | awk '{print $4}' }}};
+
+<MONITORS> ::= {{{ hyprctl monitors | grep Monitor | awk '{ print $2 }' }}};
+
+<KEYBOARDS> ::= {{{ hyprctl devices | sed -n '/Keyboard at/{n; s/^\s\+//; p}' }}};
+
+<NOTIFICATION_TYPES> ::=  (0)   "WARNING"
+                      |   (1)   "INFO"
+                      |   (2)   "HINT"
+                      |   (3)   "ERROR"
+                      |   (4)   "CONFUSED"
+                      |   (5)   "OK"
+                      |   (-1)  "No Icon"
+                      ;
+
+<PROPS> ::=  (animationstyle)
+         |   (rounding <NUM>)
+         |   (bordersize <NUM>)
+         |   (forcenoblur (0 | 1))
+         |   (forceopaque (0 | 1))
+         |   (forceopaqueoverriden (0 | 1))
+         |   (forceallowsinput (0 | 1))
+         |   (forcenoanims (0 | 1))
+         |   (forcenoborder (0 | 1))
+         |   (forcenodim (0 | 1))
+         |   (forcenoshadow (0 | 1))
+         |   (nofocus (0 | 1))
+         |   (windowdancecompat (0 | 1))
+         |   (nomaxsize (0 | 1))
+         |   (minsize)
+         |   (maxsize)
+         |   (dimaround (0 | 1))
+         |   (keepaspectratio (0 | 1))
+         |   (alphaoverride (0 | 1))
+         |   (alpha)
+         |   (alphainactiveoverride (0 | 1))
+         |   (alphainactive)
+         |   (alphafullscreenoverride (0 | 1))
+         |   (alphafullscreen)
+         |   (activebordercolor)
+         |   (inactivebordercolor)
+         ;
+
+
+<ARGUMENTS> ::= (activewindow)                                        "Get the active window name and its properties"
+            |   (activeworkspace)                                     "Get the active workspace name and its properties"
+            |   (binds)                                               "List all registered binds"
+            |   (clients)                                             "List all windows with their properties"
+            |   (configerrors)                                        "List all current config parsing errors"
+            |   (cursorpos)                                           "Get the current cursor pos in global layout coordinates"
+            |   (decorations <WINDOWS>)                               "List all decorations and their info"
+            |   (devices)                                             "List all connected keyboards and mice"
+            |   (dismissnotify <NUM>)                                 "Dismiss all or up to amount of notifications"
+            |   (dispatch <DISPATCHERS>)                              "Issue a dispatch to call a keybind dispatcher with an arg"
+            |   (getoption)                                           "Get the config option status (values)"
+            |   (globalshortcuts)                                     ""
+            |   (hyprpaper)                                           "Interact with hyprpaper if present"
+            |   (instances)                                           "List all running Hyprland instances and their info"
+            |   (keyword <KEYWORDS>)                                  "Issue a keyword to call a config keyword dynamically"
+            |   (kill)                                                "Get into a kill mode, where you can kill an app by clicking on it"
+            |   (layers)                                              "List the layers"
+            |   (layouts)                                             "List all layouts available (including plugin ones)"
+            |   (monitors [all])                                      "List active outputs with their properties"
+            |   (notify <NOTIFICATION_TYPES> <NUM>)                   "Send a notification using the built-in Hyprland notification system"
+            |   (output (create (wayland | x11 | headless | auto) | remove <MONITORS>)) "Allows adding/removing fake outputs to a specific backend"
+            |   (plugin <AVAILABLE_PLUGINS>)                          "Interact with a plugin"
+            |   (reload)                                              "Force reload the config"
+            |   (rollinglog)                                          "Print tail of the log"
+            |   (setcursor)                                           "Set the cursor theme and reloads the cursor manager"
+            |   (seterror [disable])                                  "Set the hyprctl error string"
+            |   (setprop <PROPS>)                                     "Set a property of a window"
+            |   (splash)                                              "Print the current random splash"
+            |   (switchxkblayout <KEYBOARDS> (next | prev | <NUM>))   "Set the xkb layout index for a keyboard"
+            |   (systeminfo)                                          "Print system info"
+            |   (version)                                             "Print the Hyprland version: flags, commit and branch of build"
+            |   (workspacerules)                                      "Get the list of defined workspace rules"
+            |   (workspaces)                                          "List all workspaces with their properties"
+            ;
+
+<DISPATCHERS> ::=  (exec)         	                                  "Execute a shell command"
+                |  (execr)           	                              "Execute a raw shell command"
+                |  (pass)            	                              "Pass the key to a specified window"
+                |  (killactive)          	                          "Close the active window"
+                |  (closewindow)         	                          "Close a specified window"
+                |  (workspace)           	                          "Change the workspace"
+                |  (movetoworkspace)         	                      "Move the focused window to a workspace"
+                |  (movetoworkspacesilent)           	              "Move window doesnt switch to the workspace"
+                |  (togglefloating)          	                      "Toggle the current window's floating state"
+                |  (setfloating)         	                          "Set the current window's floating state to true"
+                |  (settiled)            	                          "Set the current window's floating state to false"
+                |  (fullscreen)          	                          "Toggle the focused window's fullscreen state"
+                |  (fakefullscreen)          	                      "Toggle the focused window's internal fullscreen state"
+                |  (dpms)            	                              "Set all monitors' DPMS status"
+                |  (pin)         	                                  "Pin a window"
+                |  (movefocus)           	                          "Move the focus in a direction"
+                |  (movewindow)          	                          "Move the active window in a direction or to a monitor"
+                |  (swapwindow)          	                          "Swap the active window with another window"
+                |  (centerwindow)            	                      "Center the active window"
+                |  (resizeactive)            	                      "Resize the active window"
+                |  (moveactive)          	                          "Move the active window"
+                |  (resizewindowpixel)           	                  "Resize a selected window"
+                |  (movewindowpixel)         	                      "Move a selected window"
+                |  (cyclenext)           	                          "Focus the next window on a workspace"
+                |  (swapnext)            	                          "Swap the focused window with the next window"
+                |  (focuswindow)         	                          "Focus the first window matching"
+                |  (focusmonitor)            	                      "Focus a monitor"
+                |  (splitratio)          	                          "Change the split ratio"
+                |  (toggleopaque)            	                      "Toggle the current window to always be opaque"
+                |  (movecursortocorner)          	                  "Move the cursor to the corner of the active window"
+                |  (movecursor)          	                          "Move the cursor to a specified position"
+                |  (renameworkspace)         	                      "Rename a workspace"
+                |  (exit)            	                              "Exit the compositor with no questions asked"
+                |  (forcerendererreload)         	                  "Force the renderer to reload all resources and outputs"
+                |  (movecurrentworkspacetomonitor)           	      "Move the active workspace to a monitor"
+                |  (focusworkspaceoncurrentmonitor)          	      "Focus the requested workspace"
+                |  (moveworkspacetomonitor)          	              "Move a workspace to a monitor"
+                |  (swapactiveworkspaces)            	              "Swap the active workspaces between two monitors"
+                |  (alterzorder)         	                          "Modify the window stack order of the active or specified window"
+                |  (togglespecialworkspace)          	              "Toggle a special workspace on/off"
+                |  (focusurgentorlast)           	                  "Focus the urgent window or the last window"
+                |  (togglegroup)         	                          "Toggle the current active window into a group"
+                |  (changegroupactive)           	                  "Switch to the next window in a group"
+                |  (focuscurrentorlast)          	                  "Switch focus from current to previously focused window"
+                |  (lockgroups)          	                          "Lock the groups"
+                |  (lockactivegroup)         	                      "Lock the focused group"
+                |  (moveintogroup)           	                      "Move the active window into a group"
+                |  (moveoutofgroup)          	                      "Move the active window out of a group"
+                |  (movewindoworgroup)           	                  "Behave as moveintogroup"
+                |  (movegroupwindow)         	                      "Swap the active window with the next or previous in a group"
+                |  (denywindowfromgroup)         	                  "Prohibit the active window from becoming or being inserted into group"
+                |  (setignoregrouplock)          	                  "Temporarily enable or disable binds:ignore_group_lock"
+                |  (global)          	                              "Execute a Global Shortcut using the GlobalShortcuts portal"
+                |  (submap)          	                              "Change the current mapping group"
+                ;

hyprctl/hyprctl.zsh

@@ -0,0 +1,251 @@
+#compdef hyprctl
+
+_hyprctl_cmd_2 () {
+    hyprctl monitors | grep Monitor | awk '{ print $2 }'
+}
+
+_hyprctl_cmd_1 () {
+    hyprpm list | grep "Plugin" | awk '{print $4}'
+}
+
+_hyprctl_cmd_0 () {
+    hyprctl clients | grep class | awk '{print $2}'
+}
+
+_hyprctl_cmd_3 () {
+    hyprctl devices | sed -n '/Keyboard at/{n; s/^\s\+//; p}'
+}
+
+_hyprctl () {
+    local -a literals=("cyclenext" "globalshortcuts" "cursorpos" "bordersize" "renameworkspace" "animationstyle" "focuswindow" "0" "auto" "swapnext" "forceallowsinput" "moveactive" "activebordercolor" "alphafullscreen" "wayland" "layers" "minsize" "monitors" "1" "kill" "settiled" "3" "focusmonitor" "swapwindow" "moveoutofgroup" "notify" "movecursor" "setcursor" "seterror" "movecurrentworkspacetomonitor" "4" "nomaxsize" "forcenoanims" "setprop" "-i" "togglefloating" "workspacerules" "movetoworkspace" "disable" "setignoregrouplock" "workspaces" "movegroupwindow" "closewindow" "0" "--instance" "binds" "movewindow" "splitratio" "alpha" "denywindowfromgroup" "workspace" "configerrors" "togglegroup" "getoption" "forceopaque" "keepaspectratio" "killactive" "pass" "decorations" "devices" "focuscurrentorlast" "submap" "global" "alphafullscreenoverride" "forcerendererreload" "movewindowpixel" "headless" "version" "dpms" "resizeactive" "moveintogroup" "5" "alphaoverride" "setfloating" "rollinglog" "::=" "rounding" "layouts" "moveworkspacetomonitor" "exec" "alphainactiveoverride" "alterzorder" "fakefullscreen" "nofocus" "keyword" "forcenoborder" "forcenodim" "pin" "output" "forcenoblur" "togglespecialworkspace" "fullscreen" "toggleopaque" "focusworkspaceoncurrentmonitor" "next" "changegroupactive" "-j" "instances" "execr" "exit" "clients" "all" "--batch" "dismissnotify" "inactivebordercolor" "switchxkblayout" "movetoworkspacesilent" "movewindoworgroup" "-r" "movefocus" "focusurgentorlast" "remove" "activeworkspace" "dispatch" "create" "centerwindow" "2" "hyprpaper" "-1" "reload" "alphainactive" "systeminfo" "plugin" "dimaround" "activewindow" "swapactiveworkspaces" "splash" "maxsize" "lockactivegroup" "windowdancecompat" "forceopaqueoverriden" "lockgroups" "movecursortocorner" "x11" "prev" "1" "resizewindowpixel" "forcenoshadow")
+
+    local -A descriptions
+    descriptions[1]="Focus the next window on a workspace"
+    descriptions[3]="Get the current cursor pos in global layout coordinates"
+    descriptions[5]="Rename a workspace"
+    descriptions[7]="Focus the first window matching"
+    descriptions[10]="Swap the focused window with the next window"
+    descriptions[12]="Move the active window"
+    descriptions[16]="List the layers"
+    descriptions[18]="List active outputs with their properties"
+    descriptions[20]="Get into a kill mode, where you can kill an app by clicking on it"
+    descriptions[21]="Set the current window's floating state to false"
+    descriptions[22]="ERROR"
+    descriptions[23]="Focus a monitor"
+    descriptions[24]="Swap the active window with another window"
+    descriptions[25]="Move the active window out of a group"
+    descriptions[26]="Send a notification using the built-in Hyprland notification system"
+    descriptions[27]="Move the cursor to a specified position"
+    descriptions[28]="Set the cursor theme and reloads the cursor manager"
+    descriptions[29]="Set the hyprctl error string"
+    descriptions[30]="Move the active workspace to a monitor"
+    descriptions[31]="CONFUSED"
+    descriptions[34]="Set a property of a window"
+    descriptions[35]="Specify the Hyprland instance"
+    descriptions[36]="Toggle the current window's floating state"
+    descriptions[37]="Get the list of defined workspace rules"
+    descriptions[38]="Move the focused window to a workspace"
+    descriptions[40]="Temporarily enable or disable binds:ignore_group_lock"
+    descriptions[41]="List all workspaces with their properties"
+    descriptions[42]="Swap the active window with the next or previous in a group"
+    descriptions[43]="Close a specified window"
+    descriptions[44]="WARNING"
+    descriptions[45]="Specify the Hyprland instance"
+    descriptions[46]="List all registered binds"
+    descriptions[47]="Move the active window in a direction or to a monitor"
+    descriptions[48]="Change the split ratio"
+    descriptions[50]="Prohibit the active window from becoming or being inserted into group"
+    descriptions[51]="Change the workspace"
+    descriptions[52]="List all current config parsing errors"
+    descriptions[53]="Toggle the current active window into a group"
+    descriptions[54]="Get the config option status (values)"
+    descriptions[57]="Close the active window"
+    descriptions[58]="Pass the key to a specified window"
+    descriptions[59]="List all decorations and their info"
+    descriptions[60]="List all connected keyboards and mice"
+    descriptions[61]="Switch focus from current to previously focused window"
+    descriptions[62]="Change the current mapping group"
+    descriptions[63]="Execute a Global Shortcut using the GlobalShortcuts portal"
+    descriptions[65]="Force the renderer to reload all resources and outputs"
+    descriptions[66]="Move a selected window"
+    descriptions[68]="Print the Hyprland version: flags, commit and branch of build"
+    descriptions[69]="Set all monitors' DPMS status"
+    descriptions[70]="Resize the active window"
+    descriptions[71]="Move the active window into a group"
+    descriptions[72]="OK"
+    descriptions[74]="Set the current window's floating state to true"
+    descriptions[75]="Print tail of the log"
+    descriptions[78]="List all layouts available (including plugin ones)"
+    descriptions[79]="Move a workspace to a monitor"
+    descriptions[80]="Execute a shell command"
+    descriptions[82]="Modify the window stack order of the active or specified window"
+    descriptions[83]="Toggle the focused window's internal fullscreen state"
+    descriptions[85]="Issue a keyword to call a config keyword dynamically"
+    descriptions[88]="Pin a window"
+    descriptions[89]="Allows adding/removing fake outputs to a specific backend"
+    descriptions[91]="Toggle a special workspace on/off"
+    descriptions[92]="Toggle the focused window's fullscreen state"
+    descriptions[93]="Toggle the current window to always be opaque"
+    descriptions[94]="Focus the requested workspace"
+    descriptions[96]="Switch to the next window in a group"
+    descriptions[97]="Output in JSON format"
+    descriptions[98]="List all running Hyprland instances and their info"
+    descriptions[99]="Execute a raw shell command"
+    descriptions[100]="Exit the compositor with no questions asked"
+    descriptions[101]="List all windows with their properties"
+    descriptions[103]="Execute a batch of commands separated by ;"
+    descriptions[104]="Dismiss all or up to amount of notifications"
+    descriptions[106]="Set the xkb layout index for a keyboard"
+    descriptions[107]="Move window doesnt switch to the workspace"
+    descriptions[108]="Behave as moveintogroup"
+    descriptions[109]="Refresh state after issuing the command"
+    descriptions[110]="Move the focus in a direction"
+    descriptions[111]="Focus the urgent window or the last window"
+    descriptions[113]="Get the active workspace name and its properties"
+    descriptions[114]="Issue a dispatch to call a keybind dispatcher with an arg"
+    descriptions[116]="Center the active window"
+    descriptions[117]="HINT"
+    descriptions[118]="Interact with hyprpaper if present"
+    descriptions[119]="No Icon"
+    descriptions[120]="Force reload the config"
+    descriptions[122]="Print system info"
+    descriptions[123]="Interact with a plugin"
+    descriptions[125]="Get the active window name and its properties"
+    descriptions[126]="Swap the active workspaces between two monitors"
+    descriptions[127]="Print the current random splash"
+    descriptions[129]="Lock the focused group"
+    descriptions[132]="Lock the groups"
+    descriptions[133]="Move the cursor to the corner of the active window"
+    descriptions[136]="INFO"
+    descriptions[137]="Resize a selected window"
+
+    local -A literal_transitions
+    literal_transitions[1]="([104]=2 [75]=3 [34]=4 [2]=3 [3]=3 [78]=3 [106]=5 [37]=3 [109]=6 [41]=3 [46]=3 [113]=3 [85]=7 [114]=9 [52]=3 [54]=3 [89]=10 [118]=3 [120]=3 [122]=3 [16]=3 [59]=11 [60]=3 [18]=12 [123]=13 [20]=3 [125]=3 [127]=3 [26]=14 [68]=3 [97]=6 [98]=3 [28]=3 [29]=15 [101]=3 [103]=6)"
+    literal_transitions[4]="([73]=19 [14]=3 [33]=19 [55]=19 [56]=19 [90]=19 [105]=3 [121]=3 [77]=2 [17]=3 [124]=19 [4]=2 [6]=3 [64]=19 [128]=3 [130]=19 [81]=19 [131]=19 [84]=19 [32]=19 [49]=3 [13]=3 [86]=19 [11]=19 [87]=19 [138]=19)"
+    literal_transitions[8]="([104]=2 [75]=3 [34]=4 [2]=3 [3]=3 [78]=3 [106]=5 [37]=3 [41]=3 [46]=3 [113]=3 [85]=7 [114]=9 [52]=3 [54]=3 [89]=10 [118]=3 [120]=3 [122]=3 [16]=3 [59]=11 [60]=3 [18]=12 [123]=13 [20]=3 [125]=3 [127]=3 [26]=14 [68]=3 [98]=3 [28]=3 [29]=15 [101]=3)"
+    literal_transitions[9]="([129]=3 [132]=3 [1]=3 [74]=3 [36]=3 [107]=3 [38]=3 [108]=3 [5]=3 [79]=3 [40]=3 [80]=3 [111]=3 [7]=3 [42]=3 [43]=3 [82]=3 [83]=3 [47]=3 [48]=3 [10]=3 [110]=3 [51]=3 [53]=3 [12]=3 [116]=3 [88]=3 [50]=3 [57]=3 [91]=3 [58]=3 [92]=3 [93]=3 [61]=3 [62]=3 [126]=3 [94]=3 [63]=3 [21]=3 [96]=3 [23]=3 [24]=3 [65]=3 [66]=3 [25]=3 [133]=3 [27]=3 [69]=3 [99]=3 [70]=3 [30]=3 [137]=3 [71]=3 [100]=3)"
+    literal_transitions[10]="([115]=16 [112]=17)"
+    literal_transitions[12]="([102]=3)"
+    literal_transitions[14]="([22]=2 [117]=2 [31]=2 [136]=2 [119]=2 [44]=2 [72]=2)"
+    literal_transitions[15]="([39]=3)"
+    literal_transitions[16]="([9]=3 [67]=3 [15]=3 [134]=3)"
+    literal_transitions[18]="([76]=20)"
+    literal_transitions[19]="([19]=3 [8]=3)"
+    literal_transitions[20]="([35]=6 [45]=6)"
+    literal_transitions[21]="([135]=3 [95]=3)"
+
+    local -A match_anything_transitions
+    match_anything_transitions=([2]=3 [1]=8 [7]=3 [21]=3 [11]=3 [3]=18 [8]=8 [13]=3 [15]=18 [17]=3 [5]=21 [12]=18)
+
+    declare -A subword_transitions
+
+    local state=1
+    local word_index=2
+    while [[ $word_index -lt $CURRENT ]]; do
+        if [[ -v "literal_transitions[$state]" ]]; then
+            local -A state_transitions
+            eval "state_transitions=${literal_transitions[$state]}"
+
+            local word=${words[$word_index]}
+            local word_matched=0
+            for ((literal_id = 1; literal_id <= $#literals; literal_id++)); do
+                if [[ ${literals[$literal_id]} = "$word" ]]; then
+                    if [[ -v "state_transitions[$literal_id]" ]]; then
+                        state=${state_transitions[$literal_id]}
+                        word_index=$((word_index + 1))
+                        word_matched=1
+                        break
+                    fi
+                fi
+            done
+            if [[ $word_matched -ne 0 ]]; then
+                continue
+            fi
+        fi
+
+        if [[ -v "match_anything_transitions[$state]" ]]; then
+            state=${match_anything_transitions[$state]}
+            word_index=$((word_index + 1))
+            continue
+        fi
+
+        return 1
+    done
+
+    completions_no_description_trailing_space=()
+    completions_no_description_no_trailing_space=()
+    completions_trailing_space=()
+    suffixes_trailing_space=()
+    descriptions_trailing_space=()
+    completions_no_trailing_space=()
+    suffixes_no_trailing_space=()
+    descriptions_no_trailing_space=()
+
+    if [[ -v "literal_transitions[$state]" ]]; then
+        local -A state_transitions
+        eval "state_transitions=${literal_transitions[$state]}"
+
+        for literal_id in ${(k)state_transitions}; do
+            if [[ -v "descriptions[$literal_id]" ]]; then
+                completions_trailing_space+=("${literals[$literal_id]}")
+                suffixes_trailing_space+=("${literals[$literal_id]}")
+                descriptions_trailing_space+=("${descriptions[$literal_id]}")
+            else
+                completions_no_description_trailing_space+=("${literals[$literal_id]}")
+            fi
+        done
+    fi
+    local -A commands=([17]=2 [5]=3 [13]=1 [11]=0)
+
+    if [[ -v "commands[$state]" ]]; then
+        local command_id=${commands[$state]}
+        local output=$(_hyprctl_cmd_${command_id} "${words[$CURRENT]}")
+        local -a command_completions=("${(@f)output}")
+        for line in ${command_completions[@]}; do
+            local parts=(${(@s:	:)line})
+            if [[ -v "parts[2]" ]]; then
+                completions_trailing_space+=("${parts[1]}")
+                suffixes_trailing_space+=("${parts[1]}")
+                descriptions_trailing_space+=("${parts[2]}")
+            else
+                completions_no_description_trailing_space+=("${parts[1]}")
+            fi
+        done
+    fi
+
+    local maxlen=0
+    for suffix in ${suffixes_trailing_space[@]}; do
+        if [[ ${#suffix} -gt $maxlen ]]; then
+            maxlen=${#suffix}
+        fi
+    done
+    for suffix in ${suffixes_no_trailing_space[@]}; do
+        if [[ ${#suffix} -gt $maxlen ]]; then
+            maxlen=${#suffix}
+        fi
+    done
+
+    for ((i = 1; i <= $#suffixes_trailing_space; i++)); do
+        if [[ -z ${descriptions_trailing_space[$i]} ]]; then
+            descriptions_trailing_space[$i]="${(r($maxlen)( ))${suffixes_trailing_space[$i]}}"
+        else
+            descriptions_trailing_space[$i]="${(r($maxlen)( ))${suffixes_trailing_space[$i]}} -- ${descriptions_trailing_space[$i]}"
+        fi
+    done
+
+    for ((i = 1; i <= $#suffixes_no_trailing_space; i++)); do
+        if [[ -z ${descriptions_no_trailing_space[$i]} ]]; then
+            descriptions_no_trailing_space[$i]="${(r($maxlen)( ))${suffixes_no_trailing_space[$i]}}"
+        else
+            descriptions_no_trailing_space[$i]="${(r($maxlen)( ))${suffixes_no_trailing_space[$i]}} -- ${descriptions_no_trailing_space[$i]}"
+        fi
+    done
+
+    compadd -Q -a completions_no_description_trailing_space
+    compadd -Q -S ' ' -a completions_no_description_no_trailing_space
+    compadd -l -Q -a -d descriptions_trailing_space completions_trailing_space
+    compadd -l -Q -S '' -a -d descriptions_no_trailing_space completions_no_trailing_space
+    return 0
+}
+
+compdef _hyprctl hyprctl

hyprctl/main.cpp

@@ -22,41 +22,9 @@
 #include <deque>
 #include <filesystem>
 #include <stdarg.h>
+#include <regex>
 
-const std::string USAGE = R"#(usage: hyprctl [(opt)flags] [command] [(opt)args]
-
-commands:
-    monitors
-    workspaces
-    activeworkspace
-    clients
-    activewindow
-    layers
-    devices
-    binds
-    dispatch
-    keyword
-    version
-    kill
-    splash
-    hyprpaper
-    reload
-    setcursor
-    getoption
-    cursorpos
-    switchxkblayout
-    seterror
-    setprop
-    plugin
-    notify
-    globalshortcuts
-    instances
-
-flags:
-    -j -> output in JSON
-    --batch -> execute a batch of commands, separated by ';'
-    --instance (-i) -> use a specific instance. Can be either signature or index in hyprctl instances (0, 1, etc)
-)#";
+#include "Strings.hpp"
 
 #define PAD
 
@@ -74,7 +42,7 @@ std::vector<SInstanceData> instances() {
     std::vector<SInstanceData> result;
 
     for (const auto& el : std::filesystem::directory_iterator("/tmp/hypr")) {
-        if (el.is_directory())
+        if (el.is_directory() || !el.path().string().ends_with(".lock"))
             continue;
 
         // read lock
@@ -82,7 +50,9 @@ std::vector<SInstanceData> instances() {
         data->id            = el.path().string();
         data->id            = data->id.substr(data->id.find_last_of('/') + 1, data->id.find(".lock") - data->id.find_last_of('/') - 1);
 
-        data->time = std::stoull(data->id.substr(data->id.find_first_of('_') + 1));
+        try {
+            data->time = std::stoull(data->id.substr(data->id.find_first_of('_') + 1));
+        } catch (std::exception& e) { continue; }
 
         // read file
         std::ifstream ifs(el.path().string());
@@ -90,7 +60,9 @@ std::vector<SInstanceData> instances() {
         int           i = 0;
         for (std::string line; std::getline(ifs, line); ++i) {
             if (i == 0) {
-                data->pid = std::stoull(line);
+                try {
+                    data->pid = std::stoull(line);
+                } catch (std::exception& e) { continue; }
             } else if (i == 1) {
                 data->wlSocket = line;
             } else
@@ -221,9 +193,14 @@ void requestHyprpaper(std::string arg) {
     std::cout << std::string(buffer);
 }
 
-void batchRequest(std::string arg) {
-    std::string rq = "[[BATCH]]" + arg.substr(arg.find_first_of(" ") + 1);
+void batchRequest(std::string arg, bool json) {
+    std::string commands = arg.substr(arg.find_first_of(" ") + 1);
 
+    if (json) {
+        commands = "j/" + std::regex_replace(commands, std::regex(";\\s*"), ";j/");
+    }
+
+    std::string rq = "[[BATCH]]" + commands;
     request(rq);
 }
 
@@ -273,11 +250,10 @@ bool isNumber(const std::string& str, bool allowfloat) {
 }
 
 int main(int argc, char** argv) {
-    int  bflag = 0, sflag = 0, index, c;
     bool parseArgs = true;
 
     if (argc < 2) {
-        printf("%s\n", USAGE.c_str());
+        std::cout << USAGE << std::endl;
         return 1;
     }
 
@@ -287,7 +263,7 @@ int main(int argc, char** argv) {
     bool        json             = false;
     std::string overrideInstance = "";
 
-    for (auto i = 0; i < ARGS.size(); ++i) {
+    for (std::size_t i = 0; i < ARGS.size(); ++i) {
         if (ARGS[i] == "--") {
             // Stop parsing arguments after --
             parseArgs = false;
@@ -298,19 +274,43 @@ int main(int argc, char** argv) {
             if (ARGS[i] == "-j" && !fullArgs.contains("j")) {
                 fullArgs += "j";
                 json = true;
+            } else if (ARGS[i] == "-r" && !fullArgs.contains("r")) {
+                fullArgs += "r";
+            } else if (ARGS[i] == "-a" && !fullArgs.contains("a")) {
+                fullArgs += "a";
             } else if (ARGS[i] == "--batch") {
                 fullRequest = "--batch ";
             } else if (ARGS[i] == "--instance" || ARGS[i] == "-i") {
                 ++i;
 
                 if (i >= ARGS.size()) {
-                    printf("%s\n", USAGE.c_str());
+                    std::cout << USAGE << std::endl;
                     return 1;
                 }
 
                 overrideInstance = ARGS[i];
+            } else if (ARGS[i] == "--help") {
+                const std::string& cmd = ARGS[0];
+
+                if (cmd == "hyprpaper") {
+                    std::cout << HYPRPAPER_HELP << std::endl;
+                } else if (cmd == "notify") {
+                    std::cout << NOTIFY_HELP << std::endl;
+                } else if (cmd == "output") {
+                    std::cout << OUTPUT_HELP << std::endl;
+                } else if (cmd == "plugin") {
+                    std::cout << PLUGIN_HELP << std::endl;
+                } else if (cmd == "setprop") {
+                    std::cout << SETPROP_HELP << std::endl;
+                } else if (cmd == "switchxkblayout") {
+                    std::cout << SWITCHXKBLAYOUT_HELP << std::endl;
+                } else {
+                    std::cout << USAGE << std::endl;
+                }
+
+                return 1;
             } else {
-                printf("%s\n", USAGE.c_str());
+                std::cout << USAGE << std::endl;
                 return 1;
             }
 
@@ -321,7 +321,7 @@ int main(int argc, char** argv) {
     }
 
     if (fullRequest.empty()) {
-        printf("%s\n", USAGE.c_str());
+        std::cout << USAGE << std::endl;
         return 1;
     }
 
@@ -329,6 +329,12 @@ int main(int argc, char** argv) {
 
     fullRequest = fullArgs + "/" + fullRequest;
 
+    // instances is HIS-independent
+    if (fullRequest.contains("/instances")) {
+        instancesRequest(json);
+        return 0;
+    }
+
     if (overrideInstance.contains("_"))
         instanceSignature = overrideInstance;
     else if (!overrideInstance.empty()) {
@@ -341,7 +347,7 @@ int main(int argc, char** argv) {
 
         const auto INSTANCES = instances();
 
-        if (INSTANCENO < 0 || INSTANCENO >= INSTANCES.size()) {
+        if (INSTANCENO < 0 || static_cast<std::size_t>(INSTANCENO) >= INSTANCES.size()) {
             std::cout << "no such instance\n";
             return 1;
         }
@@ -351,7 +357,7 @@ int main(int argc, char** argv) {
         const auto ISIG = getenv("HYPRLAND_INSTANCE_SIGNATURE");
 
         if (!ISIG) {
-            std::cout << "HYPRLAND_INSTANCE_SIGNATURE not set! (is hyprland running?)";
+            std::cout << "HYPRLAND_INSTANCE_SIGNATURE not set! (is hyprland running?)\n";
             return 1;
         }
 
@@ -361,41 +367,9 @@ int main(int argc, char** argv) {
     int exitStatus = 0;
 
     if (fullRequest.contains("/--batch"))
-        batchRequest(fullRequest);
-    else if (fullRequest.contains("/monitors"))
-        request(fullRequest);
-    else if (fullRequest.contains("/clients"))
-        request(fullRequest);
-    else if (fullRequest.contains("/workspaces"))
-        request(fullRequest);
-    else if (fullRequest.contains("/activeworkspace"))
-        request(fullRequest);
-    else if (fullRequest.contains("/activewindow"))
-        request(fullRequest);
-    else if (fullRequest.contains("/layers"))
-        request(fullRequest);
-    else if (fullRequest.contains("/version"))
-        request(fullRequest);
-    else if (fullRequest.contains("/kill"))
-        request(fullRequest);
-    else if (fullRequest.contains("/splash"))
-        request(fullRequest);
-    else if (fullRequest.contains("/devices"))
-        request(fullRequest);
-    else if (fullRequest.contains("/reload"))
-        request(fullRequest);
-    else if (fullRequest.contains("/getoption"))
-        request(fullRequest);
-    else if (fullRequest.contains("/binds"))
-        request(fullRequest);
-    else if (fullRequest.contains("/cursorpos"))
-        request(fullRequest);
-    else if (fullRequest.contains("/animations"))
-        request(fullRequest);
-    else if (fullRequest.contains("/globalshortcuts"))
-        request(fullRequest);
-    else if (fullRequest.contains("/instances"))
-        instancesRequest(json);
+        batchRequest(fullRequest, json);
+    else if (fullRequest.contains("/hyprpaper"))
+        requestHyprpaper(fullRequest);
     else if (fullRequest.contains("/switchxkblayout"))
         request(fullRequest, 2);
     else if (fullRequest.contains("/seterror"))
@@ -404,6 +378,8 @@ int main(int argc, char** argv) {
         request(fullRequest, 3);
     else if (fullRequest.contains("/plugin"))
         request(fullRequest, 1);
+    else if (fullRequest.contains("/dismissnotify"))
+        request(fullRequest, 0);
     else if (fullRequest.contains("/notify"))
         request(fullRequest, 2);
     else if (fullRequest.contains("/output"))
@@ -414,15 +390,14 @@ int main(int argc, char** argv) {
         request(fullRequest, 1);
     else if (fullRequest.contains("/keyword"))
         request(fullRequest, 2);
-    else if (fullRequest.contains("/hyprpaper"))
-        requestHyprpaper(fullRequest);
+    else if (fullRequest.contains("/decorations"))
+        request(fullRequest, 1);
     else if (fullRequest.contains("/--help"))
-        printf("%s", USAGE.c_str());
+        std::cout << USAGE << std::endl;
     else {
-        printf("%s\n", USAGE.c_str());
-        return 1;
+        request(fullRequest);
     }
 
-    printf("\n");
+    std::cout << std::endl;
     return exitStatus;
 }

hyprctl/meson.build

@@ -1,3 +1,7 @@
 executable('hyprctl', 'main.cpp',
   install: true
 )
+
+install_data('hyprctl.bash', install_dir: join_paths(get_option('datadir'), 'bash-completions'), install_tag: 'runtime', rename: 'hyprctl')
+install_data('hyprctl.fish', install_dir: join_paths(get_option('datadir'), 'fish/vendor_completions.d'), install_tag: 'runtime')
+install_data('hyprctl.zsh', install_dir: join_paths(get_option('datadir'), 'zsh/site-functions'), install_tag: 'runtime', rename: '_hyprctl')

hyprland.pc.in

@@ -5,4 +5,4 @@ Name: Hyprland
 URL: https://github.com/hyprwm/Hyprland
 Description: Hyprland header files
 Version: @HYPRLAND_VERSION@
-Cflags: -I"${includedir}/hyprland/protocols" -I"${includedir}/hyprland/wlroots" -I"${includedir}"
+Cflags: -I"${includedir}/hyprland/protocols" -I"${includedir}/hyprland/wlroots-hyprland" -I"${includedir}"

hyprpm/CMakeLists.txt

@@ -0,0 +1,16 @@
+cmake_minimum_required(VERSION 3.19)
+
+project(
+    hyprpm
+    DESCRIPTION "A Hyprland Plugin Manager"
+)
+
+file(GLOB_RECURSE SRCFILES CONFIGURE_DEPENDS "src/*.cpp")
+
+set(CMAKE_CXX_STANDARD 23)
+
+pkg_check_modules(tomlplusplus REQUIRED IMPORTED_TARGET tomlplusplus)
+
+add_executable(hyprpm ${SRCFILES})
+
+target_link_libraries(hyprpm PUBLIC PkgConfig::tomlplusplus)

hyprpm/hyprpm.bash

@@ -0,0 +1,106 @@
+_hyprpm_cmd_0 () {
+    hyprpm list | grep Plugin | awk '{print $4}'
+}
+
+_hyprpm () {
+    if [[ $(type -t _get_comp_words_by_ref) != function ]]; then
+        echo _get_comp_words_by_ref: function not defined.  Make sure the bash-completions system package is installed
+        return 1
+    fi
+
+    local words cword
+    _get_comp_words_by_ref -n "$COMP_WORDBREAKS" words cword
+
+    local -a literals=("-n" "::=" "list" "disable" "--help" "update" "add" "--verbose" "-v" "--force" "remove" "enable" "--notify" "-h" "reload" "-f")
+
+    declare -A literal_transitions
+    literal_transitions[0]="([9]=6 [2]=2 [7]=6 [8]=6 [4]=6 [10]=2 [11]=3 [5]=2 [13]=6 [3]=3 [14]=2 [15]=6 [6]=2)"
+    literal_transitions[1]="([10]=2 [11]=3 [3]=3 [2]=2 [14]=2 [5]=2 [6]=2)"
+    literal_transitions[4]="([1]=5)"
+    literal_transitions[5]="([0]=6 [12]=6)"
+
+    declare -A match_anything_transitions
+    match_anything_transitions=([3]=2 [2]=4 [0]=1 [1]=1)
+    declare -A subword_transitions
+
+    local state=0
+    local word_index=1
+    while [[ $word_index -lt $cword ]]; do
+        local word=${words[$word_index]}
+
+        if [[ -v "literal_transitions[$state]" ]]; then
+            declare -A state_transitions
+            eval "state_transitions=${literal_transitions[$state]}"
+
+            local word_matched=0
+            for literal_id in $(seq 0 $((${#literals[@]} - 1))); do
+                if [[ ${literals[$literal_id]} = "$word" ]]; then
+                    if [[ -v "state_transitions[$literal_id]" ]]; then
+                        state=${state_transitions[$literal_id]}
+                        word_index=$((word_index + 1))
+                        word_matched=1
+                        break
+                    fi
+                fi
+            done
+            if [[ $word_matched -ne 0 ]]; then
+                continue
+            fi
+        fi
+
+        if [[ -v "match_anything_transitions[$state]" ]]; then
+            state=${match_anything_transitions[$state]}
+            word_index=$((word_index + 1))
+            continue
+        fi
+
+        return 1
+    done
+
+
+    local prefix="${words[$cword]}"
+
+    local shortest_suffix="$word"
+    for ((i=0; i < ${#COMP_WORDBREAKS}; i++)); do
+        local char="${COMP_WORDBREAKS:$i:1}"
+        local candidate="${word##*$char}"
+        if [[ ${#candidate} -lt ${#shortest_suffix} ]]; then
+            shortest_suffix=$candidate
+        fi
+    done
+    local superfluous_prefix=""
+    if [[ "$shortest_suffix" != "$word" ]]; then
+        local superfluous_prefix=${word%$shortest_suffix}
+    fi
+
+    if [[ -v "literal_transitions[$state]" ]]; then
+        local state_transitions_initializer=${literal_transitions[$state]}
+        declare -A state_transitions
+        eval "state_transitions=$state_transitions_initializer"
+
+        for literal_id in "${!state_transitions[@]}"; do
+            local literal="${literals[$literal_id]}"
+            if [[ $literal = "${prefix}"* ]]; then
+                local completion=${literal#"$superfluous_prefix"}
+                COMPREPLY+=("$completion ")
+            fi
+        done
+    fi
+    declare -A commands
+    commands=([3]=0)
+    if [[ -v "commands[$state]" ]]; then
+        local command_id=${commands[$state]}
+        local completions=()
+        mapfile -t completions < <(_hyprpm_cmd_${command_id} "$prefix" | cut -f1)
+        for item in "${completions[@]}"; do
+            if [[ $item = "${prefix}"* ]]; then
+                COMPREPLY+=("$item")
+            fi
+        done
+    fi
+
+
+    return 0
+}
+
+complete -o nospace -F _hyprpm hyprpm

hyprpm/hyprpm.fish

@@ -0,0 +1,109 @@
+function _hyprpm_1
+    set 1 $argv[1]
+    hyprpm list | grep Plugin | awk '{print $4}'
+end
+
+function _hyprpm
+    set COMP_LINE (commandline --cut-at-cursor)
+
+    set COMP_WORDS
+    echo $COMP_LINE | read --tokenize --array COMP_WORDS
+    if string match --quiet --regex '.*\s$' $COMP_LINE
+        set COMP_CWORD (math (count $COMP_WORDS) + 1)
+    else
+        set COMP_CWORD (count $COMP_WORDS)
+    end
+
+    set --local literals "-n" "::=" "list" "disable" "--help" "update" "add" "--verbose" "-v" "--force" "remove" "enable" "--notify" "-h" "reload" "-f"
+
+    set --local descriptions
+    set descriptions[1] "Send a hyprland notification for important events (e.g. load fail)"
+    set descriptions[3] "List all installed plugins"
+    set descriptions[4] "Unload a plugin"
+    set descriptions[5] "Show help menu"
+    set descriptions[6] "Check and update all plugins if needed"
+    set descriptions[7] "Install a new plugin repository from git"
+    set descriptions[8] "Enable too much loggin"
+    set descriptions[9] "Enable too much loggin"
+    set descriptions[10] "Force an operation ignoring checks (e.g. update -f)"
+    set descriptions[11] "Remove a plugin repository"
+    set descriptions[12] "Load a plugin"
+    set descriptions[13] "Send a hyprland notification for important events (e.g. load fail)"
+    set descriptions[14] "Show help menu"
+    set descriptions[15] "Reload all plugins"
+    set descriptions[16] "Force an operation ignoring checks (e.g. update -f)"
+
+    set --local literal_transitions
+    set literal_transitions[1] "set inputs 10 3 8 9 5 11 12 6 14 4 15 16 7; set tos 7 3 7 7 7 3 4 3 7 4 3 7 3"
+    set literal_transitions[2] "set inputs 11 12 4 3 15 6 7; set tos 3 4 4 3 3 3 3"
+    set literal_transitions[5] "set inputs 2; set tos 6"
+    set literal_transitions[6] "set inputs 1 13; set tos 7 7"
+
+    set --local match_anything_transitions_from 4 3 1 2
+    set --local match_anything_transitions_to 3 5 2 2
+
+    set --local state 1
+    set --local word_index 2
+    while test $word_index -lt $COMP_CWORD
+        set --local -- word $COMP_WORDS[$word_index]
+
+        if set --query literal_transitions[$state] && test -n $literal_transitions[$state]
+            set --local --erase inputs
+            set --local --erase tos
+            eval $literal_transitions[$state]
+
+            if contains -- $word $literals
+                set --local literal_matched 0
+                for literal_id in (seq 1 (count $literals))
+                    if test $literals[$literal_id] = $word
+                        set --local index (contains --index -- $literal_id $inputs)
+                        set state $tos[$index]
+                        set word_index (math $word_index + 1)
+                        set literal_matched 1
+                        break
+                    end
+                end
+                if test $literal_matched -ne 0
+                    continue
+                end
+            end
+        end
+
+        if set --query match_anything_transitions_from[$state] && test -n $match_anything_transitions_from[$state]
+            set --local index (contains --index -- $state $match_anything_transitions_from)
+            set state $match_anything_transitions_to[$index]
+            set word_index (math $word_index + 1)
+            continue
+        end
+
+        return 1
+    end
+
+    if set --query literal_transitions[$state] && test -n $literal_transitions[$state]
+        set --local --erase inputs
+        set --local --erase tos
+        eval $literal_transitions[$state]
+        for literal_id in $inputs
+            if test -n $descriptions[$literal_id]
+                printf '%s\t%s\n' $literals[$literal_id] $descriptions[$literal_id]
+            else
+                printf '%s\n' $literals[$literal_id]
+            end
+        end
+    end
+
+    set command_states 4
+    set command_ids 1
+    if contains $state $command_states
+        set --local index (contains --index $state $command_states)
+        set --local function_id $command_ids[$index]
+        set --local function_name _hyprpm_$function_id
+        set --local --erase inputs
+        set --local --erase tos
+        $function_name "$COMP_WORDS[$COMP_CWORD]"
+    end
+
+    return 0
+end
+
+complete --command hyprpm --no-files --arguments "(_hyprpm)"

hyprpm/hyprpm.usage

@@ -0,0 +1,19 @@
+hyprpm [<FLAGS>]... <ARGUMENT>
+
+
+<FLAGS> ::= (--notify | -n)             "Send a hyprland notification for important events (e.g. load fail)"
+        |   (--help | -h)               "Show help menu"
+        |   (--verbose | -v)            "Enable too much loggin"
+        |   (--force | -f)              "Force an operation ignoring checks (e.g. update -f)"
+        ;
+
+<ARGUMENT> ::= (add)                    "Install a new plugin repository from git"
+        |   (remove)                    "Remove a plugin repository"
+        |   (update)                    "Check and update all plugins if needed"
+        |   (list)                      "List all installed plugins"
+        |   (enable <PLUGINS>)          "Load a plugin"
+        |   (disable <PLUGINS>)         "Unload a plugin"
+        |   (reload)                    "Reload all plugins"
+        ;
+
+<PLUGINS> ::= {{{ hyprpm list | grep Plugin | awk '{print $4}' }}};

hyprpm/hyprpm.zsh

@@ -0,0 +1,151 @@
+#compdef hyprpm
+
+_hyprpm_cmd_0 () {
+    hyprpm list | grep Plugin | awk '{print $4}'
+}
+
+_hyprpm () {
+    local -a literals=("-n" "::=" "list" "disable" "--help" "update" "add" "--verbose" "-v" "--force" "remove" "enable" "--notify" "-h" "reload" "-f")
+
+    local -A descriptions
+    descriptions[1]="Send a hyprland notification for important events (e.g. load fail)"
+    descriptions[3]="List all installed plugins"
+    descriptions[4]="Unload a plugin"
+    descriptions[5]="Show help menu"
+    descriptions[6]="Check and update all plugins if needed"
+    descriptions[7]="Install a new plugin repository from git"
+    descriptions[8]="Enable too much loggin"
+    descriptions[9]="Enable too much loggin"
+    descriptions[10]="Force an operation ignoring checks (e.g. update -f)"
+    descriptions[11]="Remove a plugin repository"
+    descriptions[12]="Load a plugin"
+    descriptions[13]="Send a hyprland notification for important events (e.g. load fail)"
+    descriptions[14]="Show help menu"
+    descriptions[15]="Reload all plugins"
+    descriptions[16]="Force an operation ignoring checks (e.g. update -f)"
+
+    local -A literal_transitions
+    literal_transitions[1]="([10]=7 [3]=3 [8]=7 [9]=7 [5]=7 [11]=3 [12]=4 [6]=3 [14]=7 [4]=4 [15]=3 [16]=7 [7]=3)"
+    literal_transitions[2]="([11]=3 [12]=4 [4]=4 [3]=3 [15]=3 [6]=3 [7]=3)"
+    literal_transitions[5]="([2]=6)"
+    literal_transitions[6]="([1]=7 [13]=7)"
+
+    local -A match_anything_transitions
+    match_anything_transitions=([4]=3 [3]=5 [1]=2 [2]=2)
+
+    declare -A subword_transitions
+
+    local state=1
+    local word_index=2
+    while [[ $word_index -lt $CURRENT ]]; do
+        if [[ -v "literal_transitions[$state]" ]]; then
+            local -A state_transitions
+            eval "state_transitions=${literal_transitions[$state]}"
+
+            local word=${words[$word_index]}
+            local word_matched=0
+            for ((literal_id = 1; literal_id <= $#literals; literal_id++)); do
+                if [[ ${literals[$literal_id]} = "$word" ]]; then
+                    if [[ -v "state_transitions[$literal_id]" ]]; then
+                        state=${state_transitions[$literal_id]}
+                        word_index=$((word_index + 1))
+                        word_matched=1
+                        break
+                    fi
+                fi
+            done
+            if [[ $word_matched -ne 0 ]]; then
+                continue
+            fi
+        fi
+
+        if [[ -v "match_anything_transitions[$state]" ]]; then
+            state=${match_anything_transitions[$state]}
+            word_index=$((word_index + 1))
+            continue
+        fi
+
+        return 1
+    done
+
+    completions_no_description_trailing_space=()
+    completions_no_description_no_trailing_space=()
+    completions_trailing_space=()
+    suffixes_trailing_space=()
+    descriptions_trailing_space=()
+    completions_no_trailing_space=()
+    suffixes_no_trailing_space=()
+    descriptions_no_trailing_space=()
+
+    if [[ -v "literal_transitions[$state]" ]]; then
+        local -A state_transitions
+        eval "state_transitions=${literal_transitions[$state]}"
+
+        for literal_id in ${(k)state_transitions}; do
+            if [[ -v "descriptions[$literal_id]" ]]; then
+                completions_trailing_space+=("${literals[$literal_id]}")
+                suffixes_trailing_space+=("${literals[$literal_id]}")
+                descriptions_trailing_space+=("${descriptions[$literal_id]}")
+            else
+                completions_no_description_trailing_space+=("${literals[$literal_id]}")
+            fi
+        done
+    fi
+    local -A commands=([4]=0)
+
+    if [[ -v "commands[$state]" ]]; then
+        local command_id=${commands[$state]}
+        local output=$(_hyprpm_cmd_${command_id} "${words[$CURRENT]}")
+        local -a command_completions=("${(@f)output}")
+        for line in ${command_completions[@]}; do
+            local parts=(${(@s:	:)line})
+            if [[ -v "parts[2]" ]]; then
+                completions_trailing_space+=("${parts[1]}")
+                suffixes_trailing_space+=("${parts[1]}")
+                descriptions_trailing_space+=("${parts[2]}")
+            else
+                completions_no_description_trailing_space+=("${parts[1]}")
+            fi
+        done
+    fi
+
+    local maxlen=0
+    for suffix in ${suffixes_trailing_space[@]}; do
+        if [[ ${#suffix} -gt $maxlen ]]; then
+            maxlen=${#suffix}
+        fi
+    done
+    for suffix in ${suffixes_no_trailing_space[@]}; do
+        if [[ ${#suffix} -gt $maxlen ]]; then
+            maxlen=${#suffix}
+        fi
+    done
+
+    for ((i = 1; i <= $#suffixes_trailing_space; i++)); do
+        if [[ -z ${descriptions_trailing_space[$i]} ]]; then
+            descriptions_trailing_space[$i]="${(r($maxlen)( ))${suffixes_trailing_space[$i]}}"
+        else
+            descriptions_trailing_space[$i]="${(r($maxlen)( ))${suffixes_trailing_space[$i]}} -- ${descriptions_trailing_space[$i]}"
+        fi
+    done
+
+    for ((i = 1; i <= $#suffixes_no_trailing_space; i++)); do
+        if [[ -z ${descriptions_no_trailing_space[$i]} ]]; then
+            descriptions_no_trailing_space[$i]="${(r($maxlen)( ))${suffixes_no_trailing_space[$i]}}"
+        else
+            descriptions_no_trailing_space[$i]="${(r($maxlen)( ))${suffixes_no_trailing_space[$i]}} -- ${descriptions_no_trailing_space[$i]}"
+        fi
+    done
+
+    compadd -Q -a completions_no_description_trailing_space
+    compadd -Q -S ' ' -a completions_no_description_no_trailing_space
+    compadd -l -Q -a -d descriptions_trailing_space completions_trailing_space
+    compadd -l -Q -S '' -a -d descriptions_no_trailing_space completions_no_trailing_space
+    return 0
+}
+
+if [[ $ZSH_EVAL_CONTEXT =~ :file$ ]]; then
+    compdef _hyprpm hyprpm
+else
+    _hyprpm
+fi

hyprpm/src/core/DataState.cpp

@@ -0,0 +1,245 @@
+#include "DataState.hpp"
+#include <toml++/toml.hpp>
+#include <iostream>
+#include <filesystem>
+#include <fstream>
+#include "PluginManager.hpp"
+
+std::string DataState::getDataStatePath() {
+    const auto HOME = getenv("HOME");
+    if (!HOME) {
+        std::cerr << "DataState: no $HOME\n";
+        throw std::runtime_error("no $HOME");
+        return "";
+    }
+
+    const auto XDG_DATA_HOME = getenv("XDG_DATA_HOME");
+
+    if (XDG_DATA_HOME)
+        return std::string{XDG_DATA_HOME} + "/hyprpm";
+    return std::string{HOME} + "/.local/share/hyprpm";
+}
+
+std::string DataState::getHeadersPath() {
+    return getDataStatePath() + "/headersRoot";
+}
+
+void DataState::ensureStateStoreExists() {
+    const auto PATH = getDataStatePath();
+
+    if (!std::filesystem::exists(PATH))
+        std::filesystem::create_directories(PATH);
+
+    if (!std::filesystem::exists(getHeadersPath()))
+        std::filesystem::create_directories(getHeadersPath());
+}
+
+void DataState::addNewPluginRepo(const SPluginRepository& repo) {
+    ensureStateStoreExists();
+
+    const auto PATH = getDataStatePath() + "/" + repo.name;
+
+    std::filesystem::create_directories(PATH);
+    // clang-format off
+    auto DATA = toml::table{
+        {"repository", toml::table{
+            {"name", repo.name},
+            {"hash", repo.hash},
+            {"url", repo.url},
+            {"rev", repo.rev}
+        }}
+    };
+    for (auto& p : repo.plugins) {
+        // copy .so to the good place
+        if (std::filesystem::exists(p.filename))
+            std::filesystem::copy_file(p.filename, PATH + "/" + p.name + ".so");
+
+        DATA.emplace(p.name, toml::table{
+            {"filename", p.name + ".so"},
+            {"enabled", p.enabled},
+            {"failed", p.failed}
+        });
+    }
+    // clang-format on
+
+    std::ofstream ofs(PATH + "/state.toml", std::ios::trunc);
+    ofs << DATA;
+    ofs.close();
+}
+
+bool DataState::pluginRepoExists(const std::string& urlOrName) {
+    ensureStateStoreExists();
+
+    const auto PATH = getDataStatePath();
+
+    for (const auto& entry : std::filesystem::directory_iterator(PATH)) {
+        if (!entry.is_directory() || entry.path().stem() == "headersRoot")
+            continue;
+
+        if (!std::filesystem::exists(entry.path().string() + "/state.toml"))
+            continue;
+
+        auto       STATE = toml::parse_file(entry.path().string() + "/state.toml");
+
+        const auto NAME = STATE["repository"]["name"].value_or("");
+        const auto URL  = STATE["repository"]["url"].value_or("");
+
+        if (URL == urlOrName || NAME == urlOrName)
+            return true;
+    }
+
+    return false;
+}
+
+void DataState::removePluginRepo(const std::string& urlOrName) {
+    ensureStateStoreExists();
+
+    const auto PATH = getDataStatePath();
+
+    for (const auto& entry : std::filesystem::directory_iterator(PATH)) {
+        if (!entry.is_directory() || entry.path().stem() == "headersRoot")
+            continue;
+
+        if (!std::filesystem::exists(entry.path().string() + "/state.toml"))
+            continue;
+
+        auto       STATE = toml::parse_file(entry.path().string() + "/state.toml");
+
+        const auto NAME = STATE["repository"]["name"].value_or("");
+        const auto URL  = STATE["repository"]["url"].value_or("");
+
+        if (URL == urlOrName || NAME == urlOrName) {
+
+            // unload the plugins!!
+            for (const auto& file : std::filesystem::directory_iterator(entry.path())) {
+                if (!file.path().string().ends_with(".so"))
+                    continue;
+
+                g_pPluginManager->loadUnloadPlugin(std::filesystem::absolute(file.path()), false);
+            }
+
+            std::filesystem::remove_all(entry.path());
+            return;
+        }
+    }
+}
+
+void DataState::updateGlobalState(const SGlobalState& state) {
+    ensureStateStoreExists();
+
+    const auto PATH = getDataStatePath();
+
+    std::filesystem::create_directories(PATH);
+    // clang-format off
+    auto DATA = toml::table{
+        {"state", toml::table{
+            {"hash", state.headersHashCompiled},
+            {"dont_warn_install", state.dontWarnInstall}
+        }}
+    };
+    // clang-format on
+
+    std::ofstream ofs(PATH + "/state.toml", std::ios::trunc);
+    ofs << DATA;
+    ofs.close();
+}
+
+SGlobalState DataState::getGlobalState() {
+    ensureStateStoreExists();
+
+    const auto PATH = getDataStatePath();
+
+    if (!std::filesystem::exists(PATH + "/state.toml"))
+        return SGlobalState{};
+
+    auto         DATA = toml::parse_file(PATH + "/state.toml");
+
+    SGlobalState state;
+    state.headersHashCompiled = DATA["state"]["hash"].value_or("");
+    state.dontWarnInstall     = DATA["state"]["dont_warn_install"].value_or(false);
+
+    return state;
+}
+
+std::vector<SPluginRepository> DataState::getAllRepositories() {
+    ensureStateStoreExists();
+
+    const auto                     PATH = getDataStatePath();
+
+    std::vector<SPluginRepository> repos;
+
+    for (const auto& entry : std::filesystem::directory_iterator(PATH)) {
+        if (!entry.is_directory() || entry.path().stem() == "headersRoot")
+            continue;
+
+        if (!std::filesystem::exists(entry.path().string() + "/state.toml"))
+            continue;
+
+        auto              STATE = toml::parse_file(entry.path().string() + "/state.toml");
+
+        const auto        NAME = STATE["repository"]["name"].value_or("");
+        const auto        URL  = STATE["repository"]["url"].value_or("");
+        const auto        REV  = STATE["repository"]["rev"].value_or("");
+        const auto        HASH = STATE["repository"]["hash"].value_or("");
+
+        SPluginRepository repo;
+        repo.hash = HASH;
+        repo.name = NAME;
+        repo.url  = URL;
+        repo.rev  = REV;
+
+        for (const auto& [key, val] : STATE) {
+            if (key == "repository")
+                continue;
+
+            const auto ENABLED  = STATE[key]["enabled"].value_or(false);
+            const auto FAILED   = STATE[key]["failed"].value_or(false);
+            const auto FILENAME = STATE[key]["filename"].value_or("");
+
+            repo.plugins.push_back(SPlugin{std::string{key.str()}, FILENAME, ENABLED, FAILED});
+        }
+
+        repos.push_back(repo);
+    }
+
+    return repos;
+}
+
+bool DataState::setPluginEnabled(const std::string& name, bool enabled) {
+    ensureStateStoreExists();
+
+    const auto PATH = getDataStatePath();
+
+    for (const auto& entry : std::filesystem::directory_iterator(PATH)) {
+        if (!entry.is_directory() || entry.path().stem() == "headersRoot")
+            continue;
+
+        if (!std::filesystem::exists(entry.path().string() + "/state.toml"))
+            continue;
+
+        auto STATE = toml::parse_file(entry.path().string() + "/state.toml");
+
+        for (const auto& [key, val] : STATE) {
+            if (key == "repository")
+                continue;
+
+            if (key.str() != name)
+                continue;
+
+            const auto FAILED = STATE[key]["failed"].value_or(false);
+
+            if (FAILED)
+                return false;
+
+            (*STATE[key].as_table()).insert_or_assign("enabled", enabled);
+
+            std::ofstream state(entry.path().string() + "/state.toml", std::ios::trunc);
+            state << STATE;
+            state.close();
+
+            return true;
+        }
+    }
+
+    return false;
+}

hyprpm/src/core/DataState.hpp

@@ -0,0 +1,22 @@
+#pragma once
+#include <string>
+#include <vector>
+#include "Plugin.hpp"
+
+struct SGlobalState {
+    std::string headersHashCompiled = "";
+    bool        dontWarnInstall     = false;
+};
+
+namespace DataState {
+    std::string                    getDataStatePath();
+    std::string                    getHeadersPath();
+    void                           ensureStateStoreExists();
+    void                           addNewPluginRepo(const SPluginRepository& repo);
+    void                           removePluginRepo(const std::string& urlOrName);
+    bool                           pluginRepoExists(const std::string& urlOrName);
+    void                           updateGlobalState(const SGlobalState& state);
+    SGlobalState                   getGlobalState();
+    bool                           setPluginEnabled(const std::string& name, bool enabled);
+    std::vector<SPluginRepository> getAllRepositories();
+};

hyprpm/src/core/Manifest.cpp

@@ -0,0 +1,105 @@
+#include "Manifest.hpp"
+#include <toml++/toml.hpp>
+#include <iostream>
+
+CManifest::CManifest(const eManifestType type, const std::string& path) {
+    auto manifest = toml::parse_file(path);
+
+    if (type == MANIFEST_HYPRLOAD) {
+        for (auto& [key, val] : manifest) {
+            if (key.str().ends_with(".build"))
+                continue;
+
+            CManifest::SManifestPlugin plugin;
+            plugin.name = key;
+            m_vPlugins.push_back(plugin);
+        }
+
+        for (auto& plugin : m_vPlugins) {
+            plugin.description = manifest[plugin.name]["description"].value_or("?");
+            plugin.version     = manifest[plugin.name]["version"].value_or("?");
+            plugin.output      = manifest[plugin.name]["build"]["output"].value_or("?");
+            auto authors       = manifest[plugin.name]["authors"].as_array();
+            if (authors) {
+                for (auto&& a : *authors) {
+                    plugin.authors.push_back(a.as_string()->value_or("?"));
+                }
+            } else {
+                auto author = manifest[plugin.name]["author"].value_or("");
+                if (!std::string{author}.empty())
+                    plugin.authors.push_back(author);
+            }
+            auto buildSteps = manifest[plugin.name]["build"]["steps"].as_array();
+            if (buildSteps) {
+                for (auto&& s : *buildSteps) {
+                    plugin.buildSteps.push_back(s.as_string()->value_or("?"));
+                }
+            }
+
+            if (plugin.output.empty() || plugin.buildSteps.empty()) {
+                m_bGood = false;
+                return;
+            }
+        }
+    } else if (type == MANIFEST_HYPRPM) {
+        m_sRepository.name = manifest["repository"]["name"].value_or("");
+        auto authors       = manifest["repository"]["authors"].as_array();
+        if (authors) {
+            for (auto&& a : *authors) {
+                m_sRepository.authors.push_back(a.as_string()->value_or("?"));
+            }
+        } else {
+            auto author = manifest["repository"]["author"].value_or("");
+            if (!std::string{author}.empty())
+                m_sRepository.authors.push_back(author);
+        }
+
+        auto pins = manifest["repository"]["commit_pins"].as_array();
+        if (pins) {
+            for (auto&& pin : *pins) {
+                auto pinArr = pin.as_array();
+                if (pinArr && pinArr->get(1))
+                    m_sRepository.commitPins.push_back(std::make_pair<>(pinArr->get(0)->as_string()->get(), pinArr->get(1)->as_string()->get()));
+            }
+        }
+
+        for (auto& [key, val] : manifest) {
+            if (key.str() == "repository")
+                continue;
+
+            CManifest::SManifestPlugin plugin;
+            plugin.name = key;
+            m_vPlugins.push_back(plugin);
+        }
+
+        for (auto& plugin : m_vPlugins) {
+            plugin.description = manifest[plugin.name]["description"].value_or("?");
+            plugin.output      = manifest[plugin.name]["output"].value_or("?");
+            plugin.since       = manifest[plugin.name]["since_hyprland"].value_or(0);
+            auto authors       = manifest[plugin.name]["authors"].as_array();
+            if (authors) {
+                for (auto&& a : *authors) {
+                    plugin.authors.push_back(a.as_string()->value_or("?"));
+                }
+            } else {
+                auto author = manifest[plugin.name]["author"].value_or("");
+                if (!std::string{author}.empty())
+                    plugin.authors.push_back(author);
+            }
+            auto buildSteps = manifest[plugin.name]["build"].as_array();
+            if (buildSteps) {
+                for (auto&& s : *buildSteps) {
+                    plugin.buildSteps.push_back(s.as_string()->value_or("?"));
+                }
+            }
+
+            if (plugin.output.empty() || plugin.buildSteps.empty()) {
+                m_bGood = false;
+                return;
+            }
+        }
+    } else {
+        // ???
+        m_bGood = false;
+    }
+}

hyprpm/src/core/Manifest.hpp

@@ -0,0 +1,34 @@
+#pragma once
+
+#include <string>
+#include <vector>
+
+enum eManifestType {
+    MANIFEST_HYPRLOAD,
+    MANIFEST_HYPRPM
+};
+
+class CManifest {
+  public:
+    CManifest(const eManifestType type, const std::string& path);
+
+    struct SManifestPlugin {
+        std::string              name;
+        std::string              description;
+        std::string              version;
+        std::vector<std::string> authors;
+        std::vector<std::string> buildSteps;
+        std::string              output;
+        int                      since  = 0;
+        bool                     failed = false;
+    };
+
+    struct {
+        std::string                                      name;
+        std::vector<std::string>                         authors;
+        std::vector<std::pair<std::string, std::string>> commitPins;
+    } m_sRepository;
+
+    std::vector<SManifestPlugin> m_vPlugins;
+    bool                         m_bGood = true;
+};

hyprpm/src/core/Plugin.hpp

@@ -0,0 +1,19 @@
+#pragma once
+
+#include <string>
+#include <vector>
+
+struct SPlugin {
+    std::string name;
+    std::string filename;
+    bool        enabled = false;
+    bool        failed  = false;
+};
+
+struct SPluginRepository {
+    std::string          url;
+    std::string          rev;
+    std::string          name;
+    std::vector<SPlugin> plugins;
+    std::string          hash;
+};

hyprpm/src/core/PluginManager.cpp

@@ -0,0 +1,819 @@
+#include "PluginManager.hpp"
+#include "../helpers/Colors.hpp"
+#include "../progress/CProgressBar.hpp"
+#include "Manifest.hpp"
+#include "DataState.hpp"
+
+#include <iostream>
+#include <array>
+#include <filesystem>
+#include <thread>
+#include <fstream>
+#include <algorithm>
+#include <format>
+
+#include <toml++/toml.hpp>
+
+static std::string removeBeginEndSpacesTabs(std::string str) {
+    if (str.empty())
+        return str;
+
+    int countBefore = 0;
+    while (str[countBefore] == ' ' || str[countBefore] == '\t') {
+        countBefore++;
+    }
+
+    int countAfter = 0;
+    while ((int)str.length() - countAfter - 1 >= 0 && (str[str.length() - countAfter - 1] == ' ' || str[str.length() - 1 - countAfter] == '\t')) {
+        countAfter++;
+    }
+
+    str = str.substr(countBefore, str.length() - countBefore - countAfter);
+
+    return str;
+}
+
+static std::string execAndGet(std::string cmd) {
+    cmd += " 2>&1";
+    std::array<char, 128>                          buffer;
+    std::string                                    result;
+    const std::unique_ptr<FILE, decltype(&pclose)> pipe(popen(cmd.c_str(), "r"), pclose);
+    if (!pipe)
+        return "";
+
+    while (fgets(buffer.data(), buffer.size(), pipe.get()) != nullptr) {
+        result += buffer.data();
+    }
+    return result;
+}
+
+SHyprlandVersion CPluginManager::getHyprlandVersion() {
+    static SHyprlandVersion ver;
+    static bool             once = false;
+
+    if (once)
+        return ver;
+
+    once                 = true;
+    const auto HLVERCALL = execAndGet("hyprctl version");
+    if (m_bVerbose)
+        std::cout << Colors::BLUE << "[v] " << Colors::RESET << "version returned: " << HLVERCALL << "\n";
+
+    if (!HLVERCALL.contains("Tag:")) {
+        std::cerr << "\n" << Colors::RED << "✖" << Colors::RESET << " You don't seem to be running Hyprland.";
+        return SHyprlandVersion{};
+    }
+
+    std::string hlcommit = HLVERCALL.substr(HLVERCALL.find("at commit") + 10);
+    hlcommit             = hlcommit.substr(0, hlcommit.find_first_of(' '));
+
+    std::string hlbranch = HLVERCALL.substr(HLVERCALL.find("from branch") + 12);
+    hlbranch             = hlbranch.substr(0, hlbranch.find(" at commit "));
+
+    std::string hldate = HLVERCALL.substr(HLVERCALL.find("Date: ") + 6);
+    hldate             = hldate.substr(0, hldate.find("\n"));
+
+    std::string hlcommits;
+
+    if (HLVERCALL.contains("commits:")) {
+        hlcommits = HLVERCALL.substr(HLVERCALL.find("commits:") + 9);
+        hlcommits = hlcommits.substr(0, hlcommits.find(" "));
+    }
+
+    int commits = 0;
+    try {
+        commits = std::stoi(hlcommits);
+    } catch (...) { ; }
+
+    if (m_bVerbose)
+        std::cout << Colors::BLUE << "[v] " << Colors::RESET << "parsed commit " << hlcommit << " at branch " << hlbranch << " on " << hldate << ", commits " << commits << "\n";
+
+    ver = SHyprlandVersion{hlbranch, hlcommit, hldate, commits};
+    return ver;
+}
+
+bool CPluginManager::addNewPluginRepo(const std::string& url, const std::string& rev) {
+    const auto HLVER = getHyprlandVersion();
+
+    if (DataState::pluginRepoExists(url)) {
+        std::cerr << "\n" << Colors::RED << "✖" << Colors::RESET << " Could not clone the plugin repository. Repository already installed.\n";
+        return false;
+    }
+
+    auto GLOBALSTATE = DataState::getGlobalState();
+    if (!GLOBALSTATE.dontWarnInstall) {
+        std::cout << Colors::YELLOW << "!" << Colors::RED << " Disclaimer:\n  " << Colors::RESET
+                  << "plugins, especially not official, have no guarantee of stability, availablity or security.\n  Run them at your own risk.\n  "
+                  << "This message will not appear again.\n";
+        GLOBALSTATE.dontWarnInstall = true;
+        DataState::updateGlobalState(GLOBALSTATE);
+    }
+
+    std::cout << Colors::GREEN << "✔" << Colors::RESET << Colors::RED << " adding a new plugin repository " << Colors::RESET << "from " << url << "\n  " << Colors::RED
+              << "MAKE SURE" << Colors::RESET << " that you trust the authors. " << Colors::RED << "DO NOT" << Colors::RESET
+              << " install random plugins without verifying the code and author.\n  "
+              << "Are you sure? [Y/n] ";
+    std::fflush(stdout);
+    std::string input;
+    std::getline(std::cin, input);
+
+    if (input.size() > 0 && input[0] != 'Y' && input[0] != 'y') {
+        std::cout << "Aborting.\n";
+        return false;
+    }
+
+    CProgressBar progress;
+    progress.m_iMaxSteps        = 5;
+    progress.m_iSteps           = 0;
+    progress.m_szCurrentMessage = "Cloning the plugin repository";
+
+    progress.print();
+
+    if (!std::filesystem::exists("/tmp/hyprpm")) {
+        std::filesystem::create_directory("/tmp/hyprpm");
+        std::filesystem::permissions("/tmp/hyprpm", std::filesystem::perms::all, std::filesystem::perm_options::replace);
+    }
+
+    if (std::filesystem::exists("/tmp/hyprpm/new")) {
+        progress.printMessageAbove(std::string{Colors::YELLOW} + "!" + Colors::RESET + " old plugin repo build files found in temp directory, removing.");
+        std::filesystem::remove_all("/tmp/hyprpm/new");
+    }
+
+    progress.printMessageAbove(std::string{Colors::RESET} + " → Cloning " + url);
+
+    std::string ret = execAndGet("cd /tmp/hyprpm && git clone --recursive " + url + " new");
+
+    if (!std::filesystem::exists("/tmp/hyprpm/new")) {
+        std::cerr << "\n" << Colors::RED << "✖" << Colors::RESET << " Could not clone the plugin repository. shell returned:\n" << ret << "\n";
+        return false;
+    }
+
+    if (!rev.empty()) {
+        std::string ret = execAndGet("git -C /tmp/hyprpm/new reset --hard --recurse-submodules " + rev);
+        if (ret.compare(0, 6, "fatal:") == 0) {
+            std::cerr << "\n" << Colors::RED << "✖" << Colors::RESET << " Could not check out revision " << rev << ". shell returned:\n" << ret << "\n";
+            return false;
+        }
+    }
+
+    progress.m_iSteps = 1;
+    progress.printMessageAbove(std::string{Colors::GREEN} + "✔" + Colors::RESET + " cloned");
+    progress.m_szCurrentMessage = "Reading the manifest";
+    progress.print();
+
+    std::unique_ptr<CManifest> pManifest;
+
+    if (std::filesystem::exists("/tmp/hyprpm/new/hyprpm.toml")) {
+        progress.printMessageAbove(std::string{Colors::GREEN} + "✔" + Colors::RESET + " found hyprpm manifest");
+        pManifest = std::make_unique<CManifest>(MANIFEST_HYPRPM, "/tmp/hyprpm/new/hyprpm.toml");
+    } else if (std::filesystem::exists("/tmp/hyprpm/new/hyprload.toml")) {
+        progress.printMessageAbove(std::string{Colors::GREEN} + "✔" + Colors::RESET + " found hyprload manifest");
+        pManifest = std::make_unique<CManifest>(MANIFEST_HYPRLOAD, "/tmp/hyprpm/new/hyprload.toml");
+    }
+
+    if (!pManifest) {
+        std::cerr << "\n" << Colors::RED << "✖" << Colors::RESET << " The provided plugin repository does not have a valid manifest\n";
+        return false;
+    }
+
+    if (!pManifest->m_bGood) {
+        std::cerr << "\n" << Colors::RED << "✖" << Colors::RESET << " The provided plugin repository has a corrupted manifest\n";
+        return false;
+    }
+
+    progress.m_iSteps = 2;
+    progress.printMessageAbove(std::string{Colors::GREEN} + "✔" + Colors::RESET + " parsed manifest, found " + std::to_string(pManifest->m_vPlugins.size()) + " plugins:");
+    for (auto& pl : pManifest->m_vPlugins) {
+        std::string message = std::string{Colors::RESET} + " → " + pl.name + " by ";
+        for (auto& a : pl.authors) {
+            message += a + ", ";
+        }
+        if (pl.authors.size() > 0) {
+            message.pop_back();
+            message.pop_back();
+        }
+        message += " version " + pl.version;
+        progress.printMessageAbove(message);
+    }
+
+    if (!pManifest->m_sRepository.commitPins.empty()) {
+        // check commit pins
+
+        progress.printMessageAbove(std::string{Colors::RESET} + " → Manifest has " + std::to_string(pManifest->m_sRepository.commitPins.size()) + " pins, checking");
+
+        for (auto& [hl, plugin] : pManifest->m_sRepository.commitPins) {
+            if (hl != HLVER.hash)
+                continue;
+
+            progress.printMessageAbove(std::string{Colors::GREEN} + "✔" + Colors::RESET + " commit pin " + plugin + " matched hl, resetting");
+
+            execAndGet("cd /tmp/hyprpm/new/ && git reset --hard --recurse-submodules " + plugin);
+        }
+    }
+
+    progress.m_szCurrentMessage = "Verifying headers";
+    progress.print();
+
+    const auto HEADERSSTATUS = headersValid();
+
+    if (HEADERSSTATUS != HEADERS_OK) {
+        std::cerr << "\n" << headerError(HEADERSSTATUS);
+        return false;
+    }
+
+    progress.m_iSteps = 3;
+    progress.printMessageAbove(std::string{Colors::GREEN} + "✔" + Colors::RESET + " Hyprland headers OK");
+    progress.m_szCurrentMessage = "Building plugin(s)";
+    progress.print();
+
+    for (auto& p : pManifest->m_vPlugins) {
+        std::string out;
+
+        if (p.since > HLVER.commits && HLVER.commits >= 1 /* for --depth 1 clones, we can't check this. */) {
+            progress.printMessageAbove(std::string{Colors::RED} + "✖" + Colors::RESET + " Not building " + p.name + ": your Hyprland version is too old.\n");
+            p.failed = true;
+            continue;
+        }
+
+        progress.printMessageAbove(std::string{Colors::RESET} + " → Building " + p.name);
+
+        for (auto& bs : p.buildSteps) {
+            std::string cmd = std::format("cd /tmp/hyprpm/new && PKG_CONFIG_PATH=\"{}/share/pkgconfig\" {}", DataState::getHeadersPath(), bs);
+            out += " -> " + cmd + "\n" + execAndGet(cmd) + "\n";
+        }
+
+        if (m_bVerbose)
+            std::cout << Colors::BLUE << "[v] " << Colors::RESET << "shell returned: " << out << "\n";
+
+        if (!std::filesystem::exists("/tmp/hyprpm/new/" + p.output)) {
+            progress.printMessageAbove(std::string{Colors::RED} + "✖" + Colors::RESET + " Plugin " + p.name + " failed to build.\n" +
+                                       "  This likely means that the plugin is either outdated, not yet available for your version, or broken.\n  If you are on -git, update "
+                                       "first.\n  Try re-running with -v to see "
+                                       "more verbose output.\n");
+
+            p.failed = true;
+            continue;
+        }
+
+        progress.printMessageAbove(std::string{Colors::GREEN} + "✔" + Colors::RESET + " built " + p.name + " into " + p.output);
+    }
+
+    progress.printMessageAbove(std::string{Colors::GREEN} + "✔" + Colors::RESET + " all plugins built");
+    progress.m_iSteps           = 4;
+    progress.m_szCurrentMessage = "Installing repository";
+    progress.print();
+
+    // add repo toml to DataState
+    SPluginRepository repo;
+    std::string       repohash = execAndGet("cd /tmp/hyprpm/new/ && git rev-parse HEAD");
+    if (repohash.length() > 0)
+        repohash.pop_back();
+    repo.name = pManifest->m_sRepository.name.empty() ? url.substr(url.find_last_of('/') + 1) : pManifest->m_sRepository.name;
+    repo.url  = url;
+    repo.rev  = rev;
+    repo.hash = repohash;
+    for (auto& p : pManifest->m_vPlugins) {
+        repo.plugins.push_back(SPlugin{p.name, "/tmp/hyprpm/new/" + p.output, false, p.failed});
+    }
+    DataState::addNewPluginRepo(repo);
+
+    progress.printMessageAbove(std::string{Colors::GREEN} + "✔" + Colors::RESET + " installed repository");
+    progress.printMessageAbove(std::string{Colors::GREEN} + "✔" + Colors::RESET + " you can now enable the plugin(s) with hyprpm enable");
+    progress.m_iSteps           = 5;
+    progress.m_szCurrentMessage = "Done!";
+    progress.print();
+
+    std::cout << "\n";
+
+    // remove build files
+    std::filesystem::remove_all("/tmp/hyprpm/new");
+
+    return true;
+}
+
+bool CPluginManager::removePluginRepo(const std::string& urlOrName) {
+    if (!DataState::pluginRepoExists(urlOrName)) {
+        std::cerr << "\n" << Colors::RED << "✖" << Colors::RESET << " Could not remove the repository. Repository is not installed.\n";
+        return false;
+    }
+
+    std::cout << Colors::YELLOW << "!" << Colors::RESET << Colors::RED << " removing a plugin repository: " << Colors::RESET << urlOrName << "\n  "
+              << "Are you sure? [Y/n] ";
+    std::fflush(stdout);
+    std::string input;
+    std::getline(std::cin, input);
+
+    if (input.size() > 0 && input[0] != 'Y' && input[0] != 'y') {
+        std::cout << "Aborting.\n";
+        return false;
+    }
+
+    DataState::removePluginRepo(urlOrName);
+
+    return true;
+}
+
+eHeadersErrors CPluginManager::headersValid() {
+    const auto HLVER = getHyprlandVersion();
+
+    if (!std::filesystem::exists(DataState::getHeadersPath() + "/share/pkgconfig/hyprland.pc"))
+        return HEADERS_MISSING;
+
+    // find headers commit
+    std::string cmd     = std::format("PKG_CONFIG_PATH=\"{}/share/pkgconfig\" pkgconf --cflags --keep-system-cflags hyprland", DataState::getHeadersPath());
+    auto        headers = execAndGet(cmd.c_str());
+
+    if (!headers.contains("-I/"))
+        return HEADERS_MISSING;
+
+    headers.pop_back(); // pop newline
+
+    std::string verHeader = "";
+
+    while (!headers.empty()) {
+        const auto PATH = headers.substr(0, headers.find(" -I/", 3));
+
+        if (headers.find(" -I/", 3) != std::string::npos)
+            headers = headers.substr(headers.find("-I/", 3));
+        else
+            headers = "";
+
+        if (PATH.ends_with("protocols") || PATH.ends_with("wlroots-hyprland"))
+            continue;
+
+        verHeader = removeBeginEndSpacesTabs(PATH.substr(2)) + "/hyprland/src/version.h";
+        break;
+    }
+
+    if (verHeader.empty())
+        return HEADERS_CORRUPTED;
+
+    // read header
+    std::ifstream ifs(verHeader);
+    if (!ifs.good())
+        return HEADERS_CORRUPTED;
+
+    std::string verHeaderContent((std::istreambuf_iterator<char>(ifs)), (std::istreambuf_iterator<char>()));
+    ifs.close();
+
+    const auto HASHPOS = verHeaderContent.find("#define GIT_COMMIT_HASH");
+
+    if (HASHPOS == std::string::npos || HASHPOS + 23 >= verHeaderContent.length())
+        return HEADERS_CORRUPTED;
+
+    std::string hash = verHeaderContent.substr(HASHPOS + 23);
+    hash             = hash.substr(0, hash.find_first_of('\n'));
+    hash             = hash.substr(hash.find_first_of('"') + 1);
+    hash             = hash.substr(0, hash.find_first_of('"'));
+
+    if (hash != HLVER.hash)
+        return HEADERS_MISMATCHED;
+
+    return HEADERS_OK;
+}
+
+bool CPluginManager::updateHeaders(bool force) {
+
+    DataState::ensureStateStoreExists();
+
+    const auto HLVER = getHyprlandVersion();
+
+    if (!std::filesystem::exists("/tmp/hyprpm")) {
+        std::filesystem::create_directory("/tmp/hyprpm");
+        std::filesystem::permissions("/tmp/hyprpm", std::filesystem::perms::all, std::filesystem::perm_options::replace);
+    }
+
+    if (!force && headersValid() == HEADERS_OK) {
+        std::cout << "\n" << std::string{Colors::GREEN} + "✔" + Colors::RESET + " Headers up to date.\n";
+        return true;
+    }
+
+    CProgressBar progress;
+    progress.m_iMaxSteps        = 5;
+    progress.m_iSteps           = 0;
+    progress.m_szCurrentMessage = "Cloning the hyprland repository";
+    progress.print();
+
+    if (std::filesystem::exists("/tmp/hyprpm/hyprland")) {
+        progress.printMessageAbove(std::string{Colors::YELLOW} + "!" + Colors::RESET + " old hyprland source files found in temp directory, removing.");
+        std::filesystem::remove_all("/tmp/hyprpm/hyprland");
+    }
+
+    progress.printMessageAbove(std::string{Colors::YELLOW} + "!" + Colors::RESET + " Cloning https://github.com/hyprwm/hyprland, this might take a moment.");
+
+    std::string ret = execAndGet("cd /tmp/hyprpm && git clone --recursive https://github.com/hyprwm/hyprland hyprland --shallow-since='" + HLVER.date + "'");
+
+    if (!std::filesystem::exists("/tmp/hyprpm/hyprland")) {
+        std::cerr << "\n" << Colors::RED << "✖" << Colors::RESET << " Could not clone the hyprland repository. shell returned:\n" << ret << "\n";
+        return false;
+    }
+
+    progress.printMessageAbove(std::string{Colors::GREEN} + "✔" + Colors::RESET + " cloned");
+    progress.m_iSteps           = 2;
+    progress.m_szCurrentMessage = "Checking out sources";
+    progress.print();
+
+    ret = execAndGet("cd /tmp/hyprpm/hyprland && git checkout " + HLVER.branch +
+                     " 2>&1 && git rm subprojects/tracy && git submodule update --init 2>&1 && git reset --hard --recurse-submodules " + HLVER.hash);
+
+    if (m_bVerbose)
+        progress.printMessageAbove(std::string{Colors::BLUE} + "[v] " + Colors::RESET + "git returned: " + ret);
+
+    progress.printMessageAbove(std::string{Colors::GREEN} + "✔" + Colors::RESET + " checked out to running ver");
+    progress.m_iSteps           = 3;
+    progress.m_szCurrentMessage = "Building Hyprland";
+    progress.print();
+
+    progress.printMessageAbove(std::string{Colors::YELLOW} + "!" + Colors::RESET + " configuring Hyprland");
+
+    if (m_bVerbose)
+        progress.printMessageAbove(std::string{Colors::BLUE} + "[v] " + Colors::RESET + "setting PREFIX for cmake to " + DataState::getHeadersPath());
+
+    ret = execAndGet(
+        std::format("cd /tmp/hyprpm/hyprland && cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:STRING=\"{}\" -S . -B ./build -G Ninja",
+                    DataState::getHeadersPath()));
+    if (m_bVerbose)
+        progress.printMessageAbove(std::string{Colors::BLUE} + "[v] " + Colors::RESET + "cmake returned: " + ret);
+
+    // le hack. Wlroots has to generate its build/include
+    ret = execAndGet("cd /tmp/hyprpm/hyprland/subprojects/wlroots-hyprland && meson setup -Drenderers=gles2 -Dexamples=false build");
+    if (m_bVerbose)
+        progress.printMessageAbove(std::string{Colors::BLUE} + "[v] " + Colors::RESET + "meson returned: " + ret);
+
+    progress.printMessageAbove(std::string{Colors::GREEN} + "✔" + Colors::RESET + " configured Hyprland");
+    progress.m_iSteps           = 4;
+    progress.m_szCurrentMessage = "Installing sources";
+    progress.print();
+
+    std::string cmd = std::format("sed -i -e \"s#PREFIX = /usr/local#PREFIX = {}#\" /tmp/hyprpm/hyprland/Makefile && cd /tmp/hyprpm/hyprland && make installheaders",
+                                  DataState::getHeadersPath());
+    if (m_bVerbose)
+        progress.printMessageAbove(std::string{Colors::BLUE} + "[v] " + Colors::RESET + "installation will run: " + cmd);
+
+    ret = execAndGet(cmd);
+
+    if (m_bVerbose)
+        std::cout << Colors::BLUE << "[v] " << Colors::RESET << "installer returned: " << ret << "\n";
+
+    // remove build files
+    std::filesystem::remove_all("/tmp/hyprpm/hyprland");
+
+    auto HEADERSVALID = headersValid();
+    if (HEADERSVALID == HEADERS_OK) {
+        progress.printMessageAbove(std::string{Colors::GREEN} + "✔" + Colors::RESET + " installed headers");
+        progress.m_iSteps           = 5;
+        progress.m_szCurrentMessage = "Done!";
+        progress.print();
+
+        std::cout << "\n";
+    } else {
+        progress.printMessageAbove(std::string{Colors::RED} + "✖" + Colors::RESET + " failed to install headers with error code " + std::to_string((int)HEADERSVALID));
+        progress.m_iSteps           = 5;
+        progress.m_szCurrentMessage = "Failed";
+        progress.print();
+
+        std::cout << "\n";
+
+        std::cerr << "\n" << headerError(HEADERSVALID);
+
+        return false;
+    }
+
+    return true;
+}
+
+bool CPluginManager::updatePlugins(bool forceUpdateAll) {
+    if (headersValid() != HEADERS_OK) {
+        std::cout << "\n" << std::string{Colors::RED} + "✖" + Colors::RESET + " headers are not up-to-date, please run hyprpm update.\n";
+        return false;
+    }
+
+    const auto REPOS = DataState::getAllRepositories();
+
+    if (REPOS.size() < 1) {
+        std::cout << "\n" << std::string{Colors::RED} + "✖" + Colors::RESET + " No repos to update.\n";
+        return true;
+    }
+
+    const auto   HLVER = getHyprlandVersion();
+
+    CProgressBar progress;
+    progress.m_iMaxSteps        = REPOS.size() * 2 + 2;
+    progress.m_iSteps           = 0;
+    progress.m_szCurrentMessage = "Updating repositories";
+    progress.print();
+
+    for (auto& repo : REPOS) {
+        bool update = forceUpdateAll;
+
+        progress.m_iSteps++;
+        progress.m_szCurrentMessage = "Updating " + repo.name;
+        progress.print();
+
+        progress.printMessageAbove(std::string{Colors::RESET} + " → checking for updates for " + repo.name);
+
+        if (std::filesystem::exists("/tmp/hyprpm/update")) {
+            progress.printMessageAbove(std::string{Colors::YELLOW} + "!" + Colors::RESET + " old update build files found in temp directory, removing.");
+            std::filesystem::remove_all("/tmp/hyprpm/update");
+        }
+
+        progress.printMessageAbove(std::string{Colors::RESET} + " → Cloning " + repo.url);
+
+        std::string ret = execAndGet("cd /tmp/hyprpm && git clone --recursive " + repo.url + " update");
+
+        if (!std::filesystem::exists("/tmp/hyprpm/update")) {
+            std::cout << "\n" << std::string{Colors::RED} + "✖" + Colors::RESET + " could not clone repo: shell returned:\n" + ret;
+            return false;
+        }
+
+        if (!repo.rev.empty()) {
+            progress.printMessageAbove(std::string{Colors::RESET} + " → Plugin has revision set, resetting: " + repo.rev);
+
+            std::string ret = execAndGet("git -C /tmp/hyprpm/update reset --hard --recurse-submodules " + repo.rev);
+            if (ret.compare(0, 6, "fatal:") == 0) {
+                std::cout << "\n" << std::string{Colors::RED} + "✖" + Colors::RESET + " could not check out revision " + repo.rev + ": shell returned:\n" + ret;
+                return false;
+            }
+        }
+
+        if (!update) {
+            // check if git has updates
+            std::string hash = execAndGet("cd /tmp/hyprpm/update && git rev-parse HEAD");
+            if (!hash.empty())
+                hash.pop_back();
+
+            update = update || hash != repo.hash;
+        }
+
+        if (!update) {
+            std::filesystem::remove_all("/tmp/hyprpm/update");
+            progress.printMessageAbove(std::string{Colors::GREEN} + "✔" + Colors::RESET + " repository " + repo.name + " is up-to-date.");
+            progress.m_iSteps++;
+            progress.print();
+            continue;
+        }
+
+        // we need to update
+
+        progress.printMessageAbove(std::string{Colors::GREEN} + "✔" + Colors::RESET + " repository " + repo.name + " has updates.");
+        progress.printMessageAbove(std::string{Colors::RESET} + " → Building " + repo.name);
+        progress.m_iSteps++;
+        progress.print();
+
+        std::unique_ptr<CManifest> pManifest;
+
+        if (std::filesystem::exists("/tmp/hyprpm/update/hyprpm.toml")) {
+            progress.printMessageAbove(std::string{Colors::GREEN} + "✔" + Colors::RESET + " found hyprpm manifest");
+            pManifest = std::make_unique<CManifest>(MANIFEST_HYPRPM, "/tmp/hyprpm/update/hyprpm.toml");
+        } else if (std::filesystem::exists("/tmp/hyprpm/update/hyprload.toml")) {
+            progress.printMessageAbove(std::string{Colors::GREEN} + "✔" + Colors::RESET + " found hyprload manifest");
+            pManifest = std::make_unique<CManifest>(MANIFEST_HYPRLOAD, "/tmp/hyprpm/update/hyprload.toml");
+        }
+
+        if (!pManifest) {
+            std::cerr << "\n" << Colors::RED << "✖" << Colors::RESET << " The provided plugin repository does not have a valid manifest\n";
+            continue;
+        }
+
+        if (!pManifest->m_bGood) {
+            std::cerr << "\n" << Colors::RED << "✖" << Colors::RESET << " The provided plugin repository has a corrupted manifest\n";
+            continue;
+        }
+
+        if (repo.rev.empty() && !pManifest->m_sRepository.commitPins.empty()) {
+            // check commit pins unless a revision is specified
+
+            progress.printMessageAbove(std::string{Colors::RESET} + " → Manifest has " + std::to_string(pManifest->m_sRepository.commitPins.size()) + " pins, checking");
+
+            for (auto& [hl, plugin] : pManifest->m_sRepository.commitPins) {
+                if (hl != HLVER.hash)
+                    continue;
+
+                progress.printMessageAbove(std::string{Colors::GREEN} + "✔" + Colors::RESET + " commit pin " + plugin + " matched hl, resetting");
+
+                execAndGet("cd /tmp/hyprpm/update/ && git reset --hard --recurse-submodules " + plugin);
+            }
+        }
+
+        for (auto& p : pManifest->m_vPlugins) {
+            std::string out;
+
+            if (p.since > HLVER.commits && HLVER.commits >= 1 /* for --depth 1 clones, we can't check this. */) {
+                progress.printMessageAbove(std::string{Colors::RED} + "✖" + Colors::RESET + " Not building " + p.name + ": your Hyprland version is too old.\n");
+                p.failed = true;
+                continue;
+            }
+
+            progress.printMessageAbove(std::string{Colors::RESET} + " → Building " + p.name);
+
+            for (auto& bs : p.buildSteps) {
+                std::string cmd = std::format("cd /tmp/hyprpm/update && PKG_CONFIG_PATH=\"{}/share/pkgconfig\" {}", DataState::getHeadersPath(), bs);
+                out += " -> " + cmd + "\n" + execAndGet(cmd) + "\n";
+            }
+
+            if (m_bVerbose)
+                std::cout << Colors::BLUE << "[v] " << Colors::RESET << "shell returned: " << out << "\n";
+
+            if (!std::filesystem::exists("/tmp/hyprpm/update/" + p.output)) {
+                std::cerr << "\n"
+                          << Colors::RED << "✖" << Colors::RESET << " Plugin " << p.name << " failed to build.\n"
+                          << "  This likely means that the plugin is either outdated, not yet available for your version, or broken.\n  If you are on -git, update first.\n  Try "
+                             "re-running with -v to see more verbose "
+                             "output.\n";
+                p.failed = true;
+                continue;
+            }
+
+            progress.printMessageAbove(std::string{Colors::GREEN} + "✔" + Colors::RESET + " built " + p.name + " into " + p.output);
+        }
+
+        // add repo toml to DataState
+        SPluginRepository newrepo = repo;
+        newrepo.plugins.clear();
+        execAndGet(
+            "cd /tmp/hyprpm/update/ && git pull --recurse-submodules && git reset --hard --recurse-submodules"); // repo hash in the state.toml has to match head and not any pin
+        std::string repohash = execAndGet("cd /tmp/hyprpm/update && git rev-parse HEAD");
+        if (repohash.length() > 0)
+            repohash.pop_back();
+        newrepo.hash = repohash;
+        for (auto& p : pManifest->m_vPlugins) {
+            const auto OLDPLUGINIT = std::find_if(repo.plugins.begin(), repo.plugins.end(), [&](const auto& other) { return other.name == p.name; });
+            newrepo.plugins.push_back(SPlugin{p.name, "/tmp/hyprpm/update/" + p.output, OLDPLUGINIT != repo.plugins.end() ? OLDPLUGINIT->enabled : false});
+        }
+        DataState::removePluginRepo(newrepo.name);
+        DataState::addNewPluginRepo(newrepo);
+
+        std::filesystem::remove_all("/tmp/hyprpm/update");
+
+        progress.printMessageAbove(std::string{Colors::GREEN} + "✔" + Colors::RESET + " updated " + repo.name);
+    }
+
+    progress.m_iSteps++;
+    progress.m_szCurrentMessage = "Updating global state...";
+    progress.print();
+
+    auto GLOBALSTATE                = DataState::getGlobalState();
+    GLOBALSTATE.headersHashCompiled = HLVER.hash;
+    DataState::updateGlobalState(GLOBALSTATE);
+
+    progress.m_iSteps++;
+    progress.m_szCurrentMessage = "Done!";
+    progress.print();
+
+    std::cout << "\n";
+
+    return true;
+}
+
+bool CPluginManager::enablePlugin(const std::string& name) {
+    bool ret = DataState::setPluginEnabled(name, true);
+    if (ret)
+        std::cout << Colors::GREEN << "✔" << Colors::RESET << " Enabled " << name << "\n";
+    return ret;
+}
+
+bool CPluginManager::disablePlugin(const std::string& name) {
+    bool ret = DataState::setPluginEnabled(name, false);
+    if (ret)
+        std::cout << Colors::GREEN << "✔" << Colors::RESET << " Disabled " << name << "\n";
+    return ret;
+}
+
+ePluginLoadStateReturn CPluginManager::ensurePluginsLoadState() {
+    if (headersValid() != HEADERS_OK) {
+        std::cerr << "\n" << std::string{Colors::RED} + "✖" + Colors::RESET + " headers are not up-to-date, please run hyprpm update.\n";
+        return LOADSTATE_HEADERS_OUTDATED;
+    }
+
+    const auto HOME = getenv("HOME");
+    const auto HIS  = getenv("HYPRLAND_INSTANCE_SIGNATURE");
+    if (!HOME || !HIS) {
+        std::cerr << "PluginManager: no $HOME or HIS\n";
+        return LOADSTATE_FAIL;
+    }
+    const auto               HYPRPMPATH = DataState::getDataStatePath() + "/";
+
+    auto                     pluginLines = execAndGet("hyprctl plugins list | grep Plugin");
+
+    std::vector<std::string> loadedPlugins;
+
+    std::cout << Colors::GREEN << "✔" << Colors::RESET << " Ensuring plugin load state\n";
+
+    // iterate line by line
+    while (!pluginLines.empty()) {
+        auto plLine = pluginLines.substr(0, pluginLines.find("\n"));
+
+        if (pluginLines.find("\n") != std::string::npos)
+            pluginLines = pluginLines.substr(pluginLines.find("\n") + 1);
+        else
+            pluginLines = "";
+
+        if (plLine.back() != ':')
+            continue;
+
+        plLine = plLine.substr(7);
+        plLine = plLine.substr(0, plLine.find(" by "));
+
+        loadedPlugins.push_back(plLine);
+    }
+
+    // get state
+    const auto REPOS = DataState::getAllRepositories();
+
+    auto       enabled = [REPOS](const std::string& plugin) -> bool {
+        for (auto& r : REPOS) {
+            for (auto& p : r.plugins) {
+                if (p.name == plugin && p.enabled)
+                    return true;
+            }
+        }
+
+        return false;
+    };
+
+    auto repoForName = [REPOS](const std::string& name) -> std::string {
+        for (auto& r : REPOS) {
+            for (auto& p : r.plugins) {
+                if (p.name == name)
+                    return r.name;
+            }
+        }
+
+        return "";
+    };
+
+    // unload disabled plugins
+    for (auto& p : loadedPlugins) {
+        if (!enabled(p)) {
+            // unload
+            loadUnloadPlugin(HYPRPMPATH + repoForName(p) + "/" + p + ".so", false);
+            std::cout << Colors::GREEN << "✔" << Colors::RESET << " Unloaded " << p << "\n";
+        }
+    }
+
+    // load enabled plugins
+    for (auto& r : REPOS) {
+        for (auto& p : r.plugins) {
+            if (!p.enabled)
+                continue;
+
+            if (std::find_if(loadedPlugins.begin(), loadedPlugins.end(), [&](const auto& other) { return other == p.name; }) != loadedPlugins.end())
+                continue;
+
+            loadUnloadPlugin(HYPRPMPATH + repoForName(p.name) + "/" + p.filename, true);
+            std::cout << Colors::GREEN << "✔" << Colors::RESET << " Loaded " << p.name << "\n";
+        }
+    }
+
+    std::cout << Colors::GREEN << "✔" << Colors::RESET << " Plugin load state ensured\n";
+
+    return LOADSTATE_OK;
+}
+
+bool CPluginManager::loadUnloadPlugin(const std::string& path, bool load) {
+    if (load)
+        execAndGet("hyprctl plugin load " + path);
+    else
+        execAndGet("hyprctl plugin unload " + path);
+
+    return true;
+}
+
+void CPluginManager::listAllPlugins() {
+    const auto REPOS = DataState::getAllRepositories();
+
+    for (auto& r : REPOS) {
+        std::cout << std::string{Colors::RESET} + " → Repository " + r.name + ":\n";
+
+        for (auto& p : r.plugins) {
+
+            std::cout << std::string{Colors::RESET} + "  │ Plugin " + p.name;
+
+            if (!p.failed)
+                std::cout << "\n  └─ enabled: " << (p.enabled ? Colors::GREEN : Colors::RED) << (p.enabled ? "true" : "false") << Colors::RESET << "\n";
+            else
+                std::cout << "\n  └─ enabled: " << Colors::RED << "Plugin failed to build" << Colors::RESET << "\n";
+        }
+    }
+}
+
+void CPluginManager::notify(const eNotifyIcons icon, uint32_t color, int durationMs, const std::string& message) {
+    execAndGet("hyprctl notify " + std::to_string((int)icon) + " " + std::to_string(durationMs) + " " + std::to_string(color) + " " + message);
+}
+
+std::string CPluginManager::headerError(const eHeadersErrors err) {
+    switch (err) {
+        case HEADERS_CORRUPTED: return std::string{Colors::RED} + "✖" + Colors::RESET + " Headers corrupted. Please run hyprpm update to fix those.\n";
+        case HEADERS_MISMATCHED: return std::string{Colors::RED} + "✖" + Colors::RESET + " Headers version mismatch. Please run hyprpm update to fix those.\n";
+        case HEADERS_NOT_HYPRLAND: return std::string{Colors::RED} + "✖" + Colors::RESET + " It doesn't seem you are running on hyprland.\n";
+        case HEADERS_MISSING: return std::string{Colors::RED} + "✖" + Colors::RESET + " Headers missing. Please run hyprpm update to fix those.\n";
+        case HEADERS_DUPLICATED: {
+            return std::string{Colors::RED} + "✖" + Colors::RESET + " Headers duplicated!!! This is a very bad sign.\n" +
+                " This could be due to e.g. installing hyprland manually while a system package of hyprland is also installed.\n" +
+                " If the above doesn't apply, check your /usr/include and /usr/local/include directories\n and remove all the hyprland headers.\n";
+        }
+        default: break;
+    }
+
+    return std::string{Colors::RED} + "✖" + Colors::RESET + " Unknown header error. Please run hyprpm update to fix those.\n";
+}

hyprpm/src/core/PluginManager.hpp

@@ -0,0 +1,65 @@
+#pragma once
+
+#include <memory>
+#include <string>
+
+enum eHeadersErrors {
+    HEADERS_OK = 0,
+    HEADERS_NOT_HYPRLAND,
+    HEADERS_MISSING,
+    HEADERS_CORRUPTED,
+    HEADERS_MISMATCHED,
+    HEADERS_DUPLICATED
+};
+
+enum eNotifyIcons {
+    ICON_WARNING = 0,
+    ICON_INFO,
+    ICON_HINT,
+    ICON_ERROR,
+    ICON_CONFUSED,
+    ICON_OK,
+    ICON_NONE
+};
+
+enum ePluginLoadStateReturn {
+    LOADSTATE_OK = 0,
+    LOADSTATE_FAIL,
+    LOADSTATE_PARTIAL_FAIL,
+    LOADSTATE_HEADERS_OUTDATED
+};
+
+struct SHyprlandVersion {
+    std::string branch;
+    std::string hash;
+    std::string date;
+    int         commits = 0;
+};
+
+class CPluginManager {
+  public:
+    bool                   addNewPluginRepo(const std::string& url, const std::string& rev);
+    bool                   removePluginRepo(const std::string& urlOrName);
+
+    eHeadersErrors         headersValid();
+    bool                   updateHeaders(bool force = false);
+    bool                   updatePlugins(bool forceUpdateAll);
+
+    void                   listAllPlugins();
+
+    bool                   enablePlugin(const std::string& name);
+    bool                   disablePlugin(const std::string& name);
+    ePluginLoadStateReturn ensurePluginsLoadState();
+
+    bool                   loadUnloadPlugin(const std::string& path, bool load);
+    SHyprlandVersion       getHyprlandVersion();
+
+    void                   notify(const eNotifyIcons icon, uint32_t color, int durationMs, const std::string& message);
+
+    bool                   m_bVerbose = false;
+
+  private:
+    std::string headerError(const eHeadersErrors err);
+};
+
+inline std::unique_ptr<CPluginManager> g_pPluginManager;

hyprpm/src/helpers/Colors.hpp

@@ -0,0 +1,11 @@
+#pragma once
+
+namespace Colors {
+    constexpr const char* RED     = "\x1b[31m";
+    constexpr const char* GREEN   = "\x1b[32m";
+    constexpr const char* YELLOW  = "\x1b[33m";
+    constexpr const char* BLUE    = "\x1b[34m";
+    constexpr const char* MAGENTA = "\x1b[35m";
+    constexpr const char* CYAN    = "\x1b[36m";
+    constexpr const char* RESET   = "\x1b[0m";
+};

hyprpm/src/main.cpp

@@ -0,0 +1,164 @@
+#include "progress/CProgressBar.hpp"
+#include "helpers/Colors.hpp"
+#include "core/PluginManager.hpp"
+#include "core/DataState.hpp"
+
+#include <iostream>
+#include <vector>
+#include <string>
+#include <chrono>
+#include <thread>
+
+const std::string HELP = R"#(┏ hyprpm, a Hyprland Plugin Manager
+┃
+┣ add [url] [git rev]    → Install a new plugin repository from git. Git revision
+┃                          is optional, when set, commit locks are ignored.
+┣ remove [url/name]      → Remove an installed plugin repository
+┣ enable [name]          → Enable a plugin
+┣ disable [name]         → Disable a plugin
+┣ update                 → Check and update all plugins if needed
+┣ reload                 → Reload hyprpm state. Ensure all enabled plugins are loaded.
+┣ list                   → List all installed plugins
+┃
+┣ Flags:
+┃
+┣ --notify       | -n    → Send a hyprland notification for important events (e.g. load fail)
+┣ --help         | -h    → Show this menu
+┣ --verbose      | -v    → Enable too much logging
+┣ --force        | -f    → Force an operation ignoring checks (e.g. update -f)
+┗
+)#";
+
+int               main(int argc, char** argv, char** envp) {
+    std::vector<std::string> ARGS{argc};
+    for (int i = 0; i < argc; ++i) {
+        ARGS[i] = std::string{argv[i]};
+    }
+
+    if (ARGS.size() < 2) {
+        std::cout << HELP;
+        return 1;
+    }
+
+    std::vector<std::string> command;
+    bool                     notify = false, verbose = false, force = false;
+
+    for (int i = 1; i < argc; ++i) {
+        if (ARGS[i].starts_with("-")) {
+            if (ARGS[i] == "--help" || ARGS[i] == "-h") {
+                std::cout << HELP;
+                return 0;
+            } else if (ARGS[i] == "--notify" || ARGS[i] == "-n") {
+                notify = true;
+            } else if (ARGS[i] == "--verbose" || ARGS[i] == "-v") {
+                verbose = true;
+            } else if (ARGS[i] == "--force" || ARGS[i] == "-f") {
+                force = true;
+                std::cout << Colors::RED << "!" << Colors::RESET << " Using --force, I hope you know what you are doing.\n";
+            } else {
+                std::cerr << "Unrecognized option " << ARGS[i] << "\n";
+                return 1;
+            }
+        } else {
+            command.push_back(ARGS[i]);
+        }
+    }
+
+    if (command.empty()) {
+        std::cout << HELP;
+        return 0;
+    }
+
+    g_pPluginManager             = std::make_unique<CPluginManager>();
+    g_pPluginManager->m_bVerbose = verbose;
+
+    if (command[0] == "add") {
+        if (command.size() < 2) {
+            std::cerr << Colors::RED << "✖" << Colors::RESET << " Not enough args for add.\n";
+            return 1;
+        }
+
+        std::string rev = "";
+        if (command.size() >= 3) {
+            rev = command[2];
+        }
+
+        return g_pPluginManager->addNewPluginRepo(command[1], rev) ? 0 : 1;
+    } else if (command[0] == "remove") {
+        if (ARGS.size() < 2) {
+            std::cerr << Colors::RED << "✖" << Colors::RESET << " Not enough args for remove.\n";
+            return 1;
+        }
+
+        return g_pPluginManager->removePluginRepo(command[1]) ? 0 : 1;
+    } else if (command[0] == "update") {
+        bool headersValid = g_pPluginManager->headersValid() == HEADERS_OK;
+        bool headers      = g_pPluginManager->updateHeaders(force);
+        if (headers) {
+            const auto HLVER            = g_pPluginManager->getHyprlandVersion();
+            auto       GLOBALSTATE      = DataState::getGlobalState();
+            const auto COMPILEDOUTDATED = HLVER.hash != GLOBALSTATE.headersHashCompiled;
+
+            bool       ret1 = g_pPluginManager->updatePlugins(!headersValid || force || COMPILEDOUTDATED);
+
+            if (!ret1)
+                return 1;
+
+            auto ret2 = g_pPluginManager->ensurePluginsLoadState();
+
+            if (ret2 != LOADSTATE_OK)
+                return 1;
+        } else if (notify)
+            g_pPluginManager->notify(ICON_ERROR, 0, 10000, "[hyprpm] Couldn't update headers");
+    } else if (command[0] == "enable") {
+        if (ARGS.size() < 2) {
+            std::cerr << Colors::RED << "✖" << Colors::RESET << " Not enough args for enable.\n";
+            return 1;
+        }
+
+        if (!g_pPluginManager->enablePlugin(command[1])) {
+            std::cerr << Colors::RED << "✖" << Colors::RESET << " Couldn't enable plugin (missing?)\n";
+            return 1;
+        }
+
+        auto ret = g_pPluginManager->ensurePluginsLoadState();
+        if (ret != LOADSTATE_OK)
+            return 1;
+    } else if (command[0] == "disable") {
+        if (command.size() < 2) {
+            std::cerr << Colors::RED << "✖" << Colors::RESET << " Not enough args for disable.\n";
+            return 1;
+        }
+
+        if (!g_pPluginManager->disablePlugin(command[1])) {
+            std::cerr << Colors::RED << "✖" << Colors::RESET << " Couldn't disable plugin (missing?)\n";
+            return 1;
+        }
+
+        auto ret = g_pPluginManager->ensurePluginsLoadState();
+        if (ret != LOADSTATE_OK)
+            return 1;
+    } else if (command[0] == "reload") {
+        auto ret = g_pPluginManager->ensurePluginsLoadState();
+
+        if (ret != LOADSTATE_OK && notify) {
+            switch (ret) {
+                case LOADSTATE_FAIL:
+                case LOADSTATE_PARTIAL_FAIL: g_pPluginManager->notify(ICON_ERROR, 0, 10000, "[hyprpm] Failed to load plugins"); break;
+                case LOADSTATE_HEADERS_OUTDATED:
+                    g_pPluginManager->notify(ICON_ERROR, 0, 10000, "[hyprpm] Failed to load plugins: Outdated headers. Please run hyprpm update manually.");
+                    break;
+                default: break;
+            }
+        } else if (notify) {
+            g_pPluginManager->notify(ICON_OK, 0, 4000, "[hyprpm] Loaded plugins");
+        }
+    } else if (command[0] == "list") {
+        g_pPluginManager->listAllPlugins();
+    } else {
+        std::cout << HELP;
+        return 1;
+    }
+
+    return 0;
+}

hyprpm/src/meson.build

@@ -0,0 +1,14 @@
+globber = run_command('sh', '-c', 'find . -name "*.cpp" | sort', check: true)
+src = globber.stdout().strip().split('\n')
+
+executable('hyprpm', src,
+  dependencies: [
+    dependency('threads'),
+    dependency('tomlplusplus')
+  ],
+  install : true
+)
+
+install_data('../hyprpm.bash', install_dir: join_paths(get_option('datadir'), 'bash-completions'), install_tag: 'runtime', rename: 'hyprpm')
+install_data('../hyprpm.fish', install_dir: join_paths(get_option('datadir'), 'fish/vendor_completions.d'), install_tag: 'runtime')
+install_data('../hyprpm.zsh', install_dir: join_paths(get_option('datadir'), 'zsh/site-functions'), install_tag: 'runtime', rename: '_hyprpm')

hyprpm/src/progress/CProgressBar.cpp

@@ -0,0 +1,80 @@
+#include "CProgressBar.hpp"
+
+#include <iostream>
+#include <algorithm>
+#include <cmath>
+#include <format>
+
+#include <sys/ioctl.h>
+#include <stdio.h>
+#include <unistd.h>
+
+#include "../helpers/Colors.hpp"
+
+void CProgressBar::printMessageAbove(const std::string& msg) {
+    struct winsize w;
+    ioctl(STDOUT_FILENO, TIOCGWINSZ, &w);
+
+    std::string spaces;
+    for (size_t i = 0; i < w.ws_col; ++i) {
+        spaces += ' ';
+    }
+
+    std::cout << "\r" << spaces << "\r" << msg << "\n";
+    print();
+}
+
+void CProgressBar::print() {
+    struct winsize w;
+    ioctl(STDOUT_FILENO, TIOCGWINSZ, &w);
+
+    if (m_bFirstPrint)
+        std::cout << "\n";
+    m_bFirstPrint = false;
+
+    std::string spaces;
+    for (size_t i = 0; i < w.ws_col; ++i) {
+        spaces += ' ';
+    }
+
+    std::cout << "\r" << spaces << "\r";
+
+    std::string message = "";
+
+    float       percentDone = 0;
+    if (m_fPercentage >= 0)
+        percentDone = m_fPercentage;
+    else
+        percentDone = (float)m_iSteps / (float)m_iMaxSteps;
+
+    const auto BARWIDTH = std::clamp(w.ws_col - static_cast<unsigned long>(m_szCurrentMessage.length()) - 2, 0UL, 50UL);
+
+    // draw bar
+    message += std::string{" "} + Colors::GREEN;
+    size_t i = 0;
+    for (; i < std::floor(percentDone * BARWIDTH); ++i) {
+        message += "━";
+    }
+
+    if (i < BARWIDTH) {
+        i++;
+
+        message += std::string{"╍"} + Colors::RESET;
+
+        for (; i < BARWIDTH; ++i) {
+            message += "━";
+        }
+    } else
+        message += Colors::RESET;
+
+    // draw progress
+    if (m_fPercentage >= 0)
+        message += "  " + std::format("{}%", static_cast<int>(percentDone * 100.0)) + " ";
+    else
+        message += "  " + std::format("{} / {}", m_iSteps, m_iMaxSteps) + " ";
+
+    // draw message
+    std::cout << message + " " + m_szCurrentMessage;
+
+    std::fflush(stdout);
+}

hyprpm/src/progress/CProgressBar.hpp

@@ -0,0 +1,17 @@
+#pragma once
+
+#include <string>
+
+class CProgressBar {
+  public:
+    void        print();
+    void        printMessageAbove(const std::string& msg);
+
+    std::string m_szCurrentMessage = "";
+    size_t      m_iSteps           = 0;
+    size_t      m_iMaxSteps        = 0;
+    float       m_fPercentage      = -1; // if != -1, use percentage
+
+  private:
+    bool m_bFirstPrint = true;
+};

meson.build

@@ -33,7 +33,7 @@ if cpp_compiler.check_header('execinfo.h')
   add_project_arguments('-DHAS_EXECINFO', language: 'cpp')
 endif
 
-wlroots = subproject('wlroots', default_options: ['examples=false', 'renderers=gles2'])
+wlroots = subproject('wlroots-hyprland', default_options: ['examples=false', 'renderers=gles2'])
 have_xwlr = wlroots.get_variable('features').get('xwayland')
 xcb_dep = dependency('xcb', required: get_option('xwayland'))
 
@@ -69,17 +69,18 @@ if get_option('buildtype') == 'debug'
   add_project_arguments('-DHYPRLAND_DEBUG', language: 'cpp')
 endif
 
+version_h = run_command('sh', '-c', 'scripts/generateVersion.sh')
+
 globber = run_command('find', 'src', '-name', '*.h*', check: true)
 headers = globber.stdout().strip().split('\n')
 foreach file : headers
   install_headers(file, subdir: 'hyprland', preserve_path: true)
 endforeach
 
-version_h = run_command('sh', '-c', 'scripts/generateVersion.sh')
-
 subdir('protocols')
 subdir('src')
 subdir('hyprctl')
+subdir('hyprpm/src')
 subdir('assets')
 subdir('example')
 subdir('docs')

nix/default.nix

@@ -2,15 +2,20 @@
   lib,
   stdenv,
   pkg-config,
+  pkgconf,
   makeWrapper,
   meson,
   ninja,
   binutils,
   cairo,
   git,
+  hyprcursor,
   hyprland-protocols,
+  hyprlang,
   jq,
+  libGL,
   libdrm,
+  libexecinfo,
   libinput,
   libxcb,
   libxkbcommon,
@@ -18,29 +23,34 @@
   pango,
   pciutils,
   systemd,
+  tomlplusplus,
   udis86,
   wayland,
   wayland-protocols,
   wayland-scanner,
-  wlroots,
+  wlroots-hyprland,
   xcbutilwm,
   xwayland,
   debug ? false,
-  enableNvidiaPatches ? false,
   enableXWayland ? true,
   legacyRenderer ? false,
   withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd,
   wrapRuntimeDeps ? true,
   version ? "git",
   commit,
+  date,
   # deprecated flags
+  enableNvidiaPatches ? false,
   nvidiaPatches ? false,
   hidpiXWayland ? false,
 }:
-assert lib.assertMsg (!nvidiaPatches) "The option `nvidiaPatches` has been renamed `enableNvidiaPatches`";
-assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been removed. Please refer https://wiki.hyprland.org/Configuring/XWayland";
+assert lib.assertMsg (!nvidiaPatches) "The option `nvidiaPatches` has been removed.";
+assert lib.assertMsg (!enableNvidiaPatches) "The option `enableNvidiaPatches` has been removed.";
+assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been removed. Please refer https://wiki.hyprland.org/Configuring/XWayland"; let
+  wlr = wlroots-hyprland.override {inherit enableXWayland;};
+in
   stdenv.mkDerivation {
-    pname = "hyprland${lib.optionalString enableNvidiaPatches "-nvidia"}${lib.optionalString debug "-debug"}";
+    pname = "hyprland${lib.optionalString debug "-debug"}";
     inherit version;
 
     src = lib.cleanSourceWith {
@@ -51,52 +61,6 @@ assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been remov
       src = lib.cleanSource ../.;
     };
 
-    nativeBuildInputs = [
-      jq
-      meson
-      ninja
-      pkg-config
-      makeWrapper
-      wayland-scanner
-    ];
-
-    outputs = [
-      "out"
-      "man"
-      "dev"
-    ];
-
-    buildInputs =
-      [
-        git
-        cairo
-        hyprland-protocols
-        libdrm
-        libinput
-        libxkbcommon
-        mesa
-        pango
-        udis86
-        wayland
-        wayland-protocols
-        pciutils
-        (wlroots.override {inherit enableNvidiaPatches;})
-      ]
-      ++ lib.optionals enableXWayland [libxcb xcbutilwm xwayland]
-      ++ lib.optionals withSystemd [systemd];
-
-    mesonBuildType =
-      if debug
-      then "debug"
-      else "release";
-
-    mesonFlags = builtins.concatLists [
-      ["-Dauto_features=disabled"]
-      (lib.optional enableXWayland "-Dxwayland=enabled")
-      (lib.optional legacyRenderer "-Dlegacy_renderer=enabled")
-      (lib.optional withSystemd "-Dsystemd=enabled")
-    ];
-
     patches = [
       # make meson use the provided wlroots instead of the git submodule
       ./patches/meson-build.patch
@@ -112,6 +76,7 @@ assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been remov
         --replace "@HASH@" '${commit}' \
         --replace "@BRANCH@" "" \
         --replace "@MESSAGE@" "" \
+        --replace "@DATE@" "${date}" \
         --replace "@TAG@" "" \
         --replace "@DIRTY@" '${
         if commit == ""
@@ -120,21 +85,80 @@ assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been remov
       }'
     '';
 
+    nativeBuildInputs = [
+      jq
+      makeWrapper
+      meson
+      ninja
+      pkg-config
+      wayland-scanner
+    ];
+
+    outputs = [
+      "out"
+      "man"
+      "dev"
+    ];
+
+    buildInputs =
+      wlr.buildInputs
+      ++ [
+        cairo
+        git
+        hyprcursor.dev
+        hyprland-protocols
+        hyprlang
+        libdrm
+        libGL
+        libinput
+        libxkbcommon
+        mesa
+        pango
+        pciutils
+        tomlplusplus
+        udis86
+        wayland
+        wayland-protocols
+        wlr
+      ]
+      ++ lib.optionals stdenv.hostPlatform.isMusl [libexecinfo]
+      ++ lib.optionals enableXWayland [libxcb xcbutilwm xwayland]
+      ++ lib.optionals withSystemd [systemd];
+
+    mesonBuildType =
+      if debug
+      then "debug"
+      else "release";
+
+    mesonAutoFeatures = "disabled";
+
+    mesonFlags = [
+      (lib.mesonEnable "xwayland" enableXWayland)
+      (lib.mesonEnable "legacy_renderer" legacyRenderer)
+      (lib.mesonEnable "systemd" withSystemd)
+    ];
+
     postInstall = ''
-      ln -s ${wlroots}/include/wlr $dev/include/hyprland/wlroots
+      ln -s ${wlr}/include/wlr $dev/include/hyprland/wlroots
+
       ${lib.optionalString wrapRuntimeDeps ''
         wrapProgram $out/bin/Hyprland \
-          --suffix PATH : ${lib.makeBinPath [binutils pciutils]}
+          --suffix PATH : ${lib.makeBinPath [
+          stdenv.cc
+          binutils
+          pciutils
+          pkgconf
+        ]}
       ''}
     '';
 
     passthru.providedSessions = ["hyprland"];
 
     meta = with lib; {
-      homepage = "https://github.com/vaxerski/Hyprland";
+      homepage = "https://github.com/hyprwm/Hyprland";
       description = "A dynamic tiling Wayland compositor that doesn't sacrifice on its looks";
       license = licenses.bsd3;
-      platforms = platforms.linux;
+      platforms = wlr.meta.platforms;
       mainProgram = "Hyprland";
     };
   }

nix/hm-module.nix

@@ -4,174 +4,11 @@ self: {
   pkgs,
   ...
 }: let
-  cfg = config.wayland.windowManager.hyprland;
-  defaultHyprlandPackage = self.packages.${pkgs.stdenv.hostPlatform.system}.default.override {
-    enableXWayland = cfg.xwayland.enable;
-    inherit (cfg) enableNvidiaPatches;
-  };
+  inherit (pkgs.stdenv.hostPlatform) system;
+
+  package = self.packages.${system}.default;
 in {
-  disabledModules = ["services/window-managers/hyprland.nix"];
-
-  meta.maintainers = [lib.maintainers.fufexan];
-
-  options.wayland.windowManager.hyprland = {
-    enable =
-      lib.mkEnableOption null
-      // {
-        description = lib.mdDoc ''
-          Whether to enable Hyprland, the dynamic tiling Wayland compositor
-          that doesn't sacrifice on its looks.
-
-          You can manually launch Hyprland by executing {command}`Hyprland` on
-          a TTY.
-
-          See <https://wiki.hyprland.org> for more information.
-        '';
-      };
-
-    package = lib.mkOption {
-      type = with lib.types; nullOr package;
-      default = defaultHyprlandPackage;
-      defaultText = lib.literalExpression ''
-        hyprland.packages.''${pkgs.stdenv.hostPlatform.system}.default.override {
-          enableXWayland = config.wayland.windowManager.hyprland.xwayland.enable;
-          inherit (config.wayland.windowManager.hyprland) enableNvidiaPatches;
-        }
-      '';
-      description = lib.mdDoc ''
-        Hyprland package to use. Will override the 'xwayland' and
-        'enableNvidiaPatches' options.
-
-        Defaults to the one provided by the flake. Set it to
-        {package}`pkgs.hyprland` to use the one provided by nixpkgs or
-        if you have an overlay.
-
-        Set to null to not add any Hyprland package to your path. This should
-        be done if you want to use the NixOS module to install Hyprland.
-      '';
-    };
-
-    plugins = lib.mkOption {
-      type = with lib.types; listOf (either package path);
-      default = [];
-      description = lib.mdDoc ''
-        List of Hyprland plugins to use. Can either be packages or
-        absolute plugin paths.
-      '';
-    };
-
-    systemdIntegration = lib.mkOption {
-      type = lib.types.bool;
-      default = pkgs.stdenv.isLinux;
-      description = lib.mdDoc ''
-        Whether to enable {file}`hyprland-session.target` on
-        Hyprland startup. This links to {file}`graphical-session.target`.
-        Some important environment variables will be imported to systemd
-        and dbus user environment before reaching the target, including
-        - {env}`DISPLAY`
-        - {env}`HYPRLAND_INSTANCE_SIGNATURE`
-        - {env}`WAYLAND_DISPLAY`
-        - {env}`XDG_CURRENT_DESKTOP`
-      '';
-    };
-
-    disableAutoreload =
-      lib.mkEnableOption null
-      // {
-        description = lib.mdDoc ''
-          Whether to disable automatically reloading Hyprland's configuration when
-          rebuilding the Home Manager profile.
-        '';
-      };
-
-    xwayland.enable = lib.mkEnableOption (lib.mdDoc "XWayland") // {default = true;};
-
-    enableNvidiaPatches = lib.mkEnableOption (lib.mdDoc "patching wlroots for better Nvidia support.");
-
-    extraConfig = lib.mkOption {
-      type = lib.types.nullOr lib.types.lines;
-      default = "";
-      description = lib.mdDoc ''
-        Extra configuration lines to add to {file}`~/.config/hypr/hyprland.conf`.
-      '';
-    };
-
-    recommendedEnvironment =
-      lib.mkEnableOption null
-      // {
-        description = lib.mdDoc ''
-          Whether to set the recommended environment variables.
-        '';
-      };
+  config = {
+    wayland.windowManager.hyprland.package = lib.mkDefault package;
   };
-
-  config = lib.mkIf cfg.enable {
-    warnings =
-      if (cfg.systemdIntegration || cfg.plugins != []) && cfg.extraConfig == null
-      then [
-        ''
-          You have enabled hyprland.systemdIntegration or listed plugins in hyprland.plugins.
-          Your Hyprland config will be linked by home manager.
-          Set hyprland.extraConfig or unset hyprland.systemdIntegration and hyprland.plugins to remove this warning.
-        ''
-      ]
-      else [];
-
-    home.packages =
-      lib.optional (cfg.package != null) cfg.package
-      ++ lib.optional cfg.xwayland.enable pkgs.xwayland;
-
-    home.sessionVariables =
-      lib.mkIf cfg.recommendedEnvironment {NIXOS_OZONE_WL = "1";};
-
-    xdg.configFile."hypr/hyprland.conf" = lib.mkIf (cfg.systemdIntegration || cfg.extraConfig != null || cfg.plugins != []) {
-      text =
-        (lib.optionalString cfg.systemdIntegration ''
-          exec-once=${pkgs.dbus}/bin/dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY HYPRLAND_INSTANCE_SIGNATURE XDG_CURRENT_DESKTOP && systemctl --user start hyprland-session.target
-        '')
-        + lib.concatStrings (builtins.map (entry: let
-          plugin =
-            if lib.types.package.check entry
-            then "${entry}/lib/lib${entry.pname}.so"
-            else entry;
-        in "plugin = ${plugin}\n")
-        cfg.plugins)
-        + (
-          if cfg.extraConfig != null
-          then cfg.extraConfig
-          else ""
-        );
-
-      onChange = let
-        hyprlandPackage =
-          if cfg.package == null
-          then defaultHyprlandPackage
-          else cfg.package;
-      in
-        lib.mkIf (!cfg.disableAutoreload) ''
-          (  # execute in subshell so that `shopt` won't affect other scripts
-            shopt -s nullglob  # so that nothing is done if /tmp/hypr/ does not exist or is empty
-            for instance in /tmp/hypr/*; do
-              HYPRLAND_INSTANCE_SIGNATURE=''${instance##*/} ${hyprlandPackage}/bin/hyprctl reload config-only \
-                || true  # ignore dead instance(s)
-            done
-          )
-        '';
-    };
-
-    systemd.user.targets.hyprland-session = lib.mkIf cfg.systemdIntegration {
-      Unit = {
-        Description = "Hyprland compositor session";
-        Documentation = ["man:systemd.special(7)"];
-        BindsTo = ["graphical-session.target"];
-        Wants = ["graphical-session-pre.target"];
-        After = ["graphical-session-pre.target"];
-      };
-    };
-  };
-
-  imports = [
-    (lib.mkRemovedOptionModule ["wayland" "windowManager" "hyprland" "xwayland" "hidpi"]
-      "Support for this option has been removed. Refer to https://wiki.hyprland.org/Configuring/XWayland for more info")
-  ];
 }

nix/module.nix

@@ -2,98 +2,20 @@ inputs: {
   config,
   lib,
   pkgs,
-  options,
   ...
-}:
-with lib; let
-  cfg = config.programs.hyprland;
+}: let
   inherit (pkgs.stdenv.hostPlatform) system;
+  cfg = config.programs.hyprland;
 
-  finalPortalPackage = cfg.portalPackage.override {
+  package = inputs.self.packages.${system}.hyprland;
+  portalPackage = inputs.self.packages.${system}.xdg-desktop-portal-hyprland.override {
     hyprland = cfg.finalPackage;
   };
 in {
-  # disables Nixpkgs Hyprland module to avoid conflicts
-  disabledModules = ["programs/hyprland.nix"];
-
-  options.programs.hyprland = {
-    enable =
-      mkEnableOption null
-      // {
-        description = mdDoc ''
-          Hyprland, the dynamic tiling Wayland compositor that doesn't sacrifice on its looks.
-
-          You can manually launch Hyprland by executing {command}`Hyprland` on a TTY.
-
-          A configuration file will be generated in {file}`~/.config/hypr/hyprland.conf`.
-          See <https://wiki.hyprland.org> for more information.
-        '';
-      };
-
-    package = mkPackageOptionMD inputs.self.packages.${system} "hyprland" { };
-
-    finalPackage = mkOption {
-      type = types.package;
-      readOnly = true;
-      default = cfg.package.override {
-        enableXWayland = cfg.xwayland.enable;
-        enableNvidiaPatches = cfg.enableNvidiaPatches;
-      };
-      defaultText =
-        literalExpression
-        "`programs.hyprland.package` with applied configuration";
-      description = mdDoc ''
-        The Hyprland package after applying configuration.
-      '';
-    };
-
-    portalPackage = mkPackageOptionMD inputs.xdph.packages.${system} "xdg-desktop-portal-hyprland" {};
-
-    xwayland.enable = mkEnableOption (mdDoc "support for XWayland") // {default = true;};
-
-    enableNvidiaPatches =
-      mkEnableOption null
-      // {
-        description = mdDoc "Whether to apply patches to wlroots for better Nvidia support.";
-      };
-  };
-
-  config = mkIf cfg.enable {
-    environment.systemPackages = [cfg.finalPackage];
-
-    # NixOS changed the name of this attribute between NixOS 23.05 and
-    # 23.11
-    fonts = if builtins.hasAttr "enableDefaultPackages" options.fonts
-      then {enableDefaultPackages = mkDefault true;}
-      else {enableDefaultFonts = mkDefault true;};
-
-    hardware.opengl.enable = mkDefault true;
-
-    programs = {
-      dconf.enable = mkDefault true;
-      xwayland.enable = mkDefault cfg.xwayland.enable;
-    };
-
-    security.polkit.enable = true;
-
-    services.xserver.displayManager.sessionPackages = [cfg.finalPackage];
-
-    xdg.portal = {
-      enable = mkDefault true;
-      extraPortals = [finalPortalPackage];
+  config = {
+    programs.hyprland = {
+      package = lib.mkDefault package;
+      portalPackage = lib.mkDefault portalPackage;
     };
   };
-
-  imports = with lib; [
-    (
-      mkRemovedOptionModule
-      ["programs" "hyprland" "xwayland" "hidpi"]
-      "XWayland patches are deprecated. Refer to https://wiki.hyprland.org/Configuring/XWayland"
-    )
-    (
-      mkRenamedOptionModule
-      ["programs" "hyprland" "nvidiaPatches"]
-      ["programs" "hyprland" "enableNvidiaPatches"]
-    )
-  ];
 }

nix/overlays.nix

@@ -10,35 +10,43 @@
     (builtins.substring 4 2 longDate)
     (builtins.substring 6 2 longDate)
   ]);
-
-  mkJoinedOverlays = overlays: final: prev:
-    lib.foldl' (attrs: overlay: attrs // (overlay final prev)) {} overlays;
 in {
   # Contains what a user is most likely to care about:
   # Hyprland itself, XDPH and the Share Picker.
-  default = mkJoinedOverlays (with self.overlays; [
+  default = lib.composeManyExtensions (with self.overlays; [
     hyprland-packages
     hyprland-extras
   ]);
 
   # Packages for variations of Hyprland, dependencies included.
-  hyprland-packages = mkJoinedOverlays [
+  hyprland-packages = lib.composeManyExtensions [
     # Dependencies
+    inputs.hyprcursor.overlays.default
     inputs.hyprland-protocols.overlays.default
+    inputs.hyprlang.overlays.default
     self.overlays.wlroots-hyprland
     self.overlays.udis86
     # Hyprland packages themselves
-    (final: prev: {
+    (final: prev: let
+      date = mkDate (self.lastModifiedDate or "19700101");
+    in {
       hyprland = final.callPackage ./default.nix {
         stdenv = final.gcc13Stdenv;
-        version = "${props.version}+date=${mkDate (self.lastModifiedDate or "19700101")}_${self.shortRev or "dirty"}";
-        wlroots = final.wlroots-hyprland;
+        version = "${props.version}+date=${date}_${self.shortRev or "dirty"}";
         commit = self.rev or "";
-        inherit (final) udis86 hyprland-protocols;
+        udis86 = final.udis86-hyprland; # explicit override until decided on breaking change of the name
+        inherit (final) wlroots-hyprland; # explicit override until decided on breaking change of the name
+        inherit date;
       };
       hyprland-unwrapped = final.hyprland.override {wrapRuntimeDeps = false;};
       hyprland-debug = final.hyprland.override {debug = true;};
-      hyprland-nvidia = final.hyprland.override {enableNvidiaPatches = true;};
+      hyprland-legacy-renderer = final.hyprland.override {legacyRenderer = true;};
+      hyprland-nvidia =
+        builtins.trace ''
+          hyprland-nvidia was removed. Please use the hyprland package.
+          Nvidia patches are no longer needed.
+        ''
+        final.hyprland;
       hyprland-hidpi =
         builtins.trace ''
           hyprland-hidpi was removed. Please use the hyprland package.
@@ -50,12 +58,12 @@ in {
 
   # Packages for extra software recommended for usage with Hyprland,
   # including forked or patched packages for compatibility.
-  hyprland-extras = mkJoinedOverlays [
+  hyprland-extras = lib.composeManyExtensions [
     inputs.xdph.overlays.xdg-desktop-portal-hyprland
   ];
 
   udis86 = final: prev: {
-    udis86 = final.callPackage ./udis86.nix {};
+    udis86-hyprland = final.callPackage ./udis86.nix {};
   };
 
   # Patched version of wlroots for Hyprland.
@@ -65,30 +73,6 @@ in {
     wlroots-hyprland = final.callPackage ./wlroots.nix {
       version = "${mkDate (inputs.wlroots.lastModifiedDate or "19700101")}_${inputs.wlroots.shortRev or "dirty"}";
       src = inputs.wlroots;
-
-      libdisplay-info = prev.libdisplay-info.overrideAttrs (old: {
-        version = "0.1.1+date=2023-03-02";
-        src = final.fetchFromGitLab {
-          domain = "gitlab.freedesktop.org";
-          owner = "emersion";
-          repo = old.pname;
-          rev = "147d6611a64a6ab04611b923e30efacaca6fc678";
-          sha256 = "sha256-/q79o13Zvu7x02SBGu0W5yQznQ+p7ltZ9L6cMW5t/o4=";
-        };
-      });
-
-      libliftoff = prev.libliftoff.overrideAttrs (old: {
-        version = "0.5.0-dev";
-        src = final.fetchFromGitLab {
-          domain = "gitlab.freedesktop.org";
-          owner = "emersion";
-          repo = old.pname;
-          rev = "d98ae243280074b0ba44bff92215ae8d785658c0";
-          sha256 = "sha256-DjwlS8rXE7srs7A8+tHqXyUsFGtucYSeq6X0T/pVOc8=";
-        };
-
-        NIX_CFLAGS_COMPILE = toString ["-Wno-error=sign-conversion"];
-      });
     };
   };
 }

nix/patches/meson-build.patch

@@ -1,12 +1,12 @@
 diff --git a/meson.build b/meson.build
-index 726933bc..28b4d9ac 100644
+index 1d2c7f9f..c5ef4e67 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -29,20 +29,7 @@ add_project_arguments(
-   ],
-   language: 'cpp')
+@@ -33,20 +33,7 @@ if cpp_compiler.check_header('execinfo.h')
+   add_project_arguments('-DHAS_EXECINFO', language: 'cpp')
+ endif
  
--wlroots = subproject('wlroots', default_options: ['examples=false', 'renderers=gles2'])
+-wlroots = subproject('wlroots-hyprland', default_options: ['examples=false', 'renderers=gles2'])
 -have_xwlr = wlroots.get_variable('features').get('xwayland')
 -xcb_dep = dependency('xcb', required: get_option('xwayland'))
 -
@@ -24,27 +24,29 @@ index 726933bc..28b4d9ac 100644
    add_project_arguments('-DNO_XWAYLAND', language: 'cpp')
  endif
  
-@@ -71,8 +58,6 @@ foreach file : headers
-   install_headers(file, subdir: 'hyprland', preserve_path: true)
- endforeach
+@@ -69,8 +56,6 @@ if get_option('buildtype') == 'debug'
+   add_project_arguments('-DHYPRLAND_DEBUG', language: 'cpp')
+ endif
  
 -version_h = run_command('sh', '-c', 'scripts/generateVersion.sh')
 -
- subdir('protocols')
- subdir('src')
- subdir('hyprctl')
+ globber = run_command('find', 'src', '-name', '*.h*', check: true)
+ headers = globber.stdout().strip().split('\n')
+ foreach file : headers
 diff --git a/src/meson.build b/src/meson.build
-index 2065c6f5..55530605 100644
+index 45701f5f..3505cefe 100644
 --- a/src/meson.build
 +++ b/src/meson.build
-@@ -9,16 +9,16 @@ executable('Hyprland', src,
+@@ -9,7 +9,7 @@ executable('Hyprland', src,
      server_protos,
      dependency('wayland-server'),
      dependency('wayland-client'),
 -    wlroots.get_variable('wlroots'),
 +    dependency('wlroots'),
      dependency('cairo'),
-     dependency('libdrm'),
+     dependency('hyprcursor'),
+     dependency('hyprlang', version: '>= 0.3.2'),
+@@ -16,12 +16,12 @@ executable('Hyprland', src,
      dependency('egl'),
      dependency('xkbcommon'),
      dependency('libinput'),

nix/patches/wlroots-nvidia.patch

@@ -1,41 +0,0 @@
-diff --git a/render/gles2/renderer.c b/render/gles2/renderer.c
-index 9fe934f7..9662d4ee 100644
---- a/render/gles2/renderer.c
-+++ b/render/gles2/renderer.c
-@@ -176,7 +176,7 @@ static bool gles2_bind_buffer(struct wlr_renderer *wlr_renderer,
- 		assert(wlr_egl_is_current(renderer->egl));
- 
- 		push_gles2_debug(renderer);
--		glFlush();
-+		glFinish();
- 		glBindFramebuffer(GL_FRAMEBUFFER, 0);
- 		pop_gles2_debug(renderer);
- 
-diff --git a/types/output/render.c b/types/output/render.c
-index 2e38919a..97f78608 100644
---- a/types/output/render.c
-+++ b/types/output/render.c
-@@ -240,22 +240,7 @@ bool output_pick_format(struct wlr_output *output,
- }
- 
- uint32_t wlr_output_preferred_read_format(struct wlr_output *output) {
--	struct wlr_renderer *renderer = output->renderer;
--	assert(renderer != NULL);
--
--	if (!renderer->impl->preferred_read_format || !renderer->impl->read_pixels) {
--		return DRM_FORMAT_INVALID;
--	}
--
--	if (!wlr_output_attach_render(output, NULL)) {
--		return false;
--	}
--
--	uint32_t fmt = renderer->impl->preferred_read_format(renderer);
--
--	output_clear_back_buffer(output);
--
--	return fmt;
-+	return DRM_FORMAT_XRGB8888;
- }
- 
- struct wlr_render_pass *wlr_output_begin_render_pass(struct wlr_output *output,

nix/update-wlroots.sh

@@ -8,7 +8,7 @@ CRT_REV=$(rg rev flake.nix | awk '{ print substr($3, 2, 40) }')
 if [ "$SUB_REV" != "$CRT_REV" ]; then
   echo "Updating wlroots..."
   # update wlroots to submodule revision
-  sed -Ei "s/\w{40}/$SUB_REV/g" flake.nix subprojects/wlroots.wrap
+  sed -Ei "s/\w{40}/$SUB_REV/g" flake.nix
   nix flake lock
 
   echo "wlroots: $CRT_REV -> $SUB_REV"

nix/wlroots.nix

@@ -1,28 +1,13 @@
 {
-  lib,
   version,
   src,
   wlroots,
-  hwdata,
-  libdisplay-info,
-  libliftoff,
   enableXWayland ? true,
-  enableNvidiaPatches ? false,
 }:
 wlroots.overrideAttrs (old: {
   inherit version src enableXWayland;
 
-  pname = "${old.pname}-hyprland${lib.optionalString enableNvidiaPatches "-nvidia"}";
+  pname = "${old.pname}-hyprland";
 
-  patches =
-    (old.patches or [])
-    ++ (lib.optionals enableNvidiaPatches [
-      ./patches/wlroots-nvidia.patch
-    ]);
-
-  buildInputs = old.buildInputs ++ [hwdata libliftoff libdisplay-info];
-
-  NIX_CFLAGS_COMPILE = toString [
-    "-Wno-error=maybe-uninitialized"
-  ];
+  patches = [ ]; # don't inherit old.patches
 })

props.json

@@ -1,3 +1,3 @@
 {
-    "version": "0.31.0"
+    "version": "0.39.0"
 }

protocols/meson.build

@@ -1,5 +1,5 @@
 wayland_protos = dependency('wayland-protocols',
-	version: '>=1.25',
+	version: '>=1.32',
 	fallback: 'wayland-protocols',
 	default_options: ['tests=false'],
 )

scripts/generateVersion.sh

@@ -2,13 +2,17 @@
 cp -fr ./src/version.h.in ./src/version.h
 
 HASH=$(git rev-parse HEAD)
-BRANCH=$(git rev-parse --abbrev-ref HEAD)
+BRANCH=$(git branch --show-current)
 MESSAGE=$(git show ${GIT_COMMIT_HASH} | head -n 5 | tail -n 1 | sed -e 's/#//g' -e 's/\"//g')
+DATE=$(git show ${GIT_COMMIT_HASH} --no-patch --format=%cd --date=local)
 DIRTY=$(git diff-index --quiet HEAD -- || echo dirty)
 TAG=$(git describe --tags)
+COMMITS=$(git rev-list --count HEAD)
 
 sed -i -e "s#@HASH@#${HASH}#" ./src/version.h
 sed -i -e "s#@BRANCH@#${BRANCH}#" ./src/version.h
 sed -i -e "s#@MESSAGE@#${MESSAGE}#" ./src/version.h
+sed -i -e "s#@DATE@#${DATE}#" ./src/version.h
 sed -i -e "s#@DIRTY@#${DIRTY}#" ./src/version.h
 sed -i -e "s#@TAG@#${TAG}#" ./src/version.h
+sed -i -e "s#@COMMITS@#${COMMITS}#" ./src/version.h

scripts/hyprlandStaticAsan.diff

@@ -0,0 +1,20 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1190876d..0e7573f9 100755
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -110,6 +110,7 @@ pkg_check_modules(deps REQUIRED IMPORTED_TARGET
+     cairo pango pangocairo pixman-1
+     libdrm libinput hwdata libseat libdisplay-info libliftoff libudev gbm
+     hyprlang>=0.3.2 hyprcursor
++    libffi
+ )
+ 
+ file(GLOB_RECURSE SRCFILES CONFIGURE_DEPENDS "src/*.cpp")
+@@ -130,6 +131,7 @@ if(CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES DEBUG)
+         message(STATUS "Enabling ASan")
+ 
+         target_link_libraries(Hyprland asan)
++        target_link_libraries(Hyprland ${CMAKE_SOURCE_DIR}/libwayland-server.a)
+         target_compile_options(Hyprland PUBLIC -fsanitize=address)
+     endif()
+ 

scripts/waylandStatic.diff

@@ -0,0 +1,23 @@
+diff --git a/src/meson.build b/src/meson.build
+index 5d04334..6645eec 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -170,7 +170,7 @@ if get_option('libraries')
+ 		error('We probably need to bump the SONAME of libwayland-server and -client')
+ 	endif
+ 
+-	wayland_server = library(
++	wayland_server = static_library(
+ 		'wayland-server',
+ 		sources: [
+ 			wayland_server_protocol_core_h,
+@@ -180,9 +180,6 @@ if get_option('libraries')
+ 			'wayland-shm.c',
+ 			'event-loop.c'
+ 		],
+-		# To avoid an unnecessary SONAME bump, wayland 1.x.y produces
+-		# libwayland-server.so.0.x.y.
+-		version: '.'.join(['0', wayland_version[1], wayland_version[2]]),
+ 		dependencies: [
+ 			epoll_dep,
+ 			ffi_dep,

src/Compositor.hpp

@@ -21,16 +21,15 @@
 #include "debug/HyprDebugOverlay.hpp"
 #include "debug/HyprNotificationOverlay.hpp"
 #include "helpers/Monitor.hpp"
-#include "helpers/Workspace.hpp"
-#include "Window.hpp"
+#include "desktop/Workspace.hpp"
+#include "desktop/Window.hpp"
 #include "render/Renderer.hpp"
 #include "render/OpenGL.hpp"
 #include "hyprerror/HyprError.hpp"
 #include "plugins/PluginSystem.hpp"
 #include "helpers/Watchdog.hpp"
 
-enum eManagersInitStage
-{
+enum eManagersInitStage {
     STAGE_PRIORITY = 0,
     STAGE_LATE
 };
@@ -54,16 +53,13 @@ class CCompositor {
     wlr_drm_lease_v1_manager*                  m_sWRLDRMLeaseMgr;
     wlr_xdg_activation_v1*                     m_sWLRXDGActivation;
     wlr_output_layout*                         m_sWLROutputLayout;
-    wlr_idle*                                  m_sWLRIdle;
     wlr_idle_notifier_v1*                      m_sWLRIdleNotifier;
     wlr_layer_shell_v1*                        m_sWLRLayerShell;
     wlr_xdg_shell*                             m_sWLRXDGShell;
     wlr_cursor*                                m_sWLRCursor;
-    wlr_xcursor_manager*                       m_sWLRXCursorMgr;
     wlr_virtual_keyboard_manager_v1*           m_sWLRVKeyboardMgr;
     wlr_output_manager_v1*                     m_sWLROutputMgr;
     wlr_presentation*                          m_sWLRPresentation;
-    wlr_input_inhibit_manager*                 m_sWLRInhibitMgr;
     wlr_keyboard_shortcuts_inhibit_manager_v1* m_sWLRKbShInhibitMgr;
     wlr_egl*                                   m_sWLREGL;
     int                                        m_iDRMFD;
@@ -96,9 +92,7 @@ class CCompositor {
     std::vector<std::shared_ptr<CMonitor>>    m_vMonitors;
     std::vector<std::shared_ptr<CMonitor>>    m_vRealMonitors; // for all monitors, even those turned off
     std::vector<std::unique_ptr<CWindow>>     m_vWindows;
-    std::vector<std::unique_ptr<SXDGPopup>>   m_vXDGPopups;
-    std::vector<std::unique_ptr<CWorkspace>>  m_vWorkspaces;
-    std::vector<std::unique_ptr<SSubsurface>> m_vSubsurfaces;
+    std::vector<PHLWORKSPACE>                 m_vWorkspaces;
     std::vector<CWindow*>                     m_vWindowsFadingOut;
     std::vector<SLayerSurface*>               m_vSurfacesFadingOut;
 
@@ -122,7 +116,9 @@ class CCompositor {
     bool                                      m_bSessionActive  = true;
     bool                                      m_bDPMSStateON    = true;
     bool                                      m_bUnsafeState    = false;   // unsafe state is when there is no monitors.
-    wlr_output*                               m_pUnsafeOutput   = nullptr; // fallback output for the unsafe state
+    bool                                      m_bNextIsUnsafe   = false;   // because wlroots
+    CMonitor*                                 m_pUnsafeOutput   = nullptr; // fallback output for the unsafe state
+    bool                                      m_bExitTriggered  = false;   // For exit dispatcher
     bool                                      m_bIsShuttingDown = false;
 
     // ------------------------------------------------- //
@@ -137,26 +133,26 @@ class CCompositor {
     void           focusSurface(wlr_surface*, CWindow* pWindowOwner = nullptr);
     bool           windowExists(CWindow*);
     bool           windowValidMapped(CWindow*);
-    CWindow*       vectorToWindow(const Vector2D&);
-    CWindow*       vectorToWindowIdeal(const Vector2D&); // used only for finding a window to focus on, basically a "findFocusableWindow"
-    CWindow*       vectorToWindowTiled(const Vector2D&);
+    bool           monitorExists(CMonitor*);
+    CWindow*       vectorToWindowUnified(const Vector2D&, uint8_t properties, CWindow* pIgnoreWindow = nullptr);
     wlr_surface*   vectorToLayerSurface(const Vector2D&, std::vector<std::unique_ptr<SLayerSurface>>*, Vector2D*, SLayerSurface**);
+    wlr_surface*   vectorToLayerPopupSurface(const Vector2D&, CMonitor* monitor, Vector2D*, SLayerSurface**);
     wlr_surface*   vectorWindowToSurface(const Vector2D&, CWindow*, Vector2D& sl);
     Vector2D       vectorToSurfaceLocal(const Vector2D&, CWindow*, wlr_surface*);
-    CWindow*       windowFromCursor();
-    CWindow*       windowFloatingFromCursor();
     CMonitor*      getMonitorFromOutput(wlr_output*);
-    CWindow*       getWindowForPopup(wlr_xdg_popup*);
+    CMonitor*      getRealMonitorFromOutput(wlr_output*);
     CWindow*       getWindowFromSurface(wlr_surface*);
     CWindow*       getWindowFromHandle(uint32_t);
     CWindow*       getWindowFromZWLRHandle(wl_resource*);
-    bool           isWorkspaceVisible(const int&);
-    CWorkspace*    getWorkspaceByID(const int&);
-    CWorkspace*    getWorkspaceByName(const std::string&);
-    CWorkspace*    getWorkspaceByString(const std::string&);
+    bool           isWorkspaceVisible(PHLWORKSPACE);
+    PHLWORKSPACE   getWorkspaceByID(const int&);
+    PHLWORKSPACE   getWorkspaceByName(const std::string&);
+    PHLWORKSPACE   getWorkspaceByString(const std::string&);
     void           sanityCheckWorkspaces();
     void           updateWorkspaceWindowDecos(const int&);
-    int            getWindowsOnWorkspace(const int&);
+    void           updateWorkspaceSpecialRenderData(const int&);
+    int            getWindowsOnWorkspace(const int& id, std::optional<bool> onlyTiled = {});
+    int            getGroupsOnWorkspace(const int& id, std::optional<bool> onlyTiled = {});
     CWindow*       getUrgentWindow();
     bool           hasUrgentWindowOnWorkspace(const int&);
     CWindow*       getFirstWindowOnWorkspace(const int&);
@@ -167,21 +163,23 @@ class CCompositor {
     void           changeWindowZOrder(CWindow*, bool);
     void           cleanupFadingOut(const int& monid);
     CWindow*       getWindowInDirection(CWindow*, char);
-    CWindow*       getNextWindowOnWorkspace(CWindow*, bool focusableOnly = false);
-    CWindow*       getPrevWindowOnWorkspace(CWindow*, bool focusableOnly = false);
+    CWindow*       getNextWindowOnWorkspace(CWindow*, bool focusableOnly = false, std::optional<bool> floating = {});
+    CWindow*       getPrevWindowOnWorkspace(CWindow*, bool focusableOnly = false, std::optional<bool> floating = {});
     int            getNextAvailableNamedWorkspace();
     bool           isPointOnAnyMonitor(const Vector2D&);
-    CWindow*       getConstraintWindow(SMouse*);
+    bool           isPointOnReservedArea(const Vector2D& point, const CMonitor* monitor = nullptr);
     CMonitor*      getMonitorInDirection(const char&);
+    CMonitor*      getMonitorInDirection(CMonitor*, const char&);
     void           updateAllWindowsAnimatedDecorationValues();
+    void           updateWorkspaceWindows(const int64_t& id);
     void           updateWindowAnimatedDecorationValues(CWindow*);
     int            getNextAvailableMonitorID(std::string const& name);
-    void           moveWorkspaceToMonitor(CWorkspace*, CMonitor*);
+    void           moveWorkspaceToMonitor(PHLWORKSPACE, CMonitor*, bool noWarpCursor = false);
     void           swapActiveWorkspaces(CMonitor*, CMonitor*);
     CMonitor*      getMonitorFromString(const std::string&);
     bool           workspaceIDOutOfBounds(const int64_t&);
-    void           setWindowFullscreen(CWindow*, bool, eFullscreenMode);
-    void           updateFullscreenFadeOnWorkspace(CWorkspace*);
+    void           setWindowFullscreen(CWindow*, bool, eFullscreenMode mode = FULLSCREEN_INVALID);
+    void           updateFullscreenFadeOnWorkspace(PHLWORKSPACE);
     CWindow*       getX11Parent(CWindow*);
     void           scheduleFrameForMonitor(CMonitor*);
     void           addToFadingOutSafe(SLayerSurface*);
@@ -193,27 +191,31 @@ class CCompositor {
     void           closeWindow(CWindow*);
     Vector2D       parseWindowVectorArgsRelative(const std::string&, const Vector2D&);
     void           forceReportSizesToWindowsOnWorkspace(const int&);
-    bool           cursorOnReservedArea();
-    CWorkspace*    createNewWorkspace(const int&, const int&, const std::string& name = ""); // will be deleted next frame if left empty and unfocused!
+    PHLWORKSPACE   createNewWorkspace(const int&, const int&, const std::string& name = ""); // will be deleted next frame if left empty and unfocused!
     void           renameWorkspace(const int&, const std::string& name = "");
     void           setActiveMonitor(CMonitor*);
     bool           isWorkspaceSpecial(const int&);
     int            getNewSpecialID();
     void           performUserChecks();
-    void           moveWindowToWorkspaceSafe(CWindow* pWindow, CWorkspace* pWorkspace);
+    void           moveWindowToWorkspaceSafe(CWindow* pWindow, PHLWORKSPACE pWorkspace);
     CWindow*       getForceFocus();
     void           notifyIdleActivity();
     void           setIdleActivityInhibit(bool inhibit);
     void           arrangeMonitors();
     void           enterUnsafeState();
     void           leaveUnsafeState();
+    void           setPreferredScaleForSurface(wlr_surface* pSurface, double scale);
+    void           setPreferredTransformForSurface(wlr_surface* pSurface, wl_output_transform transform);
+    void           updateSuspendedStates();
 
     std::string    explicitConfigPath;
 
   private:
     void     initAllSignals();
+    void     removeAllSignals();
     void     setRandomSplash();
     void     initManagers(eManagersInitStage stage);
+    void     prepareFallbackOutput();
 
     uint64_t m_iHyprlandPID = 0;
 };
@@ -233,4 +235,7 @@ inline std::map<std::string, xcb_atom_t> HYPRATOMS = {HYPRATOM("_NET_WM_WINDOW_T
                                                       HYPRATOM("_NET_WM_WINDOW_TYPE_POPUP_MENU"),
                                                       HYPRATOM("_NET_WM_WINDOW_TYPE_TOOLTIP"),
                                                       HYPRATOM("_NET_WM_WINDOW_TYPE_NOTIFICATION"),
-                                                      HYPRATOM("_KDE_NET_WM_WINDOW_TYPE_OVERRIDE")};
+                                                      HYPRATOM("_KDE_NET_WM_WINDOW_TYPE_OVERRIDE"),
+                                                      HYPRATOM("_NET_SUPPORTING_WM_CHECK"),
+                                                      HYPRATOM("_NET_WM_NAME"),
+                                                      HYPRATOM("UTF8_STRING")};

src/SharedDefs.hpp

@@ -1,7 +1,9 @@
 #pragma once
 
-enum eIcons
-{
+#include "helpers/Vector2D.hpp"
+#include <functional>
+
+enum eIcons {
     ICON_WARNING = 0,
     ICON_INFO,
     ICON_HINT,
@@ -11,8 +13,7 @@ enum eIcons
     ICON_NONE
 };
 
-enum eRenderStage
-{
+enum eRenderStage {
     RENDER_PRE = 0,      /* Before binding the gl context */
     RENDER_BEGIN,        /* Just when the rendering begins, nothing has been rendered yet. Damage, current render data in opengl valid. */
     RENDER_PRE_WINDOWS,  /* Pre windows, post bottom and overlay layers */
@@ -23,3 +24,51 @@ enum eRenderStage
     RENDER_PRE_WINDOW,   /* Before rendering a window (any pass) Note some windows (e.g. tiled) may have 2 passes (main & popup) */
     RENDER_POST_WINDOW,  /* After rendering a window (any pass) */
 };
+
+enum eInputType {
+    INPUT_TYPE_AXIS = 0,
+    INPUT_TYPE_BUTTON,
+    INPUT_TYPE_DRAG_START,
+    INPUT_TYPE_DRAG_END,
+    INPUT_TYPE_MOTION
+};
+
+struct SCallbackInfo {
+    bool cancelled = false; /* on cancellable events, will cancel the event. */
+};
+
+struct SWindowDecorationExtents {
+    Vector2D topLeft;
+    Vector2D bottomRight;
+
+    //
+    SWindowDecorationExtents operator*(const double& scale) const {
+        return SWindowDecorationExtents{topLeft * scale, bottomRight * scale};
+    }
+
+    SWindowDecorationExtents round() {
+        return {topLeft.round(), bottomRight.round()};
+    }
+
+    bool operator==(const SWindowDecorationExtents& other) const {
+        return topLeft == other.topLeft && bottomRight == other.bottomRight;
+    }
+
+    void addExtents(const SWindowDecorationExtents& other) {
+        topLeft     = topLeft.getComponentMax(other.topLeft);
+        bottomRight = bottomRight.getComponentMax(other.bottomRight);
+    }
+};
+
+enum eHyprCtlOutputFormat {
+    FORMAT_NORMAL = 0,
+    FORMAT_JSON
+};
+
+struct SHyprCtlCommand {
+    std::string                                                   name  = "";
+    bool                                                          exact = true;
+    std::function<std::string(eHyprCtlOutputFormat, std::string)> fn;
+};
+
+typedef std::function<void(void*, SCallbackInfo&, std::any)> HOOK_CALLBACK_FN;

src/config/ConfigDataValues.hpp

@@ -1,10 +1,12 @@
 #pragma once
 #include "../defines.hpp"
+#include "../helpers/VarList.hpp"
 #include <vector>
 
 enum eConfigValueDataTypes {
-    CVD_TYPE_INVALID  = -1,
-    CVD_TYPE_GRADIENT = 0
+    CVD_TYPE_INVALID   = -1,
+    CVD_TYPE_GRADIENT  = 0,
+    CVD_TYPE_CSS_VALUE = 1
 };
 
 class ICustomConfigValueData {
@@ -12,10 +14,13 @@ class ICustomConfigValueData {
     virtual ~ICustomConfigValueData() = 0;
 
     virtual eConfigValueDataTypes getDataType() = 0;
+
+    virtual std::string           toString() = 0;
 };
 
 class CGradientValueData : public ICustomConfigValueData {
   public:
+    CGradientValueData(){};
     CGradientValueData(CColor col) {
         m_vColors.push_back(col);
     };
@@ -48,4 +53,70 @@ class CGradientValueData : public ICustomConfigValueData {
 
         return true;
     }
+
+    virtual std::string toString() {
+        std::string result;
+        for (auto& c : m_vColors) {
+            result += std::format("{:x} ", c.getAsHex());
+        }
+
+        result += std::format("{}deg", (int)(m_fAngle * 180.0 / M_PI));
+        return result;
+    }
+};
+
+class CCssGapData : public ICustomConfigValueData {
+  public:
+    CCssGapData() : top(0), right(0), bottom(0), left(0){};
+    CCssGapData(int64_t global) : top(global), right(global), bottom(global), left(global){};
+    CCssGapData(int64_t vertical, int64_t horizontal) : top(vertical), right(horizontal), bottom(vertical), left(horizontal){};
+    CCssGapData(int64_t top, int64_t horizontal, int64_t bottom) : top(top), right(horizontal), bottom(bottom), left(horizontal){};
+    CCssGapData(int64_t top, int64_t right, int64_t bottom, int64_t left) : top(top), right(right), bottom(bottom), left(left){};
+
+    /* Css like directions */
+    int64_t top;
+    int64_t right;
+    int64_t bottom;
+    int64_t left;
+
+    void    parseGapData(CVarList varlist) {
+        switch (varlist.size()) {
+            case 1: {
+                *this = CCssGapData(std::stoi(varlist[0]));
+                break;
+            }
+            case 2: {
+                *this = CCssGapData(std::stoi(varlist[0]), std::stoi(varlist[1]));
+                break;
+            }
+            case 3: {
+                *this = CCssGapData(std::stoi(varlist[0]), std::stoi(varlist[1]), std::stoi(varlist[2]));
+                break;
+            }
+            case 4: {
+                *this = CCssGapData(std::stoi(varlist[0]), std::stoi(varlist[1]), std::stoi(varlist[2]), std::stoi(varlist[3]));
+                break;
+            }
+            default: {
+                Debug::log(WARN, "Too many arguments provided for gaps.");
+                *this = CCssGapData(std::stoi(varlist[0]), std::stoi(varlist[1]), std::stoi(varlist[2]), std::stoi(varlist[3]));
+                break;
+            }
+        }
+    }
+
+    void reset(int64_t global) {
+        top    = global;
+        right  = global;
+        bottom = global;
+        left   = global;
+    }
+
+    virtual eConfigValueDataTypes getDataType() {
+        return CVD_TYPE_CSS_VALUE;
+    }
+
+    virtual std::string toString() {
+        return std::format("{} {} {} {}", top, right, bottom, left);
+    }
 };

src/config/ConfigManager.hpp

@@ -11,44 +11,42 @@
 #include <algorithm>
 #include <regex>
 #include <optional>
+#include <functional>
 #include <xf86drmMode.h>
-#include "../Window.hpp"
 #include "../helpers/WLClasses.hpp"
 #include "../helpers/Monitor.hpp"
 #include "../helpers/VarList.hpp"
+#include "../desktop/Window.hpp"
 
 #include "defaultConfig.hpp"
 #include "ConfigDataValues.hpp"
 
+#include <hyprlang.hpp>
+
 #define INITANIMCFG(name)           animationConfig[name] = {}
 #define CREATEANIMCFG(name, parent) animationConfig[name] = {false, "", "", 0.f, -1, &animationConfig["global"], &animationConfig[parent]}
 
 #define HANDLE void*
 
-struct SConfigValue {
-    int64_t                                 intValue   = -INT64_MAX;
-    float                                   floatValue = -__FLT_MAX__;
-    std::string                             strValue   = "";
-    Vector2D                                vecValue   = Vector2D(-__FLT_MAX__, -__FLT_MAX__);
-    std::shared_ptr<ICustomConfigValueData> data;
-
-    bool                                    set = false; // used for device configs
-};
+class CWindow;
 
 struct SWorkspaceRule {
-    std::string            monitor         = "";
-    std::string            workspaceString = "";
-    std::string            workspaceName   = "";
-    int                    workspaceId     = -1;
-    bool                   isDefault       = false;
-    bool                   isPersistent    = false;
-    std::optional<int64_t> gapsIn;
-    std::optional<int64_t> gapsOut;
-    std::optional<int64_t> borderSize;
-    std::optional<int>     border;
-    std::optional<int>     rounding;
-    std::optional<int>     decorate;
-    std::optional<int>     shadow;
+    std::string                        monitor         = "";
+    std::string                        workspaceString = "";
+    std::string                        workspaceName   = "";
+    int                                workspaceId     = -1;
+    bool                               isDefault       = false;
+    bool                               isPersistent    = false;
+    std::optional<CCssGapData>         gapsIn;
+    std::optional<CCssGapData>         gapsOut;
+    std::optional<int64_t>             borderSize;
+    std::optional<int>                 border;
+    std::optional<int>                 rounding;
+    std::optional<int>                 decorate;
+    std::optional<int>                 shadow;
+    std::optional<std::string>         onCreatedEmptyRunCmd;
+    std::optional<std::string>         defaultName;
+    std::map<std::string, std::string> layoutopts;
 };
 
 struct SMonitorAdditionalReservedArea {
@@ -70,6 +68,17 @@ struct SAnimationPropertyConfig {
     SAnimationPropertyConfig* pParentAnimation = nullptr;
 };
 
+struct SPluginKeyword {
+    HANDLE                       handle = 0;
+    std::string                  name   = "";
+    Hyprlang::PCONFIGHANDLERFUNC fn     = nullptr;
+};
+
+struct SPluginVariable {
+    HANDLE      handle = 0;
+    std::string name   = "";
+};
+
 struct SExecRequestedRule {
     std::string szRule = "";
     uint64_t    iPid   = 0;
@@ -82,44 +91,38 @@ class CConfigManager {
     void                                                            tick();
     void                                                            init();
 
-    int                                                             getInt(const std::string&);
-    float                                                           getFloat(const std::string&);
-    Vector2D                                                        getVec(const std::string&);
-    std::string                                                     getString(const std::string&);
-    void                                                            setFloat(const std::string&, float);
-    void                                                            setInt(const std::string&, int);
-    void                                                            setVec(const std::string&, Vector2D);
-    void                                                            setString(const std::string&, const std::string&);
-
     int                                                             getDeviceInt(const std::string&, const std::string&, const std::string& fallback = "");
     float                                                           getDeviceFloat(const std::string&, const std::string&, const std::string& fallback = "");
     Vector2D                                                        getDeviceVec(const std::string&, const std::string&, const std::string& fallback = "");
     std::string                                                     getDeviceString(const std::string&, const std::string&, const std::string& fallback = "");
     bool                                                            deviceConfigExists(const std::string&);
+    Hyprlang::CConfigValue*                                         getConfigValueSafeDevice(const std::string& dev, const std::string& val, const std::string& fallback);
     bool                                                            shouldBlurLS(const std::string&);
 
-    SConfigValue*                                                   getConfigValuePtr(const std::string&);
-    SConfigValue*                                                   getConfigValuePtrSafe(const std::string&);
+    void* const*                                                    getConfigValuePtr(const std::string&);
+    Hyprlang::CConfigValue*                                         getHyprlangConfigValuePtr(const std::string& name, const std::string& specialCat = "");
+    void                                                            onPluginLoadUnload(const std::string& name, bool load);
     static std::string                                              getConfigDir();
     static std::string                                              getMainConfigPath();
 
-    SMonitorRule                                                    getMonitorRuleFor(const std::string&, const std::string& displayName = "");
-    SWorkspaceRule                                                  getWorkspaceRuleFor(CWorkspace*);
+    SMonitorRule                                                    getMonitorRuleFor(const CMonitor&);
+    SWorkspaceRule                                                  getWorkspaceRuleFor(PHLWORKSPACE workspace);
     std::string                                                     getDefaultWorkspaceFor(const std::string&);
 
     CMonitor*                                                       getBoundMonitorForWS(const std::string&);
     std::string                                                     getBoundMonitorStringForWS(const std::string&);
     const std::deque<SWorkspaceRule>&                               getAllWorkspaceRules();
 
-    std::vector<SWindowRule>                                        getMatchingRules(CWindow*);
+    std::vector<SWindowRule>                                        getMatchingRules(CWindow*, bool dynamic = true, bool shadowExec = false);
     std::vector<SLayerRule>                                         getMatchingRules(SLayerSurface*);
 
     std::unordered_map<std::string, SMonitorAdditionalReservedArea> m_mAdditionalReservedAreas;
 
     std::unordered_map<std::string, SAnimationPropertyConfig>       getAnimationConfig();
 
-    void                                                            addPluginConfigVar(HANDLE handle, const std::string& name, const SConfigValue& value);
-    void                                                            removePluginConfig(HANDLE handle);
+    void                                                            addPluginConfigVar(HANDLE handle, const std::string& name, const Hyprlang::CConfigValue& value);
+    void addPluginKeyword(HANDLE handle, const std::string& name, Hyprlang::PCONFIGHANDLERFUNC fun, Hyprlang::SHandlerOptions opts = {});
+    void removePluginConfig(HANDLE handle);
 
     // no-op when done.
     void                      dispatchExecOnce();
@@ -131,7 +134,7 @@ class CConfigManager {
     void                      ensureMonitorStatus();
     void                      ensureVRR(CMonitor* pMonitor = nullptr);
 
-    std::string               parseKeyword(const std::string&, const std::string&, bool dynamic = false);
+    std::string               parseKeyword(const std::string&, const std::string&);
 
     void                      addParseError(const std::string&);
 
@@ -140,77 +143,68 @@ class CConfigManager {
     void                      addExecRule(const SExecRequestedRule&);
 
     void                      handlePluginLoads();
+    std::string               getErrors();
 
-    std::string               configCurrentPath;
+    // keywords
+    std::optional<std::string> handleRawExec(const std::string&, const std::string&);
+    std::optional<std::string> handleExecOnce(const std::string&, const std::string&);
+    std::optional<std::string> handleMonitor(const std::string&, const std::string&);
+    std::optional<std::string> handleBind(const std::string&, const std::string&);
+    std::optional<std::string> handleUnbind(const std::string&, const std::string&);
+    std::optional<std::string> handleWindowRule(const std::string&, const std::string&);
+    std::optional<std::string> handleLayerRule(const std::string&, const std::string&);
+    std::optional<std::string> handleWindowRuleV2(const std::string&, const std::string&);
+    std::optional<std::string> handleWorkspaceRules(const std::string&, const std::string&);
+    std::optional<std::string> handleBezier(const std::string&, const std::string&);
+    std::optional<std::string> handleAnimation(const std::string&, const std::string&);
+    std::optional<std::string> handleSource(const std::string&, const std::string&);
+    std::optional<std::string> handleSubmap(const std::string&, const std::string&);
+    std::optional<std::string> handleBlurLS(const std::string&, const std::string&);
+    std::optional<std::string> handleBindWS(const std::string&, const std::string&);
+    std::optional<std::string> handleEnv(const std::string&, const std::string&);
+    std::optional<std::string> handlePlugin(const std::string&, const std::string&);
+
+    std::string                configCurrentPath;
 
   private:
-    std::deque<std::string>                                                                    configPaths;       // stores all the config paths
-    std::unordered_map<std::string, time_t>                                                    configModifyTimes; // stores modify times
-    std::vector<std::pair<std::string, std::string>>                                           configDynamicVars; // stores dynamic vars declared by the user
-    std::unordered_map<std::string, SConfigValue>                                              configValues;
-    std::unordered_map<std::string, std::unordered_map<std::string, SConfigValue>>             deviceConfigs; // stores device configs
+    std::unique_ptr<Hyprlang::CConfig>                        m_pConfig;
 
-    std::unordered_map<std::string, SAnimationPropertyConfig>                                  animationConfig; // stores all the animations with their set values
+    std::deque<std::string>                                   configPaths;       // stores all the config paths
+    std::unordered_map<std::string, time_t>                   configModifyTimes; // stores modify times
 
-    std::string                                                                                currentCategory = ""; // For storing the category of the current item
+    std::unordered_map<std::string, SAnimationPropertyConfig> animationConfig; // stores all the animations with their set values
 
-    std::string                                                                                parseError = ""; // For storing a parse error to display later
+    std::string                                               m_szCurrentSubmap = ""; // For storing the current keybind submap
 
-    std::string                                                                                m_szCurrentSubmap = ""; // For storing the current keybind submap
+    std::vector<SExecRequestedRule>                           execRequestedRules; // rules requested with exec, e.g. [workspace 2] kitty
 
-    std::vector<SExecRequestedRule>                                                            execRequestedRules; // rules requested with exec, e.g. [workspace 2] kitty
+    std::vector<std::string>                                  m_vDeclaredPlugins;
+    std::vector<SPluginKeyword>                               pluginKeywords;
+    std::vector<SPluginVariable>                              pluginVariables;
 
-    std::vector<std::string>                                                                   m_vDeclaredPlugins;
-    std::unordered_map<HANDLE, std::unique_ptr<std::unordered_map<std::string, SConfigValue>>> pluginConfigs; // stores plugin configs
+    bool                                                      isFirstLaunch = true; // For exec-once
 
-    bool                                                                                       isFirstLaunch = true; // For exec-once
+    std::deque<SMonitorRule>                                  m_dMonitorRules;
+    std::deque<SWorkspaceRule>                                m_dWorkspaceRules;
+    std::deque<SWindowRule>                                   m_dWindowRules;
+    std::deque<SLayerRule>                                    m_dLayerRules;
+    std::deque<std::string>                                   m_dBlurLSNamespaces;
 
-    std::deque<SMonitorRule>                                                                   m_dMonitorRules;
-    std::deque<SWorkspaceRule>                                                                 m_dWorkspaceRules;
-    std::deque<SWindowRule>                                                                    m_dWindowRules;
-    std::deque<SLayerRule>                                                                     m_dLayerRules;
-    std::deque<std::string>                                                                    m_dBlurLSNamespaces;
+    bool                                                      firstExecDispatched     = false;
+    bool                                                      m_bManualCrashInitiated = false;
+    std::deque<std::string>                                   firstExecRequests;
 
-    bool                                                                                       firstExecDispatched     = false;
-    bool                                                                                       m_bManualCrashInitiated = false;
-    std::deque<std::string>                                                                    firstExecRequests;
-
-    std::vector<std::pair<std::string, std::string>>                                           environmentVariables;
-
-    std::vector<std::pair<std::string, std::string>>                                           m_vFailedPluginConfigValues; // for plugin values of unloaded plugins
+    std::vector<std::pair<std::string, std::string>>          m_vFailedPluginConfigValues; // for plugin values of unloaded plugins
+    std::string                                               m_szConfigErrors = "";
 
     // internal methods
-    void         setDefaultVars();
-    void         setDefaultAnimationVars();
-    void         setDeviceDefaultVars(const std::string&);
-    void         populateEnvironment();
-
-    void         setAnimForChildren(SAnimationPropertyConfig* const);
-    void         updateBlurredLS(const std::string&, const bool);
-
-    void         applyUserDefinedVars(std::string&, const size_t);
-    void         loadConfigLoadVars();
-    SConfigValue getConfigValueSafe(const std::string&);
-    SConfigValue getConfigValueSafeDevice(const std::string&, const std::string&, const std::string& fallback = "");
-    void         parseLine(std::string&);
-    void         configSetValueSafe(const std::string&, const std::string&);
-    void         handleDeviceConfig(const std::string&, const std::string&);
-    void         handleRawExec(const std::string&, const std::string&);
-    void         handleMonitor(const std::string&, const std::string&);
-    void         handleBind(const std::string&, const std::string&);
-    void         handleUnbind(const std::string&, const std::string&);
-    void         handleWindowRule(const std::string&, const std::string&);
-    void         handleLayerRule(const std::string&, const std::string&);
-    void         handleWindowRuleV2(const std::string&, const std::string&);
-    void         handleWorkspaceRules(const std::string&, const std::string&);
-    void         handleBezier(const std::string&, const std::string&);
-    void         handleAnimation(const std::string&, const std::string&);
-    void         handleSource(const std::string&, const std::string&);
-    void         handleSubmap(const std::string&, const std::string&);
-    void         handleBlurLS(const std::string&, const std::string&);
-    void         handleBindWS(const std::string&, const std::string&);
-    void         handleEnv(const std::string&, const std::string&);
-    void         handlePlugin(const std::string&, const std::string&);
+    void                       setAnimForChildren(SAnimationPropertyConfig* const);
+    void                       updateBlurredLS(const std::string&, const bool);
+    void                       setDefaultAnimationVars();
+    std::optional<std::string> resetHLConfig();
+    std::optional<std::string> verifyConfigExists();
+    void                       postConfigReload(const Hyprlang::CParseResult& result);
+    void                       reload();
 };
 
 inline std::unique_ptr<CConfigManager> g_pConfigManager;

src/config/ConfigValue.hpp

@@ -0,0 +1,73 @@
+#pragma once
+
+#include <string>
+#include <typeindex>
+#include <hyprlang.hpp>
+#include "../debug/Log.hpp"
+#include "../macros.hpp"
+#include "ConfigManager.hpp"
+
+template <typename T>
+class CConfigValue {
+  public:
+    CConfigValue(const std::string& val) {
+        const auto PVHYPRLANG = g_pConfigManager->getHyprlangConfigValuePtr(val.c_str());
+
+        p_ = PVHYPRLANG->getDataStaticPtr();
+
+#ifdef HYPRLAND_DEBUG
+        // verify type
+        const auto ANY  = PVHYPRLANG->getValue();
+        const auto TYPE = std::type_index(ANY.type());
+
+        // exceptions
+        const bool STRINGEX = (typeid(T) == typeid(std::string) && TYPE == typeid(Hyprlang::STRING));
+        const bool CUSTOMEX = (typeid(T) == typeid(Hyprlang::CUSTOMTYPE) && (TYPE == typeid(Hyprlang::CUSTOMTYPE*) || TYPE == typeid(void*) /* dunno why it does this? */));
+
+        RASSERT(typeid(T) == TYPE || STRINGEX || CUSTOMEX, "Mismatched type in CConfigValue<T>, got {} but has {}", typeid(T).name(), TYPE.name());
+#endif
+    }
+
+    T* ptr() const {
+        return *(T* const*)p_;
+    }
+
+    T operator*() const {
+        return *ptr();
+    }
+
+  private:
+    void* const* p_ = nullptr;
+};
+
+template <>
+inline std::string* CConfigValue<std::string>::ptr() const {
+    RASSERT(false, "Impossible to implement ptr() of CConfigValue<std::string>");
+    return nullptr;
+}
+
+template <>
+inline std::string CConfigValue<std::string>::operator*() const {
+    return std::string{*(Hyprlang::STRING*)p_};
+}
+
+template <>
+inline Hyprlang::STRING* CConfigValue<Hyprlang::STRING>::ptr() const {
+    return (Hyprlang::STRING*)p_;
+}
+
+template <>
+inline Hyprlang::STRING CConfigValue<Hyprlang::STRING>::operator*() const {
+    return *(Hyprlang::STRING*)p_;
+}
+
+template <>
+inline Hyprlang::CUSTOMTYPE* CConfigValue<Hyprlang::CUSTOMTYPE>::ptr() const {
+    return *(Hyprlang::CUSTOMTYPE* const*)p_;
+}
+
+template <>
+inline Hyprlang::CUSTOMTYPE CConfigValue<Hyprlang::CUSTOMTYPE>::operator*() const {
+    RASSERT(false, "Impossible to implement operator* of CConfigValue<Hyprlang::CUSTOMTYPE>, use ptr()");
+    return *ptr();
+}

src/config/defaultConfig.hpp

@@ -3,11 +3,11 @@
 #include <string>
 
 inline const std::string AUTOCONFIG = R"#(
-########################################################################################
-AUTOGENERATED HYPR CONFIG.
-PLEASE USE THE CONFIG PROVIDED IN THE GIT REPO /examples/hypr.conf AND EDIT IT,
-OR EDIT THIS ONE ACCORDING TO THE WIKI INSTRUCTIONS.
-########################################################################################
+# #######################################################################################
+# AUTOGENERATED HYPR CONFIG.
+# PLEASE USE THE CONFIG PROVIDED IN THE GIT REPO /examples/hypr.conf AND EDIT IT,
+# OR EDIT THIS ONE ACCORDING TO THE WIKI INSTRUCTIONS.
+# #######################################################################################
 
 #
 # Please note not all available settings / options are set here.
@@ -28,8 +28,14 @@ monitor=,preferred,auto,auto
 # Source a file (multi-file configs)
 # source = ~/.config/hypr/myColors.conf
 
+# Set programs that you use
+$terminal = kitty
+$fileManager = dolphin
+$menu = wofi --show drun
+
 # Some default env vars.
 env = XCURSOR_SIZE,24
+env = QT_QPA_PLATFORMTHEME,qt5ct # change to qt6ct if you have that
 
 # For all categories, see https://wiki.hyprland.org/Configuring/Variables/
 input {
@@ -45,7 +51,7 @@ input {
         natural_scroll = no
     }
 
-    sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
+    sensitivity = 0 # -1.0 to 1.0, 0 means no modification.
 }
 
 general {
@@ -113,12 +119,13 @@ gestures {
 
 misc {
     # See https://wiki.hyprland.org/Configuring/Variables/ for more
-    force_default_wallpaper = -1 # Set to 0 to disable the anime mascot wallpapers
+    force_default_wallpaper = -1 # Set to 0 or 1 to disable the anime mascot wallpapers
 }
 
 # Example per-device config
-# See https://wiki.hyprland.org/Configuring/Keywords/#executing for more
-device:epic-mouse-v1 {
+# See https://wiki.hyprland.org/Configuring/Keywords/#per-device-input-configs for more
+device {
+    name = epic-mouse-v1
     sensitivity = -0.5
 }
 
@@ -127,18 +134,19 @@ device:epic-mouse-v1 {
 # Example windowrule v2
 # windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
 # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
+windowrulev2 = suppressevent maximize, class:.* # You'll probably like this.
 
 
 # See https://wiki.hyprland.org/Configuring/Keywords/ for more
 $mainMod = SUPER
 
 # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
-bind = $mainMod, Q, exec, kitty
+bind = $mainMod, Q, exec, $terminal
 bind = $mainMod, C, killactive, 
 bind = $mainMod, M, exit, 
-bind = $mainMod, E, exec, dolphin
+bind = $mainMod, E, exec, $fileManager
 bind = $mainMod, V, togglefloating, 
-bind = $mainMod, R, exec, wofi --show drun
+bind = $mainMod, R, exec, $menu
 bind = $mainMod, P, pseudo, # dwindle
 bind = $mainMod, J, togglesplit, # dwindle
 
@@ -172,6 +180,10 @@ bind = $mainMod SHIFT, 8, movetoworkspace, 8
 bind = $mainMod SHIFT, 9, movetoworkspace, 9
 bind = $mainMod SHIFT, 0, movetoworkspace, 10
 
+# Example special workspace (scratchpad)
+bind = $mainMod, S, togglespecialworkspace, magic
+bind = $mainMod SHIFT, S, movetoworkspace, special:magic
+
 # Scroll through existing workspaces with mainMod + scroll
 bind = $mainMod, mouse_down, workspace, e+1
 bind = $mainMod, mouse_up, workspace, e-1

src/debug/CrashReporter.cpp

@@ -3,6 +3,7 @@
 #include <sys/utsname.h>
 #include <fstream>
 #include <signal.h>
+#include <link.h>
 
 #include "../plugins/PluginSystem.hpp"
 
@@ -13,19 +14,19 @@
 std::string getRandomMessage() {
 
     const std::vector<std::string>  MESSAGES = {"Sorry, didn't mean to...",
-                                               "This was an accident, I swear!",
-                                               "Calm down, it was a misinput! MISINPUT!",
-                                               "Oops",
-                                               "Vaxry is going to be upset.",
-                                               "Who tried dividing by zero?!",
-                                               "Maybe you should try dusting your PC in the meantime?",
-                                               "I tried so hard, and got so far...",
-                                               "I don't feel so good...",
-                                               "*thud*",
-                                               "Well this is awkward.",
-                                               "\"stable\"",
-                                               "I hope you didn't have any unsaved progress.",
-                                               "All these computers..."};
+                                                "This was an accident, I swear!",
+                                                "Calm down, it was a misinput! MISINPUT!",
+                                                "Oops",
+                                                "Vaxry is going to be upset.",
+                                                "Who tried dividing by zero?!",
+                                                "Maybe you should try dusting your PC in the meantime?",
+                                                "I tried so hard, and got so far...",
+                                                "I don't feel so good...",
+                                                "*thud*",
+                                                "Well this is awkward.",
+                                                "\"stable\"",
+                                                "I hope you didn't have any unsaved progress.",
+                                                "All these computers..."};
 
     std::random_device              dev;
     std::mt19937                    engine(dev());
@@ -63,8 +64,8 @@ void CrashReporter::createAndSaveCrash(int sig) {
     struct utsname unameInfo;
     uname(&unameInfo);
 
-    finalCrashReport +=
-        std::format("\tSystem name: {}\n\tNode name: {}\n\tRelease: {}\n\tVersion: {}\n\n", unameInfo.sysname, unameInfo.nodename, unameInfo.release, unameInfo.version);
+    finalCrashReport += std::format("\tSystem name: {}\n\tNode name: {}\n\tRelease: {}\n\tVersion: {}\n\n", std::string{unameInfo.sysname}, std::string{unameInfo.nodename},
+                                    std::string{unameInfo.release}, std::string{unameInfo.version});
 
 #if defined(__DragonFly__) || defined(__FreeBSD__)
     const std::string GPUINFO = execAndGet("pciconf -lv | fgrep -A4 vga");
@@ -105,21 +106,43 @@ void CrashReporter::createAndSaveCrash(int sig) {
     const auto FPATH = std::filesystem::canonical("/proc/self/exe");
 #endif
 
+    std::string addrs = "";
     for (size_t i = 0; i < CALLSTACK.size(); ++i) {
-        finalCrashReport += std::format("\t#{} | {}\n", i, CALLSTACK[i].desc);
-
-#ifdef __clang__
-        const auto CMD = std::format("llvm-addr2line -e {} -f 0x{:x}", FPATH.c_str(), (uint64_t)CALLSTACK[i].adr);
+#ifdef __GLIBC__
+        // convert in memory address to VMA address
+        Dl_info          info;
+        struct link_map* linkMap;
+        dladdr1((void*)CALLSTACK[i].adr, &info, (void**)&linkMap, RTLD_DL_LINKMAP);
+        size_t vmaAddr = (size_t)CALLSTACK[i].adr - linkMap->l_addr;
 #else
-        const auto CMD = std::format("addr2line -e {} -f 0x{:x}", FPATH.c_str(), (uint64_t)CALLSTACK[i].adr);
+        // musl doesn't define dladdr1
+        size_t vmaAddr = (size_t)CALLSTACK[i].adr;
 #endif
-        const auto ADDR2LINE = replaceInString(execAndGet(CMD.c_str()), "\n", "\n\t\t");
-        finalCrashReport += "\t\t" + ADDR2LINE.substr(0, ADDR2LINE.length() - 2);
+
+        addrs += std::format("0x{:x} ", vmaAddr);
+    }
+#ifdef __clang__
+    const auto CMD = std::format("llvm-addr2line -e {} -Cf {}", FPATH.c_str(), addrs);
+#else
+    const auto CMD = std::format("addr2line -e {} -Cf {}", FPATH.c_str(), addrs);
+#endif
+
+    const auto        ADDR2LINE = execAndGet(CMD.c_str());
+
+    std::stringstream ssin(ADDR2LINE);
+
+    for (size_t i = 0; i < CALLSTACK.size(); ++i) {
+        finalCrashReport += std::format("\t#{} | {}", i, CALLSTACK[i].desc);
+        std::string functionInfo;
+        std::string fileLineInfo;
+        std::getline(ssin, functionInfo);
+        std::getline(ssin, fileLineInfo);
+        finalCrashReport += std::format("\n\t\t{}\n\t\t{}\n", functionInfo, fileLineInfo);
     }
 
     finalCrashReport += "\n\nLog tail:\n";
 
-    finalCrashReport += execAndGet(("cat \"" + Debug::logFile + "\" | tail -n 50").c_str());
+    finalCrashReport += Debug::rollingLog.substr(Debug::rollingLog.find("\n") + 1);
 
     const auto HOME       = getenv("HOME");
     const auto CACHE_HOME = getenv("XDG_CACHE_HOME");
@@ -128,25 +151,18 @@ void CrashReporter::createAndSaveCrash(int sig) {
         return;
 
     std::ofstream ofs;
-    std::string   path;
-    if (!CACHE_HOME || std::string(CACHE_HOME).empty()) {
-        if (!std::filesystem::exists(std::string(HOME) + "/.hyprland")) {
-            std::filesystem::create_directory(std::string(HOME) + "/.hyprland");
-            std::filesystem::permissions(std::string(HOME) + "/.hyprland", std::filesystem::perms::all, std::filesystem::perm_options::replace);
-        }
+    std::string   reportDir;
 
-        path = std::string(HOME) + "/.hyprland/hyprlandCrashReport" + std::to_string(PID) + ".txt";
-        ofs.open(path, std::ios::trunc);
+    if (!CACHE_HOME || std::string(CACHE_HOME).empty())
+        reportDir = std::string(HOME) + "/.cache/hyprland";
+    else
+        reportDir = std::string(CACHE_HOME) + "/hyprland";
 
-    } else {
-        if (!std::filesystem::exists(std::string(CACHE_HOME) + "/hyprland")) {
-            std::filesystem::create_directory(std::string(CACHE_HOME) + "/hyprland");
-            std::filesystem::permissions(std::string(CACHE_HOME) + "/hyprland", std::filesystem::perms::all, std::filesystem::perm_options::replace);
-        }
+    if (!std::filesystem::exists(reportDir))
+        std::filesystem::create_directory(reportDir);
+    const auto path = reportDir + "/hyprlandCrashReport" + std::to_string(PID) + ".txt";
 
-        path = std::string(CACHE_HOME) + "/hyprland/hyprlandCrashReport" + std::to_string(PID) + ".txt";
-        ofs.open(path, std::ios::trunc);
-    }
+    ofs.open(path, std::ios::trunc);
 
     ofs << finalCrashReport;
 

src/debug/HyprCtl.hpp

@@ -3,24 +3,27 @@
 #include "../Compositor.hpp"
 #include <fstream>
 #include "../helpers/MiscFunctions.hpp"
+#include <functional>
 
-namespace HyprCtl {
-    void        startHyprCtlSocket();
-    std::string makeDynamicCall(const std::string& input);
+class CHyprCtl {
+  public:
+    CHyprCtl();
 
-    // very simple thread-safe request method
-    inline bool             requestMade  = false;
-    inline bool             requestReady = false;
-    inline std::string      request      = "";
+    std::string                      makeDynamicCall(const std::string& input);
+    std::shared_ptr<SHyprCtlCommand> registerCommand(SHyprCtlCommand cmd);
+    void                             unregisterCommand(const std::shared_ptr<SHyprCtlCommand>& cmd);
+    std::string                      getReply(std::string);
 
-    inline std::ifstream    requestStream;
+    int                              m_iSocketFD = -1;
 
-    inline wl_event_source* hyprCtlTickSource = nullptr;
+    struct {
+        bool all = false;
+    } m_sCurrentRequestParams;
 
-    inline int              iSocketFD = -1;
+  private:
+    void                                          startHyprCtlSocket();
 
-    enum eHyprCtlOutputFormat {
-        FORMAT_NORMAL = 0,
-        FORMAT_JSON
-    };
+    std::vector<std::shared_ptr<SHyprCtlCommand>> m_vCommands;
 };
+
+inline std::unique_ptr<CHyprCtl> g_pHyprCtl;

src/debug/HyprDebugOverlay.cpp

@@ -233,6 +233,6 @@ void CHyprDebugOverlay::draw() {
 
     glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, PMONITOR->vecPixelSize.x, PMONITOR->vecPixelSize.y, 0, GL_RGBA, GL_UNSIGNED_BYTE, DATA);
 
-    wlr_box pMonBox = {0, 0, PMONITOR->vecPixelSize.x, PMONITOR->vecPixelSize.y};
+    CBox pMonBox = {0, 0, PMONITOR->vecPixelSize.x, PMONITOR->vecPixelSize.y};
     g_pHyprOpenGL->renderTexture(m_tTexture, &pMonBox, 1.f);
 }

src/debug/HyprDebugOverlay.hpp

@@ -24,7 +24,7 @@ class CHyprMonitorDebugOverlay {
     std::deque<float>                              m_dLastAnimationTicks;
     std::chrono::high_resolution_clock::time_point m_tpLastFrame;
     CMonitor*                                      m_pMonitor = nullptr;
-    wlr_box                                        m_wbLastDrawnBox;
+    CBox                                           m_wbLastDrawnBox;
 
     friend class CHyprRenderer;
 };

src/debug/HyprNotificationOverlay.cpp

@@ -3,7 +3,7 @@
 #include <pango/pangocairo.h>
 
 CHyprNotificationOverlay::CHyprNotificationOverlay() {
-    g_pHookSystem->hookDynamic("focusedMon", [&](void* self, std::any param) {
+    g_pHookSystem->hookDynamic("focusedMon", [&](void* self, SCallbackInfo& info, std::any param) {
         if (m_dNotifications.size() == 0)
             return;
 
@@ -36,21 +36,34 @@ CHyprNotificationOverlay::CHyprNotificationOverlay() {
     m_szIconFontName = fonts.substr(COLON + 2, LASTCHAR - (COLON + 2));
 }
 
-void CHyprNotificationOverlay::addNotification(const std::string& text, const CColor& color, const float timeMs, const eIcons icon) {
+void CHyprNotificationOverlay::addNotification(const std::string& text, const CColor& color, const float timeMs, const eIcons icon, const float fontSize) {
     const auto PNOTIF = m_dNotifications.emplace_back(std::make_unique<SNotification>()).get();
 
     PNOTIF->text  = text;
     PNOTIF->color = color == CColor(0) ? ICONS_COLORS[icon] : color;
     PNOTIF->started.reset();
-    PNOTIF->timeMs = timeMs;
-    PNOTIF->icon   = icon;
+    PNOTIF->timeMs   = timeMs;
+    PNOTIF->icon     = icon;
+    PNOTIF->fontSize = fontSize;
 
     for (auto& m : g_pCompositor->m_vMonitors) {
         g_pCompositor->scheduleFrameForMonitor(m.get());
     }
 }
 
-wlr_box CHyprNotificationOverlay::drawNotifications(CMonitor* pMonitor) {
+void CHyprNotificationOverlay::dismissNotifications(const int amount) {
+    if (amount == -1)
+        m_dNotifications.clear();
+    else {
+        const int AMT = std::min(amount, static_cast<int>(m_dNotifications.size()));
+
+        for (int i = 0; i < AMT; ++i) {
+            m_dNotifications.pop_front();
+        }
+    }
+}
+
+CBox CHyprNotificationOverlay::drawNotifications(CMonitor* pMonitor) {
     static constexpr auto ANIM_DURATION_MS   = 600.0;
     static constexpr auto ANIM_LAG_MS        = 100.0;
     static constexpr auto NOTIF_LEFTBAR_SIZE = 5.0;
@@ -61,28 +74,25 @@ wlr_box CHyprNotificationOverlay::drawNotifications(CMonitor* pMonitor) {
     float                 offsetY  = 10;
     float                 maxWidth = 0;
 
-    const auto            SCALE    = pMonitor->scale;
-    const auto            FONTSIZE = std::clamp((int)(13.f * ((pMonitor->vecPixelSize.x * SCALE) / 1920.f)), 8, 40);
+    const auto            SCALE = pMonitor->scale;
 
     const auto            MONSIZE = pMonitor->vecPixelSize;
 
     cairo_text_extents_t  cairoExtents;
     int                   iconW = 0, iconH = 0;
 
-    PangoLayout*          pangoLayout;
-    PangoFontDescription* pangoFD;
-
-    pangoLayout = pango_cairo_create_layout(m_pCairo);
-    pangoFD     = pango_font_description_from_string(("Sans " + std::to_string(FONTSIZE * ICON_SCALE)).c_str());
-    pango_layout_set_font_description(pangoLayout, pangoFD);
-
     cairo_select_font_face(m_pCairo, "Sans", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
-    cairo_set_font_size(m_pCairo, FONTSIZE);
 
     const auto PBEZIER = g_pAnimationManager->getBezier("default");
 
     for (auto& notif : m_dNotifications) {
-        const auto ICONPADFORNOTIF = notif->icon == ICON_NONE ? 0 : ICON_PAD;
+        const auto            ICONPADFORNOTIF = notif->icon == ICON_NONE ? 0 : ICON_PAD;
+        const auto            FONTSIZE        = std::clamp((int)(notif->fontSize * ((pMonitor->vecPixelSize.x * SCALE) / 1920.f)), 8, 40);
+
+        PangoLayout*          pangoLayout = pango_cairo_create_layout(m_pCairo);
+        PangoFontDescription* pangoFD     = pango_font_description_from_string(("Sans " + std::to_string(FONTSIZE * ICON_SCALE)).c_str());
+        pango_layout_set_font_description(pangoLayout, pangoFD);
+        cairo_set_font_size(m_pCairo, FONTSIZE);
 
         // first rect (bg, col)
         const float FIRSTRECTANIMP =
@@ -162,15 +172,15 @@ wlr_box CHyprNotificationOverlay::drawNotifications(CMonitor* pMonitor) {
 
         if (maxWidth < NOTIFSIZE.x)
             maxWidth = NOTIFSIZE.x;
-    }
 
-    pango_font_description_free(pangoFD);
-    g_object_unref(pangoLayout);
+        pango_font_description_free(pangoFD);
+        g_object_unref(pangoLayout);
+    }
 
     // cleanup notifs
     std::erase_if(m_dNotifications, [](const auto& notif) { return notif->started.getMillis() > notif->timeMs; });
 
-    return wlr_box{(int)(pMonitor->vecPosition.x + pMonitor->vecSize.x - maxWidth - 20), (int)pMonitor->vecPosition.y, (int)maxWidth + 20, (int)offsetY + 10};
+    return CBox{(int)(pMonitor->vecPosition.x + pMonitor->vecSize.x - maxWidth - 20), (int)pMonitor->vecPosition.y, (int)maxWidth + 20, (int)offsetY + 10};
 }
 
 void CHyprNotificationOverlay::draw(CMonitor* pMonitor) {
@@ -201,7 +211,7 @@ void CHyprNotificationOverlay::draw(CMonitor* pMonitor) {
 
     cairo_surface_flush(m_pCairoSurface);
 
-    wlr_box damage = drawNotifications(pMonitor);
+    CBox damage = drawNotifications(pMonitor);
 
     g_pHyprRenderer->damageBox(&damage);
     g_pHyprRenderer->damageBox(&m_bLastDamage);
@@ -224,6 +234,10 @@ void CHyprNotificationOverlay::draw(CMonitor* pMonitor) {
 
     glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, pMonitor->vecPixelSize.x, pMonitor->vecPixelSize.y, 0, GL_RGBA, GL_UNSIGNED_BYTE, DATA);
 
-    wlr_box pMonBox = {0, 0, pMonitor->vecPixelSize.x, pMonitor->vecPixelSize.y};
+    CBox pMonBox = {0, 0, pMonitor->vecPixelSize.x, pMonitor->vecPixelSize.y};
     g_pHyprOpenGL->renderTexture(m_tTexture, &pMonBox, 1.f);
 }
+
+bool CHyprNotificationOverlay::hasAny() {
+    return !m_dNotifications.empty();
+}

src/debug/HyprNotificationOverlay.hpp

@@ -10,16 +10,15 @@
 
 #include <cairo/cairo.h>
 
-enum eIconBackend
-{
+enum eIconBackend {
     ICONS_BACKEND_NONE = 0,
     ICONS_BACKEND_NF,
     ICONS_BACKEND_FA
 };
 
 static const std::array<std::array<std::string, ICON_NONE + 1>, 3 /* backends */> ICONS_ARRAY = {
-    std::array<std::string, ICON_NONE + 1>{"[!]", "[i]", "[Hint]", "[Err]", "[?]", "[ok]", ""}, std::array<std::string, ICON_NONE + 1>{"", "", "", "", "", "󰸞", ""},
-    std::array<std::string, ICON_NONE + 1>{"", "", "", "", "", ""}};
+    std::array<std::string, ICON_NONE + 1>{"[!]", "[i]", "[Hint]", "[Err]", "[?]", "[ok]", ""},
+    std::array<std::string, ICON_NONE + 1>{"", "", "", "", "", "󰸞", ""}, std::array<std::string, ICON_NONE + 1>{"", "", "", "", "", ""}};
 static const std::array<CColor, ICON_NONE + 1> ICONS_COLORS = {CColor{255.0 / 255.0, 204 / 255.0, 102 / 255.0, 1.0},
                                                                CColor{128 / 255.0, 255 / 255.0, 255 / 255.0, 1.0},
                                                                CColor{179 / 255.0, 255 / 255.0, 204 / 255.0, 1.0},
@@ -32,8 +31,9 @@ struct SNotification {
     std::string text = "";
     CColor      color;
     CTimer      started;
-    float       timeMs = 0;
-    eIcons      icon   = ICON_NONE;
+    float       timeMs   = 0;
+    eIcons      icon     = ICON_NONE;
+    float       fontSize = 13.f;
 };
 
 class CHyprNotificationOverlay {
@@ -41,11 +41,13 @@ class CHyprNotificationOverlay {
     CHyprNotificationOverlay();
 
     void draw(CMonitor* pMonitor);
-    void addNotification(const std::string& text, const CColor& color, const float timeMs, const eIcons icon = ICON_NONE);
+    void addNotification(const std::string& text, const CColor& color, const float timeMs, const eIcons icon = ICON_NONE, const float fontSize = 13.f);
+    void dismissNotifications(const int amount);
+    bool hasAny();
 
   private:
-    wlr_box                                    drawNotifications(CMonitor* pMonitor);
-    wlr_box                                    m_bLastDamage;
+    CBox                                       drawNotifications(CMonitor* pMonitor);
+    CBox                                       m_bLastDamage;
 
     std::deque<std::unique_ptr<SNotification>> m_dNotifications;
 

src/debug/Log.cpp

@@ -10,25 +10,24 @@ void Debug::init(const std::string& IS) {
 }
 
 void Debug::wlrLog(wlr_log_importance level, const char* fmt, va_list args) {
-    if (disableLogs && *disableLogs)
-        return;
-
     if (level > wlr_log_get_verbosity())
         return;
 
-    char*         outputStr = nullptr;
-
-    std::ofstream ofs;
-    ofs.open(logFile, std::ios::out | std::ios::app);
+    char* outputStr = nullptr;
 
     vasprintf(&outputStr, fmt, args);
 
     std::string output = std::string(outputStr);
     free(outputStr);
 
-    ofs << "[wlr] " << output << "\n";
+    rollingLog += output + "\n";
 
-    ofs.close();
+    if (!disableLogs || !**disableLogs) {
+        std::ofstream ofs;
+        ofs.open(logFile, std::ios::out | std::ios::app);
+        ofs << "[wlr] " << output << "\n";
+        ofs.close();
+    }
 
     if (!disableStdout)
         std::cout << output << "\n";

src/debug/Log.hpp

@@ -1,13 +1,14 @@
 #pragma once
 #include <string>
-#include <wlr/util/log.h>
 #include <format>
 #include <iostream>
 #include <fstream>
 #include <chrono>
+#include "../includes.hpp"
 #include "../helpers/MiscFunctions.hpp"
 
-#define LOGMESSAGESIZE 1024
+#define LOGMESSAGESIZE   1024
+#define ROLLING_LOG_SIZE 4096
 
 enum LogLevel {
     NONE = -1,
@@ -20,19 +21,22 @@ enum LogLevel {
 };
 
 namespace Debug {
-    inline std::string logFile;
-    inline int64_t*    disableLogs   = nullptr;
-    inline int64_t*    disableTime   = nullptr;
-    inline bool        disableStdout = false;
-    inline bool        trace         = false;
+    inline std::string     logFile;
+    inline int64_t* const* disableLogs   = nullptr;
+    inline int64_t* const* disableTime   = nullptr;
+    inline bool            disableStdout = false;
+    inline bool            trace         = false;
+    inline bool            shuttingDown  = false;
 
-    void               init(const std::string& IS);
+    inline std::string     rollingLog = ""; // rolling log contains the ROLLING_LOG_SIZE tail of the log
+
+    void                   init(const std::string& IS);
     template <typename... Args>
     void log(LogLevel level, std::format_string<Args...> fmt, Args&&... args) {
-        if (disableLogs && *disableLogs)
+        if (level == TRACE && !trace)
             return;
 
-        if (level == TRACE && !trace)
+        if (shuttingDown)
             return;
 
         std::string logMsg = "";
@@ -47,12 +51,8 @@ namespace Debug {
             default: break;
         }
 
-        // log to a file
-        std::ofstream ofs;
-        ofs.open(logFile, std::ios::out | std::ios::app);
-
         // print date and time to the ofs
-        if (disableTime && !*disableTime) {
+        if (disableTime && !**disableTime) {
 #ifndef _LIBCPP_VERSION
             logMsg += std::format("[{:%T}] ", std::chrono::hh_mm_ss{std::chrono::system_clock::now() - std::chrono::floor<std::chrono::days>(std::chrono::system_clock::now())});
 #else
@@ -69,9 +69,18 @@ namespace Debug {
         // 3. this is actually what std::format in stdlib does
         logMsg += std::vformat(fmt.get(), std::make_format_args(args...));
 
-        ofs << logMsg << "\n";
+        rollingLog += logMsg + "\n";
+        if (rollingLog.size() > ROLLING_LOG_SIZE)
+            rollingLog = rollingLog.substr(rollingLog.size() - ROLLING_LOG_SIZE);
 
-        ofs.close();
+        if (!disableLogs || !**disableLogs) {
+            // log to a file
+            std::ofstream ofs;
+            ofs.open(logFile, std::ios::out | std::ios::app);
+            ofs << logMsg << "\n";
+
+            ofs.close();
+        }
 
         // log it to the stdout too.
         if (!disableStdout)

src/debug/TracyDefines.hpp

@@ -13,15 +13,6 @@ inline PFNGLGETQUERYOBJECTUI64VEXTPROC glGetQueryObjectui64v;
 
 #include "../../subprojects/tracy/public/tracy/TracyOpenGL.hpp"
 
-inline void loadGLProc(void* pProc, const char* name) {
-    void* proc = (void*)eglGetProcAddress(name);
-    if (proc == NULL) {
-        Debug::log(CRIT, "[Tracy GPU Profiling] eglGetProcAddress({}) failed", name);
-        abort();
-    }
-    *(void**)pProc = proc;
-}
-
 #define TRACY_GPU_CONTEXT TracyGpuContext
 #define TRACY_GPU_ZONE(e) TracyGpuZone(e)
 #define TRACY_GPU_COLLECT TracyGpuCollect

src/desktop/Constraint.cpp

@@ -0,0 +1,131 @@
+#include "Constraint.hpp"
+#include "WLSurface.hpp"
+#include "../Compositor.hpp"
+
+CConstraint::CConstraint(wlr_pointer_constraint_v1* constraint, CWLSurface* owner) : m_pOwner(owner), m_pConstraint(constraint) {
+    RASSERT(!constraint->data, "CConstraint: attempted to duplicate ownership");
+
+    constraint->data = this;
+    initSignals();
+
+    m_vCursorPosOnActivate = g_pInputManager->getMouseCoordsInternal();
+
+    g_pInputManager->m_vConstraints.push_back(this);
+
+    if (g_pCompositor->m_pLastFocus == m_pOwner->wlr())
+        activate();
+}
+
+CConstraint::~CConstraint() {
+    std::erase(g_pInputManager->m_vConstraints, this);
+}
+
+static void onConstraintDestroy(void* owner, void* data) {
+    const auto CONSTRAINT = (CConstraint*)owner;
+    CONSTRAINT->onDestroy();
+}
+
+static void onConstraintSetRegion(void* owner, void* data) {
+    const auto CONSTRAINT = (CConstraint*)owner;
+    CONSTRAINT->onSetRegion();
+}
+
+void CConstraint::initSignals() {
+    hyprListener_setConstraintRegion.initCallback(&m_pConstraint->events.set_region, ::onConstraintSetRegion, this, "CConstraint");
+    hyprListener_destroyConstraint.initCallback(&m_pConstraint->events.destroy, ::onConstraintDestroy, this, "CConstraint");
+}
+
+void CConstraint::onDestroy() {
+    hyprListener_setConstraintRegion.removeCallback();
+    hyprListener_destroyConstraint.removeCallback();
+
+    if (active() && isLocked())
+        g_pCompositor->warpCursorTo(logicPositionHint(), true);
+
+    // this is us
+    m_pOwner->m_pConstraint.reset();
+}
+
+void CConstraint::onSetRegion() {
+    if (!m_bActive)
+        return;
+
+    m_rRegion.set(&m_pConstraint->region);
+    m_vPositionHint = m_rRegion.closestPoint(m_vPositionHint);
+    g_pInputManager->simulateMouseMovement(); // to warp the cursor if anything's amiss
+}
+
+void CConstraint::onCommit() {
+    if (!m_bActive)
+        return;
+
+    const auto COMMITTED = m_pConstraint->current.committed;
+
+    if (COMMITTED & WLR_POINTER_CONSTRAINT_V1_STATE_CURSOR_HINT) {
+        m_bHintSet      = true;
+        m_vPositionHint = {m_pConstraint->current.cursor_hint.x, m_pConstraint->current.cursor_hint.y};
+        g_pInputManager->simulateMouseMovement();
+    }
+
+    if (COMMITTED & WLR_POINTER_CONSTRAINT_V1_STATE_REGION)
+        onSetRegion();
+}
+
+CRegion CConstraint::logicConstraintRegion() {
+    CRegion    rg            = m_rRegion;
+    const auto SURFBOX       = m_pOwner->getSurfaceBoxGlobal();
+    const auto CONSTRAINTPOS = SURFBOX.has_value() ? SURFBOX->pos() : Vector2D{};
+    rg.translate(CONSTRAINTPOS);
+    return rg;
+}
+
+CWLSurface* CConstraint::owner() {
+    return m_pOwner;
+}
+
+bool CConstraint::isLocked() {
+    return m_pConstraint->type == WLR_POINTER_CONSTRAINT_V1_LOCKED;
+}
+
+Vector2D CConstraint::logicPositionHint() {
+    const auto SURFBOX       = m_pOwner->getSurfaceBoxGlobal();
+    const auto CONSTRAINTPOS = SURFBOX.has_value() ? SURFBOX->pos() : Vector2D{};
+
+    return m_bHintSet ? CONSTRAINTPOS + m_vPositionHint : m_vCursorPosOnActivate;
+}
+
+void CConstraint::deactivate() {
+    if (!m_bActive)
+        return;
+
+    m_bActive = false;
+
+    if (isLocked())
+        g_pCompositor->warpCursorTo(logicPositionHint(), true);
+
+    if (m_pConstraint->lifetime == ZWP_POINTER_CONSTRAINTS_V1_LIFETIME_ONESHOT)
+        m_bDead = true;
+
+    wlr_pointer_constraint_v1_send_deactivated(m_pConstraint);
+}
+
+void CConstraint::activate() {
+    if (m_bActive || m_bDead)
+        return;
+
+    m_bActive = true;
+
+    // TODO: hack, probably not a super duper great idea
+    if (g_pCompositor->m_sSeat.seat->pointer_state.focused_surface != m_pOwner->wlr()) {
+        const auto SURFBOX = m_pOwner->getSurfaceBoxGlobal();
+        const auto LOCAL   = SURFBOX.has_value() ? logicPositionHint() - SURFBOX->pos() : Vector2D{};
+        wlr_seat_pointer_enter(g_pCompositor->m_sSeat.seat, m_pOwner->wlr(), LOCAL.x, LOCAL.y);
+    }
+
+    g_pCompositor->warpCursorTo(logicPositionHint(), true);
+    wlr_pointer_constraint_v1_send_activated(m_pConstraint);
+}
+
+bool CConstraint::active() {
+    return m_bActive;
+}

src/desktop/Constraint.hpp

@@ -0,0 +1,44 @@
+#pragma once
+
+#include "../includes.hpp"
+#include "../helpers/Region.hpp"
+#include "../helpers/WLListener.hpp"
+
+class CWLSurface;
+
+class CConstraint {
+  public:
+    CConstraint(wlr_pointer_constraint_v1* constraint, CWLSurface* owner);
+    ~CConstraint();
+
+    void        onCommit();
+    void        onDestroy();
+    void        onSetRegion();
+    CRegion     logicConstraintRegion();
+    bool        isLocked();
+    Vector2D    logicPositionHint();
+
+    void        deactivate();
+    void        activate();
+    bool        active();
+
+    CWLSurface* owner();
+
+  private:
+    bool                       m_bActive = false;
+    CWLSurface*                m_pOwner  = nullptr;
+    wlr_pointer_constraint_v1* m_pConstraint;
+
+    CRegion                    m_rRegion;
+    bool                       m_bHintSet             = false;
+    Vector2D                   m_vPositionHint        = {-1, -1};
+    Vector2D                   m_vCursorPosOnActivate = {-1, -1};
+
+    // for oneshot constraints that have been activated once
+    bool m_bDead = false;
+
+    DYNLISTENER(destroyConstraint);
+    DYNLISTENER(setConstraintRegion);
+
+    void initSignals();
+};

src/desktop/DesktopTypes.hpp

@@ -0,0 +1,6 @@
+#pragma once
+#include <memory>
+
+class CWorkspace;
+
+typedef std::shared_ptr<CWorkspace> PHLWORKSPACE;

src/desktop/Popup.cpp

@@ -0,0 +1,269 @@
+#include "Popup.hpp"
+#include "../config/ConfigValue.hpp"
+#include "../Compositor.hpp"
+
+CPopup::CPopup(CWindow* pOwner) : m_pWindowOwner(pOwner) {
+    initAllSignals();
+}
+
+CPopup::CPopup(SLayerSurface* pOwner) : m_pLayerOwner(pOwner) {
+    initAllSignals();
+}
+
+CPopup::CPopup(wlr_xdg_popup* popup, CPopup* pOwner) : m_pParent(pOwner), m_pWLR(popup) {
+    m_pWLR->base->data = this;
+    m_sWLSurface.assign(popup->base->surface, this);
+
+    m_pLayerOwner  = pOwner->m_pLayerOwner;
+    m_pWindowOwner = pOwner->m_pWindowOwner;
+
+    m_vLastSize = {m_pWLR->current.geometry.width, m_pWLR->current.geometry.height};
+    unconstrain();
+
+    initAllSignals();
+}
+
+CPopup::~CPopup() {
+    m_sWLSurface.unassign();
+    if (m_pWLR)
+        m_pWLR->base->data = nullptr;
+
+    hyprListener_commitPopup.removeCallback();
+    hyprListener_repositionPopup.removeCallback();
+    hyprListener_mapPopup.removeCallback();
+    hyprListener_unmapPopup.removeCallback();
+    hyprListener_newPopup.removeCallback();
+    hyprListener_destroyPopup.removeCallback();
+}
+
+static void onNewPopup(void* owner, void* data) {
+    const auto POPUP = (CPopup*)owner;
+    POPUP->onNewPopup((wlr_xdg_popup*)data);
+}
+
+static void onMapPopup(void* owner, void* data) {
+    const auto POPUP = (CPopup*)owner;
+    POPUP->onMap();
+}
+
+static void onDestroyPopup(void* owner, void* data) {
+    const auto POPUP = (CPopup*)owner;
+    POPUP->onDestroy();
+}
+
+static void onUnmapPopup(void* owner, void* data) {
+    const auto POPUP = (CPopup*)owner;
+    POPUP->onUnmap();
+}
+
+static void onCommitPopup(void* owner, void* data) {
+    const auto POPUP = (CPopup*)owner;
+    POPUP->onCommit();
+}
+
+static void onRepositionPopup(void* owner, void* data) {
+    const auto POPUP = (CPopup*)owner;
+    POPUP->onReposition();
+}
+
+void CPopup::initAllSignals() {
+
+    if (!m_pWLR) {
+        if (m_pWindowOwner)
+            hyprListener_newPopup.initCallback(&m_pWindowOwner->m_uSurface.xdg->events.new_popup, ::onNewPopup, this, "CPopup Head");
+        else if (m_pLayerOwner)
+            hyprListener_newPopup.initCallback(&m_pLayerOwner->layerSurface->events.new_popup, ::onNewPopup, this, "CPopup Head");
+        else
+            ASSERT(false);
+
+        return;
+    }
+
+    hyprListener_repositionPopup.initCallback(&m_pWLR->events.reposition, ::onRepositionPopup, this, "CPopup");
+    hyprListener_destroyPopup.initCallback(&m_pWLR->events.destroy, ::onDestroyPopup, this, "CPopup");
+    hyprListener_mapPopup.initCallback(&m_sWLSurface.wlr()->events.map, ::onMapPopup, this, "CPopup");
+    hyprListener_unmapPopup.initCallback(&m_sWLSurface.wlr()->events.unmap, ::onUnmapPopup, this, "CPopup");
+    hyprListener_commitPopup.initCallback(&m_sWLSurface.wlr()->events.commit, ::onCommitPopup, this, "CPopup");
+    hyprListener_newPopup.initCallback(&m_pWLR->base->events.new_popup, ::onNewPopup, this, "CPopup");
+}
+
+void CPopup::onNewPopup(wlr_xdg_popup* popup) {
+    const auto POPUP = m_vChildren.emplace_back(std::make_unique<CPopup>(popup, this)).get();
+    Debug::log(LOG, "New popup at wlr {:x} and hl {:x}", (uintptr_t)popup, (uintptr_t)POPUP);
+}
+
+void CPopup::onDestroy() {
+    m_bInert = true;
+
+    if (!m_pParent)
+        return; // head node
+
+    std::erase_if(m_pParent->m_vChildren, [this](const auto& other) { return other.get() == this; });
+}
+
+void CPopup::onMap() {
+    m_vLastSize       = {m_pWLR->base->current.geometry.width, m_pWLR->base->current.geometry.height};
+    const auto COORDS = coordsGlobal();
+
+    CBox       box;
+    wlr_surface_get_extends(m_sWLSurface.wlr(), box.pWlr());
+    box.applyFromWlr().translate(COORDS).expand(4);
+    g_pHyprRenderer->damageBox(&box);
+
+    m_vLastPos = coordsRelativeToParent();
+
+    g_pInputManager->simulateMouseMovement();
+
+    m_pSubsurfaceHead = std::make_unique<CSubsurface>(this);
+
+    unconstrain();
+    sendScale();
+
+    if (m_pLayerOwner && m_pLayerOwner->layer < ZWLR_LAYER_SHELL_V1_LAYER_TOP)
+        g_pHyprOpenGL->markBlurDirtyForMonitor(g_pCompositor->getMonitorFromID(m_pLayerOwner->layer));
+}
+
+void CPopup::onUnmap() {
+    m_vLastSize       = {m_pWLR->base->current.geometry.width, m_pWLR->base->current.geometry.height};
+    const auto COORDS = coordsGlobal();
+
+    CBox       box;
+    wlr_surface_get_extends(m_sWLSurface.wlr(), box.pWlr());
+    box.applyFromWlr().translate(COORDS).expand(4);
+    g_pHyprRenderer->damageBox(&box);
+
+    m_pSubsurfaceHead.reset();
+
+    g_pInputManager->simulateMouseMovement();
+
+    if (m_pLayerOwner && m_pLayerOwner->layer < ZWLR_LAYER_SHELL_V1_LAYER_TOP)
+        g_pHyprOpenGL->markBlurDirtyForMonitor(g_pCompositor->getMonitorFromID(m_pLayerOwner->layer));
+}
+
+void CPopup::onCommit(bool ignoreSiblings) {
+    if (m_pWLR->base->initial_commit) {
+        wlr_xdg_surface_schedule_configure(m_pWLR->base);
+        return;
+    }
+
+    if (m_pWindowOwner && (!m_pWindowOwner->m_bIsMapped || !m_pWindowOwner->m_pWorkspace->m_bVisible)) {
+        m_vLastSize = {m_pWLR->base->current.geometry.width, m_pWLR->base->current.geometry.height};
+
+        static auto PLOGDAMAGE = CConfigValue<Hyprlang::INT>("debug:log_damage");
+        if (*PLOGDAMAGE)
+            Debug::log(LOG, "Refusing to commit damage from a subsurface of {} because it's invisible.", m_pWindowOwner);
+        return;
+    }
+
+    if (!m_pWLR->base->surface->mapped)
+        return;
+
+    const auto COORDS      = coordsGlobal();
+    const auto COORDSLOCAL = coordsRelativeToParent();
+
+    if (m_vLastSize != Vector2D{m_pWLR->base->current.geometry.width, m_pWLR->base->current.geometry.height} || m_bRequestedReposition || m_vLastPos != COORDSLOCAL) {
+        CBox box = {localToGlobal(m_vLastPos), m_vLastSize};
+        g_pHyprRenderer->damageBox(&box);
+        m_vLastSize = {m_pWLR->base->current.geometry.width, m_pWLR->base->current.geometry.height};
+        box         = {COORDS, m_vLastSize};
+        g_pHyprRenderer->damageBox(&box);
+
+        m_vLastPos = COORDSLOCAL;
+    }
+
+    if (!ignoreSiblings && m_pSubsurfaceHead)
+        m_pSubsurfaceHead->recheckDamageForSubsurfaces();
+
+    g_pHyprRenderer->damageSurface(m_sWLSurface.wlr(), COORDS.x, COORDS.y);
+
+    m_bRequestedReposition = false;
+
+    if (m_pLayerOwner && m_pLayerOwner->layer < ZWLR_LAYER_SHELL_V1_LAYER_TOP)
+        g_pHyprOpenGL->markBlurDirtyForMonitor(g_pCompositor->getMonitorFromID(m_pLayerOwner->layer));
+}
+
+void CPopup::onReposition() {
+    Debug::log(LOG, "Popup {:x} requests reposition", (uintptr_t)this);
+
+    m_bRequestedReposition = true;
+
+    m_vLastPos = coordsRelativeToParent();
+
+    unconstrain();
+}
+
+void CPopup::unconstrain() {
+    const auto COORDS   = t1ParentCoords();
+    const auto PMONITOR = g_pCompositor->getMonitorFromVector(COORDS);
+
+    if (!PMONITOR)
+        return;
+
+    CBox box = {PMONITOR->vecPosition.x - COORDS.x, PMONITOR->vecPosition.y - COORDS.y, PMONITOR->vecSize.x, PMONITOR->vecSize.y};
+    wlr_xdg_popup_unconstrain_from_box(m_pWLR, box.pWlr());
+}
+
+Vector2D CPopup::coordsRelativeToParent() {
+    Vector2D offset;
+
+    CPopup*  current = this;
+
+    offset -= {m_pWLR->base->current.geometry.x, m_pWLR->base->current.geometry.y};
+
+    while (current->m_pParent) {
+
+        offset += {current->m_sWLSurface.wlr()->current.dx, current->m_sWLSurface.wlr()->current.dy};
+        offset += {current->m_pWLR->current.geometry.x, current->m_pWLR->current.geometry.y};
+
+        current = current->m_pParent;
+    }
+
+    return offset;
+}
+
+Vector2D CPopup::coordsGlobal() {
+    return localToGlobal(coordsRelativeToParent());
+}
+
+Vector2D CPopup::localToGlobal(const Vector2D& rel) {
+    return t1ParentCoords() + rel;
+}
+
+Vector2D CPopup::t1ParentCoords() {
+    if (m_pWindowOwner)
+        return m_pWindowOwner->m_vRealPosition.value();
+    if (m_pLayerOwner)
+        return m_pLayerOwner->realPosition.value();
+
+    ASSERT(false);
+    return {};
+}
+
+void CPopup::recheckTree() {
+    CPopup* curr = this;
+    while (curr->m_pParent) {
+        curr = curr->m_pParent;
+    }
+
+    curr->recheckChildrenRecursive();
+}
+
+void CPopup::recheckChildrenRecursive() {
+    for (auto& c : m_vChildren) {
+        c->onCommit(true);
+        c->recheckChildrenRecursive();
+    }
+}
+
+Vector2D CPopup::size() {
+    return m_vLastSize;
+}
+
+void CPopup::sendScale() {
+    if (m_pWindowOwner)
+        g_pCompositor->setPreferredScaleForSurface(m_sWLSurface.wlr(), m_pWindowOwner->m_pWLSurface.m_fLastScale);
+    else if (m_pLayerOwner)
+        g_pCompositor->setPreferredScaleForSurface(m_sWLSurface.wlr(), m_pLayerOwner->surface.m_fLastScale);
+    else
+        UNREACHABLE();
+}

src/desktop/Popup.hpp

@@ -0,0 +1,72 @@
+#pragma once
+
+#include <vector>
+#include <memory>
+#include "Subsurface.hpp"
+
+struct SLayerSurface;
+
+class CPopup {
+  public:
+    // dummy head nodes
+    CPopup(CWindow* pOwner);
+    CPopup(SLayerSurface* pOwner);
+
+    // real nodes
+    CPopup(wlr_xdg_popup* popup, CPopup* pOwner);
+
+    ~CPopup();
+
+    Vector2D   coordsRelativeToParent();
+    Vector2D   coordsGlobal();
+
+    Vector2D   size();
+
+    void       onNewPopup(wlr_xdg_popup* popup);
+    void       onDestroy();
+    void       onMap();
+    void       onUnmap();
+    void       onCommit(bool ignoreSiblings = false);
+    void       onReposition();
+
+    void       recheckTree();
+
+    CWLSurface m_sWLSurface;
+
+  private:
+    // T1 owners, each popup has to have one of these
+    CWindow*       m_pWindowOwner = nullptr;
+    SLayerSurface* m_pLayerOwner  = nullptr;
+
+    // T2 owners
+    CPopup*        m_pParent = nullptr;
+
+    wlr_xdg_popup* m_pWLR = nullptr;
+
+    Vector2D       m_vLastSize = {};
+    Vector2D       m_vLastPos  = {};
+
+    bool           m_bRequestedReposition = false;
+
+    bool           m_bInert = false;
+
+    //
+    std::vector<std::unique_ptr<CPopup>> m_vChildren;
+    std::unique_ptr<CSubsurface>         m_pSubsurfaceHead;
+
+    // signals
+    DYNLISTENER(newPopup);
+    DYNLISTENER(destroyPopup);
+    DYNLISTENER(mapPopup);
+    DYNLISTENER(unmapPopup);
+    DYNLISTENER(commitPopup);
+    DYNLISTENER(repositionPopup);
+
+    void     initAllSignals();
+    void     unconstrain();
+    void     recheckChildrenRecursive();
+    void     sendScale();
+
+    Vector2D localToGlobal(const Vector2D& rel);
+    Vector2D t1ParentCoords();
+};