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

Prepare for ABI_XINPUT_VERSION 7.

Browse Source 
Still missing the actual button and axis labeling,
this can be added at a later point in time.
This commit is contained in:
matthieu 2009-11-22 22:08:57 +00:00
parent 44eea5f75c
commit deae15d61d
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
driver/xf86-input-ws/src/ws.c
View File

@ -13,7 +13,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $OpenBSD: ws.c,v 1.2 2009/11/22 19:26:48 matthieu Exp $ */ /* $OpenBSD: ws.c,v 1.3 2009/11/22 22:08:57 matthieu Exp $ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
@ -339,6 +339,10 @@ wsProc(DeviceIntPtr pWS, int what)
WSDevicePtr priv = (WSDevicePtr)XI_PRIVATE(pWS); WSDevicePtr priv = (WSDevicePtr)XI_PRIVATE(pWS);
unsigned char map[NBUTTONS + 1]; unsigned char map[NBUTTONS + 1];
int i; int i;
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
Atom btn_labels[NBUTTONS] = {0};
Atom axes_labels[NAXES] = {0};
#endif
switch (what) { switch (what) {
case DEVICE_INIT: case DEVICE_INIT:
@ -353,6 +357,9 @@ wsProc(DeviceIntPtr pWS, int what)
map[i + 1] = i + 1; map[i + 1] = i + 1;
InitPointerDeviceStruct((DevicePtr)pWS, map, InitPointerDeviceStruct((DevicePtr)pWS, map,
min(priv->buttons, NBUTTONS), min(priv->buttons, NBUTTONS),
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
btn_labels,
#endif
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
miPointerGetMotionEvents, miPointerGetMotionEvents,
#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 #elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
@ -363,12 +370,23 @@ wsProc(DeviceIntPtr pWS, int what)
miPointerGetMotionBufferSize() miPointerGetMotionBufferSize()
#else #else
GetMotionHistorySize(), NAXES GetMotionHistorySize(), NAXES
#endif
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
, axes_labels
#endif #endif
); );
xf86InitValuatorAxisStruct(pWS, 0, 0, -1, 1, 0, 1); xf86InitValuatorAxisStruct(pWS,
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
axes_labels[0],
#endif
0, 0, -1, 1, 0, 1);
xf86InitValuatorDefaults(pWS, 0); xf86InitValuatorDefaults(pWS, 0);
xf86InitValuatorAxisStruct(pWS, 1, 0, -1, 1, 0, 1); xf86InitValuatorAxisStruct(pWS,
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
axes_labels[1],
#endif
1, 0, -1, 1, 0, 1);
xf86InitValuatorDefaults(pWS, 1); xf86InitValuatorDefaults(pWS, 1);
xf86MotionHistoryAllocate(pInfo); xf86MotionHistoryAllocate(pInfo);
AssignTypeAndName(pWS, pInfo->atom, pInfo->name); AssignTypeAndName(pWS, pInfo->atom, pInfo->name);