[Git][xorg-team/lib/libinput][upstream-unstable] 9 commits: quirks: Add quirk for StarLabs clickpads with two phyisical buttons

Timo Aaltonen pushed to branch upstream-unstable at X Strike Force / lib / libinput

Commits:

89cd0f99

by Sean Rhodes at 2021-10-04T10:19:52+01:00

quirks: Add quirk for StarLabs clickpads with two phyisical buttons

Signed-off-by: Sean Rhodes <sean@starlabs.systems>

cf929e98

by José Expósito at 2021-10-07T08:34:43+02:00

gestures: avoid processing the last hold and motion event twice

During the transition from GESTURE_STATE_HOLD_AND_MOTION to
GESTURE_STATE_POINTER_MOTION the last pointer motion event was
processed twice.

Fix #680

Signed-off-by: José Expósito <jose.exposito89@gmail.com>

34bab6e1

by Eduardo de Souza Cruz at 2021-10-10T23:32:36+00:00

evdev: disable button scroll timeout for extra mouse buttons

Signed-off-by: Eduardo Cruz <eduardo.cruz@kdemail.net>

f2d110df

by Sean Rhodes at 2021-10-11T07:19:39+00:00

quirks: Update dmi for StarBook Mk V

Signed-off-by: Sean Rhodes <sean@starlabs.systems>

f5c20fe6

by Eduardo de Souza Cruz at 2021-10-11T17:43:26-03:00

evdev: avoid usage of bogus BTN_FORWARD name

Signed-off-by: Eduardo Cruz <eduardo.cruz@kdemail.net>

9b77661e

by Travis Wrightsman at 2021-10-11T19:23:20-04:00

quirks: relax DMI modalias match for Purism Librem 14v1

Both "svnPurism:pnLibrem14:" and "svnPurism:pnlibrem_14:" are possible

Signed-off-by: Travis Wrightsman <travis@wrightsman.org>

e2d4e055

by Peter Hutterer at 2021-10-19T13:05:00+10:00

test: use a plain libinput context for the log priority check

Don't use the litest wrapper context here, it changes log priority if
the test suite is run with --verbose, causing the test to fail.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

74fac6d0

by A-w-x at 2021-10-20T16:18:33+02:00

quirks: add quirk for GPD Win Max

clickpad that announces BTN_RIGHT

Signed-off-by: A-w-x <awxkrnl@gmail.com>

ac385e12

by Peter Hutterer at 2021-10-21T14:19:49+10:00

libinput 1.19.2

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

Changes:

meson.build

  project('libinput', 'c',
 -	version : '1.19.1',
 +	version : '1.19.2',
  	license : 'MIT/Expat',
  	default_options : [ 'c_std=gnu99', 'warning_level=2' ],
  	meson_version : '>= 0.49.0')

quirks/30-vendor-starlabs.quirks

 +[StarBook Mk V]
 +MatchName=STAR0001:00 093A:0255 Touchpad
 +MatchUdevType=touchpad
 +MatchDMIModalias=dmi:*svnStarLabs:pnStarBook*
 +AttrEventCodeDisable=BTN_RIGHT
++
 +[StarLabTop Mk IV - coreboot firmware]
 +MatchName=STAR0001:00 093A:1336 Touchpad
 +MatchUdevType=touchpad
 +MatchDMIModalias=dmi:*svnStarLabs:pnLabTop*
 +AttrEventCodeDisable=BTN_RIGHT
++
 +[StarLabTop Mk IV - AMI firmware]
 +MatchName=PCT1336:00 093A:1336 Touchpad
 +MatchUdevType=touchpad
 +MatchDMIModalias=dmi:*svnStarLabs:pnLabTop*
 +AttrEventCodeDisable=BTN_RIGHT
++
 +[StarLite Mk III - coreboot firmware]
 +MatchName=STAR0001:00 093A:0255 Touchpad
 +MatchUdevType=touchpad
 +MatchDMIModalias=dmi:*svnStarLabs:pnLite*
 +AttrEventCodeDisable=BTN_RIGHT
++
 +[StarLite Mk III - AMI firmware]
 +MatchName=HTIX5288:00 093A:0255 Touchpad
 +MatchUdevType=touchpad
 +MatchDMIModalias=dmi:*svnStarLabs:pnLite*
 +AttrEventCodeDisable=BTN_RIGHT
++
 +[StarLite Mk II - coreboot firmware]
 +MatchName=STAR0001:00 0911:5288 Touchpad
 +MatchUdevType=touchpad
 +MatchDMIModalias=dmi:*svnStarLabs:pnLite*
 +AttrEventCodeDisable=BTN_RIGHT
++
 +[StarLite Mk II - AMI firmware]
 +MatchName=ALPS0001:00 0911:5288 Touchpad
 +MatchUdevType=touchpad
 +MatchDMIModalias=dmi:*svnStarLabs:pnLite*
 +AttrEventCodeDisable=BTN_RIGHT

quirks/50-system-gpd.quirks

 +[GPD Win Max - All versions]
 +MatchName=HTIX5288:00 093A:0255 Touchpad
 +MatchUdevType=touchpad
 +MatchDMIModalias=dmi:*svnGPD:*pnG1619-*
 +AttrEventCodeDisable=BTN_RIGHT

quirks/50-system-purism.quirks

@@ -3,5 +3,5 @@
  [Librem 14v1 Touchpad]
  MatchName=HTIX5288:00 0911:5288 Touchpad
  MatchUdevType=touchpad
 -MatchDMIModalias=dmi:*svnPurism:*pnLibrem14*
 +MatchDMIModalias=dmi:*svnPurism:*pn[Ll]ibrem*14:*
  AttrEventCodeDisable=BTN_RIGHT

src/evdev-mt-touchpad-gestures.c

@@ -1256,12 +1256,12 @@ tp_gesture_post_gesture(struct tp_dispatch *tp, uint64_t time,
  	if (tp->gesture.state == GESTURE_STATE_HOLD)
  		tp_gesture_handle_state_hold(tp, time, ignore_motion);
 -	if (tp->gesture.state == GESTURE_STATE_HOLD_AND_MOTION)
 -		tp_gesture_handle_state_hold_and_pointer_motion(tp, time);
+-
  	if (tp->gesture.state == GESTURE_STATE_POINTER_MOTION)
  		tp_gesture_handle_state_pointer_motion(tp, time);
 +	if (tp->gesture.state == GESTURE_STATE_HOLD_AND_MOTION)
 +		tp_gesture_handle_state_hold_and_pointer_motion(tp, time);
++
  	if (tp->gesture.state == GESTURE_STATE_SCROLL)
  		tp_gesture_handle_state_scroll(tp, time);

src/evdev.c

@@ -230,26 +230,35 @@ evdev_button_scroll_button(struct evdev_device *device,
+ 	}
  	if (is_press) {
 -		enum timer_flags flags = TIMER_FLAG_NONE;
+-
 -		device->scroll.button_scroll_state = BUTTONSCROLL_BUTTON_DOWN;
 +		if (device->scroll.button < BTN_MOUSE + 5) {
 +			/* For mouse buttons 1-5 (0x110 to 0x114) we apply a timeout before scrolling
 +			 * since the button could also be used for regular clicking. */
 +			enum timer_flags flags = TIMER_FLAG_NONE;
++
 +			device->scroll.button_scroll_state = BUTTONSCROLL_BUTTON_DOWN;
++
 +			/* Special case: if middle button emulation is enabled and
 +			 * our scroll button is the left or right button, we only
 +			 * get here *after* the middle button timeout has expired
 +			 * for that button press. The time passed is the button-down
 +			 * time though (which is in the past), so we have to allow
 +			 * for a negative timer to be set.
 +			 */
 +			if (device->middlebutton.enabled &&
 +				(device->scroll.button == BTN_LEFT ||
 +				device->scroll.button == BTN_RIGHT)) {
 +				flags = TIMER_FLAG_ALLOW_NEGATIVE;
 +			}
 -		/* Special case: if middle button emulation is enabled and
 -		 * our scroll button is the left or right button, we only
 -		 * get here *after* the middle button timeout has expired
 -		 * for that button press. The time passed is the button-down
 -		 * time though (which is in the past), so we have to allow
 -		 * for a negative timer to be set.
 -		 */
 -		if (device->middlebutton.enabled &&
 -		    (device->scroll.button == BTN_LEFT ||
 -		     device->scroll.button == BTN_RIGHT)) {
 -			flags = TIMER_FLAG_ALLOW_NEGATIVE;
 +			libinput_timer_set_flags(&device->scroll.timer,
 +						time + DEFAULT_BUTTON_SCROLL_TIMEOUT,
 +						flags);
 +		} else {
 +			/* For extra mouse buttons numbered 6 or more (0x115+) we assume it is
 +			 * dedicated exclusively to scrolling, so we don't apply the timeout
 +			 * in order to provide immediate scrolling responsiveness. */
 +			device->scroll.button_scroll_state = BUTTONSCROLL_READY;
+ 		}
+-
 -		libinput_timer_set_flags(&device->scroll.timer,
 -					 time + DEFAULT_BUTTON_SCROLL_TIMEOUT,
 -					 flags);
  		device->scroll.button_down_time = time;
  		evdev_log_debug(device, "btnscroll: down\n");
  	} else {

test/test-log.c

@@ -47,17 +47,34 @@ simple_log_handler(struct libinput *libinput,
  	litest_assert_notnull(format);
+ }
++
 +static int open_restricted(const char *path, int flags, void *data)
 +{
 +       int fd;
 +       fd = open(path, flags);
 +       return fd < 0 ? -errno : fd;
 +}
 +static void close_restricted(int fd, void *data)
 +{
 +       close(fd);
 +}
++
 +static const struct libinput_interface simple_interface = {
 +       .open_restricted = open_restricted,
 +       .close_restricted = close_restricted,
 +};
++
  START_TEST(log_default_priority)
+ {
  	enum libinput_log_priority pri;
  	struct libinput *li;
 -	li = litest_create_context();
 +	li = libinput_path_create_context(&simple_interface, NULL);
  	pri = libinput_log_get_priority(li);
  	ck_assert_int_eq(pri, LIBINPUT_LOG_PRIORITY_ERROR);
 -	litest_destroy_context(li);
 +	libinput_unref(li);
+ }
  END_TEST