New header file startup.h

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

The prototypes included were moved from funcs.h.

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

src/Makefile.am

@@ -74,6 +74,7 @@ wmaker_SOURCES = 	\
 	stacking.c \
 	stacking.h \
 	startup.c \
+	startup.h \
 	superfluous.c \
 	superfluous.h \
 	switchmenu.c \

src/funcs.h

@@ -61,22 +61,6 @@ int MonitorLoop(int argc, char **argv);
 Bool GetCommandForPid(int pid, char ***argv, int *argc);
 
 
-/* ---[ startup.c ]------------------------------------------------------- */
-
-void StartUp(Bool defaultScreenOnly);
-
-void wHackedGrabButton(unsigned int button, unsigned int modifiers,
-                       Window grab_window, Bool owner_events,
-                       unsigned int event_mask, int pointer_mode,
-                       int keyboard_mode, Window confine_to, Cursor cursor);
-
-#ifdef NUMLOCK_HACK
-void wHackedGrabKey(int keycode, unsigned int modifiers,
-                    Window grab_window, Bool owner_events, int pointer_mode,
-                    int keyboard_mode);
-#endif
-
-
 /* ---[ switchmenu.c ]---------------------------------------------------- */
 
 void UpdateSwitchMenu(WScreen *scr, WWindow *wwin, int action);

src/icon.c

@@ -44,6 +44,7 @@
 #include "appicon.h"
 #include "wmspec.h"
 #include "misc.h"
+#include "startup.h"
 
 /**** Global varianebles ****/
 extern WPreferences wPreferences;

src/main.c

@@ -46,6 +46,7 @@
 #include "WindowMaker.h"
 #include "window.h"
 #include "funcs.h"
+#include "startup.h"
 #include "menu.h"
 #include "keybind.h"
 #include "xmodifier.h"

src/rootmenu.c

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

src/startup.c

@@ -56,7 +56,7 @@
 #include "actions.h"
 #include "client.h"
 #include "main.h"
-#include "funcs.h"
+#include "startup.h"
 #include "dock.h"
 #include "workspace.h"
 #include "keybind.h"

src/startup.h

@@ -0,0 +1,38 @@
+/*
+ *  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 WMSTARTUP_H
+#define WMSTARTUP_H
+
+void StartUp(Bool defaultScreenOnly);
+
+void wHackedGrabButton(unsigned int button, unsigned int modifiers,
+		       Window grab_window, Bool owner_events,
+		       unsigned int event_mask, int pointer_mode,
+		       int keyboard_mode, Window confine_to, Cursor cursor);
+
+#ifdef NUMLOCK_HACK
+void wHackedGrabKey(int keycode, unsigned int modifiers,
+		    Window grab_window, Bool owner_events, int pointer_mode,
+		    int keyboard_mode);
+#endif
+
+#endif /* WMSTARTUP_H */

src/window.c

@@ -61,6 +61,7 @@
 #include "rootmenu.h"
 #include "placement.h"
 #include "misc.h"
+#include "startup.h"
 
 #ifdef MWM_HINTS
 # include "motif.h"