cc862fa674
Right now KWin moves minimized windows to the end of the task switcher's ordering. However this is a rather confusing and undocumented behavior that explicitly overrides the user's chosen sort ordering, be it "Recently used" or "Stacking order". This makes it a hidden magic behavior of the type that is at risk of being more annoying than useful. This commit removes the special handling and lets minimized windows live in the appropriate order in the task switcher.
259 lines
7.6 KiB
C++
259 lines
7.6 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/>.
|
|
*********************************************************************/
|
|
#include "focuschain.h"
|
|
#include "abstract_client.h"
|
|
#include "screens.h"
|
|
|
|
namespace KWin
|
|
{
|
|
|
|
KWIN_SINGLETON_FACTORY_VARIABLE(FocusChain, s_manager)
|
|
|
|
FocusChain::FocusChain(QObject *parent)
|
|
: QObject(parent)
|
|
, m_separateScreenFocus(false)
|
|
, m_activeClient(nullptr)
|
|
, m_currentDesktop(0)
|
|
{
|
|
}
|
|
|
|
FocusChain::~FocusChain()
|
|
{
|
|
s_manager = nullptr;
|
|
}
|
|
|
|
void FocusChain::remove(AbstractClient *client)
|
|
{
|
|
for (auto it = m_desktopFocusChains.begin();
|
|
it != m_desktopFocusChains.end();
|
|
++it) {
|
|
it.value().removeAll(client);
|
|
}
|
|
m_mostRecentlyUsed.removeAll(client);
|
|
}
|
|
|
|
void FocusChain::resize(uint previousSize, uint newSize)
|
|
{
|
|
for (uint i = previousSize + 1; i <= newSize; ++i) {
|
|
m_desktopFocusChains.insert(i, Chain());
|
|
}
|
|
for (uint i = previousSize; i > newSize; --i) {
|
|
m_desktopFocusChains.remove(i);
|
|
}
|
|
}
|
|
|
|
AbstractClient *FocusChain::getForActivation(uint desktop) const
|
|
{
|
|
return getForActivation(desktop, screens()->current());
|
|
}
|
|
|
|
AbstractClient *FocusChain::getForActivation(uint desktop, int screen) const
|
|
{
|
|
auto it = m_desktopFocusChains.constFind(desktop);
|
|
if (it == m_desktopFocusChains.constEnd()) {
|
|
return nullptr;
|
|
}
|
|
const auto &chain = it.value();
|
|
for (int i = chain.size() - 1; i >= 0; --i) {
|
|
auto tmp = chain.at(i);
|
|
// TODO: move the check into Client
|
|
if (tmp->isShown(false) && tmp->isOnCurrentActivity()
|
|
&& ( !m_separateScreenFocus || tmp->screen() == screen)) {
|
|
return tmp;
|
|
}
|
|
}
|
|
return nullptr;
|
|
}
|
|
|
|
void FocusChain::update(AbstractClient *client, FocusChain::Change change)
|
|
{
|
|
if (!client->wantsTabFocus()) {
|
|
// Doesn't want tab focus, remove
|
|
remove(client);
|
|
return;
|
|
}
|
|
|
|
if (client->isOnAllDesktops()) {
|
|
// Now on all desktops, add it to focus chains it is not already in
|
|
for (auto it = m_desktopFocusChains.begin();
|
|
it != m_desktopFocusChains.end();
|
|
++it) {
|
|
auto &chain = it.value();
|
|
// Making first/last works only on current desktop, don't affect all desktops
|
|
if (it.key() == m_currentDesktop
|
|
&& (change == MakeFirst || change == MakeLast)) {
|
|
if (change == MakeFirst) {
|
|
makeFirstInChain(client, chain);
|
|
} else {
|
|
makeLastInChain(client, chain);
|
|
}
|
|
} else {
|
|
insertClientIntoChain(client, chain);
|
|
}
|
|
}
|
|
} else {
|
|
// Now only on desktop, remove it anywhere else
|
|
for (auto it = m_desktopFocusChains.begin();
|
|
it != m_desktopFocusChains.end();
|
|
++it) {
|
|
auto &chain = it.value();
|
|
if (client->isOnDesktop(it.key())) {
|
|
updateClientInChain(client, change, chain);
|
|
} else {
|
|
chain.removeAll(client);
|
|
}
|
|
}
|
|
}
|
|
|
|
// add for most recently used chain
|
|
updateClientInChain(client, change, m_mostRecentlyUsed);
|
|
}
|
|
|
|
void FocusChain::updateClientInChain(AbstractClient *client, FocusChain::Change change, Chain &chain)
|
|
{
|
|
if (change == MakeFirst) {
|
|
makeFirstInChain(client, chain);
|
|
} else if (change == MakeLast) {
|
|
makeLastInChain(client, chain);
|
|
} else {
|
|
insertClientIntoChain(client, chain);
|
|
}
|
|
}
|
|
|
|
void FocusChain::insertClientIntoChain(AbstractClient *client, Chain &chain)
|
|
{
|
|
if (chain.contains(client)) {
|
|
return;
|
|
}
|
|
if (m_activeClient && m_activeClient != client &&
|
|
!chain.empty() && chain.last() == m_activeClient) {
|
|
// Add it after the active client
|
|
chain.insert(chain.size() - 1, client);
|
|
} else {
|
|
// Otherwise add as the first one
|
|
chain.append(client);
|
|
}
|
|
}
|
|
|
|
void FocusChain::moveAfterClient(AbstractClient *client, AbstractClient *reference)
|
|
{
|
|
if (!client->wantsTabFocus()) {
|
|
return;
|
|
}
|
|
|
|
for (auto it = m_desktopFocusChains.begin();
|
|
it != m_desktopFocusChains.end();
|
|
++it) {
|
|
if (!client->isOnDesktop(it.key())) {
|
|
continue;
|
|
}
|
|
moveAfterClientInChain(client, reference, it.value());
|
|
}
|
|
moveAfterClientInChain(client, reference, m_mostRecentlyUsed);
|
|
}
|
|
|
|
void FocusChain::moveAfterClientInChain(AbstractClient *client, AbstractClient *reference, Chain &chain)
|
|
{
|
|
if (!chain.contains(reference)) {
|
|
return;
|
|
}
|
|
if (AbstractClient::belongToSameApplication(reference, client)) {
|
|
chain.removeAll(client);
|
|
chain.insert(chain.indexOf(reference), client);
|
|
} else {
|
|
chain.removeAll(client);
|
|
for (int i = chain.size() - 1; i >= 0; --i) {
|
|
if (AbstractClient::belongToSameApplication(reference, chain.at(i))) {
|
|
chain.insert(i, client);
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
AbstractClient *FocusChain::firstMostRecentlyUsed() const
|
|
{
|
|
if (m_mostRecentlyUsed.isEmpty()) {
|
|
return nullptr;
|
|
}
|
|
return m_mostRecentlyUsed.first();
|
|
}
|
|
|
|
AbstractClient *FocusChain::nextMostRecentlyUsed(AbstractClient *reference) const
|
|
{
|
|
if (m_mostRecentlyUsed.isEmpty()) {
|
|
return nullptr;
|
|
}
|
|
const int index = m_mostRecentlyUsed.indexOf(reference);
|
|
if (index == -1) {
|
|
return m_mostRecentlyUsed.first();
|
|
}
|
|
if (index == 0) {
|
|
return m_mostRecentlyUsed.last();
|
|
}
|
|
return m_mostRecentlyUsed.at(index - 1);
|
|
}
|
|
|
|
// copied from activation.cpp
|
|
bool FocusChain::isUsableFocusCandidate(AbstractClient *c, AbstractClient *prev) const
|
|
{
|
|
return c != prev &&
|
|
c->isShown(false) && c->isOnCurrentDesktop() && c->isOnCurrentActivity() &&
|
|
(!m_separateScreenFocus || c->isOnScreen(prev ? prev->screen() : screens()->current()));
|
|
}
|
|
|
|
AbstractClient *FocusChain::nextForDesktop(AbstractClient *reference, uint desktop) const
|
|
{
|
|
auto it = m_desktopFocusChains.constFind(desktop);
|
|
if (it == m_desktopFocusChains.constEnd()) {
|
|
return nullptr;
|
|
}
|
|
const auto &chain = it.value();
|
|
for (int i = chain.size() - 1; i >= 0; --i) {
|
|
auto client = chain.at(i);
|
|
if (isUsableFocusCandidate(client, reference)) {
|
|
return client;
|
|
}
|
|
}
|
|
return nullptr;
|
|
}
|
|
|
|
void FocusChain::makeFirstInChain(AbstractClient *client, Chain &chain)
|
|
{
|
|
chain.removeAll(client);
|
|
chain.append(client);
|
|
}
|
|
|
|
void FocusChain::makeLastInChain(AbstractClient *client, Chain &chain)
|
|
{
|
|
chain.removeAll(client);
|
|
chain.prepend(client);
|
|
}
|
|
|
|
bool FocusChain::contains(AbstractClient *client, uint desktop) const
|
|
{
|
|
auto it = m_desktopFocusChains.constFind(desktop);
|
|
if (it == m_desktopFocusChains.constEnd()) {
|
|
return false;
|
|
}
|
|
return it.value().contains(client);
|
|
}
|
|
|
|
} // namespace
|