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

seat: avoid sending null surfaces in leave/enter events

Browse source 
ref #9699
This commit is contained in:
Vaxry 2025-03-24 14:10:47 +00:00
parent 4b968e5bc1
commit aec69131cd
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/protocols/core/Seat.cpp
View file

@ -22,7 +22,7 @@ bool CWLTouchResource::good() {
} }
void CWLTouchResource::sendDown(SP<CWLSurfaceResource> surface, uint32_t timeMs, int32_t id, const Vector2D& local) { void CWLTouchResource::sendDown(SP<CWLSurfaceResource> surface, uint32_t timeMs, int32_t id, const Vector2D& local) {
if (!owner) if (!owner || !surface || !surface->getResource()->resource())
return; return;
if (!(PROTO::seat->currentCaps & eHIDCapabilityType::HID_INPUT_CAPABILITY_TOUCH)) if (!(PROTO::seat->currentCaps & eHIDCapabilityType::HID_INPUT_CAPABILITY_TOUCH))
@ -145,7 +145,7 @@ bool CWLPointerResource::good() {
} }
void CWLPointerResource::sendEnter(SP<CWLSurfaceResource> surface, const Vector2D& local) { void CWLPointerResource::sendEnter(SP<CWLSurfaceResource> surface, const Vector2D& local) {
if (!owner || currentSurface == surface) if (!owner || currentSurface == surface || !surface->getResource()->resource())
return; return;
if (!(PROTO::seat->currentCaps & eHIDCapabilityType::HID_INPUT_CAPABILITY_POINTER)) if (!(PROTO::seat->currentCaps & eHIDCapabilityType::HID_INPUT_CAPABILITY_POINTER))
@ -165,7 +165,7 @@ void CWLPointerResource::sendEnter(SP<CWLSurfaceResource> surface, const Vector2
} }
void CWLPointerResource::sendLeave() { void CWLPointerResource::sendLeave() {
if (!owner || !currentSurface) if (!owner || !currentSurface || !currentSurface->getResource()->resource())
return; return;
if (!(PROTO::seat->currentCaps & eHIDCapabilityType::HID_INPUT_CAPABILITY_POINTER)) if (!(PROTO::seat->currentCaps & eHIDCapabilityType::HID_INPUT_CAPABILITY_POINTER))
@ -336,7 +336,7 @@ void CWLKeyboardResource::sendKeymap(SP<IKeyboard> keyboard) {
} }
void CWLKeyboardResource::sendEnter(SP<CWLSurfaceResource> surface) { void CWLKeyboardResource::sendEnter(SP<CWLSurfaceResource> surface) {
if (!owner || currentSurface == surface) if (!owner || currentSurface == surface || !surface->getResource()->resource())
return; return;
if (!(PROTO::seat->currentCaps & eHIDCapabilityType::HID_INPUT_CAPABILITY_KEYBOARD)) if (!(PROTO::seat->currentCaps & eHIDCapabilityType::HID_INPUT_CAPABILITY_KEYBOARD))
@ -361,7 +361,7 @@ void CWLKeyboardResource::sendEnter(SP<CWLSurfaceResource> surface) {
} }
void CWLKeyboardResource::sendLeave() { void CWLKeyboardResource::sendLeave() {
if (!owner || !currentSurface) if (!owner || !currentSurface || !currentSurface->getResource()->resource())
return; return;
if (!(PROTO::seat->currentCaps & eHIDCapabilityType::HID_INPUT_CAPABILITY_KEYBOARD)) if (!(PROTO::seat->currentCaps & eHIDCapabilityType::HID_INPUT_CAPABILITY_KEYBOARD))