mirrors/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland.git synced 2025-09-15 07:48:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup: Revert use doLater instead of adding idle event handlers (#8624)

Browse Source 
This reverts commit 6d7544458d.
This commit is contained in:
vaxerski
2024-12-03 21:15:25 +00:00
parent 320144ae72
commit f6ac755cf7
5 changed files with 39 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/protocols/XDGShell.cpp
View File

@@ -3,7 +3,6 @@
#include <algorithm>
#include "../Compositor.hpp"
#include "../managers/SeatManager.hpp"
#include "../managers/eventLoop/EventLoopManager.hpp"
#include "core/Seat.hpp"
#include "core/Compositor.hpp"
#include <cstring>
@@ -470,6 +469,8 @@ CXDGSurfaceResource::CXDGSurfaceResource(SP<CXdgSurface> resource_, SP<CXDGWMBas
CXDGSurfaceResource::~CXDGSurfaceResource() {
events.destroy.emit();
if (configureSource)
wl_event_source_remove(configureSource);
if (surface)
surface->resetRole();
}
@@ -483,23 +484,22 @@ SP<CXDGSurfaceResource> CXDGSurfaceResource::fromResource(wl_resource* res) {
return data ? data->self.lock() : nullptr;
}
static void onConfigure(void* data) {
((CXDGSurfaceResource*)data)->configure();
}
uint32_t CXDGSurfaceResource::scheduleConfigure() {
if (configureScheduled)
if (configureSource)
return scheduledSerial;
configureSource = wl_event_loop_add_idle(g_pCompositor->m_sWLEventLoop, onConfigure, this);
scheduledSerial = wl_display_next_serial(g_pCompositor->m_sWLDisplay);
configureScheduled = true;
g_pEventLoopManager->doLater([this]() { configure(); });
return scheduledSerial;
}
void CXDGSurfaceResource::configure() {
if (!resource)
return;
configureScheduled = false;
configureSource = nullptr;
resource->sendConfigure(scheduledSerial);
}