f74302dd00fbbd006ecda8acced222c6c5d0f72f
- Author
- Christoph Hollizeck <christoph.hollizeck@hey.com>
- Committer
- outfoxxed <outfoxxed@outfoxxed.me>
- Date
Message
fixup: apply renaming changes Members for various classes got m_ prefix
Diff
This diff is truncated to protect this page.
1diff --git a/flake.lock b/flake.lock
2index 2d55892dbb0662bd55b5998f7ba5cff10c402477..f3190bfc098e9bff8c0c338989d90777ae48cc54 100644
3--- a/flake.lock
4+++ b/flake.lock
5@@ -20,11 +20,11 @@
6 ]
7 },
8 "locked": {
9- "lastModified": 1744289235,
10- "narHash": "sha256-ZFkHLdimtFzQACsVVyZkZlfYdj4iNy3PkzXfrwmlse8=",
11+ "lastModified": 1745357003,
12+ "narHash": "sha256-jYwzQkv1r7HN/4qrAuKp+NR4YYNp2xDrOX5O9YVqkWo=",
13 "owner": "hyprwm",
14 "repo": "aquamarine",
15- "rev": "c8282f4982b56dfa5e9b9f659809da93f8d37e7a",
16+ "rev": "a19cf76ee1a15c1c12083fa372747ce46387289f",
17 "type": "github"
18 },
19 "original": {
20@@ -87,11 +87,11 @@
21 ]
22 },
23 "locked": {
24- "lastModified": 1742215578,
25- "narHash": "sha256-zfs71PXVVPEe56WEyNi2TJQPs0wabU4WAlq0XV7GcdE=",
26+ "lastModified": 1745948457,
27+ "narHash": "sha256-lzTV10FJTCGNtMdgW5YAhCAqezeAzKOd/97HbQK8GTU=",
28 "owner": "hyprwm",
29 "repo": "hyprcursor",
30- "rev": "2fd36421c21aa87e2fe3bee11067540ae612f719",
31+ "rev": "ac903e80b33ba6a88df83d02232483d99f327573",
32 "type": "github"
33 },
34 "original": {
35@@ -145,17 +145,17 @@
36 "xdph": "xdph"
37 },
38 "locked": {
39- "lastModified": 1745969732,
40- "narHash": "sha256-OUQ6QeZIf518LtkizIYHRo7FHRpuh3zd28bJV7WSiSg=",
41+ "lastModified": 1746496467,
42+ "narHash": "sha256-PFmX5SvVN54LdFEBzMBIx4JEKOGP5d6nR/PcYHQhMlw=",
43 "owner": "hyprwm",
44 "repo": "Hyprland",
45- "rev": "72cb5d24b6894334da021157c626556a8e99b6ff",
46+ "rev": "1ce614dfc0eb8b323e603b76975842c1f2e6a553",
47 "type": "github"
48 },
49 "original": {
50 "owner": "hyprwm",
51 "repo": "Hyprland",
52- "rev": "72cb5d24b6894334da021157c626556a8e99b6ff",
53+ "rev": "1ce614dfc0eb8b323e603b76975842c1f2e6a553",
54 "type": "github"
55 }
56 },
57@@ -239,11 +239,11 @@
58 ]
59 },
60 "locked": {
61- "lastModified": 1739048983,
62- "narHash": "sha256-REhTcXq4qs3B3cCDtLlYDz0GZvmsBSh947Ub6pQWGTQ=",
63+ "lastModified": 1745951494,
64+ "narHash": "sha256-2dModE32doiyQMmd6EDAQeZnz+5LOs6KXyE0qX76WIg=",
65 "owner": "hyprwm",
66 "repo": "hyprland-qtutils",
67- "rev": "3504a293c8f8db4127cb0f7cfc1a318ffb4316f8",
68+ "rev": "4be1d324faf8d6e82c2be9f8510d299984dfdd2e",
69 "type": "github"
70 },
71 "original": {
72@@ -268,11 +268,11 @@
73 ]
74 },
75 "locked": {
76- "lastModified": 1744468525,
77- "narHash": "sha256-9HySx+EtsbbKlZDlY+naqqOV679VdxP6x6fP3wxDXJk=",
78+ "lastModified": 1745357019,
79+ "narHash": "sha256-q/C3qj9FWHQenObXuw/nGIT8iIsWFjgmcQYcA+ZfpPs=",
80 "owner": "hyprwm",
81 "repo": "hyprlang",
82- "rev": "f1000c54d266e6e4e9d646df0774fac5b8a652df",
83+ "rev": "397600c42b8d7a443a5b4e92aa15f46650a90f18",
84 "type": "github"
85 },
86 "original": {
87@@ -293,11 +293,11 @@
88 ]
89 },
90 "locked": {
91- "lastModified": 1743950287,
92- "narHash": "sha256-/6IAEWyb8gC/NKZElxiHChkouiUOrVYNq9YqG0Pzm4Y=",
93+ "lastModified": 1745975815,
94+ "narHash": "sha256-s3GzsRxBL/N/xYgUXZhQh4t62uR1BN4zxXgWBtJ3lWM=",
95 "owner": "hyprwm",
96 "repo": "hyprutils",
97- "rev": "f2dc70e448b994cef627a157ee340135bd68fbc6",
98+ "rev": "05878d9470c9e5cbc8807813f9ec2006627a0ca0",
99 "type": "github"
100 },
101 "original": {
102@@ -333,11 +333,11 @@
103 },
104 "nixpkgs": {
105diff --git a/flake.nix b/flake.nix
106index 9f5feb0780be913de96e9de2e0691e367616e299..991b06caada626f132ef0ef5dfa4d913ffc08b22 100644
107--- a/flake.nix
108+++ b/flake.nix
109@@ -1,6 +1,6 @@
110 {
111 inputs = {
112- hyprland.url = "github:hyprwm/Hyprland?rev=72cb5d24b6894334da021157c626556a8e99b6ff";
113+ hyprland.url = "github:hyprwm/Hyprland?rev=1ce614dfc0eb8b323e603b76975842c1f2e6a553";
114 };
115
116 outputs = { self, hyprland, ... }: let
117diff --git a/src/Hy3Layout.cpp b/src/Hy3Layout.cpp
118index 04c00d09e44947b33c15a0c36635914889b7463f..b10aced5a2ab54b526175698fa5b86ee95f7b8dd 100644
119--- a/src/Hy3Layout.cpp
120+++ b/src/Hy3Layout.cpp
121@@ -30,8 +30,8 @@
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_lastMonitor->activeSpecialWorkspace;
126- if (!valid(workspace)) workspace = g_pCompositor->m_lastMonitor->activeWorkspace;
127+ auto workspace = g_pCompositor->m_lastMonitor->m_activeSpecialWorkspace;
128+ if (!valid(workspace)) workspace = g_pCompositor->m_lastMonitor->m_activeWorkspace;
129
130 if (!valid(workspace)) return nullptr;
131 if (!allow_fullscreen && workspace->m_hasFullscreenWindow) return nullptr;
132@@ -44,9 +44,9 @@ std::string operationWorkspaceForName(const std::string& workspace) {
133
134 static auto* hyprsplitTransformer = []() {
135 for (auto& p: g_pPluginSystem->getAllPlugins()) {
136- if (p->name == "hyprsplit") {
137+ if (p->m_name == "hyprsplit") {
138 return reinterpret_cast<PHYPRSPLIT_GET_WORKSPACE_FN>(
139- dlsym(p->m_pHandle, "hyprsplitGetWorkspace")
140+ dlsym(p->m_handle, "hyprsplitGetWorkspace")
141 );
142 }
143 }
144@@ -177,14 +177,14 @@ void Hy3Layout::insertNode(Hy3Node& node) {
145 ConfigValue<Hyprlang::INT>("plugin:hy3:tab_first_window");
146
147 auto width =
148- monitor->vecSize.x - monitor->vecReservedBottomRight.x - monitor->vecReservedTopLeft.x;
149+ monitor->m_size.x - monitor->m_reservedBottomRight.x - monitor->m_reservedTopLeft.x;
150 auto height =
151- monitor->vecSize.y - monitor->vecReservedBottomRight.y - monitor->vecReservedTopLeft.y;
152+ monitor->m_size.y - monitor->m_reservedBottomRight.y - monitor->m_reservedTopLeft.y;
153
154 this->nodes.push_back({
155 .data = height > width ? Hy3GroupLayout::SplitV : Hy3GroupLayout::SplitH,
156- .position = monitor->vecPosition + monitor->vecReservedTopLeft,
157- .size = monitor->vecSize - monitor->vecReservedTopLeft - monitor->vecReservedBottomRight,
158+ .position = monitor->m_position + monitor->m_reservedTopLeft,
159+ .size = monitor->m_size - monitor->m_reservedTopLeft - monitor->m_reservedBottomRight,
160 .workspace = node.workspace,
161 .layout = this,
162 });
163@@ -362,21 +362,21 @@ void Hy3Layout::recalculateMonitor(const MONITORID& monitor_id) {
164
165 // todo: refactor this
166
167- auto* top_node = this->getWorkspaceRootGroup(monitor->activeWorkspace.get());
168+ auto* top_node = this->getWorkspaceRootGroup(monitor->m_activeWorkspace.get());
169 if (top_node != nullptr) {
170- top_node->position = monitor->vecPosition + monitor->vecReservedTopLeft;
171+ top_node->position = monitor->m_position + monitor->m_reservedTopLeft;
172 top_node->size =
173- monitor->vecSize - monitor->vecReservedTopLeft - monitor->vecReservedBottomRight;
174+ monitor->m_size - monitor->m_reservedTopLeft - monitor->m_reservedBottomRight;
175
176 top_node->recalcSizePosRecursive();
177 }
178
179- top_node = this->getWorkspaceRootGroup(monitor->activeSpecialWorkspace.get());
180+ top_node = this->getWorkspaceRootGroup(monitor->m_activeSpecialWorkspace.get());
181
182 if (top_node != nullptr) {
183- top_node->position = monitor->vecPosition + monitor->vecReservedTopLeft;
184+ top_node->position = monitor->m_position + monitor->m_reservedTopLeft;
185 top_node->size =
186- monitor->vecSize - monitor->vecReservedTopLeft - monitor->vecReservedBottomRight;
187+ monitor->m_size - monitor->m_reservedTopLeft - monitor->m_reservedBottomRight;
188
189 top_node->recalcSizePosRecursive();
190 }
191@@ -410,16 +410,16 @@ void Hy3Layout::resizeActiveWindow(const Vector2D& delta, eRectCorner corner, PH
192 auto& monitor = window->m_monitor;
193
194 const bool display_left =
195- STICKS(node->position.x, monitor->vecPosition.x + monitor->vecReservedTopLeft.x);
196+ STICKS(node->position.x, monitor->m_position.x + monitor->m_reservedTopLeft.x);
197 const bool display_right = STICKS(
198 node->position.x + node->size.x,
199- monitor->vecPosition.x + monitor->vecSize.x - monitor->vecReservedBottomRight.x
200+ monitor->m_position.x + monitor->m_size.x - monitor->m_reservedBottomRight.x
201 );
202 const bool display_top =
203- STICKS(node->position.y, monitor->vecPosition.y + monitor->vecReservedTopLeft.y);
204+ STICKS(node->position.y, monitor->m_position.y + monitor->m_reservedTopLeft.y);
205 const bool display_bottom = STICKS(
206 node->position.y + node->size.y,
207- monitor->vecPosition.y + monitor->vecSize.y - monitor->vecReservedBottomRight.y
208+ monitor->m_position.y + monitor->m_size.y - monitor->m_reservedBottomRight.y
209 );
210
211 Vector2D resize_delta = delta;
212@@ -520,8 +520,8 @@ void Hy3Layout::fullscreenRequestForWindow(
213 }
214
215 if (target_mode == FSMODE_FULLSCREEN) {
216- *window->m_realPosition = monitor->vecPosition;
217- *window->m_realSize = monitor->vecSize;
218+ *window->m_realPosition = monitor->m_position;
219+ *window->m_realSize = monitor->m_size;
220 } else {
221diff --git a/src/Hy3Node.cpp b/src/Hy3Node.cpp
222index 4be52b7626b9f91d95e1f6bbdf96dd15f48ef0ca..1e46c12c92d3efd822323e9acb9ae964678acae2 100644
223--- a/src/Hy3Node.cpp
224+++ b/src/Hy3Node.cpp
225@@ -336,15 +336,15 @@ void Hy3Node::recalcSizePosRecursive(bool no_animation) {
226 auto& monitor = this->workspace->m_monitor;
227
228 if (window->isEffectiveInternalFSMode(FSMODE_FULLSCREEN)) {
229- *window->m_realPosition = monitor->vecPosition;
230- *window->m_realSize = monitor->vecSize;
231+ *window->m_realPosition = monitor->m_position;
232+ *window->m_realSize = monitor->m_size;
233 return;
234 }
235
236 Hy3Node fake_node = {
237 .data = window,
238- .position = monitor->vecPosition + monitor->vecReservedTopLeft,
239- .size = monitor->vecSize - monitor->vecReservedTopLeft - monitor->vecReservedBottomRight,
240+ .position = monitor->m_position + monitor->m_reservedTopLeft,
241+ .size = monitor->m_size - monitor->m_reservedTopLeft - monitor->m_reservedBottomRight,
242 .gap_topleft_offset = gap_topleft_offset,
243 .gap_bottomright_offset = gap_bottomright_offset,
244 .workspace = this->workspace,
245diff --git a/src/SelectionHook.cpp b/src/SelectionHook.cpp
246index 6bbeef839769a897e2baa57ddc4796b2b6925bc5..5e6c0bd4a5dafae8b09025f253cb3f8ca9f96bf3 100644
247--- a/src/SelectionHook.cpp
248+++ b/src/SelectionHook.cpp
249@@ -14,7 +14,7 @@ void hook_updateDecos(void* thisptr, PHLWINDOW window) {
250 g_pCompositor->m_lastWindow = window;
251 }
252
253- ((void (*)(void*, PHLWINDOW)) g_LastSelectionHook->m_pOriginal)(thisptr, window);
254+ ((void (*)(void*, PHLWINDOW)) g_LastSelectionHook->m_original)(thisptr, window);
255
256 if (explicitly_selected) {
257 g_pCompositor->m_lastWindow = lastWindow;
258diff --git a/src/TabGroup.cpp b/src/TabGroup.cpp
259index cd7321fd361382d8372751bc52880017fc388f87..4c2c84526fb7a137a900efc63d6a0418a031069d 100644
260--- a/src/TabGroup.cpp
261+++ b/src/TabGroup.cpp
262@@ -310,7 +310,7 @@ void Hy3TabBarEntry::renderText(float scale, CBox& box, float opacity) {
263 if (!this->texture) this->texture = makeShared<CTexture>();
264 this->texture->allocate();
265
266- glBindTexture(GL_TEXTURE_2D, this->texture->m_iTexID);
267+ glBindTexture(GL_TEXTURE_2D, this->texture->m_texID);
268 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
269 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
270
271@@ -682,11 +682,11 @@ void Hy3TabGroup::tick() {
272 }
273
274 std::pair<CBox, CBox> Hy3TabGroup::getRenderBB() const {
275- auto* monitor = g_pHyprOpenGL->m_RenderData.pMonitor.get();
276- auto scale = monitor->scale;
277+ auto* monitor = g_pHyprOpenGL->m_renderData.pMonitor.get();
278+ auto scale = monitor->m_scale;
279
280- auto monitor_size = monitor->vecSize;
281- auto pos = this->pos->value() - monitor->vecPosition;
282+ auto monitor_size = monitor->m_size;
283+ auto pos = this->pos->value() - monitor->m_position;
284 auto size = this->size->value();
285
286 if (valid(this->workspace)) {
287@@ -706,8 +706,8 @@ void Hy3TabGroup::renderTabBar() {
288
289 auto [box, scaledBox] = this->getRenderBB();
290
291- auto* monitor = g_pHyprOpenGL->m_RenderData.pMonitor.get();
292- auto scale = monitor->scale;
293+ auto* monitor = g_pHyprOpenGL->m_renderData.pMonitor.get();
294+ auto scale = monitor->m_scale;
295
296 if (!this->bar.damaged) {
297 pixman_region32 damage;
298@@ -715,7 +715,7 @@ void Hy3TabGroup::renderTabBar() {
299
300 pixman_region32_intersect_rect(
301 &damage,
302- g_pHyprOpenGL->m_RenderData.damage.pixman(),
303+ g_pHyprOpenGL->m_renderData.damage.pixman(),
304 scaledBox.x,
305 scaledBox.y,
306 scaledBox.width,
307@@ -757,7 +757,7 @@ void Hy3TabGroup::renderTabBar() {
308 auto window = windowref.lock();
309
310 auto wpos =
311- window->m_realPosition->value() - monitor->vecPosition
312+ window->m_realPosition->value() - monitor->m_position
313 + (window->m_workspace ? window->m_workspace->m_renderOffset->value() : Vector2D());
314
315 auto wsize = window->m_realSize->value();
316diff --git a/src/render.cpp b/src/render.cpp
317index bbd02b4575f6751759c70ef79807524123d29b1a..94ef6b8a8480d16d14b7a4296db1586b61d5a2db 100644
318--- a/src/render.cpp
319+++ b/src/render.cpp
320@@ -22,12 +22,12 @@ void Hy3Render::renderTab(
321 int radius
322 ) {
323 static auto& shader = Hy3Shaders::instance()->tab;
324- auto& rdata = g_pHyprOpenGL->m_RenderData;
325+ auto& rdata = g_pHyprOpenGL->m_renderData;
326
327 auto rbox = box;
328 rdata.renderModif.applyToBox(rbox);
329
330- const auto& monitorSize = rdata.pMonitor->vecTransformedSize;
331+ const auto& monitorSize = rdata.pMonitor->m_transformedSize;
332 auto monitorBox = CBox {Vector2D(), monitorSize};
333
334 auto matrix =
335@@ -53,7 +53,7 @@ void Hy3Render::renderTab(
336
337 if (blur) {
338 glActiveTexture(GL_TEXTURE0);
339- glBindTexture(blurTex->m_iTarget, blurTex->m_iTexID);
340+ glBindTexture(blurTex->m_target, blurTex->m_texID);
341 glUniform1i(shader.blurTex, 0);
342 }
343
344@@ -93,6 +93,6 @@ void Hy3Render::renderTab(
345 glDisableVertexAttribArray(shader.posAttrib);
346
347 if (blur) {
348- glBindTexture(blurTex->m_iTarget, 0);
349+ glBindTexture(blurTex->m_target, 0);
350 }
351 }