diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2012-07-23 22:11:57 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2012-07-24 18:53:33 -0700 |
| commit | a2494e6fe3168b03f2ebc7d584db0256657c891f (patch) | |
| tree | 38627ff371ac415651f51a5c84f1d32fc7fcf365 /src/mouse.c | |
| parent | 88e90dde7a5ffff67da9e091e59c09f2a0828582 (diff) | |
| download | xorg-driver-xf86-input-mouse-a2494e6fe3168b03f2ebc7d584db0256657c891f.tar.gz | |
Raise bar for xorg-server to 1.7 for XINPUT ABI 7
Not all of the button label settings were wrapped in ABI #ifdefs,
so just drop all #ifdefs for GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 7
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Diffstat (limited to 'src/mouse.c')
| -rw-r--r-- | src/mouse.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/src/mouse.c b/src/mouse.c index 7d1ee1b..70ea7fb 100644 --- a/src/mouse.c +++ b/src/mouse.c @@ -1673,10 +1673,8 @@ MouseProc(DeviceIntPtr device, int what) mousePrivPtr mPriv; unsigned char map[MSE_MAXBUTTONS + 1]; int i; -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 Atom btn_labels[MSE_MAXBUTTONS] = {0}; Atom axes_labels[2] = { 0, 0 }; -#endif pInfo = device->public.devicePrivate; pMse = pInfo->private; @@ -1693,29 +1691,21 @@ MouseProc(DeviceIntPtr device, int what) for (i = 0; i < MSE_MAXBUTTONS; i++) map[i + 1] = i + 1; -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 MouseInitButtonLabels(btn_labels); axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_X); axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_Y); -#endif InitPointerDeviceStruct((DevicePtr)device, map, min(pMse->buttons, MSE_MAXBUTTONS), -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 btn_labels, -#endif pMse->Ctrl, - GetMotionHistorySize(), 2 -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 - , axes_labels -#endif + GetMotionHistorySize(), 2, + axes_labels ); /* X valuator */ xf86InitValuatorAxisStruct(device, 0, -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 axes_labels[0], -#endif -1, -1, 1, 0, 1 #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12 , Relative @@ -1724,9 +1714,7 @@ MouseProc(DeviceIntPtr device, int what) xf86InitValuatorDefaults(device, 0); /* Y valuator */ xf86InitValuatorAxisStruct(device, 1, -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 axes_labels[1], -#endif -1, -1, 1, 0, 1 #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12 , Relative |