diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-01-06 12:49:16 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-01-06 12:49:16 (GMT) |
| commit | c50c3b612ba50c205771d13c6165254eb6d3a08f (patch) | |
| tree | aba16824ea837ae0491f49f6d94c0f17d4343de8 /xlib | |
| parent | 20a005ef0c7ab42b7f4f703572c56ac2af790137 (diff) | |
| parent | 0fad0657c2f97cbfbbbfd7dbe1da39e618fcd33b (diff) | |
| download | tk-c50c3b612ba50c205771d13c6165254eb6d3a08f.zip tk-c50c3b612ba50c205771d13c6165254eb6d3a08f.tar.gz tk-c50c3b612ba50c205771d13c6165254eb6d3a08f.tar.bz2 | |
Merge trunk
Diffstat (limited to 'xlib')
| -rw-r--r-- | xlib/X11/Xlib.h | 2 | ||||
| -rw-r--r-- | xlib/X11/Xutil.h | 19 | ||||
| -rw-r--r-- | xlib/X11/keysymdef.h | 8 |
3 files changed, 24 insertions, 5 deletions
diff --git a/xlib/X11/Xlib.h b/xlib/X11/Xlib.h index 44f556f..2db3f10 100644 --- a/xlib/X11/Xlib.h +++ b/xlib/X11/Xlib.h @@ -1048,7 +1048,7 @@ typedef union _XEvent { XKeymapEvent xkeymap; XGenericEvent xgeneric; XGenericEventCookie xcookie; - long pad[24]; + XID pad[24]; } XEvent; #endif 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 30ca537..728320c 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 * */ |