Timo Aaltonen pushed to branch upstream-unstable at X Strike Force / driver / xserver-xorg-input-libinput
Commits:
-
05548118
by Peter Hutterer at 2019-02-12T05:40:53Z
-
8923d18d
by David Rosca at 2019-02-25T17:43:42Z
-
39b0bb45
by Peter Hutterer at 2019-07-30T01:51:12Z
-
3c9052d8
by Peter Hutterer at 2019-07-31T00:32:44Z
-
1ef2ed87
by Peter Hutterer at 2019-07-31T00:32:44Z
-
d5867e5d
by Peter Hutterer at 2019-08-12T00:36:08Z
-
27a88897
by Peter Hutterer at 2019-08-12T01:44:56Z
-
400bf493
by Peter Hutterer at 2019-08-12T02:35:51Z
3 changed files:
Changes:
1 |
+# vim: set expandtab shiftwidth=2 tabstop=8 textwidth=0:
|
|
2 |
+ |
|
3 |
+include:
|
|
4 |
+ - project: 'wayland/ci-templates'
|
|
5 |
+ ref: 955e61e67cf29327cf907432f668df9eec4ca6a2 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
|
|
6 |
+ file: '/templates/fedora.yml'
|
|
7 |
+ |
|
8 |
+ |
|
9 |
+variables:
|
|
10 |
+ FEDORA_RPMS: 'git autoconf automake libtool make xorg-x11-server-devel libudev-devel libevdev-devel libinput-devel xorg-x11-util-macros'
|
|
11 |
+ FEDORA_TAG: '2019-08-12.0'
|
|
12 |
+ UPSTREAM_REPO: xorg/drivers/xf86-input-libinput
|
|
13 |
+ BUILDAH_IMAGE: $CI_REGISTRY/wayland/ci-templates/buildah:latest
|
|
14 |
+ FEDORA_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/fedora/$FEDORA_VERSION:$FEDORA_TAG
|
|
15 |
+ |
|
16 |
+ |
|
17 |
+stages:
|
|
18 |
+ - containers-build
|
|
19 |
+ - build
|
|
20 |
+ |
|
21 |
+ |
|
22 |
+container_build:
|
|
23 |
+ extends: .fedora@container-ifnot-exists
|
|
24 |
+ stage: containers-build
|
|
25 |
+ variables:
|
|
26 |
+ GIT_STRATEGY: none
|
|
27 |
+ FEDORA_VERSION: 30
|
|
28 |
+ |
|
29 |
+ |
|
30 |
+.default_artifacts: &default_artifacts
|
|
31 |
+ artifacts:
|
|
32 |
+ name: "automake-logs-$CI_JOB_NAME"
|
|
33 |
+ when: always
|
|
34 |
+ expire_in: 1 week
|
|
35 |
+ paths:
|
|
36 |
+ - _builddir/config.log
|
|
37 |
+ |
|
38 |
+ |
|
39 |
+.default_build: &default_build
|
|
40 |
+ script:
|
|
41 |
+ - mkdir _builddir _inst
|
|
42 |
+ - pushd _builddir > /dev/null
|
|
43 |
+ - ../autogen.sh --prefix=$(realpath ../_inst) --disable-silent-rules
|
|
44 |
+ - make && make check
|
|
45 |
+ - make install
|
|
46 |
+ - popd > /dev/null
|
|
47 |
+ |
|
48 |
+ |
|
49 |
+.build@template:
|
|
50 |
+ stage: build
|
|
51 |
+ <<: *default_artifacts
|
|
52 |
+ <<: *default_build
|
|
53 |
+ dependencies: []
|
|
54 |
+ |
|
55 |
+ |
|
56 |
+.fedora-build@template:
|
|
57 |
+ extends: .build@template
|
|
58 |
+ image: $FEDORA_CONTAINER_IMAGE
|
|
59 |
+ |
|
60 |
+ |
|
61 |
+fedora:30@default-build:
|
|
62 |
+ extends: .fedora-build@template
|
|
63 |
+ variables:
|
|
64 |
+ FEDORA_VERSION: 30
|
... | ... | @@ -23,7 +23,7 @@ |
23 | 23 |
# Initialize Autoconf
|
24 | 24 |
AC_PREREQ([2.60])
|
25 | 25 |
AC_INIT([xf86-input-libinput],
|
26 |
- [0.28.2],
|
|
26 |
+ [0.29.0],
|
|
27 | 27 |
[https://gitlab.freedesktop.org/xorg/driver/xf86-input-libinput/issues],
|
28 | 28 |
[xf86-input-libinput])
|
29 | 29 |
AC_CONFIG_SRCDIR([Makefile.am])
|
... | ... | @@ -45,7 +45,7 @@ XORG_DEFAULT_OPTIONS |
45 | 45 |
|
46 | 46 |
# Obtain compiler/linker options from server and required extensions
|
47 | 47 |
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.10] xproto [inputproto >= 2.2])
|
48 |
-PKG_CHECK_MODULES(LIBINPUT, [libinput >= 1.4.901])
|
|
48 |
+PKG_CHECK_MODULES(LIBINPUT, [libinput >= 1.7.0])
|
|
49 | 49 |
|
50 | 50 |
OLD_LIBS=$LIBS
|
51 | 51 |
OLD_CFLAGS=$CFLAGS
|
... | ... | @@ -1791,7 +1791,9 @@ xf86libinput_pick_device(struct xf86libinput_device *shared_device, |
1791 | 1791 |
if (libinput_tablet_tool_get_serial(driver_data->tablet_tool) ==
|
1792 | 1792 |
libinput_tablet_tool_get_serial(tool) &&
|
1793 | 1793 |
libinput_tablet_tool_get_tool_id(driver_data->tablet_tool) ==
|
1794 |
- libinput_tablet_tool_get_tool_id(tool))
|
|
1794 |
+ libinput_tablet_tool_get_tool_id(tool) &&
|
|
1795 |
+ libinput_tablet_tool_get_type(driver_data->tablet_tool) ==
|
|
1796 |
+ libinput_tablet_tool_get_type(tool))
|
|
1795 | 1797 |
return driver_data->pInfo;
|
1796 | 1798 |
}
|
1797 | 1799 |
}
|
... | ... | @@ -2062,6 +2064,7 @@ xf86libinput_create_tool_subdevice(InputInfoPtr pInfo, |
2062 | 2064 |
struct xf86libinput_tablet_tool *t;
|
2063 | 2065 |
struct xf86libinput_tablet_tool_event_queue *queue;
|
2064 | 2066 |
struct libinput_tablet_tool *tool;
|
2067 |
+ enum libinput_tablet_tool_type tool_type;
|
|
2065 | 2068 |
uint64_t serial, tool_id;
|
2066 | 2069 |
XF86OptionPtr options = NULL;
|
2067 | 2070 |
char name[64];
|
... | ... | @@ -2081,12 +2084,14 @@ xf86libinput_create_tool_subdevice(InputInfoPtr pInfo, |
2081 | 2084 |
tool = libinput_event_tablet_tool_get_tool(event);
|
2082 | 2085 |
serial = libinput_tablet_tool_get_serial(tool);
|
2083 | 2086 |
tool_id = libinput_tablet_tool_get_tool_id(tool);
|
2087 |
+ tool_type = libinput_tablet_tool_get_type(tool);
|
|
2084 | 2088 |
|
2085 | 2089 |
t->tool = libinput_tablet_tool_ref(tool);
|
2086 | 2090 |
xorg_list_append(&t->node, &shared_device->unclaimed_tablet_tool_list);
|
2087 | 2091 |
|
2088 | 2092 |
options = xf86ReplaceIntOption(options, "_libinput/tablet-tool-serial", serial);
|
2089 | 2093 |
options = xf86ReplaceIntOption(options, "_libinput/tablet-tool-id", tool_id);
|
2094 |
+ options = xf86ReplaceIntOption(options, "_libinput/tablet-tool-type", tool_type);
|
|
2090 | 2095 |
/* Convert the name to "<base name> <tool type> (serial number)" */
|
2091 | 2096 |
if (snprintf(name,
|
2092 | 2097 |
sizeof(name),
|
... | ... | @@ -2111,13 +2116,15 @@ xf86libinput_find_device_for_tool(InputInfoPtr pInfo, |
2111 | 2116 |
struct xf86libinput_device *shared_device = driver_data->shared_device;
|
2112 | 2117 |
uint64_t serial = libinput_tablet_tool_get_serial(tool);
|
2113 | 2118 |
uint64_t tool_id = libinput_tablet_tool_get_tool_id(tool);
|
2119 |
+ enum libinput_tablet_tool_type tool_type = libinput_tablet_tool_get_type(tool);
|
|
2114 | 2120 |
|
2115 | 2121 |
xorg_list_for_each_entry(dev,
|
2116 | 2122 |
&shared_device->device_list,
|
2117 | 2123 |
shared_device_link) {
|
2118 | 2124 |
if (dev->tablet_tool &&
|
2119 | 2125 |
libinput_tablet_tool_get_serial(dev->tablet_tool) == serial &&
|
2120 |
- libinput_tablet_tool_get_tool_id(dev->tablet_tool) == tool_id) {
|
|
2126 |
+ libinput_tablet_tool_get_tool_id(dev->tablet_tool) == tool_id &&
|
|
2127 |
+ libinput_tablet_tool_get_type(dev->tablet_tool) == tool_type) {
|
|
2121 | 2128 |
return dev->pInfo->dev;
|
2122 | 2129 |
}
|
2123 | 2130 |
}
|
... | ... | @@ -2332,6 +2339,8 @@ xf86libinput_handle_event(struct libinput_event *event) |
2332 | 2339 |
xf86libinput_handle_tablet_pad_strip(pInfo,
|
2333 | 2340 |
libinput_event_get_tablet_pad_event(event));
|
2334 | 2341 |
break;
|
2342 |
+ case LIBINPUT_EVENT_SWITCH_TOGGLE:
|
|
2343 |
+ break;
|
|
2335 | 2344 |
}
|
2336 | 2345 |
|
2337 | 2346 |
out:
|
... | ... | @@ -3296,16 +3305,19 @@ claim_tablet_tool(InputInfoPtr pInfo) |
3296 | 3305 |
struct xf86libinput_device *shared_device = driver_data->shared_device;
|
3297 | 3306 |
struct xf86libinput_tablet_tool_event_queue *queue;
|
3298 | 3307 |
struct xf86libinput_tablet_tool *t;
|
3308 |
+ enum libinput_tablet_tool_type tool_type;
|
|
3299 | 3309 |
uint64_t serial, tool_id;
|
3300 | 3310 |
|
3301 | 3311 |
serial = (uint32_t)xf86CheckIntOption(pInfo->options, "_libinput/tablet-tool-serial", 0);
|
3302 | 3312 |
tool_id = (uint32_t)xf86CheckIntOption(pInfo->options, "_libinput/tablet-tool-id", 0);
|
3313 |
+ tool_type = (uint32_t)xf86CheckIntOption(pInfo->options, "_libinput/tablet-tool-type", 0);
|
|
3303 | 3314 |
|
3304 | 3315 |
xorg_list_for_each_entry(t,
|
3305 | 3316 |
&shared_device->unclaimed_tablet_tool_list,
|
3306 | 3317 |
node) {
|
3307 | 3318 |
if (libinput_tablet_tool_get_serial(t->tool) == serial &&
|
3308 |
- libinput_tablet_tool_get_tool_id(t->tool) == tool_id) {
|
|
3319 |
+ libinput_tablet_tool_get_tool_id(t->tool) == tool_id &&
|
|
3320 |
+ libinput_tablet_tool_get_type(t->tool) == tool_type) {
|
|
3309 | 3321 |
driver_data->tablet_tool = t->tool;
|
3310 | 3322 |
queue = libinput_tablet_tool_get_user_data(t->tool);
|
3311 | 3323 |
if (queue)
|