summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPing Cheng <pinglinux@gmail.com>2009-08-03 13:15:47 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-08-03 13:57:11 +1000
commit6c5b33444b2e6d7acacaf200dbf7bafc676328cb (patch)
tree026d6292a7d800b6f9d6d07caf658c208280f577 /src
parent0e7c5819592680b8f75e29ad3d97f85bf4fd8da0 (diff)
downloadxf86-input-wacom-6c5b33444b2e6d7acacaf200dbf7bafc676328cb.tar.gz
Set up the default xf86-input-* directory structure, autotool.
This version does not build as-is due to missing include files and headers that are about to be purged anyway. It does pass the autoconf stage. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am43
-rwxr-xr-xsrc/include/Xwacom.h170
-rw-r--r--src/include/xdrv-config.h.in113
-rw-r--r--src/wacom.4x224
-rwxr-xr-xsrc/wcmCommon.c (renamed from src/xdrv/wcmCommon.c)0
-rwxr-xr-xsrc/wcmCompat.c (renamed from src/xdrv/wcmCompat.c)0
-rwxr-xr-xsrc/wcmConfig.c (renamed from src/xdrv/wcmConfig.c)0
-rwxr-xr-xsrc/wcmFilter.c (renamed from src/xdrv/wcmFilter.c)0
-rwxr-xr-xsrc/wcmFilter.h (renamed from src/xdrv/wcmFilter.h)0
-rwxr-xr-xsrc/wcmISDV4.c (renamed from src/xdrv/wcmISDV4.c)0
-rwxr-xr-xsrc/wcmSerial.c (renamed from src/xdrv/wcmSerial.c)0
-rwxr-xr-xsrc/wcmSerial.h (renamed from src/xdrv/wcmSerial.h)0
-rw-r--r--src/wcmTilt2Rotation.c (renamed from src/xdrv/wcmTilt2Rotation.c)0
-rwxr-xr-xsrc/wcmUSB.c (renamed from src/xdrv/wcmUSB.c)0
-rw-r--r--src/wcmXCommand.c (renamed from src/xdrv/wcmXCommand.c)0
-rwxr-xr-xsrc/xf86Wacom.c (renamed from src/xdrv/xf86Wacom.c)0
-rwxr-xr-xsrc/xf86Wacom.h (renamed from src/xdrv/xf86Wacom.h)0
-rwxr-xr-xsrc/xf86WacomDefs.h (renamed from src/xdrv/xf86WacomDefs.h)0
18 files changed, 36 insertions, 514 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 7344747..e58ad9f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,10 +1,39 @@
-SUBDIRS = . xdrv
+# Copyright 2005 Adam Jackson.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# on the rights to use, copy, modify, merge, publish, distribute, sub
+# license, and/or sell copies of the Software, and to permit persons to whom
+# the Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+# ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-wmanpagedir = @mandir@/man4
-wmanpage_HEADERS = wacom.4x.gz
-EXTRA_DIST = wacom.4x
+# this is obnoxious:
+# -module lets us name the module exactly how we want
+# -avoid-version prevents gratuitous .0.0.0 version numbers on the end
+# _ladir passes a dummy rpath to libtool so the thing will actually link
+# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
+AM_CFLAGS = $(XORG_CFLAGS)
+
+@DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la
+@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version
+@DRIVER_NAME@_drv_ladir = @inputdir@
+
+INCLUDES=-I$(top_srcdir)/include/
+
+@DRIVER_NAME@_drv_la_SOURCES = xf86Wacom.c xf86Wacom.h \
+ wcmCommon.c wcmCompat.c wcmConfig.c wcmISDV4.c \
+ wcmFilter.c wcmFilter.h xf86WacomDefs.h \
+ wcmTilt2Rotation.c wcmUSB.c wcmXCommand.c
-$(wmanpage_HEADERS): $(EXTRA_DIST)
- rm -f $(wmanpage_HEADERS)
- gzip -9c < $(srcdir)/$(EXTRA_DIST) > $(wmanpage_HEADERS)
diff --git a/src/include/Xwacom.h b/src/include/Xwacom.h
deleted file mode 100755
index f698225..0000000
--- a/src/include/Xwacom.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Copyright 2003 by John Joganic <john@joganic.com>
- * Copyright 2003 - 2009 by Ping Cheng <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 Lesser 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_XWACOM_H
-#define __XF86_XWACOM_H
-
-#include <X11/keysym.h>
-
-#define XWACOM_PARAM_TOPX 1
-#define XWACOM_PARAM_TOPY 2
-#define XWACOM_PARAM_BOTTOMX 3
-#define XWACOM_PARAM_BOTTOMY 4
-#define XWACOM_PARAM_DEBUGLEVEL 5
-#define XWACOM_PARAM_PRESSCURVE 6
-#define XWACOM_PARAM_MODE 7
-#define XWACOM_PARAM_TPCBUTTON 8
-#define XWACOM_PARAM_TOUCH 9
-#define XWACOM_PARAM_CURSORPROX 10
-#define XWACOM_PARAM_ROTATE 11
-#define XWACOM_PARAM_TWINVIEW 12
-#define XWACOM_PARAM_SUPPRESS 13
-#define XWACOM_PARAM_SCREEN_NO 14
-#define XWACOM_PARAM_COMMONDBG 15
-#define XWACOM_PARAM_RAWSAMPLE 16
-#define XWACOM_PARAM_CAPACITY 17
-#define XWACOM_PARAM_SERIAL 18
-
-/* The followings are defined together */
-#define XWACOM_PARAM_BUTTON1 101
-#define XWACOM_PARAM_BUTTON2 102
-#define XWACOM_PARAM_BUTTON3 103
-#define XWACOM_PARAM_BUTTON4 104
-#define XWACOM_PARAM_BUTTON5 105
-#define XWACOM_PARAM_BUTTON6 106
-#define XWACOM_PARAM_BUTTON7 107
-#define XWACOM_PARAM_BUTTON8 108
-#define XWACOM_PARAM_BUTTON9 109
-#define XWACOM_PARAM_BUTTON10 110
-#define XWACOM_PARAM_BUTTON11 111
-#define XWACOM_PARAM_BUTTON12 112
-#define XWACOM_PARAM_BUTTON13 113
-#define XWACOM_PARAM_BUTTON14 114
-#define XWACOM_PARAM_BUTTON15 115
-#define XWACOM_PARAM_BUTTON16 116
-#define XWACOM_PARAM_BUTTON17 117
-#define XWACOM_PARAM_BUTTON18 118
-#define XWACOM_PARAM_BUTTON19 119
-#define XWACOM_PARAM_BUTTON20 120
-#define XWACOM_PARAM_BUTTON21 121
-#define XWACOM_PARAM_BUTTON22 122
-#define XWACOM_PARAM_BUTTON23 123
-#define XWACOM_PARAM_BUTTON24 124
-#define XWACOM_PARAM_BUTTON25 125
-#define XWACOM_PARAM_BUTTON26 126
-#define XWACOM_PARAM_BUTTON27 127
-#define XWACOM_PARAM_BUTTON28 128
-#define XWACOM_PARAM_BUTTON29 129
-#define XWACOM_PARAM_BUTTON30 130
-#define XWACOM_PARAM_BUTTON31 131
-#define XWACOM_PARAM_BUTTON32 132
-
-#define XWACOM_PARAM_NOXOPTION 150
-#define XWACOM_PARAM_RELWUP 151
-#define XWACOM_PARAM_RELWDN 152
-#define XWACOM_PARAM_ABSWUP 153
-#define XWACOM_PARAM_ABSWDN 154
-#define XWACOM_PARAM_STRIPLUP 155
-#define XWACOM_PARAM_STRIPLDN 156
-#define XWACOM_PARAM_STRIPRUP 157
-#define XWACOM_PARAM_STRIPRDN 158
-/* End of together */
-
-#define XWACOM_PARAM_SPEEDLEVEL 201
-#define XWACOM_PARAM_CLICKFORCE 202
-#define XWACOM_PARAM_ACCEL 203
-#define XWACOM_PARAM_XYDEFAULT 204
-#define XWACOM_PARAM_MMT 205
-#define XWACOM_PARAM_RAWFILTER 206
-/* the following 2 stays together */
-#define XWACOM_PARAM_TVRESOLUTION0 207
-#define XWACOM_PARAM_TVRESOLUTION1 208
-#define XWACOM_PARAM_COREEVENT 209
-#define XWACOM_PARAM_THRESHOLD 210
-
-#define XWACOM_PARAM_GETONLYPARAM 320
-#define XWACOM_PARAM_TID 321
-#define XWACOM_PARAM_TOOLID 322
-#define XWACOM_PARAM_NUMSCREEN 350
-#define XWACOM_PARAM_STOPX0 351
-#define XWACOM_PARAM_STOPY0 352
-#define XWACOM_PARAM_SBOTTOMX0 353
-#define XWACOM_PARAM_SBOTTOMY0 354
-#define XWACOM_PARAM_STOPX1 355
-#define XWACOM_PARAM_STOPY1 356
-#define XWACOM_PARAM_SBOTTOMX1 357
-#define XWACOM_PARAM_SBOTTOMY1 358
-#define XWACOM_PARAM_STOPX2 359
-#define XWACOM_PARAM_STOPY2 360
-#define XWACOM_PARAM_SBOTTOMX2 361
-#define XWACOM_PARAM_SBOTTOMY2 362
-#define XWACOM_PARAM_STOPX3 363
-#define XWACOM_PARAM_STOPY3 364
-#define XWACOM_PARAM_SBOTTOMX3 365
-#define XWACOM_PARAM_SBOTTOMY3 366
-#define XWACOM_PARAM_STOPX4 367
-#define XWACOM_PARAM_STOPY4 368
-#define XWACOM_PARAM_SBOTTOMX4 369
-#define XWACOM_PARAM_SBOTTOMY4 370
-#define XWACOM_PARAM_STOPX5 371
-#define XWACOM_PARAM_STOPY5 372
-#define XWACOM_PARAM_SBOTTOMX5 373
-#define XWACOM_PARAM_SBOTTOMY5 374
-#define XWACOM_PARAM_STOPX6 375
-#define XWACOM_PARAM_STOPY6 376
-#define XWACOM_PARAM_SBOTTOMX6 377
-#define XWACOM_PARAM_SBOTTOMY6 378
-#define XWACOM_PARAM_STOPX7 379
-#define XWACOM_PARAM_STOPY7 380
-#define XWACOM_PARAM_SBOTTOMX7 381
-#define XWACOM_PARAM_SBOTTOMY7 382
-#define XWACOM_PARAM_XSCALING 383
-#define XWACOM_PARAM_TOOLSERIAL 384
-
-#define TV_NONE 0
-#define TV_XINERAMA 1
-#define TV_ABOVE_BELOW 2
-#define TV_LEFT_RIGHT 3
-#define TV_BELOW_ABOVE 4
-#define TV_RIGHT_LEFT 5
-#define TV_MAX 5
-
-#define ROTATE_NONE 0
-#define ROTATE_CW 1
-#define ROTATE_CCW 2
-#define ROTATE_HALF 3
-
-#define XWACOM_MAX_SAMPLES 20
-
-/* The following flags are used for XWACOM_PARAM_BUTTON# values to mark
- * the type of event that should be emitted when that button is pressed;
- * combined together they form an Action Code (AC).
- */
-#define AC_CODE 0x0000ffff /* Mask to isolate button number or key code */
-#define AC_BUTTON 0x00000000 /* Emit button events */
-#define AC_KEY 0x00010000 /* Emit key events */
-#define AC_MODETOGGLE 0x00020000 /* Toggle absolute/relative mode */
-#define AC_DBLCLICK 0x00030000 /* Emit a button1 double-click event */
-#define AC_DISPLAYTOGGLE 0x00040000 /* Toggle among screens */
-#define AC_TYPE 0x000f0000 /* The mask to isolate event type bits */
-#define AC_NUM_KEYS 0x0ff00000 /* The mask to isolate number of keys to send */
-#define AC_CORE 0x10000000 /* Always emit a core event */
-#define AC_EVENT 0xf00f0000 /* Mask to isolate event flag */
-
-#endif /* __XF86_XWACOM_H */
diff --git a/src/include/xdrv-config.h.in b/src/include/xdrv-config.h.in
deleted file mode 100644
index 436addb..0000000
--- a/src/include/xdrv-config.h.in
+++ /dev/null
@@ -1,113 +0,0 @@
-/* src/include/xdrv-config.h.in. Generated from configure.in by autoheader. */
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* cmdline substitute */
-#undef IN_MODULE
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
- */
-#undef LT_OBJDIR
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Version number of package */
-#undef VERSION
-
-/* Enable the Linux Input subsystem */
-#undef WCM_ENABLE_LINUXINPUT
-
-/* ncurses header files available */
-#undef WCM_ENABLE_NCURSES
-
-/* Later X.org version uses dixScreenOrigins for screen positions and sizes */
-#undef WCM_HAVE_DIXSCREENORIGINS
-
-/* IsXExtensionPointer is only defined in later X.org releases */
-#undef WCM_ISXEXTENSIONPOINTER
-
-/* The X-driver can send key events for a button */
-#undef WCM_KEY_SENDING_SUPPORT
-
-/* The xserver have no wraps around libc-functions */
-#undef WCM_NO_LIBCWRAPPER
-
-/* libxf86config isn't included */
-#undef WCM_XF86CONFIG
-
-/* Compiling for XFree86 */
-#undef WCM_XFREE86
-
-/* Slightly diffent abi in XINPUT >= 1.0 */
-#undef WCM_XINPUTABI_MAJOR
-
-/* Compiling for X.org */
-#undef WCM_XORG
-
-/* Some X.org versions require that the events are scaled to screen size */
-#undef WCM_XORG_TABLET_SCALING
-
-/* Xserver versions 1.4 and later call Uninit before closing a device */
-#undef WCM_XORG_XSERVER_1_4
-
-/* Using version 1.6 or later of X.org */
-#undef WCM_XORG_XSERVER_1_6
-
-/* cmdline substitute */
-#undef XFree86LOADER
-
-/* cmdline substitute */
-#undef XINPUT
-
-/* cmdline substitute */
-#undef XKB
-
-/* Define to 1 if the X Window System is missing or not being used. */
-#undef X_DISPLAY_MISSING
diff --git a/src/wacom.4x b/src/wacom.4x
deleted file mode 100644
index d4adb6c..0000000
--- a/src/wacom.4x
+++ /dev/null
@@ -1,224 +0,0 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/wacom/wacom.man,v 1.1 2001/01/24 00:06:39 dawes Exp $
-.\" shorthand for double quote that works everywhere.
-.ds q \N'34'
-.TH WACOM 4x "linuxwacom 0.8.3" "X Version 11"
-.SH NAME
-wacom \- Wacom input driver
-.SH SYNOPSIS
-.nf
-.B "Section \*qInputDevice\*q"
-.BI " Identifier \*q" idevname \*q
-.B " Driver \*qwacom\*q"
-.BI " Option \*qDevice\*q \*q" devpath \*q
-\ \ ...
-.B EndSection
-.fi
-.SH DESCRIPTION
-.B wacom
-is an X input driver for Wacom devices.
-.PP
-The
-.B wacom
-driver functions as a pointer input device, and may be used as the
-X server's core pointer.
-.SH SUPPORTED HARDWARE
-This driver supports the Wacom IV and Wacom V protocols. Serial tablets only
-need this driver. USB tablet support is available on some Linux platforms.
-USB tablets needs wacom kernel driver being loaded before this driver starts.
-Please check linuxwacom.sf.net for latest updates of Wacom X and kernel drivers.
-.SH CONFIGURATION DETAILS
-Please refer to xorg.conf(5x) for general configuration
-details and for options that can be used with all input drivers. This
-section only covers configuration details specific to this driver.
-.PP
-Multiple instances of the Wacom devices can cohabit. It can be useful
-to define multiple devices with different active zones. Each device
-supports the following entries:
-.RS 8
-.TP 4
-.B Option \fI"Type"\fP \fI"stylus"|"eraser"|"cursor"|"pad"|"touch"\fP
-sets the type of tool the device represents. This option is mandatory.
-The core options, such as "SendCoreEvents" or "AlwaysCore", are
-unnecessary in Gimp if you don't need to move system cursor outside
-of Gimp drawing area. "pad" is for Intuos 3 or Cintiq 21UX tablet
-ExpressKeys/menu strips, and Graphire 4 or Bamboo tablet buttons, wheel,
-and/or ring. It is required for Intuos3, CintiqV5, Graphire 4, and
-Bamboo if you want to use keystroke features. "pad" is reported as a
-second tool in the driver. "touch" is for the tablet with touch support.
-Right now only a few Tablet PCs have this feature.
-.TP 4
-.B Option \fI"Device"\fP \fI"path"\fP
-sets the path to the special file which represents serial line where
-the tablet is plugged. You have to specify it for each subsection with
-the same value if you want to have multiple devices with the same tablet.
-This option is mandatory.
-.TP 4
-.B Option \fI"USB"\fP \fI"on"\fP
-tells the driver to dialog with the tablet the USB way. This option is
-mandatory for USB tablets.
-.TP 4
-.B Option \fI"ForceDevice"\fP \fI"ISDV4"\fP
-tells the driver to dialog with the tablet the serial Tablet PC way. It
-is a special Wacom IV protocol, called ISDV4 protocol. This option is
-mandatory for serial Tablet PCs only.
-.TP 4
-.B Option \fI"Suppress"\fP \fI"Inumber"\fP
-sets the position increment under which not to transmit coordinates.
-This entry must be specified only in the first Wacom subsection if you have
-multiple devices for one tablet. If you don't specify this entry, the default
-value, which is 2, will be used. To disable suppression, the entry should be
-specified as 0. When suppress is defined, an event will be sent only when at
-least one of the following conditions is met:
-
- the change between the current X coordinate and the previous one is
-greater than suppress;
-
- the change between the current Y coordinate and the previous one is
-greater than suppress;
-
- the change between the current pressure and the previous one is
-greater than suppress;
-
- the change between the current degree of rotation and the previous
-one of the transducer is greater than suppress;
-
- the change between the current absolute wheel value and the previous
-one is equal to or greater than suppress;
-
- the change between the current tilt value and the previous one is equal
-to or greater than suppress (if tilt is supported);
-
- relative wheel value has changed;
-
- button value has changed;
-
- proximity has changed.
-.TP 4
-.B Option \fI"Mode"\fP \fI"Relative"|"Absolute"\fP
-sets the mode of the device. The default value for stylus and
-eraser is Absolute; cursor is Relative; pad mode is decided
-according to its core option due to its nature of not moving
-system cursor: Relative if it is a core device; Absolute, otherwise;
-touch is always in absolute mode.
-.TP 4
-.B Option \fI"TopX"\fP \fI"number"\fP
-X coordinate of the top corner of the active zone. Default to 0.
-.TP 4
-.B Option \fI"TopY"\fP \fI"number"\fP
-Y coordinate of the top corner of the active zone. Default to 0.
-.TP 4
-.B Option \fI"BottomX"\fP \fI"Inumber"\fP
-X coordinate of the bottom corner of the active zone. Default to width of the tablet.
-.TP 4
-.B Option \fI"BottomY"\fP \fI"number"\fP
-Y coordinate of the bottom corner of the active zone. Default to height of the tablet.
-.TP 4
-.B Option \fI"ButtonsOnly"\fP \fI"on"|"off"\fP
-disables the device's motion events. Default to off.
-.TP 4
-.B Option \fI"ButtonM"\fP \fI"AC"\fP
-reports an action AC when button M is pressed, where M
-is one of the device supported button numbers, it can be 1
-to 32. The default action reported to Xinput is mouse button M click.
-To ignore the button click, i.e., to not report any button click event
-to Xinput, use "0" or "button 0".
-.TP 4
-.B Option \fI"TPCButton"\fP \fI"on"|"off"\fP
-enables the stylus buttons as Tablet PC buttons, i.e., reports stylus
-button event only when its tip is pressed. Default to "on" for Tablet PCs;
-"off" for all other models.
-.TP 4
-.B Option \fI"Touch"\fP \fI"on"|"off"\fP
-enables the touch event for Tablet PC that supports touch feature, i.e.,
-system cursor moves when user touches the tablet. Default to "on" for
-Tablet PCs with touch feature; "off" for all other models.
-.TP 4
-.B Option \fI"Capacity"\fP \fI"number"\fP
-sets touch sensitivity level for capacitive touch device, where number
-can be an integer from -1 to 5. Default is 3 for capacitive tools and
--1 for none capacitive tools.
-.TP 4
-.B Option \fI"Speed"\fP \fI"Rspeed"\fP
-sets the cursor's relative movement speed to Rspeed. The default value is 1.0.
-A Rspeed greater than 1.0 will speed up the cursor's relative movement. A Rspeed
-less than 1.0 but greater than 0 will slow down the cursor's relative movement.
-A Rspeed too close to 0 is not recommanded.
-.TP 4
-.B Option \fI"Twinview"\fP \fI"horizontal"|"vertical"|"leftof"|"aboveof"|"xinerama"|"none"\fP
-sets the orientation of TwinView to map the tablet to one screen and to be able
-to move the screen cursor from one screen to the other when tool reaches the
-edge of the tablet. The cursor can be constrained in a specific screen if
-"ScreenNo" option is added. If you want to map the tablet to the whole desktop,
-you should NOT add this option. The default is "none". Note: due to historic
-reason, "horizontal" represents the "RightOf" and "vertical" represents the
-"BelowOf" in acutal TwinView setup.
-.TP 4
-.B Option \fI"TVResolution"\fP \fI"res0,res1"\fP
-specifies different resolutions for the two screens in TwinView setup. For example,
-if the resolution of screen 0 (res0) is 1024x768 and screen 1 (res1) is 1280x1024,
-the option will be set to:
- Option "TVResolution" "1024x768,1280x1024"
-
-This option is used only when TwinView option is not none. It is unnecessary to add
-this option if your screens are displaying in the same resolutions.
-.TP 4
-.B Option \fI"ScreenNo"\fP \fI"n"\fP
-In a multi-monitor environment, specifies the screen number in which the cursor can move.
-.TP 4
-.B Option \fI"MMonitor"\fP \fI"n"\fP
-turns on/off across monitor movement on a non-TwinView multi-monitor desktop.
-The default is "on". Here n starts from 0, which indicates the first screen.
-.TP 4
-.B Option \fI"Rotate"\fP \fI"CW"|"CCW"|"HALF"|"NONE"\fP
-rotates the tablet orientation counterclockwise (CCW) or clockwise (CW) or 180 degrees (HALF).
-If you have specific tablet mappings, i.e. TopX/Y or BottomX/Y were set, the mapping will be
-applied before rotation. The default is "NONE".
-.TP 4
-.B Option \fI"PressCurve"\fP \fI"x1,y1,x2,y2"\fP
-sets pressure curve by control points x1, y1, x2, and y2. Their values are in range
-from 0..100. The input for
- linear curve (default) is "0,0,100,100";
- slightly depressed curve (firmer) might be "5,0,100,95";
- slightly raised curve (softer) might be "0,5,95,100".
-.TP 4
-.B Option \fI"KeepShape"\fP \fI"on"|"off"\fP
-When this option is enabled, the active zone begins according to TopX
-and TopY. The bottom corner is adjusted to keep the ratio width/height
-of the active zone the same as the screen while maximizing the area
-described by TopX, TopY, BottomX, BottomY.
-.TP 4
-.B Option \fI"DebugLevel"\fP \fI"number"\fP
-sets the level of debugging info reported. There are 12 levels, specified by
-the integers between 1 and 12. Once it is defined, all the debug messages
-with a level less than or equal to the "number" will be logged into
-/etc/X11/Xorg.0.log.
-.TP 4
-.B Option \fI"CommonDBG"\fP \fI"number"\fP
-sets the level of debugging info for all devices defined for the
-same tablet. There are 12 levels in use, specified by the
-integers between 1 and 12. Once it is defined, all the debug
-messages with a level less than or equal to the "number" will
-be logged into /etc/X11/Xorg.0.log.
-.TP 4
-.B Option \fI"CursorProx"\fP \fI"number"\fP
-sets the max distance from tablet to stop reporting movement for cursor in relative mode.
-Default for Intuos series is 10, for Graphire series (including Volitos) is 42.
-.TP 4
-.B Option \fI"Serial"\fP \fI"number"\fP
-sets the serial number associated with the physical device. This allows
-to have multiple devices of the same type (i.e. multiple pens). This
-option is only available on wacom V devices (Intuos series and Cintiq 21U).
-To see which serial number belongs to a device, you need to run the utility program,
-xsetwacom, which comes with linuxwacom package.
-.TP 4
-.B Option \fI"Threshold"\fP \fI"number"\fP
-sets the pressure threshold used to generate a button 1 events of stylus.
-The default is MaxPressure*3/50.
-.RE
-.SH "SEE ALSO"
-Xorg(1x), xorg.conf(5x), xorgconfig(1x), Xserver(1x), X(7).
-.SH AUTHORS
-Frederic Lepied <lepied@xfree86.org>
-Ping Cheng <pingc@wacom.com>
-John E. Joganic <jej@j-arkadia.com>
-Magnus Vigerlöf <Magnus.Vigerlof@ipbo.se>
diff --git a/src/xdrv/wcmCommon.c b/src/wcmCommon.c
index a628a05..a628a05 100755
--- a/src/xdrv/wcmCommon.c
+++ b/src/wcmCommon.c
diff --git a/src/xdrv/wcmCompat.c b/src/wcmCompat.c
index f00af8f..f00af8f 100755
--- a/src/xdrv/wcmCompat.c
+++ b/src/wcmCompat.c
diff --git a/src/xdrv/wcmConfig.c b/src/wcmConfig.c
index 5986e71..5986e71 100755
--- a/src/xdrv/wcmConfig.c
+++ b/src/wcmConfig.c
diff --git a/src/xdrv/wcmFilter.c b/src/wcmFilter.c
index 9bd77da..9bd77da 100755
--- a/src/xdrv/wcmFilter.c
+++ b/src/wcmFilter.c
diff --git a/src/xdrv/wcmFilter.h b/src/wcmFilter.h
index d5995e4..d5995e4 100755
--- a/src/xdrv/wcmFilter.h
+++ b/src/wcmFilter.h
diff --git a/src/xdrv/wcmISDV4.c b/src/wcmISDV4.c
index 257911f..257911f 100755
--- a/src/xdrv/wcmISDV4.c
+++ b/src/wcmISDV4.c
diff --git a/src/xdrv/wcmSerial.c b/src/wcmSerial.c
index 0307614..0307614 100755
--- a/src/xdrv/wcmSerial.c
+++ b/src/wcmSerial.c
diff --git a/src/xdrv/wcmSerial.h b/src/wcmSerial.h
index 2836efd..2836efd 100755
--- a/src/xdrv/wcmSerial.h
+++ b/src/wcmSerial.h
diff --git a/src/xdrv/wcmTilt2Rotation.c b/src/wcmTilt2Rotation.c
index f608713..f608713 100644
--- a/src/xdrv/wcmTilt2Rotation.c
+++ b/src/wcmTilt2Rotation.c
diff --git a/src/xdrv/wcmUSB.c b/src/wcmUSB.c
index ba17546..ba17546 100755
--- a/src/xdrv/wcmUSB.c
+++ b/src/wcmUSB.c
diff --git a/src/xdrv/wcmXCommand.c b/src/wcmXCommand.c
index 5cf0c5c..5cf0c5c 100644
--- a/src/xdrv/wcmXCommand.c
+++ b/src/wcmXCommand.c
diff --git a/src/xdrv/xf86Wacom.c b/src/xf86Wacom.c
index 70f4740..70f4740 100755
--- a/src/xdrv/xf86Wacom.c
+++ b/src/xf86Wacom.c
diff --git a/src/xdrv/xf86Wacom.h b/src/xf86Wacom.h
index 742f638..742f638 100755
--- a/src/xdrv/xf86Wacom.h
+++ b/src/xf86Wacom.h
diff --git a/src/xdrv/xf86WacomDefs.h b/src/xf86WacomDefs.h
index d9884f2..d9884f2 100755
--- a/src/xdrv/xf86WacomDefs.h
+++ b/src/xf86WacomDefs.h