From adc9eb112b9e426c42f582e1dd2f033d4ff9de5a Mon Sep 17 00:00:00 2001 From: matthieu Date: Sun, 7 Sep 2008 13:24:46 +0000 Subject: [PATCH] Update to inputproto 1.4.4. Note that this version has removed the include of Xmd.h that caused the update to 1.4.3 to be reverted. --- proto/inputproto/ChangeLog | 284 +++++++++++++++++++++++++++++++++- proto/inputproto/Makefile.am | 10 ++ proto/inputproto/XI.h | 19 +-- proto/inputproto/XIproto.h | 2 +- proto/inputproto/configure.ac | 2 +- 5 files changed, 303 insertions(+), 14 deletions(-) diff --git a/proto/inputproto/ChangeLog b/proto/inputproto/ChangeLog index c722b519a..2e502aacb 100644 --- a/proto/inputproto/ChangeLog +++ b/proto/inputproto/ChangeLog @@ -1,4 +1,282 @@ -2005-12-14 Kevin E. Martin +commit c109e2ddb9cab22f185a877ab7e48002d1087400 +Author: Peter Hutterer +Date: Tue Jul 29 09:10:09 2008 +0930 - * configure.ac: - Update package version number for final X11R7 release candidate. + inputproto 1.4.4 + +commit f41d153886c3519ebaf767f9c0d3281b6adce030 +Author: Peter Hutterer +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) + +commit 852568991b251e9366da167f1b746a0a1db6adf0 +Author: Adam Jackson +Date: Mon Mar 10 09:31:51 2008 -0400 + + Typo fix. + +commit b5cbe2d93f6c0129b8f29da97778f6d1b15c38f9 +Author: Adam Jackson +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). + +commit 3edc1bf23b07ea47d7e1e32047e15c67333c663e +Author: Adam Jackson +Date: Wed Mar 5 22:06:19 2008 -0500 + + inputproto 1.4.3 + +commit 096b20bf5492d248b5c8ff0c1c28e221d59db724 +Author: Jesse Barnes +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. + +commit 9359e625787761e6b3df15f29bbf842c67a9516d +Author: James Cloos +Date: Thu Dec 6 16:39:02 2007 -0500 + + Replace static ChangeLog with dist-hook to generate from git log + +commit 4b22047f347d8fd65a36b2fc90e1a87dff8e93e3 +Author: Eamon Walsh +Date: Thu Sep 27 12:27:19 2007 -0400 + + XI.h needs X.h for CARD32 on 64-bit systems. + +commit f033750780b74d72056da93fd9a91140a978891b +Merge: 369dd28... 96b0c13... +Author: James Cloos +Date: Mon Sep 3 06:17:20 2007 -0400 + + Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/proto/inputproto + +commit 369dd283cfcf006e2cfe3496ebc5157839a3d04e +Author: James Cloos +Date: Mon Sep 3 05:54:06 2007 -0400 + + Add *~ to .gitignore to skip patch/emacs droppings + +commit 96b0c13a5a689b3a6dbc4249ca4ef364f778c003 +Author: Peter Hutterer +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. + +commit 310a93f8e194aa070b0f1d40c8fd5ae941908dbe +Author: Peter Hutterer +Date: Thu Apr 26 11:06:18 2007 +0930 + + bump to 1.4.2 + +commit c9bed7d4750c314002c16430a4dd75f95cc2f78d +Author: Peter Hutterer +Date: Tue Apr 24 22:53:27 2007 +0930 + + Add flags to be used for DevicePrensence's devchange field. + +commit c608d82c6b5b87ddc8d14862f528bdd69f5f5b72 +Author: Daniel Stone +Date: Thu Feb 15 16:33:07 2007 +0200 + + bump to 1.4.1 + +commit ad2edb61ffd8baf87b9ab249aa36b0c04a765f79 +Author: Peter Hutterer +Date: Tue Jan 9 13:32:39 2007 +1030 + + Fix typo in DevicePresence() macro + +commit a0be30da79e35e7d503c6eeb9021c2f63beb2176 +Author: Daniel Stone +Date: Sun Oct 22 16:40:11 2006 +0300 + + DeviceAbs{Area,Calib}: properly align 32-bit types + Decorate CARD32s and INT32s with B32. + +commit b1b3dbfd9b00d47c84c213bc6b7d61c5e8c80466 +Author: Daniel Stone +Date: Sun Oct 22 16:30:56 2006 +0300 + + DevicePresenceNotify: add deviceid field, with explanation + Add deviceid field, and an explanation of same in XInput.h. + deviceid is only used if a specific device changed, and control + is non-zero if a specific control on that device changed. + +commit 06ffd1e6b600d4e3f55ce7da69448a284ff5dac6 +Author: Zephaniah E. Hull +Date: Sat Oct 21 03:58:53 2006 -0400 + + DEVICE_TOUCHPAD -> DEVICE_ABS_CALIB. + + As it's really calibration for absolute devices, add some stuff. + + DEVICE_ABS_AREA + + Defines the area of the screen that an absolute device covers if it is sending + core events. + +commit 1fab95863efc2bbf9a5b836b3de31da4a956b4bd +Author: Daniel Stone +Date: Fri Oct 20 00:33:13 2006 +0300 + + add DEVICE_ENABLE control, add core indication + Add DEVICE_ENABLE control, which allows specific devices to be + enabled or disabled at runtime. + Add 'iscore' flag to DEVICE_CORE, which indicates whether or not the + device is a virtual core device. + +commit 926251a486b57197d735a426887acad6fdfd7dc6 +Author: Daniel Stone +Date: Tue Jul 18 11:56:37 2006 -0400 + + add XExtensionKeyboard and XExtensionPointer classes + Add two new classes of device, XExtensionKeyboard, and XExtensionPointer. + +commit 7a4a2a3e733378abced0a184627adfda4ed387b9 +Author: Daniel Stone +Date: Mon Jul 17 19:34:45 2006 -0400 + + add DevicePresenceNotify event, clean up + Add DevicePresenceNotify event, which indicates that something in the device + list changed (Kristian Høgsberg, Red Hat). + Add a core event control, which toggles the sending or not of core events by + an extended device. + Clean up some random detritus from the MetroLink merge. + +commit 6767671f502964d385aa41de3a45fb479c6330c0 +Author: Alan Coopersmith +Date: Fri Jul 14 18:56:18 2006 -0700 + + renamed: .cvsignore -> .gitignore + +commit 4cc2697880ae61723094dacf78ffe77d81f6e0ee +Author: Kevin E Martin +Date: Thu Dec 15 00:24:37 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit 3ade2fe8443f572abeee73b4fa8e986e4a054017 +Author: Kevin E Martin +Date: Wed Oct 19 02:48:14 2005 +0000 + + Update package version number for RC1 release. + +commit 67498db2df7435d9d59eda4ac444c6560da839b3 +Author: Eric Anholt +Date: Tue Aug 2 19:19:38 2005 +0000 + + Add basic .cvsignore files for proto modules. + +commit 742a1eb222d662fc9247ab7c1bd337ffef01eafb +Author: Kevin E Martin +Date: Fri Jul 29 21:22:55 2005 +0000 + + Various changes preparing packages for RC0: + - Verify and update package version numbers as needed + - Implement versioning scheme + - Change bug address to point to bugzilla bug entry form + - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to + reenable it) + - Fix makedepend to use pkgconfig and pass distcheck + - Update build script to build macros first + - Update modular Xorg version + +commit 9161a356397a07002e03cf1846d212c7154f4c52 +Author: Daniel Stone +Date: Sat May 21 04:04:21 2005 +0000 + + Set version to 1.3. + +commit 492f0a9e16bfe9cfb2c7b888b5b5e511db2bf83b +Author: Adam Jackson +Date: Thu May 19 00:22:39 2005 +0000 + + revert last change, didn't do right thing at all, sorry for the noise + +commit ec71e17293b90ff5eeaa97566751fc5c3955904a +Author: Adam Jackson +Date: Thu May 19 00:10:18 2005 +0000 + + Require automake 1.7 in AM_INIT_AUTOMAKE + +commit 242316c65e53d1bba244e4f35e5a93718b0ea8d0 +Author: Josh Triplett +Date: Mon May 16 03:30:03 2005 +0000 + + Add COPYING file for Input. + +commit 5c5945a47990b7bc077bcfdbabb6e0003cbf1659 +Author: Søren Sandmann Pedersen +Date: Mon May 9 18:20:04 2005 +0000 + + Change all the protonames from Ext to Proto. + +commit 518f527ab685d2d082796460113bb7a9ea9bfe15 +Author: Kevin E Martin +Date: Fri May 6 01:46:30 2005 +0000 + + Initial build system files for proto module. + +commit 4254b2967e3c5f256138f35de1ab49efff87220c +Author: Egbert Eich +Date: Fri Apr 23 18:43:06 2004 +0000 + + Merging XORG-CURRENT into trunk + +commit ca910a158bdc060d17cf3c00f93c82c3a6ee6f05 +Author: Egbert Eich +Date: Sun Mar 14 08:31:35 2004 +0000 + + Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 + +commit 08e413c25f385e51466ef3309d880c1f63bf0a73 +Author: Egbert Eich +Date: Wed Mar 3 12:10:54 2004 +0000 + + Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 + +commit 1b98dbf2eab5a8ef74afda0c669c9fdfc6461cda +Author: Egbert Eich +Date: Thu Feb 26 13:35:11 2004 +0000 + + readding XFree86's cvs IDs + +commit f276a601f272742ea8570fae4326c172cf4b8723 +Author: Egbert Eich +Date: Thu Feb 26 09:22:27 2004 +0000 + + Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004 + +commit 47d36cccfdf0e65848bb2e9595779501a76d6000 +Author: Kaleb Keithley +Date: Tue Nov 25 19:28:02 2003 +0000 + + XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks + +commit 4383a95e0bbc2f09394deefc453c2edd1c813d0f +Author: Kaleb Keithley +Date: Fri Nov 14 16:48:42 2003 +0000 + + XFree86 4.3.0.1 + +commit 51468f1607f0b88576628c89e85d159afbb4628e +Author: Kaleb Keithley +Date: Fri Nov 14 15:54:35 2003 +0000 + + R6.6 is the Xorg base-line diff --git a/proto/inputproto/Makefile.am b/proto/inputproto/Makefile.am index e39ea0a25..f8d4a3207 100644 --- a/proto/inputproto/Makefile.am +++ b/proto/inputproto/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 diff --git a/proto/inputproto/XI.h b/proto/inputproto/XI.h index ae5229249..51a417514 100644 --- a/proto/inputproto/XI.h +++ b/proto/inputproto/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,16 +43,14 @@ 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_ -#define sz_xGetExtensionVersionReq 8 -#define sz_xGetExtensionVersionReply 32 +#define sz_xGetExtensionVersionReq 8 +#define sz_xGetExtensionVersionReply 32 #define sz_xListInputDevicesReq 4 #define sz_xListInputDevicesReply 32 #define sz_xOpenDeviceReq 8 @@ -254,7 +250,8 @@ SOFTWARE. #define DeviceRemoved 1 #define DeviceEnabled 2 #define DeviceDisabled 3 -#define DeviceUnrecoverable 4 +#define DeviceUnrecoverable 4 +#define DeviceControlChanged 5 #define XI_BadDevice 0 #define XI_BadEvent 1 @@ -262,12 +259,16 @@ SOFTWARE. #define XI_DeviceBusy 3 #define XI_BadClass 4 -/* 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 -typedef CARD32 XEventClass; +typedef unsigned int XEventClass; #else typedef unsigned long XEventClass; #endif diff --git a/proto/inputproto/XIproto.h b/proto/inputproto/XIproto.h index 4f46f4f65..6d4bf64b2 100644 --- a/proto/inputproto/XIproto.h +++ b/proto/inputproto/XIproto.h @@ -1600,7 +1600,7 @@ typedef struct BYTE pad00; CARD16 sequenceNumber B16; Time time B32; - BYTE devchange; /* Device{Added|Removed|Enabled|Disabled} */ + BYTE devchange; /* Device{Added|Removed|Enabled|Disabled|ControlChanged} */ BYTE deviceid; CARD16 control B16; CARD32 pad02 B32; diff --git a/proto/inputproto/configure.ac b/proto/inputproto/configure.ac index c01069912..b34346539 100644 --- a/proto/inputproto/configure.ac +++ b/proto/inputproto/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.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) XORG_RELEASE_VERSION