qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to inputproto 2.3.1

Browse Source
This commit is contained in:
matthieu 2014-09-28 17:26:36 +00:00
parent 6d1b4b2eb2
commit 2b97fe831d
5 changed files with 95 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
proto/inputproto/ChangeLog
View File

@ -1,3 +1,72 @@
commit 343ff0938f592876b9d82c966f166bf45a78c3c8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri May 30 11:25:39 2014 +1000
inputproto 2.3.1
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit c2cf8cab4aa781306ff26b171107d26f12bac015
Author: Daniel Martin <consume.noise@gmail.com>
Date: Thu May 29 12:24:46 2014 +0200
XI2: Fix XI_TouchOwnershipChangedMask value
A none existing define
XI_TouchOwnershipChanged
had been used to set the value of XI_TouchOwnershipChangedMask. Fix this
by using
XI_TouchOwnership.
Signed-off-by: Daniel Martin <consume.noise@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit b4184619702b6801e3a2ea9733ae1620fa4ceda7
Author: Keith Packard <keithp@keithp.com>
Date: Mon Dec 16 09:43:41 2013 -0800
inputproto: Allow library users to avoid having the 'Pointer' typedef declared
'Pointer' collides with too many other application names, so stop
using it locally and allow applications to avoid having it in the API.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
commit 3c1ebd1cfe71029ebc6a732a6b55308861e549e0
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Aug 14 19:30:24 2013 +1000
specs: note that axis values are non-sparse arrays
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
commit 06da19e15c9d3a9e57f4fe89fe507a4fa7160a45
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jul 19 15:54:45 2013 +1000
specs: clarify SD keyboard focus behaviour
The smart thing would be to have the SD's keyboard focus to be identical to
the MD's keyboard focus (and a BadDevice returned when trying to set an
attached SD's keyboard focus) but alas, the server never implemented this
behaviour and we've now shipped 7 versions with separate SD and MD focus. So
consider this set in stone. oops.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net>
commit 65f14b2edaf70a2520e0180609f79f52836ca4f9
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Oct 26 09:42:05 2013 -0400
config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES
Fix Automake warning: AC_OUTPUT should be used without arguments.
www.gnu.org/software/autoconf/manual/autoconf.html#Configuration-Files
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit f33a329026c9f2eaa5fa436543e4feb0e54b685d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Mar 7 10:42:39 2013 +1000

2
proto/inputproto/XI2.h
View File

@ -234,7 +234,7 @@
#define XI_RawMotionMask (1 << XI_RawMotion)
#define XI_TouchBeginMask (1 << XI_TouchBegin)
#define XI_TouchEndMask (1 << XI_TouchEnd)
#define XI_TouchOwnershipChangedMask (1 << XI_TouchOwnershipChanged)
#define XI_TouchOwnershipChangedMask (1 << XI_TouchOwnership)
#define XI_TouchUpdateMask (1 << XI_TouchUpdate)
#define XI_RawTouchBeginMask (1 << XI_RawTouchBegin)
#define XI_RawTouchEndMask (1 << XI_RawTouchEnd)

6
proto/inputproto/XIproto.h
View File

@ -85,12 +85,14 @@ typedef struct _XExtEventInfo
BYTE word;
} XExtEventInfo;
typedef unsigned char *Pointer;
#ifndef _XITYPEDEF_POINTER
typedef void *Pointer;
#endif
struct tmask
{
Mask mask;
Pointer dev;
void *dev;
};
/*********************************************************

5
proto/inputproto/configure.ac
View File

@ -1,5 +1,5 @@
AC_PREREQ([2.60])
AC_INIT([InputProto], [2.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AC_INIT([InputProto], [2.3.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
# Require xorg-macros: XORG_WITH_ASCIIDOC
@ -10,6 +10,7 @@ XORG_DEFAULT_OPTIONS
XORG_ENABLE_SPECS
XORG_WITH_ASCIIDOC(8.4.5)
AC_OUTPUT([Makefile
AC_CONFIG_FILES([Makefile
specs/Makefile
inputproto.pc])
AC_OUTPUT

21
proto/inputproto/specs/XI2proto.txt
View File

@ -212,6 +212,8 @@ If an event is generated by an SD
- if the SD is attached to a master pointer, it changes the position and/or
button state of the master pointer.
- if the SD has a keyboard focus other than None, the key event is sent to
the focus window.
- if the SD is attached to a master keyboard, it sends events to this
keyboard's focus window (if applicable) and/or changes the modifier state of
this keyboard.
@ -220,6 +222,13 @@ If an event is generated by an SD
Both the sprite and the focus must be managed explicitly by the client
program.
Note: the keyboard focus of an attached slave device is independent to that
of the master device. Two keyboard events are generated, once with deviceid
and sourceid set to the slave device. This keyboard event is sent to the
slave device's focus window. The second event has a deviceid of the master
and a sourceid of the slave device. This second event is delivered to the
master keyboard's focus window.
[[hierarchy-dcce]]
Event processing for attached slave devices
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -2281,7 +2290,9 @@ XI 2.2: The event type may also be TouchBegin, TouchUpdate, or TouchEnd.
valuators
Bitmask of valuators provided in axisvalues.
axisvalues
Valuator data in device-native resolution.
Valuator data in device-native resolution. This is a non-sparse
array, value N represents the axis corresponding to the Nth bit set
in valuators.
flags
Miscellaneous information about this event; the union of the
common flag set and either the key or pointer flag set,
@ -2392,9 +2403,13 @@ when the device is grabbed by another client.
valuators
Bitmask of valuators provided in axisvalues and axisvalues_raw.
axisvalues
Valuator data in device-native resolution.
Valuator data in device-native resolution. This is a non-sparse
array, value N represents the axis corresponding to the Nth bit set
in valuators.
axisvalues_raw
Untransformed valuator data in device-native resolution.
Untransformed valuator data in device-native resolution. This is a
non-sparse array, value N represents the axis corresponding to the
Nth bit set in valuators.
¹ since XI 2.2