From: "Rodolfo García Peñas (kix)" <[email protected]> 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) <[email protected]> --- src/Makefile.am | 1 + src/funcs.h | 16 ---------------- src/icon.c | 1 + src/main.c | 1 + src/rootmenu.c | 1 + src/startup.c | 2 +- src/startup.h | 38 ++++++++++++++++++++++++++++++++++++++ src/window.c | 1 + 8 files changed, 44 insertions(+), 17 deletions(-) create mode 100644 src/startup.h diff --git a/src/Makefile.am b/src/Makefile.am index 2d1bd2b..1f019ce 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -74,6 +74,7 @@ wmaker_SOURCES = \ stacking.c \ stacking.h \ startup.c \ + startup.h \ superfluous.c \ superfluous.h \ switchmenu.c \ diff --git a/src/funcs.h b/src/funcs.h index b996856..2879c98 100644 --- a/src/funcs.h +++ b/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); diff --git a/src/icon.c b/src/icon.c index 95d3dd7..a6bbca6 100644 --- a/src/icon.c +++ b/src/icon.c @@ -44,6 +44,7 @@ #include "appicon.h" #include "wmspec.h" #include "misc.h" +#include "startup.h" /**** Global varianebles ****/ extern WPreferences wPreferences; diff --git a/src/main.c b/src/main.c index b1958e8..777363a 100644 --- a/src/main.c +++ b/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" diff --git a/src/rootmenu.c b/src/rootmenu.c index f93e5bf..de602d5 100644 --- a/src/rootmenu.c +++ b/src/rootmenu.c @@ -53,6 +53,7 @@ #include "shutdown.h" #include "xmodifier.h" #include "rootmenu.h" +#include "startup.h" #include <WINGs/WUtil.h> diff --git a/src/startup.c b/src/startup.c index 94f88aa..1d82c2a 100644 --- a/src/startup.c +++ b/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" diff --git a/src/startup.h b/src/startup.h new file mode 100644 index 0000000..aba3c37 --- /dev/null +++ b/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 */ diff --git a/src/window.c b/src/window.c index 9ac5e78..1dee587 100644 --- a/src/window.c +++ b/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" -- 1.7.10.4 -- To unsubscribe, send mail to [email protected].
