mirror of
https://gitlab.freedesktop.org/libinput/libinput.git
synced 2025-12-25 07:00:06 +01:00
Commit94b7836456("filter: support accelerating high-resolution scroll wheel events") introduced a regression where high-res scroll wheel events were incorrectly normalized by DPI. Mice with non-default DPI (e.g., Logitech G502 at 2400 DPI) had their scroll wheel speed reduced by the DPI ratio (1000/2400), resulting in 2-3x slower scrolling. The "noop" filter functions were actually performing DPI normalization or applying a constant acceleration factor, which is appropriate for button scrolling but incorrect for scroll wheels that have their own units. Add a filter_scroll_type enum (CONTINOUS, WHEEL, FINGER to match the public events) passed through the filter_scroll interface. Update all filter implementations to skip acceleration and normalization for wheel events while maintaining existing behavior for button scrolling and touchpad scrolling. The custom acceleration profile continues to accelerate high-res wheel events as designed. Fixes:94b7836456("filter: support accelerating high-resolution scroll wheel events") Closes: #1212 Signed-off-by: Yinon Burgansky <yinonburgansky@gmail.com> Part-of: <https://gitlab.freedesktop.org/libinput/libinput/-/merge_requests/1363>
153 lines
4.7 KiB
C
153 lines
4.7 KiB
C
/*
|
|
* Copyright © 2006-2009 Simon Thum
|
|
* Copyright © 2012 Jonas Ådahl
|
|
* Copyright © 2014-2015 Red Hat, Inc.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice (including the next
|
|
* paragraph) shall be included in all copies or substantial portions of the
|
|
* Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
|
* DEALINGS IN THE SOFTWARE.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#include <assert.h>
|
|
#include <stdint.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
|
|
#include "filter-private.h"
|
|
#include "filter.h"
|
|
#include "libinput-util.h"
|
|
|
|
struct pointer_accelerator_flat {
|
|
struct motion_filter base;
|
|
|
|
double factor;
|
|
int dpi;
|
|
};
|
|
|
|
static struct normalized_coords
|
|
accelerator_filter_flat(struct motion_filter *filter,
|
|
const struct device_float_coords *unaccelerated,
|
|
void *data,
|
|
uint64_t time)
|
|
{
|
|
struct pointer_accelerator_flat *accel_filter =
|
|
(struct pointer_accelerator_flat *)filter;
|
|
double factor; /* unitless factor */
|
|
struct normalized_coords accelerated;
|
|
|
|
/* You want flat acceleration, you get flat acceleration for the
|
|
* device */
|
|
factor = accel_filter->factor;
|
|
accelerated.x = factor * unaccelerated->x;
|
|
accelerated.y = factor * unaccelerated->y;
|
|
|
|
return accelerated;
|
|
}
|
|
|
|
static struct normalized_coords
|
|
accelerator_filter_constant_flat(struct motion_filter *filter,
|
|
const struct device_float_coords *unaccelerated,
|
|
void *data,
|
|
uint64_t time)
|
|
{
|
|
/* We map the unaccelerated flat filter to have the same behavior as
|
|
* the "accelerated" flat filter.
|
|
* The filter by definition is flat, i.e. it does not actually
|
|
* apply any acceleration (merely a constant factor) and we can assume
|
|
* that a user wants all mouse movement to have the same speed, mapped
|
|
* 1:1 to the input speed.
|
|
*
|
|
* Thus we apply the same factor to our non-accelerated motion - this way
|
|
* things like button scrolling end up having the same movement as
|
|
* pointer motion.
|
|
*/
|
|
return accelerator_filter_flat(filter, unaccelerated, data, time);
|
|
}
|
|
|
|
static struct normalized_coords
|
|
accelerator_filter_scroll_flat(struct motion_filter *filter,
|
|
const struct device_float_coords *unaccelerated,
|
|
void *data,
|
|
uint64_t time,
|
|
enum filter_scroll_type type)
|
|
{
|
|
/* Scroll wheels were not historically accelerated and have different
|
|
* units than button scrolling. Maintain the status quo and do not
|
|
* accelerate wheel events.
|
|
*/
|
|
if (type == FILTER_SCROLL_TYPE_WHEEL) {
|
|
return (struct normalized_coords){
|
|
.x = unaccelerated->x,
|
|
.y = unaccelerated->y,
|
|
};
|
|
}
|
|
|
|
return accelerator_filter_constant_flat(filter, unaccelerated, data, time);
|
|
}
|
|
|
|
static bool
|
|
accelerator_set_speed_flat(struct motion_filter *filter, double speed_adjustment)
|
|
{
|
|
struct pointer_accelerator_flat *accel_filter =
|
|
(struct pointer_accelerator_flat *)filter;
|
|
|
|
assert(speed_adjustment >= -1.0 && speed_adjustment <= 1.0);
|
|
|
|
/* Speed range is 0-200% of the nominal speed, with 0 mapping to the
|
|
* nominal speed. Anything above 200 is pointless, we're already
|
|
* skipping over ever second pixel at 200% speed.
|
|
*/
|
|
|
|
accel_filter->factor = max(0.005, 1 + speed_adjustment);
|
|
filter->speed_adjustment = speed_adjustment;
|
|
|
|
return true;
|
|
}
|
|
|
|
static void
|
|
accelerator_destroy_flat(struct motion_filter *filter)
|
|
{
|
|
struct pointer_accelerator_flat *accel =
|
|
(struct pointer_accelerator_flat *)filter;
|
|
|
|
free(accel);
|
|
}
|
|
|
|
static const struct motion_filter_interface accelerator_interface_flat = {
|
|
.type = LIBINPUT_CONFIG_ACCEL_PROFILE_FLAT,
|
|
.filter = accelerator_filter_flat,
|
|
.filter_constant = accelerator_filter_constant_flat,
|
|
.filter_scroll = accelerator_filter_scroll_flat,
|
|
.restart = NULL,
|
|
.destroy = accelerator_destroy_flat,
|
|
.set_speed = accelerator_set_speed_flat,
|
|
};
|
|
|
|
struct motion_filter *
|
|
create_pointer_accelerator_filter_flat(int dpi)
|
|
{
|
|
struct pointer_accelerator_flat *filter;
|
|
|
|
filter = zalloc(sizeof *filter);
|
|
filter->base.interface = &accelerator_interface_flat;
|
|
filter->dpi = dpi;
|
|
|
|
return &filter->base;
|
|
}
|