1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

client: Guard against client destruction in gestures

Browse Source 
Client code can delete a window at any point. Any gesture events,
including a "begin" event can be already in flight before the compositor
is aware of the window destruction.

It's up to the client code to handle either the focus not being
initially found or the QPointer resetting and no-op.

Task-number: QTBUG-113145
Pick-to: 6.6 6.5
Change-Id: Ie2c01799bd38c6f295159876a1bcd018abe60188
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
This commit is contained in:
David Edmundson 2023-06-05 15:57:49 +01:00
parent 2aa8de5524
commit 388e6659a7
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/platforms/wayland/qwaylandpointergestures.cpp
View File

@ -41,8 +41,11 @@ void QWaylandPointerGestureSwipe::zwp_pointer_gesture_swipe_v1_begin(uint32_t se
uint32_t fingers)
{
#ifndef QT_NO_GESTURES
mParent->mSerial = serial;
mFocus = QWaylandWindow::fromWlSurface(surface);
if (!mFocus) {
return;
}
mParent->mSerial = serial;
mFingers = fingers;
const auto* pointer = mParent->pointer();
@ -62,6 +65,9 @@ void QWaylandPointerGestureSwipe::zwp_pointer_gesture_swipe_v1_update(uint32_t t
wl_fixed_t dx, wl_fixed_t dy)
{
#ifndef QT_NO_GESTURES
if (!mFocus) {
return;
}
const auto* pointer = mParent->pointer();
const QPointF delta = QPointF(wl_fixed_to_double(dx), wl_fixed_to_double(dy));
@ -79,6 +85,9 @@ void QWaylandPointerGestureSwipe::zwp_pointer_gesture_swipe_v1_end(uint32_t seri
int32_t cancelled)
{
#ifndef QT_NO_GESTURES
if (!mFocus) {
return;
}
mParent->mSerial = serial;
const auto* pointer = mParent->pointer();
@ -113,11 +122,13 @@ void QWaylandPointerGesturePinch::zwp_pointer_gesture_pinch_v1_begin(uint32_t se
uint32_t fingers)
{
#ifndef QT_NO_GESTURES
mParent->mSerial = serial;
mFocus = QWaylandWindow::fromWlSurface(surface);
if (!mFocus) {
return;
}
mParent->mSerial = serial;
mFingers = fingers;
mLastScale = 1;
const auto* pointer = mParent->pointer();
qCDebug(lcQpaWaylandInput) << "zwp_pointer_gesture_pinch_v1_begin @ "
@ -137,6 +148,9 @@ void QWaylandPointerGesturePinch::zwp_pointer_gesture_pinch_v1_update(uint32_t t
wl_fixed_t rotation)
{
#ifndef QT_NO_GESTURES
if (!mFocus) {
return;
}
const auto* pointer = mParent->pointer();
const qreal rscale = wl_fixed_to_double(scale);
@ -161,6 +175,9 @@ void QWaylandPointerGesturePinch::zwp_pointer_gesture_pinch_v1_end(uint32_t seri
int32_t cancelled)
{
#ifndef QT_NO_GESTURES
if (!mFocus) {
return;
}
mParent->mSerial = serial;
const auto* pointer = mParent->pointer();