hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-15 09:46:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

output: send enter events on late wl_output binds

Browse source 
fixes #6560
This commit is contained in:
Vaxry 2024-10-16 21:59:29 +01:00
parent 0baf166d39
commit 781828a56e
3 changed files with 29 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/protocols/core/Compositor.cpp
View file

@ -589,3 +589,9 @@ void CWLCompositorProtocol::destroyResource(CWLSurfaceResource* resource) {
void CWLCompositorProtocol::destroyResource(CWLRegionResource* resource) { void CWLCompositorProtocol::destroyResource(CWLRegionResource* resource) {
std::erase_if(m_vRegions, [&](const auto& other) { return other.get() == resource; }); std::erase_if(m_vRegions, [&](const auto& other) { return other.get() == resource; });
} }
void CWLCompositorProtocol::forEachSurface(std::function<void(SP<CWLSurfaceResource>)> fn) {
for (auto& surf : m_vSurfaces) {
fn(surf);
}
}

2
src/protocols/core/Compositor.hpp
View file

@ -169,6 +169,8 @@ class CWLCompositorProtocol : public IWaylandProtocol {
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);
void forEachSurface(std::function<void(SP<CWLSurfaceResource>)> fn);
struct { struct {
CSignal newSurface; // SP<CWLSurfaceResource> CSignal newSurface; // SP<CWLSurfaceResource>
} events; } events;

21
src/protocols/core/Output.cpp
View file

@ -1,4 +1,6 @@
#include "Output.hpp" #include "Output.hpp"
#include "Compositor.hpp"
#include "../../Compositor.hpp"
#include "../../helpers/Monitor.hpp" #include "../../helpers/Monitor.hpp"
CWLOutputResource::CWLOutputResource(SP<CWlOutput> resource_, SP<CMonitor> pMonitor) : monitor(pMonitor), resource(resource_) { CWLOutputResource::CWLOutputResource(SP<CWlOutput> resource_, SP<CMonitor> pMonitor) : monitor(pMonitor), resource(resource_) {
@ -27,6 +29,25 @@ CWLOutputResource::CWLOutputResource(SP<CWlOutput> resource_, SP<CMonitor> pMoni
} }
updateState(); updateState();
PROTO::compositor->forEachSurface([](SP<CWLSurfaceResource> surf) {
auto HLSurf = CWLSurface::fromResource(surf);
if (!HLSurf)
return;
const auto GEOMETRY = HLSurf->getSurfaceBoxGlobal();
if (!GEOMETRY.has_value())
return;
for (auto& m : g_pCompositor->m_vMonitors) {
if (!m->logicalBox().overlaps(*GEOMETRY))
continue;
surf->enter(m);
}
});
} }
SP<CWLOutputResource> CWLOutputResource::fromResource(wl_resource* res) { SP<CWLOutputResource> CWLOutputResource::fromResource(wl_resource* res) {