primary-selection: move to hyprland impl

CMakeLists.txt

@@ -293,6 +293,7 @@ protocolNew("staging/ext-session-lock/ext-session-lock-v1.xml" "ext-session-lock
 protocolNew("stable/tablet/tablet-v2.xml" "tablet-v2" false)
 protocolNew("stable/presentation-time/presentation-time.xml" "presentation-time" false)
 protocolNew("stable/xdg-shell/xdg-shell.xml" "xdg-shell" false)
+protocolNew("unstable/primary-selection/primary-selection-unstable-v1.xml" "primary-selection-unstable-v1" false)
 
 protocolWayland()
 

protocols/meson.build

@@ -62,6 +62,7 @@ new_protocols = [
   [wl_protocol_dir, 'stable/tablet/tablet-v2.xml'],
   [wl_protocol_dir, 'stable/presentation-time/presentation-time.xml'],
   [wl_protocol_dir, 'stable/xdg-shell/xdg-shell.xml'],
+  [wl_protocol_dir, 'unstable/primary-selection/primary-selection-unstable-v1.xml'],
 ]
 
 wl_protos_src = []

src/config/ConfigManager.cpp

@@ -346,6 +346,7 @@ CConfigManager::CConfigManager() {
     m_pConfig->addConfigValue("misc:background_color", Hyprlang::INT{0xff111111});
     m_pConfig->addConfigValue("misc:new_window_takes_over_fullscreen", Hyprlang::INT{0});
     m_pConfig->addConfigValue("misc:initial_workspace_tracking", Hyprlang::INT{1});
+    m_pConfig->addConfigValue("misc:middle_click_paste", Hyprlang::INT{1});
 
     m_pConfig->addConfigValue("group:insert_after_current", Hyprlang::INT{1});
     m_pConfig->addConfigValue("group:focus_removed_window", Hyprlang::INT{1});

src/managers/ProtocolManager.cpp

@@ -30,6 +30,7 @@
 #include "../protocols/PresentationTime.hpp"
 #include "../protocols/XDGShell.hpp"
 #include "../protocols/DataDeviceWlr.hpp"
+#include "../protocols/PrimarySelection.hpp"
 
 #include "../protocols/core/Seat.hpp"
 #include "../protocols/core/DataDevice.hpp"
@@ -71,6 +72,7 @@ CProtocolManager::CProtocolManager() {
     PROTO::presentation        = std::make_unique<CPresentationProtocol>(&wp_presentation_interface, 1, "Presentation");
     PROTO::xdgShell            = std::make_unique<CXDGShellProtocol>(&xdg_wm_base_interface, 6, "XDGShell");
     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");
 
     // Old protocol implementations.
     // TODO: rewrite them to use hyprwayland-scanner.

src/managers/SeatManager.cpp

@@ -2,6 +2,7 @@
 #include "../protocols/core/Seat.hpp"
 #include "../protocols/core/DataDevice.hpp"
 #include "../protocols/DataDeviceWlr.hpp"
+#include "../protocols/PrimarySelection.hpp"
 #include "../Compositor.hpp"
 #include "../devices/IKeyboard.hpp"
 #include <algorithm>
@@ -425,7 +426,30 @@ void CSeatManager::setCurrentSelection(SP<IDataSource> source) {
     if (source) {
         selection.destroySelection = source->events.destroy.registerListener([this](std::any d) { setCurrentSelection(nullptr); });
         PROTO::data->setSelection(source);
-        PROTO::dataWlr->setSelection(source);
+        PROTO::dataWlr->setSelection(source, false);
+    }
+}
+
+void CSeatManager::setCurrentPrimarySelection(SP<IDataSource> source) {
+    if (source == selection.currentPrimarySelection) {
+        Debug::log(WARN, "[seat] duplicated setCurrentPrimarySelection?");
+        return;
+    }
+
+    selection.destroyPrimarySelection.reset();
+
+    if (selection.currentPrimarySelection)
+        selection.currentPrimarySelection->cancelled();
+
+    if (!source)
+        PROTO::primarySelection->setSelection(nullptr);
+
+    selection.currentPrimarySelection = source;
+
+    if (source) {
+        selection.destroyPrimarySelection = source->events.destroy.registerListener([this](std::any d) { setCurrentSelection(nullptr); });
+        PROTO::primarySelection->setSelection(source);
+        PROTO::dataWlr->setSelection(source, true);
     }
 }
 

src/managers/SeatManager.hpp

@@ -106,9 +106,12 @@ class CSeatManager {
     struct {
         WP<IDataSource>     currentSelection;
         CHyprSignalListener destroySelection;
+        WP<IDataSource>     currentPrimarySelection;
+        CHyprSignalListener destroyPrimarySelection;
     } selection;
 
     void setCurrentSelection(SP<IDataSource> source);
+    void setCurrentPrimarySelection(SP<IDataSource> source);
 
     // do not write to directly, use set...
     WP<IPointer>  mouse;

src/protocols/DataDeviceWlr.cpp

@@ -145,10 +145,11 @@ CWLRDataDevice::CWLRDataDevice(SP<CZwlrDataControlDeviceV1> resource_) : resourc
         source->markUsed();
 
         LOGM(LOG, "wlr manager requests primary selection to {:x}", (uintptr_t)source.get());
-        g_pSeatManager->setCurrentSelection(source);
+        g_pSeatManager->setCurrentPrimarySelection(source);
     });
 
     resource->sendSelectionRaw(nullptr);
+    resource->sendPrimarySelectionRaw(nullptr);
 }
 
 bool CWLRDataDevice::good() {
@@ -167,6 +168,10 @@ void CWLRDataDevice::sendSelection(SP<CWLRDataOffer> selection) {
     resource->sendSelection(selection->resource.get());
 }
 
+void CWLRDataDevice::sendPrimarySelection(SP<CWLRDataOffer> selection) {
+    resource->sendPrimarySelection(selection->resource.get());
+}
+
 CWLRDataControlManagerResource::CWLRDataControlManagerResource(SP<CZwlrDataControlManagerV1> resource_) : resource(resource_) {
     if (!good())
         return;
@@ -254,7 +259,7 @@ void CDataDeviceWLRProtocol::destroyResource(CWLRDataOffer* resource) {
     std::erase_if(m_vOffers, [&](const auto& other) { return other.get() == resource; });
 }
 
-void CDataDeviceWLRProtocol::sendSelectionToDevice(SP<CWLRDataDevice> dev, SP<IDataSource> sel) {
+void CDataDeviceWLRProtocol::sendSelectionToDevice(SP<CWLRDataDevice> dev, SP<IDataSource> sel, bool primary) {
     if (!sel)
         return;
 
@@ -266,34 +271,41 @@ void CDataDeviceWLRProtocol::sendSelectionToDevice(SP<CWLRDataDevice> dev, SP<ID
         return;
     }
 
-    LOGM(LOG, "New offer {:x} for data source {:x}", (uintptr_t)OFFER.get(), (uintptr_t)sel.get());
+    OFFER->primary = primary;
+
+    LOGM(LOG, "New {}offer {:x} for data source {:x}", primary ? "primary " : " ", (uintptr_t)OFFER.get(), (uintptr_t)sel.get());
 
     dev->sendDataOffer(OFFER);
     OFFER->sendData();
-    dev->sendSelection(OFFER);
+    if (primary)
+        dev->sendPrimarySelection(OFFER);
+    else
+        dev->sendSelection(OFFER);
 }
 
-void CDataDeviceWLRProtocol::setSelection(SP<IDataSource> source) {
+void CDataDeviceWLRProtocol::setSelection(SP<IDataSource> source, bool primary) {
     for (auto& o : m_vOffers) {
         if (o->source && o->source->hasDnd())
             continue;
+        if (o->primary != primary)
+            continue;
         o->dead = true;
     }
 
     if (!source) {
-        LOGM(LOG, "resetting selection");
+        LOGM(LOG, "resetting {}selection", primary ? "primary " : " ");
 
         for (auto& d : m_vDevices) {
-            sendSelectionToDevice(d, nullptr);
+            sendSelectionToDevice(d, nullptr, primary);
         }
 
         return;
     }
 
-    LOGM(LOG, "New selection for data source {:x}", (uintptr_t)source.get());
+    LOGM(LOG, "New {}selection for data source {:x}", primary ? "primary" : "", (uintptr_t)source.get());
 
     for (auto& d : m_vDevices) {
-        sendSelectionToDevice(d, source);
+        sendSelectionToDevice(d, source, primary);
     }
 }
 

src/protocols/DataDeviceWlr.hpp

@@ -19,7 +19,8 @@ class CWLRDataOffer {
     bool            good();
     void            sendData();
 
-    bool            dead = false;
+    bool            dead    = false;
+    bool            primary = false;
 
     WP<IDataSource> source;
 
@@ -60,6 +61,7 @@ class CWLRDataDevice {
 
     void               sendDataOffer(SP<CWLRDataOffer> offer);
     void               sendSelection(SP<CWLRDataOffer> selection);
+    void               sendPrimarySelection(SP<CWLRDataOffer> selection);
 
     WP<CWLRDataDevice> self;
 
@@ -102,8 +104,8 @@ class CDataDeviceWLRProtocol : public IWaylandProtocol {
     std::vector<SP<CWLRDataOffer>>                  m_vOffers;
 
     //
-    void setSelection(SP<IDataSource> source);
-    void sendSelectionToDevice(SP<CWLRDataDevice> dev, SP<IDataSource> sel);
+    void setSelection(SP<IDataSource> source, bool primary);
+    void sendSelectionToDevice(SP<CWLRDataDevice> dev, SP<IDataSource> sel, bool primary);
 
     //
     SP<CWLRDataDevice> dataDeviceForClient(wl_client*);