props: bump ver to 0.38.1

fixes #5333

.github/ISSUE_TEMPLATE/bug.yml

@@ -5,33 +5,15 @@ body:
   - type: markdown
     attributes:
       value: |
-        ## Before opening a new issue, please take a moment to search through the current open and closed issues to check if it already exists.
+        Before opening a new issue, take a moment to search through the current open ones.
 
         ---
 
-  - type: dropdown
-    id: type
-    attributes:
-      label: Regression?
-      description: |
-        Regression means that something used to work but no longer does.
-        **BEFORE CONTINUING**, please check if this bug is a regression or not, and if it is, we need you to bisect with the help of the wiki: https://wiki.hyprland.org/Crashes-and-Bugs/#bisecting-an-issue
-      multiple: true
-      options:
-        - "Yes"
-        - "No"
-    validations:
-      required: true
-
   - type: textarea
     id: ver
     attributes:
-      label: System Info and Version
-      description: |
-        Paste the output of `hyprctl systeminfo -c` here (If you are on a 
-        version that shows you help menu, omit the `-c` and attach config files
-        to the issue). If you have configs outside of the main config shown 
-        here, please attach.
+      label: Hyprland Version
+      description: "Paste the output of `hyprctl systeminfo` here."
       value: "<details>
         <summary>System/Version info</summary>
 
@@ -47,6 +29,17 @@ body:
     validations:
       required: true
 
+  - type: dropdown
+    id: type
+    attributes:
+      label: Bug or Regression?
+      description: Is this a bug or a regression?
+      options:
+        - Bug
+        - Regression
+    validations:
+      required: true
+
   - type: textarea
     id: desc
     attributes:
@@ -69,6 +62,6 @@ body:
       label: Crash reports, logs, images, videos
       description: |
         Anything that can help. Please always ATTACH and not paste them.
-        Logs can be found in $XDG_RUNTIME_DIR/hypr
+        Logs can be found in /tmp/hypr
         Crash reports are stored in ~/.cache/hyprland or $XDG_CACHE_HOME/hyprland
 

.github/actions/setup_base/action.yml

@@ -12,6 +12,7 @@ runs:
     - 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 \
@@ -24,7 +25,6 @@ runs:
           glslang \
           go \
           hyprlang \
-          hyprcursor \
           jq \
           libc++ \
           libdisplay-info \
@@ -44,7 +44,6 @@ runs:
           pango \
           pixman \
           pkgconf \
-          pugixml \
           scdoc \
           seatd \
           systemd \
@@ -54,25 +53,18 @@ runs:
           xcb-util-errors \
           xcb-util-renderutil \
           xcb-util-wm \
-          xcb-util \
-          xcb-util-image \
           libzip \
           librsvg
 
-    - name: Get hyprwayland-scanner-git
+    - name: Get hyprcursor-git
       shell: bash
       run: |
-        git clone https://github.com/hyprwm/hyprwayland-scanner --recursive
-        cd hyprwayland-scanner
+        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 hyprutils-git
-      shell: bash
-      run: |
-        git clone https://github.com/hyprwm/hyprutils && cd hyprutils && cmake -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:PATH=/usr -B build && cmake --build build --target hyprutils && cmake --install build
-
     - name: Get Xorg pacman pkgs
       shell: bash
       if: inputs.INSTALL_XORG_PKGS == 'true'

.github/labeler.yml

@@ -1,83 +0,0 @@
-assets:
-  - changed-files:
-      - any-glob-to-any-file: "assets/**"
-
-docs:
-  - changed-files:
-      - any-glob-to-any-file: "docs/**"
-
-hyprctl:
-  - changed-files:
-      - any-glob-to-any-file: "hyprctl/**"
-
-hyprpm:
-  - changed-files:
-      - any-glob-to-any-file: "hyprpm/**"
-
-nix:
-  - changed-files:
-      - any-glob-to-any-file: "nix/**"
-
-protocols:
-  - changed-files:
-      - any-glob-to-any-file: ["protocols/**", "src/protocols/**"]
-
-core:
-  - changed-files:
-      - any-glob-to-any-file: "src/**"
-
-config:
-  - changed-files:
-      - any-glob-to-any-file: "src/config/**"
-
-debug:
-  - changed-files:
-      - any-glob-to-any-file: "src/debug/**"
-
-desktop:
-  - changed-files:
-      - any-glob-to-any-file: "src/desktop/**"
-
-devices:
-  - changed-files:
-      - any-glob-to-any-file: "src/devices/**"
-
-events:
-  - changed-files:
-      - any-glob-to-any-file: "src/events/**"
-
-helpers:
-  - changed-files:
-      - any-glob-to-any-file: "src/helpers/**"
-
-hyprerror:
-  - changed-files:
-      - any-glob-to-any-file: "src/hyprerror/**"
-
-init:
-  - changed-files:
-      - any-glob-to-any-file: "src/init/**"
-
-layout:
-  - changed-files:
-      - any-glob-to-any-file: "src/layout/**"
-
-managers:
-  - changed-files:
-      - any-glob-to-any-file: "src/managers/**"
-
-pch:
-  - changed-files:
-      - any-glob-to-any-file: "src/pch/**"
-
-plugins:
-  - changed-files:
-      - any-glob-to-any-file: "src/plugins/**"
-
-render:
-  - changed-files:
-      - any-glob-to-any-file: "src/render/**"
-
-xwayland:
-  - changed-files:
-      - any-glob-to-any-file: "src/xwayland/**"

.github/workflows/ci.yaml

@@ -32,6 +32,7 @@ jobs:
           cp build/Hyprland hyprland/
           cp build/hyprctl/hyprctl hyprland/
           cp build/hyprpm/hyprpm hyprland/
+          cp subprojects/wlroots/build/libwlroots.so.13032 hyprland/
           cp build/Hyprland hyprland/
           cp -r example/ hyprland/
           cp -r assets/ hyprland/
@@ -63,25 +64,6 @@ jobs:
       - name: Compile
         run: ninja -C build
 
-  no-pch:
-    name: "Build Hyprland without precompiled headers (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
-        with:
-          INSTALL_XORG_PKGS: true
-
-      - name: Compile
-        run: make nopch
-
   noxwayland:
     name: "Build Hyprland in pure Wayland (Arch)"
     runs-on: ubuntu-latest

.github/workflows/labeler.yml

@@ -1,12 +0,0 @@
-name: "Pull Request Labeler"
-on:
-  - pull_request_target
-
-jobs:
-  labeler:
-    permissions:
-      contents: read
-      pull-requests: write
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/labeler@v5

.github/workflows/nix-build.yml

@@ -18,13 +18,12 @@ jobs:
         uses: actions/checkout@v3
         with:
           ref: ${{ github.ref }}
-          submodules: recursive
 
-      - uses: cachix/install-nix-action@v26
+      - 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 '.?submodules=1#${{ matrix.package }}' -L --extra-substituters "https://hyprland.cachix.org"
+      - run: nix build .#${{ matrix.package }} -L

.github/workflows/nix-ci.yml

@@ -3,13 +3,13 @@ name: Nix
 on: [push, pull_request, workflow_dispatch]
 
 jobs:
-  update-inputs:
-    if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
-    uses: ./.github/workflows/nix-update-inputs.yml
+  wlroots:
+    if: github.event_name != 'pull_request'
+    uses: ./.github/workflows/nix-update-wlroots.yml
     secrets: inherit
 
   build:
     if: always() && !cancelled() && !contains(needs.*.result, 'failure')
-    needs: update-inputs
+    needs: wlroots
     uses: ./.github/workflows/nix-build.yml
     secrets: inherit

.github/workflows/nix-update-inputs.yml

@@ -1,10 +1,8 @@
 name: Nix
 
 on:
-  workflow_call:
-    secrets:
-      PAT:
-        required: true
+  schedule:
+    - cron: '0 0 * * *' # check daily
 
 jobs:
   update:
@@ -24,3 +22,8 @@ jobs:
         uses: stefanzweifel/git-auto-commit-action@v4
         with:
           commit_message: "[gha] Nix: update inputs"
+
+  update-build:
+    needs: update
+    uses: ./.github/workflows/nix-build.yml
+    secrets: inherit

.github/workflows/nix-update-wlroots.yml

@@ -0,0 +1,26 @@
+name: Nix
+
+on:
+  workflow_call:
+    secrets:
+      PAT:
+        required: true
+
+jobs:
+  update:
+    name: wlroots
+    runs-on: ubuntu-latest
+    steps:
+    - name: Clone repository
+      uses: actions/checkout@v3
+      with:
+        token: ${{ secrets.PAT }}
+
+    - uses: DeterminateSystems/nix-installer-action@main
+    - name: Update lockfile
+      run: nix/update-wlroots.sh
+
+    - name: Commit
+      uses: stefanzweifel/git-auto-commit-action@v4
+      with:
+        commit_message: "[gha] Nix: update wlroots"

.github/workflows/release.yaml

@@ -18,7 +18,6 @@ jobs:
       - name: Generate version
         id: genversion
         run: |
-          git fetch --unshallow || echo "failed unshallowing"
           bash -c scripts/generateVersion.sh
           mv scripts/generateVersion.sh scripts/generateVersion.sh.bak
 

.gitignore

@@ -17,8 +17,8 @@ result*
 .cache
 
 *.o
-protocols/*.c*
-protocols/*.h*
+*-protocol.c
+*-protocol.h
 .ccls-cache
 *.so
 

.gitmodules

@@ -1,3 +1,6 @@
+[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
@@ -7,7 +10,3 @@
 [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
-	ignore = dirty

CMakeLists.txt

@@ -1,8 +1,5 @@
-cmake_minimum_required(VERSION 3.27)
-
+cmake_minimum_required(VERSION 3.19)
 include(CheckIncludeFile)
-include(ExternalProject)
-include(GNUInstallDirs)
 
 # Get version
 file(READ ${CMAKE_CURRENT_SOURCE_DIR}/props.json PROPS)
@@ -15,8 +12,7 @@ project(Hyprland
 
 set(HYPRLAND_VERSION ${VER})
 set(PREFIX ${CMAKE_INSTALL_PREFIX})
-set(INCLUDEDIR ${CMAKE_INSTALL_INCLUDEDIR})
-configure_file(hyprland.pc.in hyprland.pc @ONLY)
+configure_file(hyprland.pc.in hyprland.pc @ONLY) 
 
 set(CMAKE_MESSAGE_LOG_LEVEL "STATUS")
 
@@ -27,6 +23,8 @@ message(STATUS "Gathering git info")
 execute_process(
     COMMAND ./scripts/generateVersion.sh
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
+#
+#
 
 # udis
 add_subdirectory("subprojects/udis86")
@@ -34,6 +32,8 @@ add_subdirectory("subprojects/udis86")
 # wlroots
 message(STATUS "Setting up wlroots")
 
+include(ExternalProject)
+
 if(CMAKE_BUILD_TYPE)
     string(TOLOWER ${CMAKE_BUILD_TYPE} BUILDTYPE_LOWER)
     if(BUILDTYPE_LOWER STREQUAL "release")
@@ -54,24 +54,26 @@ else()
 endif()
 
 ExternalProject_Add(
-    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>
+    wlroots
+    PREFIX ${CMAKE_SOURCE_DIR}/subprojects/wlroots
+    SOURCE_DIR ${CMAKE_SOURCE_DIR}/subprojects/wlroots
+    PATCH_COMMAND sed -E -i -e "s/(soversion = .*$)/soversion = 13032/g" meson.build
+    CONFIGURE_COMMAND meson setup --reconfigure build --buildtype=${BUILDTYPE_LOWER} -Dwerror=false -Dxwayland=$<IF:$<BOOL:${NO_XWAYLAND}>,disabled,enabled> -Dexamples=false -Drenderers=gles2 $<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-hyprland/build/libwlroots.a
-    INSTALL_COMMAND echo "wlroots-hyprland: install not needed"
+    BUILD_BYPRODUCTS ${CMAKE_SOURCE_DIR}/subprojects/wlroots/build/libwlroots.so.13032
+    INSTALL_COMMAND echo "wlroots: install not needed"
 )
 
-find_package(PkgConfig REQUIRED)
-
-pkg_get_variable(WaylandScanner wayland-scanner wayland_scanner)
+find_program(WaylandScanner NAMES wayland-scanner)
 message(STATUS "Found WaylandScanner at ${WaylandScanner}")
-pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir)
+execute_process(
+    COMMAND pkg-config --variable=pkgdatadir wayland-protocols
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    OUTPUT_VARIABLE WAYLAND_PROTOCOLS_DIR
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
 message(STATUS "Found wayland-protocols at ${WAYLAND_PROTOCOLS_DIR}")
-pkg_get_variable(WAYLAND_SERVER_DIR wayland-server pkgdatadir)
 
 if(CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES DEBUG)
     message(STATUS "Configuring Hyprland in Debug with CMake")
@@ -84,41 +86,24 @@ endif()
 include_directories(
   .
   "src/"
-  "subprojects/wlroots-hyprland/include/"
-  "subprojects/wlroots-hyprland/build/include/"
+  "subprojects/wlroots/include/"
+  "subprojects/wlroots/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
-    -fmacro-prefix-map=${CMAKE_SOURCE_DIR}/=)
-
-set(CMAKE_EXECUTABLE_ENABLE_EXPORTS TRUE)
-set(CMAKE_EXPORT_COMPILE_COMMANDS TRUE)
+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)
 
 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 hyprlang>=0.3.2 hyprcursor) # 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 uuid
-    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>=0.1.7 hyprutils>=0.1.5
-)
-
-find_package(hyprwayland-scanner 0.3.10 REQUIRED)
-
-file(GLOB_RECURSE SRCFILES "src/*.cpp")
+file(GLOB_RECURSE SRCFILES CONFIGURE_DEPENDS "src/*.cpp")
 
 set(TRACY_CPP_FILES "")
 if(USE_TRACY)
@@ -127,9 +112,7 @@ if(USE_TRACY)
 endif()
 
 add_executable(Hyprland ${SRCFILES} ${TRACY_CPP_FILES})
-add_dependencies(Hyprland wlroots-hyprland)
-
-set(USE_GPROF ON)
+add_dependencies(Hyprland wlroots)
 
 if(CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES DEBUG)
     message(STATUS "Setting debug flags")
@@ -156,12 +139,8 @@ if(CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES DEBUG)
         endif()
     endif()
 
-    add_compile_options(-fno-pie -fno-builtin)
-    add_link_options(-no-pie -fno-builtin)
-    if(USE_GPROF)
-        add_compile_options(-pg)
-        add_link_options(-pg)
-    endif()
+    add_compile_options(-pg -no-pie -fno-builtin)
+    add_link_options(-pg -no-pie -fno-builtin)
 endif()
 
 check_include_file("execinfo.h" EXECINFOH)
@@ -176,12 +155,6 @@ if(HAVE_LIBEXECINFO)
     target_link_libraries(Hyprland execinfo)
 endif()
 
-check_include_file("sys/timerfd.h" HAS_TIMERFD)
-pkg_check_modules(epoll IMPORTED_TARGET epoll-shim)
-if(NOT HAS_TIMERFD AND epoll_FOUND)
-    target_link_libraries(Hyprland PkgConfig::epoll)
-endif()
-
 if(LEGACY_RENDERER)
     message(STATUS "Using the legacy GLES2 renderer!")
     add_compile_definitions(LEGACY_RENDERER)
@@ -192,15 +165,27 @@ if(NO_XWAYLAND)
     add_compile_definitions(NO_XWAYLAND)
 else()
     message(STATUS "XWAYLAND Enabled (NO_XWAYLAND not defined) checking deps...")
-    pkg_check_modules(xdeps REQUIRED IMPORTED_TARGET xcb xwayland xcb-util xcb-render xcb-xfixes xcb-icccm xcb-composite xcb-res xcb-ewmh xcb-errors)
-    target_link_libraries(Hyprland PkgConfig::xdeps)
+    pkg_check_modules(xcbdep REQUIRED IMPORTED_TARGET xcb)
+    target_link_libraries(Hyprland PkgConfig::xcbdep)
 endif()
 
 if(NO_SYSTEMD)
     message(STATUS "SYSTEMD support is disabled...")
 else()
-    message(STATUS "SYSTEMD support is requested (NO_SYSTEMD not defined)...")
-    add_compile_definitions(USES_SYSTEMD)
+    message(STATUS "SYSTEMD support is requested (NO_SYSTEMD not defined) checking deps...")
+    check_include_file("systemd/sd-daemon.h" SYSTEMDH)
+    if(SYSTEMDH)
+        pkg_check_modules(LIBSYSTEMD libsystemd)
+        if (LIBSYSTEMD_FOUND)
+            add_compile_definitions(USES_SYSTEMD)
+            target_link_libraries(Hyprland "${LIBSYSTEMD_LIBRARIES}")
+            message(STATUS "Systemd found")
+        else()
+            message(WARNING "Systemd support requested but systemd libraries were not found")
+        endif()
+    else()
+        message(WARNING "Systemd support requested but systemd headers were not found")
+    endif()
 endif()
 
 set(CPACK_PROJECT_NAME ${PROJECT_NAME})
@@ -215,169 +200,51 @@ message(STATUS "Setting link libraries")
 
 target_link_libraries(Hyprland rt PkgConfig::deps)
 
-# used by `make installheaders`, to ensure the headers are generated
-add_custom_target(generate-protocol-headers)
-
 function(protocol protoPath protoName external)
     if (external)
-        set(path ${CMAKE_SOURCE_DIR}/${protoPath})
+        execute_process(
+            COMMAND ${WaylandScanner} server-header ${protoPath} protocols/${protoName}-protocol.h
+            WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
+        execute_process(
+            COMMAND ${WaylandScanner} private-code ${protoPath} protocols/${protoName}-protocol.c
+            WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})  
+        target_sources(Hyprland PRIVATE protocols/${protoName}-protocol.c)
     else()
-        set(path ${WAYLAND_PROTOCOLS_DIR}/${protoPath})
+        execute_process(
+            COMMAND ${WaylandScanner} server-header ${WAYLAND_PROTOCOLS_DIR}/${protoPath} protocols/${protoName}-protocol.h
+            WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
+        execute_process(
+            COMMAND ${WaylandScanner} private-code ${WAYLAND_PROTOCOLS_DIR}/${protoPath} protocols/${protoName}-protocol.c
+            WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})  
+        target_sources(Hyprland PRIVATE protocols/${protoName}-protocol.c)
     endif()
-
-    add_custom_command(
-        OUTPUT ${CMAKE_SOURCE_DIR}/protocols/${protoName}-protocol.h
-        COMMAND ${WaylandScanner} server-header ${path} protocols/${protoName}-protocol.h
-        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-    )
-    add_custom_command(
-        OUTPUT ${CMAKE_SOURCE_DIR}/protocols/${protoName}-protocol.c
-        COMMAND ${WaylandScanner} private-code ${path} protocols/${protoName}-protocol.c
-        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-    )
-    target_sources(Hyprland PRIVATE ${CMAKE_SOURCE_DIR}/protocols/${protoName}-protocol.h ${CMAKE_SOURCE_DIR}/protocols/${protoName}-protocol.c)
-    target_sources(generate-protocol-headers PRIVATE ${CMAKE_SOURCE_DIR}/protocols/${protoName}-protocol.h)
-endfunction()
-
-function(protocolNew protoPath protoName external)
-    if (external)
-        set(path ${CMAKE_SOURCE_DIR}/${protoPath})
-    else()
-        set(path ${WAYLAND_PROTOCOLS_DIR}/${protoPath})
-    endif()
-    add_custom_command(
-        OUTPUT ${CMAKE_SOURCE_DIR}/protocols/${protoName}.cpp
-               ${CMAKE_SOURCE_DIR}/protocols/${protoName}.hpp
-        COMMAND hyprwayland-scanner ${path}/${protoName}.xml ${CMAKE_SOURCE_DIR}/protocols/
-        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-    )
-    target_sources(Hyprland PRIVATE protocols/${protoName}.cpp protocols/${protoName}.hpp)
-    target_sources(generate-protocol-headers PRIVATE ${CMAKE_SOURCE_DIR}/protocols/${protoName}.hpp)
-endfunction()
-function(protocolWayland)
-    add_custom_command(
-        OUTPUT ${CMAKE_SOURCE_DIR}/protocols/wayland.cpp
-               ${CMAKE_SOURCE_DIR}/protocols/wayland.hpp
-        COMMAND hyprwayland-scanner --wayland-enums ${WAYLAND_SERVER_DIR}/wayland.xml ${CMAKE_SOURCE_DIR}/protocols/
-        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-    )
-    target_sources(Hyprland PRIVATE protocols/wayland.cpp protocols/wayland.hpp)
-    target_sources(generate-protocol-headers PRIVATE ${CMAKE_SOURCE_DIR}/protocols/wayland.hpp)
 endfunction()
 
 target_link_libraries(Hyprland
-        ${CMAKE_SOURCE_DIR}/subprojects/wlroots-hyprland/build/libwlroots.a
+        ${CMAKE_SOURCE_DIR}/subprojects/wlroots/build/libwlroots.so.13032 # wlroots is provided by us
         OpenGL::EGL
         OpenGL::GL
         Threads::Threads
         libudis86
-        uuid
 )
 
+protocol("protocols/idle.xml" "idle" true)
+protocol("protocols/pointer-constraints-unstable-v1.xml" "pointer-constraints-unstable-v1" true)
+protocol("protocols/tablet-unstable-v2.xml" "tablet-unstable-v2" true)
+protocol("protocols/wlr-foreign-toplevel-management-unstable-v1.xml" "wlr-foreign-toplevel-management-unstable-v1" true)
+protocol("protocols/wlr-layer-shell-unstable-v1.xml" "wlr-layer-shell-unstable-v1" true)
+protocol("protocols/wlr-output-power-management-unstable-v1.xml" "wlr-output-power-management-unstable-v1" true)
 protocol("protocols/wlr-screencopy-unstable-v1.xml" "wlr-screencopy-unstable-v1" true)
 protocol("subprojects/hyprland-protocols/protocols/hyprland-global-shortcuts-v1.xml" "hyprland-global-shortcuts-v1" true)
 protocol("subprojects/hyprland-protocols/protocols/hyprland-toplevel-export-v1.xml" "hyprland-toplevel-export-v1" true)
+protocol("stable/xdg-shell/xdg-shell.xml" "xdg-shell" false)
+protocol("unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml" "linux-dmabuf-unstable-v1" false)
+protocol("unstable/xdg-output/xdg-output-unstable-v1.xml" "xdg-output-unstable-v1" false)
+protocol("staging/fractional-scale/fractional-scale-v1.xml" "fractional-scale-v1" false)
+protocol("staging/tearing-control/tearing-control-v1.xml" "tearing-control-v1" false)
 protocol("unstable/text-input/text-input-unstable-v1.xml" "text-input-unstable-v1" false)
-
-protocolNew("protocols" "wlr-gamma-control-unstable-v1" true)
-protocolNew("protocols" "wlr-foreign-toplevel-management-unstable-v1" true)
-protocolNew("protocols" "wlr-output-power-management-unstable-v1" true)
-protocolNew("protocols" "virtual-keyboard-unstable-v1" true)
-protocolNew("protocols" "wlr-virtual-pointer-unstable-v1" true)
-protocolNew("protocols" "input-method-unstable-v2" true)
-protocolNew("protocols" "wlr-output-management-unstable-v1" true)
-protocolNew("protocols" "kde-server-decoration" true)
-protocolNew("protocols" "wlr-data-control-unstable-v1" true)
-protocolNew("subprojects/hyprland-protocols/protocols" "hyprland-focus-grab-v1" true)
-protocolNew("protocols" "wlr-layer-shell-unstable-v1" true)
-protocolNew("protocols" "wayland-drm" true)
-protocolNew("staging/tearing-control" "tearing-control-v1" false)
-protocolNew("staging/fractional-scale" "fractional-scale-v1" false)
-protocolNew("unstable/xdg-output" "xdg-output-unstable-v1" false)
-protocolNew("staging/cursor-shape" "cursor-shape-v1" false)
-protocolNew("unstable/idle-inhibit" "idle-inhibit-unstable-v1" false)
-protocolNew("unstable/relative-pointer" "relative-pointer-unstable-v1" false)
-protocolNew("unstable/xdg-decoration" "xdg-decoration-unstable-v1" false)
-protocolNew("staging/alpha-modifier" "alpha-modifier-v1" false)
-protocolNew("staging/ext-foreign-toplevel-list" "ext-foreign-toplevel-list-v1" false)
-protocolNew("unstable/pointer-gestures" "pointer-gestures-unstable-v1" false)
-protocolNew("unstable/keyboard-shortcuts-inhibit" "keyboard-shortcuts-inhibit-unstable-v1" false)
-protocolNew("unstable/text-input" "text-input-unstable-v3" false)
-protocolNew("unstable/pointer-constraints" "pointer-constraints-unstable-v1" false)
-protocolNew("staging/xdg-activation" "xdg-activation-v1" false)
-protocolNew("staging/ext-idle-notify" "ext-idle-notify-v1" false)
-protocolNew("staging/ext-session-lock" "ext-session-lock-v1" false)
-protocolNew("stable/tablet" "tablet-v2" false)
-protocolNew("stable/presentation-time" "presentation-time" false)
-protocolNew("stable/xdg-shell" "xdg-shell" false)
-protocolNew("unstable/primary-selection" "primary-selection-unstable-v1" false)
-protocolNew("staging/xwayland-shell" "xwayland-shell-v1" false)
-protocolNew("stable/viewporter" "viewporter" false)
-protocolNew("stable/linux-dmabuf" "linux-dmabuf-v1" false)
-
-protocolWayland()
+protocol("staging/cursor-shape/cursor-shape-v1.xml" "cursor-shape-v1" false)
 
 # tools
 add_subdirectory(hyprctl)
 add_subdirectory(hyprpm)
-
-# binary and symlink
-install(TARGETS Hyprland)
-
-install(CODE "execute_process( \
-        COMMAND ${CMAKE_COMMAND} -E create_symlink \
-        ${CMAKE_INSTALL_BINDIR}/Hyprland \
-        ${CMAKE_INSTALL_BINDIR}/hyprland
-        )"
-)
-
-# session file
-install(FILES ${CMAKE_SOURCE_DIR}/example/hyprland.desktop
-        DESTINATION ${CMAKE_INSTALL_DATADIR}/wayland-sessions)
-
-# wallpapers
-file(GLOB_RECURSE WALLPAPERS "assets/wall*")
-install(FILES ${WALLPAPERS}
-        DESTINATION ${CMAKE_INSTALL_DATADIR}/hyprland)
-
-# default config
-install(FILES ${CMAKE_SOURCE_DIR}/example/hyprland.conf
-        DESTINATION ${CMAKE_INSTALL_DATADIR}/hyprland)
-
-# portal config
-install(FILES ${CMAKE_SOURCE_DIR}/assets/hyprland-portals.conf
-        DESTINATION ${CMAKE_INSTALL_DATADIR}/xdg-desktop-portal)
-
-# man pages
-file(GLOB_RECURSE MANPAGES "docs/*.1")
-install(FILES ${MANPAGES}
-        DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
-
-
-# pkgconfig entry
-install(FILES ${CMAKE_BINARY_DIR}/hyprland.pc
-        DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pkgconfig)
-
-# wlroots headers
-set(HEADERS_WLR "${CMAKE_CURRENT_SOURCE_DIR}/subprojects/wlroots-hyprland/include/wlr")
-install(DIRECTORY ${HEADERS_WLR}
-        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/hyprland
-        FILES_MATCHING PATTERN "*.h")
-
-# config.h and version.h
-set(HEADERS_WLR_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/subprojects/wlroots-hyprland/build/include/wlr")
-install(DIRECTORY ${HEADERS_WLR_ROOT}/
-        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/hyprland/wlr
-        FILES_MATCHING PATTERN "*.h")
-
-# protocol headers
-set(HEADERS_PROTO "${CMAKE_CURRENT_SOURCE_DIR}/protocols")
-install(DIRECTORY ${HEADERS_PROTO}
-        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/hyprland
-        FILES_MATCHING PATTERN "*.h*")
-
-# hyprland headers
-set(HEADERS_SRC "${CMAKE_CURRENT_SOURCE_DIR}/src")
-install(DIRECTORY ${HEADERS_SRC}
-        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/hyprland
-        FILES_MATCHING PATTERN "*.h*")

Makefile

@@ -2,63 +2,89 @@ PREFIX = /usr/local
 
 legacyrenderer:
 	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
+	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 -DCMAKE_INSTALL_PREFIX:STRING=${PREFIX} -DLEGACY_RENDERER:BOOL=true -S . -B ./build -G Ninja
-	cmake --build ./build --config Release --target all
+	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 -DCMAKE_INSTALL_PREFIX:STRING=${PREFIX} -S . -B ./build -G Ninja
-	cmake --build ./build --config Release --target all
+	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 -DCMAKE_INSTALL_PREFIX:STRING=${PREFIX} -S . -B ./build -G Ninja
-	cmake --build ./build --config Debug --target all
+	cmake --build ./build --config Debug --target all -j`nproc 2>/dev/null || getconf NPROCESSORS_CONF`
 	chmod -R 777 ./build
 
-nopch:
-	cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:STRING=${PREFIX} -DCMAKE_DISABLE_PRECOMPILE_HEADERS=ON -S . -B ./build -G Ninja
-	cmake --build ./build --config Release --target all
-
 clear:
 	rm -rf build
-	rm -f ./protocols/*.h ./protocols/*.c ./protocols/*.cpp ./protocols/*.hpp
-	rm -rf ./subprojects/wlroots-hyprland/build
+	rm -f ./protocols/*-protocol.h ./protocols/*-protocol.c
+	rm -rf ./subprojects/wlroots/build
 
 all:
+	@if [[ "$EUID" = 0 ]]; then echo -en "Avoid running $(MAKE) all as sudo.\n"; fi
 	$(MAKE) clear
 	$(MAKE) release
 
 install:
-	cmake --install ./build
+	@if [ ! -f ./build/Hyprland ]; then echo -en "You need to run $(MAKE) all first.\n" && exit 1; fi
+	@echo -en "!NOTE: Please note make install does not compile Hyprland and only installs the already built files."
+
+	mkdir -p ${PREFIX}/share/wayland-sessions
+	mkdir -p ${PREFIX}/bin
+	cp -f ./build/Hyprland ${PREFIX}/bin
+	cp -f ./build/hyprctl/hyprctl ${PREFIX}/bin
+	cp -f ./build/hyprpm/hyprpm ${PREFIX}/bin
+	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
+	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.13032 ${PREFIX}/lib/
+
+	$(MAKE) installheaders
 
 uninstall:
-	xargs rm < ./build/install_manifest.txt
+	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}/bin/hyprpm
+	rm -f ${PREFIX}/lib/libwlroots.so.13032
+	rm -rf ${PREFIX}/share/hyprland
+	rm -f ${PREFIX}/share/man/man1/Hyprland.1
+	rm -f ${PREFIX}/share/man/man1/hyprctl.1
 
 pluginenv:
 	@echo -en "$(MAKE) pluginenv has been deprecated.\nPlease run $(MAKE) all && sudo $(MAKE) installheaders\n"
 	@exit 1
-
+	
 installheaders:
 	@if [ ! -f ./src/version.h ]; then echo -en "You need to run $(MAKE) all first.\n" && exit 1; fi
 
-	# remove previous headers from hyprpm's dir
 	rm -fr ${PREFIX}/include/hyprland
 	mkdir -p ${PREFIX}/include/hyprland
 	mkdir -p ${PREFIX}/include/hyprland/protocols
-	mkdir -p ${PREFIX}/include/hyprland/wlr
+	mkdir -p ${PREFIX}/include/hyprland/wlroots
 	mkdir -p ${PREFIX}/share/pkgconfig
-
-	cmake --build ./build --config Release --target generate-protocol-headers
-
+	
 	find src -name '*.h*' -print0 | cpio --quiet -0dump ${PREFIX}/include/hyprland
-	cd subprojects/wlroots-hyprland/include/wlr && find . -name '*.h*' -print0 | cpio --quiet -0dump ${PREFIX}/include/hyprland/wlr && cd ../../../..
-	cd subprojects/wlroots-hyprland/build/include && find . -name '*.h*' -print0 | cpio --quiet -0dump ${PREFIX}/include/hyprland/wlr && cd ../../../..
-	cp ./protocols/*.h* ${PREFIX}/include/hyprland/protocols
+	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 ../../../..
+	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
 
@@ -90,10 +116,6 @@ asan:
 	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 .
@@ -101,7 +123,8 @@ asan:
 
 	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
+	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

@@ -10,6 +10,7 @@
 [![Badge Pull Requests]][Pull Requests] 
 [![Badge Issues]][Issues] 
 ![Badge Hi Mom]<br>
+[![Badge Discord]][Discord]
 
 <br>
 
@@ -44,11 +45,11 @@ easy IPC, much more QoL stuff than other wlr-based compositors and more...
 - Tearing support for better gaming performance
 - Easily expandable and readable codebase
 - Fast and active development
-- Not afraid to provide bleeding-edge features
+- Not scared to provide bleeding-edge features
 - Config reloaded instantly upon saving
 - Fully dynamic workspaces
 - Two built-in layouts and more available as plugins
-- Uses forked wlroots with QoL patches
+- Closely follows `wlroots-git`
 - Global keybinds passed to your apps of choice
 - Tiling/pseudotiling/floating/fullscreen windows
 - Special workspaces (scratchpads)
@@ -102,6 +103,7 @@ easy IPC, much more QoL stuff than other wlr-based compositors and more...
 <!----------------------------------------------------------------------------->
 
 [Configure]: https://wiki.hyprland.org/Configuring/Configuring-Hyprland/
+[Discord]: https://discord.gg/hQ9XvMUjjr
 [Stars]: https://starchart.cc/hyprwm/Hyprland
 [Hypr]: https://github.com/hyprwm/Hypr
 
@@ -136,6 +138,7 @@ easy IPC, much more QoL stuff than other wlr-based compositors and more...
 
 [Badge Workflow]: https://github.com/hyprwm/Hyprland/actions/workflows/ci.yaml/badge.svg
 
+[Badge Discord]: https://img.shields.io/badge/Join%20the-Discord%20server-6666ff
 [Badge Issues]: https://img.shields.io/github/issues/hyprwm/Hyprland
 [Badge Pull Requests]: https://img.shields.io/github/issues-pr/hyprwm/Hyprland
 [Badge Language]: https://img.shields.io/github/languages/top/hyprwm/Hyprland

docs/ISSUE_GUIDELINES.md

@@ -34,16 +34,16 @@ If your bug crashes Hyprland, append additionally:
 ## Obtaining the Hyprland log
 If you are in a TTY, and the hyprland session that crashed was the last one you launched, the log will be printed with
 ```
-cat $XDG_RUNTIME_DIR/hypr/$(ls -t $XDG_RUNTIME_DIR/hypr | head -n 1)/hyprland.log
+cat /tmp/hypr/$(ls -t /tmp/hypr/ | head -n 1)/hyprland.log
 ```
 feel free to send it to a file, save, copy, etc.
 
 if you are in a Hyprland session, and you want the log of the last session, use
 ```
-cat $XDG_RUNTIME_DIR/hypr/$(ls -t $XDG_RUNTIME_DIR/hypr | head -n 2 | tail -n 1)/hyprland.log
+cat /tmp/hypr/$(ls -t /tmp/hypr/ | head -n 2 | tail -n 1)/hyprland.log
 ```
 
-basically, directories in $XDG_RUNTIME_DIR/hypr are your sessions.
+basically, directories in /tmp/hypr are your sessions.
 
 ## Obtaining the Hyprland Crash Report (v0.22.0beta and up)
 

example/hyprland.conf

@@ -1,97 +1,70 @@
 # This is an example Hyprland config file.
+#
 # Refer to the wiki for more information.
-# https://wiki.hyprland.org/Configuring/Configuring-Hyprland/
 
+#
 # Please note not all available settings / options are set here.
 # For a full list, see the wiki
-
-# You can split this configuration into multiple files
-# Create your files separately and then link them to this file like this:
-# source = ~/.config/hypr/myColors.conf
-
-
-################
-### MONITORS ###
-################
+#
 
 # See https://wiki.hyprland.org/Configuring/Monitors/
 monitor=,preferred,auto,auto
 
 
-###################
-### MY PROGRAMS ###
-###################
+# See https://wiki.hyprland.org/Configuring/Keywords/ for more
 
-# See https://wiki.hyprland.org/Configuring/Keywords/
+# Execute your favorite apps at launch
+# exec-once = waybar & hyprpaper & firefox
+
+# Source a file (multi-file configs)
+# source = ~/.config/hypr/myColors.conf
 
 # Set programs that you use
 $terminal = kitty
 $fileManager = dolphin
 $menu = wofi --show drun
 
-
-#################
-### AUTOSTART ###
-#################
-
-# Autostart necessary processes (like notifications daemons, status bars, etc.)
-# Or execute your favorite apps at launch like this:
-
-# exec-once = $terminal
-# exec-once = nm-applet &
-# exec-once = waybar & hyprpaper & firefox
-
-
-#############################
-### ENVIRONMENT VARIABLES ###
-#############################
-
-# See https://wiki.hyprland.org/Configuring/Environment-variables/
-
+# Some default env vars.
 env = XCURSOR_SIZE,24
-env = HYPRCURSOR_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 {
+    kb_layout = us
+    kb_variant =
+    kb_model =
+    kb_options =
+    kb_rules =
 
-#####################
-### LOOK AND FEEL ###
-#####################
+    follow_mouse = 1
 
-# Refer to https://wiki.hyprland.org/Configuring/Variables/
+    touchpad {
+        natural_scroll = false
+    }
+
+    sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
+}
+
+general {
+    # See https://wiki.hyprland.org/Configuring/Variables/ for more
 
-# https://wiki.hyprland.org/Configuring/Variables/#general
-general { 
     gaps_in = 5
     gaps_out = 20
-
     border_size = 2
-
-    # https://wiki.hyprland.org/Configuring/Variables/#variable-types for info about colors
     col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg
     col.inactive_border = rgba(595959aa)
 
-    # Set to true enable resizing windows by clicking and dragging on borders and gaps
-    resize_on_border = false 
+    layout = dwindle
 
     # Please see https://wiki.hyprland.org/Configuring/Tearing/ before you turn this on
     allow_tearing = false
-
-    layout = dwindle
 }
 
-# https://wiki.hyprland.org/Configuring/Variables/#decoration
 decoration {
+    # See https://wiki.hyprland.org/Configuring/Variables/ for more
+
     rounding = 10
 
-    # Change transparency of focused and unfocused windows
-    active_opacity = 1.0
-    inactive_opacity = 1.0
-
-    drop_shadow = true
-    shadow_range = 4
-    shadow_render_power = 3
-    col.shadow = rgba(1a1a1aee)
-
-    # https://wiki.hyprland.org/Configuring/Variables/#blur
     blur {
         enabled = true
         size = 3
@@ -99,13 +72,17 @@ decoration {
         
         vibrancy = 0.1696
     }
+
+    drop_shadow = true
+    shadow_range = 4
+    shadow_render_power = 3
+    col.shadow = rgba(1a1a1aee)
 }
 
-# https://wiki.hyprland.org/Configuring/Variables/#animations
 animations {
     enabled = true
 
-    # Default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more
+    # Some default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more
 
     bezier = myBezier, 0.05, 0.9, 0.1, 1.05
 
@@ -117,50 +94,27 @@ animations {
     animation = workspaces, 1, 6, default
 }
 
-# See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
 dwindle {
-    pseudotile = true # Master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
-    preserve_split = true # You probably want this
+    # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
+    pseudotile = true # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
+    preserve_split = true # you probably want this
 }
 
-# See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
 master {
-    new_status = master
+    # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
+    new_is_master = true
 }
 
-# https://wiki.hyprland.org/Configuring/Variables/#misc
-misc { 
-    force_default_wallpaper = -1 # Set to 0 or 1 to disable the anime mascot wallpapers
-    disable_hyprland_logo = false # If true disables the random hyprland logo / anime girl background. :(
-}
-
-
-#############
-### INPUT ###
-#############
-
-# https://wiki.hyprland.org/Configuring/Variables/#input
-input {
-    kb_layout = us
-    kb_variant =
-    kb_model =
-    kb_options =
-    kb_rules =
-
-    follow_mouse = 1
-
-    sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
-
-    touchpad {
-        natural_scroll = false
-    }
-}
-
-# https://wiki.hyprland.org/Configuring/Variables/#gestures
 gestures {
+    # See https://wiki.hyprland.org/Configuring/Variables/ for more
     workspace_swipe = false
 }
 
+misc {
+    # See https://wiki.hyprland.org/Configuring/Variables/ for more
+    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 {
@@ -168,13 +122,16 @@ device {
     sensitivity = -0.5
 }
 
+# Example windowrule v1
+# windowrule = float, ^(kitty)$
+# 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.
 
-####################
-### KEYBINDINGSS ###
-####################
 
-# See https://wiki.hyprland.org/Configuring/Keywords/
-$mainMod = SUPER # Sets "Windows" key as main modifier
+# 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, $terminal
@@ -227,19 +184,3 @@ bind = $mainMod, mouse_up, workspace, e-1
 # Move/resize windows with mainMod + LMB/RMB and dragging
 bindm = $mainMod, mouse:272, movewindow
 bindm = $mainMod, mouse:273, resizewindow
-
-
-##############################
-### WINDOWS AND WORKSPACES ###
-##############################
-
-# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
-# See https://wiki.hyprland.org/Configuring/Workspace-Rules/ for workspace rules
-
-# Example windowrule v1
-# windowrule = float, ^(kitty)$
-
-# Example windowrule v2
-# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
-
-windowrulev2 = suppressevent maximize, class:.* # You'll probably like this.

flake.lock

@@ -2,9 +2,7 @@
   "nodes": {
     "hyprcursor": {
       "inputs": {
-        "hyprlang": [
-          "hyprlang"
-        ],
+        "hyprlang": "hyprlang",
         "nixpkgs": [
           "nixpkgs"
         ],
@@ -13,11 +11,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718450675,
-        "narHash": "sha256-jpsns6buS4bK+1sF8sL8AaixAiCRjA+nldTKvcwmvUs=",
+        "lastModified": 1711466786,
+        "narHash": "sha256-sArxGyUBiCA1in+q6t0QqT+ZJiZ1PyBp7cNPKLmREM0=",
         "owner": "hyprwm",
         "repo": "hyprcursor",
-        "rev": "66d5b46ff94efbfa6fa3d1d1b66735f1779c34a6",
+        "rev": "d3876f34779cc03ee51e4aafc0d00a4f187c7544",
         "type": "github"
       },
       "original": {
@@ -29,20 +27,18 @@
     "hyprland-protocols": {
       "inputs": {
         "nixpkgs": [
-          "xdph",
           "nixpkgs"
         ],
         "systems": [
-          "xdph",
           "systems"
         ]
       },
       "locked": {
-        "lastModified": 1714869498,
-        "narHash": "sha256-vbLVOWvQqo4n1yvkg/Q70VTlPbMmTiCQfNTgcWDCfJM=",
+        "lastModified": 1691753796,
+        "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=",
         "owner": "hyprwm",
         "repo": "hyprland-protocols",
-        "rev": "e06482e0e611130cd1929f75e8c1cf679e57d161",
+        "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03",
         "type": "github"
       },
       "original": {
@@ -53,22 +49,18 @@
     },
     "hyprlang": {
       "inputs": {
-        "hyprutils": [
-          "hyprutils"
-        ],
         "nixpkgs": [
+          "hyprcursor",
           "nixpkgs"
         ],
-        "systems": [
-          "systems"
-        ]
+        "systems": "systems"
       },
       "locked": {
-        "lastModified": 1717881852,
-        "narHash": "sha256-XeeVoKHQgfKuXoP6q90sUqKyl7EYy3ol2dVZGM+Jj94=",
+        "lastModified": 1709914708,
+        "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=",
         "owner": "hyprwm",
         "repo": "hyprlang",
-        "rev": "ec6938c66253429192274d612912649a0cfe4d28",
+        "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2",
         "type": "github"
       },
       "original": {
@@ -77,7 +69,7 @@
         "type": "github"
       }
     },
-    "hyprutils": {
+    "hyprlang_2": {
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
@@ -87,49 +79,26 @@
         ]
       },
       "locked": {
-        "lastModified": 1719316102,
-        "narHash": "sha256-dmRz128j/lJmMuTYeCYPfSBRHHQO3VeH4PbmoyAhHzw=",
+        "lastModified": 1711250455,
+        "narHash": "sha256-LSq1ZsTpeD7xsqvlsepDEelWRDtAhqwetp6PusHXJRo=",
         "owner": "hyprwm",
-        "repo": "hyprutils",
-        "rev": "1f6bbec5954f623ff8d68e567bddcce97cd2f085",
+        "repo": "hyprlang",
+        "rev": "b3e430f81f3364c5dd1a3cc9995706a4799eb3fa",
         "type": "github"
       },
       "original": {
         "owner": "hyprwm",
-        "repo": "hyprutils",
-        "type": "github"
-      }
-    },
-    "hyprwayland-scanner": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "systems": [
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1719067853,
-        "narHash": "sha256-mAnZG/eQy72Fp1ImGtqCgUrDumnR1rMZv2E/zgP4U74=",
-        "owner": "hyprwm",
-        "repo": "hyprwayland-scanner",
-        "rev": "914f083741e694092ee60a39d31f693d0a6dc734",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprwayland-scanner",
+        "repo": "hyprlang",
         "type": "github"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1719075281,
-        "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=",
+        "lastModified": 1711523803,
+        "narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af",
+        "rev": "2726f127c15a4cc9810843b96cad73c7eb39e443",
         "type": "github"
       },
       "original": {
@@ -142,11 +111,11 @@
     "root": {
       "inputs": {
         "hyprcursor": "hyprcursor",
-        "hyprlang": "hyprlang",
-        "hyprutils": "hyprutils",
-        "hyprwayland-scanner": "hyprwayland-scanner",
+        "hyprland-protocols": "hyprland-protocols",
+        "hyprlang": "hyprlang_2",
         "nixpkgs": "nixpkgs",
-        "systems": "systems",
+        "systems": "systems_2",
+        "wlroots": "wlroots",
         "xdph": "xdph"
       }
     },
@@ -165,9 +134,45 @@
         "type": "github"
       }
     },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1689347949,
+        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "type": "github"
+      }
+    },
+    "wlroots": {
+      "flake": false,
+      "locked": {
+        "host": "gitlab.freedesktop.org",
+        "lastModified": 1709983277,
+        "narHash": "sha256-wXWIJLd4F2JZeMaihWVDW/yYXCLEC8OpeNJZg9a9ly8=",
+        "owner": "wlroots",
+        "repo": "wlroots",
+        "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b",
+        "type": "gitlab"
+      },
+      "original": {
+        "host": "gitlab.freedesktop.org",
+        "owner": "wlroots",
+        "repo": "wlroots",
+        "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b",
+        "type": "gitlab"
+      }
+    },
     "xdph": {
       "inputs": {
-        "hyprland-protocols": "hyprland-protocols",
+        "hyprland-protocols": [
+          "hyprland-protocols"
+        ],
         "hyprlang": [
           "hyprlang"
         ],
@@ -179,11 +184,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718619174,
-        "narHash": "sha256-FWW68AVYmB91ZDQnhLMBNCUUTCjb1ZpO2k2KIytHtkA=",
+        "lastModified": 1709299639,
+        "narHash": "sha256-jYqJM5khksLIbqSxCLUUcqEgI+O2LdlSlcMEBs39CAU=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "c7894aa54f9a7dbd16df5cd24d420c8af22d5623",
+        "rev": "2d2fb547178ec025da643db57d40a971507b82fe",
         "type": "github"
       },
       "original": {

flake.nix

@@ -7,36 +7,38 @@
     # <https://github.com/nix-systems/nix-systems>
     systems.url = "github:nix-systems/default-linux";
 
+    wlroots = {
+      type = "gitlab";
+      host = "gitlab.freedesktop.org";
+      owner = "wlroots";
+      repo = "wlroots";
+      rev = "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b";
+      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";
-      inputs.hyprutils.follows = "hyprutils";
-    };
-
-    hyprutils = {
-      url = "github:hyprwm/hyprutils";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.systems.follows = "systems";
-    };
-
-    hyprwayland-scanner = {
-      url = "github:hyprwm/hyprwayland-scanner";
-      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";
     };
   };
@@ -81,6 +83,11 @@
         # hyprland-extras
         
         xdg-desktop-portal-hyprland
+        # dependencies
+        
+        hyprland-protocols
+        wlroots-hyprland
+        udis86
         ;
     });
 
@@ -90,9 +97,13 @@
           stdenv = pkgsFor.${system}.gcc13Stdenv;
         } {
           name = "hyprland-shell";
-          nativeBuildInputs = with pkgsFor.${system}; [expat libxml2];
+          nativeBuildInputs = with pkgsFor.${system}; [cmake python3 expat libxml2];
+          buildInputs = [self.packages.${system}.wlroots-hyprland];
           hardeningDisable = ["fortify"];
-          inputsFrom = [pkgsFor.${system}.hyprland];
+          inputsFrom = [
+            self.packages.${system}.wlroots-hyprland
+            self.packages.${system}.hyprland
+          ];
         };
     });
 
@@ -101,4 +112,9 @@
     nixosModules.default = import ./nix/module.nix inputs;
     homeManagerModules.default = import ./nix/hm-module.nix self;
   };
+
+  nixConfig = {
+    extra-substituters = ["https://hyprland.cachix.org"];
+    extra-trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="];
+  };
 }

hyprctl/CMakeLists.txt

@@ -5,21 +5,4 @@ project(
     DESCRIPTION "Control utility for Hyprland"
 )
 
-pkg_check_modules(deps REQUIRED IMPORTED_TARGET hyprutils>=0.1.1)
-
-add_executable(hyprctl "main.cpp")
-
-target_link_libraries(hyprctl PUBLIC PkgConfig::deps)
-
-# binary
-install(TARGETS hyprctl)
-
-# shell completions
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/hyprctl.bash
-        DESTINATION ${CMAKE_INSTALL_DATADIR}/bash-completion/completions
-        RENAME hyprctl)
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/hyprctl.fish
-        DESTINATION ${CMAKE_INSTALL_DATADIR}/fish/vendor_completions.d)
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/hyprctl.zsh
-        DESTINATION ${CMAKE_INSTALL_DATADIR}/zsh/site-functions
-        RENAME _hyprctl)
+add_executable(hyprctl "main.cpp")

hyprctl/Strings.hpp

@@ -1,160 +0,0 @@
-#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. Also supports -f/--follow
-                          option
-    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)
-    --quiet (-q)        → Disable the output of hyprctl
-
---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

@@ -1,127 +0,0 @@
-_hyprctl_cmd_2 () {
-    hyprctl monitors | grep Monitor | awk '{ print $2 }'
-}
-
-_hyprctl_cmd_3 () {
-    hyprpm list | grep "Plugin" | awk '{print $4}'
-}
-
-_hyprctl_cmd_0 () {
-    hyprctl clients | grep class | awk '{print $2}'
-}
-
-_hyprctl_cmd_1 () {
-    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" "-q" "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" "--quiet" "pin" "output" "forcenoblur" "togglespecialworkspace" "fullscreen" "toggleopaque" "focusworkspaceoncurrentmonitor" "next" "changegroupactive" "-j" "instances" "execr" "exit" "clients" "all" "--batch" "dismissnotify" "inactivebordercolor" "switchxkblayout" "movetoworkspacesilent" "tagwindow" "movewindoworgroup" "-r" "movefocus" "focusurgentorlast" "remove" "activeworkspace" "dispatch" "create" "centerwindow" "2" "hyprpaper" "-1" "reload" "alphainactive" "systeminfo" "plugin" "dimaround" "activewindow" "swapactiveworkspaces" "splash" "sendshortcut" "maxsize" "lockactivegroup" "windowdancecompat" "forceopaqueoverriden" "lockgroups" "movecursortocorner" "x11" "prev" "1" "resizewindowpixel" "forcenoshadow")
-
-    declare -A literal_transitions
-    literal_transitions[0]="([105]=1 [75]=2 [33]=3 [35]=4 [1]=2 [2]=2 [78]=2 [107]=5 [37]=2 [111]=4 [41]=2 [46]=2 [115]=2 [85]=6 [116]=8 [52]=2 [88]=4 [54]=2 [90]=9 [120]=2 [122]=2 [124]=2 [15]=2 [59]=10 [60]=2 [17]=11 [125]=12 [19]=2 [127]=2 [129]=2 [25]=13 [68]=2 [98]=4 [99]=2 [27]=2 [28]=14 [102]=2 [104]=4)"
-    literal_transitions[3]="([73]=17 [13]=2 [32]=17 [55]=17 [56]=17 [91]=17 [106]=2 [123]=2 [77]=1 [16]=2 [126]=17 [3]=1 [5]=2 [64]=17 [131]=2 [133]=17 [81]=17 [134]=17 [84]=17 [31]=17 [49]=2 [12]=2 [86]=17 [10]=17 [87]=17 [141]=17)"
-    literal_transitions[7]="([105]=1 [75]=2 [33]=3 [1]=2 [2]=2 [78]=2 [107]=5 [37]=2 [41]=2 [46]=2 [115]=2 [85]=6 [116]=8 [52]=2 [54]=2 [90]=9 [120]=2 [122]=2 [124]=2 [15]=2 [59]=10 [60]=2 [17]=11 [125]=12 [19]=2 [127]=2 [129]=2 [25]=13 [68]=2 [99]=2 [27]=2 [28]=14 [102]=2)"
-    literal_transitions[8]="([101]=2 [130]=2 [132]=2 [0]=2 [74]=2 [36]=2 [108]=2 [109]=2 [38]=2 [110]=2 [4]=2 [79]=2 [40]=2 [80]=2 [113]=2 [6]=2 [42]=2 [43]=2 [82]=2 [83]=2 [47]=2 [48]=2 [9]=2 [50]=2 [51]=2 [53]=2 [11]=2 [112]=2 [89]=2 [118]=2 [57]=2 [92]=2 [58]=2 [93]=2 [94]=2 [61]=2 [62]=2 [128]=2 [95]=2 [63]=2 [20]=2 [97]=2 [22]=2 [23]=2 [65]=2 [66]=2 [135]=2 [136]=2 [24]=2 [26]=2 [69]=2 [100]=2 [70]=2 [140]=2 [29]=2 [71]=2)"
-    literal_transitions[9]="([117]=20 [114]=16)"
-    literal_transitions[11]="([103]=2)"
-    literal_transitions[13]="([21]=1 [119]=1 [30]=1 [139]=1 [121]=1 [44]=1 [72]=1)"
-    literal_transitions[14]="([39]=2)"
-    literal_transitions[15]="([138]=2 [96]=2)"
-    literal_transitions[17]="([18]=2 [7]=2)"
-    literal_transitions[18]="([76]=19)"
-    literal_transitions[19]="([34]=4 [45]=4)"
-    literal_transitions[20]="([8]=2 [67]=2 [14]=2 [137]=2)"
-
-    declare -A match_anything_transitions
-    match_anything_transitions=([1]=2 [0]=7 [6]=2 [15]=2 [10]=2 [5]=15 [14]=18 [7]=7 [2]=18 [16]=2 [12]=2 [11]=18)
-    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=([5]=1 [16]=2 [12]=3 [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

@@ -1,220 +0,0 @@
-function _hyprctl_3
-    set 1 $argv[1]
-    hyprctl monitors | grep Monitor | awk '{ print $2 }'
-end
-
-function _hyprctl_4
-    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_2
-    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" "-q" "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" "--quiet" "pin" "output" "forcenoblur" "togglespecialworkspace" "fullscreen" "toggleopaque" "focusworkspaceoncurrentmonitor" "next" "changegroupactive" "-j" "instances" "execr" "exit" "clients" "all" "--batch" "dismissnotify" "inactivebordercolor" "switchxkblayout" "movetoworkspacesilent" "tagwindow" "movewindoworgroup" "-r" "movefocus" "focusurgentorlast" "remove" "activeworkspace" "dispatch" "create" "centerwindow" "2" "hyprpaper" "-1" "reload" "alphainactive" "systeminfo" "plugin" "dimaround" "activewindow" "swapactiveworkspaces" "splash" "sendshortcut" "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] "Disable output"
-    set descriptions[37] "Toggle the current window's floating state"
-    set descriptions[38] "Get the list of defined workspace rules"
-    set descriptions[39] "Move the focused window to a workspace"
-    set descriptions[41] "Temporarily enable or disable binds:ignore_group_lock"
-    set descriptions[42] "List all workspaces with their properties"
-    set descriptions[43] "Swap the active window with the next or previous in a group"
-    set descriptions[44] "Close a specified window"
-    set descriptions[45] "WARNING"
-    set descriptions[46] "Specify the Hyprland instance"
-    set descriptions[47] "List all registered binds"
-    set descriptions[48] "Move the active window in a direction or to a monitor"
-    set descriptions[49] "Change the split ratio"
-    set descriptions[51] "Prohibit the active window from becoming or being inserted into group"
-    set descriptions[52] "Change the workspace"
-    set descriptions[53] "List all current config parsing errors"
-    set descriptions[54] "Toggle the current active window into a group"
-    set descriptions[55] "Get the config option status (values)"
-    set descriptions[58] "Close the active window"
-    set descriptions[59] "Pass the key to a specified window"
-    set descriptions[60] "List all decorations and their info"
-    set descriptions[61] "List all connected keyboards and mice"
-    set descriptions[62] "Switch focus from current to previously focused window"
-    set descriptions[63] "Change the current mapping group"
-    set descriptions[64] "Execute a Global Shortcut using the GlobalShortcuts portal"
-    set descriptions[66] "Force the renderer to reload all resources and outputs"
-    set descriptions[67] "Move a selected window"
-    set descriptions[69] "Print the Hyprland version: flags, commit and branch of build"
-    set descriptions[70] "Set all monitors' DPMS status"
-    set descriptions[71] "Resize the active window"
-    set descriptions[72] "Move the active window into a group"
-    set descriptions[73] "OK"
-    set descriptions[75] "Set the current window's floating state to true"
-    set descriptions[76] "Print tail of the log"
-    set descriptions[79] "List all layouts available (including plugin ones)"
-    set descriptions[80] "Move a workspace to a monitor"
-    set descriptions[81] "Execute a shell command"
-    set descriptions[83] "Modify the window stack order of the active or specified window"
-    set descriptions[84] "Toggle the focused window's internal fullscreen state"
-    set descriptions[86] "Issue a keyword to call a config keyword dynamically"
-    set descriptions[89] "Disable output"
-    set descriptions[90] "Pin a window"
-    set descriptions[91] "Allows adding/removing fake outputs to a specific backend"
-    set descriptions[93] "Toggle a special workspace on/off"
-    set descriptions[94] "Toggle the focused window's fullscreen state"
-    set descriptions[95] "Toggle the current window to always be opaque"
-    set descriptions[96] "Focus the requested workspace"
-    set descriptions[98] "Switch to the next window in a group"
-    set descriptions[99] "Output in JSON format"
-    set descriptions[100] "List all running Hyprland instances and their info"
-    set descriptions[101] "Execute a raw shell command"
-    set descriptions[102] "Exit the compositor with no questions asked"
-    set descriptions[103] "List all windows with their properties"
-    set descriptions[105] "Execute a batch of commands separated by ;"
-    set descriptions[106] "Dismiss all or up to amount of notifications"
-    set descriptions[108] "Set the xkb layout index for a keyboard"
-    set descriptions[109] "Move window doesnt switch to the workspace"
-    set descriptions[110] "Apply a tag to the window"
-    set descriptions[111] "Behave as moveintogroup"
-    set descriptions[112] "Refresh state after issuing the command"
-    set descriptions[113] "Move the focus in a direction"
-    set descriptions[114] "Focus the urgent window or the last window"
-    set descriptions[116] "Get the active workspace name and its properties"
-    set descriptions[117] "Issue a dispatch to call a keybind dispatcher with an arg"
-    set descriptions[119] "Center the active window"
-    set descriptions[120] "HINT"
-    set descriptions[121] "Interact with hyprpaper if present"
-    set descriptions[122] "No Icon"
-    set descriptions[123] "Force reload the config"
-    set descriptions[125] "Print system info"
-    set descriptions[126] "Interact with a plugin"
-    set descriptions[128] "Get the active window name and its properties"
-    set descriptions[129] "Swap the active workspaces between two monitors"
-    set descriptions[130] "Print the current random splash"
-    set descriptions[131] "On shortcut X sends shortcut Y to a specified window"
-    set descriptions[133] "Lock the focused group"
-    set descriptions[136] "Lock the groups"
-    set descriptions[137] "Move the cursor to the corner of the active window"
-    set descriptions[140] "INFO"
-    set descriptions[141] "Resize a selected window"
-
-    set --local literal_transitions
-    set literal_transitions[1] "set inputs 106 76 34 36 2 3 79 108 38 112 42 47 116 86 117 53 89 55 91 121 123 125 16 60 61 18 126 20 128 130 26 69 99 100 28 29 103 105; set tos 2 3 4 5 3 3 3 6 3 5 3 3 3 7 9 3 5 3 10 3 3 3 3 11 3 12 13 3 3 3 14 3 5 3 3 15 3 5"
-    set literal_transitions[4] "set inputs 74 14 33 56 57 92 107 124 78 17 127 4 6 65 132 134 82 135 85 32 50 13 87 11 88 142; set tos 18 3 18 18 18 18 3 3 2 3 18 2 3 18 3 18 18 18 18 18 3 3 18 18 18 18"
-    set literal_transitions[8] "set inputs 106 76 34 2 3 79 108 38 42 47 116 86 117 53 55 91 121 123 125 16 60 61 18 126 20 128 130 26 69 100 28 29 103; set tos 2 3 4 3 3 3 6 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 102 131 133 1 75 37 109 110 39 111 5 80 41 81 114 7 43 44 83 84 48 49 10 51 52 54 12 113 90 119 58 93 59 94 95 62 63 129 96 64 21 98 23 24 66 67 136 137 25 27 70 101 71 141 30 72; 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 3 3"
-    set literal_transitions[10] "set inputs 118 115; set tos 21 17"
-    set literal_transitions[12] "set inputs 104; set tos 3"
-    set literal_transitions[14] "set inputs 22 120 31 140 122 45 73; set tos 2 2 2 2 2 2 2"
-    set literal_transitions[15] "set inputs 40; set tos 3"
-    set literal_transitions[16] "set inputs 139 97; set tos 3 3"
-    set literal_transitions[18] "set inputs 19 8; set tos 3 3"
-    set literal_transitions[19] "set inputs 77; set tos 20"
-    set literal_transitions[20] "set inputs 35 46; set tos 5 5"
-    set literal_transitions[21] "set inputs 9 68 15 138; set tos 3 3 3 3"
-
-    set --local match_anything_transitions_from 2 1 7 16 11 6 15 8 3 17 13 12
-    set --local match_anything_transitions_to 3 8 3 3 3 16 19 8 19 3 3 19
-
-    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 6 17 13 11
-    set command_ids 2 3 4 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

@@ -1,151 +0,0 @@
-# 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 ;"
-            |   (-q | --quiet)                                        "Disable output"
-            ;
-
-<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"
-                |  (sendshortcut)            	                      "On shortcut X sends shortcut Y 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"
-                |  (tagwindow)           	                          "Apply a tag to the 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

@@ -1,255 +0,0 @@
-#compdef hyprctl
-
-_hyprctl_cmd_2 () {
-    hyprctl monitors | grep Monitor | awk '{ print $2 }'
-}
-
-_hyprctl_cmd_3 () {
-    hyprpm list | grep "Plugin" | awk '{print $4}'
-}
-
-_hyprctl_cmd_0 () {
-    hyprctl clients | grep class | awk '{print $2}'
-}
-
-_hyprctl_cmd_1 () {
-    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" "-q" "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" "--quiet" "pin" "output" "forcenoblur" "togglespecialworkspace" "fullscreen" "toggleopaque" "focusworkspaceoncurrentmonitor" "next" "changegroupactive" "-j" "instances" "execr" "exit" "clients" "all" "--batch" "dismissnotify" "inactivebordercolor" "switchxkblayout" "movetoworkspacesilent" "tagwindow" "movewindoworgroup" "-r" "movefocus" "focusurgentorlast" "remove" "activeworkspace" "dispatch" "create" "centerwindow" "2" "hyprpaper" "-1" "reload" "alphainactive" "systeminfo" "plugin" "dimaround" "activewindow" "swapactiveworkspaces" "splash" "sendshortcut" "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]="Disable output"
-    descriptions[37]="Toggle the current window's floating state"
-    descriptions[38]="Get the list of defined workspace rules"
-    descriptions[39]="Move the focused window to a workspace"
-    descriptions[41]="Temporarily enable or disable binds:ignore_group_lock"
-    descriptions[42]="List all workspaces with their properties"
-    descriptions[43]="Swap the active window with the next or previous in a group"
-    descriptions[44]="Close a specified window"
-    descriptions[45]="WARNING"
-    descriptions[46]="Specify the Hyprland instance"
-    descriptions[47]="List all registered binds"
-    descriptions[48]="Move the active window in a direction or to a monitor"
-    descriptions[49]="Change the split ratio"
-    descriptions[51]="Prohibit the active window from becoming or being inserted into group"
-    descriptions[52]="Change the workspace"
-    descriptions[53]="List all current config parsing errors"
-    descriptions[54]="Toggle the current active window into a group"
-    descriptions[55]="Get the config option status (values)"
-    descriptions[58]="Close the active window"
-    descriptions[59]="Pass the key to a specified window"
-    descriptions[60]="List all decorations and their info"
-    descriptions[61]="List all connected keyboards and mice"
-    descriptions[62]="Switch focus from current to previously focused window"
-    descriptions[63]="Change the current mapping group"
-    descriptions[64]="Execute a Global Shortcut using the GlobalShortcuts portal"
-    descriptions[66]="Force the renderer to reload all resources and outputs"
-    descriptions[67]="Move a selected window"
-    descriptions[69]="Print the Hyprland version: flags, commit and branch of build"
-    descriptions[70]="Set all monitors' DPMS status"
-    descriptions[71]="Resize the active window"
-    descriptions[72]="Move the active window into a group"
-    descriptions[73]="OK"
-    descriptions[75]="Set the current window's floating state to true"
-    descriptions[76]="Print tail of the log"
-    descriptions[79]="List all layouts available (including plugin ones)"
-    descriptions[80]="Move a workspace to a monitor"
-    descriptions[81]="Execute a shell command"
-    descriptions[83]="Modify the window stack order of the active or specified window"
-    descriptions[84]="Toggle the focused window's internal fullscreen state"
-    descriptions[86]="Issue a keyword to call a config keyword dynamically"
-    descriptions[89]="Disable output"
-    descriptions[90]="Pin a window"
-    descriptions[91]="Allows adding/removing fake outputs to a specific backend"
-    descriptions[93]="Toggle a special workspace on/off"
-    descriptions[94]="Toggle the focused window's fullscreen state"
-    descriptions[95]="Toggle the current window to always be opaque"
-    descriptions[96]="Focus the requested workspace"
-    descriptions[98]="Switch to the next window in a group"
-    descriptions[99]="Output in JSON format"
-    descriptions[100]="List all running Hyprland instances and their info"
-    descriptions[101]="Execute a raw shell command"
-    descriptions[102]="Exit the compositor with no questions asked"
-    descriptions[103]="List all windows with their properties"
-    descriptions[105]="Execute a batch of commands separated by ;"
-    descriptions[106]="Dismiss all or up to amount of notifications"
-    descriptions[108]="Set the xkb layout index for a keyboard"
-    descriptions[109]="Move window doesnt switch to the workspace"
-    descriptions[110]="Apply a tag to the window"
-    descriptions[111]="Behave as moveintogroup"
-    descriptions[112]="Refresh state after issuing the command"
-    descriptions[113]="Move the focus in a direction"
-    descriptions[114]="Focus the urgent window or the last window"
-    descriptions[116]="Get the active workspace name and its properties"
-    descriptions[117]="Issue a dispatch to call a keybind dispatcher with an arg"
-    descriptions[119]="Center the active window"
-    descriptions[120]="HINT"
-    descriptions[121]="Interact with hyprpaper if present"
-    descriptions[122]="No Icon"
-    descriptions[123]="Force reload the config"
-    descriptions[125]="Print system info"
-    descriptions[126]="Interact with a plugin"
-    descriptions[128]="Get the active window name and its properties"
-    descriptions[129]="Swap the active workspaces between two monitors"
-    descriptions[130]="Print the current random splash"
-    descriptions[131]="On shortcut X sends shortcut Y to a specified window"
-    descriptions[133]="Lock the focused group"
-    descriptions[136]="Lock the groups"
-    descriptions[137]="Move the cursor to the corner of the active window"
-    descriptions[140]="INFO"
-    descriptions[141]="Resize a selected window"
-
-    local -A literal_transitions
-    literal_transitions[1]="([106]=2 [76]=3 [34]=4 [36]=5 [2]=3 [3]=3 [79]=3 [108]=6 [38]=3 [112]=5 [42]=3 [47]=3 [116]=3 [86]=7 [117]=9 [53]=3 [89]=5 [55]=3 [91]=10 [121]=3 [123]=3 [125]=3 [16]=3 [60]=11 [61]=3 [18]=12 [126]=13 [20]=3 [128]=3 [130]=3 [26]=14 [69]=3 [99]=5 [100]=3 [28]=3 [29]=15 [103]=3 [105]=5)"
-    literal_transitions[4]="([74]=18 [14]=3 [33]=18 [56]=18 [57]=18 [92]=18 [107]=3 [124]=3 [78]=2 [17]=3 [127]=18 [4]=2 [6]=3 [65]=18 [132]=3 [134]=18 [82]=18 [135]=18 [85]=18 [32]=18 [50]=3 [13]=3 [87]=18 [11]=18 [88]=18 [142]=18)"
-    literal_transitions[8]="([106]=2 [76]=3 [34]=4 [2]=3 [3]=3 [79]=3 [108]=6 [38]=3 [42]=3 [47]=3 [116]=3 [86]=7 [117]=9 [53]=3 [55]=3 [91]=10 [121]=3 [123]=3 [125]=3 [16]=3 [60]=11 [61]=3 [18]=12 [126]=13 [20]=3 [128]=3 [130]=3 [26]=14 [69]=3 [100]=3 [28]=3 [29]=15 [103]=3)"
-    literal_transitions[9]="([102]=3 [131]=3 [133]=3 [1]=3 [75]=3 [37]=3 [109]=3 [110]=3 [39]=3 [111]=3 [5]=3 [80]=3 [41]=3 [81]=3 [114]=3 [7]=3 [43]=3 [44]=3 [83]=3 [84]=3 [48]=3 [49]=3 [10]=3 [51]=3 [52]=3 [54]=3 [12]=3 [113]=3 [90]=3 [119]=3 [58]=3 [93]=3 [59]=3 [94]=3 [95]=3 [62]=3 [63]=3 [129]=3 [96]=3 [64]=3 [21]=3 [98]=3 [23]=3 [24]=3 [66]=3 [67]=3 [136]=3 [137]=3 [25]=3 [27]=3 [70]=3 [101]=3 [71]=3 [141]=3 [30]=3 [72]=3)"
-    literal_transitions[10]="([118]=21 [115]=17)"
-    literal_transitions[12]="([104]=3)"
-    literal_transitions[14]="([22]=2 [120]=2 [31]=2 [140]=2 [122]=2 [45]=2 [73]=2)"
-    literal_transitions[15]="([40]=3)"
-    literal_transitions[16]="([139]=3 [97]=3)"
-    literal_transitions[18]="([19]=3 [8]=3)"
-    literal_transitions[19]="([77]=20)"
-    literal_transitions[20]="([35]=5 [46]=5)"
-    literal_transitions[21]="([9]=3 [68]=3 [15]=3 [138]=3)"
-
-    local -A match_anything_transitions
-    match_anything_transitions=([2]=3 [1]=8 [7]=3 [16]=3 [11]=3 [6]=16 [15]=19 [8]=8 [3]=19 [17]=3 [13]=3 [12]=19)
-
-    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=([6]=1 [17]=2 [13]=3 [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

@@ -1,18 +1,17 @@
-#include <cctype>
+#include <ctype.h>
 #include <netdb.h>
 #include <netinet/in.h>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/un.h>
-#include <pwd.h>
 #include <unistd.h>
 #include <ranges>
 #include <algorithm>
-#include <csignal>
+#include <signal.h>
 #include <format>
 
 #include <iostream>
@@ -22,18 +21,56 @@
 #include <vector>
 #include <deque>
 #include <filesystem>
-#include <cstdarg>
+#include <stdarg.h>
 #include <regex>
-#include <sys/socket.h>
-#include <hyprutils/string/String.hpp>
-using namespace Hyprutils::String;
 
-#include "Strings.hpp"
+const std::string USAGE = R"#(usage: hyprctl [(opt)flags] [command] [(opt)args]
+
+commands:
+    activewindow
+    activeworkspace
+    binds
+    clients
+    configerrors
+    cursorpos
+    decorations
+    devices
+    dismissnotify
+    dispatch
+    getoption
+    globalshortcuts
+    hyprpaper
+    instances
+    keyword
+    kill
+    layers
+    layouts
+    monitors
+    notify
+    output
+    plugin
+    reload
+    rollinglog
+    setcursor
+    seterror
+    setprop
+    splash
+    switchxkblayout
+    systeminfo
+    version
+    workspacerules
+    workspaces
+
+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)
+)#";
 
 #define PAD
 
 std::string instanceSignature;
-bool        quiet = false;
 
 struct SInstanceData {
     std::string id;
@@ -43,41 +80,24 @@ struct SInstanceData {
     bool        valid = true;
 };
 
-void log(std::string str) {
-    if (quiet)
-        return;
-
-    std::cout << str << "\n";
-}
-
-std::string getRuntimeDir() {
-    const auto XDG = getenv("XDG_RUNTIME_DIR");
-
-    if (!XDG) {
-        const std::string USERID = std::to_string(getpwuid(getuid())->pw_uid);
-        return "/run/user/" + USERID + "/hypr";
-    }
-
-    return std::string{XDG} + "/hypr";
-}
-
 std::vector<SInstanceData> instances() {
     std::vector<SInstanceData> result;
 
-    for (const auto& el : std::filesystem::directory_iterator(getRuntimeDir())) {
-        if (!el.is_directory() || !std::filesystem::exists(el.path().string() + "/hyprland.lock"))
+    for (const auto& el : std::filesystem::directory_iterator("/tmp/hypr")) {
+        if (el.is_directory() || !el.path().string().ends_with(".lock"))
             continue;
 
         // read lock
         SInstanceData* data = &result.emplace_back();
-        data->id            = el.path().filename().string();
+        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);
 
         try {
-            data->time = std::stoull(data->id.substr(data->id.find_first_of('_') + 1, data->id.find_last_of('_') - (data->id.find_first_of('_') + 1)));
+            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() + "/hyprland.lock");
+        std::ifstream ifs(el.path().string());
 
         int           i = 0;
         for (std::string line; std::getline(ifs, line); ++i) {
@@ -101,100 +121,53 @@ std::vector<SInstanceData> instances() {
     return result;
 }
 
-static volatile bool sigintReceived = false;
-void                 intHandler(int sig) {
-    sigintReceived = true;
-    std::cout << "[hyprctl] SIGINT received, closing connection" << std::endl;
-}
-
-int rollingRead(const int socket) {
-    sigintReceived = false;
-    signal(SIGINT, intHandler);
-
-    constexpr size_t              BUFFER_SIZE = 8192;
-    std::array<char, BUFFER_SIZE> buffer      = {0};
-    int                           sizeWritten = 0;
-    std::cout << "[hyprctl] reading from socket following up log:" << std::endl;
-    while (!sigintReceived) {
-        sizeWritten = read(socket, buffer.data(), BUFFER_SIZE);
-        if (sizeWritten < 0 && errno != EAGAIN) {
-            if (errno != EINTR)
-                std::cout << "Couldn't read (5) " << strerror(errno) << ":" << errno << std::endl;
-            close(socket);
-            return 5;
-        }
-
-        if (sizeWritten == 0)
-            break;
-
-        if (sizeWritten > 0) {
-            std::cout << std::string(buffer.data(), sizeWritten);
-            buffer.fill('\0');
-        }
-
-        usleep(100000);
-    }
-    close(socket);
-    return 0;
-}
-
-int request(std::string arg, int minArgs = 0, bool needRoll = false) {
+void request(std::string arg, int minArgs = 0) {
     const auto SERVERSOCKET = socket(AF_UNIX, SOCK_STREAM, 0);
 
-    auto       t = timeval{.tv_sec = 1, .tv_usec = 0};
-    setsockopt(SERVERSOCKET, SOL_SOCKET, SO_RCVTIMEO, &t, sizeof(struct timeval));
-
     const auto ARGS = std::count(arg.begin(), arg.end(), ' ');
 
     if (ARGS < minArgs) {
-        log(std::format("Not enough arguments in '{}', expected at least {}", arg, minArgs));
-        return -1;
+        std::cout << "Not enough arguments, expected at least " << minArgs;
+        return;
     }
 
     if (SERVERSOCKET < 0) {
-        log("Couldn't open a socket (1)");
-        return 1;
+        std::cout << "Couldn't open a socket (1)";
+        return;
     }
 
     if (instanceSignature.empty()) {
-        log("HYPRLAND_INSTANCE_SIGNATURE was not set! (Is Hyprland running?)");
-        return 2;
+        std::cout << "HYPRLAND_INSTANCE_SIGNATURE was not set! (Is Hyprland running?)";
+        return;
     }
 
-    const std::string USERID = std::to_string(getpwuid(getuid())->pw_uid);
+    sockaddr_un serverAddress = {0};
+    serverAddress.sun_family  = AF_UNIX;
 
-    sockaddr_un       serverAddress = {0};
-    serverAddress.sun_family        = AF_UNIX;
-
-    std::string socketPath = getRuntimeDir() + "/" + instanceSignature + "/.socket.sock";
+    std::string socketPath = "/tmp/hypr/" + instanceSignature + "/.socket.sock";
 
     strncpy(serverAddress.sun_path, socketPath.c_str(), sizeof(serverAddress.sun_path) - 1);
 
     if (connect(SERVERSOCKET, (sockaddr*)&serverAddress, SUN_LEN(&serverAddress)) < 0) {
-        log("Couldn't connect to " + socketPath + ". (3)");
-        return 3;
+        std::cout << "Couldn't connect to " << socketPath << ". (3)";
+        return;
     }
 
     auto sizeWritten = write(SERVERSOCKET, arg.c_str(), arg.length());
 
     if (sizeWritten < 0) {
-        log("Couldn't write (4)");
-        return 4;
+        std::cout << "Couldn't write (4)";
+        return;
     }
 
-    if (needRoll)
-        return rollingRead(SERVERSOCKET);
-
     std::string reply        = "";
     char        buffer[8192] = {0};
 
     sizeWritten = read(SERVERSOCKET, buffer, 8192);
 
     if (sizeWritten < 0) {
-        if (errno == EWOULDBLOCK)
-            log("Hyprland IPC didn't respond in time\n");
-        log("Couldn't read (5)");
-        return 5;
+        std::cout << "Couldn't read (5)";
+        return;
     }
 
     reply += std::string(buffer, sizeWritten);
@@ -202,44 +175,40 @@ int request(std::string arg, int minArgs = 0, bool needRoll = false) {
     while (sizeWritten == 8192) {
         sizeWritten = read(SERVERSOCKET, buffer, 8192);
         if (sizeWritten < 0) {
-            log("Couldn't read (5)");
-            return 5;
+            std::cout << "Couldn't read (5)";
+            return;
         }
         reply += std::string(buffer, sizeWritten);
     }
 
     close(SERVERSOCKET);
 
-    log(reply);
-
-    return 0;
+    std::cout << reply;
 }
 
-int requestHyprpaper(std::string arg) {
+void requestHyprpaper(std::string arg) {
     const auto SERVERSOCKET = socket(AF_UNIX, SOCK_STREAM, 0);
 
     if (SERVERSOCKET < 0) {
-        log("Couldn't open a socket (1)");
-        return 1;
+        std::cout << "Couldn't open a socket (1)";
+        return;
     }
 
     if (instanceSignature.empty()) {
-        log("HYPRLAND_INSTANCE_SIGNATURE was not set! (Is Hyprland running?)");
-        return 2;
+        std::cout << "HYPRLAND_INSTANCE_SIGNATURE was not set! (Is Hyprland running?)";
+        return;
     }
 
     sockaddr_un serverAddress = {0};
     serverAddress.sun_family  = AF_UNIX;
 
-    const std::string USERID = std::to_string(getpwuid(getuid())->pw_uid);
-
-    std::string       socketPath = getRuntimeDir() + "/" + instanceSignature + "/.hyprpaper.sock";
+    std::string socketPath = "/tmp/hypr/" + instanceSignature + "/.hyprpaper.sock";
 
     strncpy(serverAddress.sun_path, socketPath.c_str(), sizeof(serverAddress.sun_path) - 1);
 
     if (connect(SERVERSOCKET, (sockaddr*)&serverAddress, SUN_LEN(&serverAddress)) < 0) {
-        log("Couldn't connect to " + socketPath + ". (3)");
-        return 3;
+        std::cout << "Couldn't connect to " << socketPath << ". (3)";
+        return;
     }
 
     arg = arg.substr(arg.find_first_of('/') + 1); // strip flags
@@ -248,8 +217,8 @@ int requestHyprpaper(std::string arg) {
     auto sizeWritten = write(SERVERSOCKET, arg.c_str(), arg.length());
 
     if (sizeWritten < 0) {
-        log("Couldn't write (4)");
-        return 4;
+        std::cout << "Couldn't write (4)";
+        return;
     }
 
     char buffer[8192] = {0};
@@ -257,15 +226,13 @@ int requestHyprpaper(std::string arg) {
     sizeWritten = read(SERVERSOCKET, buffer, 8192);
 
     if (sizeWritten < 0) {
-        log("Couldn't read (5)");
-        return 5;
+        std::cout << "Couldn't read (5)";
+        return;
     }
 
     close(SERVERSOCKET);
 
-    log(std::string(buffer));
-
-    return 0;
+    std::cout << std::string(buffer);
 }
 
 void batchRequest(std::string arg, bool json) {
@@ -306,7 +273,7 @@ void instancesRequest(bool json) {
         result += "\n]";
     }
 
-    log(result + "\n");
+    std::cout << result << "\n";
 }
 
 std::deque<std::string> splitArgs(int argc, char** argv) {
@@ -318,11 +285,17 @@ std::deque<std::string> splitArgs(int argc, char** argv) {
     return result;
 }
 
+bool isNumber(const std::string& str, bool allowfloat) {
+    if (str.empty())
+        return false;
+    return std::ranges::all_of(str.begin(), str.end(), [&](char c) { return isdigit(c) != 0 || c == '-' || (allowfloat && c == '.'); });
+}
+
 int main(int argc, char** argv) {
     bool parseArgs = true;
 
     if (argc < 2) {
-        std::cout << USAGE << std::endl;
+        printf("%s\n", USAGE.c_str());
         return 1;
     }
 
@@ -330,7 +303,6 @@ int main(int argc, char** argv) {
     std::string fullArgs         = "";
     const auto  ARGS             = splitArgs(argc, argv);
     bool        json             = false;
-    bool        needRoll         = false;
     std::string overrideInstance = "";
 
     for (std::size_t i = 0; i < ARGS.size(); ++i) {
@@ -348,46 +320,19 @@ int main(int argc, char** argv) {
                 fullArgs += "r";
             } else if (ARGS[i] == "-a" && !fullArgs.contains("a")) {
                 fullArgs += "a";
-            } else if ((ARGS[i] == "-c" || ARGS[i] == "--config") && !fullArgs.contains("c")) {
-                fullArgs += "c";
-            } else if ((ARGS[i] == "-f" || ARGS[i] == "--follow") && !fullArgs.contains("f")) {
-                fullArgs += "f";
-                needRoll = true;
             } else if (ARGS[i] == "--batch") {
                 fullRequest = "--batch ";
             } else if (ARGS[i] == "--instance" || ARGS[i] == "-i") {
                 ++i;
 
                 if (i >= ARGS.size()) {
-                    std::cout << USAGE << std::endl;
+                    printf("%s\n", USAGE.c_str());
                     return 1;
                 }
 
                 overrideInstance = ARGS[i];
-            } else if (ARGS[i] == "-q" || ARGS[i] == "--quiet") {
-                quiet = true;
-            } 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 {
-                std::cout << USAGE << std::endl;
+                printf("%s\n", USAGE.c_str());
                 return 1;
             }
 
@@ -398,7 +343,7 @@ int main(int argc, char** argv) {
     }
 
     if (fullRequest.empty()) {
-        std::cout << USAGE << std::endl;
+        printf("%s\n", USAGE.c_str());
         return 1;
     }
 
@@ -412,16 +357,11 @@ int main(int argc, char** argv) {
         return 0;
     }
 
-    if (needRoll && !fullRequest.contains("/rollinglog")) {
-        log("only 'rollinglog' command supports '--follow' option");
-        return 1;
-    }
-
     if (overrideInstance.contains("_"))
         instanceSignature = overrideInstance;
     else if (!overrideInstance.empty()) {
         if (!isNumber(overrideInstance, false)) {
-            log("instance invalid\n");
+            std::cout << "instance invalid\n";
             return 1;
         }
 
@@ -430,7 +370,7 @@ int main(int argc, char** argv) {
         const auto INSTANCES = instances();
 
         if (INSTANCENO < 0 || static_cast<std::size_t>(INSTANCENO) >= INSTANCES.size()) {
-            log("no such instance\n");
+            std::cout << "no such instance\n";
             return 1;
         }
 
@@ -439,7 +379,7 @@ int main(int argc, char** argv) {
         const auto ISIG = getenv("HYPRLAND_INSTANCE_SIGNATURE");
 
         if (!ISIG) {
-            log("HYPRLAND_INSTANCE_SIGNATURE not set! (is hyprland running?)\n");
+            std::cout << "HYPRLAND_INSTANCE_SIGNATURE not set! (is hyprland running?)\n";
             return 1;
         }
 
@@ -451,37 +391,35 @@ int main(int argc, char** argv) {
     if (fullRequest.contains("/--batch"))
         batchRequest(fullRequest, json);
     else if (fullRequest.contains("/hyprpaper"))
-        exitStatus = requestHyprpaper(fullRequest);
+        requestHyprpaper(fullRequest);
     else if (fullRequest.contains("/switchxkblayout"))
-        exitStatus = request(fullRequest, 2);
+        request(fullRequest, 2);
     else if (fullRequest.contains("/seterror"))
-        exitStatus = request(fullRequest, 1);
+        request(fullRequest, 1);
     else if (fullRequest.contains("/setprop"))
-        exitStatus = request(fullRequest, 3);
+        request(fullRequest, 3);
     else if (fullRequest.contains("/plugin"))
-        exitStatus = request(fullRequest, 1);
+        request(fullRequest, 1);
     else if (fullRequest.contains("/dismissnotify"))
-        exitStatus = request(fullRequest, 0);
+        request(fullRequest, 0);
     else if (fullRequest.contains("/notify"))
-        exitStatus = request(fullRequest, 2);
+        request(fullRequest, 2);
     else if (fullRequest.contains("/output"))
-        exitStatus = request(fullRequest, 2);
+        request(fullRequest, 2);
     else if (fullRequest.contains("/setcursor"))
-        exitStatus = request(fullRequest, 1);
+        request(fullRequest, 1);
     else if (fullRequest.contains("/dispatch"))
-        exitStatus = request(fullRequest, 1);
+        request(fullRequest, 1);
     else if (fullRequest.contains("/keyword"))
-        exitStatus = request(fullRequest, 2);
+        request(fullRequest, 2);
     else if (fullRequest.contains("/decorations"))
-        exitStatus = request(fullRequest, 1);
+        request(fullRequest, 1);
     else if (fullRequest.contains("/--help"))
-        std::cout << USAGE << std::endl;
-    else if (fullRequest.contains("/rollinglog") && needRoll)
-        exitStatus = request(fullRequest, 0, true);
+        printf("%s", USAGE.c_str());
     else {
-        exitStatus = request(fullRequest);
+        request(fullRequest);
     }
 
-    std::cout << std::flush;
+    printf("\n");
     return exitStatus;
 }

hyprctl/meson.build

@@ -1,10 +1,3 @@
 executable('hyprctl', 'main.cpp',
-  dependencies: [
-    dependency('hyprutils', version: '>= 0.1.1'),
-  ],
   install: true
 )
-
-install_data('hyprctl.bash', install_dir: join_paths(get_option('datadir'), 'bash-completion/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

@@ -1,7 +1,8 @@
-prefix=@PREFIX@/@INCLUDEDIR@
+prefix="@PREFIX@"
+includedir="${prefix}/include"
 
 Name: Hyprland
 URL: https://github.com/hyprwm/Hyprland
 Description: Hyprland header files
 Version: @HYPRLAND_VERSION@
-Cflags: -I${prefix} -I${prefix}/hyprland/protocols -I${prefix}/hyprland -I${prefix}/hyprland/wlr
+Cflags: -I"${includedir}/hyprland/protocols" -I"${includedir}/hyprland/wlroots" -I"${includedir}"

hyprpm/CMakeLists.txt

@@ -9,21 +9,8 @@ file(GLOB_RECURSE SRCFILES CONFIGURE_DEPENDS "src/*.cpp")
 
 set(CMAKE_CXX_STANDARD 23)
 
-pkg_check_modules(deps REQUIRED IMPORTED_TARGET tomlplusplus hyprutils>=0.1.1)
+pkg_check_modules(tomlplusplus REQUIRED IMPORTED_TARGET tomlplusplus)
 
 add_executable(hyprpm ${SRCFILES})
 
-target_link_libraries(hyprpm PUBLIC PkgConfig::deps)
-
-# binary
-install(TARGETS hyprpm)
-
-# shell completions
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/hyprpm.bash
-        DESTINATION ${CMAKE_INSTALL_DATADIR}/bash-completion/completions
-        RENAME hyprpm)
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/hyprpm.fish
-        DESTINATION ${CMAKE_INSTALL_DATADIR}/fish/vendor_completions.d)
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/hyprpm.zsh
-        DESTINATION ${CMAKE_INSTALL_DATADIR}/zsh/site-functions
-        RENAME _hyprpm)
+target_link_libraries(hyprpm PUBLIC PkgConfig::tomlplusplus)

hyprpm/hyprpm.bash

@@ -1,106 +0,0 @@
-_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

@@ -1,109 +0,0 @@
-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

@@ -1,19 +0,0 @@
-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

@@ -1,151 +0,0 @@
-#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/Manifest.cpp

@@ -75,7 +75,6 @@ CManifest::CManifest(const eManifestType type, const std::string& path) {
         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) {

hyprpm/src/core/Manifest.hpp

@@ -19,7 +19,6 @@ class CManifest {
         std::vector<std::string> authors;
         std::vector<std::string> buildSteps;
         std::string              output;
-        int                      since  = 0;
         bool                     failed = false;
     };
 

hyprpm/src/core/PluginManager.cpp

@@ -12,22 +12,32 @@
 #include <algorithm>
 #include <format>
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <pwd.h>
-#include <unistd.h>
-
 #include <toml++/toml.hpp>
 
-#include <hyprutils/string/String.hpp>
-using namespace Hyprutils::String;
+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;
-    using PcloseType = int (*)(FILE*);
-    const std::unique_ptr<FILE, PcloseType> pipe(popen(cmd.c_str(), "r"), static_cast<PcloseType>(pclose));
+    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 "";
 
@@ -60,52 +70,16 @@ SHyprlandVersion CPluginManager::getHyprlandVersion() {
     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";
+        std::cout << Colors::BLUE << "[v] " << Colors::RESET << "parsed commit " << hlcommit << " at branch " << hlbranch << "\n";
 
-    ver = SHyprlandVersion{hlbranch, hlcommit, hldate, commits};
+    ver = SHyprlandVersion{hlbranch, hlcommit};
     return ver;
 }
 
-bool CPluginManager::createSafeDirectory(const std::string& path) {
-    if (path.empty() || !path.starts_with("/tmp"))
-        return false;
-
-    if (std::filesystem::exists(path))
-        std::filesystem::remove_all(path);
-
-    if (std::filesystem::exists(path))
-        return false;
-
-    if (mkdir(path.c_str(), S_IRWXU) < 0)
-        return false;
-
-    return true;
-}
-
 bool CPluginManager::addNewPluginRepo(const std::string& url, const std::string& rev) {
     const auto HLVER = getHyprlandVersion();
 
-    if (!hasDeps()) {
-        std::cerr << "\n" << Colors::RED << "✖" << Colors::RESET << " Could not clone the plugin repository. Dependencies not satisfied. Hyprpm requires: cmake, meson, cpio\n";
-        return false;
-    }
-
     if (DataState::pluginRepoExists(url)) {
         std::cerr << "\n" << Colors::RED << "✖" << Colors::RESET << " Could not clone the plugin repository. Repository already installed.\n";
         return false;
@@ -143,31 +117,24 @@ bool CPluginManager::addNewPluginRepo(const std::string& url, const std::string&
     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);
-    } else if (!std::filesystem::is_directory("/tmp/hyprpm")) {
-        std::cerr << "\n" << Colors::RED << "✖" << Colors::RESET << " Could not prepare working dir for hyprpm\n";
-        return false;
     }
 
-    const std::string USERNAME = getpwuid(getuid())->pw_name;
-
-    m_szWorkingPluginDirectory = "/tmp/hyprpm/" + USERNAME;
-
-    if (!createSafeDirectory(m_szWorkingPluginDirectory)) {
-        std::cerr << "\n" << Colors::RED << "✖" << Colors::RESET << " Could not prepare working dir for repo\n";
-        return false;
+    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 + " " + USERNAME);
+    std::string ret = execAndGet("cd /tmp/hyprpm && git clone --recursive " + url + " new");
 
-    if (!std::filesystem::exists(m_szWorkingPluginDirectory + "/.git")) {
+    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 " + m_szWorkingPluginDirectory + " reset --hard --recurse-submodules " + rev);
+        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;
@@ -181,12 +148,12 @@ bool CPluginManager::addNewPluginRepo(const std::string& url, const std::string&
 
     std::unique_ptr<CManifest> pManifest;
 
-    if (std::filesystem::exists(m_szWorkingPluginDirectory + "/hyprpm.toml")) {
+    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, m_szWorkingPluginDirectory + "/hyprpm.toml");
-    } else if (std::filesystem::exists(m_szWorkingPluginDirectory + "/hyprload.toml")) {
+        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, m_szWorkingPluginDirectory + "/hyprload.toml");
+        pManifest = std::make_unique<CManifest>(MANIFEST_HYPRLOAD, "/tmp/hyprpm/new/hyprload.toml");
     }
 
     if (!pManifest) {
@@ -225,7 +192,7 @@ bool CPluginManager::addNewPluginRepo(const std::string& url, const std::string&
 
             progress.printMessageAbove(std::string{Colors::GREEN} + "✔" + Colors::RESET + " commit pin " + plugin + " matched hl, resetting");
 
-            execAndGet("cd " + m_szWorkingPluginDirectory + " && git reset --hard --recurse-submodules " + plugin);
+            execAndGet("cd /tmp/hyprpm/new/ && git reset --hard --recurse-submodules " + plugin);
         }
     }
 
@@ -247,29 +214,21 @@ bool CPluginManager::addNewPluginRepo(const std::string& url, const std::string&
     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 {} && PKG_CONFIG_PATH=\"{}/share/pkgconfig\" {}", m_szWorkingPluginDirectory, DataState::getHeadersPath(), bs);
+            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(m_szWorkingPluginDirectory + "/" + 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");
+        if (!std::filesystem::exists("/tmp/hyprpm/new/" + p.output)) {
+            progress.printMessageAbove(std::string{Colors::RED} + "✖" + Colors::RESET + " Plugin " + p.name + " failed to build.\n");
 
             p.failed = true;
+
             continue;
         }
 
@@ -283,7 +242,7 @@ bool CPluginManager::addNewPluginRepo(const std::string& url, const std::string&
 
     // add repo toml to DataState
     SPluginRepository repo;
-    std::string       repohash = execAndGet("cd " + m_szWorkingPluginDirectory + " && git rev-parse HEAD");
+    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;
@@ -291,7 +250,7 @@ bool CPluginManager::addNewPluginRepo(const std::string& url, const std::string&
     repo.rev  = rev;
     repo.hash = repohash;
     for (auto& p : pManifest->m_vPlugins) {
-        repo.plugins.push_back(SPlugin{p.name, m_szWorkingPluginDirectory + "/" + p.output, false, p.failed});
+        repo.plugins.push_back(SPlugin{p.name, "/tmp/hyprpm/new/" + p.output, false, p.failed});
     }
     DataState::addNewPluginRepo(repo);
 
@@ -304,7 +263,7 @@ bool CPluginManager::addNewPluginRepo(const std::string& url, const std::string&
     std::cout << "\n";
 
     // remove build files
-    std::filesystem::remove_all(m_szWorkingPluginDirectory);
+    std::filesystem::remove_all("/tmp/hyprpm/new");
 
     return true;
 }
@@ -338,7 +297,7 @@ eHeadersErrors CPluginManager::headersValid() {
         return HEADERS_MISSING;
 
     // find headers commit
-    std::string cmd     = std::format("PKG_CONFIG_PATH=\"{}/share/pkgconfig\" pkgconf --cflags --keep-system-cflags hyprland", DataState::getHeadersPath());
+    std::string cmd     = std::format("PKG_CONFIG_PATH=\"{}/share/pkgconfig\" pkg-config --cflags --keep-system-cflags hyprland", DataState::getHeadersPath());
     auto        headers = execAndGet(cmd.c_str());
 
     if (!headers.contains("-I/"))
@@ -356,10 +315,10 @@ eHeadersErrors CPluginManager::headersValid() {
         else
             headers = "";
 
-        if (PATH.ends_with("protocols") || PATH.ends_with("wlroots-hyprland"))
+        if (PATH.ends_with("protocols") || PATH.ends_with("wlroots"))
             continue;
 
-        verHeader = trim(PATH.substr(2)) + "/hyprland/src/version.h";
+        verHeader = removeBeginEndSpacesTabs(PATH.substr(2)) + "/hyprland/src/version.h";
         break;
     }
 
@@ -396,11 +355,6 @@ bool CPluginManager::updateHeaders(bool force) {
 
     const auto HLVER = getHyprlandVersion();
 
-    if (!hasDeps()) {
-        std::cerr << "\n" << Colors::RED << "✖" << Colors::RESET << " Could not update. Dependencies not satisfied. Hyprpm requires: cmake, meson, cpio\n";
-        return false;
-    }
-
     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);
@@ -417,35 +371,16 @@ bool CPluginManager::updateHeaders(bool force) {
     progress.m_szCurrentMessage = "Cloning the hyprland repository";
     progress.print();
 
-    const std::string USERNAME   = getpwuid(getuid())->pw_name;
-    const auto        WORKINGDIR = "/tmp/hyprpm/hyprland-" + USERNAME;
-
-    if (!createSafeDirectory(WORKINGDIR)) {
-        std::cerr << "\n" << Colors::RED << "✖" << Colors::RESET << " Could not prepare working dir for hl\n";
-        return false;
+    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.");
 
-    const bool bShallow = (HLVER.branch == "main" || HLVER.branch == "") && !m_bNoShallow;
+    std::string ret = execAndGet("cd /tmp/hyprpm && git clone --recursive https://github.com/hyprwm/hyprland hyprland");
 
-    // let us give a bit of leg-room for shallowing
-    // due to timezones, etc.
-    const std::string SHALLOW_DATE =
-        trim(HLVER.date).empty() ? "" : execAndGet("LC_TIME=\"en_US.UTF-8\" date --date='" + HLVER.date + " - 1 weeks' '+\%a \%b \%d \%H:\%M:\%S \%Y'");
-
-    if (m_bVerbose && bShallow)
-        progress.printMessageAbove(std::string{Colors::BLUE} + "[v] " + Colors::RESET + "will shallow since: " + SHALLOW_DATE);
-
-    std::string ret =
-        execAndGet("cd /tmp/hyprpm && git clone --recursive https://github.com/hyprwm/hyprland hyprland-" + USERNAME + (bShallow ? " --shallow-since='" + SHALLOW_DATE + "'" : ""));
-
-    if (!std::filesystem::exists(WORKINGDIR)) {
-        progress.printMessageAbove(std::string{Colors::RED} + "✖" + Colors::RESET + " Clone failed. Retrying without shallow.");
-        ret = execAndGet("cd /tmp/hyprpm && git clone --recursive https://github.com/hyprwm/hyprland hyprland-" + USERNAME);
-    }
-
-    if (!std::filesystem::exists(WORKINGDIR + "/.git")) {
+    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;
     }
@@ -455,15 +390,11 @@ bool CPluginManager::updateHeaders(bool force) {
     progress.m_szCurrentMessage = "Checking out sources";
     progress.print();
 
-    ret = execAndGet("cd " + WORKINGDIR + " && git checkout " + HLVER.branch + " 2>&1");
+    ret =
+        execAndGet("cd /tmp/hyprpm/hyprland && git checkout " + HLVER.branch + " 2>&1 && 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 (co): " + ret);
-
-    ret = execAndGet("cd " + WORKINGDIR + " && 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 (rs): " + ret);
+        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;
@@ -475,26 +406,14 @@ bool CPluginManager::updateHeaders(bool force) {
     if (m_bVerbose)
         progress.printMessageAbove(std::string{Colors::BLUE} + "[v] " + Colors::RESET + "setting PREFIX for cmake to " + DataState::getHeadersPath());
 
-    ret = execAndGet(std::format("cd {} && cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:STRING=\"{}\" -S . -B ./build -G Ninja", WORKINGDIR,
-                                 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);
 
-    if (ret.contains("CMake Error at")) {
-        // missing deps, let the user know.
-        std::string missing = ret.substr(ret.find("CMake Error at"));
-        missing             = ret.substr(ret.find_first_of('\n') + 1);
-        missing             = missing.substr(0, missing.find("-- Configuring incomplete"));
-        missing             = missing.substr(0, missing.find_last_of('\n'));
-
-        std::cerr << "\n"
-                  << Colors::RED << "✖" << Colors::RESET << " Could not configure the hyprland source, cmake complained:\n"
-                  << missing << "\n\nThis likely means that you are missing the above dependencies or they are out of date.\n";
-        return false;
-    }
-
     // le hack. Wlroots has to generate its build/include
-    ret = execAndGet("cd " + WORKINGDIR + "/subprojects/wlroots-hyprland && meson setup -Drenderers=gles2 -Dexamples=false build");
+    ret = execAndGet("cd /tmp/hyprpm/hyprland/subprojects/wlroots && meson setup -Drenderers=gles2 -Dexamples=false build");
     if (m_bVerbose)
         progress.printMessageAbove(std::string{Colors::BLUE} + "[v] " + Colors::RESET + "meson returned: " + ret);
 
@@ -503,8 +422,12 @@ bool CPluginManager::updateHeaders(bool force) {
     progress.m_szCurrentMessage = "Installing sources";
     progress.print();
 
-    std::string cmd =
-        std::format("sed -i -e \"s#PREFIX = /usr/local#PREFIX = {}#\" {}/Makefile && cd {} && make installheaders", DataState::getHeadersPath(), WORKINGDIR, WORKINGDIR);
+    // progress.printMessageAbove(
+    //     std::string{Colors::YELLOW} + "!" + Colors::RESET +
+    //     " in order to install the sources, you will need to input your password.\n  If nothing pops up, make sure you have polkit and an authentication daemon running.");
+
+    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);
 
@@ -514,7 +437,7 @@ bool CPluginManager::updateHeaders(bool force) {
         std::cout << Colors::BLUE << "[v] " << Colors::RESET << "installer returned: " << ret << "\n";
 
     // remove build files
-    std::filesystem::remove_all(WORKINGDIR);
+    std::filesystem::remove_all("/tmp/hyprpm/hyprland");
 
     auto HEADERSVALID = headersValid();
     if (HEADERSVALID == HEADERS_OK) {
@@ -561,9 +484,6 @@ bool CPluginManager::updatePlugins(bool forceUpdateAll) {
     progress.m_szCurrentMessage = "Updating repositories";
     progress.print();
 
-    const std::string USERNAME = getpwuid(getuid())->pw_name;
-    m_szWorkingPluginDirectory = "/tmp/hyprpm/" + USERNAME;
-
     for (auto& repo : REPOS) {
         bool update = forceUpdateAll;
 
@@ -573,13 +493,16 @@ bool CPluginManager::updatePlugins(bool forceUpdateAll) {
 
         progress.printMessageAbove(std::string{Colors::RESET} + " → checking for updates for " + repo.name);
 
-        createSafeDirectory(m_szWorkingPluginDirectory);
+        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 + " " + USERNAME);
+        std::string ret = execAndGet("cd /tmp/hyprpm && git clone --recursive " + repo.url + " update");
 
-        if (!std::filesystem::exists(m_szWorkingPluginDirectory + "/.git")) {
+        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;
         }
@@ -587,7 +510,7 @@ bool CPluginManager::updatePlugins(bool forceUpdateAll) {
         if (!repo.rev.empty()) {
             progress.printMessageAbove(std::string{Colors::RESET} + " → Plugin has revision set, resetting: " + repo.rev);
 
-            std::string ret = execAndGet("git -C " + m_szWorkingPluginDirectory + " reset --hard --recurse-submodules " + repo.rev);
+            std::string ret = execAndGet("git -C /tmp/hyprpm 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;
@@ -596,7 +519,7 @@ bool CPluginManager::updatePlugins(bool forceUpdateAll) {
 
         if (!update) {
             // check if git has updates
-            std::string hash = execAndGet("cd " + m_szWorkingPluginDirectory + " && git rev-parse HEAD");
+            std::string hash = execAndGet("cd /tmp/hyprpm/update && git rev-parse HEAD");
             if (!hash.empty())
                 hash.pop_back();
 
@@ -604,7 +527,7 @@ bool CPluginManager::updatePlugins(bool forceUpdateAll) {
         }
 
         if (!update) {
-            std::filesystem::remove_all(m_szWorkingPluginDirectory);
+            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();
@@ -620,12 +543,12 @@ bool CPluginManager::updatePlugins(bool forceUpdateAll) {
 
         std::unique_ptr<CManifest> pManifest;
 
-        if (std::filesystem::exists(m_szWorkingPluginDirectory + "/hyprpm.toml")) {
+        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, m_szWorkingPluginDirectory + "/hyprpm.toml");
-        } else if (std::filesystem::exists(m_szWorkingPluginDirectory + "/hyprload.toml")) {
+            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, m_szWorkingPluginDirectory + "/hyprload.toml");
+            pManifest = std::make_unique<CManifest>(MANIFEST_HYPRLOAD, "/tmp/hyprpm/update/hyprload.toml");
         }
 
         if (!pManifest) {
@@ -649,59 +572,53 @@ bool CPluginManager::updatePlugins(bool forceUpdateAll) {
 
                 progress.printMessageAbove(std::string{Colors::GREEN} + "✔" + Colors::RESET + " commit pin " + plugin + " matched hl, resetting");
 
-                execAndGet("cd " + m_szWorkingPluginDirectory + " && git reset --hard --recurse-submodules " + plugin);
+                execAndGet("cd /tmp/hyprpm/update/ && git reset --hard --recurse-submodules " + plugin);
             }
         }
 
+        bool failed = false;
         for (auto& p : pManifest->m_vPlugins) {
             std::string out;
 
-            if (p.since > HLVER.commits && HLVER.commits >= 1000 /* for shallow clones, we can't check this. 1000 is an arbitrary number I chose. */) {
-                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 {} && PKG_CONFIG_PATH=\"{}/share/pkgconfig\" {}", m_szWorkingPluginDirectory, DataState::getHeadersPath(), bs);
+                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(m_szWorkingPluginDirectory + "/" + 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;
+            if (!std::filesystem::exists("/tmp/hyprpm/update/" + p.output)) {
+                std::cerr << "\n" << Colors::RED << "✖" << Colors::RESET << " Plugin " << p.name << " failed to build.\n";
+                failed = true;
+                break;
             }
 
             progress.printMessageAbove(std::string{Colors::GREEN} + "✔" + Colors::RESET + " built " + p.name + " into " + p.output);
         }
 
+        if (failed)
+            continue;
+
         // add repo toml to DataState
         SPluginRepository newrepo = repo;
         newrepo.plugins.clear();
-        execAndGet("cd " + m_szWorkingPluginDirectory +
-                   " && 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 " + m_szWorkingPluginDirectory + " && git rev-parse HEAD");
+        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, m_szWorkingPluginDirectory + "/" + p.output, OLDPLUGINIT != repo.plugins.end() ? OLDPLUGINIT->enabled : false});
+            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(m_szWorkingPluginDirectory);
+        std::filesystem::remove_all("/tmp/hyprpm/update");
 
         progress.printMessageAbove(std::string{Colors::GREEN} + "✔" + Colors::RESET + " updated " + repo.name);
     }
@@ -875,13 +792,3 @@ std::string CPluginManager::headerError(const eHeadersErrors err) {
 
     return std::string{Colors::RED} + "✖" + Colors::RESET + " Unknown header error. Please run hyprpm update to fix those.\n";
 }
-
-bool CPluginManager::hasDeps() {
-    std::vector<std::string> deps = {"meson", "cpio", "cmake"};
-    for (auto& d : deps) {
-        if (!execAndGet("which " + d + " 2>&1").contains("/"))
-            return false;
-    }
-
-    return true;
-}

hyprpm/src/core/PluginManager.hpp

@@ -32,8 +32,6 @@ enum ePluginLoadStateReturn {
 struct SHyprlandVersion {
     std::string branch;
     std::string hash;
-    std::string date;
-    int         commits = 0;
 };
 
 class CPluginManager {
@@ -56,18 +54,10 @@ class CPluginManager {
 
     void                   notify(const eNotifyIcons icon, uint32_t color, int durationMs, const std::string& message);
 
-    bool                   hasDeps();
-
-    bool                   m_bVerbose   = false;
-    bool                   m_bNoShallow = false;
-
-    // will delete recursively if exists!!
-    bool createSafeDirectory(const std::string& path);
+    bool                   m_bVerbose = false;
 
   private:
     std::string headerError(const eHeadersErrors err);
-
-    std::string m_szWorkingPluginDirectory = "";
 };
 
 inline std::unique_ptr<CPluginManager> g_pPluginManager;

hyprpm/src/main.cpp

@@ -26,7 +26,6 @@ const std::string HELP = R"#(┏ hyprpm, a Hyprland Plugin Manager
 ┣ --help         | -h    → Show this menu
 ┣ --verbose      | -v    → Enable too much logging
 ┣ --force        | -f    → Force an operation ignoring checks (e.g. update -f)
-┣ --no-shallow   | -s    → Disable shallow cloning of Hyprland sources
 ┗
 )#";
 
@@ -42,7 +41,7 @@ int               main(int argc, char** argv, char** envp) {
     }
 
     std::vector<std::string> command;
-    bool                     notify = false, verbose = false, force = false, noShallow = false;
+    bool                     notify = false, verbose = false, force = false;
 
     for (int i = 1; i < argc; ++i) {
         if (ARGS[i].starts_with("-")) {
@@ -53,8 +52,6 @@ int               main(int argc, char** argv, char** envp) {
                 notify = true;
             } else if (ARGS[i] == "--verbose" || ARGS[i] == "-v") {
                 verbose = true;
-            } else if (ARGS[i] == "--no-shallow" || ARGS[i] == "-s") {
-                noShallow = 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";
@@ -72,9 +69,8 @@ int               main(int argc, char** argv, char** envp) {
         return 0;
     }
 
-    g_pPluginManager               = std::make_unique<CPluginManager>();
-    g_pPluginManager->m_bVerbose   = verbose;
-    g_pPluginManager->m_bNoShallow = noShallow;
+    g_pPluginManager             = std::make_unique<CPluginManager>();
+    g_pPluginManager->m_bVerbose = verbose;
 
     if (command[0] == "add") {
         if (command.size() < 2) {

hyprpm/src/meson.build

@@ -3,13 +3,8 @@ src = globber.stdout().strip().split('\n')
 
 executable('hyprpm', src,
   dependencies: [
-    dependency('hyprutils', version: '>= 0.1.1'),
     dependency('threads'),
     dependency('tomlplusplus')
   ],
   install : true
 )
-
-install_data('../hyprpm.bash', install_dir: join_paths(get_option('datadir'), 'bash-completion/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')

meson.build

@@ -5,9 +5,20 @@ project('Hyprland', 'cpp', 'c',
     'default_library=static',
     'optimization=3',
     'buildtype=release',
-    'debug=false',
-    'cpp_std=c++23',
-  ])
+    'debug=false'
+    # 'cpp_std=c++23' # not yet supported by meson, as of version 0.63.0
+    ])
+
+# clang v14.0.6 uses C++2b instead of C++23, so we've gotta account for that
+# replace the following with a project default option once meson gets support for C++23
+cpp_compiler = meson.get_compiler('cpp')
+if cpp_compiler.has_argument('-std=c++23')
+  add_global_arguments('-std=c++23', language: 'cpp')
+elif cpp_compiler.has_argument('-std=c++2b')
+  add_global_arguments('-std=c++2b', language: 'cpp')
+else
+  error('Could not configure current C++ compiler (' + cpp_compiler.get_id() + ' ' + cpp_compiler.version() + ') with required C++ standard (C++23)')
+endif
 
 add_project_arguments(
   [
@@ -15,24 +26,16 @@ add_project_arguments(
     '-Wno-unused-value',
     '-Wno-missing-field-initializers',
     '-Wno-narrowing',
-    '-Wno-pointer-arith',
   ],
   language: 'cpp')
 
-cpp_compiler = meson.get_compiler('cpp')
 if cpp_compiler.check_header('execinfo.h')
   add_project_arguments('-DHAS_EXECINFO', language: 'cpp')
 endif
 
-wlroots = subproject('wlroots-hyprland', default_options: ['examples=false', 'renderers=gles2'])
+wlroots = subproject('wlroots', default_options: ['examples=false', 'renderers=gles2'])
 have_xwlr = wlroots.get_variable('features').get('xwayland')
 xcb_dep = dependency('xcb', required: get_option('xwayland'))
-xcb_composite_dep = dependency('xcb-composite', required: get_option('xwayland'))
-xcb_errors_dep = dependency('xcb-errors', required: get_option('xwayland'))
-xcb_icccm_dep = dependency('xcb-icccm', required: get_option('xwayland'))
-xcb_render_dep = dependency('xcb-render', required: get_option('xwayland'))
-xcb_res_dep = dependency('xcb-res', required: get_option('xwayland'))
-xcb_xfixes_dep = dependency('xcb-xfixes', required: get_option('xwayland'))
 
 cmake = import('cmake')
 udis = cmake.subproject('udis86')
@@ -48,10 +51,14 @@ if not have_xwayland
 endif
 
 backtrace_dep = cpp_compiler.find_library('execinfo', required: false)
-epoll_dep = dependency('epoll-shim', required: false) # timerfd on BSDs
+systemd_dep = dependency('libsystemd', required: get_option('systemd'))
 
 if get_option('systemd').enabled()
-  add_project_arguments('-DUSES_SYSTEMD', language: 'cpp')
+  if systemd_dep.found()
+    add_project_arguments('-DUSES_SYSTEMD', language: 'cpp')
+  else
+  	error('Cannot enable systemd in Hyprland: libsystemd was not found')
+  endif
 endif
 
 if get_option('legacy_renderer').enabled()
@@ -62,7 +69,7 @@ if get_option('buildtype') == 'debug'
   add_project_arguments('-DHYPRLAND_DEBUG', language: 'cpp')
 endif
 
-version_h = run_command('sh', '-c', 'scripts/generateVersion.sh', check: true)
+version_h = run_command('sh', '-c', 'scripts/generateVersion.sh')
 
 globber = run_command('find', 'src', '-name', '*.h*', check: true)
 headers = globber.stdout().strip().split('\n')
@@ -86,5 +93,5 @@ import('pkgconfig').generate(
   url: 'https://github.com/hyprwm/Hyprland',
   description: 'Hyprland header files',
   install_dir: pkg_install_dir,
-  subdirs: ['', 'hyprland/protocols', 'hyprland', 'hyprland/wlr'],
+  subdirs: ['', 'hyprland/protocols', 'hyprland/wlroots'],
 )

nix/default.nix

@@ -2,46 +2,33 @@
   lib,
   stdenv,
   pkg-config,
-  pkgconf,
   makeWrapper,
-  cmake,
+  meson,
   ninja,
   binutils,
   cairo,
-  expat,
-  fribidi,
   git,
-  hwdata,
   hyprcursor,
+  hyprland-protocols,
   hyprlang,
-  hyprutils,
-  hyprwayland-scanner,
   jq,
   libGL,
-  libdatrie,
-  libdisplay-info,
   libdrm,
   libexecinfo,
   libinput,
-  libliftoff,
-  libselinux,
-  libsepol,
-  libthai,
-  libuuid,
+  libxcb,
   libxkbcommon,
   mesa,
-  meson,
   pango,
   pciutils,
-  pcre2,
-  python3,
-  seatd,
   systemd,
   tomlplusplus,
+  udis86,
   wayland,
   wayland-protocols,
   wayland-scanner,
-  xorg,
+  wlroots,
+  xcbutilwm,
   xwayland,
   debug ? false,
   enableXWayland ? true,
@@ -58,7 +45,9 @@
 }:
 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";
+assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been removed. Please refer https://wiki.hyprland.org/Configuring/XWayland"; let
+  wlr = wlroots.override {inherit enableXWayland;};
+in
   stdenv.mkDerivation {
     pname = "hyprland${lib.optionalString debug "-debug"}";
     inherit version;
@@ -71,28 +60,36 @@ assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been remov
       src = lib.cleanSource ../.;
     };
 
+    patches = [
+      # make meson use the provided wlroots instead of the git submodule
+      ./patches/meson-build.patch
+    ];
+
     postPatch = ''
       # Fix hardcoded paths to /usr installation
       sed -i "s#/usr#$out#" src/render/OpenGL.cpp
 
-      # Remove extra @PREFIX@ to fix pkg-config paths
-      sed -i "s#@PREFIX@/##g" hyprland.pc.in
+      # Generate version.h
+      cp src/version.h.in src/version.h
+      substituteInPlace src/version.h \
+        --replace "@HASH@" '${commit}' \
+        --replace "@BRANCH@" "" \
+        --replace "@MESSAGE@" "" \
+        --replace "@DATE@" "${date}" \
+        --replace "@TAG@" "" \
+        --replace "@DIRTY@" '${
+        if commit == ""
+        then "dirty"
+        else ""
+      }'
     '';
 
-    COMMITS = commit;
-    DATE = date;
-    DIRTY = lib.optionalString (commit == "") "dirty";
-    HASH = commit;
-
     nativeBuildInputs = [
-      hyprwayland-scanner
       jq
       makeWrapper
-      cmake
-      meson # for wlroots
+      meson
       ninja
       pkg-config
-      python3 # for udis86
       wayland-scanner
     ];
 
@@ -102,82 +99,63 @@ assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been remov
       "dev"
     ];
 
-    buildInputs = lib.concatLists [
+    buildInputs =
       [
         cairo
-        expat
-        fribidi
         git
-        hwdata
-        hyprcursor
+        hyprcursor.dev
+        hyprland-protocols
         hyprlang
-        hyprutils
-        libGL
         libdrm
-        libdatrie
+        libGL
         libinput
-        libselinux
-        libsepol
-        libthai
-        libuuid
         libxkbcommon
         mesa
         pango
         pciutils
-        pcre2
         tomlplusplus
+        udis86
         wayland
         wayland-protocols
-        # for wlroots
-        seatd
-        libdisplay-info
-        libliftoff
+        wlr
       ]
-      (lib.optionals stdenv.hostPlatform.isMusl [libexecinfo])
-      (lib.optionals enableXWayland [
-        xorg.libxcb
-        xorg.libXdmcp
-        xorg.xcbutil
-        xorg.xcbutilerrors
-        xorg.xcbutilrenderutil
-        xorg.xcbutilwm
-        xwayland
-      ])
-      (lib.optionals withSystemd [systemd])
-    ];
+      ++ lib.optionals stdenv.hostPlatform.isMusl [libexecinfo]
+      ++ lib.optionals enableXWayland [libxcb xcbutilwm xwayland]
+      ++ lib.optionals withSystemd [systemd];
 
-    cmakeBuildType =
+    mesonBuildType =
       if debug
-      then "Debug"
-      else "RelWithDebInfo";
+      then "debug"
+      else "release";
 
-    # we want as much debug info as possible
-    dontStrip = debug;
+    mesonAutoFeatures = "disabled";
 
-    cmakeFlags = [
-      (lib.cmakeBool "NO_XWAYLAND" (!enableXWayland))
-      (lib.cmakeBool "LEGACY_RENDERER" legacyRenderer)
-      (lib.cmakeBool "NO_SYSTEMD" (!withSystemd))
+    mesonFlags = [
+      (lib.mesonEnable "xwayland" enableXWayland)
+      (lib.mesonEnable "legacy_renderer" legacyRenderer)
+      (lib.mesonEnable "systemd" withSystemd)
     ];
 
     postInstall = ''
+      ln -s ${wlr}/include/wlr $dev/include/hyprland/wlroots
+
       ${lib.optionalString wrapRuntimeDeps ''
         wrapProgram $out/bin/Hyprland \
           --suffix PATH : ${lib.makeBinPath [
+          stdenv.cc
           binutils
           pciutils
-          pkgconf
         ]}
       ''}
     '';
 
     passthru.providedSessions = ["hyprland"];
 
-    meta = {
+    meta = with lib; {
       homepage = "https://github.com/hyprwm/Hyprland";
-      description = "Dynamic tiling Wayland compositor that doesn't sacrifice on its looks";
-      license = lib.licenses.bsd3;
-      platforms = lib.platforms.linux;
+      description = "A dynamic tiling Wayland compositor that doesn't sacrifice on its looks";
+      license = licenses.bsd3;
+      platforms = wlr.meta.platforms;
       mainProgram = "Hyprland";
     };
   }

nix/overlays.nix

@@ -22,11 +22,10 @@ in {
   hyprland-packages = lib.composeManyExtensions [
     # Dependencies
     inputs.hyprcursor.overlays.default
+    inputs.hyprland-protocols.overlays.default
     inputs.hyprlang.overlays.default
-    inputs.hyprutils.overlays.default
-    inputs.hyprwayland-scanner.overlays.default
-    self.overlays.xwayland
-
+    self.overlays.wlroots-hyprland
+    self.overlays.udis86
     # Hyprland packages themselves
     (final: prev: let
       date = mkDate (self.lastModifiedDate or "19700101");
@@ -35,20 +34,19 @@ in {
         stdenv = final.gcc13Stdenv;
         version = "${props.version}+date=${date}_${self.shortRev or "dirty"}";
         commit = self.rev or "";
+        wlroots = final.wlroots-hyprland; # explicit override until decided on breaking change of the name
+        udis86 = final.udis86-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-legacy-renderer = final.hyprland.override {legacyRenderer = true;};
-
-      # deprecated packages
       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.
@@ -64,13 +62,17 @@ in {
     inputs.xdph.overlays.xdg-desktop-portal-hyprland
   ];
 
-  # Patches XWayland's pkgconfig file to not include Cflags or includedir
-  # The above two variables trip up CMake and the build fails
-  xwayland = final: prev: {
-    xwayland = prev.xwayland.overrideAttrs (old: {
-      postInstall = ''
-        sed -i '/includedir/d' $out/lib/pkgconfig/xwayland.pc
-      '';
-    });
+  udis86 = final: prev: {
+    udis86-hyprland = final.callPackage ./udis86.nix {};
+  };
+
+  # Patched version of wlroots for Hyprland.
+  # It is under a new package name so as to not conflict with
+  # the standard version in nixpkgs.
+  wlroots-hyprland = final: prev: {
+    wlroots-hyprland = final.callPackage ./wlroots.nix {
+      version = "${mkDate (inputs.wlroots.lastModifiedDate or "19700101")}_${inputs.wlroots.shortRev or "dirty"}";
+      src = inputs.wlroots;
+    };
   };
 }

nix/patches/meson-build.patch

@@ -0,0 +1,61 @@
+diff --git a/meson.build b/meson.build
+index 1d2c7f9f..c5ef4e67 100644
+--- a/meson.build
++++ b/meson.build
+@@ -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'])
+-have_xwlr = wlroots.get_variable('features').get('xwayland')
+-xcb_dep = dependency('xcb', required: get_option('xwayland'))
+-
+-cmake = import('cmake')
+-udis = cmake.subproject('udis86')
+-udis86 = udis.dependency('libudis86')
+-
+-if get_option('xwayland').enabled() and not have_xwlr
+-	error('Cannot enable Xwayland in Hyprland: wlroots has been built without Xwayland support')
+-endif
+-have_xwayland = xcb_dep.found() and have_xwlr
+-
+-if not have_xwayland
++if get_option('xwayland').disabled()
+   add_project_arguments('-DNO_XWAYLAND', language: 'cpp')
+ endif
+ 
+@@ -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')
+-
+ 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 45701f5f..3505cefe 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -9,7 +9,7 @@ executable('Hyprland', src,
+     server_protos,
+     dependency('wayland-server'),
+     dependency('wayland-client'),
+-    wlroots.get_variable('wlroots'),
++    dependency('wlroots'),
+     dependency('cairo'),
+     dependency('hyprcursor'),
+     dependency('hyprlang', version: '>= 0.3.2'),
+@@ -16,12 +16,12 @@ executable('Hyprland', src,
+     dependency('egl'),
+     dependency('xkbcommon'),
+     dependency('libinput'),
+-    xcb_dep,
++    dependency('xcb', required: get_option('xwayland')),
+     backtrace_dep,
+     systemd_dep,
+-    udis86,
++    dependency('udis86'),
+ 
+     dependency('pixman-1'),
+     dependency('gl', 'opengl'),

nix/udis86.nix

@@ -0,0 +1,32 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  autoreconfHook,
+  python3,
+}:
+stdenv.mkDerivation {
+  pname = "udis86";
+  version = "unstable-2022-10-13";
+
+  src = fetchFromGitHub {
+    owner = "canihavesomecoffee";
+    repo = "udis86";
+    rev = "5336633af70f3917760a6d441ff02d93477b0c86";
+    hash = "sha256-HifdUQPGsKQKQprByeIznvRLONdOXeolOsU5nkwIv3g=";
+  };
+
+  nativeBuildInputs = [autoreconfHook python3];
+
+  configureFlags = ["--enable-shared"];
+
+  outputs = ["bin" "out" "dev" "lib"];
+
+  meta = with lib; {
+    homepage = "https://udis86.sourceforge.net";
+    license = licenses.bsd2;
+    mainProgram = "udcli";
+    description = "Easy-to-use, minimalistic x86 disassembler library (libudis86)";
+    platforms = platforms.all;
+  };
+}

nix/wlroots.nix

@@ -0,0 +1,13 @@
+{
+  version,
+  src,
+  wlroots,
+  enableXWayland ? true,
+}:
+wlroots.overrideAttrs (old: {
+  inherit version src enableXWayland;
+
+  pname = "${old.pname}-hyprland";
+
+  patches = [ ]; # don't inherit old.patches
+})

props.json

@@ -1,3 +1,3 @@
 {
-    "version": "0.41.2"
+    "version": "0.38.1"
 }

protocols/idle.xml

@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<protocol name="idle">
+  <copyright><![CDATA[
+    Copyright (C) 2015 Martin Gräßlin
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 2.1 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  ]]></copyright>
+  <interface  name="org_kde_kwin_idle" version="1">
+      <description summary="User idle time manager">
+        This interface allows to monitor user idle time on a given seat. The interface
+        allows to register timers which trigger after no user activity was registered
+        on the seat for a given interval. It notifies when user activity resumes.
+
+        This is useful for applications wanting to perform actions when the user is not
+        interacting with the system, e.g. chat applications setting the user as away, power
+        management features to dim screen, etc..
+      </description>
+      <request name="get_idle_timeout">
+        <arg name="id" type="new_id" interface="org_kde_kwin_idle_timeout"/>
+        <arg name="seat" type="object" interface="wl_seat"/>
+        <arg name="timeout" type="uint" summary="The idle timeout in msec"/>
+      </request>
+  </interface>
+  <interface name="org_kde_kwin_idle_timeout" version="1">
+      <request name="release" type="destructor">
+        <description summary="release the timeout object"/>
+      </request>
+      <request name="simulate_user_activity">
+          <description summary="Simulates user activity for this timeout, behaves just like real user activity on the seat"/>
+      </request>
+      <event name="idle">
+          <description summary="Triggered when there has not been any user activity in the requested idle time interval"/>
+      </event>
+      <event name="resumed">
+          <description summary="Triggered on the first user activity after an idle event"/>
+      </event>
+  </interface>
+</protocol>

protocols/input-method-unstable-v2.xml

@@ -1,494 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<protocol name="input_method_unstable_v2">
-
-  <copyright>
-    Copyright © 2008-2011 Kristian Høgsberg
-    Copyright © 2010-2011 Intel Corporation
-    Copyright © 2012-2013 Collabora, Ltd.
-    Copyright © 2012, 2013 Intel Corporation
-    Copyright © 2015, 2016 Jan Arne Petersen
-    Copyright © 2017, 2018 Red Hat, Inc.
-    Copyright © 2018       Purism SPC
-
-    Permission is hereby granted, free of charge, to any person obtaining a
-    copy of this software and associated documentation files (the "Software"),
-    to deal in the Software without restriction, including without limitation
-    the rights to use, copy, modify, merge, publish, distribute, sublicense,
-    and/or sell copies of the Software, and to permit persons to whom the
-    Software is furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice (including the next
-    paragraph) shall be included in all copies or substantial portions of the
-    Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-    DEALINGS IN THE SOFTWARE.
-  </copyright>
-
-  <description summary="Protocol for creating input methods">
-    This protocol allows applications to act as input methods for compositors.
-
-    An input method context is used to manage the state of the input method.
-
-    Text strings are UTF-8 encoded, their indices and lengths are in bytes.
-
-    This document adheres to the RFC 2119 when using words like "must",
-    "should", "may", etc.
-
-    Warning! The protocol described in this file is experimental and
-    backward incompatible changes may be made. Backward compatible changes
-    may be added together with the corresponding interface version bump.
-    Backward incompatible changes are done by bumping the version number in
-    the protocol and interface names and resetting the interface version.
-    Once the protocol is to be declared stable, the 'z' prefix and the
-    version number in the protocol and interface names are removed and the
-    interface version number is reset.
-  </description>
-
-  <interface name="zwp_input_method_v2" version="1">
-    <description summary="input method">
-      An input method object allows for clients to compose text.
-
-      The objects connects the client to a text input in an application, and
-      lets the client to serve as an input method for a seat.
-
-      The zwp_input_method_v2 object can occupy two distinct states: active and
-      inactive. In the active state, the object is associated to and
-      communicates with a text input. In the inactive state, there is no
-      associated text input, and the only communication is with the compositor.
-      Initially, the input method is in the inactive state.
-
-      Requests issued in the inactive state must be accepted by the compositor.
-      Because of the serial mechanism, and the state reset on activate event,
-      they will not have any effect on the state of the next text input.
-
-      There must be no more than one input method object per seat.
-    </description>
-
-    <enum name="error">
-      <entry name="role" value="0" summary="wl_surface has another role"/>
-    </enum>
-
-    <event name="activate">
-      <description summary="input method has been requested">
-        Notification that a text input focused on this seat requested the input
-        method to be activated.
-
-        This event serves the purpose of providing the compositor with an
-        active input method.
-
-        This event resets all state associated with previous enable, disable,
-        surrounding_text, text_change_cause, and content_type events, as well
-        as the state associated with set_preedit_string, commit_string, and
-        delete_surrounding_text requests. In addition, it marks the
-        zwp_input_method_v2 object as active, and makes any existing
-        zwp_input_popup_surface_v2 objects visible.
-
-        The surrounding_text, and content_type events must follow before the
-        next done event if the text input supports the respective
-        functionality.
-
-        State set with this event is double-buffered. It will get applied on
-        the next zwp_input_method_v2.done event, and stay valid until changed.
-      </description>
-    </event>
-
-    <event name="deactivate">
-      <description summary="deactivate event">
-        Notification that no focused text input currently needs an active 
-        input method on this seat.
-
-        This event marks the zwp_input_method_v2 object as inactive. The
-        compositor must make all existing zwp_input_popup_surface_v2 objects
-        invisible until the next activate event.
-
-        State set with this event is double-buffered. It will get applied on
-        the next zwp_input_method_v2.done event, and stay valid until changed.
-      </description>
-    </event>
-
-    <event name="surrounding_text">
-      <description summary="surrounding text event">
-        Updates the surrounding plain text around the cursor, excluding the
-        preedit text.
-
-        If any preedit text is present, it is replaced with the cursor for the
-        purpose of this event.
-
-        The argument text is a buffer containing the preedit string, and must
-        include the cursor position, and the complete selection. It should
-        contain additional characters before and after these. There is a
-        maximum length of wayland messages, so text can not be longer than 4000
-        bytes.
-
-        cursor is the byte offset of the cursor within the text buffer.
-
-        anchor is the byte offset of the selection anchor within the text
-        buffer. If there is no selected text, anchor must be the same as
-        cursor.
-
-        If this event does not arrive before the first done event, the input
-        method may assume that the text input does not support this
-        functionality and ignore following surrounding_text events.
-
-        Values set with this event are double-buffered. They will get applied
-        and set to initial values on the next zwp_input_method_v2.done
-        event.
-
-        The initial state for affected fields is empty, meaning that the text
-        input does not support sending surrounding text. If the empty values
-        get applied, subsequent attempts to change them may have no effect.
-      </description>
-      <arg name="text" type="string"/>
-      <arg name="cursor" type="uint"/>
-      <arg name="anchor" type="uint"/>
-    </event>
-
-    <event name="text_change_cause">
-      <description summary="indicates the cause of surrounding text change">
-        Tells the input method why the text surrounding the cursor changed.
-
-        Whenever the client detects an external change in text, cursor, or
-        anchor position, it must issue this request to the compositor. This
-        request is intended to give the input method a chance to update the
-        preedit text in an appropriate way, e.g. by removing it when the user
-        starts typing with a keyboard.
-
-        cause describes the source of the change.
-
-        The value set with this event is double-buffered. It will get applied
-        and set to its initial value on the next zwp_input_method_v2.done
-        event.
-
-        The initial value of cause is input_method.
-      </description>
-      <arg name="cause" type="uint" enum="zwp_text_input_v3.change_cause"/>
-    </event>
-
-    <event name="content_type">
-      <description summary="content purpose and hint">
-        Indicates the content type and hint for the current
-        zwp_input_method_v2 instance.
-
-        Values set with this event are double-buffered. They will get applied
-        on the next zwp_input_method_v2.done event.
-
-        The initial value for hint is none, and the initial value for purpose
-        is normal.
-      </description>
-      <arg name="hint" type="uint" enum="zwp_text_input_v3.content_hint"/>
-      <arg name="purpose" type="uint" enum="zwp_text_input_v3.content_purpose"/>
-    </event>
-
-    <event name="done">
-      <description summary="apply state">
-        Atomically applies state changes recently sent to the client.
-
-        The done event establishes and updates the state of the client, and
-        must be issued after any changes to apply them.
-
-        Text input state (content purpose, content hint, surrounding text, and
-        change cause) is conceptually double-buffered within an input method
-        context.
-
-        Events modify the pending state, as opposed to the current state in use
-        by the input method. A done event atomically applies all pending state,
-        replacing the current state. After done, the new pending state is as
-        documented for each related request.
-
-        Events must be applied in the order of arrival.
-
-        Neither current nor pending state are modified unless noted otherwise.
-      </description>
-    </event>
-
-    <request name="commit_string">
-      <description summary="commit string">
-        Send the commit string text for insertion to the application.
-
-        Inserts a string at current cursor position (see commit event
-        sequence). The string to commit could be either just a single character
-        after a key press or the result of some composing.
-
-        The argument text is a buffer containing the string to insert. There is
-        a maximum length of wayland messages, so text can not be longer than
-        4000 bytes.
-
-        Values set with this event are double-buffered. They must be applied
-        and reset to initial on the next zwp_text_input_v3.commit request.
-
-        The initial value of text is an empty string.
-      </description>
-      <arg name="text" type="string"/>
-    </request>
-
-    <request name="set_preedit_string">
-      <description summary="pre-edit string">
-        Send the pre-edit string text to the application text input.
-
-        Place a new composing text (pre-edit) at the current cursor position.
-        Any previously set composing text must be removed. Any previously
-        existing selected text must be removed. The cursor is moved to a new
-        position within the preedit string.
-
-        The argument text is a buffer containing the preedit string. There is
-        a maximum length of wayland messages, so text can not be longer than
-        4000 bytes.
-
-        The arguments cursor_begin and cursor_end are counted in bytes relative
-        to the beginning of the submitted string buffer. Cursor should be
-        hidden by the text input when both are equal to -1.
-
-        cursor_begin indicates the beginning of the cursor. cursor_end
-        indicates the end of the cursor. It may be equal or different than
-        cursor_begin.
-
-        Values set with this event are double-buffered. They must be applied on
-        the next zwp_input_method_v2.commit event.
-
-        The initial value of text is an empty string. The initial value of
-        cursor_begin, and cursor_end are both 0.
-      </description>
-      <arg name="text" type="string"/>
-      <arg name="cursor_begin" type="int"/>
-      <arg name="cursor_end" type="int"/>
-    </request>
-
-    <request name="delete_surrounding_text">
-      <description summary="delete text">
-        Remove the surrounding text.
-
-        before_length and after_length are the number of bytes before and after
-        the current cursor index (excluding the preedit text) to delete.
-
-        If any preedit text is present, it is replaced with the cursor for the
-        purpose of this event. In effect before_length is counted from the
-        beginning of preedit text, and after_length from its end (see commit
-        event sequence).
-
-        Values set with this event are double-buffered. They must be applied
-        and reset to initial on the next zwp_input_method_v2.commit request.
-
-        The initial values of both before_length and after_length are 0.
-      </description>
-      <arg name="before_length" type="uint"/>
-      <arg name="after_length" type="uint"/>
-    </request>
-
-    <request name="commit">
-      <description summary="apply state">
-        Apply state changes from commit_string, set_preedit_string and
-        delete_surrounding_text requests.
-
-        The state relating to these events is double-buffered, and each one
-        modifies the pending state. This request replaces the current state
-        with the pending state.
-
-        The connected text input is expected to proceed by evaluating the
-        changes in the following order:
-
-        1. Replace existing preedit string with the cursor.
-        2. Delete requested surrounding text.
-        3. Insert commit string with the cursor at its end.
-        4. Calculate surrounding text to send.
-        5. Insert new preedit text in cursor position.
-        6. Place cursor inside preedit text.
-
-        The serial number reflects the last state of the zwp_input_method_v2
-        object known to the client. The value of the serial argument must be
-        equal to the number of done events already issued by that object. When
-        the compositor receives a commit request with a serial different than
-        the number of past done events, it must proceed as normal, except it
-        should not change the current state of the zwp_input_method_v2 object.
-      </description>
-      <arg name="serial" type="uint"/>
-    </request>
-
-    <request name="get_input_popup_surface">
-      <description summary="create popup surface">
-        Creates a new zwp_input_popup_surface_v2 object wrapping a given
-        surface.
-
-        The surface gets assigned the "input_popup" role. If the surface
-        already has an assigned role, the compositor must issue a protocol
-        error.
-      </description>
-      <arg name="id" type="new_id" interface="zwp_input_popup_surface_v2"/>
-      <arg name="surface" type="object" interface="wl_surface"/>
-    </request>
-
-    <request name="grab_keyboard">
-      <description summary="grab hardware keyboard">
-        Allow an input method to receive hardware keyboard input and process
-        key events to generate text events (with pre-edit) over the wire. This
-        allows input methods which compose multiple key events for inputting
-        text like it is done for CJK languages.
-
-        The compositor should send all keyboard events on the seat to the grab
-        holder via the returned wl_keyboard object. Nevertheless, the
-        compositor may decide not to forward any particular event. The
-        compositor must not further process any event after it has been
-        forwarded to the grab holder.
-
-        Releasing the resulting wl_keyboard object releases the grab.
-      </description>
-      <arg name="keyboard" type="new_id"
-        interface="zwp_input_method_keyboard_grab_v2"/>
-    </request>
-
-    <event name="unavailable">
-      <description summary="input method unavailable">
-        The input method ceased to be available.
-
-        The compositor must issue this event as the only event on the object if
-        there was another input_method object associated with the same seat at
-        the time of its creation.
-
-        The compositor must issue this request when the object is no longer
-        usable, e.g. due to seat removal.
-
-        The input method context becomes inert and should be destroyed after
-        deactivation is handled. Any further requests and events except for the
-        destroy request must be ignored.
-      </description>
-    </event>
-
-    <request name="destroy" type="destructor">
-      <description summary="destroy the text input">
-        Destroys the zwp_text_input_v2 object and any associated child
-        objects, i.e. zwp_input_popup_surface_v2 and
-        zwp_input_method_keyboard_grab_v2.
-      </description>
-    </request>
-  </interface>
-
-  <interface name="zwp_input_popup_surface_v2" version="1">
-    <description summary="popup surface">
-      This interface marks a surface as a popup for interacting with an input
-      method.
-
-      The compositor should place it near the active text input area. It must
-      be visible if and only if the input method is in the active state.
-
-      The client must not destroy the underlying wl_surface while the
-      zwp_input_popup_surface_v2 object exists.
-    </description>
-
-    <event name="text_input_rectangle">
-      <description summary="set text input area position">
-        Notify about the position of the area of the text input expressed as a
-        rectangle in surface local coordinates.
-
-        This is a hint to the input method telling it the relative position of
-        the text being entered.
-      </description>
-      <arg name="x" type="int"/>
-      <arg name="y" type="int"/>
-      <arg name="width" type="int"/>
-      <arg name="height" type="int"/>
-    </event>
-
-    <request name="destroy" type="destructor"/>
-  </interface>
-
-  <interface name="zwp_input_method_keyboard_grab_v2" version="1">
-    <!-- Closely follows wl_keyboard version 6 -->
-    <description summary="keyboard grab">
-      The zwp_input_method_keyboard_grab_v2 interface represents an exclusive
-      grab of the wl_keyboard interface associated with the seat.
-    </description>
-
-    <event name="keymap">
-      <description summary="keyboard mapping">
-        This event provides a file descriptor to the client which can be
-        memory-mapped to provide a keyboard mapping description.
-      </description>
-      <arg name="format" type="uint" enum="wl_keyboard.keymap_format"
-        summary="keymap format"/>
-      <arg name="fd" type="fd" summary="keymap file descriptor"/>
-      <arg name="size" type="uint" summary="keymap size, in bytes"/>
-    </event>
-
-    <event name="key">
-      <description summary="key event">
-        A key was pressed or released.
-        The time argument is a timestamp with millisecond granularity, with an
-        undefined base.
-      </description>
-      <arg name="serial" type="uint" summary="serial number of the key event"/>
-      <arg name="time" type="uint" summary="timestamp with millisecond granularity"/>
-      <arg name="key" type="uint" summary="key that produced the event"/>
-      <arg name="state" type="uint" enum="wl_keyboard.key_state"
-        summary="physical state of the key"/>
-    </event>
-
-    <event name="modifiers">
-      <description summary="modifier and group state">
-        Notifies clients that the modifier and/or group state has changed, and
-        it should update its local state.
-      </description>
-      <arg name="serial" type="uint" summary="serial number of the modifiers event"/>
-      <arg name="mods_depressed" type="uint" summary="depressed modifiers"/>
-      <arg name="mods_latched" type="uint" summary="latched modifiers"/>
-      <arg name="mods_locked" type="uint" summary="locked modifiers"/>
-      <arg name="group" type="uint" summary="keyboard layout"/>
-    </event>
-
-    <request name="release" type="destructor">
-      <description summary="release the grab object"/>
-    </request>
-
-    <event name="repeat_info">
-      <description summary="repeat rate and delay">
-        Informs the client about the keyboard's repeat rate and delay.
-
-        This event is sent as soon as the zwp_input_method_keyboard_grab_v2
-        object has been created, and is guaranteed to be received by the
-        client before any key press event.
-
-        Negative values for either rate or delay are illegal. A rate of zero
-        will disable any repeating (regardless of the value of delay).
-
-        This event can be sent later on as well with a new value if necessary,
-        so clients should continue listening for the event past the creation
-        of zwp_input_method_keyboard_grab_v2.
-      </description>
-      <arg name="rate" type="int"
-	   summary="the rate of repeating keys in characters per second"/>
-      <arg name="delay" type="int"
-	   summary="delay in milliseconds since key down until repeating starts"/>
-    </event>
-  </interface>
-
-  <interface name="zwp_input_method_manager_v2" version="1">
-    <description summary="input method manager">
-      The input method manager allows the client to become the input method on
-      a chosen seat.
-
-      No more than one input method must be associated with any seat at any
-      given time.
-    </description>
-
-    <request name="get_input_method">
-      <description summary="request an input method object">
-        Request a new input zwp_input_method_v2 object associated with a given
-        seat.
-      </description>
-      <arg name="seat" type="object" interface="wl_seat"/>
-      <arg name="input_method" type="new_id" interface="zwp_input_method_v2"/>
-    </request>
-
-    <request name="destroy" type="destructor">
-      <description summary="destroy the input method manager">
-        Destroys the zwp_input_method_manager_v2 object.
-
-        The zwp_input_method_v2 objects originating from it remain valid.
-      </description>
-    </request>
-  </interface>
-</protocol>

protocols/kde-server-decoration.xml

@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<protocol name="server_decoration">
-  <copyright><![CDATA[
-    SPDX-FileCopyrightText: 2015 Martin Gräßlin
-
-    SPDX-License-Identifier: LGPL-2.1-or-later
-  ]]></copyright>
-  <interface  name="org_kde_kwin_server_decoration_manager" version="1">
-      <description summary="Server side window decoration manager">
-        This interface allows to coordinate whether the server should create
-        a server-side window decoration around a wl_surface representing a
-        shell surface (wl_shell_surface or similar). By announcing support
-        for this interface the server indicates that it supports server
-        side decorations.
-
-        Use in conjunction with zxdg_decoration_manager_v1 is undefined.
-      </description>
-      <request name="create">
-        <description summary="Create a server-side decoration object for a given surface">
-            When a client creates a server-side decoration object it indicates
-            that it supports the protocol. The client is supposed to tell the
-            server whether it wants server-side decorations or will provide
-            client-side decorations.
-
-            If the client does not create a server-side decoration object for
-            a surface the server interprets this as lack of support for this
-            protocol and considers it as client-side decorated. Nevertheless a
-            client-side decorated surface should use this protocol to indicate
-            to the server that it does not want a server-side deco.
-        </description>
-        <arg name="id" type="new_id" interface="org_kde_kwin_server_decoration"/>
-        <arg name="surface" type="object" interface="wl_surface"/>
-      </request>
-      <enum name="mode">
-            <description summary="Possible values to use in request_mode and the event mode."/>
-            <entry name="None" value="0" summary="Undecorated: The surface is not decorated at all, neither server nor client-side. An example is a popup surface which should not be decorated."/>
-            <entry name="Client" value="1" summary="Client-side decoration: The decoration is part of the surface and the client."/>
-            <entry name="Server" value="2" summary="Server-side decoration: The server embeds the surface into a decoration frame."/>
-      </enum>
-      <event name="default_mode">
-          <description summary="The default mode used on the server">
-              This event is emitted directly after binding the interface. It contains
-              the default mode for the decoration. When a new server decoration object
-              is created this new object will be in the default mode until the first
-              request_mode is requested.
-
-              The server may change the default mode at any time.
-          </description>
-          <arg name="mode" type="uint" summary="The default decoration mode applied to newly created server decorations."/>
-      </event>
-  </interface>
-  <interface name="org_kde_kwin_server_decoration" version="1">
-      <request name="release" type="destructor">
-        <description summary="release the server decoration object"/>
-      </request>
-      <enum name="mode">
-            <description summary="Possible values to use in request_mode and the event mode."/>
-            <entry name="None" value="0" summary="Undecorated: The surface is not decorated at all, neither server nor client-side. An example is a popup surface which should not be decorated."/>
-            <entry name="Client" value="1" summary="Client-side decoration: The decoration is part of the surface and the client."/>
-            <entry name="Server" value="2" summary="Server-side decoration: The server embeds the surface into a decoration frame."/>
-      </enum>
-      <request name="request_mode">
-          <description summary="The decoration mode the surface wants to use."/>
-          <arg name="mode" type="uint" summary="The mode this surface wants to use."/>
-      </request>
-      <event name="mode">
-          <description summary="The new decoration mode applied by the server">
-              This event is emitted directly after the decoration is created and
-              represents the base decoration policy by the server. E.g. a server
-              which wants all surfaces to be client-side decorated will send Client,
-              a server which wants server-side decoration will send Server.
-
-              The client can request a different mode through the decoration request.
-              The server will acknowledge this by another event with the same mode. So
-              even if a server prefers server-side decoration it's possible to force a
-              client-side decoration.
-
-              The server may emit this event at any time. In this case the client can
-              again request a different mode. It's the responsibility of the server to
-              prevent a feedback loop.
-          </description>
-          <arg name="mode" type="uint" summary="The decoration mode applied to the surface by the server."/>
-      </event>
-  </interface>
-</protocol>

protocols/meson.build

@@ -17,60 +17,27 @@ wayland_scanner = find_program(
 	wayland_scanner_dep.get_variable('wayland_scanner'),
 	native: true,
 )
-hyprwayland_scanner_dep = dependency('hyprwayland-scanner', version: '>=0.3.8', native: true)
-hyprwayland_scanner = find_program(
-	hyprwayland_scanner_dep.get_variable('hyprwayland_scanner'),
-	native: true,
-)
 
 protocols = [
+  [wl_protocol_dir, 'stable/xdg-shell/xdg-shell.xml'],
+  [wl_protocol_dir, 'unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml'],
   [wl_protocol_dir, 'unstable/text-input/text-input-unstable-v1.xml'],
+  [wl_protocol_dir, 'unstable/xdg-output/xdg-output-unstable-v1.xml'],
+  [wl_protocol_dir, 'staging/fractional-scale/fractional-scale-v1.xml'],
+  [wl_protocol_dir, 'staging/cursor-shape/cursor-shape-v1.xml'],
+  [wl_protocol_dir, 'staging/tearing-control/tearing-control-v1.xml'],
+  ['wlr-foreign-toplevel-management-unstable-v1.xml'],
+  ['wlr-layer-shell-unstable-v1.xml'],
+  ['wlr-output-power-management-unstable-v1.xml'],
   ['wlr-screencopy-unstable-v1.xml'],
+  ['pointer-constraints-unstable-v1.xml'],
+  ['tablet-unstable-v2.xml'],
+  ['idle.xml'],
   [hl_protocol_dir, 'protocols/hyprland-toplevel-export-v1.xml'],
   [hl_protocol_dir, 'protocols/hyprland-global-shortcuts-v1.xml']
 ]
-
-new_protocols = [
-  ['wlr-gamma-control-unstable-v1.xml'],
-  ['wlr-foreign-toplevel-management-unstable-v1.xml'],
-  ['wlr-output-power-management-unstable-v1.xml'],
-  ['input-method-unstable-v2.xml'],
-  ['virtual-keyboard-unstable-v1.xml'],
-  ['wlr-virtual-pointer-unstable-v1.xml'],
-  ['wlr-output-management-unstable-v1.xml'],
-  ['kde-server-decoration.xml'],
-  ['wlr-layer-shell-unstable-v1.xml'],
-  ['wayland-drm.xml'],
-  ['wlr-data-control-unstable-v1.xml'],
-  [hl_protocol_dir, 'protocols/hyprland-focus-grab-v1.xml'],
-  [wl_protocol_dir, 'staging/tearing-control/tearing-control-v1.xml'],
-  [wl_protocol_dir, 'staging/fractional-scale/fractional-scale-v1.xml'],
-  [wl_protocol_dir, 'unstable/xdg-output/xdg-output-unstable-v1.xml'],
-  [wl_protocol_dir, 'staging/cursor-shape/cursor-shape-v1.xml'],
-  [wl_protocol_dir, 'unstable/idle-inhibit/idle-inhibit-unstable-v1.xml'],
-  [wl_protocol_dir, 'unstable/relative-pointer/relative-pointer-unstable-v1.xml'],
-  [wl_protocol_dir, 'unstable/xdg-decoration/xdg-decoration-unstable-v1.xml'],
-  [wl_protocol_dir, 'staging/alpha-modifier/alpha-modifier-v1.xml'],
-  [wl_protocol_dir, 'staging/ext-foreign-toplevel-list/ext-foreign-toplevel-list-v1.xml'],
-  [wl_protocol_dir, 'unstable/pointer-gestures/pointer-gestures-unstable-v1.xml'],
-  [wl_protocol_dir, 'unstable/keyboard-shortcuts-inhibit/keyboard-shortcuts-inhibit-unstable-v1.xml'],
-  [wl_protocol_dir, 'unstable/text-input/text-input-unstable-v3.xml'],
-  [wl_protocol_dir, 'unstable/pointer-constraints/pointer-constraints-unstable-v1.xml'],
-  [wl_protocol_dir, 'staging/xdg-activation/xdg-activation-v1.xml'],
-  [wl_protocol_dir, 'staging/ext-idle-notify/ext-idle-notify-v1.xml'],
-  [wl_protocol_dir, 'staging/ext-session-lock/ext-session-lock-v1.xml'],
-  [wl_protocol_dir, 'stable/tablet/tablet-v2.xml'],
-  [wl_protocol_dir, 'stable/presentation-time/presentation-time.xml'],
-  [wl_protocol_dir, 'stable/xdg-shell/xdg-shell.xml'],
-  [wl_protocol_dir, 'unstable/primary-selection/primary-selection-unstable-v1.xml'],
-  [wl_protocol_dir, 'staging/xwayland-shell/xwayland-shell-v1.xml'],
-  [wl_protocol_dir, 'stable/viewporter/viewporter.xml'],
-  [wl_protocol_dir, 'stable/linux-dmabuf/linux-dmabuf-v1.xml'],
-]
-
 wl_protos_src = []
 wl_protos_headers = []
-
 foreach p : protocols
 	xml = join_paths(p)
 	wl_protos_src += custom_target(
@@ -89,43 +56,15 @@ foreach p : protocols
 	)
 endforeach
 
-new_wl_protos = []
-foreach p : new_protocols
-	xml = join_paths(p)
-	new_wl_protos += custom_target(
-		xml.underscorify(),
-		input: xml,
-		install: true,
-		install_dir: [false, join_paths(get_option('includedir'), 'hyprland/protocols')],
-		output: ['@BASENAME@.cpp', '@BASENAME@.hpp'],
-		command: [hyprwayland_scanner, '@INPUT@', '@OUTDIR@'],
-	)
-endforeach
-
-wayland_server_dep = dependency('wayland-server', version: '>=1.20.0')
-wayland_server_dir = wayland_server_dep.get_variable('pkgdatadir')
-
-wl_server_protos = [
-	wayland_server_dir / 'wayland.xml'
-]
-wl_server_protos_gen = []
-foreach p : wl_server_protos
-	wl_server_protos_gen += custom_target(
-		p.underscorify(),
-		input: p,
-		install: false,
-		output: ['@BASENAME@.cpp', '@BASENAME@.hpp'],
-		command: [hyprwayland_scanner, '--wayland-enums', '@INPUT@', '@OUTDIR@'],
-	)
-endforeach
+wayland_server = dependency('wayland-server', version: '>=1.20.0')
 
 lib_server_protos = static_library(
 	'server_protos',
-	wl_protos_src + wl_protos_headers + new_wl_protos + wl_server_protos_gen,
-	dependencies: wayland_server_dep.partial_dependency(compile_args: true),
+	wl_protos_src + wl_protos_headers,
+	dependencies: wayland_server.partial_dependency(compile_args: true),
 )
 
 server_protos = declare_dependency(
 	link_with: lib_server_protos,
-	sources: wl_protos_headers + new_wl_protos,
+	sources: wl_protos_headers,
 )

protocols/pointer-constraints-unstable-v1.xml

@@ -0,0 +1,339 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<protocol name="pointer_constraints_unstable_v1">
+
+  <copyright>
+    Copyright © 2014      Jonas Ådahl
+    Copyright © 2015      Red Hat Inc.
+
+    Permission is hereby granted, free of charge, to any person obtaining a
+    copy of this software and associated documentation files (the "Software"),
+    to deal in the Software without restriction, including without limitation
+    the rights to use, copy, modify, merge, publish, distribute, sublicense,
+    and/or sell copies of the Software, and to permit persons to whom the
+    Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice (including the next
+    paragraph) shall be included in all copies or substantial portions of the
+    Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+    DEALINGS IN THE SOFTWARE.
+  </copyright>
+
+  <description summary="protocol for constraining pointer motions">
+    This protocol specifies a set of interfaces used for adding constraints to
+    the motion of a pointer. Possible constraints include confining pointer
+    motions to a given region, or locking it to its current position.
+
+    In order to constrain the pointer, a client must first bind the global
+    interface "wp_pointer_constraints" which, if a compositor supports pointer
+    constraints, is exposed by the registry. Using the bound global object, the
+    client uses the request that corresponds to the type of constraint it wants
+    to make. See wp_pointer_constraints for more details.
+
+    Warning! The protocol described in this file is experimental and backward
+    incompatible changes may be made. Backward compatible changes may be added
+    together with the corresponding interface version bump. Backward
+    incompatible changes are done by bumping the version number in the protocol
+    and interface names and resetting the interface version. Once the protocol
+    is to be declared stable, the 'z' prefix and the version number in the
+    protocol and interface names are removed and the interface version number is
+    reset.
+  </description>
+
+  <interface name="zwp_pointer_constraints_v1" version="1">
+    <description summary="constrain the movement of a pointer">
+      The global interface exposing pointer constraining functionality. It
+      exposes two requests: lock_pointer for locking the pointer to its
+      position, and confine_pointer for locking the pointer to a region.
+
+      The lock_pointer and confine_pointer requests create the objects
+      wp_locked_pointer and wp_confined_pointer respectively, and the client can
+      use these objects to interact with the lock.
+
+      For any surface, only one lock or confinement may be active across all
+      wl_pointer objects of the same seat. If a lock or confinement is requested
+      when another lock or confinement is active or requested on the same surface
+      and with any of the wl_pointer objects of the same seat, an
+      'already_constrained' error will be raised.
+    </description>
+
+    <enum name="error">
+      <description summary="wp_pointer_constraints error values">
+	These errors can be emitted in response to wp_pointer_constraints
+	requests.
+      </description>
+      <entry name="already_constrained" value="1"
+	     summary="pointer constraint already requested on that surface"/>
+    </enum>
+
+    <enum name="lifetime">
+      <description summary="constraint lifetime">
+	These values represent different lifetime semantics. They are passed
+	as arguments to the factory requests to specify how the constraint
+	lifetimes should be managed.
+      </description>
+      <entry name="oneshot" value="1">
+	<description summary="the pointer constraint is defunct once deactivated">
+	  A oneshot pointer constraint will never reactivate once it has been
+	  deactivated. See the corresponding deactivation event
+	  (wp_locked_pointer.unlocked and wp_confined_pointer.unconfined) for
+	  details.
+	</description>
+      </entry>
+      <entry name="persistent" value="2">
+	<description summary="the pointer constraint may reactivate">
+	  A persistent pointer constraint may again reactivate once it has
+	  been deactivated. See the corresponding deactivation event
+	  (wp_locked_pointer.unlocked and wp_confined_pointer.unconfined) for
+	  details.
+	</description>
+      </entry>
+    </enum>
+
+    <request name="destroy" type="destructor">
+      <description summary="destroy the pointer constraints manager object">
+	Used by the client to notify the server that it will no longer use this
+	pointer constraints object.
+      </description>
+    </request>
+
+    <request name="lock_pointer">
+      <description summary="lock pointer to a position">
+	The lock_pointer request lets the client request to disable movements of
+	the virtual pointer (i.e. the cursor), effectively locking the pointer
+	to a position. This request may not take effect immediately; in the
+	future, when the compositor deems implementation-specific constraints
+	are satisfied, the pointer lock will be activated and the compositor
+	sends a locked event.
+
+	The protocol provides no guarantee that the constraints are ever
+	satisfied, and does not require the compositor to send an error if the
+	constraints cannot ever be satisfied. It is thus possible to request a
+	lock that will never activate.
+
+	There may not be another pointer constraint of any kind requested or
+	active on the surface for any of the wl_pointer objects of the seat of
+	the passed pointer when requesting a lock. If there is, an error will be
+	raised. See general pointer lock documentation for more details.
+
+	The intersection of the region passed with this request and the input
+	region of the surface is used to determine where the pointer must be
+	in order for the lock to activate. It is up to the compositor whether to
+	warp the pointer or require some kind of user interaction for the lock
+	to activate. If the region is null the surface input region is used.
+
+	A surface may receive pointer focus without the lock being activated.
+
+	The request creates a new object wp_locked_pointer which is used to
+	interact with the lock as well as receive updates about its state. See
+	the the description of wp_locked_pointer for further information.
+
+	Note that while a pointer is locked, the wl_pointer objects of the
+	corresponding seat will not emit any wl_pointer.motion events, but
+	relative motion events will still be emitted via wp_relative_pointer
+	objects of the same seat. wl_pointer.axis and wl_pointer.button events
+	are unaffected.
+      </description>
+      <arg name="id" type="new_id" interface="zwp_locked_pointer_v1"/>
+      <arg name="surface" type="object" interface="wl_surface"
+	   summary="surface to lock pointer to"/>
+      <arg name="pointer" type="object" interface="wl_pointer"
+	   summary="the pointer that should be locked"/>
+      <arg name="region" type="object" interface="wl_region" allow-null="true"
+	   summary="region of surface"/>
+      <arg name="lifetime" type="uint" enum="lifetime" summary="lock lifetime"/>
+    </request>
+
+    <request name="confine_pointer">
+      <description summary="confine pointer to a region">
+	The confine_pointer request lets the client request to confine the
+	pointer cursor to a given region. This request may not take effect
+	immediately; in the future, when the compositor deems implementation-
+	specific constraints are satisfied, the pointer confinement will be
+	activated and the compositor sends a confined event.
+
+	The intersection of the region passed with this request and the input
+	region of the surface is used to determine where the pointer must be
+	in order for the confinement to activate. It is up to the compositor
+	whether to warp the pointer or require some kind of user interaction for
+	the confinement to activate. If the region is null the surface input
+	region is used.
+
+	The request will create a new object wp_confined_pointer which is used
+	to interact with the confinement as well as receive updates about its
+	state. See the the description of wp_confined_pointer for further
+	information.
+      </description>
+      <arg name="id" type="new_id" interface="zwp_confined_pointer_v1"/>
+      <arg name="surface" type="object" interface="wl_surface"
+	   summary="surface to lock pointer to"/>
+      <arg name="pointer" type="object" interface="wl_pointer"
+	   summary="the pointer that should be confined"/>
+      <arg name="region" type="object" interface="wl_region" allow-null="true"
+	   summary="region of surface"/>
+      <arg name="lifetime" type="uint" enum="lifetime" summary="confinement lifetime"/>
+    </request>
+  </interface>
+
+  <interface name="zwp_locked_pointer_v1" version="1">
+    <description summary="receive relative pointer motion events">
+      The wp_locked_pointer interface represents a locked pointer state.
+
+      While the lock of this object is active, the wl_pointer objects of the
+      associated seat will not emit any wl_pointer.motion events.
+
+      This object will send the event 'locked' when the lock is activated.
+      Whenever the lock is activated, it is guaranteed that the locked surface
+      will already have received pointer focus and that the pointer will be
+      within the region passed to the request creating this object.
+
+      To unlock the pointer, send the destroy request. This will also destroy
+      the wp_locked_pointer object.
+
+      If the compositor decides to unlock the pointer the unlocked event is
+      sent. See wp_locked_pointer.unlock for details.
+
+      When unlocking, the compositor may warp the cursor position to the set
+      cursor position hint. If it does, it will not result in any relative
+      motion events emitted via wp_relative_pointer.
+
+      If the surface the lock was requested on is destroyed and the lock is not
+      yet activated, the wp_locked_pointer object is now defunct and must be
+      destroyed.
+    </description>
+
+    <request name="destroy" type="destructor">
+      <description summary="destroy the locked pointer object">
+	Destroy the locked pointer object. If applicable, the compositor will
+	unlock the pointer.
+      </description>
+    </request>
+
+    <request name="set_cursor_position_hint">
+      <description summary="set the pointer cursor position hint">
+	Set the cursor position hint relative to the top left corner of the
+	surface.
+
+	If the client is drawing its own cursor, it should update the position
+	hint to the position of its own cursor. A compositor may use this
+	information to warp the pointer upon unlock in order to avoid pointer
+	jumps.
+
+	The cursor position hint is double buffered. The new hint will only take
+	effect when the associated surface gets it pending state applied. See
+	wl_surface.commit for details.
+      </description>
+      <arg name="surface_x" type="fixed"
+	   summary="surface-local x coordinate"/>
+      <arg name="surface_y" type="fixed"
+	   summary="surface-local y coordinate"/>
+    </request>
+
+    <request name="set_region">
+      <description summary="set a new lock region">
+	Set a new region used to lock the pointer.
+
+	The new lock region is double-buffered. The new lock region will
+	only take effect when the associated surface gets its pending state
+	applied. See wl_surface.commit for details.
+
+	For details about the lock region, see wp_locked_pointer.
+      </description>
+      <arg name="region" type="object" interface="wl_region" allow-null="true"
+	   summary="region of surface"/>
+    </request>
+
+    <event name="locked">
+      <description summary="lock activation event">
+	Notification that the pointer lock of the seat's pointer is activated.
+      </description>
+    </event>
+
+    <event name="unlocked">
+      <description summary="lock deactivation event">
+	Notification that the pointer lock of the seat's pointer is no longer
+	active. If this is a oneshot pointer lock (see
+	wp_pointer_constraints.lifetime) this object is now defunct and should
+	be destroyed. If this is a persistent pointer lock (see
+	wp_pointer_constraints.lifetime) this pointer lock may again
+	reactivate in the future.
+      </description>
+    </event>
+  </interface>
+
+  <interface name="zwp_confined_pointer_v1" version="1">
+    <description summary="confined pointer object">
+      The wp_confined_pointer interface represents a confined pointer state.
+
+      This object will send the event 'confined' when the confinement is
+      activated. Whenever the confinement is activated, it is guaranteed that
+      the surface the pointer is confined to will already have received pointer
+      focus and that the pointer will be within the region passed to the request
+      creating this object. It is up to the compositor to decide whether this
+      requires some user interaction and if the pointer will warp to within the
+      passed region if outside.
+
+      To unconfine the pointer, send the destroy request. This will also destroy
+      the wp_confined_pointer object.
+
+      If the compositor decides to unconfine the pointer the unconfined event is
+      sent. The wp_confined_pointer object is at this point defunct and should
+      be destroyed.
+    </description>
+
+    <request name="destroy" type="destructor">
+      <description summary="destroy the confined pointer object">
+	Destroy the confined pointer object. If applicable, the compositor will
+	unconfine the pointer.
+      </description>
+    </request>
+
+    <request name="set_region">
+      <description summary="set a new confine region">
+	Set a new region used to confine the pointer.
+
+	The new confine region is double-buffered. The new confine region will
+	only take effect when the associated surface gets its pending state
+	applied. See wl_surface.commit for details.
+
+	If the confinement is active when the new confinement region is applied
+	and the pointer ends up outside of newly applied region, the pointer may
+	warped to a position within the new confinement region. If warped, a
+	wl_pointer.motion event will be emitted, but no
+	wp_relative_pointer.relative_motion event.
+
+	The compositor may also, instead of using the new region, unconfine the
+	pointer.
+
+	For details about the confine region, see wp_confined_pointer.
+      </description>
+      <arg name="region" type="object" interface="wl_region" allow-null="true"
+	   summary="region of surface"/>
+    </request>
+
+    <event name="confined">
+      <description summary="pointer confined">
+	Notification that the pointer confinement of the seat's pointer is
+	activated.
+      </description>
+    </event>
+
+    <event name="unconfined">
+      <description summary="pointer unconfined">
+	Notification that the pointer confinement of the seat's pointer is no
+	longer active. If this is a oneshot pointer confinement (see
+	wp_pointer_constraints.lifetime) this object is now defunct and should
+	be destroyed. If this is a persistent pointer confinement (see
+	wp_pointer_constraints.lifetime) this pointer confinement may again
+	reactivate in the future.
+      </description>
+    </event>
+  </interface>
+
+</protocol>

protocols/virtual-keyboard-unstable-v1.xml

@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<protocol name="virtual_keyboard_unstable_v1">
-  <copyright>
-    Copyright © 2008-2011  Kristian Høgsberg
-    Copyright © 2010-2013  Intel Corporation
-    Copyright © 2012-2013  Collabora, Ltd.
-    Copyright © 2018       Purism SPC
-
-    Permission is hereby granted, free of charge, to any person obtaining a
-    copy of this software and associated documentation files (the "Software"),
-    to deal in the Software without restriction, including without limitation
-    the rights to use, copy, modify, merge, publish, distribute, sublicense,
-    and/or sell copies of the Software, and to permit persons to whom the
-    Software is furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice (including the next
-    paragraph) shall be included in all copies or substantial portions of the
-    Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-    DEALINGS IN THE SOFTWARE.
-  </copyright>
-
-  <interface name="zwp_virtual_keyboard_v1" version="1">
-    <description summary="virtual keyboard">
-      The virtual keyboard provides an application with requests which emulate
-      the behaviour of a physical keyboard.
-
-      This interface can be used by clients on its own to provide raw input
-      events, or it can accompany the input method protocol.
-    </description>
-
-    <request name="keymap">
-      <description summary="keyboard mapping">
-        Provide a file descriptor to the compositor which can be
-        memory-mapped to provide a keyboard mapping description.
-
-        Format carries a value from the keymap_format enumeration.
-      </description>
-      <arg name="format" type="uint" summary="keymap format"/>
-      <arg name="fd" type="fd" summary="keymap file descriptor"/>
-      <arg name="size" type="uint" summary="keymap size, in bytes"/>
-    </request>
-
-    <enum name="error">
-      <entry name="no_keymap" value="0" summary="No keymap was set"/>
-    </enum>
-
-    <request name="key">
-      <description summary="key event">
-        A key was pressed or released.
-        The time argument is a timestamp with millisecond granularity, with an
-        undefined base. All requests regarding a single object must share the
-        same clock.
-
-        Keymap must be set before issuing this request.
-
-        State carries a value from the key_state enumeration.
-      </description>
-      <arg name="time" type="uint" summary="timestamp with millisecond granularity"/>
-      <arg name="key" type="uint" summary="key that produced the event"/>
-      <arg name="state" type="uint" summary="physical state of the key"/>
-    </request>
-
-    <request name="modifiers">
-      <description summary="modifier and group state">
-        Notifies the compositor that the modifier and/or group state has
-        changed, and it should update state.
-
-        The client should use wl_keyboard.modifiers event to synchronize its
-        internal state with seat state.
-
-        Keymap must be set before issuing this request.
-      </description>
-      <arg name="mods_depressed" type="uint" summary="depressed modifiers"/>
-      <arg name="mods_latched" type="uint" summary="latched modifiers"/>
-      <arg name="mods_locked" type="uint" summary="locked modifiers"/>
-      <arg name="group" type="uint" summary="keyboard layout"/>
-    </request>
-
-    <request name="destroy" type="destructor" since="1">
-      <description summary="destroy the virtual keyboard keyboard object"/>
-    </request>
-  </interface>
-
-  <interface name="zwp_virtual_keyboard_manager_v1" version="1">
-    <description summary="virtual keyboard manager">
-      A virtual keyboard manager allows an application to provide keyboard
-      input events as if they came from a physical keyboard.
-    </description>
-
-    <enum name="error">
-      <entry name="unauthorized" value="0" summary="client not authorized to use the interface"/>
-    </enum>
-
-    <request name="create_virtual_keyboard">
-      <description summary="Create a new virtual keyboard">
-        Creates a new virtual keyboard associated to a seat.
-
-        If the compositor enables a keyboard to perform arbitrary actions, it
-        should present an error when an untrusted client requests a new
-        keyboard.
-      </description>
-      <arg name="seat" type="object" interface="wl_seat"/>
-      <arg name="id" type="new_id" interface="zwp_virtual_keyboard_v1"/>
-    </request>
-  </interface>
-</protocol>

protocols/wayland-drm.xml

@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<protocol name="drm">
-
-  <copyright>
-    Copyright © 2008-2011 Kristian Høgsberg
-    Copyright © 2010-2011 Intel Corporation
-
-    Permission to use, copy, modify, distribute, and sell this
-    software and its documentation for any purpose is hereby granted
-    without fee, provided that\n the above copyright notice appear in
-    all copies and that both that copyright notice and this permission
-    notice appear in supporting documentation, and that the name of
-    the copyright holders not be used in advertising or publicity
-    pertaining to distribution of the software without specific,
-    written prior permission.  The copyright holders make no
-    representations about the suitability of this software for any
-    purpose.  It is provided "as is" without express or implied
-    warranty.
-
-    THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-    SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-    FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
-    SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-    AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-    ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-    THIS SOFTWARE.
-  </copyright>
-
-  <!-- drm support. This object is created by the server and published
-       using the display's global event. -->
-  <interface name="wl_drm" version="2">
-    <enum name="error">
-      <entry name="authenticate_fail" value="0"/>
-      <entry name="invalid_format" value="1"/>
-      <entry name="invalid_name" value="2"/>
-    </enum>
-
-    <enum name="format">
-      <!-- The drm format codes match the #defines in drm_fourcc.h.
-           The formats actually supported by the compositor will be
-           reported by the format event. New codes must not be added,
-           unless directly taken from drm_fourcc.h. -->
-      <entry name="c8" value="0x20203843"/>
-      <entry name="rgb332" value="0x38424752"/>
-      <entry name="bgr233" value="0x38524742"/>
-      <entry name="xrgb4444" value="0x32315258"/>
-      <entry name="xbgr4444" value="0x32314258"/>
-      <entry name="rgbx4444" value="0x32315852"/>
-      <entry name="bgrx4444" value="0x32315842"/>
-      <entry name="argb4444" value="0x32315241"/>
-      <entry name="abgr4444" value="0x32314241"/>
-      <entry name="rgba4444" value="0x32314152"/>
-      <entry name="bgra4444" value="0x32314142"/>
-      <entry name="xrgb1555" value="0x35315258"/>
-      <entry name="xbgr1555" value="0x35314258"/>
-      <entry name="rgbx5551" value="0x35315852"/>
-      <entry name="bgrx5551" value="0x35315842"/>
-      <entry name="argb1555" value="0x35315241"/>
-      <entry name="abgr1555" value="0x35314241"/>
-      <entry name="rgba5551" value="0x35314152"/>
-      <entry name="bgra5551" value="0x35314142"/>
-      <entry name="rgb565" value="0x36314752"/>
-      <entry name="bgr565" value="0x36314742"/>
-      <entry name="rgb888" value="0x34324752"/>
-      <entry name="bgr888" value="0x34324742"/>
-      <entry name="xrgb8888" value="0x34325258"/>
-      <entry name="xbgr8888" value="0x34324258"/>
-      <entry name="rgbx8888" value="0x34325852"/>
-      <entry name="bgrx8888" value="0x34325842"/>
-      <entry name="argb8888" value="0x34325241"/>
-      <entry name="abgr8888" value="0x34324241"/>
-      <entry name="rgba8888" value="0x34324152"/>
-      <entry name="bgra8888" value="0x34324142"/>
-      <entry name="xrgb2101010" value="0x30335258"/>
-      <entry name="xbgr2101010" value="0x30334258"/>
-      <entry name="rgbx1010102" value="0x30335852"/>
-      <entry name="bgrx1010102" value="0x30335842"/>
-      <entry name="argb2101010" value="0x30335241"/>
-      <entry name="abgr2101010" value="0x30334241"/>
-      <entry name="rgba1010102" value="0x30334152"/>
-      <entry name="bgra1010102" value="0x30334142"/>
-      <entry name="yuyv" value="0x56595559"/>
-      <entry name="yvyu" value="0x55595659"/>
-      <entry name="uyvy" value="0x59565955"/>
-      <entry name="vyuy" value="0x59555956"/>
-      <entry name="ayuv" value="0x56555941"/>
-      <entry name="xyuv8888" value="0x56555958"/>
-      <entry name="nv12" value="0x3231564e"/>
-      <entry name="nv21" value="0x3132564e"/>
-      <entry name="nv16" value="0x3631564e"/>
-      <entry name="nv61" value="0x3136564e"/>
-      <entry name="yuv410" value="0x39565559"/>
-      <entry name="yvu410" value="0x39555659"/>
-      <entry name="yuv411" value="0x31315559"/>
-      <entry name="yvu411" value="0x31315659"/>
-      <entry name="yuv420" value="0x32315559"/>
-      <entry name="yvu420" value="0x32315659"/>
-      <entry name="yuv422" value="0x36315559"/>
-      <entry name="yvu422" value="0x36315659"/>
-      <entry name="yuv444" value="0x34325559"/>
-      <entry name="yvu444" value="0x34325659"/>
-      <entry name="abgr16f" value="0x48344241"/>
-      <entry name="xbgr16f" value="0x48344258"/>
-    </enum>
-
-    <!-- Call this request with the magic received from drmGetMagic().
-         It will be passed on to the drmAuthMagic() or
-         DRIAuthConnection() call.  This authentication must be
-         completed before create_buffer could be used. -->
-    <request name="authenticate">
-      <arg name="id" type="uint"/>
-    </request>
-
-    <!-- Create a wayland buffer for the named DRM buffer.  The DRM
-         surface must have a name using the flink ioctl -->
-    <request name="create_buffer">
-      <arg name="id" type="new_id" interface="wl_buffer"/>
-      <arg name="name" type="uint"/>
-      <arg name="width" type="int"/>
-      <arg name="height" type="int"/>
-      <arg name="stride" type="uint"/>
-      <arg name="format" type="uint"/>
-    </request>
-
-    <!-- Create a wayland buffer for the named DRM buffer.  The DRM
-         surface must have a name using the flink ioctl -->
-    <request name="create_planar_buffer">
-      <arg name="id" type="new_id" interface="wl_buffer"/>
-      <arg name="name" type="uint"/>
-      <arg name="width" type="int"/>
-      <arg name="height" type="int"/>
-      <arg name="format" type="uint"/>
-      <arg name="offset0" type="int"/>
-      <arg name="stride0" type="int"/>
-      <arg name="offset1" type="int"/>
-      <arg name="stride1" type="int"/>
-      <arg name="offset2" type="int"/>
-      <arg name="stride2" type="int"/>
-    </request>
-
-    <!-- Notification of the path of the drm device which is used by
-         the server.  The client should use this device for creating
-         local buffers.  Only buffers created from this device should
-         be be passed to the server using this drm object's
-         create_buffer request. -->
-    <event name="device">
-      <arg name="name" type="string"/>
-    </event>
-
-    <event name="format">
-      <arg name="format" type="uint"/>
-    </event>
-
-    <!-- Raised if the authenticate request succeeded -->
-    <event name="authenticated"/>
-
-    <enum name="capability" since="2">
-      <description summary="wl_drm capability bitmask">
-        Bitmask of capabilities.
-      </description>
-      <entry name="prime" value="1" summary="wl_drm prime available"/>
-    </enum>
-
-    <event name="capabilities">
-      <arg name="value" type="uint"/>
-    </event>
-
-    <!-- Version 2 additions -->
-
-    <!-- Create a wayland buffer for the prime fd.  Use for regular and planar
-         buffers.  Pass 0 for offset and stride for unused planes. -->
-    <request name="create_prime_buffer" since="2">
-      <arg name="id" type="new_id" interface="wl_buffer"/>
-      <arg name="name" type="fd"/>
-      <arg name="width" type="int"/>
-      <arg name="height" type="int"/>
-      <arg name="format" type="uint"/>
-      <arg name="offset0" type="int"/>
-      <arg name="stride0" type="int"/>
-      <arg name="offset1" type="int"/>
-      <arg name="stride1" type="int"/>
-      <arg name="offset2" type="int"/>
-      <arg name="stride2" type="int"/>
-    </request>
-
-  </interface>
-
-</protocol>

protocols/wlr-data-control-unstable-v1.xml

@@ -1,278 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<protocol name="wlr_data_control_unstable_v1">
-  <copyright>
-    Copyright © 2018 Simon Ser
-    Copyright © 2019 Ivan Molodetskikh
-
-    Permission to use, copy, modify, distribute, and sell this
-    software and its documentation for any purpose is hereby granted
-    without fee, provided that the above copyright notice appear in
-    all copies and that both that copyright notice and this permission
-    notice appear in supporting documentation, and that the name of
-    the copyright holders not be used in advertising or publicity
-    pertaining to distribution of the software without specific,
-    written prior permission.  The copyright holders make no
-    representations about the suitability of this software for any
-    purpose.  It is provided "as is" without express or implied
-    warranty.
-
-    THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-    SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-    FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
-    SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-    AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-    ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-    THIS SOFTWARE.
-  </copyright>
-
-  <description summary="control data devices">
-    This protocol allows a privileged client to control data devices. In
-    particular, the client will be able to manage the current selection and take
-    the role of a clipboard manager.
-
-    Warning! The protocol described in this file is experimental and
-    backward incompatible changes may be made. Backward compatible changes
-    may be added together with the corresponding interface version bump.
-    Backward incompatible changes are done by bumping the version number in
-    the protocol and interface names and resetting the interface version.
-    Once the protocol is to be declared stable, the 'z' prefix and the
-    version number in the protocol and interface names are removed and the
-    interface version number is reset.
-  </description>
-
-  <interface name="zwlr_data_control_manager_v1" version="2">
-    <description summary="manager to control data devices">
-      This interface is a manager that allows creating per-seat data device
-      controls.
-    </description>
-
-    <request name="create_data_source">
-      <description summary="create a new data source">
-        Create a new data source.
-      </description>
-      <arg name="id" type="new_id" interface="zwlr_data_control_source_v1"
-        summary="data source to create"/>
-    </request>
-
-    <request name="get_data_device">
-      <description summary="get a data device for a seat">
-        Create a data device that can be used to manage a seat's selection.
-      </description>
-      <arg name="id" type="new_id" interface="zwlr_data_control_device_v1"/>
-      <arg name="seat" type="object" interface="wl_seat"/>
-    </request>
-
-    <request name="destroy" type="destructor">
-      <description summary="destroy the manager">
-        All objects created by the manager will still remain valid, until their
-        appropriate destroy request has been called.
-      </description>
-    </request>
-  </interface>
-
-  <interface name="zwlr_data_control_device_v1" version="2">
-    <description summary="manage a data device for a seat">
-      This interface allows a client to manage a seat's selection.
-
-      When the seat is destroyed, this object becomes inert.
-    </description>
-
-    <request name="set_selection">
-      <description summary="copy data to the selection">
-        This request asks the compositor to set the selection to the data from
-        the source on behalf of the client.
-
-        The given source may not be used in any further set_selection or
-        set_primary_selection requests. Attempting to use a previously used
-        source is a protocol error.
-
-        To unset the selection, set the source to NULL.
-      </description>
-      <arg name="source" type="object" interface="zwlr_data_control_source_v1"
-        allow-null="true"/>
-    </request>
-
-    <request name="destroy" type="destructor">
-      <description summary="destroy this data device">
-        Destroys the data device object.
-      </description>
-    </request>
-
-    <event name="data_offer">
-      <description summary="introduce a new wlr_data_control_offer">
-        The data_offer event introduces a new wlr_data_control_offer object,
-        which will subsequently be used in either the
-        wlr_data_control_device.selection event (for the regular clipboard
-        selections) or the wlr_data_control_device.primary_selection event (for
-        the primary clipboard selections). Immediately following the
-        wlr_data_control_device.data_offer event, the new data_offer object
-        will send out wlr_data_control_offer.offer events to describe the MIME
-        types it offers.
-      </description>
-      <arg name="id" type="new_id" interface="zwlr_data_control_offer_v1"/>
-    </event>
-
-    <event name="selection">
-      <description summary="advertise new selection">
-        The selection event is sent out to notify the client of a new
-        wlr_data_control_offer for the selection for this device. The
-        wlr_data_control_device.data_offer and the wlr_data_control_offer.offer
-        events are sent out immediately before this event to introduce the data
-        offer object. The selection event is sent to a client when a new
-        selection is set. The wlr_data_control_offer is valid until a new
-        wlr_data_control_offer or NULL is received. The client must destroy the
-        previous selection wlr_data_control_offer, if any, upon receiving this
-        event.
-
-        The first selection event is sent upon binding the
-        wlr_data_control_device object.
-      </description>
-      <arg name="id" type="object" interface="zwlr_data_control_offer_v1"
-        allow-null="true"/>
-    </event>
-
-    <event name="finished">
-      <description summary="this data control is no longer valid">
-        This data control object is no longer valid and should be destroyed by
-        the client.
-      </description>
-    </event>
-
-    <!-- Version 2 additions -->
-
-    <event name="primary_selection" since="2">
-      <description summary="advertise new primary selection">
-        The primary_selection event is sent out to notify the client of a new
-        wlr_data_control_offer for the primary selection for this device. The
-        wlr_data_control_device.data_offer and the wlr_data_control_offer.offer
-        events are sent out immediately before this event to introduce the data
-        offer object. The primary_selection event is sent to a client when a
-        new primary selection is set. The wlr_data_control_offer is valid until
-        a new wlr_data_control_offer or NULL is received. The client must
-        destroy the previous primary selection wlr_data_control_offer, if any,
-        upon receiving this event.
-
-        If the compositor supports primary selection, the first
-        primary_selection event is sent upon binding the
-        wlr_data_control_device object.
-      </description>
-      <arg name="id" type="object" interface="zwlr_data_control_offer_v1"
-        allow-null="true"/>
-    </event>
-
-    <request name="set_primary_selection" since="2">
-      <description summary="copy data to the primary selection">
-        This request asks the compositor to set the primary selection to the
-        data from the source on behalf of the client.
-
-        The given source may not be used in any further set_selection or
-        set_primary_selection requests. Attempting to use a previously used
-        source is a protocol error.
-
-        To unset the primary selection, set the source to NULL.
-
-        The compositor will ignore this request if it does not support primary
-        selection.
-      </description>
-      <arg name="source" type="object" interface="zwlr_data_control_source_v1"
-        allow-null="true"/>
-    </request>
-
-    <enum name="error" since="2">
-      <entry name="used_source" value="1"
-        summary="source given to set_selection or set_primary_selection was already used before"/>
-    </enum>
-  </interface>
-
-  <interface name="zwlr_data_control_source_v1" version="1">
-    <description summary="offer to transfer data">
-      The wlr_data_control_source object is the source side of a
-      wlr_data_control_offer. It is created by the source client in a data
-      transfer and provides a way to describe the offered data and a way to
-      respond to requests to transfer the data.
-    </description>
-
-    <enum name="error">
-      <entry name="invalid_offer" value="1"
-        summary="offer sent after wlr_data_control_device.set_selection"/>
-    </enum>
-
-    <request name="offer">
-      <description summary="add an offered MIME type">
-        This request adds a MIME type to the set of MIME types advertised to
-        targets. Can be called several times to offer multiple types.
-
-        Calling this after wlr_data_control_device.set_selection is a protocol
-        error.
-      </description>
-      <arg name="mime_type" type="string"
-        summary="MIME type offered by the data source"/>
-    </request>
-
-    <request name="destroy" type="destructor">
-      <description summary="destroy this source">
-        Destroys the data source object.
-      </description>
-    </request>
-
-    <event name="send">
-      <description summary="send the data">
-        Request for data from the client. Send the data as the specified MIME
-        type over the passed file descriptor, then close it.
-      </description>
-      <arg name="mime_type" type="string" summary="MIME type for the data"/>
-      <arg name="fd" type="fd" summary="file descriptor for the data"/>
-    </event>
-
-    <event name="cancelled">
-      <description summary="selection was cancelled">
-        This data source is no longer valid. The data source has been replaced
-        by another data source.
-
-        The client should clean up and destroy this data source.
-      </description>
-    </event>
-  </interface>
-
-  <interface name="zwlr_data_control_offer_v1" version="1">
-    <description summary="offer to transfer data">
-      A wlr_data_control_offer represents a piece of data offered for transfer
-      by another client (the source client). The offer describes the different
-      MIME types that the data can be converted to and provides the mechanism
-      for transferring the data directly from the source client.
-    </description>
-
-    <request name="receive">
-      <description summary="request that the data is transferred">
-        To transfer the offered data, the client issues this request and
-        indicates the MIME type it wants to receive. The transfer happens
-        through the passed file descriptor (typically created with the pipe
-        system call). The source client writes the data in the MIME type
-        representation requested and then closes the file descriptor.
-
-        The receiving client reads from the read end of the pipe until EOF and
-        then closes its end, at which point the transfer is complete.
-
-        This request may happen multiple times for different MIME types.
-      </description>
-      <arg name="mime_type" type="string"
-        summary="MIME type desired by receiver"/>
-      <arg name="fd" type="fd" summary="file descriptor for data transfer"/>
-    </request>
-
-    <request name="destroy" type="destructor">
-      <description summary="destroy this offer">
-        Destroys the data offer object.
-      </description>
-    </request>
-
-    <event name="offer">
-      <description summary="advertise offered MIME type">
-        Sent immediately after creating the wlr_data_control_offer object.
-        One event per offered MIME type.
-      </description>
-      <arg name="mime_type" type="string" summary="offered MIME type"/>
-    </event>
-  </interface>
-</protocol>

protocols/wlr-gamma-control-unstable-v1.xml

@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<protocol name="wlr_gamma_control_unstable_v1">
-  <copyright>
-    Copyright © 2015 Giulio camuffo
-    Copyright © 2018 Simon Ser
-
-    Permission to use, copy, modify, distribute, and sell this
-    software and its documentation for any purpose is hereby granted
-    without fee, provided that the above copyright notice appear in
-    all copies and that both that copyright notice and this permission
-    notice appear in supporting documentation, and that the name of
-    the copyright holders not be used in advertising or publicity
-    pertaining to distribution of the software without specific,
-    written prior permission.  The copyright holders make no
-    representations about the suitability of this software for any
-    purpose.  It is provided "as is" without express or implied
-    warranty.
-
-    THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-    SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-    FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
-    SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-    AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-    ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-    THIS SOFTWARE.
-  </copyright>
-
-  <description summary="manage gamma tables of outputs">
-    This protocol allows a privileged client to set the gamma tables for
-    outputs.
-
-    Warning! The protocol described in this file is experimental and
-    backward incompatible changes may be made. Backward compatible changes
-    may be added together with the corresponding interface version bump.
-    Backward incompatible changes are done by bumping the version number in
-    the protocol and interface names and resetting the interface version.
-    Once the protocol is to be declared stable, the 'z' prefix and the
-    version number in the protocol and interface names are removed and the
-    interface version number is reset.
-  </description>
-
-  <interface name="zwlr_gamma_control_manager_v1" version="1">
-    <description summary="manager to create per-output gamma controls">
-      This interface is a manager that allows creating per-output gamma
-      controls.
-    </description>
-
-    <request name="get_gamma_control">
-      <description summary="get a gamma control for an output">
-        Create a gamma control that can be used to adjust gamma tables for the
-        provided output.
-      </description>
-      <arg name="id" type="new_id" interface="zwlr_gamma_control_v1"/>
-      <arg name="output" type="object" interface="wl_output"/>
-    </request>
-
-    <request name="destroy" type="destructor">
-      <description summary="destroy the manager">
-        All objects created by the manager will still remain valid, until their
-        appropriate destroy request has been called.
-      </description>
-    </request>
-  </interface>
-
-  <interface name="zwlr_gamma_control_v1" version="1">
-    <description summary="adjust gamma tables for an output">
-      This interface allows a client to adjust gamma tables for a particular
-      output.
-
-      The client will receive the gamma size, and will then be able to set gamma
-      tables. At any time the compositor can send a failed event indicating that
-      this object is no longer valid.
-
-      There can only be at most one gamma control object per output, which
-      has exclusive access to this particular output. When the gamma control
-      object is destroyed, the gamma table is restored to its original value.
-    </description>
-
-    <event name="gamma_size">
-      <description summary="size of gamma ramps">
-        Advertise the size of each gamma ramp.
-
-        This event is sent immediately when the gamma control object is created.
-      </description>
-      <arg name="size" type="uint" summary="number of elements in a ramp"/>
-    </event>
-
-    <enum name="error">
-      <entry name="invalid_gamma" value="1" summary="invalid gamma tables"/>
-    </enum>
-
-    <request name="set_gamma">
-      <description summary="set the gamma table">
-        Set the gamma table. The file descriptor can be memory-mapped to provide
-        the raw gamma table, which contains successive gamma ramps for the red,
-        green and blue channels. Each gamma ramp is an array of 16-byte unsigned
-        integers which has the same length as the gamma size.
-
-        The file descriptor data must have the same length as three times the
-        gamma size.
-      </description>
-      <arg name="fd" type="fd" summary="gamma table file descriptor"/>
-    </request>
-
-    <event name="failed">
-      <description summary="object no longer valid">
-        This event indicates that the gamma control is no longer valid. This
-        can happen for a number of reasons, including:
-        - The output doesn't support gamma tables
-        - Setting the gamma tables failed
-        - Another client already has exclusive gamma control for this output
-        - The compositor has transferred gamma control to another client
-
-        Upon receiving this event, the client should destroy this object.
-      </description>
-    </event>
-
-    <request name="destroy" type="destructor">
-      <description summary="destroy this control">
-        Destroys the gamma control object. If the object is still valid, this
-        restores the original gamma tables.
-      </description>
-    </request>
-  </interface>
-</protocol>

protocols/wlr-layer-shell-unstable-v1.xml

@@ -25,7 +25,7 @@
     THIS SOFTWARE.
   </copyright>
 
-  <interface name="zwlr_layer_shell_v1" version="5">
+  <interface name="zwlr_layer_shell_v1" version="4">
     <description summary="create surfaces that are layers of the desktop">
       Clients can use this interface to assign the surface_layer role to
       wl_surfaces. Such surfaces are assigned to a "layer" of the output and
@@ -100,7 +100,7 @@
     </request>
   </interface>
 
-  <interface name="zwlr_layer_surface_v1" version="5">
+  <interface name="zwlr_layer_surface_v1" version="4">
     <description summary="layer metadata interface">
       An interface that may be implemented by a wl_surface, for surfaces that
       are designed to be rendered as a layer of a stacked desktop-like
@@ -367,7 +367,6 @@
       <entry name="invalid_size" value="1" summary="size is invalid"/>
       <entry name="invalid_anchor" value="2" summary="anchor bitfield is invalid"/>
       <entry name="invalid_keyboard_interactivity" value="3" summary="keyboard interactivity is invalid"/>
-      <entry name="invalid_exclusive_edge" value="4" summary="exclusive edge is invalid given the surface anchors"/>
     </enum>
 
     <enum name="anchor" bitfield="true">
@@ -387,21 +386,5 @@
       </description>
       <arg name="layer" type="uint" enum="zwlr_layer_shell_v1.layer" summary="layer to move this surface to"/>
     </request>
-
-    <!-- Version 5 additions -->
-
-    <request name="set_exclusive_edge" since="5">
-      <description summary="set the edge the exclusive zone will be applied to">
-        Requests an edge for the exclusive zone to apply. The exclusive
-        edge will be automatically deduced from anchor points when possible,
-        but when the surface is anchored to a corner, it will be necessary
-        to set it explicitly to disambiguate, as it is not possible to deduce
-        which one of the two corner edges should be used.
-
-        The edge must be one the surface is anchored to, otherwise the
-        invalid_exclusive_edge protocol error will be raised.
-      </description>
-      <arg name="edge" type="uint" enum="anchor"/>
-    </request>
   </interface>
 </protocol>

protocols/wlr-output-management-unstable-v1.xml

@@ -1,601 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<protocol name="wlr_output_management_unstable_v1">
-  <copyright>
-    Copyright © 2019 Purism SPC
-
-    Permission to use, copy, modify, distribute, and sell this
-    software and its documentation for any purpose is hereby granted
-    without fee, provided that the above copyright notice appear in
-    all copies and that both that copyright notice and this permission
-    notice appear in supporting documentation, and that the name of
-    the copyright holders not be used in advertising or publicity
-    pertaining to distribution of the software without specific,
-    written prior permission.  The copyright holders make no
-    representations about the suitability of this software for any
-    purpose.  It is provided "as is" without express or implied
-    warranty.
-
-    THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-    SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-    FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
-    SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-    AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-    ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
-    THIS SOFTWARE.
-  </copyright>
-
-  <description summary="protocol to configure output devices">
-    This protocol exposes interfaces to obtain and modify output device
-    configuration.
-
-    Warning! The protocol described in this file is experimental and
-    backward incompatible changes may be made. Backward compatible changes
-    may be added together with the corresponding interface version bump.
-    Backward incompatible changes are done by bumping the version number in
-    the protocol and interface names and resetting the interface version.
-    Once the protocol is to be declared stable, the 'z' prefix and the
-    version number in the protocol and interface names are removed and the
-    interface version number is reset.
-  </description>
-
-  <interface name="zwlr_output_manager_v1" version="4">
-    <description summary="output device configuration manager">
-      This interface is a manager that allows reading and writing the current
-      output device configuration.
-
-      Output devices that display pixels (e.g. a physical monitor or a virtual
-      output in a window) are represented as heads. Heads cannot be created nor
-      destroyed by the client, but they can be enabled or disabled and their
-      properties can be changed. Each head may have one or more available modes.
-
-      Whenever a head appears (e.g. a monitor is plugged in), it will be
-      advertised via the head event. Immediately after the output manager is
-      bound, all current heads are advertised.
-
-      Whenever a head's properties change, the relevant wlr_output_head events
-      will be sent. Not all head properties will be sent: only properties that
-      have changed need to.
-
-      Whenever a head disappears (e.g. a monitor is unplugged), a
-      wlr_output_head.finished event will be sent.
-
-      After one or more heads appear, change or disappear, the done event will
-      be sent. It carries a serial which can be used in a create_configuration
-      request to update heads properties.
-
-      The information obtained from this protocol should only be used for output
-      configuration purposes. This protocol is not designed to be a generic
-      output property advertisement protocol for regular clients. Instead,
-      protocols such as xdg-output should be used.
-    </description>
-
-    <event name="head">
-      <description summary="introduce a new head">
-        This event introduces a new head. This happens whenever a new head
-        appears (e.g. a monitor is plugged in) or after the output manager is
-        bound.
-      </description>
-      <arg name="head" type="new_id" interface="zwlr_output_head_v1"/>
-    </event>
-
-    <event name="done">
-      <description summary="sent all information about current configuration">
-        This event is sent after all information has been sent after binding to
-        the output manager object and after any subsequent changes. This applies
-        to child head and mode objects as well. In other words, this event is
-        sent whenever a head or mode is created or destroyed and whenever one of
-        their properties has been changed. Not all state is re-sent each time
-        the current configuration changes: only the actual changes are sent.
-
-        This allows changes to the output configuration to be seen as atomic,
-        even if they happen via multiple events.
-
-        A serial is sent to be used in a future create_configuration request.
-      </description>
-      <arg name="serial" type="uint" summary="current configuration serial"/>
-    </event>
-
-    <request name="create_configuration">
-      <description summary="create a new output configuration object">
-        Create a new output configuration object. This allows to update head
-        properties.
-      </description>
-      <arg name="id" type="new_id" interface="zwlr_output_configuration_v1"/>
-      <arg name="serial" type="uint"/>
-    </request>
-
-    <request name="stop">
-      <description summary="stop sending events">
-        Indicates the client no longer wishes to receive events for output
-        configuration changes. However the compositor may emit further events,
-        until the finished event is emitted.
-
-        The client must not send any more requests after this one.
-      </description>
-    </request>
-
-    <event name="finished" type="destructor">
-      <description summary="the compositor has finished with the manager">
-        This event indicates that the compositor is done sending manager events.
-        The compositor will destroy the object immediately after sending this
-        event, so it will become invalid and the client should release any
-        resources associated with it.
-      </description>
-    </event>
-  </interface>
-
-  <interface name="zwlr_output_head_v1" version="4">
-    <description summary="output device">
-      A head is an output device. The difference between a wl_output object and
-      a head is that heads are advertised even if they are turned off. A head
-      object only advertises properties and cannot be used directly to change
-      them.
-
-      A head has some read-only properties: modes, name, description and
-      physical_size. These cannot be changed by clients.
-
-      Other properties can be updated via a wlr_output_configuration object.
-
-      Properties sent via this interface are applied atomically via the
-      wlr_output_manager.done event. No guarantees are made regarding the order
-      in which properties are sent.
-    </description>
-
-    <event name="name">
-      <description summary="head name">
-        This event describes the head name.
-
-        The naming convention is compositor defined, but limited to alphanumeric
-        characters and dashes (-). Each name is unique among all wlr_output_head
-        objects, but if a wlr_output_head object is destroyed the same name may
-        be reused later. The names will also remain consistent across sessions
-        with the same hardware and software configuration.
-
-        Examples of names include 'HDMI-A-1', 'WL-1', 'X11-1', etc. However, do
-        not assume that the name is a reflection of an underlying DRM
-        connector, X11 connection, etc.
-
-        If the compositor implements the xdg-output protocol and this head is
-        enabled, the xdg_output.name event must report the same name.
-
-        The name event is sent after a wlr_output_head object is created. This
-        event is only sent once per object, and the name does not change over
-        the lifetime of the wlr_output_head object.
-      </description>
-      <arg name="name" type="string"/>
-    </event>
-
-    <event name="description">
-      <description summary="head description">
-        This event describes a human-readable description of the head.
-
-        The description is a UTF-8 string with no convention defined for its
-        contents. Examples might include 'Foocorp 11" Display' or 'Virtual X11
-        output via :1'. However, do not assume that the name is a reflection of
-        the make, model, serial of the underlying DRM connector or the display
-        name of the underlying X11 connection, etc.
-
-        If the compositor implements xdg-output and this head is enabled,
-        the xdg_output.description must report the same description.
-
-        The description event is sent after a wlr_output_head object is created.
-        This event is only sent once per object, and the description does not
-        change over the lifetime of the wlr_output_head object.
-      </description>
-      <arg name="description" type="string"/>
-    </event>
-
-    <event name="physical_size">
-      <description summary="head physical size">
-        This event describes the physical size of the head. This event is only
-        sent if the head has a physical size (e.g. is not a projector or a
-        virtual device).
-      </description>
-      <arg name="width" type="int" summary="width in millimeters of the output"/>
-      <arg name="height" type="int" summary="height in millimeters of the output"/>
-    </event>
-
-    <event name="mode">
-      <description summary="introduce a mode">
-        This event introduces a mode for this head. It is sent once per
-        supported mode.
-      </description>
-      <arg name="mode" type="new_id" interface="zwlr_output_mode_v1"/>
-    </event>
-
-    <event name="enabled">
-      <description summary="head is enabled or disabled">
-        This event describes whether the head is enabled. A disabled head is not
-        mapped to a region of the global compositor space.
-
-        When a head is disabled, some properties (current_mode, position,
-        transform and scale) are irrelevant.
-      </description>
-      <arg name="enabled" type="int" summary="zero if disabled, non-zero if enabled"/>
-    </event>
-
-    <event name="current_mode">
-      <description summary="current mode">
-        This event describes the mode currently in use for this head. It is only
-        sent if the output is enabled.
-      </description>
-      <arg name="mode" type="object" interface="zwlr_output_mode_v1"/>
-    </event>
-
-    <event name="position">
-      <description summary="current position">
-        This events describes the position of the head in the global compositor
-        space. It is only sent if the output is enabled.
-      </description>
-      <arg name="x" type="int"
-        summary="x position within the global compositor space"/>
-      <arg name="y" type="int"
-        summary="y position within the global compositor space"/>
-    </event>
-
-    <event name="transform">
-      <description summary="current transformation">
-        This event describes the transformation currently applied to the head.
-        It is only sent if the output is enabled.
-      </description>
-      <arg name="transform" type="int" enum="wl_output.transform"/>
-    </event>
-
-    <event name="scale">
-      <description summary="current scale">
-        This events describes the scale of the head in the global compositor
-        space. It is only sent if the output is enabled.
-      </description>
-      <arg name="scale" type="fixed"/>
-    </event>
-
-    <event name="finished">
-      <description summary="the head has disappeared">
-        This event indicates that the head is no longer available. The head
-        object becomes inert. Clients should send a destroy request and release
-        any resources associated with it.
-      </description>
-    </event>
-
-    <!-- Version 2 additions -->
-
-    <event name="make" since="2">
-      <description summary="head manufacturer">
-        This event describes the manufacturer of the head.
-
-        This must report the same make as the wl_output interface does in its
-        geometry event.
-
-        Together with the model and serial_number events the purpose is to
-        allow clients to recognize heads from previous sessions and for example
-        load head-specific configurations back.
-
-        It is not guaranteed this event will be ever sent. A reason for that
-        can be that the compositor does not have information about the make of
-        the head or the definition of a make is not sensible in the current
-        setup, for example in a virtual session. Clients can still try to
-        identify the head by available information from other events but should
-        be aware that there is an increased risk of false positives.
-
-        It is not recommended to display the make string in UI to users. For
-        that the string provided by the description event should be preferred.
-      </description>
-      <arg name="make" type="string"/>
-    </event>
-
-    <event name="model" since="2">
-      <description summary="head model">
-        This event describes the model of the head.
-
-        This must report the same model as the wl_output interface does in its
-        geometry event.
-
-        Together with the make and serial_number events the purpose is to
-        allow clients to recognize heads from previous sessions and for example
-        load head-specific configurations back.
-
-        It is not guaranteed this event will be ever sent. A reason for that
-        can be that the compositor does not have information about the model of
-        the head or the definition of a model is not sensible in the current
-        setup, for example in a virtual session. Clients can still try to
-        identify the head by available information from other events but should
-        be aware that there is an increased risk of false positives.
-
-        It is not recommended to display the model string in UI to users. For
-        that the string provided by the description event should be preferred.
-      </description>
-      <arg name="model" type="string"/>
-    </event>
-
-    <event name="serial_number" since="2">
-      <description summary="head serial number">
-        This event describes the serial number of the head.
-
-        Together with the make and model events the purpose is to allow clients
-        to recognize heads from previous sessions and for example load head-
-        specific configurations back.
-
-        It is not guaranteed this event will be ever sent. A reason for that
-        can be that the compositor does not have information about the serial
-        number of the head or the definition of a serial number is not sensible
-        in the current setup. Clients can still try to identify the head by
-        available information from other events but should be aware that there
-        is an increased risk of false positives.
-
-        It is not recommended to display the serial_number string in UI to
-        users. For that the string provided by the description event should be
-        preferred.
-      </description>
-      <arg name="serial_number" type="string"/>
-    </event>
-
-    <!-- Version 3 additions -->
-
-    <request name="release" type="destructor" since="3">
-      <description summary="destroy the head object">
-        This request indicates that the client will no longer use this head
-        object.
-      </description>
-    </request>
-
-    <!-- Version 4 additions -->
-
-    <enum name="adaptive_sync_state" since="4">
-      <entry name="disabled" value="0" summary="adaptive sync is disabled"/>
-      <entry name="enabled" value="1" summary="adaptive sync is enabled"/>
-    </enum>
-
-    <event name="adaptive_sync" since="4">
-      <description summary="current adaptive sync state">
-        This event describes whether adaptive sync is currently enabled for
-        the head or not. Adaptive sync is also known as Variable Refresh
-        Rate or VRR.
-      </description>
-      <arg name="state" type="uint" enum="adaptive_sync_state"/>
-    </event>
-  </interface>
-
-  <interface name="zwlr_output_mode_v1" version="3">
-    <description summary="output mode">
-      This object describes an output mode.
-
-      Some heads don't support output modes, in which case modes won't be
-      advertised.
-
-      Properties sent via this interface are applied atomically via the
-      wlr_output_manager.done event. No guarantees are made regarding the order
-      in which properties are sent.
-    </description>
-
-    <event name="size">
-      <description summary="mode size">
-        This event describes the mode size. The size is given in physical
-        hardware units of the output device. This is not necessarily the same as
-        the output size in the global compositor space. For instance, the output
-        may be scaled or transformed.
-      </description>
-      <arg name="width" type="int" summary="width of the mode in hardware units"/>
-      <arg name="height" type="int" summary="height of the mode in hardware units"/>
-    </event>
-
-    <event name="refresh">
-      <description summary="mode refresh rate">
-        This event describes the mode's fixed vertical refresh rate. It is only
-        sent if the mode has a fixed refresh rate.
-      </description>
-      <arg name="refresh" type="int" summary="vertical refresh rate in mHz"/>
-    </event>
-
-    <event name="preferred">
-      <description summary="mode is preferred">
-        This event advertises this mode as preferred.
-      </description>
-    </event>
-
-    <event name="finished">
-      <description summary="the mode has disappeared">
-        This event indicates that the mode is no longer available. The mode
-        object becomes inert. Clients should send a destroy request and release
-        any resources associated with it.
-      </description>
-    </event>
-
-    <!-- Version 3 additions -->
-
-    <request name="release" type="destructor" since="3">
-      <description summary="destroy the mode object">
-        This request indicates that the client will no longer use this mode
-        object.
-      </description>
-    </request>
-  </interface>
-
-  <interface name="zwlr_output_configuration_v1" version="4">
-    <description summary="output configuration">
-      This object is used by the client to describe a full output configuration.
-
-      First, the client needs to setup the output configuration. Each head can
-      be either enabled (and configured) or disabled. It is a protocol error to
-      send two enable_head or disable_head requests with the same head. It is a
-      protocol error to omit a head in a configuration.
-
-      Then, the client can apply or test the configuration. The compositor will
-      then reply with a succeeded, failed or cancelled event. Finally the client
-      should destroy the configuration object.
-    </description>
-
-    <enum name="error">
-      <entry name="already_configured_head" value="1"
-        summary="head has been configured twice"/>
-      <entry name="unconfigured_head" value="2"
-        summary="head has not been configured"/>
-      <entry name="already_used" value="3"
-        summary="request sent after configuration has been applied or tested"/>
-    </enum>
-
-    <request name="enable_head">
-      <description summary="enable and configure a head">
-        Enable a head. This request creates a head configuration object that can
-        be used to change the head's properties.
-      </description>
-      <arg name="id" type="new_id" interface="zwlr_output_configuration_head_v1"
-        summary="a new object to configure the head"/>
-      <arg name="head" type="object" interface="zwlr_output_head_v1"
-        summary="the head to be enabled"/>
-    </request>
-
-    <request name="disable_head">
-      <description summary="disable a head">
-        Disable a head.
-      </description>
-      <arg name="head" type="object" interface="zwlr_output_head_v1"
-        summary="the head to be disabled"/>
-    </request>
-
-    <request name="apply">
-      <description summary="apply the configuration">
-        Apply the new output configuration.
-
-        In case the configuration is successfully applied, there is no guarantee
-        that the new output state matches completely the requested
-        configuration. For instance, a compositor might round the scale if it
-        doesn't support fractional scaling.
-
-        After this request has been sent, the compositor must respond with an
-        succeeded, failed or cancelled event. Sending a request that isn't the
-        destructor is a protocol error.
-      </description>
-    </request>
-
-    <request name="test">
-      <description summary="test the configuration">
-        Test the new output configuration. The configuration won't be applied,
-        but will only be validated.
-
-        Even if the compositor succeeds to test a configuration, applying it may
-        fail.
-
-        After this request has been sent, the compositor must respond with an
-        succeeded, failed or cancelled event. Sending a request that isn't the
-        destructor is a protocol error.
-      </description>
-    </request>
-
-    <event name="succeeded">
-      <description summary="configuration changes succeeded">
-        Sent after the compositor has successfully applied the changes or
-        tested them.
-
-        Upon receiving this event, the client should destroy this object.
-
-        If the current configuration has changed, events to describe the changes
-        will be sent followed by a wlr_output_manager.done event.
-      </description>
-    </event>
-
-    <event name="failed">
-      <description summary="configuration changes failed">
-        Sent if the compositor rejects the changes or failed to apply them. The
-        compositor should revert any changes made by the apply request that
-        triggered this event.
-
-        Upon receiving this event, the client should destroy this object.
-      </description>
-    </event>
-
-    <event name="cancelled">
-      <description summary="configuration has been cancelled">
-        Sent if the compositor cancels the configuration because the state of an
-        output changed and the client has outdated information (e.g. after an
-        output has been hotplugged).
-
-        The client can create a new configuration with a newer serial and try
-        again.
-
-        Upon receiving this event, the client should destroy this object.
-      </description>
-    </event>
-
-    <request name="destroy" type="destructor">
-      <description summary="destroy the output configuration">
-        Using this request a client can tell the compositor that it is not going
-        to use the configuration object anymore. Any changes to the outputs
-        that have not been applied will be discarded.
-
-        This request also destroys wlr_output_configuration_head objects created
-        via this object.
-      </description>
-    </request>
-  </interface>
-
-  <interface name="zwlr_output_configuration_head_v1" version="4">
-    <description summary="head configuration">
-      This object is used by the client to update a single head's configuration.
-
-      It is a protocol error to set the same property twice.
-    </description>
-
-    <enum name="error">
-      <entry name="already_set" value="1" summary="property has already been set"/>
-      <entry name="invalid_mode" value="2" summary="mode doesn't belong to head"/>
-      <entry name="invalid_custom_mode" value="3" summary="mode is invalid"/>
-      <entry name="invalid_transform" value="4" summary="transform value outside enum"/>
-      <entry name="invalid_scale" value="5" summary="scale negative or zero"/>
-      <entry name="invalid_adaptive_sync_state" value="6" since="4"
-        summary="invalid enum value used in the set_adaptive_sync request"/>
-    </enum>
-
-    <request name="set_mode">
-      <description summary="set the mode">
-        This request sets the head's mode.
-      </description>
-      <arg name="mode" type="object" interface="zwlr_output_mode_v1"/>
-    </request>
-
-    <request name="set_custom_mode">
-      <description summary="set a custom mode">
-        This request assigns a custom mode to the head. The size is given in
-        physical hardware units of the output device. If set to zero, the
-        refresh rate is unspecified.
-
-        It is a protocol error to set both a mode and a custom mode.
-      </description>
-      <arg name="width" type="int" summary="width of the mode in hardware units"/>
-      <arg name="height" type="int" summary="height of the mode in hardware units"/>
-      <arg name="refresh" type="int" summary="vertical refresh rate in mHz or zero"/>
-    </request>
-
-    <request name="set_position">
-      <description summary="set the position">
-        This request sets the head's position in the global compositor space.
-      </description>
-      <arg name="x" type="int" summary="x position in the global compositor space"/>
-      <arg name="y" type="int" summary="y position in the global compositor space"/>
-    </request>
-
-    <request name="set_transform">
-      <description summary="set the transform">
-        This request sets the head's transform.
-      </description>
-      <arg name="transform" type="int" enum="wl_output.transform"/>
-    </request>
-
-    <request name="set_scale">
-      <description summary="set the scale">
-        This request sets the head's scale.
-      </description>
-      <arg name="scale" type="fixed"/>
-    </request>
-
-    <!-- Version 4 additions -->
-
-    <request name="set_adaptive_sync" since="4">
-      <description summary="enable/disable adaptive sync">
-        This request enables/disables adaptive sync. Adaptive sync is also
-        known as Variable Refresh Rate or VRR.
-      </description>
-      <arg name="state" type="uint" enum="zwlr_output_head_v1.adaptive_sync_state"/>
-    </request>
-  </interface>
-</protocol>

protocols/wlr-virtual-pointer-unstable-v1.xml

@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<protocol name="wlr_virtual_pointer_unstable_v1">
-  <copyright>
-    Copyright © 2019 Josef Gajdusek
-
-    Permission is hereby granted, free of charge, to any person obtaining a
-    copy of this software and associated documentation files (the "Software"),
-    to deal in the Software without restriction, including without limitation
-    the rights to use, copy, modify, merge, publish, distribute, sublicense,
-    and/or sell copies of the Software, and to permit persons to whom the
-    Software is furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice (including the next
-    paragraph) shall be included in all copies or substantial portions of the
-    Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-    THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-    DEALINGS IN THE SOFTWARE.
-  </copyright>
-
-  <interface name="zwlr_virtual_pointer_v1" version="2">
-    <description summary="virtual pointer">
-      This protocol allows clients to emulate a physical pointer device. The
-      requests are mostly mirror opposites of those specified in wl_pointer.
-    </description>
-
-    <enum name="error">
-      <entry name="invalid_axis" value="0"
-        summary="client sent invalid axis enumeration value" />
-      <entry name="invalid_axis_source" value="1"
-        summary="client sent invalid axis source enumeration value" />
-    </enum>
-
-    <request name="motion">
-      <description summary="pointer relative motion event">
-        The pointer has moved by a relative amount to the previous request.
-
-        Values are in the global compositor space.
-      </description>
-      <arg name="time" type="uint" summary="timestamp with millisecond granularity"/>
-      <arg name="dx" type="fixed" summary="displacement on the x-axis"/>
-      <arg name="dy" type="fixed" summary="displacement on the y-axis"/>
-    </request>
-
-    <request name="motion_absolute">
-      <description summary="pointer absolute motion event">
-        The pointer has moved in an absolute coordinate frame.
-
-        Value of x can range from 0 to x_extent, value of y can range from 0
-        to y_extent.
-      </description>
-      <arg name="time" type="uint" summary="timestamp with millisecond granularity"/>
-      <arg name="x" type="uint" summary="position on the x-axis"/>
-      <arg name="y" type="uint" summary="position on the y-axis"/>
-      <arg name="x_extent" type="uint" summary="extent of the x-axis"/>
-      <arg name="y_extent" type="uint" summary="extent of the y-axis"/>
-    </request>
-
-    <request name="button">
-      <description summary="button event">
-        A button was pressed or released.
-      </description>
-      <arg name="time" type="uint" summary="timestamp with millisecond granularity"/>
-      <arg name="button" type="uint" summary="button that produced the event"/>
-      <arg name="state" type="uint" enum="wl_pointer.button_state" summary="physical state of the button"/>
-    </request>
-
-    <request name="axis">
-      <description summary="axis event">
-        Scroll and other axis requests.
-      </description>
-      <arg name="time" type="uint" summary="timestamp with millisecond granularity"/>
-      <arg name="axis" type="uint" enum="wl_pointer.axis" summary="axis type"/>
-      <arg name="value" type="fixed" summary="length of vector in touchpad coordinates"/>
-    </request>
-
-    <request name="frame">
-      <description summary="end of a pointer event sequence">
-        Indicates the set of events that logically belong together.
-      </description>
-    </request>
-
-    <request name="axis_source">
-      <description summary="axis source event">
-        Source information for scroll and other axis.
-      </description>
-      <arg name="axis_source" type="uint" enum="wl_pointer.axis_source" summary="source of the axis event"/>
-    </request>
-
-    <request name="axis_stop">
-      <description summary="axis stop event">
-        Stop notification for scroll and other axes.
-      </description>
-      <arg name="time" type="uint" summary="timestamp with millisecond granularity"/>
-      <arg name="axis" type="uint" enum="wl_pointer.axis" summary="the axis stopped with this event"/>
-    </request>
-
-    <request name="axis_discrete">
-      <description summary="axis click event">
-        Discrete step information for scroll and other axes.
-
-        This event allows the client to extend data normally sent using the axis
-        event with discrete value.
-      </description>
-      <arg name="time" type="uint" summary="timestamp with millisecond granularity"/>
-      <arg name="axis" type="uint" enum="wl_pointer.axis" summary="axis type"/>
-      <arg name="value" type="fixed" summary="length of vector in touchpad coordinates"/>
-      <arg name="discrete" type="int" summary="number of steps"/>
-    </request>
-
-    <request name="destroy" type="destructor" since="1">
-      <description summary="destroy the virtual pointer object"/>
-    </request>
-  </interface>
-
-  <interface name="zwlr_virtual_pointer_manager_v1" version="2">
-    <description summary="virtual pointer manager">
-      This object allows clients to create individual virtual pointer objects.
-    </description>
-
-    <request name="create_virtual_pointer">
-      <description summary="Create a new virtual pointer">
-        Creates a new virtual pointer. The optional seat is a suggestion to the
-        compositor.
-      </description>
-      <arg name="seat" type="object" interface="wl_seat" allow-null="true"/>
-      <arg name="id" type="new_id" interface="zwlr_virtual_pointer_v1"/>
-    </request>
-
-    <request name="destroy" type="destructor" since="1">
-      <description summary="destroy the virtual pointer manager"/>
-    </request>
-
-    <!-- Version 2 additions -->
-    <request name="create_virtual_pointer_with_output" since="2">
-      <description summary="Create a new virtual pointer">
-        Creates a new virtual pointer. The seat and the output arguments are
-        optional. If the seat argument is set, the compositor should assign the
-        input device to the requested seat. If the output argument is set, the
-        compositor should map the input device to the requested output.
-      </description>
-      <arg name="seat" type="object" interface="wl_seat" allow-null="true"/>
-      <arg name="output" type="object" interface="wl_output" allow-null="true"/>
-      <arg name="id" type="new_id" interface="zwlr_virtual_pointer_v1"/>
-    </request>
-  </interface>
-</protocol>

scripts/generateVersion.sh

@@ -1,13 +1,12 @@
 #!/bin/sh
 cp -fr ./src/version.h.in ./src/version.h
 
-HASH=${HASH-$(git rev-parse HEAD)}
-BRANCH=${BRANCH-$(git branch --show-current)}
-MESSAGE=${MESSAGE-$(git show | head -n 5 | tail -n 1 | sed -e 's/#//g' -e 's/\"//g')}
-DATE=${DATE-$(git show --no-patch --format=%cd --date=local)}
-DIRTY=${DIRTY-$(git diff-index --quiet HEAD -- || echo dirty)}
-TAG=${TAG-$(git describe --tags)}
-COMMITS=${COMMITS-$(git rev-list --count HEAD)}
+HASH=$(git rev-parse HEAD)
+BRANCH=$(git rev-parse --abbrev-ref HEAD)
+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)
 
 sed -i -e "s#@HASH@#${HASH}#" ./src/version.h
 sed -i -e "s#@BRANCH@#${BRANCH}#" ./src/version.h
@@ -15,4 +14,3 @@ 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

@@ -1,13 +1,21 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f54cdf5d..ad7c3e73 100755
+index 71766a8c..bd8cdc0e 100755
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -130,6 +130,8 @@ if(CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES DEBUG)
+@@ -101,7 +101,7 @@ 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 hyprlang>=0.3.2 hyprcursor) # we do not check for wlroots, as we provide it ourselves
++pkg_check_modules(deps REQUIRED IMPORTED_TARGET wayland-server wayland-client wayland-cursor wayland-protocols cairo libdrm xkbcommon libinput pango pangocairo pixman-1 hyprlang>=0.3.2 hyprcursor libffi) # we do not check for wlroots, as we provide it ourselves
+ 
+ file(GLOB_RECURSE SRCFILES CONFIGURE_DEPENDS "src/*.cpp")
+ 
+@@ -121,6 +121,7 @@ if(CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES DEBUG)
          message(STATUS "Enabling ASan")
  
          target_link_libraries(Hyprland asan)
-+        pkg_check_modules(ffidep REQUIRED IMPORTED_TARGET libffi)
-+        target_link_libraries(Hyprland ${CMAKE_SOURCE_DIR}/libwayland-server.a PkgConfig::ffidep)
++        target_link_libraries(Hyprland ${CMAKE_SOURCE_DIR}/libwayland-server.a)
          target_compile_options(Hyprland PUBLIC -fsanitize=address)
      endif()
  

src/Compositor.hpp

@@ -3,7 +3,6 @@
 #include <memory>
 #include <deque>
 #include <list>
-#include <sys/resource.h>
 
 #include "defines.hpp"
 #include "debug/Log.hpp"
@@ -30,11 +29,8 @@
 #include "plugins/PluginSystem.hpp"
 #include "helpers/Watchdog.hpp"
 
-class CWLSurfaceResource;
-
 enum eManagersInitStage {
     STAGE_PRIORITY = 0,
-    STAGE_BASICINIT,
     STAGE_LATE
 };
 
@@ -44,36 +40,61 @@ class CCompositor {
     ~CCompositor();
 
     // ------------------ WLR BASICS ------------------ //
-    wl_display*               m_sWLDisplay;
-    wl_event_loop*            m_sWLEventLoop;
-    wlr_backend*              m_sWLRBackend;
-    wlr_session*              m_sWLRSession;
-    wlr_renderer*             m_sWLRRenderer;
-    wlr_allocator*            m_sWLRAllocator;
-    wlr_compositor*           m_sWLRCompositor;
-    wlr_subcompositor*        m_sWLRSubCompositor;
-    wlr_drm*                  m_sWRLDRM;
-    wlr_drm_lease_v1_manager* m_sWRLDRMLeaseMgr;
-    wlr_egl*                  m_sWLREGL;
-    int                       m_iDRMFD;
-    wlr_linux_dmabuf_v1*      m_sWLRLinuxDMABuf;
-    wlr_backend*              m_sWLRHeadlessBackend;
+    wl_display*                                m_sWLDisplay;
+    wl_event_loop*                             m_sWLEventLoop;
+    wlr_backend*                               m_sWLRBackend;
+    wlr_session*                               m_sWLRSession;
+    wlr_renderer*                              m_sWLRRenderer;
+    wlr_allocator*                             m_sWLRAllocator;
+    wlr_compositor*                            m_sWLRCompositor;
+    wlr_subcompositor*                         m_sWLRSubCompositor;
+    wlr_data_device_manager*                   m_sWLRDataDevMgr;
+    wlr_drm*                                   m_sWRLDRM;
+    wlr_drm_lease_v1_manager*                  m_sWRLDRMLeaseMgr;
+    wlr_xdg_activation_v1*                     m_sWLRXDGActivation;
+    wlr_output_layout*                         m_sWLROutputLayout;
+    wlr_idle_notifier_v1*                      m_sWLRIdleNotifier;
+    wlr_layer_shell_v1*                        m_sWLRLayerShell;
+    wlr_xdg_shell*                             m_sWLRXDGShell;
+    wlr_cursor*                                m_sWLRCursor;
+    wlr_virtual_keyboard_manager_v1*           m_sWLRVKeyboardMgr;
+    wlr_output_manager_v1*                     m_sWLROutputMgr;
+    wlr_presentation*                          m_sWLRPresentation;
+    wlr_keyboard_shortcuts_inhibit_manager_v1* m_sWLRKbShInhibitMgr;
+    wlr_egl*                                   m_sWLREGL;
+    int                                        m_iDRMFD;
+    wlr_pointer_constraints_v1*                m_sWLRPointerConstraints;
+    wlr_relative_pointer_manager_v1*           m_sWLRRelPointerMgr;
+    wlr_server_decoration_manager*             m_sWLRServerDecoMgr;
+    wlr_xdg_decoration_manager_v1*             m_sWLRXDGDecoMgr;
+    wlr_virtual_pointer_manager_v1*            m_sWLRVirtPtrMgr;
+    wlr_foreign_toplevel_manager_v1*           m_sWLRToplevelMgr;
+    wlr_tablet_manager_v2*                     m_sWLRTabletManager;
+    wlr_xdg_foreign_registry*                  m_sWLRForeignRegistry;
+    wlr_idle_inhibit_manager_v1*               m_sWLRIdleInhibitMgr;
+    wlr_pointer_gestures_v1*                   m_sWLRPointerGestures;
+    wlr_output_power_manager_v1*               m_sWLROutputPowerMgr;
+    wlr_input_method_manager_v2*               m_sWLRIMEMgr;
+    wlr_text_input_manager_v3*                 m_sWLRTextInputMgr;
+    wlr_xdg_activation_v1*                     m_sWLRActivation;
+    wlr_linux_dmabuf_v1*                       m_sWLRLinuxDMABuf;
+    wlr_backend*                               m_sWLRHeadlessBackend;
+    wlr_session_lock_manager_v1*               m_sWLRSessionLockMgr;
+    wlr_gamma_control_manager_v1*              m_sWLRGammaCtrlMgr;
+    wlr_cursor_shape_manager_v1*               m_sWLRCursorShapeMgr;
+    wlr_tearing_control_manager_v1*            m_sWLRTearingControlMgr;
     // ------------------------------------------------- //
 
-    std::string                               m_szHyprTempDataRoot = "";
-
     std::string                               m_szWLDisplaySocket   = "";
     std::string                               m_szInstanceSignature = "";
-    std::string                               m_szInstancePath      = "";
     std::string                               m_szCurrentSplash     = "error";
 
-    std::vector<SP<CMonitor>>                 m_vMonitors;
-    std::vector<SP<CMonitor>>                 m_vRealMonitors; // for all monitors, even those turned off
-    std::vector<PHLWINDOW>                    m_vWindows;
-    std::vector<PHLLS>                        m_vLayers;
-    std::vector<PHLWORKSPACE>                 m_vWorkspaces;
-    std::vector<PHLWINDOWREF>                 m_vWindowsFadingOut;
-    std::vector<PHLLSREF>                     m_vSurfacesFadingOut;
+    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<CWorkspace>>  m_vWorkspaces;
+    std::vector<CWindow*>                     m_vWindowsFadingOut;
+    std::vector<SLayerSurface*>               m_vSurfacesFadingOut;
 
     std::unordered_map<std::string, uint64_t> m_mMonitorIDMap;
 
@@ -82,14 +103,14 @@ class CCompositor {
     void                                      cleanup();
     void                                      createLockFile();
     void                                      removeLockFile();
-    void                                      bumpNofile();
-    void                                      restoreNofile();
 
-    WP<CWLSurfaceResource>                    m_pLastFocus;
-    PHLWINDOWREF                              m_pLastWindow;
-    WP<CMonitor>                              m_pLastMonitor;
+    wlr_surface*                              m_pLastFocus   = nullptr;
+    CWindow*                                  m_pLastWindow  = nullptr;
+    CMonitor*                                 m_pLastMonitor = nullptr;
 
-    std::vector<PHLWINDOWREF>                 m_vWindowFocusHistory; // first element is the most recently focused.
+    std::vector<CWindow*>                     m_vWindowFocusHistory; // first element is the most recently focused.
+
+    SSeat                                     m_sSeat;
 
     bool                                      m_bReadyToProcess = false;
     bool                                      m_bSessionActive  = true;
@@ -102,100 +123,117 @@ class CCompositor {
 
     // ------------------------------------------------- //
 
-    CMonitor*              getMonitorFromID(const int&);
-    CMonitor*              getMonitorFromName(const std::string&);
-    CMonitor*              getMonitorFromDesc(const std::string&);
-    CMonitor*              getMonitorFromCursor();
-    CMonitor*              getMonitorFromVector(const Vector2D&);
-    void                   removeWindowFromVectorSafe(PHLWINDOW);
-    void                   focusWindow(PHLWINDOW, SP<CWLSurfaceResource> pSurface = nullptr);
-    void                   focusSurface(SP<CWLSurfaceResource>, PHLWINDOW pWindowOwner = nullptr);
-    bool                   monitorExists(CMonitor*);
-    PHLWINDOW              vectorToWindowUnified(const Vector2D&, uint8_t properties, PHLWINDOW pIgnoreWindow = nullptr);
-    SP<CWLSurfaceResource> vectorToLayerSurface(const Vector2D&, std::vector<PHLLSREF>*, Vector2D*, PHLLS*);
-    SP<CWLSurfaceResource> vectorToLayerPopupSurface(const Vector2D&, CMonitor* monitor, Vector2D*, PHLLS*);
-    SP<CWLSurfaceResource> vectorWindowToSurface(const Vector2D&, PHLWINDOW, Vector2D& sl);
-    Vector2D               vectorToSurfaceLocal(const Vector2D&, PHLWINDOW, SP<CWLSurfaceResource>);
-    CMonitor*              getMonitorFromOutput(wlr_output*);
-    CMonitor*              getRealMonitorFromOutput(wlr_output*);
-    PHLWINDOW              getWindowFromSurface(SP<CWLSurfaceResource>);
-    PHLWINDOW              getWindowFromHandle(uint32_t);
-    bool                   isWorkspaceVisible(PHLWORKSPACE);
-    bool                   isWorkspaceVisibleNotCovered(PHLWORKSPACE);
-    PHLWORKSPACE           getWorkspaceByID(const int&);
-    PHLWORKSPACE           getWorkspaceByName(const std::string&);
-    PHLWORKSPACE           getWorkspaceByString(const std::string&);
-    void                   sanityCheckWorkspaces();
-    void                   updateWorkspaceWindowDecos(const int&);
-    void                   updateWorkspaceSpecialRenderData(const int&);
-    int                    getWindowsOnWorkspace(const int& id, std::optional<bool> onlyTiled = {}, std::optional<bool> onlyVisible = {});
-    int                    getGroupsOnWorkspace(const int& id, std::optional<bool> onlyTiled = {}, std::optional<bool> onlyVisible = {});
-    PHLWINDOW              getUrgentWindow();
-    bool                   hasUrgentWindowOnWorkspace(const int&);
-    PHLWINDOW              getFirstWindowOnWorkspace(const int&);
-    PHLWINDOW              getTopLeftWindowOnWorkspace(const int&);
-    PHLWINDOW              getFullscreenWindowOnWorkspace(const int&);
-    bool                   isWindowActive(PHLWINDOW);
-    void                   changeWindowZOrder(PHLWINDOW, bool);
-    void                   cleanupFadingOut(const int& monid);
-    PHLWINDOW              getWindowInDirection(PHLWINDOW, char);
-    PHLWINDOW              getNextWindowOnWorkspace(PHLWINDOW, bool focusableOnly = false, std::optional<bool> floating = {});
-    PHLWINDOW              getPrevWindowOnWorkspace(PHLWINDOW, bool focusableOnly = false, std::optional<bool> floating = {});
-    int                    getNextAvailableNamedWorkspace();
-    bool                   isPointOnAnyMonitor(const Vector2D&);
-    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(PHLWINDOW);
-    int                    getNextAvailableMonitorID(std::string const& name);
-    void                   moveWorkspaceToMonitor(PHLWORKSPACE, CMonitor*, bool noWarpCursor = false);
-    void                   swapActiveWorkspaces(CMonitor*, CMonitor*);
-    CMonitor*              getMonitorFromString(const std::string&);
-    bool                   workspaceIDOutOfBounds(const int64_t&);
-    void                   setWindowFullscreen(PHLWINDOW, bool, eFullscreenMode mode = FULLSCREEN_INVALID);
-    void                   updateFullscreenFadeOnWorkspace(PHLWORKSPACE);
-    PHLWINDOW              getX11Parent(PHLWINDOW);
-    void                   scheduleFrameForMonitor(CMonitor*);
-    void                   addToFadingOutSafe(PHLLS);
-    void                   removeFromFadingOutSafe(PHLLS);
-    void                   addToFadingOutSafe(PHLWINDOW);
-    PHLWINDOW              getWindowByRegex(const std::string&);
-    void                   warpCursorTo(const Vector2D&, bool force = false);
-    PHLLS                  getLayerSurfaceFromSurface(SP<CWLSurfaceResource>);
-    void                   closeWindow(PHLWINDOW);
-    Vector2D               parseWindowVectorArgsRelative(const std::string&, const Vector2D&);
-    void                   forceReportSizesToWindowsOnWorkspace(const int&);
-    PHLWORKSPACE           createNewWorkspace(const int&, const int&, const std::string& name = "", bool isEmtpy = true); // 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(PHLWINDOW pWindow, PHLWORKSPACE pWorkspace);
-    PHLWINDOW              getForceFocus();
-    void                   arrangeMonitors();
-    void                   enterUnsafeState();
-    void                   leaveUnsafeState();
-    void                   setPreferredScaleForSurface(SP<CWLSurfaceResource> pSurface, double scale);
-    void                   setPreferredTransformForSurface(SP<CWLSurfaceResource> pSurface, wl_output_transform transform);
-    void                   updateSuspendedStates();
-    PHLWINDOW              windowForCPointer(CWindow*);
+    CMonitor*      getMonitorFromID(const int&);
+    CMonitor*      getMonitorFromName(const std::string&);
+    CMonitor*      getMonitorFromDesc(const std::string&);
+    CMonitor*      getMonitorFromCursor();
+    CMonitor*      getMonitorFromVector(const Vector2D&);
+    void           removeWindowFromVectorSafe(CWindow*);
+    void           focusWindow(CWindow*, wlr_surface* pSurface = nullptr);
+    void           focusSurface(wlr_surface*, CWindow* pWindowOwner = nullptr);
+    bool           windowExists(CWindow*);
+    bool           windowValidMapped(CWindow*);
+    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*);
+    CMonitor*      getMonitorFromOutput(wlr_output*);
+    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&);
+    void           sanityCheckWorkspaces();
+    void           updateWorkspaceWindowDecos(const int&);
+    int            getWindowsOnWorkspace(const int& id, std::optional<bool> onlyTiled = {});
+    CWindow*       getUrgentWindow();
+    bool           hasUrgentWindowOnWorkspace(const int&);
+    CWindow*       getFirstWindowOnWorkspace(const int&);
+    CWindow*       getTopLeftWindowOnWorkspace(const int&);
+    CWindow*       getFullscreenWindowOnWorkspace(const int&);
+    bool           doesSeatAcceptInput(wlr_surface*);
+    bool           isWindowActive(CWindow*);
+    void           changeWindowZOrder(CWindow*, bool);
+    void           cleanupFadingOut(const int& monid);
+    CWindow*       getWindowInDirection(CWindow*, char);
+    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&);
+    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*, bool noWarpCursor = false);
+    void           swapActiveWorkspaces(CMonitor*, CMonitor*);
+    CMonitor*      getMonitorFromString(const std::string&);
+    bool           workspaceIDOutOfBounds(const int64_t&);
+    void           setWindowFullscreen(CWindow*, bool, eFullscreenMode mode = FULLSCREEN_INVALID);
+    void           updateFullscreenFadeOnWorkspace(CWorkspace*);
+    CWindow*       getX11Parent(CWindow*);
+    void           scheduleFrameForMonitor(CMonitor*);
+    void           addToFadingOutSafe(SLayerSurface*);
+    void           addToFadingOutSafe(CWindow*);
+    CWindow*       getWindowByRegex(const std::string&);
+    void           warpCursorTo(const Vector2D&, bool force = false);
+    SLayerSurface* getLayerSurfaceFromWlr(wlr_layer_surface_v1*);
+    SLayerSurface* getLayerSurfaceFromSurface(wlr_surface*);
+    void           closeWindow(CWindow*);
+    Vector2D       parseWindowVectorArgsRelative(const std::string&, const Vector2D&);
+    void           forceReportSizesToWindowsOnWorkspace(const int&);
+    CWorkspace*    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);
+    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;
+    std::string    explicitConfigPath;
 
   private:
-    void             initAllSignals();
-    void             removeAllSignals();
-    void             cleanEnvironment();
-    void             setRandomSplash();
-    void             initManagers(eManagersInitStage stage);
-    void             prepareFallbackOutput();
+    void     initAllSignals();
+    void     removeAllSignals();
+    void     setRandomSplash();
+    void     initManagers(eManagersInitStage stage);
+    void     prepareFallbackOutput();
 
-    uint64_t         m_iHyprlandPID    = 0;
-    wl_event_source* m_critSigSource   = nullptr;
-    rlimit           m_sOriginalNofile = {0};
+    uint64_t m_iHyprlandPID = 0;
 };
 
 inline std::unique_ptr<CCompositor> g_pCompositor;
+
+// For XWayland
+inline std::map<std::string, xcb_atom_t> HYPRATOMS = {HYPRATOM("_NET_WM_WINDOW_TYPE"),
+                                                      HYPRATOM("_NET_WM_WINDOW_TYPE_NORMAL"),
+                                                      HYPRATOM("_NET_WM_WINDOW_TYPE_DOCK"),
+                                                      HYPRATOM("_NET_WM_WINDOW_TYPE_DIALOG"),
+                                                      HYPRATOM("_NET_WM_WINDOW_TYPE_UTILITY"),
+                                                      HYPRATOM("_NET_WM_WINDOW_TYPE_TOOLBAR"),
+                                                      HYPRATOM("_NET_WM_WINDOW_TYPE_SPLASH"),
+                                                      HYPRATOM("_NET_WM_WINDOW_TYPE_MENU"),
+                                                      HYPRATOM("_NET_WM_WINDOW_TYPE_DROPDOWN_MENU"),
+                                                      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("_NET_SUPPORTING_WM_CHECK"),
+                                                      HYPRATOM("_NET_WM_NAME"),
+                                                      HYPRATOM("UTF8_STRING")};

src/SharedDefs.hpp

@@ -1,11 +1,7 @@
 #pragma once
 
-#include "helpers/math/Math.hpp"
+#include "helpers/Vector2D.hpp"
 #include <functional>
-#include <any>
-#include <hyprutils/math/Box.hpp>
-
-using namespace Hyprutils::Math;
 
 enum eIcons {
     ICON_WARNING = 0,
@@ -41,6 +37,29 @@ 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
@@ -51,5 +70,3 @@ struct SHyprCtlCommand {
     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,6 +1,6 @@
 #pragma once
 #include "../defines.hpp"
-#include "../helpers/varlist/VarList.hpp"
+#include "../helpers/VarList.hpp"
 #include <vector>
 
 enum eConfigValueDataTypes {

src/config/ConfigManager.cpp

@@ -3,27 +3,19 @@
 
 #include "../render/decorations/CHyprGroupBarDecoration.hpp"
 #include "config/ConfigDataValues.hpp"
-#include "helpers/varlist/VarList.hpp"
-#include "../protocols/LayerShell.hpp"
+#include "helpers/VarList.hpp"
 
-#include <cstddef>
-#include <cstdint>
 #include <string.h>
 #include <string>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <glob.h>
-#include <xkbcommon/xkbcommon.h>
 
 #include <algorithm>
 #include <fstream>
 #include <iostream>
 #include <sstream>
-#include <ranges>
-#include <unordered_set>
-#include <hyprutils/string/String.hpp>
-using namespace Hyprutils::String;
 
 extern "C" char**             environ;
 
@@ -317,6 +309,8 @@ CConfigManager::CConfigManager() {
     m_pConfig->addConfigValue("general:gaps_in", Hyprlang::CConfigCustomValueType{configHandleGapSet, configHandleGapDestroy, "5"});
     m_pConfig->addConfigValue("general:gaps_out", Hyprlang::CConfigCustomValueType{configHandleGapSet, configHandleGapDestroy, "20"});
     m_pConfig->addConfigValue("general:gaps_workspaces", Hyprlang::INT{0});
+    m_pConfig->addConfigValue("general:cursor_inactive_timeout", Hyprlang::INT{0});
+    m_pConfig->addConfigValue("general:no_cursor_warps", Hyprlang::INT{0});
     m_pConfig->addConfigValue("general:no_focus_fallback", Hyprlang::INT{0});
     m_pConfig->addConfigValue("general:resize_on_border", Hyprlang::INT{0});
     m_pConfig->addConfigValue("general:extend_border_grab_area", Hyprlang::INT{15});
@@ -328,8 +322,7 @@ CConfigManager::CConfigManager() {
     m_pConfig->addConfigValue("misc:disable_hyprland_logo", Hyprlang::INT{0});
     m_pConfig->addConfigValue("misc:disable_splash_rendering", Hyprlang::INT{0});
     m_pConfig->addConfigValue("misc:col.splash", Hyprlang::INT{0x55ffffff});
-    m_pConfig->addConfigValue("misc:splash_font_family", {STRVAL_EMPTY});
-    m_pConfig->addConfigValue("misc:font_family", {"Sans"});
+    m_pConfig->addConfigValue("misc:splash_font_family", {"Sans"});
     m_pConfig->addConfigValue("misc:force_default_wallpaper", Hyprlang::INT{-1});
     m_pConfig->addConfigValue("misc:vfr", Hyprlang::INT{1});
     m_pConfig->addConfigValue("misc:vrr", Hyprlang::INT{0});
@@ -345,20 +338,23 @@ CConfigManager::CConfigManager() {
     m_pConfig->addConfigValue("misc:swallow_exception_regex", {STRVAL_EMPTY});
     m_pConfig->addConfigValue("misc:focus_on_activate", Hyprlang::INT{0});
     m_pConfig->addConfigValue("misc:no_direct_scanout", Hyprlang::INT{1});
+    m_pConfig->addConfigValue("misc:hide_cursor_on_touch", Hyprlang::INT{1});
     m_pConfig->addConfigValue("misc:mouse_move_focuses_monitor", Hyprlang::INT{1});
     m_pConfig->addConfigValue("misc:render_ahead_of_time", Hyprlang::INT{0});
     m_pConfig->addConfigValue("misc:render_ahead_safezone", Hyprlang::INT{1});
+    m_pConfig->addConfigValue("misc:cursor_zoom_factor", {1.f});
+    m_pConfig->addConfigValue("misc:cursor_zoom_rigid", Hyprlang::INT{0});
     m_pConfig->addConfigValue("misc:allow_session_lock_restore", Hyprlang::INT{0});
     m_pConfig->addConfigValue("misc:close_special_on_empty", Hyprlang::INT{1});
     m_pConfig->addConfigValue("misc:background_color", Hyprlang::INT{0xff111111});
     m_pConfig->addConfigValue("misc:new_window_takes_over_fullscreen", Hyprlang::INT{0});
-    m_pConfig->addConfigValue("misc:initial_workspace_tracking", Hyprlang::INT{1});
-    m_pConfig->addConfigValue("misc:middle_click_paste", Hyprlang::INT{1});
+    m_pConfig->addConfigValue("misc:enable_hyprcursor", Hyprlang::INT{1});
+    m_pConfig->addConfigValue("misc:hide_cursor_on_key_press", Hyprlang::INT{0});
 
     m_pConfig->addConfigValue("group:insert_after_current", Hyprlang::INT{1});
     m_pConfig->addConfigValue("group:focus_removed_window", Hyprlang::INT{1});
     m_pConfig->addConfigValue("group:groupbar:enabled", Hyprlang::INT{1});
-    m_pConfig->addConfigValue("group:groupbar:font_family", {STRVAL_EMPTY});
+    m_pConfig->addConfigValue("group:groupbar:font_family", {"Sans"});
     m_pConfig->addConfigValue("group:groupbar:font_size", Hyprlang::INT{8});
     m_pConfig->addConfigValue("group:groupbar:gradients", Hyprlang::INT{1});
     m_pConfig->addConfigValue("group:groupbar:height", Hyprlang::INT{14});
@@ -366,7 +362,6 @@ CConfigManager::CConfigManager() {
     m_pConfig->addConfigValue("group:groupbar:render_titles", Hyprlang::INT{1});
     m_pConfig->addConfigValue("group:groupbar:scrolling", Hyprlang::INT{1});
     m_pConfig->addConfigValue("group:groupbar:text_color", Hyprlang::INT{0xffffffff});
-    m_pConfig->addConfigValue("group:groupbar:stacked", Hyprlang::INT{0});
 
     m_pConfig->addConfigValue("debug:int", Hyprlang::INT{0});
     m_pConfig->addConfigValue("debug:log_damage", Hyprlang::INT{0});
@@ -379,10 +374,8 @@ CConfigManager::CConfigManager() {
     m_pConfig->addConfigValue("debug:manual_crash", Hyprlang::INT{0});
     m_pConfig->addConfigValue("debug:suppress_errors", Hyprlang::INT{0});
     m_pConfig->addConfigValue("debug:error_limit", Hyprlang::INT{5});
-    m_pConfig->addConfigValue("debug:error_position", Hyprlang::INT{0});
     m_pConfig->addConfigValue("debug:watchdog_timeout", Hyprlang::INT{5});
     m_pConfig->addConfigValue("debug:disable_scale_checks", Hyprlang::INT{0});
-    m_pConfig->addConfigValue("debug:colored_stdout_logs", Hyprlang::INT{1});
 
     m_pConfig->addConfigValue("decoration:rounding", Hyprlang::INT{0});
     m_pConfig->addConfigValue("decoration:blur:enabled", Hyprlang::INT{1});
@@ -431,9 +424,8 @@ CConfigManager::CConfigManager() {
 
     m_pConfig->addConfigValue("master:special_scale_factor", {1.f});
     m_pConfig->addConfigValue("master:mfact", {0.55f});
-    m_pConfig->addConfigValue("master:new_status", {"slave"});
+    m_pConfig->addConfigValue("master:new_is_master", Hyprlang::INT{1});
     m_pConfig->addConfigValue("master:always_center_master", Hyprlang::INT{0});
-    m_pConfig->addConfigValue("master:new_on_active", {"none"});
     m_pConfig->addConfigValue("master:new_on_top", Hyprlang::INT{0});
     m_pConfig->addConfigValue("master:no_gaps_when_only", Hyprlang::INT{0});
     m_pConfig->addConfigValue("master:orientation", {"left"});
@@ -448,7 +440,6 @@ CConfigManager::CConfigManager() {
     m_pConfig->addConfigValue("input:follow_mouse", Hyprlang::INT{1});
     m_pConfig->addConfigValue("input:mouse_refocus", Hyprlang::INT{1});
     m_pConfig->addConfigValue("input:special_fallthrough", Hyprlang::INT{0});
-    m_pConfig->addConfigValue("input:off_window_axis_events", Hyprlang::INT{1});
     m_pConfig->addConfigValue("input:sensitivity", {0.f});
     m_pConfig->addConfigValue("input:accel_profile", {STRVAL_EMPTY});
     m_pConfig->addConfigValue("input:kb_file", {STRVAL_EMPTY});
@@ -500,11 +491,9 @@ CConfigManager::CConfigManager() {
     m_pConfig->addConfigValue("binds:ignore_group_lock", Hyprlang::INT{0});
     m_pConfig->addConfigValue("binds:movefocus_cycles_fullscreen", Hyprlang::INT{1});
     m_pConfig->addConfigValue("binds:disable_keybind_grabbing", Hyprlang::INT{0});
-    m_pConfig->addConfigValue("binds:window_direction_monitor_fallback", Hyprlang::INT{1});
 
     m_pConfig->addConfigValue("gestures:workspace_swipe", Hyprlang::INT{0});
     m_pConfig->addConfigValue("gestures:workspace_swipe_fingers", Hyprlang::INT{3});
-    m_pConfig->addConfigValue("gestures:workspace_swipe_min_fingers", Hyprlang::INT{0});
     m_pConfig->addConfigValue("gestures:workspace_swipe_distance", Hyprlang::INT{300});
     m_pConfig->addConfigValue("gestures:workspace_swipe_invert", Hyprlang::INT{1});
     m_pConfig->addConfigValue("gestures:workspace_swipe_min_speed_to_force", Hyprlang::INT{30});
@@ -513,6 +502,7 @@ CConfigManager::CConfigManager() {
     m_pConfig->addConfigValue("gestures:workspace_swipe_direction_lock", Hyprlang::INT{1});
     m_pConfig->addConfigValue("gestures:workspace_swipe_direction_lock_threshold", Hyprlang::INT{10});
     m_pConfig->addConfigValue("gestures:workspace_swipe_forever", Hyprlang::INT{0});
+    m_pConfig->addConfigValue("gestures:workspace_swipe_numbered", Hyprlang::INT{0});
     m_pConfig->addConfigValue("gestures:workspace_swipe_use_r", Hyprlang::INT{0});
     m_pConfig->addConfigValue("gestures:workspace_swipe_touch", Hyprlang::INT{0});
 
@@ -522,21 +512,6 @@ CConfigManager::CConfigManager() {
     m_pConfig->addConfigValue("opengl:nvidia_anti_flicker", Hyprlang::INT{1});
     m_pConfig->addConfigValue("opengl:force_introspection", Hyprlang::INT{2});
 
-    m_pConfig->addConfigValue("cursor:no_hardware_cursors", Hyprlang::INT{0});
-    m_pConfig->addConfigValue("cursor:no_break_fs_vrr", Hyprlang::INT{0});
-    m_pConfig->addConfigValue("cursor:min_refresh_rate", Hyprlang::INT{24});
-    m_pConfig->addConfigValue("cursor:hotspot_padding", Hyprlang::INT{1});
-    m_pConfig->addConfigValue("cursor:inactive_timeout", Hyprlang::INT{0});
-    m_pConfig->addConfigValue("cursor:no_warps", Hyprlang::INT{0});
-    m_pConfig->addConfigValue("cursor:persistent_warps", Hyprlang::INT{0});
-    m_pConfig->addConfigValue("cursor:warp_on_change_workspace", Hyprlang::INT{0});
-    m_pConfig->addConfigValue("cursor:default_monitor", {STRVAL_EMPTY});
-    m_pConfig->addConfigValue("cursor:zoom_factor", {1.f});
-    m_pConfig->addConfigValue("cursor:zoom_rigid", Hyprlang::INT{0});
-    m_pConfig->addConfigValue("cursor:enable_hyprcursor", Hyprlang::INT{1});
-    m_pConfig->addConfigValue("cursor:hide_on_key_press", Hyprlang::INT{0});
-    m_pConfig->addConfigValue("cursor:hide_on_touch", Hyprlang::INT{1});
-
     m_pConfig->addConfigValue("autogenerated", Hyprlang::INT{0});
 
     m_pConfig->addConfigValue("general:col.active_border", Hyprlang::CConfigCustomValueType{&configHandleGradientSet, configHandleGradientDestroy, "0xffffffff"});
@@ -616,7 +591,7 @@ CConfigManager::CConfigManager() {
     setDefaultAnimationVars();
     resetHLConfig();
 
-    Debug::log(INFO,
+    Debug::log(LOG,
                "!!!!HEY YOU, YES YOU!!!!: further logs to stdout / logfile are disabled by default. BEFORE SENDING THIS LOG, ENABLE THEM. Use debug:disable_logs = false to do so: "
                "https://wiki.hyprland.org/Configuring/Variables/#debug");
 
@@ -643,25 +618,6 @@ std::string CConfigManager::getMainConfigPath() {
     return getConfigDir() + "/hypr/" + (ISDEBUG ? "hyprlandd.conf" : "hyprland.conf");
 }
 
-const std::string CConfigManager::getConfigString() {
-    std::string configString;
-    std::string currFileContent;
-
-    for (auto path : configPaths) {
-        std::ifstream configFile(path);
-        configString += ("\n\nConfig File: " + path + ": ");
-        if (!configFile.is_open()) {
-            Debug::log(LOG, "Config file not readable/found!");
-            configString += "Read Failed\n";
-            continue;
-        }
-        configString += "Read Succeeded\n";
-        currFileContent.assign(std::istreambuf_iterator<char>(configFile), std::istreambuf_iterator<char>());
-        configString.append(currFileContent);
-    }
-    return configString;
-}
-
 std::string CConfigManager::getErrors() {
     return m_szConfigErrors;
 }
@@ -690,10 +646,6 @@ void CConfigManager::setDefaultAnimationVars() {
         INITANIMCFG("windowsOut");
         INITANIMCFG("windowsMove");
 
-        // layers
-        INITANIMCFG("layersIn");
-        INITANIMCFG("layersOut");
-
         // fade
         INITANIMCFG("fadeIn");
         INITANIMCFG("fadeOut");
@@ -717,9 +669,6 @@ void CConfigManager::setDefaultAnimationVars() {
     CREATEANIMCFG("borderangle", "global");
     CREATEANIMCFG("workspaces", "global");
 
-    CREATEANIMCFG("layersIn", "layers");
-    CREATEANIMCFG("layersOut", "layers");
-
     CREATEANIMCFG("windowsIn", "windows");
     CREATEANIMCFG("windowsOut", "windows");
     CREATEANIMCFG("windowsMove", "windows");
@@ -730,8 +679,6 @@ void CConfigManager::setDefaultAnimationVars() {
     CREATEANIMCFG("fadeShadow", "fade");
     CREATEANIMCFG("fadeDim", "fade");
     CREATEANIMCFG("fadeLayers", "fade");
-    CREATEANIMCFG("fadeLayersIn", "fadeLayers");
-    CREATEANIMCFG("fadeLayersOut", "fadeLayers");
 
     CREATEANIMCFG("specialWorkspace", "workspaces");
 }
@@ -835,11 +782,12 @@ void CConfigManager::postConfigReload(const Hyprlang::CParseResult& result) {
         refreshGroupBarGradients();
 
     // Updates dynamic window and workspace rules
-    for (auto& w : g_pCompositor->m_vWorkspaces) {
-        if (w->inert())
+    for (auto& w : g_pCompositor->m_vWindows) {
+        if (!w->m_bIsMapped)
             continue;
-        g_pCompositor->updateWorkspaceWindows(w->m_iID);
-        g_pCompositor->updateWorkspaceSpecialRenderData(w->m_iID);
+
+        w->updateDynamicRules();
+        w->updateSpecialRenderData();
     }
 
     // Update window border colors
@@ -861,8 +809,6 @@ void CConfigManager::postConfigReload(const Hyprlang::CParseResult& result) {
     if (Debug::disableStdout && isFirstLaunch)
         Debug::log(LOG, "Disabling stdout logs! Check the log for further logs.");
 
-    Debug::coloredLogs = reinterpret_cast<int64_t* const*>(m_pConfig->getConfigValuePtr("debug:colored_stdout_logs")->getDataStaticPtr());
-
     for (auto& m : g_pCompositor->m_vMonitors) {
         // mark blur dirty
         g_pHyprOpenGL->markBlurDirtyForMonitor(m.get());
@@ -871,10 +817,6 @@ void CConfigManager::postConfigReload(const Hyprlang::CParseResult& result) {
 
         // Force the compositor to fully re-render all monitors
         m->forceFullFrames = 2;
-
-        // also force mirrors, as the aspect ratio could've changed
-        for (auto& mirror : m->mirrors)
-            mirror->forceFullFrames = 3;
     }
 
     // Reset no monitor reload
@@ -982,8 +924,7 @@ float CConfigManager::getDeviceFloat(const std::string& dev, const std::string&
 }
 
 Vector2D CConfigManager::getDeviceVec(const std::string& dev, const std::string& v, const std::string& fallback) {
-    auto vec = std::any_cast<Hyprlang::VEC2>(getConfigValueSafeDevice(dev, v, fallback)->getValue());
-    return {vec.x, vec.y};
+    return std::any_cast<Hyprlang::VEC2>(getConfigValueSafeDevice(dev, v, fallback)->getValue());
 }
 
 std::string CConfigManager::getDeviceString(const std::string& dev, const std::string& v, const std::string& fallback) {
@@ -996,7 +937,7 @@ std::string CConfigManager::getDeviceString(const std::string& dev, const std::s
 }
 
 SMonitorRule CConfigManager::getMonitorRuleFor(const CMonitor& PMONITOR) {
-    for (auto& r : m_dMonitorRules | std::views::reverse) {
+    for (auto& r : m_dMonitorRules) {
         if (PMONITOR.matchesStaticSelector(r.name)) {
             return r;
         }
@@ -1005,85 +946,33 @@ SMonitorRule CConfigManager::getMonitorRuleFor(const CMonitor& PMONITOR) {
     Debug::log(WARN, "No rule found for {}, trying to use the first.", PMONITOR.szName);
 
     for (auto& r : m_dMonitorRules) {
-        if (r.name.empty()) {
+        if (r.name == "") {
             return r;
         }
     }
 
     Debug::log(WARN, "No rules configured. Using the default hardcoded one.");
 
-    return SMonitorRule{.autoDir    = eAutoDirs::DIR_AUTO_RIGHT,
-                        .name       = "",
-                        .resolution = Vector2D(0, 0),
-                        .offset     = Vector2D(-INT32_MAX, -INT32_MAX),
-                        .scale      = -1}; // 0, 0 is preferred and -1, -1 is auto
+    return SMonitorRule{.name = "", .resolution = Vector2D(0, 0), .offset = Vector2D(-INT32_MAX, -INT32_MAX), .scale = -1}; // 0, 0 is preferred and -1, -1 is auto
 }
 
-SWorkspaceRule CConfigManager::getWorkspaceRuleFor(PHLWORKSPACE pWorkspace) {
-    SWorkspaceRule mergedRule{};
+std::vector<SWorkspaceRule> CConfigManager::getWorkspaceRulesFor(CWorkspace* pWorkspace) {
+    std::vector<SWorkspaceRule> results;
     for (auto& rule : m_dWorkspaceRules) {
-        if (!pWorkspace->matchesStaticSelector(rule.workspaceString))
-            continue;
-
-        mergedRule = mergeWorkspaceRules(mergedRule, rule);
+        if (pWorkspace->matchesStaticSelector(rule.workspaceString))
+            results.push_back(rule);
     }
-
-    return mergedRule;
+    return results;
 }
 
-SWorkspaceRule CConfigManager::mergeWorkspaceRules(const SWorkspaceRule& rule1, const SWorkspaceRule& rule2) {
-    SWorkspaceRule mergedRule = rule1;
-
-    if (rule1.monitor.empty())
-        mergedRule.monitor = rule2.monitor;
-    if (rule1.workspaceString.empty())
-        mergedRule.workspaceString = rule2.workspaceString;
-    if (rule1.workspaceName.empty())
-        mergedRule.workspaceName = rule2.workspaceName;
-    if (rule1.workspaceId == WORKSPACE_INVALID)
-        mergedRule.workspaceId = rule2.workspaceId;
-
-    if (rule2.isDefault)
-        mergedRule.isDefault = true;
-    if (rule2.isPersistent)
-        mergedRule.isPersistent = true;
-    if (rule2.gapsIn.has_value())
-        mergedRule.gapsIn = rule2.gapsIn;
-    if (rule2.gapsOut.has_value())
-        mergedRule.gapsOut = rule2.gapsOut;
-    if (rule2.borderSize.has_value())
-        mergedRule.borderSize = rule2.borderSize;
-    if (rule2.border.has_value())
-        mergedRule.border = rule2.border;
-    if (rule2.rounding.has_value())
-        mergedRule.rounding = rule2.rounding;
-    if (rule2.decorate.has_value())
-        mergedRule.decorate = rule2.decorate;
-    if (rule2.shadow.has_value())
-        mergedRule.shadow = rule2.shadow;
-    if (rule2.onCreatedEmptyRunCmd.has_value())
-        mergedRule.onCreatedEmptyRunCmd = rule2.onCreatedEmptyRunCmd;
-    if (rule2.defaultName.has_value())
-        mergedRule.defaultName = rule2.defaultName;
-    if (!rule2.layoutopts.empty()) {
-        for (const auto& layoutopt : rule2.layoutopts) {
-            mergedRule.layoutopts[layoutopt.first] = layoutopt.second;
-        }
-    }
-    return mergedRule;
-}
-
-std::vector<SWindowRule> CConfigManager::getMatchingRules(PHLWINDOW pWindow, bool dynamic, bool shadowExec) {
-    if (!valid(pWindow))
+std::vector<SWindowRule> CConfigManager::getMatchingRules(CWindow* pWindow, bool dynamic, bool shadowExec) {
+    if (!g_pCompositor->windowExists(pWindow))
         return std::vector<SWindowRule>();
 
-    // if the window is unmapped, don't process exec rules yet.
-    shadowExec = shadowExec || !pWindow->m_bIsMapped;
-
     std::vector<SWindowRule> returns;
 
-    std::string              title      = pWindow->m_szTitle;
-    std::string              appidclass = pWindow->m_szClass;
+    std::string              title      = g_pXWaylandManager->getTitle(pWindow);
+    std::string              appidclass = g_pXWaylandManager->getAppIDClass(pWindow);
 
     Debug::log(LOG, "Searching for matching rules for {} (title: {})", appidclass, title);
 
@@ -1091,17 +980,12 @@ std::vector<SWindowRule> CConfigManager::getMatchingRules(PHLWINDOW pWindow, boo
     bool hasFloating   = pWindow->m_bIsFloating;
     bool hasFullscreen = pWindow->m_bIsFullscreen;
 
-    // local tags for dynamic tag rule match
-    auto tags = pWindow->m_tags;
-
     for (auto& rule : m_dWindowRules) {
         // check if we have a matching rule
         if (!rule.v2) {
             try {
-                if (rule.szValue.starts_with("tag:") && !tags.isTagged(rule.szValue.substr(4)))
-                    continue;
-
                 if (rule.szValue.starts_with("title:")) {
+                    // we have a title rule.
                     std::regex RULECHECK(rule.szValue.substr(6));
 
                     if (!std::regex_search(title, RULECHECK))
@@ -1118,31 +1002,28 @@ std::vector<SWindowRule> CConfigManager::getMatchingRules(PHLWINDOW pWindow, boo
             }
         } else {
             try {
-                if (!rule.szTag.empty() && !tags.isTagged(rule.szTag))
-                    continue;
-
-                if (!rule.szClass.empty()) {
+                if (rule.szClass != "") {
                     std::regex RULECHECK(rule.szClass);
 
                     if (!std::regex_search(appidclass, RULECHECK))
                         continue;
                 }
 
-                if (!rule.szTitle.empty()) {
+                if (rule.szTitle != "") {
                     std::regex RULECHECK(rule.szTitle);
 
                     if (!std::regex_search(title, RULECHECK))
                         continue;
                 }
 
-                if (!rule.szInitialTitle.empty()) {
+                if (rule.szInitialTitle != "") {
                     std::regex RULECHECK(rule.szInitialTitle);
 
                     if (!std::regex_search(pWindow->m_szInitialTitle, RULECHECK))
                         continue;
                 }
 
-                if (!rule.szInitialClass.empty()) {
+                if (rule.szInitialClass != "") {
                     std::regex RULECHECK(rule.szInitialClass);
 
                     if (!std::regex_search(pWindow->m_szInitialClass, RULECHECK))
@@ -1170,18 +1051,18 @@ std::vector<SWindowRule> CConfigManager::getMatchingRules(PHLWINDOW pWindow, boo
                 }
 
                 if (rule.bFocus != -1) {
-                    if (rule.bFocus != (g_pCompositor->m_pLastWindow.lock() == pWindow))
+                    if (rule.bFocus != (g_pCompositor->m_pLastWindow == pWindow))
                         continue;
                 }
 
                 if (!rule.szOnWorkspace.empty()) {
-                    const auto PWORKSPACE = pWindow->m_pWorkspace;
+                    const auto PWORKSPACE = g_pCompositor->getWorkspaceByID(pWindow->m_iWorkspaceID);
                     if (!PWORKSPACE || !PWORKSPACE->matchesStaticSelector(rule.szOnWorkspace))
                         continue;
                 }
 
                 if (!rule.szWorkspace.empty()) {
-                    const auto PWORKSPACE = pWindow->m_pWorkspace;
+                    const auto PWORKSPACE = g_pCompositor->getWorkspaceByID(pWindow->m_iWorkspaceID);
 
                     if (!PWORKSPACE)
                         continue;
@@ -1211,13 +1092,6 @@ std::vector<SWindowRule> CConfigManager::getMatchingRules(PHLWINDOW pWindow, boo
 
         returns.push_back(rule);
 
-        // apply tag with local tags
-        if (rule.szRule.starts_with("tag")) {
-            CVarList vars{rule.szRule, 0, 's', true};
-            if (vars.size() == 2 && vars[0] == "tag")
-                tags.applyTag(vars[1], true);
-        }
-
         if (dynamic)
             continue;
 
@@ -1247,7 +1121,7 @@ std::vector<SWindowRule> CConfigManager::getMatchingRules(PHLWINDOW pWindow, boo
     return returns;
 }
 
-std::vector<SLayerRule> CConfigManager::getMatchingRules(PHLLS pLS) {
+std::vector<SLayerRule> CConfigManager::getMatchingRules(SLayerSurface* pLS) {
     std::vector<SLayerRule> returns;
 
     if (!pLS->layerSurface || pLS->fadingOut)
@@ -1255,12 +1129,12 @@ std::vector<SLayerRule> CConfigManager::getMatchingRules(PHLLS pLS) {
 
     for (auto& lr : m_dLayerRules) {
         if (lr.targetNamespace.starts_with("address:0x")) {
-            if (std::format("address:0x{:x}", (uintptr_t)pLS.get()) != lr.targetNamespace)
+            if (std::format("address:0x{:x}", (uintptr_t)pLS) != lr.targetNamespace)
                 continue;
         } else {
             std::regex NSCHECK(lr.targetNamespace);
 
-            if (!std::regex_search(pLS->layerSurface->layerNamespace, NSCHECK))
+            if (!pLS->layerSurface->_namespace || !std::regex_search(pLS->layerSurface->_namespace, NSCHECK))
                 continue;
         }
 
@@ -1268,8 +1142,8 @@ std::vector<SLayerRule> CConfigManager::getMatchingRules(PHLLS pLS) {
         returns.push_back(lr);
     }
 
-    if (shouldBlurLS(pLS->layerSurface->layerNamespace))
-        returns.push_back({pLS->layerSurface->layerNamespace, "blur"});
+    if (pLS->layerSurface->_namespace && shouldBlurLS(pLS->layerSurface->_namespace))
+        returns.push_back({pLS->layerSurface->_namespace, "blur"});
 
     return returns;
 }
@@ -1282,10 +1156,10 @@ void CConfigManager::dispatchExecOnce() {
     if (g_pCompositor->m_sWLRSession)
         handleRawExec("",
 #ifdef USES_SYSTEMD
-                      "systemctl --user import-environment DISPLAY WAYLAND_DISPLAY HYPRLAND_INSTANCE_SIGNATURE XDG_CURRENT_DESKTOP QT_QPA_PLATFORMTHEME PATH XDG_DATA_DIRS && hash "
+                      "systemctl --user import-environment DISPLAY WAYLAND_DISPLAY HYPRLAND_INSTANCE_SIGNATURE XDG_CURRENT_DESKTOP QT_QPA_PLATFORMTHEME && hash "
                       "dbus-update-activation-environment 2>/dev/null && "
 #endif
-                      "dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP HYPRLAND_INSTANCE_SIGNATURE QT_QPA_PLATFORMTHEME PATH XDG_DATA_DIRS");
+                      "dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP HYPRLAND_INSTANCE_SIGNATURE QT_QPA_PLATFORMTHEME");
 
     firstExecDispatched = true;
 
@@ -1305,22 +1179,6 @@ void CConfigManager::dispatchExecOnce() {
     g_pCompositor->performUserChecks();
 }
 
-void CConfigManager::appendMonitorRule(const SMonitorRule& r) {
-    m_dMonitorRules.emplace_back(r);
-}
-
-bool CConfigManager::replaceMonitorRule(const SMonitorRule& newrule) {
-    // Looks for an existing monitor rule (compared by name).
-    // If the rule exists, it is replaced with the input rule.
-    for (auto& r : m_dMonitorRules) {
-        if (r.name == newrule.name) {
-            r = newrule;
-            return true;
-        }
-    }
-    return false;
-}
-
 void CConfigManager::performMonitorReload() {
 
     bool overAgain = false;
@@ -1429,7 +1287,7 @@ void CConfigManager::ensureVRR(CMonitor* pMonitor) {
             /* fullscreen */
             m->vrrActive = true;
 
-            const auto PWORKSPACE = m->activeWorkspace;
+            const auto PWORKSPACE = g_pCompositor->getWorkspaceByID(m->activeWorkspace);
 
             if (!PWORKSPACE)
                 return; // ???
@@ -1722,7 +1580,7 @@ std::optional<std::string> CConfigManager::handleMonitor(const std::string& comm
         newrule.resolution = Vector2D(-1, -2);
     } else if (parseModeLine(ARGS[1], newrule.drmMode)) {
         newrule.resolution  = Vector2D(newrule.drmMode.hdisplay, newrule.drmMode.vdisplay);
-        newrule.refreshRate = float(newrule.drmMode.vrefresh) / 1000;
+        newrule.refreshRate = newrule.drmMode.vrefresh / 1000;
     } else {
 
         if (!ARGS[1].contains("x")) {
@@ -1739,21 +1597,6 @@ std::optional<std::string> CConfigManager::handleMonitor(const std::string& comm
 
     if (ARGS[2].starts_with("auto")) {
         newrule.offset = Vector2D(-INT32_MAX, -INT32_MAX);
-        // If this is the first monitor rule needs to be on the right.
-        if (ARGS[2] == "auto-right" || ARGS[2] == "auto" || m_dMonitorRules.empty())
-            newrule.autoDir = eAutoDirs::DIR_AUTO_RIGHT;
-        else if (ARGS[2] == "auto-left")
-            newrule.autoDir = eAutoDirs::DIR_AUTO_LEFT;
-        else if (ARGS[2] == "auto-up")
-            newrule.autoDir = eAutoDirs::DIR_AUTO_UP;
-        else if (ARGS[2] == "auto-down")
-            newrule.autoDir = eAutoDirs::DIR_AUTO_DOWN;
-        else {
-            Debug::log(WARN,
-                       "Invalid auto direction. Valid options are 'auto',"
-                       "'auto-up', 'auto-down', 'auto-left', and 'auto-right'.");
-            error += "invalid auto direction ";
-        }
     } else {
         if (!ARGS[2].contains("x")) {
             error += "invalid offset ";
@@ -1815,13 +1658,14 @@ std::optional<std::string> CConfigManager::handleMonitor(const std::string& comm
             newrule.vrr = std::stoi(ARGS[argno + 1]);
             argno++;
         } else if (ARGS[argno] == "workspace") {
-            const auto& [id, name] = getWorkspaceIDNameFromString(ARGS[argno + 1]);
+            std::string    name = "";
+            int            wsId = getWorkspaceIDFromString(ARGS[argno + 1], name);
 
             SWorkspaceRule wsRule;
             wsRule.monitor         = newrule.name;
             wsRule.workspaceString = ARGS[argno + 1];
-            wsRule.workspaceId     = id;
             wsRule.workspaceName   = name;
+            wsRule.workspaceId     = wsId;
 
             m_dWorkspaceRules.emplace_back(wsRule);
             argno++;
@@ -1898,15 +1742,12 @@ std::optional<std::string> CConfigManager::handleAnimation(const std::string& co
     PANIM->second.overridden = true;
     PANIM->second.pValues    = &PANIM->second;
 
-    // This helper casts strings like "1", "true", "off", "yes"... to int.
-    int64_t enabledInt = configStringToInt(ARGS[1]) == 1;
+    // on/off
+    PANIM->second.internalEnabled = ARGS[1] == "1";
 
-    // Checking that the int is 1 or 0 because the helper can return integers out of range.
-    if (enabledInt != 0 && enabledInt != 1)
+    if (ARGS[1] != "0" && ARGS[1] != "1")
         return "invalid animation on/off state";
 
-    PANIM->second.internalEnabled = configStringToInt(ARGS[1]) == 1;
-
     if (PANIM->second.internalEnabled) {
         // speed
         if (isNumber(ARGS[2], true)) {
@@ -1962,16 +1803,14 @@ std::optional<std::string> CConfigManager::handleBind(const std::string& command
     // bind[fl]=SUPER,G,exec,dmenu_run <args>
 
     // flags
-    bool       locked         = false;
-    bool       release        = false;
-    bool       repeat         = false;
-    bool       mouse          = false;
-    bool       nonConsuming   = false;
-    bool       transparent    = false;
-    bool       ignoreMods     = false;
-    bool       multiKey       = false;
-    bool       hasDescription = false;
-    const auto BINDARGS       = command.substr(4);
+    bool       locked       = false;
+    bool       release      = false;
+    bool       repeat       = false;
+    bool       mouse        = false;
+    bool       nonConsuming = false;
+    bool       transparent  = false;
+    bool       ignoreMods   = false;
+    const auto BINDARGS     = command.substr(4);
 
     for (auto& arg : BINDARGS) {
         if (arg == 'l') {
@@ -1988,10 +1827,6 @@ std::optional<std::string> CConfigManager::handleBind(const std::string& command
             transparent = true;
         } else if (arg == 'i') {
             ignoreMods = true;
-        } else if (arg == 's') {
-            multiKey = true;
-        } else if (arg == 'd') {
-            hasDescription = true;
         } else {
             return "bind: invalid flag";
         }
@@ -2003,36 +1838,21 @@ std::optional<std::string> CConfigManager::handleBind(const std::string& command
     if (mouse && (repeat || release || locked))
         return "flag m is exclusive";
 
-    const int  numbArgs = hasDescription ? 5 : 4;
-    const auto ARGS     = CVarList(value, numbArgs);
+    const auto ARGS = CVarList(value, 4);
 
-    const int  DESCR_OFFSET = hasDescription ? 1 : 0;
     if ((ARGS.size() < 3 && !mouse) || (ARGS.size() < 3 && mouse))
         return "bind: too few args";
-    else if ((ARGS.size() > (size_t)4 + DESCR_OFFSET && !mouse) || (ARGS.size() > (size_t)3 + DESCR_OFFSET && mouse))
+    else if ((ARGS.size() > 4 && !mouse) || (ARGS.size() > 3 && mouse))
         return "bind: too many args";
 
-    std::set<xkb_keysym_t> KEYSYMS;
-    std::set<xkb_keysym_t> MODS;
-
-    if (multiKey) {
-        for (auto splitKey : CVarList(ARGS[1], 8, '&')) {
-            KEYSYMS.insert(xkb_keysym_from_name(splitKey.c_str(), XKB_KEYSYM_CASE_INSENSITIVE));
-        }
-        for (auto splitMod : CVarList(ARGS[0], 8, '&')) {
-            MODS.insert(xkb_keysym_from_name(splitMod.c_str(), XKB_KEYSYM_CASE_INSENSITIVE));
-        }
-    }
     const auto MOD    = g_pKeybindManager->stringToModMask(ARGS[0]);
     const auto MODSTR = ARGS[0];
 
-    const auto KEY = multiKey ? "" : ARGS[1];
+    const auto KEY = ARGS[1];
 
-    const auto DESCRIPTION = hasDescription ? ARGS[2] : "";
+    auto       HANDLER = ARGS[2];
 
-    auto       HANDLER = ARGS[2 + DESCR_OFFSET];
-
-    const auto COMMAND = mouse ? HANDLER : ARGS[3 + DESCR_OFFSET];
+    const auto COMMAND = mouse ? HANDLER : ARGS[3];
 
     if (mouse)
         HANDLER = "mouse";
@@ -2052,16 +1872,16 @@ std::optional<std::string> CConfigManager::handleBind(const std::string& command
         return "Invalid mod, requested mod \"" + MODSTR + "\" is not a valid mod.";
     }
 
-    if ((KEY != "") || multiKey) {
+    if (KEY != "") {
         SParsedKey parsedKey = parseKey(KEY);
 
-        if (parsedKey.catchAll && m_szCurrentSubmap.empty()) {
+        if (parsedKey.catchAll && m_szCurrentSubmap == "") {
             Debug::log(ERR, "Catchall not allowed outside of submap!");
             return "Invalid catchall, catchall keybinds are only allowed in submaps.";
         }
 
-        g_pKeybindManager->addKeybind(SKeybind{parsedKey.key, KEYSYMS, parsedKey.keycode, parsedKey.catchAll, MOD, MODS, HANDLER, COMMAND, locked, m_szCurrentSubmap, DESCRIPTION,
-                                               release, repeat, mouse, nonConsuming, transparent, ignoreMods, multiKey, hasDescription});
+        g_pKeybindManager->addKeybind(SKeybind{parsedKey.key, parsedKey.keycode, parsedKey.catchAll, MOD, HANDLER, COMMAND, locked, m_szCurrentSubmap, release, repeat, mouse,
+                                               nonConsuming, transparent, ignoreMods});
     }
 
     return {};
@@ -2080,32 +1900,26 @@ std::optional<std::string> CConfigManager::handleUnbind(const std::string& comma
 }
 
 bool windowRuleValid(const std::string& RULE) {
-    static const auto rules = std::unordered_set<std::string>{
-        "dimaround",       "fakefullscreen", "float",           "focusonactivate", "forceinput", "forcergbx",   "fullscreen", "immediate",
-        "keepaspectratio", "maximize",       "nearestneighbor", "noanim",          "noblur",     "noborder",    "nodim",      "nofocus",
-        "noinitialfocus",  "nomaxsize",      "noshadow",        "opaque",          "pin",        "stayfocused", "tile",       "windowdance",
-    };
-    static const auto rulesPrefix = std::vector<std::string>{
-        "animation", "bordercolor", "bordersize", "center",   "group", "idleinhibit",   "maxsize", "minsize",   "monitor", "move",
-        "opacity",   "plugin:",     "pseudo",     "rounding", "size",  "suppressevent", "tag",     "workspace", "xray",
-    };
-
-    return rules.contains(RULE) || std::any_of(rulesPrefix.begin(), rulesPrefix.end(), [&RULE](auto prefix) { return RULE.starts_with(prefix); });
+    return RULE == "float" || RULE == "tile" || RULE.starts_with("opacity") || RULE.starts_with("move") || RULE.starts_with("size") || RULE.starts_with("minsize") ||
+        RULE.starts_with("maxsize") || RULE.starts_with("pseudo") || RULE.starts_with("monitor") || RULE.starts_with("idleinhibit") || RULE == "nofocus" || RULE == "noblur" ||
+        RULE == "noshadow" || RULE == "nodim" || RULE == "noborder" || RULE == "opaque" || RULE == "forceinput" || RULE == "fullscreen" || RULE == "fakefullscreen" ||
+        RULE == "nomaxsize" || RULE == "pin" || RULE == "noanim" || RULE == "dimaround" || RULE == "windowdance" || RULE == "maximize" || RULE == "keepaspectratio" ||
+        RULE.starts_with("animation") || RULE.starts_with("rounding") || RULE.starts_with("workspace") || RULE.starts_with("bordercolor") || RULE == "forcergbx" ||
+        RULE == "noinitialfocus" || RULE == "stayfocused" || RULE.starts_with("bordersize") || RULE.starts_with("xray") || RULE.starts_with("center") ||
+        RULE.starts_with("group") || RULE == "immediate" || RULE == "nearestneighbor" || RULE.starts_with("suppressevent");
 }
 
 bool layerRuleValid(const std::string& RULE) {
-    static const auto rules       = std::unordered_set<std::string>{"noanim", "blur", "blurpopups", "dimaround"};
-    static const auto rulesPrefix = std::vector<std::string>{"ignorealpha", "ignorezero", "xray", "animation"};
-
-    return rules.contains(RULE) || std::any_of(rulesPrefix.begin(), rulesPrefix.end(), [&RULE](auto prefix) { return RULE.starts_with(prefix); });
+    return RULE == "noanim" || RULE == "blur" || RULE == "blurpopups" || RULE.starts_with("ignorealpha") || RULE.starts_with("ignorezero") || RULE.starts_with("xray") ||
+        RULE.starts_with("animation");
 }
 
 std::optional<std::string> CConfigManager::handleWindowRule(const std::string& command, const std::string& value) {
-    const auto RULE  = trim(value.substr(0, value.find_first_of(',')));
-    const auto VALUE = trim(value.substr(value.find_first_of(',') + 1));
+    const auto RULE  = removeBeginEndSpacesTabs(value.substr(0, value.find_first_of(',')));
+    const auto VALUE = removeBeginEndSpacesTabs(value.substr(value.find_first_of(',') + 1));
 
     // check rule and value
-    if (RULE.empty() || VALUE.empty())
+    if (RULE == "" || VALUE == "")
         return "empty rule?";
 
     if (RULE == "unset") {
@@ -2128,11 +1942,11 @@ std::optional<std::string> CConfigManager::handleWindowRule(const std::string& c
 }
 
 std::optional<std::string> CConfigManager::handleLayerRule(const std::string& command, const std::string& value) {
-    const auto RULE  = trim(value.substr(0, value.find_first_of(',')));
-    const auto VALUE = trim(value.substr(value.find_first_of(',') + 1));
+    const auto RULE  = removeBeginEndSpacesTabs(value.substr(0, value.find_first_of(',')));
+    const auto VALUE = removeBeginEndSpacesTabs(value.substr(value.find_first_of(',') + 1));
 
     // check rule and value
-    if (RULE.empty() || VALUE.empty())
+    if (RULE == "" || VALUE == "")
         return "empty rule?";
 
     if (RULE == "unset") {
@@ -2156,7 +1970,7 @@ std::optional<std::string> CConfigManager::handleLayerRule(const std::string& co
 }
 
 std::optional<std::string> CConfigManager::handleWindowRuleV2(const std::string& command, const std::string& value) {
-    const auto RULE  = trim(value.substr(0, value.find_first_of(',')));
+    const auto RULE  = removeBeginEndSpacesTabs(value.substr(0, value.find_first_of(',')));
     const auto VALUE = value.substr(value.find_first_of(',') + 1);
 
     if (!windowRuleValid(RULE) && RULE != "unset") {
@@ -2170,7 +1984,6 @@ std::optional<std::string> CConfigManager::handleWindowRuleV2(const std::string&
     rule.szRule  = RULE;
     rule.szValue = VALUE;
 
-    const auto TAGPOS          = VALUE.find("tag:");
     const auto TITLEPOS        = VALUE.find("title:");
     const auto CLASSPOS        = VALUE.find("class:");
     const auto INITIALTITLEPOS = VALUE.find("initialTitle:");
@@ -2193,10 +2006,9 @@ std::optional<std::string> CConfigManager::handleWindowRuleV2(const std::string&
         currentPos = VALUE.find("workspace:", currentPos + 1);
     }
 
-    const auto checkPos = std::unordered_set{
-        TAGPOS, TITLEPOS, CLASSPOS, INITIALTITLEPOS, INITIALCLASSPOS, X11POS, FLOATPOS, FULLSCREENPOS, PINNEDPOS, WORKSPACEPOS, FOCUSPOS, ONWORKSPACEPOS,
-    };
-    if (checkPos.size() == 1 && checkPos.contains(std::string::npos)) {
+    if (TITLEPOS == std::string::npos && CLASSPOS == std::string::npos && INITIALTITLEPOS == std::string::npos && INITIALCLASSPOS == std::string::npos &&
+        X11POS == std::string::npos && FLOATPOS == std::string::npos && FULLSCREENPOS == std::string::npos && PINNEDPOS == std::string::npos && WORKSPACEPOS == std::string::npos &&
+        FOCUSPOS == std::string::npos && ONWORKSPACEPOS == std::string::npos) {
         Debug::log(ERR, "Invalid rulev2 syntax: {}", VALUE);
         return "Invalid rulev2 syntax: " + VALUE;
     }
@@ -2206,8 +2018,6 @@ std::optional<std::string> CConfigManager::handleWindowRuleV2(const std::string&
         result = VALUE.substr(pos);
 
         size_t min = 999999;
-        if (TAGPOS > pos && TAGPOS < min)
-            min = TAGPOS;
         if (TITLEPOS > pos && TITLEPOS < min)
             min = TITLEPOS;
         if (CLASSPOS > pos && CLASSPOS < min)
@@ -2233,17 +2043,14 @@ std::optional<std::string> CConfigManager::handleWindowRuleV2(const std::string&
 
         result = result.substr(0, min - pos);
 
-        result = trim(result);
+        result = removeBeginEndSpacesTabs(result);
 
-        if (!result.empty() && result.back() == ',')
+        if (result.back() == ',')
             result.pop_back();
 
         return result;
     };
 
-    if (TAGPOS != std::string::npos)
-        rule.szTag = extract(TAGPOS + 4);
-
     if (CLASSPOS != std::string::npos)
         rule.szClass = extract(CLASSPOS + 6);
 
@@ -2282,9 +2089,6 @@ std::optional<std::string> CConfigManager::handleWindowRuleV2(const std::string&
             if (!other.v2) {
                 return other.szClass == rule.szClass && !rule.szClass.empty();
             } else {
-                if (!rule.szTag.empty() && rule.szTag != other.szTag)
-                    return false;
-
                 if (!rule.szClass.empty() && rule.szClass != other.szClass)
                     return false;
 
@@ -2355,7 +2159,7 @@ void CConfigManager::updateBlurredLS(const std::string& name, const bool forceBl
 
 std::optional<std::string> CConfigManager::handleBlurLS(const std::string& command, const std::string& value) {
     if (value.starts_with("remove,")) {
-        const auto TOREMOVE = trim(value.substr(7));
+        const auto TOREMOVE = removeBeginEndSpacesTabs(value.substr(7));
         if (std::erase_if(m_dBlurLSNamespaces, [&](const auto& other) { return other == TOREMOVE; }))
             updateBlurredLS(TOREMOVE, false);
         return {};
@@ -2369,11 +2173,11 @@ std::optional<std::string> CConfigManager::handleBlurLS(const std::string& comma
 
 std::optional<std::string> CConfigManager::handleWorkspaceRules(const std::string& command, const std::string& value) {
     // This can either be the monitor or the workspace identifier
-    const auto FIRST_DELIM = value.find_first_of(',');
+    const auto     FIRST_DELIM = value.find_first_of(',');
 
-    auto       first_ident = trim(value.substr(0, FIRST_DELIM));
-
-    const auto& [id, name] = getWorkspaceIDNameFromString(first_ident);
+    std::string    name        = "";
+    auto           first_ident = removeBeginEndSpacesTabs(value.substr(0, FIRST_DELIM));
+    int            id          = getWorkspaceIDFromString(first_ident, name);
 
     auto           rules = value.substr(FIRST_DELIM + 1);
     SWorkspaceRule wsRule;
@@ -2394,8 +2198,8 @@ std::optional<std::string> CConfigManager::handleWorkspaceRules(const std::strin
     //     rules                  = value.substr(WORKSPACE_DELIM + 1);
     // }
 
-    const static std::string ruleOnCreatedEmpty    = "on-created-empty:";
-    const static int         ruleOnCreatedEmptyLen = ruleOnCreatedEmpty.length();
+    const static std::string ruleOnCreatedEmtpy    = "on-created-empty:";
+    const static int         ruleOnCreatedEmtpyLen = ruleOnCreatedEmtpy.length();
 
     auto                     assignRule = [&](std::string rule) -> std::optional<std::string> {
         size_t delim = std::string::npos;
@@ -2431,8 +2235,8 @@ std::optional<std::string> CConfigManager::handleWorkspaceRules(const std::strin
             wsRule.isPersistent = configStringToInt(rule.substr(delim + 11));
         else if ((delim = rule.find("defaultName:")) != std::string::npos)
             wsRule.defaultName = rule.substr(delim + 12);
-        else if ((delim = rule.find(ruleOnCreatedEmpty)) != std::string::npos)
-            wsRule.onCreatedEmptyRunCmd = cleanCmdForWorkspace(name, rule.substr(delim + ruleOnCreatedEmptyLen));
+        else if ((delim = rule.find(ruleOnCreatedEmtpy)) != std::string::npos)
+            wsRule.onCreatedEmptyRunCmd = cleanCmdForWorkspace(name, rule.substr(delim + ruleOnCreatedEmtpyLen));
         else if ((delim = rule.find("layoutopt:")) != std::string::npos) {
             std::string opt = rule.substr(delim + 10);
             if (!opt.contains(":")) {
@@ -2465,7 +2269,7 @@ std::optional<std::string> CConfigManager::handleWorkspaceRules(const std::strin
     if (IT == m_dWorkspaceRules.end())
         m_dWorkspaceRules.emplace_back(wsRule);
     else
-        *IT = mergeWorkspaceRules(*IT, wsRule);
+        *IT = wsRule;
 
     return {};
 }

src/config/ConfigManager.hpp

@@ -15,9 +15,7 @@
 #include <xf86drmMode.h>
 #include "../helpers/WLClasses.hpp"
 #include "../helpers/Monitor.hpp"
-#include "../helpers/varlist/VarList.hpp"
-#include "../desktop/Window.hpp"
-#include "../desktop/LayerSurface.hpp"
+#include "../helpers/VarList.hpp"
 
 #include "defaultConfig.hpp"
 #include "ConfigDataValues.hpp"
@@ -29,6 +27,8 @@
 
 #define HANDLE void*
 
+class CWindow;
+
 struct SWorkspaceRule {
     std::string                        monitor         = "";
     std::string                        workspaceString = "";
@@ -103,18 +103,17 @@ class CConfigManager {
     void                                                            onPluginLoadUnload(const std::string& name, bool load);
     static std::string                                              getConfigDir();
     static std::string                                              getMainConfigPath();
-    const std::string                                               getConfigString();
 
     SMonitorRule                                                    getMonitorRuleFor(const CMonitor&);
-    SWorkspaceRule                                                  getWorkspaceRuleFor(PHLWORKSPACE workspace);
+    std::vector<SWorkspaceRule>                                     getWorkspaceRulesFor(CWorkspace*);
     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(PHLWINDOW, bool dynamic = true, bool shadowExec = false);
-    std::vector<SLayerRule>                                         getMatchingRules(PHLLS);
+    std::vector<SWindowRule>                                        getMatchingRules(CWindow*, bool dynamic = true, bool shadowExec = false);
+    std::vector<SLayerRule>                                         getMatchingRules(SLayerSurface*);
 
     std::unordered_map<std::string, SMonitorAdditionalReservedArea> m_mAdditionalReservedAreas;
 
@@ -128,8 +127,6 @@ class CConfigManager {
     void                      dispatchExecOnce();
 
     void                      performMonitorReload();
-    void                      appendMonitorRule(const SMonitorRule&);
-    bool                      replaceMonitorRule(const SMonitorRule&);
     bool                      m_bWantsMonitorReload = false;
     bool                      m_bForceReload        = false;
     bool                      m_bNoMonitorReload    = false;
@@ -207,7 +204,6 @@ class CConfigManager {
     std::optional<std::string> verifyConfigExists();
     void                       postConfigReload(const Hyprlang::CParseResult& result);
     void                       reload();
-    SWorkspaceRule             mergeWorkspaceRules(const SWorkspaceRule&, const SWorkspaceRule&);
 };
 
 inline std::unique_ptr<CConfigManager> g_pConfigManager;

src/config/ConfigValue.hpp

@@ -5,13 +5,12 @@
 #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);
+        const auto PVHYPRLANG = g_pConfigManager->getHyprlangConfigValuePtr(val.c_str());
 
         p_ = PVHYPRLANG->getDataStaticPtr();
 

src/config/defaultConfig.hpp

@@ -9,116 +9,87 @@ inline const std::string AUTOCONFIG = R"#(
 # OR EDIT THIS ONE ACCORDING TO THE WIKI INSTRUCTIONS.
 # #######################################################################################
 
-autogenerated = 1 # remove this line to remove the warning
-
-# This is an example Hyprland config file.
-# Refer to the wiki for more information.
-# https://wiki.hyprland.org/Configuring/Configuring-Hyprland/
-
+#
 # Please note not all available settings / options are set here.
 # For a full list, see the wiki
+#
 
-# You can split this configuration into multiple files
-# Create your files separately and then link them to this file like this:
-# source = ~/.config/hypr/myColors.conf
-
-
-################
-### MONITORS ###
-################
+autogenerated = 1 # remove this line to remove the warning
 
 # See https://wiki.hyprland.org/Configuring/Monitors/
 monitor=,preferred,auto,auto
 
 
-###################
-### MY PROGRAMS ###
-###################
+# See https://wiki.hyprland.org/Configuring/Keywords/ for more
 
-# See https://wiki.hyprland.org/Configuring/Keywords/
+# Execute your favorite apps at launch
+# exec-once = waybar & hyprpaper & firefox
+
+# Source a file (multi-file configs)
+# source = ~/.config/hypr/myColors.conf
 
 # Set programs that you use
 $terminal = kitty
 $fileManager = dolphin
 $menu = wofi --show drun
 
-
-#################
-### AUTOSTART ###
-#################
-
-# Autostart necessary processes (like notifications daemons, status bars, etc.)
-# Or execute your favorite apps at launch like this:
-
-# exec-once = $terminal
-# exec-once = nm-applet &
-# exec-once = waybar & hyprpaper & firefox
-
-
-#############################
-### ENVIRONMENT VARIABLES ###
-#############################
-
-# See https://wiki.hyprland.org/Configuring/Environment-variables/
-
+# Some default env vars.
 env = XCURSOR_SIZE,24
-env = HYPRCURSOR_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 {
+    kb_layout = us
+    kb_variant =
+    kb_model =
+    kb_options =
+    kb_rules =
 
-#####################
-### LOOK AND FEEL ###
-#####################
+    follow_mouse = 1
 
-# Refer to https://wiki.hyprland.org/Configuring/Variables/
+    touchpad {
+        natural_scroll = no
+    }
+
+    sensitivity = 0 # -1.0 to 1.0, 0 means no modification.
+}
+
+general {
+    # See https://wiki.hyprland.org/Configuring/Variables/ for more
 
-# https://wiki.hyprland.org/Configuring/Variables/#general
-general { 
     gaps_in = 5
     gaps_out = 20
-
     border_size = 2
-
-    # https://wiki.hyprland.org/Configuring/Variables/#variable-types for info about colors
     col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg
     col.inactive_border = rgba(595959aa)
 
-    # Set to true enable resizing windows by clicking and dragging on borders and gaps
-    resize_on_border = false 
+    layout = dwindle
 
     # Please see https://wiki.hyprland.org/Configuring/Tearing/ before you turn this on
     allow_tearing = false
-
-    layout = dwindle
 }
 
-# https://wiki.hyprland.org/Configuring/Variables/#decoration
 decoration {
+    # See https://wiki.hyprland.org/Configuring/Variables/ for more
+
     rounding = 10
-
-    # Change transparency of focused and unfocused windows
-    active_opacity = 1.0
-    inactive_opacity = 1.0
-
-    drop_shadow = true
-    shadow_range = 4
-    shadow_render_power = 3
-    col.shadow = rgba(1a1a1aee)
-
-    # https://wiki.hyprland.org/Configuring/Variables/#blur
+    
     blur {
         enabled = true
         size = 3
         passes = 1
-        
-        vibrancy = 0.1696
     }
+
+    drop_shadow = yes
+    shadow_range = 4
+    shadow_render_power = 3
+    col.shadow = rgba(1a1a1aee)
 }
 
-# https://wiki.hyprland.org/Configuring/Variables/#animations
 animations {
-    enabled = true
+    enabled = yes
 
-    # Default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more
+    # Some default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more
 
     bezier = myBezier, 0.05, 0.9, 0.1, 1.05
 
@@ -130,48 +101,25 @@ animations {
     animation = workspaces, 1, 6, default
 }
 
-# See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
 dwindle {
-    pseudotile = true # Master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
-    preserve_split = true # You probably want this
+    # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
+    pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
+    preserve_split = yes # you probably want this
 }
 
-# See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
 master {
-    new_status = master
+    # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
+    new_is_master = true
 }
 
-# https://wiki.hyprland.org/Configuring/Variables/#misc
-misc { 
-    force_default_wallpaper = -1 # Set to 0 or 1 to disable the anime mascot wallpapers
-    disable_hyprland_logo = false # If true disables the random hyprland logo / anime girl background. :(
-}
-
-
-#############
-### INPUT ###
-#############
-
-# https://wiki.hyprland.org/Configuring/Variables/#input
-input {
-    kb_layout = us
-    kb_variant =
-    kb_model =
-    kb_options =
-    kb_rules =
-
-    follow_mouse = 1
-
-    sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
-
-    touchpad {
-        natural_scroll = false
-    }
-}
-
-# https://wiki.hyprland.org/Configuring/Variables/#gestures
 gestures {
-    workspace_swipe = false
+    # See https://wiki.hyprland.org/Configuring/Variables/ for more
+    workspace_swipe = off
+}
+
+misc {
+    # See https://wiki.hyprland.org/Configuring/Variables/ for more
+    force_default_wallpaper = -1 # Set to 0 or 1 to disable the anime mascot wallpapers
 }
 
 # Example per-device config
@@ -181,20 +129,23 @@ device {
     sensitivity = -0.5
 }
 
+# Example windowrule v1
+# windowrule = float, ^(kitty)$
+# 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.
 
-####################
-### KEYBINDINGSS ###
-####################
 
-# See https://wiki.hyprland.org/Configuring/Keywords/
-$mainMod = SUPER # Sets "Windows" key as main modifier
+# 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, $terminal
-bind = $mainMod, C, killactive,
-bind = $mainMod, M, exit,
+bind = $mainMod, C, killactive, 
+bind = $mainMod, M, exit, 
 bind = $mainMod, E, exec, $fileManager
-bind = $mainMod, V, togglefloating,
+bind = $mainMod, V, togglefloating, 
 bind = $mainMod, R, exec, $menu
 bind = $mainMod, P, pseudo, # dwindle
 bind = $mainMod, J, togglesplit, # dwindle
@@ -240,20 +191,4 @@ bind = $mainMod, mouse_up, workspace, e-1
 # Move/resize windows with mainMod + LMB/RMB and dragging
 bindm = $mainMod, mouse:272, movewindow
 bindm = $mainMod, mouse:273, resizewindow
-
-
-##############################
-### WINDOWS AND WORKSPACES ###
-##############################
-
-# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
-# See https://wiki.hyprland.org/Configuring/Workspace-Rules/ for workspace rules
-
-# Example windowrule v1
-# windowrule = float, ^(kitty)$
-
-# Example windowrule v2
-# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
-
-windowrulev2 = suppressevent maximize, class:.* # You'll probably like this.
 )#";

src/debug/CrashReporter.cpp

@@ -1,127 +1,59 @@
 #include "CrashReporter.hpp"
-#include <fcntl.h>
+#include <random>
 #include <sys/utsname.h>
+#include <fstream>
+#include <signal.h>
 #include <link.h>
-#include <time.h>
-#include <errno.h>
-#include <sys/stat.h>
 
 #include "../plugins/PluginSystem.hpp"
-#include "../signal-safe.hpp"
 
 #if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__)
 #include <sys/sysctl.h>
 #endif
 
-static char const* const 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..."};
+std::string getRandomMessage() {
 
-// <random> is not async-signal-safe, fake it with time(NULL) instead
-char const* getRandomMessage() {
-    return MESSAGES[time(NULL) % (sizeof(MESSAGES) / sizeof(MESSAGES[0]))];
-}
+    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..."};
 
-[[noreturn]] inline void exit_with_error(char const* err) {
-    write(STDERR_FILENO, err, strlen(err));
-    // perror() is not signal-safe, but we use it here
-    // because if the crash-handler already crashed, it can't get any worse.
-    perror("");
-    abort();
+    std::random_device              dev;
+    std::mt19937                    engine(dev());
+    std::uniform_int_distribution<> distribution(0, MESSAGES.size() - 1);
+
+    return MESSAGES[distribution(engine)];
 }
 
 void CrashReporter::createAndSaveCrash(int sig) {
-    int reportFd;
 
-    // We're in the signal handler, so we *only* have stack memory.
-    // To save as much stack memory as possible,
-    // destroy things as soon as possible.
-    {
-        MaxLengthCString<255> reportPath;
+    // get the backtrace
+    const int   PID = getpid();
 
-        const auto            HOME       = sig_getenv("HOME");
-        const auto            CACHE_HOME = sig_getenv("XDG_CACHE_HOME");
-
-        if (CACHE_HOME && CACHE_HOME[0] != '\0') {
-            reportPath += CACHE_HOME;
-            reportPath += "/hyprland";
-        } else if (HOME && HOME[0] != '\0') {
-            reportPath += HOME;
-            reportPath += "/.cache/hyprland";
-        } else {
-            exit_with_error("$CACHE_HOME and $HOME not set, nowhere to report crash\n");
-            return;
-        }
-
-        int ret = mkdir(reportPath.get_str(), S_IRWXU);
-        //__asm__("int $3");
-        if (ret < 0 && errno != EEXIST) {
-            exit_with_error("failed to mkdir() crash report directory\n");
-        }
-        reportPath += "/hyprlandCrashReport";
-        reportPath.write_num(getpid());
-        reportPath += ".txt";
-
-        {
-            BufFileWriter<64> stderr(2);
-            stderr += "Hyprland has crashed :( Consult the crash report at ";
-            if (!reportPath.boundsExceeded()) {
-                stderr += reportPath.get_str();
-            } else {
-                stderr += "[ERROR: Crash report path does not fit into memory! Check if your $CACHE_HOME/$HOME is too deeply nested. Max 255 characters.]";
-            }
-            stderr += " for more information.\n";
-            stderr.flush();
-        }
-
-        reportFd = open(reportPath.get_str(), O_WRONLY | O_CREAT, S_IRWXU);
-        if (reportFd < 0) {
-            exit_with_error("Failed to open crash report path for writing");
-        }
-    }
-    BufFileWriter<512> finalCrashReport(reportFd);
+    std::string finalCrashReport = "";
 
     finalCrashReport += "--------------------------------------------\n   Hyprland Crash Report\n--------------------------------------------\n";
-    finalCrashReport += getRandomMessage();
-    finalCrashReport += "\n\n";
+    finalCrashReport += getRandomMessage() + "\n\n";
 
-    finalCrashReport += "Hyprland received signal ";
-    finalCrashReport.writeNum(sig);
-    finalCrashReport += '(';
-    finalCrashReport += sig_strsignal(sig);
-    finalCrashReport += ")\nVersion: ";
-    finalCrashReport += GIT_COMMIT_HASH;
-    finalCrashReport += "\nTag: ";
-    finalCrashReport += GIT_TAG;
-    finalCrashReport += "\n\n";
+    finalCrashReport += std::format("Hyprland received signal {} ({})\n\n", sig, (const char*)strsignal(sig));
 
-    if (g_pPluginSystem && g_pPluginSystem->pluginCount() > 0) {
+    finalCrashReport += std::format("Version: {}\nTag: {}\n\n", GIT_COMMIT_HASH, GIT_TAG);
+
+    if (g_pPluginSystem && !g_pPluginSystem->getAllPlugins().empty()) {
         finalCrashReport += "Hyprland seems to be running with plugins. This crash might not be Hyprland's fault.\nPlugins:\n";
 
-        size_t   count = g_pPluginSystem->pluginCount();
-        CPlugin* plugins[count];
-        g_pPluginSystem->sig_getPlugins(plugins, count);
-
-        for (size_t i = 0; i < count; i++) {
-            auto p = plugins[i];
-            finalCrashReport += '\t';
-            finalCrashReport += p->name;
-            finalCrashReport += " (";
-            finalCrashReport += p->author;
-            finalCrashReport += ") ";
-            finalCrashReport += p->version;
-            finalCrashReport += '\n';
+        for (auto& p : g_pPluginSystem->getAllPlugins()) {
+            finalCrashReport += std::format("\t{} ({}) {}\n", p->name, p->author, p->version);
         }
 
         finalCrashReport += "\n\n";
@@ -129,36 +61,21 @@ void CrashReporter::createAndSaveCrash(int sig) {
 
     finalCrashReport += "System info:\n";
 
-    {
-        struct utsname unameInfo;
-        uname(&unameInfo);
+    struct utsname unameInfo;
+    uname(&unameInfo);
 
-        finalCrashReport += "\tSystem name: ";
-        finalCrashReport += unameInfo.sysname;
-        finalCrashReport += "\n\tNode name: ";
-        finalCrashReport += unameInfo.nodename;
-        finalCrashReport += "\n\tRelease: ";
-        finalCrashReport += unameInfo.release;
-        finalCrashReport += "\n\tVersion: ";
-        finalCrashReport += unameInfo.version;
-        finalCrashReport += "\n\n";
-    }
+    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});
 
-    finalCrashReport += "GPU:\n\t";
 #if defined(__DragonFly__) || defined(__FreeBSD__)
-    finalCrashReport.writeCmdOutput("pciconf -lv | fgrep -A4 vga");
+    const std::string GPUINFO = execAndGet("pciconf -lv | fgrep -A4 vga");
 #else
-    finalCrashReport.writeCmdOutput("lspci -vnn | grep VGA");
+    const std::string GPUINFO = execAndGet("lspci -vnn | grep VGA");
 #endif
 
-    finalCrashReport += "\n\nos-release:\n";
-    finalCrashReport.writeCmdOutput("cat /etc/os-release | sed 's/^/\t/'");
+    finalCrashReport += "GPU:\n\t" + GPUINFO;
 
-    // dladdr1()/backtrace_symbols()/this entire section allocates, and hence is NOT async-signal-safe.
-    // Make sure that we save the current known crash report information,
-    // so that if we are caught in a deadlock during a call to malloc(),
-    // there is still something to debug from.
-    finalCrashReport.flush();
+    finalCrashReport += std::format("\n\nos-release:\n\t{}\n\n\n", replaceInString(execAndGet("cat /etc/os-release"), "\n", "\n\t"));
 
     finalCrashReport += "Backtrace:\n";
 
@@ -215,10 +132,7 @@ void CrashReporter::createAndSaveCrash(int sig) {
     std::stringstream ssin(ADDR2LINE);
 
     for (size_t i = 0; i < CALLSTACK.size(); ++i) {
-        finalCrashReport += "\t#";
-        finalCrashReport.writeNum(i);
-        finalCrashReport += " | ";
-        finalCrashReport += CALLSTACK[i].desc;
+        finalCrashReport += std::format("\t#{} | {}", i, CALLSTACK[i].desc);
         std::string functionInfo;
         std::string fileLineInfo;
         std::getline(ssin, functionInfo);
@@ -228,5 +142,32 @@ void CrashReporter::createAndSaveCrash(int sig) {
 
     finalCrashReport += "\n\nLog tail:\n";
 
-    finalCrashReport += std::string_view(Debug::rollingLog).substr(Debug::rollingLog.find("\n") + 1);
+    finalCrashReport += Debug::rollingLog.substr(Debug::rollingLog.find("\n") + 1);
+
+    const auto HOME       = getenv("HOME");
+    const auto CACHE_HOME = getenv("XDG_CACHE_HOME");
+
+    if (!HOME)
+        return;
+
+    std::ofstream ofs;
+    std::string   reportDir;
+
+    if (!CACHE_HOME || std::string(CACHE_HOME).empty())
+        reportDir = std::string(HOME) + "/.cache/hyprland";
+    else
+        reportDir = std::string(CACHE_HOME) + "/hyprland";
+
+    if (!std::filesystem::exists(reportDir))
+        std::filesystem::create_directory(reportDir);
+    const auto path = reportDir + "/hyprlandCrashReport" + std::to_string(PID) + ".txt";
+
+    ofs.open(path, std::ios::trunc);
+
+    ofs << finalCrashReport;
+
+    ofs.close();
+
+    Debug::disableStdout = false;
+    Debug::log(CRIT, "Hyprland has crashed :( Consult the crash report at {} for more information.", path);
 }

src/debug/HyprCtl.cpp

@@ -1,6 +1,5 @@
 #include "HyprCtl.hpp"
 
-#include <format>
 #include <netinet/in.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -11,33 +10,29 @@
 #include <sys/utsname.h>
 #include <sys/un.h>
 #include <unistd.h>
-#include <sys/poll.h>
 
 #include <sstream>
 #include <string>
 #include <typeindex>
-#include <numeric>
 
-#include <hyprutils/string/String.hpp>
-using namespace Hyprutils::String;
-
-#include "../config/ConfigDataValues.hpp"
 #include "../config/ConfigValue.hpp"
 #include "../managers/CursorManager.hpp"
 #include "../hyprerror/HyprError.hpp"
-#include "../devices/IPointer.hpp"
-#include "../devices/IKeyboard.hpp"
-#include "../devices/ITouch.hpp"
-#include "../devices/Tablet.hpp"
-#include "debug/RollingLogFollow.hpp"
-#include "config/ConfigManager.hpp"
-#include "helpers/MiscFunctions.hpp"
 
 static void trimTrailingComma(std::string& str) {
     if (!str.empty() && str.back() == ',')
         str.pop_back();
 }
 
+static std::string getWorkspaceNameFromSpecialID(const int workspaceID) {
+    if (workspaceID == 0)
+        return "";
+    const auto* workspace = g_pCompositor->getWorkspaceByID(workspaceID);
+    if (!workspace)
+        return "";
+    return workspace->m_szName;
+}
+
 static std::string formatToString(uint32_t drmFormat) {
     switch (drmFormat) {
         case DRM_FORMAT_XRGB2101010: return "XRGB2101010";
@@ -116,18 +111,16 @@ std::string monitorsRequest(eHyprCtlOutputFormat format, std::string request) {
     "dpmsStatus": {},
     "vrr": {},
     "activelyTearing": {},
-    "disabled": {},
     "currentFormat": "{}",
     "availableModes": [{}]
 }},)#",
-                m->ID, escapeJSONStrings(m->szName), escapeJSONStrings(m->szShortDescription), escapeJSONStrings(m->output->make ? m->output->make : ""),
-                escapeJSONStrings(m->output->model ? m->output->model : ""), escapeJSONStrings(m->output->serial ? m->output->serial : ""), (int)m->vecPixelSize.x,
-                (int)m->vecPixelSize.y, m->refreshRate, (int)m->vecPosition.x, (int)m->vecPosition.y, m->activeWorkspaceID(),
-                (!m->activeWorkspace ? "" : escapeJSONStrings(m->activeWorkspace->m_szName)), m->activeSpecialWorkspaceID(),
-                escapeJSONStrings(m->activeSpecialWorkspace ? m->activeSpecialWorkspace->m_szName : ""), (int)m->vecReservedTopLeft.x, (int)m->vecReservedTopLeft.y,
-                (int)m->vecReservedBottomRight.x, (int)m->vecReservedBottomRight.y, m->scale, (int)m->transform, (m == g_pCompositor->m_pLastMonitor ? "true" : "false"),
+                m->ID, escapeJSONStrings(m->szName), escapeJSONStrings(m->szShortDescription), (m->output->make ? m->output->make : ""), (m->output->model ? m->output->model : ""),
+                (m->output->serial ? m->output->serial : ""), (int)m->vecPixelSize.x, (int)m->vecPixelSize.y, m->refreshRate, (int)m->vecPosition.x, (int)m->vecPosition.y,
+                m->activeWorkspace, (m->activeWorkspace == -1 ? "" : escapeJSONStrings(g_pCompositor->getWorkspaceByID(m->activeWorkspace)->m_szName)), m->specialWorkspaceID,
+                escapeJSONStrings(getWorkspaceNameFromSpecialID(m->specialWorkspaceID)), (int)m->vecReservedTopLeft.x, (int)m->vecReservedTopLeft.y,
+                (int)m->vecReservedBottomRight.x, (int)m->vecReservedBottomRight.y, m->scale, (int)m->transform, (m.get() == g_pCompositor->m_pLastMonitor ? "true" : "false"),
                 (m->dpmsStatus ? "true" : "false"), (m->output->adaptive_sync_status == WLR_OUTPUT_ADAPTIVE_SYNC_ENABLED ? "true" : "false"),
-                (m->tearingState.activelyTearing ? "true" : "false"), (m->m_bEnabled ? "false" : "true"), formatToString(m->drmFormat), availableModesForOutput(m.get(), format));
+                m->tearingState.activelyTearing ? "true" : "false", formatToString(m->drmFormat), availableModesForOutput(m.get(), format));
         }
 
         trimTrailingComma(result);
@@ -138,47 +131,39 @@ std::string monitorsRequest(eHyprCtlOutputFormat format, std::string request) {
             if (!m->output || m->ID == -1ull)
                 continue;
 
-            result += std::format(
-                "Monitor {} (ID {}):\n\t{}x{}@{:.5f} at {}x{}\n\tdescription: {}\n\tmake: {}\n\tmodel: {}\n\tserial: {}\n\tactive workspace: {} ({})\n\t"
-                "special workspace: {} ({})\n\treserved: {} {} {} {}\n\tscale: {:.2f}\n\ttransform: {}\n\tfocused: {}\n\t"
-                "dpmsStatus: {}\n\tvrr: {}\n\tactivelyTearing: {}\n\tdisabled: {}\n\tcurrentFormat: {}\n\tavailableModes: {}\n\n",
-                m->szName, m->ID, (int)m->vecPixelSize.x, (int)m->vecPixelSize.y, m->refreshRate, (int)m->vecPosition.x, (int)m->vecPosition.y, m->szShortDescription,
-                (m->output->make ? m->output->make : ""), (m->output->model ? m->output->model : ""), (m->output->serial ? m->output->serial : ""), m->activeWorkspaceID(),
-                (!m->activeWorkspace ? "" : m->activeWorkspace->m_szName), m->activeSpecialWorkspaceID(), (m->activeSpecialWorkspace ? m->activeSpecialWorkspace->m_szName : ""),
-                (int)m->vecReservedTopLeft.x, (int)m->vecReservedTopLeft.y, (int)m->vecReservedBottomRight.x, (int)m->vecReservedBottomRight.y, m->scale, (int)m->transform,
-                (m == g_pCompositor->m_pLastMonitor ? "yes" : "no"), (int)m->dpmsStatus, (int)(m->output->adaptive_sync_status == WLR_OUTPUT_ADAPTIVE_SYNC_ENABLED),
-                m->tearingState.activelyTearing, !m->m_bEnabled, formatToString(m->drmFormat), availableModesForOutput(m.get(), format));
+            result +=
+                std::format("Monitor {} (ID {}):\n\t{}x{}@{:.5f} at {}x{}\n\tdescription: {}\n\tmake: {}\n\tmodel: {}\n\tserial: {}\n\tactive workspace: {} ({})\n\tspecial "
+                            "workspace: {} ({})\n\treserved: {} "
+                            "{} {} {}\n\tscale: {:.2f}\n\ttransform: "
+                            "{}\n\tfocused: {}\n\tdpmsStatus: {}\n\tvrr: {}\n\tactivelyTearing: {}\n\tcurrentFormat: {}\n\tavailableModes: {}\n\n",
+                            m->szName, m->ID, (int)m->vecPixelSize.x, (int)m->vecPixelSize.y, m->refreshRate, (int)m->vecPosition.x, (int)m->vecPosition.y, m->szShortDescription,
+                            (m->output->make ? m->output->make : ""), (m->output->model ? m->output->model : ""), (m->output->serial ? m->output->serial : ""), m->activeWorkspace,
+                            (m->activeWorkspace == -1 ? "" : g_pCompositor->getWorkspaceByID(m->activeWorkspace)->m_szName), m->specialWorkspaceID,
+                            getWorkspaceNameFromSpecialID(m->specialWorkspaceID), (int)m->vecReservedTopLeft.x, (int)m->vecReservedTopLeft.y, (int)m->vecReservedBottomRight.x,
+                            (int)m->vecReservedBottomRight.y, m->scale, (int)m->transform, (m.get() == g_pCompositor->m_pLastMonitor ? "yes" : "no"), (int)m->dpmsStatus,
+                            (int)(m->output->adaptive_sync_status == WLR_OUTPUT_ADAPTIVE_SYNC_ENABLED), m->tearingState.activelyTearing, formatToString(m->drmFormat),
+                            availableModesForOutput(m.get(), format));
         }
     }
 
     return result;
 }
 
-static std::string getTagsData(PHLWINDOW w, eHyprCtlOutputFormat format) {
-    const auto tags = w->m_tags.getTags();
-
-    if (format == eHyprCtlOutputFormat::FORMAT_JSON)
-        return std::accumulate(tags.begin(), tags.end(), std::string(),
-                               [](const std::string& a, const std::string& b) { return a.empty() ? std::format("\"{}\"", b) : std::format("{}, \"{}\"", a, b); });
-    else
-        return std::accumulate(tags.begin(), tags.end(), std::string(), [](const std::string& a, const std::string& b) { return a.empty() ? b : a + ", " + b; });
-}
-
-static std::string getGroupedData(PHLWINDOW w, eHyprCtlOutputFormat format) {
+static std::string getGroupedData(CWindow* w, eHyprCtlOutputFormat format) {
     const bool isJson = format == eHyprCtlOutputFormat::FORMAT_JSON;
-    if (w->m_sGroupData.pNextWindow.expired())
+    if (!w->m_sGroupData.pNextWindow)
         return isJson ? "" : "0";
 
     std::ostringstream result;
 
-    PHLWINDOW          head = w->getGroupHead();
-    PHLWINDOW          curr = head;
+    CWindow*           head = w->getGroupHead();
+    CWindow*           curr = head;
     while (true) {
         if (isJson)
-            result << std::format("\"0x{:x}\"", (uintptr_t)curr.get());
+            result << std::format("\"0x{:x}\"", (uintptr_t)curr);
         else
-            result << std::format("{:x}", (uintptr_t)curr.get());
-        curr = curr->m_sGroupData.pNextWindow.lock();
+            result << std::format("{:x}", (uintptr_t)curr);
+        curr = curr->m_sGroupData.pNextWindow;
         // We've wrapped around to the start, break out without trailing comma
         if (curr == head)
             break;
@@ -188,10 +173,10 @@ static std::string getGroupedData(PHLWINDOW w, eHyprCtlOutputFormat format) {
     return result.str();
 }
 
-static std::string getWindowData(PHLWINDOW w, eHyprCtlOutputFormat format) {
-    auto getFocusHistoryID = [](PHLWINDOW wnd) -> int {
+static std::string getWindowData(CWindow* w, eHyprCtlOutputFormat format) {
+    auto getFocusHistoryID = [](CWindow* wnd) -> int {
         for (size_t i = 0; i < g_pCompositor->m_vWindowFocusHistory.size(); ++i) {
-            if (g_pCompositor->m_vWindowFocusHistory[i].lock() == wnd)
+            if (g_pCompositor->m_vWindowFocusHistory[i] == wnd)
                 return i;
         }
         return -1;
@@ -210,7 +195,6 @@ static std::string getWindowData(PHLWINDOW w, eHyprCtlOutputFormat format) {
         "name": "{}"
     }},
     "floating": {},
-    "pseudo": {},
     "monitor": {},
     "class": "{}",
     "title": "{}",
@@ -223,28 +207,34 @@ static std::string getWindowData(PHLWINDOW w, eHyprCtlOutputFormat format) {
     "fullscreenMode": {},
     "fakeFullscreen": {},
     "grouped": [{}],
-    "tags": [{}],
     "swallowing": "0x{:x}",
     "focusHistoryID": {}
 }},)#",
-            (uintptr_t)w.get(), (w->m_bIsMapped ? "true" : "false"), (w->isHidden() ? "true" : "false"), (int)w->m_vRealPosition.goal().x, (int)w->m_vRealPosition.goal().y,
-            (int)w->m_vRealSize.goal().x, (int)w->m_vRealSize.goal().y, w->m_pWorkspace ? w->workspaceID() : WORKSPACE_INVALID,
-            escapeJSONStrings(!w->m_pWorkspace ? "" : w->m_pWorkspace->m_szName), ((int)w->m_bIsFloating == 1 ? "true" : "false"), (w->m_bIsPseudotiled ? "true" : "false"),
-            (int64_t)w->m_iMonitorID, escapeJSONStrings(w->m_szClass), escapeJSONStrings(w->m_szTitle), escapeJSONStrings(w->m_szInitialClass),
-            escapeJSONStrings(w->m_szInitialTitle), w->getPID(), ((int)w->m_bIsX11 == 1 ? "true" : "false"), (w->m_bPinned ? "true" : "false"),
-            (w->m_bIsFullscreen ? "true" : "false"), (w->m_bIsFullscreen ? (w->m_pWorkspace ? (int)w->m_pWorkspace->m_efFullscreenMode : 0) : 0),
-            w->m_bFakeFullscreenState ? "true" : "false", getGroupedData(w, format), getTagsData(w, format), (uintptr_t)w->m_pSwallowed.lock().get(), getFocusHistoryID(w));
+            (uintptr_t)w, (w->m_bIsMapped ? "true" : "false"), (w->isHidden() ? "true" : "false"), (int)w->m_vRealPosition.goal().x, (int)w->m_vRealPosition.goal().y,
+            (int)w->m_vRealSize.goal().x, (int)w->m_vRealSize.goal().y, w->m_iWorkspaceID,
+            escapeJSONStrings(w->m_iWorkspaceID == -1                                ? "" :
+                                  g_pCompositor->getWorkspaceByID(w->m_iWorkspaceID) ? g_pCompositor->getWorkspaceByID(w->m_iWorkspaceID)->m_szName :
+                                                                                       std::string("Invalid workspace " + std::to_string(w->m_iWorkspaceID))),
+            ((int)w->m_bIsFloating == 1 ? "true" : "false"), (int64_t)w->m_iMonitorID, escapeJSONStrings(g_pXWaylandManager->getAppIDClass(w)),
+            escapeJSONStrings(g_pXWaylandManager->getTitle(w)), escapeJSONStrings(w->m_szInitialClass), escapeJSONStrings(w->m_szInitialTitle), w->getPID(),
+            ((int)w->m_bIsX11 == 1 ? "true" : "false"), (w->m_bPinned ? "true" : "false"), (w->m_bIsFullscreen ? "true" : "false"),
+            (w->m_bIsFullscreen ? (g_pCompositor->getWorkspaceByID(w->m_iWorkspaceID) ? (int)g_pCompositor->getWorkspaceByID(w->m_iWorkspaceID)->m_efFullscreenMode : 0) : 0),
+            w->m_bFakeFullscreenState ? "true" : "false", getGroupedData(w, format), (uintptr_t)w->m_pSwallowed, getFocusHistoryID(w));
     } else {
         return std::format(
-            "Window {:x} -> {}:\n\tmapped: {}\n\thidden: {}\n\tat: {},{}\n\tsize: {},{}\n\tworkspace: {} ({})\n\tfloating: {}\n\tpseudo: {}\n\tmonitor: {}\n\tclass: {}\n\ttitle: "
+            "Window {:x} -> {}:\n\tmapped: {}\n\thidden: {}\n\tat: {},{}\n\tsize: {},{}\n\tworkspace: {} ({})\n\tfloating: {}\n\tmonitor: {}\n\tclass: {}\n\ttitle: "
             "{}\n\tinitialClass: {}\n\tinitialTitle: {}\n\tpid: "
             "{}\n\txwayland: {}\n\tpinned: "
-            "{}\n\tfullscreen: {}\n\tfullscreenmode: {}\n\tfakefullscreen: {}\n\tgrouped: {}\n\ttags: {}\n\tswallowing: {:x}\n\tfocusHistoryID: {}\n\n",
-            (uintptr_t)w.get(), w->m_szTitle, (int)w->m_bIsMapped, (int)w->isHidden(), (int)w->m_vRealPosition.goal().x, (int)w->m_vRealPosition.goal().y,
-            (int)w->m_vRealSize.goal().x, (int)w->m_vRealSize.goal().y, w->m_pWorkspace ? w->workspaceID() : WORKSPACE_INVALID, (!w->m_pWorkspace ? "" : w->m_pWorkspace->m_szName),
-            (int)w->m_bIsFloating, (int)w->m_bIsPseudotiled, (int64_t)w->m_iMonitorID, w->m_szClass, w->m_szTitle, w->m_szInitialClass, w->m_szInitialTitle, w->getPID(),
-            (int)w->m_bIsX11, (int)w->m_bPinned, (int)w->m_bIsFullscreen, (w->m_bIsFullscreen ? (w->m_pWorkspace ? w->m_pWorkspace->m_efFullscreenMode : 0) : 0),
-            (int)w->m_bFakeFullscreenState, getGroupedData(w, format), getTagsData(w, format), (uintptr_t)w->m_pSwallowed.lock().get(), getFocusHistoryID(w));
+            "{}\n\tfullscreen: {}\n\tfullscreenmode: {}\n\tfakefullscreen: {}\n\tgrouped: {}\n\tswallowing: {:x}\n\tfocusHistoryID: {}\n\n",
+            (uintptr_t)w, w->m_szTitle, (int)w->m_bIsMapped, (int)w->isHidden(), (int)w->m_vRealPosition.goal().x, (int)w->m_vRealPosition.goal().y, (int)w->m_vRealSize.goal().x,
+            (int)w->m_vRealSize.goal().y, w->m_iWorkspaceID,
+            (w->m_iWorkspaceID == -1                                ? "" :
+                 g_pCompositor->getWorkspaceByID(w->m_iWorkspaceID) ? g_pCompositor->getWorkspaceByID(w->m_iWorkspaceID)->m_szName :
+                                                                      std::string("Invalid workspace " + std::to_string(w->m_iWorkspaceID))),
+            (int)w->m_bIsFloating, (int64_t)w->m_iMonitorID, g_pXWaylandManager->getAppIDClass(w), g_pXWaylandManager->getTitle(w), w->m_szInitialClass, w->m_szInitialTitle,
+            w->getPID(), (int)w->m_bIsX11, (int)w->m_bPinned, (int)w->m_bIsFullscreen,
+            (w->m_bIsFullscreen ? (g_pCompositor->getWorkspaceByID(w->m_iWorkspaceID) ? g_pCompositor->getWorkspaceByID(w->m_iWorkspaceID)->m_efFullscreenMode : 0) : 0),
+            (int)w->m_bFakeFullscreenState, getGroupedData(w, format), (uintptr_t)w->m_pSwallowed, getFocusHistoryID(w));
     }
 }
 
@@ -257,7 +247,7 @@ std::string clientsRequest(eHyprCtlOutputFormat format, std::string request) {
             if (!w->m_bIsMapped && !g_pHyprCtl->m_sCurrentRequestParams.all)
                 continue;
 
-            result += getWindowData(w, format);
+            result += getWindowData(w.get(), format);
         }
 
         trimTrailingComma(result);
@@ -268,13 +258,13 @@ std::string clientsRequest(eHyprCtlOutputFormat format, std::string request) {
             if (!w->m_bIsMapped && !g_pHyprCtl->m_sCurrentRequestParams.all)
                 continue;
 
-            result += getWindowData(w, format);
+            result += getWindowData(w.get(), format);
         }
     }
     return result;
 }
 
-static std::string getWorkspaceData(PHLWORKSPACE w, eHyprCtlOutputFormat format) {
+static std::string getWorkspaceData(CWorkspace* w, eHyprCtlOutputFormat format) {
     const auto PLASTW   = w->getLastFocusedWindow();
     const auto PMONITOR = g_pCompositor->getMonitorFromID(w->m_iMonitorID);
     if (format == eHyprCtlOutputFormat::FORMAT_JSON) {
@@ -290,11 +280,11 @@ static std::string getWorkspaceData(PHLWORKSPACE w, eHyprCtlOutputFormat format)
 }})#",
                            w->m_iID, escapeJSONStrings(w->m_szName), escapeJSONStrings(PMONITOR ? PMONITOR->szName : "?"),
                            escapeJSONStrings(PMONITOR ? std::to_string(PMONITOR->ID) : "null"), g_pCompositor->getWindowsOnWorkspace(w->m_iID),
-                           ((int)w->m_bHasFullscreenWindow == 1 ? "true" : "false"), (uintptr_t)PLASTW.get(), PLASTW ? escapeJSONStrings(PLASTW->m_szTitle) : "");
+                           ((int)w->m_bHasFullscreenWindow == 1 ? "true" : "false"), (uintptr_t)PLASTW, PLASTW ? escapeJSONStrings(PLASTW->m_szTitle) : "");
     } else {
         return std::format("workspace ID {} ({}) on monitor {}:\n\tmonitorID: {}\n\twindows: {}\n\thasfullscreen: {}\n\tlastwindow: 0x{:x}\n\tlastwindowtitle: {}\n\n", w->m_iID,
                            w->m_szName, PMONITOR ? PMONITOR->szName : "?", PMONITOR ? std::to_string(PMONITOR->ID) : "null", g_pCompositor->getWindowsOnWorkspace(w->m_iID),
-                           (int)w->m_bHasFullscreenWindow, (uintptr_t)PLASTW.get(), PLASTW ? PLASTW->m_szTitle : "");
+                           (int)w->m_bHasFullscreenWindow, (uintptr_t)PLASTW, PLASTW ? PLASTW->m_szTitle : "");
     }
 }
 
@@ -349,9 +339,9 @@ std::string activeWorkspaceRequest(eHyprCtlOutputFormat format, std::string requ
         return "unsafe state";
 
     std::string result = "";
-    auto        w      = g_pCompositor->m_pLastMonitor->activeWorkspace;
+    auto        w      = g_pCompositor->getWorkspaceByID(g_pCompositor->m_pLastMonitor->activeWorkspace);
 
-    if (!valid(w))
+    if (!w)
         return "internal error";
 
     return getWorkspaceData(w, format);
@@ -363,7 +353,7 @@ std::string workspacesRequest(eHyprCtlOutputFormat format, std::string request)
     if (format == eHyprCtlOutputFormat::FORMAT_JSON) {
         result += "[";
         for (auto& w : g_pCompositor->m_vWorkspaces) {
-            result += getWorkspaceData(w, format);
+            result += getWorkspaceData(w.get(), format);
             result += ",";
         }
 
@@ -371,7 +361,7 @@ std::string workspacesRequest(eHyprCtlOutputFormat format, std::string request)
         result += "]";
     } else {
         for (auto& w : g_pCompositor->m_vWorkspaces) {
-            result += getWorkspaceData(w, format);
+            result += getWorkspaceData(w.get(), format);
         }
     }
 
@@ -399,9 +389,9 @@ std::string workspaceRulesRequest(eHyprCtlOutputFormat format, std::string reque
 }
 
 std::string activeWindowRequest(eHyprCtlOutputFormat format, std::string request) {
-    const auto PWINDOW = g_pCompositor->m_pLastWindow.lock();
+    const auto PWINDOW = g_pCompositor->m_pLastWindow;
 
-    if (!validMapped(PWINDOW))
+    if (!g_pCompositor->windowValidMapped(PWINDOW))
         return format == eHyprCtlOutputFormat::FORMAT_JSON ? "{}" : "Invalid";
 
     auto result = getWindowData(PWINDOW, format);
@@ -538,24 +528,23 @@ std::string devicesRequest(eHyprCtlOutputFormat format, std::string request) {
         result += "{\n";
         result += "\"mice\": [\n";
 
-        for (auto& m : g_pInputManager->m_vPointers) {
+        for (auto& m : g_pInputManager->m_lMice) {
             result += std::format(
                 R"#(    {{
         "address": "0x{:x}",
         "name": "{}",
         "defaultSpeed": {:.5f}
     }},)#",
-                (uintptr_t)m.get(), escapeJSONStrings(m->hlName),
-                wlr_input_device_is_libinput(&m->wlr()->base) ? libinput_device_config_accel_get_default_speed((libinput_device*)wlr_libinput_get_device_handle(&m->wlr()->base)) :
-                                                                0.f);
+                (uintptr_t)&m, escapeJSONStrings(m.name),
+                wlr_input_device_is_libinput(m.mouse) ? libinput_device_config_accel_get_default_speed((libinput_device*)wlr_libinput_get_device_handle(m.mouse)) : 0.f);
         }
 
         trimTrailingComma(result);
         result += "\n],\n";
 
         result += "\"keyboards\": [\n";
-        for (auto& k : g_pInputManager->m_vKeyboards) {
-            const auto KM = k->getActiveLayout();
+        for (auto& k : g_pInputManager->m_lKeyboards) {
+            const auto KM = g_pInputManager->getActiveLayoutForKeyboard(&k);
             result += std::format(
                 R"#(    {{
         "address": "0x{:x}",
@@ -568,9 +557,9 @@ std::string devicesRequest(eHyprCtlOutputFormat format, std::string request) {
         "active_keymap": "{}",
         "main": {}
     }},)#",
-                (uintptr_t)k.get(), escapeJSONStrings(k->hlName), escapeJSONStrings(k->currentRules.rules), escapeJSONStrings(k->currentRules.model),
-                escapeJSONStrings(k->currentRules.layout), escapeJSONStrings(k->currentRules.variant), escapeJSONStrings(k->currentRules.options), escapeJSONStrings(KM),
-                (k->active ? "true" : "false"));
+                (uintptr_t)&k, escapeJSONStrings(k.name), escapeJSONStrings(k.currentRules.rules), escapeJSONStrings(k.currentRules.model),
+                escapeJSONStrings(k.currentRules.layout), escapeJSONStrings(k.currentRules.variant), escapeJSONStrings(k.currentRules.options), escapeJSONStrings(KM),
+                (k.active ? "true" : "false"));
         }
 
         trimTrailingComma(result);
@@ -578,7 +567,7 @@ std::string devicesRequest(eHyprCtlOutputFormat format, std::string request) {
 
         result += "\"tablets\": [\n";
 
-        for (auto& d : g_pInputManager->m_vTabletPads) {
+        for (auto& d : g_pInputManager->m_lTabletPads) {
             result += std::format(
                 R"#(    {{
         "address": "0x{:x}",
@@ -588,26 +577,26 @@ std::string devicesRequest(eHyprCtlOutputFormat format, std::string request) {
             "name": "{}"
         }}
     }},)#",
-                (uintptr_t)d.get(), (uintptr_t)d->parent.get(), escapeJSONStrings(d->parent ? d->parent->hlName : ""));
+                (uintptr_t)&d, (uintptr_t)d.pTabletParent, escapeJSONStrings(d.pTabletParent ? d.pTabletParent->name : ""));
         }
 
-        for (auto& d : g_pInputManager->m_vTablets) {
+        for (auto& d : g_pInputManager->m_lTablets) {
             result += std::format(
                 R"#(    {{
         "address": "0x{:x}",
         "name": "{}"
     }},)#",
-                (uintptr_t)d.get(), escapeJSONStrings(d->hlName));
+                (uintptr_t)&d, escapeJSONStrings(d.name));
         }
 
-        for (auto& d : g_pInputManager->m_vTabletTools) {
+        for (auto& d : g_pInputManager->m_lTabletTools) {
             result += std::format(
                 R"#(    {{
         "address": "0x{:x}",
         "type": "tabletTool",
         "belongsTo": "0x{:x}"
     }},)#",
-                (uintptr_t)d.get(), d->wlr() ? (uintptr_t)d->wlr()->data : 0);
+                (uintptr_t)&d, d.wlrTabletTool ? (uintptr_t)d.wlrTabletTool->data : 0);
         }
 
         trimTrailingComma(result);
@@ -615,13 +604,13 @@ std::string devicesRequest(eHyprCtlOutputFormat format, std::string request) {
 
         result += "\"touch\": [\n";
 
-        for (auto& d : g_pInputManager->m_vTouches) {
+        for (auto& d : g_pInputManager->m_lTouchDevices) {
             result += std::format(
                 R"#(    {{
         "address": "0x{:x}",
         "name": "{}"
     }},)#",
-                (uintptr_t)d.get(), escapeJSONStrings(d->hlName));
+                (uintptr_t)&d, d.name);
         }
 
         trimTrailingComma(result);
@@ -635,7 +624,7 @@ std::string devicesRequest(eHyprCtlOutputFormat format, std::string request) {
         "address": "0x{:x}",
         "name": "{}"
     }},)#",
-                (uintptr_t)&d, escapeJSONStrings(d.pWlrDevice ? d.pWlrDevice->name : ""));
+                (uintptr_t)&d, d.pWlrDevice ? d.pWlrDevice->name : "");
         }
 
         trimTrailingComma(result);
@@ -646,40 +635,39 @@ std::string devicesRequest(eHyprCtlOutputFormat format, std::string request) {
     } else {
         result += "mice:\n";
 
-        for (auto& m : g_pInputManager->m_vPointers) {
-            result += std::format("\tMouse at {:x}:\n\t\t{}\n\t\t\tdefault speed: {:.5f}\n", (uintptr_t)m.get(), m->hlName,
-                                  (wlr_input_device_is_libinput(&m->wlr()->base) ?
-                                       libinput_device_config_accel_get_default_speed((libinput_device*)wlr_libinput_get_device_handle(&m->wlr()->base)) :
-                                       0.f));
+        for (auto& m : g_pInputManager->m_lMice) {
+            result += std::format(
+                "\tMouse at {:x}:\n\t\t{}\n\t\t\tdefault speed: {:.5f}\n", (uintptr_t)&m, m.name,
+                (wlr_input_device_is_libinput(m.mouse) ? libinput_device_config_accel_get_default_speed((libinput_device*)wlr_libinput_get_device_handle(m.mouse)) : 0.f));
         }
 
         result += "\n\nKeyboards:\n";
 
-        for (auto& k : g_pInputManager->m_vKeyboards) {
-            const auto KM = k->getActiveLayout();
+        for (auto& k : g_pInputManager->m_lKeyboards) {
+            const auto KM = g_pInputManager->getActiveLayoutForKeyboard(&k);
             result += std::format("\tKeyboard at {:x}:\n\t\t{}\n\t\t\trules: r \"{}\", m \"{}\", l \"{}\", v \"{}\", o \"{}\"\n\t\t\tactive keymap: {}\n\t\t\tmain: {}\n",
-                                  (uintptr_t)k.get(), k->hlName, k->currentRules.rules, k->currentRules.model, k->currentRules.layout, k->currentRules.variant,
-                                  k->currentRules.options, KM, (k->active ? "yes" : "no"));
+                                  (uintptr_t)&k, k.name, k.currentRules.rules, k.currentRules.model, k.currentRules.layout, k.currentRules.variant, k.currentRules.options, KM,
+                                  (k.active ? "yes" : "no"));
         }
 
         result += "\n\nTablets:\n";
 
-        for (auto& d : g_pInputManager->m_vTabletPads) {
-            result += std::format("\tTablet Pad at {:x} (belongs to {:x} -> {})\n", (uintptr_t)d.get(), (uintptr_t)d->parent.get(), d->parent ? d->parent->hlName : "");
+        for (auto& d : g_pInputManager->m_lTabletPads) {
+            result += std::format("\tTablet Pad at {:x} (belongs to {:x} -> {})\n", (uintptr_t)&d, (uintptr_t)d.pTabletParent, d.pTabletParent ? d.pTabletParent->name : "");
         }
 
-        for (auto& d : g_pInputManager->m_vTablets) {
-            result += std::format("\tTablet at {:x}:\n\t\t{}\n\t\t\tsize: {}x{}mm\n", (uintptr_t)d.get(), d->hlName, d->wlr()->width_mm, d->wlr()->height_mm);
+        for (auto& d : g_pInputManager->m_lTablets) {
+            result += std::format("\tTablet at {:x}:\n\t\t{}\n\t\t\tsize: {}x{}mm\n", (uintptr_t)&d, d.name, d.wlrTablet->width_mm, d.wlrTablet->height_mm);
         }
 
-        for (auto& d : g_pInputManager->m_vTabletTools) {
-            result += std::format("\tTablet Tool at {:x} (belongs to {:x})\n", (uintptr_t)d.get(), d->wlr() ? (uintptr_t)d->wlr()->data : 0);
+        for (auto& d : g_pInputManager->m_lTabletTools) {
+            result += std::format("\tTablet Tool at {:x} (belongs to {:x})\n", (uintptr_t)&d, d.wlrTabletTool ? (uintptr_t)d.wlrTabletTool->data : 0);
         }
 
         result += "\n\nTouch:\n";
 
-        for (auto& d : g_pInputManager->m_vTouches) {
-            result += std::format("\tTouch Device at {:x}:\n\t\t{}\n", (uintptr_t)d.get(), d->hlName);
+        for (auto& d : g_pInputManager->m_lTouchDevices) {
+            result += std::format("\tTouch Device at {:x}:\n\t\t{}\n", (uintptr_t)&d, d.name);
         }
 
         result += "\n\nSwitches:\n";
@@ -721,8 +709,8 @@ std::string animationsRequest(eHyprCtlOutputFormat format, std::string request)
     "speed": {:.2f},
     "style": "{}"
 }},)#",
-                               ac.first, ac.second.overridden ? "true" : "false", escapeJSONStrings(ac.second.internalBezier), ac.second.internalEnabled ? "true" : "false",
-                               ac.second.internalSpeed, escapeJSONStrings(ac.second.internalStyle));
+                               ac.first, ac.second.overridden ? "true" : "false", ac.second.internalBezier, ac.second.internalEnabled ? "true" : "false", ac.second.internalSpeed,
+                               ac.second.internalStyle);
         }
 
         ret[ret.length() - 1] = ']';
@@ -734,7 +722,7 @@ std::string animationsRequest(eHyprCtlOutputFormat format, std::string request)
 {{
     "name": "{}"
 }},)#",
-                               escapeJSONStrings(bz.first));
+                               bz.first);
         }
 
         trimTrailingComma(ret);
@@ -797,11 +785,9 @@ std::string bindsRequest(eHyprCtlOutputFormat format, std::string request) {
                 ret += "e";
             if (kb.nonConsuming)
                 ret += "n";
-            if (kb.hasDescription)
-                ret += "d";
 
-            ret += std::format("\n\tmodmask: {}\n\tsubmap: {}\n\tkey: {}\n\tkeycode: {}\n\tcatchall: {}\n\tdescription: {}\n\tdispatcher: {}\n\targ: {}\n\n", kb.modmask, kb.submap,
-                               kb.key, kb.keycode, kb.catchAll, kb.description, kb.handler, kb.arg);
+            ret += std::format("\n\tmodmask: {}\n\tsubmap: {}\n\tkey: {}\n\tkeycode: {}\n\tcatchall: {}\n\tdispatcher: {}\n\targ: {}\n\n", kb.modmask, kb.submap, kb.key,
+                               kb.keycode, kb.catchAll, kb.handler, kb.arg);
         }
     } else {
         // json
@@ -815,19 +801,17 @@ std::string bindsRequest(eHyprCtlOutputFormat format, std::string request) {
     "release": {},
     "repeat": {},
     "non_consuming": {},
-    "has_description": {},
     "modmask": {},
     "submap": "{}",
     "key": "{}",
     "keycode": {},
     "catch_all": {},
-    "description": "{}",
     "dispatcher": "{}",
     "arg": "{}"
 }},)#",
                 kb.locked ? "true" : "false", kb.mouse ? "true" : "false", kb.release ? "true" : "false", kb.repeat ? "true" : "false", kb.nonConsuming ? "true" : "false",
-                kb.hasDescription ? "true" : "false", kb.modmask, escapeJSONStrings(kb.submap), escapeJSONStrings(kb.key), kb.keycode, kb.catchAll ? "true" : "false",
-                escapeJSONStrings(kb.description), escapeJSONStrings(kb.handler), escapeJSONStrings(kb.arg));
+                kb.modmask, escapeJSONStrings(kb.submap), escapeJSONStrings(kb.key), kb.keycode, kb.catchAll ? "true" : "false", escapeJSONStrings(kb.handler),
+                escapeJSONStrings(kb.arg));
         }
         trimTrailingComma(ret);
         ret += "]";
@@ -838,12 +822,12 @@ std::string bindsRequest(eHyprCtlOutputFormat format, std::string request) {
 
 std::string versionRequest(eHyprCtlOutputFormat format, std::string request) {
 
-    auto commitMsg = trim(GIT_COMMIT_MESSAGE);
+    auto commitMsg = removeBeginEndSpacesTabs(GIT_COMMIT_MESSAGE);
     std::replace(commitMsg.begin(), commitMsg.end(), '#', ' ');
 
     if (format == eHyprCtlOutputFormat::FORMAT_NORMAL) {
         std::string result = "Hyprland, built from branch " + std::string(GIT_BRANCH) + " at commit " + GIT_COMMIT_HASH + " " + GIT_DIRTY + " (" + commitMsg +
-            ").\nDate: " + GIT_COMMIT_DATE + "\nTag: " + GIT_TAG + ", commits: " + GIT_COMMITS + "\n\nflags: (if any)\n";
+            ").\nDate: " + GIT_COMMIT_DATE + "\nTag: " + GIT_TAG + "\n\nflags: (if any)\n";
 
 #ifdef LEGACY_RENDERER
         result += "legacyrenderer\n";
@@ -865,9 +849,8 @@ std::string versionRequest(eHyprCtlOutputFormat format, std::string request) {
     "commit_message": "{}",
     "commit_date": "{}",
     "tag": "{}",
-    "commits": "{}",
     "flags": [)#",
-            GIT_BRANCH, GIT_COMMIT_HASH, (strcmp(GIT_DIRTY, "dirty") == 0 ? "true" : "false"), escapeJSONStrings(commitMsg), GIT_COMMIT_DATE, GIT_TAG, GIT_COMMITS);
+            GIT_BRANCH, GIT_COMMIT_HASH, (strcmp(GIT_DIRTY, "dirty") == 0 ? "true" : "false"), escapeJSONStrings(commitMsg), GIT_COMMIT_DATE, GIT_TAG);
 
 #ifdef LEGACY_RENDERER
         result += "\"legacyrenderer\",";
@@ -907,8 +890,6 @@ std::string systemInfoRequest(eHyprCtlOutputFormat format, std::string request)
 
 #if defined(__DragonFly__) || defined(__FreeBSD__)
     const std::string GPUINFO = execAndGet("pciconf -lv | fgrep -A4 vga");
-#elif defined(__arm__) || defined(__aarch64__)
-    const std::string GPUINFO = execAndGet("cat /proc/device-tree/soc*/gpu*/compatible");
 #else
     const std::string GPUINFO = execAndGet("lspci -vnn | grep VGA");
 #endif
@@ -921,12 +902,6 @@ std::string systemInfoRequest(eHyprCtlOutputFormat format, std::string request)
         result += std::format("  {} by {} ver {}\n", pl->name, pl->author, pl->version);
     }
 
-    if (g_pHyprCtl->m_sCurrentRequestParams.sysInfoConfig) {
-        result += "\n======Config-Start======\n";
-        result += g_pConfigManager->getConfigString();
-        result += "\n======Config-End========\n";
-    }
-
     return result;
 }
 
@@ -987,7 +962,7 @@ std::string dispatchKeyword(eHyprCtlOutputFormat format, std::string in) {
     }
 
     // decorations will probably need a repaint
-    if (COMMAND.contains("decoration:") || COMMAND.contains("border") || COMMAND == "workspace" || COMMAND.contains("zoom_factor") || COMMAND == "source") {
+    if (COMMAND.contains("decoration:") || COMMAND.contains("border") || COMMAND == "workspace" || COMMAND.contains("cursor_zoom_factor") || COMMAND == "source") {
         for (auto& m : g_pCompositor->m_vMonitors) {
             g_pHyprRenderer->damageMonitor(m.get());
             g_pLayoutManager->getCurrentLayout()->recalculateMonitor(m->ID);
@@ -1063,20 +1038,18 @@ std::string dispatchBatch(eHyprCtlOutputFormat format, std::string request) {
             request = "";
         }
 
-        curitem = trim(curitem);
+        curitem = removeBeginEndSpacesTabs(curitem);
     };
 
     nextItem();
 
-    const std::string DELIMITER = "\n\n\n";
-
     while (curitem != "" || request != "") {
-        reply += g_pHyprCtl->getReply(curitem) + DELIMITER;
+        reply += g_pHyprCtl->getReply(curitem);
 
         nextItem();
     }
 
-    return reply.substr(0, std::max(static_cast<int>(reply.size() - DELIMITER.size()), 0));
+    return reply;
 }
 
 std::string dispatchSetCursor(eHyprCtlOutputFormat format, std::string request) {
@@ -1097,8 +1070,7 @@ std::string dispatchSetCursor(eHyprCtlOutputFormat format, std::string request)
     if (size <= 0)
         return "size not positive";
 
-    if (!g_pCursorManager->changeTheme(theme, size))
-        return "failed to set cursor";
+    g_pCursorManager->changeTheme(theme, size);
 
     return "ok";
 }
@@ -1110,17 +1082,17 @@ std::string switchXKBLayoutRequest(eHyprCtlOutputFormat format, std::string requ
     const auto CMD = vars[2];
 
     // get kb
-    const auto PKEYBOARD = std::find_if(g_pInputManager->m_vKeyboards.begin(), g_pInputManager->m_vKeyboards.end(),
-                                        [&](const auto& other) { return other->hlName == g_pInputManager->deviceNameToInternalString(KB); });
+    const auto PKEYBOARD = std::find_if(g_pInputManager->m_lKeyboards.begin(), g_pInputManager->m_lKeyboards.end(),
+                                        [&](const SKeyboard& other) { return other.name == g_pInputManager->deviceNameToInternalString(KB); });
 
-    if (PKEYBOARD == g_pInputManager->m_vKeyboards.end())
+    if (PKEYBOARD == g_pInputManager->m_lKeyboards.end())
         return "device not found";
 
-    const auto         PWLRKEYBOARD = (*PKEYBOARD)->wlr();
+    const auto         PWLRKEYBOARD = wlr_keyboard_from_input_device(PKEYBOARD->keyboard);
     const auto         LAYOUTS      = xkb_keymap_num_layouts(PWLRKEYBOARD->keymap);
     xkb_layout_index_t activeLayout = 0;
     while (activeLayout < LAYOUTS) {
-        if (xkb_state_layout_index_is_active(PWLRKEYBOARD->xkb_state, activeLayout, XKB_STATE_LAYOUT_EFFECTIVE) == 1)
+        if (xkb_state_layout_index_is_active(PWLRKEYBOARD->xkb_state, activeLayout, XKB_STATE_LAYOUT_EFFECTIVE))
             break;
 
         activeLayout++;
@@ -1184,7 +1156,7 @@ std::string dispatchSetProp(eHyprCtlOutputFormat format, std::string request) {
     if (vars.size() < 4)
         return "not enough args";
 
-    const auto PLASTWINDOW = g_pCompositor->m_pLastWindow.lock();
+    const auto PLASTWINDOW = g_pCompositor->m_pLastWindow;
     const auto PWINDOW     = g_pCompositor->getWindowByRegex(vars[1]);
 
     if (!PWINDOW)
@@ -1253,27 +1225,10 @@ std::string dispatchSetProp(eHyprCtlOutputFormat format, std::string request) {
             PWINDOW->m_sSpecialRenderData.alphaInactiveOverride.forceSetIgnoreLocked(configStringToInt(VAL), lock);
         } else if (PROP == "alphainactive") {
             PWINDOW->m_sSpecialRenderData.alphaInactive.forceSetIgnoreLocked(std::stof(VAL), lock);
-        } else if (PROP == "alphafullscreenoverride") {
-            PWINDOW->m_sSpecialRenderData.alphaFullscreenOverride.forceSetIgnoreLocked(configStringToInt(VAL), lock);
-        } else if (PROP == "alphafullscreen") {
-            PWINDOW->m_sSpecialRenderData.alphaFullscreen.forceSetIgnoreLocked(std::stof(VAL), lock);
-        } else if (PROP == "activebordercolor" || PROP == "inactivebordercolor") {
-            CGradientValueData colorData = {};
-            if (vars.size() > 4) {
-                for (int i = 3; i < static_cast<int>(lock ? vars.size() - 1 : vars.size()); ++i) {
-                    const auto TOKEN = vars[i];
-                    if (TOKEN.ends_with("deg"))
-                        colorData.m_fAngle = std::stoi(TOKEN.substr(0, TOKEN.size() - 3)) * (PI / 180.0);
-                    else
-                        colorData.m_vColors.push_back(configStringToInt(TOKEN));
-                }
-            } else if (VAL != "-1")
-                colorData.m_vColors.push_back(configStringToInt(VAL));
-
-            if (PROP == "activebordercolor")
-                PWINDOW->m_sSpecialRenderData.activeBorderColor.forceSetIgnoreLocked(colorData, lock);
-            else
-                PWINDOW->m_sSpecialRenderData.inactiveBorderColor.forceSetIgnoreLocked(colorData, lock);
+        } else if (PROP == "activebordercolor") {
+            PWINDOW->m_sSpecialRenderData.activeBorderColor.forceSetIgnoreLocked(CGradientValueData(CColor(configStringToInt(VAL))), lock);
+        } else if (PROP == "inactivebordercolor") {
+            PWINDOW->m_sSpecialRenderData.inactiveBorderColor.forceSetIgnoreLocked(CGradientValueData(CColor(configStringToInt(VAL))), lock);
         } else if (PROP == "forcergbx") {
             PWINDOW->m_sAdditionalConfigData.forceRGBX.forceSetIgnoreLocked(configStringToInt(VAL), lock);
         } else if (PROP == "bordersize") {
@@ -1317,7 +1272,7 @@ std::string dispatchGetOption(eHyprCtlOutputFormat format, std::string request)
             request = "";
         }
 
-        curitem = trim(curitem);
+        curitem = removeBeginEndSpacesTabs(curitem);
     };
 
     nextItem();
@@ -1386,64 +1341,73 @@ std::string decorationRequest(eHyprCtlOutputFormat format, std::string request)
     return result;
 }
 
-static bool addOutput(wlr_backend* backend, const std::string& type, const std::string& name) {
-    wlr_output* output = nullptr;
-
-    if (type.empty() || type == "auto") {
-        if (wlr_backend_is_wl(backend))
-            output = wlr_wl_output_create(backend);
-        else if (wlr_backend_is_headless(backend))
-            output = wlr_headless_add_output(backend, 1920, 1080);
-    } else {
-        if (wlr_backend_is_wl(backend) && type == "wayland")
-            output = wlr_wl_output_create(backend);
-        else if (wlr_backend_is_headless(backend) && type == "headless")
-            output = wlr_headless_add_output(backend, 1920, 1080);
-    }
-
-    if (output && !name.empty())
-        g_pCompositor->getMonitorFromOutput(output)->szName = name;
-
-    return output != nullptr;
-}
-
-struct outputData {
-    std::string type;
-    std::string name;
-    bool        added;
-};
-
 void createOutputIter(wlr_backend* backend, void* data) {
-    const auto DATA = static_cast<outputData*>(data);
+    const auto DATA = (std::pair<std::string, bool>*)data;
 
-    if (DATA->added)
+    if (DATA->second)
         return;
 
-    if (addOutput(backend, DATA->type, DATA->name))
-        DATA->added = true;
+    if (DATA->first.empty() || DATA->first == "auto") {
+        if (wlr_backend_is_wl(backend)) {
+            wlr_wl_output_create(backend);
+            DATA->second = true;
+        } else if (wlr_backend_is_x11(backend)) {
+            wlr_x11_output_create(backend);
+            DATA->second = true;
+        } else if (wlr_backend_is_headless(backend)) {
+            wlr_headless_add_output(backend, 1920, 1080);
+            DATA->second = true;
+        }
+    } else {
+        if (wlr_backend_is_wl(backend) && DATA->first == "wayland") {
+            wlr_wl_output_create(backend);
+            DATA->second = true;
+        } else if (wlr_backend_is_x11(backend) && DATA->first == "x11") {
+            wlr_x11_output_create(backend);
+            DATA->second = true;
+        } else if (wlr_backend_is_headless(backend) && DATA->first == "headless") {
+            wlr_headless_add_output(backend, 1920, 1080);
+            DATA->second = true;
+        }
+    }
 }
 
 std::string dispatchOutput(eHyprCtlOutputFormat format, std::string request) {
-    CVarList vars(request, 0, ' ');
+    std::string curitem = "";
 
-    if (vars.size() < 2)
-        return "not enough args";
+    auto        nextItem = [&]() {
+        auto idx = request.find_first_of(' ');
 
-    const auto MODE = vars[1];
+        if (idx != std::string::npos) {
+            curitem = request.substr(0, idx);
+            request = request.substr(idx + 1);
+        } else {
+            curitem = request;
+            request = "";
+        }
+
+        curitem = removeBeginEndSpacesTabs(curitem);
+    };
+
+    nextItem();
+    nextItem();
+
+    const auto MODE = curitem;
+
+    nextItem();
+
+    const auto NAME = curitem;
 
     if (MODE == "create" || MODE == "add") {
-        if (g_pCompositor->getMonitorFromName(vars[3]))
-            return "A real monitor already uses that name.";
-
-        outputData result{vars[2], vars[3], false};
+        std::pair<std::string, bool> result = {NAME, false};
 
         wlr_multi_for_each_backend(g_pCompositor->m_sWLRBackend, createOutputIter, &result);
 
-        if (!result.added)
+        if (!result.second)
             return "no backend replied to the request";
 
     } else if (MODE == "destroy" || MODE == "remove") {
-        const auto PMONITOR = g_pCompositor->getMonitorFromName(vars[2]);
+        const auto PMONITOR = g_pCompositor->getMonitorFromName(NAME);
 
         if (!PMONITOR)
             return "output not found";
@@ -1576,18 +1540,6 @@ std::string dispatchDismissNotify(eHyprCtlOutputFormat format, std::string reque
     return "ok";
 }
 
-std::string getIsLocked(eHyprCtlOutputFormat format, std::string request) {
-    std::string lockedStr = g_pSessionLockManager->isSessionLocked() ? "true" : "false";
-    if (format == eHyprCtlOutputFormat::FORMAT_JSON)
-        lockedStr = std::format(R"#(
-{{
-    "locked": {}
-}}
-)#",
-                                lockedStr);
-    return lockedStr;
-}
-
 CHyprCtl::CHyprCtl() {
     registerCommand(SHyprCtlCommand{"workspaces", true, workspacesRequest});
     registerCommand(SHyprCtlCommand{"workspacerules", true, workspaceRulesRequest});
@@ -1607,7 +1559,6 @@ CHyprCtl::CHyprCtl() {
     registerCommand(SHyprCtlCommand{"rollinglog", true, rollinglogRequest});
     registerCommand(SHyprCtlCommand{"layouts", true, layoutsRequest});
     registerCommand(SHyprCtlCommand{"configerrors", true, configErrorsRequest});
-    registerCommand(SHyprCtlCommand{"locked", true, getIsLocked});
 
     registerCommand(SHyprCtlCommand{"monitors", false, monitorsRequest});
     registerCommand(SHyprCtlCommand{"reload", false, reloadRequest});
@@ -1628,16 +1579,11 @@ CHyprCtl::CHyprCtl() {
     startHyprCtlSocket();
 }
 
-CHyprCtl::~CHyprCtl() {
-    if (m_eventSource)
-        wl_event_source_remove(m_eventSource);
+std::shared_ptr<SHyprCtlCommand> CHyprCtl::registerCommand(SHyprCtlCommand cmd) {
+    return m_vCommands.emplace_back(std::make_shared<SHyprCtlCommand>(cmd));
 }
 
-SP<SHyprCtlCommand> CHyprCtl::registerCommand(SHyprCtlCommand cmd) {
-    return m_vCommands.emplace_back(makeShared<SHyprCtlCommand>(cmd));
-}
-
-void CHyprCtl::unregisterCommand(const SP<SHyprCtlCommand>& cmd) {
+void CHyprCtl::unregisterCommand(const std::shared_ptr<SHyprCtlCommand>& cmd) {
     std::erase(m_vCommands, cmd);
 }
 
@@ -1669,8 +1615,6 @@ std::string CHyprCtl::getReply(std::string request) {
                 reloadAll = true;
             else if (c == 'a')
                 m_sCurrentRequestParams.all = true;
-            else if (c == 'c')
-                m_sCurrentRequestParams.sysInfoConfig = true;
         }
 
         if (sepIndex < request.size())
@@ -1735,46 +1679,6 @@ std::string CHyprCtl::makeDynamicCall(const std::string& input) {
     return getReply(input);
 }
 
-bool successWrite(int fd, const std::string& data, bool needLog = true) {
-    if (write(fd, data.c_str(), data.length()) > 0)
-        return true;
-
-    if (errno == EAGAIN)
-        return true;
-
-    if (needLog)
-        Debug::log(ERR, "Couldn't write to socket. Error: " + std::string(strerror(errno)));
-
-    return false;
-}
-
-void runWritingDebugLogThread(const int conn) {
-    using namespace std::chrono_literals;
-    Debug::log(LOG, "In followlog thread, got connection, start writing: {}", conn);
-    //will be finished, when reading side close connection
-    std::thread([conn]() {
-        while (Debug::RollingLogFollow::Get().IsRunning()) {
-            if (Debug::RollingLogFollow::Get().isEmpty(conn)) {
-                std::this_thread::sleep_for(1000ms);
-                continue;
-            }
-
-            auto line = Debug::RollingLogFollow::Get().GetLog(conn);
-            if (!successWrite(conn, line))
-                // We cannot write, when connection is closed. So thread will successfully exit by itself
-                break;
-
-            std::this_thread::sleep_for(100ms);
-        }
-        close(conn);
-        Debug::RollingLogFollow::Get().StopFor(conn);
-    }).detach();
-}
-
-bool isFollowUpRollingLogRequest(const std::string& request) {
-    return request.contains("rollinglog") && request.contains("f");
-}
-
 int hyprCtlFDTick(int fd, uint32_t mask, void* data) {
     if (mask & WL_EVENT_ERROR || mask & WL_EVENT_HANGUP)
         return 0;
@@ -1786,17 +1690,13 @@ int hyprCtlFDTick(int fd, uint32_t mask, void* data) {
 
     std::array<char, 1024> readBuffer;
 
-    //
-    pollfd pollfds[1] = {
-        {
-            .fd     = ACCEPTEDCONNECTION,
-            .events = POLLIN,
-        },
-    };
+    fd_set                 fdset;
+    FD_ZERO(&fdset);
+    FD_SET(ACCEPTEDCONNECTION, &fdset);
+    timeval timeout = {.tv_sec = 0, .tv_usec = 5000};
+    auto    success = select(ACCEPTEDCONNECTION + 1, &fdset, nullptr, nullptr, &timeout);
 
-    int ret = poll(pollfds, 1, 5000);
-
-    if (ret <= 0) {
+    if (success <= 0) {
         close(ACCEPTEDCONNECTION);
         return 0;
     }
@@ -1822,15 +1722,9 @@ int hyprCtlFDTick(int fd, uint32_t mask, void* data) {
         reply = "Err: " + std::string(e.what());
     }
 
-    successWrite(ACCEPTEDCONNECTION, reply);
+    write(ACCEPTEDCONNECTION, reply.c_str(), reply.length());
 
-    if (isFollowUpRollingLogRequest(request)) {
-        Debug::log(LOG, "Followup rollinglog request received. Starting thread to write to socket.");
-        Debug::RollingLogFollow::Get().StartFor(ACCEPTEDCONNECTION);
-        runWritingDebugLogThread(ACCEPTEDCONNECTION);
-        Debug::log(LOG, Debug::RollingLogFollow::Get().DebugInfo());
-    } else
-        close(ACCEPTEDCONNECTION);
+    close(ACCEPTEDCONNECTION);
 
     if (g_pConfigManager->m_bWantsMonitorReload)
         g_pConfigManager->ensureMonitorStatus();
@@ -1849,7 +1743,7 @@ void CHyprCtl::startHyprCtlSocket() {
 
     sockaddr_un SERVERADDRESS = {.sun_family = AF_UNIX};
 
-    std::string socketPath = g_pCompositor->m_szInstancePath + "/.socket.sock";
+    std::string socketPath = "/tmp/hypr/" + g_pCompositor->m_szInstanceSignature + "/.socket.sock";
 
     strcpy(SERVERADDRESS.sun_path, socketPath.c_str());
 
@@ -1863,5 +1757,5 @@ void CHyprCtl::startHyprCtlSocket() {
 
     Debug::log(LOG, "Hypr socket started at {}", socketPath);
 
-    m_eventSource = wl_event_loop_add_fd(g_pCompositor->m_sWLEventLoop, m_iSocketFD, WL_EVENT_READABLE, hyprCtlFDTick, nullptr);
+    wl_event_loop_add_fd(g_pCompositor->m_sWLEventLoop, m_iSocketFD, WL_EVENT_READABLE, hyprCtlFDTick, nullptr);
 }

src/debug/HyprCtl.hpp

@@ -8,25 +8,22 @@
 class CHyprCtl {
   public:
     CHyprCtl();
-    ~CHyprCtl();
 
-    std::string         makeDynamicCall(const std::string& input);
-    SP<SHyprCtlCommand> registerCommand(SHyprCtlCommand cmd);
-    void                unregisterCommand(const SP<SHyprCtlCommand>& cmd);
-    std::string         getReply(std::string);
+    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);
 
-    int                 m_iSocketFD = -1;
+    int                              m_iSocketFD = -1;
 
     struct {
-        bool all           = false;
-        bool sysInfoConfig = false;
+        bool all = false;
     } m_sCurrentRequestParams;
 
   private:
-    void                             startHyprCtlSocket();
+    void                                          startHyprCtlSocket();
 
-    std::vector<SP<SHyprCtlCommand>> m_vCommands;
-    wl_event_source*                 m_eventSource = nullptr;
+    std::vector<std::shared_ptr<SHyprCtlCommand>> m_vCommands;
 };
 
-inline std::unique_ptr<CHyprCtl> g_pHyprCtl;
+inline std::unique_ptr<CHyprCtl> g_pHyprCtl;

src/debug/HyprDebugOverlay.cpp

@@ -1,12 +1,6 @@
-#include <pango/pangocairo.h>
 #include "HyprDebugOverlay.hpp"
-#include "config/ConfigValue.hpp"
 #include "../Compositor.hpp"
 
-CHyprDebugOverlay::CHyprDebugOverlay() {
-    m_pTexture = makeShared<CTexture>();
-}
-
 void CHyprMonitorDebugOverlay::renderData(CMonitor* pMonitor, float µs) {
     m_dLastRenderTimes.push_back(µs / 1000.f);
 
@@ -39,7 +33,7 @@ void CHyprMonitorDebugOverlay::frameData(CMonitor* pMonitor) {
         m_pMonitor = pMonitor;
 
     // anim data too
-    const auto PMONITORFORTICKS = g_pHyprRenderer->m_pMostHzMonitor ? g_pHyprRenderer->m_pMostHzMonitor : g_pCompositor->m_pLastMonitor.get();
+    const auto PMONITORFORTICKS = g_pHyprRenderer->m_pMostHzMonitor ? g_pHyprRenderer->m_pMostHzMonitor : g_pCompositor->m_pLastMonitor;
     if (PMONITORFORTICKS) {
         if (m_dLastAnimationTicks.size() > (long unsigned int)PMONITORFORTICKS->refreshRate)
             m_dLastAnimationTicks.pop_front();
@@ -53,6 +47,11 @@ int CHyprMonitorDebugOverlay::draw(int offset) {
     if (!m_pMonitor)
         return 0;
 
+    int                  yOffset = offset;
+    cairo_text_extents_t cairoExtents;
+    float                maxX = 0;
+    std::string          text = "";
+
     // get avg fps
     float avgFrametime = 0;
     float maxFrametime = 0;
@@ -106,49 +105,23 @@ int CHyprMonitorDebugOverlay::draw(int offset) {
     float varAnimMgrTick = maxAnimMgrTick - minAnimMgrTick;
     avgAnimMgrTick /= m_dLastAnimationTicks.size() == 0 ? 1 : m_dLastAnimationTicks.size();
 
-    const float           FPS      = 1.f / (avgFrametime / 1000.f); // frametimes are in ms
-    const float           idealFPS = m_dLastFrametimes.size();
+    const float FPS      = 1.f / (avgFrametime / 1000.f); // frametimes are in ms
+    const float idealFPS = m_dLastFrametimes.size();
 
-    static auto           fontFamily = CConfigValue<std::string>("misc:font_family");
-    PangoLayout*          layoutText = pango_cairo_create_layout(g_pDebugOverlay->m_pCairo);
-    PangoFontDescription* pangoFD    = pango_font_description_new();
+    cairo_select_font_face(g_pDebugOverlay->m_pCairo, "Sans", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
 
-    pango_font_description_set_family(pangoFD, (*fontFamily).c_str());
-    pango_font_description_set_style(pangoFD, PANGO_STYLE_NORMAL);
-    pango_font_description_set_weight(pangoFD, PANGO_WEIGHT_NORMAL);
-
-    float maxTextW = 0;
-    int   fontSize = 0;
-    auto  cr       = g_pDebugOverlay->m_pCairo;
-
-    auto  showText = [cr, layoutText, pangoFD, &maxTextW, &fontSize](const char* text, int size) {
-        if (fontSize != size) {
-            pango_font_description_set_absolute_size(pangoFD, size * PANGO_SCALE);
-            pango_layout_set_font_description(layoutText, pangoFD);
-            fontSize = size;
-        }
-
-        pango_layout_set_text(layoutText, text, -1);
-        pango_cairo_show_layout(cr, layoutText);
-
-        int textW = 0, textH = 0;
-        pango_layout_get_size(layoutText, &textW, &textH);
-        textW /= PANGO_SCALE;
-        textH /= PANGO_SCALE;
-        if (textW > maxTextW)
-            maxTextW = textW;
-
-        // move to next line
-        cairo_rel_move_to(cr, 0, fontSize + 1);
-    };
-
-    const int MARGIN_TOP  = 8;
-    const int MARGIN_LEFT = 4;
-    cairo_move_to(cr, MARGIN_LEFT, MARGIN_TOP + offset);
+    cairo_set_font_size(g_pDebugOverlay->m_pCairo, 10);
     cairo_set_source_rgba(g_pDebugOverlay->m_pCairo, 1.f, 1.f, 1.f, 1.f);
 
-    std::string text;
-    showText(m_pMonitor->szName.c_str(), 10);
+    yOffset += 10;
+    cairo_move_to(g_pDebugOverlay->m_pCairo, 0, yOffset);
+    text = m_pMonitor->szName;
+    cairo_show_text(g_pDebugOverlay->m_pCairo, text.c_str());
+    cairo_text_extents(g_pDebugOverlay->m_pCairo, text.c_str(), &cairoExtents);
+    if (cairoExtents.width > maxX)
+        maxX = cairoExtents.width;
+
+    cairo_set_font_size(g_pDebugOverlay->m_pCairo, 16);
 
     if (FPS > idealFPS * 0.95f)
         cairo_set_source_rgba(g_pDebugOverlay->m_pCairo, 0.2f, 1.f, 0.2f, 1.f);
@@ -157,35 +130,57 @@ int CHyprMonitorDebugOverlay::draw(int offset) {
     else
         cairo_set_source_rgba(g_pDebugOverlay->m_pCairo, 1.f, 0.2f, 0.2f, 1.f);
 
+    yOffset += 17;
+    cairo_move_to(g_pDebugOverlay->m_pCairo, 0, yOffset);
     text = std::format("{} FPS", (int)FPS);
-    showText(text.c_str(), 16);
+    cairo_show_text(g_pDebugOverlay->m_pCairo, text.c_str());
+    cairo_text_extents(g_pDebugOverlay->m_pCairo, text.c_str(), &cairoExtents);
+    if (cairoExtents.width > maxX)
+        maxX = cairoExtents.width;
 
+    cairo_set_font_size(g_pDebugOverlay->m_pCairo, 10);
     cairo_set_source_rgba(g_pDebugOverlay->m_pCairo, 1.f, 1.f, 1.f, 1.f);
 
+    yOffset += 11;
+    cairo_move_to(g_pDebugOverlay->m_pCairo, 0, yOffset);
     text = std::format("Avg Frametime: {:.2f}ms (var {:.2f}ms)", avgFrametime, varFrametime);
-    showText(text.c_str(), 10);
+    cairo_show_text(g_pDebugOverlay->m_pCairo, text.c_str());
+    cairo_text_extents(g_pDebugOverlay->m_pCairo, text.c_str(), &cairoExtents);
+    if (cairoExtents.width > maxX)
+        maxX = cairoExtents.width;
 
+    yOffset += 11;
+    cairo_move_to(g_pDebugOverlay->m_pCairo, 0, yOffset);
     text = std::format("Avg Rendertime: {:.2f}ms (var {:.2f}ms)", avgRenderTime, varRenderTime);
-    showText(text.c_str(), 10);
+    cairo_show_text(g_pDebugOverlay->m_pCairo, text.c_str());
+    cairo_text_extents(g_pDebugOverlay->m_pCairo, text.c_str(), &cairoExtents);
+    if (cairoExtents.width > maxX)
+        maxX = cairoExtents.width;
 
+    yOffset += 11;
+    cairo_move_to(g_pDebugOverlay->m_pCairo, 0, yOffset);
     text = std::format("Avg Rendertime (No Overlay): {:.2f}ms (var {:.2f}ms)", avgRenderTimeNoOverlay, varRenderTimeNoOverlay);
-    showText(text.c_str(), 10);
+    cairo_show_text(g_pDebugOverlay->m_pCairo, text.c_str());
+    cairo_text_extents(g_pDebugOverlay->m_pCairo, text.c_str(), &cairoExtents);
+    if (cairoExtents.width > maxX)
+        maxX = cairoExtents.width;
 
+    yOffset += 11;
+    cairo_move_to(g_pDebugOverlay->m_pCairo, 0, yOffset);
     text = std::format("Avg Anim Tick: {:.2f}ms (var {:.2f}ms) ({:.2f} TPS)", avgAnimMgrTick, varAnimMgrTick, 1.0 / (avgAnimMgrTick / 1000.0));
-    showText(text.c_str(), 10);
+    cairo_show_text(g_pDebugOverlay->m_pCairo, text.c_str());
+    cairo_text_extents(g_pDebugOverlay->m_pCairo, text.c_str(), &cairoExtents);
+    if (cairoExtents.width > maxX)
+        maxX = cairoExtents.width;
 
-    pango_font_description_free(pangoFD);
-    g_object_unref(layoutText);
-
-    double posX = 0, posY = 0;
-    cairo_get_current_point(cr, &posX, &posY);
+    yOffset += 11;
 
     g_pHyprRenderer->damageBox(&m_wbLastDrawnBox);
-    m_wbLastDrawnBox = {(int)g_pCompositor->m_vMonitors.front()->vecPosition.x + MARGIN_LEFT - 1, (int)g_pCompositor->m_vMonitors.front()->vecPosition.y + offset + MARGIN_TOP - 1,
-                        (int)maxTextW + 2, posY - offset - MARGIN_TOP + 2};
+    m_wbLastDrawnBox = {(int)g_pCompositor->m_vMonitors.front()->vecPosition.x, (int)g_pCompositor->m_vMonitors.front()->vecPosition.y + offset - 1, (int)maxX + 2,
+                        yOffset - offset + 2};
     g_pHyprRenderer->damageBox(&m_wbLastDrawnBox);
 
-    return posY - offset;
+    return yOffset - offset;
 }
 
 void CHyprDebugOverlay::renderData(CMonitor* pMonitor, float µs) {
@@ -226,8 +221,8 @@ void CHyprDebugOverlay::draw() {
 
     // copy the data to an OpenGL texture we have
     const auto DATA = cairo_image_surface_get_data(m_pCairoSurface);
-    m_pTexture->allocate();
-    glBindTexture(GL_TEXTURE_2D, m_pTexture->m_iTexID);
+    m_tTexture.allocate();
+    glBindTexture(GL_TEXTURE_2D, m_tTexture.m_iTexID);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
 
@@ -239,5 +234,5 @@ void CHyprDebugOverlay::draw() {
     glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, PMONITOR->vecPixelSize.x, PMONITOR->vecPixelSize.y, 0, GL_RGBA, GL_UNSIGNED_BYTE, DATA);
 
     CBox pMonBox = {0, 0, PMONITOR->vecPixelSize.x, PMONITOR->vecPixelSize.y};
-    g_pHyprOpenGL->renderTexture(m_pTexture, &pMonBox, 1.f);
+    g_pHyprOpenGL->renderTexture(m_tTexture, &pMonBox, 1.f);
 }

src/debug/HyprDebugOverlay.hpp

@@ -31,7 +31,6 @@ class CHyprMonitorDebugOverlay {
 
 class CHyprDebugOverlay {
   public:
-    CHyprDebugOverlay();
     void draw();
     void renderData(CMonitor*, float µs);
     void renderDataNoOverlay(CMonitor*, float µs);
@@ -43,7 +42,7 @@ class CHyprDebugOverlay {
     cairo_surface_t*                                        m_pCairoSurface = nullptr;
     cairo_t*                                                m_pCairo        = nullptr;
 
-    SP<CTexture>                                            m_pTexture;
+    CTexture                                                m_tTexture;
 
     friend class CHyprMonitorDebugOverlay;
     friend class CHyprRenderer;

src/debug/HyprNotificationOverlay.cpp

@@ -1,37 +1,39 @@
-#include <numeric>
-#include <pango/pangocairo.h>
 #include "HyprNotificationOverlay.hpp"
 #include "../Compositor.hpp"
-#include "../config/ConfigValue.hpp"
-
-inline auto iconBackendFromLayout(PangoLayout* layout) {
-    // preference: Nerd > FontAwesome > text
-    auto eIconBackendChecks = std::array<eIconBackend, 2>{ICONS_BACKEND_NF, ICONS_BACKEND_FA};
-    for (auto iconID : eIconBackendChecks) {
-        auto iconsText = std::accumulate(ICONS_ARRAY[iconID].begin(), ICONS_ARRAY[iconID].end(), std::string());
-        pango_layout_set_text(layout, iconsText.c_str(), -1);
-        if (pango_layout_get_unknown_glyphs_count(layout) == 0)
-            return iconID;
-    }
-    return ICONS_BACKEND_NONE;
-}
+#include <pango/pangocairo.h>
 
 CHyprNotificationOverlay::CHyprNotificationOverlay() {
-    static auto P = g_pHookSystem->hookDynamic("focusedMon", [&](void* self, SCallbackInfo& info, std::any param) {
+    g_pHookSystem->hookDynamic("focusedMon", [&](void* self, SCallbackInfo& info, std::any param) {
         if (m_dNotifications.size() == 0)
             return;
 
         g_pHyprRenderer->damageBox(&m_bLastDamage);
     });
 
-    m_pTexture = makeShared<CTexture>();
-}
+    // check for the icon backend
+    std::string fonts      = execAndGet("fc-list");
+    std::string fontsLower = fonts;
+    std::transform(fontsLower.begin(), fontsLower.end(), fontsLower.begin(), [&](char& i) { return std::tolower(i); });
 
-CHyprNotificationOverlay::~CHyprNotificationOverlay() {
-    if (m_pCairo)
-        cairo_destroy(m_pCairo);
-    if (m_pCairoSurface)
-        cairo_surface_destroy(m_pCairoSurface);
+    size_t index = 0;
+
+    if (index = fontsLower.find("nerd"); index != std::string::npos) {
+        m_eIconBackend = ICONS_BACKEND_NF;
+    } else if (index = fontsLower.find("font awesome"); index != std::string::npos) {
+        m_eIconBackend = ICONS_BACKEND_FA;
+    } else if (index = fontsLower.find("fontawesome"); index != std::string::npos) {
+        m_eIconBackend = ICONS_BACKEND_FA;
+    } else {
+        return;
+    }
+
+    const auto LASTNEWLINE = fonts.find_last_of('\n', index);
+    const auto COLON       = fonts.find(':', LASTNEWLINE);
+    const auto COMMA       = fonts.find(',', COLON);
+    const auto NEWLINE     = fonts.find('\n', COLON);
+    const auto LASTCHAR    = COMMA < NEWLINE ? COMMA : NEWLINE;
+
+    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, const float fontSize) {
@@ -72,24 +74,25 @@ CBox CHyprNotificationOverlay::drawNotifications(CMonitor* pMonitor) {
     float                 offsetY  = 10;
     float                 maxWidth = 0;
 
-    const auto            SCALE   = pMonitor->scale;
-    const auto            MONSIZE = pMonitor->vecTransformedSize;
+    const auto            SCALE = pMonitor->scale;
 
-    static auto           fontFamily = CConfigValue<std::string>("misc:font_family");
+    const auto            MONSIZE = pMonitor->vecPixelSize;
 
-    PangoLayout*          layout  = pango_cairo_create_layout(m_pCairo);
-    PangoFontDescription* pangoFD = pango_font_description_new();
+    cairo_text_extents_t  cairoExtents;
+    int                   iconW = 0, iconH = 0;
 
-    pango_font_description_set_family(pangoFD, (*fontFamily).c_str());
-    pango_font_description_set_style(pangoFD, PANGO_STYLE_NORMAL);
-    pango_font_description_set_weight(pangoFD, PANGO_WEIGHT_NORMAL);
+    cairo_select_font_face(m_pCairo, "Sans", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
 
-    const auto iconBackendID = iconBackendFromLayout(layout);
-    const auto PBEZIER       = g_pAnimationManager->getBezier("default");
+    const auto PBEZIER = g_pAnimationManager->getBezier("default");
 
     for (auto& notif : m_dNotifications) {
-        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);
+        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 =
@@ -112,37 +115,31 @@ CBox CHyprNotificationOverlay::drawNotifications(CMonitor* pMonitor) {
         const float THIRDRECTPERC = notif->started.getMillis() / notif->timeMs;
 
         // get text size
-        const auto ICON      = ICONS_ARRAY[iconBackendID][notif->icon];
+        cairo_text_extents(m_pCairo, notif->text.c_str(), &cairoExtents);
+        const auto ICON      = ICONS_ARRAY[m_eIconBackend][notif->icon];
         const auto ICONCOLOR = ICONS_COLORS[notif->icon];
-
-        int        iconW = 0, iconH = 0;
-        pango_font_description_set_absolute_size(pangoFD, PANGO_SCALE * FONTSIZE * ICON_SCALE);
-        pango_layout_set_font_description(layout, pangoFD);
-        pango_layout_set_text(layout, ICON.c_str(), -1);
-        pango_layout_get_size(layout, &iconW, &iconH);
+        pango_layout_set_text(pangoLayout, ICON.c_str(), -1);
+        pango_layout_set_font_description(pangoLayout, pangoFD);
+        pango_cairo_update_layout(m_pCairo, pangoLayout);
+        pango_layout_get_size(pangoLayout, &iconW, &iconH);
         iconW /= PANGO_SCALE;
         iconH /= PANGO_SCALE;
 
-        int textW = 0, textH = 0;
-        pango_font_description_set_absolute_size(pangoFD, PANGO_SCALE * FONTSIZE);
-        pango_layout_set_font_description(layout, pangoFD);
-        pango_layout_set_text(layout, notif->text.c_str(), -1);
-        pango_layout_get_size(layout, &textW, &textH);
-        textW /= PANGO_SCALE;
-        textH /= PANGO_SCALE;
+        cairo_set_source_rgba(m_pCairo, notif->color.r, notif->color.g, notif->color.b, notif->color.a);
 
-        const auto NOTIFSIZE = Vector2D{textW + 20.0 + iconW + 2 * ICONPADFORNOTIF, textH + 10.0};
+        const auto NOTIFSIZE = Vector2D{cairoExtents.width + 20 + iconW + 2 * ICONPADFORNOTIF, cairoExtents.height + 10};
 
         // draw rects
-        cairo_set_source_rgba(m_pCairo, notif->color.r, notif->color.g, notif->color.b, notif->color.a);
         cairo_rectangle(m_pCairo, MONSIZE.x - (NOTIFSIZE.x + NOTIF_LEFTBAR_SIZE) * FIRSTRECTPERC, offsetY, (NOTIFSIZE.x + NOTIF_LEFTBAR_SIZE) * FIRSTRECTPERC, NOTIFSIZE.y);
         cairo_fill(m_pCairo);
 
         cairo_set_source_rgb(m_pCairo, 0.f, 0.f, 0.f);
+
         cairo_rectangle(m_pCairo, MONSIZE.x - NOTIFSIZE.x * SECONDRECTPERC, offsetY, NOTIFSIZE.x * SECONDRECTPERC, NOTIFSIZE.y);
         cairo_fill(m_pCairo);
 
         cairo_set_source_rgba(m_pCairo, notif->color.r, notif->color.g, notif->color.b, notif->color.a);
+
         cairo_rectangle(m_pCairo, MONSIZE.x - NOTIFSIZE.x * SECONDRECTPERC + 3, offsetY + NOTIFSIZE.y - 4, THIRDRECTPERC * (NOTIFSIZE.x - 6), 2);
         cairo_fill(m_pCairo);
 
@@ -160,26 +157,25 @@ CBox CHyprNotificationOverlay::drawNotifications(CMonitor* pMonitor) {
 
             // draw icon
             cairo_set_source_rgb(m_pCairo, 1.f, 1.f, 1.f);
-            cairo_move_to(m_pCairo, MONSIZE.x - NOTIFSIZE.x * SECONDRECTPERC + NOTIF_LEFTBAR_SIZE + ICONPADFORNOTIF - 1, offsetY - 2 + std::round((NOTIFSIZE.y - iconH) / 2.0));
-            pango_layout_set_text(layout, ICON.c_str(), -1);
-            pango_cairo_show_layout(m_pCairo, layout);
+            cairo_move_to(m_pCairo, MONSIZE.x - NOTIFSIZE.x * SECONDRECTPERC + NOTIF_LEFTBAR_SIZE + ICONPADFORNOTIF - 1, offsetY + std::round((NOTIFSIZE.y - iconH - 4) / 2.0));
+            pango_cairo_show_layout(m_pCairo, pangoLayout);
         }
 
         // draw text
+        cairo_set_font_size(m_pCairo, FONTSIZE);
         cairo_set_source_rgb(m_pCairo, 1.f, 1.f, 1.f);
-        cairo_move_to(m_pCairo, MONSIZE.x - NOTIFSIZE.x * SECONDRECTPERC + NOTIF_LEFTBAR_SIZE + iconW + 2 * ICONPADFORNOTIF, offsetY - 2 + std::round((NOTIFSIZE.y - textH) / 2.0));
-        pango_layout_set_text(layout, notif->text.c_str(), -1);
-        pango_cairo_show_layout(m_pCairo, layout);
+        cairo_move_to(m_pCairo, MONSIZE.x - NOTIFSIZE.x * SECONDRECTPERC + NOTIF_LEFTBAR_SIZE + iconW + 2 * ICONPADFORNOTIF, offsetY + FONTSIZE + (FONTSIZE / 10.0));
+        cairo_show_text(m_pCairo, notif->text.c_str());
 
         // adjust offset and move on
         offsetY += NOTIFSIZE.y + 10;
 
         if (maxWidth < NOTIFSIZE.x)
             maxWidth = NOTIFSIZE.x;
-    }
 
-    pango_font_description_free(pangoFD);
-    g_object_unref(layout);
+        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; });
@@ -189,19 +185,16 @@ CBox CHyprNotificationOverlay::drawNotifications(CMonitor* pMonitor) {
 
 void CHyprNotificationOverlay::draw(CMonitor* pMonitor) {
 
-    const auto MONSIZE = pMonitor->vecTransformedSize;
-
-    if (m_pLastMonitor != pMonitor || m_vecLastSize != MONSIZE || !m_pCairo || !m_pCairoSurface) {
+    if (m_pLastMonitor != pMonitor || !m_pCairo || !m_pCairoSurface) {
 
         if (m_pCairo && m_pCairoSurface) {
             cairo_destroy(m_pCairo);
             cairo_surface_destroy(m_pCairoSurface);
         }
 
-        m_pCairoSurface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, MONSIZE.x, MONSIZE.y);
+        m_pCairoSurface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, pMonitor->vecPixelSize.x, pMonitor->vecPixelSize.y);
         m_pCairo        = cairo_create(m_pCairoSurface);
         m_pLastMonitor  = pMonitor;
-        m_vecLastSize   = MONSIZE;
     }
 
     // Draw the notifications
@@ -229,8 +222,8 @@ void CHyprNotificationOverlay::draw(CMonitor* pMonitor) {
 
     // copy the data to an OpenGL texture we have
     const auto DATA = cairo_image_surface_get_data(m_pCairoSurface);
-    m_pTexture->allocate();
-    glBindTexture(GL_TEXTURE_2D, m_pTexture->m_iTexID);
+    m_tTexture.allocate();
+    glBindTexture(GL_TEXTURE_2D, m_tTexture.m_iTexID);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
 
@@ -239,12 +232,12 @@ void CHyprNotificationOverlay::draw(CMonitor* pMonitor) {
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_B, GL_RED);
 #endif
 
-    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, MONSIZE.x, MONSIZE.y, 0, GL_RGBA, GL_UNSIGNED_BYTE, DATA);
+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, pMonitor->vecPixelSize.x, pMonitor->vecPixelSize.y, 0, GL_RGBA, GL_UNSIGNED_BYTE, DATA);
 
-    CBox pMonBox = {0, 0, MONSIZE.x, MONSIZE.y};
-    g_pHyprOpenGL->renderTexture(m_pTexture, &pMonBox, 1.f);
+    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

@@ -39,7 +39,6 @@ struct SNotification {
 class CHyprNotificationOverlay {
   public:
     CHyprNotificationOverlay();
-    ~CHyprNotificationOverlay();
 
     void draw(CMonitor* pMonitor);
     void addNotification(const std::string& text, const CColor& color, const float timeMs, const eIcons icon = ICON_NONE, const float fontSize = 13.f);
@@ -56,9 +55,11 @@ class CHyprNotificationOverlay {
     cairo_t*                                   m_pCairo        = nullptr;
 
     CMonitor*                                  m_pLastMonitor = nullptr;
-    Vector2D                                   m_vecLastSize  = Vector2D(-1, -1);
 
-    SP<CTexture>                               m_pTexture;
+    CTexture                                   m_tTexture;
+
+    eIconBackend                               m_eIconBackend   = ICONS_BACKEND_NONE;
+    std::string                                m_szIconFontName = "Sans";
 };
 
-inline std::unique_ptr<CHyprNotificationOverlay> g_pHyprNotificationOverlay;
+inline std::unique_ptr<CHyprNotificationOverlay> g_pHyprNotificationOverlay;

src/debug/Log.cpp

@@ -1,13 +1,12 @@
 #include "Log.hpp"
 #include "../defines.hpp"
 #include "../Compositor.hpp"
-#include "RollingLogFollow.hpp"
 
 #include <fstream>
 #include <iostream>
 
 void Debug::init(const std::string& IS) {
-    logFile = IS + (ISDEBUG ? "/hyprlandd.log" : "/hyprland.log");
+    logFile = "/tmp/hypr/" + IS + (ISDEBUG ? "/hyprlandd.log" : "/hyprland.log");
 }
 
 void Debug::wlrLog(wlr_log_importance level, const char* fmt, va_list args) {
@@ -33,60 +32,3 @@ void Debug::wlrLog(wlr_log_importance level, const char* fmt, va_list args) {
     if (!disableStdout)
         std::cout << output << "\n";
 }
-
-void Debug::log(LogLevel level, std::string str) {
-    if (level == TRACE && !trace)
-        return;
-
-    if (shuttingDown)
-        return;
-
-    std::string coloredStr = str;
-    switch (level) {
-        case LOG:
-            str        = "[LOG] " + str;
-            coloredStr = str;
-            break;
-        case WARN:
-            str        = "[WARN] " + str;
-            coloredStr = "\033[1;33m" + str + "\033[0m"; // yellow
-            break;
-        case ERR:
-            str        = "[ERR] " + str;
-            coloredStr = "\033[1;31m" + str + "\033[0m"; // red
-            break;
-        case CRIT:
-            str        = "[CRITICAL] " + str;
-            coloredStr = "\033[1;35m" + str + "\033[0m"; // magenta
-            break;
-        case INFO:
-            str        = "[INFO] " + str;
-            coloredStr = "\033[1;32m" + str + "\033[0m"; // green
-            break;
-        case TRACE:
-            str        = "[TRACE] " + str;
-            coloredStr = "\033[1;34m" + str + "\033[0m"; // blue
-            break;
-        default: break;
-    }
-
-    rollingLog += str + "\n";
-    if (rollingLog.size() > ROLLING_LOG_SIZE)
-        rollingLog = rollingLog.substr(rollingLog.size() - ROLLING_LOG_SIZE);
-
-    if (RollingLogFollow::Get().IsRunning())
-        RollingLogFollow::Get().AddLog(str);
-
-    if (!disableLogs || !**disableLogs) {
-        // log to a file
-        std::ofstream ofs;
-        ofs.open(logFile, std::ios::out | std::ios::app);
-        ofs << str << "\n";
-
-        ofs.close();
-    }
-
-    // log it to the stdout too.
-    if (!disableStdout)
-        std::cout << ((coloredLogs && !**coloredLogs) ? str : coloredStr) << "\n";
-}

src/debug/Log.hpp

@@ -27,15 +27,10 @@ namespace Debug {
     inline bool            disableStdout = false;
     inline bool            trace         = false;
     inline bool            shuttingDown  = false;
-    inline int64_t* const* coloredLogs   = nullptr;
 
     inline std::string     rollingLog = ""; // rolling log contains the ROLLING_LOG_SIZE tail of the log
 
     void                   init(const std::string& IS);
-
-    //
-    void log(LogLevel level, std::string str);
-
     template <typename... Args>
     void log(LogLevel level, std::format_string<Args...> fmt, Args&&... args) {
         if (level == TRACE && !trace)
@@ -46,16 +41,25 @@ namespace Debug {
 
         std::string logMsg = "";
 
+        switch (level) {
+            case LOG: logMsg += "[LOG] "; break;
+            case WARN: logMsg += "[WARN] "; break;
+            case ERR: logMsg += "[ERR] "; break;
+            case CRIT: logMsg += "[CRITICAL] "; break;
+            case INFO: logMsg += "[INFO] "; break;
+            case TRACE: logMsg += "[TRACE] "; break;
+            default: break;
+        }
+
         // print date and time to the ofs
         if (disableTime && !**disableTime) {
 #ifndef _LIBCPP_VERSION
-            const auto zt  = std::chrono::zoned_time{std::chrono::current_zone(), std::chrono::system_clock::now()};
-            const auto hms = std::chrono::hh_mm_ss{zt.get_local_time() - std::chrono::floor<std::chrono::days>(zt.get_local_time())};
+            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
-            // TODO: current clang 17 does not support `zoned_time`, remove this once clang 19 is ready
-            const auto hms = std::chrono::hh_mm_ss{std::chrono::system_clock::now() - std::chrono::floor<std::chrono::days>(std::chrono::system_clock::now())};
+            auto c = std::chrono::hh_mm_ss{std::chrono::system_clock::now() - std::chrono::floor<std::chrono::days>(std::chrono::system_clock::now())};
+            logMsg += std::format("{:%H}:{:%M}:{:%S}", c.hours(), c.minutes(), c.subseconds());
+
 #endif
-            logMsg += std::format("[{}] ", hms);
         }
 
         // no need for try {} catch {} because std::format_string<Args...> ensures that vformat never throw std::format_error
@@ -65,7 +69,22 @@ namespace Debug {
         // 3. this is actually what std::format in stdlib does
         logMsg += std::vformat(fmt.get(), std::make_format_args(args...));
 
-        log(level, logMsg);
+        rollingLog += logMsg + "\n";
+        if (rollingLog.size() > ROLLING_LOG_SIZE)
+            rollingLog = rollingLog.substr(rollingLog.size() - ROLLING_LOG_SIZE);
+
+        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)
+            std::cout << logMsg << "\n";
     }
 
     void wlrLog(wlr_log_importance level, const char* fmt, va_list args);

src/debug/RollingLogFollow.hpp

@@ -1,65 +0,0 @@
-#pragma once
-
-#include <shared_mutex>
-
-namespace Debug {
-    struct RollingLogFollow {
-        std::unordered_map<int, std::string> socketToRollingLogFollowQueue;
-        std::shared_mutex                    m;
-        bool                                 running                    = false;
-        static constexpr size_t              ROLLING_LOG_FOLLOW_TOO_BIG = 8192;
-
-        // Returns true if the queue is empty for the given socket
-        bool isEmpty(int socket) {
-            std::shared_lock<std::shared_mutex> r(m);
-            return socketToRollingLogFollowQueue[socket].empty();
-        }
-
-        std::string DebugInfo() {
-            std::shared_lock<std::shared_mutex> r(m);
-            return std::format("RollingLogFollow, got {} connections", socketToRollingLogFollowQueue.size());
-        }
-
-        std::string GetLog(int socket) {
-            std::unique_lock<std::shared_mutex> w(m);
-
-            const std::string                   ret = socketToRollingLogFollowQueue[socket];
-            socketToRollingLogFollowQueue[socket]   = "";
-
-            return ret;
-        };
-
-        void AddLog(std::string log) {
-            std::unique_lock<std::shared_mutex> w(m);
-            running = true;
-            std::vector<int> to_erase;
-            for (const auto& p : socketToRollingLogFollowQueue)
-                socketToRollingLogFollowQueue[p.first] += log + "\n";
-        }
-
-        bool IsRunning() {
-            std::shared_lock<std::shared_mutex> r(m);
-            return running;
-        }
-
-        void StopFor(int socket) {
-            std::unique_lock<std::shared_mutex> w(m);
-            socketToRollingLogFollowQueue.erase(socket);
-            if (socketToRollingLogFollowQueue.empty())
-                running = false;
-        }
-
-        void StartFor(int socket) {
-            std::unique_lock<std::shared_mutex> w(m);
-            socketToRollingLogFollowQueue[socket] = std::format("[LOG] Following log to socket: {} started\n", socket);
-            running                               = true;
-        }
-
-        static RollingLogFollow& Get() {
-            static RollingLogFollow     instance;
-            static std::mutex           gm;
-            std::lock_guard<std::mutex> lock(gm);
-            return instance;
-        };
-    };
-}

src/defines.hpp

@@ -3,4 +3,3 @@
 #include "helpers/WLListener.hpp"
 #include "helpers/Color.hpp"
 #include "macros.hpp"
-#include "desktop/DesktopTypes.hpp"

src/desktop/Constraint.cpp

@@ -0,0 +1,128 @@
+#include "Constraint.hpp"
+#include "WLSurface.hpp"
+#include "../Compositor.hpp"
+
+CConstraint::CConstraint(wlr_pointer_constraint_v1* constraint, CWLSurface* owner) : m_pOwner(owner), m_pConstraint(constraint) {
+    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;
+
+    wlr_pointer_constraint_v1_send_deactivated(m_pConstraint);
+
+    if (isLocked())
+        g_pCompositor->warpCursorTo(logicPositionHint(), true);
+
+    if (m_pConstraint->lifetime == ZWP_POINTER_CONSTRAINTS_V1_LIFETIME_ONESHOT)
+        m_bDead = true;
+}
+
+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

@@ -1,20 +0,0 @@
-#pragma once
-#include "../macros.hpp"
-class CWorkspace;
-class CWindow;
-class CLayerSurface;
-
-/* Shared pointer to a workspace */
-typedef SP<CWorkspace> PHLWORKSPACE;
-/* Weak pointer to a workspace */
-typedef WP<CWorkspace> PHLWORKSPACEREF;
-
-/* Shared pointer to a window */
-typedef SP<CWindow> PHLWINDOW;
-/* Weak pointer to a window */
-typedef WP<CWindow> PHLWINDOWREF;
-
-/* Shared pointer to a layer surface */
-typedef SP<CLayerSurface> PHLLS;
-/* Weak pointer to a layer surface */
-typedef WP<CLayerSurface> PHLLSREF;

src/desktop/LayerSurface.cpp

@@ -1,522 +0,0 @@
-#include "LayerSurface.hpp"
-#include "../Compositor.hpp"
-#include "../events/Events.hpp"
-#include "../protocols/LayerShell.hpp"
-#include "../protocols/core/Compositor.hpp"
-#include "../managers/SeatManager.hpp"
-
-PHLLS CLayerSurface::create(SP<CLayerShellResource> resource) {
-    PHLLS     pLS = SP<CLayerSurface>(new CLayerSurface(resource));
-
-    CMonitor* pMonitor = resource->monitor.empty() ? g_pCompositor->getMonitorFromCursor() : g_pCompositor->getMonitorFromName(resource->monitor);
-
-    pLS->surface->assign(resource->surface.lock(), pLS);
-
-    if (!pMonitor) {
-        Debug::log(ERR, "New LS has no monitor??");
-        return pLS;
-    }
-
-    if (pMonitor->pMirrorOf)
-        pMonitor = g_pCompositor->m_vMonitors.front().get();
-
-    pLS->self = pLS;
-
-    pLS->szNamespace = resource->layerNamespace;
-
-    pLS->layer     = resource->current.layer;
-    pLS->popupHead = std::make_unique<CPopup>(pLS);
-    pLS->monitorID = pMonitor->ID;
-    pMonitor->m_aLayerSurfaceLayers[resource->current.layer].emplace_back(pLS);
-
-    pLS->forceBlur = g_pConfigManager->shouldBlurLS(pLS->szNamespace);
-
-    pLS->alpha.create(g_pConfigManager->getAnimationPropertyConfig("fadeLayersIn"), pLS, AVARDAMAGE_ENTIRE);
-    pLS->realPosition.create(g_pConfigManager->getAnimationPropertyConfig("layersIn"), pLS, AVARDAMAGE_ENTIRE);
-    pLS->realSize.create(g_pConfigManager->getAnimationPropertyConfig("layersIn"), pLS, AVARDAMAGE_ENTIRE);
-    pLS->alpha.registerVar();
-    pLS->realPosition.registerVar();
-    pLS->realSize.registerVar();
-
-    pLS->registerCallbacks();
-
-    pLS->alpha.setValueAndWarp(0.f);
-
-    Debug::log(LOG, "LayerSurface {:x} (namespace {} layer {}) created on monitor {}", (uintptr_t)resource.get(), resource->layerNamespace, (int)pLS->layer, pMonitor->szName);
-
-    return pLS;
-}
-
-void CLayerSurface::registerCallbacks() {
-    alpha.setUpdateCallback([this](void*) {
-        if (dimAround)
-            g_pHyprRenderer->damageMonitor(g_pCompositor->getMonitorFromID(monitorID));
-    });
-}
-
-CLayerSurface::CLayerSurface(SP<CLayerShellResource> resource_) : layerSurface(resource_) {
-    listeners.commit  = layerSurface->events.commit.registerListener([this](std::any d) { onCommit(); });
-    listeners.map     = layerSurface->events.map.registerListener([this](std::any d) { onMap(); });
-    listeners.unmap   = layerSurface->events.unmap.registerListener([this](std::any d) { onUnmap(); });
-    listeners.destroy = layerSurface->events.destroy.registerListener([this](std::any d) { onDestroy(); });
-
-    surface = CWLSurface::create();
-}
-
-CLayerSurface::~CLayerSurface() {
-    if (!g_pHyprOpenGL)
-        return;
-
-    if (surface)
-        surface->unassign();
-    g_pHyprRenderer->makeEGLCurrent();
-    std::erase_if(g_pHyprOpenGL->m_mLayerFramebuffers, [&](const auto& other) { return other.first.expired() || other.first.lock() == self.lock(); });
-}
-
-void CLayerSurface::onDestroy() {
-    Debug::log(LOG, "LayerSurface {:x} destroyed", (uintptr_t)layerSurface);
-
-    const auto PMONITOR = g_pCompositor->getMonitorFromID(monitorID);
-
-    if (!g_pCompositor->getMonitorFromID(monitorID))
-        Debug::log(WARN, "Layersurface destroyed on an invalid monitor (removed?)");
-
-    if (!fadingOut) {
-        if (mapped) {
-            Debug::log(LOG, "Forcing an unmap of a LS that did a straight destroy!");
-            onUnmap();
-        } else {
-            Debug::log(LOG, "Removing LayerSurface that wasn't mapped.");
-            alpha.setValueAndWarp(0.f);
-            fadingOut = true;
-            g_pCompositor->addToFadingOutSafe(self.lock());
-        }
-    }
-
-    popupHead.reset();
-
-    noProcess = true;
-
-    // rearrange to fix the reserved areas
-    if (PMONITOR) {
-        g_pHyprRenderer->arrangeLayersForMonitor(PMONITOR->ID);
-        PMONITOR->scheduledRecalc = true;
-
-        // and damage
-        CBox geomFixed = {geometry.x + PMONITOR->vecPosition.x, geometry.y + PMONITOR->vecPosition.y, geometry.width, geometry.height};
-        g_pHyprRenderer->damageBox(&geomFixed);
-    }
-
-    readyToDelete = true;
-    layerSurface.reset();
-    if (surface)
-        surface->unassign();
-}
-
-void CLayerSurface::onMap() {
-    Debug::log(LOG, "LayerSurface {:x} mapped", (uintptr_t)layerSurface);
-
-    mapped        = true;
-    interactivity = layerSurface->current.interactivity;
-
-    // this layer might be re-mapped.
-    fadingOut = false;
-    g_pCompositor->removeFromFadingOutSafe(self.lock());
-
-    // fix if it changed its mon
-    const auto PMONITOR = g_pCompositor->getMonitorFromID(monitorID);
-
-    if (!PMONITOR)
-        return;
-
-    applyRules();
-
-    PMONITOR->scheduledRecalc = true;
-
-    g_pHyprRenderer->arrangeLayersForMonitor(PMONITOR->ID);
-
-    surface->resource()->enter(PMONITOR->self.lock());
-
-    const bool ISEXCLUSIVE = layerSurface->current.interactivity == ZWLR_LAYER_SURFACE_V1_KEYBOARD_INTERACTIVITY_EXCLUSIVE;
-
-    if (ISEXCLUSIVE)
-        g_pInputManager->m_dExclusiveLSes.push_back(self);
-
-    const bool GRABSFOCUS = ISEXCLUSIVE ||
-        (layerSurface->current.interactivity != ZWLR_LAYER_SURFACE_V1_KEYBOARD_INTERACTIVITY_NONE &&
-         // don't focus if constrained
-         (g_pSeatManager->mouse.expired() || !g_pInputManager->isConstrained()));
-
-    if (GRABSFOCUS) {
-        // TODO: use the new superb really very cool grab
-        g_pSeatManager->setGrab(nullptr);
-        g_pInputManager->releaseAllMouseButtons();
-        g_pCompositor->focusSurface(surface->resource());
-
-        const auto LOCAL = g_pInputManager->getMouseCoordsInternal() - Vector2D(geometry.x + PMONITOR->vecPosition.x, geometry.y + PMONITOR->vecPosition.y);
-        g_pSeatManager->setPointerFocus(surface->resource(), LOCAL);
-        g_pInputManager->m_bEmptyFocusCursorSet = false;
-    }
-
-    position = Vector2D(geometry.x, geometry.y);
-
-    CBox geomFixed = {geometry.x + PMONITOR->vecPosition.x, geometry.y + PMONITOR->vecPosition.y, geometry.width, geometry.height};
-    g_pHyprRenderer->damageBox(&geomFixed);
-    const auto WORKSPACE  = PMONITOR->activeWorkspace;
-    const bool FULLSCREEN = WORKSPACE->m_bHasFullscreenWindow && WORKSPACE->m_efFullscreenMode == FULLSCREEN_FULL;
-
-    startAnimation(!(layer == ZWLR_LAYER_SHELL_V1_LAYER_TOP && FULLSCREEN && !GRABSFOCUS));
-    readyToDelete = false;
-    fadingOut     = false;
-
-    g_pEventManager->postEvent(SHyprIPCEvent{"openlayer", szNamespace});
-    EMIT_HOOK_EVENT("openLayer", self.lock());
-
-    g_pCompositor->setPreferredScaleForSurface(surface->resource(), PMONITOR->scale);
-    g_pCompositor->setPreferredTransformForSurface(surface->resource(), PMONITOR->transform);
-}
-
-void CLayerSurface::onUnmap() {
-    Debug::log(LOG, "LayerSurface {:x} unmapped", (uintptr_t)layerSurface);
-
-    g_pEventManager->postEvent(SHyprIPCEvent{"closelayer", layerSurface->layerNamespace});
-    EMIT_HOOK_EVENT("closeLayer", self.lock());
-
-    std::erase_if(g_pInputManager->m_dExclusiveLSes, [this](const auto& other) { return !other.lock() || other.lock() == self.lock(); });
-
-    if (!g_pCompositor->getMonitorFromID(monitorID) || g_pCompositor->m_bUnsafeState) {
-        Debug::log(WARN, "Layersurface unmapping on invalid monitor (removed?) ignoring.");
-
-        g_pCompositor->addToFadingOutSafe(self.lock());
-
-        mapped = false;
-
-        startAnimation(false);
-        return;
-    }
-
-    // make a snapshot and start fade
-    g_pHyprOpenGL->makeLayerSnapshot(self.lock());
-
-    startAnimation(false);
-
-    mapped = false;
-
-    g_pCompositor->addToFadingOutSafe(self.lock());
-
-    const auto PMONITOR = g_pCompositor->getMonitorFromID(monitorID);
-
-    const bool WASLASTFOCUS = g_pCompositor->m_pLastFocus == surface->resource();
-
-    if (!PMONITOR)
-        return;
-
-    // refocus if needed
-    if (WASLASTFOCUS)
-        g_pInputManager->refocusLastWindow(PMONITOR);
-
-    CBox geomFixed = {geometry.x + PMONITOR->vecPosition.x, geometry.y + PMONITOR->vecPosition.y, geometry.width, geometry.height};
-    g_pHyprRenderer->damageBox(&geomFixed);
-
-    geomFixed = {geometry.x + (int)PMONITOR->vecPosition.x, geometry.y + (int)PMONITOR->vecPosition.y, (int)layerSurface->surface->current.size.x,
-                 (int)layerSurface->surface->current.size.y};
-    g_pHyprRenderer->damageBox(&geomFixed);
-
-    g_pInputManager->sendMotionEventsToFocused();
-
-    g_pHyprRenderer->arrangeLayersForMonitor(PMONITOR->ID);
-}
-
-void CLayerSurface::onCommit() {
-    if (!layerSurface)
-        return;
-
-    if (!mapped) {
-        // we're re-mapping if this is the case
-        if (layerSurface->surface && !layerSurface->surface->current.buffer) {
-            fadingOut = false;
-            geometry  = {};
-            g_pHyprRenderer->arrangeLayersForMonitor(monitorID);
-        }
-
-        return;
-    }
-
-    const auto PMONITOR = g_pCompositor->getMonitorFromID(monitorID);
-
-    if (!PMONITOR)
-        return;
-
-    if (layer == ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND || layer == ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM)
-        g_pHyprOpenGL->markBlurDirtyForMonitor(PMONITOR); // so that blur is recalc'd
-
-    CBox geomFixed = {geometry.x, geometry.y, geometry.width, geometry.height};
-    g_pHyprRenderer->damageBox(&geomFixed);
-
-    if (layerSurface->current.committed != 0) {
-        if (layerSurface->current.committed & CLayerShellResource::eCommittedState::STATE_LAYER) {
-
-            for (auto it = PMONITOR->m_aLayerSurfaceLayers[layer].begin(); it != PMONITOR->m_aLayerSurfaceLayers[layer].end(); it++) {
-                if (*it == self) {
-                    if (layerSurface->current.layer == layer)
-                        break;
-                    PMONITOR->m_aLayerSurfaceLayers[layerSurface->current.layer].emplace_back(*it);
-                    PMONITOR->m_aLayerSurfaceLayers[layer].erase(it);
-                    break;
-                }
-            }
-
-            layer = layerSurface->current.layer;
-
-            if (layer == ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND || layer == ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM)
-                g_pHyprOpenGL->markBlurDirtyForMonitor(PMONITOR); // so that blur is recalc'd
-        }
-
-        g_pHyprRenderer->arrangeLayersForMonitor(PMONITOR->ID);
-
-        PMONITOR->scheduledRecalc = true;
-    } else {
-        position = Vector2D(geometry.x, geometry.y);
-
-        // update geom if it changed
-        if (layerSurface->surface->current.scale == 1 && PMONITOR->scale != 1.f && layerSurface->surface->current.viewport.hasDestination) {
-            // fractional scaling. Dirty hack.
-            geometry = {geometry.pos(), layerSurface->surface->current.viewport.destination};
-        } else {
-            // this is because some apps like e.g. rofi-lbonn can't fucking use the protocol correctly.
-            geometry = {geometry.pos(), layerSurface->surface->current.size};
-        }
-    }
-
-    if (realPosition.goal() != geometry.pos()) {
-        if (realPosition.isBeingAnimated())
-            realPosition = geometry.pos();
-        else
-            realPosition.setValueAndWarp(geometry.pos());
-    }
-    if (realSize.goal() != geometry.size()) {
-        if (realSize.isBeingAnimated())
-            realSize = geometry.size();
-        else
-            realSize.setValueAndWarp(geometry.size());
-    }
-
-    if (mapped) {
-        const bool WASLASTFOCUS = g_pCompositor->m_pLastFocus == surface->resource();
-        const bool WASEXCLUSIVE = interactivity == ZWLR_LAYER_SURFACE_V1_KEYBOARD_INTERACTIVITY_EXCLUSIVE;
-        const bool ISEXCLUSIVE  = layerSurface->current.interactivity == ZWLR_LAYER_SURFACE_V1_KEYBOARD_INTERACTIVITY_EXCLUSIVE;
-
-        if (!WASEXCLUSIVE && ISEXCLUSIVE)
-            g_pInputManager->m_dExclusiveLSes.push_back(self);
-        else if (WASEXCLUSIVE && !ISEXCLUSIVE)
-            std::erase_if(g_pInputManager->m_dExclusiveLSes, [this](const auto& other) { return !other.lock() || other.lock() == self.lock(); });
-
-        // if the surface was focused and interactive but now isn't, refocus
-        if (WASLASTFOCUS && !layerSurface->current.interactivity) {
-            // moveMouseUnified won't focus non interactive layers but it won't unfocus them either,
-            // so unfocus the surface here.
-            g_pCompositor->focusSurface(nullptr);
-            g_pInputManager->refocusLastWindow(g_pCompositor->getMonitorFromID(monitorID));
-        } else if (!WASEXCLUSIVE && ISEXCLUSIVE) {
-            // if now exclusive and not previously
-            g_pSeatManager->setGrab(nullptr);
-            g_pInputManager->releaseAllMouseButtons();
-            g_pCompositor->focusSurface(surface->resource());
-
-            const auto LOCAL = g_pInputManager->getMouseCoordsInternal() - Vector2D(geometry.x + PMONITOR->vecPosition.x, geometry.y + PMONITOR->vecPosition.y);
-            g_pSeatManager->setPointerFocus(surface->resource(), LOCAL);
-            g_pInputManager->m_bEmptyFocusCursorSet = false;
-        }
-    }
-
-    interactivity = layerSurface->current.interactivity;
-
-    g_pHyprRenderer->damageSurface(surface->resource(), position.x, position.y);
-
-    g_pCompositor->setPreferredScaleForSurface(surface->resource(), PMONITOR->scale);
-    g_pCompositor->setPreferredTransformForSurface(surface->resource(), PMONITOR->transform);
-}
-
-void CLayerSurface::applyRules() {
-    noAnimations     = false;
-    forceBlur        = false;
-    ignoreAlpha      = false;
-    ignoreAlphaValue = 0.f;
-    dimAround        = false;
-    xray             = -1;
-    animationStyle.reset();
-
-    for (auto& rule : g_pConfigManager->getMatchingRules(self.lock())) {
-        if (rule.rule == "noanim")
-            noAnimations = true;
-        else if (rule.rule == "blur")
-            forceBlur = true;
-        else if (rule.rule == "blurpopups")
-            forceBlurPopups = true;
-        else if (rule.rule.starts_with("ignorealpha") || rule.rule.starts_with("ignorezero")) {
-            const auto  FIRST_SPACE_POS = rule.rule.find_first_of(' ');
-            std::string alphaValue      = "";
-            if (FIRST_SPACE_POS != std::string::npos)
-                alphaValue = rule.rule.substr(FIRST_SPACE_POS + 1);
-
-            try {
-                ignoreAlpha = true;
-                if (!alphaValue.empty())
-                    ignoreAlphaValue = std::stof(alphaValue);
-            } catch (...) { Debug::log(ERR, "Invalid value passed to ignoreAlpha"); }
-        } else if (rule.rule == "dimaround") {
-            dimAround = true;
-        } else if (rule.rule.starts_with("xray")) {
-            CVarList vars{rule.rule, 0, ' '};
-            try {
-                xray = configStringToInt(vars[1]);
-            } catch (...) {}
-        } else if (rule.rule.starts_with("animation")) {
-            CVarList vars{rule.rule, 2, 's'};
-            animationStyle = vars[1];
-        }
-    }
-}
-
-void CLayerSurface::startAnimation(bool in, bool instant) {
-    const auto ANIMSTYLE = animationStyle.value_or(realPosition.m_pConfig->pValues->internalStyle);
-    if (in) {
-        realPosition.m_pConfig = g_pConfigManager->getAnimationPropertyConfig("layersIn");
-        realSize.m_pConfig     = g_pConfigManager->getAnimationPropertyConfig("layersIn");
-        alpha.m_pConfig        = g_pConfigManager->getAnimationPropertyConfig("fadeLayersIn");
-    } else {
-        realPosition.m_pConfig = g_pConfigManager->getAnimationPropertyConfig("layersOut");
-        realSize.m_pConfig     = g_pConfigManager->getAnimationPropertyConfig("layersOut");
-        alpha.m_pConfig        = g_pConfigManager->getAnimationPropertyConfig("fadeLayersOut");
-    }
-
-    if (ANIMSTYLE.starts_with("slide")) {
-        // get closest edge
-        const auto MIDDLE = geometry.middle();
-
-        const auto PMONITOR = g_pCompositor->getMonitorFromVector(MIDDLE);
-
-        int        force = -1;
-
-        CVarList   args(ANIMSTYLE, 0, 's');
-        if (args.size() > 1) {
-            const auto ARG2 = args[1];
-            if (ARG2 == "top")
-                force = 0;
-            else if (ARG2 == "bottom")
-                force = 1;
-            else if (ARG2 == "left")
-                force = 2;
-            else if (ARG2 == "right")
-                force = 3;
-        }
-
-        const std::array<Vector2D, 4> edgePoints = {
-            PMONITOR->vecPosition + Vector2D{PMONITOR->vecSize.x / 2, 0.0},
-            PMONITOR->vecPosition + Vector2D{PMONITOR->vecSize.x / 2, PMONITOR->vecSize.y},
-            PMONITOR->vecPosition + Vector2D{0.0, PMONITOR->vecSize.y},
-            PMONITOR->vecPosition + Vector2D{PMONITOR->vecSize.x, PMONITOR->vecSize.y / 2},
-        };
-
-        float closest = std::numeric_limits<float>::max();
-        int   leader  = force;
-        if (leader == -1) {
-            for (size_t i = 0; i < 4; ++i) {
-                float dist = MIDDLE.distance(edgePoints[i]);
-                if (dist < closest) {
-                    leader  = i;
-                    closest = dist;
-                }
-            }
-        }
-
-        realSize.setValueAndWarp(geometry.size());
-        alpha.setValueAndWarp(in ? 0.f : 1.f);
-        alpha = in ? 1.f : 0.f;
-
-        Vector2D prePos;
-
-        switch (leader) {
-            case 0:
-                // TOP
-                prePos = {geometry.x, PMONITOR->vecPosition.y - geometry.h};
-                break;
-            case 1:
-                // BOTTOM
-                prePos = {geometry.x, PMONITOR->vecPosition.y + PMONITOR->vecSize.y};
-                break;
-            case 2:
-                // LEFT
-                prePos = {PMONITOR->vecPosition.x - geometry.w, geometry.y};
-                break;
-            case 3:
-                // RIGHT
-                prePos = {PMONITOR->vecPosition.x + PMONITOR->vecSize.x, geometry.y};
-                break;
-            default: UNREACHABLE();
-        }
-
-        if (in) {
-            realPosition.setValueAndWarp(prePos);
-            realPosition = geometry.pos();
-        } else {
-            realPosition.setValueAndWarp(geometry.pos());
-            realPosition = prePos;
-        }
-
-    } else if (ANIMSTYLE.starts_with("popin")) {
-        float minPerc = 0.f;
-        if (ANIMSTYLE.find("%") != std::string::npos) {
-            try {
-                auto percstr = ANIMSTYLE.substr(ANIMSTYLE.find_last_of(' '));
-                minPerc      = std::stoi(percstr.substr(0, percstr.length() - 1));
-            } catch (std::exception& e) {
-                ; // oops
-            }
-        }
-
-        minPerc *= 0.01;
-
-        const auto GOALSIZE = (geometry.size() * minPerc).clamp({5, 5});
-        const auto GOALPOS  = geometry.pos() + (geometry.size() - GOALSIZE) / 2.f;
-
-        alpha.setValueAndWarp(in ? 0.f : 1.f);
-        alpha = in ? 1.f : 0.f;
-
-        if (in) {
-            realSize.setValueAndWarp(GOALSIZE);
-            realPosition.setValueAndWarp(GOALPOS);
-            realSize     = geometry.size();
-            realPosition = geometry.pos();
-        } else {
-            realSize.setValueAndWarp(geometry.size());
-            realPosition.setValueAndWarp(geometry.pos());
-            realSize     = GOALSIZE;
-            realPosition = GOALPOS;
-        }
-    } else {
-        // fade
-        realPosition.setValueAndWarp(geometry.pos());
-        realSize.setValueAndWarp(geometry.size());
-        alpha = in ? 1.f : 0.f;
-    }
-
-    if (!in)
-        fadingOut = true;
-}
-
-bool CLayerSurface::isFadedOut() {
-    if (!fadingOut)
-        return false;
-
-    return !realPosition.isBeingAnimated() && !realSize.isBeingAnimated() && !alpha.isBeingAnimated();
-}
-
-int CLayerSurface::popupsCount() {
-    if (!layerSurface || !mapped || fadingOut)
-        return 0;
-
-    int no = -1; // we have one dummy
-    popupHead->breadthfirst([](CPopup* p, void* data) { *(int*)data += 1; }, &no);
-    return no;
-}

src/desktop/LayerSurface.hpp

@@ -1,87 +0,0 @@
-#pragma once
-
-#include <string>
-#include "../defines.hpp"
-#include "WLSurface.hpp"
-#include "../helpers/AnimatedVariable.hpp"
-
-struct SLayerRule {
-    std::string targetNamespace = "";
-    std::string rule            = "";
-};
-
-class CLayerShellResource;
-
-class CLayerSurface {
-  public:
-    static PHLLS create(SP<CLayerShellResource>);
-
-  private:
-    CLayerSurface(SP<CLayerShellResource>);
-
-  public:
-    ~CLayerSurface();
-
-    void                        applyRules();
-    void                        startAnimation(bool in, bool instant = false);
-    bool                        isFadedOut();
-    int                         popupsCount();
-
-    CAnimatedVariable<Vector2D> realPosition;
-    CAnimatedVariable<Vector2D> realSize;
-    CAnimatedVariable<float>    alpha;
-
-    WP<CLayerShellResource>     layerSurface;
-    wl_list                     link;
-
-    // the header providing the enum type cannot be imported here
-    int                        interactivity = 0;
-
-    SP<CWLSurface>             surface;
-
-    bool                       mapped = false;
-    uint32_t                   layer  = 0;
-
-    int                        monitorID = -1;
-
-    bool                       fadingOut     = false;
-    bool                       readyToDelete = false;
-    bool                       noProcess     = false;
-    bool                       noAnimations  = false;
-
-    bool                       forceBlur        = false;
-    bool                       forceBlurPopups  = false;
-    int                        xray             = -1;
-    bool                       ignoreAlpha      = false;
-    float                      ignoreAlphaValue = 0.f;
-    bool                       dimAround        = false;
-
-    std::optional<std::string> animationStyle;
-
-    PHLLSREF                   self;
-
-    CBox                       geometry = {0, 0, 0, 0};
-    Vector2D                   position;
-    std::string                szNamespace = "";
-    std::unique_ptr<CPopup>    popupHead;
-
-    void                       onDestroy();
-    void                       onMap();
-    void                       onUnmap();
-    void                       onCommit();
-
-  private:
-    struct {
-        CHyprSignalListener destroy;
-        CHyprSignalListener map;
-        CHyprSignalListener unmap;
-        CHyprSignalListener commit;
-    } listeners;
-
-    void registerCallbacks();
-
-    // For the list lookup
-    bool operator==(const CLayerSurface& rhs) const {
-        return layerSurface == rhs.layerSurface && monitorID == rhs.monitorID;
-    }
-};

src/desktop/Popup.cpp

@@ -1,62 +1,94 @@
 #include "Popup.hpp"
-#include "../config/ConfigValue.hpp"
 #include "../Compositor.hpp"
-#include "../protocols/LayerShell.hpp"
-#include "../protocols/XDGShell.hpp"
-#include "../protocols/core/Compositor.hpp"
-#include <ranges>
 
-CPopup::CPopup(PHLWINDOW pOwner) : m_pWindowOwner(pOwner) {
+CPopup::CPopup(CWindow* pOwner) : m_pWindowOwner(pOwner) {
     initAllSignals();
 }
 
-CPopup::CPopup(PHLLS pOwner) : m_pLayerOwner(pOwner) {
+CPopup::CPopup(SLayerSurface* pOwner) : m_pLayerOwner(pOwner) {
     initAllSignals();
 }
 
-CPopup::CPopup(SP<CXDGPopupResource> popup, CPopup* pOwner) : m_pParent(pOwner), m_pResource(popup) {
-    m_pWLSurface = CWLSurface::create();
-    m_pWLSurface->assign(popup->surface->surface.lock(), this);
+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 = popup->surface->current.geometry.size();
+    m_vLastSize = {m_pWLR->current.geometry.width, m_pWLR->current.geometry.height};
     unconstrain();
 
     initAllSignals();
 }
 
 CPopup::~CPopup() {
-    if (m_pWLSurface)
-        m_pWLSurface->unassign();
+    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_pResource) {
-        if (!m_pWindowOwner.expired())
-            listeners.newPopup = m_pWindowOwner->m_pXDGSurface->events.newPopup.registerListener([this](std::any d) { this->onNewPopup(std::any_cast<SP<CXDGPopupResource>>(d)); });
-        else if (!m_pLayerOwner.expired())
-            listeners.newPopup = m_pLayerOwner->layerSurface->events.newPopup.registerListener([this](std::any d) { this->onNewPopup(std::any_cast<SP<CXDGPopupResource>>(d)); });
+    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;
     }
 
-    listeners.reposition = m_pResource->events.reposition.registerListener([this](std::any d) { this->onReposition(); });
-    listeners.map        = m_pResource->surface->events.map.registerListener([this](std::any d) { this->onMap(); });
-    listeners.unmap      = m_pResource->surface->events.unmap.registerListener([this](std::any d) { this->onUnmap(); });
-    listeners.dismissed  = m_pResource->events.dismissed.registerListener([this](std::any d) { this->onUnmap(); });
-    listeners.destroy    = m_pResource->surface->events.destroy.registerListener([this](std::any d) { this->onDestroy(); });
-    listeners.commit     = m_pResource->surface->events.commit.registerListener([this](std::any d) { this->onCommit(); });
-    listeners.newPopup   = m_pResource->surface->events.newPopup.registerListener([this](std::any d) { this->onNewPopup(std::any_cast<SP<CXDGPopupResource>>(d)); });
+    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(SP<CXDGPopupResource> popup) {
+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 {:x}", (uintptr_t)POPUP);
+    Debug::log(LOG, "New popup at wlr {:x} and hl {:x}", (uintptr_t)popup, (uintptr_t)POPUP);
 }
 
 void CPopup::onDestroy() {
@@ -69,17 +101,12 @@ void CPopup::onDestroy() {
 }
 
 void CPopup::onMap() {
-    if (m_bMapped)
-        return;
+    m_vLastSize       = {m_pWLR->base->current.geometry.width, m_pWLR->base->current.geometry.height};
+    const auto COORDS = coordsGlobal();
 
-    m_bMapped   = true;
-    m_vLastSize = m_pResource->surface->surface->current.size;
-
-    const auto COORDS   = coordsGlobal();
-    const auto PMONITOR = g_pCompositor->getMonitorFromVector(COORDS);
-
-    CBox       box = m_pWLSurface->resource()->extends();
-    box.translate(COORDS).expand(4);
+    CBox       box;
+    wlr_surface_get_extends(m_sWLSurface.wlr(), box.pWlr());
+    box.applyFromWlr().translate(COORDS).expand(4);
     g_pHyprRenderer->damageBox(&box);
 
     m_vLastPos = coordsRelativeToParent();
@@ -88,96 +115,57 @@ void CPopup::onMap() {
 
     m_pSubsurfaceHead = std::make_unique<CSubsurface>(this);
 
-    //unconstrain();
+    unconstrain();
     sendScale();
-    m_pResource->surface->surface->enter(PMONITOR->self.lock());
 
-    if (!m_pLayerOwner.expired() && m_pLayerOwner->layer < ZWLR_LAYER_SHELL_V1_LAYER_TOP)
+    if (m_pLayerOwner && m_pLayerOwner->layer < ZWLR_LAYER_SHELL_V1_LAYER_TOP)
         g_pHyprOpenGL->markBlurDirtyForMonitor(g_pCompositor->getMonitorFromID(m_pLayerOwner->layer));
 }
 
 void CPopup::onUnmap() {
-    if (!m_bMapped)
-        return;
-
-    if (!m_pResource || !m_pResource->surface) {
-        Debug::log(ERR, "CPopup: orphaned (no surface/resource) and unmaps??");
-        onDestroy();
-        return;
-    }
-
-    m_vLastSize = m_pResource->surface->surface->current.size;
-
+    m_vLastSize       = {m_pWLR->base->current.geometry.width, m_pWLR->base->current.geometry.height};
     const auto COORDS = coordsGlobal();
 
-    CBox       box = m_pWLSurface->resource()->extends();
-    box.translate(COORDS).expand(4);
+    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.expired() && m_pLayerOwner->layer < ZWLR_LAYER_SHELL_V1_LAYER_TOP)
+    if (m_pLayerOwner && m_pLayerOwner->layer < ZWLR_LAYER_SHELL_V1_LAYER_TOP)
         g_pHyprOpenGL->markBlurDirtyForMonitor(g_pCompositor->getMonitorFromID(m_pLayerOwner->layer));
-
-    // damage all children
-    breadthfirst(
-        [](CPopup* p, void* data) {
-            if (!p->m_pResource)
-                return;
-
-            auto box = CBox{p->coordsGlobal(), p->size()};
-            g_pHyprRenderer->damageBox(&box);
-        },
-        nullptr);
 }
 
 void CPopup::onCommit(bool ignoreSiblings) {
-    if (!m_pResource || !m_pResource->surface) {
-        Debug::log(ERR, "CPopup: orphaned (no surface/resource) and commits??");
-        onDestroy();
+    if (m_pWLR->base->initial_commit) {
+        wlr_xdg_surface_schedule_configure(m_pWLR->base);
         return;
     }
 
-    if (m_pResource->surface->initialCommit) {
-        m_pResource->surface->scheduleConfigure();
-        return;
-    }
-
-    if (!m_pWindowOwner.expired() && (!m_pWindowOwner->m_bIsMapped || !m_pWindowOwner->m_pWorkspace->m_bVisible)) {
-        m_vLastSize = m_pResource->surface->surface->current.size;
-
-        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.lock());
-        return;
-    }
-
-    if (!m_pResource->surface->mapped)
-        return;
-
     const auto COORDS      = coordsGlobal();
     const auto COORDSLOCAL = coordsRelativeToParent();
 
-    if (m_vLastSize != m_pResource->surface->surface->current.size || m_bRequestedReposition || m_vLastPos != COORDSLOCAL) {
+    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_pResource->surface->surface->current.size;
+        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)
+    if (!ignoreSiblings)
         m_pSubsurfaceHead->recheckDamageForSubsurfaces();
 
-    g_pHyprRenderer->damageSurface(m_pWLSurface->resource(), COORDS.x, COORDS.y);
+    g_pHyprRenderer->damageSurface(m_sWLSurface.wlr(), COORDS.x, COORDS.y);
 
     m_bRequestedReposition = false;
 
-    if (!m_pLayerOwner.expired() && m_pLayerOwner->layer < ZWLR_LAYER_SHELL_V1_LAYER_TOP)
+    if (m_pLayerOwner && m_pLayerOwner->layer < ZWLR_LAYER_SHELL_V1_LAYER_TOP)
         g_pHyprOpenGL->markBlurDirtyForMonitor(g_pCompositor->getMonitorFromID(m_pLayerOwner->layer));
 }
 
@@ -199,22 +187,20 @@ void CPopup::unconstrain() {
         return;
 
     CBox box = {PMONITOR->vecPosition.x - COORDS.x, PMONITOR->vecPosition.y - COORDS.y, PMONITOR->vecSize.x, PMONITOR->vecSize.y};
-    m_pResource->applyPositioning(box, COORDS - PMONITOR->vecPosition);
+    wlr_xdg_popup_unconstrain_from_box(m_pWLR, box.pWlr());
 }
 
 Vector2D CPopup::coordsRelativeToParent() {
     Vector2D offset;
 
-    if (!m_pResource)
-        return {};
+    CPopup*  current = this;
 
-    CPopup* current = this;
-    offset -= current->m_pResource->surface->current.geometry.pos();
+    offset -= {m_pWLR->base->current.geometry.x, m_pWLR->base->current.geometry.y};
 
-    while (current->m_pParent && current->m_pResource) {
+    while (current->m_pParent) {
 
-        offset += current->m_pWLSurface->resource()->current.offset;
-        offset += current->m_pResource->geometry.pos();
+        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;
     }
@@ -231,9 +217,9 @@ Vector2D CPopup::localToGlobal(const Vector2D& rel) {
 }
 
 Vector2D CPopup::t1ParentCoords() {
-    if (!m_pWindowOwner.expired())
+    if (m_pWindowOwner)
         return m_pWindowOwner->m_vRealPosition.value();
-    if (!m_pLayerOwner.expired())
+    if (m_pLayerOwner)
         return m_pLayerOwner->realPosition.value();
 
     ASSERT(false);
@@ -261,71 +247,10 @@ Vector2D CPopup::size() {
 }
 
 void CPopup::sendScale() {
-    if (!m_pWindowOwner.expired())
-        g_pCompositor->setPreferredScaleForSurface(m_pWLSurface->resource(), m_pWindowOwner->m_pWLSurface->m_fLastScale);
-    else if (!m_pLayerOwner.expired())
-        g_pCompositor->setPreferredScaleForSurface(m_pWLSurface->resource(), m_pLayerOwner->surface->m_fLastScale);
+    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();
 }
-
-bool CPopup::visible() {
-    if (!m_pWindowOwner.expired())
-        return g_pHyprRenderer->shouldRenderWindow(m_pWindowOwner.lock());
-    if (!m_pLayerOwner.expired())
-        return true;
-    if (m_pParent)
-        return m_pParent->visible();
-
-    return false;
-}
-
-void CPopup::bfHelper(std::vector<CPopup*> nodes, std::function<void(CPopup*, void*)> fn, void* data) {
-    for (auto& n : nodes) {
-        fn(n, data);
-    }
-
-    std::vector<CPopup*> nodes2;
-
-    for (auto& n : nodes) {
-        for (auto& c : n->m_vChildren) {
-            nodes2.push_back(c.get());
-        }
-    }
-
-    if (!nodes2.empty())
-        bfHelper(nodes2, fn, data);
-}
-
-void CPopup::breadthfirst(std::function<void(CPopup*, void*)> fn, void* data) {
-    std::vector<CPopup*> popups;
-    popups.push_back(this);
-    bfHelper(popups, fn, data);
-}
-
-CPopup* CPopup::at(const Vector2D& globalCoords, bool allowsInput) {
-    std::vector<CPopup*> popups;
-    breadthfirst([](CPopup* popup, void* data) { ((std::vector<CPopup*>*)data)->push_back(popup); }, &popups);
-
-    for (auto& p : popups | std::views::reverse) {
-        if (!p->m_pResource)
-            continue;
-
-        if (!allowsInput) {
-            const Vector2D offset = p->m_pResource ? (p->size() - p->m_pResource->geometry.size()) / 2.F : Vector2D{};
-            const Vector2D size   = p->m_pResource ? p->m_pResource->geometry.size() : p->size();
-
-            const auto     BOX = CBox{p->coordsGlobal() + offset, size};
-            if (BOX.containsPoint(globalCoords))
-                return p;
-        } else {
-            const Vector2D offset = p->m_pResource ? (p->size() - p->m_pResource->geometry.size()) / 2.F : Vector2D{};
-            const auto     REGION =
-                CRegion{p->m_pWLSurface->resource()->current.input}.intersect(CBox{{}, p->m_pWLSurface->resource()->current.size}).translate(p->coordsGlobal() + offset);
-            if (REGION.containsPoint(globalCoords))
-                return p;
-        }
-    }
-
-    return nullptr;
-}

src/desktop/Popup.hpp

@@ -3,82 +3,70 @@
 #include <vector>
 #include <memory>
 #include "Subsurface.hpp"
-#include "../helpers/signal/Signal.hpp"
 
-class CXDGPopupResource;
+struct SLayerSurface;
 
 class CPopup {
   public:
     // dummy head nodes
-    CPopup(PHLWINDOW pOwner);
-    CPopup(PHLLS pOwner);
+    CPopup(CWindow* pOwner);
+    CPopup(SLayerSurface* pOwner);
 
     // real nodes
-    CPopup(SP<CXDGPopupResource> popup, CPopup* pOwner);
+    CPopup(wlr_xdg_popup* popup, CPopup* pOwner);
 
     ~CPopup();
 
-    Vector2D coordsRelativeToParent();
-    Vector2D coordsGlobal();
+    Vector2D   coordsRelativeToParent();
+    Vector2D   coordsGlobal();
 
-    Vector2D size();
+    Vector2D   size();
 
-    void     onNewPopup(SP<CXDGPopupResource> popup);
-    void     onDestroy();
-    void     onMap();
-    void     onUnmap();
-    void     onCommit(bool ignoreSiblings = false);
-    void     onReposition();
+    void       onNewPopup(wlr_xdg_popup* popup);
+    void       onDestroy();
+    void       onMap();
+    void       onUnmap();
+    void       onCommit(bool ignoreSiblings = false);
+    void       onReposition();
 
-    void     recheckTree();
+    void       recheckTree();
 
-    bool     visible();
-
-    // will also loop over this node
-    void    breadthfirst(std::function<void(CPopup*, void*)> fn, void* data);
-    CPopup* at(const Vector2D& globalCoords, bool allowsInput = false);
-
-    //
-    SP<CWLSurface> m_pWLSurface;
+    CWLSurface m_sWLSurface;
 
   private:
     // T1 owners, each popup has to have one of these
-    PHLWINDOWREF m_pWindowOwner;
-    PHLLSREF     m_pLayerOwner;
+    CWindow*       m_pWindowOwner = nullptr;
+    SLayerSurface* m_pLayerOwner  = nullptr;
 
     // T2 owners
-    CPopup*               m_pParent = nullptr;
+    CPopup*        m_pParent = nullptr;
 
-    WP<CXDGPopupResource> m_pResource;
+    wlr_xdg_popup* m_pWLR = nullptr;
 
-    Vector2D              m_vLastSize = {};
-    Vector2D              m_vLastPos  = {};
+    Vector2D       m_vLastSize = {};
+    Vector2D       m_vLastPos  = {};
 
-    bool                  m_bRequestedReposition = false;
+    bool           m_bRequestedReposition = false;
 
-    bool                  m_bInert  = false;
-    bool                  m_bMapped = false;
+    bool           m_bInert = false;
 
     //
     std::vector<std::unique_ptr<CPopup>> m_vChildren;
     std::unique_ptr<CSubsurface>         m_pSubsurfaceHead;
 
-    struct {
-        CHyprSignalListener newPopup;
-        CHyprSignalListener destroy;
-        CHyprSignalListener map;
-        CHyprSignalListener unmap;
-        CHyprSignalListener commit;
-        CHyprSignalListener dismissed;
-        CHyprSignalListener reposition;
-    } listeners;
+    // signals
+    DYNLISTENER(newPopup);
+    DYNLISTENER(destroyPopup);
+    DYNLISTENER(mapPopup);
+    DYNLISTENER(unmapPopup);
+    DYNLISTENER(commitPopup);
+    DYNLISTENER(repositionPopup);
 
-    void        initAllSignals();
-    void        unconstrain();
-    void        recheckChildrenRecursive();
-    void        sendScale();
+    void     initAllSignals();
+    void     unconstrain();
+    void     recheckChildrenRecursive();
+    void     sendScale();
 
-    Vector2D    localToGlobal(const Vector2D& rel);
-    Vector2D    t1ParentCoords();
-    static void bfHelper(std::vector<CPopup*> nodes, std::function<void(CPopup*, void*)> fn, void* data);
+    Vector2D localToGlobal(const Vector2D& rel);
+    Vector2D t1ParentCoords();
 };

src/desktop/Subsurface.cpp

@@ -2,31 +2,29 @@
 #include "../events/Events.hpp"
 #include "../Compositor.hpp"
 #include "../config/ConfigValue.hpp"
-#include "../protocols/core/Compositor.hpp"
-#include "../protocols/core/Subcompositor.hpp"
 
-CSubsurface::CSubsurface(PHLWINDOW pOwner) : m_pWindowParent(pOwner) {
+static void onNewSubsurface(void* owner, void* data);
+
+CSubsurface::CSubsurface(CWindow* pOwner) : m_pWindowParent(pOwner) {
     initSignals();
-    initExistingSubsurfaces(pOwner->m_pWLSurface->resource());
+    initExistingSubsurfaces(pOwner->m_pWLSurface.wlr());
 }
 
 CSubsurface::CSubsurface(CPopup* pOwner) : m_pPopupParent(pOwner) {
     initSignals();
-    initExistingSubsurfaces(pOwner->m_pWLSurface->resource());
+    initExistingSubsurfaces(pOwner->m_sWLSurface.wlr());
 }
 
-CSubsurface::CSubsurface(SP<CWLSubsurfaceResource> pSubsurface, PHLWINDOW pOwner) : m_pSubsurface(pSubsurface), m_pWindowParent(pOwner) {
-    m_pWLSurface = CWLSurface::create();
-    m_pWLSurface->assign(pSubsurface->surface.lock(), this);
+CSubsurface::CSubsurface(wlr_subsurface* pSubsurface, CWindow* pOwner) : m_pSubsurface(pSubsurface), m_pWindowParent(pOwner) {
+    m_sWLSurface.assign(pSubsurface->surface, this);
     initSignals();
-    initExistingSubsurfaces(pSubsurface->surface.lock());
+    initExistingSubsurfaces(pSubsurface->surface);
 }
 
-CSubsurface::CSubsurface(SP<CWLSubsurfaceResource> pSubsurface, CPopup* pOwner) : m_pSubsurface(pSubsurface), m_pPopupParent(pOwner) {
-    m_pWLSurface = CWLSurface::create();
-    m_pWLSurface->assign(pSubsurface->surface.lock(), this);
+CSubsurface::CSubsurface(wlr_subsurface* pSubsurface, CPopup* pOwner) : m_pSubsurface(pSubsurface), m_pPopupParent(pOwner) {
+    m_sWLSurface.assign(pSubsurface->surface, this);
     initSignals();
-    initExistingSubsurfaces(pSubsurface->surface.lock());
+    initExistingSubsurfaces(pSubsurface->surface);
 }
 
 CSubsurface::~CSubsurface() {
@@ -35,27 +33,52 @@ CSubsurface::~CSubsurface() {
     if (!m_pSubsurface)
         return;
 
+    m_pSubsurface->data = nullptr;
+
     hyprListener_commitSubsurface.removeCallback();
     hyprListener_destroySubsurface.removeCallback();
 }
 
+static void onNewSubsurface(void* owner, void* data) {
+    const auto PSUBSURFACE = (CSubsurface*)owner;
+    PSUBSURFACE->onNewSubsurface((wlr_subsurface*)data);
+}
+
+static void onDestroySubsurface(void* owner, void* data) {
+    const auto PSUBSURFACE = (CSubsurface*)owner;
+    PSUBSURFACE->onDestroy();
+}
+
+static void onCommitSubsurface(void* owner, void* data) {
+    const auto PSUBSURFACE = (CSubsurface*)owner;
+    PSUBSURFACE->onCommit();
+}
+
+static void onMapSubsurface(void* owner, void* data) {
+    const auto PSUBSURFACE = (CSubsurface*)owner;
+    PSUBSURFACE->onMap();
+}
+
+static void onUnmapSubsurface(void* owner, void* data) {
+    const auto PSUBSURFACE = (CSubsurface*)owner;
+    PSUBSURFACE->onUnmap();
+}
+
 void CSubsurface::initSignals() {
     if (m_pSubsurface) {
-        listeners.commitSubsurface  = m_pSubsurface->surface->events.commit.registerListener([this](std::any d) { onCommit(); });
-        listeners.destroySubsurface = m_pSubsurface->events.destroy.registerListener([this](std::any d) { onDestroy(); });
-        listeners.mapSubsurface     = m_pSubsurface->surface->events.map.registerListener([this](std::any d) { onMap(); });
-        listeners.unmapSubsurface   = m_pSubsurface->surface->events.unmap.registerListener([this](std::any d) { onUnmap(); });
-        listeners.newSubsurface =
-            m_pSubsurface->surface->events.newSubsurface.registerListener([this](std::any d) { onNewSubsurface(std::any_cast<SP<CWLSubsurfaceResource>>(d)); });
+        m_pSubsurface->data = this;
+        hyprListener_commitSubsurface.initCallback(&m_pSubsurface->surface->events.commit, &onCommitSubsurface, this, "CSubsurface");
+        hyprListener_destroySubsurface.initCallback(&m_pSubsurface->events.destroy, &onDestroySubsurface, this, "CSubsurface");
+        hyprListener_newSubsurface.initCallback(&m_pSubsurface->surface->events.new_subsurface, &::onNewSubsurface, this, "CSubsurface");
+        hyprListener_mapSubsurface.initCallback(&m_pSubsurface->surface->events.map, &onMapSubsurface, this, "CSubsurface");
+        hyprListener_unmapSubsurface.initCallback(&m_pSubsurface->surface->events.unmap, &onUnmapSubsurface, this, "CSubsurface");
     } else {
         if (m_pWindowParent)
-            listeners.newSubsurface = m_pWindowParent->m_pWLSurface->resource()->events.newSubsurface.registerListener(
-                [this](std::any d) { onNewSubsurface(std::any_cast<SP<CWLSubsurfaceResource>>(d)); });
+            hyprListener_newSubsurface.initCallback(&m_pWindowParent->m_pWLSurface.wlr()->events.new_subsurface, &::onNewSubsurface, this, "CSubsurface Head");
         else if (m_pPopupParent)
-            listeners.newSubsurface = m_pPopupParent->m_pWLSurface->resource()->events.newSubsurface.registerListener(
-                [this](std::any d) { onNewSubsurface(std::any_cast<SP<CWLSubsurfaceResource>>(d)); });
+            hyprListener_newSubsurface.initCallback(&m_pPopupParent->m_sWLSurface.wlr()->events.new_subsurface, &::onNewSubsurface, this, "CSubsurface Head");
         else
-            ASSERT(false);
+            RASSERT(false, "CSubsurface::initSignals empty subsurface");
     }
 }
 
@@ -63,51 +86,51 @@ void CSubsurface::checkSiblingDamage() {
     if (!m_pParent)
         return; // ??????????
 
-    const double SCALE = m_pWindowParent.lock() && m_pWindowParent->m_bIsX11 ? 1.0 / m_pWindowParent->m_fX11SurfaceScaledBy : 1.0;
+    const double SCALE = m_pWindowParent && m_pWindowParent->m_bIsX11 ? 1.0 / m_pWindowParent->m_fX11SurfaceScaledBy : 1.0;
 
     for (auto& n : m_pParent->m_vChildren) {
         if (n.get() == this)
             continue;
 
         const auto COORDS = n->coordsGlobal();
-        g_pHyprRenderer->damageSurface(n->m_pWLSurface->resource(), COORDS.x, COORDS.y, SCALE);
+        g_pHyprRenderer->damageSurface(n->m_sWLSurface.wlr(), COORDS.x, COORDS.y, SCALE);
     }
 }
 
 void CSubsurface::recheckDamageForSubsurfaces() {
     for (auto& n : m_vChildren) {
         const auto COORDS = n->coordsGlobal();
-        g_pHyprRenderer->damageSurface(n->m_pWLSurface->resource(), COORDS.x, COORDS.y);
+        g_pHyprRenderer->damageSurface(n->m_sWLSurface.wlr(), COORDS.x, COORDS.y);
     }
 }
 
 void CSubsurface::onCommit() {
     // no damaging if it's not visible
-    if (!m_pWindowParent.expired() && (!m_pWindowParent->m_bIsMapped || !m_pWindowParent->m_pWorkspace->m_bVisible)) {
-        m_vLastSize = m_pWLSurface->resource()->current.size;
+    if (m_pWindowParent && !g_pHyprRenderer->shouldRenderWindow(m_pWindowParent)) {
+        m_vLastSize = Vector2D{m_sWLSurface.wlr()->current.width, m_sWLSurface.wlr()->current.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_pWindowParent.lock());
+            Debug::log(LOG, "Refusing to commit damage from a subsurface of {} because it's invisible.", m_pWindowParent);
         return;
     }
 
     const auto COORDS = coordsGlobal();
 
-    g_pHyprRenderer->damageSurface(m_pWLSurface->resource(), COORDS.x, COORDS.y);
+    g_pHyprRenderer->damageSurface(m_sWLSurface.wlr(), COORDS.x, COORDS.y);
 
     if (m_pPopupParent)
         m_pPopupParent->recheckTree();
-    if (!m_pWindowParent.expired()) // I hate you firefox why are you doing this
+    if (m_pWindowParent) // I hate you firefox why are you doing this
         m_pWindowParent->m_pPopupHead->recheckTree();
 
     // I do not think this is correct, but it solves a lot of issues with some apps (e.g. firefox)
     checkSiblingDamage();
 
-    if (m_vLastSize != m_pWLSurface->resource()->current.size) {
+    if (m_vLastSize != Vector2D{m_sWLSurface.wlr()->current.width, m_sWLSurface.wlr()->current.height}) {
         CBox box{COORDS, m_vLastSize};
         g_pHyprRenderer->damageBox(&box);
-        m_vLastSize = m_pWLSurface->resource()->current.size;
+        m_vLastSize = Vector2D{m_sWLSurface.wlr()->current.width, m_sWLSurface.wlr()->current.height};
         box         = {COORDS, m_vLastSize};
         g_pHyprRenderer->damageBox(&box);
     }
@@ -126,28 +149,27 @@ void CSubsurface::onDestroy() {
     std::erase_if(m_pParent->m_vChildren, [this](const auto& other) { return other.get() == this; });
 }
 
-void CSubsurface::onNewSubsurface(SP<CWLSubsurfaceResource> pSubsurface) {
+void CSubsurface::onNewSubsurface(wlr_subsurface* pSubsurface) {
     CSubsurface* PSUBSURFACE = nullptr;
 
-    if (!m_pWindowParent.expired())
-        PSUBSURFACE = m_vChildren.emplace_back(std::make_unique<CSubsurface>(pSubsurface, m_pWindowParent.lock())).get();
+    if (m_pWindowParent)
+        PSUBSURFACE = m_vChildren.emplace_back(std::make_unique<CSubsurface>(pSubsurface, m_pWindowParent)).get();
     else if (m_pPopupParent)
         PSUBSURFACE = m_vChildren.emplace_back(std::make_unique<CSubsurface>(pSubsurface, m_pPopupParent)).get();
+    PSUBSURFACE->m_pParent = this;
 
     ASSERT(PSUBSURFACE);
-
-    PSUBSURFACE->m_pParent = this;
 }
 
 void CSubsurface::onMap() {
-    m_vLastSize = m_pWLSurface->resource()->current.size;
+    m_vLastSize = {m_sWLSurface.wlr()->current.width, m_sWLSurface.wlr()->current.height};
 
     const auto COORDS = coordsGlobal();
     CBox       box{COORDS, m_vLastSize};
     box.expand(4);
     g_pHyprRenderer->damageBox(&box);
 
-    if (!m_pWindowParent.expired())
+    if (m_pWindowParent)
         m_pWindowParent->updateSurfaceScaleTransformDetails();
 }
 
@@ -157,7 +179,7 @@ void CSubsurface::onUnmap() {
     box.expand(4);
     g_pHyprRenderer->damageBox(&box);
 
-    if (m_pWLSurface->resource() == g_pCompositor->m_pLastFocus)
+    if (m_sWLSurface.wlr() == g_pCompositor->m_pLastFocus)
         g_pInputManager->releaseAllMouseButtons();
 
     g_pInputManager->simulateMouseMovement();
@@ -166,15 +188,25 @@ void CSubsurface::onUnmap() {
 }
 
 Vector2D CSubsurface::coordsRelativeToParent() {
-    if (!m_pSubsurface)
-        return {};
-    return m_pSubsurface->posRelativeToParent();
+    Vector2D     offset;
+
+    CSubsurface* current = this;
+
+    while (current->m_pParent) {
+
+        offset += {current->m_sWLSurface.wlr()->current.dx, current->m_sWLSurface.wlr()->current.dy};
+        offset += {current->m_pSubsurface->current.x, current->m_pSubsurface->current.y};
+
+        current = current->m_pParent;
+    }
+
+    return offset;
 }
 
 Vector2D CSubsurface::coordsGlobal() {
     Vector2D coords = coordsRelativeToParent();
 
-    if (!m_pWindowParent.expired())
+    if (m_pWindowParent)
         coords += m_pWindowParent->m_vRealPosition.value();
     else if (m_pPopupParent)
         coords += m_pPopupParent->coordsGlobal();
@@ -182,25 +214,16 @@ Vector2D CSubsurface::coordsGlobal() {
     return coords;
 }
 
-void CSubsurface::initExistingSubsurfaces(SP<CWLSurfaceResource> pSurface) {
-    for (auto& s : pSurface->subsurfaces) {
-        if (!s || s->surface->hlSurface /* already assigned */)
-            continue;
-        onNewSubsurface(s.lock());
+void CSubsurface::initExistingSubsurfaces(wlr_surface* pSurface) {
+    wlr_subsurface* wlrSubsurface;
+    wl_list_for_each(wlrSubsurface, &pSurface->current.subsurfaces_below, current.link) {
+        ::onNewSubsurface(this, wlrSubsurface);
+    }
+    wl_list_for_each(wlrSubsurface, &pSurface->current.subsurfaces_above, current.link) {
+        ::onNewSubsurface(this, wlrSubsurface);
     }
 }
 
 Vector2D CSubsurface::size() {
-    return m_pWLSurface->resource()->current.size;
-}
-
-bool CSubsurface::visible() {
-    if (!m_pWindowParent.expired())
-        return g_pHyprRenderer->shouldRenderWindow(m_pWindowParent.lock());
-    if (m_pPopupParent)
-        return m_pPopupParent->visible();
-    if (m_pParent)
-        return m_pParent->visible();
-
-    return false;
+    return {m_sWLSurface.wlr()->current.width, m_sWLSurface.wlr()->current.height};
 }

src/desktop/Subsurface.hpp

@@ -4,18 +4,18 @@
 #include <vector>
 #include "WLSurface.hpp"
 
+class CWindow;
 class CPopup;
-class CWLSubsurfaceResource;
 
 class CSubsurface {
   public:
     // root dummy nodes
-    CSubsurface(PHLWINDOW pOwner);
+    CSubsurface(CWindow* pOwner);
     CSubsurface(CPopup* pOwner);
 
     // real nodes
-    CSubsurface(SP<CWLSubsurfaceResource> pSubsurface, PHLWINDOW pOwner);
-    CSubsurface(SP<CWLSubsurfaceResource> pSubsurface, CPopup* pOwner);
+    CSubsurface(wlr_subsurface* pSubsurface, CWindow* pOwner);
+    CSubsurface(wlr_subsurface* pSubsurface, CPopup* pOwner);
 
     ~CSubsurface();
 
@@ -26,42 +26,34 @@ class CSubsurface {
 
     void     onCommit();
     void     onDestroy();
-    void     onNewSubsurface(SP<CWLSubsurfaceResource> pSubsurface);
+    void     onNewSubsurface(wlr_subsurface* pSubsurface);
     void     onMap();
     void     onUnmap();
 
-    bool     visible();
-
     void     recheckDamageForSubsurfaces();
 
   private:
     DYNLISTENER(destroySubsurface);
     DYNLISTENER(commitSubsurface);
     DYNLISTENER(newSubsurface);
+    DYNLISTENER(mapSubsurface);
+    DYNLISTENER(unmapSubsurface);
 
-    struct {
-        CHyprSignalListener destroySubsurface;
-        CHyprSignalListener commitSubsurface;
-        CHyprSignalListener mapSubsurface;
-        CHyprSignalListener unmapSubsurface;
-        CHyprSignalListener newSubsurface;
-    } listeners;
-
-    WP<CWLSubsurfaceResource> m_pSubsurface;
-    SP<CWLSurface>            m_pWLSurface;
-    Vector2D                  m_vLastSize = {};
+    wlr_subsurface* m_pSubsurface = nullptr;
+    CWLSurface      m_sWLSurface;
+    Vector2D        m_vLastSize = {};
 
     // if nullptr, means it's a dummy node
     CSubsurface*                              m_pParent = nullptr;
 
-    PHLWINDOWREF                              m_pWindowParent;
-    CPopup*                                   m_pPopupParent = nullptr;
+    CWindow*                                  m_pWindowParent = nullptr;
+    CPopup*                                   m_pPopupParent  = nullptr;
 
     std::vector<std::unique_ptr<CSubsurface>> m_vChildren;
 
     bool                                      m_bInert = false;
 
     void                                      initSignals();
-    void                                      initExistingSubsurfaces(SP<CWLSurfaceResource> pSurface);
+    void                                      initExistingSubsurfaces(wlr_surface* pSurface);
     void                                      checkSiblingDamage();
 };

src/desktop/WLSurface.cpp

@@ -1,37 +1,36 @@
 #include "WLSurface.hpp"
 #include "../Compositor.hpp"
-#include "../protocols/core/Compositor.hpp"
 
-void CWLSurface::assign(SP<CWLSurfaceResource> pSurface) {
-    m_pResource = pSurface;
+void CWLSurface::assign(wlr_surface* pSurface) {
+    m_pWLRSurface = pSurface;
     init();
     m_bInert = false;
 }
 
-void CWLSurface::assign(SP<CWLSurfaceResource> pSurface, PHLWINDOW pOwner) {
+void CWLSurface::assign(wlr_surface* pSurface, CWindow* pOwner) {
     m_pWindowOwner = pOwner;
-    m_pResource    = pSurface;
+    m_pWLRSurface  = pSurface;
     init();
     m_bInert = false;
 }
 
-void CWLSurface::assign(SP<CWLSurfaceResource> pSurface, PHLLS pOwner) {
+void CWLSurface::assign(wlr_surface* pSurface, SLayerSurface* pOwner) {
     m_pLayerOwner = pOwner;
-    m_pResource   = pSurface;
+    m_pWLRSurface = pSurface;
     init();
     m_bInert = false;
 }
 
-void CWLSurface::assign(SP<CWLSurfaceResource> pSurface, CSubsurface* pOwner) {
+void CWLSurface::assign(wlr_surface* pSurface, CSubsurface* pOwner) {
     m_pSubsurfaceOwner = pOwner;
-    m_pResource        = pSurface;
+    m_pWLRSurface      = pSurface;
     init();
     m_bInert = false;
 }
 
-void CWLSurface::assign(SP<CWLSurfaceResource> pSurface, CPopup* pOwner) {
+void CWLSurface::assign(wlr_surface* pSurface, CPopup* pOwner) {
     m_pPopupOwner = pOwner;
-    m_pResource   = pSurface;
+    m_pWLRSurface = pSurface;
     init();
     m_bInert = false;
 }
@@ -45,58 +44,54 @@ CWLSurface::~CWLSurface() {
 }
 
 bool CWLSurface::exists() const {
-    return m_pResource;
+    return m_pWLRSurface;
 }
 
-SP<CWLSurfaceResource> CWLSurface::resource() const {
-    return m_pResource.lock();
+wlr_surface* CWLSurface::wlr() const {
+    return m_pWLRSurface;
 }
 
 bool CWLSurface::small() const {
-    if (!validMapped(m_pWindowOwner) || !exists())
+    if (!m_pWindowOwner || !exists())
         return false;
 
-    if (!m_pResource->current.buffer)
-        return false;
-
-    const auto O = m_pWindowOwner.lock();
-
-    return O->m_vReportedSize.x > m_pResource->current.buffer->size.x + 1 || O->m_vReportedSize.y > m_pResource->current.buffer->size.y + 1;
+    return m_pWindowOwner->m_vReportedSize.x > m_pWLRSurface->current.buffer_width + 1 || m_pWindowOwner->m_vReportedSize.y > m_pWLRSurface->current.buffer_height + 1;
 }
 
 Vector2D CWLSurface::correctSmallVec() const {
-    if (!validMapped(m_pWindowOwner) || !exists() || !small() || m_bFillIgnoreSmall)
+    if (!m_pWindowOwner || !exists() || !small() || m_bFillIgnoreSmall)
         return {};
 
     const auto SIZE = getViewporterCorrectedSize();
-    const auto O    = m_pWindowOwner.lock();
 
-    return Vector2D{(O->m_vReportedSize.x - SIZE.x) / 2, (O->m_vReportedSize.y - SIZE.y) / 2}.clamp({}, {INFINITY, INFINITY}) * (O->m_vRealSize.value() / O->m_vReportedSize);
+    return Vector2D{(m_pWindowOwner->m_vReportedSize.x - SIZE.x) / 2, (m_pWindowOwner->m_vReportedSize.y - SIZE.y) / 2}.clamp({}, {INFINITY, INFINITY}) *
+        (m_pWindowOwner->m_vRealSize.value() / m_pWindowOwner->m_vReportedSize);
 }
 
 Vector2D CWLSurface::getViewporterCorrectedSize() const {
-    if (!exists() || !m_pResource->current.buffer)
+    if (!exists())
         return {};
 
-    return m_pResource->current.viewport.hasDestination ? m_pResource->current.viewport.destination : m_pResource->current.buffer->size;
+    return m_pWLRSurface->current.viewport.has_dst ? Vector2D{m_pWLRSurface->current.viewport.dst_width, m_pWLRSurface->current.viewport.dst_height} :
+                                                     Vector2D{m_pWLRSurface->current.buffer_width, m_pWLRSurface->current.buffer_height};
 }
 
 CRegion CWLSurface::logicalDamage() const {
-    if (!m_pResource->current.buffer)
-        return {};
-
-    CRegion damage = m_pResource->accumulateCurrentBufferDamage();
-    damage.transform(wlTransformToHyprutils(m_pResource->current.transform), m_pResource->current.buffer->size.x, m_pResource->current.buffer->size.y);
-    damage.scale(1.0 / m_pResource->current.scale);
+    CRegion damage{&m_pWLRSurface->buffer_damage};
+    damage.transform(m_pWLRSurface->current.transform, m_pWLRSurface->current.buffer_width, m_pWLRSurface->current.buffer_height);
+    damage.scale(1.0 / m_pWLRSurface->current.scale);
 
     const auto VPSIZE     = getViewporterCorrectedSize();
     const auto CORRECTVEC = correctSmallVec();
 
-    if (m_pResource->current.viewport.hasSource)
-        damage.intersect(m_pResource->current.viewport.source);
+    if (m_pWLRSurface->current.viewport.has_src) {
+        damage.intersect(CBox{std::floor(m_pWLRSurface->current.viewport.src.x), std::floor(m_pWLRSurface->current.viewport.src.y),
+                              std::ceil(m_pWLRSurface->current.viewport.src.width), std::ceil(m_pWLRSurface->current.viewport.src.height)});
+    }
 
-    const auto SCALEDSRCSIZE =
-        m_pResource->current.viewport.hasSource ? m_pResource->current.viewport.source.size() * m_pResource->current.scale : m_pResource->current.buffer->size;
+    const auto SCALEDSRCSIZE = m_pWLRSurface->current.viewport.has_src ?
+        Vector2D{m_pWLRSurface->current.viewport.src.width, m_pWLRSurface->current.viewport.src.height} * m_pWLRSurface->current.scale :
+        Vector2D{m_pWLRSurface->current.buffer_width, m_pWLRSurface->current.buffer_height};
 
     damage.scale({VPSIZE.x / SCALEDSRCSIZE.x, VPSIZE.y / SCALEDSRCSIZE.y});
     damage.translate(CORRECTVEC);
@@ -105,48 +100,58 @@ CRegion CWLSurface::logicalDamage() const {
 }
 
 void CWLSurface::destroy() {
-    if (!m_pResource)
+    if (!m_pWLRSurface)
         return;
 
-    events.destroy.emit();
-
     m_pConstraint.reset();
 
-    listeners.destroy.reset();
-    m_pResource->hlSurface.reset();
-    m_pWindowOwner.reset();
-    m_pLayerOwner.reset();
-    m_pPopupOwner      = nullptr;
-    m_pSubsurfaceOwner = nullptr;
-    m_bInert           = true;
+    hyprListener_destroy.removeCallback();
+    hyprListener_commit.removeCallback();
+    m_pWLRSurface->data = nullptr;
+    m_pWindowOwner      = nullptr;
+    m_pLayerOwner       = nullptr;
+    m_pPopupOwner       = nullptr;
+    m_pSubsurfaceOwner  = nullptr;
+    m_bInert            = true;
 
-    if (g_pHyprRenderer && g_pHyprRenderer->m_sLastCursorData.surf && g_pHyprRenderer->m_sLastCursorData.surf->get() == this)
+    if (g_pCompositor && g_pCompositor->m_pLastFocus == m_pWLRSurface)
+        g_pCompositor->m_pLastFocus = nullptr;
+    if (g_pInputManager && g_pInputManager->m_pLastMouseSurface == m_pWLRSurface)
+        g_pInputManager->m_pLastMouseSurface = nullptr;
+    if (g_pHyprRenderer && g_pHyprRenderer->m_sLastCursorData.surf == m_pWLRSurface)
         g_pHyprRenderer->m_sLastCursorData.surf.reset();
 
-    m_pResource.reset();
+    m_pWLRSurface = nullptr;
 
     Debug::log(LOG, "CWLSurface {:x} called destroy()", (uintptr_t)this);
 }
 
+static void onCommit(void* owner, void* data) {
+    const auto SURF = (CWLSurface*)owner;
+    SURF->onCommit();
+}
+
 void CWLSurface::init() {
-    if (!m_pResource)
+    if (!m_pWLRSurface)
         return;
 
-    RASSERT(!m_pResource->hlSurface, "Attempted to duplicate CWLSurface ownership!");
+    RASSERT(!m_pWLRSurface->data, "Attempted to duplicate CWLSurface ownership!");
 
-    m_pResource->hlSurface = self.lock();
+    m_pWLRSurface->data = this;
 
-    listeners.destroy = m_pResource->events.destroy.registerListener([this](std::any d) { destroy(); });
+    hyprListener_destroy.initCallback(
+        &m_pWLRSurface->events.destroy, [&](void* owner, void* data) { destroy(); }, this, "CWLSurface");
+    hyprListener_commit.initCallback(&m_pWLRSurface->events.commit, ::onCommit, this, "CWLSurface");
 
     Debug::log(LOG, "CWLSurface {:x} called init()", (uintptr_t)this);
 }
 
-PHLWINDOW CWLSurface::getWindow() {
-    return m_pWindowOwner.lock();
+CWindow* CWLSurface::getWindow() {
+    return m_pWindowOwner;
 }
 
-PHLLS CWLSurface::getLayer() {
-    return m_pLayerOwner.lock();
+SLayerSurface* CWLSurface::getLayer() {
+    return m_pLayerOwner;
 }
 
 CPopup* CWLSurface::getPopup() {
@@ -158,16 +163,16 @@ CSubsurface* CWLSurface::getSubsurface() {
 }
 
 bool CWLSurface::desktopComponent() {
-    return !m_pLayerOwner.expired() || !m_pWindowOwner.expired() || m_pSubsurfaceOwner || m_pPopupOwner;
+    return m_pLayerOwner || m_pWindowOwner || m_pSubsurfaceOwner || m_pPopupOwner;
 }
 
 std::optional<CBox> CWLSurface::getSurfaceBoxGlobal() {
     if (!desktopComponent())
         return {};
 
-    if (!m_pWindowOwner.expired())
+    if (m_pWindowOwner)
         return m_pWindowOwner->getWindowMainSurfaceBox();
-    if (!m_pLayerOwner.expired())
+    if (m_pLayerOwner)
         return m_pLayerOwner->geometry;
     if (m_pPopupOwner)
         return CBox{m_pPopupOwner->coordsGlobal(), m_pPopupOwner->size()};
@@ -177,28 +182,15 @@ std::optional<CBox> CWLSurface::getSurfaceBoxGlobal() {
     return {};
 }
 
-void CWLSurface::appendConstraint(WP<CPointerConstraint> constraint) {
-    m_pConstraint = constraint;
+void CWLSurface::appendConstraint(wlr_pointer_constraint_v1* constraint) {
+    m_pConstraint = std::make_unique<CConstraint>(constraint, this);
 }
 
-SP<CPointerConstraint> CWLSurface::constraint() {
-    return m_pConstraint.lock();
+void CWLSurface::onCommit() {
+    if (m_pConstraint)
+        m_pConstraint->onCommit();
 }
 
-bool CWLSurface::visible() {
-    if (!m_pWindowOwner.expired())
-        return g_pHyprRenderer->shouldRenderWindow(m_pWindowOwner.lock());
-    if (!m_pLayerOwner.expired())
-        return true;
-    if (m_pPopupOwner)
-        return m_pPopupOwner->visible();
-    if (m_pSubsurfaceOwner)
-        return m_pSubsurfaceOwner->visible();
-    return true; // non-desktop, we don't know much.
-}
-
-SP<CWLSurface> CWLSurface::fromResource(SP<CWLSurfaceResource> pSurface) {
-    if (!pSurface)
-        return nullptr;
-    return pSurface->hlSurface.lock();
+CConstraint* CWLSurface::constraint() {
+    return m_pConstraint.get();
 }

src/desktop/WLSurface.hpp

@@ -1,54 +1,50 @@
 #pragma once
 
 #include "../defines.hpp"
-#include "../helpers/math/Math.hpp"
-#include "../helpers/signal/Signal.hpp"
+#include "../helpers/Region.hpp"
+#include "Constraint.hpp"
 
+class CWindow;
+struct SLayerSurface;
 class CSubsurface;
 class CPopup;
-class CPointerConstraint;
-class CWLSurfaceResource;
 
 class CWLSurface {
   public:
-    static SP<CWLSurface> create() {
-        auto p  = SP<CWLSurface>(new CWLSurface);
-        p->self = p;
-        return p;
-    }
+    CWLSurface() = default;
     ~CWLSurface();
 
     // anonymous surfaces are non-desktop components, e.g. a cursor surface or a DnD
-    void assign(SP<CWLSurfaceResource> pSurface);
-    void assign(SP<CWLSurfaceResource> pSurface, PHLWINDOW pOwner);
-    void assign(SP<CWLSurfaceResource> pSurface, PHLLS pOwner);
-    void assign(SP<CWLSurfaceResource> pSurface, CSubsurface* pOwner);
-    void assign(SP<CWLSurfaceResource> pSurface, CPopup* pOwner);
+    void assign(wlr_surface* pSurface);
+    void assign(wlr_surface* pSurface, CWindow* pOwner);
+    void assign(wlr_surface* pSurface, SLayerSurface* pOwner);
+    void assign(wlr_surface* pSurface, CSubsurface* pOwner);
+    void assign(wlr_surface* pSurface, CPopup* pOwner);
     void unassign();
 
-    CWLSurface(const CWLSurface&)                       = delete;
-    CWLSurface(CWLSurface&&)                            = delete;
-    CWLSurface&            operator=(const CWLSurface&) = delete;
-    CWLSurface&            operator=(CWLSurface&&)      = delete;
+    CWLSurface(const CWLSurface&)             = delete;
+    CWLSurface(CWLSurface&&)                  = delete;
+    CWLSurface&  operator=(const CWLSurface&) = delete;
+    CWLSurface&  operator=(CWLSurface&&)      = delete;
 
-    SP<CWLSurfaceResource> resource() const;
-    bool                   exists() const;
-    bool                   small() const;           // means surface is smaller than the requested size
-    Vector2D               correctSmallVec() const; // returns a corrective vector for small() surfaces
-    Vector2D               getViewporterCorrectedSize() const;
-    CRegion                logicalDamage() const;
-    bool                   visible();
+    wlr_surface* wlr() const;
+    bool         exists() const;
+    bool         small() const;           // means surface is smaller than the requested size
+    Vector2D     correctSmallVec() const; // returns a corrective vector for small() surfaces
+    Vector2D     getViewporterCorrectedSize() const;
+    CRegion      logicalDamage() const;
+    void         onCommit();
 
     // getters for owners.
-    PHLWINDOW    getWindow();
-    PHLLS        getLayer();
-    CPopup*      getPopup();
-    CSubsurface* getSubsurface();
+    CWindow*       getWindow();
+    SLayerSurface* getLayer();
+    CPopup*        getPopup();
+    CSubsurface*   getSubsurface();
 
     // desktop components misc utils
-    std::optional<CBox>    getSurfaceBoxGlobal();
-    void                   appendConstraint(WP<CPointerConstraint> constraint);
-    SP<CPointerConstraint> constraint();
+    std::optional<CBox> getSurfaceBoxGlobal();
+    void                appendConstraint(wlr_pointer_constraint_v1* constraint);
+    CConstraint*        constraint();
 
     // allow stretching. Useful for plugins.
     bool m_bFillIgnoreSmall = false;
@@ -59,59 +55,51 @@ class CWLSurface {
     wl_output_transform m_eLastTransform = (wl_output_transform)-1;
 
     //
-    CWLSurface& operator=(SP<CWLSurfaceResource> pSurface) {
+    CWLSurface& operator=(wlr_surface* pSurface) {
         destroy();
-        m_pResource = pSurface;
+        m_pWLRSurface = pSurface;
         init();
 
         return *this;
     }
 
     bool operator==(const CWLSurface& other) const {
-        return other.resource() == resource();
+        return other.wlr() == wlr();
     }
 
-    bool operator==(const SP<CWLSurfaceResource> other) const {
-        return other == resource();
+    bool operator==(const wlr_surface* other) const {
+        return other == wlr();
     }
 
     explicit operator bool() const {
         return exists();
     }
 
-    static SP<CWLSurface> fromResource(SP<CWLSurfaceResource> pSurface);
-
-    // used by the alpha-modifier protocol
-    float m_pAlphaModifier = 1.F;
-
-    struct {
-        CSignal destroy;
-    } events;
-
-    WP<CWLSurface> self;
+    static CWLSurface* surfaceFromWlr(wlr_surface* pSurface) {
+        if (!pSurface)
+            return nullptr;
+        return (CWLSurface*)pSurface->data;
+    }
 
   private:
-    CWLSurface() = default;
+    bool           m_bInert = true;
 
-    bool                   m_bInert = true;
+    wlr_surface*   m_pWLRSurface = nullptr;
 
-    WP<CWLSurfaceResource> m_pResource;
-
-    PHLWINDOWREF           m_pWindowOwner;
-    PHLLSREF               m_pLayerOwner;
-    CPopup*                m_pPopupOwner      = nullptr;
-    CSubsurface*           m_pSubsurfaceOwner = nullptr;
+    CWindow*       m_pWindowOwner     = nullptr;
+    SLayerSurface* m_pLayerOwner      = nullptr;
+    CPopup*        m_pPopupOwner      = nullptr;
+    CSubsurface*   m_pSubsurfaceOwner = nullptr;
 
     //
-    WP<CPointerConstraint> m_pConstraint;
+    std::unique_ptr<CConstraint> m_pConstraint;
 
-    void                   destroy();
-    void                   init();
-    bool                   desktopComponent();
+    void                         destroy();
+    void                         init();
+    bool                         desktopComponent();
 
-    struct {
-        CHyprSignalListener destroy;
-    } listeners;
+    DYNLISTENER(destroy);
+    DYNLISTENER(commit);
 
-    friend class CPointerConstraint;
+    friend class CConstraint;
 };

src/desktop/Window.hpp

@@ -1,24 +1,16 @@
 #pragma once
 
-#include <deque>
-#include <string>
-
-#include "../config/ConfigDataValues.hpp"
 #include "../defines.hpp"
+#include "Subsurface.hpp"
 #include "../helpers/AnimatedVariable.hpp"
-#include "../helpers/math/Math.hpp"
-#include "../helpers/signal/Signal.hpp"
-#include "../helpers/TagKeeper.hpp"
+#include "../render/decorations/IHyprWindowDecoration.hpp"
+#include <deque>
+#include "../config/ConfigDataValues.hpp"
+#include "../helpers/Vector2D.hpp"
+#include "WLSurface.hpp"
+#include "Popup.hpp"
 #include "../macros.hpp"
 #include "../managers/XWaylandManager.hpp"
-#include "../render/decorations/IHyprWindowDecoration.hpp"
-#include "DesktopTypes.hpp"
-#include "Popup.hpp"
-#include "Subsurface.hpp"
-#include "WLSurface.hpp"
-
-class CXDGSurfaceResource;
-class CXWaylandSurface;
 
 enum eIdleInhibitMode {
     IDLEINHIBIT_NONE = 0,
@@ -62,22 +54,18 @@ class IWindowTransformer;
 template <typename T>
 class CWindowOverridableVar {
   public:
-    CWindowOverridableVar(T const& val) {
+    CWindowOverridableVar(T val) {
         value = val;
     }
 
     ~CWindowOverridableVar() = default;
 
-    CWindowOverridableVar<T>& operator=(CWindowOverridableVar<T> const& other) {
-        // Self-assignment check
-        if (this == &other)
+    CWindowOverridableVar<T>& operator=(CWindowOverridableVar<T> other) {
+        if (locked)
             return *this;
 
-        // Check if the current object is locked
-        if (!locked) {
-            locked = other.locked;
-            value  = other.value;
-        }
+        locked = other.locked;
+        value  = other.value;
 
         return *this;
     }
@@ -89,36 +77,36 @@ class CWindowOverridableVar {
         return other;
     }
 
-    void forceSetIgnoreLocked(T const& val, bool lock = false) {
+    void forceSetIgnoreLocked(T val, bool lock = false) {
         value  = val;
         locked = lock;
     }
 
-    T operator*(T const& other) {
+    T operator*(T& other) {
         return value * other;
     }
 
-    T operator+(T const& other) {
+    T operator+(T& other) {
         return value + other;
     }
 
-    bool operator==(T const& other) {
+    bool operator==(T& other) {
         return other == value;
     }
 
-    bool operator>=(T const& other) {
+    bool operator>=(T& other) {
         return value >= other;
     }
 
-    bool operator<=(T const& other) {
+    bool operator<=(T& other) {
         return value <= other;
     }
 
-    bool operator>(T const& other) {
+    bool operator>(T& other) {
         return value > other;
     }
 
-    bool operator<(T const& other) {
+    bool operator<(T& other) {
         return value < other;
     }
 
@@ -137,12 +125,10 @@ class CWindowOverridableVar {
 };
 
 struct SWindowSpecialRenderData {
-    CWindowOverridableVar<bool>               alphaOverride           = false;
-    CWindowOverridableVar<float>              alpha                   = 1.f;
-    CWindowOverridableVar<bool>               alphaInactiveOverride   = false;
-    CWindowOverridableVar<float>              alphaInactive           = -1.f; // -1 means unset
-    CWindowOverridableVar<bool>               alphaFullscreenOverride = false;
-    CWindowOverridableVar<float>              alphaFullscreen         = -1.f; // -1 means unset
+    CWindowOverridableVar<bool>               alphaOverride         = false;
+    CWindowOverridableVar<float>              alpha                 = 1.f;
+    CWindowOverridableVar<bool>               alphaInactiveOverride = false;
+    CWindowOverridableVar<float>              alphaInactive         = -1.f; // -1 means unset
 
     CWindowOverridableVar<CGradientValueData> activeBorderColor   = CGradientValueData(); // empty color vector means unset
     CWindowOverridableVar<CGradientValueData> inactiveBorderColor = CGradientValueData(); // empty color vector means unset
@@ -174,7 +160,6 @@ struct SWindowAdditionalConfigData {
     CWindowOverridableVar<bool>     dimAround             = false;
     CWindowOverridableVar<bool>     forceRGBX             = false;
     CWindowOverridableVar<bool>     keepAspectRatio       = false;
-    CWindowOverridableVar<bool>     focusOnActivate       = false;
     CWindowOverridableVar<int>      xray                  = -1; // -1 means unset, takes precedence over the renderdata one
     CWindowOverridableVar<int>      borderSize            = -1; // -1 means unset, takes precedence over the renderdata one
     CWindowOverridableVar<bool>     forceTearing          = false;
@@ -190,7 +175,6 @@ struct SWindowRule {
     std::string szClass;
     std::string szInitialTitle;
     std::string szInitialClass;
-    std::string szTag;
     int         bX11          = -1; // -1 means "ANY"
     int         bFloating     = -1;
     int         bFullscreen   = -1;
@@ -200,31 +184,39 @@ struct SWindowRule {
     std::string szWorkspace   = ""; // empty means any
 };
 
-struct SInitialWorkspaceToken {
-    PHLWINDOWREF primaryOwner;
-    std::string  workspace;
-};
-
 class CWindow {
   public:
-    static PHLWINDOW create(SP<CXDGSurfaceResource>);
-    static PHLWINDOW create(SP<CXWaylandSurface>);
-
-  private:
-    CWindow(SP<CXDGSurfaceResource> resource);
-    CWindow(SP<CXWaylandSurface> surface);
-
-  public:
+    CWindow();
     ~CWindow();
 
-    SP<CWLSurface> m_pWLSurface;
+    DYNLISTENER(commitWindow);
+    DYNLISTENER(mapWindow);
+    DYNLISTENER(unmapWindow);
+    DYNLISTENER(destroyWindow);
+    DYNLISTENER(setTitleWindow);
+    DYNLISTENER(setGeometryX11U);
+    DYNLISTENER(fullscreenWindow);
+    DYNLISTENER(requestMove);
+    DYNLISTENER(requestMinimize);
+    DYNLISTENER(requestMaximize);
+    DYNLISTENER(requestResize);
+    DYNLISTENER(activateX11);
+    DYNLISTENER(configureX11);
+    DYNLISTENER(toplevelClose);
+    DYNLISTENER(toplevelActivate);
+    DYNLISTENER(toplevelFullscreen);
+    DYNLISTENER(setOverrideRedirect);
+    DYNLISTENER(associateX11);
+    DYNLISTENER(dissociateX11);
+    DYNLISTENER(ackConfigure);
+    // DYNLISTENER(newSubsurfaceWindow);
 
-    struct {
-        CSignal destroy;
-    } events;
+    CWLSurface m_pWLSurface;
 
-    WP<CXDGSurfaceResource> m_pXDGSurface;
-    WP<CXWaylandSurface>    m_pXWaylandSurface;
+    union {
+        wlr_xdg_surface*      xdg;
+        wlr_xwayland_surface* xwayland;
+    } m_uSurface;
 
     // this is the position and size of the "bounding box"
     Vector2D m_vPosition = Vector2D(0, 0);
@@ -249,40 +241,36 @@ class CWindow {
     Vector2D m_vFloatingOffset = Vector2D(0, 0);
 
     // this is used for pseudotiling
-    bool     m_bIsPseudotiled = false;
-    Vector2D m_vPseudoSize    = Vector2D(1280, 720);
+    bool        m_bIsPseudotiled = false;
+    Vector2D    m_vPseudoSize    = Vector2D(0, 0);
 
-    // for recovering relative cursor position
-    Vector2D     m_vRelativeCursorCoordsOnLastWarp = Vector2D(-1, -1);
+    bool        m_bFirstMap           = false; // for layouts
+    bool        m_bIsFloating         = false;
+    bool        m_bDraggingTiled      = false; // for dragging around tiled windows
+    bool        m_bIsFullscreen       = false;
+    bool        m_bDontSendFullscreen = false;
+    bool        m_bWasMaximized       = false;
+    uint64_t    m_iMonitorID          = -1;
+    std::string m_szTitle             = "";
+    std::string m_szInitialTitle      = "";
+    std::string m_szInitialClass      = "";
+    int         m_iWorkspaceID        = -1;
 
-    bool         m_bFirstMap           = false; // for layouts
-    bool         m_bIsFloating         = false;
-    bool         m_bDraggingTiled      = false; // for dragging around tiled windows
-    bool         m_bIsFullscreen       = false;
-    bool         m_bDontSendFullscreen = false;
-    bool         m_bWasMaximized       = false;
-    uint64_t     m_iMonitorID          = -1;
-    std::string  m_szTitle             = "";
-    std::string  m_szClass             = "";
-    std::string  m_szInitialTitle      = "";
-    std::string  m_szInitialClass      = "";
-    PHLWORKSPACE m_pWorkspace;
+    bool        m_bIsMapped = false;
 
-    bool         m_bIsMapped = false;
-
-    bool         m_bRequestsFloat = false;
+    bool        m_bRequestsFloat = false;
 
     // This is for fullscreen apps
     bool m_bCreatedOverFullscreen = false;
 
     // XWayland stuff
-    bool         m_bIsX11 = false;
-    PHLWINDOWREF m_pX11Parent;
-    uint64_t     m_iX11Type              = 0;
-    bool         m_bIsModal              = false;
-    bool         m_bX11DoesntWantBorders = false;
-    bool         m_bX11ShouldntFocus     = false;
-    float        m_fX11SurfaceScaledBy   = 1.f;
+    bool     m_bIsX11                = false;
+    CWindow* m_pX11Parent            = nullptr;
+    uint64_t m_iX11Type              = 0;
+    bool     m_bIsModal              = false;
+    bool     m_bX11DoesntWantBorders = false;
+    bool     m_bX11ShouldntFocus     = false;
+    float    m_fX11SurfaceScaledBy   = 1.f;
     //
 
     // For nofocus
@@ -310,7 +298,7 @@ class CWindow {
     bool                     m_bReadyToDelete = false;
     Vector2D                 m_vOriginalClosedPos;  // these will be used for calculations later on in
     Vector2D                 m_vOriginalClosedSize; // drawing the closing animations
-    SBoxExtents              m_eOriginalClosedExtents;
+    SWindowDecorationExtents m_eOriginalClosedExtents;
     bool                     m_bAnimatingIn = false;
 
     // For pinned (sticky) windows
@@ -323,10 +311,12 @@ class CWindow {
     bool m_bFakeFullscreenState = false;
 
     // for proper cycling. While cycling we can't just move the pointers, so we need to keep track of the last cycled window.
-    PHLWINDOWREF m_pLastCycledWindow;
+    CWindow* m_pLastCycledWindow = nullptr;
+
+    // Foreign Toplevel proto
+    wlr_foreign_toplevel_handle_v1* m_phForeignToplevel = nullptr;
 
     // Window decorations
-    // TODO: make this a SP.
     std::deque<std::unique_ptr<IHyprWindowDecoration>> m_dWindowDecorations;
     std::vector<IHyprWindowDecoration*>                m_vDecosToRemove;
 
@@ -347,7 +337,7 @@ class CWindow {
     CAnimatedVariable<float> m_fDimPercent;
 
     // swallowing
-    PHLWINDOWREF m_pSwallowed;
+    CWindow* m_pSwallowed = nullptr;
 
     // focus stuff
     bool m_bStayFocused = false;
@@ -359,154 +349,89 @@ class CWindow {
     // for idle inhibiting windows
     eIdleInhibitMode m_eIdleInhibitMode = IDLEINHIBIT_NONE;
 
-    // initial token. Will be unregistered on workspace change or timeout of 2 minutes
-    std::string m_szInitialWorkspaceToken = "";
-
     // for groups
     struct SGroupData {
-        PHLWINDOWREF pNextWindow; // nullptr means no grouping. Self means single group.
-        bool         head   = false;
-        bool         locked = false; // per group lock
-        bool         deny   = false; // deny window from enter a group or made a group
+        CWindow* pNextWindow = nullptr; // nullptr means no grouping. Self means single group.
+        bool     head        = false;
+        bool     locked      = false; // per group lock
+        bool     deny        = false; // deny window from enter a group or made a group
     } m_sGroupData;
     uint16_t m_eGroupRules = GROUP_NONE;
 
     bool     m_bTearingHint = false;
 
-    // stores the currently matched window rules
-    std::vector<SWindowRule> m_vMatchedRules;
-
-    // window tags
-    CTagKeeper m_tags;
-
     // For the list lookup
     bool operator==(const CWindow& rhs) {
-        return m_pXDGSurface == rhs.m_pXDGSurface && m_pXWaylandSurface == rhs.m_pXWaylandSurface && m_vPosition == rhs.m_vPosition && m_vSize == rhs.m_vSize &&
+        return m_uSurface.xdg == rhs.m_uSurface.xdg && m_uSurface.xwayland == rhs.m_uSurface.xwayland && m_vPosition == rhs.m_vPosition && m_vSize == rhs.m_vSize &&
             m_bFadingOut == rhs.m_bFadingOut;
     }
 
     // methods
-    CBox                   getFullWindowBoundingBox();
-    SBoxExtents            getFullWindowExtents();
-    CBox                   getWindowBoxUnified(uint64_t props);
-    CBox                   getWindowMainSurfaceBox();
-    CBox                   getWindowIdealBoundingBoxIgnoreReserved();
-    void                   addWindowDeco(std::unique_ptr<IHyprWindowDecoration> deco);
-    void                   updateWindowDecos();
-    void                   removeWindowDeco(IHyprWindowDecoration* deco);
-    void                   uncacheWindowDecos();
-    bool                   checkInputOnDecos(const eInputType, const Vector2D&, std::any = {});
-    pid_t                  getPID();
-    IHyprWindowDecoration* getDecorationByType(eDecorationType);
-    void                   removeDecorationByType(eDecorationType);
-    void                   updateToplevel();
-    void                   updateSurfaceScaleTransformDetails(bool force = false);
-    void                   moveToWorkspace(PHLWORKSPACE);
-    PHLWINDOW              X11TransientFor();
-    void                   onUnmap();
-    void                   onMap();
-    void                   setHidden(bool hidden);
-    bool                   isHidden();
-    void                   applyDynamicRule(const SWindowRule& r);
-    void                   updateDynamicRules();
-    SBoxExtents            getFullWindowReservedArea();
-    Vector2D               middle();
-    bool                   opaque();
-    float                  rounding();
-    bool                   canBeTorn();
-    bool                   shouldSendFullscreenState();
-    void                   setSuspended(bool suspend);
-    bool                   visibleOnMonitor(CMonitor* pMonitor);
-    int                    workspaceID();
-    bool                   onSpecialWorkspace();
-    void                   activate(bool force = false);
-    int                    surfacesCount();
+    CBox                     getFullWindowBoundingBox();
+    SWindowDecorationExtents getFullWindowExtents();
+    CBox                     getWindowBoxUnified(uint64_t props);
+    CBox                     getWindowMainSurfaceBox();
+    CBox                     getWindowIdealBoundingBoxIgnoreReserved();
+    void                     addWindowDeco(std::unique_ptr<IHyprWindowDecoration> deco);
+    void                     updateWindowDecos();
+    void                     removeWindowDeco(IHyprWindowDecoration* deco);
+    void                     uncacheWindowDecos();
+    bool                     checkInputOnDecos(const eInputType, const Vector2D&, std::any = {});
+    pid_t                    getPID();
+    IHyprWindowDecoration*   getDecorationByType(eDecorationType);
+    void                     removeDecorationByType(eDecorationType);
+    void                     createToplevelHandle();
+    void                     destroyToplevelHandle();
+    void                     updateToplevel();
+    void                     updateSurfaceScaleTransformDetails();
+    void                     moveToWorkspace(int);
+    CWindow*                 X11TransientFor();
+    void                     onUnmap();
+    void                     onMap();
+    void                     setHidden(bool hidden);
+    bool                     isHidden();
+    void                     applyDynamicRule(const SWindowRule& r);
+    void                     updateDynamicRules();
+    SWindowDecorationExtents getFullWindowReservedArea();
+    Vector2D                 middle();
+    bool                     opaque();
+    float                    rounding();
+    bool                     canBeTorn();
+    bool                     shouldSendFullscreenState();
+    void                     setSuspended(bool suspend);
+    bool                     visibleOnMonitor(CMonitor* pMonitor);
 
-    int                    getRealBorderSize();
-    void                   updateSpecialRenderData();
-    void                   updateSpecialRenderData(const struct SWorkspaceRule&);
+    int                      getRealBorderSize();
+    void                     updateSpecialRenderData();
 
-    void                   onBorderAngleAnimEnd(void* ptr);
-    bool                   isInCurvedCorner(double x, double y);
-    bool                   hasPopupAt(const Vector2D& pos);
-    int                    popupsCount();
+    void                     onBorderAngleAnimEnd(void* ptr);
+    bool                     isInCurvedCorner(double x, double y);
+    bool                     hasPopupAt(const Vector2D& pos);
+    int                      popupsCount();
 
-    void                   applyGroupRules();
-    void                   createGroup();
-    void                   destroyGroup();
-    PHLWINDOW              getGroupHead();
-    PHLWINDOW              getGroupTail();
-    PHLWINDOW              getGroupCurrent();
-    PHLWINDOW              getGroupPrevious();
-    PHLWINDOW              getGroupWindowByIndex(int);
-    int                    getGroupSize();
-    bool                   canBeGroupedInto(PHLWINDOW pWindow);
-    void                   setGroupCurrent(PHLWINDOW pWindow);
-    void                   insertWindowToGroup(PHLWINDOW pWindow);
-    void                   updateGroupOutputs();
-    void                   switchWithWindowInGroup(PHLWINDOW pWindow);
-    void                   setAnimationsToMove();
-    void                   onWorkspaceAnimUpdate();
-    void                   onUpdateState();
-    void                   onUpdateMeta();
-    void                   onX11Configure(CBox box);
-    void                   onResourceChangeX11();
-    std::string            fetchTitle();
-    std::string            fetchClass();
-    void                   warpCursor();
-    PHLWINDOW              getSwallower();
-
-    // listeners
-    void onAck(uint32_t serial);
-
-    //
-    std::unordered_map<std::string, std::string> getEnv();
-
-    //
-    PHLWINDOWREF m_pSelf;
-
-    // make private once we move listeners to inside CWindow
-    struct {
-        CHyprSignalListener map;
-        CHyprSignalListener ack;
-        CHyprSignalListener unmap;
-        CHyprSignalListener commit;
-        CHyprSignalListener destroy;
-        CHyprSignalListener activate;
-        CHyprSignalListener configure;
-        CHyprSignalListener setGeometry;
-        CHyprSignalListener updateState;
-        CHyprSignalListener updateMetadata;
-        CHyprSignalListener resourceChange;
-    } listeners;
+    void                     applyGroupRules();
+    void                     createGroup();
+    void                     destroyGroup();
+    CWindow*                 getGroupHead();
+    CWindow*                 getGroupTail();
+    CWindow*                 getGroupCurrent();
+    CWindow*                 getGroupPrevious();
+    CWindow*                 getGroupWindowByIndex(int);
+    int                      getGroupSize();
+    bool                     canBeGroupedInto(CWindow* pWindow);
+    void                     setGroupCurrent(CWindow* pWindow);
+    void                     insertWindowToGroup(CWindow* pWindow);
+    void                     updateGroupOutputs();
+    void                     switchWithWindowInGroup(CWindow* pWindow);
+    void                     setAnimationsToMove();
+    void                     onWorkspaceAnimUpdate();
 
   private:
     // For hidden windows and stuff
-    bool m_bHidden        = false;
-    bool m_bSuspended     = false;
-    int  m_iLastWorkspace = WORKSPACE_INVALID;
+    bool m_bHidden    = false;
+    bool m_bSuspended = false;
 };
 
-inline bool valid(PHLWINDOW w) {
-    return w.get();
-}
-
-inline bool valid(PHLWINDOWREF w) {
-    return !w.expired();
-}
-
-inline bool validMapped(PHLWINDOW w) {
-    if (!valid(w))
-        return false;
-    return w->m_bIsMapped;
-}
-
-inline bool validMapped(PHLWINDOWREF w) {
-    if (!valid(w))
-        return false;
-    return w->m_bIsMapped;
-}
-
 /**
     format specification
     - 'x', only address, equivalent of (uintpr_t)CWindow*
@@ -516,7 +441,7 @@ inline bool validMapped(PHLWINDOWREF w) {
 */
 
 template <typename CharT>
-struct std::formatter<PHLWINDOW, CharT> : std::formatter<CharT> {
+struct std::formatter<CWindow*, CharT> : std::formatter<CharT> {
     bool formatAddressOnly = false;
     bool formatWorkspace   = false;
     bool formatMonitor     = false;
@@ -526,24 +451,24 @@ struct std::formatter<PHLWINDOW, CharT> : std::formatter<CharT> {
         FORMAT_FLAG('m', formatMonitor)     //
         FORMAT_FLAG('w', formatWorkspace)   //
         FORMAT_FLAG('c', formatClass),
-        PHLWINDOW)
+        CWindow*)
 
     template <typename FormatContext>
-    auto format(PHLWINDOW const& w, FormatContext& ctx) const {
+    auto format(CWindow* const& w, FormatContext& ctx) const {
         auto&& out = ctx.out();
         if (formatAddressOnly)
-            return std::format_to(out, "{:x}", (uintptr_t)w.get());
+            return std::format_to(out, "{:x}", (uintptr_t)w);
         if (!w)
             return std::format_to(out, "[Window nullptr]");
 
         std::format_to(out, "[");
-        std::format_to(out, "Window {:x}: title: \"{}\"", (uintptr_t)w.get(), w->m_szTitle);
+        std::format_to(out, "Window {:x}: title: \"{}\"", (uintptr_t)w, w->m_szTitle);
         if (formatWorkspace)
-            std::format_to(out, ", workspace: {}", w->m_pWorkspace ? w->workspaceID() : WORKSPACE_INVALID);
+            std::format_to(out, ", workspace: {}", w->m_iWorkspaceID);
         if (formatMonitor)
             std::format_to(out, ", monitor: {}", w->m_iMonitorID);
         if (formatClass)
-            std::format_to(out, ", class: {}", w->m_szClass);
+            std::format_to(out, ", class: {}", g_pXWaylandManager->getAppIDClass(w));
         return std::format_to(out, "]");
     }
 };

src/desktop/Workspace.cpp

@@ -2,82 +2,47 @@
 #include "../Compositor.hpp"
 #include "../config/ConfigValue.hpp"
 
-#include <hyprutils/string/String.hpp>
-using namespace Hyprutils::String;
+CWorkspace::CWorkspace(int id, int monitorID, std::string name, bool special) {
+    const auto PMONITOR = g_pCompositor->getMonitorFromID(monitorID);
 
-PHLWORKSPACE CWorkspace::create(int id, int monitorID, std::string name, bool special, bool isEmtpy) {
-    PHLWORKSPACE workspace = makeShared<CWorkspace>(id, monitorID, name, special, isEmtpy);
-    workspace->init(workspace);
-    return workspace;
-}
+    if (!PMONITOR) {
+        Debug::log(ERR, "Attempted a creation of CWorkspace with an invalid monitor?");
+        return;
+    }
 
-CWorkspace::CWorkspace(int id, int monitorID, std::string name, bool special, bool isEmtpy) {
     m_iMonitorID          = monitorID;
     m_iID                 = id;
     m_szName              = name;
     m_bIsSpecialWorkspace = special;
-    m_bWasCreatedEmtpy    = isEmtpy;
-}
 
-void CWorkspace::init(PHLWORKSPACE self) {
-    m_pSelf = self;
-
-    m_vRenderOffset.create(m_bIsSpecialWorkspace ? g_pConfigManager->getAnimationPropertyConfig("specialWorkspace") : g_pConfigManager->getAnimationPropertyConfig("workspaces"),
-                           self, AVARDAMAGE_ENTIRE);
-    m_fAlpha.create(AVARTYPE_FLOAT,
-                    m_bIsSpecialWorkspace ? g_pConfigManager->getAnimationPropertyConfig("specialWorkspace") : g_pConfigManager->getAnimationPropertyConfig("workspaces"), self,
+    m_vRenderOffset.create(special ? g_pConfigManager->getAnimationPropertyConfig("specialWorkspace") : g_pConfigManager->getAnimationPropertyConfig("workspaces"), this,
+                           AVARDAMAGE_ENTIRE);
+    m_fAlpha.create(AVARTYPE_FLOAT, special ? g_pConfigManager->getAnimationPropertyConfig("specialWorkspace") : g_pConfigManager->getAnimationPropertyConfig("workspaces"), this,
                     AVARDAMAGE_ENTIRE);
     m_fAlpha.setValueAndWarp(1.f);
 
     m_vRenderOffset.registerVar();
     m_fAlpha.registerVar();
 
-    const auto RULEFORTHIS = g_pConfigManager->getWorkspaceRuleFor(self);
-    if (RULEFORTHIS.defaultName.has_value())
-        m_szName = RULEFORTHIS.defaultName.value();
-
-    m_pFocusedWindowHook = g_pHookSystem->hookDynamic("closeWindow", [this](void* self, SCallbackInfo& info, std::any param) {
-        const auto PWINDOW = std::any_cast<PHLWINDOW>(param);
-
-        if (PWINDOW == m_pLastFocusedWindow.lock())
-            m_pLastFocusedWindow.reset();
-    });
-
-    m_bInert = false;
-
-    const auto WORKSPACERULE = g_pConfigManager->getWorkspaceRuleFor(self);
-    m_bPersistent            = WORKSPACERULE.isPersistent;
-
-    if (self->m_bWasCreatedEmtpy)
-        if (auto cmd = WORKSPACERULE.onCreatedEmptyRunCmd)
-            g_pKeybindManager->spawn(*cmd);
+    const auto RULESFORTHIS = g_pConfigManager->getWorkspaceRulesFor(this);
+    for (auto& rule : RULESFORTHIS) {
+        if (rule.defaultName.has_value())
+            m_szName = rule.defaultName.value();
+    }
 
     g_pEventManager->postEvent({"createworkspace", m_szName});
     g_pEventManager->postEvent({"createworkspacev2", std::format("{},{}", m_iID, m_szName)});
     EMIT_HOOK_EVENT("createWorkspace", this);
 }
 
-SWorkspaceIDName CWorkspace::getPrevWorkspaceIDName(bool perMonitor) const {
-    if (perMonitor)
-        return m_sPrevWorkspacePerMonitor;
-
-    return m_sPrevWorkspace;
-}
-
 CWorkspace::~CWorkspace() {
     m_vRenderOffset.unregister();
 
     Debug::log(LOG, "Destroying workspace ID {}", m_iID);
 
-    // check if g_pHookSystem and g_pEventManager exist, they might be destroyed as in when the compositor is closing.
-    if (g_pHookSystem)
-        g_pHookSystem->unhook(m_pFocusedWindowHook);
-
-    if (g_pEventManager) {
-        g_pEventManager->postEvent({"destroyworkspace", m_szName});
-        g_pEventManager->postEvent({"destroyworkspacev2", std::format("{},{}", m_iID, m_szName)});
-        EMIT_HOOK_EVENT("destroyWorkspace", this);
-    }
+    g_pEventManager->postEvent({"destroyworkspace", m_szName});
+    g_pEventManager->postEvent({"destroyworkspacev2", std::format("{},{}", m_iID, m_szName)});
+    EMIT_HOOK_EVENT("destroyWorkspace", this);
 }
 
 void CWorkspace::startAnim(bool in, bool left, bool instant) {
@@ -87,7 +52,7 @@ void CWorkspace::startAnim(bool in, bool left, bool instant) {
     // set floating windows offset callbacks
     m_vRenderOffset.setUpdateCallback([&](void*) {
         for (auto& w : g_pCompositor->m_vWindows) {
-            if (!validMapped(w) || w->workspaceID() != m_iID)
+            if (!g_pCompositor->windowValidMapped(w.get()) || w->m_iWorkspaceID != m_iID)
                 continue;
 
             w->onWorkspaceAnimUpdate();
@@ -111,24 +76,24 @@ void CWorkspace::startAnim(bool in, bool left, bool instant) {
         if (ANIMSTYLE.starts_with("slidefadevert")) {
             if (in) {
                 m_fAlpha.setValueAndWarp(0.f);
-                m_vRenderOffset.setValueAndWarp(Vector2D(0.0, (left ? PMONITOR->vecSize.y : -PMONITOR->vecSize.y) * (movePerc / 100.f)));
+                m_vRenderOffset.setValueAndWarp(Vector2D(0, (left ? PMONITOR->vecSize.y : -PMONITOR->vecSize.y) * (movePerc / 100.f)));
                 m_fAlpha        = 1.f;
                 m_vRenderOffset = Vector2D(0, 0);
             } else {
                 m_fAlpha.setValueAndWarp(1.f);
                 m_fAlpha        = 0.f;
-                m_vRenderOffset = Vector2D(0.0, (left ? -PMONITOR->vecSize.y : PMONITOR->vecSize.y) * (movePerc / 100.f));
+                m_vRenderOffset = Vector2D(0, (left ? -PMONITOR->vecSize.y : PMONITOR->vecSize.y) * (movePerc / 100.f));
             }
         } else {
             if (in) {
                 m_fAlpha.setValueAndWarp(0.f);
-                m_vRenderOffset.setValueAndWarp(Vector2D((left ? PMONITOR->vecSize.x : -PMONITOR->vecSize.x) * (movePerc / 100.f), 0.0));
+                m_vRenderOffset.setValueAndWarp(Vector2D((left ? PMONITOR->vecSize.x : -PMONITOR->vecSize.x) * (movePerc / 100.f), 0));
                 m_fAlpha        = 1.f;
                 m_vRenderOffset = Vector2D(0, 0);
             } else {
                 m_fAlpha.setValueAndWarp(1.f);
                 m_fAlpha        = 0.f;
-                m_vRenderOffset = Vector2D((left ? -PMONITOR->vecSize.x : PMONITOR->vecSize.x) * (movePerc / 100.f), 0.0);
+                m_vRenderOffset = Vector2D((left ? -PMONITOR->vecSize.x : PMONITOR->vecSize.x) * (movePerc / 100.f), 0);
             }
         }
     } else if (ANIMSTYLE == "fade") {
@@ -149,10 +114,10 @@ void CWorkspace::startAnim(bool in, bool left, bool instant) {
         m_fAlpha.setValueAndWarp(1.f); // fix a bug, if switching from fade -> slide.
 
         if (in) {
-            m_vRenderOffset.setValueAndWarp(Vector2D(0.0, left ? YDISTANCE : -YDISTANCE));
+            m_vRenderOffset.setValueAndWarp(Vector2D(0, left ? YDISTANCE : -YDISTANCE));
             m_vRenderOffset = Vector2D(0, 0);
         } else {
-            m_vRenderOffset = Vector2D(0.0, left ? -YDISTANCE : YDISTANCE);
+            m_vRenderOffset = Vector2D(0, left ? -YDISTANCE : YDISTANCE);
         }
     } else {
         // fallback is slide
@@ -162,10 +127,10 @@ void CWorkspace::startAnim(bool in, bool left, bool instant) {
         m_fAlpha.setValueAndWarp(1.f); // fix a bug, if switching from fade -> slide.
 
         if (in) {
-            m_vRenderOffset.setValueAndWarp(Vector2D(left ? XDISTANCE : -XDISTANCE, 0.0));
+            m_vRenderOffset.setValueAndWarp(Vector2D(left ? XDISTANCE : -XDISTANCE, 0));
             m_vRenderOffset = Vector2D(0, 0);
         } else {
-            m_vRenderOffset = Vector2D(left ? -XDISTANCE : XDISTANCE, 0.0);
+            m_vRenderOffset = Vector2D(left ? -XDISTANCE : XDISTANCE, 0);
         }
     }
 
@@ -194,16 +159,16 @@ void CWorkspace::moveToMonitor(const int& id) {
     ; // empty until https://gitlab.freedesktop.org/wayland/wayland-protocols/-/merge_requests/40
 }
 
-PHLWINDOW CWorkspace::getLastFocusedWindow() {
-    if (!validMapped(m_pLastFocusedWindow) || m_pLastFocusedWindow->workspaceID() != m_iID)
+CWindow* CWorkspace::getLastFocusedWindow() {
+    if (!g_pCompositor->windowValidMapped(m_pLastFocusedWindow) || m_pLastFocusedWindow->m_iWorkspaceID != m_iID)
         return nullptr;
 
-    return m_pLastFocusedWindow.lock();
+    return m_pLastFocusedWindow;
 }
 
-void CWorkspace::rememberPrevWorkspace(const PHLWORKSPACE& prev) {
+void CWorkspace::rememberPrevWorkspace(const CWorkspace* prev) {
     if (!prev) {
-        m_sPrevWorkspace.id   = -1;
+        m_sPrevWorkspace.iID  = -1;
         m_sPrevWorkspace.name = "";
         return;
     }
@@ -213,18 +178,13 @@ void CWorkspace::rememberPrevWorkspace(const PHLWORKSPACE& prev) {
         return;
     }
 
-    m_sPrevWorkspace.id   = prev->m_iID;
+    m_sPrevWorkspace.iID  = prev->m_iID;
     m_sPrevWorkspace.name = prev->m_szName;
-
-    if (prev->m_iMonitorID == m_iMonitorID) {
-        m_sPrevWorkspacePerMonitor.id   = prev->m_iID;
-        m_sPrevWorkspacePerMonitor.name = prev->m_szName;
-    }
 }
 
 std::string CWorkspace::getConfigName() {
     if (m_bIsSpecialWorkspace) {
-        return m_szName;
+        return "special:" + m_szName;
     }
 
     if (m_iID > 0)
@@ -234,13 +194,15 @@ std::string CWorkspace::getConfigName() {
 }
 
 bool CWorkspace::matchesStaticSelector(const std::string& selector_) {
-    auto selector = trim(selector_);
+    auto selector = removeBeginEndSpacesTabs(selector_);
 
     if (selector.empty())
         return true;
 
     if (isNumber(selector)) {
-        const auto& [wsid, wsname] = getWorkspaceIDNameFromString(selector);
+
+        std::string wsname = "";
+        int         wsid   = getWorkspaceIDFromString(selector, wsname);
 
         if (wsid == WORKSPACE_INVALID)
             return false;
@@ -249,7 +211,7 @@ bool CWorkspace::matchesStaticSelector(const std::string& selector_) {
 
     } else if (selector.starts_with("name:")) {
         return m_szName == selector.substr(5);
-    } else if (selector.starts_with("special")) {
+    } else if (selector.starts_with("special:")) {
         return m_szName == selector;
     } else {
         // parse selector
@@ -264,11 +226,7 @@ bool CWorkspace::matchesStaticSelector(const std::string& selector_) {
             // s - special: s[true]
             // n - named: n[true] or n[s:string] or n[e:string]
             // m - monitor: m[monitor_selector]
-            // w - windowCount: w[1-4] or w[1], optional flag t or f for tiled or floating and
-            //                  flag g to count groups instead of windows, e.g. w[t1-2], w[fg4]
-            //                  flag v will count only visible windows
-            // f - fullscreen state : f[-1], f[0], f[1], or f[2] for different fullscreen states
-            //                        -1: no fullscreen, 0: fullscreen, 1: maximized, 2: fullscreen without sending fs state to window
+            // w - windowCount: w[0-4] or w[1], optional flag t or f for tiled or floating, e.g. w[t0-1]
 
             const auto  NEXTSPACE = selector.find_first_of(' ', i);
             std::string prop      = selector.substr(i, NEXTSPACE == std::string::npos ? std::string::npos : NEXTSPACE - i);
@@ -352,10 +310,10 @@ bool CWorkspace::matchesStaticSelector(const std::string& selector_) {
 
                 prop = prop.substr(2, prop.length() - 3);
 
-                if (prop.starts_with("s:") && !m_szName.starts_with(prop.substr(2)))
-                    return false;
-                if (prop.starts_with("e:") && !m_szName.ends_with(prop.substr(2)))
-                    return false;
+                if (prop.starts_with("s:"))
+                    return m_szName.starts_with(prop.substr(2));
+                if (prop.starts_with("e:"))
+                    return m_szName.ends_with(prop.substr(2));
 
                 const auto WANTSNAMED = configStringToInt(prop);
 
@@ -373,29 +331,15 @@ bool CWorkspace::matchesStaticSelector(const std::string& selector_) {
 
                 prop = prop.substr(2, prop.length() - 3);
 
-                int  wantsOnlyTiled    = -1;
-                bool wantsCountGroup   = false;
-                bool wantsCountVisible = false;
+                int wantsOnlyTiled = -1;
 
-                int  flagCount = 0;
-                for (auto& flag : prop) {
-                    if (flag == 't' && wantsOnlyTiled == -1) {
-                        wantsOnlyTiled = 1;
-                        flagCount++;
-                    } else if (flag == 'f' && wantsOnlyTiled == -1) {
-                        wantsOnlyTiled = 0;
-                        flagCount++;
-                    } else if (flag == 'g' && !wantsCountGroup) {
-                        wantsCountGroup = true;
-                        flagCount++;
-                    } else if (flag == 'v' && !wantsCountVisible) {
-                        wantsCountVisible = true;
-                        flagCount++;
-                    } else {
-                        break;
-                    }
+                if (prop.starts_with("t")) {
+                    wantsOnlyTiled = 1;
+                    prop           = prop.substr(1);
+                } else if (prop.starts_with("f")) {
+                    wantsOnlyTiled = 0;
+                    prop           = prop.substr(1);
                 }
-                prop = prop.substr(flagCount);
 
                 if (!prop.contains("-")) {
                     // try single
@@ -412,17 +356,7 @@ bool CWorkspace::matchesStaticSelector(const std::string& selector_) {
                         return false;
                     }
 
-                    int count;
-                    if (wantsCountGroup)
-                        count = g_pCompositor->getGroupsOnWorkspace(m_iID, wantsOnlyTiled == -1 ? std::nullopt : std::optional<bool>((bool)wantsOnlyTiled),
-                                                                    wantsCountVisible ? std::optional<bool>(wantsCountVisible) : std::nullopt);
-                    else
-                        count = g_pCompositor->getWindowsOnWorkspace(m_iID, wantsOnlyTiled == -1 ? std::nullopt : std::optional<bool>((bool)wantsOnlyTiled),
-                                                                     wantsCountVisible ? std::optional<bool>(wantsCountVisible) : std::nullopt);
-
-                    if (count != from)
-                        return false;
-                    continue;
+                    return g_pCompositor->getWindowsOnWorkspace(m_iID, wantsOnlyTiled == -1 ? std::nullopt : std::optional<bool>((bool)wantsOnlyTiled)) == from;
                 }
 
                 const auto DASHPOS = prop.find("-");
@@ -446,57 +380,12 @@ bool CWorkspace::matchesStaticSelector(const std::string& selector_) {
                     return false;
                 }
 
-                int count;
-                if (wantsCountGroup)
-                    count = g_pCompositor->getGroupsOnWorkspace(m_iID, wantsOnlyTiled == -1 ? std::nullopt : std::optional<bool>((bool)wantsOnlyTiled),
-                                                                wantsCountVisible ? std::optional<bool>(wantsCountVisible) : std::nullopt);
-                else
-                    count = g_pCompositor->getWindowsOnWorkspace(m_iID, wantsOnlyTiled == -1 ? std::nullopt : std::optional<bool>((bool)wantsOnlyTiled),
-                                                                 wantsCountVisible ? std::optional<bool>(wantsCountVisible) : std::nullopt);
-
-                if (std::clamp(count, from, to) != count)
+                const auto WINDOWSONWORKSPACE = g_pCompositor->getWindowsOnWorkspace(m_iID, wantsOnlyTiled == -1 ? std::nullopt : std::optional<bool>((bool)wantsOnlyTiled));
+                if (std::clamp(WINDOWSONWORKSPACE, from, to) != WINDOWSONWORKSPACE)
                     return false;
                 continue;
             }
 
-            if (cur == 'f') {
-                if (!prop.starts_with("f[") || !prop.ends_with("]")) {
-                    Debug::log(LOG, "Invalid selector {}", selector);
-                    return false;
-                }
-
-                prop        = prop.substr(2, prop.length() - 3);
-                int FSSTATE = -1;
-                try {
-                    FSSTATE = std::stoi(prop);
-                } catch (std::exception& e) {
-                    Debug::log(LOG, "Invalid selector {}", selector);
-                    return false;
-                }
-
-                switch (FSSTATE) {
-                    case -1: // no fullscreen
-                        if (m_bHasFullscreenWindow)
-                            return false;
-                        break;
-                    case 0: // fullscreen full
-                        if (!m_bHasFullscreenWindow || m_efFullscreenMode != FULLSCREEN_FULL)
-                            return false;
-                        break;
-                    case 1: // maximized
-                        if (!m_bHasFullscreenWindow || m_efFullscreenMode != FULLSCREEN_MAXIMIZED)
-                            return false;
-                        break;
-                    case 2: // fullscreen without sending fullscreen state to window
-                        if (!m_bHasFullscreenWindow || m_efFullscreenMode != FULLSCREEN_FULL || !g_pCompositor->getFullscreenWindowOnWorkspace(m_iID) ||
-                            !g_pCompositor->getFullscreenWindowOnWorkspace(m_iID)->m_bDontSendFullscreen)
-                            return false;
-                        break;
-                    default: break;
-                }
-                continue;
-            }
-
             Debug::log(LOG, "Invalid selector {}", selector);
             return false;
         }
@@ -507,14 +396,3 @@ bool CWorkspace::matchesStaticSelector(const std::string& selector_) {
     UNREACHABLE();
     return false;
 }
-
-void CWorkspace::markInert() {
-    m_bInert     = true;
-    m_iID        = WORKSPACE_INVALID;
-    m_iMonitorID = -1;
-    m_bVisible   = false;
-}
-
-bool CWorkspace::inert() {
-    return m_bInert;
-}

src/desktop/Workspace.hpp

@@ -3,8 +3,6 @@
 #include "../helpers/AnimatedVariable.hpp"
 #include <string>
 #include "../defines.hpp"
-#include "DesktopTypes.hpp"
-#include "../helpers/MiscFunctions.hpp"
 
 enum eFullscreenMode : int8_t {
     FULLSCREEN_INVALID = -1,
@@ -16,9 +14,7 @@ class CWindow;
 
 class CWorkspace {
   public:
-    static PHLWORKSPACE create(int id, int monitorID, std::string name, bool special = false, bool isEmtpy = true);
-    // use create() don't use this
-    CWorkspace(int id, int monitorID, std::string name, bool special = false, bool isEmpty = true);
+    CWorkspace(int id, int monitorID, std::string name, bool special = false);
     ~CWorkspace();
 
     // Workspaces ID-based have IDs > 0
@@ -26,28 +22,28 @@ class CWorkspace {
     int         m_iID        = -1;
     std::string m_szName     = "";
     uint64_t    m_iMonitorID = -1;
-    // Previous workspace ID and name is stored during a workspace change, allowing travel
+    // Previous workspace ID is stored during a workspace change, allowing travel
     // to the previous workspace.
-    SWorkspaceIDName m_sPrevWorkspace, m_sPrevWorkspacePerMonitor;
+    struct SPrevWorkspaceData {
+        int         iID  = -1;
+        std::string name = "";
+    } m_sPrevWorkspace;
 
-    bool             m_bHasFullscreenWindow = false;
-    eFullscreenMode  m_efFullscreenMode     = FULLSCREEN_FULL;
+    bool            m_bHasFullscreenWindow = false;
+    eFullscreenMode m_efFullscreenMode     = FULLSCREEN_FULL;
 
-    wl_array         m_wlrCoordinateArr;
+    wl_array        m_wlrCoordinateArr;
 
     // for animations
     CAnimatedVariable<Vector2D> m_vRenderOffset;
     CAnimatedVariable<float>    m_fAlpha;
     bool                        m_bForceRendering = false;
 
-    // allows damage to propagate.
-    bool m_bVisible = false;
-
     // "scratchpad"
     bool m_bIsSpecialWorkspace = false;
 
     // last window
-    PHLWINDOWREF m_pLastFocusedWindow;
+    CWindow* m_pLastFocusedWindow = nullptr;
 
     // user-set
     bool m_bDefaultFloating = false;
@@ -56,40 +52,18 @@ class CWorkspace {
     // last monitor (used on reconnect)
     std::string m_szLastMonitor = "";
 
-    bool        m_bWasCreatedEmtpy = true;
+    // Whether the user configured command for on-created-empty has been executed, if any
+    bool        m_bOnCreatedEmptyExecuted = false;
 
-    bool        m_bPersistent = false;
+    void        startAnim(bool in, bool left, bool instant = false);
+    void        setActive(bool on);
 
-    // Inert: destroyed and invalid. If this is true, release the ptr you have.
-    bool             inert();
+    void        moveToMonitor(const int&);
 
-    void             startAnim(bool in, bool left, bool instant = false);
-    void             setActive(bool on);
+    CWindow*    getLastFocusedWindow();
+    void        rememberPrevWorkspace(const CWorkspace* prevWorkspace);
 
-    void             moveToMonitor(const int&);
+    std::string getConfigName();
 
-    PHLWINDOW        getLastFocusedWindow();
-    void             rememberPrevWorkspace(const PHLWORKSPACE& prevWorkspace);
-
-    std::string      getConfigName();
-
-    bool             matchesStaticSelector(const std::string& selector);
-
-    void             markInert();
-
-    SWorkspaceIDName getPrevWorkspaceIDName(bool perMonitor) const;
-
-  private:
-    void                 init(PHLWORKSPACE self);
-
-    SP<HOOK_CALLBACK_FN> m_pFocusedWindowHook;
-    bool                 m_bInert = true;
-    WP<CWorkspace>       m_pSelf;
+    bool        matchesStaticSelector(const std::string& selector);
 };
-
-inline bool valid(const PHLWORKSPACE& ref) {
-    if (!ref)
-        return false;
-
-    return !ref->inert();
-}

src/devices/IHID.cpp

@@ -1,5 +0,0 @@
-#include "IHID.hpp"
-
-eHIDType IHID::getType() {
-    return HID_TYPE_UNKNOWN;
-}

src/devices/IHID.hpp

@@ -1,40 +0,0 @@
-#pragma once
-
-#include <cstdint>
-#include <string>
-#include "../helpers/signal/Signal.hpp"
-
-enum eHIDCapabilityType : uint32_t {
-    HID_INPUT_CAPABILITY_KEYBOARD = (1 << 0),
-    HID_INPUT_CAPABILITY_POINTER  = (1 << 1),
-    HID_INPUT_CAPABILITY_TOUCH    = (1 << 2),
-    HID_INPUT_CAPABILITY_TABLET   = (1 << 3),
-};
-
-enum eHIDType {
-    HID_TYPE_UNKNOWN = 0,
-    HID_TYPE_POINTER,
-    HID_TYPE_KEYBOARD,
-    HID_TYPE_TOUCH,
-    HID_TYPE_TABLET,
-    HID_TYPE_TABLET_TOOL,
-    HID_TYPE_TABLET_PAD,
-};
-
-/*
-    Base class for a HID device.
-    This could be a keyboard, a mouse, or a touchscreen.
-*/
-class IHID {
-  public:
-    virtual ~IHID() {}
-
-    virtual uint32_t getCapabilities() = 0;
-    virtual eHIDType getType();
-
-    struct {
-        CSignal destroy;
-    } events;
-
-    std::string deviceName;
-};

src/devices/IKeyboard.cpp

@@ -1,147 +0,0 @@
-#include "IKeyboard.hpp"
-#include "../defines.hpp"
-#include "../helpers/varlist/VarList.hpp"
-#include "../managers/input/InputManager.hpp"
-
-uint32_t IKeyboard::getCapabilities() {
-    return HID_INPUT_CAPABILITY_KEYBOARD;
-}
-
-eHIDType IKeyboard::getType() {
-    return HID_TYPE_KEYBOARD;
-}
-
-IKeyboard::~IKeyboard() {
-    events.destroy.emit();
-
-    if (!xkbTranslationState)
-        return;
-
-    xkb_state_unref(xkbTranslationState);
-    xkbTranslationState = nullptr;
-}
-
-void IKeyboard::updateXKBTranslationState(xkb_keymap* const keymap) {
-
-    if (xkbTranslationState)
-        xkb_state_unref(xkbTranslationState);
-
-    if (keymap) {
-        Debug::log(LOG, "Updating keyboard {:x}'s translation state from a provided keymap", (uintptr_t)this);
-        xkbTranslationState = xkb_state_new(keymap);
-        return;
-    }
-
-    const auto WLRKB      = wlr();
-    const auto KEYMAP     = WLRKB->keymap;
-    const auto STATE      = WLRKB->xkb_state;
-    const auto LAYOUTSNUM = xkb_keymap_num_layouts(KEYMAP);
-
-    const auto PCONTEXT = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
-
-    for (uint32_t i = 0; i < LAYOUTSNUM; ++i) {
-        if (xkb_state_layout_index_is_active(STATE, i, XKB_STATE_LAYOUT_EFFECTIVE) == 1) {
-            Debug::log(LOG, "Updating keyboard {:x}'s translation state from an active index {}", (uintptr_t)this, i);
-
-            CVarList       keyboardLayouts(currentRules.layout, 0, ',');
-            CVarList       keyboardModels(currentRules.model, 0, ',');
-            CVarList       keyboardVariants(currentRules.variant, 0, ',');
-
-            xkb_rule_names rules = {.rules = "", .model = "", .layout = "", .variant = "", .options = ""};
-
-            std::string    layout, model, variant;
-            layout  = keyboardLayouts[i % keyboardLayouts.size()];
-            model   = keyboardModels[i % keyboardModels.size()];
-            variant = keyboardVariants[i % keyboardVariants.size()];
-
-            rules.layout  = layout.c_str();
-            rules.model   = model.c_str();
-            rules.variant = variant.c_str();
-
-            auto KEYMAP = xkb_keymap_new_from_names(PCONTEXT, &rules, XKB_KEYMAP_COMPILE_NO_FLAGS);
-
-            if (!KEYMAP) {
-                Debug::log(ERR, "updateXKBTranslationState: keymap failed 1, fallback without model/variant");
-                rules.model   = "";
-                rules.variant = "";
-                KEYMAP        = xkb_keymap_new_from_names(PCONTEXT, &rules, XKB_KEYMAP_COMPILE_NO_FLAGS);
-            }
-
-            if (!KEYMAP) {
-                Debug::log(ERR, "updateXKBTranslationState: keymap failed 2, fallback to us");
-                rules.layout = "us";
-                KEYMAP       = xkb_keymap_new_from_names(PCONTEXT, &rules, XKB_KEYMAP_COMPILE_NO_FLAGS);
-            }
-
-            xkbTranslationState = xkb_state_new(KEYMAP);
-
-            xkb_keymap_unref(KEYMAP);
-            xkb_context_unref(PCONTEXT);
-
-            return;
-        }
-    }
-
-    Debug::log(LOG, "Updating keyboard {:x}'s translation state from an unknown index", (uintptr_t)this);
-
-    xkb_rule_names rules = {
-        .rules   = currentRules.rules.c_str(),
-        .model   = currentRules.model.c_str(),
-        .layout  = currentRules.layout.c_str(),
-        .variant = currentRules.variant.c_str(),
-        .options = currentRules.options.c_str(),
-    };
-
-    const auto NEWKEYMAP = xkb_keymap_new_from_names(PCONTEXT, &rules, XKB_KEYMAP_COMPILE_NO_FLAGS);
-
-    xkbTranslationState = xkb_state_new(NEWKEYMAP);
-
-    xkb_keymap_unref(NEWKEYMAP);
-    xkb_context_unref(PCONTEXT);
-}
-
-std::string IKeyboard::getActiveLayout() {
-    const auto WLRKB      = wlr();
-    const auto KEYMAP     = WLRKB->keymap;
-    const auto STATE      = WLRKB->xkb_state;
-    const auto LAYOUTSNUM = xkb_keymap_num_layouts(KEYMAP);
-
-    for (uint32_t i = 0; i < LAYOUTSNUM; ++i) {
-        if (xkb_state_layout_index_is_active(STATE, i, XKB_STATE_LAYOUT_EFFECTIVE) == 1) {
-            const auto LAYOUTNAME = xkb_keymap_layout_get_name(KEYMAP, i);
-
-            if (LAYOUTNAME)
-                return std::string(LAYOUTNAME);
-            return "error";
-        }
-    }
-
-    return "none";
-}
-
-void IKeyboard::updateLEDs() {
-    auto keyboard = wlr();
-
-    if (!keyboard || keyboard->xkb_state == nullptr)
-        return;
-
-    uint32_t leds = 0;
-    for (uint32_t i = 0; i < WLR_LED_COUNT; ++i) {
-        if (xkb_state_led_index_is_active(keyboard->xkb_state, keyboard->led_indexes[i]))
-            leds |= (1 << i);
-    }
-
-    updateLEDs(leds);
-}
-
-void IKeyboard::updateLEDs(uint32_t leds) {
-    auto keyboard = wlr();
-
-    if (!keyboard || keyboard->xkb_state == nullptr)
-        return;
-
-    if (isVirtual() && g_pInputManager->shouldIgnoreVirtualKeyboard(self.lock()))
-        return;
-
-    wlr_keyboard_led_update(keyboard, leds);
-}

src/devices/IKeyboard.hpp

@@ -1,63 +0,0 @@
-#pragma once
-
-#include "IHID.hpp"
-#include "../helpers/WLListener.hpp"
-#include "../macros.hpp"
-#include "../helpers/math/Math.hpp"
-
-#include <xkbcommon/xkbcommon.h>
-
-struct wlr_keyboard;
-
-class IKeyboard : public IHID {
-  public:
-    virtual ~IKeyboard();
-    virtual uint32_t      getCapabilities();
-    virtual eHIDType      getType();
-    virtual bool          isVirtual() = 0;
-    virtual wlr_keyboard* wlr()       = 0;
-
-    struct SKeyEvent {
-        uint32_t              timeMs     = 0;
-        uint32_t              keycode    = 0;
-        bool                  updateMods = false;
-        wl_keyboard_key_state state      = WL_KEYBOARD_KEY_STATE_PRESSED;
-    };
-
-    struct {
-        CSignal key;
-        CSignal modifiers;
-        CSignal keymap;
-        CSignal repeatInfo;
-    } keyboardEvents;
-
-    struct SStringRuleNames {
-        std::string layout  = "";
-        std::string model   = "";
-        std::string variant = "";
-        std::string options = "";
-        std::string rules   = "";
-    };
-
-    void               updateXKBTranslationState(xkb_keymap* const keymap = nullptr);
-    std::string        getActiveLayout();
-    void               updateLEDs();
-    void               updateLEDs(uint32_t leds);
-
-    bool               active  = false;
-    bool               enabled = true;
-
-    xkb_layout_index_t activeLayout        = 0;
-    xkb_state*         xkbTranslationState = nullptr;
-
-    std::string        hlName      = "";
-    std::string        xkbFilePath = "";
-
-    SStringRuleNames   currentRules;
-    int                repeatRate        = 0;
-    int                repeatDelay       = 0;
-    int                numlockOn         = -1;
-    bool               resolveBindsBySym = false;
-
-    WP<IKeyboard>      self;
-};

src/devices/IPointer.cpp

@@ -1,9 +0,0 @@
-#include "IPointer.hpp"
-
-uint32_t IPointer::getCapabilities() {
-    return HID_INPUT_CAPABILITY_POINTER;
-}
-
-eHIDType IPointer::getType() {
-    return HID_TYPE_POINTER;
-}