[Git][xorg-team/lib/libinput][debian-unstable] 9 commits: Fix double click button.

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

Commits:

894d8fe0

by Kevin Kaland at 2019-08-11T20:02:18Z

Fix double click button.

This fixes the double click button on the RollerMouse v3 (USB ID 0b33:1004).

a67b6523
by Ronan Pigott at 2019-08-13T22:05:35Z
```
completion: add libinput(1) zsh completions
```
ac007401
by Ronan Pigott at 2019-08-13T22:26:53Z
```
tools: fix typo in debug-events
```

73d55cc6

by Matt Mayfield at 2019-08-16T04:48:52Z

touchpad: don't allow gestures with a clickpad button down by a finger

Allowing gestures when holding a physical click enables tasks like
switching workspaces while dragging an icon, but this should only be
possible with a *thumb* holding down the clickpad, not fingers. This
commit restores the ability to hold down the clickpad with two or three
fingers to right- or middle-drag.

Fixes #339, #340

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

7a12e460

by Peter Hutterer at 2019-08-26T01:38:05Z

libinput 1.14.1

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

b29f30ef

by Timo Aaltonen at 2019-09-07T21:09:02Z

Merge branch 'upstream-unstable' into debian-unstable

5920aa7b
by Timo Aaltonen at 2019-09-07T21:09:43Z
```
bump the version
```
7e267e20
by Timo Aaltonen at 2019-09-07T21:36:16Z
```
tools.install: Add zsh completions.
```
5028473c
by Timo Aaltonen at 2019-09-07T21:38:39Z
```
release to sid
```

Changes:

completion/zsh/_libinput

 +#compdef libinput
++
 +(( $+functions[_libinput_commands] )) || _libinput_commands()
 +{
 +	local -a commands
 +	commands=(
 +		"list-devices:List all devices recognized by libinput"
 +		"debug-events:Print all events as seen by libinput"
 +		"debug-gui:Show a GUI to visualize libinput's events"
 +		"measure:Measure various properties of devices"
 +		"record:Record the events from a device"
 +		"replay:Replay the events from a device"
 +	)
++
 +	_describe -t commands 'command' commands
 +}
++
 +__all_seats()
 +{
 +	# Obviously only works with logind
 +	local -a seats
 +	seats=${(f)"$(loginctl --no-legend --no-pager list-seats 2>/dev/null)"}
 +	if [[ -z $seats ]]; then
 +		# Can always offer seat0, even if we can't enumerate the seats
 +		compadd "$@" - seat0
 +	else
 +		compadd "$@" - $seats
 +	fi
 +}
++
 +(( $+functions[_libinput_list-devices] )) || _libinput_list-devices()
 +{
 +	_arguments \
 +		'--help[Show help and exit]' \
 +		'--version[show version information and exit]'
 +}
++
 +(( $+functions[_libinput_debug-events] )) || _libinput_debug-events()
 +{
 +	_arguments \
 +		'--help[Show debug-events help and exit]' \
 +		'--quiet[Only print libinput messages and nothing from this tool]' \
 +		'--verbose[Use verbose output]' \
 +		'--show-keycodes[Make all keycodes visible]' \
 +		'--grab[Exclusively grab all opened devices]' \
 +		'--device=[Use the given device with the path backend]:device:_files -W /dev/input/ -P /dev/input/' \
 +		'--udev=[Listen for notifications on the given seat]:seat:__all_seats' \
 +		'--apply-to=[Apply configuration options where the device name matches the pattern]:pattern' \
 +		'--disable-sendevents=[Disable send-events option for the devices matching the pattern]:pattern' \
 +		'--set-click-method=[Set the desired click method]:click-method:(none clickfinger buttonareas)' \
 +		'--set-scroll-method=[Set the desired scroll method]:scroll-method:(none twofinger edge button)' \
 +		'--set-scroll-button=[Set the button to the given button code]' \
 +		'--set-profile="" pointer acceleration profile]:accel-profile:(adaptive flat)' \
 +		'--set-speed=[Set pointer acceleration speed (within range \[-1, 1\])]' \
 +		'--set-tap-map=[Set button mapping for tapping]:tap-map:((  \
 +			lrm\:2-fingers\ right-click\ /\ 3-fingers\ middle-click \
 +			lmr\:2-fingers\ middle-click\ /\ 3-fingers\ right-click \
 +		))' \
 +		+ '(tap-to-click)' \
 +		'--enable-tap[Enable tap-to-click]' \
 +		'--disable-tap[Disable tap-to-click]' \
 +		+ '(drag)' \
 +		'--enable-drag[Enable tap-and-drag]' \
 +		'--disable-drag[Disable tap-and-drag]' \
 +		+ '(drag-lock)' \
 +		'--enable-drag-lock[Enable drag-lock]' \
 +		'--disable-drag-lock[Disable drag-lock]' \
 +		+ '(natural-scrolling)' \
 +		'--enable-natural-scrolling[Enable natural scrolling]' \
 +		'--disable-natural-scrolling[Disable natural scrolling]' \
 +		+ '(left-handed)' \
 +		'--enable-left-handed[Enable left handed button configuration]' \
 +		'--disable-left-handed[Disable left handed button configuration]' \
 +		+ '(middlebutton)' \
 +		'--enable-middlebutton[Enable middle button emulation]' \
 +		'--disable-middlebutton[Disable middle button emulation]' \
 +		+ '(dwt)' \
 +		'--enable-dwt[Enable disable-while-typing]' \
 +		'--disable-dwt[Disable enable-while-typing]'
 +}
++
 +(( $+functions[_libinput_debug-gui] )) || _libinput_debug-gui()
 +{
 +	_arguments \
 +		'--help[Show debug-gui help and exit]' \
 +		'--verbose[Use verbose output]' \
 +		'--grab[Exclusively grab all opened devices]' \
 +		'--device=[Use the given device with the path backend]:device:_files -W /dev/input/ -P /dev/input/' \
 +		'--udev=[Listen for notifications on the given seat]:seat:_libinput_all_seats'
 +}
++
 +(( $+functions[_libinput_measure] )) || _libinput_measure()
 +{
 +	local curcontext=$curcontext state line ret=1
 +	local features
 +	features=(
 +		"fuzz:Measure touch fuzz to avoid pointer jitter"
 +		"touch-size:Measure touch size and orientation"
 +		"touchpad-tap:Measure tap-to-click time"
 +		"touchpad-pressure:Measure touch pressure"
 +	)
++
 +	_arguments -C \
 +		'--help[Print help and exit]' \
 +		':feature:->feature' \
 +		'*:: :->option-or-argument'
++
 +	case $state in
 +		(feature)
 +			_describe -t features 'feature' features
 +			;;
 +		(option-or-argument)
 +			curcontext=${curcontext%:*:*}:libinput-measure-$words[1]:
 +			if ! _call_function ret _libinput_measure_$words[1]; then
 +				_message "unknown feature: $words[1]"
 +			fi
 +			;;
 +	esac
 +	return ret
 +}
++
 +(( $+functions[_libinput_measure_fuzz] )) || _libinput_measure_fuzz()
 +{
 +	_arguments \
 +		'--help[Show help message and exit]' \
 +		':device:_files -W /dev/input/ -P /dev/input/'
 +}
++
 +(( $+functions[_libinput_measure_touch-size] )) || _libinput_measure_touch-size()
 +{
 +	_arguments \
 +		'--help[Show help message and exit]' \
 +		'--touch-threshold=[Assume a touch pressure threshold of "down:up"]' \
 +		'--palm-threshold=[Assume a palm threshold of N]' \
 +		':device:_files -W /dev/input/ -P /dev/input/'
 +}
++
 +(( $+functions[_libinput_measure_touchpad-pressure] )) || _libinput_measure_touchpad-pressure()
 +{
 +	_arguments \
 +		'--help[Show help message and exit]' \
 +		'--touch-threshold=[Assume a touch pressure threshold of "down:up"]' \
 +		'--palm-threshold=[Assume a palm threshold of N]' \
 +		':device:_files -W /dev/input/ -P /dev/input/'
 +}
++
 +(( $+functions[_libinput_measure_touchpad-tap] )) || _libinput_measure_touchpad-tap()
 +{
 +	_arguments \
 +		'--help[Show help message and exit]' \
 +		'--format=dat[Specify the data format to be printed. The default is "summary"]'
 +		':device:_files -W /dev/input/ -P /dev/input/'
 +}
++
 +(( $+functions[_libinput_record] )) || _libinput_record()
 +{
 +	_arguments \
 +		'--help[Show help message and exit]' \
 +		'--all[Record all /dev/input/event* devices available on the system]' \
 +		'--autorestart=[Terminate the current recording after s seconds of device inactivity]' \
 +		{-o+,--output=}'[Speficy the output file to use]:file:_files -g "*.yml"' \
 +		'--multiple[Record multiple devices at once]' \
 +		'--show-keycodes[Show keycodes as-is in the recording]' \
 +		'--with-libinput[Record libinput events alongside device events]' \
 +		'*::device:_files -W /dev/input/ -P /dev/input/'
 +}
++
 +(( $+functions[_libinput_replay] )) || _libinput_replay()
 +{
 +	_arguments \
 +		'--help[Show help message and exit]' \
 +		':recording:_files'
 +}
++
 +_libinput()
 +{
 +	local curcontext=$curcontext state line ret=1
++
 +	_arguments -C \
 +		{-h,--help}'[Show help message and exit]' \
 +		'--version[Show version information and exit]' \
 +		':command:->command' \
 +		'*:: :->option-or-argument' && return
++
 +	case $state in
 +		(command)
 +			_libinput_commands && ret=0
 +			;;
 +		(option-or-argument)
 +			curcontext=${curcontext%:*:*}:libinput-$words[1]:
 +			if ! _call_function ret _libinput_$words[1]; then
 +				_message "unknown libinput command: $words[1]"
 +			fi
 +			;;
 +	esac
 +	return ret
 +}
++
 +_libinput

completion/zsh/meson.build

 +zshcompletiondir = get_option('zshcompletiondir')
 +if zshcompletiondir == ''
 +		zshcompletiondir = join_paths(get_option('datadir'), 'zsh', 'site-functions')
 +endif
++
 +if zshcompletiondir != 'no'
 +	install_data(
 +		'_libinput',
 +		install_dir: zshcompletiondir,
 +		install_mode: 'rw-r--r--',
 +	)
 +endif

debian/changelog

 +libinput (1.14.1-1) unstable; urgency=medium
++
 +  * New upstream release.
 +  * tools.install: Add zsh completions.
++
 + -- Timo Aaltonen <tjaalton@debian.org>  Sun, 08 Sep 2019 00:37:12 +0300
++
  libinput (1.14.0-1) unstable; urgency=medium
    * New upstream release.

debian/libinput-tools.install

  usr/bin/*
  usr/libexec/libinput/*
  usr/share/man/man1/*
 +usr/share/zsh/site-functions/_libinput

meson.build

  project('libinput', 'c',
 -	version : '1.14.0',
 +	version : '1.14.1',
  	license : 'MIT/Expat',
  	default_options : [ 'c_std=gnu99', 'warning_level=2' ],
  	meson_version : '>= 0.41.0')
@@ -405,6 +405,10 @@ if get_option('documentation')
  	subdir('doc/user')
  endif
 +############ shell completion #########
++
 +subdir('completion/zsh')
++
  ############ tools ############
  libinput_tool_path = dir_libexec
  config_h.set_quoted('LIBINPUT_TOOL_PATH', libinput_tool_path)

meson_options.txt

@@ -30,3 +30,7 @@ option('coverity',
         type: 'boolean',
         value: false,
         description: 'Enable coverity build fixes, see meson.build for details [default=false]')
 +option('zshcompletiondir',
 +       type: 'string',
 +       value: '',
 +       description: 'Directory for zsh completion scripts ["no" disables]')

quirks/30-vendor-contour.quirks

@@ -9,3 +9,9 @@ MatchVendor=0x0B33
  MatchProduct=0x1000
  MatchUdevType=mouse
  ModelBouncingKeys=1
++
 +[Contour Design RollerMouse Red v3]
 +MatchVendor=0x0B33
 +MatchProduct=0x1004
 +MatchUdevType=mouse
 +ModelBouncingKeys=1

src/evdev-mt-touchpad-gestures.c

@@ -717,8 +717,13 @@ tp_gesture_post_events(struct tp_dispatch *tp, uint64_t time)
  	if (tp->gesture.finger_count == 0)
  		return;
 -	/* When tap-and-dragging, force 1fg mode. */
 -	if (tp_tap_dragging(tp)) {
 +	/* When tap-and-dragging, force 1fg mode. On clickpads, if the
 +	 * physical button is down, don't allow gestures unless the button
 +	 * is held down by a *thumb*, specifically.
 +	 */
 +	if (tp_tap_dragging(tp) ||
 +	    (tp->buttons.is_clickpad && tp->buttons.state &&
 +	     tp->thumb.state == THUMB_STATE_FINGER)) {
  		tp_gesture_cancel(tp, time);
  		tp->gesture.finger_count = 1;
  		tp->gesture.finger_count_pending = 0;

test/test-touchpad-buttons.c

@@ -958,6 +958,96 @@ START_TEST(touchpad_clickfinger_appletouch_3fg)
+ }
  END_TEST
 +START_TEST(touchpad_clickfinger_click_drag)
 +{
 +	struct litest_device *dev = litest_current_device();
 +	struct libinput *li = dev->libinput;
 +	int nfingers = _i; /* ranged test */
 +	unsigned int button;
 +	int nslots = libevdev_get_num_slots(dev->evdev);
++
 +	litest_enable_clickfinger(dev);
 +	litest_drain_events(li);
++
 +	litest_touch_down(dev, 0, 40, 50);
 +	button = BTN_LEFT;
++
 +	if (nfingers > 1) {
 +		if (nslots > 1) {
 +			litest_touch_down(dev, 1, 50, 50);
 +		} else {
 +			litest_event(dev, EV_KEY, BTN_TOOL_DOUBLETAP, 1);
 +		}
 +		button = BTN_RIGHT;
 +	}
++
 +	if (nfingers > 2) {
 +		if (nslots > 2) {
 +			litest_touch_down(dev, 2, 60, 50);
 +		} else {
 +			litest_event(dev, EV_KEY, BTN_TOOL_DOUBLETAP, 0);
 +			litest_event(dev, EV_KEY, BTN_TOOL_TRIPLETAP, 1);
 +		}
 +		button = BTN_MIDDLE;
 +	}
++
 +	litest_button_click(dev, BTN_LEFT, true);
++
 +	libinput_dispatch(li);
 +	litest_assert_button_event(li, button,
 +				   LIBINPUT_BUTTON_STATE_PRESSED);
++
 +	for (int i = 0; i < 20; i++) {
 +		litest_push_event_frame(dev);
 +		switch (nfingers) {
 +		case 3:
 +			if (nslots >= nfingers)
 +				litest_touch_move(dev, 2, 60, 50 + i);
 +			/* fallthrough */
 +		case 2:
 +			if (nslots >= nfingers)
 +				litest_touch_move(dev, 1, 50, 50 + i);
 +			/* fallthrough */
 +		case 1:
 +			litest_touch_move(dev, 0, 40, 50 + i);
 +			break;
 +		}
 +		litest_pop_event_frame(dev);
 +		libinput_dispatch(li);
 +	}
++
 +	litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION);
++
 +	litest_button_click(dev, BTN_LEFT, false);
 +	litest_assert_button_event(li, button,
 +				   LIBINPUT_BUTTON_STATE_RELEASED);
++
 +	if (nfingers > 3) {
 +		if (nslots > 3) {
 +			litest_touch_up(dev, 2);
 +		} else {
 +			litest_event(dev, EV_KEY, BTN_TOOL_DOUBLETAP, 1);
 +			litest_event(dev, EV_KEY, BTN_TOOL_TRIPLETAP, 0);
 +		}
 +	}
++
 +	if (nfingers > 2) {
 +		if (nslots > 2) {
 +			litest_touch_up(dev, 1);
 +		} else {
 +			litest_event(dev, EV_KEY, BTN_TOOL_DOUBLETAP, 0);
 +		}
 +		button = BTN_MIDDLE;
 +	}
++
 +	litest_touch_up(dev, 0);
++
++
 +	libinput_dispatch(li);
 +	litest_assert_empty_queue(li);
 +}
 +END_TEST
++
  START_TEST(touchpad_btn_left)
+ {
  	struct litest_device *dev = litest_current_device();
@@ -2006,6 +2096,8 @@ END_TEST
  TEST_COLLECTION(touchpad_buttons)
+ {
 +	struct range finger_count = {1, 4};
++
  	litest_add("touchpad:button", touchpad_button, LITEST_TOUCHPAD, LITEST_CLICKPAD);
  	litest_add("touchpad:clickfinger", touchpad_1fg_clickfinger, LITEST_CLICKPAD, LITEST_ANY);
@@ -2036,6 +2128,8 @@ TEST_COLLECTION(touchpad_buttons)
  	litest_add_for_device("touchpad:clickfinger", touchpad_clickfinger_appletouch_2fg, LITEST_APPLETOUCH);
  	litest_add_for_device("touchpad:clickfinger", touchpad_clickfinger_appletouch_3fg, LITEST_APPLETOUCH);
 +	litest_add_ranged("touchpad:clickfinger", touchpad_clickfinger_click_drag, LITEST_CLICKPAD, LITEST_ANY, &finger_count);
++
  	litest_add("touchpad:click", touchpad_click_defaults_clickfinger, LITEST_APPLE_CLICKPAD, LITEST_ANY);
  	litest_add("touchpad:click", touchpad_click_defaults_btnarea, LITEST_CLICKPAD, LITEST_APPLE_CLICKPAD);
  	litest_add("touchpad:click", touchpad_click_defaults_none, LITEST_TOUCHPAD, LITEST_CLICKPAD);

tools/libinput-debug-events.man

@@ -65,7 +65,7 @@ Enable or disable tap-to-click
  Enable or disable tap-and-drag
  .TP 8
  .B \-\-enable\-drag-lock|\-\-disable\-drag\-lock
 -Enable or disable tap-and-drag
 +Enable or disable drag-lock
  .TP 8
  .B \-\-enable\-natural\-scrolling|\-\-disable\-natural\-scrolling
  Enable or disable natural scrolling