New header file switchmenu.h

The file switchmenu.h includes the function prototypes for switchmenu.c.

The prototypes included were moved from funcs.h.

Signed-off-by: Rodolfo García Peñas (kix) <kix@kix.es>

src/Makefile.am

@@ -81,6 +81,7 @@ wmaker_SOURCES = 	\
 	superfluous.c \
 	superfluous.h \
 	switchmenu.c \
+	switchmenu.h \
 	texture.c \
 	texture.h \
 	usermenu.c \

src/event.c

@@ -74,6 +74,7 @@
 #include "misc.h"
 #include "event.h"
 #include "winmenu.h"
+#include "switchmenu.h"
 
 /******** Global Variables **********/
 extern XContext wWinContext;

src/funcs.h

@@ -36,11 +36,4 @@ typedef void (WDeathHandler)(pid_t pid, unsigned int status, void *cdata);
 
 Bool GetCommandForPid(int pid, char ***argv, int *argc);
 
-
-/* ---[ switchmenu.c ]---------------------------------------------------- */
-
-void UpdateSwitchMenu(WScreen *scr, WWindow *wwin, int action);
-void OpenSwitchMenu(WScreen *scr, int x, int y, int keyboard);
-void InitializeSwitchMenu(void);
-
 #endif

src/menu.c

@@ -43,6 +43,7 @@
 #include "workspace.h"
 #include "dialog.h"
 #include "rootmenu.h"
+#include "switchmenu.h"
 
 /****** Global Variables ******/
 

src/rootmenu.c

@@ -54,6 +54,7 @@
 #include "xmodifier.h"
 #include "rootmenu.h"
 #include "startup.h"
+#include "switchmenu.h"
 
 #include <WINGs/WUtil.h>
 

src/startup.c

@@ -67,6 +67,7 @@
 #include "dialog.h"
 #include "wmspec.h"
 #include "event.h"
+#include "switchmenu.h"
 #ifdef XDND
 #include "xdnd.h"
 #endif

src/switchmenu.c

@@ -37,6 +37,7 @@
 #include "stacking.h"
 #include "workspace.h"
 #include "framewin.h"
+#include "switchmenu.h"
 
 #define IS_GNUSTEP_MENU(w) ((w)->wm_gnustep_attr && \
 	((w)->wm_gnustep_attr->flags & GSWindowLevelAttr) && \

src/switchmenu.h

@@ -0,0 +1,29 @@
+/*
+ *  Window Maker window manager
+ *
+ *  Copyright (c) 1997-2003 Alfredo K. Kojima
+ *  Copyright (c) 2013 Window Maker Team
+ *
+ *  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 WMSWITCHMENU_H
+#define WMSWITCHMENU_H
+
+void UpdateSwitchMenu(WScreen *scr, WWindow *wwin, int action);
+void OpenSwitchMenu(WScreen *scr, int x, int y, int keyboard);
+void InitializeSwitchMenu(void);
+
+#endif /* WMSWITCHMENU_H */

src/winspector.c

@@ -47,6 +47,7 @@
 #include "client.h"
 #include "wmspec.h"
 #include "misc.h"
+#include "switchmenu.h"
 
 #include <WINGs/WUtil.h>