xserver-xorg-input-evdev: Changes to 'ubuntu'
New branch 'ubuntu' available with the following commits:
commit 4e18c7d609be15cfb52fa456ea2dac980a35d967
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Wed Oct 8 12:01:27 2008 +0300
fix x11proto-input-dev build-dep
commit b5627ecff2d3ffe8af687761615ed673636c7c0e
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Wed Oct 8 11:58:44 2008 +0300
Bump the build-dep on xserver-xorg-dev and x11proto-input-dev.
commit 24ac9ef94c58d7034d75e92560a9b12c24fd319b
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Wed Oct 8 11:54:48 2008 +0300
Update the changelog
include the previous upload too.
commit 9bb4b9e9d96b8aec3321d1c6cbf4d89e9401fbc7
Merge: bd2767f778973459be4774ae1946ba75a75e6d73 84a0e39c0dd8bcc80d4f6912562260c1771f311f
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Wed Oct 8 11:52:23 2008 +0300
Merge commit '84a0e39' into ubuntu
commit bd2767f778973459be4774ae1946ba75a75e6d73
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu Oct 2 10:56:04 2008 +0930
Close fd on DEVICE_OFF. (LP #276887)
Leaving the fd open means we still get keyboard events after VT switching
away. Coming back, some of these events are replayed on the application that
has the current focus.
Reproduceable:
1. open terminal, focus.
2. VT switch away
3. type something, preferably a password
4. VT switch back, trigger a mouse event
5. Observe the X server guessing your password.
Closing the fd on DEVICE_OFF fixes this. Reopen is handled by the reopen
code introduced with
commit 9930477cbeb4acfd070ae70894d13ffabfc347b8
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Tue Aug 26 14:33:40 2008 +0930
Attempt to re-open devices on read errors.
Launchpad Bug 276887
<https://bugs.edge.launchpad.net/ubuntu/+source/xorg-server/+bug/276887>
commit 165d452aff8d2f99dbad053e7915a3293e3bd4dd
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Wed Oct 8 11:45:27 2008 +0300
Don't check for *.patch in .gitignore
commit 84a0e39c0dd8bcc80d4f6912562260c1771f311f
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu Sep 18 16:44:27 2008 +0930
Use new property API (no ConfigureDP, less args to ChangeDP)
Return appropriate status codes from property handlers.
Make properties non-deletable.
commit 73869372212f7afc18e02184f347bcd94ce19d04
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu Sep 18 16:47:35 2008 +0930
draglock: Shut up compiler warning.
commit fcf8375f2b960993686bd08fd4d0e2d8623b4680
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Sep 26 12:53:29 2008 +0930
Don't require randrproto.
commit a99ecbb0cc21b0a232024d6de9c842716b382ae2
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Fri Sep 12 16:15:28 2008 +0300
Update changelog for release.
commit fafc5d32d196a0fde9715734ee48176b871f487e
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Fri Sep 12 16:08:35 2008 +0300
100_dont_check_abi.patch:
Don't check for XINPUT_VERSION >= 3, since the ubuntu xserver & libXi
has those bits backported.
commit d98e09a5716de6ad5c72ae350167fd583472cfb2
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Fri Sep 12 15:47:41 2008 +0300
Update the changelogs.
re-add upstream changelog, generated by running
'git-log upstream/master > ChangeLog'
commit 63547be5d4564829276804c609a840f567c59a36
Merge: 872677edb4ba316813eb4761e35e737da937f4c7 9930477cbeb4acfd070ae70894d13ffabfc347b8
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Fri Sep 12 15:01:41 2008 +0300
Merge commit 'upstream/master' into ubuntu
Conflicts:
ChangeLog
configure.ac
src/evdev.c
commit 872677edb4ba316813eb4761e35e737da937f4c7
Merge: dc6e3f863baf79025ee0e4cb206a237a7257391e dd74edd87a5f7925b2dc19b44b60c8f5aea68b5d
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Fri Sep 12 14:56:04 2008 +0300
Merge branch 'debian-experimental' into ubuntu
Conflicts:
debian/changelog
commit dc6e3f863baf79025ee0e4cb206a237a7257391e
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Tue Sep 9 18:37:14 2008 +0300
Change the maintainer address.
commit 345e5da2c58c181fc2b751646e520a987da4e8d2
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Tue Sep 9 18:36:18 2008 +0300
Pull 36d702006d, "Force rules, not model, to be evdev".
commit 2b9d02ee08b5bf875487eea2c8ff3547e1a89c51
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Aug 16 15:33:23 2008 +0300
Force rules, not model, to be evdev
xkeyboard-config recently changed to a separate ruleset for the evdev
driver, so match that by only forcing the ruleset, not the model, to be
evdev.
commit 9930477cbeb4acfd070ae70894d13ffabfc347b8
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Tue Aug 26 14:33:40 2008 +0930
Attempt to re-open devices on read errors.
Coming back from resume may leave us with a file descriptor that can be opened
but fails on the first read (ENODEV).
In this case, try to open the device until it becomes available or until the
predefined count expires. To be safe, we cache the information from the device
and compare against it when we re-open. This way we ensure that if the
topology changes under us, we don't open a completely different device. If a
device has changed, we disable it.
Adds option "ReopenAttempts" <int>
commit 4509ec1daf8a03b261c1fa8aa48b5def3f336aed
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu Sep 4 18:22:56 2008 +0930
Use HAVE_PROPERTIES define instead of GET_ABI_MAJOR for property compilation.
commit a205dfc091e6d7c67e3fa1421fe8a43f5ed40b00
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Aug 22 14:07:17 2008 +0930
Shut up "unused variable" compiler warnings.
Hide properties behind ifdefs, fake use of "val".
commit 184206e7174dc08239d6a78a1ca912176e3f6229
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Mon Aug 25 17:24:15 2008 +0930
Wheel emulation: initial values must be char.
parsing int* to char* in XIChangeDeviceProperty means we lose values.
commit 79ff677c52d38f67144f09bd534aaef862946a5e
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Aug 22 09:00:13 2008 +0930
Init all emulateWheel values, even if EmulateWheel is disabled.
Even if we don't want EmulateWheel, we can at least init everything to usable
values. This way we only need to toggle "enabled", rather than initialising
the whole lot before usage.
commit 37e3addf89923bfc1e7ae23b678614f4ca926dcf
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Wed Aug 20 18:16:41 2008 -0700
Add wheel timeout property support
Copied from the wheel inertia property support.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit e237de0dea9fe24e1c4efc78523bfdd86ed73876
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Wed Aug 20 18:16:40 2008 -0700
Add timeout support for mouse wheel emulation
Support the EmulateWheelTimeout option as the mouse driver does.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 92c6611b6f4495103fccea38dcafc6c6bf18049a
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Mon Aug 18 12:13:15 2008 +0930
Add property support for drag lock.
commit bd405ddc83b9ad1ceed47f572245fccae598e6bb
Author: Chris Salch <emeraldd.chris@gmail.com>
Date: Sun Aug 17 12:31:23 2008 -0500
Adding in DragLockButtons functionality.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 36d702006d5aace50083ca52b7065d465b497077
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Aug 16 15:33:23 2008 +0300
Force rules, not model, to be evdev
xkeyboard-config recently changed to a separate ruleset for the evdev
driver, so match that by only forcing the ruleset, not the model, to be
evdev.
commit 6dc41991557fa55a9e2f5aaf0fe40c70a08d41fd
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Fri Aug 15 09:23:02 2008 +0930
Revert "Don't grab devices unless specified through the config options."
Not such a good idea, CTRL+C terminates the server and other issues. Reverting
for now until a better solution is found, at least this way the driver is
usable.
See also: http://lists.freedesktop.org/archives/xorg/2008-August/038032.html
This reverts commit e8534d47c8524ac081c2e3e6ebaabe4c6b274a18.
commit e8534d47c8524ac081c2e3e6ebaabe4c6b274a18
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu Aug 14 13:38:50 2008 +0930
Don't grab devices unless specified through the config options.
Grabbing event devices stops in-kernel event forwarding, most notably rfkill
and the "Macintosh mouse button emulation" device. Let's not do that.
Option "GrabDevice" forces grabbing the device.
commit 555f5a7cbf3c980c436c205e9b23a78f3e19bdfe
Author: Chris Salch <chrissalch@letu.edu>
Date: Fri Aug 8 15:56:27 2008 +0930
Filter wheel events before middle mouse button emulation.
The Emulate3Button needs to be the last filter function, otherwise the timeout
code causes it to hijack button presses for the first 3 buttons.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
commit 134829d911c698704595014ba402516ae9a2f36c
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu Aug 7 17:34:54 2008 +0930
Simplify the property handler registration.
Instead of having separate handlers for each property, just handle all of them
in one handler for emuMB, and one handler for emuWheel.
commit 4e121b297ee0a9b179f8188926564fb8b2c3f6c8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Aug 7 16:57:06 2008 +0930
Add EVDEV_MAXBUTTONS instead of checking against 32.
Numbers are so lame, defines are all the rage now I've heard.
commit 9793de81373bb78b9ddbb2487e0af5d2ddd0b246
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Aug 7 16:53:51 2008 +0930
Expose wheel emulation through device properties.
Don't enable wheel emulation with 0 inertia - bad things happen.
commit a9d72b40fbe178fa4fbb9d0e7c02dc6c5250969a
Author: Chris Salch <emeraldd.chris@gmail.com>
Date: Wed Aug 6 22:08:13 2008 -0500
Adding mouse wheel emulation code.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c1f7f8c3d22ecae7839f82ea8b584069f54f1f5e
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Aug 7 09:21:26 2008 +0930
Print a warning if a keycode exceeds the range accepted by the server.
Keycodes over 255 are silently ignored in the server. The least we can do is
put a warning in the logs.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 40e1474d84c09d93197ac5db34a88e654386e68f
Author: Chris Salch <emeraldd.chris@gmail.com>
Date: Mon Aug 4 20:19:47 2008 -0500
Adding a function to map button events to button numbers.
Remove code duplication, let the mapping function hand us the actual button
event to be passed up to the server.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit d9097df01b01afaf946fa04fca8ae8ab7108ff21
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Aug 4 09:16:53 2008 +0930
Actually close the fd on DEVICE_CLOSE (bug#16948)
Fixes file descriptor leak.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 5c074af5a9abba138023e3bc6954d1062f7c36dd
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Jul 30 10:40:47 2008 +0200
Print the device name when we get a read error
commit 72551662a09eedf696508aaacf6aa02c0254e4de
Author: Michel Dänzer <michel@tungstengraphics.com>
Date: Tue Jul 29 10:06:07 2008 +0200
xf86-input-evdev: Fix EVIOCGBIT ioctl usage on big endian platforms.
With this fix, on my PowerBook HAL hotplugging correctly detects my USB mouse,
and no longer thinks keyboards have random numbers of mouse buttons. :)
The LONG_BITS and NBITS macro definitions are stolen from xf86-input-synaptics.
Signed-off-by: Michel Dänzer <michel@tungstengraphics.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 53e7525744cd7c47707c7339f0b771f59f99b97c
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 21 18:15:35 2008 +0930
Add support for ButtonMapping option.
commit 5d13259a5ddab31dbb2158975c8ccbb1f3c99046
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jul 21 13:10:06 2008 +0930
Guard property changes against ABI_XINPUT < 3.
commit 2b7edaa4ab88e192d7285d39b4834d1e535b94d0
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jul 20 11:33:37 2008 +0200
Fill up the version info
Report correct versions instead of
"compiled for 0.0.0, module version = 1.0.0"
commit bf0d81011e19a8bb5bbd80c6b496c8ae257b4f2c
Author: Peter Hutterer <whot@possum.(none)>
Date: Mon Jul 14 13:06:32 2008 +0930
Don't enable the device if the grab failed with ENODEV.
After suspend/resume, sometimes the device doesn't come back up on the same
node. Since we do not call PreInit for the device (which would detect this
situation), we continue to try to read a nonexisting file, spamming the log
file with "Read Error".
commit ef4bb69c1a64e784fef1c758ee439372ba329b0a
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 10 19:32:22 2008 +0930
Add .gitignore file.
commit d1818ef2066d7e526e0f64fffd41e06061ceb017
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Jul 8 16:37:42 2008 +0930
Add support for device properties, currently MB emulation and timeout.
commit a9223edcd869288cf6e90f2214e607db510c7027
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 10 16:55:21 2008 +0930
Clean out configure.ac
We're not building with or without XInput. Same with xkb.
commit ec23c6b2f550f2679226da907c1d022295d453f1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 3 15:01:32 2008 +0930
Remove static ChangeLog, autogenerate as part of make dist.
Hook taken from xserver's Makefile.am
commit 18d70d796fe68116907d86fc27ed77528a51ff1d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 3 14:50:45 2008 +0930
Update COPYING with the correct copyright info.
Fix up licence of emuMB.c, was using Red Hat instead of "The authors", but
this code wasn't contributed by RH anyway.
commit 37b854cb643fa9c5087eccdd1b6ba940d5413bf9
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 3 14:45:41 2008 +0930
Remove stale comments.
Ctrl+Alt+Backspace works, I'm using it daily.
CapsLock doesn't repeat, otherwise we wouldn't have Bug 16318.
commit 8c06093191761f9bd2f3c5eb0b57d7b9feca70bc
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jul 3 14:44:52 2008 +0930
Remove EvdevConvert, nobody calls it now anyway.
Conversion is now done in the DIX.
commit 0830676a0ce3618eae9cf4c072998c16e164c687
Author: Ander Conselvan de Oliveira <ander@mandriva.com.br>
Date: Thu Jun 26 14:36:58 2008 -0300
Mice with a lot of buttons (e.g. Logitech MX1000) generate button events greater than BTN_TASK.
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
commit 1cf7b8f7ee224d823d94ea65458f5269a1a77d2e
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sat Jun 28 17:50:26 2008 +0930
Count buttons at probe and print to log.
We don't really do anything with the number other than print it since I'm sure
that half the mice don't report the correct number anyway (especially with the
wheel button mapping). But having a bit more debug info is good.
commit 826e6e7dd408659af9a1751ed16e437db8c8dc34
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sun Jun 22 17:52:40 2008 +0930
Bump to 2.0.99.
commit 5a0ea39b79b27b7c3117661a21e7ab5eba3c9b24
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Sat Jun 21 16:42:12 2008 +0930
No need to finalize MB emulation after EvdevProbe anymore.
Follow-up to 76800bfa75807e49398380b902f6c0f547cd4c0e.
commit 373e13ae353d1e0022f8821adc528ebc5411d47d
Author: Simon Munton <simon@munton.demon.co.uk>
Date: Sat Jun 21 10:19:07 2008 +0930
Close file descriptor if EvdevProbe fails.
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
commit 76800bfa75807e49398380b902f6c0f547cd4c0e
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jun 20 18:20:55 2008 -0700
Enable middle button emulation at DEVICE_ON instead of DEVICE_INIT.
This ensures that the middle button emulation is re-enabled after VT switch,
otherwise the block handler that deals with the timeouts would not get
re-registered.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reply to: