5cd223f051
Most windows use the hostname in WM_CLIENT_MACHINE, but there are windows using the FQDN (for example libreoffice). So instead of "foo" it is "foo.local.net" or similar. The logic so far has been unable to properly determine whether windows with FQDN are on the local system. In order to solve this problem the handling is split out into an own class which stores the information of hostname and whether it is a local machine. This is to not query multiple times. To determine whether the Client is on the local system getaddrinfo is used for the own hostname and the FQDN provided in WM_CLIENT_MACHINE. If one of the queried names matches, we know that it is on the local machine. The old logic to compare the hostname is still used and getaddrinfo is only a fallback in case hostname does not match. The problem with getaddrinfo is, that it accesses the network and by that could block. To circumvent this problem the calls are moved into threads by using QtConcurrent::run. Obviously this brings disadvantages. When trying to resolve whether a Client is on the local machine and a FQDN is used, the information is initially wrong. The new ClientMachine class emits a signal when the information that the system is local becomes available, but for some things this is just too late: * window rules are already gathered * Session Management has already taken place In both cases this is an acceptable loss. For window rules it just needs a proper matching of the machine in case of localhost (remote hosts are not affected). And the case of session management is very academic as it is unlikely that a restoring session contains remote windows. BUG: 308391 FIXED-IN: 4.11 REVIEW: 108235
117 lines
2.6 KiB
C++
117 lines
2.6 KiB
C++
/********************************************************************
|
|
KWin - the KDE window manager
|
|
This file is part of the KDE project.
|
|
|
|
Copyright (C) 2013 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_CLIENT_MACHINE_H
|
|
#define KWIN_CLIENT_MACHINE_H
|
|
|
|
#include <QObject>
|
|
#include <xcb/xcb.h>
|
|
|
|
// forward declaration
|
|
struct addrinfo;
|
|
template <typename T>
|
|
class QFutureWatcher;
|
|
|
|
namespace KWin {
|
|
|
|
class GetAddrInfo : public QObject
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
explicit GetAddrInfo(const QByteArray &hostName, QObject *parent = NULL);
|
|
virtual ~GetAddrInfo();
|
|
|
|
void resolve();
|
|
|
|
Q_SIGNALS:
|
|
void local();
|
|
|
|
private Q_SLOTS:
|
|
void slotResolved();
|
|
void slotOwnAddressResolved();
|
|
|
|
private:
|
|
void compare();
|
|
bool resolved(QFutureWatcher<int> *watcher);
|
|
bool m_resolving;
|
|
bool m_resolved;
|
|
bool m_ownResolved;
|
|
QByteArray m_hostName;
|
|
addrinfo *m_addressHints;
|
|
addrinfo *m_address;
|
|
addrinfo *m_ownAddress;
|
|
QFutureWatcher<int> *m_watcher;
|
|
QFutureWatcher<int> *m_ownAddressWatcher;
|
|
};
|
|
|
|
class ClientMachine : public QObject
|
|
{
|
|
Q_OBJECT
|
|
public:
|
|
explicit ClientMachine(QObject *parent = NULL);
|
|
virtual ~ClientMachine();
|
|
|
|
void resolve(xcb_window_t window, xcb_window_t clientLeader);
|
|
const QByteArray &hostName() const;
|
|
bool isLocal() const;
|
|
static QByteArray localhost();
|
|
bool isResolving() const;
|
|
|
|
Q_SIGNALS:
|
|
void localhostChanged();
|
|
|
|
private Q_SLOTS:
|
|
void setLocal();
|
|
void resolveFinished();
|
|
|
|
private:
|
|
void checkForLocalhost();
|
|
QByteArray m_hostName;
|
|
bool m_localhost;
|
|
bool m_resolved;
|
|
bool m_resolving;
|
|
};
|
|
|
|
inline
|
|
bool ClientMachine::isLocal() const
|
|
{
|
|
return m_localhost;
|
|
}
|
|
|
|
inline
|
|
const QByteArray &ClientMachine::hostName() const
|
|
{
|
|
return m_hostName;
|
|
}
|
|
|
|
inline
|
|
QByteArray ClientMachine::localhost()
|
|
{
|
|
return "localhost";
|
|
}
|
|
|
|
inline
|
|
bool ClientMachine::isResolving() const
|
|
{
|
|
return m_resolving;
|
|
}
|
|
|
|
} // namespace
|
|
|
|
#endif
|