From 27ab95e7ad000bfb7751e6e208d96985cc53d423 Mon Sep 17 00:00:00 2001 From: Simon Thum Date: Thu, 10 Mar 2011 21:03:40 +0100 Subject: [PATCH 6/6] xserver: remove AbsoluteClass, breaking the A(P|B)I Signed-off-by: Simon Thum --- dix/devices.c | 9 --------- include/input.h | 6 ------ include/inputstr.h | 2 -- 3 files changed, 0 insertions(+), 17 deletions(-) diff --git a/dix/devices.c b/dix/devices.c index 534931c..fc2e468 100644 --- a/dix/devices.c +++ b/dix/devices.c @@ -1334,15 +1334,6 @@ InitPointerAccelerationScheme(DeviceIntPtr dev, } Bool -InitAbsoluteClassDeviceStruct(DeviceIntPtr dev) -{ - /* This is an API-preserving noop. Instructions: Kill when no more drivers - * call it. The infrastructure behind hasn't really been used, so any calls - * are likely just a declaration that the device is absolute. */ - return FALSE; -} - -Bool InitFocusClassDeviceStruct(DeviceIntPtr dev) { FocusClassPtr focc; diff --git a/include/input.h b/include/input.h index 2bb85ff..c88263c 100644 --- a/include/input.h +++ b/include/input.h @@ -311,12 +311,6 @@ extern _X_EXPORT Bool InitPointerAccelerationScheme( DeviceIntPtr /*dev*/, int /*scheme*/); -/** - * This is not implemented and just returns FALSE. - */ -extern _X_EXPORT _X_DEPRECATED Bool InitAbsoluteClassDeviceStruct( - DeviceIntPtr /*device*/); - extern _X_EXPORT Bool InitFocusClassDeviceStruct( DeviceIntPtr /*device*/); diff --git a/include/inputstr.h b/include/inputstr.h index f63df80..f10a3bd 100644 --- a/include/inputstr.h +++ b/include/inputstr.h @@ -371,7 +371,6 @@ typedef struct _ClassesRec { ButtonClassPtr button; FocusClassPtr focus; ProximityClassPtr proximity; - void* _pad0; /* keep ABI during AbsoluteClass removal */ KbdFeedbackPtr kbdfeed; PtrFeedbackPtr ptrfeed; IntegerFeedbackPtr intfeed; @@ -496,7 +495,6 @@ typedef struct _DeviceIntRec { ButtonClassPtr button; FocusClassPtr focus; ProximityClassPtr proximity; - void* _pad0; /* keep ABI, was pointer to abs class */ KbdFeedbackPtr kbdfeed; PtrFeedbackPtr ptrfeed; IntegerFeedbackPtr intfeed; -- 1.7.3.4