58169cf129ae1d298e87b67ab00a9fdde8aef092
- Author
- outfoxxed <outfoxxed@outfoxxed.me>
- Committer
- outfoxxed <outfoxxed@outfoxxed.me>
- Date
Message
fixup: account for more upstream hungarian notation changes
Diff
This diff is truncated to protect this page.
1diff --git a/flake.lock b/flake.lock
2index 08a9c0ac07a4f3e995de818a3b68c4242f36b4cd..2d55892dbb0662bd55b5998f7ba5cff10c402477 100644
3--- a/flake.lock
4+++ b/flake.lock
5@@ -145,17 +145,17 @@
6 "xdph": "xdph"
7 },
8 "locked": {
9- "lastModified": 1745541469,
10- "narHash": "sha256-M4eoWX2yBwVwYtp2rNNTvudnPdZuGKiJWQYTU5s9g1E=",
11+ "lastModified": 1745969732,
12+ "narHash": "sha256-OUQ6QeZIf518LtkizIYHRo7FHRpuh3zd28bJV7WSiSg=",
13 "owner": "hyprwm",
14 "repo": "Hyprland",
15- "rev": "41f5f67f6c8675ec48d893007ca93f8bf6c0049a",
16+ "rev": "72cb5d24b6894334da021157c626556a8e99b6ff",
17 "type": "github"
18 },
19 "original": {
20 "owner": "hyprwm",
21 "repo": "Hyprland",
22- "rev": "41f5f67f6c8675ec48d893007ca93f8bf6c0049a",
23+ "rev": "72cb5d24b6894334da021157c626556a8e99b6ff",
24 "type": "github"
25 }
26 },
27diff --git a/flake.nix b/flake.nix
28index 931115344cbfd86bd170a46bdb56840e581638e2..9f5feb0780be913de96e9de2e0691e367616e299 100644
29--- a/flake.nix
30+++ b/flake.nix
31@@ -1,6 +1,6 @@
32 {
33 inputs = {
34- hyprland.url = "github:hyprwm/Hyprland?rev=41f5f67f6c8675ec48d893007ca93f8bf6c0049a";
35+ hyprland.url = "github:hyprwm/Hyprland?rev=72cb5d24b6894334da021157c626556a8e99b6ff";
36 };
37
38 outputs = { self, hyprland, ... }: let
39diff --git a/src/Hy3Layout.cpp b/src/Hy3Layout.cpp
40index dfdd96dd8de449971630869d8f2b14227e25df38..04c00d09e44947b33c15a0c36635914889b7463f 100644
41--- a/src/Hy3Layout.cpp
42+++ b/src/Hy3Layout.cpp
43@@ -69,12 +69,12 @@ void Hy3Layout::onWindowCreatedTiling(PHLWINDOW window, eDirection) {
44 LOG,
45 "onWindowCreatedTiling called with window {:x} (floating: {}, monitor: {}, workspace: {})",
46 (uintptr_t) window.get(),
47- window->m_bIsFloating,
48+ window->m_isFloating,
49 window->monitorID(),
50- window->m_pWorkspace->m_id
51+ window->m_workspace->m_id
52 );
53
54- if (window->m_bIsFloating) return;
55+ if (window->m_isFloating) return;
56
57 auto* existing = this->getNodeFromWindow(window.get());
58 if (existing != nullptr) {
59@@ -90,7 +90,7 @@ void Hy3Layout::onWindowCreatedTiling(PHLWINDOW window, eDirection) {
60 this->nodes.push_back({
61 .parent = nullptr,
62 .data = window,
63- .workspace = window->m_pWorkspace,
64+ .workspace = window->m_workspace,
65 .layout = this,
66 });
67
68@@ -141,10 +141,10 @@ void Hy3Layout::insertNode(Hy3Node& node) {
69
70 if (opening_after == nullptr) {
71 auto last_window = g_pCompositor->m_lastWindow;
72- if (last_window != nullptr && last_window->m_pWorkspace == node.workspace
73- && !last_window->m_bIsFloating
74+ if (last_window != nullptr && last_window->m_workspace == node.workspace
75+ && !last_window->m_isFloating
76 && (node.data.is_window() || last_window != node.data.as_window())
77- && last_window->m_bIsMapped)
78+ && last_window->m_isMapped)
79 {
80 opening_after = this->getNodeFromWindow(last_window.get());
81 } else {
82@@ -153,7 +153,7 @@ void Hy3Layout::insertNode(Hy3Node& node) {
83 RESERVED_EXTENTS | INPUT_EXTENTS
84 );
85
86- if (mouse_window != nullptr && mouse_window->m_pWorkspace == node.workspace) {
87+ if (mouse_window != nullptr && mouse_window->m_workspace == node.workspace) {
88 opening_after = this->getNodeFromWindow(mouse_window.get());
89 }
90 }
91@@ -407,7 +407,7 @@ void Hy3Layout::resizeActiveWindow(const Vector2D& delta, eRectCorner corner, PH
92 if (node != nullptr) {
93 node = &node->getExpandActor();
94
95- auto& monitor = window->m_pMonitor;
96+ auto& monitor = window->m_monitor;
97
98 const bool display_left =
99 STICKS(node->position.x, monitor->vecPosition.x + monitor->vecReservedTopLeft.x);
100@@ -475,13 +475,13 @@ void Hy3Layout::resizeActiveWindow(const Vector2D& delta, eRectCorner corner, PH
101 vertical_neighbor->resize(reverse(target_edge_y), resize_delta.y, *animate == 0);
102 }
103 }
104- } else if (window->m_bIsFloating) {
105+ } else if (window->m_isFloating) {
106 // No parent node - is this a floating window? If so, use the same logic as the `main` layout
107 const auto required_size = Vector2D(
108- std::max((window->m_vRealSize->goal() + delta).x, 20.0),
109- std::max((window->m_vRealSize->goal() + delta).y, 20.0)
110+ std::max((window->m_realSize->goal() + delta).x, 20.0),
111+ std::max((window->m_realSize->goal() + delta).y, 20.0)
112 );
113- *window->m_vRealSize = required_size;
114+ *window->m_realSize = required_size;
115 }
116 }
117
118@@ -490,9 +490,9 @@ void Hy3Layout::fullscreenRequestForWindow(
119 eFullscreenMode current_mode,
120 eFullscreenMode target_mode
121 ) {
122- if (current_mode == target_mode || window->m_pWorkspace->m_isSpecialWorkspace) return;
123+ if (current_mode == target_mode || window->m_workspace->m_isSpecialWorkspace) return;
124
125- const auto& monitor = window->m_pMonitor;
126+ const auto& monitor = window->m_monitor;
127
128 window->updateDynamicRules();
129 window->updateWindowDecos();
130@@ -505,23 +505,23 @@ void Hy3Layout::fullscreenRequestForWindow(
131 this->applyNodeDataToWindow(node);
132 } else {
133 // restore floating position if not
134- *window->m_vRealPosition = window->m_vLastFloatingPosition;
135- *window->m_vRealSize = window->m_vLastFloatingSize;
136+ *window->m_realPosition = window->m_lastFloatingPosition;
137+ *window->m_realSize = window->m_lastFloatingSize;
138
139 window->unsetWindowData(PRIORITY_LAYOUT);
140 }
141 } else {
142 // save position and size if floating
143diff --git a/src/Hy3Node.cpp b/src/Hy3Node.cpp
144index f8315200acfd690decc696ad79e211d98bdfdd4f..4be52b7626b9f91d95e1f6bbdf96dd15f48ef0ca 100644
145--- a/src/Hy3Node.cpp
146+++ b/src/Hy3Node.cpp
147@@ -177,7 +177,7 @@ void Hy3Node::focus(bool warp) {
148 auto window = this->data.as_window();
149 window->setHidden(false);
150 g_pCompositor->focusWindow(window);
151- if (warp) Hy3Layout::warpCursorToBox(window->m_vPosition, window->m_vSize);
152+ if (warp) Hy3Layout::warpCursorToBox(window->m_position, window->m_size);
153 break;
154 }
155 case Hy3NodeType::Group: {
156@@ -336,8 +336,8 @@ void Hy3Node::recalcSizePosRecursive(bool no_animation) {
157 auto& monitor = this->workspace->m_monitor;
158
159 if (window->isEffectiveInternalFSMode(FSMODE_FULLSCREEN)) {
160- *window->m_vRealPosition = monitor->vecPosition;
161- *window->m_vRealSize = monitor->vecSize;
162+ *window->m_realPosition = monitor->vecPosition;
163+ *window->m_realSize = monitor->vecSize;
164 return;
165 }
166
167@@ -567,7 +567,7 @@ void Hy3Node::updateTabBar(bool no_animation) {
168 FindTopWindowInNodeResult result;
169 findTopWindowInNode(*this, result);
170 group.tab_bar->target_window = result.window;
171- if (result.window != nullptr) group.tab_bar->workspace = result.window->m_pWorkspace;
172+ if (result.window != nullptr) group.tab_bar->workspace = result.window->m_workspace;
173 } else if (group.tab_bar != nullptr) {
174 group.tab_bar->bar.beginDestroy();
175 group.tab_bar = nullptr;
176@@ -600,7 +600,7 @@ void Hy3Node::updateDecos() {
177
178 std::string Hy3Node::getTitle() {
179 switch (this->data.type()) {
180- case Hy3NodeType::Window: return this->data.as_window()->m_szTitle;
181+ case Hy3NodeType::Window: return this->data.as_window()->m_title;
182 case Hy3NodeType::Group:
183 std::string title;
184 auto& group = this->data.as_group();
185@@ -625,7 +625,7 @@ std::string Hy3Node::getTitle() {
186
187 bool Hy3Node::isUrgent() {
188 switch (this->data.type()) {
189- case Hy3NodeType::Window: return this->data.as_window()->m_bIsUrgent;
190+ case Hy3NodeType::Window: return this->data.as_window()->m_isUrgent;
191 case Hy3NodeType::Group:
192 for (auto* child: this->data.as_group().children) {
193 if (child->isUrgent()) return true;
194diff --git a/src/TabGroup.cpp b/src/TabGroup.cpp
195index 9835c012987a8ed1dd0f53d6ce2c0108732add13..cd7321fd361382d8372751bc52880017fc388f87 100644
196--- a/src/TabGroup.cpp
197+++ b/src/TabGroup.cpp
198@@ -757,10 +757,10 @@ void Hy3TabGroup::renderTabBar() {
199 auto window = windowref.lock();
200
201 auto wpos =
202- window->m_vRealPosition->value() - monitor->vecPosition
203- + (window->m_pWorkspace ? window->m_pWorkspace->m_renderOffset->value() : Vector2D());
204+ window->m_realPosition->value() - monitor->vecPosition
205+ + (window->m_workspace ? window->m_workspace->m_renderOffset->value() : Vector2D());
206
207- auto wsize = window->m_vRealSize->value();
208+ auto wsize = window->m_realSize->value();
209
210 CBox window_box = {wpos.x, wpos.y, wsize.x, wsize.y};
211 // scaleBox(&window_box, scale);