50643d625829f303239f9ec019021f17d7e9f3fc
- Author
- outfoxxed <outfoxxed@outfoxxed.me>
- Committer
- outfoxxed <outfoxxed@outfoxxed.me>
- Date
Message
fixup: fix upstream log breakage
Diff
This diff is truncated to protect this page.
1diff --git a/flake.lock b/flake.lock
2index 7a713aee6924781bf0edbe93580d01584de093d5..042e4cb249acaf2a869fcd9f15e507b45c99ad62 100644
3--- a/flake.lock
4+++ b/flake.lock
5@@ -20,11 +20,11 @@
6 ]
7 },
8 "locked": {
9- "lastModified": 1764714051,
10- "narHash": "sha256-AjcMlM3UoavFoLzr0YrcvsIxALShjyvwe+o7ikibpCM=",
11+ "lastModified": 1765900596,
12+ "narHash": "sha256-+hn8v9jkkLP9m+o0Nm5SiEq10W0iWDSotH2XfjU45fA=",
13 "owner": "hyprwm",
14 "repo": "aquamarine",
15- "rev": "a43bedcceced5c21ad36578ed823e6099af78214",
16+ "rev": "d83c97f8f5c0aae553c1489c7d9eff3eadcadace",
17 "type": "github"
18 },
19 "original": {
20@@ -146,17 +146,17 @@
21 "xdph": "xdph"
22 },
23 "locked": {
24- "lastModified": 1765284242,
25- "narHash": "sha256-r9ltXBKsowTVc/avfoBmd7M4H3NOxJUPm0+9o8sj03Y=",
26+ "lastModified": 1766357453,
27+ "narHash": "sha256-6E6k/T6fPXtyhT35wXSv1h3qTQrEbNbDVaMEXiYQ2Xs=",
28 "owner": "hyprwm",
29 "repo": "hyprland",
30- "rev": "6712fb954f2e4f701878b97f19b7185a2cd0e192",
31+ "rev": "60efbf3f63bec3100477ea9ba6cd634e35d5aeaa",
32 "type": "github"
33 },
34 "original": {
35 "owner": "hyprwm",
36 "repo": "hyprland",
37- "rev": "6712fb954f2e4f701878b97f19b7185a2cd0e192",
38+ "rev": "60efbf3f63bec3100477ea9ba6cd634e35d5aeaa",
39 "type": "github"
40 }
41 },
42@@ -193,11 +193,11 @@
43 ]
44 },
45 "locked": {
46- "lastModified": 1764812575,
47- "narHash": "sha256-1bK1yGgaR82vajUrt6z+BSljQvFn91D74WJ/vJsydtE=",
48+ "lastModified": 1765643131,
49+ "narHash": "sha256-CCGohW5EBIRy4B7vTyBMqPgsNcaNenVad/wszfddET0=",
50 "owner": "hyprwm",
51 "repo": "hyprland-guiutils",
52- "rev": "fd321368a40c782cfa299991e5584ca338e36ebe",
53+ "rev": "e50ae912813bdfa8372d62daf454f48d6df02297",
54 "type": "github"
55 },
56 "original": {
57@@ -218,11 +218,11 @@
58 ]
59 },
60 "locked": {
61- "lastModified": 1759610243,
62- "narHash": "sha256-+KEVnKBe8wz+a6dTLq8YDcF3UrhQElwsYJaVaHXJtoI=",
63+ "lastModified": 1765214753,
64+ "narHash": "sha256-P9zdGXOzToJJgu5sVjv7oeOGPIIwrd9hAUAP3PsmBBs=",
65 "owner": "hyprwm",
66 "repo": "hyprland-protocols",
67- "rev": "bd153e76f751f150a09328dbdeb5e4fab9d23622",
68+ "rev": "3f3860b869014c00e8b9e0528c7b4ddc335c21ab",
69 "type": "github"
70 },
71 "original": {
72@@ -324,11 +324,11 @@
73 ]
74 },
75 "locked": {
76- "lastModified": 1764962281,
77- "narHash": "sha256-rGbEMhTTyTzw4iyz45lch5kXseqnqcEpmrHdy+zHsfo=",
78+ "lastModified": 1766160771,
79+ "narHash": "sha256-roINUGikWRqqgKrD4iotKbGj3ZKJl3hjMz5l/SyKrHw=",
80 "owner": "hyprwm",
81 "repo": "hyprutils",
82- "rev": "fe686486ac867a1a24f99c753bb40ffed338e4b0",
83+ "rev": "5ac060bfcf2f12b3a6381156ebbc13826a05b09f",
84 "type": "github"
85 },
86 "original": {
87@@ -378,11 +378,11 @@
88 ]
89 },
90 "locked": {
91- "lastModified": 1764872015,
92- "narHash": "sha256-INI9AVrQG5nJZFvGPSiUZ9FEUZJLfGdsqjF1QSak7Gc=",
93+ "lastModified": 1766253200,
94+ "narHash": "sha256-26qPwrd3od+xoYVywSB7hC2cz9ivN46VPLlrsXyGxvE=",
95 "owner": "hyprwm",
96 "repo": "hyprwire",
97- "rev": "7997451dcaab7b9d9d442f18985d514ec5891608",
98+ "rev": "1079777525b30a947c8d657fac158e00ae85de9d",
99 "type": "github"
100 },
101 "original": {
102@@ -393,11 +393,11 @@
103 },
104 "nixpkgs": {
105diff --git a/flake.nix b/flake.nix
106index 50ead460da2d93d69759d31263c923298e1a8137..993770760fa9664f44143b0c938e7f7a92429ad8 100644
107--- a/flake.nix
108+++ b/flake.nix
109@@ -1,6 +1,6 @@
110 {
111 inputs = {
112- hyprland.url = "github:hyprwm/hyprland/6712fb954f2e4f701878b97f19b7185a2cd0e192";
113+ hyprland.url = "github:hyprwm/hyprland/60efbf3f63bec3100477ea9ba6cd634e35d5aeaa";
114 };
115
116 outputs = {
117diff --git a/src/Hy3Layout.cpp b/src/Hy3Layout.cpp
118index 352081cce1fe82433ece3ad646dcaa297557c80a..9aecf48087e97739346aa28c4917cce66801f40c 100644
119--- a/src/Hy3Layout.cpp
120+++ b/src/Hy3Layout.cpp
121@@ -20,6 +20,7 @@
122 #include <hyprutils/math/Vector2D.hpp>
123 #include <ranges>
124
125+#include "log.hpp"
126 #include "Hy3Layout.hpp"
127 #include "Hy3Node.hpp"
128 #include "TabGroup.hpp"
129@@ -1155,11 +1156,7 @@ void Hy3Layout::moveNodeToWorkspace(
130 origin_ws->m_monitor->setSpecialWorkspace(nullptr);
131 }
132
133- static const auto allow_workspace_cycles =
134- ConfigValue<Hyprlang::INT>("binds:allow_workspace_cycles");
135-
136 monitor->changeWorkspace(workspace);
137- if (*allow_workspace_cycles) workspace->rememberPrevWorkspace(origin_ws);
138
139 node->parent->recalcSizePosRecursive();
140 node->focus(warp);
141diff --git a/src/Hy3Node.cpp b/src/Hy3Node.cpp
142index 7de161a2c1f68488ad4694306f1fb2ce2be48cfb..3c777862ebe5eedd80fad2ed3a69de60379b23fd 100644
143--- a/src/Hy3Node.cpp
144+++ b/src/Hy3Node.cpp
145@@ -10,6 +10,7 @@
146 #include <hyprland/src/plugins/PluginAPI.hpp>
147 #include <hyprutils/math/Box.hpp>
148
149+#include "log.hpp"
150 #include "Hy3Layout.hpp"
151 #include "Hy3Node.hpp"
152 #include "globals.hpp"
153diff --git a/src/TabGroup.cpp b/src/TabGroup.cpp
154index b3df4ab99bb18c9da26807ff5decc817696e0f8a..b40a85bfd3cff6b008953b16c34ca0da012196b3 100644
155--- a/src/TabGroup.cpp
156+++ b/src/TabGroup.cpp
157@@ -21,6 +21,7 @@
158 #include <pango/pangocairo.h>
159 #include <pixman.h>
160
161+#include "log.hpp"
162 #include "globals.hpp"
163 #include "render.hpp"
164
165diff --git a/src/dispatchers.cpp b/src/dispatchers.cpp
166index f88793f77e75fa8ba3a1cc2148744232969cd0ed..eaa3642d8806e9ab52dc7064305716fdffe4738b 100644
167--- a/src/dispatchers.cpp
168+++ b/src/dispatchers.cpp
169@@ -198,7 +198,7 @@ static SDispatchResult dispatch_focustab(std::string value) {
170 focus = TabFocus::Index;
171 if (!isNumber(args[i])) return SDispatchResult {};
172 index = std::stoi(args[i]);
173- Debug::log(LOG, "Focus index '%s' -> %d, errno: %d", args[i].c_str(), index, errno);
174+ hy3_log(LOG, "Focus index '%s' -> %d, errno: %d", args[i].c_str(), index, errno);
175 } else return SDispatchResult {};
176
177 i++;
178diff --git a/src/log.hpp b/src/log.hpp
179index b86ce36ac982f8ce888b19a87bae9a33ce25529c..dc13444521aafb1bb39aa41b0faf9bc79647235d 100644
180--- a/src/log.hpp
181+++ b/src/log.hpp
182@@ -1,9 +1,20 @@
183 #pragma once
184
185-#include <hyprland/src/debug/Log.hpp>
186+#include <hyprland/src/debug/log/Logger.hpp>
187+#include <hyprutils/cli/Logger.hpp>
188+
189+using Hyprutils::CLI::eLogLevel;
190+
191+inline constexpr auto TRACE = Log::TRACE;
192+inline constexpr auto DEBUG = Log::DEBUG;
193+inline constexpr auto INFO = Log::INFO;
194+inline constexpr auto WARN = Log::WARN;
195+inline constexpr auto ERR = Log::ERR;
196+inline constexpr auto CRIT = Log::CRIT;
197+inline constexpr auto LOG = Log::DEBUG;
198
199 template <typename... Args>
200 void hy3_log(eLogLevel level, std::format_string<Args...> fmt, Args&&... args) {
201 auto msg = std::vformat(fmt.get(), std::make_format_args(args...));
202- Debug::log(level, "[hy3] {}", msg);
203+ Log::logger->log(level, "[hy3] {}", msg);
204 }