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

Port all remaining XDeleteProperty calls to XCB

Browse source
This commit is contained in:
Martin Gräßlin 2013-09-10 09:33:07 +02:00
parent e3a1cc0b5d
commit 592ea89b01
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
composite.cpp
View file

@ -371,7 +371,7 @@ void Compositor::deleteUnusedSupportProperties()
} }
foreach (const xcb_atom_t &atom, m_unusedSupportProperties) { foreach (const xcb_atom_t &atom, m_unusedSupportProperties) {
// remove property from root window // remove property from root window
XDeleteProperty(QX11Info::display(), rootWindow(), atom); xcb_delete_property(connection(), rootWindow(), atom);
} }
} }

2
effects.cpp
View file

@ -201,7 +201,7 @@ static QByteArray readWindowProperty(Window win, long atom, long type, int forma
static void deleteWindowProperty(Window win, long int atom) static void deleteWindowProperty(Window win, long int atom)
{ {
XDeleteProperty(QX11Info::display(), win, atom); xcb_delete_property(connection(), win, atom);
} }
//--------------------- //---------------------

6
tabbox/tabboxhandler.cpp
View file

@ -20,6 +20,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// own // own
#include "tabboxhandler.h" #include "tabboxhandler.h"
#include <kwinglobals.h>
// tabbox // tabbox
#include "clientmodel.h" #include "clientmodel.h"
#include "declarative.h" #include "declarative.h"
@ -178,9 +179,8 @@ void TabBoxHandlerPrivate::endHighlightWindows(bool abort)
lastRaisedClient = 0; lastRaisedClient = 0;
lastRaisedClientSucc = 0; lastRaisedClientSucc = 0;
// highlight windows // highlight windows
Display *dpy = QX11Info::display(); Atom atom = XInternAtom(display(), "_KDE_WINDOW_HIGHLIGHT", False);
Atom atom = XInternAtom(dpy, "_KDE_WINDOW_HIGHLIGHT", False); xcb_delete_property(connection(), config.isShowTabBox() && m_declarativeView ? m_declarativeView->winId() : rootWindow(), atom);
XDeleteProperty(dpy, config.isShowTabBox() && m_declarativeView ? m_declarativeView->winId() : QX11Info::appRootWindow(), atom);
} }
/*********************************************** /***********************************************

2
workspace.cpp
View file

@ -459,7 +459,7 @@ Workspace::~Workspace()
} }
for (UnmanagedList::iterator it = unmanaged.begin(), end = unmanaged.end(); it != end; ++it) for (UnmanagedList::iterator it = unmanaged.begin(), end = unmanaged.end(); it != end; ++it)
(*it)->release(true); (*it)->release(true);
XDeleteProperty(display(), rootWindow(), atoms->kwin_running); xcb_delete_property(connection(), rootWindow(), atoms->kwin_running);
delete RuleBook::self(); delete RuleBook::self();
KSharedConfig::openConfig()->sync(); KSharedConfig::openConfig()->sync();