Remove scene basic
Was never used and it is unlikely that it would work at all after all the changes over the last years.
This commit is contained in:
Martin Gräßlin
parent
70828a3ee4
commit
f5b93b0159
4 changed files with 0 additions and 162 deletions
|
|
@ -105,7 +105,6 @@ set(kwin_KDEINIT_SRCS
|
||||||
toplevel.cpp
|
toplevel.cpp
|
||||||
unmanaged.cpp
|
unmanaged.cpp
|
||||||
scene.cpp
|
scene.cpp
|
||||||
scene_basic.cpp
|
|
||||||
scene_xrender.cpp
|
scene_xrender.cpp
|
||||||
scene_opengl.cpp
|
scene_opengl.cpp
|
||||||
thumbnailitem.cpp
|
thumbnailitem.cpp
|
||||||
|
|
|
||||||
|
|
@ -49,7 +49,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#include "effects.h"
|
#include "effects.h"
|
||||||
#include "overlaywindow.h"
|
#include "overlaywindow.h"
|
||||||
#include "scene.h"
|
#include "scene.h"
|
||||||
#include "scene_basic.h"
|
|
||||||
#include "scene_xrender.h"
|
#include "scene_xrender.h"
|
||||||
#include "scene_opengl.h"
|
#include "scene_opengl.h"
|
||||||
#include "shadow.h"
|
#include "shadow.h"
|
||||||
|
|
@ -101,10 +100,6 @@ void Workspace::setupCompositing()
|
||||||
cm_selection->claim(true); // force claiming
|
cm_selection->claim(true); // force claiming
|
||||||
|
|
||||||
switch(options->compositingMode) {
|
switch(options->compositingMode) {
|
||||||
/*case 'B':
|
|
||||||
kDebug( 1212 ) << "X compositing";
|
|
||||||
scene = new SceneBasic( this );
|
|
||||||
break; // don't fall through (this is a testing one) */
|
|
||||||
case OpenGLCompositing: {
|
case OpenGLCompositing: {
|
||||||
kDebug(1212) << "Initializing OpenGL compositing";
|
kDebug(1212) << "Initializing OpenGL compositing";
|
||||||
|
|
||||||
|
|
|
||||||
105
scene_basic.cpp
105
scene_basic.cpp
|
|
@ -1,105 +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/>.
|
|
||||||
*********************************************************************/
|
|
||||||
|
|
||||||
/*
|
|
||||||
This is very simple compositing code using only plain X. It doesn't use any effects
|
|
||||||
or anything like that, it merely draws everything as it would be visible without
|
|
||||||
compositing. It was the first compositing code in KWin and is usable only for testing
|
|
||||||
and as the very simple "this is how it works".
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "scene_basic.h"
|
|
||||||
|
|
||||||
#include "utils.h"
|
|
||||||
#include "client.h"
|
|
||||||
|
|
||||||
namespace KWin
|
|
||||||
{
|
|
||||||
|
|
||||||
SceneBasic::SceneBasic(Workspace* ws)
|
|
||||||
: Scene(ws)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
SceneBasic::~SceneBasic()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void SceneBasic::paint(QRegion, ToplevelList windows)
|
|
||||||
{
|
|
||||||
QTime t = QTime::currentTime();
|
|
||||||
Pixmap composite_pixmap = XCreatePixmap(display(), rootWindow(), displayWidth(), displayHeight(), DefaultDepth(display(), DefaultScreen(display())));
|
|
||||||
XGCValues val;
|
|
||||||
val.foreground = WhitePixel(display(), DefaultScreen(display()));
|
|
||||||
val.subwindow_mode = IncludeInferiors;
|
|
||||||
GC gc = XCreateGC(display(), composite_pixmap, GCForeground | GCSubwindowMode, &val);
|
|
||||||
XFillRectangle(display(), composite_pixmap, gc, 0, 0, displayWidth(), displayHeight());
|
|
||||||
for (ToplevelList::ConstIterator it = windows.constBegin();
|
|
||||||
it != windows.constEnd();
|
|
||||||
++it) {
|
|
||||||
QRect r = (*it)->geometry().intersected(QRect(0, 0, displayWidth(), displayHeight()));
|
|
||||||
if (!r.isEmpty()) {
|
|
||||||
Pixmap pix = (*it)->windowPixmap();
|
|
||||||
if (pix == None)
|
|
||||||
continue;
|
|
||||||
XCopyArea(display(), pix, composite_pixmap, gc,
|
|
||||||
qMax(0, -(*it)->x()), qMax(0, -(*it)->y()), r.width(), r.height(), r.x(), r.y());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
lastRenderTime = t.elapsed();
|
|
||||||
XCopyArea(display(), composite_pixmap, rootWindow(), gc, 0, 0, displayWidth(), displayHeight(), 0, 0);
|
|
||||||
XFreeGC(display(), gc);
|
|
||||||
XFreePixmap(display(), composite_pixmap);
|
|
||||||
XFlush(display());
|
|
||||||
}
|
|
||||||
|
|
||||||
bool SceneBasic::initFailed() const
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// These functions are not used at all, SceneBasic
|
|
||||||
// is not using inherited functionality.
|
|
||||||
|
|
||||||
void SceneBasic::paintBackground(QRegion)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void SceneBasic::windowGeometryShapeChanged(Toplevel*)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void SceneBasic::windowOpacityChanged(Toplevel*)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void SceneBasic::windowAdded(Toplevel*)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void SceneBasic::windowClosed(Toplevel*, Deleted*)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void SceneBasic::windowDeleted(Deleted*)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace
|
|
||||||
|
|
@ -1,51 +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/>.
|
|
||||||
*********************************************************************/
|
|
||||||
|
|
||||||
#ifndef KWIN_SCENE_BASIC_H
|
|
||||||
#define KWIN_SCENE_BASIC_H
|
|
||||||
|
|
||||||
#include "scene.h"
|
|
||||||
|
|
||||||
namespace KWin
|
|
||||||
{
|
|
||||||
|
|
||||||
class SceneBasic
|
|
||||||
: public Scene
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
SceneBasic(Workspace* ws);
|
|
||||||
virtual ~SceneBasic();
|
|
||||||
virtual bool initFailed() const;
|
|
||||||
virtual CompositingType compositingType() const {
|
|
||||||
return NoCompositing;
|
|
||||||
}
|
|
||||||
virtual void paint(QRegion damage, ToplevelList windows);
|
|
||||||
protected:
|
|
||||||
virtual void paintBackground(QRegion region);
|
|
||||||
virtual void windowGeometryShapeChanged(Toplevel*);
|
|
||||||
virtual void windowOpacityChanged(Toplevel*);
|
|
||||||
virtual void windowAdded(Toplevel*);
|
|
||||||
virtual void windowClosed(Toplevel*, Deleted*);
|
|
||||||
virtual void windowDeleted(Deleted*);
|
|
||||||
};
|
|
||||||
|
|
||||||
} // namespace
|
|
||||||
|
|
||||||
#endif
|
|
||||||
Loading…
Reference in a new issue