protocols: move screencopy and toplevel export to hyprwayland-scanner (…

…#7065) * move screencopy and toplevel export to hyprwayland-scanner * oops
hyprwm · Jul 27, 2024 · ec672b1 · ec672b1
1 parent 963816b
commit ec672b1
Show file tree

Hide file tree

Showing 11 changed files with 665 additions and 768 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -288,17 +288,16 @@ endfunction()
 target_link_libraries(Hyprland OpenGL::EGL OpenGL::GL Threads::Threads
                       libudis86 uuid)
 
-protocol("protocols/wlr-screencopy-unstable-v1.xml"
-         "wlr-screencopy-unstable-v1" true)
 protocol(
   "subprojects/hyprland-protocols/protocols/hyprland-global-shortcuts-v1.xml"
   "hyprland-global-shortcuts-v1" true)
+
 protocol(
-  "subprojects/hyprland-protocols/protocols/hyprland-toplevel-export-v1.xml"
-  "hyprland-toplevel-export-v1" true)
-protocol("unstable/text-input/text-input-unstable-v1.xml"
-         "text-input-unstable-v1" false)
+  "unstable/text-input/text-input-unstable-v1.xml"
+  "text-input-unstable-v1" false)
 
+protocolnew("subprojects/hyprland-protocols/protocols" "hyprland-toplevel-export-v1" true)
+protocolnew("protocols" "wlr-screencopy-unstable-v1" true)
 protocolnew("protocols" "wlr-gamma-control-unstable-v1" true)
 protocolnew("protocols" "wlr-foreign-toplevel-management-unstable-v1" true)
 protocolnew("protocols" "wlr-output-power-management-unstable-v1" true)

diff --git a/protocols/meson.build b/protocols/meson.build
@@ -25,8 +25,6 @@ hyprwayland_scanner = find_program(
 
 protocols = [
   [wl_protocol_dir, 'unstable/text-input/text-input-unstable-v1.xml'],
-  ['wlr-screencopy-unstable-v1.xml'],
-  [hl_protocol_dir, 'protocols/hyprland-toplevel-export-v1.xml'],
   [hl_protocol_dir, 'protocols/hyprland-global-shortcuts-v1.xml']
 ]
 
@@ -42,6 +40,8 @@ new_protocols = [
   ['wlr-layer-shell-unstable-v1.xml'],
   ['wayland-drm.xml'],
   ['wlr-data-control-unstable-v1.xml'],
+  ['wlr-screencopy-unstable-v1.xml'],
+  [hl_protocol_dir, 'protocols/hyprland-toplevel-export-v1.xml'],
   [hl_protocol_dir, 'protocols/hyprland-focus-grab-v1.xml'],
   [wl_protocol_dir, 'staging/tearing-control/tearing-control-v1.xml'],
   [wl_protocol_dir, 'staging/fractional-scale/fractional-scale-v1.xml'],

diff --git a/src/events/Monitors.cpp b/src/events/Monitors.cpp
@@ -5,6 +5,8 @@
 #include "Events.hpp"
 #include "../debug/HyprCtl.hpp"
 #include "../config/ConfigValue.hpp"
+#include "../protocols/Screencopy.hpp"
+#include "../protocols/ToplevelExport.hpp"
 #include <aquamarine/output/Output.hpp>
 
 // --------------------------------------------------------- //
@@ -118,8 +120,8 @@ void Events::listener_monitorCommit(void* owner, void* data) {
     const auto PMONITOR = (CMonitor*)owner;
 
     if (true) { // FIXME: E->state->committed & WLR_OUTPUT_STATE_BUFFER
-        g_pProtocolManager->m_pScreencopyProtocolManager->onOutputCommit(PMONITOR);
-        g_pProtocolManager->m_pToplevelExportProtocolManager->onOutputCommit(PMONITOR);
+        PROTO::screencopy->onOutputCommit(PMONITOR);
+        PROTO::toplevelExport->onOutputCommit(PMONITOR);
     }
 }
 

diff --git a/src/events/Windows.cpp b/src/events/Windows.cpp
@@ -10,6 +10,7 @@
 #include "../protocols/LayerShell.hpp"
 #include "../protocols/XDGShell.hpp"
 #include "../protocols/core/Compositor.hpp"
+#include "../protocols/ToplevelExport.hpp"
 #include "../xwayland/XSurface.hpp"
 
 #include <hyprutils/string/String.hpp>
@@ -601,7 +602,7 @@ void Events::listener_unmapWindow(void* owner, void* data) {
     g_pEventManager->postEvent(SHyprIPCEvent{"closewindow", std::format("{:x}", PWINDOW)});
     EMIT_HOOK_EVENT("closeWindow", PWINDOW);
 
-    g_pProtocolManager->m_pToplevelExportProtocolManager->onWindowUnmap(PWINDOW);
+    PROTO::toplevelExport->onWindowUnmap(PWINDOW);
 
     if (PWINDOW->m_bIsFullscreen)
         g_pCompositor->setWindowFullscreen(PWINDOW, false, FULLSCREEN_FULL);

diff --git a/src/managers/ProtocolManager.cpp b/src/managers/ProtocolManager.cpp
@@ -39,6 +39,8 @@
 #include "../protocols/LinuxDMABUF.hpp"
 #include "../protocols/DRMLease.hpp"
 #include "../protocols/DRMSyncobj.hpp"
+#include "../protocols/Screencopy.hpp"
+#include "../protocols/ToplevelExport.hpp"
 
 #include "../protocols/core/Seat.hpp"
 #include "../protocols/core/DataDevice.hpp"
@@ -142,6 +144,8 @@ CProtocolManager::CProtocolManager() {
     PROTO::dataWlr             = std::make_unique<CDataDeviceWLRProtocol>(&zwlr_data_control_manager_v1_interface, 2, "DataDeviceWlr");
     PROTO::primarySelection    = std::make_unique<CPrimarySelectionProtocol>(&zwp_primary_selection_device_manager_v1_interface, 1, "PrimarySelection");
     PROTO::xwaylandShell       = std::make_unique<CXWaylandShellProtocol>(&xwayland_shell_v1_interface, 1, "XWaylandShell");
+    PROTO::screencopy          = std::make_unique<CScreencopyProtocol>(&zwlr_screencopy_manager_v1_interface, 3, "Screencopy");
+    PROTO::toplevelExport      = std::make_unique<CToplevelExportProtocol>(&hyprland_toplevel_export_manager_v1_interface, 2, "ToplevelExport");
 
     for (auto& b : g_pCompositor->m_pAqBackend->getImplementations()) {
         if (b->type() != Aquamarine::AQ_BACKEND_DRM)
@@ -161,10 +165,8 @@ CProtocolManager::CProtocolManager() {
 
     // 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>();
 }
 
 CProtocolManager::~CProtocolManager() {
@@ -214,6 +216,8 @@ CProtocolManager::~CProtocolManager() {
     PROTO::dataWlr.reset();
     PROTO::primarySelection.reset();
     PROTO::xwaylandShell.reset();
+    PROTO::screencopy.reset();
+    PROTO::toplevelExport.reset();
 
     PROTO::lease.reset();
     PROTO::sync.reset();

diff --git a/src/managers/ProtocolManager.hpp b/src/managers/ProtocolManager.hpp
@@ -1,10 +1,9 @@
 #pragma once
 
 #include "../defines.hpp"
-#include "../protocols/ToplevelExport.hpp"
 #include "../protocols/TextInputV1.hpp"
 #include "../protocols/GlobalShortcuts.hpp"
-#include "../protocols/Screencopy.hpp"
+#include "../helpers/Monitor.hpp"
 #include "../helpers/memory/Memory.hpp"
 #include "../helpers/signal/Signal.hpp"
 #include <unordered_map>
@@ -15,10 +14,8 @@ class CProtocolManager {
     ~CProtocolManager();
 
     // TODO: rewrite to use the new protocol framework
-    std::unique_ptr<CToplevelExportProtocolManager>  m_pToplevelExportProtocolManager;
     std::unique_ptr<CTextInputV1ProtocolManager>     m_pTextInputV1ProtocolManager;
     std::unique_ptr<CGlobalShortcutsProtocolManager> m_pGlobalShortcutsProtocolManager;
-    std::unique_ptr<CScreencopyProtocolManager>      m_pScreencopyProtocolManager;
 
   private:
     std::unordered_map<std::string, CHyprSignalListener> m_mModeChangeListeners;