hyprwm/Hyprland
1
1
Fork 0
mirror of https://github.com/hyprwm/Hyprland.git synced 2024-12-26 09:15:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

foreign-toplevel: fixup output resource finding

Browse Source 
fixes #6457
This commit is contained in:
Vaxry 2024-06-12 23:28:52 +02:00
parent 18ee9ece9c
commit 0e18da8467
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/protocols/ForeignToplevelWlr.cpp
View File

@ -122,25 +122,19 @@ void CForeignToplevelHandleWlr::sendMonitor(CMonitor* pMonitor) {
if (lastMonitorID == (int64_t)pMonitor->ID)
return;
const auto CLIENT = resource->client();
struct wl_resource* outputResource;
const auto CLIENT = resource->client();
if (const auto PLASTMONITOR = g_pCompositor->getMonitorFromID(lastMonitorID); PLASTMONITOR) {
wl_resource_for_each(outputResource, &PLASTMONITOR->output->resources) {
if (wl_resource_get_client(outputResource) != CLIENT)
continue;
const auto OLDRESOURCE = PROTO::outputs.at(PLASTMONITOR->szName)->outputResourceFrom(CLIENT);
resource->sendOutputLeave(outputResource);
}
if (OLDRESOURCE)
resource->sendOutputLeave(OLDRESOURCE->getResource()->resource());
}
wl_resource_for_each(outputResource, &pMonitor->output->resources) {
if (wl_resource_get_client(outputResource) != CLIENT)
continue;
const auto NEWRESOURCE = PROTO::outputs.at(pMonitor->szName)->outputResourceFrom(CLIENT);
resource->sendOutputEnter(outputResource);
}
if (NEWRESOURCE)
resource->sendOutputEnter(NEWRESOURCE->getResource()->resource());
lastMonitorID = pMonitor->ID;
}