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

94 lines
2.9 KiB
C
Raw Normal View History

Move RootInfo and WinInfo into an own header and impl file Main motivation for this change is that it's unhandy to have the class definition in workspace.h and client.h while the implementation is in events.cpp although nothing in events.cpp uses it directly. By getting it out of workspace.h we get the header a little bit smaller which should improve compile time given that it's included almost everywhere. In events.cpp the enum usage is changed to NETWinInfo as that's the class where they are defined. RootInfo does no longer hold a workspace pointer. Where it's needed it uses the singleton accessor of Workspace. REVIEW: 110199
2013-04-26 08:41:24 +00:00
/********************************************************************
KWin - the KDE window manager
This file is part of the KDE project.
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>
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_NETINFO_H
#define KWIN_NETINFO_H
#include <KDE/NETRootInfo>
Turn RootInfo into a KWIN_SINGLETON It's not a typical singleton as the ctor is not taking a Workspace* and needs addtional data to be passed to NETRootInfo. All the initialization code is moved to RootInfo::create() and the tear- down code is moved to RootInfo::destroyed(). This includes the support window which used to be a member of Workspace. It's only needed by RootInfo, so there is no need to have the ownership inside Workspace. Instead of using a QWidget we just create a normal window through xcb. It gets destroyed again in the tear-down code after the RootInfo got destroyed. REVIEW: 110238
2013-04-29 10:17:42 +00:00
#include <xcb/xcb.h>
Move RootInfo and WinInfo into an own header and impl file Main motivation for this change is that it's unhandy to have the class definition in workspace.h and client.h while the implementation is in events.cpp although nothing in events.cpp uses it directly. By getting it out of workspace.h we get the header a little bit smaller which should improve compile time given that it's included almost everywhere. In events.cpp the enum usage is changed to NETWinInfo as that's the class where they are defined. RootInfo does no longer hold a workspace pointer. Where it's needed it uses the singleton accessor of Workspace. REVIEW: 110199
2013-04-26 08:41:24 +00:00
namespace KWin
{
class Client;
/**
* NET WM Protocol handler class
*/
class RootInfo : public NETRootInfo
{
private:
typedef KWin::Client Client; // Because of NET::Client
public:
Turn RootInfo into a KWIN_SINGLETON It's not a typical singleton as the ctor is not taking a Workspace* and needs addtional data to be passed to NETRootInfo. All the initialization code is moved to RootInfo::create() and the tear- down code is moved to RootInfo::destroyed(). This includes the support window which used to be a member of Workspace. It's only needed by RootInfo, so there is no need to have the ownership inside Workspace. Instead of using a QWidget we just create a normal window through xcb. It gets destroyed again in the tear-down code after the RootInfo got destroyed. REVIEW: 110238
2013-04-29 10:17:42 +00:00
static RootInfo *create();
static void destroy();
Move RootInfo and WinInfo into an own header and impl file Main motivation for this change is that it's unhandy to have the class definition in workspace.h and client.h while the implementation is in events.cpp although nothing in events.cpp uses it directly. By getting it out of workspace.h we get the header a little bit smaller which should improve compile time given that it's included almost everywhere. In events.cpp the enum usage is changed to NETWinInfo as that's the class where they are defined. RootInfo does no longer hold a workspace pointer. Where it's needed it uses the singleton accessor of Workspace. REVIEW: 110199
2013-04-26 08:41:24 +00:00
protected:
Add override to methods in (Root|Win)Info The methods in the parent class might need to be changed (XLib data types). So getting a compile error after the change would be nice.
2013-09-17 06:17:40 +00:00
virtual void changeNumberOfDesktops(int n) override;
virtual void changeCurrentDesktop(int d) override;
virtual void changeActiveWindow(Window w, NET::RequestSource src, Time timestamp, Window active_window) override;
virtual void closeWindow(Window w) override;
virtual void moveResize(Window w, int x_root, int y_root, unsigned long direction) override;
virtual void moveResizeWindow(Window w, int flags, int x, int y, int width, int height) override;
virtual void gotPing(Window w, Time timestamp) override;
virtual void restackWindow(Window w, RequestSource source, Window above, int detail, Time timestamp) override;
virtual void gotTakeActivity(Window w, Time timestamp, long flags) override;
virtual void changeShowingDesktop(bool showing) override;
Turn RootInfo into a KWIN_SINGLETON It's not a typical singleton as the ctor is not taking a Workspace* and needs addtional data to be passed to NETRootInfo. All the initialization code is moved to RootInfo::create() and the tear- down code is moved to RootInfo::destroyed(). This includes the support window which used to be a member of Workspace. It's only needed by RootInfo, so there is no need to have the ownership inside Workspace. Instead of using a QWidget we just create a normal window through xcb. It gets destroyed again in the tear-down code after the RootInfo got destroyed. REVIEW: 110238
2013-04-29 10:17:42 +00:00
private:
RootInfo(xcb_window_t w, const char* name, unsigned long pr[],
int pr_num, int scr = -1);
static RootInfo *s_self;
friend RootInfo *rootInfo();
Move RootInfo and WinInfo into an own header and impl file Main motivation for this change is that it's unhandy to have the class definition in workspace.h and client.h while the implementation is in events.cpp although nothing in events.cpp uses it directly. By getting it out of workspace.h we get the header a little bit smaller which should improve compile time given that it's included almost everywhere. In events.cpp the enum usage is changed to NETWinInfo as that's the class where they are defined. RootInfo does no longer hold a workspace pointer. Where it's needed it uses the singleton accessor of Workspace. REVIEW: 110199
2013-04-26 08:41:24 +00:00
};
Turn RootInfo into a KWIN_SINGLETON It's not a typical singleton as the ctor is not taking a Workspace* and needs addtional data to be passed to NETRootInfo. All the initialization code is moved to RootInfo::create() and the tear- down code is moved to RootInfo::destroyed(). This includes the support window which used to be a member of Workspace. It's only needed by RootInfo, so there is no need to have the ownership inside Workspace. Instead of using a QWidget we just create a normal window through xcb. It gets destroyed again in the tear-down code after the RootInfo got destroyed. REVIEW: 110238
2013-04-29 10:17:42 +00:00
inline RootInfo *rootInfo()
{
return RootInfo::s_self;
}
Move RootInfo and WinInfo into an own header and impl file Main motivation for this change is that it's unhandy to have the class definition in workspace.h and client.h while the implementation is in events.cpp although nothing in events.cpp uses it directly. By getting it out of workspace.h we get the header a little bit smaller which should improve compile time given that it's included almost everywhere. In events.cpp the enum usage is changed to NETWinInfo as that's the class where they are defined. RootInfo does no longer hold a workspace pointer. Where it's needed it uses the singleton accessor of Workspace. REVIEW: 110199
2013-04-26 08:41:24 +00:00
/**
* NET WM Protocol handler class
*/
class WinInfo : public NETWinInfo2
{
private:
typedef KWin::Client Client; // Because of NET::Client
public:
WinInfo(Client* c, Display * display, Window window,
Window rwin, const unsigned long pr[], int pr_size);
Add override to methods in (Root|Win)Info The methods in the parent class might need to be changed (XLib data types). So getting a compile error after the change would be nice.
2013-09-17 06:17:40 +00:00
virtual void changeDesktop(int desktop) override;
virtual void changeFullscreenMonitors(NETFullscreenMonitors topology) override;
virtual void changeState(unsigned long state, unsigned long mask) override;
Move RootInfo and WinInfo into an own header and impl file Main motivation for this change is that it's unhandy to have the class definition in workspace.h and client.h while the implementation is in events.cpp although nothing in events.cpp uses it directly. By getting it out of workspace.h we get the header a little bit smaller which should improve compile time given that it's included almost everywhere. In events.cpp the enum usage is changed to NETWinInfo as that's the class where they are defined. RootInfo does no longer hold a workspace pointer. Where it's needed it uses the singleton accessor of Workspace. REVIEW: 110199
2013-04-26 08:41:24 +00:00
void disable();
private:
Client * m_client;
};
} // KWin
#endif
Reference in a new issue Copy permalink