0001-slightly-nicer-scrolling-when-dealing-with-OSX-to-OS.patch

diff --git a/configure b/configure
index ac47d02..5961126 100755
--- a/configure
+++ b/configure
@@ -1784,7 +1784,7 @@ case $host in
 	acx_host_winapi="XWINDOWS"
 	;;
 esac
-ARCH_CFLAGS="$ARCH_CFLAGS -DSYSAPI_$acx_host_arch=1 -DWINAPI_$acx_host_winapi=1"
+ARCH_CFLAGS="$ARCH_CFLAGS -DSYSAPI_$acx_host_arch=1 -DWINAPI_$acx_host_winapi=1 -arch i386"
 
 
 if test x$acx_host_arch = xWIN32; then
@@ -10840,11 +10840,6 @@ echo $ECHO_N "checking for C++ compiler warning are errors flags... $ECHO_C" >&6
 	if test "$GXX" = "yes"; then
 		acx_cxx_warnings_are_errors="-Werror"
 	fi
-	if test -n "$acx_cxx_warnings_are_errors"; then
-		CXXFLAGS="$CXXFLAGS $acx_cxx_warnings_are_errors"
-	else
-		acx_cxx_warnings_are_errors="unknown"
-	fi
 	echo "$as_me:$LINENO: result: $acx_cxx_warnings_are_errors" >&5
 echo "${ECHO_T}$acx_cxx_warnings_are_errors" >&6
 
@@ -10854,7 +10849,7 @@ OBJCXXFLAGS="$OBJCXXFLAGS $CXXFLAGS $ARCH_CFLAGS"
 LIBS="$NANOSLEEP_LIBS $INET_ATON_LIBS $ARCH_LIBS $LIBS"
 
 if test x"$acx_host_winapi" = xCARBON; then
-	MACOSX_DEPLOYMENT_TARGET="10.2"
+	MACOSX_DEPLOYMENT_TARGET="10.6"
 	CCDEPMODE="MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET $CCDEPMODE"
 	CXXDEPMODE="MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET $CXXDEPMODE"
 	OBJCDEPMODE="MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET $OBJCDEPMODE"
diff --git a/lib/platform/COSXScreen.cpp b/lib/platform/COSXScreen.cpp
index 82574cf..d5b80f9 100644
--- a/lib/platform/COSXScreen.cpp
+++ b/lib/platform/COSXScreen.cpp
@@ -1269,8 +1269,8 @@ COSXScreen::mapScrollWheelToSynergy(SInt32 x) const
 {
 	// return accelerated scrolling but not exponentially scaled as it is
 	// on the mac.
-	double d = (1.0 + getScrollSpeed()) * x / getScrollSpeedFactor();
-	return static_cast<SInt32>(120.0 * d);
+	double d = (1.0 + getScrollSpeed()) * x;
+	return static_cast<SInt32>(d);
 }
 
 SInt32
@@ -1278,7 +1278,8 @@ COSXScreen::mapScrollWheelFromSynergy(SInt32 x) const
 {
 	// use server's acceleration with a little boost since other platforms
 	// take one wheel step as a larger step than the mac does.
-	return static_cast<SInt32>(3.0 * x / 120.0);
+	LOG((CLOG_DEBUG1 "event: hurr=%+d", x));
+	return static_cast<SInt32>(x / 8.0);
 }
 
 double