diff options
| author | Chris Dekter <cdekter@gmail.com> | 2010-02-11 16:34:09 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2010-02-23 10:51:13 +1000 |
| commit | 5ac8298469cd4d5e56ef7fc41af4878b88706b28 (patch) | |
| tree | e9d3fa3bda19d0b9b835571aafde0c612288b974 /include | |
| parent | d1732a637e479f20a0edd1426c99d1c6f2027049 (diff) | |
Re-enable RECORD extension.
RECORD was disabled during the switch to internal events. This patch
modifies the record callback to work with internal events instead of
xEvents. The InternalEvents are converted to core/Xi events as needed.
Since record is a loadable extension, the EventTo* calls must be externed.
Signed-off-by: Chris Dekter <cdekter@gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 122fc0e7a0712df4ec2bd9ca6773f90bcd2095cf)
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/dix.h | 6 | ||||
| -rw-r--r-- | include/eventconvert.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/dix.h b/include/dix.h index 9fd2ed8f8..8bd52b66b 100644 --- a/include/dix.h +++ b/include/dix.h @@ -581,8 +581,8 @@ typedef struct { extern _X_EXPORT CallbackListPtr DeviceEventCallback; typedef struct { - xEventPtr events; - int count; + InternalEvent *event; + DeviceIntPtr device; } DeviceEventInfoRec; extern int XItoCoreType(int xi_type); @@ -590,7 +590,7 @@ extern Bool DevHasCursor(DeviceIntPtr pDev); extern Bool _X_EXPORT IsPointerDevice( DeviceIntPtr dev); extern Bool _X_EXPORT IsKeyboardDevice(DeviceIntPtr dev); extern Bool IsPointerEvent(InternalEvent *event); -extern Bool IsMaster(DeviceIntPtr dev); +extern _X_EXPORT Bool IsMaster(DeviceIntPtr dev); extern _X_HIDDEN void CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master); extern _X_HIDDEN int CorePointerProc(DeviceIntPtr dev, int what); diff --git a/include/eventconvert.h b/include/eventconvert.h index 277a6c4b8..b1196a00e 100644 --- a/include/eventconvert.h +++ b/include/eventconvert.h @@ -30,9 +30,9 @@ #define FP1616(integral, frac) ((integral) * (1 << 16) + (frac) * (1 << 16)) -_X_INTERNAL int EventToCore(InternalEvent *event, xEvent *core); -_X_INTERNAL int EventToXI(InternalEvent *ev, xEvent **xi, int *count); -_X_INTERNAL int EventToXI2(InternalEvent *ev, xEvent **xi); +_X_EXPORT int EventToCore(InternalEvent *event, xEvent *core); +_X_EXPORT int EventToXI(InternalEvent *ev, xEvent **xi, int *count); +_X_EXPORT int EventToXI2(InternalEvent *ev, xEvent **xi); _X_INTERNAL int GetCoreType(InternalEvent* ev); _X_INTERNAL int GetXIType(InternalEvent* ev); _X_INTERNAL int GetXI2Type(InternalEvent* ev); |