summaryrefslogtreecommitdiff
path: root/src/aquamarine.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/aquamarine.cpp')
-rw-r--r--src/aquamarine.cpp44
1 files changed, 2 insertions, 42 deletions
diff --git a/src/aquamarine.cpp b/src/aquamarine.cpp
index bcc96e3..2920dc1 100644
--- a/src/aquamarine.cpp
+++ b/src/aquamarine.cpp
@@ -3,10 +3,9 @@
*
* Copyright (c) 2006 Dennis Kasprzyk <onestone@beryl-project.org>
* Copyright (c) 2006 Volker Krause <vkrause@kde.org>
+ * Copyright (c) 2006 David Reveman <davidr@novell.com>
*
* Uses code of:
- * Emerald window decorator (www.beryl-project.org)
- * gtk-window-decorator (www.freedesktop.org/wiki/Software/Compiz)
* KWin window manager (www.kde.org)
*
* This program is free software; you can redistribute it and/or modify
@@ -56,7 +55,6 @@ static const KCmdLineOptions options[] = {
int
main (int argc, char **argv)
{
- bool argb_visual = false;
char *display = 0;
Display *dpy = XOpenDisplay (display);
int screen = DefaultScreen (dpy);
@@ -83,39 +81,6 @@ main (int argc, char **argv)
exit (1);
}
-
- Colormap colormap = 0;
- Visual *visual = 0;
- int event_base, error_base;
-
- if (XRenderQueryExtension (dpy, &event_base, &error_base))
- {
- int nvi;
- XVisualInfo templ;
- templ.screen = screen;
- templ.depth = 32;
- templ.c_class = TrueColor;
- XVisualInfo *xvi =
- XGetVisualInfo (dpy,
- VisualScreenMask | VisualDepthMask |
- VisualClassMask, &templ, &nvi);
-
- for (int i = 0; i < nvi; i++)
- {
- XRenderPictFormat *format =
- XRenderFindVisualFormat (dpy, xvi[i].visual);
- if (format->type == PictTypeDirect && format->direct.alphaMask)
- {
- visual = xvi[i].visual;
- colormap =
- XCreateColormap (dpy, RootWindow (dpy, screen), visual,
- AllocNone);
- argb_visual = true;
- break;
- }
- }
- }
-
Bool wmRunning = false;
do
{
@@ -173,12 +138,7 @@ main (int argc, char **argv)
}
} while (!wmRunning);
- Aquamarine::Decorator *app = new Aquamarine::Decorator(dpy, Qt::HANDLE (visual),
- Qt::HANDLE (colormap));
-
- DCOPClient *client = app->dcopClient ();
- client->registerAs ("kwin", false);
- client->setDefaultObject ("KWinInterface");
+ Aquamarine::Decorator *app = new Aquamarine::Decorator();
if (app->isReady ()) {
rv = app->exec ();