diff --git a/composite.cpp b/composite.cpp
index bc51425a02..907058dc13 100644
--- a/composite.cpp
+++ b/composite.cpp
@@ -17,26 +17,6 @@ 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 .
*********************************************************************/
-
-/*
- Code related to compositing (redirecting windows to pixmaps and tracking
- window damage).
-
- Docs:
-
- XComposite (the protocol, but the function calls map to it):
- http://gitweb.freedesktop.org/?p=xorg/proto/compositeproto.git;a=blob_plain;hb=HEAD;f=compositeproto.txt
-
- XDamage (again the protocol):
- http://gitweb.freedesktop.org/?p=xorg/proto/damageproto.git;a=blob_plain;hb=HEAD;f=damageproto.txt
-
- Paper including basics on compositing, XGL vs AIGLX, XRender vs OpenGL, etc.:
- http://www.vis.uni-stuttgart.de/~hopf/pub/LinuxTag2007_compiz_NextGenerationDesktop_Paper.pdf
-
- Composite HOWTO from Fredrik:
- http://ktown.kde.org/~fredrik/composite_howto.html
-
-*/
#include "composite.h"
#include "compositingadaptor.h"
@@ -79,10 +59,6 @@ namespace KWin
Compositor *Compositor::s_compositor = NULL;
extern int currentRefreshRate();
-//****************************************
-// Workspace
-//****************************************
-
Compositor *Compositor::createCompositor(QObject *parent)
{
Q_ASSERT(!s_compositor);
diff --git a/scene.cpp b/scene.cpp
index 2e4190afac..685254b4c3 100644
--- a/scene.cpp
+++ b/scene.cpp
@@ -19,9 +19,6 @@ along with this program. If not, see .
*********************************************************************/
/*
- (NOTE: The compositing code is work in progress. As such this design
- documentation may get outdated in some areas.)
-
The base class for compositing, implementing shared functionality
between the OpenGL and XRender backends.
@@ -31,7 +28,7 @@ along with this program. If not, see .
drawing of windows to pixmaps and XDamage extension is used to get informed
about damage (changes) to window contents. This code is mostly in composite.cpp .
- Workspace::performCompositing() starts one painting pass. Painting is done
+ Compositor::performCompositing() starts one painting pass. Painting is done
by painting the screen, which in turn paints every window. Painting can be affected
using effects, which are chained. E.g. painting a screen means that actually
paintScreen() of the first effect is called, which possibly does modifications
diff --git a/scene_opengl.cpp b/scene_opengl.cpp
index 6cf62c668d..147a248965 100644
--- a/scene_opengl.cpp
+++ b/scene_opengl.cpp
@@ -21,51 +21,6 @@ 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 .
*********************************************************************/
-
-
-/*
- This is the OpenGL-based compositing code. It is the primary and most powerful
- compositing backend.
-
-Sources and other compositing managers:
-=======================================
-
-- http://opengl.org
- - documentation
- - OpenGL Redbook (http://opengl.org/documentation/red_book/ - note it's only version 1.1)
- - GLX docs (http://opengl.org/documentation/specs/glx/glx1.4.pdf)
- - extensions docs (http://www.opengl.org/registry/)
-
-- glcompmgr
- - http://lists.freedesktop.org/archives/xorg/2006-July/017006.html ,
- - http://www.mail-archive.com/compiz%40lists.freedesktop.org/msg00023.html
- - simple and easy to understand
- - works even without texture_from_pixmap extension
- - claims to support several different gfx cards
- - compile with something like
- "gcc -Wall glcompmgr-0.5.c `pkg-config --cflags --libs glib-2.0` -lGL -lXcomposite -lXdamage -L/usr/X11R6/lib"
-
-- compiz
- - git clone git://anongit.freedesktop.org/git/xorg/app/compiz
- - the ultimate
- - glxcompmgr
- - git clone git://anongit.freedesktop.org/git/xorg/app/glxcompgr
- - a rather old version of compiz, but also simpler and as such simpler
- to understand
-
-- beryl
- - a fork of Compiz
- - http://beryl-project.org
- - git clone git://anongit.beryl-project.org/beryl/beryl-core (or beryl-plugins etc. ,
- the full list should be at git://anongit.beryl-project.org/beryl/)
-
-- libcm (metacity)
- - cvs -d :pserver:anonymous@anoncvs.gnome.org:/cvs/gnome co libcm
- - not much idea about it, the model differs a lot from KWin/Compiz/Beryl
- - does not seem to be very powerful or with that much development going on
-
-*/
-
#include "scene_opengl.h"
#ifdef KWIN_HAVE_EGL
#include "eglonxbackend.h"
diff --git a/scene_xrender.cpp b/scene_xrender.cpp
index ee6ff581e7..0fa139b1b7 100644
--- a/scene_xrender.cpp
+++ b/scene_xrender.cpp
@@ -18,26 +18,6 @@ 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 .
*********************************************************************/
-
-/*
- This is the XRender-based compositing code. The primary compositing
- backend is the OpenGL-based one, which should be more powerful
- and also possibly better documented. This backend is mostly for cases
- when the OpenGL backend cannot be used for some reason (insufficient
- performance, no usable OpenGL support at all, etc.)
- The plan is to keep it around as long as needed/possible, but if it
- proves to be too much hassle it will be dropped in the future.
-
- Docs:
-
- XRender (the protocol, but the function calls map to it):
- http://gitweb.freedesktop.org/?p=xorg/proto/renderproto.git;a=blob_plain;hb=HEAD;f=renderproto.txt
-
- XFixes (again, the protocol):
- http://gitweb.freedesktop.org/?p=xorg/proto/fixesproto.git;a=blob_plain;hb=HEAD;f=fixesproto.txt
-
-*/
-
#include "scene_xrender.h"
#ifdef KWIN_HAVE_XRENDER_COMPOSITING
diff --git a/workspace.cpp b/workspace.cpp
index b9e137d697..63f675eded 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -91,16 +91,6 @@ static const char *KDED_INTERFACE = "org.kde.kded";
Workspace* Workspace::_self = 0;
-//-----------------------------------------------------------------------------
-// Rikkus: This class is too complex. It needs splitting further.
-// It's a nightmare to understand, especially with so few comments :(
-//
-// Matthias: Feel free to ask me questions about it. Feel free to add
-// comments. I dissagree that further splittings makes it easier. 2500
-// lines are not too much. It's the task that is complex, not the
-// code.
-//-----------------------------------------------------------------------------
-
Workspace::Workspace(bool restore)
: QObject(0)
// Desktop layout
@@ -271,10 +261,6 @@ void Workspace::init()
m_screenEdge.init();
#endif
- // Not used yet
- //topDock = 0L;
- //maximizedWindowCounter = 0;
-
supportWindow = new QWidget(NULL, Qt::X11BypassWindowManagerHint);
XLowerWindow(display(), supportWindow->winId()); // See usage in layers.cpp