Merge branch 'master' into mpx

diff --cc XI.h
index d561fcf,ae52292..a9b96c5
--- 1/XI.h
--- 2/XI.h
+++ b/XI.h
@@@ -268,24 -249,13 +268,30 @@@ SOFTWARE
  #define _noExtensionEvent      9
  
  #define _devicePresence                0
 +#define _pairingChanged          1
 +
 +#define _deviceEnter             0
 +#define _deviceLeave             1
 +
 +/* Flags for ChangeWindowAccess defaultRule. Pick one. */
 +#define WindowAccessNoRule       0
 +#define WindowAccessKeepRule     1
 +#define WindowAccessDenyAll      2
 +
 +/* Flags for ChangeWindowAccess. */
 +#define WindowAccessClearNone    0
 +#define WindowAccessClearPerm   (1)
 +#define WindowAccessClearDeny   (1 << 1)
 +#define WindowAccessClearRule   (1 << 2)
 +#define WindowAccessClearAll \
 +    WindowAccessClearPerm | WindowAccessClearDeny | WindowAccessClearRule
  
+ #define DeviceAdded              0
+ #define DeviceRemoved            1
+ #define DeviceEnabled            2
+ #define DeviceDisabled           3
+ #define DeviceUnrecoverable      4  
+ 
  #define XI_BadDevice  0
  #define XI_BadEvent   1
  #define XI_BadMode    2

diff --cc XIproto.h
Simple merge