Merge branch 'cygwin-patches-for-1.13' into cygwin-release-1.13xserver-cygwin-1.13.1-1

Conflicts:
	hw/xwin/Makefile.am

1 files changed, 15 insertions, 83 deletions

diff --git a/hw/xwin/winmouse.c b/hw/xwin/winmouse.c
index 9d896c90e..ec1e5ce4f 100644
--- a/hw/xwin/winmouse.c
+++ b/hw/xwin/winmouse.c
@@ -41,6 +41,8 @@
 #include "xserver-properties.h"
 #include "inpututils.h"
 
+#include "wmutil/mouse.h"
+
 /* Peek the internal button mapping */
 static CARD8 const *g_winMouseButtonMap = NULL;
 
@@ -133,90 +135,20 @@ winMouseProc(DeviceIntPtr pDeviceInt, int iState)
     return Success;
 }
 
-/* Handle the mouse wheel */
-int
-winMouseWheel(ScreenPtr pScreen, int iDeltaZ)
-{
-    winScreenPriv(pScreen);
-    int button;                 /* Button4 or Button5 */
-
-    /* Button4 = WheelUp */
-    /* Button5 = WheelDown */
-
-    /* Do we have any previous delta stored? */
-    if ((pScreenPriv->iDeltaZ > 0 && iDeltaZ > 0)
-        || (pScreenPriv->iDeltaZ < 0 && iDeltaZ < 0)) {
-        /* Previous delta and of same sign as current delta */
-        iDeltaZ += pScreenPriv->iDeltaZ;
-        pScreenPriv->iDeltaZ = 0;
-    }
-    else {
-        /*
-         * Previous delta of different sign, or zero.
-         * We will set it to zero for either case,
-         * as blindly setting takes just as much time
-         * as checking, then setting if necessary :)
-         */
-        pScreenPriv->iDeltaZ = 0;
-    }
-
-    /*
-     * Only process this message if the wheel has moved further than
-     * WHEEL_DELTA
-     */
-    if (iDeltaZ >= WHEEL_DELTA || (-1 * iDeltaZ) >= WHEEL_DELTA) {
-        pScreenPriv->iDeltaZ = 0;
-
-        /* Figure out how many whole deltas of the wheel we have */
-        iDeltaZ /= WHEEL_DELTA;
-    }
-    else {
-        /*
-         * Wheel has not moved past WHEEL_DELTA threshold;
-         * we will store the wheel delta until the threshold
-         * has been reached.
-         */
-        pScreenPriv->iDeltaZ = iDeltaZ;
-        return 0;
-    }
-
-    /* Set the button to indicate up or down wheel delta */
-    if (iDeltaZ > 0) {
-        button = Button4;
-    }
-    else {
-        button = Button5;
-    }
-
-    /*
-     * Flip iDeltaZ to positive, if negative,
-     * because always need to generate a *positive* number of
-     * button clicks for the Z axis.
-     */
-    if (iDeltaZ < 0) {
-        iDeltaZ *= -1;
-    }
-
-    /* Generate X input messages for each wheel delta we have seen */
-    while (iDeltaZ--) {
-        /* Push the wheel button */
-        winMouseButtonsSendEvent(ButtonPress, button);
-
-        /* Release the wheel button */
-        winMouseButtonsSendEvent(ButtonRelease, button);
-    }
-
-    return 0;
-}
-
 /*
  * Enqueue a mouse button event
  */
 
 void
-winMouseButtonsSendEvent(int iEventType, int iButton)
+winMouseButtonsSendEvent(bool bPress, int iButton)
 {
     ValuatorMask mask;
+    int iEventType;
+
+    if (bPress)
+      iEventType = ButtonPress;
+    else
+      iEventType = ButtonRelease;
 
     if (g_winMouseButtonMap)
         iButton = g_winMouseButtonMap[iButton];
@@ -245,7 +177,7 @@ winMouseButtonsHandle(ScreenPtr pScreen,
     /* Send button events right away if emulate 3 buttons is off */
     if (pScreenInfo->iE3BTimeout == WIN_E3B_OFF) {
         /* Emulate 3 buttons is off, send the button event */
-        winMouseButtonsSendEvent(iEventType, iButton);
+        winMouseButtonsSendEvent((iEventType == ButtonPress), iButton);
         return 0;
     }
 
@@ -282,7 +214,7 @@ winMouseButtonsHandle(ScreenPtr pScreen,
         pScreenPriv->iE3BCachedPress = 0;
 
         /* Send fake middle button */
-        winMouseButtonsSendEvent(ButtonPress, Button2);
+        winMouseButtonsSendEvent(TRUE, Button2);
 
         /* Indicate that a fake middle button event was sent */
         pScreenPriv->fE3BFakeButton2Sent = TRUE;
@@ -297,8 +229,8 @@ winMouseButtonsHandle(ScreenPtr pScreen,
         pScreenPriv->iE3BCachedPress = 0;
 
         /* Send cached press, then send release */
-        winMouseButtonsSendEvent(ButtonPress, iButton);
-        winMouseButtonsSendEvent(ButtonRelease, iButton);
+        winMouseButtonsSendEvent(TRUE, iButton);
+        winMouseButtonsSendEvent(FALSE, iButton);
     }
     else if (iEventType == ButtonRelease
              && pScreenPriv->fE3BFakeButton2Sent && !(wParam & MK_LBUTTON)
@@ -309,7 +241,7 @@ winMouseButtonsHandle(ScreenPtr pScreen,
         pScreenPriv->fE3BFakeButton2Sent = FALSE;
 
         /* Send middle mouse button release */
-        winMouseButtonsSendEvent(ButtonRelease, Button2);
+        winMouseButtonsSendEvent(TRUE, Button2);
     }
     else if (iEventType == ButtonRelease
              && pScreenPriv->iE3BCachedPress == 0
@@ -318,7 +250,7 @@ winMouseButtonsHandle(ScreenPtr pScreen,
          * Button was release, no button is cached,
          * and there is no fake button 2 release is pending.
          */
-        winMouseButtonsSendEvent(ButtonRelease, iButton);
+        winMouseButtonsSendEvent(FALSE, iButton);
     }
 
     return 0;