summaryrefslogtreecommitdiff
path: root/src/protocols/core
diff options
context:
space:
mode:
authorVaxry <43317083+vaxerski@users.noreply.github.com>2026-02-20 22:31:59 +0000
committerGitHub <noreply@github.com>2026-02-20 22:31:59 +0000
commitd91952c555085758117f1eb360d4ace120ee5d65 (patch)
tree7bcf2d3b9454b075c0fc68b09f3c33e0f27b8a96 /src/protocols/core
parent8b17a7404b70a5ca2383320167a88e03289f0211 (diff)
wayland/output: return all bound wl_output instances in outputResourceFrom (#13315)
ref https://github.com/hyprwm/Hyprland/discussions/13301
Diffstat (limited to 'src/protocols/core')
-rw-r--r--src/protocols/core/Compositor.cpp20
-rw-r--r--src/protocols/core/Output.cpp8
-rw-r--r--src/protocols/core/Output.hpp10
3 files changed, 24 insertions, 14 deletions
diff --git a/src/protocols/core/Compositor.cpp b/src/protocols/core/Compositor.cpp
index 7638486f..06f430b9 100644
--- a/src/protocols/core/Compositor.cpp
+++ b/src/protocols/core/Compositor.cpp
@@ -286,16 +286,20 @@ void CWLSurfaceResource::enter(PHLMONITOR monitor) {
return;
}
- auto output = PROTO::outputs.at(monitor->m_name)->outputResourceFrom(m_client);
+ auto outputs = PROTO::outputs.at(monitor->m_name)->outputResourcesFrom(m_client);
- if UNLIKELY (!output || !output->getResource() || !output->getResource()->resource()) {
+ if UNLIKELY (outputs.empty() || std::ranges::all_of(outputs, [](const auto& o) { return !o->getResource() || !o->getResource()->resource(); })) {
LOGM(Log::ERR, "Cannot enter surface {:x} to {}, client hasn't bound the output", (uintptr_t)this, monitor->m_name);
return;
}
m_enteredOutputs.emplace_back(monitor);
- m_resource->sendEnter(output->getResource().get());
+ for (const auto& o : outputs) {
+ if (!o->getResource() || !o->getResource()->resource())
+ continue;
+ m_resource->sendEnter(o->getResource().get());
+ }
m_events.enter.emit(monitor);
}
@@ -303,16 +307,20 @@ void CWLSurfaceResource::leave(PHLMONITOR monitor) {
if UNLIKELY (std::ranges::find(m_enteredOutputs, monitor) == m_enteredOutputs.end())
return;
- auto output = PROTO::outputs.at(monitor->m_name)->outputResourceFrom(m_client);
+ auto outputs = PROTO::outputs.at(monitor->m_name)->outputResourcesFrom(m_client);
- if UNLIKELY (!output) {
+ if UNLIKELY (outputs.empty() || std::ranges::all_of(outputs, [](const auto& o) { return !o->getResource() || !o->getResource()->resource(); })) {
LOGM(Log::ERR, "Cannot leave surface {:x} from {}, client hasn't bound the output", (uintptr_t)this, monitor->m_name);
return;
}
std::erase(m_enteredOutputs, monitor);
- m_resource->sendLeave(output->getResource().get());
+ for (const auto& o : outputs) {
+ if (!o->getResource() || !o->getResource()->resource())
+ continue;
+ m_resource->sendLeave(o->getResource().get());
+ }
m_events.leave.emit(monitor);
}
diff --git a/src/protocols/core/Output.cpp b/src/protocols/core/Output.cpp
index 755470e4..dd9c3166 100644
--- a/src/protocols/core/Output.cpp
+++ b/src/protocols/core/Output.cpp
@@ -117,15 +117,17 @@ void CWLOutputProtocol::destroyResource(CWLOutputResource* resource) {
PROTO::outputs.erase(m_name);
}
-SP<CWLOutputResource> CWLOutputProtocol::outputResourceFrom(wl_client* client) {
+std::vector<SP<CWLOutputResource>> CWLOutputProtocol::outputResourcesFrom(wl_client* client) {
+ std::vector<SP<CWLOutputResource>> ret;
+
for (auto const& r : m_outputs) {
if (r->client() != client)
continue;
- return r;
+ ret.emplace_back(r);
}
- return nullptr;
+ return ret;
}
void CWLOutputProtocol::remove() {
diff --git a/src/protocols/core/Output.hpp b/src/protocols/core/Output.hpp
index d0c6fb13..cf266685 100644
--- a/src/protocols/core/Output.hpp
+++ b/src/protocols/core/Output.hpp
@@ -34,13 +34,13 @@ class CWLOutputProtocol : public IWaylandProtocol {
public:
CWLOutputProtocol(const wl_interface* iface, const int& ver, const std::string& name, PHLMONITOR pMonitor);
- virtual void bindManager(wl_client* client, void* data, uint32_t ver, uint32_t id);
+ virtual void bindManager(wl_client* client, void* data, uint32_t ver, uint32_t id);
- SP<CWLOutputResource> outputResourceFrom(wl_client* client);
- void sendDone();
+ std::vector<SP<CWLOutputResource>> outputResourcesFrom(wl_client* client);
+ void sendDone();
- PHLMONITORREF m_monitor;
- WP<CWLOutputProtocol> m_self;
+ PHLMONITORREF m_monitor;
+ WP<CWLOutputProtocol> m_self;
// will mark the protocol for removal, will be removed when no. of bound outputs is 0 (or when overwritten by a new global)
void remove();