xserver-xorg-input-hyperpen: Changes to 'upstream-unstable'
.cvsignore | 19 -------------------
.gitignore | 20 ++++++++++++++++++++
man/.cvsignore | 2 --
man/.gitignore | 2 ++
src/.cvsignore | 6 ------
src/.gitignore | 6 ++++++
src/xf86HyperPen.c | 17 ++++++-----------
7 files changed, 34 insertions(+), 38 deletions(-)
New commits:
commit 00dff80caeb6aabd1206f0279de6d2e8263ca3a5
Author: Bartosz Fabianowski <freebsd@chillt.de>
Date: Fri Dec 7 14:26:28 2007 +1030
Make the hyperpen driver actually report sensible pressure values.
diff --git a/src/xf86HyperPen.c b/src/xf86HyperPen.c
index c31526b..f27899a 100644
--- a/src/xf86HyperPen.c
+++ b/src/xf86HyperPen.c
@@ -1565,6 +1565,7 @@ xf86HypInit(InputDriverPtr drv,
}
local->name = dev->identifier;
+ priv->AutoPT = 1;
/* Serial Device is mandatory */
priv->hypDevice = xf86FindOptionValue(local->options, "Device");
@@ -1636,6 +1637,7 @@ xf86HypInit(InputDriverPtr drv,
if (priv->PT > 2) {
xf86Msg(X_CONFIG, "%s: PMin = %d\n",
dev->identifier, priv->PT);
+ priv->AutoPT = 0;
}
else
xf86Msg(X_ERROR, "%s: invalid PMin value (should be > 2)."
commit 7f22bdb90dcb1fd4077c64784bae182f84aca653
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Sep 20 08:06:23 2007 +0930
Don't check if the device is a core device or not.
Remove call to xf86IsCore (doesn't exist anymore anyway) and unconditionally
try to generate ProximityEvents. The device should not bother whether it's a
core event or not, it's all handled in the dix now.
diff --git a/src/xf86HyperPen.c b/src/xf86HyperPen.c
index a40fb9c..c31526b 100644
--- a/src/xf86HyperPen.c
+++ b/src/xf86HyperPen.c
@@ -689,7 +689,7 @@ xf86HypReadInput(LocalDevicePtr local)
{
HyperPenDevicePtr priv = (HyperPenDevicePtr) local->private;
int len, loop;
- int is_core_pointer, is_absolute;
+ int is_absolute;
int f_keys, f_key, tip;
int x, y, bx, by, barrel, barrel1, prox, pressure, button, push;
int hw_pressure;
@@ -791,16 +791,10 @@ is_absolute = stylus;
device = local->dev;
-
-
-
- is_core_pointer = xf86IsCorePointer(device);
-
/* coordonates are ready we can send events */
if ((prox) && !(f_keys)) {
if (!(priv->hypOldProximity))
- if (!is_core_pointer)
xf86PostProximityEvent(device, 1, 0, 3, x, y, pressure);
if ((is_absolute && ((priv->hypOldX != x) ||
@@ -854,9 +848,8 @@ is_absolute = stylus;
} else { /* !PROXIMITY */
/* Any changes in buttons are ignored when !proximity */
- if (!is_core_pointer)
- if (priv->hypOldProximity)
- xf86PostProximityEvent(device, 0, 0, 3, x, y, pressure);
+ if (priv->hypOldProximity)
+ xf86PostProximityEvent(device, 0, 0, 3, x, y, pressure);
priv->hypOldProximity = 0;
}
}
commit dc2d398f11b6ca19dd0024e88dccfa3c6f73341d
Author: James Cloos <cloos@jhcloos.com>
Date: Mon Sep 3 05:52:11 2007 -0400
Add *~ to .gitignore to skip patch/emacs droppings
diff --git a/.gitignore b/.gitignore
index fb1befd..2df4a8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ libtool
ltmain.sh
missing
stamp-h1
+*~
commit 0b0c119e48fc245faa89608526510a6b93debc48
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Aug 23 19:25:27 2007 -0400
Rename .cvsignore to .gitignore
diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index fb1befd..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1,19 +0,0 @@
-Makefile
-Makefile.in
-*.la
-*.lo
-aclocal.m4
-autom4te.cache
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-configure
-depcomp
-install-sh
-libtool
-ltmain.sh
-missing
-stamp-h1
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..fb1befd
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,19 @@
+Makefile
+Makefile.in
+*.la
+*.lo
+aclocal.m4
+autom4te.cache
+config.guess
+config.h
+config.h.in
+config.log
+config.status
+config.sub
+configure
+depcomp
+install-sh
+libtool
+ltmain.sh
+missing
+stamp-h1
diff --git a/man/.cvsignore b/man/.cvsignore
deleted file mode 100644
index 282522d..0000000
--- a/man/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/man/.gitignore b/man/.gitignore
new file mode 100644
index 0000000..282522d
--- /dev/null
+++ b/man/.gitignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/src/.cvsignore b/src/.cvsignore
deleted file mode 100644
index 9730646..0000000
--- a/src/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.la
-*.lo
diff --git a/src/.gitignore b/src/.gitignore
new file mode 100644
index 0000000..9730646
--- /dev/null
+++ b/src/.gitignore
@@ -0,0 +1,6 @@
+.deps
+.libs
+Makefile
+Makefile.in
+*.la
+*.lo
commit 901b298cc61a7890bdae554cbd9a3890955c6e00
Author: Brice Goglin <bgoglin@debian.org>
Date: Mon Aug 6 23:27:25 2007 +0200
Use PACKAGE_VERSION_MAJOR/MINOR/PATCHLEVEL in xf86HypVersionRec
diff --git a/src/xf86HyperPen.c b/src/xf86HyperPen.c
index b109787..a40fb9c 100644
--- a/src/xf86HyperPen.c
+++ b/src/xf86HyperPen.c
@@ -1766,7 +1766,7 @@ static XF86ModuleVersionInfo xf86HypVersionRec =
MODINFOSTRING1,
MODINFOSTRING2,
XORG_VERSION_CURRENT,
- 1, 1, 0,
+ PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL,
ABI_CLASS_XINPUT,
ABI_XINPUT_VERSION,
MOD_CLASS_XINPUT,
Reply to: