From 1bd7fd195d85681e722161f8c636a28f11b40abb Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Fri, 25 Apr 2008 19:50:12 +0300 Subject: XKB: Sanitise pointer actions Turn two unsigned chars into one int. Signed-off-by: Daniel Stone Signed-off-by: Peter Hutterer --- include/xkbstr.h | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'include') diff --git a/include/xkbstr.h b/include/xkbstr.h index c1752a30c..193f27618 100644 --- a/include/xkbstr.h +++ b/include/xkbstr.h @@ -149,16 +149,9 @@ typedef struct _XkbISOAction { typedef struct _XkbPtrAction { unsigned char type; unsigned char flags; - /* FIXME: Make this an int. */ - unsigned char high_XXX; - unsigned char low_XXX; - unsigned char high_YYY; - unsigned char low_YYY; + int x; + int y; } XkbPtrAction; -#define XkbPtrActionX(a) (Xkb2CharsToInt((a)->high_XXX,(a)->low_XXX)) -#define XkbPtrActionY(a) (Xkb2CharsToInt((a)->high_YYY,(a)->low_YYY)) -#define XkbSetPtrActionX(a,x) (XkbIntTo2Chars(x,(a)->high_XXX,(a)->low_XXX)) -#define XkbSetPtrActionY(a,y) (XkbIntTo2Chars(y,(a)->high_YYY,(a)->low_YYY)) typedef struct _XkbPtrBtnAction { unsigned char type; -- cgit v1.2.3