Moving declarations for touch filter from xf86Wacom.h to wcmTouchFilter.h
Signed-off-by: Alexey Osipov <[email protected]>
---
Original patch name: 'Left mouse button' dragging support.
Changes to previous version:
- patch split into two parts: this part is "cleanup patch", which creates
separate
header file for wcmTouchFilter.c
src/common.mk | 3 ++-
src/wcmCommon.c | 1 +
src/wcmTouchFilter.c | 1 +
src/wcmTouchFilter.h | 29 +++++++++++++++++++++++++++++
src/xf86Wacom.h | 1 -
5 files changed, 33 insertions(+), 2 deletions(-)
create mode 100644 src/wcmTouchFilter.h
diff --git a/src/common.mk b/src/common.mk
index fae8d9f..7f1eadd 100644
--- a/src/common.mk
+++ b/src/common.mk
@@ -12,4 +12,5 @@ DRIVER_SOURCES= \
$(top_srcdir)/src/wcmUSB.c \
$(top_srcdir)/src/wcmXCommand.c \
$(top_srcdir)/src/wcmValidateDevice.c \
- $(top_srcdir)/src/wcmTouchFilter.c
+ $(top_srcdir)/src/wcmTouchFilter.c \
+ $(top_srcdir)/src/wcmTouchFilter.h
diff --git a/src/wcmCommon.c b/src/wcmCommon.c
index 10a154c..055583d 100644
--- a/src/wcmCommon.c
+++ b/src/wcmCommon.c
@@ -24,6 +24,7 @@
#include "xf86Wacom.h"
#include "Xwacom.h"
#include "wcmFilter.h"
+#include "wcmTouchFilter.h"
#include <xkbsrv.h>
#include <xf86_OSproc.h>
diff --git a/src/wcmTouchFilter.c b/src/wcmTouchFilter.c
index 7f9f4f2..58c4bb3 100644
--- a/src/wcmTouchFilter.c
+++ b/src/wcmTouchFilter.c
@@ -21,6 +21,7 @@
#endif
#include "xf86Wacom.h"
+#include "wcmTouchFilter.h"
#include <math.h>
/* Defines for 2FC Gesture */
diff --git a/src/wcmTouchFilter.h b/src/wcmTouchFilter.h
new file mode 100644
index 0000000..38c73fb
--- /dev/null
+++ b/src/wcmTouchFilter.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2009 - 2010 by Ping Cheng, Wacom. <[email protected]>
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __XF86_WCMTOUCHFILTER_H
+#define __XF86_WCMTOUCHFILTER_H
+
+#include "xf86Wacom.h"
+
+/****************************************************************************/
+
+void wcmGestureFilter(WacomDevicePtr priv, int channel);
+
+/****************************************************************************/
+#endif /* __XF86_WCMTOUCHFILTER_H */
diff --git a/src/xf86Wacom.h b/src/xf86Wacom.h
index e58e0b0..fc1b4f4 100644
--- a/src/xf86Wacom.h
+++ b/src/xf86Wacom.h
@@ -152,7 +152,6 @@ extern int wcmDevSwitchMode(ClientPtr client, DeviceIntPtr
dev, int mode);
/* run-time modifications */
extern void wcmChangeScreen(InputInfoPtr pInfo, int value);
extern int wcmTilt2R(int x, int y, double offset);
-extern void wcmGestureFilter(WacomDevicePtr priv, int channel);
extern void wcmEmitKeycode(DeviceIntPtr keydev, int keycode, int state);
extern void wcmSoftOutEvent(InputInfoPtr pInfo);
--
1.7.0.4
------------------------------------------------------------------------------
Ridiculously easy VDI. With Citrix VDI-in-a-Box, you don't need a complex
infrastructure or vast IT resources to deliver seamless, secure access to
virtual desktops. With this all-in-one solution, easily deploy virtual
desktops for less than the cost of PCs and save 60% on VDI infrastructure
costs. Try it free! http://p.sf.net/sfu/Citrix-VDIinabox
_______________________________________________
Linuxwacom-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
