# On branch master # Changes to be committed: # (use "git reset HEAD ..." to unstage) # # modified: XI.h # modified: XInput.h # modified: XIproto.h # # Untracked files: # (use "git add ..." to include in what will be committed) # # XI.h.orig diff --git a/XI.h b/XI.h index 0bfefcc..219ab36 100644 --- a/XI.h +++ b/XI.h @@ -163,6 +163,22 @@ SOFTWARE. #define DEVICE_CORE 3 #define DEVICE_ENABLE 4 #define DEVICE_ABS_AREA 5 +#define DEVICE_PTRACCEL 6 + +#define DevicePtrAccel_Scheme (DEVICE_PTRACCEL + 0) +#define DevicePtrAccel_Profile (DEVICE_PTRACCEL + 1) +#define DevicePtrAccel_Scale (DEVICE_PTRACCEL + 2) +#define DevicePtrAccel_Coeff (DEVICE_PTRACCEL + 3) +#define DevicePtrAccel_AvgDecay (DEVICE_PTRACCEL + 4) +#define DevicePtrAccel_MinAcc (DEVICE_PTRACCEL + 5) +#define DevicePtrAccel_ConstAcc (DEVICE_PTRACCEL + 6) +#define DevicePtrAccel_Soften (DEVICE_PTRACCEL + 7) +#define DevicePtrAccel_Coupling (DEVICE_PTRACCEL + 8) +#define DevicePtrAccel_LutSize (DEVICE_PTRACCEL + 9) +#define DevicePtrAccel_SampleCoupling (DEVICE_PTRACCEL + 10) +#define DevicePtrAccel_SampleVelocity (DEVICE_PTRACCEL + 11) +#define DevicePtrAccel_SampleAcceleration (DEVICE_PTRACCEL + 12) +#define DEVICE_PTRACCEL_MAX DevicePtrAccel_SampleAcceleration #define NoSuchExtension 1 diff --git a/XInput.h b/XInput.h index e3585b4..e4579c8 100644 --- a/XInput.h +++ b/XInput.h @@ -707,6 +707,14 @@ typedef struct { int enable; } XDeviceEnableControl, XDeviceEnableState; +typedef struct { + XID control; + int length; + int integer; + int rational_num; + int rational_den; +} XDeviceAccelerationControl, XDeviceAccelerationState; + /******************************************************************* * * An array of XDeviceList structures is returned by the diff --git a/XIproto.h b/XIproto.h index 4f46f4f..cad21e8 100644 --- a/XIproto.h +++ b/XIproto.h @@ -1331,6 +1331,15 @@ typedef struct { CARD16 pad1 B16; } xDeviceEnableState; +typedef struct xDeviceAccelerationUniform { + CARD16 control B16; /*DEVICE_PTRACCEL ... DEVICE_PTRACCEL_MAX */ + CARD16 length B16; + CARD32 integer; + CARD32 rational_num; + CARD32 rational_den; +} xDeviceAccelerationState; + + /********************************************************* * * ChangeDeviceControl. @@ -1413,6 +1422,10 @@ typedef struct { CARD16 pad1 B16; } xDeviceEnableCtl; + +typedef struct xDeviceAccelerationUniform xDeviceAccelerationCtl; + + /********************************************************** * * Input extension events.