x11proto-input: Changes to 'upstream-unstable'

2016-04-28 Thread Andreas Boll
 configure.ac   |2 +-
 specs/Makefile.am  |2 +-
 specs/XI2proto.txt |   15 +--
 3 files changed, 11 insertions(+), 8 deletions(-)

New commits:
commit 6946d497e3fe496818fa70de6702934bf70e44ec
Author: Peter Hutterer 
Date:   Mon Apr 4 12:28:42 2016 +1000

inputproto 2.3.2

Signed-off-by: Peter Hutterer 

diff --git a/configure.ac b/configure.ac
index 56115df..7480425 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.60])
-AC_INIT([InputProto], [2.3.1], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([InputProto], [2.3.2], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
 # Require xorg-macros: XORG_WITH_ASCIIDOC

commit 1dbdc297d915e4979a7823d6a569d9c7fed14617
Author: Andreas Boll 
Date:   Fri Dec 11 10:49:33 2015 +0100

specs: Set TZ=UTC before calling asciidoc

Set TZ=UTC before calling asciidoc to make the embedded dates invariant
to timezones in order to make the package build reproducibly.

Fixes bug:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=795981

v2: Set TZ=UTC after $(AM_V_GEN) (fixes non-verbose build)

Suggested-by: Eduard Sanou 
Signed-off-by: Andreas Boll 
Signed-off-by: Peter Hutterer 

diff --git a/specs/Makefile.am b/specs/Makefile.am
index a83cf40..f2454bc 100644
--- a/specs/Makefile.am
+++ b/specs/Makefile.am
@@ -6,7 +6,7 @@ doc_DATA = XI2proto.html XIproto.html
 dist_doc_DATA = XI2proto.txt XIproto.txt
 
 %.html: %.txt
-   $(AM_V_GEN)$(ASCIIDOC) -o $@ $<
+   $(AM_V_GEN)TZ=UTC $(ASCIIDOC) -o $@ $<
 
 CLEANFILES = $(doc_DATA)
 

commit 7c7c2c18864d166391e49758d83e9cc601bbfb17
Author: Peter Hutterer 
Date:   Mon Oct 27 14:22:58 2014 +1000

specs: rename EVENTMASK to EVTYPEMASK

EVENTMASK was used twice in the spec, once as the actual bitmask for events,
once as the set of deviceid, mask length and mask.

The libXi public API uses XIEventMask for the latter data triplet, so leave
EVENTMASK, and rename the pure bitmask to EVTYPEMASK.

Reported-by: Gabriel Laskar 
Signed-off-by: Peter Hutterer 
Reviewed-by: Hans de Goede 

diff --git a/specs/XI2proto.txt b/specs/XI2proto.txt
index e3636ac..697dd89 100644
--- a/specs/XI2proto.txt
+++ b/specs/XI2proto.txt
@@ -672,9 +672,9 @@ Data types
 device hierarchy. See Section "The Master/Slave device hierarchy"
 for more information.
 
-EVENTMASK
-An EVENTMASK is a binary mask defined as (1 << event type).
-A SETofEVENTMASK is a binary OR of zero or more EVENTMASK.
+EVTYPEMASK
+An EVTYPEMASK is a binary mask defined as (1 << event type).
+A SETofEVTYPEMASK is a binary OR of zero or more EVTYPEMASK.
 
 FP1616
 Fixed point decimal in 16.16 format as one INT16 and one CARD16.
@@ -971,7 +971,7 @@ XISelectEvents
 
 EVENTMASK { deviceid:  DEVICE,
 mask_len:  CARD16,
-mask:  SETofEVENTMASK
+mask:  SETofEVTYPEMASK }
 
 window
 The window to select the events on.
@@ -1392,7 +1392,7 @@ XIGrabDevice
 time:TIMESTAMP or CurrentTime
 cursor:  Cursor
 mask_len:CARD16
-masks:   SETofEVENTMASK
+masks:   SETofEVTYPEMASK
 ▶
 status:  Success, AlreadyGrabbed, Frozen, InvalidTime, 
NotViewable
 └───
@@ -1638,7 +1638,7 @@ XIPassiveGrabDevice
 paired_device_mode: { Synchronous, Asynchronous }
 num_modifiers:   INT16
 mask_len:CARD16
-masks:   SETofEVENTMASK
+masks:   SETofEVTYPEMASK
 modifiers:   LISTofSETofMODIFIERMASK
 ▶
 num_modifiers_return:INT16

commit 81378a1e7139af9d476d90df8737c0c1a58670f3
Author: Peter Hutterer 
Date:   Mon Aug 25 11:04:38 2014 +1000

specs: note the (unused) time field in XIPassiveGrabDevice

We don't actually use it either in libXi or in the server, it's a copy/paste
error that never got noticed and removed.

Signed-off-by: Peter Hutterer 

diff --git a/specs/XI2proto.txt b/specs/XI2proto.txt
index 2f81bef..e3636ac 100644
--- a/specs/XI2proto.txt
+++ b/specs/XI2proto.txt
@@ -1630,6 +1630,7 @@ XIPassiveGrabDevice
 deviceid:DEVICE
 detail:  CARD32
 grab_type:   GRABTYPE
+time:TIMESTAMP
 grab_window: Window
 cursor:  Cursor
 owner_events:Bool
@@ -1695,6 +1696,8 @@ on the specified input device.
 Number of elements in modifiers_return
 modifiers_return
 XKB modifier state that could not be grabbed.
+time
+This field is unused.
 
 If owner-events is

x11proto-input: Changes to 'upstream-unstable'

2013-04-22 Thread Timo Aaltonen
 autogen.sh   |4 +++-
 configure.ac |3 +--
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit f33a329026c9f2eaa5fa436543e4feb0e54b685d
Author: Peter Hutterer 
Date:   Thu Mar 7 10:42:39 2013 +1000

inputproto 2.3

Signed-off-by: Peter Hutterer 

diff --git a/configure.ac b/configure.ac
index 85dfaf1..e6f3db4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.60])
-AC_INIT([InputProto], [2.2.99.1], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([InputProto], [2.3], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
 # Require xorg-macros: XORG_WITH_ASCIIDOC

commit f8428123019e7357891bbfc0aef21dbb4d0db10f
Author: Colin Walters 
Date:   Wed Jan 4 17:37:06 2012 -0500

autogen.sh: Implement GNOME Build API

http://people.gnome.org/~walters/docs/build-api.txt

Signed-off-by: Adam Jackson 

diff --git a/autogen.sh b/autogen.sh
index 904cd67..fc34bd5 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -9,4 +9,6 @@ cd $srcdir
 autoreconf -v --install || exit 1
 cd $ORIGDIR || exit $?
 
-$srcdir/configure --enable-maintainer-mode "$@"
+if test -z "$NOCONFIGURE"; then
+$srcdir/configure "$@"
+fi

commit 8cad031f9f583089dd33bae41dfa8a7e0d8a71f4
Author: Adam Jackson 
Date:   Tue Jan 15 14:01:10 2013 -0500

configure: Remove AM_MAINTAINER_MODE

Signed-off-by: Adam Jackson 

diff --git a/configure.ac b/configure.ac
index 7c8e2eb..85dfaf1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,6 @@
 AC_PREREQ([2.60])
 AC_INIT([InputProto], [2.2.99.1], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
-AM_MAINTAINER_MODE
 
 # Require xorg-macros: XORG_WITH_ASCIIDOC
 m4_ifndef([XORG_MACROS_VERSION],


-- 
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1uubwh-0001h7...@vasks.debian.org



x11proto-input: Changes to 'upstream-unstable'

2012-04-15 Thread Julien Cristau
 XI2.h  |   39 +-
 XI2proto.h |   54 +++
 configure.ac   |2 
 specs/XI2proto.txt |  858 +
 4 files changed, 826 insertions(+), 127 deletions(-)

New commits:
commit e752e92dbdcf01b1cd46a3853f582ff765d19e90
Author: Peter Hutterer 
Date:   Fri Mar 2 12:58:18 2012 +1000

inputproto 2.2

Signed-off-by: Peter Hutterer 

diff --git a/configure.ac b/configure.ac
index 028538b..1c74810 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.60])
-AC_INIT([InputProto], [2.1.99.6], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([InputProto], [2.2], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 

commit b02b0b42e266560bd48f7e8f38c8338417394fd0
Author: Peter Hutterer 
Date:   Wed Feb 29 15:08:01 2012 +1000

specs: XI 2.2 release date is March 2012

Signed-off-by: Peter Hutterer 
Reviewed-by: Chase Douglas 

diff --git a/specs/XI2proto.txt b/specs/XI2proto.txt
index 11fc39c..fb32768 100644
--- a/specs/XI2proto.txt
+++ b/specs/XI2proto.txt
@@ -13,7 +13,7 @@ Authors:
 History 
 ---
 
-- v2.2, ??: Multitouch support added
+- v2.2, March 2012: Multitouch support added
 - v2.1, December 2011: new raw event behaviour, smooth scrolling support
   added
 - v2.0, October 2009: Initial release of XI2 protocol

commit 950a7a0b2e733d9713a88612b669603b0c155329
Author: Peter Hutterer 
Date:   Wed Feb 29 14:55:26 2012 +1000

specs: Remove work in progress warning

We're close enough to a release now.

Signed-off-by: Peter Hutterer 
Reviewed-by: Chase Douglas 

diff --git a/specs/XI2proto.txt b/specs/XI2proto.txt
index 024b107..11fc39c 100644
--- a/specs/XI2proto.txt
+++ b/specs/XI2proto.txt
@@ -3,8 +3,6 @@ The X Input Extension 2.x
 :toc:
 :numbered:
 
-.This is a work in progress!
-
 Authors:
 
 - Peter Hutterer (Red Hat) 

commit 3ac053f2c7ef8d07b4a6dcb64d8ca47edad15716
Author: Peter Hutterer 
Date:   Fri Mar 2 10:31:26 2012 +1000

specs: remove "since" from TouchOwnershipEvent

It's already in a section "Events introduced in version 2.2"

Signed-off-by: Peter Hutterer 
Reviewed-by: Chase Douglas 

diff --git a/specs/XI2proto.txt b/specs/XI2proto.txt
index b9a68ee..024b107 100644
--- a/specs/XI2proto.txt
+++ b/specs/XI2proto.txt
@@ -2346,7 +2346,7 @@ Events introduced in version 2.2
 
 [[events-touchownershipevent]]
 ┌───
-TouchOwnershipEvent (since XI 2.2):
+TouchOwnershipEvent
 EVENTHEADER
 touchid:CARD32
 root:   Window

commit b42e4d24a26fb8467ed54183480c9dacd66fc804
Author: Peter Hutterer 
Date:   Fri Mar 2 10:28:46 2012 +1000

specs: remove TouchOwnership mention from DeviceEvent

TouchOwnership is described separately below.

Signed-off-by: Peter Hutterer 
Reviewed-by: Chase Douglas 

diff --git a/specs/XI2proto.txt b/specs/XI2proto.txt
index ba3d856..b9a68ee 100644
--- a/specs/XI2proto.txt
+++ b/specs/XI2proto.txt
@@ -2175,8 +2175,7 @@ touch sequence initializes.
 A TouchEnd event is generated whenever a touch sequence ceases. A
 TouchUpdate event is generated whenever a valuator value changes, or a flag
 flag (e.g. pending end) has changed for that touch sequence; this may result
-in a TouchUpdate event being sent with zero valuators. A TouchOwnership event
-is sent when a client becomes the owner of a touch.
+in a TouchUpdate event being sent with zero valuators.
 
 The average finger size is significantly larger than one pixel. The
 selection of the hotspot of a touchpoint is implementation dependent and

commit a09ca92ce31ede86b883cb74fb1767f8ed687ca5
Author: Peter Hutterer 
Date:   Fri Mar 2 10:26:04 2012 +1000

specs: whitespace fix to avoid wrong asciidoc formatting

Signed-off-by: Peter Hutterer 
Reviewed-by: Chase Douglas 

diff --git a/specs/XI2proto.txt b/specs/XI2proto.txt
index 3090ac8..ba3d856 100644
--- a/specs/XI2proto.txt
+++ b/specs/XI2proto.txt
@@ -2097,7 +2097,7 @@ changes in response to a button press, a button release, 
a motion, a key
 press or a key release. The event type may be one of KeyPress,
 KeyRelease, ButtonPress, ButtonRelease, Motion.
 
-XI 2.2: The event type may also be TouchBegin, TouchUpdate, or TouchEnd.
+XI 2.2: The event type may also be TouchBegin, TouchUpdate, or TouchEnd.
 
 detail
 The button number, key code, touch ID, or 0.
@@ -2170,9 +2170,8 @@ Modifier state in mods is detailed as follows:
 locked_group
 XKB locked group state.
 
-XI 2.2:
-
-A TouchBegin event is generated whenever a new touch sequence initializes
+In servers supporting XI 2.2, a TouchBegin event is generated whenever a new
+touch sequence initializes.
 A TouchEnd event is generated whenever a touch sequence ceases. A
 TouchUpdate event is generated whenever a valuator valu

x11proto-input: Changes to 'upstream-unstable'

2011-12-16 Thread Cyril Brulebois
Rebased ref, commits from common ancestor:
commit 8640944f4ff193027ce0f21622918b88da910e72
Author: Peter Hutterer 
Date:   Fri Dec 16 11:06:13 2011 +1000

inputproto 2.1

Signed-off-by: Peter Hutterer 

diff --git a/configure.ac b/configure.ac
index c755917..8e2bb0d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.60])
-AC_INIT([InputProto], [2.0.99.1], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([InputProto], [2.1], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 

commit 019a252a59c1d076b07a0162cb3ee6af42ceea14
Author: Peter Hutterer 
Date:   Fri Dec 2 15:03:46 2011 +1000

specs: typo fix

Signed-off-by: Peter Hutterer 

diff --git a/specs/XI2proto.txt b/specs/XI2proto.txt
index 6c1ccbe..f220557 100644
--- a/specs/XI2proto.txt
+++ b/specs/XI2proto.txt
@@ -218,7 +218,7 @@ event processing stops.
 
 
 Many core protocol and some extension requests are ambiguous when multiple
-master devices are available (e.g. QueryPointer does not specfy which pointer).
+master devices are available (e.g. QueryPointer does not specify which 
pointer).
 The X server does not have the knowledge to chose the contextually correct
 master device. For each client, one master pointer is designated as this
 clients's "ClientPointer". Whenever a client sends an ambiguous request (e.g.

commit a9fcea66eb18fab330f3b27b3daedef2b5c9210a
Author: Peter Hutterer 
Date:   Fri Nov 11 14:33:34 2011 +1000

specs: smooth scrolling was added in 2.1, say so

Signed-off-by: Peter Hutterer 

diff --git a/specs/XI2proto.txt b/specs/XI2proto.txt
index 2a25c4e..6c1ccbe 100644
--- a/specs/XI2proto.txt
+++ b/specs/XI2proto.txt
@@ -40,6 +40,7 @@ device information in each event (with the exception of core 
events).
 Changes introduced by version 2.1
 
 - RawEvents are sent regardless of the grab state.
+- Addition of the ScrollClass for smooth scrolling
 
 //❧❧❧
 

commit 279524b089c7b42871ee072cfc03a1fad7421b7b
Author: Peter Hutterer 
Date:   Tue Nov 8 15:36:02 2011 +1000

specs: scroll events have no specific event type, state so.

This wasn't clear enough in the current spec.

Signed-off-by: Peter Hutterer 

diff --git a/specs/XI2proto.txt b/specs/XI2proto.txt
index b6707b3..2a25c4e 100644
--- a/specs/XI2proto.txt
+++ b/specs/XI2proto.txt
@@ -128,13 +128,14 @@ simply dragging your finger along a designated strip 
along the side of the
 touchpad.
 
 Newer X servers may provide scrolling information through valuators to
-provide scroll events with more precision than the button events. Valuators
-for axes sending scrolling information must have one ScrollClass for each
-scrolling axis.
-
-If scrolling valuators are present on a device, the server must provide
-two-way emulation between these valuators and the legacy button events for
-each delta unit of scrolling.
+provide clients with more precision than the legacy button events. This
+scrolling information is part of the valuator data in device events.
+Scrolling events do not have a specific event type.
+
+Valuators for axes sending scrolling information must have one
+ScrollClass for each scrolling axis. If scrolling valuators are present on a
+device, the server must provide two-way emulation between these valuators
+and the legacy button events for each delta unit of scrolling.
 
 One unit of scrolling in either direction is considered to be equivalent to
 one button event, e.g. for a unit size of 1.0, -2.0 on an valuator type

commit 9f2b1a33063b139756e08951affe802e8af39a76
Author: Peter Hutterer 
Date:   Tue Nov 8 15:29:24 2011 +1000

specs: We're up to version 2.1 now, say so

Signed-off-by: Peter Hutterer 

diff --git a/specs/XI2proto.txt b/specs/XI2proto.txt
index 1a93c8d..b6707b3 100644
--- a/specs/XI2proto.txt
+++ b/specs/XI2proto.txt
@@ -2,6 +2,7 @@ The X Input Extension
 =
 
 Version 2.0
+Version 2.1
 
   Peter Hutterer
  peter.hutte...@redhat.com

commit 463ffaabab506ad6ddb3b55c5781ae91fcccfd04
Author: Peter Hutterer 
Date:   Fri Sep 23 08:41:18 2011 +1000

specs: clarify that Preferred scroll valuators are per scroll direction

Reported-by: Daniel Stone 
Signed-off-by: Peter Hutterer 

diff --git a/specs/XI2proto.txt b/specs/XI2proto.txt
index 2b13845..1a93c8d 100644
--- a/specs/XI2proto.txt
+++ b/specs/XI2proto.txt
@@ -147,10 +147,11 @@ with the XIPointerEmulated flag for DeviceEvents, and the 
XIRawEmulated flag
 for raw events, to hint at applications which event is a hardware event.
 
 If more than one scroll valuator of the same type is present on a device,
-the valuator marked with Preferred is used to convert legacy button events
-into scroll valuator events. If no valuator

x11proto-input: Changes to 'upstream-unstable'

2011-06-09 Thread Cyril Brulebois
 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 
Date:   Tue Jun 7 14:16:17 2011 +1000

inputproto 2.0.2

Signed-off-by: Peter Hutterer 

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 
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 
Signed-off-by: Peter Hutterer 
(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 XIAllDevices0

commit a4cab7946409613e27fbad195c861224ad0e0b10
Author: Fernando Carrijo 
Date:   Thu Jan 27 22:40:11 2011 -0200

Fix typos in XIproto.txt

Signed-off-by: Fernando Carrijo 
Signed-off-by: Peter Hutterer 
(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 

x11proto-input: Changes to 'upstream-unstable'

2010-11-12 Thread Cyril Brulebois
Rebased ref, commits from common ancestor:
commit 56ffb564712257e0f998170e83071a6ee85aa231
Author: Peter Hutterer 
Date:   Thu Nov 11 14:10:26 2010 +1000

inputproto 2.0.1

Signed-off-by: Peter Hutterer 

diff --git a/configure.ac b/configure.ac
index 7466dc3..39e4df9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.60])
-AC_INIT([InputProto], [2.0], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([InputProto], [2.0.1], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 

commit 52e92f280c4e065d6a3f040493a0b46d2c8bee1d
Author: Peter Hutterer 
Date:   Mon Aug 2 15:53:52 2010 +1000

Typo fix: GrabTypeFocusIn -> GrabtypeFocusIn

Signed-off-by: Peter Hutterer 

diff --git a/XI2proto.txt b/XI2proto.txt
index 78eae8e..10f58c2 100644
--- a/XI2proto.txt
+++ b/XI2proto.txt
@@ -999,7 +999,7 @@ are required to be 0.
 └───
 
 GRABTYPE { GrabtypeButton, GrabtypeKeycode, GrabtypeEnter,
-   GrabTypeFocusIn}
+   GrabtypeFocusIn}
 
 GRABMODIFIERINFO {   status:Access
  modifiers: CARD32 }

commit 3dc8e70f761f7da338c632a5acb0176bef515b33
Author: Peter Hutterer 
Date:   Fri Aug 6 09:52:33 2010 +1000

Spell out event types for XIDeviceEvent.

Signed-off-by: Peter Hutterer 

diff --git a/XI2proto.txt b/XI2proto.txt
index 79a1483..78eae8e 100644
--- a/XI2proto.txt
+++ b/XI2proto.txt
@@ -1485,7 +1485,8 @@ EVENTHEADER { type:   BYTE
 
 An XIDeviceEvent is generated whenever the logical state of a device
 changes in response to a button press, a button release, a motion, a key
-press or a key release.
+press or a key release. The event type may be one of KeyPress,
+KeyRelease, ButtonPress, ButtonRelease, Motion.
 
 detail
 The button number or key code, or 0.

commit 993ca70d7ecfb88037edfd77bccfcb671aea4c7b
Author: Peter Hutterer 
Date:   Mon Jan 11 17:02:55 2010 +1000

Define the error cases for XSetDeviceMode better.

Take the error codes as described in the man page for XSetDeviceMode. This
is more likely to be what clients expect, especially since the protocol spec
doesn't actually define when BadMode is to be reported.

This behaviour is the same as specified in the XSetDeviceMode man page.

Signed-off-by: Peter Hutterer 
Reviewed-by: Fernando Carrijo 

diff --git a/XIproto.txt b/XIproto.txt
index 20cc02a..f9d19f0 100644
--- a/XIproto.txt
+++ b/XIproto.txt
@@ -577,7 +577,9 @@
already has the device open with a different mode. It will fail
and return AlreadyGrabbed if another client has the device
grabbed. The request will fail with a BadMatch error if the
-   requested mode is not supported by the device.
+   device has no valuators and reports no axes of motion. The
+   request will fail with a BadMode error if the requested mode
+   is not supported by the device.
 
SetDeviceMode
device:DEVICE

commit 617c4a2db48e98d06f728fa6b8caa18fbbfb66fc
Author: Peter Hutterer 
Date:   Mon Nov 23 10:21:17 2009 +1000

XI2proto.txt: fix up some request names.

Leftovers from previous versions of the spec before the requests were
renamed.

Signed-off-by: Peter Hutterer 

diff --git a/XI2proto.txt b/XI2proto.txt
index 706f50a..79a1483 100644
--- a/XI2proto.txt
+++ b/XI2proto.txt
@@ -296,7 +296,7 @@ are required to be 0.
   value:FP3232
   resolution:   CARD32 }
 
-XIQueryDevices details information about the requested input devices.
+XIQueryDevice details information about the requested input devices.
 
 devices
 The device to list. If devices is AllDevices, all enabled and
@@ -871,7 +871,7 @@ are required to be 0.
 └───
 
 This request releases the device if this client has it actively grabbed
-(from either XIGrabDevice,  XIGrabDeviceKey or XIGrabDeviceButton) and
+(from either XIGrabDevice or  XIPassiveGrabDevice) and
 releases any queued events. If any devices were frozen by the grab,
 XIUngrabDevice thaws them.
 
@@ -1223,7 +1223,7 @@ are required to be 0.
 until server reset.
 
 A property cannot be deleted by setting nitems to zero. To delete a
-property, use XIDeleteDeviceProperty.
+property, use XIDeleteProperty.
 
 This request generates an XIPropertyEvent.
 
@@ -1443,8 +1443,7 @@ EVENTHEADER { type:   BYTE
 Details the available classes provided by the device.  The order the
 classes are provided in is undefined.
 
-For a detailed description of classes, see the XQueryInputDevice
-request.
+For a detailed description of classes, see the XQueryDevice request.
 
 ┌───
 DeviceEvent:
@@ -1554,8 +1553,8

x11proto-input: Changes to 'upstream-unstable'

2009-02-15 Thread Julien Cristau
 XI.h |   11 
 XInput.h |   82 +
 XIproto.h|  143 +--
 configure.ac |2 
 4 files changed, 232 insertions(+), 6 deletions(-)

New commits:
commit 60c449cbb1769569ed5e98c75f26bd15627bd146
Author: Peter Hutterer 
Date:   Mon Dec 15 12:16:10 2008 +1000

Protect _XiDevicePresenceNotifyEvent declaration against C++ includes. 
#19075

X.Org Bug 19075 

diff --git a/XInput.h b/XInput.h
index 702706d..3092e62 100644
--- a/XInput.h
+++ b/XInput.h
@@ -156,9 +156,16 @@ SOFTWARE.
 #define NoExtensionEvent(d,type,_class) \
 { _class =  ((XDevice *) d)->device_id << 8 | _noExtensionEvent;}
 
+#if defined(__cplusplus) || defined(c_plusplus)
+extern "C" {
+#endif
+extern int _XiGetDevicePresenceNotifyEvent(Display *);
+#if defined(__cplusplus) || defined(c_plusplus)
+}
+#endif
+
 #define DevicePresence(dpy, type, _class)   \
 {   \
-extern int _XiGetDevicePresenceNotifyEvent(Display *);  \
 type = _XiGetDevicePresenceNotifyEvent(dpy);\
 _class =  (0x1 | _devicePresence);  \
 }

commit d38e79ca3ddd6031ca4a335eb2faf99294a6731f
Author: Peter Hutterer 
Date:   Wed Nov 26 21:37:06 2008 +1000

inputproto 1.5.0

diff --git a/configure.ac b/configure.ac
index b343465..56b9bc7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.57])
-AC_INIT([InputProto], [1.4.4], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([InputProto], [1.5.0], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
 XORG_RELEASE_VERSION

commit 5829370cafb112e488156e7ac1dd7902cfd1659a
Author: Peter Hutterer 
Date:   Mon Nov 17 10:58:31 2008 +1000

Remove Configure/QueryDeviceProperty.
(cherry picked from commit 18ef04f8a2026cca5d2d2b796ec2ea1c949bad36)

Removing Configure/QueryDevice property from XInput.h as well.
Not cherry-picked as XInput.h is moved to libXi in master.

Conflicts:

XIproto.h

diff --git a/XI.h b/XI.h
index 878ba0f..7c8c111 100644
--- a/XI.h
+++ b/XI.h
@@ -108,9 +108,6 @@ SOFTWARE.
 #define sz_xChangeDeviceControlReply   32
 #define sz_xListDevicePropertiesReq 8
 #define sz_xListDevicePropertiesReply   32
-#define sz_xQueryDevicePropertyReq  12
-#define sz_xQueryDevicePropertyReply32
-#define sz_xConfigureDevicePropertyReq  12
 #define sz_xChangeDevicePropertyReq 20
 #define sz_xDeleteDevicePropertyReq 12
 #define sz_xGetDevicePropertyReq24
diff --git a/XInput.h b/XInput.h
index 34fbb33..702706d 100644
--- a/XInput.h
+++ b/XInput.h
@@ -1244,23 +1244,6 @@ extern void XChangeDeviceProperty(
 int /* nelements */
 );
 
-extern XIPropertyInfo* XQueryDeviceProperty(
-Display*/* dpy */,
-XDevice*/* dev */,
-Atom/* property */
-);
-
-extern void
-XConfigureDeviceProperty(
-Display*/* dpy */,
-XDevice*/* dev */,
-Atom/* property */,
-Bool/* pending */,
-Bool/* range */,
-int /* num_values */,
-long*   /* values */
-);
-
 extern void
 XDeleteDeviceProperty(
 Display*/* dpy */,
@@ -1276,7 +1259,6 @@ XGetDeviceProperty(
  long   /* offset*/,
  long   /* length*/,
  Bool   /* delete*/,
- Bool   /* pending*/,
  Atom   /* req_type*/,
  Atom*  /* actual_type*/,
  int*   /* actual_format*/,
diff --git a/XIproto.h b/XIproto.h
index c84fe39..eef3ee8 100644
--- a/XIproto.h
+++ b/XIproto.h
@@ -159,11 +159,9 @@ struct tmask
 #define X_ChangeDeviceControl  35
 /* XI 1.5 */
 #define X_ListDeviceProperties  36
-#define X_QueryDeviceProperty   37
-#define X_ConfigureDeviceProperty   38
-#define X_ChangeDeviceProperty  39
-#define X_DeleteDeviceProperty  40
-#define X_GetDeviceProperty 41
+#define X_ChangeDeviceProperty  37
+#define X_DeleteDeviceProperty  38
+#define X_GetDeviceProperty 39
 
 /*
  *
@@ -1454,55 +1452,6 @@ typedef struct {
 
 /*
  *
- * QueryDeviceProperty.
- *
- */
-
-typedef struct {
-CARD8   reqType;/* input extension major opcode */
-CARD8   ReqType;/* always X_QueryDeviceProperty */
-CARD16  length B16;
-Atomproperty B32;
-CARD8   deviceid;
-CARD8   pad0;
-CARD16  pad1 B16;
-} xQueryDevicePropertyReq;
-
-type

x11proto-input: Changes to 'upstream-unstable'

2008-08-27 Thread Julien Cristau
 XI.h |3 ++-
 XIproto.h|2 +-
 configure.ac |2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit c109e2ddb9cab22f185a877ab7e48002d1087400
Author: Peter Hutterer <[EMAIL PROTECTED]>
Date:   Tue Jul 29 09:10:09 2008 +0930

inputproto 1.4.4

diff --git a/configure.ac b/configure.ac
index b07f4ea..b343465 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.57])
-AC_INIT([InputProto], [1.4.3], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([InputProto], [1.4.4], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
 XORG_RELEASE_VERSION

commit f41d153886c3519ebaf767f9c0d3281b6adce030
Author: Peter Hutterer <[EMAIL PROTECTED]>
Date:   Tue Jul 29 08:58:53 2008 +0930

Add DeviceControlChanged define.

This value is used for the devchange field in the DevicePresenceNotify event
when a device's control has been modified.
(cherry picked from commit 0daf8328cfa90b038753fc409c5eb05ba3fac6d5)

diff --git a/XI.h b/XI.h
index 3b11860..51a4175 100644
--- a/XI.h
+++ b/XI.h
@@ -250,7 +250,8 @@ SOFTWARE.
 #define DeviceRemoved1
 #define DeviceEnabled2
 #define DeviceDisabled   3
-#define DeviceUnrecoverable  4  
+#define DeviceUnrecoverable  4
+#define DeviceControlChanged 5
 
 #define XI_BadDevice   0
 #define XI_BadEvent1
diff --git a/XIproto.h b/XIproto.h
index 4f46f4f..6d4bf64 100644
--- a/XIproto.h
+++ b/XIproto.h
@@ -1600,7 +1600,7 @@ typedef struct
 BYTEpad00;
 CARD16 sequenceNumber B16;
 Timetime B32;
-BYTEdevchange; /* Device{Added|Removed|Enabled|Disabled} */
+BYTEdevchange; /* 
Device{Added|Removed|Enabled|Disabled|ControlChanged} */
 BYTEdeviceid;
 CARD16  control B16;
 CARD32 pad02 B32;


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



x11proto-input: Changes to 'upstream-unstable'

2008-03-10 Thread Julien Cristau
 XI.h |   17 -
 1 file changed, 8 insertions(+), 9 deletions(-)

New commits:
commit 852568991b251e9366da167f1b746a0a1db6adf0
Author: Adam Jackson <[EMAIL PROTECTED]>
Date:   Mon Mar 10 09:31:51 2008 -0400

Typo fix.

diff --git a/XI.h b/XI.h
index ec9bee2..3b11860 100644
--- a/XI.h
+++ b/XI.h
@@ -49,6 +49,8 @@ SOFTWARE.
 #ifndef _XI_H_
 #define _XI_H_
 
+#define sz_xGetExtensionVersionReq 8
+#define sz_xGetExtensionVersionReply   32
 #define sz_xListInputDevicesReq4
 #define sz_xListInputDevicesReply  32
 #define sz_xOpenDeviceReq  8

commit b5cbe2d93f6c0129b8f29da97778f6d1b15c38f9
Author: Adam Jackson <[EMAIL PROTECTED]>
Date:   Mon Mar 10 09:08:21 2008 -0400

C sucks: define XEventClass in terms of unsigned int, not CARD32.

Apparently pulling in Xmd.h here breaks qt, since they both define an
INT32 type (and incompatible ones even, since Xmd's is unsigned long on
ILP32 because whoever wrote Xmd.h is a C novice).

diff --git a/XI.h b/XI.h
index fe4981a..ec9bee2 100644
--- a/XI.h
+++ b/XI.h
@@ -1,5 +1,3 @@
-/* $Xorg: XI.h,v 1.4 2001/02/09 02:03:23 xorgcvs Exp $ */
-
 /
 
 Copyright 1989, 1998  The Open Group
@@ -45,17 +43,12 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
OF THIS
 SOFTWARE.
 
 /
-/* $XFree86: xc/include/extensions/XI.h,v 1.4 2001/01/17 17:53:16 dawes Exp $ 
*/
 
 /* Definitions used by the server, library and client */
 
 #ifndef _XI_H_
 #define _XI_H_
 
-#include  /* CARD32 */
-
-#define sz_xGetExtensionVersionReq 8
-#define sz_xGetExtensionVersionReply   32
 #define sz_xListInputDevicesReq4
 #define sz_xListInputDevicesReply  32
 #define sz_xOpenDeviceReq  8
@@ -263,12 +256,16 @@ SOFTWARE.
 #define XI_DeviceBusy  3
 #define XI_BadClass4
 
-/* Make XEventClass be a CARD32 for 64 bit servers.  Don't affect client
+/*
+ * Make XEventClass be a CARD32 for 64 bit servers.  Don't affect client
  * definition of XEventClass since that would be a library interface change.
  * See the top of X.h for more _XSERVER64 magic.
+ *
+ * But, don't actually use the CARD32 type.  We can't get it defined here
+ * without polluting the namespace.
  */
 #ifdef _XSERVER64
-typedefCARD32  XEventClass;
+typedef unsigned int   XEventClass;
 #else
 typedefunsigned long   XEventClass;
 #endif


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



x11proto-input: Changes to 'upstream-unstable'

2008-03-07 Thread Julien Cristau
 .gitignore   |1 +
 ChangeLog|4 
 Makefile.am  |   10 ++
 XI.h |3 ++-
 configure.ac |2 +-
 5 files changed, 14 insertions(+), 6 deletions(-)

New commits:
commit 3edc1bf23b07ea47d7e1e32047e15c67333c663e
Author: Adam Jackson <[EMAIL PROTECTED]>
Date:   Wed Mar 5 22:06:19 2008 -0500

inputproto 1.4.3

diff --git a/configure.ac b/configure.ac
index c010699..b07f4ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.57])
-AC_INIT([InputProto], [1.4.2.1], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([InputProto], [1.4.3], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
 XORG_RELEASE_VERSION

commit 096b20bf5492d248b5c8ff0c1c28e221d59db724
Author: Jesse Barnes <[EMAIL PROTECTED]>
Date:   Mon Jan 21 15:28:49 2008 -0800

Use Xmd.h instead of X.h to pull in CARD32 definition

On 64 bit hosts, CARD32 may be undefined unless we use Xmd.h to define it 
for
us.  Apparently X.h is no longer sufficient.

diff --git a/XI.h b/XI.h
index 0bfefcc..fe4981a 100644
--- a/XI.h
+++ b/XI.h
@@ -52,7 +52,7 @@ SOFTWARE.
 #ifndef _XI_H_
 #define _XI_H_
 
-#include  /* CARD32 */
+#include  /* CARD32 */
 
 #define sz_xGetExtensionVersionReq 8
 #define sz_xGetExtensionVersionReply   32

commit 9359e625787761e6b3df15f29bbf842c67a9516d
Author: James Cloos <[EMAIL PROTECTED]>
Date:   Thu Dec 6 16:39:02 2007 -0500

Replace static ChangeLog with dist-hook to generate from git log

diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index c722b51..000
--- a/ChangeLog
+++ /dev/null
@@ -1,4 +0,0 @@
-2005-12-14  Kevin E. Martin  
-
-   * configure.ac:
-   Update package version number for final X11R7 release candidate.
diff --git a/Makefile.am b/Makefile.am
index e39ea0a..f8d4a32 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,3 +8,13 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = inputproto.pc
 
 EXTRA_DIST = autogen.sh inputproto.pc.in
+
+EXTRA_DIST += ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+   (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv 
.changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git 
directory not found: installing possibly empty changelog.' >&2)
+
+dist-hook: ChangeLog

commit 4b22047f347d8fd65a36b2fc90e1a87dff8e93e3
Author: Eamon Walsh <[EMAIL PROTECTED]>
Date:   Thu Sep 27 12:27:19 2007 -0400

XI.h needs X.h for CARD32 on 64-bit systems.

diff --git a/XI.h b/XI.h
index ae52292..0bfefcc 100644
--- a/XI.h
+++ b/XI.h
@@ -50,9 +50,10 @@ SOFTWARE.
 /* Definitions used by the server, library and client */
 
 #ifndef _XI_H_
-
 #define _XI_H_
 
+#include  /* CARD32 */
+
 #define sz_xGetExtensionVersionReq 8
 #define sz_xGetExtensionVersionReply   32
 #define sz_xListInputDevicesReq4

commit 369dd283cfcf006e2cfe3496ebc5157839a3d04e
Author: James Cloos <[EMAIL PROTECTED]>
Date:   Mon Sep 3 05:54:06 2007 -0400

Add *~ to .gitignore to skip patch/emacs droppings

diff --git a/.gitignore b/.gitignore
index 2c3bca3..503dd99 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ configure
 install-sh
 missing
 inputproto.pc
+*~

commit 96b0c13a5a689b3a6dbc4249ca4ef364f778c003
Author: Peter Hutterer <[EMAIL PROTECTED]>
Date:   Fri Aug 31 17:58:27 2007 +0930

Bump to 1.4.2.1

No source changes, the 1.4.2 tarball had a busted configure script.

diff --git a/configure.ac b/configure.ac
index 72f9882..c010699 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.57])
-AC_INIT([InputProto], [1.4.2], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([InputProto], [1.4.2.1], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
 XORG_RELEASE_VERSION


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



x11proto-input: Changes to 'upstream-unstable'

2007-04-30 Thread David Nusinow
 XI.h |6 ++
 XIproto.h|2 +-
 configure.ac |2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 310a93f8e194aa070b0f1d40c8fd5ae941908dbe
Author: Peter Hutterer <[EMAIL PROTECTED]>
Date:   Thu Apr 26 11:06:18 2007 +0930

bump to 1.4.2

diff --git a/configure.ac b/configure.ac
index 057e1c5..72f9882 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.57])
-AC_INIT([InputProto], [1.4.1], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([InputProto], [1.4.2], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
 XORG_RELEASE_VERSION

commit c9bed7d4750c314002c16430a4dd75f95cc2f78d
Author: Peter Hutterer <[EMAIL PROTECTED]>
Date:   Tue Apr 24 22:53:27 2007 +0930

Add flags to be used for DevicePrensence's devchange field.

diff --git a/XI.h b/XI.h
index fbecd80..ae52292 100644
--- a/XI.h
+++ b/XI.h
@@ -250,6 +250,12 @@ SOFTWARE.
 
 #define _devicePresence 0
 
+#define DeviceAdded  0
+#define DeviceRemoved1
+#define DeviceEnabled2
+#define DeviceDisabled   3
+#define DeviceUnrecoverable  4  
+
 #define XI_BadDevice   0
 #define XI_BadEvent1
 #define XI_BadMode 2
diff --git a/XIproto.h b/XIproto.h
index 36b5a49..4f46f4f 100644
--- a/XIproto.h
+++ b/XIproto.h
@@ -1600,7 +1600,7 @@ typedef struct
 BYTEpad00;
 CARD16 sequenceNumber B16;
 Timetime B32;
-BYTEdevchange;
+BYTEdevchange; /* Device{Added|Removed|Enabled|Disabled} */
 BYTEdeviceid;
 CARD16  control B16;
 CARD32 pad02 B32;


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



x11proto-input: Changes to 'upstream-unstable'

2007-04-20 Thread Julien Cristau
 XInput.h |2 +-
 configure.ac |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c608d82c6b5b87ddc8d14862f528bdd69f5f5b72
Author: Daniel Stone <[EMAIL PROTECTED]>
Date:   Thu Feb 15 16:33:07 2007 +0200

bump to 1.4.1

diff --git a/configure.ac b/configure.ac
index aa96cc1..057e1c5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.57])
-AC_INIT([InputProto], [1.4], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([InputProto], [1.4.1], 
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
 XORG_RELEASE_VERSION

commit ad2edb61ffd8baf87b9ab249aa36b0c04a765f79
Author: Peter Hutterer <[EMAIL PROTECTED]>
Date:   Tue Jan 9 13:32:39 2007 +1030

Fix typo in DevicePresence() macro

diff --git a/XInput.h b/XInput.h
index e4066b1..e3585b4 100644
--- a/XInput.h
+++ b/XInput.h
@@ -151,7 +151,7 @@ SOFTWARE.
 
 #define DevicePresence(dpy, type, _class)   \
 {   \
-extern int_XiGetDevicePresenceNotifyEvent(Display *);   \
+extern int _XiGetDevicePresenceNotifyEvent(Display *);  \
 type = _XiGetDevicePresenceNotifyEvent(dpy);\
 _class =  (0x1 | _devicePresence);  \
 }


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]



x11proto-input: Changes to 'upstream-unstable'

2007-01-14 Thread David Nusinow
New branch 'upstream-unstable' available with the following commits:


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]