Update to recordproto 1.14

9 files changed, 578 insertions, 700 deletions

diff --git a/proto/recordproto/ChangeLog b/proto/recordproto/ChangeLog
index c722b519a..81eec582e 100644
--- a/proto/recordproto/ChangeLog
+++ b/proto/recordproto/ChangeLog
@@ -1,4 +1,194 @@
-2005-12-14  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+commit 38fd3772f3a5a107fa6e9d94e0be7bd276f771b6
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Thu Oct 1 19:38:36 2009 +1000
 
-	* configure.ac:
-	Update package version number for final X11R7 release candidate.
+    recordproto 1.14
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit fd428befaa8a76b216d5e42e63b688d4d55fdbc5
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Thu Oct 1 19:38:12 2009 +1000
+
+    Require macros 1.3 for XORG_DEFAULT_OPTIONS
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 379a691a45f4a637b8b7bbea9d3c7c2454f5cde6
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Sat Aug 15 21:47:26 2009 +1000
+
+    Bump to 1.13.99.1
+
+commit a7419fc173ccb949e6b20e1608bdcb816157a17f
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Tue Aug 18 11:08:27 2009 +1000
+
+    Rename recordstr.h to recordproto.h, provide a stub instead.
+    
+    Renaming for consistency with other protocol packages. recordstr.h is a
+    simple stub warning against the use of this header.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 5e35e18e81da8a6a891bc73ac828d45eae91c53c
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Fri Aug 14 13:34:52 2009 +1000
+
+    Remove xlib headers, rename record.h to recordconst.h.
+    
+    Xlib headers moved to libXtst.
+    
+    This patch also moves some defines from recordstr.h into recordconst.h.
+    These defines are the ones possibly used by clients (e.g. RECORD_NAME).
+    Clients should never need to include recordstr.h.
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 59c7795cb8cf932c5c5942bb07278854c89a6a67
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date:   Fri Aug 14 13:29:13 2009 +1000
+
+    remove RCS tags
+    
+    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit eb14a315478af94dc588e1ed29628830deef90e4
+Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
+Date:   Tue Jan 27 20:06:28 2009 -0200
+
+    Janitor: Correct make distcheck and dont distribute autogen.sh
+
+commit b38fe6228b369c7bf32e4003658395dd45352257
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Thu Dec 6 16:39:05 2007 -0500
+
+    Replace static ChangeLog with dist-hook to generate from git log
+
+commit ecaf1d1c89a1ce914c387c8d9722d6cdaa82a9e6
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Mon Sep 3 05:54:13 2007 -0400
+
+    Add *~ to .gitignore to skip patch/emacs droppings
+
+commit 400d7a5db8cb56464a2ff48b21a1b53e7cc5b295
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Fri Jul 14 18:56:28 2006 -0700
+
+    renamed: .cvsignore -> .gitignore
+
+commit 18c27afa9a8a96bd8ba05ba6cd1e3bf0922601cb
+Author: Kevin E Martin <kem@kem.org>
+Date:   Thu Dec 15 00:24:38 2005 +0000
+
+    Update package version number for final X11R7 release candidate.
+
+commit 6f8dbc14edcff010da66a1bf2d0f5e570f2d0812
+Author: Kevin E Martin <kem@kem.org>
+Date:   Wed Oct 19 02:48:14 2005 +0000
+
+    Update package version number for RC1 release.
+
+commit b298e441128e479b12615acab77df63a1ce516b1
+Author: Eric Anholt <anholt@freebsd.org>
+Date:   Tue Aug 2 19:19:39 2005 +0000
+
+    Add basic .cvsignore files for proto modules.
+
+commit b9e116fe4b9970696029d79c63bb36a0960a7861
+Author: Kevin E Martin <kem@kem.org>
+Date:   Fri Jul 29 21:22:56 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 a895a7e1f18706d4a91a390f1266bbd4a46f8231
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Sat May 21 04:15:05 2005 +0000
+
+    Set version to 1.13.
+
+commit 3e7909df321b6969bc020d84a54bea6af31fc80c
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Thu May 19 00:22:40 2005 +0000
+
+    revert last change, didn't do right thing at all, sorry for the noise
+
+commit 8f287f8cfaeac5c28560fa94ca215244c1bb7776
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Thu May 19 00:10:19 2005 +0000
+
+    Require automake 1.7 in AM_INIT_AUTOMAKE
+
+commit 3cb43fd0e261894865a8a86d598adb41eec0cc0e
+Author: Josh Triplett <josh@speakeasy.net>
+Date:   Tue May 17 07:08:40 2005 +0000
+
+    Add COPYING file for Record.
+
+commit 7bb7d5ca1396f83d81cc4164b975e5dc2597e678
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date:   Mon May 9 18:20:06 2005 +0000
+
+    Change all the protonames from <extension>Ext to <extension>Proto.
+
+commit 81198a3b1bbff8109801c64c44f732bb26abcb89
+Author: Kevin E Martin <kem@kem.org>
+Date:   Fri May 6 01:46:31 2005 +0000
+
+    Initial build system files for proto module.
+
+commit c7dc29e5d64a7fc308874512321f43c194ac11e2
+Author: Egbert Eich <eich@suse.de>
+Date:   Fri Apr 23 18:43:06 2004 +0000
+
+    Merging XORG-CURRENT into trunk
+
+commit b62b2b4b4cd80f05e48c634d16e05bed76f80607
+Author: Egbert Eich <eich@suse.de>
+Date:   Sun Mar 14 08:31:36 2004 +0000
+
+    Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit f6c0db4c6e249901109722da6d5bd7be3bde377c
+Author: Egbert Eich <eich@suse.de>
+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 28f7d2358c7b2a07f08ea9b872aab5ee42440b56
+Author: Egbert Eich <eich@suse.de>
+Date:   Thu Feb 26 13:35:14 2004 +0000
+
+    readding XFree86's cvs IDs
+
+commit c435e3cc568e9d690f7b1291084e676ae3376d54
+Author: Egbert Eich <eich@suse.de>
+Date:   Thu Feb 26 09:22:28 2004 +0000
+
+    Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 45626afe8e328c1c1deb32cb6e96914ba8923101
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+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 3b9115eb4dd86b813ac3423f2d508535a2fcaf09
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Fri Nov 14 16:48:43 2003 +0000
+
+    XFree86 4.3.0.1
+
+commit 5891b79405209d51d5fcf20ff562cf7120c3017f
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Fri Nov 14 15:54:35 2003 +0000
+
+    R6.6 is the Xorg base-line
diff --git a/proto/recordproto/Makefile b/proto/recordproto/Makefile
index a71113a2c..840c76ffc 100644
--- a/proto/recordproto/Makefile
+++ b/proto/recordproto/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.1 2008/03/25 23:28:20 matthieu Exp $
+# $OpenBSD: Makefile,v 1.2 2010/05/10 20:01:46 matthieu Exp $
 
 HEADERS_SUBDIR=	X11/extensions/
-HEADERS=	record.h recordstr.h
+HEADERS=	recordconst.h recordproto.h recordstr.h
 PKGCONFIG=	recordproto.pc
 
 .include <bsd.xorg.mk>
diff --git a/proto/recordproto/Makefile.am b/proto/recordproto/Makefile.am
index c4aaee387..dd0b02884 100644
--- a/proto/recordproto/Makefile.am
+++ b/proto/recordproto/Makefile.am
@@ -1,9 +1,20 @@
 recorddir = $(includedir)/X11/extensions
 record_HEADERS = \
-	record.h \
+	recordconst.h \
+	recordproto.h \
 	recordstr.h
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = recordproto.pc
 
-EXTRA_DIST = autogen.sh recordproto.pc.in
+EXTRA_DIST = recordproto.pc.in
+
+EXTRA_DIST += ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+	$(CHANGELOG_CMD)
+
+dist-hook: ChangeLog
diff --git a/proto/recordproto/configure.ac b/proto/recordproto/configure.ac
index 4379c214e..1709ce6fa 100644
--- a/proto/recordproto/configure.ac
+++ b/proto/recordproto/configure.ac
@@ -1,8 +1,12 @@
 AC_PREREQ([2.57])
-AC_INIT([RecordProto], [1.13.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([RecordProto], [1.14], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
-XORG_RELEASE_VERSION
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
+
+XORG_DEFAULT_OPTIONS
 
 AC_OUTPUT([Makefile
            recordproto.pc])
diff --git a/proto/recordproto/mkinstalldirs b/proto/recordproto/mkinstalldirs
deleted file mode 100644
index 259dbfcd3..000000000
--- a/proto/recordproto/mkinstalldirs
+++ /dev/null
@@ -1,158 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-
-scriptversion=2005-06-29.22
-
-# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Public domain.
-#
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-errstatus=0
-dirmode=
-
-usage="\
-Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
-
-Create each directory DIR (with mode MODE, if specified), including all
-leading file name components.
-
-Report bugs to <bug-automake@gnu.org>."
-
-# process command line arguments
-while test $# -gt 0 ; do
-  case $1 in
-    -h | --help | --h*)         # -h for help
-      echo "$usage"
-      exit $?
-      ;;
-    -m)                         # -m PERM arg
-      shift
-      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
-      dirmode=$1
-      shift
-      ;;
-    --version)
-      echo "$0 $scriptversion"
-      exit $?
-      ;;
-    --)                         # stop option processing
-      shift
-      break
-      ;;
-    -*)                         # unknown option
-      echo "$usage" 1>&2
-      exit 1
-      ;;
-    *)                          # first non-opt arg
-      break
-      ;;
-  esac
-done
-
-for file
-do
-  if test -d "$file"; then
-    shift
-  else
-    break
-  fi
-done
-
-case $# in
-  0) exit 0 ;;
-esac
-
-# Solaris 8's mkdir -p isn't thread-safe.  If you mkdir -p a/b and
-# mkdir -p a/c at the same time, both will detect that a is missing,
-# one will create a, then the other will try to create a and die with
-# a "File exists" error.  This is a problem when calling mkinstalldirs
-# from a parallel make.  We use --version in the probe to restrict
-# ourselves to GNU mkdir, which is thread-safe.
-case $dirmode in
-  '')
-    if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-      echo "mkdir -p -- $*"
-      exec mkdir -p -- "$@"
-    else
-      # On NextStep and OpenStep, the `mkdir' command does not
-      # recognize any option.  It will interpret all options as
-      # directories to create, and then abort because `.' already
-      # exists.
-      test -d ./-p && rmdir ./-p
-      test -d ./--version && rmdir ./--version
-    fi
-    ;;
-  *)
-    if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
-       test ! -d ./--version; then
-      echo "mkdir -m $dirmode -p -- $*"
-      exec mkdir -m "$dirmode" -p -- "$@"
-    else
-      # Clean up after NextStep and OpenStep mkdir.
-      for d in ./-m ./-p ./--version "./$dirmode";
-      do
-        test -d $d && rmdir $d
-      done
-    fi
-    ;;
-esac
-
-for file
-do
-  case $file in
-    /*) pathcomp=/ ;;
-    *)  pathcomp= ;;
-  esac
-  oIFS=$IFS
-  IFS=/
-  set fnord $file
-  shift
-  IFS=$oIFS
-
-  for d
-  do
-    test "x$d" = x && continue
-
-    pathcomp=$pathcomp$d
-    case $pathcomp in
-      -*) pathcomp=./$pathcomp ;;
-    esac
-
-    if test ! -d "$pathcomp"; then
-      echo "mkdir $pathcomp"
-
-      mkdir "$pathcomp" || lasterr=$?
-
-      if test ! -d "$pathcomp"; then
-	errstatus=$lasterr
-      else
-	if test ! -z "$dirmode"; then
-	  echo "chmod $dirmode $pathcomp"
-	  lasterr=
-	  chmod "$dirmode" "$pathcomp" || lasterr=$?
-
-	  if test ! -z "$lasterr"; then
-	    errstatus=$lasterr
-	  fi
-	fi
-      fi
-    fi
-
-    pathcomp=$pathcomp/
-  done
-done
-
-exit $errstatus
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff --git a/proto/recordproto/record.h b/proto/recordproto/record.h
deleted file mode 100644
index d88be99dc..000000000
--- a/proto/recordproto/record.h
+++ /dev/null
@@ -1,211 +0,0 @@
-/* 
-$Xorg: record.h,v 1.3 2000/08/18 04:05:46 coskrey Exp $
-*/
-
-/***************************************************************************
- * Copyright 1995 Network Computing Devices
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Network Computing Devices 
- * not be used in advertising or publicity pertaining to distribution
- * of the software without specific, written prior permission.
- *
- * NETWORK COMPUTING DEVICES DISCLAIMs ALL WARRANTIES WITH REGARD TO 
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
- * AND FITNESS, IN NO EVENT SHALL NETWORK COMPUTING DEVICES BE LIABLE 
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN 
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING 
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- **************************************************************************/
-/* $XFree86$ */
-
-#ifndef _RECORD_H_
-#define _RECORD_H_
-
-#define XRecordBadContext       0	/* Not a valid RC */
-
-/*
- * Constants for arguments of various requests
- */
-#define	XRecordFromServerTime		0x01
-#define	XRecordFromClientTime		0x02
-#define	XRecordFromClientSequence	0x04
-
-#define XRecordCurrentClients		1
-#define XRecordFutureClients		2
-#define XRecordAllClients		3
-
-#define XRecordFromServer           	0
-#define XRecordFromClient               1
-#define XRecordClientStarted           	2
-#define XRecordClientDied               3
-#define XRecordStartOfData		4
-#define XRecordEndOfData		5
-
-typedef unsigned long   XRecordClientSpec;
-
-#ifndef _XRECORD_SERVER_
-
-typedef unsigned long 	XRecordContext;
-
-typedef struct
-{
-    unsigned char 	first;
-    unsigned char 	last;
-} XRecordRange8;
-
-typedef struct
-{
-    unsigned short 	first;
-    unsigned short 	last;
-} XRecordRange16; 
-
-typedef struct
-{
-    XRecordRange8	ext_major;
-    XRecordRange16 	ext_minor; 
-} XRecordExtRange; 
-
-typedef struct
-{
-    XRecordRange8     core_requests;	/* core X requests */
-    XRecordRange8     core_replies;	/* core X replies */
-    XRecordExtRange   ext_requests;	/* extension requests */
-    XRecordExtRange   ext_replies;	/* extension replies */
-    XRecordRange8     delivered_events;	/* delivered core and ext events */
-    XRecordRange8     device_events; 	/* all core and ext device events */
-    XRecordRange8     errors;		/* core X and ext errors */
-    Bool	      client_started;	/* connection setup reply */
-    Bool              client_died; 	/* notice of client disconnect */    
-} XRecordRange;
-
-typedef struct
-{
-    XRecordClientSpec 	client;
-    unsigned long 	nranges; 
-    XRecordRange 	**ranges;
-} XRecordClientInfo;
-
-typedef struct
-{
-    Bool 		enabled;
-    int			datum_flags; 
-    unsigned long 	nclients; 
-    XRecordClientInfo 	**client_info;
-} XRecordState;
-
-typedef struct
-{
-    XID 		id_base;
-    Time		server_time; 
-    unsigned long 	client_seq;
-    int			category; 
-    Bool 		client_swapped;
-    unsigned char 	*data;
-    unsigned long 	data_len;	/* in 4-byte units */
-} XRecordInterceptData;
-
-_XFUNCPROTOBEGIN
-
-/*********************************************************
- *
- * Prototypes 
- *
- */
-
-XID XRecordIdBaseMask(
-    Display *dpy
-);
-
-extern Status XRecordQueryVersion(
-    Display* 			/* dpy */,
-    int* 			/* cmajor_return */, 
-    int*			/* cminor_return */  
-);
-
-extern XRecordContext XRecordCreateContext(
-    Display*			/* dpy */, 
-    int				/* datum_flags */, 
-    XRecordClientSpec*		/* clients */,
-    int				/* nclients */,     
-    XRecordRange**              /* ranges */,
-    int				/* nranges */
-);
-
-extern XRecordRange *XRecordAllocRange(
-    void
-);
-
-extern Status XRecordRegisterClients(
-    Display* 			/* dpy */, 
-    XRecordContext 		/* context */, 
-    int				/* datum_flags */,
-    XRecordClientSpec*		/* clients */,
-    int				/* nclients */, 
-    XRecordRange** 		/* ranges */,  
-    int				/* nranges */
-);
-
-extern Status XRecordUnregisterClients(
-    Display* 			/* dpy */, 
-    XRecordContext 		/* context */, 
-    XRecordClientSpec*		/* clients */,
-    int				/* nclients */ 
-);
-
-extern Status XRecordGetContext(
-    Display*			/* dpy */,
-    XRecordContext 		/* context */, 
-    XRecordState** 		/* state_return */ 
-);
-
-extern void XRecordFreeState(
-XRecordState*			/* state */
-); 
-
-typedef void (*XRecordInterceptProc) (
-    XPointer			/* closure */, 
-    XRecordInterceptData*	/* recorded_data */
-);
-
-extern Status XRecordEnableContext(
-    Display*			/* dpy */,
-    XRecordContext 		/* context */, 
-    XRecordInterceptProc	/* callback */,
-    XPointer			/* closure */
-); 
-
-extern Status XRecordEnableContextAsync(
-    Display*			/* dpy */,
-    XRecordContext 		/* context */, 
-    XRecordInterceptProc	/* callback */,
-    XPointer			/* closure */
-); 
-
-extern void XRecordProcessReplies(
-    Display*			/* dpy */
-); 
-
-extern void XRecordFreeData(
-XRecordInterceptData*	/* data */
-); 
-
-extern Status XRecordDisableContext(
-    Display*			/* dpy */,
-    XRecordContext 		/* context */
-); 
-
-extern Status XRecordFreeContext(
-    Display* 			/* dpy */, 
-    XRecordContext 		/* context */
-);
-
-_XFUNCPROTOEND
-
-#endif /* _XRECORD_SERVER_ */
-
-#endif /* _RECORD_H_ */
diff --git a/proto/recordproto/recordconst.h b/proto/recordproto/recordconst.h
new file mode 100644
index 000000000..4819de77e
--- /dev/null
+++ b/proto/recordproto/recordconst.h
@@ -0,0 +1,54 @@
+/***************************************************************************
+ * Copyright 1995 Network Computing Devices
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Network Computing Devices 
+ * not be used in advertising or publicity pertaining to distribution
+ * of the software without specific, written prior permission.
+ *
+ * NETWORK COMPUTING DEVICES DISCLAIMs ALL WARRANTIES WITH REGARD TO 
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+ * AND FITNESS, IN NO EVENT SHALL NETWORK COMPUTING DEVICES BE LIABLE 
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN 
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING 
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ **************************************************************************/
+
+#ifndef _RECORDCONST_H_
+#define _RECORDCONST_H_
+
+#define RECORD_NAME			"RECORD"
+#define RECORD_MAJOR_VERSION		1
+#define RECORD_MINOR_VERSION		13
+#define RECORD_LOWEST_MAJOR_VERSION	1
+#define RECORD_LOWEST_MINOR_VERSION	12
+
+#define XRecordBadContext       0	/* Not a valid RC */
+
+#define RecordNumErrors         (XRecordBadContext + 1)
+#define RecordNumEvents		0L
+
+/*
+ * Constants for arguments of various requests
+ */
+#define	XRecordFromServerTime		0x01
+#define	XRecordFromClientTime		0x02
+#define	XRecordFromClientSequence	0x04
+
+#define XRecordCurrentClients		1
+#define XRecordFutureClients		2
+#define XRecordAllClients		3
+
+#define XRecordFromServer           	0
+#define XRecordFromClient               1
+#define XRecordClientStarted           	2
+#define XRecordClientDied               3
+#define XRecordStartOfData		4
+#define XRecordEndOfData		5
+
+
+#endif /* _RECORD_H_ */
diff --git a/proto/recordproto/recordproto.h b/proto/recordproto/recordproto.h
new file mode 100644
index 000000000..01bc9529f
--- /dev/null
+++ b/proto/recordproto/recordproto.h
@@ -0,0 +1,306 @@
+/***************************************************************************
+ * Copyright 1995 Network Computing Devices
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and
+ * its documentation for any purpose is hereby granted without fee, provided
+ * that the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of Network Computing Devices
+ * not be used in advertising or publicity pertaining to distribution
+ * of the software without specific, written prior permission.
+ *
+ * NETWORK COMPUTING DEVICES DISCLAIMs ALL WARRANTIES WITH REGARD TO
+ * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS, IN NO EVENT SHALL NETWORK COMPUTING DEVICES BE LIABLE
+ * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ **************************************************************************/
+
+#ifndef _RECORDPROTO_H_
+#define _RECORDPROTO_H_
+
+#include <X11/extensions/recordconst.h>
+
+/* only difference between 1.12 and 1.13 is byte order of device events,
+   which the library doesn't deal with. */
+
+/*********************************************************
+ *
+ * Protocol request constants
+ *
+ */
+#define X_RecordQueryVersion    0     /* First request from client */
+#define X_RecordCreateContext   1     /* Create client RC */
+#define X_RecordRegisterClients 2     /* Add to client RC */
+#define X_RecordUnregisterClients 3   /* Delete from client RC */
+#define X_RecordGetContext      4     /* Query client RC */
+#define X_RecordEnableContext   5     /* Enable interception and reporting */
+#define X_RecordDisableContext  6     /* Disable interception and reporting */
+#define X_RecordFreeContext     7     /* Free client RC */
+
+#define sz_XRecordRange		32
+#define sz_XRecordClientInfo 	12
+#define sz_XRecordState 	16
+#define sz_XRecordDatum 	32
+
+
+#define XRecordGlobaldef
+#define XRecordGlobalref extern
+
+#define RecordMaxEvent     	(128L-1L)
+#define RecordMinDeviceEvent	(2L)
+#define RecordMaxDeviceEvent	(6L)
+#define RecordMaxError          (256L-1L)
+#define RecordMaxCoreRequest    (128L-1L)
+#define RecordMaxExtRequest     (256L-1L)
+#define RecordMinExtRequest     (129L-1L)
+
+#define RECORD_RC 		CARD32
+#define RECORD_XIDBASE		CARD32
+#define RECORD_CLIENTSPEC	CARD32
+#define RECORD_ELEMENT_HEADER	CARD8
+
+typedef RECORD_CLIENTSPEC RecordClientSpec, *RecordClientSpecPtr;
+
+typedef struct
+{
+    CARD8	first;
+    CARD8	last;
+} RECORD_RANGE8;
+
+typedef struct
+{
+    CARD16	first B16;
+    CARD16	last B16;
+} RECORD_RANGE16;
+
+typedef struct
+{
+    RECORD_RANGE8	majorCode;
+    RECORD_RANGE16	minorCode;
+} RECORD_EXTRANGE;
+
+typedef struct
+{
+    RECORD_RANGE8	coreRequests;
+    RECORD_RANGE8	coreReplies;
+    RECORD_EXTRANGE	extRequests;
+    RECORD_EXTRANGE	extReplies;
+    RECORD_RANGE8	deliveredEvents;
+    RECORD_RANGE8	deviceEvents;
+    RECORD_RANGE8	errors;
+    BOOL		clientStarted;
+    BOOL		clientDied;
+} RECORDRANGE;
+#define sz_RECORDRANGE 	24
+
+/* typedef RECORDRANGE xRecordRange, *xRecordRangePtr;
+#define sz_xRecordRange 24 */
+
+/* Cannot have structures within structures going over the wire */
+typedef struct
+{
+    CARD8       	coreRequestsFirst;
+    CARD8       	coreRequestsLast;
+    CARD8       	coreRepliesFirst;
+    CARD8       	coreRepliesLast;
+    CARD8  		extRequestsMajorFirst;
+    CARD8		extRequestsMajorLast;
+    CARD16  		extRequestsMinorFirst B16;
+    CARD16  		extRequestsMinorLast B16;
+    CARD8  		extRepliesMajorFirst;
+    CARD8		extRepliesMajorLast;
+    CARD16  		extRepliesMinorFirst B16;
+    CARD16  		extRepliesMinorLast B16;
+    CARD8       	deliveredEventsFirst;
+    CARD8       	deliveredEventsLast;
+    CARD8		deviceEventsFirst;
+    CARD8		deviceEventsLast;
+    CARD8       	errorsFirst;
+    CARD8       	errorsLast;
+    BOOL                clientStarted;
+    BOOL		clientDied;
+} xRecordRange;
+#define sz_xRecordRange 24
+
+typedef struct
+{
+    RECORD_CLIENTSPEC	clientResource B32;
+    CARD32		nRanges B32;
+/* LISTofRECORDRANGE */
+} RECORD_CLIENT_INFO;
+
+typedef RECORD_CLIENT_INFO xRecordClientInfo;
+
+/*
+ * Initialize
+ */
+typedef struct {
+    CARD8       reqType;
+    CARD8       recordReqType;
+    CARD16      length B16;
+    CARD16      majorVersion B16;
+    CARD16      minorVersion B16;
+} xRecordQueryVersionReq;
+#define sz_xRecordQueryVersionReq 	8
+
+typedef struct
+{
+    CARD8   type;
+    CARD8   pad0;
+    CARD16  sequenceNumber B16;
+    CARD32  length	 B32;
+    CARD16  majorVersion B16;
+    CARD16  minorVersion B16;
+    CARD32  pad1	 B32;
+    CARD32  pad2	 B32;
+    CARD32  pad3	 B32;
+    CARD32  pad4	 B32;
+    CARD32  pad5	 B32;
+ } xRecordQueryVersionReply;
+#define sz_xRecordQueryVersionReply  	32
+
+/*
+ * Create RC
+ */
+typedef struct
+{
+    CARD8     		reqType;
+    CARD8     		recordReqType;
+    CARD16    		length B16;
+    RECORD_RC		context B32;
+    RECORD_ELEMENT_HEADER elementHeader;
+    CARD8		pad;
+    CARD16		pad0 B16;
+    CARD32		nClients B32;
+    CARD32              nRanges B32;
+/* LISTofRECORD_CLIENTSPEC */
+/* LISTofRECORDRANGE */
+} xRecordCreateContextReq;
+#define sz_xRecordCreateContextReq 	20
+
+/*
+ * Add to  RC
+ */
+typedef struct
+{
+    CARD8     		reqType;
+    CARD8     		recordReqType;
+    CARD16    		length B16;
+    RECORD_RC		context B32;
+    RECORD_ELEMENT_HEADER elementHeader;
+    CARD8		pad;
+    CARD16		pad0 B16;
+    CARD32		nClients B32;
+    CARD32              nRanges B32;
+/* LISTofRECORD_CLIENTSPEC */
+/* LISTofRECORDRANGE */
+} xRecordRegisterClientsReq;
+#define sz_xRecordRegisterClientsReq 	20
+
+/*
+ * Delete from RC
+ */
+typedef struct
+{
+    CARD8     		reqType;
+    CARD8     		recordReqType;
+    CARD16    		length B16;
+    RECORD_RC		context B32;
+    CARD32		nClients B32;
+/* LISTofRECORD_CLIENTSPEC */
+} xRecordUnregisterClientsReq;
+#define sz_xRecordUnregisterClientsReq 	12
+
+/*
+ * Query RC
+ */
+typedef struct
+{
+    CARD8     	reqType;
+    CARD8     	recordReqType;
+    CARD16    	length B16;
+    RECORD_RC	context B32;
+} xRecordGetContextReq;
+#define sz_xRecordGetContextReq 		8
+
+typedef struct
+{
+    CARD8   	type;
+    BOOL    	enabled;
+    CARD16  	sequenceNumber B16;
+    CARD32  	length	 B32;
+    RECORD_ELEMENT_HEADER  elementHeader;
+    CARD8	pad;
+    CARD16	pad0 B16;
+    CARD32  	nClients B32;
+    CARD32  	pad1 B32;
+    CARD32  	pad2 B32;
+    CARD32  	pad3 B32;
+    CARD32  	pad4 B32;
+/* LISTofCLIENT_INFO */ 		/* intercepted-clients */
+} xRecordGetContextReply;
+#define sz_xRecordGetContextReply  	32
+
+/*
+ * Enable data interception
+ */
+typedef struct
+{
+    CARD8     	reqType;
+    CARD8     	recordReqType;
+    CARD16    	length B16;
+    RECORD_RC	context B32;
+} xRecordEnableContextReq;
+#define sz_xRecordEnableContextReq 	8
+
+typedef struct
+{
+    CARD8		type;
+    CARD8		category;
+    CARD16		sequenceNumber B16;
+    CARD32		length B32;
+    RECORD_ELEMENT_HEADER  elementHeader;
+    BOOL		clientSwapped;
+    CARD16		pad1 B16;
+    RECORD_XIDBASE 	idBase B32;
+    CARD32		serverTime B32;
+    CARD32		recordedSequenceNumber B32;
+    CARD32		pad3 B32;
+    CARD32		pad4 B32;
+    /* BYTE		data; */
+} xRecordEnableContextReply;
+#define sz_xRecordEnableContextReply 	32
+
+/*
+ * Disable data interception
+ */
+typedef struct
+{
+    CARD8     	reqType;
+    CARD8     	recordReqType;
+    CARD16    	length B16;
+    RECORD_RC 	context B32;
+} xRecordDisableContextReq;
+#define sz_xRecordDisableContextReq	8
+
+/*
+ * Free RC
+ */
+typedef struct
+{
+    CARD8     	reqType;
+    CARD8     	recordReqType;
+    CARD16    	length B16;
+    RECORD_RC 	context B32;
+} xRecordFreeContextReq;
+#define sz_xRecordFreeContextReq 	8
+
+#undef RECORD_RC
+#undef RECORD_XIDBASE
+#undef RECORD_ELEMENT_HEADER
+#undef RECORD_CLIENTSPEC
+
+#endif
diff --git a/proto/recordproto/recordstr.h b/proto/recordproto/recordstr.h
index 246d34f1a..7f269b77e 100644
--- a/proto/recordproto/recordstr.h
+++ b/proto/recordproto/recordstr.h
@@ -1,322 +1,4 @@
-/*
-#ifndef lint
-$Xorg: recordstr.h,v 1.3 2000/08/18 04:05:46 coskrey Exp $
-static char sccsid[ ] = "@(#) recordstr.h 1.5 6/5/95 12:37:44";
-#endif
-*/
-
-/***************************************************************************
- * Copyright 1995 Network Computing Devices
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Network Computing Devices
- * not be used in advertising or publicity pertaining to distribution
- * of the software without specific, written prior permission.
- *
- * NETWORK COMPUTING DEVICES DISCLAIMs ALL WARRANTIES WITH REGARD TO
- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL NETWORK COMPUTING DEVICES BE LIABLE
- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- **************************************************************************/
-/* $XFree86$ */
-
-#ifndef _RECORDSTR_H_
-#define _RECORDSTR_H_
-
-#include <X11/extensions/record.h>
-
-#define RECORD_NAME			"RECORD"
-#define RECORD_MAJOR_VERSION		1
-#define RECORD_MINOR_VERSION		13
-#define RECORD_LOWEST_MAJOR_VERSION	1
-#define RECORD_LOWEST_MINOR_VERSION	12
-/* only difference between 1.12 and 1.13 is byte order of device events,
-   which the library doesn't deal with. */
-
-/*********************************************************
- *
- * Protocol request constants
- *
- */
-#define X_RecordQueryVersion    0     /* First request from client */
-#define X_RecordCreateContext   1     /* Create client RC */
-#define X_RecordRegisterClients 2     /* Add to client RC */
-#define X_RecordUnregisterClients 3   /* Delete from client RC */
-#define X_RecordGetContext      4     /* Query client RC */
-#define X_RecordEnableContext   5     /* Enable interception and reporting */
-#define X_RecordDisableContext  6     /* Disable interception and reporting */
-#define X_RecordFreeContext     7     /* Free client RC */
-
-#define RecordNumErrors         (XRecordBadContext + 1) 
-#define RecordNumEvents      	0L
-
-#define sz_XRecordRange		32
-#define sz_XRecordClientInfo 	12
-#define sz_XRecordState 	16
-#define sz_XRecordDatum 	32
-
-
-#define XRecordGlobaldef
-#define XRecordGlobalref extern
-
-#define RecordMaxEvent     	(128L-1L)
-#define RecordMinDeviceEvent	(2L)
-#define RecordMaxDeviceEvent	(6L)
-#define RecordMaxError          (256L-1L)
-#define RecordMaxCoreRequest    (128L-1L)
-#define RecordMaxExtRequest     (256L-1L)
-#define RecordMinExtRequest     (129L-1L)
-
-#define RECORD_RC 		CARD32
-#define RECORD_XIDBASE		CARD32
-#define RECORD_CLIENTSPEC	CARD32
-#define RECORD_ELEMENT_HEADER	CARD8
-
-typedef RECORD_CLIENTSPEC RecordClientSpec, *RecordClientSpecPtr;
-
-typedef struct
-{
-    CARD8	first;
-    CARD8	last;
-} RECORD_RANGE8;
-
-typedef struct
-{
-    CARD16	first B16;
-    CARD16	last B16;
-} RECORD_RANGE16;
-
-typedef struct
-{
-    RECORD_RANGE8	majorCode;
-    RECORD_RANGE16	minorCode;
-} RECORD_EXTRANGE;
-
-typedef struct
-{
-    RECORD_RANGE8	coreRequests;
-    RECORD_RANGE8	coreReplies;
-    RECORD_EXTRANGE	extRequests;
-    RECORD_EXTRANGE	extReplies;
-    RECORD_RANGE8	deliveredEvents;
-    RECORD_RANGE8	deviceEvents;
-    RECORD_RANGE8	errors;
-    BOOL		clientStarted;
-    BOOL		clientDied;
-} RECORDRANGE;
-#define sz_RECORDRANGE 	24
-
-/* typedef RECORDRANGE xRecordRange, *xRecordRangePtr;
-#define sz_xRecordRange 24 */
-
-/* Cannot have structures within structures going over the wire */
-typedef struct
-{
-    CARD8       	coreRequestsFirst;
-    CARD8       	coreRequestsLast;
-    CARD8       	coreRepliesFirst;
-    CARD8       	coreRepliesLast;
-    CARD8  		extRequestsMajorFirst;
-    CARD8		extRequestsMajorLast;
-    CARD16  		extRequestsMinorFirst B16;
-    CARD16  		extRequestsMinorLast B16;
-    CARD8  		extRepliesMajorFirst;
-    CARD8		extRepliesMajorLast;
-    CARD16  		extRepliesMinorFirst B16;
-    CARD16  		extRepliesMinorLast B16;
-    CARD8       	deliveredEventsFirst;
-    CARD8       	deliveredEventsLast;
-    CARD8		deviceEventsFirst;
-    CARD8		deviceEventsLast;
-    CARD8       	errorsFirst;
-    CARD8       	errorsLast;
-    BOOL                clientStarted;
-    BOOL		clientDied;
-} xRecordRange;
-#define sz_xRecordRange 24
-
-typedef struct
-{
-    RECORD_CLIENTSPEC	clientResource B32;
-    CARD32		nRanges B32;
-/* LISTofRECORDRANGE */
-} RECORD_CLIENT_INFO;
-
-typedef RECORD_CLIENT_INFO xRecordClientInfo;
-
-/*
- * Initialize
- */
-typedef struct {
-    CARD8       reqType;
-    CARD8       recordReqType;
-    CARD16      length B16;
-    CARD16      majorVersion B16;
-    CARD16      minorVersion B16;
-} xRecordQueryVersionReq;
-#define sz_xRecordQueryVersionReq 	8
-
-typedef struct
-{
-    CARD8   type;
-    CARD8   pad0;
-    CARD16  sequenceNumber B16;
-    CARD32  length	 B32;
-    CARD16  majorVersion B16;
-    CARD16  minorVersion B16;
-    CARD32  pad1	 B32;
-    CARD32  pad2	 B32;
-    CARD32  pad3	 B32;
-    CARD32  pad4	 B32;
-    CARD32  pad5	 B32;
- } xRecordQueryVersionReply;
-#define sz_xRecordQueryVersionReply  	32
-
-/*
- * Create RC
- */
-typedef struct
-{
-    CARD8     		reqType;
-    CARD8     		recordReqType;
-    CARD16    		length B16;
-    RECORD_RC		context B32;
-    RECORD_ELEMENT_HEADER elementHeader;
-    CARD8		pad;
-    CARD16		pad0 B16;
-    CARD32		nClients B32;
-    CARD32              nRanges B32;
-/* LISTofRECORD_CLIENTSPEC */
-/* LISTofRECORDRANGE */
-} xRecordCreateContextReq;
-#define sz_xRecordCreateContextReq 	20
-
-/*
- * Add to  RC
- */
-typedef struct
-{
-    CARD8     		reqType;
-    CARD8     		recordReqType;
-    CARD16    		length B16;
-    RECORD_RC		context B32;
-    RECORD_ELEMENT_HEADER elementHeader;
-    CARD8		pad;
-    CARD16		pad0 B16;
-    CARD32		nClients B32;
-    CARD32              nRanges B32;
-/* LISTofRECORD_CLIENTSPEC */
-/* LISTofRECORDRANGE */
-} xRecordRegisterClientsReq;
-#define sz_xRecordRegisterClientsReq 	20
-
-/*
- * Delete from RC
- */
-typedef struct
-{
-    CARD8     		reqType;
-    CARD8     		recordReqType;
-    CARD16    		length B16;
-    RECORD_RC		context B32;
-    CARD32		nClients B32;
-/* LISTofRECORD_CLIENTSPEC */
-} xRecordUnregisterClientsReq;
-#define sz_xRecordUnregisterClientsReq 	12
-
-/*
- * Query RC
- */
-typedef struct
-{
-    CARD8     	reqType;
-    CARD8     	recordReqType;
-    CARD16    	length B16;
-    RECORD_RC	context B32;
-} xRecordGetContextReq;
-#define sz_xRecordGetContextReq 		8
-
-typedef struct
-{
-    CARD8   	type;
-    BOOL    	enabled;
-    CARD16  	sequenceNumber B16;
-    CARD32  	length	 B32;
-    RECORD_ELEMENT_HEADER  elementHeader;
-    CARD8	pad;
-    CARD16	pad0 B16;
-    CARD32  	nClients B32;
-    CARD32  	pad1 B32;
-    CARD32  	pad2 B32;
-    CARD32  	pad3 B32;
-    CARD32  	pad4 B32;
-/* LISTofCLIENT_INFO */ 		/* intercepted-clients */
-} xRecordGetContextReply;
-#define sz_xRecordGetContextReply  	32
-
-/*
- * Enable data interception
- */
-typedef struct
-{
-    CARD8     	reqType;
-    CARD8     	recordReqType;
-    CARD16    	length B16;
-    RECORD_RC	context B32;
-} xRecordEnableContextReq;
-#define sz_xRecordEnableContextReq 	8
-
-typedef struct
-{
-    CARD8		type;
-    CARD8		category;
-    CARD16		sequenceNumber B16;
-    CARD32		length B32;
-    RECORD_ELEMENT_HEADER  elementHeader;
-    BOOL		clientSwapped;
-    CARD16		pad1 B16;
-    RECORD_XIDBASE 	idBase B32;
-    CARD32		serverTime B32;
-    CARD32		recordedSequenceNumber B32;
-    CARD32		pad3 B32;
-    CARD32		pad4 B32;
-    /* BYTE		data; */
-} xRecordEnableContextReply;
-#define sz_xRecordEnableContextReply 	32
-
-/*
- * Disable data interception
- */
-typedef struct
-{
-    CARD8     	reqType;
-    CARD8     	recordReqType;
-    CARD16    	length B16;
-    RECORD_RC 	context B32;
-} xRecordDisableContextReq;
-#define sz_xRecordDisableContextReq	8
-
-/*
- * Free RC
- */
-typedef struct
-{
-    CARD8     	reqType;
-    CARD8     	recordReqType;
-    CARD16    	length B16;
-    RECORD_RC 	context B32;
-} xRecordFreeContextReq;
-#define sz_xRecordFreeContextReq 	8
-
-#undef RECORD_RC
-#undef RECORD_XIDBASE
-#undef RECORD_ELEMENT_HEADER
-#undef RECORD_CLIENTSPEC
-
-#endif
+#warning "recordstr.h is obsolete and may be removed in the future."
+#warning "include <X11/extensions/record.h> for the library interfaces."
+#warning "include <X11/extensions/recordproto.h> for the protocol defines."
+#include <X11/extensions/recordproto.h>