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

Drop KWin::Extensions from kwinglobals

Browse source 
Replaced by KWin::Xcb::Extensions. This removes the remaining
Xlib extension dependencies form kwineffects.
This commit is contained in:
Martin Gräßlin 2013-09-05 09:14:09 +02:00
parent 211682ab67
commit 8a78e71c97
4 changed files with 0 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libkwineffects/CMakeLists.txt
View file

@ -2,7 +2,6 @@
### effects lib ###
set(kwin_EFFECTSLIB_SRCS
kwinglobals.cpp
kwineffects.cpp
anidata.cpp
kwinanimationeffect.cpp
@ -21,9 +20,6 @@ set(kwineffects_KDE_LIBS
set(kwineffects_XLIB_LIBS
${X11_X11_LIB}
${X11_Xext_LIB}
${X11_Xrandr_LIB}
${X11_Xdamage_LIB}
)
set(kwineffects_XCB_LIBS

57
libkwineffects/kwinglobals.cpp
View file

@ -1,57 +0,0 @@
/********************************************************************
KWin - the KDE window manager
This file is part of the KDE project.
Copyright (C) 2006 Lubos Lunak <l.lunak@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/>.
*********************************************************************/
#include "kwinglobals.h"
#include <config-X11.h>
#include <assert.h>
#include <X11/Xlib.h>
#include <X11/extensions/shape.h>
#include <X11/extensions/Xdamage.h>
#include <X11/extensions/Xrandr.h>
#ifdef HAVE_XSYNC
#include <X11/extensions/sync.h>
#endif
namespace KWin
{
void Extensions::init()
{
static bool initPerformed = false;
if (initPerformed) {
return;
}
// it seems like no events are delivered to XLib when the extension is not queried
int event_base, error_base;
XShapeQueryExtension(display(), &event_base, &error_base);
XRRQueryExtension(display(), &event_base, &error_base);
XDamageQueryExtension(display(), &event_base, &error_base);
#ifdef HAVE_XSYNC
XSyncQueryExtension(display(), &event_base, &error_base);
#endif
initPerformed = true;
}
} // namespace

8
libkwineffects/kwinglobals.h
View file

@ -183,14 +183,6 @@ KWIN_EXPORT int displayHeight()
return screen ? screen->height_in_pixels : 0;
}
/** @internal */
// TODO: QT5: remove
class KWIN_EXPORT Extensions
{
public:
static void init();
};
} // namespace
#define KWIN_SINGLETON_VARIABLE(ClassName, variableName) \

1
workspace.cpp
View file

@ -172,7 +172,6 @@ Workspace::Workspace(bool restore)
_self = this;
// first initialize the extensions
Extensions::init();
Xcb::Extensions::self();
// start the cursor support