bc25b2a87fa7528ec4242f952a66556e1dda782b

Message

fixup: fix breakage after hyprland#5883

Diff

This diff is truncated to protect this page.

  1diff --git a/flake.lock b/flake.lock
  2index 50d25e8b369ad5a33619a9e93c82c8a5c4c7f881..436447485dcc4b3c8568be7c4ab36a41119e0c91 100644
  3--- a/flake.lock
  4+++ b/flake.lock
  5@@ -32,45 +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": 1714409407,
 19-        "narHash": "sha256-gc10Ag5O/s+EE24JZUXTpH4ogRsSyAfdgr7OvSNhQ8s=",
 20-        "owner": "hyprwm",
 21-        "repo": "Hyprland",
 22-        "rev": "f2b03e9679bc1a091fecffd98b50a4179b5c7d43",
 23-        "type": "github"
 24+        "lastModified": 1714933694,
 25+        "narHash": "sha256-gziEBZF1wmBBw3v0Ang3nN3QwoQWtFmBIORODJt38TE=",
 26+        "ref": "refs/heads/main",
 27+        "rev": "cddeec47a1fc0e70d8598fd10c29cd0e9489999f",
 28+        "revCount": 4617,
 29+        "submodules": true,
 30+        "type": "git",
 31+        "url": "https://github.com/hyprwm/Hyprland"
 32       },
 33       "original": {
 34-        "owner": "hyprwm",
 35-        "repo": "Hyprland",
 36-        "type": "github"
 37+        "submodules": true,
 38+        "type": "git",
 39+        "url": "https://github.com/hyprwm/Hyprland"
 40       }
 41     },
 42     "hyprland-protocols": {
 43       "inputs": {
 44         "nixpkgs": [
 45           "hyprland",
 46+          "xdph",
 47           "nixpkgs"
 48         ],
 49         "systems": [
 50           "hyprland",
 51+          "xdph",
 52           "systems"
 53         ]
 54       },
 55       "locked": {
 56-        "lastModified": 1691753796,
 57-        "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=",
 58+        "lastModified": 1714869498,
 59+        "narHash": "sha256-vbLVOWvQqo4n1yvkg/Q70VTlPbMmTiCQfNTgcWDCfJM=",
 60         "owner": "hyprwm",
 61         "repo": "hyprland-protocols",
 62-        "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03",
 63+        "rev": "e06482e0e611130cd1929f75e8c1cf679e57d161",
 64         "type": "github"
 65       },
 66       "original": {
 67@@ -116,11 +118,11 @@
 68         ]
 69       },
 70       "locked": {
 71-        "lastModified": 1714171579,
 72-        "narHash": "sha256-eaWDIvt8ufUKKz3Lc2a3PyemLJG1m9RYlF+HP3hWbaw=",
 73+        "lastModified": 1714755542,
 74+        "narHash": "sha256-D0pg+ZRwrt4lavZ97Ca8clsgbPA3duLj8iEM7riaIFY=",
 75         "owner": "hyprwm",
 76         "repo": "hyprwayland-scanner",
 77-        "rev": "126dad854f22fe30e6b82cd21808e76903d90ac5",
 78+        "rev": "1270ebaa539e56d61b708c24b072b09cbbd3a828",
 79         "type": "github"
 80       },
 81       "original": {
 82@@ -131,11 +133,11 @@
 83     },
 84     "nixpkgs": {
 85       "locked": {
 86-        "lastModified": 1713714899,
 87-        "narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=",
 88+        "lastModified": 1714253743,
 89+        "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=",
 90         "owner": "NixOS",
 91         "repo": "nixpkgs",
 92-        "rev": "6143fc5eeb9c4f00163267708e26191d1e918932",
 93+        "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994",
 94         "type": "github"
 95       },
 96       "original": {
 97@@ -165,29 +167,9 @@
 98         "type": "github"
 99       }
100     },
101-    "wlroots": {
102-      "flake": false,
103-      "locked": {
104-        "lastModified": 1713731601,
105diff --git a/flake.nix b/flake.nix
106index a375308b98bc8c5caa8e69646dfbab4ef69e3f70..bf2c9287aa7496bd8d55f48caf394d60f111f650 100644
107--- a/flake.nix
108+++ b/flake.nix
109@@ -1,6 +1,6 @@
110 {
111   inputs = {
112-    hyprland.url = "github:hyprwm/Hyprland";
113+    hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
114   };
115 
116   outputs = { self, hyprland, ... }: let
117diff --git a/src/Hy3Layout.cpp b/src/Hy3Layout.cpp
118index 4bfcca88ec666db3d74d6db0eecabec2916c4ba9..348e1fcc08c81dda5ea8925eb089ea79d1f4a120 100644
119--- a/src/Hy3Layout.cpp
120+++ b/src/Hy3Layout.cpp
121@@ -11,10 +11,10 @@
122 #include "SelectionHook.hpp"
123 #include "globals.hpp"
124 
125-std::shared_ptr<HOOK_CALLBACK_FN> renderHookPtr;
126-std::shared_ptr<HOOK_CALLBACK_FN> windowTitleHookPtr;
127-std::shared_ptr<HOOK_CALLBACK_FN> urgentHookPtr;
128-std::shared_ptr<HOOK_CALLBACK_FN> tickHookPtr;
129+SP<HOOK_CALLBACK_FN> renderHookPtr;
130+SP<HOOK_CALLBACK_FN> windowTitleHookPtr;
131+SP<HOOK_CALLBACK_FN> urgentHookPtr;
132+SP<HOOK_CALLBACK_FN> tickHookPtr;
133 
134 bool performContainment(Hy3Node& node, bool contained, PHLWINDOW& window) {
135 	if (node.data.is_group()) {