diff options
| author | Zephaniah E. Hull <warp@agamemnon.b5> | 2006-10-21 04:24:49 -0400 |
|---|---|---|
| committer | Zephaniah E. Hull <warp@agamemnon.b5> | 2006-10-21 04:24:49 -0400 |
| commit | 736b0d5078597abbda80444deef852879260af90 (patch) | |
| tree | ecaa01bbd879d151c1390658ad79be9b84bc45c5 /include/inputstr.h | |
| parent | 1b1698af41b9038d9f9dbf521737d0baab5a2237 (diff) | |
DEVICE_TOUCHSCREEN becomes DEVICE_ABS_CALIB.
Update the DEVICE_ABS_CALIB stuff to include the new elements.
New DEVICE_ABS_AREA support.
dev->touchscreen becomes dev->absolute, with _CALIB and _AREA stuff in it.
Update xfree86 to compile with this, kdrive needs an update too.
Diffstat (limited to 'include/inputstr.h')
| -rw-r--r-- | include/inputstr.h | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/include/inputstr.h b/include/inputstr.h index e12b64195..1aa16d4a4 100644 --- a/include/inputstr.h +++ b/include/inputstr.h @@ -184,13 +184,25 @@ typedef struct _ProximityClassRec { char pad; } ProximityClassRec, *ProximityClassPtr; -typedef struct _TouchscreenClassRec { +typedef struct _AbsoluteClassRec { + /* Calibration. */ int min_x; int max_x; int min_y; int max_y; + int flip_x; + int flip_y; + int rotation; int button_threshold; -} TouchscreenClassRec, *TouchscreenClassPtr; + + /* 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; @@ -292,7 +304,7 @@ typedef struct _DeviceIntRec { ButtonClassPtr button; FocusClassPtr focus; ProximityClassPtr proximity; - TouchscreenClassPtr touchscreen; + AbsoluteClassPtr absolute; KbdFeedbackPtr kbdfeed; PtrFeedbackPtr ptrfeed; IntegerFeedbackPtr intfeed; |