Small code reorganization

(Old svn revision: 11020)

12 files changed, 227 insertions, 234 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 5834a2fa6..3e958d9c6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,12 +18,12 @@ xfwm4_SOURCES =								\
 	menu.h 								\
 	misc.c 								\
 	misc.h 								\
+	mypixmap.c 							\
+	mypixmap.h 							\
 	mywindow.c 							\
 	mywindow.h 							\
 	parserc.c 							\
 	parserc.h 							\
-	pixmap.c 							\
-	pixmap.h 							\
 	session.c 							\
 	session.h 							\
 	settings.c 							\
diff --git a/src/Makefile.in b/src/Makefile.in
index c9dae9d6f..9b84905cf 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -190,12 +190,12 @@ xfwm4_SOURCES = \
 	menu.h 								\
 	misc.c 								\
 	misc.h 								\
+	mypixmap.c 							\
+	mypixmap.h 							\
 	mywindow.c 							\
 	mywindow.h 							\
 	parserc.c 							\
 	parserc.h 							\
-	pixmap.c 							\
-	pixmap.h 							\
 	session.c 							\
 	session.h 							\
 	settings.c 							\
@@ -255,8 +255,8 @@ am_xfwm4_OBJECTS = xfwm4-client.$(OBJEXT) xfwm4-events.$(OBJEXT) \
 	xfwm4-frame.$(OBJEXT) xfwm4-hints.$(OBJEXT) \
 	xfwm4-keyboard.$(OBJEXT) xfwm4-main.$(OBJEXT) \
 	xfwm4-menu.$(OBJEXT) xfwm4-misc.$(OBJEXT) \
-	xfwm4-mywindow.$(OBJEXT) xfwm4-parserc.$(OBJEXT) \
-	xfwm4-pixmap.$(OBJEXT) xfwm4-session.$(OBJEXT) \
+	xfwm4-mypixmap.$(OBJEXT) xfwm4-mywindow.$(OBJEXT) \
+	xfwm4-parserc.$(OBJEXT) xfwm4-session.$(OBJEXT) \
 	xfwm4-settings.$(OBJEXT) xfwm4-startup_notification.$(OBJEXT) \
 	xfwm4-spinning_cursor.$(OBJEXT) xfwm4-tabwin.$(OBJEXT) \
 	xfwm4-workspaces.$(OBJEXT)
@@ -273,9 +273,9 @@ am__depfiles_maybe = depfiles
 @AMDEP_TRUE@	./$(DEPDIR)/xfwm4-keyboard.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/xfwm4-main.Po ./$(DEPDIR)/xfwm4-menu.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/xfwm4-misc.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/xfwm4-mypixmap.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/xfwm4-mywindow.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/xfwm4-parserc.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/xfwm4-pixmap.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/xfwm4-session.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/xfwm4-settings.Po \
 @AMDEP_TRUE@	./$(DEPDIR)/xfwm4-spinning_cursor.Po \
@@ -351,9 +351,9 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfwm4-main.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfwm4-menu.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfwm4-misc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfwm4-mypixmap.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfwm4-mywindow.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfwm4-parserc.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfwm4-pixmap.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfwm4-session.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfwm4-settings.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfwm4-spinning_cursor.Po@am__quote@
@@ -661,6 +661,39 @@ xfwm4-misc.lo: misc.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-misc.lo `test -f 'misc.c' || echo '$(srcdir)/'`misc.c
 
+xfwm4-mypixmap.o: mypixmap.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-mypixmap.o -MD -MP -MF "$(DEPDIR)/xfwm4-mypixmap.Tpo" \
+@am__fastdepCC_TRUE@	  -c -o xfwm4-mypixmap.o `test -f 'mypixmap.c' || echo '$(srcdir)/'`mypixmap.c; \
+@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-mypixmap.Tpo" "$(DEPDIR)/xfwm4-mypixmap.Po"; \
+@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-mypixmap.Tpo"; exit 1; \
+@am__fastdepCC_TRUE@	fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mypixmap.c' object='xfwm4-mypixmap.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/xfwm4-mypixmap.Po' tmpdepfile='$(DEPDIR)/xfwm4-mypixmap.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-mypixmap.o `test -f 'mypixmap.c' || echo '$(srcdir)/'`mypixmap.c
+
+xfwm4-mypixmap.obj: mypixmap.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-mypixmap.obj -MD -MP -MF "$(DEPDIR)/xfwm4-mypixmap.Tpo" \
+@am__fastdepCC_TRUE@	  -c -o xfwm4-mypixmap.obj `if test -f 'mypixmap.c'; then $(CYGPATH_W) 'mypixmap.c'; else $(CYGPATH_W) '$(srcdir)/mypixmap.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-mypixmap.Tpo" "$(DEPDIR)/xfwm4-mypixmap.Po"; \
+@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-mypixmap.Tpo"; exit 1; \
+@am__fastdepCC_TRUE@	fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mypixmap.c' object='xfwm4-mypixmap.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/xfwm4-mypixmap.Po' tmpdepfile='$(DEPDIR)/xfwm4-mypixmap.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-mypixmap.obj `if test -f 'mypixmap.c'; then $(CYGPATH_W) 'mypixmap.c'; else $(CYGPATH_W) '$(srcdir)/mypixmap.c'; fi`
+
+xfwm4-mypixmap.lo: mypixmap.c
+@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-mypixmap.lo -MD -MP -MF "$(DEPDIR)/xfwm4-mypixmap.Tpo" \
+@am__fastdepCC_TRUE@	  -c -o xfwm4-mypixmap.lo `test -f 'mypixmap.c' || echo '$(srcdir)/'`mypixmap.c; \
+@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-mypixmap.Tpo" "$(DEPDIR)/xfwm4-mypixmap.Plo"; \
+@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-mypixmap.Tpo"; exit 1; \
+@am__fastdepCC_TRUE@	fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mypixmap.c' object='xfwm4-mypixmap.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/xfwm4-mypixmap.Plo' tmpdepfile='$(DEPDIR)/xfwm4-mypixmap.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-mypixmap.lo `test -f 'mypixmap.c' || echo '$(srcdir)/'`mypixmap.c
+
 xfwm4-mywindow.o: mywindow.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-mywindow.o -MD -MP -MF "$(DEPDIR)/xfwm4-mywindow.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o xfwm4-mywindow.o `test -f 'mywindow.c' || echo '$(srcdir)/'`mywindow.c; \
@@ -727,39 +760,6 @@ xfwm4-parserc.lo: parserc.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-parserc.lo `test -f 'parserc.c' || echo '$(srcdir)/'`parserc.c
 
-xfwm4-pixmap.o: pixmap.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-pixmap.o -MD -MP -MF "$(DEPDIR)/xfwm4-pixmap.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o xfwm4-pixmap.o `test -f 'pixmap.c' || echo '$(srcdir)/'`pixmap.c; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-pixmap.Tpo" "$(DEPDIR)/xfwm4-pixmap.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-pixmap.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pixmap.c' object='xfwm4-pixmap.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/xfwm4-pixmap.Po' tmpdepfile='$(DEPDIR)/xfwm4-pixmap.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-pixmap.o `test -f 'pixmap.c' || echo '$(srcdir)/'`pixmap.c
-
-xfwm4-pixmap.obj: pixmap.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-pixmap.obj -MD -MP -MF "$(DEPDIR)/xfwm4-pixmap.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o xfwm4-pixmap.obj `if test -f 'pixmap.c'; then $(CYGPATH_W) 'pixmap.c'; else $(CYGPATH_W) '$(srcdir)/pixmap.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-pixmap.Tpo" "$(DEPDIR)/xfwm4-pixmap.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-pixmap.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pixmap.c' object='xfwm4-pixmap.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/xfwm4-pixmap.Po' tmpdepfile='$(DEPDIR)/xfwm4-pixmap.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-pixmap.obj `if test -f 'pixmap.c'; then $(CYGPATH_W) 'pixmap.c'; else $(CYGPATH_W) '$(srcdir)/pixmap.c'; fi`
-
-xfwm4-pixmap.lo: pixmap.c
-@am__fastdepCC_TRUE@	if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-pixmap.lo -MD -MP -MF "$(DEPDIR)/xfwm4-pixmap.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o xfwm4-pixmap.lo `test -f 'pixmap.c' || echo '$(srcdir)/'`pixmap.c; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-pixmap.Tpo" "$(DEPDIR)/xfwm4-pixmap.Plo"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-pixmap.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pixmap.c' object='xfwm4-pixmap.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/xfwm4-pixmap.Plo' tmpdepfile='$(DEPDIR)/xfwm4-pixmap.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-pixmap.lo `test -f 'pixmap.c' || echo '$(srcdir)/'`pixmap.c
-
 xfwm4-session.o: session.c
 @am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-session.o -MD -MP -MF "$(DEPDIR)/xfwm4-session.Tpo" \
 @am__fastdepCC_TRUE@	  -c -o xfwm4-session.o `test -f 'session.c' || echo '$(srcdir)/'`session.c; \
diff --git a/src/client.c b/src/client.c
index 667d1b9de..d508068d0 100644
--- a/src/client.c
+++ b/src/client.c
@@ -39,7 +39,7 @@
 #include "frame.h"
 #include "hints.h"
 #include "workspaces.h"
-#include "pixmap.h"
+#include "mypixmap.h"
 #include "mywindow.h"
 #include "settings.h"
 #include "tabwin.h"
@@ -2043,14 +2043,14 @@ void clientClearPixmapCache(Client * c)
 {
     g_return_if_fail(c != NULL);
 
-    freePixmap(dpy, &c->pm_cache.pm_title[ACTIVE]);
-    freePixmap(dpy, &c->pm_cache.pm_title[INACTIVE]);
-    freePixmap(dpy, &c->pm_cache.pm_sides[SIDE_LEFT][ACTIVE]);
-    freePixmap(dpy, &c->pm_cache.pm_sides[SIDE_LEFT][INACTIVE]);
-    freePixmap(dpy, &c->pm_cache.pm_sides[SIDE_RIGHT][ACTIVE]);
-    freePixmap(dpy, &c->pm_cache.pm_sides[SIDE_RIGHT][INACTIVE]);
-    freePixmap(dpy, &c->pm_cache.pm_sides[SIDE_BOTTOM][ACTIVE]);
-    freePixmap(dpy, &c->pm_cache.pm_sides[SIDE_BOTTOM][INACTIVE]);
+    myPixmapFree(dpy, &c->pm_cache.pm_title[ACTIVE]);
+    myPixmapFree(dpy, &c->pm_cache.pm_title[INACTIVE]);
+    myPixmapFree(dpy, &c->pm_cache.pm_sides[SIDE_LEFT][ACTIVE]);
+    myPixmapFree(dpy, &c->pm_cache.pm_sides[SIDE_LEFT][INACTIVE]);
+    myPixmapFree(dpy, &c->pm_cache.pm_sides[SIDE_RIGHT][ACTIVE]);
+    myPixmapFree(dpy, &c->pm_cache.pm_sides[SIDE_RIGHT][INACTIVE]);
+    myPixmapFree(dpy, &c->pm_cache.pm_sides[SIDE_BOTTOM][ACTIVE]);
+    myPixmapFree(dpy, &c->pm_cache.pm_sides[SIDE_BOTTOM][INACTIVE]);
 }
 
 void clientFrame(Window w, gboolean initial)
@@ -2118,14 +2118,14 @@ void clientFrame(Window w, gboolean initial)
     c->cmap = attr.colormap;
 
     /* Initialize pixmap caching */
-    initPixmap(&c->pm_cache.pm_title[ACTIVE]);
-    initPixmap(&c->pm_cache.pm_title[INACTIVE]);
-    initPixmap(&c->pm_cache.pm_sides[SIDE_LEFT][ACTIVE]);
-    initPixmap(&c->pm_cache.pm_sides[SIDE_LEFT][INACTIVE]);
-    initPixmap(&c->pm_cache.pm_sides[SIDE_RIGHT][ACTIVE]);
-    initPixmap(&c->pm_cache.pm_sides[SIDE_RIGHT][INACTIVE]);
-    initPixmap(&c->pm_cache.pm_sides[SIDE_BOTTOM][ACTIVE]);
-    initPixmap(&c->pm_cache.pm_sides[SIDE_BOTTOM][INACTIVE]);
+    myPixmapInit(&c->pm_cache.pm_title[ACTIVE]);
+    myPixmapInit(&c->pm_cache.pm_title[INACTIVE]);
+    myPixmapInit(&c->pm_cache.pm_sides[SIDE_LEFT][ACTIVE]);
+    myPixmapInit(&c->pm_cache.pm_sides[SIDE_LEFT][INACTIVE]);
+    myPixmapInit(&c->pm_cache.pm_sides[SIDE_RIGHT][ACTIVE]);
+    myPixmapInit(&c->pm_cache.pm_sides[SIDE_RIGHT][INACTIVE]);
+    myPixmapInit(&c->pm_cache.pm_sides[SIDE_BOTTOM][ACTIVE]);
+    myPixmapInit(&c->pm_cache.pm_sides[SIDE_BOTTOM][INACTIVE]);
     c->pm_cache.previous_width = -1;
     c->pm_cache.previous_height = -1;
 
@@ -2588,13 +2588,13 @@ void clientShow(Client * c, gboolean change_state)
         CLIENT_FLAG_SET(c2, CLIENT_FLAG_VISIBLE);
         XMapWindow(dpy, c2->window);
         XMapWindow(dpy, c2->frame);
-	if(change_state)
-	{
+        if(change_state)
+        {
             CLIENT_FLAG_UNSET(c2, CLIENT_FLAG_HIDDEN);
             setWMState(dpy, c2->window, NormalState);
             workspaceUpdateArea(margins, gnome_margins);
-	}
-	clientSetNetState(c2);
+        }
+        clientSetNetState(c2);
     }
     g_slist_free(list_of_windows);
 }
@@ -2617,14 +2617,14 @@ void clientHide(Client * c, gboolean change_state)
         XUnmapWindow(dpy, c2->window);
         XUnmapWindow(dpy, c2->frame);
         CLIENT_FLAG_UNSET(c2, CLIENT_FLAG_VISIBLE);
-	if(change_state)
-	{
+        if(change_state)
+        {
             CLIENT_FLAG_SET(c2, CLIENT_FLAG_HIDDEN);
             setWMState(dpy, c2->window, IconicState);
             workspaceUpdateArea(margins, gnome_margins);
-	}
-	c2->ignore_unmap++;
-	clientSetNetState(c2);
+        }
+        c2->ignore_unmap++;
+        clientSetNetState(c2);
     }
     g_slist_free(list_of_windows);
 }
@@ -2841,12 +2841,12 @@ void clientSetLayer(Client * c, int l)
     for(index = list_of_windows; index; index = g_slist_next(index))
     {
         c2 = (Client *) index->data;
-	if(c2->win_layer != l)
-	{
+        if(c2->win_layer != l)
+        {
             DBG("setting client \"%s\" (0x%lx) layer to %d\n", c2->name, c2->window, l);
             c2->win_layer = l;
             setGnomeHint(dpy, c2->window, win_layer, l);
-	}
+        }
     }
     g_slist_free(list_of_windows);
     if(last_raise == c)
@@ -2870,33 +2870,33 @@ void clientSetWorkspace(Client * c, int ws, gboolean manage_mapping)
     for(index = list_of_windows; index; index = g_slist_next(index))
     {
         c2 = (Client *) index->data;
-	if(c2->win_workspace != ws)
-	{
+        if(c2->win_workspace != ws)
+        {
             DBG("setting client \"%s\" (0x%lx) to workspace %d\n", c2->name, c2->window, ws);
-	    setGnomeHint(dpy, c2->window, win_workspace, ws);
-	    c2->win_workspace = ws;
-	    setNetHint(dpy, c2->window, net_wm_desktop, (unsigned long)c2->win_workspace);
-	    CLIENT_FLAG_SET(c2, CLIENT_FLAG_WORKSPACE_SET);
-
-	    if(manage_mapping && !(c2->transient_for) && !CLIENT_FLAG_TEST(c2, CLIENT_FLAG_HIDDEN))
-	    {
-        	if(CLIENT_FLAG_TEST(c2, CLIENT_FLAG_STICKY))
-        	{
-        	    clientShow(c2, False);
-        	}
-        	else
-        	{
-        	    if(ws == workspace)
-        	    {
-                	clientShow(c2, False);
-        	    }
-        	    else
-        	    {
-                	clientHide(c2, False);
-        	    }
-        	}
-	    }
-	}
+            setGnomeHint(dpy, c2->window, win_workspace, ws);
+            c2->win_workspace = ws;
+            setNetHint(dpy, c2->window, net_wm_desktop, (unsigned long)c2->win_workspace);
+            CLIENT_FLAG_SET(c2, CLIENT_FLAG_WORKSPACE_SET);
+
+            if(manage_mapping && !(c2->transient_for) && !CLIENT_FLAG_TEST(c2, CLIENT_FLAG_HIDDEN))
+            {
+                if(CLIENT_FLAG_TEST(c2, CLIENT_FLAG_STICKY))
+                {
+                    clientShow(c2, False);
+                }
+                else
+                {
+                    if(ws == workspace)
+                    {
+                        clientShow(c2, False);
+                    }
+                    else
+                    {
+                        clientHide(c2, False);
+                    }
+                }
+            }
+        }
     }
     g_slist_free(list_of_windows);
 }
@@ -2982,22 +2982,22 @@ void clientStick(Client * c, gboolean include_transients)
     if(include_transients)
     {
         list_of_windows = clientListTransients(c);
-	for(index = list_of_windows; index; index = g_slist_next(index))
-	{
+        for(index = list_of_windows; index; index = g_slist_next(index))
+        {
             c2 = (Client *) index->data;
-	    c2->win_state |= WIN_STATE_STICKY;
-	    CLIENT_FLAG_SET(c2, CLIENT_FLAG_STICKY);
-	    setGnomeHint(dpy, c2->window, win_state, c2->win_state);
+            c2->win_state |= WIN_STATE_STICKY;
+            CLIENT_FLAG_SET(c2, CLIENT_FLAG_STICKY);
+            setGnomeHint(dpy, c2->window, win_state, c2->win_state);
             clientSetNetState(c2);
-	}
+        }
         clientSetWorkspace(c, workspace, TRUE);
-	g_slist_free(list_of_windows);
+        g_slist_free(list_of_windows);
     }
     else
     {
-	c->win_state |= WIN_STATE_STICKY;
-	CLIENT_FLAG_SET(c, CLIENT_FLAG_STICKY);
-	setGnomeHint(dpy, c->window, win_state, c->win_state);
+        c->win_state |= WIN_STATE_STICKY;
+        CLIENT_FLAG_SET(c, CLIENT_FLAG_STICKY);
+        setGnomeHint(dpy, c->window, win_state, c->win_state);
         clientSetNetState(c);
         clientSetWorkspace(c, workspace, TRUE);
     }
@@ -3016,23 +3016,23 @@ void clientUnstick(Client * c, gboolean include_transients)
     if(include_transients)
     {
         list_of_windows = clientListTransients(c);
-	for(index = list_of_windows; index; index = g_slist_next(index))
-	{
+        for(index = list_of_windows; index; index = g_slist_next(index))
+        {
             c2 = (Client *) index->data;
-	    c2->win_state &= ~WIN_STATE_STICKY;
-	    CLIENT_FLAG_UNSET(c2, CLIENT_FLAG_STICKY);
-	    setGnomeHint(dpy, c2->window, win_state, c2->win_state);
-	    clientSetNetState(c2);
-	}
+            c2->win_state &= ~WIN_STATE_STICKY;
+            CLIENT_FLAG_UNSET(c2, CLIENT_FLAG_STICKY);
+            setGnomeHint(dpy, c2->window, win_state, c2->win_state);
+            clientSetNetState(c2);
+        }
         clientSetWorkspace(c, workspace, TRUE);
-	g_slist_free(list_of_windows);
+        g_slist_free(list_of_windows);
     }
     else
     {
-	c->win_state &= ~WIN_STATE_STICKY;
-	CLIENT_FLAG_UNSET(c, CLIENT_FLAG_STICKY);
-	setGnomeHint(dpy, c->window, win_state, c->win_state);
-	clientSetNetState(c);
+        c->win_state &= ~WIN_STATE_STICKY;
+        CLIENT_FLAG_UNSET(c, CLIENT_FLAG_STICKY);
+        setGnomeHint(dpy, c->window, win_state, c->win_state);
+        clientSetNetState(c);
         clientSetWorkspace(c, workspace, TRUE);
     }
 }
diff --git a/src/client.h b/src/client.h
index 2bbf641c9..0d49f7205 100644
--- a/src/client.h
+++ b/src/client.h
@@ -41,7 +41,7 @@
 #include "misc.h"
 #include "hints.h"
 #include "keyboard.h"
-#include "pixmap.h"
+#include "mypixmap.h"
 #include "mywindow.h"
 #include "settings.h"
 
diff --git a/src/events.c b/src/events.c
index d247d222f..1a7e0f8e9 100644
--- a/src/events.c
+++ b/src/events.c
@@ -800,11 +800,11 @@ static inline void handleConfigureRequest(XConfigureRequestEvent * ev)
         /* Let's say that if the client performs a XRaiseWindow, we show the window if hidden */
         if((ev->value_mask & CWStackMode) && (wc.stack_mode == Above))
         {
-	    if (CLIENT_FLAG_TEST(c, CLIENT_FLAG_HIDDEN))
-	    {
+            if (CLIENT_FLAG_TEST(c, CLIENT_FLAG_HIDDEN))
+            {
                 clientShow(c, TRUE);
             }
-	    if(params.focus_new && clientAcceptFocus(c))
+            if(params.focus_new && clientAcceptFocus(c))
             {
                 clientSetFocus(c, TRUE);
             }
diff --git a/src/frame.c b/src/frame.c
index 0382a4a10..1e1eaf55e 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -259,7 +259,7 @@ static inline void frameCreateTitlePixmap(Client * c, int state, int left, int r
         }
     }
 
-    createPixmap(dpy, pm, width, frameTop(c));
+    myPixmapCreate(dpy, pm, width, frameTop(c));
     gpixmap = gdk_pixmap_foreign_new(pm->pixmap);
     gdk_drawable_set_colormap(gpixmap, gdk_colormap_get_system());
     gc = gdk_gc_new(gpixmap);
@@ -601,19 +601,19 @@ void frameDraw(Client * c, gboolean invalidate_cache, gboolean force_shape_updat
         {
             if(c->pm_cache.previous_width != c->width)
             {
-                freePixmap(dpy, &c->pm_cache.pm_title[ACTIVE]);
-                freePixmap(dpy, &c->pm_cache.pm_title[INACTIVE]);
-                freePixmap(dpy, &c->pm_cache.pm_sides[SIDE_BOTTOM][ACTIVE]);
-                freePixmap(dpy, &c->pm_cache.pm_sides[SIDE_BOTTOM][INACTIVE]);
+                myPixmapFree(dpy, &c->pm_cache.pm_title[ACTIVE]);
+                myPixmapFree(dpy, &c->pm_cache.pm_title[INACTIVE]);
+                myPixmapFree(dpy, &c->pm_cache.pm_sides[SIDE_BOTTOM][ACTIVE]);
+                myPixmapFree(dpy, &c->pm_cache.pm_sides[SIDE_BOTTOM][INACTIVE]);
                 c->pm_cache.previous_width = c->width;
                 requires_clearing = TRUE;
             }
             if(c->pm_cache.previous_height != c->height)
             {
-                freePixmap(dpy, &c->pm_cache.pm_sides[SIDE_LEFT][ACTIVE]);
-                freePixmap(dpy, &c->pm_cache.pm_sides[SIDE_LEFT][INACTIVE]);
-                freePixmap(dpy, &c->pm_cache.pm_sides[SIDE_RIGHT][ACTIVE]);
-                freePixmap(dpy, &c->pm_cache.pm_sides[SIDE_RIGHT][INACTIVE]);
+                myPixmapFree(dpy, &c->pm_cache.pm_sides[SIDE_LEFT][ACTIVE]);
+                myPixmapFree(dpy, &c->pm_cache.pm_sides[SIDE_LEFT][INACTIVE]);
+                myPixmapFree(dpy, &c->pm_cache.pm_sides[SIDE_RIGHT][ACTIVE]);
+                myPixmapFree(dpy, &c->pm_cache.pm_sides[SIDE_RIGHT][INACTIVE]);
                 c->pm_cache.previous_height = c->height;
                 requires_clearing = TRUE;
             }
@@ -688,7 +688,7 @@ void frameDraw(Client * c, gboolean invalidate_cache, gboolean force_shape_updat
 
         if(c->pm_cache.pm_sides[SIDE_LEFT][state].pixmap == None)
         {
-            createPixmap(dpy, &c->pm_cache.pm_sides[SIDE_LEFT][state], frameLeft(c), left_height);
+            myPixmapCreate(dpy, &c->pm_cache.pm_sides[SIDE_LEFT][state], frameLeft(c), left_height);
             requires_clearing = TRUE;
         }
         fillRectangle(dpy, c->pm_cache.pm_sides[SIDE_LEFT][state].pixmap, params.sides[SIDE_LEFT][state].pixmap, 0, 0, frameLeft(c), left_height);
@@ -696,7 +696,7 @@ void frameDraw(Client * c, gboolean invalidate_cache, gboolean force_shape_updat
 
         if(c->pm_cache.pm_sides[SIDE_RIGHT][state].pixmap == None)
         {
-            createPixmap(dpy, &c->pm_cache.pm_sides[SIDE_RIGHT][state], frameRight(c), right_height);
+            myPixmapCreate(dpy, &c->pm_cache.pm_sides[SIDE_RIGHT][state], frameRight(c), right_height);
             requires_clearing = TRUE;
         }
         fillRectangle(dpy, c->pm_cache.pm_sides[SIDE_RIGHT][state].pixmap, params.sides[SIDE_RIGHT][state].pixmap, 0, 0, frameRight(c), right_height);
@@ -704,7 +704,7 @@ void frameDraw(Client * c, gboolean invalidate_cache, gboolean force_shape_updat
 
         if(c->pm_cache.pm_sides[SIDE_BOTTOM][state].pixmap == None)
         {
-            createPixmap(dpy, &c->pm_cache.pm_sides[SIDE_BOTTOM][state], bottom_width, frameBottom(c));
+            myPixmapCreate(dpy, &c->pm_cache.pm_sides[SIDE_BOTTOM][state], bottom_width, frameBottom(c));
             requires_clearing = TRUE;
         }
         fillRectangle(dpy, c->pm_cache.pm_sides[SIDE_BOTTOM][state].pixmap, params.sides[SIDE_BOTTOM][state].pixmap, 0, 0, bottom_width, frameBottom(c));
diff --git a/src/main.h b/src/main.h
index 47bdd2461..7ccbaa5d7 100644
--- a/src/main.h
+++ b/src/main.h
@@ -42,7 +42,7 @@
 #include "misc.h"
 #include "hints.h"
 #include "keyboard.h"
-#include "pixmap.h"
+#include "mypixmap.h"
 #include "parserc.h"
 
 /*
diff --git a/src/pixmap.c b/src/mypixmap.c
index 635cc17d0..8665557e6 100644
--- a/src/pixmap.c
+++ b/src/mypixmap.c
@@ -27,16 +27,16 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <glib.h>
-#include "pixmap.h"
+#include "mypixmap.h"
 #include "main.h"
 #include "debug.h"
 
-gboolean loadPixmap(Display * dpy, MyPixmap * pm, gchar * dir, gchar * file, XpmColorSymbol * cs, gint n)
+gboolean myPixmapLoad(Display * dpy, MyPixmap * pm, gchar * dir, gchar * file, XpmColorSymbol * cs, gint n)
 {
     gchar *filename;
     XpmAttributes attr;
 
-    DBG("entering loadPixmap\n");
+    DBG("entering myPixmapLoad\n");
 
     g_return_val_if_fail(dir != NULL, FALSE);
     g_return_val_if_fail(file != NULL, FALSE);
@@ -67,12 +67,12 @@ gboolean loadPixmap(Display * dpy, MyPixmap * pm, gchar * dir, gchar * file, Xpm
     return TRUE;
 }
 
-void createPixmap(Display * dpy, MyPixmap * pm, gint width, gint height)
+void myPixmapCreate(Display * dpy, MyPixmap * pm, gint width, gint height)
 {
-    DBG("entering createPixmap, width=%i, height=%i\n", width, height);
+    DBG("entering myPixmapCreate, width=%i, height=%i\n", width, height);
     if((width < 1) || (height < 1))
     {
-        initPixmap(pm);
+        myPixmapInit(pm);
     }
     else
     {
@@ -83,7 +83,7 @@ void createPixmap(Display * dpy, MyPixmap * pm, gint width, gint height)
     }
 }
 
-void initPixmap(MyPixmap * pm)
+void myPixmapInit(MyPixmap * pm)
 {
     pm->pixmap = None;
     pm->mask = None;
@@ -91,9 +91,9 @@ void initPixmap(MyPixmap * pm)
     pm->height = 0;
 }
 
-void freePixmap(Display * dpy, MyPixmap * pm)
+void myPixmapFree(Display * dpy, MyPixmap * pm)
 {
-    DBG("entering freePixmap\n");
+    DBG("entering myPixmapFree\n");
 
     if(pm->pixmap != None)
     {
diff --git a/src/pixmap.h b/src/mypixmap.h
index 276bdfc6c..83e997b6a 100644
--- a/src/pixmap.h
+++ b/src/mypixmap.h
@@ -18,8 +18,8 @@
  
  */
 
-#ifndef INC_PIXMAP_H
-#define INC_PIXMAP_H
+#ifndef INC_MYPIXMAP_H
+#define INC_MYPIXMAP_H
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
@@ -35,9 +35,9 @@ typedef struct
 }
 MyPixmap;
 
-gboolean loadPixmap(Display *, MyPixmap *, gchar *, gchar *, XpmColorSymbol *, gint);
-void createPixmap(Display *, MyPixmap *, gint, gint);
-void initPixmap(MyPixmap *);
-void freePixmap(Display *, MyPixmap *);
+gboolean myPixmapLoad(Display *, MyPixmap *, gchar *, gchar *, XpmColorSymbol *, gint);
+void myPixmapCreate(Display *, MyPixmap *, gint, gint);
+void myPixmapInit(MyPixmap *);
+void myPixmapFree(Display *, MyPixmap *);
 
-#endif /* INC_PIXMAP_H */
+#endif /* INC_MYPIXMAP_H */
diff --git a/src/settings.c b/src/settings.c
index 78fe9d5e9..4451cbb43 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -504,57 +504,57 @@ static void loadTheme(Settings rc[])
         }
     }
 
-    loadPixmap(dpy, &params.sides[SIDE_LEFT][ACTIVE], theme, "left-active.xpm", colsym, 20);
-    loadPixmap(dpy, &params.sides[SIDE_LEFT][INACTIVE], theme, "left-inactive.xpm", colsym, 20);
-    loadPixmap(dpy, &params.sides[SIDE_RIGHT][ACTIVE], theme, "right-active.xpm", colsym, 20);
-    loadPixmap(dpy, &params.sides[SIDE_RIGHT][INACTIVE], theme, "right-inactive.xpm", colsym, 20);
-    loadPixmap(dpy, &params.sides[SIDE_BOTTOM][ACTIVE], theme, "bottom-active.xpm", colsym, 20);
-    loadPixmap(dpy, &params.sides[SIDE_BOTTOM][INACTIVE], theme, "bottom-inactive.xpm", colsym, 20);
-    loadPixmap(dpy, &params.corners[CORNER_TOP_LEFT][ACTIVE], theme, "top-left-active.xpm", colsym, 20);
-    loadPixmap(dpy, &params.corners[CORNER_TOP_LEFT][INACTIVE], theme, "top-left-inactive.xpm", colsym, 20);
-    loadPixmap(dpy, &params.corners[CORNER_TOP_RIGHT][ACTIVE], theme, "top-right-active.xpm", colsym, 20);
-    loadPixmap(dpy, &params.corners[CORNER_TOP_RIGHT][INACTIVE], theme, "top-right-inactive.xpm", colsym, 20);
-    loadPixmap(dpy, &params.corners[CORNER_BOTTOM_LEFT][ACTIVE], theme, "bottom-left-active.xpm", colsym, 20);
-    loadPixmap(dpy, &params.corners[CORNER_BOTTOM_LEFT][INACTIVE], theme, "bottom-left-inactive.xpm", colsym, 20);
-    loadPixmap(dpy, &params.corners[CORNER_BOTTOM_RIGHT][ACTIVE], theme, "bottom-right-active.xpm", colsym, 20);
-    loadPixmap(dpy, &params.corners[CORNER_BOTTOM_RIGHT][INACTIVE], theme, "bottom-right-inactive.xpm", colsym, 20);
-    loadPixmap(dpy, &params.buttons[HIDE_BUTTON][ACTIVE], theme, "hide-active.xpm", colsym, 20);
-    loadPixmap(dpy, &params.buttons[HIDE_BUTTON][INACTIVE], theme, "hide-inactive.xpm", colsym, 20);
-    loadPixmap(dpy, &params.buttons[HIDE_BUTTON][PRESSED], theme, "hide-pressed.xpm", colsym, 20);
-    loadPixmap(dpy, &params.buttons[CLOSE_BUTTON][ACTIVE], theme, "close-active.xpm", colsym, 20);
-    loadPixmap(dpy, &params.buttons[CLOSE_BUTTON][INACTIVE], theme, "close-inactive.xpm", colsym, 20);
-    loadPixmap(dpy, &params.buttons[CLOSE_BUTTON][PRESSED], theme, "close-pressed.xpm", colsym, 20);
-    loadPixmap(dpy, &params.buttons[MAXIMIZE_BUTTON][ACTIVE], theme, "maximize-active.xpm", colsym, 20);
-    loadPixmap(dpy, &params.buttons[MAXIMIZE_BUTTON][INACTIVE], theme, "maximize-inactive.xpm", colsym, 20);
-    loadPixmap(dpy, &params.buttons[MAXIMIZE_BUTTON][PRESSED], theme, "maximize-pressed.xpm", colsym, 20);
-    loadPixmap(dpy, &params.buttons[SHADE_BUTTON][ACTIVE], theme, "shade-active.xpm", colsym, 20);
-    loadPixmap(dpy, &params.buttons[SHADE_BUTTON][INACTIVE], theme, "shade-inactive.xpm", colsym, 20);
-    loadPixmap(dpy, &params.buttons[SHADE_BUTTON][PRESSED], theme, "shade-pressed.xpm", colsym, 20);
-    loadPixmap(dpy, &params.buttons[STICK_BUTTON][ACTIVE], theme, "stick-active.xpm", colsym, 20);
-    loadPixmap(dpy, &params.buttons[STICK_BUTTON][INACTIVE], theme, "stick-inactive.xpm", colsym, 20);
-    loadPixmap(dpy, &params.buttons[STICK_BUTTON][PRESSED], theme, "stick-pressed.xpm", colsym, 20);
-    loadPixmap(dpy, &params.buttons[MENU_BUTTON][ACTIVE], theme, "menu-active.xpm", colsym, 20);
-    loadPixmap(dpy, &params.buttons[MENU_BUTTON][INACTIVE], theme, "menu-inactive.xpm", colsym, 20);
-    loadPixmap(dpy, &params.buttons[MENU_BUTTON][PRESSED], theme, "menu-pressed.xpm", colsym, 20);
-    loadPixmap(dpy, &params.buttons[SHADE_BUTTON][T_ACTIVE], theme, "shade-toggled-active.xpm", colsym, 20);
-    loadPixmap(dpy, &params.buttons[SHADE_BUTTON][T_INACTIVE], theme, "shade-toggled-inactive.xpm", colsym, 20);
-    loadPixmap(dpy, &params.buttons[SHADE_BUTTON][T_PRESSED], theme, "shade-toggled-pressed.xpm", colsym, 20);
-    loadPixmap(dpy, &params.buttons[STICK_BUTTON][T_ACTIVE], theme, "stick-toggled-active.xpm", colsym, 20);
-    loadPixmap(dpy, &params.buttons[STICK_BUTTON][T_INACTIVE], theme, "stick-toggled-inactive.xpm", colsym, 20);
-    loadPixmap(dpy, &params.buttons[STICK_BUTTON][T_PRESSED], theme, "stick-toggled-pressed.xpm", colsym, 20);
-    loadPixmap(dpy, &params.buttons[MAXIMIZE_BUTTON][T_ACTIVE], theme, "maximize-toggled-active.xpm", colsym, 20);
-    loadPixmap(dpy, &params.buttons[MAXIMIZE_BUTTON][T_INACTIVE], theme, "maximize-toggled-inactive.xpm", colsym, 20);
-    loadPixmap(dpy, &params.buttons[MAXIMIZE_BUTTON][T_PRESSED], theme, "maximize-toggled-pressed.xpm", colsym, 20);
-    loadPixmap(dpy, &params.title[TITLE_1][ACTIVE], theme, "title-1-active.xpm", colsym, 20);
-    loadPixmap(dpy, &params.title[TITLE_1][INACTIVE], theme, "title-1-inactive.xpm", colsym, 20);
-    loadPixmap(dpy, &params.title[TITLE_2][ACTIVE], theme, "title-2-active.xpm", colsym, 20);
-    loadPixmap(dpy, &params.title[TITLE_2][INACTIVE], theme, "title-2-inactive.xpm", colsym, 20);
-    loadPixmap(dpy, &params.title[TITLE_3][ACTIVE], theme, "title-3-active.xpm", colsym, 20);
-    loadPixmap(dpy, &params.title[TITLE_3][INACTIVE], theme, "title-3-inactive.xpm", colsym, 20);
-    loadPixmap(dpy, &params.title[TITLE_4][ACTIVE], theme, "title-4-active.xpm", colsym, 20);
-    loadPixmap(dpy, &params.title[TITLE_4][INACTIVE], theme, "title-4-inactive.xpm", colsym, 20);
-    loadPixmap(dpy, &params.title[TITLE_5][ACTIVE], theme, "title-5-active.xpm", colsym, 20);
-    loadPixmap(dpy, &params.title[TITLE_5][INACTIVE], theme, "title-5-inactive.xpm", colsym, 20);
+    myPixmapLoad(dpy, &params.sides[SIDE_LEFT][ACTIVE], theme, "left-active.xpm", colsym, 20);
+    myPixmapLoad(dpy, &params.sides[SIDE_LEFT][INACTIVE], theme, "left-inactive.xpm", colsym, 20);
+    myPixmapLoad(dpy, &params.sides[SIDE_RIGHT][ACTIVE], theme, "right-active.xpm", colsym, 20);
+    myPixmapLoad(dpy, &params.sides[SIDE_RIGHT][INACTIVE], theme, "right-inactive.xpm", colsym, 20);
+    myPixmapLoad(dpy, &params.sides[SIDE_BOTTOM][ACTIVE], theme, "bottom-active.xpm", colsym, 20);
+    myPixmapLoad(dpy, &params.sides[SIDE_BOTTOM][INACTIVE], theme, "bottom-inactive.xpm", colsym, 20);
+    myPixmapLoad(dpy, &params.corners[CORNER_TOP_LEFT][ACTIVE], theme, "top-left-active.xpm", colsym, 20);
+    myPixmapLoad(dpy, &params.corners[CORNER_TOP_LEFT][INACTIVE], theme, "top-left-inactive.xpm", colsym, 20);
+    myPixmapLoad(dpy, &params.corners[CORNER_TOP_RIGHT][ACTIVE], theme, "top-right-active.xpm", colsym, 20);
+    myPixmapLoad(dpy, &params.corners[CORNER_TOP_RIGHT][INACTIVE], theme, "top-right-inactive.xpm", colsym, 20);
+    myPixmapLoad(dpy, &params.corners[CORNER_BOTTOM_LEFT][ACTIVE], theme, "bottom-left-active.xpm", colsym, 20);
+    myPixmapLoad(dpy, &params.corners[CORNER_BOTTOM_LEFT][INACTIVE], theme, "bottom-left-inactive.xpm", colsym, 20);
+    myPixmapLoad(dpy, &params.corners[CORNER_BOTTOM_RIGHT][ACTIVE], theme, "bottom-right-active.xpm", colsym, 20);
+    myPixmapLoad(dpy, &params.corners[CORNER_BOTTOM_RIGHT][INACTIVE], theme, "bottom-right-inactive.xpm", colsym, 20);
+    myPixmapLoad(dpy, &params.buttons[HIDE_BUTTON][ACTIVE], theme, "hide-active.xpm", colsym, 20);
+    myPixmapLoad(dpy, &params.buttons[HIDE_BUTTON][INACTIVE], theme, "hide-inactive.xpm", colsym, 20);
+    myPixmapLoad(dpy, &params.buttons[HIDE_BUTTON][PRESSED], theme, "hide-pressed.xpm", colsym, 20);
+    myPixmapLoad(dpy, &params.buttons[CLOSE_BUTTON][ACTIVE], theme, "close-active.xpm", colsym, 20);
+    myPixmapLoad(dpy, &params.buttons[CLOSE_BUTTON][INACTIVE], theme, "close-inactive.xpm", colsym, 20);
+    myPixmapLoad(dpy, &params.buttons[CLOSE_BUTTON][PRESSED], theme, "close-pressed.xpm", colsym, 20);
+    myPixmapLoad(dpy, &params.buttons[MAXIMIZE_BUTTON][ACTIVE], theme, "maximize-active.xpm", colsym, 20);
+    myPixmapLoad(dpy, &params.buttons[MAXIMIZE_BUTTON][INACTIVE], theme, "maximize-inactive.xpm", colsym, 20);
+    myPixmapLoad(dpy, &params.buttons[MAXIMIZE_BUTTON][PRESSED], theme, "maximize-pressed.xpm", colsym, 20);
+    myPixmapLoad(dpy, &params.buttons[SHADE_BUTTON][ACTIVE], theme, "shade-active.xpm", colsym, 20);
+    myPixmapLoad(dpy, &params.buttons[SHADE_BUTTON][INACTIVE], theme, "shade-inactive.xpm", colsym, 20);
+    myPixmapLoad(dpy, &params.buttons[SHADE_BUTTON][PRESSED], theme, "shade-pressed.xpm", colsym, 20);
+    myPixmapLoad(dpy, &params.buttons[STICK_BUTTON][ACTIVE], theme, "stick-active.xpm", colsym, 20);
+    myPixmapLoad(dpy, &params.buttons[STICK_BUTTON][INACTIVE], theme, "stick-inactive.xpm", colsym, 20);
+    myPixmapLoad(dpy, &params.buttons[STICK_BUTTON][PRESSED], theme, "stick-pressed.xpm", colsym, 20);
+    myPixmapLoad(dpy, &params.buttons[MENU_BUTTON][ACTIVE], theme, "menu-active.xpm", colsym, 20);
+    myPixmapLoad(dpy, &params.buttons[MENU_BUTTON][INACTIVE], theme, "menu-inactive.xpm", colsym, 20);
+    myPixmapLoad(dpy, &params.buttons[MENU_BUTTON][PRESSED], theme, "menu-pressed.xpm", colsym, 20);
+    myPixmapLoad(dpy, &params.buttons[SHADE_BUTTON][T_ACTIVE], theme, "shade-toggled-active.xpm", colsym, 20);
+    myPixmapLoad(dpy, &params.buttons[SHADE_BUTTON][T_INACTIVE], theme, "shade-toggled-inactive.xpm", colsym, 20);
+    myPixmapLoad(dpy, &params.buttons[SHADE_BUTTON][T_PRESSED], theme, "shade-toggled-pressed.xpm", colsym, 20);
+    myPixmapLoad(dpy, &params.buttons[STICK_BUTTON][T_ACTIVE], theme, "stick-toggled-active.xpm", colsym, 20);
+    myPixmapLoad(dpy, &params.buttons[STICK_BUTTON][T_INACTIVE], theme, "stick-toggled-inactive.xpm", colsym, 20);
+    myPixmapLoad(dpy, &params.buttons[STICK_BUTTON][T_PRESSED], theme, "stick-toggled-pressed.xpm", colsym, 20);
+    myPixmapLoad(dpy, &params.buttons[MAXIMIZE_BUTTON][T_ACTIVE], theme, "maximize-toggled-active.xpm", colsym, 20);
+    myPixmapLoad(dpy, &params.buttons[MAXIMIZE_BUTTON][T_INACTIVE], theme, "maximize-toggled-inactive.xpm", colsym, 20);
+    myPixmapLoad(dpy, &params.buttons[MAXIMIZE_BUTTON][T_PRESSED], theme, "maximize-toggled-pressed.xpm", colsym, 20);
+    myPixmapLoad(dpy, &params.title[TITLE_1][ACTIVE], theme, "title-1-active.xpm", colsym, 20);
+    myPixmapLoad(dpy, &params.title[TITLE_1][INACTIVE], theme, "title-1-inactive.xpm", colsym, 20);
+    myPixmapLoad(dpy, &params.title[TITLE_2][ACTIVE], theme, "title-2-active.xpm", colsym, 20);
+    myPixmapLoad(dpy, &params.title[TITLE_2][INACTIVE], theme, "title-2-inactive.xpm", colsym, 20);
+    myPixmapLoad(dpy, &params.title[TITLE_3][ACTIVE], theme, "title-3-active.xpm", colsym, 20);
+    myPixmapLoad(dpy, &params.title[TITLE_3][INACTIVE], theme, "title-3-inactive.xpm", colsym, 20);
+    myPixmapLoad(dpy, &params.title[TITLE_4][ACTIVE], theme, "title-4-active.xpm", colsym, 20);
+    myPixmapLoad(dpy, &params.title[TITLE_4][INACTIVE], theme, "title-4-inactive.xpm", colsym, 20);
+    myPixmapLoad(dpy, &params.title[TITLE_5][ACTIVE], theme, "title-5-active.xpm", colsym, 20);
+    myPixmapLoad(dpy, &params.title[TITLE_5][INACTIVE], theme, "title-5-inactive.xpm", colsym, 20);
 
     if(!g_ascii_strcasecmp("left", getValue("title_alignment", rc)))
     {
@@ -908,27 +908,27 @@ static void unloadTheme(void)
 
     for(i = 0; i < 3; i++)
     {
-        freePixmap(dpy, &params.sides[i][ACTIVE]);
-        freePixmap(dpy, &params.sides[i][INACTIVE]);
+        myPixmapFree(dpy, &params.sides[i][ACTIVE]);
+        myPixmapFree(dpy, &params.sides[i][INACTIVE]);
     }
     for(i = 0; i < 4; i++)
     {
-        freePixmap(dpy, &params.corners[i][ACTIVE]);
-        freePixmap(dpy, &params.corners[i][INACTIVE]);
+        myPixmapFree(dpy, &params.corners[i][ACTIVE]);
+        myPixmapFree(dpy, &params.corners[i][INACTIVE]);
     }
     for(i = 0; i < BUTTON_COUNT; i++)
     {
-        freePixmap(dpy, &params.buttons[i][ACTIVE]);
-        freePixmap(dpy, &params.buttons[i][INACTIVE]);
-        freePixmap(dpy, &params.buttons[i][PRESSED]);
-        freePixmap(dpy, &params.buttons[i][T_ACTIVE]);
-        freePixmap(dpy, &params.buttons[i][T_INACTIVE]);
-        freePixmap(dpy, &params.buttons[i][T_PRESSED]);
+        myPixmapFree(dpy, &params.buttons[i][ACTIVE]);
+        myPixmapFree(dpy, &params.buttons[i][INACTIVE]);
+        myPixmapFree(dpy, &params.buttons[i][PRESSED]);
+        myPixmapFree(dpy, &params.buttons[i][T_ACTIVE]);
+        myPixmapFree(dpy, &params.buttons[i][T_INACTIVE]);
+        myPixmapFree(dpy, &params.buttons[i][T_PRESSED]);
     }
     for(i = 0; i < 5; i++)
     {
-        freePixmap(dpy, &params.title[i][ACTIVE]);
-        freePixmap(dpy, &params.title[i][INACTIVE]);
+        myPixmapFree(dpy, &params.title[i][ACTIVE]);
+        myPixmapFree(dpy, &params.title[i][INACTIVE]);
     }
     if(params.box_gc != None)
     {
@@ -977,27 +977,27 @@ gboolean initSettings(void)
     }
     for(i = 0; i < 3; i++)
     {
-        initPixmap(&params.sides[i][ACTIVE]);
-        initPixmap(&params.sides[i][INACTIVE]);
+        myPixmapInit(&params.sides[i][ACTIVE]);
+        myPixmapInit(&params.sides[i][INACTIVE]);
     }
     for(i = 0; i < 4; i++)
     {
-        initPixmap(&params.corners[i][ACTIVE]);
-        initPixmap(&params.corners[i][INACTIVE]);
+        myPixmapInit(&params.corners[i][ACTIVE]);
+        myPixmapInit(&params.corners[i][INACTIVE]);
     }
     for(i = 0; i < BUTTON_COUNT; i++)
     {
-        initPixmap(&params.buttons[i][ACTIVE]);
-        initPixmap(&params.buttons[i][INACTIVE]);
-        initPixmap(&params.buttons[i][PRESSED]);
-        initPixmap(&params.buttons[i][T_ACTIVE]);
-        initPixmap(&params.buttons[i][T_INACTIVE]);
-        initPixmap(&params.buttons[i][T_PRESSED]);
+        myPixmapInit(&params.buttons[i][ACTIVE]);
+        myPixmapInit(&params.buttons[i][INACTIVE]);
+        myPixmapInit(&params.buttons[i][PRESSED]);
+        myPixmapInit(&params.buttons[i][T_ACTIVE]);
+        myPixmapInit(&params.buttons[i][T_INACTIVE]);
+        myPixmapInit(&params.buttons[i][T_PRESSED]);
     }
     for(i = 0; i < 5; i++)
     {
-        initPixmap(&params.title[i][ACTIVE]);
-        initPixmap(&params.title[i][INACTIVE]);
+        myPixmapInit(&params.title[i][ACTIVE]);
+        myPixmapInit(&params.title[i][INACTIVE]);
     }
     if(!mcs_client_check_manager(dpy, screen, "xfce-mcs-manager"))
     {
diff --git a/src/settings.h b/src/settings.h
index aa9a14c35..db056afe8 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -28,7 +28,7 @@
 #include <glib.h>
 #include <gdk/gdk.h>
 #include "keyboard.h"
-#include "pixmap.h"
+#include "mypixmap.h"
 
 #define CORNER_TOP_LEFT                 0
 #define CORNER_TOP_RIGHT                1
diff --git a/src/workspaces.c b/src/workspaces.c
index aed17d251..7c2173342 100644
--- a/src/workspaces.c
+++ b/src/workspaces.c
@@ -108,13 +108,6 @@ void workspaceSwitch(int new_ws, Client * c2)
     data[0] = new_ws;
     XChangeProperty(dpy, root, net_current_desktop, XA_CARDINAL, 32, PropModeReplace, (unsigned char *)data, 1);
     workspaceUpdateArea(margins, gnome_margins);
-    /* Just get rid of EnterNotify events when using focus follow mouse */
-    XSync(dpy, 0);
-    if(!params.click_to_focus)
-    {
-        while(XCheckTypedEvent(dpy, EnterNotify, &an_event))
-            ;
-    }
     clientSetFocus(f, TRUE);
 }