400930e0391a0e13ebbc6a3b9fe162e00aaad89a

Message

fixup: fix breakage after cursor rewrite

Diff

This diff is truncated to protect this page.

  1diff --git a/flake.lock b/flake.lock
  2index aac98711baee033fce2a946156a7e192a43a468e..f670c03a670616069799d87370272386bb2835d8 100644
  3--- a/flake.lock
  4+++ b/flake.lock
  5@@ -32,46 +32,47 @@
  6     "hyprland": {
  7       "inputs": {
  8         "hyprcursor": "hyprcursor",
  9-        "hyprland-protocols": "hyprland-protocols",
 10         "hyprlang": "hyprlang",
 11         "hyprwayland-scanner": "hyprwayland-scanner",
 12         "nixpkgs": "nixpkgs",
 13         "systems": "systems",
 14-        "wlroots": "wlroots",
 15         "xdph": "xdph"
 16       },
 17       "locked": {
 18-        "lastModified": 1714837352,
 19-        "narHash": "sha256-QzzJTb+0CBqgAT0wKZsOt1rky5+u2zMUlNxbZcGj2VM=",
 20-        "owner": "hyprwm",
 21-        "repo": "Hyprland",
 22-        "rev": "cba1ade848feac44b2eda677503900639581c3f4",
 23-        "type": "github"
 24+        "lastModified": 1715817355,
 25+        "narHash": "sha256-/XuIc6AkzUZVJkKNYBCSGK+G5sLgfLY9zd+gIXLNcGA=",
 26+        "ref": "refs/heads/main",
 27+        "rev": "de9798fcf9494eb082bd168175390c0d47b8478b",
 28+        "revCount": 4702,
 29+        "submodules": true,
 30+        "type": "git",
 31+        "url": "https://github.com/hyprwm/hyprland"
 32       },
 33       "original": {
 34-        "owner": "hyprwm",
 35-        "repo": "Hyprland",
 36-        "rev": "cba1ade848feac44b2eda677503900639581c3f4",
 37-        "type": "github"
 38+        "submodules": true,
 39+        "type": "git",
 40+        "url": "https://github.com/hyprwm/hyprland"
 41       }
 42     },
 43     "hyprland-protocols": {
 44       "inputs": {
 45         "nixpkgs": [
 46           "hyprland",
 47+          "xdph",
 48           "nixpkgs"
 49         ],
 50         "systems": [
 51           "hyprland",
 52+          "xdph",
 53           "systems"
 54         ]
 55       },
 56       "locked": {
 57-        "lastModified": 1714869498,
 58-        "narHash": "sha256-vbLVOWvQqo4n1yvkg/Q70VTlPbMmTiCQfNTgcWDCfJM=",
 59+        "lastModified": 1691753796,
 60+        "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=",
 61         "owner": "hyprwm",
 62         "repo": "hyprland-protocols",
 63-        "rev": "e06482e0e611130cd1929f75e8c1cf679e57d161",
 64+        "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03",
 65         "type": "github"
 66       },
 67       "original": {
 68@@ -92,11 +93,11 @@
 69         ]
 70       },
 71       "locked": {
 72-        "lastModified": 1713121246,
 73-        "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=",
 74+        "lastModified": 1715610285,
 75+        "narHash": "sha256-i8ZQeEiwXYhmzqyUaFeHhnRVu6L7g5cy33PcTQjPw4U=",
 76         "owner": "hyprwm",
 77         "repo": "hyprlang",
 78-        "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706",
 79+        "rev": "19ec261528f924a275860dcab7979519e41809e5",
 80         "type": "github"
 81       },
 82       "original": {
 83@@ -117,11 +118,11 @@
 84         ]
 85       },
 86       "locked": {
 87-        "lastModified": 1714755542,
 88-        "narHash": "sha256-D0pg+ZRwrt4lavZ97Ca8clsgbPA3duLj8iEM7riaIFY=",
 89+        "lastModified": 1715608589,
 90+        "narHash": "sha256-vimNaLjLcoNIvBhF37GaB6PRYEvKMamY3UnDE9M5MW8=",
 91         "owner": "hyprwm",
 92         "repo": "hyprwayland-scanner",
 93-        "rev": "1270ebaa539e56d61b708c24b072b09cbbd3a828",
 94+        "rev": "65c2636484e5cb00583b8a7446c3fb657f568883",
 95         "type": "github"
 96       },
 97       "original": {
 98@@ -132,11 +133,11 @@
 99     },
100     "nixpkgs": {
101       "locked": {
102-        "lastModified": 1714253743,
103-        "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=",
104+        "lastModified": 1715447595,
105diff --git a/flake.nix b/flake.nix
106index 320f3f99aa6f585ff7e68ef769134f8147a06cce..c0b626a5391ca9e89c3aa3029321dcf527aa75f9 100644
107--- a/flake.nix
108+++ b/flake.nix
109@@ -30,7 +30,9 @@
110       impure = import ./shell.nix {
111         pkgs = import <nixpkgs> {};
112         hlversion = props.version;
113-        hyprland = (pkgs.appendOverlays [ hyprland.overlays.hyprland-packages ]).hyprland-debug;
114+        hyprland = (pkgs.appendOverlays [ hyprland.overlays.hyprland-packages ]).hyprland-debug.overrideAttrs {
115+          dontStrip = true;
116+        };
117       };
118     });
119   };
120diff --git a/src/Hy3Layout.cpp b/src/Hy3Layout.cpp
121index 64da39fa2785765a8b4e38882d8d5219d972aece..12963f863ce4b2c630721cce1671f6cc6f799b2d 100644
122--- a/src/Hy3Layout.cpp
123+++ b/src/Hy3Layout.cpp
124@@ -5,6 +5,7 @@
125 #include <hyprland/src/desktop/DesktopTypes.hpp>
126 #include <hyprland/src/desktop/Workspace.hpp>
127 #include <hyprland/src/plugins/PluginAPI.hpp>
128+#include <hyprland/src/managers/PointerManager.hpp>
129 #include <ranges>
130 
131 #include "Hy3Layout.hpp"
132@@ -1358,7 +1359,7 @@ fsupdate:
133 }
134 
135 void Hy3Layout::warpCursorToBox(const Vector2D& pos, const Vector2D& size) {
136-	auto cursorpos = Vector2D(g_pCompositor->m_sWLRCursor->x, g_pCompositor->m_sWLRCursor->y);
137+	auto cursorpos = g_pPointerManager->position();
138 
139 	if (cursorpos.x < pos.x || cursorpos.x >= pos.x + size.x || cursorpos.y < pos.y
140 	    || cursorpos.y >= pos.y + size.y)
141diff --git a/src/dispatchers.cpp b/src/dispatchers.cpp
142index b13a6e081c3bda8b89309222ac9a7626eb015a86..6a861d5a6029fbe6782431e9169596a539bc4e7e 100644
143--- a/src/dispatchers.cpp
144+++ b/src/dispatchers.cpp
145@@ -113,7 +113,7 @@ void dispatch_movefocus(std::string value) {
146 
147 	auto args = CVarList(value);
148 
149-	static const auto no_cursor_warps = ConfigValue<Hyprlang::INT>("general:no_cursor_warps");
150+	static const auto no_cursor_warps = ConfigValue<Hyprlang::INT>("cursor:no_warps");
151 	auto warp_cursor = !*no_cursor_warps;
152 
153 	int argi = 0;