diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2009-05-07 16:19:47 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2009-05-07 16:50:50 +1000 |
| commit | a47a2b50845499e3f9144739db5644952faf8ea2 (patch) | |
| tree | 77b5b83c35fe60eec57bebd92f44b50060f2d56f | |
| parent | 2edc35c032c2792d9528a396f596d466d4f10764 (diff) | |
Prefix all XI2 constants with "XI" -> inputproto 1.99.9.8inputproto-1.9.99.8
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | XI2.h | 87 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 41 insertions, 48 deletions
@@ -28,76 +28,69 @@ #define XI_2_Major 2 #define XI_2_Minor 0 -#define XIPropertyDeleted 0 -#define XIPropertyCreated 1 -#define XIPropertyModified 2 +#define XIPropertyDeleted 0 +#define XIPropertyCreated 1 +#define XIPropertyModified 2 /* Passive grab types */ -#define GrabtypeButton 0 -#define GrabtypeKeysym 1 +#define XIGrabtypeButton 0 +#define XIGrabtypeKeysym 1 /* Passive grab modifier */ #define XIAnyModifier (1 << 31) /* XIAllowEvents event-modes */ -#define AsyncDevice 0 -#define SyncDevice 1 -#define ReplayDevice 2 -#define AsyncPairedDevice 3 -#define AsyncPair 4 -#define SyncPair 5 +#define XIAsyncDevice 0 +#define XISyncDevice 1 +#define XIReplayDevice 2 +#define XIAsyncPairedDevice 3 +#define XIAsyncPair 4 +#define XISyncPair 5 /* DeviceChangedEvent change reasons */ -#define SlaveSwitch 1 -#define DeviceChange 2 +#define XISlaveSwitch 1 +#define XIDeviceChange 2 /* Hierarchy flags */ -#define HF_MasterAdded (1 << 0) -#define HF_MasterRemoved (1 << 1) -#define HF_SlaveAdded (1 << 2) -#define HF_SlaveRemoved (1 << 3) -#define HF_SlaveAttached (1 << 4) -#define HF_SlaveDetached (1 << 5) -#define HF_DeviceEnabled (1 << 6) -#define HF_DeviceDisabled (1 << 7) +#define XIMasterAdded (1 << 0) +#define XIMasterRemoved (1 << 1) +#define XISlaveAdded (1 << 2) +#define XISlaveRemoved (1 << 3) +#define XISlaveAttached (1 << 4) +#define XISlaveDetached (1 << 5) +#define XIDeviceEnabled (1 << 6) +#define XIDeviceDisabled (1 << 7) /* ChangeHierarchy constants */ -#define CH_CreateMasterDevice 1 -#define CH_RemoveMasterDevice 2 -#define CH_AttachSlave 3 -#define CH_DetachSlave 4 +#define XICreateMasterDevice 1 +#define XIRemoveMasterDevice 2 +#define XIAttachSlave 3 +#define XIDetachSlave 4 -#define AttachToMaster 1 -#define Floating 2 +#define XIAttachToMaster 1 +#define XIFloating 2 /* Valuator modes */ -#define ModeRelative 0 -#define ModeAbsolute 1 +#define XIModeRelative 0 +#define XIModeAbsolute 1 /* Device types */ -#define MasterPointer 1 -#define MasterKeyboard 2 -#define SlavePointer 3 -#define SlaveKeyboard 4 -#define FloatingSlave 5 +#define XIMasterPointer 1 +#define XIMasterKeyboard 2 +#define XISlavePointer 3 +#define XISlaveKeyboard 4 +#define XIFloatingSlave 5 /* Device classes */ -/* These may be defined if XI.h is included first */ -#ifndef KeyClass -#define KeyClass 0 -#endif -#ifndef ButtonClass -#define ButtonClass 1 -#endif -#ifndef ValuatorClass -#define ValuatorClass 2 -#endif +#define XIKeyClass 0 +#define XIButtonClass 1 +#define XIValuatorClass 2 /* XI2 mask macro */ -#define XIMASK(event) (1 << (event)) +#define XIMASK(event) (1 << (event)) -#define AllDevices 0 -#define AllMasterDevices 1 +#define XIAllDevices 0 +#define XIAllMasterDevices 1 /* Event types */ #define XI_DeviceChanged 1 diff --git a/configure.ac b/configure.ac index 8fc5357..4036868 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.57]) -AC_INIT([InputProto], [1.9.99.7], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([InputProto], [1.9.99.8], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) # Require xorg-macros: XORG_CHANGELOG |