From cff04da9bf9a82eb1e9e4034bc8382126f8587af Mon Sep 17 00:00:00 2001 From: matthieu Date: Tue, 28 Feb 2017 18:44:56 +0000 Subject: [PATCH] Update to libX11 1.6.5 --- lib/libX11/ChangeLog | 177 ++++++++ lib/libX11/compile | 2 +- lib/libX11/configure | 20 +- lib/libX11/configure.ac | 2 +- lib/libX11/nls/locale.dir.pre | 3 +- lib/libX11/specs/libX11/AppC.xml | 234 +++++----- lib/libX11/specs/libX11/AppD.xml | 140 +++--- lib/libX11/specs/libX11/CH02.xml | 756 +++++++++++++++++++------------ lib/libX11/specs/libX11/CH03.xml | 156 +++---- lib/libX11/specs/libX11/CH04.xml | 177 ++++---- lib/libX11/specs/libX11/CH05.xml | 58 +-- lib/libX11/specs/libX11/CH06.xml | 459 ++++++++++--------- lib/libX11/specs/libX11/CH07.xml | 203 +++++---- lib/libX11/specs/libX11/CH08.xml | 394 ++++++++-------- lib/libX11/specs/libX11/CH09.xml | 118 ++--- lib/libX11/specs/libX11/CH11.xml | 156 +++---- lib/libX11/specs/libX11/CH12.xml | 219 ++++----- lib/libX11/specs/libX11/CH13.xml | 379 ++++++++-------- lib/libX11/specs/libX11/CH14.xml | 389 ++++++++-------- lib/libX11/specs/libX11/CH15.xml | 159 +++---- lib/libX11/specs/libX11/CH16.xml | 323 +++++++------ lib/libX11/src/FontNames.c | 4 + 22 files changed, 2506 insertions(+), 2022 deletions(-) diff --git a/lib/libX11/ChangeLog b/lib/libX11/ChangeLog index c4821d384..b4f7df6e3 100644 --- a/lib/libX11/ChangeLog +++ b/lib/libX11/ChangeLog @@ -1,3 +1,180 @@ +commit 42f4d7af9cf6d1dbfa575552e057328b054a20c9 +Author: Matt Turner +Date: Sat Feb 25 21:54:22 2017 -0800 + + libX11 1.6.5 + + Signed-off-by: Matt Turner + +commit a0da5835e8078445947c828fe2d86c1a31439012 +Author: Adam Jackson +Date: Tue Feb 14 15:33:29 2017 -0500 + + Revert "Compose sequences for rouble sign" + + This reverts commit d9e34061307748cb7318ed6b5f83ee5ee9b81fd0. + + Reported to break 'make check': + + https://lists.freedesktop.org/archives/xorg-devel/2017-February/052720.html + +commit d9e34061307748cb7318ed6b5f83ee5ee9b81fd0 +Author: Mihail Konev +Date: Fri Feb 10 18:48:18 2017 +0500 + + Compose sequences for rouble sign + + Cyrillic combinations mirror the Qwerty-Jcuken keyboard layout. + Also add Cyrillic sequences for hryvnia sign. + + Submitted-by: Victor V. Kustov + Reviewed-by: Victor V. Kustov + Signed-off-by: Mihail Konev + +commit 23d9623c661694aba8cf1e8f277dffa7a86cf065 +Author: Petr Písař +Date: Sun Oct 30 12:49:11 2016 +0100 + + Revert cs_CZ.UTF-8 XLC_LOCALE to en_US.UTF-8 + + The cs_CZ.UTF-8/XLC_LOCALE is an empty file leading to unsupported cs_CZ.UTF-8 + locale and reporting this error: + + Warning: locale not supported by Xlib, locale set to C + + Therefore this patch reverts to the en_US.UTF-8 definition file that was used + before. This patch also deduplicates the cs_CZ.UTF-8 entry. + + + + This reverts commit 33840a5465a2e5fecab520bfbdd2d1bd0a456f51 + + Signed-off-by: Julien Cristau + +commit 71b0929ebc1f0f877f63e3f6de260f529daa6c69 +Author: Mihail Konev +Date: Thu Jan 26 13:52:49 2017 +1000 + + autogen: add default patch prefix + + Signed-off-by: Mihail Konev + +commit 2979011bc170c55894b9185b26376f8efc6db7d4 +Author: Emil Velikov +Date: Mon Mar 9 12:00:52 2015 +0000 + + autogen.sh: use quoted string variables + + Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent + fall-outs, when they contain space. + + Signed-off-by: Emil Velikov + Reviewed-by: Peter Hutterer + Signed-off-by: Peter Hutterer + +commit 4a0082a1b6affa65d38294f0e13511525cd8ad15 +Author: Peter Hutterer +Date: Tue Jan 24 10:32:07 2017 +1000 + + autogen.sh: use exec instead of waiting for configure to finish + + Syncs the invocation of configure with the one from the server. + + Signed-off-by: Peter Hutterer + Reviewed-by: Emil Velikov + +commit c74b070f2712c95f0db7c320a10232b0e5c83049 +Author: Julien Cristau +Date: Sat Jan 7 16:20:31 2017 +0100 + + Fix wrong Xfree in XListFonts failure path + + 'ch' gets moved inside the allocated buffer as we're looping through + fonts, so keep a reference to the start of the buffer so we can pass + that to Xfree in the failure case. + + Fixes: commit 20a3f99eba5001925b8b313da3accb7900eb1927 "Plug a memory leak" + + Signed-off-by: Julien Cristau + Reviewed-by: Alan Coopersmith + Signed-off-by: Peter Hutterer + +commit 663f47075fe67bab4f99bc5d186c49175d4a4334 +Author: Alan Coopersmith +Date: Sun Jan 1 20:57:58 2017 -0800 + + specs/libX11: Update Portability Considerations for the 21st century + + Signed-off-by: Alan Coopersmith + Signed-off-by: Peter Hutterer + +commit 28f4b989b52fcf45c7e75a878d8d9c2583cd6b3c +Author: Alan Coopersmith +Date: Sun Jan 1 20:39:53 2017 -0800 + + specs/libX11: Fix broken synopsis for Data/Data16/Data32 + + Signed-off-by: Alan Coopersmith + +commit 382561951e3460b09c21a1a23748cde0315fbb19 +Author: Alan Coopersmith +Date: Sun Jan 1 20:31:54 2017 -0800 + + specs/libX11: Add missing parameter types for XGetWindowProperty() + + Signed-off-by: Alan Coopersmith + +commit 2beaecdb66965b861d6b790d151ba947f65f0a22 +Author: Alan Coopersmith +Date: Sun Jan 1 20:16:08 2017 -0800 + + specs/libX11: Make paramdef spacing more consistent + + Signed-off-by: Alan Coopersmith + +commit 4c436c6c14cfd4c397b011563bf13c2872861133 +Author: Alan Coopersmith +Date: Sun Jan 1 20:02:53 2017 -0800 + + specs/libX11: Fix paramdef entries listing multiple parameters + + Signed-off-by: Alan Coopersmith + +commit 1728b1a8a4718315da8e5c9cbc2c04bb75c74107 +Author: Alan Coopersmith +Date: Sun Jan 1 19:38:40 2017 -0800 + + specs/libX11: More synopsis fixes + + Mostly transforming macro definitions and functions taking void arguments + from undecorated tags to use tags to get decorations. + + Signed-off-by: Alan Coopersmith + +commit f0dc83db7e3a3d4a76c0f9d24763b80f01c893a9 +Author: Lucien Gentis +Date: Wed Jun 1 17:02:47 2016 +0200 + + Typos in "Xlib - C Language X Interface" document - Chapter 02 + + This patch fixes typos and lack of tags in "Xlib - C Language X Interface" document - Chapter 02. + + Signed-off-by: Lucien Gentis + Reviewed-by: Alan Coopersmith + Signed-off-by: Alan Coopersmith + +commit 20a3f99eba5001925b8b313da3accb7900eb1927 +Author: Emilio Pozuelo Monfort +Date: Tue Oct 25 21:30:15 2016 +0200 + + Plug a memory leak + + This was introduced in 8ea762f. + + Reported-by: Julien Cristau + Signed-off-by: Emilio Pozuelo Monfort + Signed-off-by: Peter Hutterer + commit 8f349feac24aacc958bd816afcc52380764e3d92 Author: Matthieu Herrb Date: Tue Oct 4 21:01:39 2016 +0200 diff --git a/lib/libX11/compile b/lib/libX11/compile index 531136b06..a85b723c7 100644 --- a/lib/libX11/compile +++ b/lib/libX11/compile @@ -3,7 +3,7 @@ scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify diff --git a/lib/libX11/configure b/lib/libX11/configure index dad0e82bb..1f2b41d58 100644 --- a/lib/libX11/configure +++ b/lib/libX11/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libX11 1.6.4. +# Generated by GNU Autoconf 2.69 for libX11 1.6.5. # # Report bugs to . # @@ -651,8 +651,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libX11' PACKAGE_TARNAME='libX11' -PACKAGE_VERSION='1.6.4' -PACKAGE_STRING='libX11 1.6.4' +PACKAGE_VERSION='1.6.5' +PACKAGE_STRING='libX11 1.6.5' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' PACKAGE_URL='' @@ -1510,7 +1510,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libX11 1.6.4 to adapt to many kinds of systems. +\`configure' configures libX11 1.6.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1580,7 +1580,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libX11 1.6.4:";; + short | recursive ) echo "Configuration of libX11 1.6.5:";; esac cat <<\_ACEOF @@ -1746,7 +1746,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libX11 configure 1.6.4 +libX11 configure 1.6.5 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2272,7 +2272,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libX11 $as_me 1.6.4, which was +It was created by libX11 $as_me 1.6.5, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4490,7 +4490,7 @@ fi # Define the identity of the package. PACKAGE='libX11' - VERSION='1.6.4' + VERSION='1.6.5' cat >>confdefs.h <<_ACEOF @@ -21361,7 +21361,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libX11 $as_me 1.6.4, which was +This file was extended by libX11 $as_me 1.6.5, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21427,7 +21427,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libX11 config.status 1.6.4 +libX11 config.status 1.6.5 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/lib/libX11/configure.ac b/lib/libX11/configure.ac index 58f2681ad..9f1953ee9 100644 --- a/lib/libX11/configure.ac +++ b/lib/libX11/configure.ac @@ -1,7 +1,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([libX11], [1.6.4], +AC_INIT([libX11], [1.6.5], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libX11]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([src/config.h include/X11/XlibConf.h]) diff --git a/lib/libX11/nls/locale.dir.pre b/lib/libX11/nls/locale.dir.pre index c4740a7e6..92da87648 100644 --- a/lib/libX11/nls/locale.dir.pre +++ b/lib/libX11/nls/locale.dir.pre @@ -302,9 +302,8 @@ en_US.UTF-8/XLC_LOCALE: ca_AD.UTF-8 en_US.UTF-8/XLC_LOCALE: ca_ES.UTF-8 en_US.UTF-8/XLC_LOCALE: ca_FR.UTF-8 en_US.UTF-8/XLC_LOCALE: ca_IT.UTF-8 -cs_CZ.UTF-8/XLC_LOCALE: cs_CZ.UTF-8 -en_US.UTF-8/XLC_LOCALE: cy_GB.UTF-8 en_US.UTF-8/XLC_LOCALE: cs_CZ.UTF-8 +en_US.UTF-8/XLC_LOCALE: cy_GB.UTF-8 en_US.UTF-8/XLC_LOCALE: da_DK.UTF-8 en_US.UTF-8/XLC_LOCALE: de_AT.UTF-8 en_US.UTF-8/XLC_LOCALE: de_BE.UTF-8 diff --git a/lib/libX11/specs/libX11/AppC.xml b/lib/libX11/specs/libX11/AppC.xml index 7f4904c91..8eb1e004c 100644 --- a/lib/libX11/specs/libX11/AppC.xml +++ b/lib/libX11/specs/libX11/AppC.xml @@ -51,11 +51,11 @@ and Bool XQueryExtension - Display *display - char *name - int *major_opcode_return - int *first_event_return - int *first_error_return + Display *display + char *name + int *major_opcode_return + int *first_event_return + int *first_error_return @@ -137,8 +137,8 @@ are all considered different names. char **XListExtensions - Display *display - int *nextensions_return + Display *display + int *nextensions_return @@ -179,7 +179,7 @@ Otherwise, the result is implementation-dependent. XFreeExtensionList - char **list + char **list @@ -261,8 +261,8 @@ typedef struct _XExtCodes { /* public to extension, cannot be changed */ XExtCodes *XInitExtension - Display *display - char *name + Display *display + char *name @@ -325,7 +325,7 @@ This extension number is unique only to a single connection. XExtCodes *XAddExtension - Display *display + Display *display @@ -373,9 +373,9 @@ extension. int XESetCloseDisplay - Display *display - int extension - int (*proc)() + Display *display + int extension + int (*proc)() @@ -441,9 +441,9 @@ with these arguments: int *XESetCreateGC - Display *display - int extension - int (*proc)() + Display *display + int extension + int (*proc)() @@ -508,9 +508,9 @@ your procedure is called with these arguments: int *XESetCopyGC - Display *display - int extension - int (*proc)() + Display *display + int extension + int (*proc)() @@ -571,9 +571,9 @@ your procedure is called with these arguments: int *XESetFreeGC - Display *display - int extension - int (*proc)() + Display *display + int extension + int (*proc)() @@ -642,9 +642,9 @@ your procedure is called with these arguments: int *XESetCreateFont - Display *display - int extension - int (*proc)() + Display *display + int extension + int (*proc)() @@ -721,9 +721,9 @@ your procedure is called with these arguments: int *XESetFreeFont - Display *display - int extension - int (*proc)() + Display *display + int extension + int (*proc)() @@ -833,9 +833,9 @@ in the structure will be fully portable between machines. int *XESetWireToEvent - Display *display - int event_number - Status (*proc)() + Display *display + int event_number + Status (*proc)() @@ -941,8 +941,8 @@ with the event and use the return value. unsigned long_XSetLastRequestRead - Display *display - xGenericReply *rep + Display *display + xGenericReply *rep @@ -983,9 +983,9 @@ serial number in the event. Status *XESetEventToWire - Display *display - int event_number - int (*proc)() + Display *display + int event_number + int (*proc)() @@ -1075,9 +1075,9 @@ structure. Bool *XESetWireToError - Display *display - int error_number - Bool (*proc)() + Display *display + int error_number + Bool (*proc)() @@ -1170,9 +1170,9 @@ otherwise, it should return int *XESetError - Display *display - int extension - int (*proc)() + Display *display + int extension + int (*proc)() @@ -1261,9 +1261,9 @@ returns the value of ret_code. char *XESetErrorString - Display *display - int extension - char *(*proc)() + Display *display + int extension + char *(*proc)() @@ -1337,9 +1337,9 @@ error message into buffer. void *XESetPrintErrorValues - Display *display - int extension - void (*proc)() + Display *display + int extension + void (*proc)() @@ -1419,9 +1419,9 @@ on a POSIX-compliant system, fp should be cast to type FILE*. int *XESetFlushGC - Display *display - int extension - int *(*proc)() + Display *display + int extension + int *(*proc)() @@ -1471,9 +1471,9 @@ function, but is called when a GC cache needs to be updated in the server. int *XESetCopyGC - Display *display - int extension - int *(*proc)() + Display *display + int extension + int *(*proc)() @@ -1608,7 +1608,7 @@ union { Display *display; XExtData **XEHeadOfExtensionList - XEDataObject object + XEDataObject object @@ -1644,8 +1644,8 @@ of types contained in XAddToExtensionList - XExtData **structure - XExtData *ext_data + XExtData **structure + XExtData *ext_data @@ -1684,8 +1684,8 @@ before calling this function. XExtData *XFindOnExtensionList - struct_XExtData **structure - int number + struct_XExtData **structure + int number @@ -1735,7 +1735,7 @@ macro, which allocates and returns a resource ID, is defined in XAllocID - Display *display + Display *display @@ -1770,9 +1770,9 @@ macro allocates and returns an array of resource ID. XAllocIDs - Display *display - XID *ids_return - int count + Display *display + XID *ids_return + int count @@ -1849,8 +1849,8 @@ macro is defined as follows: FlushGC - Display *display - GC gc + Display *display + GC gc @@ -1899,8 +1899,8 @@ is defined as follows: _XFlushGCCache - Display *display - GC gc + Display *display + GC gc @@ -2325,7 +2325,7 @@ Two calls, which are generally implemented as macros, have been provided. LockDisplay - Display *display + Display *display @@ -2335,7 +2335,7 @@ Two calls, which are generally implemented as macros, have been provided. UnlockDisplay - Display *display + Display *display @@ -2518,10 +2518,23 @@ the display, a pointer to the beginning of the data, and the number of bytes to be sent. - + Data - display - (char * + display + (char *) data + nbytes + + + Data16 + display + (short *) data + nbytes + + + Data32 + display + (long *) data + nbytes @@ -2529,7 +2542,7 @@ and the number of bytes to be sent. -, +Data, Data16, and Data32 @@ -2578,10 +2591,10 @@ places them in the queue for later use. Status _XReply - Display *display - xReply *rep - int extra - Bool discard + Display *display + xReply *rep + int extra + Bool discard @@ -2744,9 +2757,9 @@ function to read the variable-length data. _XRead - Display *display - char *data_return - long nbytes + Display *display + char *data_return + long nbytes @@ -2794,9 +2807,9 @@ function reads the specified number of bytes into data_return. _XRead16 - Display *display - short *data_return - long nbytes + Display *display + short *data_return + long nbytes @@ -2846,9 +2859,9 @@ into the specified array as shorts. _XRead32 - Display *display - long *data_return - long nbytes + Display *display + long *data_return + long nbytes @@ -2898,9 +2911,9 @@ into the specified array as longs. _XRead16Pad - Display *display - short *data_return - long nbytes + Display *display + short *data_return + long nbytes @@ -2953,9 +2966,9 @@ reads and discards up to two additional pad bytes. _XReadPad - Display *display - char *data_return - long nbytes + Display *display + char *data_return + long nbytes @@ -3055,8 +3068,8 @@ critical section: char *_XAllocScratch - Display *display - unsigned long nbytes + Display *display + unsigned long nbytes @@ -3112,8 +3125,8 @@ critical sections: char *_XAllocTemp - Display *display - unsigned long nbytes + Display *display + unsigned long nbytes @@ -3151,9 +3164,9 @@ The following function returns the storage: void _XFreeTemp - Display *display - char *buf - unsigned long nbytes + Display *display + char *buf + unsigned long nbytes @@ -3200,9 +3213,8 @@ You must pass back the same pointer and size that were returned by Portability Considerations -Many machine architectures, -including many of the more recent RISC architectures, -do not correctly access data at unaligned locations; +Many machine architectures +do not correctly or efficiently access data at unaligned locations; their compilers pad out structures to preserve this characteristic. Many other machines capable of unaligned references pad inside of structures as well to preserve alignment, because accessing aligned data is @@ -3216,7 +3228,9 @@ All requests must be a multiple of 32 bits in len the natural alignment in the data stream. You must pad structures out to 32-bit boundaries. Pad information does not have to be zeroed unless you want to -preserve such fields for future use in your protocol requests. +preserve such fields for future use in your protocol requests, +but it is recommended to zero it to avoid inadvertant data leakage +and improve compressability. Floating point varies radically between machines and should be avoided completely if at all possible. @@ -3253,7 +3267,7 @@ take on values larger than the maximum 16-bit -The library currently assumes that a +The library has always assumed that a char is 8 bits, a short @@ -3261,7 +3275,15 @@ is 16 bits, an int is 16 or 32 bits, and a long -is 32 bits. +is 32 bits. +Unfortunately, this assumption remains on machines where a long +can hold 64-bits, and many functions and structures require unnecessarily +large fields to avoid breaking compatibility with existing code. Special +care must be taken with arrays of values that are transmitted in the +protocol as CARD32 or INT32 but have to be converted to arrays of 64-bit +long when passed to or from client applications. + + The PackData macro is a half-hearted attempt to deal with the possibility of 32 bit shorts. diff --git a/lib/libX11/specs/libX11/AppD.xml b/lib/libX11/specs/libX11/AppD.xml index 83837970f..823f6d518 100644 --- a/lib/libX11/specs/libX11/AppD.xml +++ b/lib/libX11/specs/libX11/AppD.xml @@ -59,14 +59,14 @@ and WM_NORMAL_HINTS properties. XSetStandardProperties - Display *display - Window w - char *window_name - char *icon_name - Pixmap icon_pixmap - char **argv - int argc - XSizeHints *hints + Display *display + Window w + char *window_name + char *icon_name + Pixmap icon_pixmap + char **argv + int argc + XSizeHints *hints @@ -208,9 +208,9 @@ This function has been superseded by XSetNormalHints - Display *display - Window w - XSizeHints *hints + Display *display + Window w + XSizeHints *hints @@ -297,9 +297,9 @@ This function has been superseded by Status XGetNormalHints - Display *display - Window w - XSizeHints *hints_return + Display *display + Window w + XSizeHints *hints_return @@ -368,9 +368,9 @@ This function is no longer supported by the XSetZoomHints - Display *display - Window w - XSizeHints *zhints + Display *display + Window w + XSizeHints *zhints @@ -438,9 +438,9 @@ This function is no longer supported by the Status XGetZoomHints - Display *display - Window w - XSizeHints *zhints_return + Display *display + Window w + XSizeHints *zhints_return @@ -505,10 +505,10 @@ This function has been superseded by XSetSizeHints - Display *display - Window w - XSizeHints *hints - Atom property + Display *display + Window w + XSizeHints *hints + Atom property @@ -592,10 +592,10 @@ This function has been superseded by Status XGetSizeHints - Display *display - Window w - XSizeHints *hints_return - Atom property + Display *display + Window w + XSizeHints *hints_return + Atom property @@ -685,10 +685,10 @@ This function has been superseded by Status XGetStandardColormap - Display *display - Window w - XStandardColormap *colormap_return - Atom property + Display *display + Window w + XStandardColormap *colormap_return + Atom property @@ -778,10 +778,10 @@ This function has been superseded by XSetStandardColormap - Display *display - Window w - XStandardColormap *colormap - Atom property + Display *display + Window w + XStandardColormap *colormap + Atom property @@ -861,15 +861,19 @@ This function has been superseded by int XGeometry - Display *display - int screen - char*position, *default_position - unsigned int bwidth + Display *display + int screen + char *position + char *default_position + unsigned int bwidth unsigned int fwidth unsigned int fheight - intxadder, yadder - int*x_return, *y_return - int*width_return, *height_return + int xadder + int yadder + int *x_return + int *y_return + int *width_return + int *height_return @@ -1062,9 +1066,9 @@ It is only useful in very simple applications. char *XGetDefault - Display *display - char *program - char *option + Display *display + char *program + char *option @@ -1256,11 +1260,11 @@ use Status XDraw - Display *display - Drawable d - GC gc - Vertex *vlist - int vcount + Display *display + Drawable d + GC gc + Vertex *vlist + int vcount @@ -1463,11 +1467,11 @@ use Status XDrawFilled - Display *display - Drawable d - GC gc - Vertex *vlist - int vcount + Display *display + Drawable d + GC gc + Vertex *vlist + int vcount @@ -1619,7 +1623,7 @@ use XAssocTable *XCreateAssocTable - int size + int size @@ -1665,10 +1669,10 @@ use XMakeAssoc - Display *display - XAssocTable *table - XID x_id - char *data + Display *display + XAssocTable *table + XID x_id + char *data @@ -1740,9 +1744,9 @@ use char *XLookUpAssoc - Display *display - XAssocTable *table - XID x_id + Display *display + XAssocTable *table + XID x_id @@ -1805,9 +1809,9 @@ use XDeleteAssoc - Display *display - XAssocTable *table - XID x_id + Display *display + XAssocTable *table + XID x_id @@ -1868,7 +1872,7 @@ use XDestroyAssocTable - XAssocTable *table + XAssocTable *table diff --git a/lib/libX11/specs/libX11/CH02.xml b/lib/libX11/specs/libX11/CH02.xml index 656dce8b1..5dbfa2b13 100644 --- a/lib/libX11/specs/libX11/CH02.xml +++ b/lib/libX11/specs/libX11/CH02.xml @@ -329,8 +329,13 @@ The following lists the C language macros, their corresponding function equivalents that are for other language bindings, and what data both can return. -AllPlanes() -XAllPlanes() +AllPlanes + + + unsigned long XAllPlanes + + + @@ -342,6 +347,10 @@ a procedure. +BlackPixel +XBlackPixel +WhitePixel +XWhitePixel Both BlackPixel and @@ -354,14 +363,18 @@ and, in any case, may not actually be black or white. The names are intended to convey the expected relative intensity of the colors. - -BlackPixel(display, screen_number) - + + + BlackPixel + display + screen_number + + unsigned long XBlackPixel - Display *display - int screen_number + Display *display + int screen_number @@ -390,8 +403,6 @@ Specifies the appropriate screen number on the host server. -BlackPixel -XBlackPixel Both return the black pixel value for the specified screen. @@ -399,14 +410,18 @@ Both return the black pixel value for the specified screen. - -WhitePixel(display, screen_number) - + + + WhitePixel + display + screen_number + + unsigned long XWhitePixel - Display *display - int screen_number + Display *display + int screen_number @@ -435,8 +450,6 @@ Specifies the appropriate screen number on the host server. -WhitePixel -XWhitePixel Both return the white pixel value for the specified screen. @@ -444,13 +457,16 @@ Both return the white pixel value for the specified screen. - -ConnectionNumber(display) - + + + ConnectionNumber + display + + int XConnectionNumber - Display *display + Display *display @@ -481,14 +497,18 @@ this is the file descriptor of the connection. - -DefaultColormap(display, screen_number) - + + + DefaultColormap + display + screen_number + + Colormap XDefaultColormap - Display *display - int screen_number + Display *display + int screen_number @@ -527,14 +547,18 @@ Most routine allocations of color should be made out of this colormap. - -DefaultDepth(display, screen_number) - + + + DefaultDepth + display + screen_number + + int XDefaultDepth - Display *display - int screen_number + Display *display + int screen_number @@ -578,15 +602,12 @@ To determine the number of depths that are available on a given screen, use XListDepths. - -DefaultGC(display, screen_number) - - + - GC XDefaultGC - Display *display - int screen_number - int *count_return + int *XListDepths + Display *display + int screen_number + int *count_return @@ -642,14 +663,18 @@ To release the memory allocated for the array of depths, use - -DefaultGC(display, screen_number) - - + + + DefaultGC + display + screen_number + + + GC XDefaultGC - Display *display - int screen_number + Display *display + int screen_number @@ -695,13 +720,16 @@ This GC should never be freed. - -DefaultRootWindow(display) - + + + DefaultRootWindow + display + + Window XDefaultRootWindow - Display *display + Display *display @@ -729,13 +757,16 @@ Both return the root window for the default screen. - -DefaultScreenOfDisplay(display) - + + + DefaultScreenOfDisplay + display + + Screen *XDefaultScreenOfDisplay - Display *display + Display *display @@ -763,14 +794,18 @@ Both return a pointer to the default screen. - -ScreenOfDisplay(display, screen_number) - + + + ScreenOfDisplay + display + screen_number + + Screen *XScreenOfDisplay - Display *display - int screen_number + Display *display + int screen_number @@ -808,13 +843,16 @@ Both return a pointer to the indicated screen. - -DefaultScreen(display) - + + + DefaultScreen + display + + int XDefaultScreen - Display *display + Display *display @@ -846,14 +884,18 @@ in applications that will use only a single screen. - -DefaultVisual(display, screen_number) - + + + DefaultVisual + display + screen_number + + Visual *XDefaultVisual - Display *display - int screen_number + Display *display + int screen_number @@ -893,14 +935,18 @@ see section 3.1. - -DisplayCells(display, screen_number) - + + + DisplayCells + display + screen_number + + int XDisplayCells - Display *display - int screen_number + Display *display + int screen_number @@ -938,14 +984,18 @@ Both return the number of entries in the default colormap. - -DisplayPlanes(display, screen_number) - + + + DisplayPlanes + display + screen_number + + int XDisplayPlanes - Display *display - int screen_number + Display *display + int screen_number @@ -985,13 +1035,16 @@ see the glossary. - -DisplayString(display) - + + + DisplayString + display + + char *XDisplayString - Display *display + Display *display @@ -1029,13 +1082,10 @@ child process as well as for printing error messages. - -LastKnownRequestProcessed(display) - - + - unsigned long XLastKnownRequestProcessed - Display *display + long XExtendedMaxRequestSize + Display *display @@ -1086,13 +1136,10 @@ split the data across multiple smaller requests instead. - -LastKnownRequestProcessed(display) - - unsigned long XLastKnownRequestProcessed - Display *display + long XMaxRequestSize + Display *display @@ -1135,13 +1182,16 @@ and - -LastKnownRequestProcessed(display) - - + + + LastKnownRequestProcessed + display + + + unsigned long XLastKnownRequestProcessed - Display *display + Display *display @@ -1172,13 +1222,16 @@ are received. - -NextRequest(display) - + + + NextRequest + display + + unsigned long XNextRequest - Display *display + Display *display @@ -1208,13 +1261,16 @@ Serial numbers are maintained separately for each display connection. - -ProtocolVersion(display) - + + + ProtocolVersion + display + + int XProtocolVersion - Display *display + Display *display @@ -1243,13 +1299,16 @@ the connected display. - -ProtocolRevision(display) - + + + ProtocolRevision + display + + int XProtocolRevision - Display *display + Display *display @@ -1277,13 +1336,16 @@ Both return the minor protocol revision number of the X server. - -QLength(display) - + + + QLength + display + + int XQLength - Display *display + Display *display @@ -1314,14 +1376,18 @@ the queue yet (see - -RootWindow(display, screen_number) - + + + RootWindow + display + screen_number + + Window XRootWindow - Display *display - int screen_number + Display *display + int screen_number @@ -1363,13 +1429,16 @@ and for creating top-level windows. - -ScreenCount(display) - + + + ScreenCount + display + + int XScreenCount - Display *display + Display *display @@ -1397,13 +1466,16 @@ Both return the number of available screens. - -ServerVendor(display) - + + + ServerVendor + display + + char *XServerVendor - Display *display + Display *display @@ -1435,13 +1507,16 @@ Otherwise, the contents of the string are implementation-dependent. - -VendorRelease(display) - + + + VendorRelease + display + + int XVendorRelease - Display *display + Display *display @@ -1482,24 +1557,19 @@ most of the work required to convert the data is provided by Xlib +XPixmapFormatValues The XPixmapFormatValues structure provides an interface to the pixmap format information that is returned at the time of a connection setup. It contains: - - - - - - - + typedef struct { - int depth; - int bits_per_pixel; - int scanline_pad; -} XPixmapFormatValues; - + int depth; + int bits_per_pixel; + int scanline_pad; +} XPixmapFormatValues; + @@ -1513,8 +1583,8 @@ To obtain the pixmap format information for a given display, use XPixmapFormatValues *XListPixmapFormats - Display *display - int *count_return + Display *display + int *count_return @@ -1569,13 +1639,16 @@ These are often used by toolkits as well as by simple applications. - -ImageByteOrder(display) - + + + ImageByteOrder + display + + int XImageByteOrder - Display *display + Display *display @@ -1609,13 +1682,16 @@ or - -BitmapUnit(display) - + + + XBitmapUnit + display + + int XBitmapUnit - Display *display + Display *display @@ -1644,13 +1720,16 @@ The scanline is calculated in multiples of this value. - -BitmapBitOrder(display) - + + + BitmapBitOrder + display + + int XBitmapBitOrder - Display *display + Display *display @@ -1684,13 +1763,16 @@ or - -BitmapPad(display) - + + + BitmapPad + display + + int XBitmapPad - Display *display + Display *display @@ -1719,14 +1801,18 @@ by this macro or function. - -DisplayHeight(display, screen_number) - + + + DisplayHeight + display + screen_number + + int XDisplayHeight - Display *display - int screen_number + Display *display + int screen_number @@ -1765,14 +1851,18 @@ in pixels. - -DisplayHeightMM(display, screen_number) - + + + DisplayHeightMM + display + screen_number + + int XDisplayHeightMM - Display *display - int screen_number + Display *display + int screen_number @@ -1810,14 +1900,18 @@ Both return the height of the specified screen in millimeters. - -DisplayWidth(display, screen_number) - + + + DisplayWidth + display + screen_number + + int XDisplayWidth - Display *display - int screen_number + Display *display + int screen_number @@ -1855,14 +1949,18 @@ Both return the width of the screen in pixels. - -DisplayWidthMM(display, screen_number) - + + + DisplayWidthMM + display + screen_number + + int XDisplayWidthMM - Display *display - int screen_number + Display *display + int screen_number @@ -1914,13 +2012,16 @@ structure. - -BlackPixelOfScreen(screen) - + + + BlackPixelOfScreen + screen + + unsigned long XBlackPixelOfScreen - Screen *screen + Screen *screen @@ -1950,13 +2051,16 @@ Both return the black pixel value of the specified screen. - -WhitePixelOfScreen(screen) - + + + XWhitePixelOfScreen + screen + + unsigned long XWhitePixelOfScreen - Screen *screen + Screen *screen @@ -1986,13 +2090,16 @@ Both return the white pixel value of the specified screen. - -CellsOfScreen(screen) - + + + CellsOfScreen + screen + + int XCellsOfScreen - Screen *screen + Screen *screen @@ -2023,13 +2130,16 @@ of the specified screen. - -DefaultColormapOfScreen(screen) - + + + DefaultColormapOfScreen + screen + + Colormap XDefaultColormapOfScreen - Screen *screen + Screen *screen @@ -2059,13 +2169,16 @@ Both return the default colormap of the specified screen. - -DefaultDepthOfScreen(screen) - + + + DefaultDepthOfScreen + screen + + int XDefaultDepthOfScreen - Screen *screen + Screen *screen @@ -2095,13 +2208,16 @@ Both return the depth of the root window. - -DefaultGCOfScreen(screen) - + + + DefaultGCOfScreen + screen + + GC XDefaultGCOfScreen - Screen *screen + Screen *screen @@ -2133,13 +2249,16 @@ The GC must never be freed. - -DefaultVisualOfScreen(screen) - + + + XDefaultVisualOfScreen + screen + + Visual *XDefaultVisualOfScreen - Screen *screen + Screen *screen @@ -2171,13 +2290,16 @@ see section 3.1. - -DoesBackingStore(screen) - + + + DoesBackingStore + screen + + int XDoesBackingStore - Screen *screen + Screen *screen @@ -2214,13 +2336,16 @@ or - -DoesSaveUnders(screen) - + + + DoesSaveUnders + screen + + Bool XDoesSaveUnders - Screen *screen + Screen *screen @@ -2258,13 +2383,16 @@ the screen does not support save unders - -DisplayOfScreen(screen) - + + + DisplayOfScreen + screen + + Display *XDisplayOfScreen - Screen *screen + Screen *screen @@ -2295,13 +2423,16 @@ Both return the display of the specified screen. XScreenNumberOfScreen - -EventMaskOfScreen(screen) - - + + + ScreenNumberOfScreen + screen + + + - long XEventMaskOfScreen - Screen *screen + long XScreenNumberOfScreen + Screen *screen @@ -2331,13 +2462,16 @@ function returns the screen index number of the specified screen. - -EventMaskOfScreen(screen) - - + + + EventMaskOfScreen + screen + + + long XEventMaskOfScreen - Screen *screen + Screen *screen @@ -2368,13 +2502,16 @@ at connection setup time. - -WidthOfScreen(screen) - + + + WidthOfScreen + screen + + int XWidthOfScreen - Screen *screen + Screen *screen @@ -2404,13 +2541,16 @@ Both return the width of the specified screen in pixels. - -HeightOfScreen(screen) - + + + HeightOfScreen + screen + + int XHeightOfScreen - Screen *screen + Screen *screen @@ -2440,13 +2580,16 @@ Both return the height of the specified screen in pixels. - -WidthMMOfScreen(screen) - + + + WidthMMOfScreen + screen + + int XWidthMMOfScreen - Screen *screen + Screen *screen @@ -2476,13 +2619,16 @@ Both return the width of the specified screen in millimeters. - -HeightMMOfScreen(screen) - + + + HeightMMOfScreen + screen + + int XHeightMMOfScreen - Screen *screen + Screen *screen @@ -2512,13 +2658,16 @@ Both return the height of the specified screen in millimeters. - -MaxCmapsOfScreen(screen) - + + + MaxCmapsOfScreen + screen + + int XMaxCmapsOfScreen - Screen *screen + Screen *screen @@ -2550,13 +2699,16 @@ by the specified screen - -MinCmapsOfScreen(screen) - + + + MinCmapsOfScreen + screen + + int XMinCmapsOfScreen - Screen *screen + Screen *screen @@ -2588,13 +2740,16 @@ by the specified screen - -PlanesOfScreen(screen) - + + + PlanesOfScreen + screen + + int XPlanesOfScreen - Screen *screen + Screen *screen @@ -2624,13 +2779,16 @@ Both return the depth of the root window. - -RootWindowOfScreen(screen) - + + + RootWindowOfScreen + screen + + Window XRootWindowOfScreen - Screen *screen + Screen *screen @@ -2674,7 +2832,7 @@ protocol request, use XNoOp - Display *display + Display *display @@ -2711,8 +2869,8 @@ To free in-memory data that was created by an Xlib function, use - XFree - void *data + XFree + void *data @@ -2757,8 +2915,8 @@ To close a display or disconnect from the X server, use - XCloseDisplay - Display *display + XCloseDisplay + Display *display @@ -2791,7 +2949,7 @@ structure and destroys all windows, resource IDs and GContext), or other resources that the client has created -on this display, unless the close-down mode of the resource has been changed +on this display, unless the close-down mode of the client has been changed (see ). Therefore, these windows, resource IDs, and other resources should never be @@ -2825,9 +2983,9 @@ To change a client's close-down mode, use - XSetCloseDownMode - Display *display - int close_mode + XSetCloseDownMode + Display *display + int close_mode @@ -2862,7 +3020,7 @@ or The - + function defines what will happen to the client's resources at connection close. A connection starts in DestroyAll @@ -3076,7 +3234,12 @@ To initialize support for concurrent threads, use XInitThreads -Status XInitThreads(); + + + Status XInitThreads + + + @@ -3111,8 +3274,8 @@ To lock a display across several Xlib calls, use - XLockDisplay - Display *display + XLockDisplay + Display *display @@ -3156,8 +3319,8 @@ To unlock a display, use - XUnlockDisplay - Display *display + XUnlockDisplay + Display *display @@ -3217,21 +3380,21 @@ To track internal connections for a display, use - type void XConnectionWatchProc - Display *display - XPointer client_data - int fd - Bool opening - XPointer *watch_data + typedef void (*XConnectionWatchProc) + Display *display + XPointer client_data + int fd + Bool opening + XPointer *watch_data - Status XAddConnectionWatch - Display *display - XWatchProc procedure - XPointer client_data + Status XAddConnectionWatch + Display *display + XConnectionWatchProc procedure + XPointer client_data @@ -3315,14 +3478,13 @@ To stop tracking internal connections for a display, use -() Status XRemoveConnectionWatch - Display *display - XWatchProc procedure - XPointer client_data + Display *display + XConnectionWatchProc procedure + XPointer client_data @@ -3377,13 +3539,12 @@ To process input on an internal connection, use -() void XProcessInternalConnection - Display *display - int fd + Display *display + int fd @@ -3432,14 +3593,13 @@ To obtain all of the current internal connections for a display, use -() Status XInternalConnectionNumbers - Display *display - int ** fd - int * count_return + Display *display + int ** fd + int * count_return diff --git a/lib/libX11/specs/libX11/CH03.xml b/lib/libX11/specs/libX11/CH03.xml index d003717ab..801febb4b 100644 --- a/lib/libX11/specs/libX11/CH03.xml +++ b/lib/libX11/specs/libX11/CH03.xml @@ -1254,18 +1254,18 @@ To create an unmapped window and set its window attributes, use Window XCreateWindow - Display *display - Window parent + Display *display + Window parent int x int y unsigned int width unsigned int height - unsigned int border_width - int depth - unsigned int class - Visual *visual - unsigned long valuemask - XSetWindowAttributes *attributes + unsigned int border_width + int depth + unsigned int class + Visual *visual + unsigned long valuemask + XSetWindowAttributes *attributes @@ -1520,15 +1520,15 @@ subwindow of a given parent window, use Window XCreateSimpleWindow - Display *display - Window parent + Display *display + Window parent int x int y unsigned int width unsigned int height - unsigned int border_width - unsigned long border - unsigned long background + unsigned int border_width + unsigned long border + unsigned long background @@ -1691,8 +1691,8 @@ To destroy a window and all of its subwindows, use XDestroyWindow - Display *display - Window w + Display *display + Window w @@ -1761,8 +1761,8 @@ To destroy all subwindows of a specified window, use XDestroySubwindows - Display *display - Window w + Display *display + Window w @@ -1905,8 +1905,8 @@ To map a given window, use XMapWindow - Display *display - Window w + Display *display + Window w @@ -2031,8 +2031,8 @@ To map and raise a window, use XMapRaised - Display *display - Window w + Display *display + Window w @@ -2091,8 +2091,8 @@ To map all subwindows for a specified window, use XMapSubwindows - Display *display - Window w + Display *display + Window w @@ -2161,8 +2161,8 @@ To unmap a window, use XUnmapWindow - Display *display - Window w + Display *display + Window w @@ -2228,8 +2228,8 @@ To unmap all subwindows for a specified window, use XUnmapSubwindows - Display *display - Window w + Display *display + Window w @@ -2537,10 +2537,10 @@ To configure a window's size, location, stacking, or border, use XConfigureWindow - Display *display - Window w - unsigned int value_mask - XWindowChanges *values + Display *display + Window w + unsigned int value_mask + XWindowChanges *values @@ -2642,8 +2642,8 @@ To move a window without changing its size, use XMoveWindow - Display *display - Window w + Display *display + Window w int x int y @@ -2744,8 +2744,8 @@ To change a window's size without changing the upper-left coordinate, use XResizeWindow - Display *display - Window w + Display *display + Window w unsigned int width unsigned int height @@ -2847,8 +2847,8 @@ To change the size and location of a window, use XMoveResizeWindow - Display *display - Window w + Display *display + Window w int x int y unsigned int width @@ -2968,9 +2968,9 @@ To change the border width of a given window, use XSetWindowBorderWidth - Display *display - Window w - unsigned int width + Display *display + Window w + unsigned int width @@ -3045,8 +3045,8 @@ To raise a window so that no sibling window obscures it, use XRaiseWindow - Display *display - Window w + Display *display + Window w @@ -3118,8 +3118,8 @@ To lower a window so that it does not obscure any sibling windows, use XLowerWindow - Display *display - Window w + Display *display + Window w @@ -3192,9 +3192,9 @@ To circulate a subwindow up or down, use XCirculateSubwindows - Display *display - Window w - int direction + Display *display + Window w + int direction @@ -3284,8 +3284,8 @@ occluded by another child, use XCirculateSubwindowsUp - Display *display - Window w + Display *display + Window w @@ -3346,8 +3346,8 @@ completely occludes another child, use XCirculateSubwindowsDown - Display *display - Window w + Display *display + Window w @@ -3405,9 +3405,9 @@ To restack a set of windows from top to bottom, use XRestackWindows - Display *display - Window windows[] - int nwindows + Display *display + Window windows[] + int nwindows @@ -3510,10 +3510,10 @@ To change one or more attributes for a given window, use XChangeWindowAttributes - Display *display - Window w - unsigned long valuemask - XSetWindowAttributes *attributes + Display *display + Window w + unsigned long valuemask + XSetWindowAttributes *attributes @@ -3668,9 +3668,9 @@ To set the background of a window to a given pixel, use XSetWindowBackground - Display *display - Window w - unsigned long background_pixel + Display *display + Window w + unsigned long background_pixel @@ -3745,9 +3745,9 @@ To set the background of a window to a given pixmap, use XSetWindowBackgroundPixmap - Display *display - Window w - Pixmap background_pixmap + Display *display + Window w + Pixmap background_pixmap @@ -3837,9 +3837,9 @@ To change and repaint a window's border to a given pixel, use XSetWindowBorder - Display *display - Window w - unsigned long border_pixel + Display *display + Window w + unsigned long border_pixel @@ -3907,9 +3907,9 @@ To change and repaint the border tile of a given window, use XSetWindowBorderPixmap - Display *display - Window w - Pixmap border_pixmap + Display *display + Window w + Pixmap border_pixmap @@ -3986,9 +3986,9 @@ To set the colormap of a given window, use XSetWindowColormap - Display *display - Window w - Colormap colormap + Display *display + Window w + Colormap colormap @@ -4057,9 +4057,9 @@ To define which cursor will be used in a window, use XDefineCursor - Display *display - Window w - Cursor cursor + Display *display + Window w + Cursor cursor @@ -4126,8 +4126,8 @@ To undefine the cursor in a given window, use XUndefineCursor - Display *display - Window w + Display *display + Window w diff --git a/lib/libX11/specs/libX11/CH04.xml b/lib/libX11/specs/libX11/CH04.xml index 5312db176..ae368920b 100644 --- a/lib/libX11/specs/libX11/CH04.xml +++ b/lib/libX11/specs/libX11/CH04.xml @@ -44,12 +44,12 @@ a given window, use Status XQueryTree - Display *display - Window w - Window *root_return - Window *parent_return - Window **children_return - unsigned int *nchildren_return + Display *display + Window w + Window *root_return + Window *parent_return + Window **children_return + unsigned int *nchildren_return @@ -150,9 +150,9 @@ To obtain the current attributes of a given window, use Status XGetWindowAttributes - Display *display - Window w - XWindowAttributes *window_attributes_return + Display *display + Window w + XWindowAttributes *window_attributes_return @@ -374,14 +374,15 @@ To obtain the current geometry of a given drawable, use Status XGetGeometry - Display *display - Drawable d - Window *root_return - int*x_return, *y_return - unsigned int *width_return - unsigned int *height_return - unsigned int *border_width_return - unsigned int *depth_return + Display *display + Drawable d + Window *root_return + int *x_return + int *y_return + unsigned int *width_return + unsigned int *height_return + unsigned int *border_width_return + unsigned int *depth_return @@ -535,11 +536,14 @@ space of another window, use Bool XTranslateCoordinates - Display *display - Windowsrc_w, dest_w - intsrc_x, src_y - int*dest_x_return, *dest_y_return - Window *child_return + Display *display + Window src_w + Window dest_w + int src_x + int src_y + int *dest_x_return + int *dest_y_return + Window *child_return @@ -669,12 +673,15 @@ or to determine the pointer coordinates relative to a specified window, use Bool XQueryPointer - Display *display - Window w - Window*root_return, *child_return - int*root_x_return, *root_y_return - int*win_x_return, *win_y_return - unsigned int *mask_return + Display *display + Window w + Window *root_return + Window *child_return + int *root_x_return + int *root_y_return + int *win_x_return + int *win_y_return + unsigned int *mask_return @@ -1051,9 +1058,9 @@ To return an atom for a given name, use Atom XInternAtom - Display *display - char *atom_name - Bool only_if_exists + Display *display + char *atom_name + Bool only_if_exists @@ -1133,11 +1140,11 @@ To return atoms for an array of names, use Status XInternAtoms - Display *display - char **names - int count - Bool only_if_exists - Atom *atoms_return + Display *display + char **names + int count + Bool only_if_exists + Atom *atoms_return @@ -1233,8 +1240,8 @@ To return a name for a given atom identifier, use char *XGetAtomName - Display *display - Atom atom + Display *display + Atom atom @@ -1292,10 +1299,10 @@ To return the names for an array of atom identifiers, use Status XGetAtomNames - Display *display - Atom *atoms - int count - char **names_return + Display *display + Atom *atoms + int count + char **names_return @@ -1408,18 +1415,18 @@ To obtain the type, format, and value of a property of a given window, use int XGetWindowProperty - display - w - property - long_offset - long_length - delete - req_type - actual_type_return - actual_format_return - nitems_return - bytes_after_return - prop_return + Display *display + Window w + Atom property + long long_offset + long long_length + Bool delete + Atom req_type + Atom *actual_type_return + int *actual_format_return + unsigned long *nitems_return + unsigned long *bytes_after_return + unsigned char **prop_return @@ -1687,9 +1694,9 @@ To obtain a given window's property list, use Atom *XListProperties - Display *display - Window w - int *num_prop_return + Display *display + Window w + int *num_prop_return @@ -1759,14 +1766,14 @@ To change a property of a given window, use XChangeProperty - Display *display - Window w - Atom property - Atom type - int format - int mode - unsignedchar *data - int nelements + Display *display + Window w + Atom property + Atom type + int format + int mode + unsignedchar *data + int nelements @@ -1958,11 +1965,11 @@ To rotate a window's property list, use XRotateWindowProperties - Display *display - Window w - Atom properties[] - int num_prop - int npositions + Display *display + Window w + Atom properties[] + int num_prop + int npositions @@ -2072,9 +2079,9 @@ To delete a property on a given window, use XDeleteProperty - Display *display - Window w - Atom property + Display *display + Window w + Atom property @@ -2194,10 +2201,10 @@ To set the selection owner, use XSetSelectionOwner - Display *display - Atom selection - Window owner - Time time + Display *display + Atom selection + Window owner + Time time @@ -2317,8 +2324,8 @@ To return the selection owner, use Window XGetSelectionOwner - Display *display - Atom selection + Display *display + Atom selection @@ -2378,12 +2385,12 @@ To request conversion of a selection, use XConvertSelection - Display *display - Atom selection - Atom target - Atom property - Window requestor - Time time + Display *display + Atom selection + Atom target + Atom property + Window requestor + Time time diff --git a/lib/libX11/specs/libX11/CH05.xml b/lib/libX11/specs/libX11/CH05.xml index a2fa8f739..e22d26d6b 100644 --- a/lib/libX11/specs/libX11/CH05.xml +++ b/lib/libX11/specs/libX11/CH05.xml @@ -28,11 +28,11 @@ To create a pixmap of a given size, use Pixmap XCreatePixmap - Display *display - Drawable d + Display *display + Drawable d unsigned int width unsigned int height - unsigned int depth + unsigned int depth @@ -140,8 +140,8 @@ To free all storage associated with a specified pixmap, use XFreePixmap - Display *display - Pixmap pixmap + Display *display + Pixmap pixmap @@ -231,8 +231,8 @@ To create a cursor from the standard cursor font, use Cursor XCreateFontCursor - Display *display - unsigned int shape + Display *display + unsigned int shape @@ -299,11 +299,13 @@ To create a cursor from font glyphs, use Cursor XCreateGlyphCursor - Display *display - Fontsource_font, mask_font - unsigned int source_char, mask_char - XColor *foreground_color - XColor *background_color + Display *display + Font source_font + Font mask_font + unsigned int source_char + unsigned int mask_char + XColor *foreground_color + XColor *background_color @@ -438,12 +440,13 @@ use Cursor XCreatePixmapCursor - Display *display - Pixmap source - Pixmap mask - XColor *foreground_color - XColor *background_color - unsigned int x, y + Display *display + Pixmap source + Pixmap mask + XColor *foreground_color + XColor *background_color + unsigned int x + unsigned int y @@ -585,12 +588,12 @@ To determine useful cursor sizes, use Status XQueryBestCursor - Display *display - Drawable d + Display *display + Drawable d unsigned int width unsigned int height - unsigned int *width_return - unsigned int *height_return + unsigned int *width_return + unsigned int *height_return @@ -691,9 +694,10 @@ To change the color of a given cursor, use XRecolorCursor - Display *display - Cursor cursor - XColor*foreground_color, *background_color + Display *display + Cursor cursor + XColor *foreground_color + XColor *background_color @@ -769,8 +773,8 @@ To free (destroy) a given cursor, use XFreeCursor - Display *display - Cursor cursor + Display *display + Cursor cursor diff --git a/lib/libX11/specs/libX11/CH06.xml b/lib/libX11/specs/libX11/CH06.xml index 4f10019ac..66f6e3035 100644 --- a/lib/libX11/specs/libX11/CH06.xml +++ b/lib/libX11/specs/libX11/CH06.xml @@ -817,10 +817,10 @@ To create a colormap for a screen, use Colormap XCreateColormap - Display *display - Window w - Visual *visual - int alloc + Display *display + Window w + Visual *visual + int alloc @@ -966,8 +966,8 @@ shared colormap has failed because of resource exhaustion, use Colormap XCopyColormapAndFree - Display *display - Colormap colormap + Display *display + Colormap colormap @@ -1042,8 +1042,8 @@ To destroy a colormap, use XFreeColormap - Display *display - Colormap colormap + Display *display + Colormap colormap @@ -1120,10 +1120,11 @@ To map a color name to an RGB value, use Status XLookupColor - Display *display - Colormap colormap - char *color_name - XColor*exact_def_return, *screen_def_return + Display *display + Colormap colormap + char *color_name + XColor *exact_def_return + XColor *screen_def_return @@ -1217,10 +1218,10 @@ To map a color name to the exact RGB value, use Status XParseColor - Display *display - Colormap colormap - char *spec - XColor *exact_def_return + Display *display + Colormap colormap + char *spec + XColor *exact_def_return @@ -1307,11 +1308,12 @@ To map a color name to a value in an arbitrary color space, use Status XcmsLookupColor - Display *display - Colormap colormap - char *color_string - XcmsColor*color_exact_return, *color_screen_return - XcmsColorFormat result_format + Display *display + Colormap colormap + char *color_string + XcmsColor *color_exact_return + XcmsColor *color_screen_return + XcmsColorFormat result_format @@ -1463,9 +1465,9 @@ To allocate a read-only color cell with an RGB value, use Status XAllocColor - Display *display - Colormap colormap - XColor *screen_in_out + Display *display + Colormap colormap + XColor *screen_in_out @@ -1553,10 +1555,10 @@ To allocate a read-only color cell with a color in arbitrary format, use Status XcmsAllocColor - Display *display - Colormap colormap - XcmsColor *color_in_out - XcmsColorFormat result_format + Display *display + Colormap colormap + XcmsColor *color_in_out + XcmsColorFormat result_format @@ -1658,10 +1660,11 @@ color supported by the hardware in RGB format, use Status XAllocNamedColor - Display *display - Colormap colormap - char *color_name - XColor*screen_def_return, *exact_def_return + Display *display + Colormap colormap + char *color_name + XColor *screen_def_return + XColor *exact_def_return @@ -1763,12 +1766,12 @@ color supported by the hardware in an arbitrary format, use Status XcmsAllocNamedColor - Display *display - Colormap colormap - char *color_string - XcmsColor *color_screen_return - XcmsColor *color_exact_return - XcmsColorFormat result_format + Display *display + Colormap colormap + char *color_string + XcmsColor *color_screen_return + XcmsColor *color_exact_return + XcmsColorFormat result_format @@ -1912,13 +1915,13 @@ model, use Status XAllocColorCells - Display *display - Colormap colormap - Bool contig - unsigned long plane_masks_return[] - unsigned int nplanes - unsigned long pixels_return[] - unsigned int npixels + Display *display + Colormap colormap + Bool contig + unsigned long plane_masks_return[] + unsigned int nplanes + unsigned long pixels_return[] + unsigned int npixels @@ -2066,13 +2069,17 @@ model, use Status XAllocColorPlanes - Display *display - Colormap colormap - Bool contig - unsigned long pixels_return[] - int ncolors - intnreds,ngreens, nblues - unsigned long *rmask_return,*gmask_return, *bmask_return + Display *display + Colormap colormap + Bool contig + unsigned long pixels_return[] + int ncolors + int nreds + int ngreens + int nblues + unsigned long *rmask_return + unsigned long *gmask_return + unsigned long *bmask_return @@ -2268,11 +2275,11 @@ To free colormap cells, use XFreeColors - Display *display - Colormap colormap - unsigned long pixels[] - int npixels - unsigned long planes + Display *display + Colormap colormap + unsigned long pixels[] + int npixels + unsigned long planes @@ -2409,9 +2416,9 @@ To store an RGB value in a single colormap cell, use XStoreColor - Display *display - Colormap colormap - XColor *color + Display *display + Colormap colormap + XColor *color @@ -2501,10 +2508,10 @@ To store multiple RGB values in multiple colormap cells, use XStoreColors - Display *display - Colormap colormap - XColor color[] - int ncolors + Display *display + Colormap colormap + XColor color[] + int ncolors @@ -2607,9 +2614,9 @@ To store a color of arbitrary format in a single colormap cell, use Status XcmsStoreColor - Display *display - Colormap colormap - XcmsColor *color + Display *display + Colormap colormap + XcmsColor *color @@ -2718,11 +2725,11 @@ To store multiple colors of arbitrary format in multiple colormap cells, use Status XcmsStoreColors - Display *display - Colormap colormap - XcmsColor colors[] - int ncolors - Bool compression_flags_return[] + Display *display + Colormap colormap + XcmsColor colors[] + int ncolors + Bool compression_flags_return[] @@ -2863,11 +2870,11 @@ To store a color specified by name in a single colormap cell, use XStoreNamedColor - Display *display - Colormap colormap - char *color - unsigned long pixel - int flags + Display *display + Colormap colormap + char *color + unsigned long pixel + int flags @@ -2993,9 +3000,9 @@ To query the RGB value of a single colormap cell, use XQueryColor - Display *display - Colormap colormap - XColor *def_in_out + Display *display + Colormap colormap + XColor *def_in_out @@ -3067,10 +3074,10 @@ To query the RGB values of multiple colormap cells, use XQueryColors - Display *display - Colormap colormap - XColor defs_in_out[] - int ncolors + Display *display + Colormap colormap + XColor defs_in_out[] + int ncolors @@ -3157,10 +3164,10 @@ To query the color of a single colormap cell in an arbitrary format, use Status XcmsQueryColor - Display *display - Colormap colormap - XcmsColor *color_in_out - XcmsColorFormat result_format + Display *display + Colormap colormap + XcmsColor *color_in_out + XcmsColorFormat result_format @@ -3246,11 +3253,11 @@ To query the color of multiple colormap cells in an arbitrary format, use Status XcmsQueryColors - Display *display - Colormap colormap - XcmsColor colors_in_out[] - unsigned int ncolors - XcmsColorFormat result_format + Display *display + Colormap colormap + XcmsColor colors_in_out[] + unsigned int ncolors + XcmsColorFormat result_format @@ -3405,8 +3412,8 @@ To obtain the CCC associated with a colormap, use XcmsCCC XcmsCCCOfColormap - Display *display - Colormap colormap + Display *display + Colormap colormap @@ -3460,9 +3467,9 @@ To change the CCC associated with a colormap, use XcmsCCC XcmsSetCCCOfColormap - Display *display - Colormap colormap - XcmsCCC ccc + Display *display + Colormap colormap + XcmsCCC ccc @@ -3540,8 +3547,8 @@ To obtain the default CCC for a screen, use XcmsCCC XcmsDefaultCCC - Display *display - int screen_number + Display *display + int screen_number @@ -3602,14 +3609,14 @@ can return. DisplayOfCCC - XcmsCCC ccc + XcmsCCC ccc Display *XcmsDisplayOfCCC - XcmsCCC ccc + XcmsCCC ccc @@ -3639,14 +3646,14 @@ Both return the display associated with the specified CCC. VisualOfCCC - XcmsCCC ccc + XcmsCCC ccc Visual *XcmsVisualOfCCC - XcmsCCC ccc + XcmsCCC ccc @@ -3676,14 +3683,14 @@ Both return the visual associated with the specified CCC. ScreenNumberOfCCC - XcmsCCC ccc + XcmsCCC ccc int XcmsScreenNumberOfCCC - XcmsCCC ccc + XcmsCCC ccc @@ -3713,13 +3720,13 @@ Both return the number of the screen associated with the specified CCC. ScreenWhitePointOfCCC - XcmsCCC ccc + XcmsCCC ccc XcmsColor XcmsScreenWhitePointOfCCC - XcmsCCC ccc + XcmsCCC ccc @@ -3749,14 +3756,14 @@ Both return the white point of the screen associated with the specified CCC. ClientWhitePointOfCCC - XcmsCCC ccc + XcmsCCC ccc XcmsColor *XcmsClientWhitePointOfCCC - XcmsCCC ccc + XcmsCCC ccc @@ -3796,8 +3803,8 @@ To set the Client White Point in the CCC, use Status XcmsSetWhitePoint - XcmsCCC ccc - XcmsColor *color + XcmsCCC ccc + XcmsColor *color @@ -3866,9 +3873,9 @@ in a specified CCC, use XcmsCompressionProc XcmsSetCompressionProc - XcmsCCC ccc - XcmsCompressionProc compression_proc - XPointer client_data + XcmsCCC ccc + XcmsCompressionProc compression_proc + XPointer client_data @@ -3934,9 +3941,9 @@ in a specified CCC, use XcmsWhiteAdjustProc XcmsSetWhiteAdjustProc - XcmsCCC ccc - XcmsWhiteAdjustProc white_adjust_proc - XPointer client_data + XcmsCCC ccc + XcmsWhiteAdjustProc white_adjust_proc + XPointer client_data @@ -4010,14 +4017,14 @@ To create a CCC, use XcmsCCC XcmsCreateCCC - Display *display - int screen_number - Visual *visual - XcmsColor *client_white_point - XcmsCompressionProc compression_proc - XPointer compression_client_data - XcmsWhiteAdjustProc white_adjust_proc - XPointer white_adjust_client_data + Display *display + int screen_number + Visual *visual + XcmsColor *client_white_point + XcmsCompressionProc compression_proc + XPointer compression_client_data + XcmsWhiteAdjustProc white_adjust_proc + XPointer white_adjust_client_data @@ -4137,7 +4144,7 @@ To free a CCC, use void XcmsFreeCCC - XcmsCCC ccc + XcmsCCC ccc @@ -4184,11 +4191,11 @@ to a single destination format, use Status XcmsConvertColors - XcmsCCC ccc - XcmsColor colors_in_out[] - unsigned int ncolors - XcmsColorFormat target_format - Bool compression_flags_return[] + XcmsCCC ccc + XcmsColor colors_in_out[] + unsigned int ncolors + XcmsColorFormat target_format + Bool compression_flags_return[] @@ -4328,11 +4335,11 @@ following: typedef Status(*XcmsCompressionProc) - XcmsCCC ccc - XcmsColor colors_in_out[] - unsigned int ncolors - unsigned int index - Bool compression_flags_return[] + XcmsCCC ccc + XcmsColor colors_in_out[] + unsigned int ncolors + unsigned int index + Bool compression_flags_return[] @@ -4655,13 +4662,13 @@ The white point adjustment procedure interface must adhere to the following: typedef Status (*XcmsWhiteAdjustProc) - XcmsCCC ccc - XcmsColor *initial_white_point - XcmsColor *target_white_point - XcmsColorFormat target_format - XcmsColor colors_in_out[] - unsigned int ncolors - Bool compression_flags_return[] + XcmsCCC ccc + XcmsColor *initial_white_point + XcmsColor *target_white_point + XcmsColorFormat target_format + XcmsColor colors_in_out[] + unsigned int ncolors + Bool compression_flags_return[] @@ -5018,9 +5025,9 @@ To obtain the color specification for black Status XcmsQueryBlack - XcmsCCC ccc - XcmsColorFormat target_format - XcmsColor *color_return + XcmsCCC ccc + XcmsColorFormat target_format + XcmsColor *color_return @@ -5083,9 +5090,9 @@ To obtain the color specification for blue Status XcmsQueryBlue - XcmsCCC ccc - XcmsColorFormat target_format - XcmsColor *color_return + XcmsCCC ccc + XcmsColorFormat target_format + XcmsColor *color_return @@ -5148,9 +5155,9 @@ To obtain the color specification for green Status XcmsQueryGreen - XcmsCCC ccc - XcmsColorFormat target_format - XcmsColor *color_return + XcmsCCC ccc + XcmsColorFormat target_format + XcmsColor *color_return @@ -5213,9 +5220,9 @@ To obtain the color specification for red Status XcmsQueryRed - XcmsCCC ccc - XcmsColorFormat target_format - XcmsColor *color_return + XcmsCCC ccc + XcmsColorFormat target_format + XcmsColor *color_return @@ -5278,9 +5285,9 @@ To obtain the color specification for white Status XcmsQueryWhite - XcmsCCC ccc - XcmsColorFormat target_format - XcmsColor *color_return + XcmsCCC ccc + XcmsColorFormat target_format + XcmsColor *color_return @@ -5365,10 +5372,10 @@ for a given Psychometric Hue Angle and CIE metric lightness ( Status XcmsCIELabQueryMaxC - XcmsCCC ccc - XcmsFloat hue_angle - XcmsFloat L_star - XcmsColor *color_return + XcmsCCC ccc + XcmsFloat hue_angle + XcmsFloat L_star + XcmsColor *color_return @@ -5445,10 +5452,10 @@ for a given Psychometric Hue Angle and Psychometric Chroma, use Status XcmsCIELabQueryMaxL - XcmsCCC ccc - XcmsFloat hue_angle - XcmsFloat chroma - XcmsColor *color_return + XcmsCCC ccc + XcmsFloat hue_angle + XcmsFloat chroma + XcmsColor *color_return @@ -5532,9 +5539,9 @@ for a given Psychometric Hue Angle, use Status XcmsCIELabQueryMaxLC - XcmsCCC ccc - XcmsFloat hue_angle - XcmsColor *color_return + XcmsCCC ccc + XcmsFloat hue_angle + XcmsColor *color_return @@ -5601,10 +5608,10 @@ for a given Psychometric Hue Angle and Psychometric Chroma, use Status XcmsCIELabQueryMinL - XcmsCCC ccc - XcmsFloat hue_angle - XcmsFloat chroma - XcmsColor *color_return + XcmsCCC ccc + XcmsFloat hue_angle + XcmsFloat chroma + XcmsColor *color_return @@ -5707,10 +5714,10 @@ for a given Psychometric Hue Angle and CIE metric lightness ( Status XcmsCIELuvQueryMaxC - XcmsCCC ccc - XcmsFloat hue_angle - XcmsFloat L_star - XcmsColor *color_return + XcmsCCC ccc + XcmsFloat hue_angle + XcmsFloat L_star + XcmsColor *color_return @@ -5787,10 +5794,10 @@ for a given Psychometric Hue Angle and Psychometric Chroma, use Status XcmsCIELuvQueryMaxL - XcmsCCC ccc - XcmsFloat hue_angle - XcmsFloat chroma - XcmsColor *color_return + XcmsCCC ccc + XcmsFloat hue_angle + XcmsFloat chroma + XcmsColor *color_return @@ -5874,9 +5881,9 @@ for a given Psychometric Hue Angle, use Status XcmsCIELuvQueryMaxLC - XcmsCCC ccc - XcmsFloat hue_angle - XcmsColor *color_return + XcmsCCC ccc + XcmsFloat hue_angle + XcmsColor *color_return @@ -5943,10 +5950,10 @@ for a given Psychometric Hue Angle and Psychometric Chroma, use Status XcmsCIELuvQueryMinL - XcmsCCC ccc - XcmsFloat hue_angle - XcmsFloat chroma - XcmsColor *color_return + XcmsCCC ccc + XcmsFloat hue_angle + XcmsFloat chroma + XcmsColor *color_return @@ -6030,10 +6037,10 @@ To obtain the maximum Chroma for a given Hue and Value, use Status XcmsTekHVCQueryMaxC - XcmsCCC ccc - XcmsFloat hue - XcmsFloat value - XcmsColor *color_return + XcmsCCC ccc + XcmsFloat hue + XcmsFloat value + XcmsColor *color_return @@ -6110,10 +6117,10 @@ To obtain the maximum Value for a given Hue and Chroma, use Status XcmsTekHVCQueryMaxV - XcmsCCC ccc - XcmsFloat hue - XcmsFloat chroma - XcmsColor *color_return + XcmsCCC ccc + XcmsFloat hue + XcmsFloat chroma + XcmsColor *color_return @@ -6195,9 +6202,9 @@ for a specified Hue, use Status XcmsTekHVCQueryMaxVC - XcmsCCC ccc - XcmsFloat hue - XcmsColor *color_return + XcmsCCC ccc + XcmsFloat hue + XcmsColor *color_return @@ -6270,10 +6277,10 @@ Chroma at which the maximum Values are reached, use Status XcmsTekHVCQueryMaxVSamples - XcmsCCC ccc - XcmsFloat hue - XcmsColor colors_return[] - unsigned int nsamples + XcmsCCC ccc + XcmsFloat hue + XcmsColor colors_return[] + unsigned int nsamples @@ -6350,10 +6357,10 @@ To obtain the minimum Value for a given Hue and Chroma, use Status XcmsTekHVCQueryMinV - XcmsCCC ccc - XcmsFloat hue - XcmsFloat chroma - XcmsColor *color_return + XcmsCCC ccc + XcmsFloat hue + XcmsFloat chroma + XcmsColor *color_return @@ -6506,7 +6513,7 @@ To add a device-independent color space, use Status XcmsAddColorSpace - XcmsColorSpace *color_space + XcmsColorSpace *color_space @@ -6574,7 +6581,7 @@ associated with a specified color string prefix, use XcmsColorFormat XcmsFormatOfPrefix - char *prefix + char *prefix @@ -6616,7 +6623,7 @@ specified by a color format, use char *XcmsPrefixOfFormat - XcmsColorFormat format + XcmsColorFormat format @@ -6760,8 +6767,8 @@ adhere to the following software interface specification: Status XcmsParseStringProc - char *color_string - XcmsColor *color_return + char *color_string + XcmsColor *color_return @@ -6810,10 +6817,10 @@ following software interface specification: Status ConversionProc - XcmsCCC ccc - XcmsColor *white_point - XcmsColor *colors_in_out - unsigned int ncolors + XcmsCCC ccc + XcmsColor *white_point + XcmsColor *colors_in_out + unsigned int ncolors @@ -6879,10 +6886,10 @@ following software interface specification: Status ConversionProc - XcmsCCC ccc - XcmsColor *colors_in_out - unsigned int ncolors - Bool compression_flags_return[] + XcmsCCC ccc + XcmsColor *colors_in_out + unsigned int ncolors + Bool compression_flags_return[] @@ -7084,7 +7091,7 @@ To add a function set, use Status XcmsAddFunctionSet - XcmsFunctionSet *function_set + XcmsFunctionSet *function_set @@ -7214,9 +7221,9 @@ interface specification: typedef Status (*XcmsScreenInitProc) - Display *display - int screen_number - ScmsPerScrnInfo *screen_info + Display *display + int screen_number + ScmsPerScrnInfo *screen_info @@ -7368,7 +7375,7 @@ interface specification: typedef void (*XcmsScreenFreeProc) - XPointer screenData + XPointer screenData diff --git a/lib/libX11/specs/libX11/CH07.xml b/lib/libX11/specs/libX11/CH07.xml index 28cc8791c..38408e44c 100644 --- a/lib/libX11/specs/libX11/CH07.xml +++ b/lib/libX11/specs/libX11/CH07.xml @@ -969,9 +969,9 @@ depth of drawable, use GC XCreateGC - Display *display - Drawable d - unsigned long valuemask + Display *display + Drawable d + unsigned long valuemask XGCValues *values @@ -1057,9 +1057,10 @@ To copy components from a source GC to a destination GC, use XCopyGC - Display *display - GCsrc, dest - unsigned long valuemask + Display *display + GC src + GC dest + unsigned long valuemask @@ -1143,10 +1144,10 @@ To change the components in a given GC, use XChangeGC - Display *display - GC gc - unsigned long valuemask - XGCValues *values + Display *display + GC gc + unsigned long valuemask + XGCValues *values @@ -1239,10 +1240,10 @@ To obtain components of a given GC, use Status XGetGCValues - Display *display - GC gc - unsigned long valuemask - XGCValues *values_return + Display *display + GC gc + unsigned long valuemask + XGCValues *values_return @@ -1351,8 +1352,8 @@ To free a given GC, use XFreeGC - Display *display - GC gc + Display *display + GC gc @@ -1405,7 +1406,7 @@ resource ID for a given GC, use GContext XGContextFromGC - GC gc + GC gc @@ -1440,8 +1441,8 @@ To force sending GC component changes, use void XFlushGC - Display *display - GC gc + Display *display + GC gc @@ -1534,11 +1535,12 @@ for a given GC, use XSetState - Display *display - GC gc - unsigned long foreground, background - int function - unsigned long plane_mask + Display *display + GC gc + unsigned long foreground + unsigned long background + int function + unsigned long plane_mask @@ -1627,9 +1629,9 @@ To set the foreground of a given GC, use XSetForeground - Display *display - GC gc - unsigned long foreground + Display *display + GC gc + unsigned long foreground @@ -1686,9 +1688,9 @@ To set the background of a given GC, use XSetBackground - Display *display - GC gc - unsigned long background + Display *display + GC gc + unsigned long background @@ -1745,9 +1747,9 @@ To set the display function in a given GC, use XSetFunction - Display *display - GC gc - int function + Display *display + GC gc + int function @@ -1805,9 +1807,9 @@ To set the plane mask of a given GC, use XSetPlaneMask - Display *display - GC gc - unsigned long plane_mask + Display *display + GC gc + unsigned long plane_mask @@ -1870,12 +1872,12 @@ To set the line drawing components of a given GC, use XSetLineAttributes - Display *display - GC gc - unsigned int line_width - int line_style - int cap_style - int join_style + Display *display + GC gc + unsigned int line_width + int line_style + int cap_style + int join_style @@ -1979,11 +1981,11 @@ To set the dash-offset and dash-list for dashed line styles of a given GC, use XSetDashes - Display *display - GC gc - int dash_offset - char dash_list[] - int n + Display *display + GC gc + int dash_offset + char dash_list[] + int n @@ -2108,9 +2110,9 @@ To set the fill-style of a given GC, use XSetFillStyle - Display *display - GC gc - int fill_style + Display *display + GC gc + int fill_style @@ -2174,9 +2176,9 @@ To set the fill-rule of a given GC, use XSetFillRule - Display *display - GC gc - int fill_rule + Display *display + GC gc + int fill_rule @@ -2254,13 +2256,13 @@ To obtain the best size of a tile, stipple, or cursor, use Status XQueryBestSize - Display *display - int class - Drawable which_screen + Display *display + int class + Drawable which_screen unsigned int width unsigned int height - unsigned int *width_return - unsigned int *height_return + unsigned int *width_return + unsigned int *height_return @@ -2399,12 +2401,12 @@ To obtain the best fill tile shape, use Status XQueryBestTile - Display *display - Drawable which_screen + Display *display + Drawable which_screen unsigned int width unsigned int height - unsigned int *width_return - unsigned int *height_return + unsigned int *width_return + unsigned int *height_return @@ -2507,12 +2509,12 @@ To obtain the best stipple shape, use Status XQueryBestStipple - Display *display - Drawable which_screen + Display *display + Drawable which_screen unsigned int width unsigned int height - unsigned int *width_return - unsigned int *height_return + unsigned int *width_return + unsigned int *height_return @@ -2615,9 +2617,9 @@ To set the fill tile of a given GC, use XSetTile - Display *display - GC gc - Pixmap tile + Display *display + GC gc + Pixmap tile @@ -2683,9 +2685,9 @@ To set the stipple of a given GC, use XSetStipple - Display *display - GC gc - Pixmap stipple + Display *display + GC gc + Pixmap stipple @@ -2751,9 +2753,10 @@ To set the tile or stipple origin of a given GC, use XSetTSOrigin - Display *display - GC gc - intts_x_origin, ts_y_origin + Display *display + GC gc + int ts_x_origin + int ts_y_origin @@ -2832,9 +2835,9 @@ To set the current font of a given GC, use XSetFont - Display *display - GC gc - Font font + Display *display + GC gc + Font font @@ -2903,9 +2906,10 @@ To set the clip-origin of a given GC, use XSetClipOrigin - Display *display - GC gc - intclip_x_origin, clip_y_origin + Display *display + GC gc + int clip_x_origin + int clip_y_origin @@ -2978,9 +2982,9 @@ To set the clip-mask of a given GC to the specified pixmap, use XSetClipMask - Display *display - GC gc - Pixmap pixmap + Display *display + GC gc + Pixmap pixmap @@ -3046,12 +3050,13 @@ To set the clip-mask of a given GC to the specified list of rectangles, use XSetClipRectangles - Display *display - GC gc - intclip_x_origin, clip_y_origin - XRectangle rectangles[] - int n - int ordering + Display *display + GC gc + int clip_x_origin + int clip_y_origin + XRectangle rectangles[] + int n + int ordering @@ -3220,9 +3225,9 @@ To set the arc mode of a given GC, use XSetArcMode - Display *display - GC gc - int arc_mode + Display *display + GC gc + int arc_mode @@ -3284,9 +3289,9 @@ To set the subwindow mode of a given GC, use XSetSubwindowMode - Display *display - GC gc - int subwindow_mode + Display *display + GC gc + int subwindow_mode @@ -3348,9 +3353,9 @@ To set the graphics-exposures flag of a given GC, use XSetGraphicsExposures - Display *display - GC gc - Bool graphics_exposures + Display *display + GC gc + Bool graphics_exposures diff --git a/lib/libX11/specs/libX11/CH08.xml b/lib/libX11/specs/libX11/CH08.xml index cdf4df87b..18eac11d1 100644 --- a/lib/libX11/specs/libX11/CH08.xml +++ b/lib/libX11/specs/libX11/CH08.xml @@ -47,13 +47,13 @@ To clear a rectangular area of a given window, use XClearArea - Display *display - Window w + Display *display + Window w int x int y unsigned int width unsigned int height - Bool exposures + Bool exposures @@ -189,8 +189,8 @@ To clear the entire area in a given window, use XClearWindow - Display *display - Window w + Display *display + Window w @@ -273,13 +273,16 @@ root and depth, use XCopyArea - Display *display - Drawablesrc, dest - GC gc - intsrc_x, src_y + Display *display + Drawable src + Drawable dest + GC gc + int src_x + int src_y unsigned int width unsigned int height - intdest_x, dest_y + int dest_x + int dest_y @@ -467,14 +470,17 @@ To copy a single bit plane of a given drawable, use XCopyPlane - Display *display - Drawablesrc, dest - GC gc - intsrc_x, src_y + Display *display + Drawable src + Drawable dest + GC gc + int src_x + int src_y unsigned int width unsigned int height - intdest_x, dest_y - unsigned long plane + int dest_x + int dest_y + unsigned long plane @@ -771,9 +777,9 @@ To draw a single point in a given drawable, use XDrawPoint - Display *display - Drawable d - GC gc + Display *display + Drawable d + GC gc int x int y @@ -844,12 +850,12 @@ To draw multiple points in a given drawable, use XDrawPoints - Display *display - Drawable d - GC gc - XPoint *points - int npoints - int mode + Display *display + Drawable d + GC gc + XPoint *points + int npoints + int mode @@ -985,10 +991,13 @@ To draw a single line between two points in a given drawable, use XDrawLine - Display *display - Drawable d - GC gc - intx1,y1,x2, y2 + Display *display + Drawable d + GC gc + int x1 + int y1 + int x2 + int y2 @@ -1079,12 +1088,12 @@ To draw multiple lines in a given drawable, use XDrawLines - Display *display - Drawable d - GC gc - XPoint *points - int npoints - int mode + Display *display + Drawable d + GC gc + XPoint *points + int npoints + int mode @@ -1167,11 +1176,11 @@ use XDrawSegments - Display *display - Drawable d - GC gc - XSegment *segments - int nsegments + Display *display + Drawable d + GC gc + XSegment *segments + int nsegments @@ -1337,9 +1346,9 @@ To draw the outline of a single rectangle in a given drawable, use XDrawRectangle - Display *display - Drawable d - GC gc + Display *display + Drawable d + GC gc int x int y unsigned int width @@ -1436,11 +1445,11 @@ in a given drawable, use XDrawRectangles - Display *display - Drawable d - GC gc - XRectangle rectangles[] - int nrectangles + Display *display + Drawable d + GC gc + XRectangle rectangles[] + int nrectangles @@ -1570,14 +1579,15 @@ To draw a single arc in a given drawable, use XDrawArc - Display *display - Drawable d - GC gc + Display *display + Drawable d + GC gc int x int y unsigned int width unsigned int height - intangle1, angle2 + int angle1 + int angle2 @@ -1691,11 +1701,11 @@ To draw multiple arcs in a given drawable, use XDrawArcs - Display *display - Drawable d - GC gc - XArc *arcs - int narcs + Display *display + Drawable d + GC gc + XArc *arcs + int narcs @@ -1929,9 +1939,9 @@ To fill a single rectangular area in a given drawable, use XFillRectangle - Display *display - Drawable d - GC gc + Display *display + Drawable d + GC gc int x int y unsigned int width @@ -2027,11 +2037,11 @@ To fill multiple rectangular areas in a given drawable, use XFillRectangles - Display *display - Drawable d - GC gc - XRectangle *rectangles - int nrectangles + Display *display + Drawable d + GC gc + XRectangle *rectangles + int nrectangles @@ -2162,13 +2172,13 @@ To fill a polygon area in a given drawable, use XFillPolygon - Display *display - Drawable d - GC gc - XPoint *points - int npoints - int shape - int mode + Display *display + Drawable d + GC gc + XPoint *points + int npoints + int shape + int mode @@ -2361,14 +2371,15 @@ To fill a single arc in a given drawable, use XFillArc - Display *display - Drawable d - GC gc + Display *display + Drawable d + GC gc int x int y unsigned int width unsigned int height - intangle1, angle2 + int angle1 + int angle2 @@ -2482,11 +2493,11 @@ To fill multiple arcs in a given drawable, use XFillArcs - Display *display - Drawable d - GC gc - XArc *arcs - int narcs + Display *display + Drawable d + GC gc + XArc *arcs + int narcs @@ -3029,8 +3040,8 @@ To load a given font, use Font XLoadFont - Display *display - char *name + Display *display + char *name @@ -3105,8 +3116,8 @@ To return information about an available font, use XFontStruct *XQueryFont - Display *display - XID font_ID + Display *display + XID font_ID @@ -3171,8 +3182,8 @@ in a single operation, use XFontStruct *XLoadQueryFont - Display *display - char *name + Display *display + char *name @@ -3239,8 +3250,8 @@ use XFreeFont - Display *display - XFontStruct *font_struct + Display *display + XFontStruct *font_struct @@ -3296,9 +3307,9 @@ To return a given font property, use Bool XGetFontProperty - XFontStruct *font_struct - Atom atom - unsigned long *value_return + XFontStruct *font_struct + Atom atom + unsigned long *value_return @@ -3371,8 +3382,8 @@ use XUnloadFont - Display *display - Font font + Display *display + Font font @@ -3436,10 +3447,10 @@ To return a list of the available font names, use char **XListFonts - Display *display - char *pattern - int maxnames - int *actual_count_return + Display *display + char *pattern + int maxnames + int *actual_count_return @@ -3523,7 +3534,7 @@ To free a font name array, use XFreeFontNames - char *list[] + char *list[] @@ -3560,11 +3571,11 @@ To obtain the names and information about available fonts, use char **XListFontsWithInfo - Display *display - char *pattern - int maxnames - int *count_return - XFontStruct **info_return + Display *display + char *pattern + int maxnames + int *count_return + XFontStruct **info_return @@ -3667,9 +3678,9 @@ To free font structures and font names, use XFreeFontInfo - char **names - XFontStruct *free_info - int actual_count + char **names + XFontStruct *free_info + int actual_count @@ -3751,9 +3762,9 @@ To determine the width of an 8-bit character string, use int XTextWidth - XFontStruct *font_struct - char *string - int count + XFontStruct *font_struct + char *string + int count @@ -3801,9 +3812,9 @@ To determine the width of a 2-byte character string, use int XTextWidth16 - XFontStruct *font_struct - XChar2b *string - int count + XFontStruct *font_struct + XChar2b *string + int count @@ -3859,12 +3870,13 @@ To compute the bounding box of an 8-bit character string in a given font, use XTextExtents - XFontStruct *font_struct - char *string - int nchars - int *direction_return - int*font_ascent_return, *font_descent_return - XCharStruct *overall_return + XFontStruct *font_struct + char *string + int nchars + int *direction_return + int *font_ascent_return + int *font_descent_return + XCharStruct *overall_return @@ -3959,12 +3971,13 @@ To compute the bounding box of a 2-byte character string in a given font, use XTextExtents16 - XFontStruct *font_struct - XChar2b *string - int nchars - int *direction_return - int*font_ascent_return, *font_descent_return - XCharStruct *overall_return + XFontStruct *font_struct + XChar2b *string + int nchars + int *direction_return + int *font_ascent_return + int *font_descent_return + XCharStruct *overall_return @@ -4106,13 +4119,14 @@ given font, use XQueryTextExtents - Display *display - XID font_ID - char *string - int nchars - int *direction_return - int*font_ascent_return, *font_descent_return - XCharStruct *overall_return + Display *display + XID font_ID + char *string + int nchars + int *direction_return + int *font_ascent_return + int *font_descent_return + XCharStruct *overall_return @@ -4218,13 +4232,14 @@ in a given font, use XQueryTextExtents16 - Display *display - XID font_ID - XChar2b *string - int nchars - int *direction_return - int*font_ascent_return, *font_descent_return - XCharStruct *overall_return + Display *display + XID font_ID + XChar2b *string + int nchars + int *direction_return + int *font_ascent_return + int *font_descent_return + XCharStruct *overall_return @@ -4491,13 +4506,13 @@ To draw 8-bit characters in a given drawable, use XDrawText - Display *display - Drawable d - GC gc + Display *display + Drawable d + GC gc int x int y - XTextItem *items - int nitems + XTextItem *items + int nitems @@ -4587,13 +4602,13 @@ To draw 2-byte characters in a given drawable, use XDrawText16 - Display *display - Drawable d - GC gc + Display *display + Drawable d + GC gc int x int y - XTextItem16 *items - int nitems + XTextItem16 *items + int nitems @@ -4747,13 +4762,13 @@ To draw 8-bit characters in a given drawable, use XDrawString - Display *display - Drawable d - GC gc - int x - int y - char *string - int length + Display *display + Drawable d + GC gc + int x + int y + char *string + int length @@ -4843,13 +4858,13 @@ To draw 2-byte characters in a given drawable, use XDrawString16 - Display *display - Drawable d - GC gc + Display *display + Drawable d + GC gc int x int y - XChar2b *string - int length + XChar2b *string + int length @@ -4987,13 +5002,13 @@ To draw 8-bit image text characters in a given drawable, use XDrawImageString - Display *display - Drawable d - GC gc + Display *display + Drawable d + GC gc int x int y - char *string - int length + char *string + int length @@ -5083,13 +5098,13 @@ To draw 2-byte image text characters in a given drawable, use XDrawImageString16 - Display *display - Drawable d - GC gc + Display *display + Drawable d + GC gc int x int y - XChar2b *string - int length + XChar2b *string + int length @@ -5328,7 +5343,7 @@ To initialize the image manipulation routines of an image structure, use Status XInitImage - XImage *image + XImage *image @@ -5386,12 +5401,14 @@ use XPutImage - Display *display - Drawable d - GC gc - XImage *image - intsrc_x, src_y - intdest_x, dest_y + Display *display + Drawable d + GC gc + XImage *image + int src_x + int src_y + int dest_x + int dest_y unsigned int width unsigned int height @@ -5575,14 +5592,14 @@ This function specifically supports rudimentary screen dumps. XImage *XGetImage - Display *display - Drawable d + Display *display + Drawable d int x int y unsigned int width unsigned int height - unsigned long plane_mask - int format + unsigned long plane_mask + int format @@ -5763,16 +5780,17 @@ to a location within a preexisting image structure, use XImage *XGetSubImage - Display *display - Drawable d + Display *display + Drawable d int x int y unsigned int width unsigned int height - unsigned long plane_mask - int format - XImage *dest_image - intdest_x, dest_y + unsigned long plane_mask + int format + XImage *dest_image + int dest_x + int dest_y diff --git a/lib/libX11/specs/libX11/CH09.xml b/lib/libX11/specs/libX11/CH09.xml index 6be5285e1..8b5e7605d 100644 --- a/lib/libX11/specs/libX11/CH09.xml +++ b/lib/libX11/specs/libX11/CH09.xml @@ -39,11 +39,11 @@ There is no way to move a window between screens. XReparentWindow - Display *display - Window w - Window parent - int x - int y + Display *display + Window w + Window parent + int x + int y @@ -223,9 +223,9 @@ To add or remove a window from the client's save-set, use XChangeSaveSet - Display *display - Window w - int change_mode + Display *display + Window w + int change_mode @@ -298,8 +298,8 @@ To add a window to the client's save-set, use XAddToSaveSet - Display *display - Window w + Display *display + Window w @@ -356,8 +356,8 @@ To remove a window from the client's save-set, use XRemoveFromSaveSet - Display *display - Window w + Display *display + Window w @@ -452,8 +452,8 @@ To install a colormap, use XInstallColormap - Display *display - Colormap colormap + Display *display + Colormap colormap @@ -525,8 +525,8 @@ To uninstall a colormap, use XUninstallColormap - Display *display - Colormap colormap + Display *display + Colormap colormap @@ -596,9 +596,9 @@ To obtain a list of the currently installed colormaps for a given screen, use Colormap *XListInstalledColormaps - Display *display - Window w - int *num_return + Display *display + Window w + int *num_return @@ -677,9 +677,9 @@ To set the font search path, use XSetFontPath - Display *display - char **directories - int ndirs + Display *display + char **directories + int ndirs @@ -755,8 +755,8 @@ To get the current font search path, use char **XGetFontPath - Display *display - int *npaths_return + Display *display + int *npaths_return @@ -807,7 +807,7 @@ use XFreeFontPath - char **list + char **list @@ -863,7 +863,7 @@ To grab the server, use XGrabServer - Display *display + Display *display @@ -899,7 +899,7 @@ To ungrab the server, use XUngrabServer - Display *display + Display *display @@ -941,8 +941,8 @@ To destroy a client, use XKillClient - Display *display - XID resource + Display *display + XID resource @@ -1028,10 +1028,11 @@ To set the screen saver mode, use XSetScreenSaver - Display *display - inttimeout, interval - int prefer_blanking - int allow_exposures + Display *display + int timeout + int interval + int prefer_blanking + int allow_exposures @@ -1163,8 +1164,8 @@ To force the screen saver on or off, use XForceScreenSaver - Display *display - int mode + Display *display + int mode @@ -1229,7 +1230,7 @@ To activate the screen saver, use XActivateScreenSaver - Display *display + Display *display @@ -1257,7 +1258,7 @@ To reset the screen saver, use XResetScreenSaver - Display *display + Display *display @@ -1285,10 +1286,11 @@ To get the current screen saver values, use XGetScreenSaver - Display *display - int*timeout_return, *interval_return - int *prefer_blanking_return - int *allow_exposures_return + Display *display + int *timeout_return + int *interval_return + int *prefer_blanking_return + int *allow_exposures_return @@ -1533,8 +1535,8 @@ To add a single host, use XAddHost - Display *display - XHostAddress *host + Display *display + XHostAddress *host @@ -1590,9 +1592,9 @@ To add multiple hosts at one time, use XAddHosts - Display *display - XHostAddress *hosts - int num_hosts + Display *display + XHostAddress *hosts + int num_hosts @@ -1658,9 +1660,9 @@ To obtain a host list, use XHostAddress *XListHosts - Display *display - int *nhosts_return - Bool *state_return + Display *display + int *nhosts_return + Bool *state_return @@ -1722,8 +1724,8 @@ To remove a single host, use XRemoveHost - Display *display - XHostAddress *host + Display *display + XHostAddress *host @@ -1783,9 +1785,9 @@ To remove multiple hosts at one time, use XRemoveHosts - Display *display - XHostAddress *hosts - int num_hosts + Display *display + XHostAddress *hosts + int num_hosts @@ -1873,8 +1875,8 @@ To change access control, use XSetAccessControl - Display *display - int mode + Display *display + int mode @@ -1932,7 +1934,7 @@ To enable access control, use XEnableAccessControl - Display *display + Display *display @@ -1973,7 +1975,7 @@ To disable access control, use XDisableAccessControl - Display *display + Display *display diff --git a/lib/libX11/specs/libX11/CH11.xml b/lib/libX11/specs/libX11/CH11.xml index 2d0fa0fe6..6b967b9ab 100644 --- a/lib/libX11/specs/libX11/CH11.xml +++ b/lib/libX11/specs/libX11/CH11.xml @@ -49,9 +49,9 @@ Another way is to use XSelectInput - Display *display - Window w - long event_mask + Display *display + Window w + long event_mask @@ -186,7 +186,7 @@ To flush the output buffer, use XFlush - Display *display + Display *display @@ -232,8 +232,8 @@ use XSync - Display *display - Bool discard + Display *display + Bool discard @@ -316,8 +316,8 @@ To check the number of events in the event queue, use int XEventsQueued - Display *display - int mode + Display *display + int mode @@ -402,7 +402,7 @@ To return the number of events that are pending, use int XPending - Display *display + Display *display @@ -476,8 +476,8 @@ To get the next event and remove it from the queue, use XNextEvent - Display *display - XEvent *event_return + Display *display + XEvent *event_return @@ -526,8 +526,8 @@ To peek at the event queue, use XPeekEvent - Display *display - XEvent *event_return + Display *display + XEvent *event_return @@ -596,9 +596,9 @@ The predicate procedure and its associated arguments are: Bool - Display *display - XEvent *event - XPointer arg + Display *display + XEvent *event + XPointer arg @@ -663,10 +663,10 @@ and, if found, remove the event from the queue, use XIfEvent - Display *display - XEvent *event_return - Bool (*predicate)() - XPointer arg + Display *display + XEvent *event_return + Bool (*predicate)() + XPointer arg @@ -742,10 +742,10 @@ To check the event queue for a matching event without blocking, use Bool XCheckIfEvent - Display *display - XEvent *event_return - Bool (*predicate)() - XPointer arg + Display *display + XEvent *event_return + Bool (*predicate)() + XPointer arg @@ -821,10 +821,10 @@ without removing the event from the queue, use XPeekIfEvent - Display *display - XEvent *event_return - Bool (*predicate)() - XPointer arg + Display *display + XEvent *event_return + Bool (*predicate)() + XPointer arg @@ -910,10 +910,10 @@ To remove the next event that matches both a window and an event mask, use XWindowEvent - Display *display - Window w - long event_mask - XEvent *event_return + Display *display + Window w + long event_mask + XEvent *event_return @@ -994,10 +994,10 @@ indicating if the event was returned. Bool XCheckWindowEvent - Display *display - Window w - long event_mask - XEvent *event_return + Display *display + Window w + long event_mask + XEvent *event_return @@ -1075,9 +1075,9 @@ To remove the next event that matches an event mask, use XMaskEvent - Display *display - long event_mask - XEvent *event_return + Display *display + long event_mask + XEvent *event_return @@ -1146,9 +1146,9 @@ indicating if the event was returned. Bool XCheckMaskEvent - Display *display - long event_mask - XEvent *event_return + Display *display + long event_mask + XEvent *event_return @@ -1215,9 +1215,9 @@ To return and remove the next event in the queue that matches an event type, use Bool XCheckTypedEvent - Display *display - int event_type - XEvent *event_return + Display *display + int event_type + XEvent *event_return @@ -1286,10 +1286,10 @@ and a window, use Bool XCheckTypedWindowEvent - Display *display - Window w - int event_type - XEvent *event_return + Display *display + Window w + int event_type + XEvent *event_return @@ -1374,8 +1374,8 @@ To push an event back into the event queue, use XPutBackEvent - Display *display - XEvent *event + Display *display + XEvent *event @@ -1437,11 +1437,11 @@ and stored as a property. Status XSendEvent - Display *display - Window w - Bool propagate - long event_mask - XEvent *event_send + Display *display + Window w + Bool propagate + long event_mask + XEvent *event_send @@ -1635,7 +1635,7 @@ use unsigned long - Display *display + Display *display @@ -1673,10 +1673,11 @@ To get the motion history for a specified window and time, use XTimeCoord *XGetMotionEvents - Display *display - Window w - Timestart, stop - int *nevents_return + Display *display + Window w + Time start + Time stop + int *nevents_return @@ -1829,8 +1830,8 @@ sets which function is to be called. int - Display *display - int (*procedure)() + Display *display + int (*procedure)() @@ -1874,8 +1875,8 @@ To enable or disable synchronization, use int - Display *display - Bool onoff + Display *display + Bool onoff @@ -1950,7 +1951,7 @@ To set the error handler, use int *XSetErrorHandler - int *handler + int *handler @@ -2219,10 +2220,10 @@ To obtain textual descriptions of the specified error code, use XGetErrorText - Display *display - int code - char *buffer_return - int length + Display *display + int code + char *buffer_return + int length @@ -2291,11 +2292,12 @@ To obtain error messages from the error database, use XGetErrorDatabaseText - Display *display - char*name, *message - char *default_string - char *buffer_return - int length + Display *display + char *name + char *message + char *default_string + char *buffer_return + int length @@ -2436,7 +2438,7 @@ To report an error to the user when the requested display does not exist, use char *XDisplayName - char *string + char *string @@ -2479,7 +2481,7 @@ To handle fatal I/O errors, use int - int(*handler)(Display *) + int(*handler)(Display *) diff --git a/lib/libX11/specs/libX11/CH12.xml b/lib/libX11/specs/libX11/CH12.xml index 42ceb1315..fee46f1f1 100644 --- a/lib/libX11/specs/libX11/CH12.xml +++ b/lib/libX11/specs/libX11/CH12.xml @@ -163,14 +163,15 @@ To grab the pointer, use int XGrabPointer - Display *display - Window grab_window - Bool owner_events - unsigned int event_mask - intpointer_mode, keyboard_mode - Window confine_to - Cursor cursor - Time time + Display *display + Window grab_window + Bool owner_events + unsigned int event_mask + int pointer_mode + int keyboard_mode + Window confine_to + Cursor cursor + Time time @@ -429,8 +430,8 @@ To ungrab the pointer, use XUngrabPointer - Display *display - Time time + Display *display + Time time @@ -497,10 +498,10 @@ To change an active pointer grab, use XChangeActivePointerGrab - Display *display - unsigned int event_mask - Cursor cursor - Time time + Display *display + unsigned int event_mask + Cursor cursor + Time time @@ -585,15 +586,16 @@ To grab a pointer button, use XGrabButton - Display *display - unsigned int button - unsigned int modifiers - Window grab_window - Bool owner_events - unsigned int event_mask - intpointer_mode, keyboard_mode - Window confine_to - Cursor cursor + Display *display + unsigned int button + unsigned int modifiers + Window grab_window + Bool owner_events + unsigned int event_mask + int pointer_mode + int keyboard_mode + Window confine_to + Cursor cursor @@ -828,10 +830,10 @@ To ungrab a pointer button, use XUngrabButton - Display *display - unsigned int button - unsigned int modifiers - Window grab_window + Display *display + unsigned int button + unsigned int modifiers + Window grab_window @@ -948,11 +950,12 @@ To grab the keyboard, use int XGrabKeyboard - Display *display - Window grab_window - Bool owner_events - intpointer_mode, keyboard_mode - Time time + Display *display + Window grab_window + Bool owner_events + int pointer_mode + int keyboard_mode + Time time @@ -1136,8 +1139,8 @@ To ungrab the keyboard, use XUngrabKeyboard - Display *display - Time time + Display *display + Time time @@ -1203,12 +1206,13 @@ To passively grab a single key of the keyboard, use XGrabKey - Display *display - int keycode - unsigned int modifiers - Window grab_window - Bool owner_events - intpointer_mode, keyboard_mode + Display *display + int keycode + unsigned int modifiers + Window grab_window + Bool owner_events + int pointer_mode + int keyboard_mode @@ -1407,10 +1411,10 @@ To ungrab a key, use XUngrabKey - Display *display - int keycode - unsigned int modifiers - Window grab_window + Display *display + int keycode + unsigned int modifiers + Window grab_window @@ -1508,9 +1512,9 @@ To allow further events to be processed when the device has been frozen, use XAllowEvents - Display *display - int event_mode - Time time + Display *display + int event_mode + Time time @@ -1764,12 +1768,15 @@ To move the pointer to an arbitrary point in a window, use XWarpPointer - Display *display - Windowsrc_w, dest_w - intsrc_x, src_y + Display *display + Window src_w + Window dest_w + int src_x + int src_y unsigned int src_width unsigned int src_height - intdest_x, dest_y + int dest_x + int dest_y @@ -1939,10 +1946,10 @@ To set the input focus, use XSetInputFocus - Display *display - Window focus - int revert_to - Time time + Display *display + Window focus + int revert_to + Time time @@ -2113,9 +2120,9 @@ To obtain the current input focus, use XGetInputFocus - Display *display - Window *focus_return - int *revert_to_return + Display *display + Window *focus_return + int *revert_to_return @@ -2328,9 +2335,9 @@ If an error is generated, a subset of the controls may have been altered. XChangeKeyboardControl - Display *display - unsigned long value_mask - XKeyboardControl *values + Display *display + unsigned long value_mask + XKeyboardControl *values @@ -2397,8 +2404,8 @@ To obtain the current control values for the keyboard, use XGetKeyboardControl - Display *display - XKeyboardState *values_return + Display *display + XKeyboardState *values_return @@ -2481,7 +2488,7 @@ To turn on keyboard auto-repeat, use XAutoRepeatOn - Display *display + Display *display @@ -2515,7 +2522,7 @@ To turn off keyboard auto-repeat, use XAutoRepeatOff - Display *display + Display *display @@ -2549,8 +2556,8 @@ To ring the bell, use XBell - Display *display - int percent + Display *display + int percent @@ -2633,8 +2640,8 @@ To obtain a bit vector that describes the state of the keyboard, use XQueryKeymap - Display *display - char keys_return[32] + Display *display + char keys_return[32] @@ -2689,9 +2696,9 @@ To set the mapping of the pointer buttons, use int XSetPointerMapping - Display *display - unsignedchar map[] - int nmap + Display *display + unsignedchar map[] + int nmap @@ -2777,9 +2784,9 @@ To get the pointer mapping, use int XGetPointerMapping - Display *display - unsignedchar map_return[] - int nmap + Display *display + unsignedchar map_return[] + int nmap @@ -2840,10 +2847,12 @@ To control the pointer's interactive feel, use XChangePointerControl - Display *display - Booldo_accel, do_threshold - intaccel_numerator, accel_denominator - int threshold + Display *display + Bool do_accel + Bool do_threshold + int accel_numerator + int accel_denominator + int threshold @@ -2953,9 +2962,10 @@ To get the current pointer parameters, use XGetPointerControl - Display *display - int*accel_numerator_return, *accel_denominator_return - int *threshold_return + Display *display + int *accel_numerator_return + int *accel_denominator_return + int *threshold_return @@ -3228,8 +3238,9 @@ To obtain the legal KeyCodes for a display, use XDisplayKeycodes - Display *display - int*min_keycodes_return, *max_keycodes_return + Display *display + int *min_keycodes_return + int *max_keycodes_return @@ -3287,10 +3298,10 @@ To obtain the symbols for the specified KeyCodes, use KeySym *XGetKeyboardMapping - Display *display - KeyCode first_keycode - int keycode_count - int *keysyms_per_keycode_return + Display *display + KeyCode first_keycode + int keycode_count + int *keysyms_per_keycode_return @@ -3411,11 +3422,11 @@ To change the keyboard mapping, use XChangeKeyboardMapping - Display *display - int first_keycode - int keysyms_per_keycode - KeySym *keysyms - int num_codes + Display *display + int first_keycode + int keysyms_per_keycode + KeySym *keysyms + int num_codes @@ -3582,7 +3593,7 @@ structure, use XModifierKeymap *XNewModifiermap - int max_keys_per_mod + int max_keys_per_mod @@ -3621,9 +3632,9 @@ structure, use XModifierKeymap *XInsertModifiermapEntry - XModifierKeymap *modmap - KeyCode keycode_entry - int modifier + XModifierKeymap *modmap + KeyCode keycode_entry + int modifier @@ -3684,9 +3695,9 @@ structure, use XModifierKeymap *XDeleteModifiermapEntry - XModifierKeymap *modmap - KeyCode keycode_entry - int modifier + XModifierKeymap *modmap + KeyCode keycode_entry + int modifier @@ -3747,7 +3758,7 @@ structure, use XFreeModifiermap - XModifierKeymap *modmap + XModifierKeymap *modmap @@ -3785,8 +3796,8 @@ To set the KeyCodes to be used as modifiers, use int XSetModifierMapping - Display *display - XModifierKeymap *modmap + Display *display + XModifierKeymap *modmap @@ -3899,7 +3910,7 @@ To obtain the KeyCodes used as modifiers, use XModifierKeymap *XGetModifierMapping - Display *display + Display *display diff --git a/lib/libX11/specs/libX11/CH13.xml b/lib/libX11/specs/libX11/CH13.xml index a471caaa9..6e2fae651 100644 --- a/lib/libX11/specs/libX11/CH13.xml +++ b/lib/libX11/specs/libX11/CH13.xml @@ -99,7 +99,12 @@ To determine if the current locale is supported by X, use XSupportsLocale. -Bool XSupportsLocale() + + + Bool XSupportsLocale + + + @@ -149,7 +154,7 @@ To configure Xlib locale modifiers for the current locale, use char *XSetLocaleModifiers - char *modifier_list + char *modifier_list @@ -511,7 +516,7 @@ To allocate a nested variable argument list dynamically, use XVaNestedList XVaCreateNestedList - int dummy + int dummy @@ -698,10 +703,10 @@ To open an output method, use XOM XOpenOM - Display *display - XrmDatabase db - char *res_name - char *res_class + Display *display + XrmDatabase db + char *res_name + char *res_class @@ -816,7 +821,7 @@ To close an output method, use Status XCloseOM - XOM om + XOM om @@ -850,7 +855,7 @@ To set output method attributes, use char *XSetOMValues - XOM om + XOM om @@ -903,7 +908,7 @@ To query an output method, use char *XGetOMValues - XOM om + XOM om @@ -950,7 +955,7 @@ To obtain the display associated with an output method, use Display *XDisplayOfOM - XOM om + XOM om @@ -984,7 +989,7 @@ To get the locale associated with an output method, use char *XLocaleOfOM - XOM om + XOM om @@ -1324,7 +1329,7 @@ To create an output context, use XOC XCreateOC - XOM om + XOM om @@ -1410,7 +1415,7 @@ To destroy an output context, use void XDestroyOC - XOC oc + XOC oc @@ -1444,7 +1449,7 @@ To get the output method associated with an output context, use XOM XOMOfOC - XOC oc + XOC oc @@ -1491,7 +1496,7 @@ To set XOC values, use char *XSetOCValues - XOC oc + XOC oc @@ -1568,7 +1573,7 @@ To obtain XOC values, use char *XGetOCValues - XOC oc + XOC oc @@ -2118,11 +2123,11 @@ or XFontSet XCreateFontSet - Display *display - char *base_font_name_list - char ***missing_charset_list_return - int *missing_charset_count_return - char **def_string_return + Display *display + char *base_font_name_list + char ***missing_charset_list_return + int *missing_charset_count_return + char **def_string_return @@ -2448,9 +2453,9 @@ use int XFontsOfFontSet - XFontSet font_set - XFontStruct ***font_struct_list_return - char ***font_name_list_return + XFontSet font_set + XFontStruct ***font_struct_list_return + char ***font_name_list_return @@ -2557,7 +2562,7 @@ use char *XBaseFontNameListOfFontSet - XFontSet font_set + XFontSet font_set @@ -2619,7 +2624,7 @@ use char *XLocaleOfFontSet - XFontSet font_set + XFontSet font_set @@ -2672,8 +2677,8 @@ if the output context was created by void XFreeFontSet - Display *display - XFontSet font_set + Display *display + XFontSet font_set @@ -2776,7 +2781,7 @@ To find out about direction-dependent rendering, use Bool XDirectionalDependentDrawing - XFontSet font_set + XFontSet font_set @@ -2814,7 +2819,7 @@ To find out about context-dependent rendering, use Bool XContextualDrawing - XFontSet font_set + XFontSet font_set @@ -2852,7 +2857,7 @@ To find out about context-dependent or direction-dependent rendering, use Bool XContextDependentDrawing - XFontSet font_set + XFontSet font_set @@ -2966,7 +2971,7 @@ use XFontSetExtents *XExtentsOfFontSet - XFontSet font_set + XFontSet font_set @@ -3019,18 +3024,18 @@ or int XmbTextEscapement - XFontSet font_set - char *string - int num_bytes + XFontSet font_set + char *string + int num_bytes int XwcTextEscapement - XFontSet font_set - wchar_t *string - int num_wchars + XFontSet font_set + wchar_t *string + int num_wchars @@ -3111,22 +3116,22 @@ use int XmbTextExtents - XFontSet font_set - char *string - int num_bytes - XRectangle *overall_ink_return - XRectangle *overall_logical_return + XFontSet font_set + char *string + int num_bytes + XRectangle *overall_ink_return + XRectangle *overall_logical_return int XwcTextExtents - XFontSet font_set - wchar_t *string - int num_wchars - XRectangle *overall_ink_return - XRectangle *overall_logical_return + XFontSet font_set + wchar_t *string + int num_wchars + XRectangle *overall_ink_return + XRectangle *overall_logical_return @@ -3270,30 +3275,30 @@ or Status XmbTextPerCharExtents - XFontSet font_set - char *string - int num_bytes - XRectangle *ink_array_return - XRectangle *logical_array_return - int array_size - int *num_chars_return - XRectangle *overall_ink_return - XRectangle *overall_logical_return + XFontSet font_set + char *string + int num_bytes + XRectangle *ink_array_return + XRectangle *logical_array_return + int array_size + int *num_chars_return + XRectangle *overall_ink_return + XRectangle *overall_logical_return Status XwcTextPerCharExtents - XFontSet font_set - wchar_t *string - int num_wchars - XRectangle *ink_array_return - XRectangle *logical_array_return - int array_size - int *num_chars_return - XRectangle *overall_ink_return - XRectangle *overall_logical_return + XFontSet font_set + wchar_t *string + int num_wchars + XRectangle *ink_array_return + XRectangle *logical_array_return + int array_size + int *num_chars_return + XRectangle *overall_ink_return + XRectangle *overall_logical_return @@ -3552,26 +3557,26 @@ or void XmbDrawText - Display *display - Drawable d - GC gc + Display *display + Drawable d + GC gc int x int y - XmbTextItem *items - int nitems + XmbTextItem *items + int nitems void XwcDrawText - Display *display - Drawable d - GC gc + Display *display + Drawable d + GC gc int x int y - XwcTextItem *items - int nitems + XwcTextItem *items + int nitems @@ -3705,28 +3710,28 @@ or void XmbDrawString - Display *display - Drawable d - XFontSet font_set - GC gc + Display *display + Drawable d + XFontSet font_set + GC gc int x int y - char *string - int num_bytes + char *string + int num_bytes void XwcDrawString - Display *display - Drawable d - XFontSet font_set - GC gc + Display *display + Drawable d + XFontSet font_set + GC gc int x int y - wchar_t *string - int num_wchars + wchar_t *string + int num_wchars @@ -3853,28 +3858,28 @@ or void XmbDrawImageString - Display *display - Drawable d - XFontSet font_set - GC gc + Display *display + Drawable d + XFontSet font_set + GC gc int x int y - char *string - int num_bytes + char *string + int num_bytes void XwcDrawImageString - Display *display - Drawable d - XFontSet font_set - GC gc + Display *display + Drawable d + XFontSet font_set + GC gc int x int y - wchar_t *string - int num_wchars + wchar_t *string + int num_wchars @@ -5163,10 +5168,10 @@ To open a connection, use XIM XOpenIM - Display *display - XrmDatabase db - char *res_name - char *res_class + Display *display + XrmDatabase db + char *res_name + char *res_class @@ -5284,7 +5289,7 @@ To close a connection, use Status XCloseIM - XIM im + XIM im @@ -5318,7 +5323,7 @@ To set input method attributes, use char *XSetIMValues - XIM im + XIM im @@ -5371,7 +5376,7 @@ To query an input method, use char *XGetIMValues - XIM im + XIM im @@ -5433,7 +5438,7 @@ To obtain the display associated with an input method, use Display *XDisplayOfIM - XIM im + XIM im @@ -5467,7 +5472,7 @@ To get the locale associated with an input method, use char *XLocaleOfIM - XIM im + XIM im @@ -5501,12 +5506,12 @@ To register an input method instantiate callback, use Bool XRegisterIMInstantiateCallback - Display *display - XrmDatabase db - char *res_name - char *res_class - XIMProc callback - XPointer *client_data + Display *display + XrmDatabase db + char *res_name + char *res_class + XIMProc callback + XPointer *client_data @@ -5597,9 +5602,9 @@ The generic prototype is as follows: void IMInstantiateCallback - Display *display - XPointer client_data - XPointer call_data + Display *display + XPointer client_data + XPointer call_data @@ -5646,12 +5651,12 @@ To unregister an input method instantiation callback, use Bool XUnregisterIMInstantiateCallback - Display *display - XrmDatabase db - char *res_name - char *res_class - XIMProc callback - XPointer *client_data + Display *display + XrmDatabase db + char *res_name + char *res_class + XIMProc callback + XPointer *client_data @@ -6092,9 +6097,9 @@ The generic prototype of this callback function is as follows: void DestroyCallback - XIM im - XPointer client_data - XPointer call_data + XIM im + XPointer client_data + XPointer call_data @@ -6328,7 +6333,7 @@ To create an input context, use XIC XCreateIC - XIM im + XIM im @@ -6421,7 +6426,7 @@ To destroy an input context, use void XDestroyIC - XIC ic + XIC ic @@ -6458,7 +6463,7 @@ and void XSetICFocus - XIC ic + XIC ic @@ -6495,7 +6500,7 @@ does not affect the focus window value. void XUnsetICFocus - XIC ic + XIC ic @@ -6544,14 +6549,14 @@ or char *XmbResetIC - XIC ic + XIC ic wchar_t *XwcResetIC - XIC ic + XIC ic @@ -6619,7 +6624,7 @@ To get the input method associated with an input context, use XIM XIMOfIC - XIC ic + XIC ic @@ -6664,7 +6669,7 @@ To set XIC values, use char *XSetICValues - XIC ic + XIC ic @@ -6747,7 +6752,7 @@ To obtain XIC values, use char *XGetICValues - XIC ic + XIC ic @@ -8310,9 +8315,9 @@ The generic prototype is as follows: void PreeditStateNotifyCallback - XIC ic - XPointer client_data - XIMPreeditStateNotifyCallbackStruct *call_data + XIC ic + XPointer client_data + XIMPreeditStateNotifyCallbackStruct *call_data @@ -8530,9 +8535,9 @@ All callback procedures follow the generic prototype: void CallbackPrototype - XIC ic - XPointer client_data - SomeType call_data + XIC ic + XPointer client_data + SomeType call_data @@ -8602,9 +8607,9 @@ The generic prototype is as follows: void GeometryCallback - XIC ic - XPointer client_data - XPointer call_data + XIC ic + XPointer client_data + XPointer call_data @@ -8663,9 +8668,9 @@ The generic prototype is as follows: void DestroyCallback - XIC ic - XPointer client_data - XPointer call_data + XIC ic + XPointer client_data + XPointer call_data @@ -8725,9 +8730,9 @@ The callback prototype is as follows: void StringConversionCallback - XIC ic - XPointer client_data - XIMStringConversionCallbackStruct *call_data + XIC ic + XPointer client_data + XIMStringConversionCallbackStruct *call_data @@ -8887,9 +8892,9 @@ or the cleanup for the preedit region. int PreeditStartCallback - XIC ic - XPointer client_data - XPointer call_data + XIC ic + XPointer client_data + XPointer call_data @@ -8941,9 +8946,9 @@ and a value of -1 indicates there is no limit. void PreeditDoneCallback - XIC ic - XPointer client_data - XPointer call_data + XIC ic + XPointer client_data + XPointer call_data @@ -9022,9 +9027,9 @@ is as follows: void PreeditDrawCallback - XIC ic - XPointer client_data - XIMPreeditDrawCallbackStruct *call_data + XIC ic + XPointer client_data + XIMPreeditDrawCallbackStruct *call_data @@ -9409,9 +9414,9 @@ It then calls the PreeditCaretCallback. void PreeditCaretCallback - XIC ic - XPointer client_data - XIMPreeditCaretCallbackStruct *call_data + XIC ic + XPointer client_data + XIMPreeditCaretCallbackStruct *call_data @@ -9626,9 +9631,9 @@ the input method calls the StatusStartCallback callback. void StatusStartCallback - XIC ic - XPointer client_data - XPointer call_data + XIC ic + XPointer client_data + XPointer call_data @@ -9683,9 +9688,9 @@ is destroyed or when it loses focus, the input method calls StatusDoneCallback. void StatusDoneCallback - XIC ic - XPointer client_data - XPointer call_data + XIC ic + XPointer client_data + XPointer call_data @@ -9738,9 +9743,9 @@ StatusDrawCallback. void StatusDrawCallback - XIC ic - XPointer client_data - XIMStatusDrawCallbackStruct *call_data + XIC ic + XPointer client_data + XIMStatusDrawCallbackStruct *call_data @@ -9876,8 +9881,8 @@ To filter an event, use Bool XFilterEvent - XEvent *event - Window w + XEvent *event + Window w @@ -9958,24 +9963,24 @@ or int XmbLookupString - XIC ic - XKeyPressedEvent *event - char *buffer_return - int bytes_buffer - KeySym *keysym_return - Status *status_return + XIC ic + XKeyPressedEvent *event + char *buffer_return + int bytes_buffer + KeySym *keysym_return + Status *status_return int XwcLookupString - XIC ic - XKeyPressedEvent *event - wchar_t *buffer_return - int wchars_buffer - KeySym *keysym_return - Status *status_return + XIC ic + XKeyPressedEvent *event + wchar_t *buffer_return + int wchars_buffer + KeySym *keysym_return + Status *status_return diff --git a/lib/libX11/specs/libX11/CH14.xml b/lib/libX11/specs/libX11/CH14.xml index c1a2704e9..ce1ada087 100644 --- a/lib/libX11/specs/libX11/CH14.xml +++ b/lib/libX11/specs/libX11/CH14.xml @@ -267,9 +267,9 @@ To request that a top-level window be iconified, use Status XIconifyWindow - Display *display - Window w - int screen_number + Display *display + Window w + int screen_number @@ -342,9 +342,9 @@ To request that a top-level window be withdrawn, use Status XWithdrawWindow - Display *display - Window w - int screen_number + Display *display + Window w + int screen_number @@ -416,11 +416,11 @@ To request that a top-level window be reconfigured, use Status XReconfigureWMWindow - Display *display - Window w - int screen_number - unsigned int value_mask - XWindowChanges *values + Display *display + Window w + int screen_number + unsigned int value_mask + XWindowChanges *values @@ -590,22 +590,22 @@ or int XmbTextListToTextProperty - Display *display - char **list - int count - XICCEncodingStyle style - XTextProperty *text_prop_return + Display *display + char **list + int count + XICCEncodingStyle style + XTextProperty *text_prop_return int XwcTextListToTextProperty - Display *display - wchar_t **list - int count - XICCEncodingStyle style - XTextProperty *text_prop_return + Display *display + wchar_t **list + int count + XICCEncodingStyle style + XTextProperty *text_prop_return @@ -752,20 +752,20 @@ or int XmbTextPropertyToTextList - Display *display - XTextProperty *text_prop - char ***list_return - int *count_return + Display *display + XTextProperty *text_prop + char ***list_return + int *count_return int XwcTextPropertyToTextList - Display *display - XTextProperty *text_prop - wchar_t ***list_return - int *count_return + Display *display + XTextProperty *text_prop + wchar_t ***list_return + int *count_return @@ -909,7 +909,7 @@ wide character string list, use void XwcFreeStringList - wchar_t **list + wchar_t **list @@ -939,7 +939,12 @@ function frees memory allocated by To obtain the default string for text conversion in the current locale, use -char *XDefaultString() + + + char *XDefaultString + + + @@ -993,9 +998,9 @@ structure, use Status XStringListToTextProperty - char **list - int count - XTextProperty *text_prop_return + char **list + int count + XTextProperty *text_prop_return @@ -1067,9 +1072,9 @@ structure in the STRING encoding, use Status XTextPropertyToStringList - XTextProperty *text_prop - char ***list_return - int *count_return + XTextProperty *text_prop + char ***list_return + int *count_return @@ -1139,7 +1144,7 @@ To free the in-memory data associated with the specified string list, use void XFreeStringList - char **list + char **list @@ -1201,10 +1206,10 @@ To set one of a window's text properties, use void XSetTextProperty - Display *display - Window w - XTextProperty *text_prop - Atom property + Display *display + Window w + XTextProperty *text_prop + Atom property @@ -1289,10 +1294,10 @@ To read one of a window's text properties, use Status XGetTextProperty - Display *display - Window w - XTextProperty *text_prop_return - Atom property + Display *display + Window w + XTextProperty *text_prop_return + Atom property @@ -1405,9 +1410,9 @@ To set a window's WM_NAME property with the supplied conven void XSetWMName - Display *display - Window w - XTextProperty *text_prop + Display *display + Window w + XTextProperty *text_prop @@ -1465,9 +1470,9 @@ To read a window's WM_NAME property with the supplied conve Status XGetWMName - Display *display - Window w - XTextProperty *text_prop_return + Display *display + Window w + XTextProperty *text_prop_return @@ -1538,9 +1543,9 @@ To assign a name to a window, use XStoreName - Display *display - Window w - char *window_name + Display *display + Window w + char *window_name @@ -1611,9 +1616,9 @@ To get the name of a window, use Status XFetchName - Display *display - Window w - char **window_name_return + Display *display + Window w + char **window_name_return @@ -1699,9 +1704,9 @@ use void XSetWMIconName - Display *display - Window w - XTextProperty *text_prop + Display *display + Window w + XTextProperty *text_prop @@ -1760,9 +1765,9 @@ use Status XGetWMIconName - Display *display - Window w - XTextProperty *text_prop_return + Display *display + Window w + XTextProperty *text_prop_return @@ -1834,9 +1839,9 @@ To set the name to be displayed in a window's icon, use XSetIconName - Display *display - Window w - char *icon_name + Display *display + Window w + char *icon_name @@ -1896,9 +1901,9 @@ To get the name a window wants displayed in its icon, use Status XGetIconName - Display *display - Window w - char **icon_name_return + Display *display + Window w + char **icon_name_return @@ -1989,9 +1994,12 @@ structure, use XAllocWMHints. - - XWMHints *XAllocWMHints() - + + + XWMHints *XAllocWMHints + + + @@ -2134,9 +2142,9 @@ To set a window's WM_HINTS property, use XSetWMHints - Display *display - Window w - XWMHints *wmhints + Display *display + Window w + XWMHints *wmhints @@ -2203,8 +2211,8 @@ To read a window's WM_HINTS property, use XWMHints *XGetWMHints - Display *display - Window w + Display *display + Window w @@ -2291,9 +2299,12 @@ structure, use XAllocSizeHints. - -XSizeHints *XAllocSizeHints() - + + + XSizeHints *XAllocSizeHints + + + @@ -2400,9 +2411,9 @@ To set a window's WM_NORMAL_HINTS property, use void XSetWMNormalHints - Display *display - Window w - XSizeHints *hints + Display *display + Window w + XSizeHints *hints @@ -2470,10 +2481,10 @@ To read a window's WM_NORMAL_HINTS property, use Status XGetWMNormalHints - Display *display - Window w - XSizeHints *hints_return - long *supplied_return + Display *display + Window w + XSizeHints *hints_return + long *supplied_return @@ -2581,10 +2592,10 @@ To set a window's WM_SIZE_HINTS property, use void XSetWMSizeHints - Display *display - Window w - XSizeHints *hints - Atom property + Display *display + Window w + XSizeHints *hints + Atom property @@ -2670,11 +2681,11 @@ To read a window's WM_SIZE_HINTS property, use Status XGetWMSizeHints - Display *display - Window w - XSizeHints *hints_return - long *supplied_return - Atom property + Display *display + Window w + XSizeHints *hints_return + long *supplied_return + Atom property @@ -2819,10 +2830,13 @@ structure, use XAllocClassHint - - XClassHint *XAllocClassHint() - + + + XClassHint *XAllocClassHint + + + @@ -2886,9 +2900,9 @@ To set a window's WM_CLASS property, use XSetClassHint - Display *display - Window w - XClassHint *class_hints + Display *display + Window w + XClassHint *class_hints @@ -2955,9 +2969,9 @@ To read a window's WM_CLASS property, use Status XGetClassHint - Display *display - Window w - XClassHint *class_hints_return + Display *display + Window w + XClassHint *class_hints_return @@ -3041,9 +3055,9 @@ To set a window's WM_TRANSIENT_FOR property, use XSetTransientForHint - Display *display - Window w - Window prop_window + Display *display + Window w + Window prop_window @@ -3107,9 +3121,9 @@ To read a window's WM_TRANSIENT_FOR property, use Status XGetTransientForHint - Display *display - Window w - Window *prop_window_return + Display *display + Window w + Window *prop_window_return @@ -3183,10 +3197,10 @@ To set a window's WM_PROTOCOLS property, use Status XSetWMProtocols - Display *display - Window w - Atom *protocols - int count + Display *display + Window w + Atom *protocols + int count @@ -3269,10 +3283,10 @@ To read a window's WM_PROTOCOLS property, use Status XGetWMProtocols - Display *display - Window w - Atom **protocols_return - int *count_return + Display *display + Window w + Atom **protocols_return + int *count_return @@ -3367,10 +3381,10 @@ To set a window's WM_COLORMAP_WINDOWS property, use Status XSetWMColormapWindows - Display *display - Window w - Window *colormap_windows - int count + Display *display + Window w + Window *colormap_windows + int count @@ -3453,10 +3467,10 @@ To read a window's WM_COLORMAP_WINDOWS property, use Status XGetWMColormapWindows - Display *display - Window w - Window **colormap_windows_return - int *count_return + Display *display + Window w + Window **colormap_windows_return + int *count_return @@ -3558,9 +3572,12 @@ structure, use XAllocIconSize. - - XIconSize *XAllocIconSize() - + + + XIconSize *XAllocIconSize + + + @@ -3617,10 +3634,10 @@ To set a window's WM_ICON_SIZE property, use XSetIconSizes - Display *display - Window w - XIconSize *size_list - int count + Display *display + Window w + XIconSize *size_list + int count @@ -3693,10 +3710,10 @@ To read a window's WM_ICON_SIZE property, use Status XGetIconSizes - Display *display - Window w - XIconSize **size_list_return - int *count_return + Display *display + Window w + XIconSize **size_list_return + int *count_return @@ -3790,15 +3807,15 @@ The standard window manager properties for a given window are void XmbSetWMProperties - Display *display - Window w - char *window_name - char *icon_name - char *argv[] - int argc - XSizeHints *normal_hints - XWMHints *wm_hints - XClassHint *class_hints + Display *display + Window w + char *window_name + char *icon_name + char *argv[] + int argc + XSizeHints *normal_hints + XWMHints *wm_hints + XClassHint *class_hints @@ -4010,15 +4027,15 @@ The standard window manager properties for a given window are void XSetWMProperties - Display *display - Window w - XTextProperty *window_name - XTextProperty *icon_name - char **argv - int argc - XSizeHints *normal_hints - XWMHints *wm_hints - XClassHint *class_hints + Display *display + Window w + XTextProperty *window_name + XTextProperty *icon_name + char **argv + int argc + XSizeHints *normal_hints + XWMHints *wm_hints + XClassHint *class_hints @@ -4242,10 +4259,10 @@ To set a window's WM_COMMAND property, use XSetCommand - Display *display - Window w - char **argv - int argc + Display *display + Window w + char **argv + int argc @@ -4322,10 +4339,10 @@ To read a window's WM_COMMAND property, use Status XGetCommand - Display *display - Window w - char ***argv_return - int *argc_return + Display *display + Window w + char ***argv_return + int *argc_return @@ -4413,9 +4430,9 @@ To set a window's WM_CLIENT_MACHINE property, use void XSetWMClientMachine - Display *display - Window w - XTextProperty *text_prop + Display *display + Window w + XTextProperty *text_prop @@ -4473,9 +4490,9 @@ To read a window's WM_CLIENT_MACHINE property, use Status XGetWMClientMachine - Display *display - Window w - XTextProperty *text_prop_return + Display *display + Window w + XTextProperty *text_prop_return @@ -4636,9 +4653,13 @@ structure, use XAllocStandardColormap. - -XStandardColormap *XAllocStandardColormap() - + + + XStandardColormap *XAllocStandardColormap + + + + @@ -4935,11 +4956,11 @@ structure, use void XSetRGBColormaps - Display *display - Window w - XStandardColormap *std_colormap - int count - Atom property + Display *display + Window w + XStandardColormap *std_colormap + int count + Atom property @@ -5114,11 +5135,11 @@ structure associated with the specified property, use Status XGetRGBColormaps - Display *display - Window w - XStandardColormap **std_colormap_return - int *count_return - Atom property + Display *display + Window w + XStandardColormap **std_colormap_return + int *count_return + Atom property diff --git a/lib/libX11/specs/libX11/CH15.xml b/lib/libX11/specs/libX11/CH15.xml index 2180c6d6c..eb9760e7c 100644 --- a/lib/libX11/specs/libX11/CH15.xml +++ b/lib/libX11/specs/libX11/CH15.xml @@ -360,7 +360,12 @@ To allocate a new quark, use XrmUniqueQuark -XrmQuark XrmUniqueQuark() + + + XrmQuark XrmUniqueQuark + + + @@ -422,7 +427,7 @@ or XrmQuark XrmStringToQuark - char *string + char *string @@ -480,7 +485,7 @@ To convert a quark to a string, use char *XrmQuarkToString - XrmQuark quark + XrmQuark quark @@ -527,8 +532,8 @@ To convert a string with one or more components to a quark list, use void XrmStringToQuarkList - char *string - XrmQuarkList quarks_return + char *string + XrmQuarkList quarks_return @@ -601,9 +606,9 @@ and a quark list, use XrmStringToBindingQuarkList - char *string - XrmBindingList bindings_return - XrmQuarkList quarks_return + char *string + XrmBindingList bindings_return + XrmQuarkList quarks_return @@ -710,7 +715,7 @@ To initialize the resource manager, use void XrmInitialize - void XrmInitialize(\|) + void XrmInitialize(\|) @@ -726,7 +731,7 @@ To retrieve a database from disk, use XrmDatabase XrmGetFileDatabase - char *filename + char *filename @@ -771,8 +776,8 @@ To store a copy of a database to disk, use void XrmPutFileDatabase - XrmDatabase database - char *stored_db + XrmDatabase database + char *stored_db @@ -825,7 +830,7 @@ To obtain a pointer to the screen-independent resources of a display, use char *XResourceManagerString - Display *display + Display *display @@ -869,7 +874,7 @@ To obtain a pointer to the screen-specific resources of a screen, use char *XScreenResourceString - Screen *screen + Screen *screen @@ -913,7 +918,7 @@ To create a database from a string, use XrmDatabase XrmGetStringDatabase - char *data + char *data @@ -959,7 +964,7 @@ To obtain the locale name of a database, use char *XrmLocaleOfDatabase - XrmDatabase database + XrmDatabase database @@ -999,7 +1004,7 @@ To destroy a resource database and free its allocated memory, use void XrmDestroyDatabase - XrmDatabase database + XrmDatabase database @@ -1033,8 +1038,8 @@ To associate a resource database with a display, use void XrmSetDatabase - Display *display - XrmDatabase database + Display *display + XrmDatabase database @@ -1082,7 +1087,7 @@ To get the resource database associated with a display, use XrmDatabase XrmGetDatabase - Display *display + Display *display @@ -1122,9 +1127,9 @@ To merge the contents of a resource file into a database, use Status XrmCombineFileDatabase - char *filename - XrmDatabase *target_db - Bool override + char *filename + XrmDatabase *target_db + Bool override @@ -1196,8 +1201,9 @@ To merge the contents of one database into another database, use void XrmCombineDatabase - XrmDatabasesource_db, *target_db - Bool override + XrmDatabase source_db + XrmDatabase *target_db + Bool override @@ -1266,7 +1272,8 @@ semantics, use void XrmMergeDatabases - XrmDatabasesource_db, *target_db + XrmDatabase source_db + XrmDatabase *target_db @@ -1322,11 +1329,11 @@ or Bool XrmGetResource - XrmDatabase database - char *str_name - char *str_class - char **str_type_return - XrmValue *value_return + XrmDatabase database + char *str_name + char *str_class + char **str_type_return + XrmValue *value_return @@ -1387,11 +1394,11 @@ Returns the value in the database. Bool XrmQGetResource - XrmDatabase database - XrmNameList quark_name - XrmClassList quark_class - XrmRepresentation *quark_type_return - XrmValue *value_return + XrmDatabase database + XrmNameList quark_name + XrmClassList quark_class + XrmRepresentation *quark_type_return + XrmValue *value_return @@ -1507,11 +1514,11 @@ To obtain a list of database levels, use Bool XrmQGetSearchResource - XrmDatabase database - XrmNameList names - XrmClassList classes - XrmSearchList list_return - int list_length + XrmDatabase database + XrmNameList names + XrmClassList classes + XrmSearchList list_return + int list_length @@ -1616,11 +1623,11 @@ To search resource database levels for a given resource, use Bool XrmQGetSearchResource - XrmSearchList list - XrmName name - XrmClass class - XrmRepresentation *type_return - XrmValue *value_return + XrmSearchList list + XrmName name + XrmClass class + XrmRepresentation *type_return + XrmValue *value_return @@ -1728,10 +1735,10 @@ This value is copied into the specified database. void XrmPutResource - XrmDatabase *database - char *specifier - char *type - XrmValue *value + XrmDatabase *database + char *specifier + char *type + XrmValue *value @@ -1804,11 +1811,11 @@ The value is stored in the database without modification. void XrmQPutResource - XrmDatabase *database - XrmBindingList bindings - XrmQuarkList quarks - XrmRepresentation type - XrmValue *value + XrmDatabase *database + XrmBindingList bindings + XrmQuarkList quarks + XrmRepresentation type + XrmValue *value @@ -1886,9 +1893,9 @@ To add a resource that is specified as a string, use void XrmPutStringResource - XrmDatabase *database - char *specifier - char *value + XrmDatabase *database + char *specifier + char *value @@ -1953,10 +1960,10 @@ To add a string resource using quarks as a specification, use void XrmQPutStringResource - XrmDatabase *database - XrmBindingList bindings - XrmQuarkList quarks - char *value + XrmDatabase *database + XrmBindingList bindings + XrmQuarkList quarks + char *value @@ -2031,8 +2038,8 @@ both a name and a value, use void XrmPutLineResource - XrmDatabase *database - char *line + XrmDatabase *database + char *line @@ -2100,12 +2107,12 @@ To enumerate the entries of a database, use Bool XrmEnumerateDatabase - XrmDatabase database - XrmNameList name_prefix - XrmClassList class_prefix - int mode - Bool (*proc)() - XPointer arg + XrmDatabase database + XrmNameList name_prefix + XrmClassList class_prefix + int mode + Bool (*proc)() + XPointer arg @@ -2305,12 +2312,12 @@ To load a resource database from a C command line, use void XrmParseCommand - XrmDatabase *database - XrmOptionDescList table - int table_count - char *name - int *argc_in_out - char **argv_in_out + XrmDatabase *database + XrmOptionDescList table + int table_count + char *name + int *argc_in_out + char **argv_in_out diff --git a/lib/libX11/specs/libX11/CH16.xml b/lib/libX11/specs/libX11/CH16.xml index 7253722bc..59614f656 100644 --- a/lib/libX11/specs/libX11/CH16.xml +++ b/lib/libX11/specs/libX11/CH16.xml @@ -104,8 +104,8 @@ To obtain a KeySym for the KeyCode of an event, use KeySym XLookupKeysym - XKeyEvent *key_event - int index + XKeyEvent *key_event + int index @@ -162,9 +162,9 @@ To obtain a KeySym for a specific KeyCode, use KeySym XKeycodeToKeysym - Display *display - KeyCode keycode - int index + Display *display + KeyCode keycode + int index @@ -224,8 +224,8 @@ To obtain a KeyCode for a key having a specific KeySym, use KeyCode XKeysymToKeycode - Display *display - KeySym keysym + Display *display + KeySym keysym @@ -272,7 +272,7 @@ To refresh the stored modifier and keymap information, use XRefreshKeyboardMapping - XMappingEvent *event_map + XMappingEvent *event_map @@ -314,9 +314,9 @@ To obtain the uppercase and lowercase forms of a KeySym, use void XConvertCase - KeySym keysym - KeySym *lower_return - KeySym *upper_return + KeySym keysym + KeySym *lower_return + KeySym *upper_return @@ -376,7 +376,7 @@ To convert the name of the KeySym to the KeySym code, use KeySym XStringToKeysym - char *string + char *string @@ -426,7 +426,7 @@ To convert a KeySym code to the name of the KeySym, use char *XKeysymToString - KeySym keysym + KeySym keysym @@ -670,11 +670,11 @@ To map a key event to an ISO Latin-1 string, use int XLookupString - XKeyEvent *event_struct - char *buffer_return - int bytes_buffer - KeySym *keysym_return - XComposeStatus *status_in_out + XKeyEvent *event_struct + char *buffer_return + int bytes_buffer + KeySym *keysym_return + XComposeStatus *status_in_out @@ -792,12 +792,12 @@ use XRebindKeysym - Display *display - KeySym keysym - KeySym list[ ] - int mod_count - unsignedchar *string - int num_bytes + Display *display + KeySym keysym + KeySym list[ ] + int mod_count + unsignedchar *string + int num_bytes @@ -895,7 +895,7 @@ To allocate some memory you will never give back, use char *Xpermalloc - unsigned int size + unsigned int size @@ -928,10 +928,11 @@ To parse standard window geometry strings, use int XParseGeometry - char *parsestring - int*x_return, *y_return - unsigned int *width_return - unsigned int *height_return + char *parsestring + int *x_return + int *y_return + unsigned int *width_return + unsigned int *height_return @@ -1063,16 +1064,17 @@ To construct a window's geometry information, use int XWMGeometry - Display *display - int screen - char *user_geom - char *def_geom - unsigned int bwidth - XSizeHints *hints - int*x_return, *y_return - int *width_return - int *height_return - int *gravity_return + Display *display + int screen + char *user_geom + char *def_geom + unsigned int bwidth + XSizeHints *hints + int *x_return + int *y_return + int *width_return + int *height_return + int *gravity_return @@ -1287,7 +1289,13 @@ Locate a point or rectangle in a region To create a new empty region, use XCreateRegion. -Region XCreateRegion() + + + + Region XCreateRegion + + + @@ -1301,9 +1309,9 @@ To generate a region from a polygon, use Region XPolygonRegion - XPoint points[] - int n - int fill_rule + XPoint points[] + int n + int fill_rule @@ -1365,9 +1373,9 @@ To set the clip-mask of a GC to a region, use XSetRegion - Display *display - GC gc - Region r + Display *display + GC gc + Region r @@ -1425,7 +1433,7 @@ To deallocate the storage associated with a specified region, use XDestroyRegion - Region r + Region r @@ -1461,8 +1469,9 @@ To move a region by a specified amount, use XOffsetRegion - Region r - intdx, dy + Region r + int dx + int dy @@ -1512,8 +1521,9 @@ To reduce a region by a specified amount, use XShrinkRegion - Region r - intdx, dy + Region r + int dx + int dy @@ -1574,8 +1584,8 @@ To generate the smallest rectangle enclosing a region, use XClipBox - Region r - XRectangle *rect_return + Region r + XRectangle *rect_return @@ -1619,7 +1629,9 @@ To compute the intersection of two regions, use XIntersectRegion - Regionsra,srb, dr_return + Region sra + Region srb + Region dr_return @@ -1668,7 +1680,9 @@ To compute the union of two regions, use XUnionRegion - Regionsra,srb, dr_return + Region sra + Region srb + Region dr_return @@ -1717,9 +1731,9 @@ To create a union of a source region and a rectangle, use XUnionRectWithRegion - XRectangle *rectangle - Region src_region - Region dest_region_return + XRectangle *rectangle + Region src_region + Region dest_region_return @@ -1774,7 +1788,9 @@ To subtract two regions, use XSubtractRegion - Regionsra,srb, dr_return + Region sra + Region srb + Region dr_return @@ -1830,7 +1846,9 @@ of two regions, use XXorRegion - Regionsra,srb, dr_return + Region sra + Region srb + Region dr_return @@ -1887,7 +1905,7 @@ To determine if the specified region is empty, use Bool XEmptyRegion - Region r + Region r @@ -1923,7 +1941,8 @@ To determine if two regions have the same offset, size, and shape, use Bool XEqualRegion - Regionr1, r2 + Region r1 + Region r2 @@ -1975,7 +1994,7 @@ To determine if a specified point resides in a specified region, use Bool XPointInRegion - Region r + Region r int x int y @@ -2034,7 +2053,7 @@ To determine if a specified rectangle is inside a region, use int XRectInRegion - Region r + Region r int x int y unsigned int width @@ -2148,9 +2167,9 @@ To store data in cut buffer 0, use XStoreBytes - Display *display - char *bytes - int nbytes + Display *display + char *bytes + int nbytes @@ -2213,10 +2232,10 @@ To store data in a specified cut buffer, use XStoreBuffer - Display *display - char *bytes - int nbytes - int buffer + Display *display + char *bytes + int nbytes + int buffer @@ -2287,8 +2306,8 @@ To return data from cut buffer 0, use char *XFetchBytes - Display *display - int *nbytes_return + Display *display + int *nbytes_return @@ -2339,9 +2358,9 @@ To return data from a specified cut buffer, use char *XFetchBuffer - Display *display - int *nbytes_return - int buffer + Display *display + int *nbytes_return + int buffer @@ -2397,8 +2416,8 @@ To rotate the cut buffers, use XRotateBuffers - Display *display - int rotate + Display *display + int rotate @@ -2517,10 +2536,10 @@ template, use XVisualInfo *XGetVisualInfo - Display *display - long vinfo_mask - XVisualInfo *vinfo_template - int *nitems_return + Display *display + long vinfo_mask + XVisualInfo *vinfo_template + int *nitems_return @@ -2592,11 +2611,11 @@ class of the screen, use Status XMatchVisualInfo - Display *display - int screen - int depth - int class - XVisualInfo *vinfo_return + Display *display + int screen + int depth + int class + XVisualInfo *vinfo_return @@ -2742,16 +2761,16 @@ structure and initialize it with image format values from a display, use XImage *XCreateImage - Display *display - Visual *visual - unsigned int depth - int format - int offset - char *data - unsigned int width - unsigned int height - int bitmap_pad - int bytes_per_line + Display *display + Visual *visual + unsigned int depth + int format + int offset + char *data + unsigned int width + unsigned int height + int bitmap_pad + int bytes_per_line @@ -2925,9 +2944,9 @@ To obtain a pixel value in an image, use unsigned long XGetPixel - XImage *ximage - int x - int y + XImage *ximage + int x + int y @@ -2986,10 +3005,10 @@ To set a pixel value in an image, use XPutPixel - XImage *ximage - int x - int y - unsigned long pixel + XImage *ximage + int x + int y + unsigned long pixel @@ -3058,11 +3077,11 @@ To create a subimage, use XImage *XSubImage - XImage *ximage - int x - int y - unsigned int subimage_width - unsigned int subimage_height + XImage *ximage + int x + int y + unsigned int subimage_width + unsigned int subimage_height @@ -3144,8 +3163,8 @@ To increment each pixel in an image by a constant value, use XAddPixel - XImage *ximage - long value + XImage *ximage + long value @@ -3280,13 +3299,14 @@ To read a bitmap from a file and store it in a pixmap, use int XReadBitmapFile - Display *display - Drawable d - char *filename - unsigned int *width_return - unsigned int *height_return - Pixmap *bitmap_return - int*x_hot_return, *y_hot_return + Display *display + Drawable d + char *filename + unsigned int *width_return + unsigned int *height_return + Pixmap *bitmap_return + int *x_hot_return + int *y_hot_return @@ -3435,11 +3455,12 @@ To read a bitmap from a file and return it as data, use int XReadBitmapFileData - char *filename - unsigned int *width_return - unsigned int *height_return - unsignedchar *data_return - int*x_hot_return, *y_hot_return + char *filename + unsigned int *width_return + unsigned int *height_return + unsignedchar *data_return + int *x_hot_return + int *y_hot_return @@ -3533,12 +3554,13 @@ To write out a bitmap from a pixmap to a file, use int XWriteBitmapFile - Display *display - char *filename - Pixmap bitmap + Display *display + char *filename + Pixmap bitmap unsigned int width unsigned int height - intx_hot, y_hot + int x_hot + int y_hot @@ -3661,13 +3683,14 @@ To create a pixmap and then store bitmap-format data into it, use Pixmap XCreatePixmapFromBitmapData - Display *display - Drawable d - char *data + Display *display + Drawable d + char *data unsigned int width unsigned int height - unsigned long fg, bg - unsigned int depth + unsigned long fg + unsigned long bg + unsigned int depth @@ -3793,9 +3816,9 @@ in a program directly, as opposed to reading it in every time at run time, use Pixmap XCreateBitmapFromData - Display *display - Drawable d - char *data + Display *display + Drawable d + char *data unsigned int width unsigned int height @@ -3939,10 +3962,10 @@ To save a data value that corresponds to a resource ID and context type, use int XSaveContext - Display *display - XID rid - XContext context - XPointer data + Display *display + XID rid + XContext context + XPointer data @@ -4013,10 +4036,10 @@ To get the data associated with a resource ID and type, use int XFindContext - Display *display - XID rid - XContext context - XPointer *data_return + Display *display + XID rid + XContext context + XPointer *data_return @@ -4086,9 +4109,9 @@ To delete an entry for a given resource ID and type, use int XDeleteContext - Display *display - XID rid - XContext context + Display *display + XID rid + XContext context @@ -4147,7 +4170,13 @@ and use XUniqueContext. -XContext XuniqueContext() + + + + XContext XUniqueContext + + + diff --git a/lib/libX11/src/FontNames.c b/lib/libX11/src/FontNames.c index e55f338ca..9ffdfd299 100644 --- a/lib/libX11/src/FontNames.c +++ b/lib/libX11/src/FontNames.c @@ -43,6 +43,7 @@ int *actualCount) /* RETURN */ register int length; char **flist = NULL; char *ch = NULL; + char *chstart; char *chend; int count = 0; xListFontsReply rep; @@ -86,6 +87,7 @@ int *actualCount) /* RETURN */ /* * unpack into null terminated strings. */ + chstart = ch; chend = ch + (rlen + 1); length = *(unsigned char *)ch; *ch = 1; /* make sure it is non-zero for XFreeFontNames */ @@ -98,12 +100,14 @@ int *actualCount) /* RETURN */ *ch = '\0'; /* and replace with null-termination */ count++; } else { + Xfree(chstart); Xfree(flist); flist = NULL; count = 0; break; } } else { + Xfree(chstart); Xfree(flist); flist = NULL; count = 0;