4e9456a857
Summary: There is a regression in WindowBasedEdge::soStopApproaching. Due to only operate when the edge activates for pointer it is possible that the cursor polling stays active. Explaining the situation: 1. Activate switch desktop when moving window 2. Start moving a window 3. Move mouse into the approach geometry -> doStartApproaching activates as we are moving a window 4. stop moving window -> doStopApproaching early exits as the position does not activate for pointer any more - we are not moving a window -> cursor polling is still connected and whenever mouse enters edge approaching is started The analysis shows that the check whether activates for pointer is wrong in the case of stop approaching. If the edge started to approach, we also need to stop approaching. This change addresses the problem by turning the check into whether the connection for cursor position update is set. This is the third bug fix to the X11 screen edge handling after introducing touch screen edges. This needs more manual testing by everybody in the Plasma team who is still using X11. BUG: 381849 FIXED-IN: 5.10.4 Reviewers: #kwin, #plasma Subscribers: plasma-devel, kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D6467
144 lines
4 KiB
C++
144 lines
4 KiB
C++
/********************************************************************
|
|
KWin - the KDE window manager
|
|
This file is part of the KDE project.
|
|
|
|
Copyright (C) 2011 Arthur Arlt <a.arlt@stud.uni-heidelberg.de>
|
|
Copyright (C) 2013 Martin Gräßlin <mgraesslin@kde.org>
|
|
|
|
Since the functionality provided in this class has been moved from
|
|
class Workspace, it is not clear who exactly has written the code.
|
|
The list below contains the copyright holders of the class Workspace.
|
|
|
|
Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
|
|
Copyright (C) 2003 Lubos Lunak <l.lunak@kde.org>
|
|
Copyright (C) 2009 Lucas Murray <lmurray@undefinedfire.com>
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*********************************************************************/
|
|
#include "edge.h"
|
|
#include "atoms.h"
|
|
#include "cursor.h"
|
|
|
|
namespace KWin
|
|
{
|
|
|
|
WindowBasedEdge::WindowBasedEdge(ScreenEdges *parent)
|
|
: Edge(parent)
|
|
, m_window(XCB_WINDOW_NONE)
|
|
, m_approachWindow(XCB_WINDOW_NONE)
|
|
{
|
|
}
|
|
|
|
WindowBasedEdge::~WindowBasedEdge()
|
|
{
|
|
}
|
|
|
|
void WindowBasedEdge::doActivate()
|
|
{
|
|
createWindow();
|
|
createApproachWindow();
|
|
doUpdateBlocking();
|
|
}
|
|
|
|
void WindowBasedEdge::doDeactivate()
|
|
{
|
|
m_window.reset();
|
|
m_approachWindow.reset();
|
|
}
|
|
|
|
void WindowBasedEdge::createWindow()
|
|
{
|
|
if (m_window.isValid()) {
|
|
return;
|
|
}
|
|
const uint32_t mask = XCB_CW_OVERRIDE_REDIRECT | XCB_CW_EVENT_MASK;
|
|
const uint32_t values[] = {
|
|
true,
|
|
XCB_EVENT_MASK_ENTER_WINDOW | XCB_EVENT_MASK_LEAVE_WINDOW | XCB_EVENT_MASK_POINTER_MOTION
|
|
};
|
|
m_window.create(geometry(), XCB_WINDOW_CLASS_INPUT_ONLY, mask, values);
|
|
m_window.map();
|
|
// Set XdndAware on the windows, so that DND enter events are received (#86998)
|
|
xcb_atom_t version = 4; // XDND version
|
|
xcb_change_property(connection(), XCB_PROP_MODE_REPLACE, m_window,
|
|
atoms->xdnd_aware, XCB_ATOM_ATOM, 32, 1, (unsigned char*)(&version));
|
|
}
|
|
|
|
void WindowBasedEdge::createApproachWindow()
|
|
{
|
|
if (!activatesForPointer()) {
|
|
return;
|
|
}
|
|
if (m_approachWindow.isValid()) {
|
|
return;
|
|
}
|
|
if (!approachGeometry().isValid()) {
|
|
return;
|
|
}
|
|
const uint32_t mask = XCB_CW_OVERRIDE_REDIRECT | XCB_CW_EVENT_MASK;
|
|
const uint32_t values[] = {
|
|
true,
|
|
XCB_EVENT_MASK_ENTER_WINDOW | XCB_EVENT_MASK_LEAVE_WINDOW | XCB_EVENT_MASK_POINTER_MOTION
|
|
};
|
|
m_approachWindow.create(approachGeometry(), XCB_WINDOW_CLASS_INPUT_ONLY, mask, values);
|
|
m_approachWindow.map();
|
|
}
|
|
|
|
void WindowBasedEdge::doGeometryUpdate()
|
|
{
|
|
m_window.setGeometry(geometry());
|
|
if (m_approachWindow.isValid()) {
|
|
m_approachWindow.setGeometry(approachGeometry());
|
|
}
|
|
}
|
|
|
|
void WindowBasedEdge::doStartApproaching()
|
|
{
|
|
if (!activatesForPointer()) {
|
|
return;
|
|
}
|
|
m_approachWindow.unmap();
|
|
Cursor *cursor = Cursor::self();
|
|
#ifndef KWIN_UNIT_TEST
|
|
m_cursorPollingConnection = connect(cursor, &Cursor::posChanged, this, &WindowBasedEdge::updateApproaching);
|
|
#endif
|
|
cursor->startMousePolling();
|
|
}
|
|
|
|
void WindowBasedEdge::doStopApproaching()
|
|
{
|
|
if (!m_cursorPollingConnection) {
|
|
return;
|
|
}
|
|
disconnect(m_cursorPollingConnection);
|
|
m_cursorPollingConnection = QMetaObject::Connection();
|
|
Cursor::self()->stopMousePolling();
|
|
m_approachWindow.map();
|
|
}
|
|
|
|
void WindowBasedEdge::doUpdateBlocking()
|
|
{
|
|
if (!isReserved()) {
|
|
return;
|
|
}
|
|
if (isBlocked()) {
|
|
m_window.unmap();
|
|
m_approachWindow.unmap();
|
|
} else {
|
|
m_window.map();
|
|
m_approachWindow.map();
|
|
}
|
|
}
|
|
|
|
}
|