x11proto-core: Changes to 'upstream-unstable'
X.h | 3 ++-
XF86keysym.h | 25 ++++++++++++++++++++++++-
Xosdefs.h | 12 +++++++++++-
Xpoll.h.in | 2 +-
Xproto.h | 32 ++++++++++++++++++++++++++++++++
Xw32defs.h | 2 +-
Xwindows.h | 2 +-
Xwinsock.h | 2 +-
configure.ac | 8 ++++++--
keysymdef.h | 46 +++++++++++++++++++++++++++++++---------------
10 files changed, 110 insertions(+), 24 deletions(-)
New commits:
commit 33a7de5cdacb59503b26c6523ffb33dba118faed
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu Oct 23 22:41:01 2008 +1030
Bump to 7.0.14.
diff --git a/configure.ac b/configure.ac
index cde753c..5bcf3ef 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.57])
-AC_INIT([Xproto], [7.0.13], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([Xproto], [7.0.14], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AC_CONFIG_HEADER([do-not-use-config.h])
commit 1cf41088ff751e60071a519466b5a51b65c7626a
Author: Bastien Nocera <bnocera@redhat.com>
Date: Wed Oct 15 14:20:45 2008 +1030
Keysyms needed for some HID remote controls to work under X. #16519
In particular, this enables Sony Ericsson phones and PS3 BD remotes.
X.Org Bug 16519 <https://bugs.freedesktop.org/show_bug.cgi?id=16519>
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
diff --git a/XF86keysym.h b/XF86keysym.h
index 4643b01..2a39f4e 100644
--- a/XF86keysym.h
+++ b/XF86keysym.h
@@ -188,6 +188,24 @@
#define XF86XK_WLAN 0x1008FF95 /* Enable/disable WLAN */
#define XF86XK_UWB 0x1008FF96 /* Enable/disable UWB */
+#define XF86XK_AudioForward 0x1008FF97 /* fast-forward audio track */
+#define XF86XK_AudioRepeat 0x1008FF98 /* toggle repeat mode */
+#define XF86XK_AudioRandomPlay 0x1008FF99 /* toggle shuffle mode */
+#define XF86XK_Subtitle 0x1008FF9A /* cycle through subtitle */
+#define XF86XK_AudioCycleTrack 0x1008FF9B /* cycle through audio tracks */
+#define XF86XK_CycleAngle 0x1008FF9C /* cycle through angles */
+#define XF86XK_FrameBack 0x1008FF9D /* video: go one frame back */
+#define XF86XK_FrameForward 0x1008FF9E /* video: go one frame forward */
+#define XF86XK_Time 0x1008FF9F /* display, or shows an entry for time seeking */
+#define XF86XK_Select 0x1008FFA0 /* Select button on joypads and remotes */
+#define XF86XK_View 0x1008FFA1 /* Show a view options/properties */
+#define XF86XK_TopMenu 0x1008FFA2 /* Go to a top-level menu in a video */
+
+#define XF86XK_Red 0x1008FFA3 /* Red button */
+#define XF86XK_Green 0x1008FFA4 /* Green button */
+#define XF86XK_Yellow 0x1008FFA5 /* Yellow button */
+#define XF86XK_Blue 0x1008FFA6 /* Blue button */
+
/* Keys for special action keys (hot keys) */
/* Virtual terminals on some operating systems */
#define XF86XK_Switch_VT_1 0x1008FE01
commit 0b541b3fa282531c97c6ecee574c8b92b1489bfc
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Tue Oct 14 21:56:14 2008 +1030
Fix typos in comments (UP/DOWN TACK and LEFT/RIGHT TACK wrong way round).
Spotted by Erik Streb and Julien Cristau.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
diff --git a/keysymdef.h b/keysymdef.h
index 84b4683..2e49082 100644
--- a/keysymdef.h
+++ b/keysymdef.h
@@ -1496,20 +1496,20 @@ SOFTWARE.
#define XK_downcaret 0x0ba8 /*(U+2228 LOGICAL OR)*/
#define XK_upcaret 0x0ba9 /*(U+2227 LOGICAL AND)*/
#define XK_overbar 0x0bc0 /*(U+00AF MACRON)*/
-#define XK_downtack 0x0bc2 /* U+22A5 UP TACK */
+#define XK_downtack 0x0bc2 /* U+22A4 DOWN TACK */
#define XK_upshoe 0x0bc3 /*(U+2229 INTERSECTION)*/
#define XK_downstile 0x0bc4 /* U+230A LEFT FLOOR */
#define XK_underbar 0x0bc6 /*(U+005F LOW LINE)*/
#define XK_jot 0x0bca /* U+2218 RING OPERATOR */
#define XK_quad 0x0bcc /* U+2395 APL FUNCTIONAL SYMBOL QUAD */
-#define XK_uptack 0x0bce /* U+22A4 DOWN TACK */
+#define XK_uptack 0x0bce /* U+22A5 UP TACK */
#define XK_circle 0x0bcf /* U+25CB WHITE CIRCLE */
#define XK_upstile 0x0bd3 /* U+2308 LEFT CEILING */
#define XK_downshoe 0x0bd6 /*(U+222A UNION)*/
#define XK_rightshoe 0x0bd8 /*(U+2283 SUPERSET OF)*/
#define XK_leftshoe 0x0bda /*(U+2282 SUBSET OF)*/
-#define XK_lefttack 0x0bdc /* U+22A2 RIGHT TACK */
-#define XK_righttack 0x0bfc /* U+22A3 LEFT TACK */
+#define XK_lefttack 0x0bdc /* U+22A3 LEFT TACK */
+#define XK_righttack 0x0bfc /* U+22A2 RIGHT TACK */
#endif /* XK_APL */
/*
commit c94477f16356790741ebc139d2d0b15d79c83e28
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Tue Oct 14 21:54:16 2008 +1030
Revert "Fix typos in comments (UP/DOWN TACK and LEFT/RIGHT TACK wrong way round)."
Codepoints should have moved with the comments. See next commit for correct
patch.
This reverts commit 2945d2f97c264783e4050a8f6c3016290014b9e2.
diff --git a/keysymdef.h b/keysymdef.h
index f1eed47..84b4683 100644
--- a/keysymdef.h
+++ b/keysymdef.h
@@ -1496,20 +1496,20 @@ SOFTWARE.
#define XK_downcaret 0x0ba8 /*(U+2228 LOGICAL OR)*/
#define XK_upcaret 0x0ba9 /*(U+2227 LOGICAL AND)*/
#define XK_overbar 0x0bc0 /*(U+00AF MACRON)*/
-#define XK_downtack 0x0bc2 /* U+22A5 DOWN TACK */
+#define XK_downtack 0x0bc2 /* U+22A5 UP TACK */
#define XK_upshoe 0x0bc3 /*(U+2229 INTERSECTION)*/
#define XK_downstile 0x0bc4 /* U+230A LEFT FLOOR */
#define XK_underbar 0x0bc6 /*(U+005F LOW LINE)*/
#define XK_jot 0x0bca /* U+2218 RING OPERATOR */
#define XK_quad 0x0bcc /* U+2395 APL FUNCTIONAL SYMBOL QUAD */
-#define XK_uptack 0x0bce /* U+22A4 UP TACK */
+#define XK_uptack 0x0bce /* U+22A4 DOWN TACK */
#define XK_circle 0x0bcf /* U+25CB WHITE CIRCLE */
#define XK_upstile 0x0bd3 /* U+2308 LEFT CEILING */
#define XK_downshoe 0x0bd6 /*(U+222A UNION)*/
#define XK_rightshoe 0x0bd8 /*(U+2283 SUPERSET OF)*/
#define XK_leftshoe 0x0bda /*(U+2282 SUBSET OF)*/
-#define XK_lefttack 0x0bdc /* U+22A2 LEFT TACK */
-#define XK_righttack 0x0bfc /* U+22A3 RIGHT TACK */
+#define XK_lefttack 0x0bdc /* U+22A2 RIGHT TACK */
+#define XK_righttack 0x0bfc /* U+22A3 LEFT TACK */
#endif /* XK_APL */
/*
commit 2945d2f97c264783e4050a8f6c3016290014b9e2
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Tue Oct 14 21:04:08 2008 +1030
Fix typos in comments (UP/DOWN TACK and LEFT/RIGHT TACK wrong way round).
Spotted by Erik Streb.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
diff --git a/keysymdef.h b/keysymdef.h
index 84b4683..f1eed47 100644
--- a/keysymdef.h
+++ b/keysymdef.h
@@ -1496,20 +1496,20 @@ SOFTWARE.
#define XK_downcaret 0x0ba8 /*(U+2228 LOGICAL OR)*/
#define XK_upcaret 0x0ba9 /*(U+2227 LOGICAL AND)*/
#define XK_overbar 0x0bc0 /*(U+00AF MACRON)*/
-#define XK_downtack 0x0bc2 /* U+22A5 UP TACK */
+#define XK_downtack 0x0bc2 /* U+22A5 DOWN TACK */
#define XK_upshoe 0x0bc3 /*(U+2229 INTERSECTION)*/
#define XK_downstile 0x0bc4 /* U+230A LEFT FLOOR */
#define XK_underbar 0x0bc6 /*(U+005F LOW LINE)*/
#define XK_jot 0x0bca /* U+2218 RING OPERATOR */
#define XK_quad 0x0bcc /* U+2395 APL FUNCTIONAL SYMBOL QUAD */
-#define XK_uptack 0x0bce /* U+22A4 DOWN TACK */
+#define XK_uptack 0x0bce /* U+22A4 UP TACK */
#define XK_circle 0x0bcf /* U+25CB WHITE CIRCLE */
#define XK_upstile 0x0bd3 /* U+2308 LEFT CEILING */
#define XK_downshoe 0x0bd6 /*(U+222A UNION)*/
#define XK_rightshoe 0x0bd8 /*(U+2283 SUPERSET OF)*/
#define XK_leftshoe 0x0bda /*(U+2282 SUBSET OF)*/
-#define XK_lefttack 0x0bdc /* U+22A2 RIGHT TACK */
-#define XK_righttack 0x0bfc /* U+22A3 LEFT TACK */
+#define XK_lefttack 0x0bdc /* U+22A2 LEFT TACK */
+#define XK_righttack 0x0bfc /* U+22A3 RIGHT TACK */
#endif /* XK_APL */
/*
commit 610eb9698316b7cdfe378ce7776c4520f8b061ff
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Mon Oct 13 12:01:16 2008 +1030
Add keysyms for XF86XK_Battery, XF86XK_Bluetooth, XF86XK_WLAN, XF86XK_UWB.
diff --git a/XF86keysym.h b/XF86keysym.h
index e4ba4a6..4643b01 100644
--- a/XF86keysym.h
+++ b/XF86keysym.h
@@ -183,6 +183,11 @@
#define XF86XK_Pictures 0x1008FF91 /* Show pictures */
#define XF86XK_Music 0x1008FF92 /* Launch music application */
+#define XF86XK_Battery 0x1008FF93 /* Display battery information */
+#define XF86XK_Bluetooth 0x1008FF94 /* Enable/disable Bluetooth */
+#define XF86XK_WLAN 0x1008FF95 /* Enable/disable WLAN */
+#define XF86XK_UWB 0x1008FF96 /* Enable/disable UWB */
+
/* Keys for special action keys (hot keys) */
/* Virtual terminals on some operating systems */
#define XF86XK_Switch_VT_1 0x1008FE01
commit 0846d7adfe790897e879c5ed53d4f81db459a20d
Author: James Cloos <cloos@jhcloos.com>
Date: Sun Jul 13 17:57:09 2008 -0400
Add dead_perispomeni to keysymdef.h
Make the dead_perispomeni keysym an alias to dead_tilde
(which is currently used for entering characters with
perispomeni).
Cf: https://bugs.freedesktop.org/show_bug.cgi?id=14013
diff --git a/keysymdef.h b/keysymdef.h
index d504e5c..84b4683 100644
--- a/keysymdef.h
+++ b/keysymdef.h
@@ -385,6 +385,7 @@ SOFTWARE.
#define XK_dead_acute 0xfe51
#define XK_dead_circumflex 0xfe52
#define XK_dead_tilde 0xfe53
+#define XK_dead_perispomeni 0xfe53 /* alias for dead_tilde */
#define XK_dead_macron 0xfe54
#define XK_dead_breve 0xfe55
#define XK_dead_abovedot 0xfe56
commit 38edd9839fa8495602378af36c67b2477b24eca2
Author: James Cloos <cloos@jhcloos.com>
Date: Sun Jul 13 17:54:47 2008 -0400
fix typo in commit 40ed4eef
diff --git a/keysymdef.h b/keysymdef.h
index 18753ee..d504e5c 100644
--- a/keysymdef.h
+++ b/keysymdef.h
@@ -404,7 +404,7 @@ SOFTWARE.
#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_dasia 0xfe65 /* alias for dead_abovereversedcomma */
#define XK_dead_belowring 0xfe67
#define XK_dead_belowmacron 0xfe68
#define XK_dead_belowcircumflex 0xfe69
commit 53859ee4e431c21000e282971894dbe9384ed205
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed May 28 17:17:38 2008 +0930
Bump to 7.0.13.
diff --git a/configure.ac b/configure.ac
index b7007d6..cde753c 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.57])
-AC_INIT([Xproto], [7.0.12], [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])
commit 44e458285bb2e7771963a9ab9b5f03d2fb48e611
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue May 15 16:41:08 2007 +0930
Add GenericEvent and xGenericEvent definitions.
(cherry picked from commit 8a96cdca08db2563e8c4c7c9a110a3ab6d973fcc)
diff --git a/X.h b/X.h
index 0a9c501..ebcc767 100644
--- a/X.h
+++ b/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/Xproto.h b/Xproto.h
index e5bba70..4ec32b8 100644
--- a/Xproto.h
+++ b/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. */
commit 22878c30d21580146200c00070478f88d969bcaa
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu May 8 15:02:41 2008 -0700
Apple: Added a comment to explain _DARWIN_C_SOURCE
diff --git a/Xosdefs.h b/Xosdefs.h
index a0b2e3e..ee33a32 100644
--- a/Xosdefs.h
+++ b/Xosdefs.h
@@ -135,9 +135,18 @@ in this Software without prior written authorization from The Open Group.
#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__
#ifndef PATH_MAX
#define PATH_MAX 4096
commit e3035a7e6e56e01eb79478ea5342e032ec67a190
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu May 8 12:16:15 2008 -0700
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
diff --git a/Xosdefs.h b/Xosdefs.h
index 903a5a0..a0b2e3e 100644
--- a/Xosdefs.h
+++ b/Xosdefs.h
@@ -135,6 +135,7 @@ in this Software without prior written authorization from The Open Group.
#ifdef __APPLE__
#define NULL_NOT_ZERO
+#define _DARWIN_C_SOURCE
#endif
#ifdef __GNU__
commit 05b119d78e1c6a4db563b2a976cee0173489f9b6
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu May 8 11:36:03 2008 -0700
Apple: Cleaned up some Apple definitions
diff --git a/Xosdefs.h b/Xosdefs.h
index 14971c4..903a5a0 100644
--- a/Xosdefs.h
+++ b/Xosdefs.h
@@ -156,7 +156,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/Xpoll.h.in b/Xpoll.h.in
index 3940489..33fdad4 100644
--- a/Xpoll.h.in
+++ b/Xpoll.h.in
@@ -91,7 +91,7 @@ from The Open Group.
#ifdef CSRG_BASED
#include <sys/param.h>
-# if BSD < 199103 || defined(__APPLE__)
+# if BSD < 199103
typedef long fd_mask;
# endif
#endif
commit c879dab58f82f4789f27933c22706c84015f8684
Author: Alan Hourihane <alanh@tungstengraphics.com>
Date: Tue Apr 29 00:37:28 2008 +0100
avoid checking for fds_bits on mingw
diff --git a/configure.ac b/configure.ac
old mode 100644
new mode 100755
index f62d508..b7007d6
--- a/configure.ac
+++ b/configure.ac
@@ -35,7 +35,11 @@ AC_ARG_ENABLE(wide-prototypes,
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,
commit 8642ec676db0dd875f4d3a97d8a3cdbf6843a985
Author: Colin Harrison <colin.harrison-at-virgin.net>
Date: Sat Apr 26 18:21:41 2008 +0100
Use Sleep() instead of sleep() on windows
(was already done in Xwindows.h, just not Xw32defs.h)
diff --git a/Xw32defs.h b/Xw32defs.h
index 07624fe..f65b265 100644
--- a/Xw32defs.h
+++ b/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/Xwindows.h b/Xwindows.h
index 7fb9840..8364952 100644
--- a/Xwindows.h
+++ b/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
commit a893a6ac5d9fdfe9a420d1812402a01904e6482b
Author: Colin Harrison <colin.harrison-at-virgin.net>
Date: Sat Apr 26 08:52:29 2008 +0100
Use winsock2.h
diff --git a/Xwinsock.h b/Xwinsock.h
index 0278c09..5cf062f 100644
--- a/Xwinsock.h
+++ b/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
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
diff --git a/keysymdef.h b/keysymdef.h
index 1d9a3c1..18753ee 100644
--- a/keysymdef.h
+++ b/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,17 +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.
- */
-
-/*
- * Now that the Xorg code base is managed in Git repositories, the KeyBind.c
- * and X11.keysyms files mentioned in the last comment block are located at:
+ * 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
*
- * src/KeyBind.c in the repo git://anongit.freedesktop.org/xorg/lib/libX11
- * specs/XProtocol/X11.keysyms in the repo git://anongit.freedesktop.org/xorg/doc/xorg-docs
*/
#define XK_VoidSymbol 0xffffff /* Void symbol */
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
diff --git a/keysymdef.h b/keysymdef.h
index b3ade4d..1d9a3c1 100644
--- a/keysymdef.h
+++ b/keysymdef.h
@@ -396,6 +396,12 @@ SOFTWARE.
#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
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.
diff --git a/XF86keysym.h b/XF86keysym.h
index fb0ee67..e4ba4a6 100644
--- a/XF86keysym.h
+++ b/XF86keysym.h
@@ -100,7 +100,7 @@
#define XF86XK_Finance 0x1008FF3C /* Display financial site */
#define XF86XK_Community 0x1008FF3D /* Display user's community */
#define XF86XK_AudioRewind 0x1008FF3E /* "rewind" audio track */
-#define XF86XK_XF86BackForward 0x1008FF3F /* ??? */
+#define XF86XK_BackForward 0x1008FF3F /* ??? */
#define XF86XK_Launch0 0x1008FF40 /* Launch Application */
#define XF86XK_Launch1 0x1008FF41 /* Launch Application */
#define XF86XK_Launch2 0x1008FF42 /* Launch Application */
Reply to: