x11proto 7.0.9 from X.Org individual releases. The 7.2RC2 tarball is too old.

2006-11-26 12:50:19 +00:00 · 2006-11-26 12:50:19 +00:00 · d2d1897b5c
commit d2d1897b5c
parent ec302a7984
17 changed files with 3250 additions and 1925 deletions
--- a/proto/x11proto/ChangeLog
+++ b/proto/x11proto/ChangeLog
@ -1,45 +1,488 @@
-2006-04-26  Adam Jackson  <ajax@freedesktop.org>
+commit 528e313fd1f1ae6f2303d3963afe41545f55ef88
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Thu Oct 26 00:45:44 2006 +0300

-	* configure.ac:
-	Bump to 7.0.5
+    bump to 7.0.9

-2006-04-25  Alan Coopersmith  <alan.coopersmith@sun.com>
+commit ab484c934301a61edc66dc1e4f554ec97b53aaf8
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Thu Oct 26 00:45:36 2006 +0300

-	* Xdefs.h: 
-	* Xos.h:
-	Fix more comment typos.
+    Xfuncproto: add _X_LIKELY and _X_UNLIKELY
+    Add gcc branch hinting annotations.

-2006-04-19  Alan Coopersmith  <alan.coopersmith@sun.com>
+commit 178cae180bc8b2e8feaaeda6d7c0317cf2715e14
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Thu Sep 21 18:43:06 2006 +0300

-	* Xmd.h: 
-	On Solaris, #include <sys/isa_defs.h> to be sure _LP64 is defined
-	in 64-bit builds.
+    Xfuncproto: define _X_INLINE for older compilers

-	* Xmd.h:
-	* Xos.h: 
-	* Xos_r.h: 
-	* Xproto.h: 
-	* keysymdef.h:
-	Fix some comment typos.
+commit 241e9dfd400aa21919d06fb7c78b5730eee12aab
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Thu Sep 21 14:51:00 2006 +0300

-2005-12-14  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+    bump to 7.0.8

-	* configure.ac:
-	Update package version number for final X11R7 release candidate.
+commit e51b21e316a5a1b9442a5d972b4ffa03455aca6e
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Thu Sep 21 14:50:45 2006 +0300

-2005-12-03  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+    XF86keysym: add keyboard/monitor brightness controls (Bug #8120)
+    Add XF86{Kbd,Mon}Brightness{Up,Down}, and XF86KbdLightOnOff.

-	* configure.ac:
-	Update package version number for X11R7 RC3 release.
+commit c3f56593f776e7f9e3e0d220c6bcf8be38a16839
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Wed Sep 20 21:11:30 2006 +0300

-2005-12-02  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+    Xfuncproto: add _X_INLINE

-	* Xfuncproto.h.in:
-	* configure.ac:
-	Automatically generate FUNCPROTO and NARROWPROTO defines in
-	Xfuncproto.h.
+commit 4fb2e257ae6de38971be8005283402226aea1ee5
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Fri Jul 14 17:59:19 2006 -0700

-2005-11-09  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+    Replace manual ChangeLog with dist-hook to generate from git log

-	* configure.ac:
-	Update package version number for X11R7 RC2 release.
+commit 2153ef4b7c2a93cba39ae08352ea2c46e5f0eefb
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Fri Jul 14 17:54:38 2006 -0700
+
+    renamed: .cvsignore -> .gitignore
+
+commit 0b76eb310307cd16e55d0c0792b54a2c6774fb88
+Author: Dan McNichol <mcnichol@austin.ibm.com>
+Date:   Fri Jul 14 17:53:34 2006 -0700
+
+    Bug #7458: AIX changes to Xmd.h
+    
+    Bugzilla Bug #7458 <https://bugs.freedesktop.org/show_bug.cgi?id=7458>
+    Patch #6179 <https://bugs.freedesktop.org/attachment.cgi?id=6179>
+
+commit bb7584b5c88236c59c4e3040bc7c28c150abf048
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Sat Jun 10 15:33:50 2006 +0000
+
+    Add ISO_Level5_{Shift,Latch,Lock}.
+
+commit e9aebeae3661d4c464c7aa53722d0a6bf915101a
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Thu Jun 1 23:31:20 2006 +0000
+
+    Bug #6887: Add dead_stroke, bump to 7.0.7. (Troy Korjuslommi)
+
+commit f3886640d29026359ffc4add39b66b8ff48472d3
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Thu Jun 1 23:00:34 2006 +0000
+
+    Bump to 7.0.6.
+
+commit d10d0302be37adb22804270926332e9d701935bb
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Thu Jun 1 23:00:03 2006 +0000
+
+    Bug #6296: Add support for Braille. (Samuel Thibault)
+
+commit 0471bfcce2787d2f1ff0fc2d019840e2bae8bc49
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Wed Apr 26 23:26:49 2006 +0000
+
+    Bump to 7.0.5
+
+commit 2a2b6db1f78f94c8f3690f675f0c032401fb2541
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Wed Apr 26 00:00:02 2006 +0000
+
+    Fix more comment typos.
+
+commit 33cea539618d58d64efb6a5c0465d14a471256cd
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Thu Apr 20 01:24:25 2006 +0000
+
+    On Solaris, #include <sys/isa_defs.h> to be sure _LP64 is defined in 64-bit
+        builds.
+    Fix some comment typos.
+
+commit 5e7d5cbf21c33f883ab508a51422775f59c4da00
+Author: Kevin E Martin <kem@kem.org>
+Date:   Thu Dec 15 00:24:39 2005 +0000
+
+    Update package version number for final X11R7 release candidate.
+
+commit 1827a78f3a23c77dbcddfc8227d85c5add59d819
+Author: Kevin E Martin <kem@kem.org>
+Date:   Sat Dec 3 05:49:47 2005 +0000
+
+    Update package version number for X11R7 RC3 release.
+
+commit 45811c86eb34e9f09e7d807ba4633107513f0d52
+Author: Kevin E Martin <kem@kem.org>
+Date:   Sat Dec 3 01:13:36 2005 +0000
+
+    Automatically generate FUNCPROTO and NARROWPROTO defines in Xfuncproto.h.
+
+commit c03cc7739b37ca504a2b56a73945755c41c68b2a
+Author: Eric Anholt <anholt@freebsd.org>
+Date:   Mon Nov 21 10:51:15 2005 +0000
+
+    Ignore Xpoll.h, which is generated now.
+
+commit 54c8ddf303053fb398e00fc8a35df712a7f3d47d
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Mon Nov 21 02:47:21 2005 +0000
+
+    Change values of XK_MATHEMATICAL symbols to use 0x1000000 + Unicode value,
+        as Xorg Architecture Task Force agreed last year should be done for all
+        new keysyms mapped to Unicode characters.
+
+commit f13eca1bc0feba2476f87e019a4ef40693a61ed8
+Author: Kevin E Martin <kem@kem.org>
+Date:   Wed Nov 9 21:20:33 2005 +0000
+
+    Update package version number for X11R7 RC2 release.
+
+commit 448763bde4a31cb012ad17cd6c5159411102432b
+Author: Kean Johnson <kean@armory.com>
+Date:   Tue Nov 8 06:33:25 2005 +0000
+
+    See ChangeLog entry 2005-11-07 for details.
+
+commit 59a5a5ebb6781d417d7a4d5905999da5fc76a083
+Author: Kevin E Martin <kem@kem.org>
+Date:   Wed Oct 19 02:48:15 2005 +0000
+
+    Update package version number for RC1 release.
+
+commit 3f74cc5e8309b2a4ac7671ca3c52c304ec5aa57f
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Sat Oct 15 00:48:27 2005 +0000
+
+    Remove duplicate keysyms accidentally added to XK_MATHEMATICAL section.
+
+commit eaffdc0d593b94d9036033911535371e73698573
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Sun Oct 9 15:37:29 2005 +0000
+
+    Bug #4688: Add various mathematical keysyms (all Unicode).
+
+commit 40b6e64fb1084f7b0270c279ac7132e52886c912
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date:   Sun Aug 21 15:27:27 2005 +0000
+
+    define CSRG_BASED here on systems that used to define it in Imake
+        configuration. For use in the modular tree.
+
+commit 04f9f7fd17cab16e5b0b135409011c0d284b002c
+Author: Eric Anholt <anholt@freebsd.org>
+Date:   Tue Aug 2 19:19:40 2005 +0000
+
+    Add basic .cvsignore files for proto modules.
+
+commit cd0400eeda5d7818232844d93343877ef0ff8168
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Tue Aug 2 18:36:30 2005 +0000
+
+    Fix the fds_bits test on OSX and maybe others. OSX defines fd_set in
+        <sys/types.h> just to be perverse.
+
+commit a475adb523a4d24cd53d436ba8c98ac7c8d37934
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Sat Jul 30 21:07:25 2005 +0000
+
+    Add prototypes of Xalloc/free functions.
+    Export ImUtil.h to match modular tree install.
+    Define SVR4 to 1 to avoid warning about redefining to different values.
+    Include missing headers to clear more compiler warnings.
+
+commit f6bd2288d3630ff7cb864e54cc7ebab1b3069067
+Author: Kevin E Martin <kem@kem.org>
+Date:   Fri Jul 29 21:22:57 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 74a3f7f77830e4417a4bc4145114030dfaef6f4e
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Sat Jul 23 02:53:32 2005 +0000
+
+    Remove all _XOPEN_SOURCE definitions from Xos.h, as Xpoll.h.in now deals
+        with this by using which of fds_bits or __fds_bits we have.
+
+commit f97e34e65e403140dde00d260be0fd7f853ac8f0
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Fri Jul 22 08:01:39 2005 +0000
+
+    Add includex11dir as a path to the includes, sans X11/.
+    Turn Xpoll.h into a generated file. In the modular tree, substitute in
+        whichever of fds_bits or __fds_bits is being used for the member of
+        fd_set on the system; in the monolithic tree, substitute in fds_bits
+        unconditionally, as that's the way it was before thanks to
+        _XOPEN_SOURCE being defined.
+
+commit 7a9ce57163172557d6ba41119a5a3b2837dbbc8e
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Sat Jul 16 20:54:13 2005 +0000
+
+    Guard INCLUDE_ALLOCA_H define to end redefinition warnings.
+
+commit 825b6ae347b3896b8ea38e6021170d45ae3bfd65
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Thu Jul 14 22:08:38 2005 +0000
+
+    Don't define _XOPEN_SOURCE on SVR4, because it will REMOVE required
+        definitions.
+
+commit acc0551fb1af1152c1b630ff5e82f023f11751e2
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Wed Jul 13 23:43:08 2005 +0000
+
+    #define INCLUDE_ALLOCA_H when building with Sun compilers. (Imake *.cf
+        files define this for a number of platforms in the monolith, but these
+        will need to be translated into #ifdef's or similar mechanism to work
+        in a world without Imake.)
+
+commit b8301067b6e962a3dc786dd909726b7e6cb81085
+Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
+Date:   Wed Jul 13 20:12:13 2005 +0000
+
+    include <X11/Xwindows.h> instead of <windows.h>. Several namespace
+        conflicts are worked around in Xwindows.h
+
+commit ec7a156bcdbe8e4bddf232d4a03f47d426096736
+Author: Keith Packard <keithp@keithp.com>
+Date:   Wed Jul 13 07:23:56 2005 +0000
+
+    Make some minor source adjustments so that we don not need to use
+        -D_XOPEN_SOURCE -D_BSD_SOURCE everywhere as this will leak out of the
+        modular environment and into application build processes, potentially
+        foulling up their compiles.
+
+commit 2a0445903d06c332acf70cfd18ba57ddbbeada32
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Sun Jul 3 07:55:00 2005 +0000
+
+    Move misc.h and os.h from proto/X11 to xserver/xorg/include.
+
+commit ef6f542053b30af29b8045ffa6ce26386aab7bba
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date:   Tue Jun 28 13:15:27 2005 +0000
+
+    - Remove xfixes.pc.in from lib/lbxutil
+    - Add missing backslash in proto/X11/Makefile.am
+    Both pointed out by ISHIKAWA Mutsumi
+
+commit 4cf89be7baf8a79d2d399abd17c4e23279cca364
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date:   Mon Jun 27 17:41:09 2005 +0000
+
+    - Add os.h and misc.h to proto/X11
+    - In symlink.sh move os.h and misc.h from xserver/include to proto/X11
+    - in xc/lib/lbxutil/ do some include-with-<>-instead-of-with-""
+
+commit e575c5104a8627428dd18c4040d4ad787655164a
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date:   Wed May 25 22:12:21 2005 +0000
+
+    - Use XTRANS_CONNECTION_FLAGS macro in lib/FS/configure.ac
+    - Don't symlink transport.c, which is a generated file
+    - instead add a new file fs_transport.c that include Xtrans/X11/transport.c
+
+commit 207e3f82011d5f83db0eca318a1de50f0c1da0dc
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date:   Wed May 25 21:47:56 2005 +0000
+
+    - Add FSlib to symlink.sh
+    - Change Xtrans includedir back to be X11/Xtrans, so that users of it can
+        continue to include <X11/*>
+    - Add build system for FSlib
+    - Conditionally include config.h in xc/lib/FS
+    - Remove redundant include of FSproto.h in xc/lib/FS
+    - Add check to proto/X11/configure.ac whether -D_XOPEN_SOURCE is needed.
+
+commit a5a4bfe9b432e7d8238f9a02d80be4ce6bb64978
+Author: Josh Triplett <josh@speakeasy.net>
+Date:   Mon May 23 01:22:10 2005 +0000
+
+    The macros in Xpoll.h poke at the guts of struct fd_set in ways that only
+        work if _XOPEN_SOURCE is defined, so define it in Cflags in the
+        pkg-config file.
+
+commit 2f4c3aa871a047359f8121e6401be1ba4cf0b8e0
+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 4809dd9150599a9e88f64cd1b82737872b7b1b94
+Author: Adam Jackson <ajax@nwnk.net>
+Date:   Thu May 19 00:10:19 2005 +0000
+
+    Require automake 1.7 in AM_INIT_AUTOMAKE
+
+commit 6ff17c33f0773e152122d66cbaffaa54e53e086c
+Author: Josh Triplett <josh@speakeasy.net>
+Date:   Sat May 14 07:56:49 2005 +0000
+
+    Add AUTHORS file for X11 from xlibs tree.
+
+commit 3f8b0ba6071dcdd62ea424cab0bddb39db2ebe6a
+Author: Josh Triplett <josh@speakeasy.net>
+Date:   Sat May 14 07:55:10 2005 +0000
+
+    Add some COPYING files.
+
+commit 803c8ecaba2f8c703bbb46c0d740bfa349ce0245
+Author: Kevin E Martin <kem@kem.org>
+Date:   Fri May 6 01:46:31 2005 +0000
+
+    Initial build system files for proto module.
+
+commit a870c60741273ebd6cb1e69b4e535ce3a6bc76bf
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Thu Apr 28 22:04:12 2005 +0000
+
+    Don't define X_NOT_STDC_ENV on Solaris x86. Bugzilla #3158:
+        https://bugs.freedesktop.org/show_bug.cgi?id=3158 Patch #2588:
+        https://bugs.freedesktop.org/attachment.cgi?id=2588 (Henry Zhao, Sun
+        Microsystems)
+
+commit 372f37171ba3875ea4bf7f60150d92869e06010f
+Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
+Date:   Wed Apr 20 13:58:17 2005 +0000
+
+    check for define PATH_MAX before referencing it
+
+commit e489ec65b4b2ab0a050d8dbf7ec0658e6decb8b3
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date:   Wed Mar 2 19:29:31 2005 +0000
+
+    Patch #2007 <https://bugs.freedesktop.org/attachment.cgi?id=2007>
+    1) Fix Solaris #ifdefs to choose between UI/SVR4 (early POSIX draft) and
+        POSIX standard thread API's correctly.
+    2) Fix calls to POSIX standard versions to check errors correctly. (POSIX
+        defines a return value of 0 on success, errno value on error, but the
+        macros were checking for -1 on error.)
+
+commit d761e87224d3e60c5355ac3e3468835fc3b4be92
+Author: Roland Mainz <roland.mainz@nrubsig.org>
+Date:   Wed Mar 2 11:20:29 2005 +0000
+
+    xc/config/cf/DragonFly.cf
+    xc/config/cf/Imake.cf
+    xc/config/cf/Imakefile
+    xc/config/imake/imake.c
+    xc/config/imake/imakemdep.h
+    xc/extras/drm/shared/drm.h
+    xc/include/Xos_r.h
+    xc/lib/xtrans/Xtranssock.c
+    xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h
+    xc/programs/Xserver/hw/xfree86/os-support/xf86_libc.h
+    xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_agp.c
+    //bugs.freedesktop.org/show_bug.cgi?id=1712) attachment #2004
+        (https://bugs.freedesktop.org/attachment.cgi?id=2004): Add support for
+        DragonFly/BSD platform. Patch by Jeroen Ruigrok <asmodai@tendra.org>
+        and Mike Verona <firedragonfly@gmail.com>.
+
+commit 1cae0cb4b1442b34d76ee5623fb2a17ed2353c50
+Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
+Date:   Sun Jan 9 15:06:04 2005 +0000
+
+    Make sure PATH_MAX is at least 1024
+
+commit 9df4ffce552a0f6eca47764a3f79b466629e8bab
+Author: Egbert Eich <eich@suse.de>
+Date:   Mon Jan 3 18:03:49 2005 +0000
+
+    gcc 4 doesn't like predeffines line 'linux' any more. To muffle the
+        compiler replace them with __linux__ (Bugzilla #2207).
+
+commit dd82af84ed67f439444e75ea1d032c082e15db51
+Author: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>
+Date:   Mon Nov 15 15:06:53 2004 +0000
+
+    Bufzilla #1802, http://freedesktop.org/bugzilla/show_bug.cgi?id=1802 Added
+        mingw (Win32) port
+
+commit 618956f1f783a8c330aab8eac425937f0b8e50e1
+Author: Markus Kuhn <Markus.Kuhn@cl.cam.ac.uk>
+Date:   Sun Sep 26 20:46:18 2004 +0000
+
+    The big keysym cleanup, to bring implementation in line with the recent
+        revision of Appendix A of the protocol spec. (Markus Kuhn)
+
+commit 7cb1490d8932d745b3a5e2b3370a000da064306f
+Author: Kevin E Martin <kem@kem.org>
+Date:   Wed Aug 11 21:14:16 2004 +0000
+
+    Apply PPC64 build patch (Bug #303, Mike A. Harris, Alan Coopersmith).
+
+commit 5b67de2bce0e33a4a85439ebcf7b726a6da24545
+Author: Egbert Eich <eich@suse.de>
+Date:   Fri Apr 23 18:43:05 2004 +0000
+
+    Merging XORG-CURRENT into trunk
+
+commit e88a09c1df46637979c4d131a8e41af923ff4d45
+Author: Egbert Eich <eich@suse.de>
+Date:   Sun Mar 14 08:31:34 2004 +0000
+
+    Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit 9259b43390c50d330f557390cc4576f5315c3f53
+Author: Egbert Eich <eich@suse.de>
+Date:   Wed Mar 3 12:10:53 2004 +0000
+
+    Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 99bbbc3fcaf67b02a50e4ff4007225b1b64beb36
+Author: Egbert Eich <eich@suse.de>
+Date:   Thu Feb 26 13:35:11 2004 +0000
+
+    readding XFree86's cvs IDs
+
+commit 82d7bb39bc84eb16134e931263f53bc88d1788ac
+Author: Egbert Eich <eich@suse.de>
+Date:   Thu Feb 26 09:22:24 2004 +0000
+
+    Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 0700ff31a84abc06fdf4b05c2328ff2329dc909c
+Author: Egbert Eich <eich@suse.de>
+Date:   Thu Jan 29 08:07:54 2004 +0000
+
+    Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004
+
+commit ad76b5cc436937d9fb945bd43d9356651fe182ca
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Fri Dec 19 20:54:20 2003 +0000
+
+    XFree86 4.3.99.902 (RC 2)
+
+commit 376f9efdab6ef2dce267caa0a0228892e768e390
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Tue Nov 25 19:28:01 2003 +0000
+
+    XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit 5ec315b967cb1ae519f514896f0b48fb5407f863
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Fri Nov 14 16:48:42 2003 +0000
+
+    XFree86 4.3.0.1
+
+commit f2001f5bd5316842106a98b23f09400688575fa3
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Fri Nov 14 16:48:42 2003 +0000
+
+    Initial revision
+
+commit ee0a1a43dc707f960e637fdf2118723e4de0a55d
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date:   Fri Nov 14 15:54:35 2003 +0000
+
+    R6.6 is the Xorg base-line
--- a/proto/x11proto/Makefile.am
+++ b/proto/x11proto/Makefile.am
@ -30,4 +30,14 @@ xproto_HEADERS = \
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = xproto.pc

-EXTRA_DIST = autogen.sh xproto.pc.in
+EXTRA_DIST = autogen.sh xproto.pc.in ChangeLog
+
+CLEANFILES=ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+	(cd $(srcdir) && git-log > ChangeLog )
+
+dist-hook: ChangeLog
+
--- a/proto/x11proto/Makefile.in
+++ b/proto/x11proto/Makefile.in
@ -121,7 +121,6 @@ STRIP = @STRIP@
 USE_FDS_BITS = @USE_FDS_BITS@
 VERSION = @VERSION@
 ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
@ -136,23 +135,30 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
@ -188,7 +194,8 @@ xproto_HEADERS = \

 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = xproto.pc
-EXTRA_DIST = autogen.sh xproto.pc.in
+EXTRA_DIST = autogen.sh xproto.pc.in ChangeLog
+CLEANFILES = ChangeLog
 all: do-not-use-config.h Xfuncproto.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am

@ -371,6 +378,9 @@ distdir: $(DISTFILES)
 	    || exit 1; \
 	  fi; \
 	done
+	$(MAKE) $(AM_MAKEFLAGS) \
+	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
+	  dist-hook
 	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
@ -492,6 +502,7 @@ install-strip:
 mostlyclean-generic:

 clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)

 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@ -551,7 +562,7 @@ uninstall-am: uninstall-info-am uninstall-pkgconfigDATA \

 .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
 	clean-generic ctags dist dist-all dist-bzip2 dist-gzip \
-	dist-shar dist-tarZ dist-zip distcheck distclean \
+	dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \
 	distclean-generic distclean-hdr distclean-tags distcleancheck \
 	distdir distuninstallcheck dvi dvi-am html html-am info \
 	info-am install install-am install-data install-data-am \
@ -563,6 +574,13 @@ uninstall-am: uninstall-info-am uninstall-pkgconfigDATA \
 	uninstall-am uninstall-info-am uninstall-pkgconfigDATA \
 	uninstall-xprotoHEADERS

+
+.PHONY: ChangeLog
+
+ChangeLog:
+	(cd $(srcdir) && git-log > ChangeLog )
+
+dist-hook: ChangeLog
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
--- a/proto/x11proto/XF86keysym.h
+++ b/proto/x11proto/XF86keysym.h
@ -19,7 +19,7 @@
 #define XF86XK_ModeLock		0x1008FF01	/* Mode Switch Lock */

 /*
- * Note, 0x1008FF02 - 0x1008FF0F are free and should be used for misc new
+ * Note, 0x1008FF07 - 0x1008FF0F are free and should be used for misc new
 * keysyms that don't fit into any of the groups below.
 *
 * 0x1008FF64, 0x1008FF6F, 0x1008FF71, 0x1008FF83 are no longer used,
@ -30,6 +30,13 @@
 */


+/* Backlight controls. */
+#define XF86XK_MonBrightnessUp   0x1008FF02
+#define XF86XK_MonBrightnessDown 0x1008FF03
+#define XF86XK_KbdLightOnOff     0x1008FF04
+#define XF86XK_KbdBrightnessUp   0x1008FF05
+#define XF86XK_KbdBrightnessDown 0x1008FF06
+
 /*
 * Keys found on some "Internet" keyboards.
 */
--- a/proto/x11proto/Xfuncproto.h
+++ b/proto/x11proto/Xfuncproto.h
@ -1,4 +1,4 @@
-/* Xfuncproto.h.  Generated by configure.  */
+/* Xfuncproto.h.  Generated from Xfuncproto.h.in by configure.  */
 /* $Xorg: Xfuncproto.h,v 1.4 2001/02/09 02:03:22 xorgcvs Exp $ */
 /*
 *
@ -90,14 +90,23 @@ in this Software without prior written authorization from The Open Group.
 # define _X_EXPORT      __attribute__((visibility("default")))
 # define _X_HIDDEN      __attribute__((visibility("hidden")))
 # define _X_INTERNAL    __attribute__((visibility("internal")))
+# define _X_LIKELY(x)   __builtin_expect(!!(x), 1)
+# define _X_UNLIKELY(x) __builtin_expect(!!(x), 0)
+# define _X_INLINE      inline
 #elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)
 # define _X_EXPORT      __global
 # define _X_HIDDEN      __hidden
 # define _X_INTERNAL    __hidden
+# define _X_LIKELY(x)   (x)
+# define _X_UNLIKELY(x) (x)
+# define _X_INLINE      inline
 #else /* not gcc >= 3.3 and not Sun Studio >= 8 */
 # define _X_EXPORT
 # define _X_HIDDEN
 # define _X_INTERNAL
+# define _X_LIKELY(x)   (x)
+# define _X_UNLIKELY(x) (x)
+# define _X_INLINE
 #endif

 #if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 301)
--- a/proto/x11proto/Xfuncproto.h.in
+++ b/proto/x11proto/Xfuncproto.h.in
@ -89,14 +89,23 @@ in this Software without prior written authorization from The Open Group.
 # define _X_EXPORT      __attribute__((visibility("default")))
 # define _X_HIDDEN      __attribute__((visibility("hidden")))
 # define _X_INTERNAL    __attribute__((visibility("internal")))
+# define _X_LIKELY(x)   __builtin_expect(!!(x), 1)
+# define _X_UNLIKELY(x) __builtin_expect(!!(x), 0)
+# define _X_INLINE      inline
 #elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)
 # define _X_EXPORT      __global
 # define _X_HIDDEN      __hidden
 # define _X_INTERNAL    __hidden
+# define _X_LIKELY(x)   (x)
+# define _X_UNLIKELY(x) (x)
+# define _X_INLINE      inline
 #else /* not gcc >= 3.3 and not Sun Studio >= 8 */
 # define _X_EXPORT
 # define _X_HIDDEN
 # define _X_INTERNAL
+# define _X_LIKELY(x)   (x)
+# define _X_UNLIKELY(x) (x)
+# define _X_INLINE
 #endif

 #if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 301)
--- a/proto/x11proto/Xfuncs.h
+++ b/proto/x11proto/Xfuncs.h
@ -1,5 +1,5 @@
 /*
- * $XdotOrg: proto/X11/Xfuncs.h,v 1.4 2005/11/08 06:33:25 jkj Exp $
+ * $XdotOrg: xc/include/Xfuncs.h,v 1.2 2004/04/23 18:43:05 eich Exp $
 * $Xorg: Xfuncs.h,v 1.4 2001/02/09 02:03:22 xorgcvs Exp $
 * 
 * 
--- a/proto/x11proto/Xmd.h
+++ b/proto/x11proto/Xmd.h
@ -1,4 +1,4 @@
-/* $XdotOrg: proto/X11/Xmd.h,v 1.4 2006/04/20 01:24:25 alanc Exp $ */
+/* $XdotOrg: $ */
 /* $XFree86: xc/include/Xmd.h,v 3.18tsi Exp $ */
 /***********************************************************

@ -139,7 +139,7 @@ typedef long INT32;
 typedef short INT16;
 #endif

-#if defined(__STDC__) || defined(sgi) || defined(AIXV3)
+#if defined(__STDC__) || defined(sgi) || defined(_AIX)
 typedef signed char    INT8;
 #else
 typedef char           INT8;
@ -151,6 +151,9 @@ typedef unsigned int CARD32;
 #else
 typedef unsigned long CARD32;
 #endif
+#if !defined(WORD64) && !defined(LONG64)
+typedef unsigned long long CARD64;
+#endif
 typedef unsigned short CARD16;
 typedef unsigned char  CARD8;

--- a/proto/x11proto/Xos.h
+++ b/proto/x11proto/Xos.h
@ -1,5 +1,5 @@
 /*
- * $XdotOrg: proto/X11/Xos.h,v 1.9 2006/04/20 01:24:25 alanc Exp $
+ * $XdotOrg: proto/X11/Xos.h,v 1.8 2005/11/08 06:33:25 jkj Exp $
 * $Xorg: Xos.h,v 1.6 2001/02/09 02:03:22 xorgcvs Exp $
 * 
 * 
--- a/proto/x11proto/Xos_r.h
+++ b/proto/x11proto/Xos_r.h
@ -1,5 +1,5 @@
 /* $Xorg: Xos_r.h,v 1.4 2001/02/09 02:03:22 xorgcvs Exp $ */
-/* $XdotOrg: proto/X11/Xos_r.h,v 1.6 2006/04/20 01:24:25 alanc Exp $ */
+/* $XdotOrg: proto/X11/Xos_r.h,v 1.5 2005/07/13 07:23:56 keithp Exp $ */
 /*
 Copyright 1996, 1998  The Open Group

--- a/proto/x11proto/Xosdefs.h
+++ b/proto/x11proto/Xosdefs.h
@ -1,7 +1,7 @@
 /*
 * O/S-dependent (mis)feature macro definitions
 *
- * $XdotOrg: proto/X11/Xosdefs.h,v 1.7 2005/11/08 06:33:25 jkj Exp $
+ * $XdotOrg: xc/include/Xosdefs.h,v 1.3 2005/04/28 22:04:12 alanc Exp $
 * $Xorg: Xosdefs.h,v 1.5 2001/02/09 02:03:23 xorgcvs Exp $
 *
 Copyright 1991, 1998  The Open Group
--- a/proto/x11proto/config.guess
+++ b/proto/x11proto/config.guess
@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.

-timestamp='2005-07-08'
+timestamp='2006-02-23'

 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@ -106,7 +106,7 @@ set_cc_for_build='
 trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
 trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
 : ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
 { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
 { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
 { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
@ -206,6 +206,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
    *:ekkoBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
 	exit ;;
+    *:SolidBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+	exit ;;
    macppc:MirBSD:*:*)
 	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
 	exit ;;
@ -764,7 +767,12 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit ;;
    *:FreeBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	case ${UNAME_MACHINE} in
+	    pc98)
+		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    *)
+		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	esac
 	exit ;;
    i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
@ -772,6 +780,9 @@ EOF
    i*:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
+    i*:MSYS_NT-*:*:*)
+	echo ${UNAME_MACHINE}-pc-mingw32
+	exit ;;
    i*:windows32*:*)
    	# uname -m includes "-pc" on this system.
    	echo ${UNAME_MACHINE}-mingw32
@ -779,8 +790,11 @@ EOF
    i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    x86:Interix*:[34]*)
-	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
+    x86:Interix*:[345]*)
+	echo i586-pc-interix${UNAME_RELEASE}
+	exit ;;
+    EM64T:Interix*:[345]*)
+	echo x86_64-unknown-interix${UNAME_RELEASE}
 	exit ;;
    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
@ -794,7 +808,7 @@ EOF
    i*:UWIN*:*)
 	echo ${UNAME_MACHINE}-pc-uwin
 	exit ;;
-    amd64:CYGWIN*:*:*)
+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
 	echo x86_64-unknown-cygwin
 	exit ;;
    p*:CYGWIN*:*)
@ -851,7 +865,11 @@ EOF
 	#endif
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^CPU/{
+		s: ::g
+		p
+	    }'`"
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
    mips64:Linux:*:*)
@ -870,9 +888,16 @@ EOF
 	#endif
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^CPU/{
+		s: ::g
+		p
+	    }'`"
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
+    or32:Linux:*:*)
+	echo or32-unknown-linux-gnu
+	exit ;;
    ppc:Linux:*:*)
 	echo powerpc-unknown-linux-gnu
 	exit ;;
@ -916,6 +941,9 @@ EOF
    sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
+    vax:Linux:*:*)
+	echo ${UNAME_MACHINE}-dec-linux-gnu
+	exit ;;
    x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
 	exit ;;
@ -961,7 +989,7 @@ EOF
 	LIBC=gnulibc1
 	# endif
 	#else
-	#ifdef __INTEL_COMPILER
+	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun)
 	LIBC=gnu
 	#else
 	LIBC=gnuaout
@ -971,7 +999,11 @@ EOF
 	LIBC=dietlibc
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+	    /^LIBC/{
+		s: ::g
+		p
+	    }'`"
 	test x"${LIBC}" != x && {
 		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
 		exit
@ -1182,7 +1214,6 @@ EOF
    *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 	case $UNAME_PROCESSOR in
-	    *86) UNAME_PROCESSOR=i686 ;;
 	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
@ -1261,6 +1292,9 @@ EOF
    i*86:skyos:*:*)
 	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
 	exit ;;
+    i*86:rdos:*:*)
+	echo ${UNAME_MACHINE}-pc-rdos
+	exit ;;
 esac

 #echo '(No uname command or uname output not recognized.)' 1>&2
--- a/proto/x11proto/config.sub
+++ b/proto/x11proto/config.sub
@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.

-timestamp='2005-07-08'
+timestamp='2006-02-23'

 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@ -119,8 +119,9 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
-  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
    os=-$maybe_os
    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
    ;;
@ -171,6 +172,10 @@ case $os in
 	-hiux*)
 		os=-hiuxwe2
 		;;
+	-sco6)
+		os=-sco5v6
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
 	-sco5)
 		os=-sco3.2v5
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@ -187,6 +192,10 @@ case $os in
 		# Don't forget version if it is 3.2v4 or newer.
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
+	-sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
 	-sco*)
 		os=-sco3.2v2
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@ -239,7 +248,7 @@ case $basic_machine in
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
-	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
+	| m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@ -257,8 +266,9 @@ case $basic_machine in
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
-	| ms1 \
+	| mt \
 	| msp430 \
+	| nios | nios2 \
 	| ns16k | ns32k \
 	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
@ -286,6 +296,9 @@ case $basic_machine in
 		;;
 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
 		;;
+	ms1)
+		basic_machine=mt-unknown
+		;;

 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
@ -336,8 +349,9 @@ case $basic_machine in
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
-	| ms1-* \
+	| mt-* \
 	| msp430-* \
+	| nios-* | nios2-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
@ -696,6 +710,9 @@ case $basic_machine in
 		basic_machine=i386-pc
 		os=-msdos
 		;;
+	ms1-*)
+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
@ -803,6 +820,12 @@ case $basic_machine in
 	pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
+	pc98)
+		basic_machine=i386-pc
+		;;
+	pc98-*)
+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
 		;;
@ -859,6 +882,10 @@ case $basic_machine in
 		basic_machine=i586-unknown
 		os=-pw32
 		;;
+	rdos)
+		basic_machine=i386-pc
+		os=-rdos
+		;;
 	rom68k)
 		basic_machine=m68k-rom68k
 		os=-coff
@ -1174,21 +1201,23 @@ case $os in
 	      | -aos* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+	      | -openbsd* | -solidbsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku*)
+	      | -skyos* | -haiku* | -rdos*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
--- a/proto/x11proto/configure
+++ b/proto/x11proto/configure
--- a/proto/x11proto/configure.ac
+++ b/proto/x11proto/configure.ac
@ -1,5 +1,5 @@
 AC_PREREQ([2.57])
-AC_INIT([Xproto], [7.0.5], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([Xproto], [7.0.9], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])

 AC_CONFIG_HEADER([do-not-use-config.h])
--- a/proto/x11proto/keysym.h
+++ b/proto/x11proto/keysym.h
@ -70,6 +70,7 @@ SOFTWARE.
 #define XK_VIETNAMESE
 #define XK_CURRENCY
 #define XK_MATHEMATICAL
+#define XK_BRAILLE

 #include <X11/keysymdef.h>

--- a/proto/x11proto/keysymdef.h
+++ b/proto/x11proto/keysymdef.h
@ -327,6 +327,9 @@ SOFTWARE.
 #define XK_ISO_Level3_Shift              0xfe03
 #define XK_ISO_Level3_Latch              0xfe04
 #define XK_ISO_Level3_Lock               0xfe05
+#define XK_ISO_Level5_Shift              0xfe11
+#define XK_ISO_Level5_Latch              0xfe12
+#define XK_ISO_Level5_Lock               0xfe13
 #define XK_ISO_Group_Shift               0xff7e  /* Alias for mode_switch */
 #define XK_ISO_Group_Latch               0xfe06
 #define XK_ISO_Group_Lock                0xfe07
@ -380,6 +383,7 @@ SOFTWARE.
 #define XK_dead_belowdot                 0xfe60
 #define XK_dead_hook                     0xfe61
 #define XK_dead_horn                     0xfe62
+#define XK_dead_stroke                   0xfe63

 #define XK_First_Virtual_Screen          0xfed0
 #define XK_Prev_Virtual_Screen           0xfed1
@ -2071,3 +2075,272 @@ SOFTWARE.
 #define XK_notidentical               0x1002262  /* U+2262 NOT IDENTICAL TO */
 #define XK_stricteq                   0x1002263  /* U+2263 STRICTLY EQUIVALENT TO */          
 #endif /* XK_MATHEMATICAL */
+
+#ifdef XK_BRAILLE
+#define XK_braille_dot_1                 0xfff1
+#define XK_braille_dot_2                 0xfff2
+#define XK_braille_dot_3                 0xfff3
+#define XK_braille_dot_4                 0xfff4
+#define XK_braille_dot_5                 0xfff5
+#define XK_braille_dot_6                 0xfff6
+#define XK_braille_dot_7                 0xfff7
+#define XK_braille_dot_8                 0xfff8
+#define XK_braille_dot_9                 0xfff9
+#define XK_braille_dot_10                0xfffa
+#define XK_braille_blank              0x1002800  /* U+2800 BRAILLE PATTERN BLANK */
+#define XK_braille_dots_1             0x1002801  /* U+2801 BRAILLE PATTERN DOTS-1 */
+#define XK_braille_dots_2             0x1002802  /* U+2802 BRAILLE PATTERN DOTS-2 */
+#define XK_braille_dots_12            0x1002803  /* U+2803 BRAILLE PATTERN DOTS-12 */
+#define XK_braille_dots_3             0x1002804  /* U+2804 BRAILLE PATTERN DOTS-3 */
+#define XK_braille_dots_13            0x1002805  /* U+2805 BRAILLE PATTERN DOTS-13 */
+#define XK_braille_dots_23            0x1002806  /* U+2806 BRAILLE PATTERN DOTS-23 */
+#define XK_braille_dots_123           0x1002807  /* U+2807 BRAILLE PATTERN DOTS-123 */
+#define XK_braille_dots_4             0x1002808  /* U+2808 BRAILLE PATTERN DOTS-4 */
+#define XK_braille_dots_14            0x1002809  /* U+2809 BRAILLE PATTERN DOTS-14 */
+#define XK_braille_dots_24            0x100280a  /* U+280a BRAILLE PATTERN DOTS-24 */
+#define XK_braille_dots_124           0x100280b  /* U+280b BRAILLE PATTERN DOTS-124 */
+#define XK_braille_dots_34            0x100280c  /* U+280c BRAILLE PATTERN DOTS-34 */
+#define XK_braille_dots_134           0x100280d  /* U+280d BRAILLE PATTERN DOTS-134 */
+#define XK_braille_dots_234           0x100280e  /* U+280e BRAILLE PATTERN DOTS-234 */
+#define XK_braille_dots_1234          0x100280f  /* U+280f BRAILLE PATTERN DOTS-1234 */
+#define XK_braille_dots_5             0x1002810  /* U+2810 BRAILLE PATTERN DOTS-5 */
+#define XK_braille_dots_15            0x1002811  /* U+2811 BRAILLE PATTERN DOTS-15 */
+#define XK_braille_dots_25            0x1002812  /* U+2812 BRAILLE PATTERN DOTS-25 */
+#define XK_braille_dots_125           0x1002813  /* U+2813 BRAILLE PATTERN DOTS-125 */
+#define XK_braille_dots_35            0x1002814  /* U+2814 BRAILLE PATTERN DOTS-35 */
+#define XK_braille_dots_135           0x1002815  /* U+2815 BRAILLE PATTERN DOTS-135 */
+#define XK_braille_dots_235           0x1002816  /* U+2816 BRAILLE PATTERN DOTS-235 */
+#define XK_braille_dots_1235          0x1002817  /* U+2817 BRAILLE PATTERN DOTS-1235 */
+#define XK_braille_dots_45            0x1002818  /* U+2818 BRAILLE PATTERN DOTS-45 */
+#define XK_braille_dots_145           0x1002819  /* U+2819 BRAILLE PATTERN DOTS-145 */
+#define XK_braille_dots_245           0x100281a  /* U+281a BRAILLE PATTERN DOTS-245 */
+#define XK_braille_dots_1245          0x100281b  /* U+281b BRAILLE PATTERN DOTS-1245 */
+#define XK_braille_dots_345           0x100281c  /* U+281c BRAILLE PATTERN DOTS-345 */
+#define XK_braille_dots_1345          0x100281d  /* U+281d BRAILLE PATTERN DOTS-1345 */
+#define XK_braille_dots_2345          0x100281e  /* U+281e BRAILLE PATTERN DOTS-2345 */
+#define XK_braille_dots_12345         0x100281f  /* U+281f BRAILLE PATTERN DOTS-12345 */
+#define XK_braille_dots_6             0x1002820  /* U+2820 BRAILLE PATTERN DOTS-6 */
+#define XK_braille_dots_16            0x1002821  /* U+2821 BRAILLE PATTERN DOTS-16 */
+#define XK_braille_dots_26            0x1002822  /* U+2822 BRAILLE PATTERN DOTS-26 */
+#define XK_braille_dots_126           0x1002823  /* U+2823 BRAILLE PATTERN DOTS-126 */
+#define XK_braille_dots_36            0x1002824  /* U+2824 BRAILLE PATTERN DOTS-36 */
+#define XK_braille_dots_136           0x1002825  /* U+2825 BRAILLE PATTERN DOTS-136 */
+#define XK_braille_dots_236           0x1002826  /* U+2826 BRAILLE PATTERN DOTS-236 */
+#define XK_braille_dots_1236          0x1002827  /* U+2827 BRAILLE PATTERN DOTS-1236 */
+#define XK_braille_dots_46            0x1002828  /* U+2828 BRAILLE PATTERN DOTS-46 */
+#define XK_braille_dots_146           0x1002829  /* U+2829 BRAILLE PATTERN DOTS-146 */
+#define XK_braille_dots_246           0x100282a  /* U+282a BRAILLE PATTERN DOTS-246 */
+#define XK_braille_dots_1246          0x100282b  /* U+282b BRAILLE PATTERN DOTS-1246 */
+#define XK_braille_dots_346           0x100282c  /* U+282c BRAILLE PATTERN DOTS-346 */
+#define XK_braille_dots_1346          0x100282d  /* U+282d BRAILLE PATTERN DOTS-1346 */
+#define XK_braille_dots_2346          0x100282e  /* U+282e BRAILLE PATTERN DOTS-2346 */
+#define XK_braille_dots_12346         0x100282f  /* U+282f BRAILLE PATTERN DOTS-12346 */
+#define XK_braille_dots_56            0x1002830  /* U+2830 BRAILLE PATTERN DOTS-56 */
+#define XK_braille_dots_156           0x1002831  /* U+2831 BRAILLE PATTERN DOTS-156 */
+#define XK_braille_dots_256           0x1002832  /* U+2832 BRAILLE PATTERN DOTS-256 */
+#define XK_braille_dots_1256          0x1002833  /* U+2833 BRAILLE PATTERN DOTS-1256 */
+#define XK_braille_dots_356           0x1002834  /* U+2834 BRAILLE PATTERN DOTS-356 */
+#define XK_braille_dots_1356          0x1002835  /* U+2835 BRAILLE PATTERN DOTS-1356 */
+#define XK_braille_dots_2356          0x1002836  /* U+2836 BRAILLE PATTERN DOTS-2356 */
+#define XK_braille_dots_12356         0x1002837  /* U+2837 BRAILLE PATTERN DOTS-12356 */
+#define XK_braille_dots_456           0x1002838  /* U+2838 BRAILLE PATTERN DOTS-456 */
+#define XK_braille_dots_1456          0x1002839  /* U+2839 BRAILLE PATTERN DOTS-1456 */
+#define XK_braille_dots_2456          0x100283a  /* U+283a BRAILLE PATTERN DOTS-2456 */
+#define XK_braille_dots_12456         0x100283b  /* U+283b BRAILLE PATTERN DOTS-12456 */
+#define XK_braille_dots_3456          0x100283c  /* U+283c BRAILLE PATTERN DOTS-3456 */
+#define XK_braille_dots_13456         0x100283d  /* U+283d BRAILLE PATTERN DOTS-13456 */
+#define XK_braille_dots_23456         0x100283e  /* U+283e BRAILLE PATTERN DOTS-23456 */
+#define XK_braille_dots_123456        0x100283f  /* U+283f BRAILLE PATTERN DOTS-123456 */
+#define XK_braille_dots_7             0x1002840  /* U+2840 BRAILLE PATTERN DOTS-7 */
+#define XK_braille_dots_17            0x1002841  /* U+2841 BRAILLE PATTERN DOTS-17 */
+#define XK_braille_dots_27            0x1002842  /* U+2842 BRAILLE PATTERN DOTS-27 */
+#define XK_braille_dots_127           0x1002843  /* U+2843 BRAILLE PATTERN DOTS-127 */
+#define XK_braille_dots_37            0x1002844  /* U+2844 BRAILLE PATTERN DOTS-37 */
+#define XK_braille_dots_137           0x1002845  /* U+2845 BRAILLE PATTERN DOTS-137 */
+#define XK_braille_dots_237           0x1002846  /* U+2846 BRAILLE PATTERN DOTS-237 */
+#define XK_braille_dots_1237          0x1002847  /* U+2847 BRAILLE PATTERN DOTS-1237 */
+#define XK_braille_dots_47            0x1002848  /* U+2848 BRAILLE PATTERN DOTS-47 */
+#define XK_braille_dots_147           0x1002849  /* U+2849 BRAILLE PATTERN DOTS-147 */
+#define XK_braille_dots_247           0x100284a  /* U+284a BRAILLE PATTERN DOTS-247 */
+#define XK_braille_dots_1247          0x100284b  /* U+284b BRAILLE PATTERN DOTS-1247 */
+#define XK_braille_dots_347           0x100284c  /* U+284c BRAILLE PATTERN DOTS-347 */
+#define XK_braille_dots_1347          0x100284d  /* U+284d BRAILLE PATTERN DOTS-1347 */
+#define XK_braille_dots_2347          0x100284e  /* U+284e BRAILLE PATTERN DOTS-2347 */
+#define XK_braille_dots_12347         0x100284f  /* U+284f BRAILLE PATTERN DOTS-12347 */
+#define XK_braille_dots_57            0x1002850  /* U+2850 BRAILLE PATTERN DOTS-57 */
+#define XK_braille_dots_157           0x1002851  /* U+2851 BRAILLE PATTERN DOTS-157 */
+#define XK_braille_dots_257           0x1002852  /* U+2852 BRAILLE PATTERN DOTS-257 */
+#define XK_braille_dots_1257          0x1002853  /* U+2853 BRAILLE PATTERN DOTS-1257 */
+#define XK_braille_dots_357           0x1002854  /* U+2854 BRAILLE PATTERN DOTS-357 */
+#define XK_braille_dots_1357          0x1002855  /* U+2855 BRAILLE PATTERN DOTS-1357 */
+#define XK_braille_dots_2357          0x1002856  /* U+2856 BRAILLE PATTERN DOTS-2357 */
+#define XK_braille_dots_12357         0x1002857  /* U+2857 BRAILLE PATTERN DOTS-12357 */
+#define XK_braille_dots_457           0x1002858  /* U+2858 BRAILLE PATTERN DOTS-457 */
+#define XK_braille_dots_1457          0x1002859  /* U+2859 BRAILLE PATTERN DOTS-1457 */
+#define XK_braille_dots_2457          0x100285a  /* U+285a BRAILLE PATTERN DOTS-2457 */
+#define XK_braille_dots_12457         0x100285b  /* U+285b BRAILLE PATTERN DOTS-12457 */
+#define XK_braille_dots_3457          0x100285c  /* U+285c BRAILLE PATTERN DOTS-3457 */
+#define XK_braille_dots_13457         0x100285d  /* U+285d BRAILLE PATTERN DOTS-13457 */
+#define XK_braille_dots_23457         0x100285e  /* U+285e BRAILLE PATTERN DOTS-23457 */
+#define XK_braille_dots_123457        0x100285f  /* U+285f BRAILLE PATTERN DOTS-123457 */
+#define XK_braille_dots_67            0x1002860  /* U+2860 BRAILLE PATTERN DOTS-67 */
+#define XK_braille_dots_167           0x1002861  /* U+2861 BRAILLE PATTERN DOTS-167 */
+#define XK_braille_dots_267           0x1002862  /* U+2862 BRAILLE PATTERN DOTS-267 */
+#define XK_braille_dots_1267          0x1002863  /* U+2863 BRAILLE PATTERN DOTS-1267 */
+#define XK_braille_dots_367           0x1002864  /* U+2864 BRAILLE PATTERN DOTS-367 */
+#define XK_braille_dots_1367          0x1002865  /* U+2865 BRAILLE PATTERN DOTS-1367 */
+#define XK_braille_dots_2367          0x1002866  /* U+2866 BRAILLE PATTERN DOTS-2367 */
+#define XK_braille_dots_12367         0x1002867  /* U+2867 BRAILLE PATTERN DOTS-12367 */
+#define XK_braille_dots_467           0x1002868  /* U+2868 BRAILLE PATTERN DOTS-467 */
+#define XK_braille_dots_1467          0x1002869  /* U+2869 BRAILLE PATTERN DOTS-1467 */
+#define XK_braille_dots_2467          0x100286a  /* U+286a BRAILLE PATTERN DOTS-2467 */
+#define XK_braille_dots_12467         0x100286b  /* U+286b BRAILLE PATTERN DOTS-12467 */
+#define XK_braille_dots_3467          0x100286c  /* U+286c BRAILLE PATTERN DOTS-3467 */
+#define XK_braille_dots_13467         0x100286d  /* U+286d BRAILLE PATTERN DOTS-13467 */
+#define XK_braille_dots_23467         0x100286e  /* U+286e BRAILLE PATTERN DOTS-23467 */
+#define XK_braille_dots_123467        0x100286f  /* U+286f BRAILLE PATTERN DOTS-123467 */
+#define XK_braille_dots_567           0x1002870  /* U+2870 BRAILLE PATTERN DOTS-567 */
+#define XK_braille_dots_1567          0x1002871  /* U+2871 BRAILLE PATTERN DOTS-1567 */
+#define XK_braille_dots_2567          0x1002872  /* U+2872 BRAILLE PATTERN DOTS-2567 */
+#define XK_braille_dots_12567         0x1002873  /* U+2873 BRAILLE PATTERN DOTS-12567 */
+#define XK_braille_dots_3567          0x1002874  /* U+2874 BRAILLE PATTERN DOTS-3567 */
+#define XK_braille_dots_13567         0x1002875  /* U+2875 BRAILLE PATTERN DOTS-13567 */
+#define XK_braille_dots_23567         0x1002876  /* U+2876 BRAILLE PATTERN DOTS-23567 */
+#define XK_braille_dots_123567        0x1002877  /* U+2877 BRAILLE PATTERN DOTS-123567 */
+#define XK_braille_dots_4567          0x1002878  /* U+2878 BRAILLE PATTERN DOTS-4567 */
+#define XK_braille_dots_14567         0x1002879  /* U+2879 BRAILLE PATTERN DOTS-14567 */
+#define XK_braille_dots_24567         0x100287a  /* U+287a BRAILLE PATTERN DOTS-24567 */
+#define XK_braille_dots_124567        0x100287b  /* U+287b BRAILLE PATTERN DOTS-124567 */
+#define XK_braille_dots_34567         0x100287c  /* U+287c BRAILLE PATTERN DOTS-34567 */
+#define XK_braille_dots_134567        0x100287d  /* U+287d BRAILLE PATTERN DOTS-134567 */
+#define XK_braille_dots_234567        0x100287e  /* U+287e BRAILLE PATTERN DOTS-234567 */
+#define XK_braille_dots_1234567       0x100287f  /* U+287f BRAILLE PATTERN DOTS-1234567 */
+#define XK_braille_dots_8             0x1002880  /* U+2880 BRAILLE PATTERN DOTS-8 */
+#define XK_braille_dots_18            0x1002881  /* U+2881 BRAILLE PATTERN DOTS-18 */
+#define XK_braille_dots_28            0x1002882  /* U+2882 BRAILLE PATTERN DOTS-28 */
+#define XK_braille_dots_128           0x1002883  /* U+2883 BRAILLE PATTERN DOTS-128 */
+#define XK_braille_dots_38            0x1002884  /* U+2884 BRAILLE PATTERN DOTS-38 */
+#define XK_braille_dots_138           0x1002885  /* U+2885 BRAILLE PATTERN DOTS-138 */
+#define XK_braille_dots_238           0x1002886  /* U+2886 BRAILLE PATTERN DOTS-238 */
+#define XK_braille_dots_1238          0x1002887  /* U+2887 BRAILLE PATTERN DOTS-1238 */
+#define XK_braille_dots_48            0x1002888  /* U+2888 BRAILLE PATTERN DOTS-48 */
+#define XK_braille_dots_148           0x1002889  /* U+2889 BRAILLE PATTERN DOTS-148 */
+#define XK_braille_dots_248           0x100288a  /* U+288a BRAILLE PATTERN DOTS-248 */
+#define XK_braille_dots_1248          0x100288b  /* U+288b BRAILLE PATTERN DOTS-1248 */
+#define XK_braille_dots_348           0x100288c  /* U+288c BRAILLE PATTERN DOTS-348 */
+#define XK_braille_dots_1348          0x100288d  /* U+288d BRAILLE PATTERN DOTS-1348 */
+#define XK_braille_dots_2348          0x100288e  /* U+288e BRAILLE PATTERN DOTS-2348 */
+#define XK_braille_dots_12348         0x100288f  /* U+288f BRAILLE PATTERN DOTS-12348 */
+#define XK_braille_dots_58            0x1002890  /* U+2890 BRAILLE PATTERN DOTS-58 */
+#define XK_braille_dots_158           0x1002891  /* U+2891 BRAILLE PATTERN DOTS-158 */
+#define XK_braille_dots_258           0x1002892  /* U+2892 BRAILLE PATTERN DOTS-258 */
+#define XK_braille_dots_1258          0x1002893  /* U+2893 BRAILLE PATTERN DOTS-1258 */
+#define XK_braille_dots_358           0x1002894  /* U+2894 BRAILLE PATTERN DOTS-358 */
+#define XK_braille_dots_1358          0x1002895  /* U+2895 BRAILLE PATTERN DOTS-1358 */
+#define XK_braille_dots_2358          0x1002896  /* U+2896 BRAILLE PATTERN DOTS-2358 */
+#define XK_braille_dots_12358         0x1002897  /* U+2897 BRAILLE PATTERN DOTS-12358 */
+#define XK_braille_dots_458           0x1002898  /* U+2898 BRAILLE PATTERN DOTS-458 */
+#define XK_braille_dots_1458          0x1002899  /* U+2899 BRAILLE PATTERN DOTS-1458 */
+#define XK_braille_dots_2458          0x100289a  /* U+289a BRAILLE PATTERN DOTS-2458 */
+#define XK_braille_dots_12458         0x100289b  /* U+289b BRAILLE PATTERN DOTS-12458 */
+#define XK_braille_dots_3458          0x100289c  /* U+289c BRAILLE PATTERN DOTS-3458 */
+#define XK_braille_dots_13458         0x100289d  /* U+289d BRAILLE PATTERN DOTS-13458 */
+#define XK_braille_dots_23458         0x100289e  /* U+289e BRAILLE PATTERN DOTS-23458 */
+#define XK_braille_dots_123458        0x100289f  /* U+289f BRAILLE PATTERN DOTS-123458 */
+#define XK_braille_dots_68            0x10028a0  /* U+28a0 BRAILLE PATTERN DOTS-68 */
+#define XK_braille_dots_168           0x10028a1  /* U+28a1 BRAILLE PATTERN DOTS-168 */
+#define XK_braille_dots_268           0x10028a2  /* U+28a2 BRAILLE PATTERN DOTS-268 */
+#define XK_braille_dots_1268          0x10028a3  /* U+28a3 BRAILLE PATTERN DOTS-1268 */
+#define XK_braille_dots_368           0x10028a4  /* U+28a4 BRAILLE PATTERN DOTS-368 */
+#define XK_braille_dots_1368          0x10028a5  /* U+28a5 BRAILLE PATTERN DOTS-1368 */
+#define XK_braille_dots_2368          0x10028a6  /* U+28a6 BRAILLE PATTERN DOTS-2368 */
+#define XK_braille_dots_12368         0x10028a7  /* U+28a7 BRAILLE PATTERN DOTS-12368 */
+#define XK_braille_dots_468           0x10028a8  /* U+28a8 BRAILLE PATTERN DOTS-468 */
+#define XK_braille_dots_1468          0x10028a9  /* U+28a9 BRAILLE PATTERN DOTS-1468 */
+#define XK_braille_dots_2468          0x10028aa  /* U+28aa BRAILLE PATTERN DOTS-2468 */
+#define XK_braille_dots_12468         0x10028ab  /* U+28ab BRAILLE PATTERN DOTS-12468 */
+#define XK_braille_dots_3468          0x10028ac  /* U+28ac BRAILLE PATTERN DOTS-3468 */
+#define XK_braille_dots_13468         0x10028ad  /* U+28ad BRAILLE PATTERN DOTS-13468 */
+#define XK_braille_dots_23468         0x10028ae  /* U+28ae BRAILLE PATTERN DOTS-23468 */
+#define XK_braille_dots_123468        0x10028af  /* U+28af BRAILLE PATTERN DOTS-123468 */
+#define XK_braille_dots_568           0x10028b0  /* U+28b0 BRAILLE PATTERN DOTS-568 */
+#define XK_braille_dots_1568          0x10028b1  /* U+28b1 BRAILLE PATTERN DOTS-1568 */
+#define XK_braille_dots_2568          0x10028b2  /* U+28b2 BRAILLE PATTERN DOTS-2568 */
+#define XK_braille_dots_12568         0x10028b3  /* U+28b3 BRAILLE PATTERN DOTS-12568 */
+#define XK_braille_dots_3568          0x10028b4  /* U+28b4 BRAILLE PATTERN DOTS-3568 */
+#define XK_braille_dots_13568         0x10028b5  /* U+28b5 BRAILLE PATTERN DOTS-13568 */
+#define XK_braille_dots_23568         0x10028b6  /* U+28b6 BRAILLE PATTERN DOTS-23568 */
+#define XK_braille_dots_123568        0x10028b7  /* U+28b7 BRAILLE PATTERN DOTS-123568 */
+#define XK_braille_dots_4568          0x10028b8  /* U+28b8 BRAILLE PATTERN DOTS-4568 */
+#define XK_braille_dots_14568         0x10028b9  /* U+28b9 BRAILLE PATTERN DOTS-14568 */
+#define XK_braille_dots_24568         0x10028ba  /* U+28ba BRAILLE PATTERN DOTS-24568 */
+#define XK_braille_dots_124568        0x10028bb  /* U+28bb BRAILLE PATTERN DOTS-124568 */
+#define XK_braille_dots_34568         0x10028bc  /* U+28bc BRAILLE PATTERN DOTS-34568 */
+#define XK_braille_dots_134568        0x10028bd  /* U+28bd BRAILLE PATTERN DOTS-134568 */
+#define XK_braille_dots_234568        0x10028be  /* U+28be BRAILLE PATTERN DOTS-234568 */
+#define XK_braille_dots_1234568       0x10028bf  /* U+28bf BRAILLE PATTERN DOTS-1234568 */
+#define XK_braille_dots_78            0x10028c0  /* U+28c0 BRAILLE PATTERN DOTS-78 */
+#define XK_braille_dots_178           0x10028c1  /* U+28c1 BRAILLE PATTERN DOTS-178 */
+#define XK_braille_dots_278           0x10028c2  /* U+28c2 BRAILLE PATTERN DOTS-278 */
+#define XK_braille_dots_1278          0x10028c3  /* U+28c3 BRAILLE PATTERN DOTS-1278 */
+#define XK_braille_dots_378           0x10028c4  /* U+28c4 BRAILLE PATTERN DOTS-378 */
+#define XK_braille_dots_1378          0x10028c5  /* U+28c5 BRAILLE PATTERN DOTS-1378 */
+#define XK_braille_dots_2378          0x10028c6  /* U+28c6 BRAILLE PATTERN DOTS-2378 */
+#define XK_braille_dots_12378         0x10028c7  /* U+28c7 BRAILLE PATTERN DOTS-12378 */
+#define XK_braille_dots_478           0x10028c8  /* U+28c8 BRAILLE PATTERN DOTS-478 */
+#define XK_braille_dots_1478          0x10028c9  /* U+28c9 BRAILLE PATTERN DOTS-1478 */
+#define XK_braille_dots_2478          0x10028ca  /* U+28ca BRAILLE PATTERN DOTS-2478 */
+#define XK_braille_dots_12478         0x10028cb  /* U+28cb BRAILLE PATTERN DOTS-12478 */
+#define XK_braille_dots_3478          0x10028cc  /* U+28cc BRAILLE PATTERN DOTS-3478 */
+#define XK_braille_dots_13478         0x10028cd  /* U+28cd BRAILLE PATTERN DOTS-13478 */
+#define XK_braille_dots_23478         0x10028ce  /* U+28ce BRAILLE PATTERN DOTS-23478 */
+#define XK_braille_dots_123478        0x10028cf  /* U+28cf BRAILLE PATTERN DOTS-123478 */
+#define XK_braille_dots_578           0x10028d0  /* U+28d0 BRAILLE PATTERN DOTS-578 */
+#define XK_braille_dots_1578          0x10028d1  /* U+28d1 BRAILLE PATTERN DOTS-1578 */
+#define XK_braille_dots_2578          0x10028d2  /* U+28d2 BRAILLE PATTERN DOTS-2578 */
+#define XK_braille_dots_12578         0x10028d3  /* U+28d3 BRAILLE PATTERN DOTS-12578 */
+#define XK_braille_dots_3578          0x10028d4  /* U+28d4 BRAILLE PATTERN DOTS-3578 */
+#define XK_braille_dots_13578         0x10028d5  /* U+28d5 BRAILLE PATTERN DOTS-13578 */
+#define XK_braille_dots_23578         0x10028d6  /* U+28d6 BRAILLE PATTERN DOTS-23578 */
+#define XK_braille_dots_123578        0x10028d7  /* U+28d7 BRAILLE PATTERN DOTS-123578 */
+#define XK_braille_dots_4578          0x10028d8  /* U+28d8 BRAILLE PATTERN DOTS-4578 */
+#define XK_braille_dots_14578         0x10028d9  /* U+28d9 BRAILLE PATTERN DOTS-14578 */
+#define XK_braille_dots_24578         0x10028da  /* U+28da BRAILLE PATTERN DOTS-24578 */
+#define XK_braille_dots_124578        0x10028db  /* U+28db BRAILLE PATTERN DOTS-124578 */
+#define XK_braille_dots_34578         0x10028dc  /* U+28dc BRAILLE PATTERN DOTS-34578 */
+#define XK_braille_dots_134578        0x10028dd  /* U+28dd BRAILLE PATTERN DOTS-134578 */
+#define XK_braille_dots_234578        0x10028de  /* U+28de BRAILLE PATTERN DOTS-234578 */
+#define XK_braille_dots_1234578       0x10028df  /* U+28df BRAILLE PATTERN DOTS-1234578 */
+#define XK_braille_dots_678           0x10028e0  /* U+28e0 BRAILLE PATTERN DOTS-678 */
+#define XK_braille_dots_1678          0x10028e1  /* U+28e1 BRAILLE PATTERN DOTS-1678 */
+#define XK_braille_dots_2678          0x10028e2  /* U+28e2 BRAILLE PATTERN DOTS-2678 */
+#define XK_braille_dots_12678         0x10028e3  /* U+28e3 BRAILLE PATTERN DOTS-12678 */
+#define XK_braille_dots_3678          0x10028e4  /* U+28e4 BRAILLE PATTERN DOTS-3678 */
+#define XK_braille_dots_13678         0x10028e5  /* U+28e5 BRAILLE PATTERN DOTS-13678 */
+#define XK_braille_dots_23678         0x10028e6  /* U+28e6 BRAILLE PATTERN DOTS-23678 */
+#define XK_braille_dots_123678        0x10028e7  /* U+28e7 BRAILLE PATTERN DOTS-123678 */
+#define XK_braille_dots_4678          0x10028e8  /* U+28e8 BRAILLE PATTERN DOTS-4678 */
+#define XK_braille_dots_14678         0x10028e9  /* U+28e9 BRAILLE PATTERN DOTS-14678 */
+#define XK_braille_dots_24678         0x10028ea  /* U+28ea BRAILLE PATTERN DOTS-24678 */
+#define XK_braille_dots_124678        0x10028eb  /* U+28eb BRAILLE PATTERN DOTS-124678 */
+#define XK_braille_dots_34678         0x10028ec  /* U+28ec BRAILLE PATTERN DOTS-34678 */
+#define XK_braille_dots_134678        0x10028ed  /* U+28ed BRAILLE PATTERN DOTS-134678 */
+#define XK_braille_dots_234678        0x10028ee  /* U+28ee BRAILLE PATTERN DOTS-234678 */
+#define XK_braille_dots_1234678       0x10028ef  /* U+28ef BRAILLE PATTERN DOTS-1234678 */
+#define XK_braille_dots_5678          0x10028f0  /* U+28f0 BRAILLE PATTERN DOTS-5678 */
+#define XK_braille_dots_15678         0x10028f1  /* U+28f1 BRAILLE PATTERN DOTS-15678 */
+#define XK_braille_dots_25678         0x10028f2  /* U+28f2 BRAILLE PATTERN DOTS-25678 */
+#define XK_braille_dots_125678        0x10028f3  /* U+28f3 BRAILLE PATTERN DOTS-125678 */
+#define XK_braille_dots_35678         0x10028f4  /* U+28f4 BRAILLE PATTERN DOTS-35678 */
+#define XK_braille_dots_135678        0x10028f5  /* U+28f5 BRAILLE PATTERN DOTS-135678 */
+#define XK_braille_dots_235678        0x10028f6  /* U+28f6 BRAILLE PATTERN DOTS-235678 */
+#define XK_braille_dots_1235678       0x10028f7  /* U+28f7 BRAILLE PATTERN DOTS-1235678 */
+#define XK_braille_dots_45678         0x10028f8  /* U+28f8 BRAILLE PATTERN DOTS-45678 */
+#define XK_braille_dots_145678        0x10028f9  /* U+28f9 BRAILLE PATTERN DOTS-145678 */
+#define XK_braille_dots_245678        0x10028fa  /* U+28fa BRAILLE PATTERN DOTS-245678 */
+#define XK_braille_dots_1245678       0x10028fb  /* U+28fb BRAILLE PATTERN DOTS-1245678 */
+#define XK_braille_dots_345678        0x10028fc  /* U+28fc BRAILLE PATTERN DOTS-345678 */
+#define XK_braille_dots_1345678       0x10028fd  /* U+28fd BRAILLE PATTERN DOTS-1345678 */
+#define XK_braille_dots_2345678       0x10028fe  /* U+28fe BRAILLE PATTERN DOTS-2345678 */
+#define XK_braille_dots_12345678      0x10028ff  /* U+28ff BRAILLE PATTERN DOTS-12345678 */
+#endif /* XK_BRAILLE */