Katana_mirror/kde-workspace
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-workspace.git synced 2025-02-23 18:32:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kwin: adjust to NETWinInfo changes

Browse source
This commit is contained in:
Ivailo Monev 2015-08-20 04:39:20 +03:00
parent 3b69a10bad
commit d94de5707e
9 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kwin/client.cpp
View file

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

2
kwin/composite.cpp
View file

@ -319,7 +319,7 @@ void Compositor::finish()
++it) { ++it) {
// forward all opacity values to the frame in case there'll be other CM running // forward all opacity values to the frame in case there'll be other CM running
if ((*it)->opacity() != 1.0) { if ((*it)->opacity() != 1.0) {
NETWinInfo2 i(display(), (*it)->frameId(), rootWindow(), 0); NETWinInfo i(display(), (*it)->frameId(), rootWindow(), 0);
i.setOpacity(static_cast< unsigned long >((*it)->opacity() * 0xffffffff)); i.setOpacity(static_cast< unsigned long >((*it)->opacity() * 0xffffffff));
} }
} }

2
kwin/events.cpp
View file

@ -437,7 +437,7 @@ bool Client::windowEvent(XEvent* e)
emit opacityChanged(this, old_opacity); emit opacityChanged(this, old_opacity);
} else { } else {
// forward to the frame if there's possibly another compositing manager running // forward to the frame if there's possibly another compositing manager running
NETWinInfo2 i(display(), frameId(), rootWindow(), 0); NETWinInfo i(display(), frameId(), rootWindow(), 0);
i.setOpacity(info->opacity()); i.setOpacity(info->opacity());
} }
} }

2
kwin/group.cpp
View file

@ -203,7 +203,7 @@ 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 }; unsigned long properties[ 2 ] = { 0, NET::WM2StartupId };
leader_info = new NETWinInfo2(display(), leader_P, rootWindow(), leader_info = new NETWinInfo(display(), leader_P, rootWindow(),
properties, 2); properties, 2);
} }
effect_group = new EffectWindowGroupImpl(this); effect_group = new EffectWindowGroupImpl(this);

2
kwin/group.h
View file

@ -60,7 +60,7 @@ private:
ClientList _members; ClientList _members;
Client* leader_client; Client* leader_client;
Window leader_wid; Window leader_wid;
NETWinInfo2* leader_info; NETWinInfo* leader_info;
Time user_time; Time user_time;
int refcount; int refcount;
EffectWindowGroupImpl* effect_group; EffectWindowGroupImpl* effect_group;

2
kwin/netinfo.cpp
View file

@ -248,7 +248,7 @@ void RootInfo::changeShowingDesktop(bool showing)
WinInfo::WinInfo(Client * c, Display * display, Window window, WinInfo::WinInfo(Client * c, Display * display, Window window,
Window rwin, const unsigned long pr[], int pr_size) Window rwin, const unsigned long pr[], int pr_size)
: NETWinInfo2(display, window, rwin, pr, pr_size, NET::WindowManager), m_client(c) : NETWinInfo(display, window, rwin, pr, pr_size, NET::WindowManager), m_client(c)
{ {
} }

2
kwin/netinfo.h
View file

@ -71,7 +71,7 @@ inline RootInfo *rootInfo()
/** /**
* NET WM Protocol handler class * NET WM Protocol handler class
*/ */
class WinInfo : public NETWinInfo2 class WinInfo : public NETWinInfo
{ {
private: private:
typedef KWin::Client Client; // Because of NET::Client typedef KWin::Client Client; // Because of NET::Client

2
kwin/toplevel.h
View file

@ -381,7 +381,7 @@ protected:
QRect geom; QRect geom;
Visual* vis; Visual* vis;
int bit_depth; int bit_depth;
NETWinInfo2* info; NETWinInfo* info;
bool ready_for_painting; bool ready_for_painting;
QRegion repaints_region; // updating, repaint just requires repaint of that area QRegion repaints_region; // updating, repaint just requires repaint of that area
QRegion layer_repaints_region; QRegion layer_repaints_region;

2
kwin/unmanaged.cpp
View file

@ -71,7 +71,7 @@ bool Unmanaged::track(Window w)
properties[ NETWinInfo::PROTOCOLS2 ] = properties[ NETWinInfo::PROTOCOLS2 ] =
NET::WM2Opacity | NET::WM2Opacity |
0; 0;
info = new NETWinInfo2(display(), w, rootWindow(), properties, 2); info = new NETWinInfo(display(), w, rootWindow(), properties, 2);
getResourceClass(); getResourceClass();
getWindowRole(); getWindowRole();
getWmClientLeader(); getWmClientLeader();