Commits:
-
b6b36166
by Alan Coopersmith at 2018-11-18T11:30:58-08:00
Update README for gitlab migration
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-
71036116
by Alan Coopersmith at 2018-11-25T12:45:55-08:00
Update configure.ac bug URL for gitlab migration
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-
6609d352
by Alan Coopersmith at 2022-01-16T10:49:21-08:00
Build xz tarballs instead of bzip2
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-
abf0fa61
by Alan Coopersmith at 2022-01-16T10:51:03-08:00
Fix spelling/wording issues
Found by using:
codespell --builtin clear,rare,usage,informal,code,names
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-
23909c35
by Alan Coopersmith at 2022-01-16T10:55:36-08:00
gitlab CI: add a basic build test
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-
469a30f1
by Alan Coopersmith at 2022-01-16T11:11:01-08:00
Convert src/draglock.c from ISO-8859-1 to UTF-8
Fixes flawfinder error in CI:
Error: encoding error in ./src/draglock.c
'utf-8' codec can't decode byte 0xa9 in position 343: invalid start byte
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-
84b27408
by Alan Coopersmith at 2023-02-09T12:06:53-08:00
gitlab CI: stop requiring Signed-off-by in commits
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-
8edcb2b9
by Alan Coopersmith at 2023-10-01T11:22:19-07:00
gitlab CI: ensure libtool is installed in build container
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-
7c48b622
by Enrico Weigelt, metux IT consult at 2024-05-14T10:59:46+02:00
bump minimal xorg version to 1.18
1.18 was released a decade ago, so it seems reasonable stop supporting
older ones.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-input-evdev/-/merge_requests/5>
-
7fc0d51f
by Enrico Weigelt, metux IT consult at 2024-06-10T18:05:40+02:00
drop quirk for ancient linux kernel version (<2.6.30)
This kernel had been released 1.5 decades ago - probably no need to have
special quirks for such an ancient kernel version anymore.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
-
409e8205
by Enrico Weigelt, metux IT consult at 2024-06-10T18:38:12+02:00
fix unportable linux-only include
including <linux/types.h> obviously isn't portable - instead using
<sys/types.h> is the right choice for us.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-input-evdev/-/merge_requests/6>
-
fbfb16ed
by Enrico Weigelt, metux IT consult at 2024-06-10T18:42:22+02:00
tolerate including linux/input.h
On some platforms (eg. FreeBSD) we're running into a name clash between
xf86str.h and linux/input.h. Since we don't actually need those symbols
here, an easy workaround is #undef'ing them.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-input-evdev/-/merge_requests/6>
-
aac329fd
by Enrico Weigelt, metux IT consult at 2024-06-10T19:05:54+02:00
fix FTBS on non-udev target platforms (eg. FreeBSD)
On platforms that don't have libudev at all (eg. FreeBSD), the build
breaks. The only consumer, EvdevDeviceIsVirtual(), can live well with
just bailing out directly if libudev isn't present.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-input-evdev/-/merge_requests/6>
-
b48c2b70
by Enrico Weigelt, metux IT consult at 2024-06-10T19:05:58+02:00
dont spam xserver with false-positives
It's not necessary to spam the xserver log with error messages of
just temporary read failures that aren't actually errors.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-input-evdev/-/merge_requests/6>
-
917c2ea2
by Peter Hutterer at 2024-09-03T13:49:04+10:00
gitlab CI: set the standard workflow rules for an fdo project
-
b9327e6b
by Martin Rys at 2024-09-05T11:32:21+10:00
Swap Compose and Kana values to conform to USB HID spec
Should fix https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/204
Current state conflicts with XKB which defines them correctly.
NUM and CAPS are still incorrectly swapped, but it's equally wrong on
XKB's side and everywhere else, so it's just cosmetic and a breaking
change just to satisfy USB HID ordering is not worth it, since the keys
work fine this way anyway.
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-input-evdev/-/merge_requests/8>
-
d893fc74
by Peter Hutterer at 2024-10-09T14:33:05+10:00
Map some specific high keycodes into the FK20-23 range
These mappings have been part of xkeyboard-config for over a decade and
the likely reason they were introduced is that the corresponding evdev
keycode is > 255.
Let's forcibly remap those in the driver here so the rest of the system
can switch to the real keycodes instead of having to map them to the
whatever X expects.
See https://github.com/systemd/systemd/pull/34325/
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-input-evdev/-/merge_requests/10>
-
abcafeed
by Peter Hutterer at 2024-10-15T14:32:50+10:00
xf86-input-evdev 2.11.0
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-
9be6e58c
by Timo Aaltonen at 2025-02-05T12:32:59+02:00
Merge branch 'upstream-unstable' into debian-unstable
-
f7018d50
by Timo Aaltonen at 2025-02-05T12:33:42+02:00
version bump
-
bd316b14
by Timo Aaltonen at 2025-02-05T12:34:11+02:00
control: Migrate to pkgconf.
-
40f6ee0a
by Timo Aaltonen at 2025-02-05T13:49:38+02:00
release to sid
12 changed files:
Changes:
.gitlab-ci.yml
|
|
1
|
+# vim: set expandtab shiftwidth=2 tabstop=8 textwidth=0 filetype=yaml:
|
|
|
2
|
+#
|
|
|
3
|
+# This CI uses the freedesktop.org ci-templates.
|
|
|
4
|
+# Please see the ci-templates documentation for details:
|
|
|
5
|
+# https://freedesktop.pages.freedesktop.org/ci-templates/
|
|
|
6
|
+
|
|
|
7
|
+.templates_sha: &template_sha 25e8e9f020880aa35fffe3d6b259b933f0f9449f # see https://docs.gitlab.com/ee/ci/yaml/#includefile
|
|
|
8
|
+
|
|
|
9
|
+
|
|
|
10
|
+include:
|
|
|
11
|
+ # Arch container builder template
|
|
|
12
|
+ - project: 'freedesktop/ci-templates'
|
|
|
13
|
+ ref: *template_sha
|
|
|
14
|
+ file: '/templates/arch.yml'
|
|
|
15
|
+ - project: 'freedesktop/ci-templates'
|
|
|
16
|
+ ref: *template_sha
|
|
|
17
|
+ file: '/templates/ci-fairy.yml'
|
|
|
18
|
+ - template: Security/SAST.gitlab-ci.yml
|
|
|
19
|
+
|
|
|
20
|
+
|
|
|
21
|
+workflow:
|
|
|
22
|
+ rules:
|
|
|
23
|
+ - if: $CI_PIPELINE_SOURCE == "merge_request_event"
|
|
|
24
|
+ - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS
|
|
|
25
|
+ when: never
|
|
|
26
|
+ - if: $CI_COMMIT_BRANCH
|
|
|
27
|
+
|
|
|
28
|
+
|
|
|
29
|
+stages:
|
|
|
30
|
+ - prep # prep work like rebuilding the container images if there is a change
|
|
|
31
|
+ - build # for actually building and testing things in a container
|
|
|
32
|
+ - test
|
|
|
33
|
+ - deploy
|
|
|
34
|
+
|
|
|
35
|
+
|
|
|
36
|
+variables:
|
|
|
37
|
+ FDO_UPSTREAM_REPO: 'xorg/driver/xf86-input-evdev'
|
|
|
38
|
+ # The tag should be updated each time the list of packages is updated.
|
|
|
39
|
+ # Changing a tag forces the associated image to be rebuilt.
|
|
|
40
|
+ # Note: the tag has no meaning, we use a date format purely for readability
|
|
|
41
|
+ FDO_DISTRIBUTION_TAG: '2023-10-01.0'
|
|
|
42
|
+ FDO_DISTRIBUTION_PACKAGES: 'git gcc pkgconf autoconf automake libtool make xorg-util-macros xorgproto xorg-server-devel pixman systemd-libs libevdev mtdev'
|
|
|
43
|
+
|
|
|
44
|
+
|
|
|
45
|
+#
|
|
|
46
|
+# Verify that commit messages are as expected
|
|
|
47
|
+#
|
|
|
48
|
+check-commits:
|
|
|
49
|
+ extends:
|
|
|
50
|
+ - .fdo.ci-fairy
|
|
|
51
|
+ stage: prep
|
|
|
52
|
+ script:
|
|
|
53
|
+ - ci-fairy check-commits --junit-xml=results.xml
|
|
|
54
|
+ except:
|
|
|
55
|
+ - master@xorg/driver/xf86-input-evdev
|
|
|
56
|
+ variables:
|
|
|
57
|
+ GIT_DEPTH: 100
|
|
|
58
|
+ artifacts:
|
|
|
59
|
+ reports:
|
|
|
60
|
+ junit: results.xml
|
|
|
61
|
+
|
|
|
62
|
+#
|
|
|
63
|
+# Verify that the merge request has the allow-collaboration checkbox ticked
|
|
|
64
|
+#
|
|
|
65
|
+check-merge-request:
|
|
|
66
|
+ extends:
|
|
|
67
|
+ - .fdo.ci-fairy
|
|
|
68
|
+ stage: deploy
|
|
|
69
|
+ script:
|
|
|
70
|
+ - ci-fairy check-merge-request --require-allow-collaboration --junit-xml=results.xml
|
|
|
71
|
+ artifacts:
|
|
|
72
|
+ when: on_failure
|
|
|
73
|
+ reports:
|
|
|
74
|
+ junit: results.xml
|
|
|
75
|
+ allow_failure: true
|
|
|
76
|
+
|
|
|
77
|
+
|
|
|
78
|
+#
|
|
|
79
|
+# Build a container with the given tag and the packages pre-installed.
|
|
|
80
|
+# This only happens if the tag changes, otherwise the existing image is
|
|
|
81
|
+# re-used.
|
|
|
82
|
+#
|
|
|
83
|
+container-prep:
|
|
|
84
|
+ extends:
|
|
|
85
|
+ - .fdo.container-build@arch
|
|
|
86
|
+ stage: prep
|
|
|
87
|
+ variables:
|
|
|
88
|
+ GIT_STRATEGY: none
|
|
|
89
|
+
|
|
|
90
|
+
|
|
|
91
|
+#
|
|
|
92
|
+# The default build, runs on the image built above.
|
|
|
93
|
+#
|
|
|
94
|
+build:
|
|
|
95
|
+ stage: build
|
|
|
96
|
+ extends:
|
|
|
97
|
+ - .fdo.distribution-image@arch
|
|
|
98
|
+ script:
|
|
|
99
|
+ - autoreconf -ivf
|
|
|
100
|
+ - mkdir _builddir
|
|
|
101
|
+ - pushd _builddir > /dev/null
|
|
|
102
|
+ - ../configure --disable-silent-rules
|
|
|
103
|
+ - make
|
|
|
104
|
+ - make check
|
|
|
105
|
+ - make distcheck
|
|
|
106
|
+ - popd > /dev/null |
Makefile.am
| ... |
... |
@@ -39,3 +39,5 @@ ChangeLog: |
|
39
|
39
|
$(CHANGELOG_CMD)
|
|
40
|
40
|
|
|
41
|
41
|
dist-hook: ChangeLog INSTALL
|
|
|
42
|
+
|
|
|
43
|
+EXTRA_DIST = README.md |
README
deleted
|
1
|
|
-xf86-input-evdev - Generic Linux input driver for the Xorg X server
|
|
2
|
|
-
|
|
3
|
|
-Please submit bugs & patches to the Xorg bugzilla:
|
|
4
|
|
-
|
|
5
|
|
- https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
|
|
6
|
|
-
|
|
7
|
|
-All questions regarding this software should be directed at the
|
|
8
|
|
-Xorg mailing list:
|
|
9
|
|
-
|
|
10
|
|
- http://lists.freedesktop.org/mailman/listinfo/xorg
|
|
11
|
|
-
|
|
12
|
|
-The master development code repository can be found at:
|
|
13
|
|
-
|
|
14
|
|
- git://anongit.freedesktop.org/git/xorg/driver/xf86-input-evdev
|
|
15
|
|
-
|
|
16
|
|
- http://cgit.freedesktop.org/xorg/driver/xf86-input-evdev
|
|
17
|
|
-
|
|
18
|
|
-For more information on the git code manager, see:
|
|
19
|
|
-
|
|
20
|
|
- http://wiki.x.org/wiki/GitPage |
README.md
|
|
1
|
+xf86-input-evdev - Generic Linux input driver for the Xorg X server
|
|
|
2
|
+-------------------------------------------------------------------
|
|
|
3
|
+
|
|
|
4
|
+All questions regarding this software should be directed at the
|
|
|
5
|
+Xorg mailing list:
|
|
|
6
|
+
|
|
|
7
|
+ https://lists.x.org/mailman/listinfo/xorg
|
|
|
8
|
+
|
|
|
9
|
+The primary development code repository can be found at:
|
|
|
10
|
+
|
|
|
11
|
+ https://gitlab.freedesktop.org/xorg/driver/xf86-input-evdev
|
|
|
12
|
+
|
|
|
13
|
+Please submit bug reports and requests to merge patches there.
|
|
|
14
|
+
|
|
|
15
|
+For patch submission instructions, see:
|
|
|
16
|
+
|
|
|
17
|
+ https://www.x.org/wiki/Development/Documentation/SubmittingPatches
|
|
|
18
|
+ |
configure.ac
| ... |
... |
@@ -23,15 +23,15 @@ |
|
23
|
23
|
# Initialize Autoconf
|
|
24
|
24
|
AC_PREREQ([2.60])
|
|
25
|
25
|
AC_INIT([xf86-input-evdev],
|
|
26
|
|
- [2.10.6],
|
|
27
|
|
- [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
|
|
|
26
|
+ [2.11.0],
|
|
|
27
|
+ [https://gitlab.freedesktop.org/xorg/driver/xf86-input-evdev/issues],
|
|
28
|
28
|
[xf86-input-evdev])
|
|
29
|
29
|
AC_CONFIG_SRCDIR([Makefile.am])
|
|
30
|
30
|
AC_CONFIG_HEADERS([config.h])
|
|
31
|
31
|
AC_CONFIG_AUX_DIR(.)
|
|
32
|
32
|
|
|
33
|
33
|
# Initialize Automake
|
|
34
|
|
-AM_INIT_AUTOMAKE([foreign dist-bzip2])
|
|
|
34
|
+AM_INIT_AUTOMAKE([foreign dist-xz])
|
|
35
|
35
|
|
|
36
|
36
|
# Initialize libtool
|
|
37
|
37
|
AC_DISABLE_STATIC
|
| ... |
... |
@@ -44,8 +44,8 @@ XORG_MACROS_VERSION(1.8) |
|
44
|
44
|
XORG_DEFAULT_OPTIONS
|
|
45
|
45
|
|
|
46
|
46
|
# Obtain compiler/linker options from server and required extensions
|
|
47
|
|
-PKG_CHECK_MODULES(XORG, [xorg-server >= 1.12] xproto [inputproto >= 2.1.99.3])
|
|
48
|
|
-PKG_CHECK_MODULES(UDEV, libudev)
|
|
|
47
|
+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.18] xproto [inputproto >= 2.1.99.3])
|
|
|
48
|
+PKG_CHECK_MODULES(UDEV, libudev, [AC_DEFINE(HAVE_LIBUDEV, 1,[libudev support])])
|
|
49
|
49
|
|
|
50
|
50
|
PKG_CHECK_MODULES(LIBEVDEV, [libevdev >= 0.4])
|
|
51
|
51
|
PKG_CHECK_MODULES(MTDEV, mtdev)
|
debian/changelog
|
1
|
|
-xserver-xorg-input-evdev (1:2.10.6-3) UNRELEASED; urgency=medium
|
|
|
1
|
+xserver-xorg-input-evdev (1:2.11.0-1) unstable; urgency=medium
|
|
2
|
2
|
|
|
|
3
|
+ [ Debian Janitor ]
|
|
3
|
4
|
* Trim trailing whitespace.
|
|
4
|
5
|
* Bump debhelper from old 12 to 13.
|
|
5
|
6
|
+ debian/rules: Drop --fail-missing argument to dh_missing, which is now the
|
|
6
|
7
|
default.
|
|
7
|
8
|
* Update standards version to 4.6.1, no changes needed.
|
|
8
|
9
|
|
|
9
|
|
- -- Debian Janitor <janitor@jelmer.uk> Wed, 14 Sep 2022 03:42:34 -0000
|
|
|
10
|
+ [ Timo Aaltonen ]
|
|
|
11
|
+ * New upstream release.
|
|
|
12
|
+ * control: Migrate to pkgconf.
|
|
|
13
|
+
|
|
|
14
|
+ -- Timo Aaltonen <tjaalton@debian.org> Wed, 05 Feb 2025 13:49:31 +0200
|
|
10
|
15
|
|
|
11
|
16
|
xserver-xorg-input-evdev (1:2.10.6-2) unstable; urgency=medium
|
|
12
|
17
|
|
debian/control
| ... |
... |
@@ -4,7 +4,7 @@ Priority: optional |
|
4
|
4
|
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
|
|
5
|
5
|
Build-Depends:
|
|
6
|
6
|
debhelper-compat (= 13),
|
|
7
|
|
- pkg-config,
|
|
|
7
|
+ pkgconf,
|
|
8
|
8
|
quilt,
|
|
9
|
9
|
xserver-xorg-dev (>= 2:1.15.99),
|
|
10
|
10
|
x11proto-dev,
|
man/evdev.man
| ... |
... |
@@ -194,7 +194,7 @@ Invert the given axis. Default: off. Property: "Evdev Axis Inversion". |
|
194
|
194
|
.BI "Option \*qIgnoreAbsoluteAxes\*q \*q" Bool \*q
|
|
195
|
195
|
Ignore the specified type of axis. Default: unset. The X server cannot deal
|
|
196
|
196
|
with devices that have both relative and absolute axes. Evdev tries to guess
|
|
197
|
|
-wich axes to ignore given the device type and disables absolute axes for
|
|
|
197
|
+which axes to ignore given the device type and disables absolute axes for
|
|
198
|
198
|
mice and relative axes for tablets, touchscreens and touchpad. These options
|
|
199
|
199
|
allow to forcibly disable an axis type. Mouse wheel axes are exempt and will
|
|
200
|
200
|
work even if relative axes are ignored. No property, this configuration must
|
src/draglock.c
| ... |
... |
@@ -5,7 +5,7 @@ |
|
5
|
5
|
* Copyright 1994-2002 by The XFree86 Project, Inc.
|
|
6
|
6
|
* Copyright 2002 by Paul Elliott
|
|
7
|
7
|
* (Ported from xf86-input-mouse, above copyrights taken from there)
|
|
8
|
|
- * Copyright 2008 University of South Australia
|
|
|
8
|
+ * Copyright © 2008 University of South Australia
|
|
9
|
9
|
* Copyright 2008 by Chris Salch
|
|
10
|
10
|
* Copyright 2008 Red Hat, Inc.
|
|
11
|
11
|
*
|
src/emuWheel.c
| ... |
... |
@@ -50,7 +50,7 @@ static Atom prop_wheel_inertia = 0; |
|
50
|
50
|
static Atom prop_wheel_timeout = 0;
|
|
51
|
51
|
static Atom prop_wheel_button = 0;
|
|
52
|
52
|
|
|
53
|
|
-/* Local Funciton Prototypes */
|
|
|
53
|
+/* Local Function Prototypes */
|
|
54
|
54
|
static int EvdevWheelEmuInertia(InputInfoPtr pInfo, WheelAxisPtr axis, int value);
|
|
55
|
55
|
|
|
56
|
56
|
/* Filter mouse button events */
|
src/evdev.c
| ... |
... |
@@ -38,9 +38,10 @@ |
|
38
|
38
|
#include <X11/keysym.h>
|
|
39
|
39
|
#include <X11/extensions/XI.h>
|
|
40
|
40
|
|
|
41
|
|
-#include <linux/version.h>
|
|
42
|
41
|
#include <sys/stat.h>
|
|
|
42
|
+#ifdef HAVE_LIBUDEV
|
|
43
|
43
|
#include <libudev.h>
|
|
|
44
|
+#endif
|
|
44
|
45
|
#include <unistd.h>
|
|
45
|
46
|
#include <errno.h>
|
|
46
|
47
|
#include <fcntl.h>
|
| ... |
... |
@@ -74,8 +75,8 @@ |
|
74
|
75
|
#define CAPSFLAG 1
|
|
75
|
76
|
#define NUMFLAG 2
|
|
76
|
77
|
#define SCROLLFLAG 4
|
|
77
|
|
-#define MODEFLAG 8
|
|
78
|
|
-#define COMPOSEFLAG 16
|
|
|
78
|
+#define COMPOSEFLAG 8
|
|
|
79
|
+#define MODEFLAG 16
|
|
79
|
80
|
|
|
80
|
81
|
#ifndef ABS_MT_SLOT
|
|
81
|
82
|
#define ABS_MT_SLOT 0x2f
|
| ... |
... |
@@ -226,6 +227,7 @@ EvdevIsDuplicate(InputInfoPtr pInfo) |
|
226
|
227
|
static BOOL
|
|
227
|
228
|
EvdevDeviceIsVirtual(const char* devicenode)
|
|
228
|
229
|
{
|
|
|
230
|
+#ifdef HAVE_LIBUDEV
|
|
229
|
231
|
struct udev *udev = NULL;
|
|
230
|
232
|
struct udev_device *device = NULL;
|
|
231
|
233
|
struct stat st;
|
| ... |
... |
@@ -256,6 +258,9 @@ out: |
|
256
|
258
|
udev_device_unref(device);
|
|
257
|
259
|
udev_unref(udev);
|
|
258
|
260
|
return rc;
|
|
|
261
|
+#else
|
|
|
262
|
+ return FALSE;
|
|
|
263
|
+#endif
|
|
259
|
264
|
}
|
|
260
|
265
|
|
|
261
|
266
|
|
| ... |
... |
@@ -277,7 +282,7 @@ EvdevNextInQueue(InputInfoPtr pInfo) |
|
277
|
282
|
void
|
|
278
|
283
|
EvdevQueueKbdEvent(InputInfoPtr pInfo, struct input_event *ev, int value)
|
|
279
|
284
|
{
|
|
280
|
|
- int code = ev->code + MIN_KEYCODE;
|
|
|
285
|
+ int code = ev->code;
|
|
281
|
286
|
EventQueuePtr pQueue;
|
|
282
|
287
|
|
|
283
|
288
|
/* Filter all repeated events from device.
|
| ... |
... |
@@ -285,10 +290,18 @@ EvdevQueueKbdEvent(InputInfoPtr pInfo, struct input_event *ev, int value) |
|
285
|
290
|
if (value == 2)
|
|
286
|
291
|
return;
|
|
287
|
292
|
|
|
|
293
|
+ /* keycodes > 256 that have a historical mapping in xkeyboard-config */
|
|
|
294
|
+ switch (code) {
|
|
|
295
|
+ case KEY_TOUCHPAD_TOGGLE: code = KEY_F21; break;
|
|
|
296
|
+ case KEY_TOUCHPAD_ON: code = KEY_F22; break;
|
|
|
297
|
+ case KEY_TOUCHPAD_OFF: code = KEY_F23; break;
|
|
|
298
|
+ case KEY_MICMUTE: code = KEY_F20; break;
|
|
|
299
|
+ }
|
|
|
300
|
+
|
|
288
|
301
|
if ((pQueue = EvdevNextInQueue(pInfo)))
|
|
289
|
302
|
{
|
|
290
|
303
|
pQueue->type = EV_QUEUE_KEY;
|
|
291
|
|
- pQueue->detail.key = code;
|
|
|
304
|
+ pQueue->detail.key = code + MIN_KEYCODE;
|
|
292
|
305
|
pQueue->val = value;
|
|
293
|
306
|
}
|
|
294
|
307
|
}
|
| ... |
... |
@@ -1072,11 +1085,13 @@ EvdevReadInput(InputInfoPtr pInfo) |
|
1072
|
1085
|
do {
|
|
1073
|
1086
|
rc = libevdev_next_event(pEvdev->dev, LIBEVDEV_READ_FLAG_NORMAL, &ev);
|
|
1074
|
1087
|
if (rc < 0) {
|
|
1075
|
|
- if (rc == -ENODEV) /* May happen after resume */
|
|
|
1088
|
+ if (rc != -EAGAIN && rc != -EINTR && rc != -EWOULDBLOCK) {
|
|
|
1089
|
+ /* May happen after resume or at device detach */
|
|
1076
|
1090
|
xf86RemoveEnabledDevice(pInfo);
|
|
1077
|
|
- else if (rc != -EAGAIN)
|
|
|
1091
|
+ EvdevCloseDevice(pInfo);
|
|
1078
|
1092
|
LogMessageVerbSigSafe(X_ERROR, 0, "%s: Read error: %s\n", pInfo->name,
|
|
1079
|
1093
|
strerror(-rc));
|
|
|
1094
|
+ }
|
|
1080
|
1095
|
break;
|
|
1081
|
1096
|
} else if (rc == LIBEVDEV_READ_STATUS_SUCCESS) {
|
|
1082
|
1097
|
if (pEvdev->mtdev)
|
| ... |
... |
@@ -1110,8 +1125,8 @@ EvdevKbdCtrl(DeviceIntPtr device, KeybdCtrl *ctrl) |
|
1110
|
1125
|
{ CAPSFLAG, LED_CAPSL },
|
|
1111
|
1126
|
{ NUMFLAG, LED_NUML },
|
|
1112
|
1127
|
{ SCROLLFLAG, LED_SCROLLL },
|
|
1113
|
|
- { MODEFLAG, LED_KANA },
|
|
1114
|
|
- { COMPOSEFLAG, LED_COMPOSE }
|
|
|
1128
|
+ { COMPOSEFLAG, LED_COMPOSE },
|
|
|
1129
|
+ { MODEFLAG, LED_KANA }
|
|
1115
|
1130
|
};
|
|
1116
|
1131
|
|
|
1117
|
1132
|
InputInfoPtr pInfo;
|
| ... |
... |
@@ -1486,10 +1501,8 @@ EvdevAddAbsValuatorClass(DeviceIntPtr device, int num_scroll_axes) |
|
1486
|
1501
|
continue;
|
|
1487
|
1502
|
|
|
1488
|
1503
|
abs = libevdev_get_abs_info(pEvdev->dev, axis);
|
|
1489
|
|
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 30)
|
|
1490
|
1504
|
/* Kernel provides units/mm, X wants units/m */
|
|
1491
|
1505
|
resolution = abs->resolution * 1000;
|
|
1492
|
|
-#endif
|
|
1493
|
1506
|
|
|
1494
|
1507
|
xf86InitValuatorAxisStruct(device, axnum,
|
|
1495
|
1508
|
atoms[axnum],
|
| ... |
... |
@@ -1933,7 +1946,7 @@ EvdevInit(DeviceIntPtr device) |
|
1933
|
1946
|
* So, unless you have a small screen, you won't be enjoying it much;
|
|
1934
|
1947
|
* consequently, absolute axes are generally ignored.
|
|
1935
|
1948
|
*
|
|
1936
|
|
- * However, currenly only a device with absolute axes can be registered
|
|
|
1949
|
+ * However, currently only a device with absolute axes can be registered
|
|
1937
|
1950
|
* as a touch{pad,screen}. Thus, given such a device, absolute axes are
|
|
1938
|
1951
|
* used and relative axes are ignored.
|
|
1939
|
1952
|
*/
|
src/evdev.h
| ... |
... |
@@ -36,7 +36,14 @@ |
|
36
|
36
|
#define EVDEV_H
|
|
37
|
37
|
|
|
38
|
38
|
#include <linux/input.h>
|
|
39
|
|
-#include <linux/types.h>
|
|
|
39
|
+#include <sys/types.h>
|
|
|
40
|
+
|
|
|
41
|
+/* Tolerate prior #include <linux/input.h> */
|
|
|
42
|
+#undef BUS_NONE
|
|
|
43
|
+#undef BUS_PCI
|
|
|
44
|
+#undef BUS_SBUS
|
|
|
45
|
+#undef BUS_PLATFORM
|
|
|
46
|
+#undef BUS_USB
|
|
40
|
47
|
|
|
41
|
48
|
#include <xorg-server.h>
|
|
42
|
49
|
#include <xf86Xinput.h>
|
|