Update upstream source from tag 'upstream/2.1.2+dfsg'

Update to upstream version '2.1.2+dfsg'
with Debian dir a655df7e32df947a70958a6a26869e4705733064

1 files changed, 11 insertions, 0 deletions

diff --git a/src/lib/platform/XWindowsScreen.h b/src/lib/platform/XWindowsScreen.h
index 35f9368..a2e3495 100644
--- a/src/lib/platform/XWindowsScreen.h
+++ b/src/lib/platform/XWindowsScreen.h
@@ -136,6 +136,10 @@ private:
     void                onMouseRelease(const XButtonEvent&);
     void                onMouseMove(const XMotionEvent&);
 
+    // Returns the number of scroll events needed after the current delta has
+    // been taken into account
+    int                 accumulateMouseScroll(SInt32 yDelta) const;
+
     bool                detectXI2();
 #ifdef HAVE_XI2
     void                selectXIRawMotion();
@@ -172,8 +176,15 @@ private:
 
     // true if screen is being used as a primary screen, false otherwise
     bool                m_isPrimary;
+
+    // The size of a smallest supported scroll event, in points
     int                 m_mouseScrollDelta;
 
+    // Accumulates scrolls of less than m_mouseScrollDelta across multiple
+    // scroll events. We dispatch a scroll event whenever the accumulated scroll
+    // becomes larger than m_mouseScrollDelta
+    mutable int         m_accumulatedScroll;
+
     Display*            m_display;
     Window                m_root;
     Window                m_window;