This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project wmaker-crm.git.
The branch, next has been updated
via 5455a585dc86cebd666ea41499519ea18e6172f0 (commit)
via ed80a9bf5c02abbe581b0a46d75a01ded1f328af (commit)
via 9ededf6cb2561624130e39123ee6003f36230d00 (commit)
via 20a695f70f70f0ef3c7bc002c73ed07376a1af6b (commit)
via 8aca1b816f39b1b6846c37bcc24d6db83eebe7b4 (commit)
via 157209a035914a64ece48efd7d60a967d0e49394 (commit)
via 583235bb36f0a125202ba1480b0189a3209a9ffc (commit)
via 68cdba0e29b623b43558adbb03a4385034f8244a (commit)
from dd8d320619316e3ca9361f03366fde906f4be100 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://repo.or.cz/w/wmaker-crm.git/commit/5455a585dc86cebd666ea41499519ea18e6172f0
commit 5455a585dc86cebd666ea41499519ea18e6172f0
Author: Rodolfo GarcÃa Peñas (kix) <[email protected]>
Date: Wed May 15 13:07:57 2013 +0200
funcs.h removed
The file funcs.h is removed. A new file osdep.h is created to hold
the definition for all osdep_*c files.
The files .c has been adjusted to include the right header files,
removing funcs.h, including osdep.h.
Signed-off-by: Rodolfo GarcÃa Peñas (kix) <[email protected]>
diff --git a/src/Makefile.am b/src/Makefile.am
index 3df6742..41a7e83 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -41,7 +41,7 @@ wmaker_SOURCES = framewin.h geomview.c
geomview.h - funcs.h + osdep.h icon.c icon.h
keybind.h diff --git a/src/application.c b/src/application.c
index abe1d2d..1bb0890 100644
--- a/src/application.c
+++ b/src/application.c
@@ -35,6 +35,7 @@
#include "properties.h"
#include "workspace.h"
#include "dock.h"
+#include "defaults.h"
/******** Global variables ********/
diff --git a/src/appmenu.c b/src/appmenu.c
index 0d6c7f4..343797b 100644
--- a/src/appmenu.c
+++ b/src/appmenu.c
@@ -33,7 +33,6 @@
#include "WindowMaker.h"
#include "menu.h"
#include "actions.h"
-#include "funcs.h"
#include "appmenu.h"
#include "framewin.h"
diff --git a/src/balloon.c b/src/balloon.c
index c00375a..a904fe0 100644
--- a/src/balloon.c
+++ b/src/balloon.c
@@ -22,6 +22,7 @@
#ifdef BALLOON_TEXT
+#include <stdio.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#ifdef SHAPED_BALLOON
@@ -39,7 +40,6 @@
#include "framewin.h"
#include "icon.h"
#include "appicon.h"
-#include "funcs.h"
#include "workspace.h"
#include "balloon.h"
diff --git a/src/dialog.c b/src/dialog.c
index 2c2e5d3..11d0325 100644
--- a/src/dialog.c
+++ b/src/dialog.c
@@ -51,6 +51,7 @@
#include "WindowMaker.h"
#include "GNUstep.h"
#include "screen.h"
+#include "window.h"
#include "dialog.h"
#include "misc.h"
#include "stacking.h"
diff --git a/src/dock.c b/src/dock.c
index 15d1679..b29fe62 100644
--- a/src/dock.c
+++ b/src/dock.c
@@ -24,6 +24,7 @@
#include <X11/Xlib.h>
#include <X11/Xutil.h>
+#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <strings.h>
diff --git a/src/dock.h b/src/dock.h
index 2c6c4bc..ffebb1e 100644
--- a/src/dock.h
+++ b/src/dock.h
@@ -23,10 +23,7 @@
#ifndef WMDOCK_H_
#define WMDOCK_H_
-
#include "appicon.h"
-#include "funcs.h"
-
typedef struct WDock {
WScreen *screen_ptr;
diff --git a/src/dockedapp.c b/src/dockedapp.c
index cc592e0..0ef180f 100644
--- a/src/dockedapp.c
+++ b/src/dockedapp.c
@@ -25,6 +25,7 @@
#include <X11/Xutil.h>
#include <stdlib.h>
#include <string.h>
+#include <stdio.h>
#include "WindowMaker.h"
#include "window.h"
diff --git a/src/event.h b/src/event.h
index 33a7a05..cfc245d 100644
--- a/src/event.h
+++ b/src/event.h
@@ -22,6 +22,8 @@
#ifndef WMEVENT_H
#define WMEVENT_H
+typedef void (WDeathHandler)(pid_t pid, unsigned int status, void *cdata);
+
void EventLoop(void);
void DispatchEvent(XEvent *event);
void ProcessPendingEvents(void);
diff --git a/src/framewin.c b/src/framewin.c
index 40fd2a3..7304da7 100644
--- a/src/framewin.c
+++ b/src/framewin.c
@@ -37,6 +37,7 @@
#include "resources.h"
#include "screen.h"
#include "wcore.h"
+#include "window.h"
#include "framewin.h"
#include "stacking.h"
#include "misc.h"
diff --git a/src/icon.h b/src/icon.h
index 368696f..e2c7d91 100644
--- a/src/icon.h
+++ b/src/icon.h
@@ -24,7 +24,6 @@
#include "wcore.h"
#include "window.h"
-#include "funcs.h"
#define TILE_NORMAL 0
#define TILE_CLIP 1
diff --git a/src/main.c b/src/main.c
index c087804..a0c096e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -45,7 +45,7 @@
#include "WindowMaker.h"
#include "window.h"
-#include "funcs.h"
+#include "defaults.h"
#include "event.h"
#include "startup.h"
#include "menu.h"
diff --git a/src/misc.c b/src/misc.c
index a791a4a..6b3336d 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -38,6 +38,7 @@
#include <WINGs/WUtil.h>
#include <wraster.h>
+#include "window.h"
#include "misc.h"
#include "WindowMaker.h"
#include "GNUstep.h"
diff --git a/src/misc.h b/src/misc.h
index 791bc59..39b4d32 100644
--- a/src/misc.h
+++ b/src/misc.h
@@ -21,9 +21,10 @@
#ifndef WMMISC_H_
#define WMMISC_H_
+#include "defaults.h"
+#include "keybind.h"
#include "appicon.h"
-
Bool wFetchName(Display *dpy, Window win, char **winname);
Bool wGetIconName(Display *dpy, Window win, char **iconname);
Bool UpdateDomainFile(WDDomain * domain);
diff --git a/src/monitor.c b/src/monitor.c
index 22eaaa9..d33372d 100644
--- a/src/monitor.c
+++ b/src/monitor.c
@@ -38,7 +38,6 @@
#include "window.h"
#include "dialog.h"
#include "main.h"
-#include "funcs.h"
/****** Global Variables ******/
extern WPreferences wPreferences;
diff --git a/src/motif.c b/src/motif.c
index 9db9db8..5fca916 100644
--- a/src/motif.c
+++ b/src/motif.c
@@ -35,7 +35,6 @@
#include "properties.h"
#include "icon.h"
#include "client.h"
-#include "funcs.h"
#include "motif.h"
/* Motif window hints */
diff --git a/src/moveres.c b/src/moveres.c
index 8f0ecba..3984906 100644
--- a/src/moveres.c
+++ b/src/moveres.c
@@ -34,7 +34,6 @@
#include "client.h"
#include "icon.h"
#include "dock.h"
-#include "funcs.h"
#include "actions.h"
#include "workspace.h"
#include "placement.h"
diff --git a/src/funcs.h b/src/osdep.h
similarity index 72%
rename from src/funcs.h
rename to src/osdep.h
index 1eb5d78..485995c 100644
--- a/src/funcs.h
+++ b/src/osdep.h
@@ -18,21 +18,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef WMFUNCS_H_
-#define WMFUNCS_H_
-
-#include <sys/types.h>
-#include <stdio.h>
-
-#include "window.h"
-#include "defaults.h"
-#include "keybind.h"
-
-typedef void (WCallBack)(void *cdata);
-typedef void (WDeathHandler)(pid_t pid, unsigned int status, void *cdata);
-
-
-/* ---[ osdep_*.c ]------------------------------------------------------- */
+#ifndef WMOSDEP_H_
+#define WMOSDEP_H_
Bool GetCommandForPid(int pid, char ***argv, int *argc);
diff --git a/src/osdep_bsd.c b/src/osdep_bsd.c
index e92a7c8..3393240 100644
--- a/src/osdep_bsd.c
+++ b/src/osdep_bsd.c
@@ -32,7 +32,7 @@
#include <WINGs/WUtil.h>
#include "wconfig.h"
-#include "funcs.h"
+#include "osdep.h"
/*
* copy argc and argv for an existing process identified by `pid'
diff --git a/src/osdep_darwin.c b/src/osdep_darwin.c
index 04ece9f..b3a7b4f 100644
--- a/src/osdep_darwin.c
+++ b/src/osdep_darwin.c
@@ -9,7 +9,7 @@
#include <WINGs/WUtil.h>
#include "wconfig.h"
-#include "funcs.h"
+#include "osdep.h"
/*
* copy argc and argv for an existing process identified by `pid'
diff --git a/src/osdep_linux.c b/src/osdep_linux.c
index 1336d2f..6d246e5 100644
--- a/src/osdep_linux.c
+++ b/src/osdep_linux.c
@@ -12,7 +12,7 @@
#include <WINGs/WUtil.h>
#include "wconfig.h"
-#include "funcs.h"
+#include "osdep.h"
#define RETRY( x ) do { diff --git
a/src/osdep_stub.c b/src/osdep_stub.c
index d0349cd..18b170c 100644
--- a/src/osdep_stub.c
+++ b/src/osdep_stub.c
@@ -4,7 +4,7 @@
#include <WINGs/WUtil.h>
#include "wconfig.h"
-#include "funcs.h"
+#include "osdep.h"
Bool GetCommandForPid(int pid, char ***argv, int *argc)
{
diff --git a/src/placement.c b/src/placement.c
index 1e70709..a445ec1 100644
--- a/src/placement.c
+++ b/src/placement.c
@@ -34,7 +34,6 @@
#include "icon.h"
#include "appicon.h"
#include "actions.h"
-#include "funcs.h"
#include "application.h"
#include "dock.h"
#include "xinerama.h"
diff --git a/src/screen.c b/src/screen.c
index c61aa1f..90b5445 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -45,7 +45,7 @@
#include "texture.h"
#include "pixmap.h"
#include "menu.h"
-#include "funcs.h"
+#include "window.h"
#include "main.h"
#include "actions.h"
#include "properties.h"
diff --git a/src/shutdown.c b/src/shutdown.c
index 67c39ab..23f02ac 100644
--- a/src/shutdown.c
+++ b/src/shutdown.c
@@ -30,7 +30,6 @@
#include "WindowMaker.h"
#include "window.h"
#include "client.h"
-#include "funcs.h"
#include "main.h"
#include "properties.h"
#include "session.h"
diff --git a/src/stacking.c b/src/stacking.c
index 890e4d1..f28e5b3 100644
--- a/src/stacking.c
+++ b/src/stacking.c
@@ -30,7 +30,6 @@
#include "WindowMaker.h"
#include "screen.h"
#include "window.h"
-#include "funcs.h"
#include "actions.h"
#include "properties.h"
#include "stacking.h"
diff --git a/src/texture.c b/src/texture.c
index 47258a5..b7ddf89 100644
--- a/src/texture.c
+++ b/src/texture.c
@@ -31,6 +31,7 @@
#include "WindowMaker.h"
#include "texture.h"
+#include "window.h"
#include "misc.h"
extern WPreferences wPreferences;
diff --git a/src/window.c b/src/window.c
index 5b42d0c..eb72223 100644
--- a/src/window.c
+++ b/src/window.c
@@ -63,6 +63,7 @@
#include "misc.h"
#include "startup.h"
#include "winmenu.h"
+#include "osdep.h"
#ifdef MWM_HINTS
# include "motif.h"
http://repo.or.cz/w/wmaker-crm.git/commit/ed80a9bf5c02abbe581b0a46d75a01ded1f328af
commit ed80a9bf5c02abbe581b0a46d75a01ded1f328af
Author: Rodolfo GarcÃa Peñas (kix) <[email protected]>
Date: Wed May 15 13:07:56 2013 +0200
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) <[email protected]>
diff --git a/src/Makefile.am b/src/Makefile.am
index 8c7f764..3df6742 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -81,6 +81,7 @@ wmaker_SOURCES = superfluous.c superfluous.h
switchmenu.c + switchmenu.h texture.c texture.h usermenu.c diff
--git a/src/event.c b/src/event.c
index 9f668f8..7a1993c 100644
--- a/src/event.c
+++ b/src/event.c
@@ -74,6 +74,7 @@
#include "misc.h"
#include "event.h"
#include "winmenu.h"
+#include "switchmenu.h"
/******** Global Variables **********/
extern XContext wWinContext;
diff --git a/src/funcs.h b/src/funcs.h
index 82d0734..1eb5d78 100644
--- a/src/funcs.h
+++ b/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
diff --git a/src/menu.c b/src/menu.c
index ddf01e6..337b9e3 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -43,6 +43,7 @@
#include "workspace.h"
#include "dialog.h"
#include "rootmenu.h"
+#include "switchmenu.h"
/****** Global Variables ******/
diff --git a/src/rootmenu.c b/src/rootmenu.c
index de602d5..f3c5671 100644
--- a/src/rootmenu.c
+++ b/src/rootmenu.c
@@ -54,6 +54,7 @@
#include "xmodifier.h"
#include "rootmenu.h"
#include "startup.h"
+#include "switchmenu.h"
#include <WINGs/WUtil.h>
diff --git a/src/startup.c b/src/startup.c
index 414ce0c..0175e7c 100644
--- a/src/startup.c
+++ b/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
diff --git a/src/switchmenu.c b/src/switchmenu.c
index a890bbb..227b7fa 100644
--- a/src/switchmenu.c
+++ b/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) && diff --git a/src/funcs.h
b/src/switchmenu.h
similarity index 66%
copy from src/funcs.h
copy to src/switchmenu.h
index 82d0734..810286a 100644
--- a/src/funcs.h
+++ b/src/switchmenu.h
@@ -2,6 +2,7 @@
* 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
@@ -18,29 +19,11 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef WMFUNCS_H_
-#define WMFUNCS_H_
-
-#include <sys/types.h>
-#include <stdio.h>
-
-#include "window.h"
-#include "defaults.h"
-#include "keybind.h"
-
-typedef void (WCallBack)(void *cdata);
-typedef void (WDeathHandler)(pid_t pid, unsigned int status, void *cdata);
-
-
-/* ---[ osdep_*.c ]------------------------------------------------------- */
-
-Bool GetCommandForPid(int pid, char ***argv, int *argc);
-
-
-/* ---[ switchmenu.c ]---------------------------------------------------- */
+#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
+#endif /* WMSWITCHMENU_H */
diff --git a/src/winspector.c b/src/winspector.c
index 41d3afb..59b56f2 100644
--- a/src/winspector.c
+++ b/src/winspector.c
@@ -47,6 +47,7 @@
#include "client.h"
#include "wmspec.h"
#include "misc.h"
+#include "switchmenu.h"
#include <WINGs/WUtil.h>
http://repo.or.cz/w/wmaker-crm.git/commit/9ededf6cb2561624130e39123ee6003f36230d00
commit 9ededf6cb2561624130e39123ee6003f36230d00
Author: Rodolfo GarcÃa Peñas (kix) <[email protected]>
Date: Wed May 15 13:07:55 2013 +0200
New header file winmenu.h
The file winmenu.h includes the function prototypes for winmenu.c.
The prototypes included were moved from funcs.h.
Signed-off-by: Rodolfo GarcÃa Peñas (kix) <[email protected]>
diff --git a/src/Makefile.am b/src/Makefile.am
index 126b51d..8c7f764 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -101,6 +101,7 @@ wmaker_SOURCES = window.c window.h
winmenu.c + winmenu.h winspector.h winspector.c wmspec.h diff
--git a/src/defaults.c b/src/defaults.c
index d82105c..50db1d4 100644
--- a/src/defaults.c
+++ b/src/defaults.c
@@ -63,6 +63,7 @@
#include "properties.h"
#include "misc.h"
#include "event.h"
+#include "winmenu.h"
#define MAX_SHORTCUT_LENGTH 32
diff --git a/src/event.c b/src/event.c
index d15b213..9f668f8 100644
--- a/src/event.c
+++ b/src/event.c
@@ -73,6 +73,7 @@
#include "shutdown.h"
#include "misc.h"
#include "event.h"
+#include "winmenu.h"
/******** Global Variables **********/
extern XContext wWinContext;
diff --git a/src/funcs.h b/src/funcs.h
index a9cb1c8..82d0734 100644
--- a/src/funcs.h
+++ b/src/funcs.h
@@ -43,13 +43,4 @@ void UpdateSwitchMenu(WScreen *scr, WWindow *wwin, int
action);
void OpenSwitchMenu(WScreen *scr, int x, int y, int keyboard);
void InitializeSwitchMenu(void);
-
-/* ---[ winmenu.c ]------------------------------------------------------- */
-
-void OpenWindowMenu(WWindow *wwin, int x, int y, int keyboard);
-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);
-
#endif
diff --git a/src/icon.c b/src/icon.c
index b292c88..6a93b7a 100644
--- a/src/icon.c
+++ b/src/icon.c
@@ -46,6 +46,7 @@
#include "misc.h"
#include "startup.h"
#include "event.h"
+#include "winmenu.h"
/**** Global varianebles ****/
extern WPreferences wPreferences;
diff --git a/src/menu.c b/src/menu.c
index 696daa0..ddf01e6 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -37,7 +37,7 @@
#include "framewin.h"
#include "menu.h"
#include "actions.h"
-#include "funcs.h"
+#include "winmenu.h"
#include "stacking.h"
#include "xinerama.h"
#include "workspace.h"
diff --git a/src/window.c b/src/window.c
index 1dee587..5b42d0c 100644
--- a/src/window.c
+++ b/src/window.c
@@ -62,6 +62,7 @@
#include "placement.h"
#include "misc.h"
#include "startup.h"
+#include "winmenu.h"
#ifdef MWM_HINTS
# include "motif.h"
diff --git a/src/winmenu.c b/src/winmenu.c
index aa2bb24..07735d2 100644
--- a/src/winmenu.c
+++ b/src/winmenu.c
@@ -46,6 +46,7 @@
#include "stacking.h"
#include "icon.h"
#include "xinerama.h"
+#include "winmenu.h"
#define MC_MAXIMIZE 0
#define MC_MINIATURIZE 1
diff --git a/src/winmenu.h b/src/winmenu.h
new file mode 100644
index 0000000..f8b6e88
--- /dev/null
+++ b/src/winmenu.h
@@ -0,0 +1,31 @@
+/*
+ * 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 WMWINMENU_H
+#define WMWINMENU_H
+
+void OpenWindowMenu(WWindow *wwin, int x, int y, int keyboard);
+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);
+
+#endif /* WMWINMENU_H */
http://repo.or.cz/w/wmaker-crm.git/commit/20a695f70f70f0ef3c7bc002c73ed07376a1af6b
commit 20a695f70f70f0ef3c7bc002c73ed07376a1af6b
Author: Rodolfo GarcÃa Peñas (kix) <[email protected]>
Date: Wed May 15 13:07:54 2013 +0200
New header file monitor.h
The file monitor.h includes the function prototypes for monitor.c.
The prototypes included were moved from funcs.h.
Signed-off-by: Rodolfo GarcÃa Peñas (kix) <[email protected]>
diff --git a/src/Makefile.am b/src/Makefile.am
index dc4d9ad..126b51d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -52,6 +52,7 @@ wmaker_SOURCES = misc.c misc.h
monitor.c + monitor.h motif.c motif.h moveres.c diff
--git a/src/funcs.h b/src/funcs.h
index f8666d1..a9cb1c8 100644
--- a/src/funcs.h
+++ b/src/funcs.h
@@ -32,11 +32,6 @@ typedef void (WCallBack)(void *cdata);
typedef void (WDeathHandler)(pid_t pid, unsigned int status, void *cdata);
-/* ---[ monitor.c ]------------------------------------------------------- */
-
-int MonitorLoop(int argc, char **argv);
-
-
/* ---[ osdep_*.c ]------------------------------------------------------- */
Bool GetCommandForPid(int pid, char ***argv, int *argc);
diff --git a/src/main.c b/src/main.c
index 11cbded..c087804 100644
--- a/src/main.c
+++ b/src/main.c
@@ -55,6 +55,7 @@
#include "shutdown.h"
#include "dialog.h"
#include "main.h"
+#include "monitor.h"
#include <WINGs/WUtil.h>
diff --git a/src/monitor.h b/src/monitor.h
new file mode 100644
index 0000000..fb9f7f1
--- /dev/null
+++ b/src/monitor.h
@@ -0,0 +1,27 @@
+/*
+ * 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 WMMONITOR_H
+#define WMMONITOR_H
+
+int MonitorLoop(int argc, char **argv);
+
+#endif /* WMMONITOR_H */
http://repo.or.cz/w/wmaker-crm.git/commit/8aca1b816f39b1b6846c37bcc24d6db83eebe7b4
commit 8aca1b816f39b1b6846c37bcc24d6db83eebe7b4
Author: Rodolfo GarcÃa Peñas (kix) <[email protected]>
Date: Wed May 15 13:07:53 2013 +0200
getWVisualID prototype moved to main.h
The prototype getWVisualID is moved to the file main.h, because
is implemented in main.c
Signed-off-by: Rodolfo GarcÃa Peñas (kix) <[email protected]>
diff --git a/src/funcs.h b/src/funcs.h
index 678c6a4..f8666d1 100644
--- a/src/funcs.h
+++ b/src/funcs.h
@@ -32,11 +32,6 @@ typedef void (WCallBack)(void *cdata);
typedef void (WDeathHandler)(pid_t pid, unsigned int status, void *cdata);
-/* ---[ main.c ]---------------------------------------------------------- */
-
-int getWVisualID(int screen);
-
-
/* ---[ monitor.c ]------------------------------------------------------- */
int MonitorLoop(int argc, char **argv);
diff --git a/src/main.h b/src/main.h
index d40a743..2198b74 100644
--- a/src/main.h
+++ b/src/main.h
@@ -29,5 +29,6 @@ void ExecuteShellCommand(WScreen *scr, char *command);
Bool RelaunchWindow(WWindow *wwin);
void wAbort(Bool dumpCore);
void ExecExitScript(void);
+int getWVisualID(int screen);
#endif
http://repo.or.cz/w/wmaker-crm.git/commit/157209a035914a64ece48efd7d60a967d0e49394
commit 157209a035914a64ece48efd7d60a967d0e49394
Author: Rodolfo GarcÃa Peñas (kix) <[email protected]>
Date: Wed May 15 13:07:52 2013 +0200
New header file event.h
The file event.h includes the function prototypes for event.c.
The prototypes included were moved from funcs.h.
Signed-off-by: Rodolfo GarcÃa Peñas (kix) <[email protected]>
diff --git a/src/Makefile.am b/src/Makefile.am
index 2415080..dc4d9ad 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -35,6 +35,7 @@ wmaker_SOURCES = dockedapp.h dock.h
event.c + event.h extend_pixmaps.h framewin.c
framewin.h diff --git a/src/actions.c b/src/actions.c
index 8a21e37..1417833 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -48,6 +48,7 @@
#include "usermenu.h"
#include "placement.h"
#include "misc.h"
+#include "event.h"
/****** Global Variables ******/
diff --git a/src/appicon.c b/src/appicon.c
index d6d8164..f863974 100644
--- a/src/appicon.c
+++ b/src/appicon.c
@@ -49,6 +49,7 @@
#include "client.h"
#include "placement.h"
#include "misc.h"
+#include "event.h"
#ifdef XDND
#include "xdnd.h"
#endif
diff --git a/src/defaults.c b/src/defaults.c
index 25d7fee..d82105c 100644
--- a/src/defaults.c
+++ b/src/defaults.c
@@ -62,6 +62,7 @@
#include "workspace.h"
#include "properties.h"
#include "misc.h"
+#include "event.h"
#define MAX_SHORTCUT_LENGTH 32
diff --git a/src/dock.c b/src/dock.c
index 7f277c5..15d1679 100644
--- a/src/dock.c
+++ b/src/dock.c
@@ -56,6 +56,7 @@
#include "xinerama.h"
#include "placement.h"
#include "misc.h"
+#include "event.h"
/**** Local variables ****/
#define CLIP_REWIND 1
diff --git a/src/event.c b/src/event.c
index 2d6c6f7..d15b213 100644
--- a/src/event.c
+++ b/src/event.c
@@ -72,6 +72,7 @@
#include "screen.h"
#include "shutdown.h"
#include "misc.h"
+#include "event.h"
/******** Global Variables **********/
extern XContext wWinContext;
diff --git a/src/event.h b/src/event.h
new file mode 100644
index 0000000..33a7a05
--- /dev/null
+++ b/src/event.h
@@ -0,0 +1,31 @@
+/*
+ * 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 WMEVENT_H
+#define WMEVENT_H
+
+void EventLoop(void);
+void DispatchEvent(XEvent *event);
+void ProcessPendingEvents(void);
+WMagicNumber wAddDeathHandler(pid_t pid, WDeathHandler *callback, void *cdata);
+Bool IsDoubleClick(WScreen *scr, XEvent *event);
+
+#endif /* WMEVENT_H */
diff --git a/src/framewin.c b/src/framewin.c
index 39f55d6..40fd2a3 100644
--- a/src/framewin.c
+++ b/src/framewin.c
@@ -40,6 +40,7 @@
#include "framewin.h"
#include "stacking.h"
#include "misc.h"
+#include "event.h"
#define DBLCLICK_TIME wPreferences.dblclick_time
diff --git a/src/funcs.h b/src/funcs.h
index 21c37aa..678c6a4 100644
--- a/src/funcs.h
+++ b/src/funcs.h
@@ -32,15 +32,6 @@ typedef void (WCallBack)(void *cdata);
typedef void (WDeathHandler)(pid_t pid, unsigned int status, void *cdata);
-/* ---[ event.c ]--------------------------------------------------------- */
-
-void EventLoop(void);
-void DispatchEvent(XEvent *event);
-void ProcessPendingEvents(void);
-WMagicNumber wAddDeathHandler(pid_t pid, WDeathHandler *callback, void *cdata);
-Bool IsDoubleClick(WScreen *scr, XEvent *event);
-
-
/* ---[ main.c ]---------------------------------------------------------- */
int getWVisualID(int screen);
diff --git a/src/icon.c b/src/icon.c
index a6bbca6..b292c88 100644
--- a/src/icon.c
+++ b/src/icon.c
@@ -45,6 +45,7 @@
#include "wmspec.h"
#include "misc.h"
#include "startup.h"
+#include "event.h"
/**** Global varianebles ****/
extern WPreferences wPreferences;
diff --git a/src/main.c b/src/main.c
index 777363a..11cbded 100644
--- a/src/main.c
+++ b/src/main.c
@@ -46,6 +46,7 @@
#include "WindowMaker.h"
#include "window.h"
#include "funcs.h"
+#include "event.h"
#include "startup.h"
#include "menu.h"
#include "keybind.h"
diff --git a/src/startup.c b/src/startup.c
index 1d82c2a..414ce0c 100644
--- a/src/startup.c
+++ b/src/startup.c
@@ -66,6 +66,7 @@
#include "properties.h"
#include "dialog.h"
#include "wmspec.h"
+#include "event.h"
#ifdef XDND
#include "xdnd.h"
#endif
diff --git a/src/workspace.c b/src/workspace.c
index ab79e68..a48fe90 100644
--- a/src/workspace.c
+++ b/src/workspace.c
@@ -48,6 +48,7 @@
#include "appicon.h"
#include "wmspec.h"
#include "xinerama.h"
+#include "event.h"
#define MC_NEW 0
#define MC_DESTROY_LAST 1
http://repo.or.cz/w/wmaker-crm.git/commit/583235bb36f0a125202ba1480b0189a3209a9ffc
commit 583235bb36f0a125202ba1480b0189a3209a9ffc
Author: Rodolfo GarcÃa Peñas (kix) <[email protected]>
Date: Wed May 15 13:07:51 2013 +0200
New header file cycling.h
The file cycling.h includes the function prototypes for cycling.c.
The prototypes included were moved from funcs.h.
Signed-off-by: Rodolfo GarcÃa Peñas (kix) <[email protected]>
diff --git a/src/Makefile.am b/src/Makefile.am
index 1f019ce..2415080 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,6 +24,7 @@ wmaker_SOURCES = colormap.c colormap.h
cycling.c + cycling.h def_pixmaps.h defaults.c defaults.h diff
--git a/src/cycling.c b/src/cycling.c
index 44c4d1e..bae12be 100644
--- a/src/cycling.c
+++ b/src/cycling.c
@@ -34,7 +34,7 @@
#include "keybind.h"
#include "actions.h"
#include "stacking.h"
-#include "funcs.h"
+#include "cycling.h"
#include "xinerama.h"
#include "switchpanel.h"
diff --git a/src/cycling.h b/src/cycling.h
new file mode 100644
index 0000000..eb8212b
--- /dev/null
+++ b/src/cycling.h
@@ -0,0 +1,27 @@
+/*
+ * 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 WMCYCLING_H
+#define WMCYCLING_H
+
+void StartWindozeCycle(WWindow *wwin, XEvent *event, Bool next, Bool
class_only);
+
+#endif /* WMCYCLING_H */
diff --git a/src/event.c b/src/event.c
index 7664926..2d6c6f7 100644
--- a/src/event.c
+++ b/src/event.c
@@ -55,7 +55,7 @@
#include "actions.h"
#include "client.h"
#include "main.h"
-#include "funcs.h"
+#include "cycling.h"
#include "keybind.h"
#include "application.h"
#include "stacking.h"
diff --git a/src/funcs.h b/src/funcs.h
index 2879c98..21c37aa 100644
--- a/src/funcs.h
+++ b/src/funcs.h
@@ -32,11 +32,6 @@ typedef void (WCallBack)(void *cdata);
typedef void (WDeathHandler)(pid_t pid, unsigned int status, void *cdata);
-/* ---[ cycling.c ]------------------------------------------------------- */
-
-void StartWindozeCycle(WWindow *wwin, XEvent *event, Bool next, Bool
class_only);
-
-
/* ---[ event.c ]--------------------------------------------------------- */
void EventLoop(void);
http://repo.or.cz/w/wmaker-crm.git/commit/68cdba0e29b623b43558adbb03a4385034f8244a
commit 68cdba0e29b623b43558adbb03a4385034f8244a
Author: Rodolfo GarcÃa Peñas (kix) <[email protected]>
Date: Wed May 15 13:07:50 2013 +0200
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) <[email protected]>
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"
-----------------------------------------------------------------------
Summary of changes:
src/Makefile.am | 8 +++-
src/actions.c | 1 +
src/appicon.c | 1 +
src/application.c | 1 +
src/appmenu.c | 1 -
src/balloon.c | 2 +-
src/cycling.c | 2 +-
src/{balloon.h => cycling.h} | 13 ++---
src/defaults.c | 2 +
src/dialog.c | 1 +
src/dock.c | 2 +
src/dock.h | 3 -
src/dockedapp.c | 1 +
src/event.c | 5 ++-
src/{balloon.h => event.h} | 17 ++++---
src/framewin.c | 2 +
src/funcs.h | 95 -------------------------------------
src/icon.c | 3 +
src/icon.h | 1 -
src/main.c | 5 ++-
src/main.h | 1 +
src/menu.c | 3 +-
src/misc.c | 1 +
src/misc.h | 3 +-
src/monitor.c | 1 -
src/{balloon.h => monitor.h} | 13 ++---
src/motif.c | 1 -
src/moveres.c | 1 -
src/{balloon.h => osdep.h} | 10 +---
src/osdep_bsd.c | 2 +-
src/osdep_darwin.c | 2 +-
src/osdep_linux.c | 2 +-
src/osdep_stub.c | 2 +-
src/placement.c | 1 -
src/rootmenu.c | 2 +
src/screen.c | 2 +-
src/shutdown.c | 1 -
src/stacking.c | 1 -
src/startup.c | 4 +-
src/{balloon.h => startup.h} | 20 +++++--
src/switchmenu.c | 1 +
src/{resources.h => switchmenu.h} | 13 +++--
src/texture.c | 1 +
src/window.c | 3 +
src/winmenu.c | 1 +
src/{balloon.h => winmenu.h} | 17 ++++---
src/winspector.c | 1 +
src/workspace.c | 1 +
48 files changed, 108 insertions(+), 169 deletions(-)
copy src/{balloon.h => cycling.h} (81%)
copy src/{balloon.h => event.h} (67%)
delete mode 100644 src/funcs.h
copy src/{balloon.h => monitor.h} (81%)
copy src/{balloon.h => osdep.h} (82%)
copy src/{balloon.h => startup.h} (60%)
copy src/{resources.h => switchmenu.h} (74%)
copy src/{balloon.h => winmenu.h} (69%)
repo.or.cz automatic notification. Contact project admin [email protected]
if you want to unsubscribe, or site admin [email protected] if you receive
no reply.
--
wmaker-crm.git ("The Window Maker window manager")
--
To unsubscribe, send mail to [email protected].
