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

xwayland: Fix crash when copying from wayland to xwayland (#10786)

Browse source
This commit is contained in:
Jasson 2025-06-19 13:44:38 -04:00 • committed by GitHub
parent 86b5e3bfbc
commit b49d0ca20e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 151 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/xwayland/XWM.hpp
View file

@ -11,6 +11,8 @@
#include <xcb/composite.h>
#include <xcb/xcb_errors.h>
#include <hyprutils/os/FileDescriptor.hpp>
#include <cinttypes> // for PRIxPTR
#include <cstdint>
struct wl_event_source;
class CXWaylandSurfaceResource;
@ -68,8 +70,12 @@ class CXCBConnection {
}
~CXCBConnection() {
if (m_connection)
if (m_connection) {
Debug::log(LOG, "Disconnecting XCB connection {:x}", (uintptr_t)m_connection);
xcb_disconnect(m_connection);
m_connection = nullptr;
} else
Debug::log(ERR, "Double xcb_disconnect attempt");
}
bool hasError() const {
@ -174,7 +180,7 @@ class CXWM {
SXSelection* getSelection(xcb_atom_t atom);
//
CXCBConnection m_connection;
UP<CXCBConnection> m_connection;
xcb_errors_context_t* m_errors = nullptr;
xcb_screen_t* m_screen = nullptr;
@ -206,6 +212,9 @@ class CXWM {
SP<CX11DataDevice> m_dndDataDevice = makeShared<CX11DataDevice>();
std::vector<SP<CX11DataOffer>> m_dndDataOffers;
inline xcb_connection_t* getConnection() {
return m_connection ? *m_connection : nullptr;
}
struct {
CHyprSignalListener newWLSurface;
CHyprSignalListener newXShellSurface;