qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xf86-input-acecad 1.2.2

Browse Source
This commit is contained in:
matthieu 2008-08-23 12:53:23 +00:00
parent afa6528308
commit f0591f1ed9
3 changed files with 59 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
driver/xf86-input-acecad/ChangeLog
View File

@ -1,3 +1,50 @@
commit 60270d38257797a82eff74a56d1561068a6c348e
Author: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Date: Sun Feb 10 08:52:46 2008 +0100
Bump to 1.2.2
commit 7cabee107798341c6c78632f56518a722ed15f03
Author: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Date: Sat Feb 9 22:32:13 2008 +0100
acecad: fix blotchy input in Inkscape and the Gimp by not pretending to be the core pointer by default
commit 079e56633f700b2a0e0240501d31e4a9e5007a4f
Author: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Date: Sat Feb 9 19:51:57 2008 +0100
acecad: improve handling of botched input versions
commit bf27c55a83a83fea4afe0499d1b2d592110e945a
Author: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Date: Sun Oct 28 01:12:28 2007 +0200
acecad: fake device limits == screen limits in xserver 1.4 for xinput
xserver 1.4 does not do automatic coordinate scaling, so we have to do
it manually. But this breaks xinput clients that do their own scaling
using the device limits as reference. Pretend that they are the same as the
screen limits to work around this.
commit 3089bc76c7e6a829caff4cb86ca3948401e1b6f3
Author: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Date: Sat Oct 27 13:08:04 2007 +0200
acecad: set type_name to XI_TABLET
commit 0ee57c9d8048c3e80356a3eab18b6871a21a3a96
Author: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Date: Fri Oct 26 21:00:19 2007 +0200
acecad: do our own scaling with USB device since it's not done in the kernel and ConverProc() isn't called automatically by X
commit 253ea9de2321bccede3f0d74ee6a6f6b403e80ae
Author: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Date: Fri Oct 26 20:12:19 2007 +0200
acecad: don't crash when xf86IsCorePointer is not defined
commit 38ba390f775e2f6001c8887328c5b925f623308a
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Sep 7 02:17:29 2007 +0200

2
driver/xf86-input-acecad/configure.ac
View File

@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-acecad],
1.2.1,
1.2.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-acecad)

17
driver/xf86-input-acecad/src/acecad.c
View File

@ -29,6 +29,11 @@
#include <xorgVersion.h>
#define XORG_VERSION_BOTCHED XORG_VERSION_NUMERIC(1,4,0,0,0)
#if XORG_VERSION_CURRENT >= XORG_VERSION_BOTCHED
#define XORG_BOTCHED_INPUT 1
#else
#define XORG_BOTCHED_INPUT 0
#endif
#define _ACECAD_C_
/*****************************************************************************
@ -63,8 +68,8 @@
#include <string.h>
#include <stdio.h>
#include <errno.h>
#include <errno.h>
#ifdef LINUX_INPUT
#include <fcntl.h>
#ifdef LINUX_SYSFS
@ -667,7 +672,7 @@ DeviceInit (DeviceIntPtr dev)
InitValuatorAxisStruct(dev,
0,
0, /* min val */
#if XORG_VERSION_CURRENT == XORG_VERSION_BOTCHED
#if XORG_BOTCHED_INPUT
screenInfo.screens[0]->width,
#else
priv->acecadMaxX, /* max val */
@ -678,7 +683,7 @@ DeviceInit (DeviceIntPtr dev)
InitValuatorAxisStruct(dev,
1,
0, /* min val */
#if XORG_VERSION_CURRENT == XORG_VERSION_BOTCHED
#if XORG_BOTCHED_INPUT
screenInfo.screens[0]->height,
#else
priv->acecadMaxY, /* max val */
@ -733,7 +738,7 @@ ReadInput (LocalDevicePtr local)
{
int x, y, z;
int prox, buttons;
int is_core_pointer = 1, is_absolute;
int is_core_pointer = 0, is_absolute;
AceCadPrivatePtr priv = (AceCadPrivatePtr) (local->private);
/*xf86Msg(X_INFO, "ACECAD Tablet Read Input\n");*/
@ -843,7 +848,7 @@ USBReadInput (LocalDevicePtr local)
int report_x, report_y;
int prox = priv->acecadOldProximity;
int buttons = priv->acecadOldButtons;
int is_core_pointer = 1;
int is_core_pointer = 0;
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
is_core_pointer = xf86IsCorePointer(local->dev);
#endif
@ -938,7 +943,7 @@ USBReadInput (LocalDevicePtr local)
if (prox)
{
#if XORG_VERSION_CURRENT == XORG_VERSION_BOTCHED
#if XORG_BOTCHED_INPUT
ConvertProc(local, 0, 3, x, y, 0, 0, 0, 0, &report_x, &report_y);
#else
report_x = x;