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

Port to SeatInterface::notifyPointer{Enter,Leave}

Browse source
This commit is contained in:
Vlad Zahorodnii 2022-02-23 21:15:40 +02:00
parent a2b7c09a11
commit 12ec886ccc
1 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/pointer_input.cpp
View file

@ -553,8 +553,6 @@ void PointerInputRedirection::cleanupDecoration(Decoration::DecoratedClientImpl
m_decorationDestroyedConnection = connect(now, &QObject::destroyed, this, &PointerInputRedirection::update, Qt::QueuedConnection); m_decorationDestroyedConnection = connect(now, &QObject::destroyed, this, &PointerInputRedirection::update, Qt::QueuedConnection);
} }
static bool s_cursorUpdateBlocking = false;
void PointerInputRedirection::focusUpdate(Toplevel *focusOld, Toplevel *focusNow) void PointerInputRedirection::focusUpdate(Toplevel *focusOld, Toplevel *focusNow)
{ {
if (AbstractClient *ac = qobject_cast<AbstractClient*>(focusOld)) { if (AbstractClient *ac = qobject_cast<AbstractClient*>(focusOld)) {
@ -571,17 +569,11 @@ void PointerInputRedirection::focusUpdate(Toplevel *focusOld, Toplevel *focusNow
auto seat = waylandServer()->seat(); auto seat = waylandServer()->seat();
if (!focusNow || !focusNow->surface()) { if (!focusNow || !focusNow->surface()) {
seat->setFocusedPointerSurface(nullptr); seat->notifyPointerLeave();
return; return;
} }
// prevent updating cursor and sending motion event outside the previously focused surface seat->notifyPointerEnter(focusNow->surface(), m_pos, focusNow->inputTransformation());
s_cursorUpdateBlocking = true;
seat->setFocusedPointerSurface(nullptr);
s_cursorUpdateBlocking = false;
seat->notifyPointerMotion(m_pos.toPoint());
seat->setFocusedPointerSurface(focusNow->surface(), focusNow->inputTransformation());
m_focusGeometryConnection = connect(focusNow, &Toplevel::inputTransformationChanged, this, m_focusGeometryConnection = connect(focusNow, &Toplevel::inputTransformationChanged, this,
[this] { [this] {
@ -1028,10 +1020,6 @@ void CursorImage::handlePointerChanged()
void CursorImage::handleFocusedSurfaceChanged() void CursorImage::handleFocusedSurfaceChanged()
{ {
if (s_cursorUpdateBlocking) {
return;
}
KWaylandServer::PointerInterface *pointer = waylandServer()->seat()->pointer(); KWaylandServer::PointerInterface *pointer = waylandServer()->seat()->pointer();
disconnect(m_serverCursor.connection); disconnect(m_serverCursor.connection);