Internal: Hyprland box implementation (#3755)

* box impl

* remove unused operators

* missed applyfromwlr

4 files changed, 28 insertions, 23 deletions

diff --git a/src/events/Layers.cpp b/src/events/Layers.cpp
index 5762e21a..5f295408 100644
--- a/src/events/Layers.cpp
+++ b/src/events/Layers.cpp
@@ -95,8 +95,8 @@ void Events::listener_destroyLayerSurface(void* owner, void* data) {
         PMONITOR->scheduledRecalc = true;
 
         // and damage
-        wlr_box geomFixed = {layersurface->geometry.x + PMONITOR->vecPosition.x, layersurface->geometry.y + PMONITOR->vecPosition.y, layersurface->geometry.width,
-                             layersurface->geometry.height};
+        CBox geomFixed = {layersurface->geometry.x + PMONITOR->vecPosition.x, layersurface->geometry.y + PMONITOR->vecPosition.y, layersurface->geometry.width,
+                          layersurface->geometry.height};
         g_pHyprRenderer->damageBox(&geomFixed);
     }
 
@@ -157,8 +157,8 @@ void Events::listener_mapLayerSurface(void* owner, void* data) {
 
     layersurface->position = Vector2D(layersurface->geometry.x, layersurface->geometry.y);
 
-    wlr_box geomFixed = {layersurface->geometry.x + PMONITOR->vecPosition.x, layersurface->geometry.y + PMONITOR->vecPosition.y, layersurface->geometry.width,
-                         layersurface->geometry.height};
+    CBox geomFixed = {layersurface->geometry.x + PMONITOR->vecPosition.x, layersurface->geometry.y + PMONITOR->vecPosition.y, layersurface->geometry.width,
+                      layersurface->geometry.height};
     g_pHyprRenderer->damageBox(&geomFixed);
     const auto WORKSPACE  = g_pCompositor->getWorkspaceByID(PMONITOR->activeWorkspace);
     const bool FULLSCREEN = WORKSPACE->m_bHasFullscreenWindow && WORKSPACE->m_efFullscreenMode == FULLSCREEN_FULL;
@@ -247,8 +247,8 @@ void Events::listener_unmapLayerSurface(void* owner, void* data) {
         }
     }
 
-    wlr_box geomFixed = {layersurface->geometry.x + PMONITOR->vecPosition.x, layersurface->geometry.y + PMONITOR->vecPosition.y, layersurface->geometry.width,
-                         layersurface->geometry.height};
+    CBox geomFixed = {layersurface->geometry.x + PMONITOR->vecPosition.x, layersurface->geometry.y + PMONITOR->vecPosition.y, layersurface->geometry.width,
+                      layersurface->geometry.height};
     g_pHyprRenderer->damageBox(&geomFixed);
 
     geomFixed = {layersurface->geometry.x + (int)PMONITOR->vecPosition.x, layersurface->geometry.y + (int)PMONITOR->vecPosition.y,
@@ -270,7 +270,7 @@ void Events::listener_commitLayerSurface(void* owner, void* data) {
     if (layersurface->layer == ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND || layersurface->layer == ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM)
         g_pHyprOpenGL->markBlurDirtyForMonitor(PMONITOR); // so that blur is recalc'd
 
-    wlr_box geomFixed = {layersurface->geometry.x, layersurface->geometry.y, layersurface->geometry.width, layersurface->geometry.height};
+    CBox geomFixed = {layersurface->geometry.x, layersurface->geometry.y, layersurface->geometry.width, layersurface->geometry.height};
     g_pHyprRenderer->damageBox(&geomFixed);
 
     // fix if it changed its mon
diff --git a/src/events/Monitors.cpp b/src/events/Monitors.cpp
index f6375edd..9155fe87 100644
--- a/src/events/Monitors.cpp
+++ b/src/events/Monitors.cpp
@@ -28,8 +28,9 @@ void Events::listener_change(wl_listener* listener, void* data) {
 
         const auto CONFIGHEAD = wlr_output_configuration_head_v1_create(CONFIG, m->output);
 
-        wlr_box    BOX;
-        wlr_output_layout_get_box(g_pCompositor->m_sWLROutputLayout, m->output, &BOX);
+        CBox       BOX;
+        wlr_output_layout_get_box(g_pCompositor->m_sWLROutputLayout, m->output, BOX.pWlr());
+        BOX.applyFromWlr();
 
         //m->vecSize.x = BOX.width;
         // m->vecSize.y = BOX.height;
diff --git a/src/events/Popups.cpp b/src/events/Popups.cpp
index 559c8410..c8898c3b 100644
--- a/src/events/Popups.cpp
+++ b/src/events/Popups.cpp
@@ -64,9 +64,9 @@ void createNewPopup(wlr_xdg_popup* popup, SXDGPopup* pHyprPopup) {
 
     const auto PMONITOR = g_pCompositor->m_pLastMonitor;
 
-    wlr_box    box = {.x = PMONITOR->vecPosition.x - pHyprPopup->lx, .y = PMONITOR->vecPosition.y - pHyprPopup->ly, .width = PMONITOR->vecSize.x, .height = PMONITOR->vecSize.y};
+    CBox       box = {PMONITOR->vecPosition.x - pHyprPopup->lx, PMONITOR->vecPosition.y - pHyprPopup->ly, PMONITOR->vecSize.x, PMONITOR->vecSize.y};
 
-    wlr_xdg_popup_unconstrain_from_box(popup, &box);
+    wlr_xdg_popup_unconstrain_from_box(popup, box.pWlr());
 
     pHyprPopup->monitor = PMONITOR;
 
@@ -159,8 +159,9 @@ void Events::listener_mapPopupXDG(void* owner, void* data) {
     int lx = 0, ly = 0;
     addPopupGlobalCoords(PPOPUP, &lx, &ly);
 
-    wlr_box extents;
-    wlr_surface_get_extends(PPOPUP->popup->base->surface, &extents);
+    CBox extents;
+    wlr_surface_get_extends(PPOPUP->popup->base->surface, extents.pWlr());
+    extents.applyFromWlr();
 
     g_pHyprRenderer->damageBox(lx - extents.x, ly - extents.y, extents.width + 2, extents.height + 2);
 
@@ -180,17 +181,18 @@ void Events::listener_repositionPopupXDG(void* owner, void* data) {
     int lx = 0, ly = 0;
     addPopupGlobalCoords(PPOPUP, &lx, &ly);
 
-    wlr_box extents;
-    wlr_surface_get_extends(PPOPUP->popup->base->surface, &extents);
+    CBox extents;
+    wlr_surface_get_extends(PPOPUP->popup->base->surface, extents.pWlr());
+    extents.applyFromWlr();
 
     PPOPUP->lastPos             = {lx - extents.x, ly - extents.y};
     PPOPUP->repositionRequested = true;
 
     const auto PMONITOR = g_pCompositor->m_pLastMonitor;
 
-    wlr_box    box = {PMONITOR->vecPosition.x - lx + PPOPUP->popup->current.geometry.x, PMONITOR->vecPosition.y - ly + PPOPUP->popup->current.geometry.y, PMONITOR->vecSize.x,
-                      PMONITOR->vecSize.y};
-    wlr_xdg_popup_unconstrain_from_box(PPOPUP->popup, &box);
+    CBox       box = {PMONITOR->vecPosition.x - lx + PPOPUP->popup->current.geometry.x, PMONITOR->vecPosition.y - ly + PPOPUP->popup->current.geometry.y, PMONITOR->vecSize.x,
+                PMONITOR->vecSize.y};
+    wlr_xdg_popup_unconstrain_from_box(PPOPUP->popup, box.pWlr());
 }
 
 void Events::listener_unmapPopupXDG(void* owner, void* data) {
@@ -207,8 +209,9 @@ void Events::listener_unmapPopupXDG(void* owner, void* data) {
     int lx = 0, ly = 0;
     addPopupGlobalCoords(PPOPUP, &lx, &ly);
 
-    wlr_box extents;
-    wlr_surface_get_extends(PPOPUP->popup->base->surface, &extents);
+    CBox extents;
+    wlr_surface_get_extends(PPOPUP->popup->base->surface, extents.pWlr());
+    extents.applyFromWlr();
 
     g_pHyprRenderer->damageBox(lx - extents.x, ly - extents.y, extents.width + 2, extents.height + 2);
 
@@ -233,8 +236,9 @@ void Events::listener_commitPopupXDG(void* owner, void* data) {
     int lx = 0, ly = 0;
     addPopupGlobalCoords(PPOPUP, &lx, &ly);
 
-    wlr_box extents;
-    wlr_surface_get_extends(PPOPUP->popup->base->surface, &extents);
+    CBox extents;
+    wlr_surface_get_extends(PPOPUP->popup->base->surface, extents.pWlr());
+    extents.applyFromWlr();
 
     if (PPOPUP->repositionRequested)
         g_pHyprRenderer->damageBox(PPOPUP->lastPos.x, PPOPUP->lastPos.y, extents.width + 2, extents.height + 2);
diff --git a/src/events/Windows.cpp b/src/events/Windows.cpp
index 59bd5fef..23559773 100644
--- a/src/events/Windows.cpp
+++ b/src/events/Windows.cpp
@@ -96,7 +96,7 @@ void Events::listener_mapWindow(void* owner, void* data) {
 
     if (PWORKSPACE->m_bDefaultPseudo) {
         PWINDOW->m_bIsPseudotiled = true;
-        wlr_box desiredGeometry   = {0};
+        CBox desiredGeometry      = {0};
         g_pXWaylandManager->getGeometryForWindow(PWINDOW, &desiredGeometry);
         PWINDOW->m_vPseudoSize = Vector2D(desiredGeometry.width, desiredGeometry.height);
     }