2350428f71c3ed32081cd84164a5a6b043e82b5a
- Author
- outfoxxed <outfoxxed@outfoxxed.me>
- Committer
- outfoxxed <outfoxxed@outfoxxed.me>
- Date
Message
fixup: account for upstream hungarian notation changes Fixes #202
Diff
This diff is truncated to protect this page.
1diff --git a/flake.lock b/flake.lock
2index 492d474c273b87a14e4099dcf990185cc0d904c4..08a9c0ac07a4f3e995de818a3b68c4242f36b4cd 100644
3--- a/flake.lock
4+++ b/flake.lock
5@@ -20,11 +20,11 @@
6 ]
7 },
8 "locked": {
9- "lastModified": 1742213273,
10- "narHash": "sha256-0l0vDb4anfsBu1rOs94bC73Hub+xEivgBAo6QXl2MmU=",
11+ "lastModified": 1744289235,
12+ "narHash": "sha256-ZFkHLdimtFzQACsVVyZkZlfYdj4iNy3PkzXfrwmlse8=",
13 "owner": "hyprwm",
14 "repo": "aquamarine",
15- "rev": "484b732195cc53f4536ce4bd59a5c6402b1e7ccf",
16+ "rev": "c8282f4982b56dfa5e9b9f659809da93f8d37e7a",
17 "type": "github"
18 },
19 "original": {
20@@ -116,11 +116,11 @@
21 ]
22 },
23 "locked": {
24- "lastModified": 1739049071,
25- "narHash": "sha256-3+7TpXMrbsUXSwgr5VAKAnmkzMb6JO+Rvc9XRb5NMg4=",
26+ "lastModified": 1745015490,
27+ "narHash": "sha256-apEJ9zoSzmslhJ2vOKFcXTMZLUFYzh1ghfB6Rbw3Low=",
28 "owner": "hyprwm",
29 "repo": "hyprgraphics",
30- "rev": "175c6b29b6ff82100539e7c4363a35a02c74dd73",
31+ "rev": "60754910946b4e2dc1377b967b7156cb989c5873",
32 "type": "github"
33 },
34 "original": {
35@@ -145,17 +145,17 @@
36 "xdph": "xdph"
37 },
38 "locked": {
39- "lastModified": 1742741773,
40- "narHash": "sha256-SLEd12Y9KzlQd4CfH2+gz3oQvkPKmwvwi74O+veNdbs=",
41+ "lastModified": 1745541469,
42+ "narHash": "sha256-M4eoWX2yBwVwYtp2rNNTvudnPdZuGKiJWQYTU5s9g1E=",
43 "owner": "hyprwm",
44 "repo": "Hyprland",
45- "rev": "5ee35f914f921e5696030698e74fb5566a804768",
46+ "rev": "41f5f67f6c8675ec48d893007ca93f8bf6c0049a",
47 "type": "github"
48 },
49 "original": {
50 "owner": "hyprwm",
51 "repo": "Hyprland",
52- "rev": "5ee35f914f921e5696030698e74fb5566a804768",
53+ "rev": "41f5f67f6c8675ec48d893007ca93f8bf6c0049a",
54 "type": "github"
55 }
56 },
57@@ -171,11 +171,11 @@
58 ]
59 },
60 "locked": {
61- "lastModified": 1738422629,
62- "narHash": "sha256-5v+bv75wJWvahyM2xcMTSNNxmV8a7hb01Eey5zYnBJw=",
63+ "lastModified": 1743714874,
64+ "narHash": "sha256-yt8F7NhMFCFHUHy/lNjH/pjZyIDFNk52Q4tivQ31WFo=",
65 "owner": "hyprwm",
66 "repo": "hyprland-protocols",
67- "rev": "755aef8dab49d0fc4663c715fa4ad221b2aedaed",
68+ "rev": "3a5c2bda1c1a4e55cc1330c782547695a93f05b2",
69 "type": "github"
70 },
71 "original": {
72@@ -268,11 +268,11 @@
73 ]
74 },
75 "locked": {
76- "lastModified": 1741191527,
77- "narHash": "sha256-kM+11Nch47Xwfgtw2EpRitJuORy4miwoMuRi5tyMBDY=",
78+ "lastModified": 1744468525,
79+ "narHash": "sha256-9HySx+EtsbbKlZDlY+naqqOV679VdxP6x6fP3wxDXJk=",
80 "owner": "hyprwm",
81 "repo": "hyprlang",
82- "rev": "72df3861f1197e41b078faa3e38eedd60e00018d",
83+ "rev": "f1000c54d266e6e4e9d646df0774fac5b8a652df",
84 "type": "github"
85 },
86 "original": {
87@@ -293,11 +293,11 @@
88 ]
89 },
90 "locked": {
91- "lastModified": 1741534688,
92- "narHash": "sha256-EV3945SnjOCuRVbGRghsWx/9D89FyshnSO1Q6/TuQ14=",
93+ "lastModified": 1743950287,
94+ "narHash": "sha256-/6IAEWyb8gC/NKZElxiHChkouiUOrVYNq9YqG0Pzm4Y=",
95 "owner": "hyprwm",
96 "repo": "hyprutils",
97- "rev": "dd1f720cbc2dbb3c71167c9598045dd3261d27b3",
98+ "rev": "f2dc70e448b994cef627a157ee340135bd68fbc6",
99 "type": "github"
100 },
101 "original": {
102@@ -333,11 +333,11 @@
103 },
104 "nixpkgs": {
105diff --git a/flake.nix b/flake.nix
106index c544c5b441f98d54eb708bede0312da9d6a8708e..931115344cbfd86bd170a46bdb56840e581638e2 100644
107--- a/flake.nix
108+++ b/flake.nix
109@@ -1,6 +1,6 @@
110 {
111 inputs = {
112- hyprland.url = "github:hyprwm/Hyprland?rev=5ee35f914f921e5696030698e74fb5566a804768";
113+ hyprland.url = "github:hyprwm/Hyprland?rev=41f5f67f6c8675ec48d893007ca93f8bf6c0049a";
114 };
115
116 outputs = { self, hyprland, ... }: let
117diff --git a/src/Hy3Layout.cpp b/src/Hy3Layout.cpp
118index 227a04910a0f7d8adeba6e4b32ed3ced7914c136..dfdd96dd8de449971630869d8f2b14227e25df38 100644
119--- a/src/Hy3Layout.cpp
120+++ b/src/Hy3Layout.cpp
121@@ -30,11 +30,11 @@
122 PHLWORKSPACE workspace_for_action(bool allow_fullscreen) {
123 if (g_pLayoutManager->getCurrentLayout() != g_Hy3Layout.get()) return nullptr;
124
125- auto workspace = g_pCompositor->m_pLastMonitor->activeSpecialWorkspace;
126- if (!valid(workspace)) workspace = g_pCompositor->m_pLastMonitor->activeWorkspace;
127+ auto workspace = g_pCompositor->m_lastMonitor->activeSpecialWorkspace;
128+ if (!valid(workspace)) workspace = g_pCompositor->m_lastMonitor->activeWorkspace;
129
130 if (!valid(workspace)) return nullptr;
131- if (!allow_fullscreen && workspace->m_bHasFullscreenWindow) return nullptr;
132+ if (!allow_fullscreen && workspace->m_hasFullscreenWindow) return nullptr;
133
134 return workspace;
135 }
136@@ -71,7 +71,7 @@ void Hy3Layout::onWindowCreatedTiling(PHLWINDOW window, eDirection) {
137 (uintptr_t) window.get(),
138 window->m_bIsFloating,
139 window->monitorID(),
140- window->m_pWorkspace->m_iID
141+ window->m_pWorkspace->m_id
142 );
143
144 if (window->m_bIsFloating) return;
145@@ -113,7 +113,7 @@ void Hy3Layout::insertNode(Hy3Node& node) {
146 ERR,
147 "insertNode called for node {:x} with invalid workspace id {}",
148 (uintptr_t) &node,
149- node.workspace->m_iID
150+ node.workspace->m_id
151 );
152 return;
153 }
154@@ -121,7 +121,7 @@ void Hy3Layout::insertNode(Hy3Node& node) {
155 node.reparenting = true;
156 node.size_ratio = 1.0;
157
158- auto& monitor = node.workspace->m_pMonitor;
159+ auto& monitor = node.workspace->m_monitor;
160
161 Hy3Node* opening_into;
162 Hy3Node* opening_after = nullptr;
163@@ -140,7 +140,7 @@ void Hy3Layout::insertNode(Hy3Node& node) {
164 }
165
166 if (opening_after == nullptr) {
167- auto last_window = g_pCompositor->m_pLastWindow;
168+ auto last_window = g_pCompositor->m_lastWindow;
169 if (last_window != nullptr && last_window->m_pWorkspace == node.workspace
170 && !last_window->m_bIsFloating
171 && (node.data.is_window() || last_window != node.data.as_window())
172@@ -220,8 +220,8 @@ void Hy3Layout::insertNode(Hy3Node& node) {
173 "opening_into node ({:x}) is on workspace {} which does not match the new window "
174 "(workspace {})",
175 (uintptr_t) opening_into,
176- opening_into->workspace->m_iID,
177- node.workspace->m_iID
178+ opening_into->workspace->m_id,
179+ node.workspace->m_id
180 );
181 }
182
183@@ -399,7 +399,7 @@ ShiftDirection reverse(ShiftDirection direction) {
184 }
185
186 void Hy3Layout::resizeActiveWindow(const Vector2D& delta, eRectCorner corner, PHLWINDOW pWindow) {
187- auto window = pWindow ? pWindow : g_pCompositor->m_pLastWindow.lock();
188+ auto window = pWindow ? pWindow : g_pCompositor->m_lastWindow.lock();
189 if (!valid(window)) return;
190
191 auto* node = this->getNodeFromWindow(window.get());
192@@ -490,7 +490,7 @@ void Hy3Layout::fullscreenRequestForWindow(
193 eFullscreenMode current_mode,
194 eFullscreenMode target_mode
195 ) {
196- if (current_mode == target_mode || window->m_pWorkspace->m_bIsSpecialWorkspace) return;
197+ if (current_mode == target_mode || window->m_pWorkspace->m_isSpecialWorkspace) return;
198
199 const auto& monitor = window->m_pMonitor;
200
201@@ -532,14 +532,14 @@ void Hy3Layout::fullscreenRequestForWindow(
202
203 // clang-format off
204 auto gap_pos_offset = Vector2D(
205- (int) -(gaps_in->left - gaps_out->left),
206- (int) -(gaps_in->top - gaps_out->top)
207+ (int) -(gaps_in->m_left - gaps_out->m_left),
208+ (int) -(gaps_in->m_top - gaps_out->m_top)
209 );
210 // clang-format on
211
212 auto gap_size_offset = Vector2D(
213- (int) (-(gaps_in->left - gaps_out->left) + -(gaps_in->right - gaps_out->right)),
214- (int) (-(gaps_in->top - gaps_out->top) + -(gaps_in->bottom - gaps_out->bottom))
215+ (int) (-(gaps_in->m_left - gaps_out->m_left) + -(gaps_in->m_right - gaps_out->m_right)),
216+ (int) (-(gaps_in->m_top - gaps_out->m_top) + -(gaps_in->m_bottom - gaps_out->m_bottom))
217 );
218
219 Hy3Node fakeNode = {
220@@ -609,7 +609,7 @@ void Hy3Layout::alterSplitRatio(PHLWINDOW pWindow, float delta, bool exact) {
221diff --git a/src/Hy3Node.cpp b/src/Hy3Node.cpp
222index 20b687fd00ecbc0793c48cff799497013008e1f5..f8315200acfd690decc696ad79e211d98bdfdd4f 100644
223--- a/src/Hy3Node.cpp
224+++ b/src/Hy3Node.cpp
225@@ -321,19 +321,19 @@ void Hy3Node::recalcSizePosRecursive(bool no_animation) {
226 auto gaps_out = workspace_rule.gapsOut.value_or(*p_gaps_out);
227
228 auto gap_topleft_offset = Vector2D(
229- (int) -(gaps_in.left - gaps_out.left),
230- (int) -(gaps_in.top - gaps_out.top)
231+ (int) -(gaps_in.m_left - gaps_out.m_left),
232+ (int) -(gaps_in.m_top - gaps_out.m_top)
233 );
234
235 auto gap_bottomright_offset = Vector2D(
236- (int) -(gaps_in.right - gaps_out.right),
237- (int) -(gaps_in.bottom - gaps_out.bottom)
238+ (int) -(gaps_in.m_right - gaps_out.m_right),
239+ (int) -(gaps_in.m_bottom - gaps_out.m_bottom)
240 );
241 // clang-format on
242
243 if (this->data.is_window() && this->data.as_window()->isFullscreen()) {
244 auto window = this->data.as_window();
245- auto& monitor = this->workspace->m_pMonitor;
246+ auto& monitor = this->workspace->m_monitor;
247
248 if (window->isEffectiveInternalFSMode(FSMODE_FULLSCREEN)) {
249 *window->m_vRealPosition = monitor->vecPosition;
250@@ -532,7 +532,7 @@ void findTopWindowInNode(Hy3Node& node, FindTopWindowInNodeResult& result) {
251 switch (node.data.type()) {
252 case Hy3NodeType::Window: {
253 auto window = node.data.as_window();
254- auto& windows = g_pCompositor->m_vWindows;
255+ auto& windows = g_pCompositor->m_windows;
256
257 for (; result.index < windows.size(); result.index++) {
258 if (windows[result.index] == window) {
259@@ -652,8 +652,8 @@ CBox Hy3Node::getStandardWindowArea(SBoxExtents extents) {
260 auto gaps_in = workspace_rule.gapsIn.value_or(*p_gaps_in);
261
262 SBoxExtents inner_gap_extents;
263- inner_gap_extents.topLeft = {(int) -gaps_in.left, (int) -gaps_in.top};
264- inner_gap_extents.bottomRight = {(int) -gaps_in.right, (int) -gaps_in.bottom};
265+ inner_gap_extents.topLeft = {(int) -gaps_in.m_left, (int) -gaps_in.m_top};
266+ inner_gap_extents.bottomRight = {(int) -gaps_in.m_right, (int) -gaps_in.m_bottom};
267
268 SBoxExtents combined_outer_extents;
269 combined_outer_extents.topLeft = -this->gap_topleft_offset;
270diff --git a/src/SelectionHook.cpp b/src/SelectionHook.cpp
271index 776effec76e385a0fab32adbe551007fb75cec8f..6bbeef839769a897e2baa57ddc4796b2b6925bc5 100644
272--- a/src/SelectionHook.cpp
273+++ b/src/SelectionHook.cpp
274@@ -9,15 +9,15 @@ inline CFunctionHook* g_LastSelectionHook = nullptr;
275 void hook_updateDecos(void* thisptr, PHLWINDOW window) {
276 bool explicitly_selected = g_Hy3Layout->shouldRenderSelected(window.get());
277
278- auto lastWindow = g_pCompositor->m_pLastWindow;
279+ auto lastWindow = g_pCompositor->m_lastWindow;
280 if (explicitly_selected) {
281- g_pCompositor->m_pLastWindow = window;
282+ g_pCompositor->m_lastWindow = window;
283 }
284
285 ((void (*)(void*, PHLWINDOW)) g_LastSelectionHook->m_pOriginal)(thisptr, window);
286
287 if (explicitly_selected) {
288- g_pCompositor->m_pLastWindow = lastWindow;
289+ g_pCompositor->m_lastWindow = lastWindow;
290 }
291 }
292
293diff --git a/src/TabGroup.cpp b/src/TabGroup.cpp
294index ff74f5cc1ff4dae909bf30b1185cfbb1b78ab879..9835c012987a8ed1dd0f53d6ce2c0108732add13 100644
295--- a/src/TabGroup.cpp
296+++ b/src/TabGroup.cpp
297@@ -617,7 +617,7 @@ void Hy3TabGroup::tick() {
298 this->bar.tick();
299
300 if (valid(this->workspace)) {
301- auto has_fullscreen = this->workspace->m_bHasFullscreenWindow;
302+ auto has_fullscreen = this->workspace->m_hasFullscreenWindow;
303
304 if (!has_fullscreen && *no_gaps_when_only) {
305 auto root_node = g_Hy3Layout->getWorkspaceRootGroup(this->workspace.get());
306@@ -631,7 +631,7 @@ void Hy3TabGroup::tick() {
307 if (this->bar.fade_opacity->goal() != 1.0) *this->bar.fade_opacity = 1.0;
308 }
309
310- auto workspaceOffset = this->workspace->m_vRenderOffset->value();
311+ auto workspaceOffset = this->workspace->m_renderOffset->value();
312 if (this->last_workspace_offset != workspaceOffset) {
313 // First we damage the area where the bar was during the previous
314 // tick, cleaning up after ourselves
315@@ -649,7 +649,7 @@ void Hy3TabGroup::tick() {
316 this->last_workspace_offset = workspaceOffset;
317 }
318
319- if (this->workspace->m_fAlpha->isBeingAnimated()) {
320+ if (this->workspace->m_alpha->isBeingAnimated()) {
321 auto pos = this->pos->value();
322 auto size = this->size->value();
323 damageBox(&pos, &size);
324@@ -690,7 +690,7 @@ std::pair<CBox, CBox> Hy3TabGroup::getRenderBB() const {
325 auto size = this->size->value();
326
327 if (valid(this->workspace)) {
328- pos = pos + this->workspace->m_vRenderOffset->value();
329+ pos = pos + this->workspace->m_renderOffset->value();
330 }
331
332 auto box = CBox(pos, size);
333@@ -758,7 +758,7 @@ void Hy3TabGroup::renderTabBar() {
334
335 auto wpos =
336 window->m_vRealPosition->value() - monitor->vecPosition
337- + (window->m_pWorkspace ? window->m_pWorkspace->m_vRenderOffset->value() : Vector2D());
338+ + (window->m_pWorkspace ? window->m_pWorkspace->m_renderOffset->value() : Vector2D());
339
340 auto wsize = window->m_vRealSize->value();
341
342@@ -778,7 +778,7 @@ void Hy3TabGroup::renderTabBar() {
343 }
344
345 auto fade_opacity = this->bar.fade_opacity->value()
346- * (valid(this->workspace) ? this->workspace->m_fAlpha->value() : 1.0);
347+ * (valid(this->workspace) ? this->workspace->m_alpha->value() : 1.0);
348
349 auto render_entry = [&](Hy3TabBarEntry& entry) {
350 Vector2D entry_pos = {
351diff --git a/src/dispatchers.cpp b/src/dispatchers.cpp
352index cb2fe383a5fb45161091412455b9caaa8f3824c3..2cc41829d398ae820496a2e7e23d720bdeed798f 100644
353--- a/src/dispatchers.cpp
354+++ b/src/dispatchers.cpp
355@@ -112,7 +112,7 @@ void dispatch_movefocus(std::string value) {
356 int argi = 0;
357 auto shift = parseShiftArg(args[argi++]);
358 if (!shift) return;
359- if (workspace->m_bHasFullscreenWindow) {
360+ if (workspace->m_hasFullscreenWindow) {
361 g_Hy3Layout->focusMonitor(shift.value());
362 return;
363 }