XLibre/xf86-input-joystick
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-input-joystick.git synced 2026-03-24 01:34:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support for axis labels; fix build on master

Browse Source 
The first two axes are always REL_X and REL_Y. All other axes and buttons
are set to 'None', proper labeling will follow.

Thanks to Peter for the heads up.

Signed-off-by: Sascha Hlusiak <saschahlusiak@arcor.de>
This commit is contained in:
Sascha Hlusiak
2009-06-23 23:51:32 +02:00
parent e171007239
commit b2de71f436
1 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/jstk.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2007-2008 by Sascha Hlusiak. <saschahlusiak@freedesktop.org>
* Copyright 2007-2009 by Sascha Hlusiak. <saschahlusiak@freedesktop.org>
* Copyright 1995-1999 by Frederic Lepied, France. <Lepied@XFree86.org>
*
* Permission to use, copy, modify, distribute, and sell this software and its
@@ -44,6 +44,9 @@
#include "jstk_key.h"
#include "jstk_options.h"
#include "jstk_properties.h"
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 3
#include <xserver-properties.h>
#endif
#ifdef LINUX_BACKEND
#include "backend_joystick.h"
@@ -326,6 +329,10 @@ jstkDeviceControlProc(DeviceIntPtr pJstk,
int i;
LocalDevicePtr local = (LocalDevicePtr)pJstk->public.devicePrivate;
JoystickDevPtr priv = (JoystickDevPtr)XI_PRIVATE(pJstk);
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
Atom btn_labels[BUTTONMAP_SIZE+1] = {0}; /* TODO: fillme */
Atom axes_labels[MAXAXES] = {0}; /* TODO: fillme */
#endif
switch (what) {
case DEVICE_INIT: {
@@ -341,9 +348,16 @@ jstkDeviceControlProc(DeviceIntPtr pJstk,
priv->close_proc(priv);
}
for (m=0; m<=BUTTONMAP_SIZE; m++)
for (m=0; m<=BUTTONMAP_SIZE; m++) {
buttonmap[m] = m;
}
if (InitButtonClassDeviceStruct(pJstk, BUTTONMAP_SIZE,
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
btn_labels,
#endif
buttonmap) == FALSE) {
ErrorF("unable to allocate Button class device\n");
return !Success;
@@ -361,6 +375,9 @@ jstkDeviceControlProc(DeviceIntPtr pJstk,
if (InitValuatorClassDeviceStruct(pJstk,
m,
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
axes_labels,
#endif
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
xf86GetMotionEvents,
#endif
@@ -371,6 +388,9 @@ jstkDeviceControlProc(DeviceIntPtr pJstk,
} else {
InitValuatorAxisStruct(pJstk,
0, /* valuator num */
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
XIGetKnownProperty(AXIS_LABEL_PROP_REL_X),
#endif
0, /* min val */
screenInfo.screens[0]->width, /* max val */
1, /* resolution */
@@ -378,6 +398,9 @@ jstkDeviceControlProc(DeviceIntPtr pJstk,
1); /* max_res */
InitValuatorAxisStruct(pJstk,
1, /* valuator num */
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
XIGetKnownProperty(AXIS_LABEL_PROP_REL_Y),
#endif
0, /* min val */
screenInfo.screens[0]->height, /* max val */
1, /* resolution */
@@ -388,6 +411,9 @@ jstkDeviceControlProc(DeviceIntPtr pJstk,
{
InitValuatorAxisStruct(pJstk,
priv->axis[i].valuator,
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
axes_labels[i],
#endif
-32768, /* min val */
32767, /* max val */
1, /* resolution */