[gimp/gimp-2-6] Bug 591017 – Tablet pan is not working as fast as it should

[Sven Neumann <neo src gnome org>]

commit 7ab4fccad5dc6241b8a694116f0db5d5c714bd29
Author: Sven Neumann <sven gimp org>
Date:   Fri Aug 7 21:11:45 2009 +0200

    Bug 591017 â?? Tablet pan is not working as fast as it should
    
    Use motion event compression for display scrolling.
    (cherry picked from commit 60f11e18ae0d2cd257c9629069564a0d98bb01fe)

 app/display/gimpdisplayshell-callbacks.c |   29 ++++++++++++++++++-----------
 1 files changed, 18 insertions(+), 11 deletions(-)
---
diff --git a/app/display/gimpdisplayshell-callbacks.c b/app/display/gimpdisplayshell-callbacks.c
index 80e4496..9b00423 100644
--- a/app/display/gimpdisplayshell-callbacks.c
+++ b/app/display/gimpdisplayshell-callbacks.c
@@ -1137,14 +1137,15 @@ gimp_display_shell_canvas_tool_events (GtkWidget        *canvas,
 
         active_tool = tool_manager_get_active (gimp);
 
-        if (active_tool &&
-            gimp_tool_control_get_motion_mode (active_tool->control) ==
-            GIMP_MOTION_MODE_COMPRESS)
+        if (shell->scrolling ||
+            (active_tool &&
+             gimp_tool_control_get_motion_mode (active_tool->control) ==
+             GIMP_MOTION_MODE_COMPRESS))
           {
             compressed_motion = gimp_display_shell_compress_motion (shell);
           }
 
-        if (compressed_motion)
+        if (compressed_motion && ! shell->scrolling)
           {
             GdkDevice *device = gimp_devices_get_current (gimp);
 
@@ -1159,8 +1160,7 @@ gimp_display_shell_canvas_tool_events (GtkWidget        *canvas,
                                                        &display_coords,
                                                        &image_coords);
 
-            if (active_tool &&
-                gimp_tool_control_get_snap_to (active_tool->control))
+            if (gimp_tool_control_get_snap_to (active_tool->control))
               {
                 gint x, y, width, height;
 
@@ -1186,10 +1186,17 @@ gimp_display_shell_canvas_tool_events (GtkWidget        *canvas,
 
         if (shell->scrolling)
           {
+            const gint x = (compressed_motion
+                            ? ((GdkEventMotion *) compressed_motion)->x
+                            : mevent->x);
+            const gint y = (compressed_motion
+                            ? ((GdkEventMotion *) compressed_motion)->y
+                            : mevent->y);
+
             gimp_display_shell_scroll (shell,
-                                       (shell->scroll_start_x - mevent->x -
+                                       (shell->scroll_start_x - x -
                                         shell->offset_x),
-                                       (shell->scroll_start_y - mevent->y -
+                                       (shell->scroll_start_y - y -
                                         shell->offset_y));
           }
         else if (state & GDK_BUTTON1_MASK)
@@ -1841,9 +1848,9 @@ gimp_display_shell_key_to_state (gint key)
 static GdkEvent *
 gimp_display_shell_compress_motion (GimpDisplayShell *shell)
 {
-  GList    *requeued_events = NULL;
-  GList    *list;
-  GdkEvent *last_motion = NULL;
+  GList       *requeued_events = NULL;
+  const GList *list;
+  GdkEvent    *last_motion = NULL;
 
   /*  Move the entire GDK event queue to a private list, filtering
    *  out any motion events for the desired widget.