diff options
| author | Alexey Osipov <simba@lerlan.ru> | 2012-01-03 15:13:45 +0700 |
|---|---|---|
| committer | Jason Gerecke <killertofu@gmail.com> | 2012-01-03 09:25:23 -0800 |
| commit | 1c5c25d7b4a4ce0686f6a088d282e437dbadadfe (patch) | |
| tree | 61aca5be0004fdcfbeba575e47afb638b03aed23 | |
| parent | a119545769f208d5722561a928a93824f87cdc81 (diff) | |
| download | xf86-input-wacom-1c5c25d7b4a4ce0686f6a088d282e437dbadadfe.tar.gz | |
Create wcmTouchFilter.h
Moving declarations for touch filter from xf86Wacom.h to wcmTouchFilter.h
Signed-off-by: Alexey Osipov <simba@lerlan.ru>
Reviewed-by: Chris Bagwell <chris@cnpgabwell.com>
| -rw-r--r-- | src/common.mk | 3 | ||||
| -rw-r--r-- | src/wcmCommon.c | 1 | ||||
| -rw-r--r-- | src/wcmTouchFilter.c | 1 | ||||
| -rw-r--r-- | src/wcmTouchFilter.h | 29 | ||||
| -rw-r--r-- | src/xf86Wacom.h | 1 |
5 files changed, 33 insertions, 2 deletions
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 6314110..e67777e 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. <pingc@wacom.com> + * + * 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); |