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

Remove AbstractClient plumbing casts in PointerInputRedirection

Browse source
This commit is contained in:
Vlad Zahorodnii 2022-04-18 11:19:10 +03:00
parent f7d913af91
commit 6cf490c9cc
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/pointer_input.cpp
View file

@ -197,9 +197,8 @@ void PointerInputRedirection::updateToReset()
setDecoration(nullptr); setDecoration(nullptr);
} }
if (focus()) { if (focus()) {
auto t = focus(); if (focus()->isClient()) {
if (auto c = static_cast<AbstractClient *>(t->isClient() ? t : nullptr)) { focus()->pointerLeaveEvent();
c->pointerLeaveEvent();
} }
disconnect(m_focusGeometryConnection); disconnect(m_focusGeometryConnection);
m_focusGeometryConnection = QMetaObject::Connection(); m_focusGeometryConnection = QMetaObject::Connection();
@ -558,16 +557,16 @@ void PointerInputRedirection::cleanupDecoration(Decoration::DecoratedClientImpl
void PointerInputRedirection::focusUpdate(AbstractClient *focusOld, AbstractClient *focusNow) void PointerInputRedirection::focusUpdate(AbstractClient *focusOld, AbstractClient *focusNow)
{ {
if (auto ac = static_cast<AbstractClient *>(focusOld && focusOld->isClient() ? focusOld : nullptr)) { if (focusOld && focusOld->isClient()) {
ac->pointerLeaveEvent(); focusOld->pointerLeaveEvent();
breakPointerConstraints(ac->surface()); breakPointerConstraints(focusOld->surface());
disconnectPointerConstraintsConnection(); disconnectPointerConstraintsConnection();
} }
disconnect(m_focusGeometryConnection); disconnect(m_focusGeometryConnection);
m_focusGeometryConnection = QMetaObject::Connection(); m_focusGeometryConnection = QMetaObject::Connection();
if (auto ac = static_cast<AbstractClient *>(focusNow && focusNow->isClient() ? focusNow : nullptr)) { if (focusNow && focusNow->isClient()) {
ac->pointerEnterEvent(m_pos.toPoint()); focusNow->pointerEnterEvent(m_pos.toPoint());
} }
auto seat = waylandServer()->seat(); auto seat = waylandServer()->seat();