New colormap header file and remove unused functions

The functions related to colormap are moved from funcs.h to the new
file colormap.h. These files are included where needed.

The functions wColormapInstallRoot and wColormapUninstallRoot are
removed, because they are not used.

src/actions.c

@@ -35,7 +35,7 @@
 #include "window.h"
 #include "client.h"
 #include "icon.h"
-#include "funcs.h"
+#include "colormap.h"
 #include "application.h"
 #include "actions.h"
 #include "stacking.h"

src/client.c

@@ -37,7 +37,7 @@
 #include "actions.h"
 #include "icon.h"
 #include "client.h"
-#include "funcs.h"
+#include "colormap.h"
 #include "stacking.h"
 #include "appicon.h"
 #include "appmenu.h"

src/colormap.c

@@ -92,26 +92,6 @@ void wColormapInstallForWindow(WScreen * scr, WWindow * wwin)
 	XSync(dpy, False);
 }
 
-void wColormapInstallRoot(WScreen * scr)
-{
-	if (scr->root_colormap_install_count == 0) {
-		wColormapInstallForWindow(scr, NULL);
-		scr->original_cmap_window = scr->cmap_window;
-	}
-	scr->root_colormap_install_count++;
-}
-
-void wColormapUninstallRoot(WScreen * scr)
-{
-	if (scr->root_colormap_install_count > 0)
-		scr->root_colormap_install_count--;
-
-	if (scr->root_colormap_install_count == 0) {
-		wColormapInstallForWindow(scr, scr->original_cmap_window);
-		scr->original_cmap_window = NULL;
-	}
-}
-
 void wColormapAllowClientInstallation(WScreen * scr, Bool starting)
 {
 	scr->flags.colormap_stuff_blocked = starting;

src/colormap.h

@@ -0,0 +1,27 @@
+/*
+ *  Window Maker window manager
+ *
+ *  Copyright (c) 2000-2003 Alfredo K. Kojima
+ *
+ *  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, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef WMCOLORMAP_H
+#define WMCOLORMAP_H
+
+void wColormapInstallForWindow(WScreen *scr, WWindow *wwin);
+void wColormapAllowClientInstallation(WScreen * scr, Bool starting);
+
+#endif /* WMCOLORMAP_H */

src/event.c

@@ -67,6 +67,7 @@
 #include "xinerama.h"
 #include "wmspec.h"
 #include "rootmenu.h"
+#include "colormap.h"
 
 /******** Global Variables **********/
 extern XContext wWinContext;

src/funcs.h

@@ -41,10 +41,6 @@ void OpenWindowMenu2(WWindow *wwin, int x, int y, int keyboard);
 void OpenMiniwindowMenu(WWindow *wwin, int x, int y);
 void CloseWindowMenu(WScreen *scr);
 void DestroyWindowMenu(WScreen *scr);
-void wColormapInstallForWindow(WScreen *scr, WWindow *wwin);
-void wColormapInstallRoot(WScreen *scr);
-void wColormapUninstallRoot(WScreen *scr);
-void wColormapAllowClientInstallation(WScreen *scr, Bool starting);
 void PlaceIcon(WScreen *scr, int *x_ret, int *y_ret, int head);
 void StartWindozeCycle(WWindow *wwin, XEvent *event, Bool next, Bool class_only);
 void SendHelperMessage(WScreen *scr, char type, int workspace, char *msg);

src/shutdown.c

@@ -36,6 +36,7 @@
 #include "session.h"
 #include "winspector.h"
 #include "wmspec.h"
+#include "colormap.h"
 
 extern Atom _XA_WM_DELETE_WINDOW;
 extern Time LastTimestamp;

src/window.c

@@ -50,6 +50,7 @@
 #include "actions.h"
 #include "client.h"
 #include "funcs.h"
+#include "colormap.h"
 #include "keybind.h"
 #include "stacking.h"
 #include "defaults.h"