2545162f87
Summary: So far TabBox used highlight windows by passing window ids around through an X property. This doesn't work on Wayland where we don't have window ids for our TabBox and the Wayland windows. This change introduces a new Effect::Feature for HighlightWindows which the HighlightWindowsEffect provides. The EffectsHandlerImpl has a new method to highlightWindows which it delegates to that effect if it is loaded by invoking a new performFeature method. The TabBoxHandler now passes the highlighting to the effects system instead of updating the x11 property. Thus this works on Wayland and at the same time improves the X11 side by no longer having to go through the property protocol. Test Plan: Verified that Alt+Tab highlights the windows on Wayland correctly. Reviewers: #kwin, #plasma_on_wayland Subscribers: plasma-devel, kwin Tags: #plasma_on_wayland, #kwin Differential Revision: https://phabricator.kde.org/D2630
109 lines
3.8 KiB
C++
109 lines
3.8 KiB
C++
/********************************************************************
|
|
KWin - the KDE window manager
|
|
This file is part of the KDE project.
|
|
|
|
Copyright (C) 2012 Martin Gräßlin <mgraesslin@kde.org>
|
|
|
|
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/>.
|
|
*********************************************************************/
|
|
#ifndef KWIN_MOCK_TABBOX_HANDLER_H
|
|
#define KWIN_MOCK_TABBOX_HANDLER_H
|
|
|
|
#include "../../tabbox/tabboxhandler.h"
|
|
namespace KWin
|
|
{
|
|
class MockTabBoxHandler : public TabBox::TabBoxHandler
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
MockTabBoxHandler(QObject *parent = nullptr);
|
|
virtual ~MockTabBoxHandler();
|
|
virtual void activateAndClose() {
|
|
}
|
|
virtual QWeakPointer< TabBox::TabBoxClient > activeClient() const;
|
|
void setActiveClient(const QWeakPointer<TabBox::TabBoxClient> &client);
|
|
virtual int activeScreen() const {
|
|
return 0;
|
|
}
|
|
virtual QWeakPointer< TabBox::TabBoxClient > clientToAddToList(TabBox::TabBoxClient *client, int desktop) const;
|
|
virtual int currentDesktop() const {
|
|
return 1;
|
|
}
|
|
virtual QWeakPointer< TabBox::TabBoxClient > desktopClient() const {
|
|
return QWeakPointer<TabBox::TabBoxClient>();
|
|
}
|
|
virtual QString desktopName(int desktop) const {
|
|
Q_UNUSED(desktop)
|
|
return "desktop 1";
|
|
}
|
|
virtual QString desktopName(TabBox::TabBoxClient *client) const {
|
|
Q_UNUSED(client)
|
|
return "desktop";
|
|
}
|
|
virtual void elevateClient(TabBox::TabBoxClient *c, QWindow *tabbox, bool elevate) const {
|
|
Q_UNUSED(c)
|
|
Q_UNUSED(tabbox)
|
|
Q_UNUSED(elevate)
|
|
}
|
|
virtual void shadeClient(TabBox::TabBoxClient *c, bool b) const {
|
|
Q_UNUSED(c)
|
|
Q_UNUSED(b)
|
|
}
|
|
virtual void hideOutline() {
|
|
}
|
|
virtual QWeakPointer< TabBox::TabBoxClient > nextClientFocusChain(TabBox::TabBoxClient *client) const;
|
|
virtual QWeakPointer<TabBox::TabBoxClient> firstClientFocusChain() const;
|
|
virtual bool isInFocusChain (TabBox::TabBoxClient* client) const;
|
|
virtual int nextDesktopFocusChain(int desktop) const {
|
|
Q_UNUSED(desktop)
|
|
return 1;
|
|
}
|
|
virtual int numberOfDesktops() const {
|
|
return 1;
|
|
}
|
|
virtual QVector< xcb_window_t > outlineWindowIds() const {
|
|
return QVector<xcb_window_t>();
|
|
}
|
|
virtual bool isKWinCompositing() const {
|
|
return false;
|
|
}
|
|
virtual void raiseClient(TabBox::TabBoxClient *c) const {
|
|
Q_UNUSED(c)
|
|
}
|
|
virtual void restack(TabBox::TabBoxClient *c, TabBox::TabBoxClient *under) {
|
|
Q_UNUSED(c)
|
|
Q_UNUSED(under)
|
|
}
|
|
virtual void showOutline(const QRect &outline) {
|
|
Q_UNUSED(outline)
|
|
}
|
|
virtual TabBox::TabBoxClientList stackingOrder() const {
|
|
return TabBox::TabBoxClientList();
|
|
}
|
|
virtual void grabbedKeyEvent(QKeyEvent *event) const;
|
|
|
|
void highlightWindows(TabBox::TabBoxClient *window = nullptr, QWindow *controller = nullptr) override {
|
|
Q_UNUSED(window)
|
|
Q_UNUSED(controller)
|
|
}
|
|
|
|
// mock methods
|
|
QWeakPointer<TabBox::TabBoxClient> createMockWindow(const QString &caption, WId id);
|
|
void closeWindow(TabBox::TabBoxClient *client);
|
|
private:
|
|
QList< QSharedPointer<TabBox::TabBoxClient> > m_windows;
|
|
QWeakPointer<TabBox::TabBoxClient> m_activeClient;
|
|
};
|
|
} // namespace KWin
|
|
#endif
|