From 84ee839ca690c89dc9498e85eefcdec265d3a765 Mon Sep 17 00:00:00 2001
From: Vaxry <vaxry@vaxry.net>
Date: Sat, 20 Apr 2024 19:34:18 +0100
Subject: XDG-Output: move to hyprwayland-scanner

---
 src/managers/ProtocolManager.cpp | 14 +++++++++-----
 src/managers/ProtocolManager.hpp |  4 ----
 src/managers/XWaylandManager.cpp |  1 -
 3 files changed, 9 insertions(+), 10 deletions(-)

(limited to 'src/managers')

diff --git a/src/managers/ProtocolManager.cpp b/src/managers/ProtocolManager.cpp
index 60ff8314..873d1a17 100644
--- a/src/managers/ProtocolManager.cpp
+++ b/src/managers/ProtocolManager.cpp
@@ -2,18 +2,22 @@
 
 #include "../protocols/TearingControl.hpp"
 #include "../protocols/FractionalScale.hpp"
+#include "../protocols/XDGOutput.hpp"
 
-#include "xdg-output-unstable-v1-protocol.h"
 #include "tearing-control-v1.hpp"
 #include "fractional-scale-v1.hpp"
+#include "xdg-output-unstable-v1.hpp"
 
 CProtocolManager::CProtocolManager() {
+
+    PROTO::tearing    = std::make_unique<CTearingControlProtocol>(&wp_tearing_control_manager_v1_interface, 1, "TearingControl");
+    PROTO::fractional = std::make_unique<CFractionalScaleProtocol>(&wp_fractional_scale_manager_v1_interface, 1, "FractionalScale");
+    PROTO::xdgOutput  = std::make_unique<CXDGOutputProtocol>(&zxdg_output_manager_v1_interface, 3, "XDGOutput");
+
+    // Old protocol implementations.
+    // TODO: rewrite them to use hyprwayland-scanner.
     m_pToplevelExportProtocolManager  = std::make_unique<CToplevelExportProtocolManager>();
     m_pTextInputV1ProtocolManager     = std::make_unique<CTextInputV1ProtocolManager>();
     m_pGlobalShortcutsProtocolManager = std::make_unique<CGlobalShortcutsProtocolManager>();
     m_pScreencopyProtocolManager      = std::make_unique<CScreencopyProtocolManager>();
-
-    m_pXDGOutputProtocol = std::make_unique<CXDGOutputProtocol>(&zxdg_output_manager_v1_interface, 3, "XDGOutput");
-    PROTO::tearing       = std::make_unique<CTearingControlProtocol>(&wp_tearing_control_manager_v1_interface, 1, "TearingControl");
-    PROTO::fractional    = std::make_unique<CFractionalScaleProtocol>(&wp_fractional_scale_manager_v1_interface, 1, "FractionalScale");
 }
diff --git a/src/managers/ProtocolManager.hpp b/src/managers/ProtocolManager.hpp
index 1c4073ef..9af7b928 100644
--- a/src/managers/ProtocolManager.hpp
+++ b/src/managers/ProtocolManager.hpp
@@ -5,7 +5,6 @@
 #include "../protocols/TextInputV1.hpp"
 #include "../protocols/GlobalShortcuts.hpp"
 #include "../protocols/Screencopy.hpp"
-#include "../protocols/XDGOutput.hpp"
 
 class CProtocolManager {
   public:
@@ -16,9 +15,6 @@ class CProtocolManager {
     std::unique_ptr<CTextInputV1ProtocolManager>     m_pTextInputV1ProtocolManager;
     std::unique_ptr<CGlobalShortcutsProtocolManager> m_pGlobalShortcutsProtocolManager;
     std::unique_ptr<CScreencopyProtocolManager>      m_pScreencopyProtocolManager;
-
-    // New protocols
-    std::unique_ptr<CXDGOutputProtocol> m_pXDGOutputProtocol;
 };
 
 inline std::unique_ptr<CProtocolManager> g_pProtocolManager;
diff --git a/src/managers/XWaylandManager.cpp b/src/managers/XWaylandManager.cpp
index 325229e7..cc7a8cac 100644
--- a/src/managers/XWaylandManager.cpp
+++ b/src/managers/XWaylandManager.cpp
@@ -1,7 +1,6 @@
 #include "XWaylandManager.hpp"
 #include "../Compositor.hpp"
 #include "../events/Events.hpp"
-#include "xdg-output-unstable-v1-protocol.h"
 #include "../config/ConfigValue.hpp"
 
 #define OUTPUT_MANAGER_VERSION                   3
-- 
cgit v1.2.3