From 157209a035914a64ece48efd7d60a967d0e49394 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Rodolfo=20Garc=C3=ADa=20Pe=C3=B1as=20=28kix=29?= <kix@kix.es>
Date: Wed, 15 May 2013 13:07:52 +0200
Subject: [PATCH] New header file event.h
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

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) <kix@kix.es>
---
 src/Makefile.am |  1 +
 src/actions.c   |  1 +
 src/appicon.c   |  1 +
 src/defaults.c  |  1 +
 src/dock.c      |  1 +
 src/event.c     |  1 +
 src/event.h     | 31 +++++++++++++++++++++++++++++++
 src/framewin.c  |  1 +
 src/funcs.h     |  9 ---------
 src/icon.c      |  1 +
 src/main.c      |  1 +
 src/startup.c   |  1 +
 src/workspace.c |  1 +
 13 files changed, 42 insertions(+), 9 deletions(-)
 create mode 100644 src/event.h

diff --git a/src/Makefile.am b/src/Makefile.am
index 2415080b..dc4d9ad7 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 8a21e378..1417833a 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 d6d81648..f863974e 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 25d7feec..d82105c4 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 7f277c51..15d1679b 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 2d6c6f7f..d15b2134 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 00000000..33a7a054
--- /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 39f55d6f..40fd2a35 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 21c37aa1..678c6a4c 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 a6bbca6d..b292c885 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 777363af..11cbded1 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 1d82c2aa..414ce0c2 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 ab79e680..a48fe90f 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
-- 
2.11.4.GIT