From 1d7aaf910f3619f6400908f72276fac5ac25c675 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 20 Jan 2012 08:04:52 +0100
Subject: Added 2 more wheele events

---
 xorg-server/hw/xwin/winmouse.c | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

(limited to 'xorg-server/hw')

diff --git a/xorg-server/hw/xwin/winmouse.c b/xorg-server/hw/xwin/winmouse.c
index efd1fb649..75e51c2f9 100644
--- a/xorg-server/hw/xwin/winmouse.c
+++ b/xorg-server/hw/xwin/winmouse.c
@@ -51,21 +51,6 @@
 /* Peek the internal button mapping */
 static CARD8 const *g_winMouseButtonMap = NULL;
 
-
-/*
- * Local prototypes
- */
-
-static void
-winMouseCtrl (DeviceIntPtr pDevice, PtrCtrl *pCtrl);
-
-
-static void
-winMouseCtrl (DeviceIntPtr pDevice, PtrCtrl *pCtrl)
-{
-}
-
-
 /*
  * See Porting Layer Definition - p. 18
  * This is known as a DeviceProc
@@ -75,7 +60,7 @@ int
 winMouseProc (DeviceIntPtr pDeviceInt, int iState)
 {
   int 			lngMouseButtons, i;
-  int			lngWheelEvents = 2;
+  int			lngWheelEvents = 4;
   CARD8			*map;
   DevicePtr		pDevice = (DevicePtr) pDeviceInt;
   Atom *btn_labels;
@@ -114,6 +99,8 @@ winMouseProc (DeviceIntPtr pDeviceInt, int iState)
       btn_labels[2] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT);
       btn_labels[3] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_UP);
       btn_labels[4] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_DOWN);
+      btn_labels[5] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_LEFT);
+      btn_labels[6] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_RIGHT);
 
       axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_X);
       axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_Y);
@@ -122,7 +109,7 @@ winMouseProc (DeviceIntPtr pDeviceInt, int iState)
 			       map,
 			       lngMouseButtons + lngWheelEvents,
 			       btn_labels,
-			       winMouseCtrl,
+			       (PtrCtrlProcPtr)NoopDDA,
 			       GetMotionHistorySize(),
 			       2,
 			       axes_labels);
-- 
cgit v1.2.3