diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:49:01 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:49:01 +0000 |
| commit | 9ff77e5b7abc7419def5346bd9fbf04842c9cc21 (patch) | |
| tree | 51ea78387fde403d6194926512d21eaa59d8c702 | |
| parent | c2b9298a935089f40c06d1061f4b300afd6a80fe (diff) | |
merge latest (4.3.99.16) from XFree86 (vendor) branchXORG-RELEASE-1-BASEXEVIE-MERGEXEVIE-BASEXINERAMA_2XEVIE
| -rw-r--r-- | src/xf86Fpit.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/xf86Fpit.c b/src/xf86Fpit.c index 5e244cb..076ec33 100644 --- a/src/xf86Fpit.c +++ b/src/xf86Fpit.c @@ -40,7 +40,7 @@ * PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/input/fpit/xf86Fpit.c,v 1.2 2002/11/22 03:37:37 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/input/fpit/xf86Fpit.c,v 1.4 2003/11/03 05:11:47 tsi Exp $ */ #include <xf86Version.h> @@ -173,7 +173,7 @@ static void xf86FpitReadInput(LocalDevicePtr local) { FpitPrivatePtr priv = (FpitPrivatePtr) local->private; int len, loop, found; - int is_core_pointer, is_absolute; + int is_core_pointer; int x, y, buttons, prox; DeviceIntPtr device; /* Read data into buffer */ @@ -251,7 +251,6 @@ static void xf86FpitReadInput(LocalDevicePtr local) buttons = (priv->fpitData[loop] & BUTTON_BITS); priv->fpitIndex = 0; device = local->dev; - is_absolute = 1; is_core_pointer = xf86IsCorePointer(device); /* coordonates are ready we can send events */ if (prox) { @@ -310,7 +309,7 @@ static Bool xf86FpitControl(DeviceIntPtr dev, int mode) LocalDevicePtr local = (LocalDevicePtr) dev->public.devicePrivate; FpitPrivatePtr priv = (FpitPrivatePtr) (local->private); unsigned char map[] = { - 0, 1 + 0, 1, 2 }; @@ -324,9 +323,9 @@ static Bool xf86FpitControl(DeviceIntPtr dev, int mode) priv->screen_width = screenInfo.screens[priv->screen_no]->width; priv->screen_height = screenInfo.screens[priv->screen_no]->height; /* - * Device reports button press for up to 1 button. + * Device reports button press for up to 3 buttons. */ - if (InitButtonClassDeviceStruct(dev, 1, map) == FALSE) { + if (InitButtonClassDeviceStruct(dev, 3, map) == FALSE) { ErrorF("Unable to allocate Fpit touchscreen ButtonClassDeviceStruct\n"); return !Success; } |