summaryrefslogtreecommitdiff
path: root/src/protocols
diff options
context:
space:
mode:
Diffstat (limited to 'src/protocols')
-rw-r--r--src/protocols/ForeignToplevel.cpp7
-rw-r--r--src/protocols/ForeignToplevel.hpp3
-rw-r--r--src/protocols/ForeignToplevelWlr.cpp12
-rw-r--r--src/protocols/ToplevelMapping.cpp78
-rw-r--r--src/protocols/ToplevelMapping.hpp46
5 files changed, 138 insertions, 8 deletions
diff --git a/src/protocols/ForeignToplevel.cpp b/src/protocols/ForeignToplevel.cpp
index 16465763..e6c026d6 100644
--- a/src/protocols/ForeignToplevel.cpp
+++ b/src/protocols/ForeignToplevel.cpp
@@ -6,6 +6,8 @@ CForeignToplevelHandle::CForeignToplevelHandle(SP<CExtForeignToplevelHandleV1> r
if UNLIKELY (!resource_->resource())
return;
+ resource->setData(this);
+
resource->setOnDestroy([this](CExtForeignToplevelHandleV1* h) { PROTO::foreignToplevel->destroyHandle(this); });
resource->setDestroy([this](CExtForeignToplevelHandleV1* h) { PROTO::foreignToplevel->destroyHandle(this); });
}
@@ -168,3 +170,8 @@ void CForeignToplevelProtocol::destroyHandle(CForeignToplevelHandle* handle) {
bool CForeignToplevelProtocol::windowValidForForeign(PHLWINDOW pWindow) {
return validMapped(pWindow) && !pWindow->isX11OverrideRedirect();
}
+
+PHLWINDOW CForeignToplevelProtocol::windowFromHandleResource(wl_resource* res) {
+ auto data = (CForeignToplevelHandle*)(((CExtForeignToplevelHandleV1*)wl_resource_get_user_data(res))->data());
+ return data ? data->window() : nullptr;
+}
diff --git a/src/protocols/ForeignToplevel.hpp b/src/protocols/ForeignToplevel.hpp
index 712b32e0..2136748b 100644
--- a/src/protocols/ForeignToplevel.hpp
+++ b/src/protocols/ForeignToplevel.hpp
@@ -3,6 +3,7 @@
#include <vector>
#include <unordered_map>
#include "WaylandProtocol.hpp"
+#include "desktop/DesktopTypes.hpp"
#include "ext-foreign-toplevel-list-v1.hpp"
class CForeignToplevelHandle {
@@ -18,6 +19,7 @@ class CForeignToplevelHandle {
bool closed = false;
friend class CForeignToplevelList;
+ friend class CForeignToplevelProtocol;
};
class CForeignToplevelList {
@@ -43,6 +45,7 @@ class CForeignToplevelList {
class CForeignToplevelProtocol : public IWaylandProtocol {
public:
CForeignToplevelProtocol(const wl_interface* iface, const int& ver, const std::string& name);
+ PHLWINDOW windowFromHandleResource(wl_resource* res);
virtual void bindManager(wl_client* client, void* data, uint32_t ver, uint32_t id);
diff --git a/src/protocols/ForeignToplevelWlr.cpp b/src/protocols/ForeignToplevelWlr.cpp
index b4210bac..f1f32d7e 100644
--- a/src/protocols/ForeignToplevelWlr.cpp
+++ b/src/protocols/ForeignToplevelWlr.cpp
@@ -10,6 +10,8 @@ CForeignToplevelHandleWlr::CForeignToplevelHandleWlr(SP<CZwlrForeignToplevelHand
if UNLIKELY (!resource_->resource())
return;
+ resource->setData(this);
+
resource->setOnDestroy([this](CZwlrForeignToplevelHandleV1* h) { PROTO::foreignToplevelWlr->destroyHandle(this); });
resource->setDestroy([this](CZwlrForeignToplevelHandleV1* h) { PROTO::foreignToplevelWlr->destroyHandle(this); });
@@ -420,14 +422,8 @@ void CForeignToplevelWlrProtocol::destroyHandle(CForeignToplevelHandleWlr* handl
}
PHLWINDOW CForeignToplevelWlrProtocol::windowFromHandleResource(wl_resource* res) {
- for (auto const& h : m_vHandles) {
- if (h->res() != res)
- continue;
-
- return h->window();
- }
-
- return nullptr;
+ auto data = (CForeignToplevelHandleWlr*)(((CZwlrForeignToplevelHandleV1*)wl_resource_get_user_data(res))->data());
+ return data ? data->window() : nullptr;
}
bool CForeignToplevelWlrProtocol::windowValidForForeign(PHLWINDOW pWindow) {
diff --git a/src/protocols/ToplevelMapping.cpp b/src/protocols/ToplevelMapping.cpp
new file mode 100644
index 00000000..e65695c8
--- /dev/null
+++ b/src/protocols/ToplevelMapping.cpp
@@ -0,0 +1,78 @@
+#include "ToplevelMapping.hpp"
+#include "hyprland-toplevel-mapping-v1.hpp"
+#include "ForeignToplevelWlr.hpp"
+#include "ForeignToplevel.hpp"
+
+CToplevelWindowMappingHandle::CToplevelWindowMappingHandle(SP<CHyprlandToplevelWindowMappingHandleV1> resource_) : resource(resource_) {}
+
+CToplevelMappingManager::CToplevelMappingManager(SP<CHyprlandToplevelMappingManagerV1> resource_) : resource(resource_) {
+ if UNLIKELY (!resource_->resource())
+ return;
+
+ resource->setOnDestroy([this](CHyprlandToplevelMappingManagerV1* h) { PROTO::toplevelMapping->onManagerResourceDestroy(this); });
+ resource->setDestroy([this](CHyprlandToplevelMappingManagerV1* h) { PROTO::toplevelMapping->onManagerResourceDestroy(this); });
+
+ resource->setGetWindowForToplevel([this](CHyprlandToplevelMappingManagerV1* mgr, uint32_t handle, wl_resource* toplevel) {
+ const auto NEWHANDLE = PROTO::toplevelMapping->m_vHandles.emplace_back(
+ makeShared<CToplevelWindowMappingHandle>(makeShared<CHyprlandToplevelWindowMappingHandleV1>(resource->client(), resource->version(), handle)));
+
+ if UNLIKELY (!NEWHANDLE->resource->resource()) {
+ LOGM(ERR, "Couldn't alloc mapping handle! (no memory)");
+ resource->noMemory();
+ return;
+ }
+
+ NEWHANDLE->resource->setOnDestroy([](CHyprlandToplevelWindowMappingHandleV1* h) { PROTO::toplevelMapping->destroyHandle(h); });
+ NEWHANDLE->resource->setDestroy([](CHyprlandToplevelWindowMappingHandleV1* h) { PROTO::toplevelMapping->destroyHandle(h); });
+
+ const auto WINDOW = PROTO::foreignToplevel->windowFromHandleResource(toplevel);
+ if (!WINDOW)
+ NEWHANDLE->resource->sendFailed();
+ else
+ NEWHANDLE->resource->sendWindowAddress((uint64_t)WINDOW.get() >> 32 & 0xFFFFFFFF, (uint64_t)WINDOW.get() & 0xFFFFFFFF);
+ });
+ resource->setGetWindowForToplevelWlr([this](CHyprlandToplevelMappingManagerV1* mgr, uint32_t handle, wl_resource* toplevel) {
+ const auto NEWHANDLE = PROTO::toplevelMapping->m_vHandles.emplace_back(
+ makeShared<CToplevelWindowMappingHandle>(makeShared<CHyprlandToplevelWindowMappingHandleV1>(resource->client(), resource->version(), handle)));
+
+ if UNLIKELY (!NEWHANDLE->resource->resource()) {
+ LOGM(ERR, "Couldn't alloc mapping handle! (no memory)");
+ resource->noMemory();
+ return;
+ }
+
+ NEWHANDLE->resource->setOnDestroy([](CHyprlandToplevelWindowMappingHandleV1* h) { PROTO::toplevelMapping->destroyHandle(h); });
+ NEWHANDLE->resource->setDestroy([](CHyprlandToplevelWindowMappingHandleV1* h) { PROTO::toplevelMapping->destroyHandle(h); });
+
+ const auto WINDOW = PROTO::foreignToplevelWlr->windowFromHandleResource(toplevel);
+ if (!WINDOW)
+ NEWHANDLE->resource->sendFailed();
+ else
+ NEWHANDLE->resource->sendWindowAddress((uint64_t)WINDOW.get() >> 32 & 0xFFFFFFFF, (uint64_t)WINDOW.get() & 0xFFFFFFFF);
+ });
+}
+
+bool CToplevelMappingManager::good() const {
+ return resource->resource();
+}
+
+CToplevelMappingProtocol::CToplevelMappingProtocol(const wl_interface* iface, const int& ver, const std::string& name) : IWaylandProtocol(iface, ver, name) {}
+
+void CToplevelMappingProtocol::bindManager(wl_client* client, void* data, uint32_t ver, uint32_t id) {
+ const auto RESOURCE = m_vManagers.emplace_back(makeUnique<CToplevelMappingManager>(makeShared<CHyprlandToplevelMappingManagerV1>(client, ver, id))).get();
+
+ if UNLIKELY (!RESOURCE->good()) {
+ LOGM(ERR, "Couldn't create a toplevel mapping manager");
+ wl_client_post_no_memory(client);
+ m_vManagers.pop_back();
+ return;
+ }
+}
+
+void CToplevelMappingProtocol::onManagerResourceDestroy(CToplevelMappingManager* mgr) {
+ std::erase_if(m_vManagers, [&](const auto& other) { return other.get() == mgr; });
+}
+
+void CToplevelMappingProtocol::destroyHandle(CHyprlandToplevelWindowMappingHandleV1* handle) {
+ std::erase_if(m_vHandles, [&](const auto& other) { return other->resource.get() == handle; });
+} \ No newline at end of file
diff --git a/src/protocols/ToplevelMapping.hpp b/src/protocols/ToplevelMapping.hpp
new file mode 100644
index 00000000..ffe94b14
--- /dev/null
+++ b/src/protocols/ToplevelMapping.hpp
@@ -0,0 +1,46 @@
+#pragma once
+
+#include <vector>
+#include "WaylandProtocol.hpp"
+#include "hyprland-toplevel-mapping-v1.hpp"
+
+class CToplevelWindowMappingHandle {
+ public:
+ CToplevelWindowMappingHandle(SP<CHyprlandToplevelWindowMappingHandleV1> resource_);
+
+ private:
+ SP<CHyprlandToplevelWindowMappingHandleV1> resource;
+
+ friend class CToplevelMappingManager;
+ friend class CToplevelMappingProtocol;
+};
+
+class CToplevelMappingManager {
+ public:
+ CToplevelMappingManager(SP<CHyprlandToplevelMappingManagerV1> resource_);
+
+ bool good() const;
+
+ private:
+ SP<CHyprlandToplevelMappingManagerV1> resource;
+};
+
+class CToplevelMappingProtocol : IWaylandProtocol {
+ public:
+ CToplevelMappingProtocol(const wl_interface* iface, const int& ver, const std::string& name);
+
+ virtual void bindManager(wl_client* client, void* data, uint32_t ver, uint32_t id);
+
+ private:
+ void onManagerResourceDestroy(CToplevelMappingManager* mgr);
+ void destroyHandle(CHyprlandToplevelWindowMappingHandleV1* handle);
+
+ std::vector<UP<CToplevelMappingManager>> m_vManagers;
+ std::vector<SP<CToplevelWindowMappingHandle>> m_vHandles;
+
+ friend class CToplevelMappingManager;
+};
+
+namespace PROTO {
+ inline UP<CToplevelMappingProtocol> toplevelMapping;
+}; \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2026-11-03 23:21:43 +0000