diff options
| author | marha <marha@users.sourceforge.net> | 2010-07-20 15:39:40 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-07-20 15:39:40 +0000 |
| commit | 3196d74a31c4eaeb1980c97703ac3b6517b503fd (patch) | |
| tree | a200b37d20085f2330a126d3bf9ff8915c713a57 | |
| parent | 27c59460b6c8c0cd5e1eb89b5b62c6600b9d4c6a (diff) | |
| parent | cc8fdc643a25483734ae03cd5db72ae00ff561cd (diff) | |
| download | vcxsrv-3196d74a31c4eaeb1980c97703ac3b6517b503fd.tar.gz vcxsrv-3196d74a31c4eaeb1980c97703ac3b6517b503fd.tar.bz2 vcxsrv-3196d74a31c4eaeb1980c97703ac3b6517b503fd.zip | |
svn merge ^/branches/released .
| -rw-r--r-- | libX11/nls/en_US.UTF-8/Compose.pre | 1 | ||||
| -rw-r--r-- | libX11/src/StrKeysym.c | 10 |
2 files changed, 11 insertions, 0 deletions
diff --git a/libX11/nls/en_US.UTF-8/Compose.pre b/libX11/nls/en_US.UTF-8/Compose.pre index 941910167..142adab2e 100644 --- a/libX11/nls/en_US.UTF-8/Compose.pre +++ b/libX11/nls/en_US.UTF-8/Compose.pre @@ -5378,3 +5378,4 @@ XCOMM <dead_circumflex> <Cyrillic_ER> : "Р̂" # CYRILLIC CAPITAL LETTER ER WITH COMBINING CIRCUMFLEX ACCENT
<Multi_key> <asciicircum> <Cyrillic_ER> : "Р̂" # CYRILLIC CAPITAL LETTER ER WITH COMBINING CIRCUMFLEX ACCENT
+<Multi_key> <backslash> <o> <slash> : "🙌" # PERSON RAISING BOTH HANDS IN CELEBRATION
diff --git a/libX11/src/StrKeysym.c b/libX11/src/StrKeysym.c index e2458fcd0..907db507b 100644 --- a/libX11/src/StrKeysym.c +++ b/libX11/src/StrKeysym.c @@ -27,6 +27,7 @@ in this Software without prior written authorization from The Open Group. #ifdef HAVE_CONFIG_H
#include <config.h>
#endif
+#include <limits.h>
#include "Xlibint.h"
#include <X11/Xresource.h>
#include <X11/keysymdef.h>
@@ -155,6 +156,15 @@ XStringToKeysym(_Xconst char *s) return val | 0x01000000;
}
+ if (strlen(s) > 2 && s[0] == '0' && s[1] == 'x') {
+ char *tmp = NULL;
+ val = strtoul(s, &tmp, 16);
+ if (val == ULONG_MAX || (tmp && *tmp != '\0'))
+ return NoSymbol;
+ else
+ return val;
+ }
+
/* Stupid inconsistency between the headers and XKeysymDB: the former has
* no separating underscore, while some XF86* syms in the latter did.
* As a last ditch effort, try without. */
|