diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-11-27 12:37:47 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-11-27 12:37:47 (GMT) |
| commit | 8eca07090ea8ef74fa14e1d8aac2f53a01b65868 (patch) | |
| tree | 58a4bbea6e43bbc09434ae9498f8f763cc58cf21 /xlib | |
| parent | a95999ab57524dbc94824157e560bebecbc887e9 (diff) | |
| download | tk-8eca07090ea8ef74fa14e1d8aac2f53a01b65868.zip tk-8eca07090ea8ef74fa14e1d8aac2f53a01b65868.tar.gz tk-8eca07090ea8ef74fa14e1d8aac2f53a01b65868.tar.bz2 | |
Update to a (slightly) later version of X11R6 headers.
Diffstat (limited to 'xlib')
| -rw-r--r-- | xlib/X11/Xutil.h | 19 | ||||
| -rw-r--r-- | xlib/X11/keysymdef.h | 10 |
2 files changed, 24 insertions, 5 deletions
diff --git a/xlib/X11/Xutil.h b/xlib/X11/Xutil.h index eab1225..6a22c97 100644 --- a/xlib/X11/Xutil.h +++ b/xlib/X11/Xutil.h @@ -764,6 +764,14 @@ EXTERN int XmbTextListToTextProperty( XTextProperty* text_prop_return ); +EXTERN int XwcTextListToTextProperty( + Display* display, + wchar_t** list, + int count, + XICCEncodingStyle style, + XTextProperty* text_prop_return +); + EXTERN int Xutf8TextListToTextProperty( Display* display, char** list, @@ -772,6 +780,10 @@ EXTERN int Xutf8TextListToTextProperty( XTextProperty* text_prop_return ); +EXTERN void XwcFreeStringList( + wchar_t** list +); + EXTERN Status XTextPropertyToStringList( XTextProperty* /* text_prop */, char*** /* list_return */, @@ -785,6 +797,13 @@ EXTERN int XmbTextPropertyToTextList( int* count_return ); +EXTERN int XwcTextPropertyToTextList( + Display* display, + const XTextProperty* text_prop, + wchar_t*** list_return, + int* count_return +); + EXTERN int Xutf8TextPropertyToTextList( Display* display, const XTextProperty* text_prop, diff --git a/xlib/X11/keysymdef.h b/xlib/X11/keysymdef.h index 7fdc64f..19abff2 100644 --- a/xlib/X11/keysymdef.h +++ b/xlib/X11/keysymdef.h @@ -104,11 +104,11 @@ SOFTWARE. * When adding new keysyms to this file, do not forget to also update the * following as needed: * - * - the mappings in src/KeyBind.c in the repo - * git://anongit.freedesktop.org/xorg/lib/libX11.git + * - the mappings in src/KeyBind.c in the libX11 repo + * https://gitlab.freedesktop.org/xorg/lib/libx11 * - * - the protocol specification in specs/keysyms.xml - * in the repo git://anongit.freedesktop.org/xorg/proto/x11proto.git + * - the protocol specification in specs/keysyms.xml in this repo + * https://gitlab.freedesktop.org/xorg/proto/xorgproto * */ @@ -1974,7 +1974,7 @@ SOFTWARE. #define XK_Ibreve 0x100012c /* U+012C LATIN CAPITAL LETTER I WITH BREVE */ #define XK_Zstroke 0x10001b5 /* U+01B5 LATIN CAPITAL LETTER Z WITH STROKE */ #define XK_Gcaron 0x10001e6 /* U+01E6 LATIN CAPITAL LETTER G WITH CARON */ -#define XK_Ocaron 0x10001d1 /* U+01D2 LATIN CAPITAL LETTER O WITH CARON */ +#define XK_Ocaron 0x10001d1 /* U+01D1 LATIN CAPITAL LETTER O WITH CARON */ #define XK_Obarred 0x100019f /* U+019F LATIN CAPITAL LETTER O WITH MIDDLE TILDE */ #define XK_xabovedot 0x1001e8b /* U+1E8B LATIN SMALL LETTER X WITH DOT ABOVE */ #define XK_ibreve 0x100012d /* U+012D LATIN SMALL LETTER I WITH BREVE */ |