summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2011-10-27We support XI 2.1 nowHEADmasterPeter Hutterer1-0/+5
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Julien Cristau <jcristau@debian.org>
2011-10-27list: drop XIQueryVersion callPeter Hutterer1-9/+0
main() calls it for us before we get here, no need to have it twice. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Julien Cristau <jcristau@debian.org>
2011-09-23Merge branch 'smooth-scrolling'Peter Hutterer3-2/+38
Conflicts: src/test_xi2.c
2011-09-23Support the new Scroll classPeter Hutterer3-1/+39
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Daniel Stone <daniel@fooishbar.org>
2011-08-25Only try to print XIPointerEmulated flag if it is defined.Peter Hutterer1-0/+2
This flag is part of the future (currently unreleased) XI 2.1 protocol. Introduced in 2c5187d0099e6c7588828ba9931d27f5c64bbaec Reported-by: Chris Ball <cjb@laptop.org> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-08-19Enclose button labels with quotes to improve readabilityPeter Hutterer1-1/+4
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Julien Cristau <jcristau@debian.org>
2011-08-19test-xi2: support a device optionPeter Hutterer2-6/+13
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Julien Cristau <jcristau@debian.org>
2011-08-19Print the class type when listing devices.Peter Hutterer1-1/+4
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Julien Cristau <jcristau@debian.org>
2011-08-19test-xi2: print the correct flags, depending on the event typePeter Hutterer1-1/+11
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Julien Cristau <jcristau@debian.org>
2011-08-12list: don't use defines for checking server version.Peter Hutterer1-3/+3
Otherwise we run into the old problem again: recompiling xinput against newer inputproto headers will appear to change the version support, potentially causing errors or other misbehaviours. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-07-18Add support for device-to-screen mappingPeter Hutterer6-3/+280
xinput map-to-crtc "device name" "VGA0" will map to the CRTC "VGA0" by manipulating the transformation matrix accordingly. And because the NVIDIA binary driver still exists, Xinerama is supported to. Maybe in another 5 years, they'll catch up. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Simon Thum <simon.thum@gmx.de>
2011-07-07man: Move my name to the top of the authors listPeter Hutterer1-1/+1
It's reasonably likely that someone looking at the list of authors will email the first one on the list. Let that be the current maintainer, it's more likely that there will be the desired response. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Cyril Brulebois <kibi@debian.org>
2011-07-07man: update missing copyrightsPeter Hutterer1-0/+4
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Cyril Brulebois <kibi@debian.org>
2011-06-21Update Copyright notices.Gaetan Nadon7-128/+115
Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-06-21Apply standard configuration init, layout and commentsGaetan Nadon1-6/+8
http://www.x.org/wiki/NewModuleGuidelines#Configurationfilescontentguidelines Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-06-20Remove redundant definition of the VERSION Automake variableGaetan Nadon1-2/+0
This variable is defined by Automake: In config.status: S["VERSION"]="1.5.3" In config.h: Reverts commit \58c513b0b9f6 Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-06-20Man pages Makefile: fix whitespaceGaetan Nadon1-3/+3
Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-06-20Use the value of MAN_SUBSTS from util-macros for man pagesGaetan Nadon1-19/+1
Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-06-03Remove superfluous comment.Peter Hutterer1-2/+1
We can't remove this part if we want to keep working against 1.7 and 1.8.1. No big deal, if this operation in xinput is the performance-critical path of a system, things have gone bad a long time ago. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Acked-by: Julien Cristau <jcristau@debian.org>
2011-06-03Announce support for XI 2.0 to the server.Peter Hutterer1-0/+10
Technically, we're required to announce support for XI 2.0 through XIQueryVersion. The behaviour of XI2 for clients that have not done so is undefined, it just happens to work. With XI 2.1 on the horizon, this may change so make sure we're clamining our version correctly Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Julien Cristau <jcristau@debian.org>
2011-05-05Initialize a few more values to defaults.Peter Hutterer1-2/+3
If we ever print <undefined> for those, we have a buggy X server that's breaking the protocol. Until that happens this is just to shut up clang. All three are assigned constant strings only, no free() needed. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-05-05Silence compiler warningPeter Hutterer1-1/+1
Static analysis claims that ptr += size may assign garbage. But since the protocol requires format to be 8, 16 or 32, size should always have a valid value. Initialize to 0 to shut up clang. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-03-04man: replace hard coded section number with __appmansuffix__Gaetan Nadon1-2/+2
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-01-20Fix broken "xinput list <devicename>".Peter Hutterer1-3/+9
Default behaviour for --list is to list --short if no device is given and --long if a device is given. Restore this behaviour. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Dirk Wallenstein <halsmit@t-online.de> Tested-by: Dirk Wallenstein <halsmit@t-online.de>
2011-01-20Add --id-only flag for 'xinput list'.Peter Hutterer3-3/+17
The default output of xinput list is hard to parse by scripts. Provide a --id-only option to print the device ID only, without any other information. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Dirk Wallenstein <halsmit@t-online.de> Tested-by: Dirk Wallenstein <halsmit@t-online.de>
2011-01-20Add --name-only flag for 'xinput list'.Peter Hutterer3-8/+30
The default output of xinput list is hard to parse by scripts. Provide a --name-only option to print the device name only, without any other information. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Dirk Wallenstein <halsmit@t-online.de> Tested-by: Dirk Wallenstein <halsmit@t-online.de>
2011-01-20Switch list to use an enum of printing formats.Peter Hutterer1-17/+31
Currently long and short, same as before. No functional changes, preparation for further formats. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Dirk Wallenstein <halsmit@t-online.de> Tested-by: Dirk Wallenstein <halsmit@t-online.de>
2011-01-12config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERSGaetan Nadon1-1/+1
This silences an Autoconf warning
2011-01-12config: remove unrequired AC_SUBST([*_LIBS])Gaetan Nadon1-1/+0
This macro is called by PKG_CHECK_MODULES Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-01-12config: remove unrequired AC_SUBST([*_CFLAGS])Gaetan Nadon1-1/+0
This macro is called by PKG_CHECK_MODULES Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-01-12config: remove AC_PROG_CC as it overrides AC_PROG_C_C99Gaetan Nadon1-1/+0
XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls AC_PROG_C_C99. This sets gcc with -std=gnu99. If AC_PROG_CC macro is called afterwards, it resets CC to gcc. Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-01-12config: use AC_PROG_INSTALL now supplied by XORG_DEFAULT_OPTIONSGaetan Nadon1-1/+0
It depends on util-macros 1.8 or later The existing statement can now be removed from the configuration file. Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-01-12config: use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONSGaetan Nadon1-1/+0
It depends on util-macros 1.8 or later The existing statement can now be removed from the configuration file. Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-01-12config: upgrade to util-macros 1.8 for additional man page supportGaetan Nadon1-3/+3
Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS The value of MAN_SUBST is the same for all X.Org packages. Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-01-12config: update AC_PREREQ statement to 2.60Gaetan Nadon1-1/+1
Unrelated to the previous patches, the new value simply reflects the reality that the minimum level for autoconf to configure all x.org modules in one pass is 2.60 dated June 2006. A version later than 2.60 can be used, but no new features from such a later version can be used in configure.ac. Although the code in this module can be configured with a version earlier than 2.60, most of code is now contained in macros from util-macros which use features of version 2.60, at the present or in the future. ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-12-29Remove unneeded include.Peter Hutterer1-1/+0
This include was added during the MPX/XI2 development cycle, likely when the headers weren't in an acceptable state and clients needed stuff defined in the proto headers. Normal clients shouldn't need the proto headers though and xinput builds fine without it. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Daniel Stone <daniel@fooishbar.org>
2010-12-01Fix typo in man page for the --test-xi2 option.David Fries1-1/+1
Signed-off-by: David Fries <david@fries.net> Signed-off-by: Philip Langdale <philipl@overt.org>
2010-11-18Zero out entire mask when selecting for different eventsChase Douglas1-2/+2
Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-11-17Print XI2 device event child window in hex tooChase Douglas1-1/+1
This fixes an obvious error in the current print formatting. Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-11-11xinput 1.5.3xinput-1.5.3Peter Hutterer1-1/+1
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-10-12Print an error if mode is neither ABSOLUTE nor RELATIVE.Peter Hutterer1-1/+4
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Julien Cristau <jcristau@debian.org>
2010-07-02xinput: Split XI2 valuators and print index of eventsChase Douglas1-3/+2
XI2 events support bitmask selected valuators. When printing masked events, we need to also print the index of the valuator value. This change prints each valuator on its own line, prefixed by its index Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-06-09list: only check the last bit in the device mode.Peter Hutterer1-0/+4
This works around a bug in X servers 1.7.x, 1.8.0 and 1.8.1 where the device mode could sometimes be binary OR'd with the OutOfProximity flag. The result was a value of 0b10 for relative and 0b11 for Absolute, both of which were interpreted as relative by this code. Affected is only the XIQueryDevice call, not the XListInputDevices call. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-06-04xinput 1.5.2xinput-1.5.2Peter Hutterer1-1/+1
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-05-18Atoms from XIGetProperty are 32bits (#27657)Kees Cook1-3/+3
A 32bit value must be dereferenced to correctly zero-extend an Atom from XIGetProperty. On 64bit systems, Atom is 64bits, so the final Atom in a list will read garbage in the upper half of the Atom. X.Org Bug 27657 <http://bugs.freedesktop.org/show_bug.cgi?id=27657> Signed-off-by: Kees Cook <kees.cook@canonical.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-05-14Support pointer: and keyboard: prefices for XI2 device namesWill Thompson1-5/+35
I have a keyboard which is also a mouse, and shows up as two devices with the same name. This patch allows me to reliably refer to the pointer device. Signed-off-by: Will Thompson <will.thompson@collabora.co.uk> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-05-14Warn and fail if a device name is ambiguous.Will Thompson1-3/+12
The XI1 path bails out if the user specifies a device by name and there is more than one device, but the XI2 path previously just silently chose the first one. This patch makes it fail outright. Signed-off-by: Will Thompson <will.thompson@collabora.co.uk> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-04-29test-xi2: Print out the sourceid for enter/leave events.Peter Hutterer1-1/+1
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-04-07man: use automake silent rulesYaakov Selkowitz1-1/+1
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> Reviewed-by: RĂ©mi Cardona <remi@gentoo.org> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-04-07man: Use AC_PROG_SED to find sedYaakov Selkowitz2-3/+2
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> Reviewed-by: Dan Nicholson <dbn.lists@gmail.com> Acked-by: Gaetan Nadon <memsize@videotron.ca> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>