diff options
| author | Keith Packard <keithp@keithp.com> | 2011-03-27 18:27:10 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-03-27 18:27:10 -0700 |
| commit | a22486f848014000dc13dda470f77d4d8ea9e9f6 (patch) | |
| tree | c7ac295dcd0774ed2e148636e16fd583217bc9c9 /include | |
| parent | 2ef4ff45ef1fcfc4967ebe3d550408769e5f6500 (diff) | |
| parent | 633b81e8ba09cc6a1ea8b43f323874fda2cf0bde (diff) | |
Merge remote-tracking branch 'whot/for-keith'
Diffstat (limited to 'include')
| -rw-r--r-- | include/input.h | 5 | ||||
| -rw-r--r-- | include/inputstr.h | 25 |
2 files changed, 6 insertions, 24 deletions
diff --git a/include/input.h b/include/input.h index bdef0389e..2bb85ffaa 100644 --- a/include/input.h +++ b/include/input.h @@ -311,7 +311,10 @@ extern _X_EXPORT Bool InitPointerAccelerationScheme( DeviceIntPtr /*dev*/, int /*scheme*/); -extern _X_EXPORT Bool InitAbsoluteClassDeviceStruct( +/** + * This is not implemented and just returns FALSE. + */ +extern _X_EXPORT _X_DEPRECATED Bool InitAbsoluteClassDeviceStruct( DeviceIntPtr /*device*/); extern _X_EXPORT Bool InitFocusClassDeviceStruct( diff --git a/include/inputstr.h b/include/inputstr.h index 8509eb024..f63df8087 100644 --- a/include/inputstr.h +++ b/include/inputstr.h @@ -317,27 +317,6 @@ typedef struct _ProximityClassRec { char in_proximity; } ProximityClassRec, *ProximityClassPtr; -typedef struct _AbsoluteClassRec { - int sourceid; - /* Calibration. */ - int min_x; - int max_x; - int min_y; - int max_y; - int flip_x; - int flip_y; - int rotation; - int button_threshold; - - /* Area. */ - int offset_x; - int offset_y; - int width; - int height; - int screen; - XID following; -} AbsoluteClassRec, *AbsoluteClassPtr; - typedef struct _KbdFeedbackClassRec *KbdFeedbackPtr; typedef struct _PtrFeedbackClassRec *PtrFeedbackPtr; typedef struct _IntegerFeedbackClassRec *IntegerFeedbackPtr; @@ -392,7 +371,7 @@ typedef struct _ClassesRec { ButtonClassPtr button; FocusClassPtr focus; ProximityClassPtr proximity; - AbsoluteClassPtr absolute; + void* _pad0; /* keep ABI during AbsoluteClass removal */ KbdFeedbackPtr kbdfeed; PtrFeedbackPtr ptrfeed; IntegerFeedbackPtr intfeed; @@ -517,7 +496,7 @@ typedef struct _DeviceIntRec { ButtonClassPtr button; FocusClassPtr focus; ProximityClassPtr proximity; - AbsoluteClassPtr absolute; + void* _pad0; /* keep ABI, was pointer to abs class */ KbdFeedbackPtr kbdfeed; PtrFeedbackPtr ptrfeed; IntegerFeedbackPtr intfeed; |