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 --- xkb/xkbActions.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'xkb/xkbActions.c') diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c index c46bd8463..cd2688744 100644 --- a/xkb/xkbActions.c +++ b/xkb/xkbActions.c @@ -523,15 +523,15 @@ Bool accel; xkbi->mouseKeysCounter= 0; xkbi->mouseKey= keycode; accel= ((pAction->ptr.flags&XkbSA_NoAcceleration)==0); - x= XkbPtrActionX(&pAction->ptr); - y= XkbPtrActionY(&pAction->ptr); + x= pAction->ptr.x; + y= pAction->ptr.y; XkbDDXFakePointerMotion(pAction->ptr.flags,x,y); AccessXCancelRepeatKey(xkbi,keycode); xkbi->mouseKeysAccel= accel&& (xkbi->desc->ctrls->enabled_ctrls&XkbMouseKeysAccelMask); xkbi->mouseKeysFlags= pAction->ptr.flags; - xkbi->mouseKeysDX= XkbPtrActionX(&pAction->ptr); - xkbi->mouseKeysDY= XkbPtrActionY(&pAction->ptr); + xkbi->mouseKeysDX= x; + xkbi->mouseKeysDY= y; xkbi->mouseKeyTimer= TimerSet(xkbi->mouseKeyTimer, 0, xkbi->desc->ctrls->mk_delay, _XkbPtrAccelExpire,(pointer)xkbi); -- cgit v1.2.3