From: Rudolf Polzer <divverent@xonotic.org>
Date: Tue, 10 Dec 2013 05:54:15 +0000 (+0100)
Subject: Fix touchpad scrolling on Linux.
X-Git-Tag: xonotic-v0.8.0~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=dc9f838f57b5717b2fd400c804f0c318028184f4;p=xonotic%2Fnetradiant.git

Fix touchpad scrolling on Linux.
---

diff --git a/libs/gtkutil/cursor.h b/libs/gtkutil/cursor.h
index b3cfe080..dfcc962c 100644
--- a/libs/gtkutil/cursor.h
+++ b/libs/gtkutil/cursor.h
@@ -114,7 +114,7 @@ void motion_delta( int x, int y, unsigned int state ){
 class FreezePointer
 {
 unsigned int handle_motion;
-int recorded_x, recorded_y;
+int recorded_x, recorded_y, last_x, last_y;
 typedef void ( *MotionDeltaFunction )( int x, int y, unsigned int state, void* data );
 MotionDeltaFunction m_function;
 void* m_data;
@@ -124,11 +124,19 @@ FreezePointer() : handle_motion( 0 ), m_function( 0 ), m_data( 0 ){
 static gboolean motion_delta( GtkWidget *widget, GdkEventMotion *event, FreezePointer* self ){
 	int current_x, current_y;
 	Sys_GetCursorPos( GTK_WINDOW( widget ), &current_x, &current_y );
-	int dx = current_x - self->recorded_x;
-	int dy = current_y - self->recorded_y;
+	int dx = current_x - self->last_x;
+	int dy = current_y - self->last_y;
+	int ddx = current_x - self->recorded_x;
+	int ddy = current_y - self->recorded_y;
+	self->last_x = current_x;
+	self->last_y = current_y;
 	if ( dx != 0 || dy != 0 ) {
 		//globalOutputStream() << "motion x: " << dx << ", y: " << dy << "\n";
-		Sys_SetCursorPos( GTK_WINDOW( widget ), self->recorded_x, self->recorded_y );
+		if (ddx < -32 || ddx > 32 || ddy < -32 || ddy > 32) {
+			Sys_SetCursorPos( GTK_WINDOW( widget ), self->recorded_x, self->recorded_y );
+			self->last_x = self->recorded_x;
+			self->last_y = self->recorded_y;
+		}
 		self->m_function( dx, dy, event->state, self->m_data );
 	}
 	return FALSE;
@@ -156,6 +164,9 @@ void freeze_pointer( GtkWindow* window, MotionDeltaFunction function, void* data
 
 	Sys_SetCursorPos( window, recorded_x, recorded_y );
 
+	last_x = recorded_x;
+	last_y = recorded_y;
+
 	m_function = function;
 	m_data = data;