Attachment 87367 Details for Bug 48118 – [PATCH v4 2/3] Add configuration options for smooth scrolling.

[patch] [PATCH v4 2/3] Add configuration options for smooth scrolling.

0001-Add-configuration-options-for-smooth-scrolling.patch (text/plain), 5.33 KB, created by Peter De Wachter on 2013-10-10 06:38:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter De Wachter

Created: 2013-10-10 06:38:33 UTC

Size: 5.33 KB

patch

obsolete

>From 468ccfffbaabfae7b509c2afd19532528f9c0cd3 Mon Sep 17 00:00:00 2001
>From: Peter De Wachter <pdewacht@gmail.com>
>Date: Wed, 3 Oct 2012 20:48:24 +0200
>Subject: [PATCH 1/2] Add configuration options for smooth scrolling.
>
>This patch creates three new xorg.conf options, VertScrollDelta,
>HorizScrollDelta and DialDelta, which adjust the sensitivity of
>smooth scrolling. These options take a positive integer, default
>value is 1.
>
>Signed-off-by: Peter De Wachter <pdewacht@gmail.com>
>---
> man/evdev.man | 11 +++++++++++
> src/evdev.c   | 30 ++++++++++++++++++++++++------
> src/evdev.h   |  5 +++++
> 3 files changed, 40 insertions(+), 6 deletions(-)
>
>diff --git a/man/evdev.man b/man/evdev.man
>index 220dd13..85cea10 100644
>--- a/man/evdev.man
>+++ b/man/evdev.man
>@@ -226,6 +226,17 @@ Specify the X Input 1.x type (see XListInputDevices(__libmansuffix__)).
> There is rarely a need to use this option, evdev will guess the device type
> based on the device's capabilities. This option is provided for devices that
> need quirks.
>+.TP 7
>+.BI "Option \*qVertScrollDelta\*q \*q" integer \*q
>+The amount of motion considered one unit of scrolling vertically.
>+Default: "1".
>+.TP 7
>+.BI "Option \*qHorizScrollDelta\*q \*q" integer \*q
>+The amount of motion considered one unit of scrolling horizontally.
>+Default: "1".
>+.TP 7
>+.BI "Option \*qDialDelta\*q \*q" integer \*q
>+The amount of motion considered one unit of turning the dial.  Default: "1".
> 
> .SH SUPPORTED PROPERTIES
> The following properties are provided by the
>diff --git a/src/evdev.c b/src/evdev.c
>index d14d08f..dc7a0db 100644
>--- a/src/evdev.c
>+++ b/src/evdev.c
>@@ -1544,7 +1544,8 @@ EvdevAddAbsValuatorClass(DeviceIntPtr device, int want_scroll_axes)
>                                        NO_AXIS_LIMITS, NO_AXIS_LIMITS,
>                                        0, 0, 0, Relative);
>             SetScrollValuator(device, pEvdev->rel_axis_map[idx],
>-                              SCROLL_TYPE_VERTICAL, -1.0,
>+                              SCROLL_TYPE_VERTICAL,
>+                              -pEvdev->smoothScroll.vert_delta,
>                               SCROLL_FLAG_PREFERRED);
>         }
> 
>@@ -1557,7 +1558,8 @@ EvdevAddAbsValuatorClass(DeviceIntPtr device, int want_scroll_axes)
>                                        NO_AXIS_LIMITS, NO_AXIS_LIMITS,
>                                        0, 0, 0, Relative);
>             SetScrollValuator(device, pEvdev->rel_axis_map[idx],
>-                              SCROLL_TYPE_HORIZONTAL, 1.0,
>+                              SCROLL_TYPE_HORIZONTAL,
>+                              pEvdev->smoothScroll.horiz_delta,
>                               SCROLL_FLAG_NONE);
>         }
> 
>@@ -1570,7 +1572,8 @@ EvdevAddAbsValuatorClass(DeviceIntPtr device, int want_scroll_axes)
>                                        NO_AXIS_LIMITS, NO_AXIS_LIMITS,
>                                        0, 0, 0, Relative);
>             SetScrollValuator(device, pEvdev->rel_axis_map[idx],
>-                              SCROLL_TYPE_VERTICAL, -1.0,
>+                              SCROLL_TYPE_VERTICAL,
>+                              -pEvdev->smoothScroll.dial_delta,
>                               SCROLL_FLAG_NONE);
>         }
>     }
>@@ -1713,11 +1716,17 @@ EvdevAddRelValuatorClass(DeviceIntPtr device)
>         xf86InitValuatorDefaults(device, axnum);
> #ifdef HAVE_SMOOTH_SCROLLING
>         if (axis == REL_WHEEL)
>-            SetScrollValuator(device, axnum, SCROLL_TYPE_VERTICAL, -1.0, SCROLL_FLAG_PREFERRED);
>+            SetScrollValuator(device, axnum, SCROLL_TYPE_VERTICAL,
>+                              -pEvdev->smoothScroll.vert_delta,
>+                              SCROLL_FLAG_PREFERRED);
>         else if (axis == REL_DIAL)
>-            SetScrollValuator(device, axnum, SCROLL_TYPE_VERTICAL, -1.0, SCROLL_FLAG_NONE);
>+            SetScrollValuator(device, axnum, SCROLL_TYPE_VERTICAL,
>+                              -pEvdev->smoothScroll.dial_delta,
>+                              SCROLL_FLAG_NONE);
>         else if (axis == REL_HWHEEL)
>-            SetScrollValuator(device, axnum, SCROLL_TYPE_HORIZONTAL, 1.0, SCROLL_FLAG_NONE);
>+            SetScrollValuator(device, axnum, SCROLL_TYPE_HORIZONTAL,
>+                              pEvdev->smoothScroll.horiz_delta,
>+                              SCROLL_FLAG_NONE);
> #endif
>     }
> 
>@@ -2340,6 +2349,15 @@ EvdevProbe(InputInfoPtr pInfo)
>         xf86IDrvMsg(pInfo, X_INFO, "Adding scrollwheel support\n");
>         pEvdev->flags |= EVDEV_BUTTON_EVENTS;
>         pEvdev->flags |= EVDEV_RELATIVE_EVENTS;
>+
>+#ifdef HAVE_SMOOTH_SCROLLING
>+        pEvdev->smoothScroll.vert_delta =
>+            xf86SetIntOption(pInfo->options, "VertScrollDelta", 1);
>+        pEvdev->smoothScroll.horiz_delta =
>+            xf86SetIntOption(pInfo->options, "HorizScrollDelta", 1);
>+        pEvdev->smoothScroll.dial_delta =
>+            xf86SetIntOption(pInfo->options, "DialDelta", 1);
>+#endif
>     }
> 
> out:
>diff --git a/src/evdev.h b/src/evdev.h
>index 563d108..520d017 100644
>--- a/src/evdev.h
>+++ b/src/evdev.h
>@@ -221,6 +221,11 @@ typedef struct {
>         Time                expires;     /* time of expiry */
>         Time                timeout;
>     } emulateWheel;
>+    struct {
>+        int                 vert_delta;
>+        int                 horiz_delta;
>+        int                 dial_delta;
>+    } smoothScroll;
>     /* run-time calibration */
>     struct {
>         int                 min_x;
>-- 
>1.8.4.rc3
>

Actions: View | Splinter Review

Attachments on bug 48118: 68058 | 68059 | 76789 | 76790 | 76791 | 87307 | 87308 | 87367 | 87368

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.