diff options
| author | marha <marha@users.sourceforge.net> | 2010-05-26 08:58:03 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-05-26 08:58:03 +0000 |
| commit | e60ed91097aa7511581b6c53b9e4b14aaf1027b5 (patch) | |
| tree | c8ce06db36103141858e95febad857ca989e7ad0 /xorg-server/include | |
| parent | fb91c8589937f1a9aba5d5a4e0de98c381dfe9b8 (diff) | |
| parent | fade1b113f18f3fd26c3c01ca4543effa80b9b62 (diff) | |
| download | vcxsrv-e60ed91097aa7511581b6c53b9e4b14aaf1027b5.tar.gz vcxsrv-e60ed91097aa7511581b6c53b9e4b14aaf1027b5.tar.bz2 vcxsrv-e60ed91097aa7511581b6c53b9e4b14aaf1027b5.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/include')
| -rw-r--r-- | xorg-server/include/input.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/xorg-server/include/input.h b/xorg-server/include/input.h index efa070c4f..de80388fa 100644 --- a/xorg-server/include/input.h +++ b/xorg-server/include/input.h @@ -62,6 +62,9 @@ SOFTWARE. #define DEVICE_OFF 2
#define DEVICE_CLOSE 3
+/* DeleteInputDeviceRequest flags */
+#define DEVICE_REMOVE_ALL (1 << 0) /* all devices will be removed */
+
#define POINTER_RELATIVE (1 << 1)
#define POINTER_ABSOLUTE (1 << 2)
#define POINTER_ACCELERATE (1 << 3)
@@ -518,6 +521,8 @@ extern int AllocXTestDevice(ClientPtr client, extern BOOL IsXTestDevice(DeviceIntPtr dev, DeviceIntPtr master);
extern DeviceIntPtr GetXTestDevice(DeviceIntPtr master);
extern void SendDevicePresenceEvent(int deviceid, int type);
+extern _X_EXPORT InputAttributes *DuplicateInputAttributes(InputAttributes *attrs);
+extern _X_EXPORT void FreeInputAttributes(InputAttributes *attrs);
/* misc event helpers */
extern Mask GetEventFilter(DeviceIntPtr dev, xEvent *event);
@@ -534,7 +539,8 @@ extern _X_EXPORT int NewInputDeviceRequest( InputAttributes *attrs,
DeviceIntPtr *dev);
extern _X_EXPORT void DeleteInputDeviceRequest(
- DeviceIntPtr dev);
+ DeviceIntPtr dev,
+ int flags);
extern _X_EXPORT void DDXRingBell(
int volume,
|