cry/Hyprland
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

core: Properly shutdown wl display (#7018)

Browse source 
* correctly destroy wayland globals

* properly shutdown and cleanup hyprland

* appease the nitpick gods and some comments
This commit is contained in:
Ikalco 2024-07-24 12:07:36 -05:00 • committed by GitHub
parent 735e3c6c56
commit 3e543d2ce8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
17 changed files with 161 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/protocols/Screencopy.hpp
View file

@ -70,17 +70,20 @@ struct SScreencopyFrame {
class CScreencopyProtocolManager {
public:
CScreencopyProtocolManager();
~CScreencopyProtocolManager();
void bindManager(wl_client* client, void* data, uint32_t version, uint32_t id);
void removeClient(CScreencopyClient* client, bool force = false);
void removeFrame(SScreencopyFrame* frame, bool force = false);
void displayDestroy();
void bindManager(wl_client* client, void* data, uint32_t version, uint32_t id);
void removeClient(CScreencopyClient* client, bool force = false);
void removeFrame(SScreencopyFrame* frame, bool force = false);
void displayDestroy();
void captureOutput(wl_client* client, wl_resource* resource, uint32_t frame, int32_t overlay_cursor, wl_resource* output, CBox box = {0, 0, 0, 0});
void captureOutput(wl_client* client, wl_resource* resource, uint32_t frame, int32_t overlay_cursor, wl_resource* output, CBox box = {0, 0, 0, 0});
void copyFrame(wl_client* client, wl_resource* resource, wl_resource* buffer);
void copyFrame(wl_client* client, wl_resource* resource, wl_resource* buffer);
void onOutputCommit(CMonitor* pMonitor);
void onOutputCommit(CMonitor* pMonitor);
wl_listener m_liDisplayDestroy;
private:
wl_global* m_pGlobal = nullptr;
@ -90,8 +93,6 @@ class CScreencopyProtocolManager {
SP<CEventLoopTimer> m_pSoftwareCursorTimer;
bool m_bTimerArmed = false;
wl_listener m_liDisplayDestroy;
std::vector<SScreencopyFrame*> m_vFramesAwaitingWrite;
SP<Aquamarine::IBuffer> m_pLastMonitorBackBuffer;
@ -103,4 +104,4 @@ class CScreencopyProtocolManager {
bool copyFrameShm(SScreencopyFrame* frame, timespec* now);
friend class CScreencopyClient;
};
};