hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-12-23 04:09:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

datadevice: guard surface in dnd for null

Browse source 
fixes #6076
This commit is contained in:
Vaxry 2024-05-15 16:25:56 +01:00
parent 7fbe05a250
commit 3381e2b55b
1 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/protocols/core/DataDevice.cpp
View file

@ -233,7 +233,7 @@ CWLDataDeviceResource::CWLDataDeviceResource(SP<CWlDataDevice> resource_) : reso
source->dnd = true; source->dnd = true;
PROTO::data->initiateDrag(source, wlr_surface_from_resource(icon), wlr_surface_from_resource(origin)); PROTO::data->initiateDrag(source, icon ? wlr_surface_from_resource(icon) : nullptr, wlr_surface_from_resource(origin));
}); });
} }
@ -471,22 +471,24 @@ void CWLDataDeviceProtocol::initiateDrag(WP<CWLDataSourceResource> currentSource
dnd.currentSource = currentSource; dnd.currentSource = currentSource;
dnd.originSurface = origin; dnd.originSurface = origin;
dnd.dndSurface = dragSurface; dnd.dndSurface = dragSurface;
dnd.hyprListener_dndSurfaceDestroy.initCallback( if (dragSurface) {
&dragSurface->events.destroy, [this](void* owner, void* data) { abortDrag(); }, nullptr, "CWLDataDeviceProtocol::drag"); dnd.hyprListener_dndSurfaceDestroy.initCallback(
dnd.hyprListener_dndSurfaceCommit.initCallback( &dragSurface->events.destroy, [this](void* owner, void* data) { abortDrag(); }, nullptr, "CWLDataDeviceProtocol::drag");
&dragSurface->events.commit, dnd.hyprListener_dndSurfaceCommit.initCallback(
[this](void* owner, void* data) { &dragSurface->events.commit,
if (dnd.dndSurface->pending.buffer_width > 0 && dnd.dndSurface->pending.buffer_height > 0 && !dnd.dndSurface->mapped) { [this](void* owner, void* data) {
wlr_surface_map(dnd.dndSurface); if (dnd.dndSurface->pending.buffer_width > 0 && dnd.dndSurface->pending.buffer_height > 0 && !dnd.dndSurface->mapped) {
return; wlr_surface_map(dnd.dndSurface);
} return;
}
if (dnd.dndSurface->pending.buffer_width <= 0 && dnd.dndSurface->pending.buffer_height <= 0 && dnd.dndSurface->mapped) { if (dnd.dndSurface->pending.buffer_width <= 0 && dnd.dndSurface->pending.buffer_height <= 0 && dnd.dndSurface->mapped) {
wlr_surface_unmap(dnd.dndSurface); wlr_surface_unmap(dnd.dndSurface);
return; return;
} }
}, },
nullptr, "CWLDataDeviceProtocol::drag"); nullptr, "CWLDataDeviceProtocol::drag");
}
dnd.mouseButton = g_pHookSystem->hookDynamic("mouseButton", [this](void* self, SCallbackInfo& info, std::any e) { dnd.mouseButton = g_pHookSystem->hookDynamic("mouseButton", [this](void* self, SCallbackInfo& info, std::any e) {
auto E = std::any_cast<IPointer::SButtonEvent>(e); auto E = std::any_cast<IPointer::SButtonEvent>(e);