diff options
| author | Keith Packard <keithp@keithp.com> | 2010-02-22 13:26:06 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2010-02-22 13:26:06 -0800 |
| commit | ca9c2472d74c7107ccc117e2c9c723c168d2eccf (patch) | |
| tree | f4c01a3f43ce5077314a0a706b28fcf51e8feb02 /include | |
| parent | e40ba5798c367bec584f6437b23d2c5f801fd013 (diff) | |
| parent | 02d1116e7eb84068fa32477f1640d29b0a81b638 (diff) | |
Merge remote branch 'whot/for-keith'
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 ed3acb6c4..6505fd02f 100644 --- a/include/dix.h +++ b/include/dix.h @@ -576,8 +576,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); @@ -585,7 +585,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); |