aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog38
-rw-r--r--src/Makefile.am2
-rw-r--r--src/evdev.c36
-rw-r--r--src/evdev.h36
-rw-r--r--src/evdev_abs.c339
-rw-r--r--src/evdev_axes.c535
-rw-r--r--src/evdev_brain.c5
-rw-r--r--src/evdev_btn.c15
-rw-r--r--src/evdev_key.c3
-rw-r--r--src/evdev_rel.c260
10 files changed, 621 insertions, 648 deletions
diff --git a/ChangeLog b/ChangeLog
index d5e94c5..069dd9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,41 @@
+2006-04-08 Zephaniah E. Hull <warp@aehallh.com>
+
+ * src/Makefile.am:
+ Remove evdev_abs.c and evdev_rel.c.
+ Added evdev_axes.c.
+ * src/evdev.c: (EvdevReadInput), (EvdevProc), (EvdevNew),
+ (EvdevPtrCtrlProc):
+ Change the calls to refer to EvdevAxes instead of Abs and Rel.
+ Include mipointer.h. (Fixes a compile error.)
+ Remove an unused variable from EvdevReadInput.
+ * src/evdev.h:
+ Removed evdev_abs.c and evdev_rel.c, added evdev_axes.c.
+ Added count to rel and abs.
+ Moved btnMap from rel to the new axes.
+ Shuffle some includes, and include stdarg.h.
+ * src/evdev_abs.c:
+ Removed.
+ * src/evdev_axes.c: (EvdevConvert), (EvdevAxesRealSyn),
+ (EvdevAxesAbsSyn), (EvdevAxesRelSyn), (EvdevAxesSyn),
+ (EvdevAxesAbsProcess), (EvdevAxesRelProcess), (EvdevAxesOn),
+ (EvdevAxesOff), (EvdevAxisAbsNew), (EvdevAxisRelNew),
+ (EvdevAxesNew), (EvdevPtrCtrlProc), (EvdevAxesInit):
+ New, a mix of rel and abs that should actually work in the
+ rel case.
+ * src/evdev_btn.c: (EvdevBtnCalcRemap):
+ Rearrange include order.
+ btnMap was moved from being part of rel to being part of axes.
+ * src/evdev_rel.c:
+ Removed.
+ * src/evdev_brain.c:
+ Rearrange include order.
+ * src/evdev_key.c:
+ Rearrange include order.
+
+ NOTE: This commit has been compile tested, not run tested.
+
+ I have some other changes to make before I can do more heavy testing.
+
2006-04-06 Adam Jackson <ajax@freedesktop.org>
* configure.ac:
diff --git a/src/Makefile.am b/src/Makefile.am
index 2321a40..dc6cded 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -29,4 +29,4 @@
@DRIVER_NAME@_drv_la_CFLAGS = -Wall
@DRIVER_NAME@_drv_ladir = @inputdir@
-@DRIVER_NAME@_drv_la_SOURCES = evdev.c evdev.h evdev_brain.c evdev_abs.c evdev_rel.c evdev_btn.c evdev_key.c
+@DRIVER_NAME@_drv_la_SOURCES = evdev.c evdev.h evdev_brain.c evdev_axes.c evdev_btn.c evdev_key.c
diff --git a/src/evdev.c b/src/evdev.c
index ee35a26..7179c04 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -68,6 +68,7 @@
#include <xf86.h>
#include <xf86Module.h>
+#include <mipointer.h>
#include <xf86_OSproc.h>
@@ -83,7 +84,7 @@ static void
EvdevReadInput(InputInfoPtr pInfo)
{
struct input_event ev;
- int len, value;
+ int len;
while (xf86WaitForInput (pInfo->fd, 0) > 0) {
len = read(pInfo->fd, &ev, sizeof(ev));
@@ -95,16 +96,13 @@ EvdevReadInput(InputInfoPtr pInfo)
break;
}
- /* Get the signed value, earlier kernels had this as unsigned */
- value = ev.value;
-
switch (ev.type) {
case EV_REL:
- EvdevRelProcess (pInfo, &ev);
+ EvdevAxesRelProcess (pInfo, &ev);
break;
case EV_ABS:
- EvdevAbsProcess (pInfo, &ev);
+ EvdevAxesAbsProcess (pInfo, &ev);
break;
case EV_KEY:
@@ -116,8 +114,7 @@ EvdevReadInput(InputInfoPtr pInfo)
case EV_SYN:
if (ev.code == SYN_REPORT) {
- EvdevRelSyn (pInfo);
- EvdevAbsSyn (pInfo);
+ EvdevAxesSyn (pInfo);
/* EvdevBtnSyn (pInfo); */
/* EvdevKeySyn (pInfo); */
}
@@ -144,10 +141,8 @@ EvdevProc(DeviceIntPtr device, int what)
switch (what)
{
case DEVICE_INIT:
- if (pEvdev->state.abs)
- EvdevAbsInit (device);
- if (pEvdev->state.rel)
- EvdevRelInit (device);
+ if (pEvdev->state.axes)
+ EvdevAxesInit (device);
if (pEvdev->state.btn)
EvdevBtnInit (device);
if (pEvdev->state.key)
@@ -184,10 +179,8 @@ EvdevProc(DeviceIntPtr device, int what)
device->public.on = TRUE;
- if (pEvdev->state.abs)
- EvdevAbsOn (device);
- if (pEvdev->state.rel)
- EvdevRelOn (device);
+ if (pEvdev->state.axes)
+ EvdevAxesOn (device);
if (pEvdev->state.btn)
EvdevBtnOn (device);
if (pEvdev->state.key)
@@ -205,10 +198,8 @@ EvdevProc(DeviceIntPtr device, int what)
xf86RemoveSIGIOHandler (pInfo->fd);
close (pInfo->fd);
- if (pEvdev->state.abs)
- EvdevAbsOff (device);
- if (pEvdev->state.rel)
- EvdevRelOff (device);
+ if (pEvdev->state.axes)
+ EvdevAxesOff (device);
if (pEvdev->state.btn)
EvdevBtnOff (device);
if (pEvdev->state.key)
@@ -304,8 +295,7 @@ EvdevNew(evdevDriverPtr driver, evdevDevicePtr device)
/* XXX: Note, the order of these is important. */
- EvdevAbsNew (pInfo);
- EvdevRelNew (pInfo);
+ EvdevAxesNew (pInfo);
EvdevBtnNew (pInfo);
if (device->state.can_grab)
EvdevKeyNew (pInfo);
@@ -448,6 +438,8 @@ EvdevCorePreInit(InputDriverPtr drv, IDevPtr dev, int flags)
return NULL;
}
+
+
_X_EXPORT InputDriverRec EVDEV = {
1,
"evdev",
diff --git a/src/evdev.h b/src/evdev.h
index 797bc9f..80e01f1 100644
--- a/src/evdev.h
+++ b/src/evdev.h
@@ -56,17 +56,21 @@
#ifndef EVDEV_BRAIN_H_
#define EVDEV_BRAIN_H_
+#define _XF86_ANSIC_H
+#define XF86_LIBC_H
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <linux/input.h>
-#include <xf86Xinput.h>
#include <errno.h>
#include <string.h>
#include <unistd.h>
#include <stdio.h>
#include <stdlib.h>
+#include <stdarg.h>
+#include <xf86Xinput.h>
#define BITS_PER_LONG (sizeof(long) * 8)
#define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1)
@@ -145,6 +149,7 @@ typedef struct {
int axes;
int n; /* Which abs_v is current, and which is previous. */
int v[2][ABS_MAX];
+ int count;
int min[ABS_MAX];
int max[ABS_MAX];
int map[ABS_MAX];
@@ -157,11 +162,17 @@ typedef struct {
typedef struct {
int axes;
int v[REL_MAX];
- CARD8 btnMap[REL_MAX][2];
+ int count;
int map[REL_MAX];
} evdevRelRec, *evdevRelPtr;
typedef struct {
+ int axes;
+ int v[ABS_MAX];
+ CARD8 btnMap[ABS_MAX][2];
+} evdevAxesRec, *evdevAxesPtr;
+
+typedef struct {
char *xkb_rules;
char *xkb_model;
char *xkb_layout;
@@ -179,6 +190,7 @@ typedef struct _evdevState {
evdevAbsPtr abs;
evdevRelPtr rel;
evdevKeyPtr key;
+ evdevAxesPtr axes;
} evdevStateRec, *evdevStatePtr;
typedef struct _evdevDevice {
@@ -232,19 +244,13 @@ int EvdevBtnNew(InputInfoPtr pInfo);
void EvdevBtnProcess (InputInfoPtr pInfo, struct input_event *ev);
void EvdevBtnPostFakeClicks(InputInfoPtr pInfo, int button, int count);
-int EvdevAbsInit (DeviceIntPtr device);
-int EvdevAbsOn (DeviceIntPtr device);
-int EvdevAbsOff (DeviceIntPtr device);
-int EvdevAbsNew(InputInfoPtr pInfo);
-void EvdevAbsProcess (InputInfoPtr pInfo, struct input_event *ev);
-void EvdevAbsSyn (InputInfoPtr pInfo);
-
-int EvdevRelInit (DeviceIntPtr device);
-int EvdevRelOn (DeviceIntPtr device);
-int EvdevRelOff (DeviceIntPtr device);
-int EvdevRelNew(InputInfoPtr pInfo);
-void EvdevRelProcess (InputInfoPtr pInfo, struct input_event *ev);
-void EvdevRelSyn (InputInfoPtr pInfo);
+int EvdevAxesInit (DeviceIntPtr device);
+int EvdevAxesOn (DeviceIntPtr device);
+int EvdevAxesOff (DeviceIntPtr device);
+int EvdevAxesNew(InputInfoPtr pInfo);
+void EvdevAxesAbsProcess (InputInfoPtr pInfo, struct input_event *ev);
+void EvdevAxesRelProcess (InputInfoPtr pInfo, struct input_event *ev);
+void EvdevAxesSyn (InputInfoPtr pInfo);
int EvdevKeyInit (DeviceIntPtr device);
int EvdevKeyNew (InputInfoPtr pInfo);
diff --git a/src/evdev_abs.c b/src/evdev_abs.c
deleted file mode 100644
index ded329a..0000000
--- a/src/evdev_abs.c
+++ /dev/null
@@ -1,339 +0,0 @@
-/*
- * Copyright © 2006 Zephaniah E. Hull
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Soft-
- * ware"), to deal in the Software without restriction, including without
- * limitation the rights to use, copy, modify, merge, publish, distribute,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, provided that the above copyright
- * notice(s) and this permission notice appear in all copies of the Soft-
- * ware and that both the above copyright notice(s) and this permission
- * notice appear in supporting documentation.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
- * ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY
- * RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN
- * THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSE-
- * QUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFOR-
- * MANCE OF THIS SOFTWARE.
- *
- * Except as contained in this notice, the name of a copyright holder shall
- * not be used in advertising or otherwise to promote the sale, use or
- * other dealings in this Software without prior written authorization of
- * the copyright holder.
- *
- * Author: Zephaniah E. Hull (warp@aehallh.com)
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <X11/keysym.h>
-#include <X11/XF86keysym.h>
-#include <X11/extensions/XIproto.h>
-
-#include <linux/input.h>
-
-#include <misc.h>
-#include <xf86.h>
-#include <xf86str.h>
-#include <xf86_OSproc.h>
-#include <xf86Xinput.h>
-#include <exevents.h>
-#include <mipointer.h>
-
-#include <xf86Module.h>
-
-#include "evdev.h"
-
-#define ArrayLength(a) (sizeof(a) / (sizeof((a)[0])))
-
-#define BITS_PER_LONG (sizeof(long) * 8)
-#define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1)
-#define OFF(x) ((x)%BITS_PER_LONG)
-#define LONG(x) ((x)/BITS_PER_LONG)
-#define TestBit(bit, array) ((array[LONG(bit)] >> OFF(bit)) & 1)
-
-static char *axis_names[] = {
- "X",
- "Y",
- "Z",
- "RX",
- "RY",
- "RZ",
- "THROTTLE",
- "RUDDER",
- "WHEEL",
- "GAS",
- "BRAKE",
- "11",
- "12",
- "13",
- "14",
- "15",
- "HAT0X",
- "HAT0Y",
- "HAT1X",
- "HAT1Y",
- "HAT2X",
- "HAT2Y",
- "HAT3X",
- "HAT3Y",
- "PRESSURE",
- "TILT_X",
- "TILT_Y",
- "TOOL_WIDTH",
- "VOLUME",
- "29",
- "30",
- "31",
- "32",
- "33",
- "34",
- "35",
- "36",
- "37",
- "38",
- "39",
- "MISC",
- "41",
- "42",
- "43",
- "44",
- "45",
- "46",
- "47",
- "48",
- "49",
- "50",
- "51",
- "52",
- "53",
- "54",
- "55",
- "56",
- "57",
- "58",
- "59",
- "60",
- "61",
- "62",
- NULL
-};
-
-static void
-EvdevPtrCtrlProc(DeviceIntPtr device, PtrCtrl *ctrl)
-{
- /* Nothing to do, dix handles all settings */
-}
-
-static Bool
-EvdevConvert(InputInfoPtr pInfo, int first, int num, int v0, int v1, int v2,
- int v3, int v4, int v5, int *x, int *y)
-{
- if (first == 0) {
- *x = v0;
- *y = v1;
- return TRUE;
- } else
- return FALSE;
-}
-
-/*
- * FIXME: Verify that the C standard lets us pass more variable arguments
- * then we specify.
- */
-void
-EvdevAbsSyn (InputInfoPtr pInfo)
-{
- evdevDevicePtr pEvdev = pInfo->private;
- evdevStatePtr state = &pEvdev->state;
- int i;
- int n;
-
- if (!state->abs)
- return;
-
- n = state->abs->n & 1;
-
- if (state->mode == Absolute) {
- if ((state->abs->screen >= 0) && state->abs->axes >= 2) {
- int conv_x, conv_y;
-
- for (i = 0; i < 2; i++)
- state->abs->v[n][i] = xf86ScaleAxis (state->abs->v[n][i], 0,
- state->abs->scale_x,
- state->abs->min[i], state->abs->max[i]);
-
-
- EvdevConvert (pInfo, 0, 2, state->abs->v[n][0], state->abs->v[n][1],
- 0, 0, 0, 0, &conv_x, &conv_y);
- xf86XInputSetScreen (pInfo, state->abs->screen, conv_x, conv_y);
- }
-
-
- xf86PostMotionEvent(pInfo->dev, 1, 0, state->abs->axes,
- state->abs->v[n][0],
- state->abs->v[n][1], state->abs->v[n][2], state->abs->v[n][3],
- state->abs->v[n][4], state->abs->v[n][5], state->abs->v[n][6],
- state->abs->v[n][7], state->abs->v[n][8], state->abs->v[n][9],
- state->abs->v[n][10], state->abs->v[n][11], state->abs->v[n][12],
- state->abs->v[n][13], state->abs->v[n][14], state->abs->v[n][15]);
- } else {
- for (i = 0; i < 2; i++)
- state->rel->v[i] = state->abs->v[n][i] - state->abs->v[!n][i];
- }
-
- state->abs->n++;
-}
-
-void
-EvdevAbsProcess (InputInfoPtr pInfo, struct input_event *ev)
-{
- evdevDevicePtr pEvdev = pInfo->private;
- evdevStatePtr state = &pEvdev->state;
- int n = state->abs->n & 1;
- int map;
-
- if (ev->code >= ABS_MAX)
- return;
-
- map = pEvdev->state.abs->map[ev->code];
- if (map >= 0)
- pEvdev->state.abs->v[n][map] += ev->value;
- else
- pEvdev->state.abs->v[n][-map] -= ev->value;
-
- if (!pEvdev->state.sync)
- EvdevAbsSyn (pInfo);
-}
-
-int
-EvdevAbsInit (DeviceIntPtr device)
-{
- InputInfoPtr pInfo = device->public.devicePrivate;
- evdevDevicePtr pEvdev = pInfo->private;
- int i;
-
- if (!InitValuatorClassDeviceStruct(device, pEvdev->state.abs->axes,
- miPointerGetMotionEvents,
- miPointerGetMotionBufferSize(), 0))
- return !Success;
-
- for (i = 0; i < pEvdev->state.abs->axes; i++) {
- xf86InitValuatorAxisStruct(device, i, 0, 0, 0, 0, 1);
- xf86InitValuatorDefaults(device, i);
- }
-
- if (!InitPtrFeedbackClassDeviceStruct(device, EvdevPtrCtrlProc))
- return !Success;
-
- return Success;
-}
-
-int
-EvdevAbsOn (DeviceIntPtr device)
-{
- return Success;
-}
-
-int
-EvdevAbsOff (DeviceIntPtr device)
-{
- return Success;
-}
-
-int
-EvdevAbsNew(InputInfoPtr pInfo)
-{
- evdevDevicePtr pEvdev = pInfo->private;
- evdevStatePtr state = &pEvdev->state;
- struct input_absinfo absinfo;
- char *s, option[64];
- int i, j, k = 0, real_axes;
-
- real_axes = 0;
- for (i = 0; i < ABS_MAX; i++)
- if (TestBit (i, pEvdev->bits.abs))
- real_axes++;
-
- if (!real_axes)
- return !Success;
-
- state->abs = Xcalloc (sizeof (evdevAbsRec));
-
- xf86Msg(X_INFO, "%s: Found %d absolute axes.\n", pInfo->name, real_axes);
- xf86Msg(X_INFO, "%s: Configuring as pointer.\n", pInfo->name);
- pInfo->flags |= XI86_POINTER_CAPABLE | XI86_SEND_DRAG_EVENTS |
- XI86_CONFIGURED;
- pInfo->type_name = XI_MOUSE;
- pInfo->conversion_proc = EvdevConvert;
-
- for (i = 0, j = 0; i < ABS_MAX; i++) {
- if (!TestBit (i, pEvdev->bits.abs))
- continue;
-
- snprintf(option, sizeof(option), "%sAbsoluteAxisMap", axis_names[i]);
- k = xf86SetIntOption(pInfo->options, option, -1);
- if (k != -1)
- state->abs->map[i] = k;
- else
- state->abs->map[i] = j;
-
- if (k != -1)
- xf86Msg(X_CONFIG, "%s: %s: %d.\n", pInfo->name, option, k);
-
- if (ioctl (pInfo->fd, EVIOCGABS(i), &absinfo) < 0) {
- xf86Msg(X_ERROR, "ioctl EVIOCGABS failed: %s\n", strerror(errno));
- return !Success;
- }
- state->abs->min[state->abs->map[i]] = absinfo.minimum;
- state->abs->max[state->abs->map[i]] = absinfo.maximum;
-
- j++;
- }
-
- state->abs->axes = real_axes;
- for (i = 0; i < ABS_MAX; i++) {
- if (state->abs->map[i] > state->abs->axes)
- state->abs->axes = state->abs->map[i];
- }
-
- if (state->abs->axes != real_axes)
- xf86Msg(X_CONFIG, "%s: Configuring %d absolute axes.\n", pInfo->name,
- state->abs->axes);
-
- s = xf86SetStrOption(pInfo->options, "Mode", "Absolute");
- if (!strcasecmp(s, "Absolute")) {
- state->mode = Absolute;
- xf86Msg(X_CONFIG, "%s: Configuring in %s mode.\n", pInfo->name, s);
- } else if (!strcasecmp(s, "Relative")) {
- state->mode = Relative;
- xf86Msg(X_CONFIG, "%s: Configuring in %s mode.\n", pInfo->name, s);
- } else {
- state->mode = Absolute;
- xf86Msg(X_CONFIG, "%s: Unknown Mode: %s.\n", pInfo->name, s);
- }
-
- if (TestBit (ABS_X, pEvdev->bits.abs) && TestBit (ABS_Y, pEvdev->bits.abs))
- k = xf86SetIntOption(pInfo->options, "AbsoluteScreen", 0);
- else
- k = xf86SetIntOption(pInfo->options, "AbsoluteScreen", -1);
- if (k < screenInfo.numScreens) {
- state->abs->screen = k;
- xf86Msg(X_CONFIG, "%s: AbsoluteScreen: %d.\n", pInfo->name, k);
- } else {
- state->abs->screen = 0;
- xf86Msg(X_CONFIG, "%s: AbsoluteScreen: %d is not a valid screen.\n", pInfo->name, k);
- }
-
- state->abs->scale_x = screenInfo.screens[state->abs->screen]->width;
- state->abs->scale_y = screenInfo.screens[state->abs->screen]->height;
-
- return Success;
-}
diff --git a/src/evdev_axes.c b/src/evdev_axes.c
new file mode 100644
index 0000000..a164f84
--- /dev/null
+++ b/src/evdev_axes.c
@@ -0,0 +1,535 @@
+/*
+ * Copyright © 2006 Zephaniah E. Hull
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Soft-
+ * ware"), to deal in the Software without restriction, including without
+ * limitation the rights to use, copy, modify, merge, publish, distribute,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, provided that the above copyright
+ * notice(s) and this permission notice appear in all copies of the Soft-
+ * ware and that both the above copyright notice(s) and this permission
+ * notice appear in supporting documentation.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
+ * ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY
+ * RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN
+ * THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSE-
+ * QUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFOR-
+ * MANCE OF THIS SOFTWARE.
+ *
+ * Except as contained in this notice, the name of a copyright holder shall
+ * not be used in advertising or otherwise to promote the sale, use or
+ * other dealings in this Software without prior written authorization of
+ * the copyright holder.
+ *
+ * Author: Zephaniah E. Hull (warp@aehallh.com)
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <X11/keysym.h>
+#include <X11/XF86keysym.h>
+#include <X11/extensions/XIproto.h>
+
+#include <string.h>
+
+#include "evdev.h"
+
+#include <xf86.h>
+
+#include <xf86Module.h>
+#include <mipointer.h>
+
+
+#include <xf86_OSproc.h>
+
+#define ArrayLength(a) (sizeof(a) / (sizeof((a)[0])))
+
+#define BITS_PER_LONG (sizeof(long) * 8)
+#define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1)
+#define OFF(x) ((x)%BITS_PER_LONG)
+#define LONG(x) ((x)/BITS_PER_LONG)
+#define TestBit(bit, array) ((array[LONG(bit)] >> OFF(bit)) & 1)
+
+static char *rel_axis_names[] = {
+ "X",
+ "Y",
+ "Z",
+ "RX",
+ "RY",
+ "RZ",
+ "HWHEEL",
+ "DIAL",
+ "WHEEL",
+ "MISC",
+ "10",
+ "11",
+ "12",
+ "13",
+ "14",
+ "15",
+ NULL
+};
+
+static char *abs_axis_names[] = {
+ "X",
+ "Y",
+ "Z",
+ "RX",
+ "RY",
+ "RZ",
+ "THROTTLE",
+ "RUDDER",
+ "WHEEL",
+ "GAS",
+ "BRAKE",
+ "11",
+ "12",
+ "13",
+ "14",
+ "15",
+ "HAT0X",
+ "HAT0Y",
+ "HAT1X",
+ "HAT1Y",
+ "HAT2X",
+ "HAT2Y",
+ "HAT3X",
+ "HAT3Y",
+ "PRESSURE",
+ "TILT_X",
+ "TILT_Y",
+ "TOOL_WIDTH",
+ "VOLUME",
+ "29",
+ "30",
+ "31",
+ "32",
+ "33",
+ "34",
+ "35",
+ "36",
+ "37",
+ "38",
+ "39",
+ "MISC",
+ "41",
+ "42",
+ "43",
+ "44",
+ "45",
+ "46",
+ "47",
+ "48",
+ "49",
+ "50",
+ "51",
+ "52",
+ "53",
+ "54",
+ "55",
+ "56",
+ "57",
+ "58",
+ "59",
+ "60",
+ "61",
+ "62",
+ NULL
+};
+
+static Bool
+EvdevConvert(InputInfoPtr pInfo, int first, int num, int v0, int v1, int v2,
+ int v3, int v4, int v5, int *x, int *y)
+{
+ if (first == 0) {
+ *x = v0;
+ *y = v1;
+ return TRUE;
+ } else
+ return FALSE;
+}
+
+static void
+EvdevAxesRealSyn (InputInfoPtr pInfo, int absolute)
+{
+ evdevDevicePtr pEvdev = pInfo->private;
+ evdevStatePtr state = &pEvdev->state;
+ evdevAxesPtr axes = state->axes;
+ int i, btn;
+
+ for (i = 0; i < state->axes->axes; i++) {
+ if ((state->axes->v[i] > 0) && (btn = state->axes->btnMap[i][0]))
+ EvdevBtnPostFakeClicks (pInfo, btn, state->axes->v[i]);
+ else if ((state->axes->v[i] < 0) && (btn = state->axes->btnMap[i][1]))
+ EvdevBtnPostFakeClicks (pInfo, btn, -state->axes->v[i]);
+ }
+
+ xf86PostMotionEvent(pInfo->dev, absolute, 0,
+ state->axes->axes,
+ axes->v[0x00], axes->v[0x01], axes->v[0x02], axes->v[0x03],
+ axes->v[0x04], axes->v[0x05], axes->v[0x06], axes->v[0x07],
+ axes->v[0x08], axes->v[0x09], axes->v[0x0a], axes->v[0x0b],
+ axes->v[0x0c], axes->v[0x0d], axes->v[0x0e], axes->v[0x0f],
+ axes->v[0x10], axes->v[0x11], axes->v[0x12], axes->v[0x13],
+ axes->v[0x14], axes->v[0x15], axes->v[0x16], axes->v[0x17],
+ axes->v[0x18], axes->v[0x19], axes->v[0x1a], axes->v[0x1b],
+ axes->v[0x1c], axes->v[0x1d], axes->v[0x1e], axes->v[0x1f],
+ axes->v[0x20], axes->v[0x21], axes->v[0x22], axes->v[0x23],
+ axes->v[0x24], axes->v[0x25], axes->v[0x26], axes->v[0x27],
+ axes->v[0x28], axes->v[0x29], axes->v[0x2a], axes->v[0x2b],
+ axes->v[0x2c], axes->v[0x2d], axes->v[0x2e], axes->v[0x2f],
+ axes->v[0x30], axes->v[0x31], axes->v[0x32], axes->v[0x33],
+ axes->v[0x34], axes->v[0x35], axes->v[0x36], axes->v[0x37],
+ axes->v[0x38], axes->v[0x39], axes->v[0x3a], axes->v[0x3b],
+ axes->v[0x3c], axes->v[0x3d], axes->v[0x3e], axes->v[0x3f]);
+
+ for (i = 0; i < ABS_MAX; i++)
+ state->axes->v[i] = 0;
+}
+
+static void
+EvdevAxesAbsSyn (InputInfoPtr pInfo)
+{
+ evdevDevicePtr pEvdev = pInfo->private;
+ evdevStatePtr state = &pEvdev->state;
+ int i, n;
+
+ if (!state->axes || !state->abs || !state->abs->count)
+ return;
+
+ n = state->abs->n & 1;
+ i = 0;
+
+ if (state->mode == Relative && state->abs->axes >= 2) {
+ for (i = 0; i < 2; i++)
+ state->axes->v[i] = state->abs->v[n][i] - state->abs->v[!n][i];
+ EvdevAxesRealSyn (pInfo, 0);
+ } else if (state->mode == Absolute && state->abs->screen >= 0 && state->abs->axes >= 2) {
+ int conv_x, conv_y;
+
+ for (i = 0; i < 2; i++)
+ state->abs->v[n][i] = xf86ScaleAxis (state->abs->v[n][i], 0,
+ state->abs->scale_x,
+ state->abs->min[i], state->abs->max[i]);
+
+
+ EvdevConvert (pInfo, 0, 2, state->abs->v[n][0], state->abs->v[n][1],
+ 0, 0, 0, 0, &conv_x, &conv_y);
+ xf86XInputSetScreen (pInfo, state->abs->screen, conv_x, conv_y);
+ }
+
+ for (; i < ABS_MAX; i++)
+ state->axes->v[i] = state->abs->v[n][i];
+
+ EvdevAxesRealSyn (pInfo, 1);
+ state->abs->count = 0;
+}
+
+static void
+EvdevAxesRelSyn (InputInfoPtr pInfo)
+{
+ evdevDevicePtr pEvdev = pInfo->private;
+ evdevStatePtr state = &pEvdev->state;
+ int i;
+
+ if (!state->axes || !state->rel || !state->rel->count)
+ return;
+
+ for (i = 0; i < REL_MAX; i++) {
+ state->axes->v[i] = state->rel->v[i];
+ state->rel->v[i] = 0;
+ }
+
+ EvdevAxesRealSyn (pInfo, 0);
+ state->rel->count = 0;
+}
+
+void
+EvdevAxesSyn (InputInfoPtr pInfo)
+{
+ EvdevAxesAbsSyn (pInfo);
+ EvdevAxesRelSyn (pInfo);
+}
+
+void
+EvdevAxesAbsProcess (InputInfoPtr pInfo, struct input_event *ev)
+{
+ evdevDevicePtr pEvdev = pInfo->private;
+ evdevStatePtr state = &pEvdev->state;
+ int n = state->abs->n & 1;
+ int map;
+
+ if (ev->code >= ABS_MAX)
+ return;
+
+ map = state->abs->map[ev->code];
+ if (map >= 0)
+ state->abs->v[n][map] += ev->value;
+ else
+ state->abs->v[n][-map] -= ev->value;
+
+ state->abs->count++;
+
+ if (!state->sync)
+ EvdevAxesAbsSyn (pInfo);
+}
+
+void
+EvdevAxesRelProcess (InputInfoPtr pInfo, struct input_event *ev)
+{
+ evdevDevicePtr pEvdev = pInfo->private;
+ evdevStatePtr state = &pEvdev->state;
+ int map;
+
+ if (ev->code >= REL_MAX)
+ return;
+
+ map = state->rel->map[ev->code];
+ if (map >= 0)
+ state->rel->v[map] += ev->value;
+ else
+ state->rel->v[-map] -= ev->value;
+
+ state->rel->count++;
+
+ if (!state->sync)
+ EvdevAxesRelSyn (pInfo);
+}
+
+int
+EvdevAxesOn (DeviceIntPtr device)
+{
+ return Success;
+}
+
+int
+EvdevAxesOff (DeviceIntPtr device)
+{
+ return Success;
+}
+
+static int
+EvdevAxisAbsNew(InputInfoPtr pInfo)
+{
+ evdevDevicePtr pEvdev = pInfo->private;
+ evdevStatePtr state = &pEvdev->state;
+ struct input_absinfo absinfo;
+ char *s, option[64];
+ int i, j, k = 0, real_axes;
+
+ real_axes = 0;
+ for (i = 0; i < ABS_MAX; i++)
+ if (TestBit (i, pEvdev->bits.abs))
+ real_axes++;
+
+ if (!real_axes)
+ return !Success;
+
+ state->abs = Xcalloc (sizeof (evdevAbsRec));
+
+ xf86Msg(X_INFO, "%s: Found %d absolute axes.\n", pInfo->name, real_axes);
+ xf86Msg(X_INFO, "%s: Configuring as pointer.\n", pInfo->name);
+ pInfo->flags |= XI86_POINTER_CAPABLE | XI86_SEND_DRAG_EVENTS |
+ XI86_CONFIGURED;
+ pInfo->type_name = XI_MOUSE;
+ pInfo->conversion_proc = EvdevConvert;
+
+ for (i = 0, j = 0; i < ABS_MAX; i++) {
+ if (!TestBit (i, pEvdev->bits.abs))
+ continue;
+
+ snprintf(option, sizeof(option), "%sAbsoluteAxisMap", abs_axis_names[i]);
+ k = xf86SetIntOption(pInfo->options, option, -1);
+ if (k != -1)
+ state->abs->map[i] = k;
+ else
+ state->abs->map[i] = j;
+
+ if (k != -1)
+ xf86Msg(X_CONFIG, "%s: %s: %d.\n", pInfo->name, option, k);
+
+ if (ioctl (pInfo->fd, EVIOCGABS(i), &absinfo) < 0) {
+ xf86Msg(X_ERROR, "ioctl EVIOCGABS failed: %s\n", strerror(errno));
+ return !Success;
+ }
+ state->abs->min[state->abs->map[i]] = absinfo.minimum;
+ state->abs->max[state->abs->map[i]] = absinfo.maximum;
+
+ j++;
+ }
+
+ state->abs->axes = real_axes;
+ for (i = 0; i < ABS_MAX; i++) {
+ if (state->abs->map[i] > state->abs->axes)
+ state->abs->axes = state->abs->map[i];
+ }
+
+ if (state->abs->axes != real_axes)
+ xf86Msg(X_CONFIG, "%s: Configuring %d absolute axes.\n", pInfo->name,
+ state->abs->axes);
+
+ s = xf86SetStrOption(pInfo->options, "Mode", "Absolute");
+ if (!strcasecmp(s, "Absolute")) {
+ state->mode = Absolute;
+ xf86Msg(X_CONFIG, "%s: Configuring in %s mode.\n", pInfo->name, s);
+ } else if (!strcasecmp(s, "Relative")) {
+ state->mode = Relative;
+ xf86Msg(X_CONFIG, "%s: Configuring in %s mode.\n", pInfo->name, s);
+ } else {
+ state->mode = Absolute;
+ xf86Msg(X_CONFIG, "%s: Unknown Mode: %s.\n", pInfo->name, s);
+ }
+
+ if (TestBit (ABS_X, pEvdev->bits.abs) && TestBit (ABS_Y, pEvdev->bits.abs))
+ k = xf86SetIntOption(pInfo->options, "AbsoluteScreen", 0);
+ else
+ k = xf86SetIntOption(pInfo->options, "AbsoluteScreen", -1);
+ if (k < screenInfo.numScreens) {
+ state->abs->screen = k;
+ xf86Msg(X_CONFIG, "%s: AbsoluteScreen: %d.\n", pInfo->name, k);
+ } else {
+ state->abs->screen = 0;
+ xf86Msg(X_CONFIG, "%s: AbsoluteScreen: %d is not a valid screen.\n", pInfo->name, k);
+ }
+
+ state->abs->scale_x = screenInfo.screens[state->abs->screen]->width;
+ state->abs->scale_y = screenInfo.screens[state->abs->screen]->height;
+
+ return Success;
+}
+
+static int
+EvdevAxisRelNew(InputInfoPtr pInfo)
+{
+ evdevDevicePtr pEvdev = pInfo->private;
+ evdevStatePtr state = &pEvdev->state;
+ char *s, option[64];
+ int i, j, k = 0, real_axes;
+
+ real_axes = 0;
+ for (i = 0; i < REL_MAX; i++)
+ if (TestBit (i, pEvdev->bits.rel))
+ real_axes++;
+
+ if (!real_axes && (!state->abs || state->abs->axes < 2))
+ return !Success;
+
+ state->rel = Xcalloc (sizeof (evdevRelRec));
+
+ xf86Msg(X_INFO, "%s: Found %d relative axes.\n", pInfo->name,
+ real_axes);
+ xf86Msg(X_INFO, "%s: Configuring as pointer.\n", pInfo->name);
+ pInfo->flags |= XI86_POINTER_CAPABLE | XI86_SEND_DRAG_EVENTS |
+ XI86_CONFIGURED;
+ pInfo->type_name = XI_MOUSE;
+ pInfo->conversion_proc = EvdevConvert;
+
+ for (i = 0, j = 0; i < REL_MAX; i++) {
+ if (!TestBit (i, pEvdev->bits.rel))
+ continue;
+
+ snprintf(option, sizeof(option), "%sRelativeAxisMap", rel_axis_names[i]);
+ s = xf86SetStrOption(pInfo->options, option, "0");
+ if (s && (k = strtol(s, NULL, 0)))
+ state->rel->map[i] = k;
+ else
+ state->rel->map[i] = j;
+
+ if (s && k)
+ xf86Msg(X_CONFIG, "%s: %s: %d.\n", pInfo->name, option, k);
+
+
+ snprintf(option, sizeof(option), "%sRelativeAxisButtons", rel_axis_names[i]);
+ if (i == REL_WHEEL || i == REL_Z)
+ s = xf86SetStrOption(pInfo->options, option, "4 5");
+ else if (i == REL_HWHEEL)
+ s = xf86SetStrOption(pInfo->options, option, "6 7");
+ else
+ s = xf86SetStrOption(pInfo->options, option, "0 0");
+
+ k = state->rel->map[i];
+
+ if (!s || (sscanf(s, "%d %d", &state->axes->btnMap[k][0],
+ &state->axes->btnMap[k][1]) != 2))
+ state->axes->btnMap[k][0] = state->axes->btnMap[k][1] = 0;
+
+ if (state->axes->btnMap[k][0] || state->axes->btnMap[k][1])
+ xf86Msg(X_CONFIG, "%s: %s: %d %d.\n", pInfo->name, option,
+ state->axes->btnMap[k][0], state->axes->btnMap[k][1]);
+
+ j++;
+ }
+
+ state->rel->axes = real_axes;
+ for (i = 0; i < REL_MAX; i++)
+ if (state->rel->map[i] > state->rel->axes)
+ state->rel->axes = state->rel->map[i];
+
+ if (state->abs && (state->abs->axes >= 2) && (state->rel->axes < 2))
+ state->rel->axes = 2;
+
+ if (state->rel->axes != real_axes)
+ xf86Msg(X_CONFIG, "%s: Configuring %d relative axes.\n", pInfo->name,
+ state->rel->axes);
+
+ return Success;
+}
+
+int
+EvdevAxesNew (InputInfoPtr pInfo)
+{
+ int ret = Success;
+ if (EvdevAxisAbsNew(pInfo) != Success)
+ ret = !Success;
+ if (EvdevAxisRelNew(pInfo) != Success)
+ ret = !Success;
+
+ return ret;
+}
+
+
+static void
+EvdevPtrCtrlProc(DeviceIntPtr device, PtrCtrl *ctrl)
+{
+ /* Nothing to do, dix handles all settings */
+}
+
+int
+EvdevAxesInit (DeviceIntPtr device)
+{
+ InputInfoPtr pInfo = device->public.devicePrivate;
+ evdevDevicePtr pEvdev = pInfo->private;
+ evdevStatePtr state = &pEvdev->state;
+ int i, axes = 0;
+
+ if (state->abs && state->abs->axes > axes)
+ axes = state->abs->axes;
+ if (state->abs && state->rel->axes > axes)
+ axes = state->rel->axes;
+
+ if (!axes)
+ return Success;
+
+ if (!InitValuatorClassDeviceStruct(device, axes,
+ miPointerGetMotionEvents,
+ miPointerGetMotionBufferSize(), 0))
+ return !Success;
+
+ for (i = 0; i < axes; i++) {
+ xf86InitValuatorAxisStruct(device, i, 0, 0, 0, 0, 1);
+ xf86InitValuatorDefaults(device, i);
+ }
+
+ if (!InitPtrFeedbackClassDeviceStruct(device, EvdevPtrCtrlProc))
+ return !Success;
+
+ return Success;
+}
+
diff --git a/src/evdev_brain.c b/src/evdev_brain.c
index 2de39c6..92f003c 100644
--- a/src/evdev_brain.c
+++ b/src/evdev_brain.c
@@ -33,11 +33,10 @@
#include "config.h"
#endif
-#define HAVE_WRAPPER_DECLS
-#include "xf86_OSlib.h"
-
#include "evdev.h"
+#include "xf86_OSlib.h"
+
#include <xf86.h>
#include <fnmatch.h>
diff --git a/src/evdev_btn.c b/src/evdev_btn.c
index a0e0dad..b9cd60d 100644
--- a/src/evdev_btn.c
+++ b/src/evdev_btn.c
@@ -33,6 +33,8 @@
#include "config.h"
#endif
+#include "evdev.h"
+
#include <X11/keysym.h>
#include <X11/XF86keysym.h>
#include <X11/extensions/XIproto.h>
@@ -49,7 +51,6 @@
#include <xf86Module.h>
-#include "evdev.h"
#define ArrayLength(a) (sizeof(a) / (sizeof((a)[0])))
@@ -138,12 +139,12 @@ EvdevBtnCalcRemap (InputInfoPtr pInfo)
do {
clear = 1;
for (j = 0; j < REL_MAX; j++) {
- if (state->rel->btnMap[j][0] == (i + base)) {
+ if (state->axes->btnMap[j][0] == (i + base)) {
base++;
clear = 0;
break;
}
- if (state->rel->btnMap[j][1] == (i + base)) {
+ if (state->axes->btnMap[j][1] == (i + base)) {
base++;
clear = 0;
break;
@@ -166,10 +167,10 @@ EvdevBtnCalcRemap (InputInfoPtr pInfo)
if (state->rel) {
for (i = 0; i < REL_MAX; i++) {
- if (state->rel->btnMap[i][0] > state->btn->buttons)
- state->btn->buttons = state->rel->btnMap[i][0];
- if (state->rel->btnMap[i][1] > state->btn->buttons)
- state->btn->buttons = state->rel->btnMap[i][1];
+ if (state->axes->btnMap[i][0] > state->btn->buttons)
+ state->btn->buttons = state->axes->btnMap[i][0];
+ if (state->axes->btnMap[i][1] > state->btn->buttons)
+ state->btn->buttons = state->axes->btnMap[i][1];
}
}
}
diff --git a/src/evdev_key.c b/src/evdev_key.c
index 74b383b..af2c943 100644
--- a/src/evdev_key.c
+++ b/src/evdev_key.c
@@ -57,6 +57,8 @@
#include "config.h"
#endif
+#include "evdev.h"
+
#include <X11/keysym.h>
#include <X11/XF86keysym.h>
#include <X11/extensions/XIproto.h>
@@ -77,7 +79,6 @@
#include <X11/extensions/XKBstr.h>
#include <X11/extensions/XKBsrv.h>
-#include "evdev.h"
#define ArrayLength(a) (sizeof(a) / (sizeof((a)[0])))
#define BITS_PER_LONG (sizeof(long) * 8)
diff --git a/src/evdev_rel.c b/src/evdev_rel.c
deleted file mode 100644
index f6d6c75..0000000
--- a/src/evdev_rel.c
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
- * Copyright © 2006 Zephaniah E. Hull
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Soft-
- * ware"), to deal in the Software without restriction, including without
- * limitation the rights to use, copy, modify, merge, publish, distribute,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, provided that the above copyright
- * notice(s) and this permission notice appear in all copies of the Soft-
- * ware and that both the above copyright notice(s) and this permission
- * notice appear in supporting documentation.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
- * ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY
- * RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN
- * THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSE-
- * QUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFOR-
- * MANCE OF THIS SOFTWARE.
- *
- * Except as contained in this notice, the name of a copyright holder shall
- * not be used in advertising or otherwise to promote the sale, use or
- * other dealings in this Software without prior written authorization of
- * the copyright holder.
- *
- * Author: Zephaniah E. Hull (warp@aehallh.com)
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <X11/keysym.h>
-#include <X11/XF86keysym.h>
-#include <X11/extensions/XIproto.h>
-
-#include <linux/input.h>
-
-#include <misc.h>
-#include <xf86.h>
-#include <xf86str.h>
-#include <xf86_OSproc.h>
-#include <xf86Xinput.h>
-#include <exevents.h>
-#include <mipointer.h>
-
-#include <xf86Module.h>
-
-#include "evdev.h"
-
-#define ArrayLength(a) (sizeof(a) / (sizeof((a)[0])))
-
-#define BITS_PER_LONG (sizeof(long) * 8)
-#define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1)
-#define OFF(x) ((x)%BITS_PER_LONG)
-#define LONG(x) ((x)/BITS_PER_LONG)
-#define TestBit(bit, array) ((array[LONG(bit)] >> OFF(bit)) & 1)
-
-static char *axis_names[] = {
- "X",
- "Y",
- "Z",
- "RX",
- "RY",
- "RZ",
- "HWHEEL",
- "DIAL",
- "WHEEL",
- "MISC",
- "10",
- "11",
- "12",
- "13",
- "14",
- "15",
- NULL
-};
-
-static void
-EvdevPtrCtrlProc(DeviceIntPtr device, PtrCtrl *ctrl)
-{
- /* Nothing to do, dix handles all settings */
-}
-
-static Bool
-EvdevConvert(InputInfoPtr pInfo, int first, int num, int v0, int v1, int v2,
- int v3, int v4, int v5, int *x, int *y)
-{
- if (first == 0) {
- *x = v0;
- *y = v1;
- return TRUE;
- } else
- return FALSE;
-}
-
-/*
- * FIXME: Verify that the C standard lets us pass more variable arguments
- * then we specify.
- */
-void
-EvdevRelSyn (InputInfoPtr pInfo)
-{
- evdevDevicePtr pEvdev = pInfo->private;
- evdevStatePtr state = &pEvdev->state;
- int i, btn;
-
- if (!state->rel || state->mode != Relative)
- return;
-
- for (i = 0; i < state->rel->axes; i++) {
- if ((state->rel->v[i] > 0) && (btn = state->rel->btnMap[i][0]))
- EvdevBtnPostFakeClicks (pInfo, btn, state->rel->v[i]);
- else if ((state->rel->v[i] < 0) && (btn = state->rel->btnMap[i][1]))
- EvdevBtnPostFakeClicks (pInfo, btn, -state->rel->v[i]);
- }
-
- xf86PostMotionEvent(pInfo->dev, 0, 0, state->rel->axes,
- state->rel->v[0], state->rel->v[1], state->rel->v[2], state->rel->v[3],
- state->rel->v[4], state->rel->v[5], state->rel->v[6], state->rel->v[7],
- state->rel->v[8], state->rel->v[9], state->rel->v[10], state->rel->v[11],
- state->rel->v[12], state->rel->v[13], state->rel->v[14], state->rel->v[15]);
-
- for (i = 0; i < REL_MAX; i++)
- state->rel->v[i] = 0;
-}
-
-void
-EvdevRelProcess (InputInfoPtr pInfo, struct input_event *ev)
-{
- evdevDevicePtr pEvdev = pInfo->private;
- int map;
-
- if (ev->code >= REL_MAX)
- return;
-
- map = pEvdev->state.rel->map[ev->code];
- if (map >= 0)
- pEvdev->state.rel->v[map] += ev->value;
- else
- pEvdev->state.rel->v[-map] -= ev->value;
-
- if (!pEvdev->state.sync)
- EvdevRelSyn (pInfo);
-}
-
-int
-EvdevRelInit (DeviceIntPtr device)
-{
- InputInfoPtr pInfo = device->public.devicePrivate;
- evdevDevicePtr pEvdev = pInfo->private;
- int i;
-
- if (!InitValuatorClassDeviceStruct(device, pEvdev->state.rel->axes,
- miPointerGetMotionEvents,
- miPointerGetMotionBufferSize(), 0))
- return !Success;
-
- for (i = 0; i < pEvdev->state.rel->axes; i++) {
- xf86InitValuatorAxisStruct(device, i, 0, 0, 0, 0, 1);
- xf86InitValuatorDefaults(device, i);
- }
-
- if (!InitPtrFeedbackClassDeviceStruct(device, EvdevPtrCtrlProc))
- return !Success;
-
- return Success;
-}
-
-int
-EvdevRelOn (DeviceIntPtr device)
-{
- return Success;
-}
-
-int
-EvdevRelOff (DeviceIntPtr device)
-{
- return Success;
-}
-
-int
-EvdevRelNew(InputInfoPtr pInfo)
-{
- evdevDevicePtr pEvdev = pInfo->private;
- evdevStatePtr state = &pEvdev->state;
- char *s, option[64];
- int i, j, k = 0, real_axes;
-
- real_axes = 0;
- for (i = 0; i < REL_MAX; i++)
- if (TestBit (i, pEvdev->bits.rel))
- real_axes++;
-
- if (!real_axes && (!state->abs || state->abs->axes < 2))
- return !Success;
-
- state->rel = Xcalloc (sizeof (evdevRelRec));
-
- xf86Msg(X_INFO, "%s: Found %d relative axes.\n", pInfo->name,
- real_axes);
- xf86Msg(X_INFO, "%s: Configuring as pointer.\n", pInfo->name);
- pInfo->flags |= XI86_POINTER_CAPABLE | XI86_SEND_DRAG_EVENTS |
- XI86_CONFIGURED;
- pInfo->type_name = XI_MOUSE;
- pInfo->conversion_proc = EvdevConvert;
-
- for (i = 0, j = 0; i < REL_MAX; i++) {
- if (!TestBit (i, pEvdev->bits.rel))
- continue;
-
- snprintf(option, sizeof(option), "%sRelativeAxisMap", axis_names[i]);
- s = xf86SetStrOption(pInfo->options, option, "0");
- if (s && (k = strtol(s, NULL, 0)))
- state->rel->map[i] = k;
- else
- state->rel->map[i] = j;
-
- if (s && k)
- xf86Msg(X_CONFIG, "%s: %s: %d.\n", pInfo->name, option, k);
-
-
- snprintf(option, sizeof(option), "%sRelativeAxisButtons", axis_names[i]);
- if (i == REL_WHEEL || i == REL_Z)
- s = xf86SetStrOption(pInfo->options, option, "4 5");
- else if (i == REL_HWHEEL)
- s = xf86SetStrOption(pInfo->options, option, "6 7");
- else
- s = xf86SetStrOption(pInfo->options, option, "0 0");
-
- k = state->rel->map[i];
-
- if (!s || (sscanf(s, "%d %d", &state->rel->btnMap[k][0],
- &state->rel->btnMap[k][1]) != 2))
- state->rel->btnMap[k][0] = state->rel->btnMap[k][1] = 0;
-
- if (state->rel->btnMap[k][0] || state->rel->btnMap[k][1])
- xf86Msg(X_CONFIG, "%s: %s: %d %d.\n", pInfo->name, option,
- state->rel->btnMap[k][0], state->rel->btnMap[k][1]);
-
- j++;
- }
-
- state->rel->axes = real_axes;
- for (i = 0; i < REL_MAX; i++)
- if (state->rel->map[i] > state->rel->axes)
- state->rel->axes = state->rel->map[i];
-
- if (state->abs && (state->abs->axes >= 2) && (state->rel->axes < 2))
- state->rel->axes = 2;
-
- if (state->rel->axes != real_axes)
- xf86Msg(X_CONFIG, "%s: Configuring %d relative axes.\n", pInfo->name,
- state->rel->axes);
-
- return Success;
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 05:23:31 +0000