yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[server] Guard sending events to PointerInterface

Browse source 
After unbind the PointerInterface is not yet deleted, but resource
is null, thus we need to protect the calls.
This commit is contained in:
Martin Gräßlin 2015-04-20 09:09:23 +02:00
parent c562f62696
commit 7b1e1bac9b
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/wayland/pointer_interface.cpp
View file

@ -101,7 +101,7 @@ PointerInterface::PointerInterface(SeatInterface *parent, wl_resource *parentRes
{ {
connect(parent, &SeatInterface::pointerPosChanged, this, [this] { connect(parent, &SeatInterface::pointerPosChanged, this, [this] {
Q_D(); Q_D();
if (d->focusedSurface) { if (d->focusedSurface && d->resource) {
const QPointF pos = d->seat->pointerPos() - d->seat->focusedPointerSurfacePosition(); const QPointF pos = d->seat->pointerPos() - d->seat->focusedPointerSurfacePosition();
wl_pointer_send_motion(d->resource, d->seat->timestamp(), wl_pointer_send_motion(d->resource, d->seat->timestamp(),
wl_fixed_from_double(pos.x()), wl_fixed_from_double(pos.y())); wl_fixed_from_double(pos.x()), wl_fixed_from_double(pos.y()));
@ -141,6 +141,9 @@ void PointerInterface::buttonPressed(quint32 button, quint32 serial)
{ {
Q_D(); Q_D();
Q_ASSERT(d->focusedSurface); Q_ASSERT(d->focusedSurface);
if (!d->resource) {
return;
}
wl_pointer_send_button(d->resource, serial, d->seat->timestamp(), button, WL_POINTER_BUTTON_STATE_PRESSED); wl_pointer_send_button(d->resource, serial, d->seat->timestamp(), button, WL_POINTER_BUTTON_STATE_PRESSED);
} }
@ -148,6 +151,9 @@ void PointerInterface::buttonReleased(quint32 button, quint32 serial)
{ {
Q_D(); Q_D();
Q_ASSERT(d->focusedSurface); Q_ASSERT(d->focusedSurface);
if (!d->resource) {
return;
}
wl_pointer_send_button(d->resource, serial, d->seat->timestamp(), button, WL_POINTER_BUTTON_STATE_RELEASED); wl_pointer_send_button(d->resource, serial, d->seat->timestamp(), button, WL_POINTER_BUTTON_STATE_RELEASED);
} }
@ -155,6 +161,9 @@ void PointerInterface::axis(Qt::Orientation orientation, quint32 delta)
{ {
Q_D(); Q_D();
Q_ASSERT(d->focusedSurface); Q_ASSERT(d->focusedSurface);
if (!d->resource) {
return;
}
wl_pointer_send_axis(d->resource, d->seat->timestamp(), wl_pointer_send_axis(d->resource, d->seat->timestamp(),
(orientation == Qt::Vertical) ? WL_POINTER_AXIS_VERTICAL_SCROLL : WL_POINTER_AXIS_HORIZONTAL_SCROLL, (orientation == Qt::Vertical) ? WL_POINTER_AXIS_VERTICAL_SCROLL : WL_POINTER_AXIS_HORIZONTAL_SCROLL,
wl_fixed_from_int(delta)); wl_fixed_from_int(delta));