XI2.h | 2 +- XI2proto.h | 1 + XIproto.txt | 30 ++++++++++-------------------- configure.ac | 2 +- 4 files changed, 13 insertions(+), 22 deletions(-)
New commits: commit 84479bf87230905cd26d8395577058950230c103 Author: Peter Hutterer <[email protected]> Date: Tue Jun 7 14:16:17 2011 +1000 inputproto 2.0.2 Signed-off-by: Peter Hutterer <[email protected]> diff --git a/configure.ac b/configure.ac index 39e4df9..4911217 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.60]) -AC_INIT([InputProto], [2.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([InputProto], [2.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE commit 3686697eb5a330deb222b5e95843f23037ca3faf Author: Alexandre Julliard <[email protected]> Date: Tue Apr 12 22:39:25 2011 +0200 XI2.h: Fix off-by-one error in the XIMaskLen definition. The previous definition would give the wrong result for events that are a multiple of 8. Signed-off-by: Alexandre Julliard <[email protected]> Signed-off-by: Peter Hutterer <[email protected]> (cherry picked from commit b1149ab782619eaeadf70affd94239184e082d03) diff --git a/XI2.h b/XI2.h index 6ba1377..3c39946 100644 --- a/XI2.h +++ b/XI2.h @@ -127,7 +127,7 @@ #define XISetMask(ptr, event) (((unsigned char*)(ptr))[(event)>>3] |= (1 << ((event) & 7))) #define XIClearMask(ptr, event) (((unsigned char*)(ptr))[(event)>>3] &= ~(1 << ((event) & 7))) #define XIMaskIsSet(ptr, event) (((unsigned char*)(ptr))[(event)>>3] & (1 << ((event) & 7))) -#define XIMaskLen(event) (((event + 7) >> 3)) +#define XIMaskLen(event) (((event) >> 3) + 1) /* Fake device ID's for event selection */ #define XIAllDevices 0 commit a4cab7946409613e27fbad195c861224ad0e0b10 Author: Fernando Carrijo <[email protected]> Date: Thu Jan 27 22:40:11 2011 -0200 Fix typos in XIproto.txt Signed-off-by: Fernando Carrijo <[email protected]> Signed-off-by: Peter Hutterer <[email protected]> (cherry picked from commit 13baef91f071ee1607f4c3bf6c1fea60e6651b89) diff --git a/XIproto.txt b/XIproto.txt index f9d19f0..83cf9dd 100644 --- a/XIproto.txt +++ b/XIproto.txt @@ -1650,7 +1650,7 @@ feedback class BellFeedback, which is reported in the BellFeedbackState structure. The members of that structure are: - CLASS String: + CLASS Bell: [class: CARD8 length: CARD16 feedback id: CARD8 @@ -1676,7 +1676,7 @@ class Led, which is reported in the LedFeedbackState structure. The members of that structure are: - CLASS String: + CLASS Led: [class: CARD8 length: CARD16 feedback id: CARD8 @@ -1781,7 +1781,7 @@ feedback id: CARD8 int_to_display: INT32] - Some devices are capable of displaying an string. This is done + Some devices are capable of displaying a string. This is done using feedback class StringFeedbackClass using the StringFeedbackCtl structure. The members of that structure are as follows: @@ -1978,29 +1978,19 @@ Controlling Device Encoding A server can impose restrictions on how modifiers can be changed (for example, if certain keys do not generate up transitions in hardware or if multiple keys per modifier are - not supported). The status reply is Failed if some such - restriction is violated, and none of the modifiers are changed. + not supported). If some such restriction is violated, the status + reply is MappingFailed, and none of the modifiers are changed. - If the new non-zero keycodes specified for a modifier differ - from those currently defined, and any (current or new) keys for - that modifier are logically in the down state, then the status - reply is Busy, and none of the modifiers are changed. + If the new keycodes specified for a modifier differ from those + currently defined and any (current or new) keys for that + modifier are in the logically down state, the status reply is + MappingBusy, and none of the modifiers are changed. This request generates a DeviceMappingNotify event on a Success status. The DeviceMappingNotify event will be sent only to those clients that have expressed an interest in receiving that event via the XSelectExtensionEvent request. - A X server can impose restrictions on how modifiers can be - changed, for example, if certain keys do not generate up - transitions in hardware or if multiple modifier keys are not - supported. If some such restriction is violated, the status - reply is MappingFailed , and none of the modifiers are changed. - If the new keycodes specified for a modifier differ from those - currently defined and any (current or new) keys for that - modifier are in the logically down state, the status reply is - MappingBusy, and none of the modifiers are changed. - 2.20 Controlling Button Mapping These requests are analogous to the core GetPointerMapping and @@ -2350,7 +2340,7 @@ Controlling Device Encoding specified device and window. Events generated by SetDeviceFocus when the device is not grabbed have mode Normal. Events generated by SetDeviceFocus when the device is grabbed have - mode WhileGrabbed. Events generated when a device grab actives + mode WhileGrabbed. Events generated when a device grab activates have mode Grab, and events generated when a device grab deactivates have mode Ungrab. commit bf66a58ddb0a39eb4a0ae8e58160780f8a2b2716 Author: Chase Douglas <[email protected]> Date: Fri Dec 17 17:11:09 2010 +0000 Include stdint.h I'm now getting build failures due to missing stdint.h. It seems we should include it explicitly in XI2proto.h anyways. Signed-off-by: Chase Douglas <[email protected]> Signed-off-by: Daniel Stone <[email protected]> Signed-off-by: Peter Hutterer <[email protected]> (cherry picked from commit 5c2d5fd99d73ae52aef62376046b5708c58a4271) diff --git a/XI2proto.h b/XI2proto.h index 2fd91eb..84574a5 100644 --- a/XI2proto.h +++ b/XI2proto.h @@ -60,6 +60,7 @@ #include <X11/Xproto.h> #include <X11/X.h> #include <X11/extensions/XI2.h> +#include <stdint.h> /* make sure types have right sizes for protocol structures. */ #define Window uint32_t -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
