From 3425b16d521b8846b95df2b7d32a548d93341f3b Mon Sep 17 00:00:00 2001 From: marha Date: Sun, 14 Nov 2010 21:29:32 +0000 Subject: xserver pixman libX11 libXext 14/11/2010 --- xorg-server/hw/xwin/winmouse.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'xorg-server/hw/xwin/winmouse.c') diff --git a/xorg-server/hw/xwin/winmouse.c b/xorg-server/hw/xwin/winmouse.c index d6cb109ea..e0c07809c 100644 --- a/xorg-server/hw/xwin/winmouse.c +++ b/xorg-server/hw/xwin/winmouse.c @@ -235,13 +235,15 @@ winMouseButtonsSendEvent (int iEventType, int iButton) { EventListPtr events; int i, nevents; + ValuatorMask mask; if (g_winMouseButtonMap) iButton = g_winMouseButtonMap[iButton]; + valuator_mask_zero(&mask); GetEventList(&events); nevents = GetPointerEvents(events, g_pwinPointer, iEventType, iButton, - POINTER_RELATIVE, 0, 0, NULL); + POINTER_RELATIVE, &mask); for (i = 0; i < nevents; i++) mieqEnqueue(g_pwinPointer, (InternalEvent*)events[i].event); @@ -366,15 +368,17 @@ void winEnqueueMotion(int x, int y) { int i, nevents; int valuators[2]; + ValuatorMask mask; EventListPtr events; miPointerSetPosition(g_pwinPointer, &x, &y); valuators[0] = x; valuators[1] = y; + valuator_mask_set_range(&mask, 0, 2, valuators); GetEventList(&events); nevents = GetPointerEvents(events, g_pwinPointer, MotionNotify, 0, - POINTER_ABSOLUTE | POINTER_SCREEN, 0, 2, valuators); + POINTER_ABSOLUTE | POINTER_SCREEN, &mask); for (i = 0; i < nevents; i++) mieqEnqueue(g_pwinPointer, (InternalEvent*)events[i].event); -- cgit v1.2.3 From 3a82f8a35b2c6d094cf9d0d5a3ccb9dd9b85f626 Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 15 Nov 2010 09:43:51 +0000 Subject: xserver git update 15/11/2010 --- xorg-server/hw/xwin/winmouse.c | 1 + 1 file changed, 1 insertion(+) (limited to 'xorg-server/hw/xwin/winmouse.c') diff --git a/xorg-server/hw/xwin/winmouse.c b/xorg-server/hw/xwin/winmouse.c index e0c07809c..32bb49bf2 100644 --- a/xorg-server/hw/xwin/winmouse.c +++ b/xorg-server/hw/xwin/winmouse.c @@ -39,6 +39,7 @@ #include "inputstr.h" #include "exevents.h" /* for button/axes labels */ #include "xserver-properties.h" +#include "inpututils.h" /* Peek the internal button mapping */ static CARD8 const *g_winMouseButtonMap = NULL; -- cgit v1.2.3