libinput: Changes to 'ubuntu'
.gitignore | 2
Makefile.am | 2
README.md | 92
README.txt | 98
configure.ac | 145 -
debian/changelog | 18
debian/libinput-tools.install | 1
debian/patches/0001-libinput-add-orientation-and-size-of-touch-point-and.patch | 52
debian/patches/0002-extend-tools-to-print-and-display-touch-event-proper.patch | 134 -
debian/patches/0003-Fix-premature-flushing-of-evdev-event-on-mx4-touchsc.patch | 8
debian/patches/series | 1
debian/rules | 3
doc/Makefile.am | 3
doc/building.dox | 103 -
doc/device-configuration-via-udev.dox | 2
doc/faqs.dox | 23
doc/libinput.doxygen.in | 4
doc/page-hierarchy.dox | 3
doc/switches.dox | 18
doc/timestamps.dox | 36
doc/tools.dox | 73
doc/touchpad-pressure.dox | 2
meson.build | 683 ++++++
meson_options.txt | 20
src/Makefile.am | 2
src/evdev-lid.c | 98
src/evdev-mt-touchpad-buttons.c | 4
src/evdev-mt-touchpad-edge-scroll.c | 2
src/evdev-mt-touchpad-gestures.c | 5
src/evdev-mt-touchpad-tap.c | 86
src/evdev-mt-touchpad.c | 251 +-
src/evdev-mt-touchpad.h | 22
src/evdev-tablet-pad.h | 4
src/evdev-tablet.c | 536 +++--
src/evdev-tablet.h | 15
src/evdev.c | 95
src/evdev.h | 12
src/libinput-private.h | 26
src/libinput-restore-selinux-context.sh | 12
src/libinput-util.c | 9
src/libinput-util.h | 41
src/libinput.c | 119 -
src/libinput.h | 44
test/Makefile.am | 3
test/litest-device-mouse-wheel-click-count.c | 6
test/litest.c | 292 +-
test/litest.h | 10
test/symbols-leak-test.in | 15
test/test-device.c | 2
test/test-keyboard.c | 3
test/test-lid.c | 54
test/test-log.c | 1
test/test-misc.c | 14
test/test-path.c | 151 -
test/test-pointer.c | 4
test/test-tablet.c | 81
test/test-touch.c | 66
test/test-touchpad-tap.c | 252 ++
test/test-touchpad.c | 156 -
test/valgrind.suppressions | 6
tools/.gitignore | 4
tools/Makefile.am | 84
tools/event-debug.c | 922 ---------
tools/event-gui.c | 903 ---------
tools/install-compat-scripts.sh | 9
tools/libinput-debug-events.c | 994 ++++++++++
tools/libinput-debug-events.compat | 4
tools/libinput-debug-events.man | 76
tools/libinput-debug-gui.c | 960 +++++++++
tools/libinput-debug-gui.man | 48
tools/libinput-list-devices.c | 26
tools/libinput-list-devices.compat | 4
tools/libinput-list-devices.man | 20
tools/libinput-measure-touchpad-tap.c | 507 +++++
tools/libinput-measure-touchpad-tap.man | 80
tools/libinput-measure.c | 79
tools/libinput-measure.man | 30
tools/libinput-tool.c | 108 +
tools/libinput.man | 59
tools/publish-doc | 10
tools/shared.c | 433 +---
tools/shared.h | 74
udev/90-libinput-model-quirks.hwdb | 25
udev/90-libinput-model-quirks.rules.in | 8
udev/parse_hwdb.py | 11
85 files changed, 6154 insertions(+), 3349 deletions(-)
New commits:
commit 83876b98906b18974e9616663b946cd90543379a
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Thu Jul 6 10:17:22 2017 +0300
release to artful
diff --git a/debian/changelog b/debian/changelog
index a212c83..6a5182b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-libinput (1.8.0-1ubuntu1) UNRELEASED; urgency=medium
+libinput (1.8.0-1ubuntu1) artful; urgency=medium
* Merge from Debian.
* 0002-extend-tools-to-print-and-display-touch-event-proper.patch:
Dropped, event-debug is gone.
* patches: Refreshed.
- -- Timo Aaltonen <tjaalton@debian.org> Thu, 06 Jul 2017 09:43:07 +0300
+ -- Timo Aaltonen <tjaalton@debian.org> Thu, 06 Jul 2017 10:17:04 +0300
libinput (1.8.0-1) unstable; urgency=medium
commit 39c9e383fec6f0509e26d05f8e68c617ce9f7412
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Thu Jul 6 09:54:15 2017 +0300
drop patch 0002, refresh others
diff --git a/debian/changelog b/debian/changelog
index aacb381..a212c83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+libinput (1.8.0-1ubuntu1) UNRELEASED; urgency=medium
+
+ * Merge from Debian.
+ * 0002-extend-tools-to-print-and-display-touch-event-proper.patch:
+ Dropped, event-debug is gone.
+ * patches: Refreshed.
+
+ -- Timo Aaltonen <tjaalton@debian.org> Thu, 06 Jul 2017 09:43:07 +0300
+
libinput (1.8.0-1) unstable; urgency=medium
* New upstream release.
diff --git a/debian/patches/0001-libinput-add-orientation-and-size-of-touch-point-and.patch b/debian/patches/0001-libinput-add-orientation-and-size-of-touch-point-and.patch
index b788b46..a8bb681 100644
--- a/debian/patches/0001-libinput-add-orientation-and-size-of-touch-point-and.patch
+++ b/debian/patches/0001-libinput-add-orientation-and-size-of-touch-point-and.patch
@@ -36,15 +36,15 @@ Signed-off-by: Andreas Pokorny <andreas.pokorny@canonical.com>
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
-@@ -28,6 +28,7 @@ header_files = \
- $(srcdir)/tapping.dox \
+@@ -29,6 +29,7 @@ header_files = \
$(srcdir)/test-suite.dox \
+ $(srcdir)/timestamps.dox \
$(srcdir)/tools.dox \
+ $(srcdir)/touch-event-properties.dox \
$(srcdir)/touchpad-jumping-cursors.dox \
$(srcdir)/touchpad-pressure.dox \
$(srcdir)/touchpads.dox \
-@@ -65,6 +66,7 @@ diagram_files = \
+@@ -66,6 +67,7 @@ diagram_files = \
$(srcdir)/svg/thumb-detection.svg \
$(srcdir)/svg/top-software-buttons.svg \
$(srcdir)/svg/touchscreen-gestures.svg \
@@ -470,7 +470,7 @@ Signed-off-by: Andreas Pokorny <andreas.pokorny@canonical.com>
enum evdev_key_type {
EVDEV_KEY_TYPE_NONE,
-@@ -374,6 +378,100 @@ evdev_device_transform_y(struct evdev_de
+@@ -371,6 +375,100 @@ evdev_device_transform_y(struct evdev_de
return scale_axis(device->abs.absinfo_y, y, height);
}
@@ -571,7 +571,7 @@ Signed-off-by: Andreas Pokorny <andreas.pokorny@canonical.com>
static inline void
normalize_delta(struct evdev_device *device,
const struct device_coords *delta,
-@@ -523,6 +621,7 @@ fallback_flush_mt_down(struct fallback_d
+@@ -520,6 +618,7 @@ fallback_flush_mt_down(struct fallback_d
struct libinput_seat *seat = base->seat;
struct device_coords point;
struct mt_slot *slot;
@@ -579,7 +579,7 @@ Signed-off-by: Andreas Pokorny <andreas.pokorny@canonical.com>
int seat_slot;
if (!(device->seat_caps & EVDEV_DEVICE_TOUCH))
-@@ -547,7 +646,8 @@ fallback_flush_mt_down(struct fallback_d
+@@ -544,7 +643,8 @@ fallback_flush_mt_down(struct fallback_d
evdev_transform_absolute(device, &point);
touch_notify_touch_down(base, time, slot_idx, seat_slot,
@@ -589,7 +589,7 @@ Signed-off-by: Andreas Pokorny <andreas.pokorny@canonical.com>
return true;
}
-@@ -578,7 +678,7 @@ fallback_flush_mt_motion(struct fallback
+@@ -575,7 +675,7 @@ fallback_flush_mt_motion(struct fallback
evdev_transform_absolute(device, &point);
touch_notify_touch_motion(base, time, slot_idx, seat_slot,
@@ -598,7 +598,7 @@ Signed-off-by: Andreas Pokorny <andreas.pokorny@canonical.com>
return true;
}
-@@ -619,6 +719,11 @@ fallback_flush_st_down(struct fallback_d
+@@ -616,6 +716,11 @@ fallback_flush_st_down(struct fallback_d
struct libinput_device *base = &device->base;
struct libinput_seat *seat = base->seat;
struct device_coords point;
@@ -610,7 +610,7 @@ Signed-off-by: Andreas Pokorny <andreas.pokorny@canonical.com>
int seat_slot;
if (!(device->seat_caps & EVDEV_DEVICE_TOUCH))
-@@ -641,7 +746,8 @@ fallback_flush_st_down(struct fallback_d
+@@ -638,7 +743,8 @@ fallback_flush_st_down(struct fallback_d
point = dispatch->abs.point;
evdev_transform_absolute(device, &point);
@@ -620,7 +620,7 @@ Signed-off-by: Andreas Pokorny <andreas.pokorny@canonical.com>
return true;
}
-@@ -653,6 +759,11 @@ fallback_flush_st_motion(struct fallback
+@@ -650,6 +756,11 @@ fallback_flush_st_motion(struct fallback
{
struct libinput_device *base = &device->base;
struct device_coords point;
@@ -632,7 +632,7 @@ Signed-off-by: Andreas Pokorny <andreas.pokorny@canonical.com>
int seat_slot;
point = dispatch->abs.point;
-@@ -663,7 +774,8 @@ fallback_flush_st_motion(struct fallback
+@@ -660,7 +771,8 @@ fallback_flush_st_motion(struct fallback
if (seat_slot == -1)
return false;
@@ -642,7 +642,7 @@ Signed-off-by: Andreas Pokorny <andreas.pokorny@canonical.com>
return true;
}
-@@ -882,6 +994,9 @@ fallback_process_touch(struct fallback_d
+@@ -879,6 +991,9 @@ fallback_process_touch(struct fallback_d
struct input_event *e,
uint64_t time)
{
@@ -652,7 +652,7 @@ Signed-off-by: Andreas Pokorny <andreas.pokorny@canonical.com>
switch (e->code) {
case ABS_MT_SLOT:
if ((size_t)e->value >= dispatch->mt.slots_len) {
-@@ -912,10 +1027,28 @@ fallback_process_touch(struct fallback_d
+@@ -909,10 +1024,28 @@ fallback_process_touch(struct fallback_d
case ABS_MT_POSITION_Y:
evdev_device_check_abs_axis_range(device, e->code, e->value);
dispatch->mt.slots[dispatch->mt.slot].point.y = e->value;
@@ -683,7 +683,7 @@ Signed-off-by: Andreas Pokorny <andreas.pokorny@canonical.com>
}
static inline void
fallback_process_absolute_motion(struct fallback_dispatch *dispatch,
-@@ -1755,6 +1888,21 @@ fallback_dispatch_init_slots(struct fall
+@@ -1791,6 +1924,21 @@ fallback_dispatch_init_slots(struct fall
slots[slot].point.y = libevdev_get_slot_value(evdev,
slot,
ABS_MT_POSITION_Y);
@@ -705,7 +705,7 @@ Signed-off-by: Andreas Pokorny <andreas.pokorny@canonical.com>
}
dispatch->mt.slots = slots;
dispatch->mt.slots_len = num_slots;
-@@ -2583,6 +2731,15 @@ evdev_configure_device(struct evdev_devi
+@@ -2615,6 +2763,15 @@ evdev_configure_device(struct evdev_devi
return NULL;
}
@@ -741,7 +741,7 @@ Signed-off-by: Andreas Pokorny <andreas.pokorny@canonical.com>
bool is_fake_resolution;
int apply_calibration;
-@@ -500,6 +504,27 @@ double
+@@ -496,6 +500,27 @@ double
evdev_device_transform_y(struct evdev_device *device,
double y,
uint32_t height);
@@ -783,7 +783,7 @@ Signed-off-by: Andreas Pokorny <andreas.pokorny@canonical.com>
/*
* A coordinate pair in device coordinates, capable of holding non discrete
* values, this is necessary e.g. when device coordinates get averaged.
-@@ -523,14 +528,18 @@ touch_notify_touch_down(struct libinput_
+@@ -525,14 +530,18 @@ touch_notify_touch_down(struct libinput_
uint64_t time,
int32_t slot,
int32_t seat_slot,
@@ -806,7 +806,7 @@ Signed-off-by: Andreas Pokorny <andreas.pokorny@canonical.com>
touch_notify_touch_up(struct libinput_device *device,
--- a/src/libinput.c
+++ b/src/libinput.c
-@@ -112,6 +112,8 @@ struct libinput_event_touch {
+@@ -181,6 +181,8 @@ struct libinput_event_touch {
int32_t slot;
int32_t seat_slot;
struct device_coords point;
@@ -815,7 +815,7 @@ Signed-off-by: Andreas Pokorny <andreas.pokorny@canonical.com>
};
struct libinput_event_gesture {
-@@ -803,6 +805,204 @@ libinput_event_touch_get_y(struct libinp
+@@ -872,6 +874,204 @@ libinput_event_touch_get_y(struct libinp
return evdev_convert_to_mm(device->abs.absinfo_y, event->point.y);
}
@@ -1020,7 +1020,7 @@ Signed-off-by: Andreas Pokorny <andreas.pokorny@canonical.com>
LIBINPUT_EXPORT uint32_t
libinput_event_gesture_get_time(struct libinput_event_gesture *event)
{
-@@ -2251,7 +2451,9 @@ touch_notify_touch_down(struct libinput_
+@@ -2331,7 +2531,9 @@ touch_notify_touch_down(struct libinput_
uint64_t time,
int32_t slot,
int32_t seat_slot,
@@ -1031,7 +1031,7 @@ Signed-off-by: Andreas Pokorny <andreas.pokorny@canonical.com>
{
struct libinput_event_touch *touch_event;
-@@ -2267,6 +2469,8 @@ touch_notify_touch_down(struct libinput_
+@@ -2347,6 +2549,8 @@ touch_notify_touch_down(struct libinput_
.slot = slot,
.seat_slot = seat_slot,
.point = *point,
@@ -1040,7 +1040,7 @@ Signed-off-by: Andreas Pokorny <andreas.pokorny@canonical.com>
};
post_device_event(device, time,
-@@ -2279,7 +2483,9 @@ touch_notify_touch_motion(struct libinpu
+@@ -2359,7 +2563,9 @@ touch_notify_touch_motion(struct libinpu
uint64_t time,
int32_t slot,
int32_t seat_slot,
@@ -1051,7 +1051,7 @@ Signed-off-by: Andreas Pokorny <andreas.pokorny@canonical.com>
{
struct libinput_event_touch *touch_event;
-@@ -2295,6 +2501,8 @@ touch_notify_touch_motion(struct libinpu
+@@ -2375,6 +2581,8 @@ touch_notify_touch_motion(struct libinpu
.slot = slot,
.seat_slot = seat_slot,
.point = *point,
@@ -1062,7 +1062,7 @@ Signed-off-by: Andreas Pokorny <andreas.pokorny@canonical.com>
post_device_event(device, time,
--- a/src/libinput.h
+++ b/src/libinput.h
-@@ -1542,6 +1542,228 @@ libinput_event_touch_get_y_transformed(s
+@@ -1560,6 +1560,228 @@ libinput_event_touch_get_y_transformed(s
/**
* @ingroup event_touch
*
@@ -1312,7 +1312,7 @@ Signed-off-by: Andreas Pokorny <andreas.pokorny@canonical.com>
+} LIBINPUT_1.5;
--- a/test/test-touch.c
+++ b/test/test-touch.c
-@@ -887,6 +887,245 @@ START_TEST(touch_fuzz)
+@@ -911,6 +911,245 @@ START_TEST(touch_fuzz)
}
END_TEST
@@ -1558,7 +1558,7 @@ Signed-off-by: Andreas Pokorny <andreas.pokorny@canonical.com>
void
litest_setup_tests_touch(void)
{
-@@ -914,10 +1153,13 @@ litest_setup_tests_touch(void)
+@@ -938,10 +1177,13 @@ litest_setup_tests_touch(void)
litest_add("touch:protocol a", touch_protocol_a_init, LITEST_PROTOCOL_A, LITEST_ANY);
litest_add("touch:protocol a", touch_protocol_a_touch, LITEST_PROTOCOL_A, LITEST_ANY);
litest_add("touch:protocol a", touch_protocol_a_2fg_touch, LITEST_PROTOCOL_A, LITEST_ANY);
diff --git a/debian/patches/0002-extend-tools-to-print-and-display-touch-event-proper.patch b/debian/patches/0002-extend-tools-to-print-and-display-touch-event-proper.patch
deleted file mode 100644
index 3231bfe..0000000
--- a/debian/patches/0002-extend-tools-to-print-and-display-touch-event-proper.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-From d8e452fc652461949d1fbc64a0364cdb31bbdb9e Mon Sep 17 00:00:00 2001
-From: Andreas Pokorny <andreas.pokorny@canonical.com>
-Date: Thu, 3 Sep 2015 10:21:51 +0200
-Subject: [PATCH libinput 2/4] extend tools to print and display touch event
- properties
-
-event-gui draws the touch contact as two concentric ellipses that indicate
-contact pressure through oppacity.
-
-Signed-off-by: Andreas Pokorny <andreas.pokorny@canonical.com>
----
- tools/event-debug.c | 29 ++++++++++++++++++++++++++++-
- tools/event-gui.c | 39 +++++++++++++++++++++++++++++++++------
- 2 files changed, 61 insertions(+), 7 deletions(-)
-
---- a/tools/event-debug.c
-+++ b/tools/event-debug.c
-@@ -606,14 +606,41 @@ print_touch_event_with_coords(struct lib
- double y = libinput_event_touch_get_y_transformed(t, screen_height);
- double xmm = libinput_event_touch_get_x(t);
- double ymm = libinput_event_touch_get_y(t);
-+ double major = libinput_event_touch_get_major_transformed(
-+ t,
-+ screen_width,
-+ screen_height);
-+ double minor = libinput_event_touch_get_minor_transformed(
-+ t,
-+ screen_width,
-+ screen_height);
-+ double majormm = libinput_event_touch_get_major(t);
-+ double minormm = libinput_event_touch_get_minor(t);
-+ double pressure = libinput_event_touch_get_pressure(t);
-+ double orientation = libinput_event_touch_get_orientation(t);
-+ int has_major = libinput_event_touch_has_major(t);
-+ int has_minor = libinput_event_touch_has_minor(t);
-+ int has_orientation = libinput_event_touch_has_orientation(t);
-+ int has_pressure = libinput_event_touch_has_pressure(t);
-
- print_event_time(libinput_event_touch_get_time(t));
-
-- printq("%d (%d) %5.2f/%5.2f (%5.2f/%5.2fmm)\n",
-+ printq("%d (%d) %5.2f/%5.2f (%5.2f/%5.2fmm)",
- libinput_event_touch_get_slot(t),
- libinput_event_touch_get_seat_slot(t),
- x, y,
- xmm, ymm);
-+
-+ if (has_major)
-+ printq(" major:%3.2f/%3.2fmm", major, majormm);
-+ if (has_minor)
-+ printq(" minor:%3.2f/%3.2fmm", minor, minormm);
-+ if (has_orientation)
-+ printq(" o:%3.1f°", orientation);
-+ if (has_pressure)
-+ printq(" p:%1.2f", pressure);
-+
-+ printf("\n");
- }
-
- static void
---- a/tools/event-gui.c
-+++ b/tools/event-gui.c
-@@ -48,6 +48,9 @@ struct tools_context context;
- struct touch {
- int active;
- int x, y;
-+ double major, minor;
-+ double angle;
-+ double pressure;
- };
-
- struct point {
-@@ -193,13 +196,23 @@ draw_touchpoints(struct window *w, cairo
- {
- struct touch *t;
-
-- cairo_set_source_rgb(cr, .8, .2, .2);
--
- ARRAY_FOR_EACH(w->touches, t) {
-- cairo_save(cr);
-- cairo_arc(cr, t->x, t->y, 10, 0, 2 * M_PI);
-- cairo_fill(cr);
-- cairo_restore(cr);
-+ if (t->active) {
-+ cairo_save(cr);
-+ /* paint a filled ellipse with the original major minor values */
-+ cairo_set_source_rgba(cr, .8, .2, .2, 0.5 + t->pressure / 2.);
-+ cairo_translate(cr, t->x, t->y);
-+ cairo_rotate(cr, t->angle * (M_PI / 180.0));
-+ cairo_scale(cr, t->minor, t->major);
-+ cairo_arc(cr, 0., 0., 1., 0, 2 * M_PI);
-+ cairo_fill(cr);
-+
-+ /* paint a larger surrounding ellipse */
-+ cairo_arc(cr, 0., 0., 4., 0, 2 * M_PI);
-+ cairo_stroke(cr);
-+
-+ cairo_restore(cr);
-+ }
- }
- }
-
-@@ -553,6 +566,8 @@ handle_event_touch(struct libinput_event
- int slot = libinput_event_touch_get_seat_slot(t);
- struct touch *touch;
- double x, y;
-+ double major;
-+ double minor;
-
- if (slot == -1 || slot >= (int) ARRAY_LENGTH(w->touches))
- return;
-@@ -566,10 +581,22 @@ handle_event_touch(struct libinput_event
-
- x = libinput_event_touch_get_x_transformed(t, w->width),
- y = libinput_event_touch_get_y_transformed(t, w->height);
-+ major = libinput_event_touch_get_major_transformed(t, w->width, w->height);
-+ minor = libinput_event_touch_get_minor_transformed(t, w->width, w->height);
-+
-+ if (!libinput_event_touch_has_major(t))
-+ major = 10.0;
-+
-+ if (!libinput_event_touch_has_minor(t))
-+ minor = major;
-
- touch->active = 1;
- touch->x = (int)x;
- touch->y = (int)y;
-+ touch->major = major;
-+ touch->minor = minor;
-+ touch->angle = libinput_event_touch_get_orientation(t);
-+ touch->pressure = libinput_event_touch_get_pressure(t);
- }
-
- static void
diff --git a/debian/patches/0003-Fix-premature-flushing-of-evdev-event-on-mx4-touchsc.patch b/debian/patches/0003-Fix-premature-flushing-of-evdev-event-on-mx4-touchsc.patch
index 8c0c78a..e2e0a29 100644
--- a/debian/patches/0003-Fix-premature-flushing-of-evdev-event-on-mx4-touchsc.patch
+++ b/debian/patches/0003-Fix-premature-flushing-of-evdev-event-on-mx4-touchsc.patch
@@ -17,7 +17,7 @@ Signed-off-by: Andreas Pokorny <andreas.pokorny@canonical.com>
--- a/src/evdev.c
+++ b/src/evdev.c
-@@ -906,8 +906,10 @@ fallback_process_key(struct fallback_dis
+@@ -934,8 +934,10 @@ fallback_process_key(struct fallback_dis
if (e->value == 2)
return;
@@ -30,7 +30,7 @@ Signed-off-by: Andreas Pokorny <andreas.pokorny@canonical.com>
fallback_process_touch_button(dispatch,
device,
time,
-@@ -917,8 +919,6 @@ fallback_process_key(struct fallback_dis
+@@ -945,8 +947,6 @@ fallback_process_key(struct fallback_dis
fallback_flush_pending_event(dispatch, device, time);
@@ -41,7 +41,7 @@ Signed-off-by: Andreas Pokorny <andreas.pokorny@canonical.com>
if (e->value == 0) {
--- a/test/test-touch.c
+++ b/test/test-touch.c
-@@ -1057,6 +1057,114 @@ START_TEST(touch_point_no_minor_or_orien
+@@ -1150,6 +1150,114 @@ START_TEST(touch_point_no_minor_or_orien
}
END_TEST
@@ -156,7 +156,7 @@ Signed-off-by: Andreas Pokorny <andreas.pokorny@canonical.com>
void
litest_setup_tests_touch(void)
{
-@@ -1092,4 +1200,5 @@ litest_setup_tests_touch(void)
+@@ -1186,4 +1294,5 @@ litest_setup_tests_touch(void)
litest_add_for_device("touch:fuzz", touch_fuzz, LITEST_MULTITOUCH_FUZZ_SCREEN);
diff --git a/debian/patches/series b/debian/patches/series
index 65fc48c..4209942 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
0001-libinput-add-orientation-and-size-of-touch-point-and.patch
-0002-extend-tools-to-print-and-display-touch-event-proper.patch
0003-Fix-premature-flushing-of-evdev-event-on-mx4-touchsc.patch
0004-Keep-stanza-for-new-symbols-on-version-0.22.0.patch
commit ac45481793f206d893b615e2692827aa65113e11
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Thu Jul 6 01:03:20 2017 +0300
release to unstable
diff --git a/debian/changelog b/debian/changelog
index 4d4114e..1e8283a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-libinput (1.8.0-1) UNRELEASED; urgency=medium
+libinput (1.8.0-1) unstable; urgency=medium
* New upstream release.
* rules: Explicitly disable building debug-gui, documentation and
tests.
* tools: Add debug tools.
- -- Timo Aaltonen <tjaalton@debian.org> Wed, 05 Jul 2017 23:58:05 +0300
+ -- Timo Aaltonen <tjaalton@debian.org> Thu, 06 Jul 2017 00:56:56 +0300
libinput (1.7.3-1) unstable; urgency=medium
commit 3c045a322631c7d805a3c7ad763d6eca4865a687
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Thu Jul 6 00:56:45 2017 +0300
tools: Add debug tools.
diff --git a/debian/changelog b/debian/changelog
index 857493f..4d4114e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libinput (1.8.0-1) UNRELEASED; urgency=medium
* New upstream release.
* rules: Explicitly disable building debug-gui, documentation and
tests.
+ * tools: Add debug tools.
-- Timo Aaltonen <tjaalton@debian.org> Wed, 05 Jul 2017 23:58:05 +0300
diff --git a/debian/libinput-tools.install b/debian/libinput-tools.install
index 68671de..4a8c702 100644
--- a/debian/libinput-tools.install
+++ b/debian/libinput-tools.install
@@ -1,2 +1,3 @@
usr/bin/*
+usr/lib/*/libinput/*
usr/share/man/man1/*
commit d1694fa5183cc426ff4ef1dd391eb80331c9048c
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Thu Jul 6 00:55:06 2017 +0300
rules: Explicitly disable building debug-gui, documentation and tests.
diff --git a/debian/changelog b/debian/changelog
index bdfa8d3..857493f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
libinput (1.8.0-1) UNRELEASED; urgency=medium
* New upstream release.
+ * rules: Explicitly disable building debug-gui, documentation and
+ tests.
-- Timo Aaltonen <tjaalton@debian.org> Wed, 05 Jul 2017 23:58:05 +0300
diff --git a/debian/rules b/debian/rules
index 5ea78db..042c323 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,9 @@
override_dh_auto_configure:
dh_auto_configure -- \
+ --enable-debug-gui=no \
+ --enable-documentation=no \
+ --enable-tests=no \
--with-udev-dir=/lib/udev
override_dh_install:
commit ea3004ac7b9a2eb872637bc43dc120a2e0a902cb
Author: Timo Aaltonen <tjaalton@debian.org>
Date: Thu Jul 6 00:00:17 2017 +0300
update the changelog
diff --git a/debian/changelog b/debian/changelog
index 411720c..bdfa8d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libinput (1.8.0-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+
+ -- Timo Aaltonen <tjaalton@debian.org> Wed, 05 Jul 2017 23:58:05 +0300
+
libinput (1.7.3-1) unstable; urgency=medium
* New upstream release.
commit 401728a1574ef886ddb7fa19cd8ed196420d7931
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 3 15:07:20 2017 +1000
configure.ac: libinput 1.8.0
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index a66371c..eabc9e1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
AC_PREREQ([2.64])
m4_define([libinput_major_version], [1])
-m4_define([libinput_minor_version], [7])
-m4_define([libinput_micro_version], [902])
+m4_define([libinput_minor_version], [8])
+m4_define([libinput_micro_version], [0])
m4_define([libinput_version],
[libinput_major_version.libinput_minor_version.libinput_micro_version])
diff --git a/meson.build b/meson.build
index bc63971..5ee1520 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
project('libinput', 'c', 'cpp',
- version : '1.7.902',
+ version : '1.8.0',
license : 'MIT/Expat',
default_options : [ 'c_std=gnu99', 'warning_level=2' ],
meson_version : '>= 0.40.0')
commit 945122c6919a00dbb6fcd5c0ad17736f1c23d410
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 3 13:33:20 2017 +1000
tools: tidy up the libinput man pages again
Make the libinput page more generic but suitable for short attention spans and
most importantly, point to the xf86-input-libinput man page in a more obvious
manner since we're now shadowing that.
The rest of the man pages have punctuation and formatting cleanups only.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/tools/libinput-debug-events.man b/tools/libinput-debug-events.man
index ac16d57..473e064 100644
--- a/tools/libinput-debug-events.man
+++ b/tools/libinput-debug-events.man
@@ -2,7 +2,7 @@
.SH NAME
libinput\-debug\-events \- debug helper for libinput
.SH SYNOPSIS
-libinput debug\-events [\-\-help] [\-\-show\-keycodes] [\-\-udev <seat>|\-\-device /dev/input/event0] [configuration options]
+.B libinput debug\-events [\-\-help] [\-\-show\-keycodes] [\-\-udev \fI<seat>\fB|\-\-device \fI/dev/input/event0\fB] \fI[configuration options]\fB
.SH DESCRIPTION
.PP
The
@@ -16,8 +16,8 @@ This tool usually needs to be run as root to have access to the
/dev/input/eventX nodes.
.SH OPTIONS
.TP 8
-.B \-\-device /dev/input/event0
-Use the given device with the path backend.
+.B \-\-device \fI/dev/input/event0\fR
+Use the given device with the path backend
.TP 8
.B \-\-grab
Exclusively grab all opened devices. This will prevent events from being
@@ -36,7 +36,7 @@ and other sensitive information showing up in the output. Use the
.B \-\-show\-keycodes
argument to make all keycodes visible.
.TP 8
-.B \-\-udev <seat>
+.B \-\-udev \fI<seat>\fR
Use the udev backend to listen for device notifications on the given seat.
The default behavior is equivalent to \-\-udev "seat0".
.TP 8
@@ -45,40 +45,40 @@ Use verbose output
.SS libinput configuration options
.TP 8
.B \-\-enable\-tap|\-\-disable\-tap
-Enable or disable tap-to-click.
+Enable or disable tap-to-click
.TP 8
.B \-\-enable-drag|\-\-disable\-drag
Enable or disable tap-and-drag
.TP 8
.B \-\-enable\-drag-lock|\-\-disable\-drag\-lock
-Enable or disable tap-and-drag.
+Enable or disable tap-and-drag
.TP 8
.B \-\-enable\-natural\-scrolling|\-\-disable\-natural\-scrolling
-Enable or disable natural scrolling.
+Enable or disable natural scrolling
.TP 8
.B \-\-enable\-left\-handed|\-\-disable\-left\-handed
-Enable or disable left handed button configuration.
+Enable or disable left handed button configuration
.TP 8
.B \-\-enable\-dwt|\-\-disable\-dwt
-Enable or disable disable-while-typing.
+Enable or disable disable-while-typing
.TP 8
.B \-\-set\-click\-method=[none|clickfinger|buttons]
Set the desired click method
.TP 8
.B \-\-set\-scroll\-method=[none|twofinger|edge|button]
-Set the desired scroll method.
+Set the desired scroll method
.TP 8
.B \-\-set\-scroll\-button=BTN_MIDDLE
-Set the button to the given button code.
+Set the button to the given button code
.TP 8
.B \-\-set\-profile=[adaptive|flat]
-Set pointer acceleration profile.
+Set pointer acceleration profile
.TP 8
.B \-\-set\-speed=<value>
Set pointer acceleration speed. The allowed range is [-1, 1].
.TP 8
.B \-\-set\-tap\-map=[lrm|lmr]
-Set button mapping for tapping.
+Set button mapping for tapping
.SH NOTES
.PP
Events shown by this tool may not correspond to the events seen by a
diff --git a/tools/libinput-debug-gui.man b/tools/libinput-debug-gui.man
index de6a67a..f205377 100644
--- a/tools/libinput-debug-gui.man
+++ b/tools/libinput-debug-gui.man
@@ -2,7 +2,7 @@
.SH NAME
libinput\-debug\-gui \- visual debug helper for libinput
.SH SYNOPSIS
-.B libinput debug\-gui [\-\-help] [\-\-udev <seat>|\-\-device /dev/input/event0] [configuration options]
+.B libinput debug\-gui [\-\-help] [\-\-udev \fI<seat>\fB|\-\-device \fI/dev/input/event0\fB] \fI[configuration options]\fB
.SH DESCRIPTION
.PP
The
@@ -20,7 +20,7 @@ This tool usually needs to be run as root to have access to the
/dev/input/eventX nodes.
.SH OPTIONS
.TP 8
-.B \-\-device /dev/input/event0
+.B \-\-device \fI/dev/input/event0\fR
Use the given device with the path backend.
.TP 8
.B \-\-grab
@@ -30,7 +30,7 @@ delivered to the host system.
.B \-\-help
Print help
.TP 8
-.B \-\-udev <seat>
+.B \-\-udev \fI<seat>\fR
Use the udev backend to listen for device notifications on the given seat.
The default behavior is equivalent to \-\-udev "seat0".
.TP 8
diff --git a/tools/libinput-measure-touchpad-tap.man b/tools/libinput-measure-touchpad-tap.man
index f0e4325..28e6753 100644
--- a/tools/libinput-measure-touchpad-tap.man
+++ b/tools/libinput-measure-touchpad-tap.man
@@ -2,7 +2,7 @@
.SH NAME
libinput\-measure\-touchpad\-tap \- measure tap-to-click properities of devices
.SH SYNOPSIS
-.B libinput measure touchpad\-tap [\-\-help] [\-\-format=<format>] [/dev/input/event0]
+.B libinput measure touchpad\-tap [\-\-help] [\-\-format=\fI<format>\fB] \fI[/dev/input/event0]\fR
.SH DESCRIPTION
.PP
The
diff --git a/tools/libinput-measure.man b/tools/libinput-measure.man
index 470657f..843f001 100644
--- a/tools/libinput-measure.man
+++ b/tools/libinput-measure.man
@@ -2,7 +2,7 @@
.SH NAME
libinput\-measure \- measure properties of devices
.SH SYNOPSIS
-.B libinput measure [\-\-help] <feature> [<args>]
+.B libinput measure [\-\-help] \fI<feature> [<args>]\fR
.SH DESCRIPTION
.PP
The
@@ -23,7 +23,7 @@ Print help
Features that can be measured include
.TP 8
.B libinput\-measure\-touchpad\-tap\-time(1)
-Measure tap-to-click time.
+Measure tap-to-click time
.SH LIBINPUT
Part of the
.B libinput(1)
diff --git a/tools/libinput.man b/tools/libinput.man
index 39bb34c..3098f5e 100644
--- a/tools/libinput.man
+++ b/tools/libinput.man
@@ -2,25 +2,28 @@
.SH NAME
libinput \- tool to interface with libinput
.SH SYNOPSIS
-.B libinput [\-\-help] [\-\-version] <command> [<args>]
+.B libinput [\-\-help|\-\-version] \fI<command>\fR \fI[<args>]\fR
.SH DESCRIPTION
.PP
+libinput is a library to handle input devices and provides device
+detection and input device event processing for most Wayland
+compositors and the X.Org xf86-input-libinput driver.
+.PP
The
.B "libinput"
-tool creates a libinput context on the default seat "seat0" and interacts
-with that libinput context.
-.PP
-This tool usually needs to be run as root to have access to the
-/dev/input/eventX nodes.
+tools are a set of tools to debug, interface with and analyze data for
+libinput. These tools create libinput contexts separate from that of
+the compositor/X server and cannot change settings in a running session.
+See section
+.B COMMANDS
+for a list of available commands.
.PP
-The context created by this tool is a new libinput context and independent
-of that created by the X.Org libinput driver, the Wayland compositor or any
-other process that utilizes libinput (henceforth called "the caller").
-Configuration options set in this context do not affect any other libinput
-contexts.
+libinput's API documentation and details on features and various high-level
+concepts are available online at
+.I https://wayland.freedesktop.org/libinput/doc/latest/
.PP
-Note that a device may be recognized by this tool but not handled by the
-X.Org libinput driver or the Wayland compositor.
+The man page for the X.Org xf86-input-libinput driver is
+.B libinput(4).
.SH OPTIONS
.TP 8
.B \-\-help
@@ -28,28 +31,22 @@ Print help and exit
.TP 8
.B \-\-version
Print the version and exit
-
.SH COMMANDS
-All commands support a
-.B \-\-help
-argument that prints command\-specific usage
-information, e.g.
-.B "libinput debug\-events \-\-help".
.TP 8
.B libinput\-debug\-events(1)
-Print all events as seen by libinput.
+Print all events as seen by libinput
.TP 8
.B libinput\-debug\-gui(1)
-Show a GUI to visualize libinput's events.
+Show a GUI to visualize libinput's events
.TP 8
.B libinput\-list\-devices(1)
-List all devices recognized by libinput.
+List all devices recognized by libinput
.TP 8
.B libinput\-measure(1)
-Measure various properties of devices.
+Measure various properties of devices
.TP 8
.B libinput\-measure\-touchpad\-tap(1)
-Measure tap-to-click time.
+Measure tap-to-click time
.SH LIBINPUT
Part of the
.B libinput(1)
commit 57e35f4afa4fa9c4f1af60b4fa115fdaffc16539
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 3 13:43:21 2017 +1000
README: tidy up the documentation links
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/README.md b/README.md
index b8a0cb7..f95a560 100644
--- a/README.md
+++ b/README.md
@@ -62,11 +62,12 @@ See @ref reporting_bugs for more info.
Documentation
-------------
-Developer API documentation:
-http://wayland.freedesktop.org/libinput/doc/latest/modules.html
-
-High-level documentation about libinput's features:
+- Developer API documentation: http://wayland.freedesktop.org/libinput/doc/latest/modules.html
+- High-level documentation about libinput's features:
http://wayland.freedesktop.org/libinput/doc/latest/pages.html
+- Build instructions:
+http://wayland.freedesktop.org/libinput/doc/latest/building_libinput.html
+- Documentation for previous versions of libinput: https://wayland.freedesktop.org/libinput/doc/
Examples of how to use libinput are the debugging tools in the libinput
repository. Developers are encouraged to look at those tools for a
@@ -75,9 +76,6 @@ real-world (yet simple) example on how to use libinput.
- A commandline debugging tool: https://cgit.freedesktop.org/wayland/libinput/tree/tools/libinput-debug-events.c
- A GTK application that draws cursor/touch/tablet positions: https://cgit.freedesktop.org/wayland/libinput/tree/tools/libinput-debug-gui.c
-Build instructions:
-http://wayland.freedesktop.org/libinput/doc/latest/building_libinput.html
-
License
-------
commit 5bba2dbb3ffe24c0fd18b8de5b4b88b3160534ad
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jun 29 08:40:28 2017 +1000
tools: add the libinput version to the man pages
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
diff --git a/configure.ac b/configure.ac
index 067c3e1..a66371c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,6 +46,7 @@ AC_USE_SYSTEM_EXTENSIONS
AC_PROG_CC_C99
AC_PROG_CXX # Only used by build C++ test
AC_PROG_GREP
+AC_PROG_SED
Reply to: