[PATCH inputproto multitouch] Reinstate libXi's version defines

Chase Douglas chase.douglas at canonical.com
Tue Dec 20 14:14:59 PST 2011


On 12/19/2011 02:23 PM, Peter Hutterer wrote:
> Realistically, we can't remove these from the protocol without breaking
> older libraries.
> 
> Introduced in a02566ca7fd37d279b957037e1251a3b3419866d
> 
> Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
> ---
>  XI.h |   11 +++++++++++
>  1 files changed, 11 insertions(+), 0 deletions(-)
> 
> diff --git a/XI.h b/XI.h
> index 378b34a..7b44399 100644
> --- a/XI.h
> +++ b/XI.h
> @@ -135,6 +135,17 @@ SOFTWARE.
>  #define XI_FOOTMOUSE	"FOOTMOUSE"
>  #define XI_JOYSTICK	"JOYSTICK"
>  
> +/* Indices into the versions[] array (XExtInt.c). Used as a index to
> + * retrieve the minimum version of XI from _XiCheckExtInit */
> +#define Dont_Check			0
> +#define XInput_Initial_Release		1
> +#define XInput_Add_XDeviceBell		2
> +#define XInput_Add_XSetDeviceValuators	3
> +#define XInput_Add_XChangeDeviceControl	4
> +#define XInput_Add_DevicePresenceNotify	5
> +#define XInput_Add_DeviceProperties	6
> +/* DO NOT ADD TO HERE -> XI2 */
> +
>  #define XI_Absent		0
>  #define XI_Present		1
>  

Hmmm, that's unfortunate.

Reviewed-by: Chase Douglas <chase.douglas at canonical.com>

And pushed to inputproto branch multitouch-devel.

Thanks!


More information about the xorg-devel mailing list