XLibre/xf86-input-evdev
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-input-evdev.git synced 2026-04-14 11:44:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation.

Browse Source
This commit is contained in:
Zephaniah E. Hull
2006-09-10 06:47:15 -04:00
parent 771eee9682
commit ab65184d47
3 changed files with 52 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/evdev.c
View File

@@ -117,9 +117,13 @@ EvdevReadInput(InputInfoPtr pInfo)
case EV_SYN:
if (ev.code == SYN_REPORT) {
EvdevAxesSyn (pInfo);
/* EvdevBtnSyn (pInfo); */
/* EvdevKeySyn (pInfo); */
EvdevAxesSynRep (pInfo);
/* EvdevBtnSynRep (pInfo); */
/* EvdevKeySynRep (pInfo); */
} else if (ev.code == SYN_CONFIG) {
EvdevAxesSynCfg (pInfo);
/* EvdevBtnSynCfg (pInfo); */
/* EvdevKeySynCfg (pInfo); */
}
break;
}

9
src/evdev.h
View File

@@ -117,6 +117,12 @@
#include <X11/extensions/XKB.h>
#include <X11/extensions/XKBstr.h>
/* XInput 1.4+ compatability. */
#ifndef SendCoreEvents
#define SendCoreEvents 59
#define DontSendCoreEvents 60
#endif
/*
* Switch events
@@ -264,7 +270,8 @@ int EvdevAxesNew0(InputInfoPtr pInfo);
int EvdevAxesNew1(InputInfoPtr pInfo);
void EvdevAxesAbsProcess (InputInfoPtr pInfo, struct input_event *ev);
void EvdevAxesRelProcess (InputInfoPtr pInfo, struct input_event *ev);
void EvdevAxesSyn (InputInfoPtr pInfo);
void EvdevAxesSynRep (InputInfoPtr pInfo);
void EvdevAxesSynCfg (InputInfoPtr pInfo);
int EvdevKeyInit (DeviceIntPtr device);
int EvdevKeyNew (InputInfoPtr pInfo);

45
src/evdev_axes.c
View File

@@ -215,7 +215,29 @@ EvdevAxesRealSyn (InputInfoPtr pInfo, int absolute, int skip_xy)
}
static void
EvdevAxesAbsSyn (InputInfoPtr pInfo)
EvdevAxesAbsSynCfg (InputInfoPtr pInfo)
{
evdevDevicePtr pEvdev = pInfo->private;
evdevStatePtr state = &pEvdev->state;
struct input_absinfo absinfo;
int i;
for (i = 0; i < ABS_MAX; i++) {
if (!test_bit (i, pEvdev->bits.abs))
continue;
if (ioctl (pInfo->fd, EVIOCGABS(i), &absinfo) < 0) {
xf86Msg(X_ERROR, "ioctl EVIOCGABS (%d) failed: %s\n", i, strerror(errno));
continue;
}
state->abs->min[state->abs->map[i]] = absinfo.minimum;
state->abs->max[state->abs->map[i]] = absinfo.maximum;
}
}
static void
EvdevAxesAbsSynRep (InputInfoPtr pInfo)
{
evdevDevicePtr pEvdev = pInfo->private;
evdevStatePtr state = &pEvdev->state;
@@ -263,7 +285,7 @@ EvdevAxesAbsSyn (InputInfoPtr pInfo)
}
static void
EvdevAxesRelSyn (InputInfoPtr pInfo)
EvdevAxesRelSynRep (InputInfoPtr pInfo)
{
evdevDevicePtr pEvdev = pInfo->private;
evdevStatePtr state = &pEvdev->state;
@@ -290,10 +312,17 @@ EvdevAxesRelSyn (InputInfoPtr pInfo)
}
void
EvdevAxesSyn (InputInfoPtr pInfo)
EvdevAxesSynRep (InputInfoPtr pInfo)
{
EvdevAxesAbsSyn (pInfo);
EvdevAxesRelSyn (pInfo);
EvdevAxesAbsSynRep (pInfo);
EvdevAxesRelSynRep (pInfo);
}
void
EvdevAxesSynCfg (InputInfoPtr pInfo)
{
EvdevAxesAbsSynCfg (pInfo);
/* EvdevAxesRelSynCfg (pInfo);*/
}
void
@@ -316,7 +345,7 @@ EvdevAxesAbsProcess (InputInfoPtr pInfo, struct input_event *ev)
state->abs->count++;
if (!state->sync)
EvdevAxesAbsSyn (pInfo);
EvdevAxesAbsSynRep (pInfo);
}
void
@@ -338,7 +367,7 @@ EvdevAxesRelProcess (InputInfoPtr pInfo, struct input_event *ev)
state->rel->count++;
if (!state->sync)
EvdevAxesRelSyn (pInfo);
EvdevAxesRelSynRep (pInfo);
}
int
@@ -637,7 +666,7 @@ EvdevAxesInit (DeviceIntPtr device)
return !Success;
for (i = 0; i < axes; i++) {
xf86InitValuatorAxisStruct(device, i, 0, 0, 0, 0, 1);
xf86InitValuatorAxisStruct(device, i, 0, -1, 0, 0, 1);
xf86InitValuatorDefaults(device, i);
}