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

tablet+libinput: do not crash if there's a tablet event without a client

Browse source 
It triggers if you start with your pen on the tablet while starting
kwin.
This commit is contained in:
Aleix Pol 2021-07-02 20:55:51 +02:00
parent c8a37ef27f
commit 8386a8bb66
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/libinput/connection.cpp
View file

@ -571,20 +571,22 @@ void Connection::processEvents()
break;
}
if (workspace()) {
#ifndef KWIN_BUILD_TESTING
auto client = workspace()->activeClient();
const auto *output = static_cast<AbstractWaylandOutput*>(
kwinApp()->platform()->enabledOutputs()[client ? client->screen() : tte->device()->screenId()]);
const QPointF globalPos =
devicePointToGlobalPosition(tte->transformedPosition(output->modeSize()),
output);
auto client = workspace()->activeClient();
const auto *output = static_cast<AbstractWaylandOutput*>(
kwinApp()->platform()->enabledOutputs()[client ? client->screen() : tte->device()->screenId()]);
const QPointF globalPos =
devicePointToGlobalPosition(tte->transformedPosition(output->modeSize()),
output);
#else
const QPointF globalPos;
const QPointF globalPos;
#endif
Q_EMIT tabletToolEvent(tabletEventType,
globalPos, tte->pressure(),
tte->xTilt(), tte->yTilt(), tte->rotation(),
tte->isTipDown(), tte->isNearby(), createTabletId(tte->tool(), event->device()->groupUserData()), tte->time());
Q_EMIT tabletToolEvent(tabletEventType,
globalPos, tte->pressure(),
tte->xTilt(), tte->yTilt(), tte->rotation(),
tte->isTipDown(), tte->isNearby(), createTabletId(tte->tool(), event->device()->groupUserData()), tte->time());
}
break;
}
case LIBINPUT_EVENT_TABLET_TOOL_BUTTON: {