diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2008-09-14 07:31:44 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2008-09-14 07:31:44 +0000 |
| commit | 38aec5d1d98e4a02da3577ee89cd1e78d4f060ba (patch) | |
| tree | 4c7eb396fb1d446488d9e1585ad4ef45d96d06b5 | |
| parent | 6ef13882bff3dee07e4147778fa5e821ce2ba5a1 (diff) | |
x11proto 7.0.13. tested by naddy@ on a bulk ports build
| -rw-r--r-- | proto/x11proto/ChangeLog | 717 | ||||
| -rw-r--r-- | proto/x11proto/X.h | 3 | ||||
| -rw-r--r-- | proto/x11proto/XF86keysym.h | 281 | ||||
| -rw-r--r-- | proto/x11proto/Xalloca.h | 9 | ||||
| -rw-r--r-- | proto/x11proto/Xfuncproto.h.in | 18 | ||||
| -rw-r--r-- | proto/x11proto/Xfuncs.h | 6 | ||||
| -rw-r--r-- | proto/x11proto/Xos.h | 4 | ||||
| -rw-r--r-- | proto/x11proto/Xos_r.h | 4 | ||||
| -rw-r--r-- | proto/x11proto/Xosdefs.h | 18 | ||||
| -rw-r--r-- | proto/x11proto/Xproto.h | 32 | ||||
| -rw-r--r-- | proto/x11proto/Xw32defs.h | 2 | ||||
| -rw-r--r-- | proto/x11proto/Xwindows.h | 2 | ||||
| -rw-r--r-- | proto/x11proto/Xwinsock.h | 2 | ||||
| -rw-r--r-- | proto/x11proto/configure.ac | 34 | ||||
| -rw-r--r-- | proto/x11proto/do-not-use-config.h.in | 48 | ||||
| -rw-r--r-- | proto/x11proto/keysymdef.h | 306 |
16 files changed, 1296 insertions, 190 deletions
diff --git a/proto/x11proto/ChangeLog b/proto/x11proto/ChangeLog index 89d1f5d7c..3635f08b5 100644 --- a/proto/x11proto/ChangeLog +++ b/proto/x11proto/ChangeLog @@ -1,45 +1,700 @@ -2006-04-26 Adam Jackson <ajax@freedesktop.org> +commit 53859ee4e431c21000e282971894dbe9384ed205 +Author: Peter Hutterer <peter@cs.unisa.edu.au> +Date: Wed May 28 17:17:38 2008 +0930 - * configure.ac: - Bump to 7.0.5 + Bump to 7.0.13. -2006-04-25 Alan Coopersmith <alan.coopersmith@sun.com> +commit 44e458285bb2e7771963a9ab9b5f03d2fb48e611 +Author: Peter Hutterer <peter@cs.unisa.edu.au> +Date: Tue May 15 16:41:08 2007 +0930 - * Xdefs.h: - * Xos.h: - Fix more comment typos. + Add GenericEvent and xGenericEvent definitions. + (cherry picked from commit 8a96cdca08db2563e8c4c7c9a110a3ab6d973fcc) -2006-04-19 Alan Coopersmith <alan.coopersmith@sun.com> +commit 22878c30d21580146200c00070478f88d969bcaa +Author: Jeremy Huddleston <jeremyhu@freedesktop.org> +Date: Thu May 8 15:02:41 2008 -0700 - * Xmd.h: - On Solaris, #include <sys/isa_defs.h> to be sure _LP64 is defined - in 64-bit builds. + Apple: Added a comment to explain _DARWIN_C_SOURCE - * Xmd.h: - * Xos.h: - * Xos_r.h: - * Xproto.h: - * keysymdef.h: - Fix some comment typos. +commit e3035a7e6e56e01eb79478ea5342e032ec67a190 +Author: Jeremy Huddleston <jeremyhu@freedesktop.org> +Date: Thu May 8 12:16:15 2008 -0700 -2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> + Apple: Define _DARWIN_C_SOURCE otherwise _XOPEN_SOURCE, _POSIX_SOURCE, or _POSIX_C_SOURCE will cause fd_mask to not be defined due to the strict namespace - * configure.ac: - Update package version number for final X11R7 release candidate. +commit 05b119d78e1c6a4db563b2a976cee0173489f9b6 +Author: Jeremy Huddleston <jeremyhu@freedesktop.org> +Date: Thu May 8 11:36:03 2008 -0700 -2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> + Apple: Cleaned up some Apple definitions - * configure.ac: - Update package version number for X11R7 RC3 release. +commit c879dab58f82f4789f27933c22706c84015f8684 +Author: Alan Hourihane <alanh@tungstengraphics.com> +Date: Tue Apr 29 00:37:28 2008 +0100 -2005-12-02 Kevin E. Martin <kem-at-freedesktop-dot-org> + avoid checking for fds_bits on mingw - * Xfuncproto.h.in: - * configure.ac: - Automatically generate FUNCPROTO and NARROWPROTO defines in - Xfuncproto.h. +commit 8642ec676db0dd875f4d3a97d8a3cdbf6843a985 +Author: Colin Harrison <colin.harrison-at-virgin.net> +Date: Sat Apr 26 18:21:41 2008 +0100 -2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org> + Use Sleep() instead of sleep() on windows + + (was already done in Xwindows.h, just not Xw32defs.h) - * configure.ac: - Update package version number for X11R7 RC2 release. +commit a893a6ac5d9fdfe9a420d1812402a01904e6482b +Author: Colin Harrison <colin.harrison-at-virgin.net> +Date: Sat Apr 26 08:52:29 2008 +0100 + + Use winsock2.h + +commit c705bab0f6efcb6937b7ccc2fb415e701878fddb +Author: Markus Kuhn <Markus.Kuhn@cl.cam.ac.uk> +Date: Mon Apr 21 21:27:26 2008 +0100 + + Added comment to slightly discourage the definition of ever more Unicode keysyms + +commit 44e24a27bca023cf7b799f191fe6d52e12efbe5f +Author: James Cloos <cloos@jhcloos.com> +Date: Sat Apr 12 15:48:46 2008 -0400 + + Add more dead key syms + Add dead keys to support input of the precomposed latin characters in + ISO 10747 which have ring, line, circumflex, tilde, breve or diaeresis + below. + + This addresses: https://bugs.freedesktop.org/show_bug.cgi?id=15446 + +commit 07e83988ec0b1c9577646daca3943badd5dcc0d1 +Author: James Cloos <cloos@jhcloos.com> +Date: Thu Mar 6 11:34:17 2008 -0500 + + Fix typo in XF86Keysym.h + + Fix typo reported in https://bugs.freedesktop.org/show_bug.cgi?id=11193 + thereby making XF86Keysym.h match libX11’s XKeysymDB. + +commit d34310efef11264ddff79320b8c6f03705b1208a +Author: Adam Jackson <ajax@redhat.com> +Date: Wed Mar 5 22:09:16 2008 -0500 + + x11proto 7.0.12 + +commit e4ad7a8080e4ac0b868fa7cf39bc5ad9a6e0bee1 +Author: Jeremy Huddleston <jeremy@tifa.local> +Date: Sun Feb 10 19:07:49 2008 -0800 + + Fixed #ifdef checks that were using i386 to use __i386__ + + """ + It's simply obsolete, sloppy, compiler namespace pollution. The + compiler is not allowed to predefine symbols that might conflict with + ordinary identifiers. For backwards compatibility gcc currently + predefines i386 when compiling for x86 32-bit (but not 64-bit), but that + will go away. It is also not defined if you specify -ansi when invoking + the compiler, because then it is seriously standards compliant. Other + compilers shouldn't define it either. Correct code shouldn't rely on it + being defined. However __i386__ is safe and proper. + """ + +commit e49280c1c33622dbf288b0ac4f8324b01ff9b4aa +Author: Jeremy Huddleston <jeremy@yuffie.local> +Date: Mon Dec 10 21:33:01 2007 -0800 + + Changed __DARWIN__ to __APPLE__ + +commit 5ae4d304ecb5fb4af0435c9f2efde3d2da5905d1 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Tue Oct 30 18:44:49 2007 -0700 + + Make Xalloca.h work with Sun C++ compiler + +commit 5ccc71161283fdb2c42da1eeb4049650f6a2f429 +Author: Ben Byer <bbyer@bbyer.apple.com> +Date: Tue Oct 30 18:40:47 2007 -0700 + + fd_mask needs to be defined on OS X, too + +commit 8be48ca399c3efd0e5d59f53da1b37d02647f33b +Author: Daniel Stone <daniel@fooishbar.org> +Date: Mon Sep 24 12:28:25 2007 +0300 + + Check headers before testing for fds_bits access method (bug #8442) + + HP-UX doesn't have sys/select.h, so make sure we don't overzealously include + headers when we try to find out how to use fds_bits. + +commit 68e841fb4bf489531635e6bee70f041d2c3cb87c +Author: James Cloos <cloos@jhcloos.com> +Date: Sat Sep 8 08:30:17 2007 -0400 + + bump to 7.0.11 + +commit 11fd082a384499c38065e06065bf80f244e9909a +Author: Eric Anholt <eric@anholt.net> +Date: Tue Aug 28 14:54:44 2007 -0700 + + Describe what XF86XK_Display does (or now is meant to do). + +commit 40ed4eef92e31fcf7ea0a436e1a00cdf49484c1b +Author: James Cloos <cloos@jhcloos.com> +Date: Wed Aug 22 21:10:47 2007 -0400 + + Add dead_abovecomma and dead_abovereversedcomma + + Also added aliases dead_psili and dead_dasia. + + The UCS unifies Combining Psili and Combining Dasia with + Combining Comma Above and Combining Reversed Comma Above. + These two aliases mirror that unification. + +commit ab74d270c76b17926504815ba43ee35b8b18d3be +Author: James Cloos <cloos@jhcloos.com> +Date: Wed Aug 22 21:01:48 2007 -0400 + + Comment on the new locations of the files referenced in keysymdef.h + keysymdef.h has a comment from the monolithic days suggesting that + the file be kept in sync with mappings inxc/lib/X11/KeyBind.c and + the protocol specication in xc/doc/specs/XProtocol/X11.keysyms. + + This commit adds pointers to the new locations of those two files. + +commit 1edcfdb7f5c51e5c8014c56c4d5937337b7d4302 +Author: James Cloos <cloos@jhcloos.com> +Date: Tue Aug 21 00:10:08 2007 -0400 + + Add *~ to .gitignore to skip patch/emacs droppings + +commit d8a49874bbd05a927c42102c0c5c147cf72cb1dd +Author: Colin Harrison <colin.harrison-at-virgin.net> +Date: Wed May 9 16:46:25 2007 +0100 + + bcopy needs definition in Xfuncs.h for Xming + +commit 7505880329d6b81f0c77d6aaa3995390659d5c63 +Author: Tilman Sauerbeck <tilman@code-monkey.de> +Date: Tue May 1 14:54:27 2007 +0200 + + Added some more files to .gitignore. + +commit 0c55a57dca2e888ba089e280f62e1c5bb55db7d7 +Author: Tilman Sauerbeck <tilman@code-monkey.de> +Date: Tue May 1 14:52:57 2007 +0200 + + Enable GCC's visibility attributes on GCC 4 or greater only. + +commit 30f5eedf800f6683161fca9fc3e2d6ddc9ce0ac3 +Author: Zephaniah E. Hull <warp@agamemnon.b5> +Date: Fri Feb 2 15:11:26 2007 -0500 + + Add keysym definitions from Jim Gettys. + +commit 5951f0355c6b1c591241bccb2023e6c4d493e701 +Author: Daniel Stone <daniel@fooishbar.org> +Date: Sat Dec 16 01:09:50 2006 +0200 + + bump to 7.0.10 + +commit 0422755ef9373fbb6f69fbb599d791331837f747 +Author: Daniel Stone <daniel@fooishbar.org> +Date: Sat Dec 16 01:09:44 2006 +0200 + + don't distribute Xfuncproto.h and Xpoll.h + Don't distribute these two files, as they're generated during the build. + +commit cf44526713681ccfb6ef929a9c25ea650c5d1a32 +Author: Daniel Stone <daniel@fooishbar.org> +Date: Wed Dec 6 19:02:19 2006 +0200 + + Makefile.am: make ChangeLog hook safer + Make ChangeLog hook as safe as possible. + +commit 528e313fd1f1ae6f2303d3963afe41545f55ef88 +Author: Daniel Stone <daniel@fooishbar.org> +Date: Thu Oct 26 00:45:44 2006 +0300 + + bump to 7.0.9 + +commit ab484c934301a61edc66dc1e4f554ec97b53aaf8 +Author: Daniel Stone <daniel@fooishbar.org> +Date: Thu Oct 26 00:45:36 2006 +0300 + + Xfuncproto: add _X_LIKELY and _X_UNLIKELY + Add gcc branch hinting annotations. + +commit 178cae180bc8b2e8feaaeda6d7c0317cf2715e14 +Author: Daniel Stone <daniel@fooishbar.org> +Date: Thu Sep 21 18:43:06 2006 +0300 + + Xfuncproto: define _X_INLINE for older compilers + +commit 241e9dfd400aa21919d06fb7c78b5730eee12aab +Author: Daniel Stone <daniel@fooishbar.org> +Date: Thu Sep 21 14:51:00 2006 +0300 + + bump to 7.0.8 + +commit e51b21e316a5a1b9442a5d972b4ffa03455aca6e +Author: Daniel Stone <daniel@fooishbar.org> +Date: Thu Sep 21 14:50:45 2006 +0300 + + XF86keysym: add keyboard/monitor brightness controls (Bug #8120) + Add XF86{Kbd,Mon}Brightness{Up,Down}, and XF86KbdLightOnOff. + +commit c3f56593f776e7f9e3e0d220c6bcf8be38a16839 +Author: Daniel Stone <daniel@fooishbar.org> +Date: Wed Sep 20 21:11:30 2006 +0300 + + Xfuncproto: add _X_INLINE + +commit 4fb2e257ae6de38971be8005283402226aea1ee5 +Author: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Fri Jul 14 17:59:19 2006 -0700 + + Replace manual ChangeLog with dist-hook to generate from git log + +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 diff --git a/proto/x11proto/X.h b/proto/x11proto/X.h index 0a9c501fb..ebcc767da 100644 --- a/proto/x11proto/X.h +++ b/proto/x11proto/X.h @@ -216,7 +216,8 @@ are reserved in the protocol for errors and replies. */ #define ColormapNotify 32 #define ClientMessage 33 #define MappingNotify 34 -#define LASTEvent 35 /* must be bigger than any event # */ +#define GenericEvent 35 +#define LASTEvent 36 /* must be bigger than any event # */ /* Key masks. Used as modifiers to GrabButton and GrabKey, results of QueryPointer, diff --git a/proto/x11proto/XF86keysym.h b/proto/x11proto/XF86keysym.h index fdb8fd6d2..e4ba4a6d6 100644 --- 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, @@ -27,147 +27,164 @@ * * Check in keysymdef.h for generic symbols before adding new XFree86-specific * symbols here. + * + * X.Org will not be adding to the XF86 set of keysyms, though they have + * been adopted and are considered a "standard" part of X keysym definitions. + * XFree86 never properly commented these keysyms, so we have done our + * best to explain the semantic meaning of these keys. + * + * XFree86 has removed their mail archives of the period, that might have + * shed more light on some of these definitions. Until/unless we resurrect + * these archives, these are from memory and usage. */ +/* Backlight controls. */ +#define XF86XK_MonBrightnessUp 0x1008FF02 /* Monitor/panel brightness */ +#define XF86XK_MonBrightnessDown 0x1008FF03 /* Monitor/panel brightness */ +#define XF86XK_KbdLightOnOff 0x1008FF04 /* Keyboards may be lit */ +#define XF86XK_KbdBrightnessUp 0x1008FF05 /* Keyboards may be lit */ +#define XF86XK_KbdBrightnessDown 0x1008FF06 /* Keyboards may be lit */ + /* * Keys found on some "Internet" keyboards. */ -#define XF86XK_Standby 0x1008FF10 -#define XF86XK_AudioLowerVolume 0x1008FF11 -#define XF86XK_AudioMute 0x1008FF12 -#define XF86XK_AudioRaiseVolume 0x1008FF13 -#define XF86XK_AudioPlay 0x1008FF14 -#define XF86XK_AudioStop 0x1008FF15 -#define XF86XK_AudioPrev 0x1008FF16 -#define XF86XK_AudioNext 0x1008FF17 -#define XF86XK_HomePage 0x1008FF18 -#define XF86XK_Mail 0x1008FF19 -#define XF86XK_Start 0x1008FF1A -#define XF86XK_Search 0x1008FF1B -#define XF86XK_AudioRecord 0x1008FF1C +#define XF86XK_Standby 0x1008FF10 /* System into standby mode */ +#define XF86XK_AudioLowerVolume 0x1008FF11 /* Volume control down */ +#define XF86XK_AudioMute 0x1008FF12 /* Mute sound from the system */ +#define XF86XK_AudioRaiseVolume 0x1008FF13 /* Volume control up */ +#define XF86XK_AudioPlay 0x1008FF14 /* Start playing of audio > */ +#define XF86XK_AudioStop 0x1008FF15 /* Stop playing audio */ +#define XF86XK_AudioPrev 0x1008FF16 /* Previous track */ +#define XF86XK_AudioNext 0x1008FF17 /* Next track */ +#define XF86XK_HomePage 0x1008FF18 /* Display user's home page */ +#define XF86XK_Mail 0x1008FF19 /* Invoke user's mail program */ +#define XF86XK_Start 0x1008FF1A /* Start application */ +#define XF86XK_Search 0x1008FF1B /* Search */ +#define XF86XK_AudioRecord 0x1008FF1C /* Record audio application */ -/* These are sometimes found on PDA's (e.g. Palm, PocketPC or elsewhere) */ -#define XF86XK_Calculator 0x1008FF1D -#define XF86XK_Memo 0x1008FF1E -#define XF86XK_ToDoList 0x1008FF1F -#define XF86XK_Calendar 0x1008FF20 -#define XF86XK_PowerDown 0x1008FF21 -#define XF86XK_ContrastAdjust 0x1008FF22 -#define XF86XK_RockerUp 0x1008FF23 -#define XF86XK_RockerDown 0x1008FF24 -#define XF86XK_RockerEnter 0x1008FF25 +/* These are sometimes found on PDA's (e.g. Palm, PocketPC or elsewhere) */ +#define XF86XK_Calculator 0x1008FF1D /* Invoke calculator program */ +#define XF86XK_Memo 0x1008FF1E /* Invoke Memo taking program */ +#define XF86XK_ToDoList 0x1008FF1F /* Invoke To Do List program */ +#define XF86XK_Calendar 0x1008FF20 /* Invoke Calendar program */ +#define XF86XK_PowerDown 0x1008FF21 /* Deep sleep the system */ +#define XF86XK_ContrastAdjust 0x1008FF22 /* Adjust screen contrast */ +#define XF86XK_RockerUp 0x1008FF23 /* Rocker switches exist up */ +#define XF86XK_RockerDown 0x1008FF24 /* and down */ +#define XF86XK_RockerEnter 0x1008FF25 /* and let you press them */ /* Some more "Internet" keyboard symbols */ -#define XF86XK_Back 0x1008FF26 -#define XF86XK_Forward 0x1008FF27 -#define XF86XK_Stop 0x1008FF28 -#define XF86XK_Refresh 0x1008FF29 -#define XF86XK_PowerOff 0x1008FF2A -#define XF86XK_WakeUp 0x1008FF2B -#define XF86XK_Eject 0x1008FF2C -#define XF86XK_ScreenSaver 0x1008FF2D -#define XF86XK_WWW 0x1008FF2E -#define XF86XK_Sleep 0x1008FF2F -#define XF86XK_Favorites 0x1008FF30 -#define XF86XK_AudioPause 0x1008FF31 -#define XF86XK_AudioMedia 0x1008FF32 -#define XF86XK_MyComputer 0x1008FF33 -#define XF86XK_VendorHome 0x1008FF34 -#define XF86XK_LightBulb 0x1008FF35 -#define XF86XK_Shop 0x1008FF36 -#define XF86XK_History 0x1008FF37 -#define XF86XK_OpenURL 0x1008FF38 -#define XF86XK_AddFavorite 0x1008FF39 -#define XF86XK_HotLinks 0x1008FF3A -#define XF86XK_BrightnessAdjust 0x1008FF3B -#define XF86XK_Finance 0x1008FF3C -#define XF86XK_Community 0x1008FF3D -#define XF86XK_AudioRewind 0x1008FF3E -#define XF86XK_XF86BackForward 0x1008FF3F -#define XF86XK_Launch0 0x1008FF40 -#define XF86XK_Launch1 0x1008FF41 -#define XF86XK_Launch2 0x1008FF42 -#define XF86XK_Launch3 0x1008FF43 -#define XF86XK_Launch4 0x1008FF44 -#define XF86XK_Launch5 0x1008FF45 -#define XF86XK_Launch6 0x1008FF46 -#define XF86XK_Launch7 0x1008FF47 -#define XF86XK_Launch8 0x1008FF48 -#define XF86XK_Launch9 0x1008FF49 -#define XF86XK_LaunchA 0x1008FF4A -#define XF86XK_LaunchB 0x1008FF4B -#define XF86XK_LaunchC 0x1008FF4C -#define XF86XK_LaunchD 0x1008FF4D -#define XF86XK_LaunchE 0x1008FF4E -#define XF86XK_LaunchF 0x1008FF4F +#define XF86XK_Back 0x1008FF26 /* Like back on a browser */ +#define XF86XK_Forward 0x1008FF27 /* Like forward on a browser */ +#define XF86XK_Stop 0x1008FF28 /* Stop current operation */ +#define XF86XK_Refresh 0x1008FF29 /* Refresh the page */ +#define XF86XK_PowerOff 0x1008FF2A /* Power off system entirely */ +#define XF86XK_WakeUp 0x1008FF2B /* Wake up system from sleep */ +#define XF86XK_Eject 0x1008FF2C /* Eject device (e.g. DVD) */ +#define XF86XK_ScreenSaver 0x1008FF2D /* Invoke screensaver */ +#define XF86XK_WWW 0x1008FF2E /* Invoke web browser */ +#define XF86XK_Sleep 0x1008FF2F /* Put system to sleep */ +#define XF86XK_Favorites 0x1008FF30 /* Show favorite locations */ +#define XF86XK_AudioPause 0x1008FF31 /* Pause audio playing */ +#define XF86XK_AudioMedia 0x1008FF32 /* Launch media collection app */ +#define XF86XK_MyComputer 0x1008FF33 /* Display "My Computer" window */ +#define XF86XK_VendorHome 0x1008FF34 /* Display vendor home web site */ +#define XF86XK_LightBulb 0x1008FF35 /* Light bulb keys exist */ +#define XF86XK_Shop 0x1008FF36 /* Display shopping web site */ +#define XF86XK_History 0x1008FF37 /* Show history of web surfing */ +#define XF86XK_OpenURL 0x1008FF38 /* Open selected URL */ +#define XF86XK_AddFavorite 0x1008FF39 /* Add URL to favorites list */ +#define XF86XK_HotLinks 0x1008FF3A /* Show "hot" links */ +#define XF86XK_BrightnessAdjust 0x1008FF3B /* Invoke brightness adj. UI */ +#define XF86XK_Finance 0x1008FF3C /* Display financial site */ +#define XF86XK_Community 0x1008FF3D /* Display user's community */ +#define XF86XK_AudioRewind 0x1008FF3E /* "rewind" audio track */ +#define XF86XK_BackForward 0x1008FF3F /* ??? */ +#define XF86XK_Launch0 0x1008FF40 /* Launch Application */ +#define XF86XK_Launch1 0x1008FF41 /* Launch Application */ +#define XF86XK_Launch2 0x1008FF42 /* Launch Application */ +#define XF86XK_Launch3 0x1008FF43 /* Launch Application */ +#define XF86XK_Launch4 0x1008FF44 /* Launch Application */ +#define XF86XK_Launch5 0x1008FF45 /* Launch Application */ +#define XF86XK_Launch6 0x1008FF46 /* Launch Application */ +#define XF86XK_Launch7 0x1008FF47 /* Launch Application */ +#define XF86XK_Launch8 0x1008FF48 /* Launch Application */ +#define XF86XK_Launch9 0x1008FF49 /* Launch Application */ +#define XF86XK_LaunchA 0x1008FF4A /* Launch Application */ +#define XF86XK_LaunchB 0x1008FF4B /* Launch Application */ +#define XF86XK_LaunchC 0x1008FF4C /* Launch Application */ +#define XF86XK_LaunchD 0x1008FF4D /* Launch Application */ +#define XF86XK_LaunchE 0x1008FF4E /* Launch Application */ +#define XF86XK_LaunchF 0x1008FF4F /* Launch Application */ -#define XF86XK_ApplicationLeft 0x1008FF50 -#define XF86XK_ApplicationRight 0x1008FF51 -#define XF86XK_Book 0x1008FF52 -#define XF86XK_CD 0x1008FF53 -#define XF86XK_Calculater 0x1008FF54 -#define XF86XK_Clear 0x1008FF55 -#define XF86XK_Close 0x1008FF56 -#define XF86XK_Copy 0x1008FF57 -#define XF86XK_Cut 0x1008FF58 -#define XF86XK_Display 0x1008FF59 -#define XF86XK_DOS 0x1008FF5A -#define XF86XK_Documents 0x1008FF5B -#define XF86XK_Excel 0x1008FF5C -#define XF86XK_Explorer 0x1008FF5D -#define XF86XK_Game 0x1008FF5E -#define XF86XK_Go 0x1008FF5F -#define XF86XK_iTouch 0x1008FF60 -#define XF86XK_LogOff 0x1008FF61 -#define XF86XK_Market 0x1008FF62 -#define XF86XK_Meeting 0x1008FF63 -#define XF86XK_MenuKB 0x1008FF65 -#define XF86XK_MenuPB 0x1008FF66 -#define XF86XK_MySites 0x1008FF67 -#define XF86XK_New 0x1008FF68 -#define XF86XK_News 0x1008FF69 -#define XF86XK_OfficeHome 0x1008FF6A -#define XF86XK_Open 0x1008FF6B -#define XF86XK_Option 0x1008FF6C -#define XF86XK_Paste 0x1008FF6D -#define XF86XK_Phone 0x1008FF6E -#define XF86XK_Q 0x1008FF70 -#define XF86XK_Reply 0x1008FF72 -#define XF86XK_Reload 0x1008FF73 -#define XF86XK_RotateWindows 0x1008FF74 -#define XF86XK_RotationPB 0x1008FF75 -#define XF86XK_RotationKB 0x1008FF76 -#define XF86XK_Save 0x1008FF77 -#define XF86XK_ScrollUp 0x1008FF78 -#define XF86XK_ScrollDown 0x1008FF79 -#define XF86XK_ScrollClick 0x1008FF7A -#define XF86XK_Send 0x1008FF7B -#define XF86XK_Spell 0x1008FF7C -#define XF86XK_SplitScreen 0x1008FF7D -#define XF86XK_Support 0x1008FF7E -#define XF86XK_TaskPane 0x1008FF7F -#define XF86XK_Terminal 0x1008FF80 -#define XF86XK_Tools 0x1008FF81 -#define XF86XK_Travel 0x1008FF82 -#define XF86XK_UserPB 0x1008FF84 -#define XF86XK_User1KB 0x1008FF85 -#define XF86XK_User2KB 0x1008FF86 -#define XF86XK_Video 0x1008FF87 -#define XF86XK_WheelButton 0x1008FF88 -#define XF86XK_Word 0x1008FF89 +#define XF86XK_ApplicationLeft 0x1008FF50 /* switch to application, left */ +#define XF86XK_ApplicationRight 0x1008FF51 /* switch to application, right*/ +#define XF86XK_Book 0x1008FF52 /* Launch bookreader */ +#define XF86XK_CD 0x1008FF53 /* Launch CD/DVD player */ +#define XF86XK_Calculater 0x1008FF54 /* Launch Calculater */ +#define XF86XK_Clear 0x1008FF55 /* Clear window, screen */ +#define XF86XK_Close 0x1008FF56 /* Close window */ +#define XF86XK_Copy 0x1008FF57 /* Copy selection */ +#define XF86XK_Cut 0x1008FF58 /* Cut selection */ +#define XF86XK_Display 0x1008FF59 /* Output switch key */ +#define XF86XK_DOS 0x1008FF5A /* Launch DOS (emulation) */ +#define XF86XK_Documents 0x1008FF5B /* Open documents window */ +#define XF86XK_Excel 0x1008FF5C /* Launch spread sheet */ +#define XF86XK_Explorer 0x1008FF5D /* Launch file explorer */ +#define XF86XK_Game 0x1008FF5E /* Launch game */ +#define XF86XK_Go 0x1008FF5F /* Go to URL */ +#define XF86XK_iTouch 0x1008FF60 /* Logitch iTouch- don't use */ +#define XF86XK_LogOff 0x1008FF61 /* Log off system */ +#define XF86XK_Market 0x1008FF62 /* ?? */ +#define XF86XK_Meeting 0x1008FF63 /* enter meeting in calendar */ +#define XF86XK_MenuKB 0x1008FF65 /* distingush keyboard from PB */ +#define XF86XK_MenuPB 0x1008FF66 /* distinuish PB from keyboard */ +#define XF86XK_MySites 0x1008FF67 /* Favourites */ +#define XF86XK_New 0x1008FF68 /* New (folder, document... */ +#define XF86XK_News 0x1008FF69 /* News */ +#define XF86XK_OfficeHome 0x1008FF6A /* Office home (old Staroffice)*/ +#define XF86XK_Open 0x1008FF6B /* Open */ +#define XF86XK_Option 0x1008FF6C /* ?? */ +#define XF86XK_Paste 0x1008FF6D /* Paste */ +#define XF86XK_Phone 0x1008FF6E /* Launch phone; dial number */ +#define XF86XK_Q 0x1008FF70 /* Compaq's Q - don't use */ +#define XF86XK_Reply 0x1008FF72 /* Reply e.g., mail */ +#define XF86XK_Reload 0x1008FF73 /* Reload web page, file, etc. */ +#define XF86XK_RotateWindows 0x1008FF74 /* Rotate windows e.g. xrandr */ +#define XF86XK_RotationPB 0x1008FF75 /* don't use */ +#define XF86XK_RotationKB 0x1008FF76 /* don't use */ +#define XF86XK_Save 0x1008FF77 /* Save (file, document, state */ +#define XF86XK_ScrollUp 0x1008FF78 /* Scroll window/contents up */ +#define XF86XK_ScrollDown 0x1008FF79 /* Scrool window/contentd down */ +#define XF86XK_ScrollClick 0x1008FF7A /* Use XKB mousekeys instead */ +#define XF86XK_Send 0x1008FF7B /* Send mail, file, object */ +#define XF86XK_Spell 0x1008FF7C /* Spell checker */ +#define XF86XK_SplitScreen 0x1008FF7D /* Split window or screen */ +#define XF86XK_Support 0x1008FF7E /* Get support (??) */ +#define XF86XK_TaskPane 0x1008FF7F /* Show tasks */ +#define XF86XK_Terminal 0x1008FF80 /* Launch terminal emulator */ +#define XF86XK_Tools 0x1008FF81 /* toolbox of desktop/app. */ +#define XF86XK_Travel 0x1008FF82 /* ?? */ +#define XF86XK_UserPB 0x1008FF84 /* ?? */ +#define XF86XK_User1KB 0x1008FF85 /* ?? */ +#define XF86XK_User2KB 0x1008FF86 /* ?? */ +#define XF86XK_Video 0x1008FF87 /* Launch video player */ +#define XF86XK_WheelButton 0x1008FF88 /* button from a mouse wheel */ +#define XF86XK_Word 0x1008FF89 /* Launch word processor */ #define XF86XK_Xfer 0x1008FF8A -#define XF86XK_ZoomIn 0x1008FF8B -#define XF86XK_ZoomOut 0x1008FF8C +#define XF86XK_ZoomIn 0x1008FF8B /* zoom in view, map, etc. */ +#define XF86XK_ZoomOut 0x1008FF8C /* zoom out view, map, etc. */ -#define XF86XK_Away 0x1008FF8D -#define XF86XK_Messenger 0x1008FF8E -#define XF86XK_WebCam 0x1008FF8F -#define XF86XK_MailForward 0x1008FF90 -#define XF86XK_Pictures 0x1008FF91 -#define XF86XK_Music 0x1008FF92 +#define XF86XK_Away 0x1008FF8D /* mark yourself as away */ +#define XF86XK_Messenger 0x1008FF8E /* as in instant messaging */ +#define XF86XK_WebCam 0x1008FF8F /* Launch web camera app. */ +#define XF86XK_MailForward 0x1008FF90 /* Forward in mail */ +#define XF86XK_Pictures 0x1008FF91 /* Show pictures */ +#define XF86XK_Music 0x1008FF92 /* Launch music application */ /* Keys for special action keys (hot keys) */ +/* Virtual terminals on some operating systems */ #define XF86XK_Switch_VT_1 0x1008FE01 #define XF86XK_Switch_VT_2 0x1008FE02 #define XF86XK_Switch_VT_3 0x1008FE03 @@ -181,8 +198,8 @@ #define XF86XK_Switch_VT_11 0x1008FE0B #define XF86XK_Switch_VT_12 0x1008FE0C -#define XF86XK_Ungrab 0x1008FE20 -#define XF86XK_ClearGrab 0x1008FE21 -#define XF86XK_Next_VMode 0x1008FE22 -#define XF86XK_Prev_VMode 0x1008FE23 +#define XF86XK_Ungrab 0x1008FE20 /* force ungrab */ +#define XF86XK_ClearGrab 0x1008FE21 /* kill application with grab */ +#define XF86XK_Next_VMode 0x1008FE22 /* next video mode available */ +#define XF86XK_Prev_VMode 0x1008FE23 /* prev. video mode available */ diff --git a/proto/x11proto/Xalloca.h b/proto/x11proto/Xalloca.h index 67f2671e9..c5617188a 100644 --- a/proto/x11proto/Xalloca.h +++ b/proto/x11proto/Xalloca.h @@ -62,7 +62,8 @@ from The Open Group. #define XALLOCA_H 1 #ifndef INCLUDE_ALLOCA_H -# if defined(__SUNPRO_C) /* Need to add more here to match Imake *.cf's */ +/* Need to add more here to match Imake *.cf's */ +# if defined(HAVE_ALLOCA_H) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) # define INCLUDE_ALLOCA_H # endif #endif @@ -111,16 +112,14 @@ from The Open Group. * decide that you don't want to use alloca, you might want to fix it here. */ /* alloca might be a macro taking one arg (hi, Sun!), so give it one. */ -# ifndef __sgi /* IRIX 5/6 has definition */ -# ifndef __QNX__ +# if !defined(__sgi) && !defined(__QNX__) && !defined(__cplusplus) # define __Xnullarg /* as nothing */ # ifndef X_NOT_STDC_ENV extern void *alloca(__Xnullarg); # else extern char *alloca(__Xnullarg); # endif -# endif /* __QNX__ */ -# endif /* __sgi */ +# endif /* !__sgi && !__QNX && !__cplusplus */ # define ALLOCATE_LOCAL(size) alloca((int)(size)) # endif /* who does alloca */ # endif /* NCR */ diff --git a/proto/x11proto/Xfuncproto.h.in b/proto/x11proto/Xfuncproto.h.in index b08a1e850..2421ae4d2 100644 --- a/proto/x11proto/Xfuncproto.h.in +++ b/proto/x11proto/Xfuncproto.h.in @@ -85,7 +85,7 @@ in this Software without prior written authorization from The Open Group. # define _X_ATTRIBUTE_PRINTF(x,y) #endif /* GNUC >= 4 */ -#if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 303) +#if defined(__GNUC__) && (__GNUC__ >= 4) # define _X_EXPORT __attribute__((visibility("default"))) # define _X_HIDDEN __attribute__((visibility("hidden"))) # define _X_INTERNAL __attribute__((visibility("internal"))) @@ -93,10 +93,24 @@ in this Software without prior written authorization from The Open Group. # define _X_EXPORT __global # define _X_HIDDEN __hidden # define _X_INTERNAL __hidden -#else /* not gcc >= 3.3 and not Sun Studio >= 8 */ +#else /* not gcc >= 4 and not Sun Studio >= 8 */ # define _X_EXPORT # define _X_HIDDEN # define _X_INTERNAL +#endif /* GNUC >= 4 */ + +#if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 303) +# 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_LIKELY(x) (x) +# define _X_UNLIKELY(x) (x) +# define _X_INLINE inline +#else /* not gcc >= 3.3 and not Sun Studio >= 8 */ +# define _X_LIKELY(x) (x) +# define _X_UNLIKELY(x) (x) +# define _X_INLINE #endif #if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 301) diff --git a/proto/x11proto/Xfuncs.h b/proto/x11proto/Xfuncs.h index ca9d29e34..2469b69a9 100644 --- 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 $ * * @@ -89,6 +89,10 @@ void bcopy(); #define atexit(f) on_exit(f, 0) #endif +#if defined WIN32 && defined __MINGW32__ +#define bcopy(b1,b2,len) memmove(b2, b1, (size_t)(len)) +#endif + #endif /* !(defined(XFree86LOADER) && defined(IN_MODULE)) */ #endif /* _XFUNCS_H_ */ diff --git a/proto/x11proto/Xos.h b/proto/x11proto/Xos.h index 83be4c638..67bf67924 100644 --- 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 $ * * @@ -149,7 +149,7 @@ extern int sys_nerr; */ #if defined(X_NOT_POSIX) #include <fcntl.h> -#if defined(USL) || defined(CRAY) || defined(MOTOROLA) || (defined(i386) && (defined(SYSV) || defined(SVR4))) || defined(__sxg__) +#if defined(USL) || defined(CRAY) || defined(MOTOROLA) || (defined(__i386__) && (defined(SYSV) || defined(SVR4))) || defined(__sxg__) #include <unistd.h> #endif #ifdef WIN32 diff --git a/proto/x11proto/Xos_r.h b/proto/x11proto/Xos_r.h index 694f7a0ef..7ce72ac13 100644 --- 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 @@ -237,7 +237,7 @@ extern void XtProcessUnlock( #elif !defined(XTHREADS) && !defined(X_FORCE_USE_MTSAFE_API) /* Use regular, unsafe API. */ -# if defined(X_NOT_POSIX) && !defined(i386) && !defined(SYSV) +# if defined(X_NOT_POSIX) && !defined(__i386__) && !defined(SYSV) extern struct passwd *getpwuid(), *getpwnam(); # endif typedef int _Xgetpwparams; /* dummy */ diff --git a/proto/x11proto/Xosdefs.h b/proto/x11proto/Xosdefs.h index d6c76826d..ee33a32f8 100644 --- 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 @@ -86,7 +86,7 @@ in this Software without prior written authorization from The Open Group. #endif #endif -#ifdef i386 +#ifdef __i386__ #ifdef SYSV #if !defined(ISC) && !defined(__SCO__) && !defined(_SEQUENT_) && \ !defined(__UNIXWARE__) && !defined(sun) @@ -133,8 +133,18 @@ in this Software without prior written authorization from The Open Group. #define NULL_NOT_ZERO #endif -#ifdef __DARWIN__ +#ifdef __APPLE__ #define NULL_NOT_ZERO + +/* Defining any of these will sanitize the namespace to JUST want is defined by + * that particular standard. If that happens, we don't get some expected + * prototypes, typedefs, etc (like fd_mask). We can define _DARWIN_C_SOURCE to + * loosen our belts a tad. + */ +#if defined(_XOPEN_SOURCE) || defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) +#define _DARWIN_C_SOURCE +#endif + #endif #ifdef __GNU__ @@ -156,7 +166,7 @@ in this Software without prior written authorization from The Open Group. #endif #if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) \ - || defined(__Darwin__) || defined(__DragonFly__) + || defined(__APPLE__) || defined(__DragonFly__) # ifndef CSRG_BASED # define CSRG_BASED # endif diff --git a/proto/x11proto/Xproto.h b/proto/x11proto/Xproto.h index e5bba7008..4ec32b8c7 100644 --- a/proto/x11proto/Xproto.h +++ b/proto/x11proto/Xproto.h @@ -1212,6 +1212,38 @@ typedef struct _xEvent { } u; } xEvent; +/********************************************************* + * + * Generic event + * + * Those events are not part of the core protocol spec and can be used by + * various extensions. + * type is always GenericEvent + * extension is the minor opcode of the extension the event belongs to. + * evtype is the actual event type, unique __per extension__. + * + * GenericEvents can be longer than 32 bytes, with the length field + * specifying the number of 4 byte blocks after the first 32 bytes. + * + * + */ +typedef struct +{ + BYTE type; + CARD8 extension; + CARD16 sequenceNumber B16; + CARD32 length B32; + CARD16 evtype B16; + CARD16 pad2 B16; + CARD32 pad3 B32; + CARD32 pad4 B32; + CARD32 pad5 B32; + CARD32 pad6 B32; + CARD32 pad7 B32; +} xGenericEvent; + + + /* KeymapNotify events are not included in the above union because they are different from all other events: they do not have a "detail" or "sequenceNumber", so there is room for a 248-bit key mask. */ diff --git a/proto/x11proto/Xw32defs.h b/proto/x11proto/Xw32defs.h index 07624fef6..f65b265bf 100644 --- a/proto/x11proto/Xw32defs.h +++ b/proto/x11proto/Xw32defs.h @@ -44,7 +44,7 @@ typedef char *caddr_t; #define putenv _putenv #define read _read #define rmdir _rmdir -#define sleep(x) _sleep((x) * 1000) +#define sleep(x) Sleep((x) * 1000) #define stat _stat #define sys_errlist _sys_errlist #define sys_nerr _sys_nerr diff --git a/proto/x11proto/Xwindows.h b/proto/x11proto/Xwindows.h index 7fb9840be..83649522c 100644 --- a/proto/x11proto/Xwindows.h +++ b/proto/x11proto/Xwindows.h @@ -66,7 +66,7 @@ The Open Group. #define RT_CURSOR ((RESTYPE)5) #endif -#define sleep(x) Sleep(1000*x) +#define sleep(x) Sleep((x) * 1000) #if defined(WIN32) && (!defined(PATH_MAX) || PATH_MAX < 1024) #undef PATH_MAX diff --git a/proto/x11proto/Xwinsock.h b/proto/x11proto/Xwinsock.h index 0278c09b7..5cf062fbf 100644 --- a/proto/x11proto/Xwinsock.h +++ b/proto/x11proto/Xwinsock.h @@ -47,7 +47,7 @@ The Open Group. #define ATOM wATOM #define BYTE wBYTE #define FreeResource wFreeResource -#include <winsock.h> +#include <winsock2.h> #undef Status #define Status int #undef BYTE diff --git a/proto/x11proto/configure.ac b/proto/x11proto/configure.ac index 06c3a6d3d..493562543 100644 --- a/proto/x11proto/configure.ac +++ b/proto/x11proto/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.57]) -AC_INIT([Xproto], [7.0.10], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([Xproto], [7.0.13], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) AC_CONFIG_HEADER(do-not-use-config.h) @@ -32,8 +32,14 @@ AC_ARG_ENABLE(wide-prototypes, [WIDEPROTO=$enableval], [WIDEPROTO=auto]) +AC_CHECK_HEADERS([sys/select.h sys/param.h sys/types.h sys/time.h]) + # Handle Xpoll.h.in -fds_bits_found=false; +# Avoid determining fds_bits on WIN32 hosts (not including cygwin) +case $host_os in + mingw*) fds_bits_found=true;; + *) fds_bits_found=false;; +esac if test "x$fds_bits_found" = xfalse ; then AC_CHECK_MEMBER(fd_set.fds_bits, @@ -42,8 +48,18 @@ if test "x$fds_bits_found" = xfalse ; then USE_FDS_BITS="fds_bits" ],, [ + #ifdef HAVE_SYS_PARAM_H + #include <sys/param.h> + #endif + #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> + #endif + #ifdef HAVE_SYS_TIME_H + #include <sys/time.h> + #endif + #ifdef HAVE_SYS_SELECT_H #include <sys/select.h> + #endif ]) fi @@ -54,8 +70,18 @@ if test "x$fds_bits_found" = xfalse ; then USE_FDS_BITS="__fds_bits" ],, [ - #include <sys/types.h> - #include <sys/select.h> + #ifdef HAVE_SYS_PARAM_H + #include <sys/param.h> + #endif + #ifdef HAVE_SYS_TYPES_H + #include <sys/types.h> + #endif + #ifdef HAVE_SYS_TIME_H + #include <sys/time.h> + #endif + #ifdef HAVE_SYS_SELECT_H + #include <sys/select.h> + #endif ]) fi diff --git a/proto/x11proto/do-not-use-config.h.in b/proto/x11proto/do-not-use-config.h.in index 34913a622..4c3523491 100644 --- a/proto/x11proto/do-not-use-config.h.in +++ b/proto/x11proto/do-not-use-config.h.in @@ -3,6 +3,42 @@ /* FUNCPROTO */ #undef FUNCPROTO +/* Define to 1 if you have the <inttypes.h> header file. */ +#undef HAVE_INTTYPES_H + +/* Define to 1 if you have the <memory.h> header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have the <stdint.h> header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the <stdlib.h> header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the <strings.h> header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the <string.h> header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the <sys/param.h> header file. */ +#undef HAVE_SYS_PARAM_H + +/* Define to 1 if you have the <sys/select.h> header file. */ +#undef HAVE_SYS_SELECT_H + +/* Define to 1 if you have the <sys/stat.h> header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the <sys/time.h> header file. */ +#undef HAVE_SYS_TIME_H + +/* Define to 1 if you have the <sys/types.h> header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have the <unistd.h> header file. */ +#undef HAVE_UNISTD_H + /* Narrow prototypes */ #undef NARROWPROTO @@ -24,5 +60,17 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION +/* Major version of this package */ +#undef PACKAGE_VERSION_MAJOR + +/* Minor version of this package */ +#undef PACKAGE_VERSION_MINOR + +/* Patch version of this package */ +#undef PACKAGE_VERSION_PATCHLEVEL + +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + /* Version number of package */ #undef VERSION diff --git a/proto/x11proto/keysymdef.h b/proto/x11proto/keysymdef.h index 4b2b045e6..18753ee78 100644 --- a/proto/x11proto/keysymdef.h +++ b/proto/x11proto/keysymdef.h @@ -56,7 +56,7 @@ SOFTWARE. * engraving) of a keyboard layout. This file assigns mnemonic macro * names for these keysyms. * - * This file is also compiled (by xc/lib/X11/util/makekeys.c) into + * This file is also compiled (by src/util/makekeys.c in libX11) into * hash tables that can be accessed with X11 library functions such as * XStringToKeysym() and XKeysymToString(). * @@ -93,9 +93,26 @@ SOFTWARE. * /^\#define XK_([a-zA-Z_0-9]+)\s+0x([0-9a-f]+)\s*\/\*\(U+([0-9A-F]{4,6}) (.*)\)\*\/\s*$/ * /^\#define XK_([a-zA-Z_0-9]+)\s+0x([0-9a-f]+)\s*(\/\*\s*(.*)\s*\*\/)?\s*$/ * + * Before adding new keysyms, please do consider the following: In + * addition to the keysym names defined in this file, the + * XStringToKeysym() and XKeysymToString() functions will also handle + * any keysym string of the form "U0020" to "U007E" and "U00A0" to + * "U10FFFF" for all possible Unicode characters. In other words, + * every possible Unicode character has already a keysym string + * defined algorithmically, even if it is not listed here. Therefore, + * defining an additional keysym macro is only necessary where a + * non-hexadecimal mnemonic name is needed, or where the new keysym + * does not represent any existing Unicode character. + * * When adding new keysyms to this file, do not forget to also update the - * mappings in xc/lib/X11/KeyBind.c and the protocol specification in - * xc/doc/specs/XProtocol/X11.keysyms. + * following: + * + * - the mappings in src/KeyBind.c in the repo + * git://anongit.freedesktop.org/xorg/lib/libX11 + * + * - the protocol specification in specs/XProtocol/X11.keysyms + * in the repo git://anongit.freedesktop.org/xorg/doc/xorg-docs + * */ #define XK_VoidSymbol 0xffffff /* Void symbol */ @@ -327,6 +344,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 +400,17 @@ SOFTWARE. #define XK_dead_belowdot 0xfe60 #define XK_dead_hook 0xfe61 #define XK_dead_horn 0xfe62 +#define XK_dead_stroke 0xfe63 +#define XK_dead_abovecomma 0xfe64 +#define XK_dead_psili 0xfe64 /* alias for dead_abovecomma */ +#define XK_dead_abovereversedcomma 0xfe65 +#define XK_dead_dasia 0xfe66 /* alias for dead_abovereversedcomma */ +#define XK_dead_belowring 0xfe67 +#define XK_dead_belowmacron 0xfe68 +#define XK_dead_belowcircumflex 0xfe69 +#define XK_dead_belowtilde 0xfe6a +#define XK_dead_belowbreve 0xfe6b +#define XK_dead_belowdiaeresis 0xfe6c #define XK_First_Virtual_Screen 0xfed0 #define XK_Prev_Virtual_Screen 0xfed1 @@ -2071,3 +2102,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 */ |