- remove Util class

- remove old window decoration images

18 files changed, 2 insertions, 93 deletions

diff --git a/Changelog b/Changelog
index 91a6158..4e927fe 100644
--- a/Changelog
+++ b/Changelog
@@ -1,6 +1,8 @@
 20.03.2007
 o Make dock buttons listen to device button presses.
 o Pair devices on button press on a keyboard in the dock.
+- remove Util class
+- remove old window decoration images
 
 16.03.2007
 o expand dock as new keyboards are plugged in.
diff --git a/images/background.jpg b/images/background.jpg
deleted file mode 100755
index e417f35..0000000
--- a/images/background.jpg
+++ /dev/null
diff --git a/images/buttonclose.png b/images/buttonclose.png
deleted file mode 100755
index e4b880b..0000000
--- a/images/buttonclose.png
+++ /dev/null
diff --git a/images/buttonfloor.png b/images/buttonfloor.png
deleted file mode 100755
index 3e68154..0000000
--- a/images/buttonfloor.png
+++ /dev/null
diff --git a/images/buttonminimize.png b/images/buttonminimize.png
deleted file mode 100644
index 8521e39..0000000
--- a/images/buttonminimize.png
+++ /dev/null
diff --git a/images/buttonoverlay.png b/images/buttonoverlay.png
deleted file mode 100644
index 71cb351..0000000
--- a/images/buttonoverlay.png
+++ /dev/null
diff --git a/images/dock_left.png b/images/dock_left.png
deleted file mode 100644
index 3ba0274..0000000
--- a/images/dock_left.png
+++ /dev/null
diff --git a/images/dock_right.png b/images/dock_right.png
deleted file mode 100644
index 3a8bfd2..0000000
--- a/images/dock_right.png
+++ /dev/null
diff --git a/images/dock_top.png b/images/dock_top.png
deleted file mode 100644
index c7710b3..0000000
--- a/images/dock_top.png
+++ /dev/null
diff --git a/images/resizebar.png b/images/resizebar.png
deleted file mode 100755
index 6c10131..0000000
--- a/images/resizebar.png
+++ /dev/null
diff --git a/images/resizebutton.png b/images/resizebutton.png
deleted file mode 100755
index db1b43f..0000000
--- a/images/resizebutton.png
+++ /dev/null
diff --git a/images/titlebar.png b/images/titlebar.png
deleted file mode 100755
index 8ec7554..0000000
--- a/images/titlebar.png
+++ /dev/null
diff --git a/src/Dock.cpp b/src/Dock.cpp
index 2a7a6e6..5ea1546 100644
--- a/src/Dock.cpp
+++ b/src/Dock.cpp
@@ -2,7 +2,6 @@
 
 #include "Dock.h"
 #include "Magick++.h"
-#include "Util.h"
 #include <cairo-xlib.h>
 #include <math.h>
 
diff --git a/src/DockApp.cpp b/src/DockApp.cpp
index 4d5391a..eee818d 100644
--- a/src/DockApp.cpp
+++ b/src/DockApp.cpp
@@ -3,7 +3,6 @@
 #include "DockApp.h"
 #include <Magick++.h>
 #include "logger.h"
-#include "Util.h"
 #include <cairo.h>
 #include <cairo-xlib.h>
 
diff --git a/src/Makefile b/src/Makefile
index d7ba760..8d868ba 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -7,7 +7,6 @@ INCLUDES=-I/opt/MPX/include/ -I/usr/include/cairo/
 OBJ= XConn.o\
      Config.o \
      DeviceError.o \
-     Util.o \
      Manager.o \
      PointerDevice.o \
      KeyboardDevice.o \
diff --git a/src/Manager.h b/src/Manager.h
index bf0ea76..a1e663b 100644
--- a/src/Manager.h
+++ b/src/Manager.h
@@ -21,7 +21,6 @@
 #include "KeyboardDevice.h"
 #include "DeviceError.h"
 #include "XError.h"
-#include "Util.h"
 #include "Dock.h"
 
 using namespace std;
diff --git a/src/Util.cpp b/src/Util.cpp
deleted file mode 100644
index 589d4dc..0000000
--- a/src/Util.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/* $Id: Util.cpp,v 1.3 2006/10/09 06:29:34 whot Exp $ */
-
-#include "Util.h"
-
-/**
- * Loads an image from a file.
- * @param file The filename of the image.
- */
-Magick::Image* Util::ImageFromFile(char* file)
-{
-    try
-    {
-        Magick::Image *image = new Magick::Image();
-        image->read(file);
-        image->modifyImage();
-        image->type(Magick::TrueColorType);
-        return image;
-    }catch (Magick::Exception &error)
-    {
-        ERR("Loading image %s failed.\n", file);
-        ERR("  -- Error: %s\n", error.what());
-        return NULL;
-    }
-}
-
-/**
- * Converts a Magick::Image to an XImage that can be displayed on the screen.
- * @param dpy The X Display.
- */
-XImage* Util::ImageToXImage(Display* dpy, int screen, Magick::Image* image)
-{
-
-    try {
-        char* buffer = 
-            (char*) malloc(4 * image->columns() * image->rows() * sizeof(char));
-
-        if (!buffer)
-        {
-            ERR("Cannot create buffer.\n");
-            throw Magick::Exception("Cannot create XImage");
-        }
-
-        image->write(0, 0, image->columns(), image->rows(), "BGRA",
-                Magick::CharPixel,
-                buffer);
-
-        XImage* ximage = XCreateImage(dpy, DefaultVisual(dpy, screen),
-                              DefaultDepth(dpy, screen), ZPixmap, 
-                              0, buffer, 
-                              image->columns(), image->rows(), 
-                              XBitmapPad(dpy), 0); 
-        if (!ximage)
-        {
-            ERR("Cannot create XImage.\n");
-            throw Magick::Exception("Cannot create XImage");
-        }
-            
-        return ximage;
-    }catch (Magick::Exception &error)
-    {
-        ERR("Converting image failed.\n");
-        ERR("  -- Error: %s\n", error.what());
-        return NULL;
-    }
-}
-
diff --git a/src/Util.h b/src/Util.h
deleted file mode 100644
index e87d66a..0000000
--- a/src/Util.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* $Id: Util.h,v 1.3 2006/10/04 07:57:12 whot Exp $ */
-
-/**
- * Utility functions.
- */
-
-#ifndef __UTIL_H__
-#define __UTIL_H__
-
-#include<X11/X.h>
-#include<X11/Xlib.h>
-#include<Magick++.h>
-#include "logger.h"
-
-class Util 
-{
-
-    public:
-        static Magick::Image* ImageFromFile(char* filename);
-        static XImage* ImageToXImage(Display* dpy, int screen, Magick::Image* image);
-};
-
-#endif