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

Adjust kde-workspace to changes in NETWMClient

Browse source 
ctor changed to take NET::Properties and NET::Properties2.
This commit is contained in:
Martin Gräßlin 2014-03-04 10:48:23 +01:00
parent f74df28450
commit b0c0e81661
6 changed files with 10 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
client.cpp
View file

@ -2258,8 +2258,7 @@ void Client::updateCursor()
void Client::updateCompositeBlocking(bool readProperty) void Client::updateCompositeBlocking(bool readProperty)
{ {
if (readProperty) { if (readProperty) {
const unsigned long properties[2] = {0, NET::WM2BlockCompositing}; NETWinInfo i(connection(), window(), rootWindow(), 0, NET::WM2BlockCompositing);
NETWinInfo i(connection(), window(), rootWindow(), properties, 2);
setBlockingCompositing(i.isBlockingCompositing()); setBlockingCompositing(i.isBlockingCompositing());
} }
else else

3
group.cpp
View file

@ -204,9 +204,8 @@ Group::Group(Window leader_P)
{ {
if (leader_P != None) { if (leader_P != None) {
leader_client = workspace()->findClient(WindowMatchPredicate(leader_P)); leader_client = workspace()->findClient(WindowMatchPredicate(leader_P));
unsigned long properties[ 2 ] = { 0, NET::WM2StartupId };
leader_info = new NETWinInfo(connection(), leader_P, rootWindow(), leader_info = new NETWinInfo(connection(), leader_P, rootWindow(),
properties, 2); 0, NET::WM2StartupId);
} }
effect_group = new EffectWindowGroupImpl(this); effect_group = new EffectWindowGroupImpl(this);
workspace()->addGroup(this); workspace()->addGroup(this);

7
manage.cpp
View file

@ -80,8 +80,7 @@ bool Client::manage(xcb_window_t w, bool isMapped)
if (isMapped) if (isMapped)
init_minimize = false; // If it's already mapped, ignore hint init_minimize = false; // If it's already mapped, ignore hint
unsigned long properties[2]; const NET::Properties properties =
properties[WinInfo::PROTOCOLS] =
NET::WMDesktop | NET::WMDesktop |
NET::WMState | NET::WMState |
NET::WMWindowType | NET::WMWindowType |
@ -91,7 +90,7 @@ bool Client::manage(xcb_window_t w, bool isMapped)
NET::WMIcon | NET::WMIcon |
NET::WMPid | NET::WMPid |
NET::WMIconName; NET::WMIconName;
properties[WinInfo::PROTOCOLS2] = const NET::Properties2 properties2 =
NET::WM2UserTime | NET::WM2UserTime |
NET::WM2StartupId | NET::WM2StartupId |
NET::WM2ExtendedStrut | NET::WM2ExtendedStrut |
@ -99,7 +98,7 @@ bool Client::manage(xcb_window_t w, bool isMapped)
NET::WM2FullscreenMonitors | NET::WM2FullscreenMonitors |
NET::WM2FrameOverlap; NET::WM2FrameOverlap;
info = new WinInfo(this, m_client, rootWindow(), properties, 2); info = new WinInfo(this, m_client, rootWindow(), properties, properties2);
m_colormap = attr.colormap; m_colormap = attr.colormap;

4
netinfo.cpp
View file

@ -246,8 +246,8 @@ void RootInfo::changeShowingDesktop(bool showing)
// **************************************** // ****************************************
WinInfo::WinInfo(Client * c, xcb_window_t window, WinInfo::WinInfo(Client * c, xcb_window_t window,
xcb_window_t rwin, const unsigned long pr[], int pr_size) xcb_window_t rwin, NET::Properties properties, NET::Properties2 properties2)
: NETWinInfo(connection(), window, rwin, pr, pr_size, NET::WindowManager), m_client(c) : NETWinInfo(connection(), window, rwin, properties, properties2, NET::WindowManager), m_client(c)
{ {
} }

2
netinfo.h
View file

@ -78,7 +78,7 @@ private:
public: public:
WinInfo(Client* c, xcb_window_t window, WinInfo(Client* c, xcb_window_t window,
xcb_window_t rwin, const unsigned long pr[], int pr_size); xcb_window_t rwin, NET::Properties properties, NET::Properties2 properties2);
virtual void changeDesktop(int desktop) override; virtual void changeDesktop(int desktop) override;
virtual void changeFullscreenMonitors(NETFullscreenMonitors topology) override; virtual void changeFullscreenMonitors(NETFullscreenMonitors topology) override;
virtual void changeState(NET::States state, NET::States mask) override; virtual void changeState(NET::States state, NET::States mask) override;

9
unmanaged.cpp
View file

@ -63,13 +63,8 @@ bool Unmanaged::track(Window w)
checkScreen(); checkScreen();
vis = attr.visual; vis = attr.visual;
bit_depth = attr.depth; bit_depth = attr.depth;
unsigned long properties[ 2 ]; info = new NETWinInfo(connection(), w, rootWindow(),
properties[ NETWinInfo::PROTOCOLS ] = NET::WMWindowType | NET::WMPid, NET::WM2Opacity);
NET::WMWindowType |
NET::WMPid;
properties[ NETWinInfo::PROTOCOLS2 ] =
NET::WM2Opacity;
info = new NETWinInfo(connection(), w, rootWindow(), properties, 2);
getResourceClass(); getResourceClass();
getWindowRole(); getWindowRole();
getWmClientLeader(); getWmClientLeader();