diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2011-08-27 15:34:16 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2011-08-27 15:34:16 +0000 |
| commit | 2bac4d23b683a1a41618861374616f39a5103d33 (patch) | |
| tree | 8198cf480f0ffed77106e7fae798996f1b38a058 /lib | |
| parent | 9056f0e1d193894344a87feaca366d3f4c797d8d (diff) | |
Update to libX11 1.4.4. Tested by ajacoutot@, shadchin@.
Diffstat (limited to 'lib')
105 files changed, 2516 insertions, 1872 deletions
diff --git a/lib/libX11/ChangeLog b/lib/libX11/ChangeLog index 250c7a74f..205f21619 100644 --- a/lib/libX11/ChangeLog +++ b/lib/libX11/ChangeLog @@ -1,3 +1,553 @@ +commit fc74dc12b1ff3c43e240e1a713316ce1bf525d61 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Thu Jul 28 19:32:40 2011 -0700 + + libX11 1.4.4 + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit ab1f30231755d99ed123af6873b981834640f01d +Author: Matt Dew <marcoz@osource.org> +Date: Wed Jul 13 12:33:40 2011 -0600 + + Add id attributes to error codes to allow linking from other docs. + + Signed-off-by: Matt Dew <marcoz@osource.org> + Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> + Acked-by: Gaetan Nadon <memsize@videotron.ca> + +commit 5c831fef402914ccf2ec14005c25be48852f119b +Author: David Coppa <dcoppa@gmail.com> +Date: Tue Jul 12 10:05:47 2011 +0200 + + Fix libpthread linkage on OpenBSD. + + OpenBSD prefers to use the -pthread to fetch pthread libs when needed. + + Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr> + Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 445b0b3efc04a74fc77cd3e483b25cfb5da82f12 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Wed Jun 22 20:46:26 2011 -0400 + + config: use XORG_WITH_PERL macro to replace custom program check + + New in version util-macros 1.15, the macro does the usual checking + for program path and provides an interface for makefile variables. + + Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit 47d99a324db9232029a22dd523e3bc3ed0936aca +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Wed Jun 22 20:41:18 2011 -0400 + + config: update XORG_WITH_FOP macro usage + + A new feature to test for a minimum version has been added. + + The parameter position changed. Due to limited usage + and requiring 1.15, it turns out to be backward compatible. + + There is no functional change to how docs are build. + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit e659683ad51ecc26c989fbdefdfe20f83af2c5a5 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Wed Jun 22 11:48:49 2011 -0400 + + Remove unused xmlrules.in in specs, now in /nls + + The specs dir has been converted to docbook.am + + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit 9992092609bd83a0db778e9a9ac1e879d445e637 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Thu Mar 31 10:23:22 2011 -0400 + + nls: move xmlrules.in from specs to nls + + It is no longer used in the specs dir. + Remove html from CLEANFILES as it breaks. Make do not clean directories + Remove SUFFIXES as pattern rules are used rather than suffix rules. + + Other improvements are possible, the first priority is to move it out + of the specs dir. + + Acked-by: Peter Hutterer <peter.hutterer@who-t.net> + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit b370eeb0191b0e2a8bde2f03a442a8ca62e35d58 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Sun Jun 5 16:27:36 2011 -0400 + + Install target dbs alongside generated documents + + This matches a change in xorg-sgml-docs whereby the masterdb will look for + the target dbs into the same location as the generated documents. + + The target dbs are now installed alongside the generated documents. + Previously they are installed in $prefix/sgml/X11/dbs alongside masterdb which + has the potential of installing outside the package prefix and cause + distcheck to fail when user does not have write permission in this package. + + Requires XORG_CHECK_SGML_DOCTOOLS(1.8) which was released 2011-06-11 + +commit 4e741654b7e0a283779b8b4af5bb32e05b7fc678 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Tue Jun 7 18:41:30 2011 -0700 + + specs/libX11: Turn appendix references into links + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit a3d1152bc4b300f59ea2f08925739aab1ebfbc4e +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Tue Jun 7 18:37:41 2011 -0700 + + specs/libX11: Turn chapter references into links + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit d0cc949dfe44a41a71f19e4fe6c7547bb3d9bdbe +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Tue Jun 7 00:52:32 2011 -0700 + + specs/libX11: Turn many "see section ..." into links + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 02d4c08dead2f266809b3f93ec72377783423ac7 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Sun Jun 5 22:50:37 2011 -0700 + + specs/libX11: Convert some header filenames to filename tags + + perl -i -p -e 's{^<(.*\.h)>\ *}{<filename class="headerfile"><\1></filename>}' *.xml + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit c51a011329afa6e5b9d2b285349c132683ecf9fb +Author: Matt Dew <marcoz@osource.org> +Date: Tue May 31 20:03:23 2011 -0600 + + Add id attributes to funcsynopsis to allow other docs to olink to them. + + Signed-off-by: Matt Dew <marcoz@osource.org> + Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> + Reviewed-by: Gaetan Nadon <memsize@videotron.ca> + +commit 6841260c8bb15404a0b4805bee3b0bdfec7176b3 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Fri May 27 20:14:36 2011 -0700 + + Bug 37624 - parameter x is missing from synopsis of XDrawString in libX11.html + + https://bugs.freedesktop.org/show_bug.cgi?id=37624 + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 205af6a4e557c62a6395feadc1c89f4a9fe1713b +Author: Matt Dew <marcoz@osource.org> +Date: Sat May 21 00:23:06 2011 -0600 + + Add id's to functions, to make clickable links. + + Signed-off-by: Matt Dew <marcoz@osource.org> + Reviewed-by: Gaetan Nadon <memsize@videotron.ca> + +commit 5c06bc594473f6ab234724cd90db32e7b57fe811 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Fri May 20 15:38:08 2011 -0700 + + libX11 spec: fix monospaced column alignment after deligaturization + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit ef0019c714c273cb9b4ad3eba52d0b905109826b +Author: James Cloos <cloos@jhcloos.com> +Date: Fri May 20 15:51:46 2011 -0400 + + Expand latin ligatures out to their NFKC equivalents. + + Ligatures should be done by the typesetting system. + Manuscripts should not bother with them. + + Signed-off-by: James Cloos <cloos@jhcloos.com> + Reviewed-by: Keith Packard <keithp@keithp.com> + +commit 761b8aa0c9b3c58c478ac5ea1b3aaafadcfc1325 +Author: Daniel Stone <daniel@fooishbar.org> +Date: Thu May 12 16:21:50 2011 +0200 + + XCB: Add more friendly error messages for common asserts + + This patch adds more friendly error messages for three common classes of + assertion: + - missed sequence numbers due to being griefed by another thread + - unknown requests in queue due to being griefed by another thread + - extensions dequeuing too much or too little reply data + + It adds error messages offering advice (e.g. call XInitThreads() first) + on stderr, but still generates actual assertions. Hopefully this means + it's a little more Googleable and a little less frightening. + + Signed-off-by: Daniel Stone <daniel@fooishbar.org> + Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> + +commit 159bf292477048b9a2f074735afc516f52c93d80 +Author: Gaetan Nadon <memsize@videotron.ca> +Date: Thu May 19 20:22:11 2011 -0400 + + Remove misplaced hyphens in libX11 DocBook/XML #37364 + + Reported-by: Christopher Yeleighton <giecrilj@stegny.2a.pl> + Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> + Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> + Signed-off-by: Gaetan Nadon <memsize@videotron.ca> + +commit 0ee6d8247d397500ae183ef180b6ff21bceefa1c +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Tue May 17 20:49:59 2011 -0700 + + Fix man page and comment references to use XFreeModifiermap (lowercase map) + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 3275ec4ca8790d571b6a1902367ca5f68a2dc5fd +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Tue May 17 20:30:54 2011 -0700 + + XKB man pages: Fix coordinantes typo in multiple pages + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit ca33a80606cd68e4572fa49ed6aaa1d1fc31a47f +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Tue May 17 16:27:32 2011 -0700 + + DisplayOfCCC.man: Fix typo "ClientWhitePointOfCC" -> "ClientWhitePointOfCCC" + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit ae39d82b01359b07dd1fe092d867f79ea95a5438 +Author: Jeremy Huddleston <jeremyhu@apple.com> +Date: Sun May 8 09:08:07 2011 -0700 + + Silence clang static analysis warnings for SetReqLen + + This provides a simplified version of the SetReqLen macro when using clang for + static analysis. Prior to this change, we would see many Idempotent operation + warnings inside this macro due to the common case of calling with arg2 and + arg3 being the same variable. This has no effect on code produced during + compilation, but it silences a number of false positives in static analysis. + + XIPassiveGrab.c:170:5: warning: Assigned value is always the same as the existing value + SetReqLen(req, num_modifiers, num_modifiers); + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + In file included from XIPassiveGrab.c:26: + .../include/X11/Xlibint.h:580:8: note: instantiated from: + n = badlen; \ + ^ + + Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> + +commit 130af2bc02090ee2526adb2f9803fc07019b8f1f +Author: Jeremy Huddleston <jeremyhu@apple.com> +Date: Wed May 4 15:34:31 2011 -0700 + + XKB: XkbComputeSectionBounds: Check correct bounds in default switch-case + + XKBGeom.c:191:25: warning: Access to field 'x1' results in a dereference of a null pointer (loaded from variable 'rbounds') + _XkbCheckBounds(bounds,rbounds->x1,rbounds->y1); + ^~~~~~~ + + Found-by: clang static analyzer + Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> + Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> + +commit c987ef04bea345d5810e60cf6c53b747ddbe910e +Author: Jeremy Huddleston <jeremyhu@apple.com> +Date: Wed May 4 15:31:17 2011 -0700 + + Revert "XKB: Avoid a possible NULL dereference" + + Sorry for the noise. I accidentally pushed and didn't mean to. =( + + This reverts commit 4024091678ea07e0d898b798df9b29f3bf68eb08. + +commit 46d04bc4e7ff6c86385002c929d8eb0310f737a8 +Author: Jeremy Huddleston <jeremyhu@apple.com> +Date: Wed May 4 11:35:31 2011 -0700 + + Dead code removal + + XKBGeom.c:118:27: warning: Assigned value is always the same as the existing value + for (key=row->keys,pos=k=0;k<row->num_keys;k++,key++) { + ~~~^~~~ + XKBGeom.c:115:5: warning: Value stored to 'pos' is never read + pos= 0; + ^ ~ + + Found-by: clang static analyzer + Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> + +commit 4024091678ea07e0d898b798df9b29f3bf68eb08 +Author: Jeremy Huddleston <jeremyhu@apple.com> +Date: Wed May 4 11:34:53 2011 -0700 + + XKB: Avoid a possible NULL dereference + + XKBGeom.c:191:25: warning: Access to field 'x1' results in a dereference of a null pointer (loaded from variable 'rbounds') + _XkbCheckBounds(bounds,rbounds->x1,rbounds->y1); + ^~~~~~~ + + Found-by: clang static analyzer + Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> + +commit 626e5e34be55b7cf734d745bd40a7ee3359029f8 +Author: Jeremy Huddleston <jeremyhu@apple.com> +Date: Wed May 4 11:21:41 2011 -0700 + + Annotate _XIOError as _X_NORETURN + + Found-by: clang static analyzer + Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> + +commit d3d7896408b435ab42656398839ff4351a37724d +Author: Jeremy Huddleston <jeremyhu@apple.com> +Date: Tue May 3 09:32:53 2011 -0700 + + clang analyzer: Don't warn about Xmalloc(0) + + This will prevent a number of false positives in where clang's + static analysis reports about calls to malloc(0). + + Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> + +commit 393921cf2188b2b0713cc157effaf17d0abab783 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Thu Apr 21 16:21:04 2011 -0700 + + Delete special case code to append "/sparcv9" to i18n module path + + Was triggered by defined(__sparcv9) so only built on Solaris SPARC 64-bit. + Inconsistent with all other platforms, and a bit overcomplicated. + + Should anyone need to continue using that path, simply build with + a #define POSTLOCALELIBDIR "sparcv9" to get the same result. + + Fixes Solaris bug 7038737: + sparcv9 Xlib looking in wrong path for i18n loadable modules + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + Reviewed-by: Daniel Stone <daniel@fooishbar.org> + +commit b9ff9cfd5c56ae6d52c6503f7019756d9de29557 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Thu Apr 14 13:47:12 2011 -0700 + + specs/libX11: Fix XOpenDisplay() prototype in chapter 2 [bug 36244] + + Was incorrectly showing AllPlanes() instead when describing XOpenDisplay() + + https://bugs.freedesktop.org/show_bug.cgi?id=36244 + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit b850adbdebcf500c659f85285d4d7374e15857f5 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Tue Apr 12 22:30:45 2011 -0700 + + Convert malloc(strlen()); strcpy() sets to strdup + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> + +commit 09194042d3dc44a463add1f7c122a68ffd5ef0bf +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Tue Apr 12 21:27:45 2011 -0700 + + Replace Xmalloc+bzero pairs with Xcalloc calls + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> + +commit ac1e2bff7121987fd768500a11d428d9fb9447c5 +Author: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira@nokia.com> +Date: Fri Mar 25 14:47:35 2011 +0200 + + om: Fix memory leaks on get_font_name error paths. + + While at it, remove unneeded check for NULL before Xfree. + + Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira@nokia.com> + Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 7c362e275c93c92b4e68fe862e73ee36665de703 +Author: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira@nokia.com> +Date: Wed Mar 30 15:06:10 2011 +0300 + + xcms: Fix memory leaks on LINEAR_RGB_InitSCCData error path. + + pScreenData is replaced when building per visual intensity tables. If + malloc failed the old value of pScreenData (stored also in + pScreenDefaultData) was being leaked. Also, property_return wasn't + free'd in that case. + + Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira@nokia.com> + Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 5c810e2ac233e00f361549bafb9b59e8a9e05eff +Author: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira@nokia.com> +Date: Wed Mar 30 15:19:28 2011 +0300 + + xcms: Fix error on LINEAR_RGB_InitSCCData error path. + + Due to what looks like a copy & paste error, pScreenData->pBlueTbl would + be accessed after being free'd. + + Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira@nokia.com> + Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit d749948f9492fd9b61c74655a08e32c595e0e3a5 +Author: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira@nokia.com> +Date: Fri Mar 25 16:06:15 2011 +0200 + + om: Fix potential memory leak in init_om. + + Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira@nokia.com> + Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit d0749d6abdf0fd4d8b4e59b02dad8ccda3f10995 +Author: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira@nokia.com> +Date: Thu Mar 24 20:40:41 2011 +0200 + + om: Fix memory leak on read_EncodingInfo error path. + + Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira@nokia.com> + Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 4b2e8d00f5b6969c14003ee8eb258b9f0e4dd7c3 +Author: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira@nokia.com> +Date: Thu Mar 24 19:55:33 2011 +0200 + + Fix memory leaks on _XimCbDispatch error path. + + Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira@nokia.com> + Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 46e6c78b1a89e4774e0f7e0f4d6d0fd060c3897e +Author: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira@nokia.com> +Date: Thu Mar 24 19:52:05 2011 +0200 + + Fix memory leak on _XimCommitRecv error path. + + Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira@nokia.com> + Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 0ace642a2d47265f01450bfa2b2fd48eb6956a83 +Author: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira@nokia.com> +Date: Thu Mar 24 19:48:44 2011 +0200 + + Fix memory leaks on _XimWriteCachedDefaultTree error paths. + + Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira@nokia.com> + Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit e29be94edbb58b3b8dab545377a710d1f73b61e0 +Author: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira@nokia.com> +Date: Thu Mar 24 19:42:36 2011 +0200 + + Fix memory leaks on _XimGetAttributeID error paths. + + Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira@nokia.com> + Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit d144a50512466766f55ce61e3884925334b08f0d +Author: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira@nokia.com> +Date: Thu Mar 24 19:36:56 2011 +0200 + + Fix memory leaks on _XimProtoCreateIC error paths. + + Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira@nokia.com> + Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 6a452f7a98499508f753cb8a7c3f08bcbec736b9 +Author: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira@nokia.com> +Date: Thu Mar 24 16:24:29 2011 +0200 + + Fix leaks in _XimEncodingNegotiation error paths. + + name_ptr and detail_ptr weren't free'd in some cases before returning + False. + + Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira@nokia.com> + Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 396e5a452a59c1f121220ba72167b720a863b30f +Author: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira@nokia.com> +Date: Thu Mar 24 14:17:44 2011 +0200 + + FSWrap: fix potential leak in copy_string_list + + If list_count is 0, dst would be allocated and leaked. + + Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira@nokia.com> + Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 1a944260182bb552b954d69f6355c2760d4415df +Author: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira@nokia.com> +Date: Wed Mar 23 14:36:22 2011 +0200 + + Fix memory leak with broken bitmap files in XReadBitmapFileData + + Bitmap file data is read looping through the lines in the input file. If + there is extra data after the bitmap, these lines will be processed and + if this data represents another bitmap it will replace the one read + before causing the memory allocated for bits to leak. + + This changes the code to stop processing the file once a bitmap was + read. + + Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan-de-oliveira@nokia.com> + Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit c1c91e9a221a0e762d96cc12a3f189d6e59f4865 +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Tue Apr 12 20:50:42 2011 -0700 + + Fix "attrinute" typo in comments in ximcp + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + +commit 7103b83a88edb9c93acfa68f3b556595b087baff +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Fri Apr 8 21:36:11 2011 -0700 + + Make doc install subdirectories more like the pre-docbook.am paths + + Haven't restored the "specs" path in the install path, but have restored + libX11 & i18n subdirectories in the path for better logical grouping. + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + Reviewed-by: Gaetan Nadon <memsize@videotron.ca> + +commit 9a1ae7a90f815a737a942e42d5eb1ffff400977b +Author: Alan Coopersmith <alan.coopersmith@oracle.com> +Date: Fri Apr 8 13:24:28 2011 -0700 + + Install xml versions of specs even if HAVE_XMLTO is false + + Moves HAVE_XMLTO check into docbook.am, more closely matches behaviour + from before docbook.am changes (commit e8c76407d2f6e3) + + Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> + Reviewed-by: Gaetan Nadon <memsize@videotron.ca> + commit a0ad0d5c99023bb9a8ce3944dbc3267f5265721e Author: Alan Coopersmith <alan.coopersmith@oracle.com> Date: Tue Apr 5 13:29:04 2011 -0700 diff --git a/lib/libX11/Makefile.in b/lib/libX11/Makefile.in index 96a9bea02..3094441a6 100644 --- a/lib/libX11/Makefile.in +++ b/lib/libX11/Makefile.in @@ -198,6 +198,7 @@ RAWCPPFLAGS = @RAWCPPFLAGS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ THRSTUBS_FALSE = @THRSTUBS_FALSE@ diff --git a/lib/libX11/aclocal.m4 b/lib/libX11/aclocal.m4 index 8161c180a..f99da44f9 100644 --- a/lib/libX11/aclocal.m4 +++ b/lib/libX11/aclocal.m4 @@ -7659,7 +7659,7 @@ dnl DEALINGS IN THE SOFTWARE. # See the "minimum version" comment for each macro you use to see what # version you require. m4_defun([XORG_MACROS_VERSION],[ -m4_define([vers_have], [1.13.0]) +m4_define([vers_have], [1.15.0]) m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.]))) m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.]))) m4_if(m4_cmp(maj_have, maj_needed), 0,, @@ -7686,7 +7686,7 @@ AC_PATH_PROGS(RAWCPP, [cpp], [${CPP}], # which is not the best choice for supporting other OS'es, but covers most # of the ones we need for now. AC_MSG_CHECKING([if $RAWCPP requires -undef]) -AC_LANG_CONFTEST([Does cpp redefine unix ?]) +AC_LANG_CONFTEST([AC_LANG_SOURCE([[Does cpp redefine unix ?]])]) if test `${RAWCPP} < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then AC_MSG_RESULT([no]) else @@ -7704,7 +7704,7 @@ fi rm -f conftest.$ac_ext AC_MSG_CHECKING([if $RAWCPP requires -traditional]) -AC_LANG_CONFTEST([Does cpp preserve "whitespace"?]) +AC_LANG_CONFTEST([AC_LANG_SOURCE([[Does cpp preserve "whitespace"?]])]) if test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then AC_MSG_RESULT([no]) else @@ -8079,6 +8079,8 @@ AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes]) # AC_DEFUN([XORG_WITH_XSLTPROC],[ AC_ARG_VAR([XSLTPROC], [Path to xsltproc command]) +# Preserves the interface, should it be implemented later +m4_ifval([$1], [m4_warn([syntax], [Checking for xsltproc MIN-VERSION is not implemented])]) m4_define([_defopt], m4_default([$2], [auto])) AC_ARG_WITH(xsltproc, AS_HELP_STRING([--with-xsltproc], @@ -8109,13 +8111,65 @@ else AC_MSG_ERROR([--with-xsltproc expects 'yes' or 'no']) fi -# Checking for minimum version is not implemented -# but we want to keep the interface consistent with other commands -m4_ifval([$1],[AC_MSG_WARN(Checking for MIN-VERSION is not implemented.)]) - AM_CONDITIONAL([HAVE_XSLTPROC], [test "$have_xsltproc" = yes]) ]) # XORG_WITH_XSLTPROC +# XORG_WITH_PERL([MIN-VERSION], [DEFAULT]) +# ---------------------------------------- +# Minimum version: 1.15.0 +# +# PERL (Practical Extraction and Report Language) is a language optimized for +# scanning arbitrary text files, extracting information from those text files, +# and printing reports based on that information. +# +# When DEFAULT is not specified, --with-perl assumes 'auto'. +# +# Interface to module: +# HAVE_PERL: used in makefiles to conditionally scan text files +# PERL: returns the path of the perl program found +# returns the path set by the user in the environment +# --with-perl: 'yes' user instructs the module to use perl +# 'no' user instructs the module not to use perl +# have_perl: returns yes if perl found in PATH or no +# +# If the user sets the value of PERL, AC_PATH_PROG skips testing the path. +# +AC_DEFUN([XORG_WITH_PERL],[ +AC_ARG_VAR([PERL], [Path to perl command]) +# Preserves the interface, should it be implemented later +m4_ifval([$1], [m4_warn([syntax], [Checking for perl MIN-VERSION is not implemented])]) +m4_define([_defopt], m4_default([$2], [auto])) +AC_ARG_WITH(perl, + AS_HELP_STRING([--with-perl], + [Use perl for extracting information from files (default: ]_defopt[)]), + [use_perl=$withval], [use_perl=]_defopt) +m4_undefine([_defopt]) + +if test "x$use_perl" = x"auto"; then + AC_PATH_PROG([PERL], [perl]) + if test "x$PERL" = "x"; then + AC_MSG_WARN([perl not found - cannot extract information and report]) + have_perl=no + else + have_perl=yes + fi +elif test "x$use_perl" = x"yes" ; then + AC_PATH_PROG([PERL], [perl]) + if test "x$PERL" = "x"; then + AC_MSG_ERROR([--with-perl=yes specified but perl not found in PATH]) + fi + have_perl=yes +elif test "x$use_perl" = x"no" ; then + if test "x$PERL" != "x"; then + AC_MSG_WARN([ignoring PERL environment variable since --with-perl=no was specified]) + fi + have_perl=no +else + AC_MSG_ERROR([--with-perl expects 'yes' or 'no']) +fi + +AM_CONDITIONAL([HAVE_PERL], [test "$have_perl" = yes]) +]) # XORG_WITH_PERL # XORG_WITH_ASCIIDOC([MIN-VERSION], [DEFAULT]) # ---------------- @@ -8362,10 +8416,11 @@ AM_CONDITIONAL([HAVE_GROFF_MM], [test "$groff_mm_works" = yes]) AM_CONDITIONAL([HAVE_GROFF_HTML], [test "$have_groff_html" = yes]) ]) # XORG_WITH_GROFF -# XORG_WITH_FOP([DEFAULT]) -# ---------------- +# XORG_WITH_FOP([MIN-VERSION], [DEFAULT]) +# --------------------------------------- # Minimum version: 1.6.0 # Minimum version for optional DEFAULT argument: 1.11.0 +# Minimum version for optional MIN-VERSION argument: 1.15.0 # # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the @@ -8385,7 +8440,7 @@ AM_CONDITIONAL([HAVE_GROFF_HTML], [test "$have_groff_html" = yes]) # AC_DEFUN([XORG_WITH_FOP],[ AC_ARG_VAR([FOP], [Path to fop command]) -m4_define([_defopt], m4_default([$1], [auto])) +m4_define([_defopt], m4_default([$2], [auto])) AC_ARG_WITH(fop, AS_HELP_STRING([--with-fop], [Use fop to regenerate documentation (default: ]_defopt[)]), @@ -8414,6 +8469,22 @@ elif test "x$use_fop" = x"no" ; then else AC_MSG_ERROR([--with-fop expects 'yes' or 'no']) fi + +# Test for a minimum version of fop, if provided. +m4_ifval([$1], +[if test "$have_fop" = yes; then + # scrape the fop version + AC_MSG_CHECKING([for fop minimum version]) + fop_version=`$FOP -version 2>/dev/null | cut -d' ' -f3` + AC_MSG_RESULT([$fop_version]) + AS_VERSION_COMPARE([$fop_version], [$1], + [if test "x$use_fop" = xauto; then + AC_MSG_WARN([fop version $fop_version found, but $1 needed]) + have_fop=no + else + AC_MSG_ERROR([fop version $fop_version found, but $1 needed]) + fi]) +fi]) AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" = yes]) ]) # XORG_WITH_FOP @@ -8912,6 +8983,23 @@ AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno]) ]) # XORG_LINT_LIBRARY +# XORG_COMPILER_BRAND +# ------------------- +# Minimum version: 1.14.0 +# +# Checks for various brands of compilers and sets flags as appropriate: +# GNU gcc - relies on AC_PROG_CC (via AC_PROG_CC_C99) to set GCC to "yes" +# clang compiler - sets CLANGCC to "yes" +# Intel compiler - sets INTELCC to "yes" +# Sun/Oracle Solaris Studio cc - sets SUNCC to "yes" +# +AC_DEFUN([XORG_COMPILER_BRAND], [ +AC_REQUIRE([AC_PROG_CC_C99]) +AC_CHECK_DECL([__clang__], [CLANGCC="yes"], [CLANGCC="no"]) +AC_CHECK_DECL([__INTEL_COMPILER], [INTELCC="yes"], [INTELCC="no"]) +AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"]) +]) # XORG_COMPILER_BRAND + # XORG_CWARNFLAGS # --------------- # Minimum version: 1.2.0 @@ -8920,6 +9008,7 @@ AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno]) # AC_DEFUN([XORG_CWARNFLAGS], [ AC_REQUIRE([AC_PROG_CC_C99]) +AC_REQUIRE([XORG_COMPILER_BRAND]) if test "x$GCC" = xyes ; then CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \ -Wmissing-declarations -Wnested-externs -fno-strict-aliasing \ @@ -8930,7 +9019,6 @@ if test "x$GCC" = xyes ; then ;; esac else - AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"]) if test "x$SUNCC" = "xyes"; then CWARNFLAGS="-v" fi @@ -8942,28 +9030,43 @@ AC_SUBST(CWARNFLAGS) # ----------------------- # Minimum version: 1.3.0 # -# Add configure option to enable strict compilation +# Add configure option to enable strict compilation flags, such as treating +# warnings as fatal errors. +# If --enable-strict-compilation is passed to configure, adds strict flags to +# $CWARNFLAGS. +# +# Starting in 1.14.0 also exports $STRICT_CFLAGS for use in other tests or +# when strict compilation is unconditionally desired. AC_DEFUN([XORG_STRICT_OPTION], [ # If the module's configure.ac calls AC_PROG_CC later on, CC gets set to C89 AC_REQUIRE([AC_PROG_CC_C99]) +AC_REQUIRE([XORG_COMPILER_BRAND]) AC_REQUIRE([XORG_CWARNFLAGS]) AC_ARG_ENABLE(strict-compilation, AS_HELP_STRING([--enable-strict-compilation], [Enable all warnings from compiler and make them errors (default: disabled)]), [STRICT_COMPILE=$enableval], [STRICT_COMPILE=no]) +if test "x$GCC" = xyes ; then + STRICT_CFLAGS="-pedantic -Werror" + # Add -Werror=attributes if supported (gcc 4.2 & later) + AC_MSG_CHECKING([if $CC supports -Werror=attributes]) + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $STRICT_CFLAGS -Werror=attributes" + AC_COMPILE_IFELSE([AC_LANG_SOURCE([return 0;])], + [STRICT_CFLAGS="$STRICT_CFLAGS -Werror=attributes" + AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no])]) + CFLAGS="$save_CFLAGS" +elif test "x$SUNCC" = "xyes"; then + STRICT_CFLAGS="-errwarn" +elif test "x$INTELCC" = "xyes"; then + STRICT_CFLAGS="-Werror" +fi if test "x$STRICT_COMPILE" = "xyes"; then - AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"]) - AC_CHECK_DECL([__INTEL_COMPILER], [INTELCC="yes"], [INTELCC="no"]) - if test "x$GCC" = xyes ; then - STRICT_CFLAGS="-pedantic -Werror" - elif test "x$SUNCC" = "xyes"; then - STRICT_CFLAGS="-errwarn" - elif test "x$INTELCC" = "xyes"; then - STRICT_CFLAGS="-Werror" - fi + CWARNFLAGS="$CWARNFLAGS $STRICT_CFLAGS" fi -CWARNFLAGS="$CWARNFLAGS $STRICT_CFLAGS" +AC_SUBST([STRICT_CFLAGS]) AC_SUBST([CWARNFLAGS]) ]) # XORG_STRICT_OPTION diff --git a/lib/libX11/configure b/lib/libX11/configure index 0a8930b34..90bf7a554 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.62 for libX11 1.4.3. +# Generated by GNU Autoconf 2.62 for libX11 1.4.4. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -810,8 +810,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='libX11' PACKAGE_TARNAME='libX11' -PACKAGE_VERSION='1.4.3' -PACKAGE_STRING='libX11 1.4.3' +PACKAGE_VERSION='1.4.4' +PACKAGE_STRING='libX11 1.4.4' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' ac_unique_file="Makefile.am" @@ -958,6 +958,7 @@ FFLAGS ac_ct_F77 LIBTOOL CWARNFLAGS +STRICT_CFLAGS CHANGELOG_CMD PKG_CONFIG INSTALL_CMD @@ -996,13 +997,13 @@ HAVE_STYLESHEETS_TRUE HAVE_STYLESHEETS_FALSE RAWCPP RAWCPPFLAGS +PERL +HAVE_PERL_TRUE +HAVE_PERL_FALSE CC_FOR_BUILD CPPFLAGS_FOR_BUILD CFLAGS_FOR_BUILD LDFLAGS_FOR_BUILD -PERL -HAVE_PERL_TRUE -HAVE_PERL_FALSE X11_EXTRA_DEPS I18N_MODULE_LIBS XLIB_LOADABLE_I18N_TRUE @@ -1109,6 +1110,7 @@ PKG_CONFIG XMLTO FOP XSLTPROC +PERL BIGFONT_CFLAGS BIGFONT_LIBS LINT @@ -1667,7 +1669,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.4.3 to adapt to many kinds of systems. +\`configure' configures libX11 1.4.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1737,7 +1739,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libX11 1.4.3:";; + short | recursive ) echo "Configuration of libX11 1.4.4:";; esac cat <<\_ACEOF @@ -1790,7 +1792,8 @@ Optional Packages: --with-fop Use fop to regenerate documentation (default: no) --with-xsltproc Use xsltproc for the transformation of XML documents (default: auto) - --with-perl=<path> path to perl interpreter for build-time tests + --with-perl Use perl for extracting information from files + (default: auto) --with-local-transport-order=LIST preference sorted list of transport types to try for local connections @@ -1820,6 +1823,7 @@ Some influential environment variables: XMLTO Path to xmlto command FOP Path to fop command XSLTPROC Path to xsltproc command + PERL Path to perl command BIGFONT_CFLAGS C compiler flags for BIGFONT, overriding pkg-config BIGFONT_LIBS @@ -1895,7 +1899,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libX11 configure 1.4.3 +libX11 configure 1.4.4 generated by GNU Autoconf 2.62 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1909,7 +1913,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.4.3, which was +It was created by libX11 $as_me 1.4.4, which was generated by GNU Autoconf 2.62. Invocation command line was $ $0 $@ @@ -4500,7 +4504,7 @@ fi # Define the identity of the package. PACKAGE='libX11' - VERSION='1.4.3' + VERSION='1.4.4' cat >>confdefs.h <<_ACEOF @@ -5343,7 +5347,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5346 "configure"' > conftest.$ac_ext + echo '#line 5350 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7966,11 +7970,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7969: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7973: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7973: \$? = $ac_status" >&5 + echo "$as_me:7977: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8256,11 +8260,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8259: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8263: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8263: \$? = $ac_status" >&5 + echo "$as_me:8267: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8360,11 +8364,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8363: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8367: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8367: \$? = $ac_status" >&5 + echo "$as_me:8371: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10760,7 +10764,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 10763 "configure" +#line 10767 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10860,7 +10864,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 10863 "configure" +#line 10867 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13269,11 +13273,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13272: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13276: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13276: \$? = $ac_status" >&5 + echo "$as_me:13280: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13373,11 +13377,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13376: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13380: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13380: \$? = $ac_status" >&5 + echo "$as_me:13384: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14956,11 +14960,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14959: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14963: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14963: \$? = $ac_status" >&5 + echo "$as_me:14967: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -15060,11 +15064,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15063: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15067: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15067: \$? = $ac_status" >&5 + echo "$as_me:15071: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17275,11 +17279,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17278: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17282: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17282: \$? = $ac_status" >&5 + echo "$as_me:17286: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17565,11 +17569,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17568: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17572: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17572: \$? = $ac_status" >&5 + echo "$as_me:17576: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17669,11 +17673,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17672: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17676: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17676: \$? = $ac_status" >&5 + echo "$as_me:17680: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -20355,7 +20359,7 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool' -# Require xorg-macros minimum of 1.12 for DocBook external references +# Require xorg-macros minimum of 1.15 for fop minimum version @@ -20571,6 +20575,186 @@ esac +{ $as_echo "$as_me:$LINENO: checking whether __clang__ is declared" >&5 +$as_echo_n "checking whether __clang__ is declared... " >&6; } +if test "${ac_cv_have_decl___clang__+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +#ifndef __clang__ + (void) __clang__; +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_have_decl___clang__=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_have_decl___clang__=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl___clang__" >&5 +$as_echo "$ac_cv_have_decl___clang__" >&6; } +if test $ac_cv_have_decl___clang__ = yes; then + CLANGCC="yes" +else + CLANGCC="no" +fi + +{ $as_echo "$as_me:$LINENO: checking whether __INTEL_COMPILER is declared" >&5 +$as_echo_n "checking whether __INTEL_COMPILER is declared... " >&6; } +if test "${ac_cv_have_decl___INTEL_COMPILER+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +#ifndef __INTEL_COMPILER + (void) __INTEL_COMPILER; +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_have_decl___INTEL_COMPILER=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_have_decl___INTEL_COMPILER=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl___INTEL_COMPILER" >&5 +$as_echo "$ac_cv_have_decl___INTEL_COMPILER" >&6; } +if test $ac_cv_have_decl___INTEL_COMPILER = yes; then + INTELCC="yes" +else + INTELCC="no" +fi + +{ $as_echo "$as_me:$LINENO: checking whether __SUNPRO_C is declared" >&5 +$as_echo_n "checking whether __SUNPRO_C is declared... " >&6; } +if test "${ac_cv_have_decl___SUNPRO_C+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +#ifndef __SUNPRO_C + (void) __SUNPRO_C; +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_have_decl___SUNPRO_C=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_have_decl___SUNPRO_C=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl___SUNPRO_C" >&5 +$as_echo "$ac_cv_have_decl___SUNPRO_C" >&6; } +if test $ac_cv_have_decl___SUNPRO_C = yes; then + SUNCC="yes" +else + SUNCC="no" +fi + + + + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. @@ -20764,6 +20948,7 @@ $as_echo "$ac_cv_path_SED" >&6; } + if test "x$GCC" = xyes ; then CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \ -Wmissing-declarations -Wnested-externs -fno-strict-aliasing \ @@ -20774,65 +20959,6 @@ if test "x$GCC" = xyes ; then ;; esac else - { $as_echo "$as_me:$LINENO: checking whether __SUNPRO_C is declared" >&5 -$as_echo_n "checking whether __SUNPRO_C is declared... " >&6; } -if test "${ac_cv_have_decl___SUNPRO_C+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -#ifndef __SUNPRO_C - (void) __SUNPRO_C; -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_have_decl___SUNPRO_C=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_have_decl___SUNPRO_C=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl___SUNPRO_C" >&5 -$as_echo "$ac_cv_have_decl___SUNPRO_C" >&6; } -if test $ac_cv_have_decl___SUNPRO_C = yes; then - SUNCC="yes" -else - SUNCC="no" -fi - if test "x$SUNCC" = "xyes"; then CWARNFLAGS="-v" fi @@ -20844,6 +20970,7 @@ fi + # Check whether --enable-strict-compilation was given. if test "${enable_strict_compilation+set}" = set; then enableval=$enable_strict_compilation; STRICT_COMPILE=$enableval @@ -20851,88 +20978,20 @@ else STRICT_COMPILE=no fi -if test "x$STRICT_COMPILE" = "xyes"; then - { $as_echo "$as_me:$LINENO: checking whether __SUNPRO_C is declared" >&5 -$as_echo_n "checking whether __SUNPRO_C is declared... " >&6; } -if test "${ac_cv_have_decl___SUNPRO_C+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF +if test "x$GCC" = xyes ; then + STRICT_CFLAGS="-pedantic -Werror" + # Add -Werror=attributes if supported (gcc 4.2 & later) + { $as_echo "$as_me:$LINENO: checking if $CC supports -Werror=attributes" >&5 +$as_echo_n "checking if $CC supports -Werror=attributes... " >&6; } + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $STRICT_CFLAGS -Werror=attributes" + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default -int -main () -{ -#ifndef __SUNPRO_C - (void) __SUNPRO_C; -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_have_decl___SUNPRO_C=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_have_decl___SUNPRO_C=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl___SUNPRO_C" >&5 -$as_echo "$ac_cv_have_decl___SUNPRO_C" >&6; } -if test $ac_cv_have_decl___SUNPRO_C = yes; then - SUNCC="yes" -else - SUNCC="no" -fi - - { $as_echo "$as_me:$LINENO: checking whether __INTEL_COMPILER is declared" >&5 -$as_echo_n "checking whether __INTEL_COMPILER is declared... " >&6; } -if test "${ac_cv_have_decl___INTEL_COMPILER+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -int -main () -{ -#ifndef __INTEL_COMPILER - (void) __INTEL_COMPILER; -#endif - - ; - return 0; -} +return 0; _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -20952,33 +21011,28 @@ $as_echo "$ac_try_echo") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_have_decl___INTEL_COMPILER=yes + STRICT_CFLAGS="$STRICT_CFLAGS -Werror=attributes" + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } else $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_have_decl___INTEL_COMPILER=no + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS="$save_CFLAGS" +elif test "x$SUNCC" = "xyes"; then + STRICT_CFLAGS="-errwarn" +elif test "x$INTELCC" = "xyes"; then + STRICT_CFLAGS="-Werror" fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl___INTEL_COMPILER" >&5 -$as_echo "$ac_cv_have_decl___INTEL_COMPILER" >&6; } -if test $ac_cv_have_decl___INTEL_COMPILER = yes; then - INTELCC="yes" -else - INTELCC="no" +if test "x$STRICT_COMPILE" = "xyes"; then + CWARNFLAGS="$CWARNFLAGS $STRICT_CFLAGS" fi - if test "x$GCC" = xyes ; then - STRICT_CFLAGS="-pedantic -Werror" - elif test "x$SUNCC" = "xyes"; then - STRICT_CFLAGS="-errwarn" - elif test "x$INTELCC" = "xyes"; then - STRICT_CFLAGS="-Werror" - fi -fi -CWARNFLAGS="$CWARNFLAGS $STRICT_CFLAGS" @@ -21442,6 +21496,9 @@ $as_echo "$as_me: error: --with-fop expects 'yes' or 'no'" >&2;} { (exit 1); exit 1; }; } fi +# Test for a minimum version of fop, if provided. + + if test "$have_fop" = yes; then HAVE_FOP_TRUE= @@ -21454,6 +21511,8 @@ fi +# Preserves the interface, should it be implemented later + # Check whether --with-xsltproc was given. @@ -21572,10 +21631,6 @@ $as_echo "$as_me: error: --with-xsltproc expects 'yes' or 'no'" >&2;} { (exit 1); exit 1; }; } fi -# Checking for minimum version is not implemented -# but we want to keep the interface consistent with other commands - - if test "$have_xsltproc" = yes; then @@ -21588,12 +21643,12 @@ fi -{ $as_echo "$as_me:$LINENO: checking for X.Org SGML entities >= 1.7" >&5 -$as_echo_n "checking for X.Org SGML entities >= 1.7... " >&6; } +{ $as_echo "$as_me:$LINENO: checking for X.Org SGML entities >= 1.8" >&5 +$as_echo_n "checking for X.Org SGML entities >= 1.8... " >&6; } XORG_SGML_PATH= if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-sgml-doctools >= 1.7\"") >&5 - ($PKG_CONFIG --exists --print-errors "xorg-sgml-doctools >= 1.7") 2>&5 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-sgml-doctools >= 1.8\"") >&5 + ($PKG_CONFIG --exists --print-errors "xorg-sgml-doctools >= 1.8") 2>&5 ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then @@ -21685,6 +21740,11 @@ test -n "$RAWCPP" || RAWCPP="${CPP}" { $as_echo "$as_me:$LINENO: checking if $RAWCPP requires -undef" >&5 $as_echo_n "checking if $RAWCPP requires -undef... " >&6; } cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ Does cpp redefine unix ? _ACEOF if test `${RAWCPP} < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then @@ -21711,6 +21771,11 @@ rm -f conftest.$ac_ext { $as_echo "$as_me:$LINENO: checking if $RAWCPP requires -traditional" >&5 $as_echo_n "checking if $RAWCPP requires -traditional... " >&6; } cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ Does cpp preserve "whitespace"? _ACEOF if test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then @@ -21731,6 +21796,139 @@ rm -f conftest.$ac_ext + +# Preserves the interface, should it be implemented later + + + +# Check whether --with-perl was given. +if test "${with_perl+set}" = set; then + withval=$with_perl; use_perl=$withval +else + use_perl=auto +fi + + + +if test "x$use_perl" = x"auto"; then + # Extract the first word of "perl", so it can be a program name with args. +set dummy perl; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_PERL+set}" = set; then + $as_echo_n "(cached) " >&6 +else + case $PERL in + [\\/]* | ?:[\\/]*) + ac_cv_path_PERL="$PERL" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +PERL=$ac_cv_path_PERL +if test -n "$PERL"; then + { $as_echo "$as_me:$LINENO: result: $PERL" >&5 +$as_echo "$PERL" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + + if test "x$PERL" = "x"; then + { $as_echo "$as_me:$LINENO: WARNING: perl not found - cannot extract information and report" >&5 +$as_echo "$as_me: WARNING: perl not found - cannot extract information and report" >&2;} + have_perl=no + else + have_perl=yes + fi +elif test "x$use_perl" = x"yes" ; then + # Extract the first word of "perl", so it can be a program name with args. +set dummy perl; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_PERL+set}" = set; then + $as_echo_n "(cached) " >&6 +else + case $PERL in + [\\/]* | ?:[\\/]*) + ac_cv_path_PERL="$PERL" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + ;; +esac +fi +PERL=$ac_cv_path_PERL +if test -n "$PERL"; then + { $as_echo "$as_me:$LINENO: result: $PERL" >&5 +$as_echo "$PERL" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + + if test "x$PERL" = "x"; then + { { $as_echo "$as_me:$LINENO: error: --with-perl=yes specified but perl not found in PATH" >&5 +$as_echo "$as_me: error: --with-perl=yes specified but perl not found in PATH" >&2;} + { (exit 1); exit 1; }; } + fi + have_perl=yes +elif test "x$use_perl" = x"no" ; then + if test "x$PERL" != "x"; then + { $as_echo "$as_me:$LINENO: WARNING: ignoring PERL environment variable since --with-perl=no was specified" >&5 +$as_echo "$as_me: WARNING: ignoring PERL environment variable since --with-perl=no was specified" >&2;} + fi + have_perl=no +else + { { $as_echo "$as_me:$LINENO: error: --with-perl expects 'yes' or 'no'" >&5 +$as_echo "$as_me: error: --with-perl expects 'yes' or 'no'" >&2;} + { (exit 1); exit 1; }; } +fi + + + +if test "$have_perl" = yes; then + HAVE_PERL_TRUE= + HAVE_PERL_FALSE='#' +else + HAVE_PERL_TRUE='#' + HAVE_PERL_FALSE= +fi + + + # Required when PKG_CHECK_MODULES called within an if statement @@ -21924,75 +22122,10 @@ if test x"$LDFLAGS_FOR_BUILD" = x; then fi -# Find perl for "make check" tests in nls/Makefile.am - -# Check whether --with-perl was given. -if test "${with_perl+set}" = set; then - withval=$with_perl; PERL=$withval ; { $as_echo "$as_me:$LINENO: checking perl" >&5 -$as_echo_n "checking perl... " >&6; } ; - { $as_echo "$as_me:$LINENO: result: (from --with-perl) $PERL" >&5 -$as_echo "(from --with-perl) $PERL" >&6; } -else - for ac_prog in perl -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_PERL+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$PERL"; then - ac_cv_prog_PERL="$PERL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_PERL="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -PERL=$ac_cv_prog_PERL -if test -n "$PERL"; then - { $as_echo "$as_me:$LINENO: result: $PERL" >&5 -$as_echo "$PERL" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$PERL" && break -done -test -n "$PERL" || PERL="no" - -fi - - - -if test x$PERL != xno; then - HAVE_PERL_TRUE= - HAVE_PERL_FALSE='#' -else - HAVE_PERL_TRUE='#' - HAVE_PERL_FALSE= -fi - - # Checks for pkg-config packages # Always required -X11_REQUIRES='xproto >= 7.0.13 xextproto xtrans xcb >= 1.1.92' +X11_REQUIRES='xproto >= 7.0.17 xextproto xtrans xcb >= 1.1.92' X11_EXTRA_DEPS="xcb >= 1.1.92" @@ -26455,7 +26588,7 @@ exec 6>&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.4.3, which was +This file was extended by libX11 $as_me 1.4.4, which was generated by GNU Autoconf 2.62. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -26508,7 +26641,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -libX11 config.status 1.4.3 +libX11 config.status 1.4.4 configured by $0, generated by GNU Autoconf 2.62, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/lib/libX11/configure.ac b/lib/libX11/configure.ac index 7da2ae4e8..6a4878e8d 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.4.3], +AC_INIT([libX11], [1.4.4], [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]) @@ -20,17 +20,18 @@ AM_MAINTAINER_MODE # Initialize libtool AC_PROG_LIBTOOL -# Require xorg-macros minimum of 1.12 for DocBook external references +# Require xorg-macros minimum of 1.15 for fop minimum version m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.12 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.12) + [m4_fatal([must install xorg-macros 1.15 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.15) XORG_DEFAULT_OPTIONS XORG_ENABLE_SPECS XORG_WITH_XMLTO(0.0.22) -XORG_WITH_FOP([no]) +XORG_WITH_FOP([],[no]) XORG_WITH_XSLTPROC -XORG_CHECK_SGML_DOCTOOLS(1.7) +XORG_CHECK_SGML_DOCTOOLS(1.8) XORG_PROG_RAWCPP +XORG_WITH_PERL # Required when PKG_CHECK_MODULES called within an if statement PKG_PROG_PKG_CONFIG @@ -65,19 +66,10 @@ if test x"$LDFLAGS_FOR_BUILD" = x; then fi AC_SUBST(LDFLAGS_FOR_BUILD) -# Find perl for "make check" tests in nls/Makefile.am -AC_ARG_WITH(perl, - AS_HELP_STRING([--with-perl=<path>], - [path to perl interpreter for build-time tests]), - [PERL=$withval ; AC_MSG_CHECKING([perl]) ; - AC_MSG_RESULT([(from --with-perl) $PERL])], - AC_CHECK_PROGS([PERL], [perl], [no])) -AM_CONDITIONAL(HAVE_PERL, test x$PERL != xno) - # Checks for pkg-config packages # Always required -X11_REQUIRES='xproto >= 7.0.13 xextproto xtrans xcb >= 1.1.92' +X11_REQUIRES='xproto >= 7.0.17 xextproto xtrans xcb >= 1.1.92' X11_EXTRA_DEPS="xcb >= 1.1.92" PKG_PROG_PKG_CONFIG() diff --git a/lib/libX11/docbook.am b/lib/libX11/docbook.am index 3cf21e879..2ffb7e60a 100644 --- a/lib/libX11/docbook.am +++ b/lib/libX11/docbook.am @@ -20,6 +20,7 @@ shelf_DATA = # DocBook/XML file with chapters, appendix and images it includes dist_shelf_DATA = $(docbook) $(chapters) +if HAVE_XMLTO # # Generate DocBook/XML output formats with or without stylesheets # @@ -71,7 +72,7 @@ if HAVE_STYLESHEETS if HAVE_XSLTPROC # DocBook/XML generated document cross-reference database -sgmldbs_DATA = $(docbook:.xml=.html.db) $(docbook:.xml=.fo.db) +shelf_DATA += $(docbook:.xml=.html.db) $(docbook:.xml=.fo.db) # Generate DocBook/XML document cross-reference database # Flags for the XSL Transformation processor generating xref target databases @@ -91,5 +92,6 @@ XSLTPROC_FLAGS = \ endif HAVE_XSLTPROC endif HAVE_STYLESHEETS +endif HAVE_XMLTO -CLEANFILES = $(shelf_DATA) $(sgmldbs_DATA) +CLEANFILES = $(shelf_DATA) diff --git a/lib/libX11/include/Makefile.in b/lib/libX11/include/Makefile.in index 9f502b834..3ae0e5626 100644 --- a/lib/libX11/include/Makefile.in +++ b/lib/libX11/include/Makefile.in @@ -177,6 +177,7 @@ RAWCPPFLAGS = @RAWCPPFLAGS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ THRSTUBS_FALSE = @THRSTUBS_FALSE@ diff --git a/lib/libX11/include/X11/Xlibint.h b/lib/libX11/include/X11/Xlibint.h index 05d344ca9..2ce356d15 100644 --- a/lib/libX11/include/X11/Xlibint.h +++ b/lib/libX11/include/X11/Xlibint.h @@ -336,7 +336,7 @@ extern LockInfoPtr _Xglobal_lock; * define MALLOC_0_RETURNS_NULL. This is necessary because some * Xlib code expects malloc(0) to return a valid pointer to storage. */ -#ifdef MALLOC_0_RETURNS_NULL +#if defined(MALLOC_0_RETURNS_NULL) || defined(__clang_analyzer__) # define Xmalloc(size) malloc(((size) == 0 ? 1 : (size))) # define Xrealloc(ptr, size) realloc((ptr), ((size) == 0 ? 1 : (size))) @@ -572,6 +572,7 @@ extern LockInfoPtr _Xglobal_lock; #endif #endif +#ifndef __clang_analyzer__ #define SetReqLen(req,n,badlen) \ if ((req->length + n) > (unsigned)65535) { \ if (dpy->bigreq_size) { \ @@ -582,6 +583,10 @@ extern LockInfoPtr _Xglobal_lock; } \ } else \ req->length += n +#else +#define SetReqLen(req,n,badlen) \ + req->length += n +#endif #define SyncHandle() \ if (dpy->synchandler) (*dpy->synchandler)(dpy) @@ -787,7 +792,7 @@ typedef int (*FreeModmapType) ( */ typedef struct _XFreeFuncs { FreeFuncType atoms; /* _XFreeAtomTable */ - FreeModmapType modifiermap; /* XFreeModifierMap */ + FreeModmapType modifiermap; /* XFreeModifiermap */ FreeFuncType key_bindings; /* _XFreeKeyBindings */ FreeFuncType context_db; /* _XFreeContextDB */ FreeFuncType defaultCCCs; /* _XcmsFreeDefaultCCCs */ @@ -899,7 +904,7 @@ extern int _XError( ); extern int _XIOError( Display* /* dpy */ -); +) _X_NORETURN; extern int (*_XIOErrorFunction)( Display* /* dpy */ ); diff --git a/lib/libX11/man/DisplayOfCCC.man b/lib/libX11/man/DisplayOfCCC.man index 8f2aad6ab..160eeb57f 100644 --- a/lib/libX11/man/DisplayOfCCC.man +++ b/lib/libX11/man/DisplayOfCCC.man @@ -175,7 +175,7 @@ macro returns the screen white point of the screen associated with the specified CCC. .LP The -.ZN ClientWhitePointOfCC +.ZN ClientWhitePointOfCCC macro returns the client white point of the screen associated with the specified CCC. .SH "SEE ALSO" diff --git a/lib/libX11/man/Makefile.am b/lib/libX11/man/Makefile.am index 60f64cc32..ef1a7453f 100644 --- a/lib/libX11/man/Makefile.am +++ b/lib/libX11/man/Makefile.am @@ -498,7 +498,7 @@ XChangeKeyboardMapping_shadows = \ XNewModifiermap \ XInsertModifiermapEntry \ XDeleteModifiermapEntry \ - XFreeModifierMap \ + XFreeModifiermap \ XModifierKeymap XChangePointerControl_shadows = \ diff --git a/lib/libX11/man/Makefile.in b/lib/libX11/man/Makefile.in index 3fe7f8f30..8328b3805 100644 --- a/lib/libX11/man/Makefile.in +++ b/lib/libX11/man/Makefile.in @@ -182,6 +182,7 @@ RAWCPPFLAGS = @RAWCPPFLAGS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ THRSTUBS_FALSE = @THRSTUBS_FALSE@ @@ -756,7 +757,7 @@ XChangeKeyboardMapping_shadows = \ XNewModifiermap \ XInsertModifiermapEntry \ XDeleteModifiermapEntry \ - XFreeModifierMap \ + XFreeModifiermap \ XModifierKeymap XChangePointerControl_shadows = \ diff --git a/lib/libX11/man/XChangeKeyboardMapping.man b/lib/libX11/man/XChangeKeyboardMapping.man index d4bb9a02f..71b7a9142 100644 --- a/lib/libX11/man/XChangeKeyboardMapping.man +++ b/lib/libX11/man/XChangeKeyboardMapping.man @@ -141,7 +141,7 @@ .ny0 .TH XChangeKeyboardMapping __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS" .SH NAME -XChangeKeyboardMapping, XGetKeyboardMapping, XDisplayKeycodes, XSetModifierMapping, XGetModifierMapping, XNewModifiermap, XInsertModifiermapEntry, XDeleteModifiermapEntry, XFreeModifierMap XModifierKeymap \- manipulate keyboard encoding and keyboard encoding structure +XChangeKeyboardMapping, XGetKeyboardMapping, XDisplayKeycodes, XSetModifierMapping, XGetModifierMapping, XNewModifiermap, XInsertModifiermapEntry, XDeleteModifiermapEntry, XFreeModifiermap, XModifierKeymap \- manipulate keyboard encoding and keyboard encoding structure .SH SYNTAX .HP int XChangeKeyboardMapping(\^Display *\fIdisplay\fP, int \fIfirst_keycode\fP, diff --git a/lib/libX11/man/XFreeModifierMap.man b/lib/libX11/man/XFreeModifiermap.man index cc772afae..cc772afae 100644 --- a/lib/libX11/man/XFreeModifierMap.man +++ b/lib/libX11/man/XFreeModifiermap.man diff --git a/lib/libX11/man/xkb/Makefile.in b/lib/libX11/man/xkb/Makefile.in index 815932fc2..c75943d4c 100644 --- a/lib/libX11/man/xkb/Makefile.in +++ b/lib/libX11/man/xkb/Makefile.in @@ -172,6 +172,7 @@ RAWCPPFLAGS = @RAWCPPFLAGS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ THRSTUBS_FALSE = @THRSTUBS_FALSE@ diff --git a/lib/libX11/man/xkb/XkbComputeShapeTop.man b/lib/libX11/man/xkb/XkbComputeShapeTop.man index 11deaa7e9..5bcf469fa 100644 --- a/lib/libX11/man/xkb/XkbComputeShapeTop.man +++ b/lib/libX11/man/xkb/XkbComputeShapeTop.man @@ -47,7 +47,7 @@ a number of points. The bounding box of a shape is a rectangle that contains all the outlines of that shape. .I XkbComputeShapeTop -returns a BoundsRec that contains two x and y coordinates. These coordinates +returns a BoundsRec that contains two x and y coordinates. These coordinates describe the corners of a rectangle that contains the outline that describes the top surface of the shape. The top surface is defined to be the approximating outline if the diff --git a/lib/libX11/man/xkb/XkbPtrActionX.man b/lib/libX11/man/xkb/XkbPtrActionX.man index bf357d38f..7116185c4 100644 --- a/lib/libX11/man/xkb/XkbPtrActionX.man +++ b/lib/libX11/man/xkb/XkbPtrActionX.man @@ -80,7 +80,7 @@ determine the new pointer Y coordinate. T} .TE -Each of the X and Y coordinantes of the XkbPtrAction structure is composed of +Each of the X and Y coordinates of the XkbPtrAction structure is composed of two signed 16-bit values, that is, the X coordinate is composed of .I high_XXX and diff --git a/lib/libX11/man/xkb/XkbPtrActionY.man b/lib/libX11/man/xkb/XkbPtrActionY.man index 6ac8d6dec..ad10214ea 100644 --- a/lib/libX11/man/xkb/XkbPtrActionY.man +++ b/lib/libX11/man/xkb/XkbPtrActionY.man @@ -80,7 +80,7 @@ determine the new pointer Y coordinate. T} .TE -Each of the X and Y coordinantes of the XkbPtrAction structure is composed of +Each of the X and Y coordinates of the XkbPtrAction structure is composed of two signed 16-bit values, that is, the X coordinate is composed of .I high_XXX and diff --git a/lib/libX11/man/xkb/XkbSetPtrActionX.man b/lib/libX11/man/xkb/XkbSetPtrActionX.man index ee7748e69..2bd56b255 100644 --- a/lib/libX11/man/xkb/XkbSetPtrActionX.man +++ b/lib/libX11/man/xkb/XkbSetPtrActionX.man @@ -84,7 +84,7 @@ determine the new pointer Y coordinate. T} .TE -Each of the X and Y coordinantes of the XkbPtrAction structure is composed of +Each of the X and Y coordinates of the XkbPtrAction structure is composed of two signed 16-bit values, that is, the X coordinate is composed of .I high_XXX and diff --git a/lib/libX11/man/xkb/XkbSetPtrActionY.man b/lib/libX11/man/xkb/XkbSetPtrActionY.man index 8c97e33c4..d8da0f20f 100644 --- a/lib/libX11/man/xkb/XkbSetPtrActionY.man +++ b/lib/libX11/man/xkb/XkbSetPtrActionY.man @@ -84,7 +84,7 @@ determine the new pointer Y coordinate. T} .TE -Each of the X and Y coordinantes of the XkbPtrAction structure is composed of +Each of the X and Y coordinates of the XkbPtrAction structure is composed of two signed 16-bit values, that is, the X coordinate is composed of .I high_XXX and diff --git a/lib/libX11/modules/Makefile.in b/lib/libX11/modules/Makefile.in index aeff4ec06..f68a330f0 100644 --- a/lib/libX11/modules/Makefile.in +++ b/lib/libX11/modules/Makefile.in @@ -171,6 +171,7 @@ RAWCPPFLAGS = @RAWCPPFLAGS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ THRSTUBS_FALSE = @THRSTUBS_FALSE@ diff --git a/lib/libX11/modules/im/Makefile.in b/lib/libX11/modules/im/Makefile.in index ac2318af5..ec908241e 100644 --- a/lib/libX11/modules/im/Makefile.in +++ b/lib/libX11/modules/im/Makefile.in @@ -171,6 +171,7 @@ RAWCPPFLAGS = @RAWCPPFLAGS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ THRSTUBS_FALSE = @THRSTUBS_FALSE@ diff --git a/lib/libX11/modules/im/ximcp/Makefile.in b/lib/libX11/modules/im/ximcp/Makefile.in index 4c6576a7c..b130bd770 100644 --- a/lib/libX11/modules/im/ximcp/Makefile.in +++ b/lib/libX11/modules/im/ximcp/Makefile.in @@ -206,6 +206,7 @@ RAWCPPFLAGS = @RAWCPPFLAGS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ THRSTUBS_FALSE = @THRSTUBS_FALSE@ diff --git a/lib/libX11/modules/im/ximcp/imCallbk.c b/lib/libX11/modules/im/ximcp/imCallbk.c index 866b27c64..6275bbf00 100644 --- a/lib/libX11/modules/im/ximcp/imCallbk.c +++ b/lib/libX11/modules/im/ximcp/imCallbk.c @@ -247,6 +247,8 @@ _XimCbDispatch(Xim xim, /* status = XimCbQueued; */ } else { /* status = XimCbError; */ + Xfree(pcb); + Xfree(proto_buf); } } else { diff --git a/lib/libX11/modules/im/ximcp/imDefIc.c b/lib/libX11/modules/im/ximcp/imDefIc.c index be74a2c5e..a962c1b0f 100644 --- a/lib/libX11/modules/im/ximcp/imDefIc.c +++ b/lib/libX11/modules/im/ximcp/imDefIc.c @@ -1425,10 +1425,9 @@ _XimProtoCreateIC( if (!(_XimGetInputStyle(arg, &input_style))) return (XIC)NULL; - if ((ic = (Xic)Xmalloc(sizeof(XicRec))) == (Xic)NULL) + if ((ic = Xcalloc(1, sizeof(XicRec))) == (Xic)NULL) return (XIC)NULL; - bzero((char *)ic, sizeof(XicRec)); ic->methods = &ic_methods; ic->core.im = (XIM)im; ic->core.input_style = input_style; @@ -1436,7 +1435,7 @@ _XimProtoCreateIC( num = im->core.ic_num_resources; len = sizeof(XIMResource) * num; if (!(res = (XIMResourceList)Xmalloc(len))) - return (XIC)NULL; + goto ErrorOnCreatingIC; (void)memcpy((char *)res, (char *)im->core.ic_resources, len); ic->private.proto.ic_resources = res; ic->private.proto.ic_num_resources = num; @@ -1464,7 +1463,7 @@ _XimProtoCreateIC( num = im->private.proto.ic_num_inner_resources; len = sizeof(XIMResource) * num; if (!(res = (XIMResourceList)Xmalloc(len))) - return (XIC)NULL; + goto ErrorOnCreatingIC; (void)memcpy((char *)res, (char *)im->private.proto.ic_inner_resources, len); ic->private.proto.ic_inner_resources = res; diff --git a/lib/libX11/modules/im/ximcp/imDefIm.c b/lib/libX11/modules/im/ximcp/imDefIm.c index b77c37d97..18a3cc85f 100644 --- a/lib/libX11/modules/im/ximcp/imDefIm.c +++ b/lib/libX11/modules/im/ximcp/imDefIm.c @@ -1713,11 +1713,8 @@ _XimEncodingNegotiation( if (!(_XimSetEncodingByName(im, &name_ptr, &name_len))) return False; - if (!(_XimSetEncodingByDetail(im, &detail_ptr, &detail_len))) { - if (name_ptr) - Xfree(name_ptr); - return False; - } + if (!(_XimSetEncodingByDetail(im, &detail_ptr, &detail_len))) + goto free_name_ptr; len = sizeof(CARD16) + sizeof(INT16) @@ -1727,13 +1724,9 @@ _XimEncodingNegotiation( + sizeof(CARD16) + detail_len; - if (!(buf = (CARD8 *)Xmalloc(XIM_HEADER_SIZE + len))) { - if (name_ptr) - Xfree(name_ptr); - if (detail_ptr) - Xfree(detail_ptr); - return False; - } + if (!(buf = (CARD8 *)Xmalloc(XIM_HEADER_SIZE + len))) + goto free_detail_ptr; + buf_s = (CARD16 *)&buf[XIM_HEADER_SIZE]; buf_s[0] = im->private.proto.imid; @@ -1750,7 +1743,7 @@ _XimEncodingNegotiation( _XimSetHeader((XPointer)buf, XIM_ENCODING_NEGOTIATION, 0, &len); if (!(_XimWrite(im, len, (XPointer)buf))) { Xfree(buf); - return False; + goto free_detail_ptr; } _XimFlush(im); Xfree(buf); @@ -1767,27 +1760,21 @@ _XimEncodingNegotiation( preply = (XPointer)Xmalloc(buf_size); ret_code = _XimRead(im, &len, preply, buf_size, _XimEncodingNegoCheck, 0); - if(ret_code != XIM_TRUE) { - Xfree(preply); - return False; - } + if(ret_code != XIM_TRUE) + goto free_preply; } } else - return False; + goto free_detail_ptr; buf_s = (CARD16 *)((char *)preply + XIM_HEADER_SIZE); if (*((CARD8 *)preply) == XIM_ERROR) { _XimProcError(im, 0, (XPointer)&buf_s[3]); - if(reply != preply) - Xfree(preply); - return False; + goto free_preply; } if (!(_XimGetEncoding(im, &buf_s[1], name_ptr, name_len, - detail_ptr, detail_len))) { - if(reply != preply) - Xfree(preply); - return False; - } + detail_ptr, detail_len))) + goto free_preply; + if (name_ptr) Xfree(name_ptr); if (detail_ptr) @@ -1797,6 +1784,18 @@ _XimEncodingNegotiation( Xfree(preply); return True; + +free_preply: + if (reply != preply) + Xfree(preply); + +free_detail_ptr: + Xfree(detail_ptr); + +free_name_ptr: + Xfree(name_ptr); + + return False; } #ifdef XIM_CONNECTABLE diff --git a/lib/libX11/modules/im/ximcp/imDefLkup.c b/lib/libX11/modules/im/ximcp/imDefLkup.c index f818faafd..996d36aef 100644 --- a/lib/libX11/modules/im/ximcp/imDefLkup.c +++ b/lib/libX11/modules/im/ximcp/imDefLkup.c @@ -691,8 +691,10 @@ _XimCommitRecv( return False; if (!(_XimProcCommit(ic, (BYTE *)&buf_s[5], - (int)buf_s[4], &string, &string_len))) + (int)buf_s[4], &string, &string_len))) { + Xfree(keysym); return False; + } } if (!(_XimRegCommitInfo(ic, string, string_len, keysym, keysym_len))) { diff --git a/lib/libX11/modules/im/ximcp/imInt.c b/lib/libX11/modules/im/ximcp/imInt.c index b19809237..26f4991a2 100644 --- a/lib/libX11/modules/im/ximcp/imInt.c +++ b/lib/libX11/modules/im/ximcp/imInt.c @@ -204,9 +204,8 @@ _XimOpenIM( Xim im; register int i; - if (!(im = (Xim)Xmalloc(sizeof(XimRec)))) + if (!(im = Xcalloc(1, sizeof(XimRec)))) return (XIM)NULL; - bzero(im, sizeof(XimRec)); im->core.lcd = lcd; im->core.ic_chain = (XIC)NULL; @@ -215,14 +214,12 @@ _XimOpenIM( im->core.res_name = NULL; im->core.res_class = NULL; if((res_name != NULL) && (*res_name != '\0')){ - if(!(im->core.res_name = (char *)Xmalloc(strlen(res_name)+1))) + if(!(im->core.res_name = strdup(res_name))) goto Error1; - strcpy(im->core.res_name,res_name); } if((res_class != NULL) && (*res_class != '\0')){ - if(!(im->core.res_class = (char *)Xmalloc(strlen(res_class)+1))) + if(!(im->core.res_class = strdup(res_class))) goto Error2; - strcpy(im->core.res_class,res_class); } if(!(im->core.im_name = _XimMakeImName(lcd))) goto Error3; diff --git a/lib/libX11/modules/im/ximcp/imLcIc.c b/lib/libX11/modules/im/ximcp/imLcIc.c index c0728084f..49338853c 100644 --- a/lib/libX11/modules/im/ximcp/imLcIc.c +++ b/lib/libX11/modules/im/ximcp/imLcIc.c @@ -143,10 +143,9 @@ _XimLocalCreateIC( unsigned int num; int len; - if((ic = (Xic)Xmalloc(sizeof(XicRec))) == (Xic)NULL) { + if((ic = Xcalloc(1, sizeof(XicRec))) == (Xic)NULL) { return ((XIC)NULL); } - bzero((char *)ic, sizeof(XicRec)); ic->methods = &Local_ic_methods; ic->core.im = im; diff --git a/lib/libX11/modules/im/ximcp/imLcIm.c b/lib/libX11/modules/im/ximcp/imLcIm.c index 83f216a75..904169830 100644 --- a/lib/libX11/modules/im/ximcp/imLcIm.c +++ b/lib/libX11/modules/im/ximcp/imLcIm.c @@ -489,10 +489,13 @@ _XimWriteCachedDefaultTree( /* This STILL might be racy on NFS */ if ( (fd = _XOpenFileMode (cachename, O_WRONLY | O_CREAT | O_EXCL, - 0600)) < 0) + 0600)) < 0) { + Xfree(m); return; + } if (! (fp = fdopen (fd, "wb")) ) { close (fd); + Xfree(m); return; } fwrite (m, msize, 1, fp); diff --git a/lib/libX11/modules/im/ximcp/imRm.c b/lib/libX11/modules/im/ximcp/imRm.c index 3d09b8136..da1207ca1 100644 --- a/lib/libX11/modules/im/ximcp/imRm.c +++ b/lib/libX11/modules/im/ximcp/imRm.c @@ -360,10 +360,9 @@ _XimDefaultStyles( n = XIMNumber(supported_local_styles) - 1; len = sizeof(XIMStyles) + sizeof(XIMStyle) * n; - if(!(tmp = (XPointer)Xmalloc(len))) { + if(!(tmp = Xcalloc(1, len))) { return False; } - bzero(tmp, len); styles = (XIMStyles *)tmp; if (n > 0) { @@ -396,10 +395,9 @@ _XimDefaultIMValues( n = XIMNumber(supported_local_im_values_list); len = sizeof(XIMValuesList) + sizeof(char **) * n; - if(!(tmp = (XPointer)Xmalloc(len))) { + if(!(tmp = Xcalloc(1, len))) { return False; } - bzero(tmp, len); values_list = (XIMValuesList *)tmp; if (n > 0) { @@ -433,10 +431,9 @@ _XimDefaultICValues( n = XIMNumber(supported_local_ic_values_list); len = sizeof(XIMValuesList) + sizeof(char **) * n; - if(!(tmp = (XPointer)Xmalloc(len))) { + if(!(tmp = Xcalloc(1, len))) { return False; } - bzero(tmp, len); values_list = (XIMValuesList *)tmp; if (n > 0) { @@ -796,19 +793,15 @@ _XimEncodeString( XPointer top, XPointer val) { - int len; char *string; char **out; if(val == (XPointer)NULL) { return False; } - len = strlen((char *)val); - if(!(string = (char *)Xmalloc(len + 1))) { + if (!(string = strdup((char *)val))) { return False; } - (void)strcpy(string, (char *)val); - string[len] = '\0'; out = (char **)((char *)top + info->offset); if(*out) { @@ -1085,10 +1078,9 @@ _XimDecodeStyles( num = styles->count_styles; len = sizeof(XIMStyles) + sizeof(XIMStyle) * num; - if(!(tmp = (XPointer)Xmalloc(len))) { + if(!(tmp = Xcalloc(1, len))) { return False; } - bzero(tmp, len); out = (XIMStyles *)tmp; if(num >0) { @@ -1124,10 +1116,9 @@ _XimDecodeValues( num = values_list->count_values; len = sizeof(XIMValuesList) + sizeof(char **) * num; - if(!(tmp = (char *)Xmalloc(len))) { + if(!(tmp = Xcalloc(1, len))) { return False; } - bzero(tmp, len); out = (XIMValuesList *)tmp; if(num) { @@ -1168,21 +1159,18 @@ _XimDecodeString( XPointer top, XPointer val) { - int len = 0; char *in; char *string; in = *((char **)((char *)top + info->offset)); - if(in != (char *)NULL) { - len = strlen(in); + if (in != NULL) { + string = strdup(in); + } else { + string = Xcalloc(1, 1); /* strdup("") */ } - if(!(string = (char *)Xmalloc(len + 1))) { + if (string == NULL) { return False; } - if(in != (char *)NULL) { - (void)strcpy(string, in); - } - string[len] = '\0'; *((char **)val) = string; return True; } @@ -2143,10 +2131,9 @@ _XimSetResourceList( XIMResourceList res; len = sizeof(XIMResource) * num_resource; - if(!(res = (XIMResourceList)Xmalloc(len))) { + if(!(res = Xcalloc(1, len))) { return False; } - bzero((char *)res, len); for(i = 0; i < num_resource; i++, id++) { res[i] = resource[i]; diff --git a/lib/libX11/modules/im/ximcp/imRmAttr.c b/lib/libX11/modules/im/ximcp/imRmAttr.c index 5035df514..2e732658a 100644 --- a/lib/libX11/modules/im/ximcp/imRmAttr.c +++ b/lib/libX11/modules/im/ximcp/imRmAttr.c @@ -1384,7 +1384,7 @@ _XimCountNumberOfAttr( { unsigned int n; INT16 len; - INT16 min_len = sizeof(CARD16) /* sizeof attrinute ID */ + INT16 min_len = sizeof(CARD16) /* sizeof attribute ID */ + sizeof(CARD16) /* sizeof type of value */ + sizeof(INT16); /* sizeof length of attribute */ @@ -1408,7 +1408,6 @@ _XimGetAttributeID( { unsigned int n; XIMResourceList res; - int res_len; char *names; int names_len; XPointer tmp; @@ -1417,7 +1416,7 @@ _XimGetAttributeID( int values_len; register int i; INT16 len; - INT16 min_len = sizeof(CARD16) /* sizeof attrinute ID */ + INT16 min_len = sizeof(CARD16) /* sizeof attribute ID */ + sizeof(CARD16) /* sizeof type of value */ + sizeof(INT16); /* sizeof length of attr */ /* @@ -1426,16 +1425,15 @@ _XimGetAttributeID( if (!(n = _XimCountNumberOfAttr(buf[0], &buf[1], &names_len))) return False; - res_len = sizeof(XIMResource) * n; - if (!(res = (XIMResourceList)Xmalloc(res_len))) + if (!(res = Xcalloc(n, sizeof(XIMResource)))) return False; - bzero((char *)res, res_len); values_len = sizeof(XIMValuesList) + (sizeof(char **) * n) + names_len; - if (!(tmp = (XPointer)Xmalloc(values_len))) + if (!(tmp = Xcalloc(1, values_len))) { + Xfree(res); return False; - bzero(tmp, values_len); + } values_list = (XIMValuesList *)tmp; values = (char **)((char *)tmp + sizeof(XIMValuesList)); @@ -1473,16 +1471,15 @@ _XimGetAttributeID( if (!(n = _XimCountNumberOfAttr(buf[0], &buf[2], &names_len))) return False; - res_len = sizeof(XIMResource) * n; - if (!(res = (XIMResourceList)Xmalloc(res_len))) + if (!(res = Xcalloc(n, sizeof(XIMResource)))) return False; - bzero((char *)res, res_len); values_len = sizeof(XIMValuesList) + (sizeof(char **) * n) + names_len; - if (!(tmp = (XPointer)Xmalloc(values_len))) + if (!(tmp = Xcalloc(1, values_len))) { + Xfree(res); return False; - bzero(tmp, values_len); + } values_list = (XIMValuesList *)tmp; values = (char **)((char *)tmp + sizeof(XIMValuesList)); diff --git a/lib/libX11/modules/im/ximcp/imThaiIc.c b/lib/libX11/modules/im/ximcp/imThaiIc.c index d1cb22a5e..95433f3d7 100644 --- a/lib/libX11/modules/im/ximcp/imThaiIc.c +++ b/lib/libX11/modules/im/ximcp/imThaiIc.c @@ -157,10 +157,9 @@ _XimThaiCreateIC( int len; DefTree *tree; - if((ic = (Xic)Xmalloc(sizeof(XicRec))) == (Xic)NULL) { + if((ic = Xcalloc(1, sizeof(XicRec))) == (Xic)NULL) { return ((XIC)NULL); } - bzero((char *)ic, sizeof(XicRec)); ic->methods = &Thai_ic_methods; ic->core.im = im; diff --git a/lib/libX11/modules/im/ximcp/imTrX.c b/lib/libX11/modules/im/ximcp/imTrX.c index edcaf0852..d85d1d114 100644 --- a/lib/libX11/modules/im/ximcp/imTrX.c +++ b/lib/libX11/modules/im/ximcp/imTrX.c @@ -496,9 +496,8 @@ _XimXConf(Xim im, char *address) { XSpecRec *spec; - if (!(spec = (XSpecRec *)Xmalloc(sizeof(XSpecRec)))) + if (!(spec = Xcalloc(1, sizeof(XSpecRec)))) return False; - bzero(spec, sizeof(XSpecRec)); spec->improtocolid = XInternAtom(im->core.display, _XIM_PROTOCOL, False); spec->imconnectid = XInternAtom(im->core.display, _XIM_XCONNECT, False); diff --git a/lib/libX11/modules/im/ximcp/imTrans.c b/lib/libX11/modules/im/ximcp/imTrans.c index dfef76594..0ac08aa60 100644 --- a/lib/libX11/modules/im/ximcp/imTrans.c +++ b/lib/libX11/modules/im/ximcp/imTrans.c @@ -290,17 +290,14 @@ _XimTransConf( char *paddr; TransSpecRec *spec; - if (!(paddr = (char *)Xmalloc(strlen(address) + 1))) + if (!(paddr = strdup(address))) return False; - if (!(spec = (TransSpecRec *) Xmalloc(sizeof(TransSpecRec)))) { + if (!(spec = Xcalloc(1, sizeof(TransSpecRec)))) { Xfree(paddr); return False; } - bzero(spec, sizeof(TransSpecRec)); - - (void)strcpy(paddr, address); spec->address = paddr; im->private.proto.spec = (XPointer)spec; diff --git a/lib/libX11/modules/lc/Makefile.in b/lib/libX11/modules/lc/Makefile.in index 81467ba30..37a7eca2f 100644 --- a/lib/libX11/modules/lc/Makefile.in +++ b/lib/libX11/modules/lc/Makefile.in @@ -171,6 +171,7 @@ RAWCPPFLAGS = @RAWCPPFLAGS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ THRSTUBS_FALSE = @THRSTUBS_FALSE@ diff --git a/lib/libX11/modules/lc/Utf8/Makefile.in b/lib/libX11/modules/lc/Utf8/Makefile.in index 1b4546e5f..29f759cd7 100644 --- a/lib/libX11/modules/lc/Utf8/Makefile.in +++ b/lib/libX11/modules/lc/Utf8/Makefile.in @@ -197,6 +197,7 @@ RAWCPPFLAGS = @RAWCPPFLAGS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ THRSTUBS_FALSE = @THRSTUBS_FALSE@ diff --git a/lib/libX11/modules/lc/def/Makefile.in b/lib/libX11/modules/lc/def/Makefile.in index e4adff524..af757e745 100644 --- a/lib/libX11/modules/lc/def/Makefile.in +++ b/lib/libX11/modules/lc/def/Makefile.in @@ -196,6 +196,7 @@ RAWCPPFLAGS = @RAWCPPFLAGS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ THRSTUBS_FALSE = @THRSTUBS_FALSE@ diff --git a/lib/libX11/modules/lc/gen/Makefile.in b/lib/libX11/modules/lc/gen/Makefile.in index a345a19d8..ded67d820 100644 --- a/lib/libX11/modules/lc/gen/Makefile.in +++ b/lib/libX11/modules/lc/gen/Makefile.in @@ -196,6 +196,7 @@ RAWCPPFLAGS = @RAWCPPFLAGS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ THRSTUBS_FALSE = @THRSTUBS_FALSE@ diff --git a/lib/libX11/modules/lc/gen/lcGenConv.c b/lib/libX11/modules/lc/gen/lcGenConv.c index f3c7b9ad9..078fa48e2 100644 --- a/lib/libX11/modules/lc/gen/lcGenConv.c +++ b/lib/libX11/modules/lc/gen/lcGenConv.c @@ -2680,10 +2680,9 @@ create_conv( *conv->methods = *methods; conv->methods->reset = init_state; - conv->state = (XPointer) Xmalloc(sizeof(StateRec)); + conv->state = Xcalloc(1, sizeof(StateRec)); if (conv->state == NULL) goto err; - bzero((char *) conv->state, sizeof(StateRec)); state = (State) conv->state; state->lcd = lcd; diff --git a/lib/libX11/modules/lc/xlocale/Makefile.in b/lib/libX11/modules/lc/xlocale/Makefile.in index e87565808..c86f62f8c 100644 --- a/lib/libX11/modules/lc/xlocale/Makefile.in +++ b/lib/libX11/modules/lc/xlocale/Makefile.in @@ -196,6 +196,7 @@ RAWCPPFLAGS = @RAWCPPFLAGS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ THRSTUBS_FALSE = @THRSTUBS_FALSE@ diff --git a/lib/libX11/modules/lc/xlocale/lcJis.c b/lib/libX11/modules/lc/xlocale/lcJis.c index 594e6363c..551862d9b 100644 --- a/lib/libX11/modules/lc/xlocale/lcJis.c +++ b/lib/libX11/modules/lc/xlocale/lcJis.c @@ -545,10 +545,9 @@ create_conv( if (XLC_PUBLIC(lcd, is_state_depend)) conv->methods->reset = init_state; - conv->state = (XPointer) Xmalloc(sizeof(StateRec)); + conv->state = Xcalloc(1, sizeof(StateRec)); if (conv->state == NULL) goto err; - bzero((char *) conv->state, sizeof(StateRec)); state = (State) conv->state; state->lcd = lcd; diff --git a/lib/libX11/modules/om/Makefile.in b/lib/libX11/modules/om/Makefile.in index 3edc7ab5c..a1b9420d8 100644 --- a/lib/libX11/modules/om/Makefile.in +++ b/lib/libX11/modules/om/Makefile.in @@ -171,6 +171,7 @@ RAWCPPFLAGS = @RAWCPPFLAGS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ THRSTUBS_FALSE = @THRSTUBS_FALSE@ diff --git a/lib/libX11/modules/om/generic/Makefile.in b/lib/libX11/modules/om/generic/Makefile.in index f4685e098..3e007865a 100644 --- a/lib/libX11/modules/om/generic/Makefile.in +++ b/lib/libX11/modules/om/generic/Makefile.in @@ -199,6 +199,7 @@ RAWCPPFLAGS = @RAWCPPFLAGS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ THRSTUBS_FALSE = @THRSTUBS_FALSE@ diff --git a/lib/libX11/modules/om/generic/omGeneric.c b/lib/libX11/modules/om/generic/omGeneric.c index c78c0a9d6..7f02c8565 100644 --- a/lib/libX11/modules/om/generic/omGeneric.c +++ b/lib/libX11/modules/om/generic/omGeneric.c @@ -523,9 +523,7 @@ get_font_name( if (list == NULL) return NULL; - name = (char *) Xmalloc(strlen(*list) + 1); - if (name) - strcpy(name, *list); + name = strdup(*list); XFreeFontNames(list); @@ -549,10 +547,9 @@ get_rotate_fontname( || len > XLFD_MAX_LEN) return NULL; - pattern = (char *)Xmalloc(len + 1); + pattern = strdup(font_name); if(!pattern) return NULL; - strcpy(pattern, font_name); memset(fields, 0, sizeof(char *) * 14); ptr = pattern; @@ -575,7 +572,7 @@ get_rotate_fontname( } if(field_num < CHARSET_ENCODING_FIELD) - return NULL; + goto free_pattern; /* Pixel Size field : fields[6] */ for(ptr = fields[PIXEL_SIZE_FIELD - 1] ; ptr && *ptr; ptr++) { @@ -584,9 +581,7 @@ get_rotate_fontname( strcpy(pattern, font_name); return(pattern); } - if(pattern) - Xfree(pattern); - return NULL; + goto free_pattern; } } pixel_size = atoi(fields[PIXEL_SIZE_FIELD - 1]); @@ -605,11 +600,11 @@ get_rotate_fontname( /* Max XLFD length is 255 */ if (len > XLFD_MAX_LEN) - return NULL; + goto free_pattern; rotate_font_ptr = (char *)Xmalloc(len + 1); if(!rotate_font_ptr) - return NULL; + goto free_pattern; rotate_font_ptr[0] = '\0'; @@ -619,8 +614,8 @@ get_rotate_fontname( strcat(rotate_font_ptr, fields[field_num]); } - if(pattern) - Xfree(pattern); +free_pattern: + Xfree(pattern); return rotate_font_ptr; } @@ -663,10 +658,8 @@ get_font_name_from_list( for (i = 0; i < count; i++) { fname = list[i]; if(is_match_charset(font_data, fname) == True) { - name = (char *) Xmalloc(strlen(fname) + 1); - if (name) - strcpy(name, fname); - break; + name = strdup(fname); + break; } } @@ -687,11 +680,10 @@ parse_all_name( if(is_match_charset(font_data, pattern) != True) return False; - font_data->xlfd_name = (char *)Xmalloc(strlen(pattern)+1); + font_data->xlfd_name = strdup(pattern); if(font_data->xlfd_name == NULL) return (-1); - strcpy(font_data->xlfd_name, pattern); return True; #else /* OLDCODE */ Display *dpy = oc->core.om->core.display; @@ -725,11 +717,10 @@ parse_all_name( } } - font_data->xlfd_name = (char *)Xmalloc(strlen(pattern)+1); + font_data->xlfd_name = strdup(pattern); if(font_data->xlfd_name == NULL) return (-1); - strcpy(font_data->xlfd_name, pattern); return True; #endif /* OLDCODE */ } @@ -948,12 +939,9 @@ parse_fontdata( * -- jjw/pma (HP) */ if (font_data_return) { - font_data_return->xlfd_name = (char *)Xmalloc - (strlen(font_data->xlfd_name) + 1); + font_data_return->xlfd_name = strdup(font_data->xlfd_name); if (!font_data_return->xlfd_name) return -1; - strcpy (font_data_return->xlfd_name, font_data->xlfd_name); - font_data_return->side = font_data->side; } #ifdef FONTDEBUG @@ -998,11 +986,9 @@ parse_fontdata( #ifdef FONTDEBUG fprintf(stderr,"XLFD name: %s\n",font_data->xlfd_name); #endif - font_data_return->xlfd_name = (char *)Xmalloc - (strlen(font_data->xlfd_name) + 1); + font_data_return->xlfd_name = strdup(font_data->xlfd_name); if (!font_data_return->xlfd_name) return -1; - strcpy (font_data_return->xlfd_name, font_data->xlfd_name); font_data_return->side = font_data->side; } @@ -1194,11 +1180,10 @@ parse_fontname( * be matched. It returns the required information in * font_data_return. */ - font_set->font_name = (char *)Xmalloc - (strlen(font_data_return.xlfd_name) + 1); + font_set->font_name = strdup(font_data_return.xlfd_name); if(font_set->font_name == (char *) NULL) goto err; - strcpy(font_set->font_name, font_data_return.xlfd_name); + font_set->side = font_data_return.side; Xfree (font_data_return.xlfd_name); @@ -1225,11 +1210,10 @@ parse_fontname( break; } } - font_set->font_name = (char *)Xmalloc - (strlen(font_set->substitute[i].xlfd_name) + 1); + font_set->font_name = strdup(font_set->substitute[i].xlfd_name); if(font_set->font_name == (char *) NULL) goto err; - strcpy(font_set->font_name,font_set->substitute[i].xlfd_name); + font_set->side = font_set->substitute[i].side; if(parse_vw(oc, font_set, name_list, count) == -1) goto err; @@ -1239,11 +1223,10 @@ parse_fontname( } } - base_name = (char *) Xmalloc(strlen(oc->core.base_name_list) + 1); + base_name = strdup(oc->core.base_name_list); if (base_name == NULL) goto err; - strcpy(base_name, oc->core.base_name_list); oc->core.base_name_list = base_name; XFreeStringList(name_list); @@ -1656,10 +1639,9 @@ create_oc( XOCMethodsList methods_list = oc_methods_list; int count; - oc = (XOC) Xmalloc(sizeof(XOCGenericRec)); + oc = Xcalloc(1, sizeof(XOCGenericRec)); if (oc == NULL) return (XOC) NULL; - bzero((char *) oc, sizeof(XOCGenericRec)); oc->core.om = om; @@ -1844,26 +1826,23 @@ create_om( { XOM om; - om = (XOM) Xmalloc(sizeof(XOMGenericRec)); + om = Xcalloc(1, sizeof(XOMGenericRec)); if (om == NULL) return (XOM) NULL; - bzero((char *) om, sizeof(XOMGenericRec)); om->methods = &methods; om->core.lcd = lcd; om->core.display = dpy; om->core.rdb = rdb; if (res_name) { - om->core.res_name = (char *) Xmalloc(strlen(res_name) + 1); + om->core.res_name = strdup(res_name); if (om->core.res_name == NULL) goto err; - strcpy(om->core.res_name, res_name); } if (res_class) { - om->core.res_class = (char *) Xmalloc(strlen(res_class) + 1); + om->core.res_class = strdup(res_class); if (om->core.res_class == NULL) goto err; - strcpy(om->core.res_class, res_class); } if (om_resources[0].xrm_name == NULLQUARK) @@ -1915,10 +1894,9 @@ read_EncodingInfo( FontData font_data,ret; char *buf, *bufptr,*scp; int len; - font_data = (FontData) Xmalloc(sizeof(FontDataRec) * count); + font_data = Xcalloc(count, sizeof(FontDataRec)); if (font_data == NULL) return NULL; - bzero((char *) font_data, sizeof(FontDataRec) * count); ret = font_data; for ( ; count-- > 0; font_data++) { @@ -1932,8 +1910,10 @@ read_EncodingInfo( } else len = strlen(buf); font_data->name = (char *) Xmalloc(len + 1); - if (font_data->name == NULL) + if (font_data->name == NULL) { + Xfree(font_data); return NULL; + } strncpy(font_data->name, buf,len); font_data->name[len] = 0; if (bufptr && _XlcCompareISOLatin1(bufptr, "GL") == 0) @@ -2017,10 +1997,9 @@ init_om( _XlcGetResource(lcd, "XLC_FONTSET", "object_name", &value, &count); if (count > 0) { - gen->object_name = (char *) Xmalloc(strlen(*value) + 1); + gen->object_name = strdup(*value); if (gen->object_name == NULL) return False; - strcpy(gen->object_name, *value); } for (num = 0; ; num++) { @@ -2117,22 +2096,24 @@ init_om( if (required_list == NULL) return False; - bufptr = (char *) Xmalloc(length); - if (bufptr == NULL) { - Xfree(required_list); - return False; - } - om->core.required_charset.charset_list = required_list; om->core.required_charset.charset_count = gen->data_num; count = gen->data_num; data = gen->data; - for ( ; count-- > 0; data++) { - strcpy(bufptr, data->font_data->name); - *required_list++ = bufptr; - bufptr += strlen(bufptr) + 1; + if (count > 0) { + bufptr = (char *) Xmalloc(length); + if (bufptr == NULL) { + Xfree(required_list); + return False; + } + + for ( ; count-- > 0; data++) { + strcpy(bufptr, data->font_data->name); + *required_list++ = bufptr; + bufptr += strlen(bufptr) + 1; + } } /* orientation list */ diff --git a/lib/libX11/nls/Makefile.am b/lib/libX11/nls/Makefile.am index 470a04878..cabaf40e1 100644 --- a/lib/libX11/nls/Makefile.am +++ b/lib/libX11/nls/Makefile.am @@ -1,8 +1,11 @@ x11localedir = $(X11_LOCALEDATADIR) specdir = $(docdir)/Compose +CLEANFILES = +XMLTO_FLAGS = +SUFFIXES = -include $(top_srcdir)/specs/xmlrules.in +include $(top_srcdir)/nls/xmlrules.in EXTRA_DIST = locale.alias.pre compose.dir.pre locale.dir.pre \ compose-check.pl compose-chart.pl diff --git a/lib/libX11/nls/Makefile.in b/lib/libX11/nls/Makefile.in index 93e63c57e..a22dcb071 100644 --- a/lib/libX11/nls/Makefile.in +++ b/lib/libX11/nls/Makefile.in @@ -65,7 +65,7 @@ build_triplet = @build@ host_triplet = @host@ DIST_COMMON = $(nobase_dist_x11locale_DATA) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(top_srcdir)/cpprules.in \ - $(top_srcdir)/specs/xmlrules.in + $(top_srcdir)/nls/xmlrules.in @HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(doc_sources:.xml=.ps) $(doc_sources:.xml=.pdf) @HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(doc_sources:.xml=.txt) @HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@am__append_3 = \ @@ -73,10 +73,9 @@ DIST_COMMON = $(nobase_dist_x11locale_DATA) $(srcdir)/Makefile.am \ @HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam img.src.path=$(abs_builddir)/ \ @HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ --stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css -@HAVE_XMLTO_TRUE@am__append_4 = $(spec_DATA) html -@HAVE_XMLTO_TRUE@am__append_5 = .xml .ps .pdf .txt .html -@HAVE_PERL_TRUE@am__append_6 = $(COMPOSE_CHARTS) $(doc_sources) -@HAVE_PERL_TRUE@am__append_7 = -o $(@D) +@HAVE_XMLTO_TRUE@am__append_4 = $(spec_DATA) +@HAVE_PERL_TRUE@am__append_5 = $(COMPOSE_CHARTS) $(doc_sources) +@HAVE_PERL_TRUE@am__append_6 = -o $(@D) subdir = nls ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_define_dir.m4 \ @@ -218,6 +217,7 @@ RAWCPPFLAGS = @RAWCPPFLAGS@ SED = sed SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ THRSTUBS_FALSE = @THRSTUBS_FALSE@ @@ -309,9 +309,9 @@ specdir = $(docdir)/Compose CLEANFILES = $(am__append_4) locale.alias locale.alias.l1 \ locale.alias.l2 compose.dir compose.dir.l1 compose.dir.l2 \ locale.dir locale.dir.l1 locale.dir.l2 XLC_LOCALE \ - $(nobase_x11locale_DATA) $(am__append_6) -SUFFIXES = $(am__append_5) .pre -XMLTO_FLAGS = $(am__append_3) $(am__append_7) + $(nobase_x11locale_DATA) $(am__append_5) +XMLTO_FLAGS = $(am__append_3) $(am__append_6) +SUFFIXES = .pre @HAVE_XMLTO_TRUE@spec_DATA = $(doc_sources:.xml=.html) $(am__append_1) \ @HAVE_XMLTO_TRUE@ $(am__append_2) EXTRA_DIST = locale.alias.pre compose.dir.pre locale.dir.pre \ @@ -409,8 +409,8 @@ nobase_x11locale_DATA = $(locales:%=%/XLC_LOCALE) $(locales:%=%/Compose) all: all-am .SUFFIXES: -.SUFFIXES: .xml .ps .pdf .txt .html .pre -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/specs/xmlrules.in $(top_srcdir)/cpprules.in $(am__configure_deps) +.SUFFIXES: .pre +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/nls/xmlrules.in $(top_srcdir)/cpprules.in $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -602,7 +602,7 @@ check-TESTS: $(TESTS) else :; fi distdir: $(DISTFILES) - $(mkdir_p) $(distdir)/.. $(distdir)/../specs + $(mkdir_p) $(distdir)/.. $(distdir)/../nls @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ diff --git a/lib/libX11/specs/xmlrules.in b/lib/libX11/nls/xmlrules.in index 768786007..5a6be24f5 100644 --- a/lib/libX11/specs/xmlrules.in +++ b/lib/libX11/nls/xmlrules.in @@ -21,10 +21,6 @@ # DEALINGS IN THE SOFTWARE. # -CLEANFILES = -SUFFIXES = -XMLTO_FLAGS = - if HAVE_XMLTO spec_DATA = $(doc_sources:.xml=.html) @@ -45,8 +41,6 @@ endif CLEANFILES += $(spec_DATA) -SUFFIXES += .xml .ps .pdf .txt .html - %.txt: %.xml $(dist_spec_DATA) $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) txt $< @@ -62,6 +56,4 @@ SUFFIXES += .xml .ps .pdf .txt .html chunked-html: $(doc_sources) $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) -o html xhtml $(doc_sources) -CLEANFILES += html - endif HAVE_XMLTO diff --git a/lib/libX11/specs/Makefile.in b/lib/libX11/specs/Makefile.in index 4df3add01..d3cc61d5e 100644 --- a/lib/libX11/specs/Makefile.in +++ b/lib/libX11/specs/Makefile.in @@ -194,6 +194,7 @@ RAWCPPFLAGS = @RAWCPPFLAGS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ THRSTUBS_FALSE = @THRSTUBS_FALSE@ diff --git a/lib/libX11/specs/XIM/Makefile.am b/lib/libX11/specs/XIM/Makefile.am index a1fa72da5..68b0b3f48 100644 --- a/lib/libX11/specs/XIM/Makefile.am +++ b/lib/libX11/specs/XIM/Makefile.am @@ -1,6 +1,5 @@ if ENABLE_SPECS -if HAVE_XMLTO # Main DocBook/XML files (DOCTYPE book) docbook = xim.xml @@ -21,5 +20,4 @@ shelfdir = $(docdir)/XIM # Generate DocBook/XML output formats with or without stylesheets include $(top_srcdir)/docbook.am -endif HAVE_XMLTO endif ENABLE_SPECS diff --git a/lib/libX11/specs/XIM/Makefile.in b/lib/libX11/specs/XIM/Makefile.in index cd176b2b4..b3211e49d 100644 --- a/lib/libX11/specs/XIM/Makefile.in +++ b/lib/libX11/specs/XIM/Makefile.in @@ -54,8 +54,18 @@ build_triplet = @build@ host_triplet = @host@ DIST_COMMON = $(am__dist_shelf_DATA_DIST) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(top_srcdir)/docbook.am -@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(docbook:.xml=.pdf) $(docbook:.xml=.ps) -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(docbook:.xml=.txt) +@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(docbook:.xml=.html) +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(docbook:.xml=.pdf) $(docbook:.xml=.ps) +@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_3 = $(docbook:.xml=.txt) + +# +# Generate documents cross-reference target databases +# + +# This is only possible if the xorg-sgml-doctools package is installed + +# DocBook/XML generated document cross-reference database +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@am__append_4 = $(docbook:.xml=.html.db) $(docbook:.xml=.fo.db) subdir = specs/XIM ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_define_dir.m4 \ @@ -77,12 +87,10 @@ am__vpath_adj = case $$p in \ *) f=$$p;; \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(sgmldbsdir)" \ - "$(DESTDIR)$(shelfdir)" +am__installdirs = "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)" dist_shelfDATA_INSTALL = $(INSTALL_DATA) -sgmldbsDATA_INSTALL = $(INSTALL_DATA) shelfDATA_INSTALL = $(INSTALL_DATA) -DATA = $(dist_shelf_DATA) $(sgmldbs_DATA) $(shelf_DATA) +DATA = $(dist_shelf_DATA) $(shelf_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADMIN_MAN_DIR = @ADMIN_MAN_DIR@ @@ -197,6 +205,7 @@ RAWCPPFLAGS = @RAWCPPFLAGS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ THRSTUBS_FALSE = @THRSTUBS_FALSE@ @@ -285,30 +294,28 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ # Main DocBook/XML files (DOCTYPE book) -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@docbook = xim.xml +@ENABLE_SPECS_TRUE@docbook = xim.xml # Included chapters, appendix, images -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@chapters = \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ dynamicflowsampleseq.svg \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ dynamicflow.svg \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ eventflow.svg \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ sampleprotocolflow1.svg \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ sampleprotocolflow2.svg \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ staticflowsampleseq.svg \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ staticflow.svg +@ENABLE_SPECS_TRUE@chapters = \ +@ENABLE_SPECS_TRUE@ dynamicflowsampleseq.svg \ +@ENABLE_SPECS_TRUE@ dynamicflow.svg \ +@ENABLE_SPECS_TRUE@ eventflow.svg \ +@ENABLE_SPECS_TRUE@ sampleprotocolflow1.svg \ +@ENABLE_SPECS_TRUE@ sampleprotocolflow2.svg \ +@ENABLE_SPECS_TRUE@ staticflowsampleseq.svg \ +@ENABLE_SPECS_TRUE@ staticflow.svg # The location where the DocBook/XML files and their generated formats are installed -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@shelfdir = $(docdir)/XIM +@ENABLE_SPECS_TRUE@shelfdir = $(docdir)/XIM # DocBook/XML generated output formats to be installed -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@shelf_DATA = \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(docbook:.xml=.html) \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(am__append_1) \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(am__append_2) +@ENABLE_SPECS_TRUE@shelf_DATA = $(am__append_1) $(am__append_2) \ +@ENABLE_SPECS_TRUE@ $(am__append_3) $(am__append_4) # DocBook/XML file with chapters, appendix and images it includes -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@dist_shelf_DATA = $(docbook) $(chapters) +@ENABLE_SPECS_TRUE@dist_shelf_DATA = $(docbook) $(chapters) # # Generate DocBook/XML output formats with or without stylesheets @@ -333,15 +340,6 @@ target_alias = @target_alias@ @ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ -x $(STYLESHEET_SRCDIR)/xorg-fo.xsl -# -# Generate documents cross-reference target databases -# - -# This is only possible if the xorg-sgml-doctools package is installed - -# DocBook/XML generated document cross-reference database -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@sgmldbs_DATA = $(docbook:.xml=.html.db) $(docbook:.xml=.fo.db) - # Generate DocBook/XML document cross-reference database # Flags for the XSL Transformation processor generating xref target databases @ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLTPROC_FLAGS = \ @@ -350,7 +348,7 @@ target_alias = @target_alias@ @ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam collect.xref.targets "only" \ @ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --nonet --xinclude -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@CLEANFILES = $(shelf_DATA) $(sgmldbs_DATA) +@ENABLE_SPECS_TRUE@CLEANFILES = $(shelf_DATA) all: all-am .SUFFIXES: @@ -410,23 +408,6 @@ uninstall-dist_shelfDATA: echo " rm -f '$(DESTDIR)$(shelfdir)/$$f'"; \ rm -f "$(DESTDIR)$(shelfdir)/$$f"; \ done -install-sgmldbsDATA: $(sgmldbs_DATA) - @$(NORMAL_INSTALL) - test -z "$(sgmldbsdir)" || $(mkdir_p) "$(DESTDIR)$(sgmldbsdir)" - @list='$(sgmldbs_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(sgmldbsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sgmldbsdir)/$$f'"; \ - $(sgmldbsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sgmldbsdir)/$$f"; \ - done - -uninstall-sgmldbsDATA: - @$(NORMAL_UNINSTALL) - @list='$(sgmldbs_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(sgmldbsdir)/$$f'"; \ - rm -f "$(DESTDIR)$(sgmldbsdir)/$$f"; \ - done install-shelfDATA: $(shelf_DATA) @$(NORMAL_INSTALL) test -z "$(shelfdir)" || $(mkdir_p) "$(DESTDIR)$(shelfdir)" @@ -483,7 +464,7 @@ check-am: all-am check: check-am all-am: Makefile $(DATA) installdirs: - for dir in "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(sgmldbsdir)" "$(DESTDIR)$(shelfdir)"; do \ + for dir in "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-am @@ -529,8 +510,7 @@ info: info-am info-am: -install-data-am: install-dist_shelfDATA install-sgmldbsDATA \ - install-shelfDATA +install-data-am: install-dist_shelfDATA install-shelfDATA install-exec-am: @@ -557,19 +537,18 @@ ps: ps-am ps-am: uninstall-am: uninstall-dist_shelfDATA uninstall-info-am \ - uninstall-sgmldbsDATA uninstall-shelfDATA + uninstall-shelfDATA .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ install-data install-data-am install-dist_shelfDATA \ install-exec install-exec-am install-info install-info-am \ - install-man install-sgmldbsDATA install-shelfDATA \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-dist_shelfDATA \ - uninstall-info-am uninstall-sgmldbsDATA uninstall-shelfDATA + install-man install-shelfDATA install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_shelfDATA uninstall-info-am uninstall-shelfDATA @ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml $(chapters) @ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_XHTML_FLAGS) xhtml-nochunks $< diff --git a/lib/libX11/specs/XKB/Makefile.am b/lib/libX11/specs/XKB/Makefile.am index 3939db6aa..90771cc0d 100644 --- a/lib/libX11/specs/XKB/Makefile.am +++ b/lib/libX11/specs/XKB/Makefile.am @@ -1,6 +1,5 @@ if ENABLE_SPECS -if HAVE_XMLTO # Main DocBook/XML files (DOCTYPE book) docbook = xkblib.xml @@ -59,5 +58,4 @@ shelfdir = $(docdir)/XKB # Generate DocBook/XML output formats with or without stylesheets include $(top_srcdir)/docbook.am -endif HAVE_XMLTO endif ENABLE_SPECS diff --git a/lib/libX11/specs/XKB/Makefile.in b/lib/libX11/specs/XKB/Makefile.in index 104b98a3a..1482e2613 100644 --- a/lib/libX11/specs/XKB/Makefile.in +++ b/lib/libX11/specs/XKB/Makefile.in @@ -54,8 +54,18 @@ build_triplet = @build@ host_triplet = @host@ DIST_COMMON = $(am__dist_shelf_DATA_DIST) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(top_srcdir)/docbook.am -@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(docbook:.xml=.pdf) $(docbook:.xml=.ps) -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(docbook:.xml=.txt) +@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(docbook:.xml=.html) +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(docbook:.xml=.pdf) $(docbook:.xml=.ps) +@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_3 = $(docbook:.xml=.txt) + +# +# Generate documents cross-reference target databases +# + +# This is only possible if the xorg-sgml-doctools package is installed + +# DocBook/XML generated document cross-reference database +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@am__append_4 = $(docbook:.xml=.html.db) $(docbook:.xml=.fo.db) subdir = specs/XKB ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_define_dir.m4 \ @@ -84,12 +94,10 @@ am__vpath_adj = case $$p in \ *) f=$$p;; \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(sgmldbsdir)" \ - "$(DESTDIR)$(shelfdir)" +am__installdirs = "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)" dist_shelfDATA_INSTALL = $(INSTALL_DATA) -sgmldbsDATA_INSTALL = $(INSTALL_DATA) shelfDATA_INSTALL = $(INSTALL_DATA) -DATA = $(dist_shelf_DATA) $(sgmldbs_DATA) $(shelf_DATA) +DATA = $(dist_shelf_DATA) $(shelf_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADMIN_MAN_DIR = @ADMIN_MAN_DIR@ @@ -204,6 +212,7 @@ RAWCPPFLAGS = @RAWCPPFLAGS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ THRSTUBS_FALSE = @THRSTUBS_FALSE@ @@ -292,68 +301,66 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ # Main DocBook/XML files (DOCTYPE book) -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@docbook = xkblib.xml +@ENABLE_SPECS_TRUE@docbook = xkblib.xml # Included chapters, appendix, images -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@chapters = \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ acknowledgement.xml \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ ch01.xml \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ ch02.xml \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ ch03.xml \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ ch04.xml \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ ch05.xml \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ ch06.xml \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ ch07.xml \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ ch08.xml \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ ch09.xml \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ ch10.xml \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ ch11.xml \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ ch12.xml \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ ch13.xml \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ ch14.xml \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ ch15.xml \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ ch16.xml \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ ch17.xml \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ ch18.xml \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ ch19.xml \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ ch20.xml \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ ch21.xml \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ ch22.xml \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ glossary.xml \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ XKBlib-1.svg \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ XKBlib-2.svg \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ XKBlib-3.svg \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ XKBlib-4.svg \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ XKBlib-5.svg \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ XKBlib-6.svg \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ XKBlib-7.svg \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ XKBlib-8.svg \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ XKBlib-9.svg \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ XKBlib-10.svg \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ XKBlib-11.svg \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ XKBlib-12.svg \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ XKBlib-13.svg \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ XKBlib-14.svg \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ XKBlib-15.svg \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ XKBlib-16.svg \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ XKBlib-17.svg \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ XKBlib-18.svg \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ XKBlib-19.svg \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ XKBlib-20.svg \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ XKBlib-21.svg +@ENABLE_SPECS_TRUE@chapters = \ +@ENABLE_SPECS_TRUE@ acknowledgement.xml \ +@ENABLE_SPECS_TRUE@ ch01.xml \ +@ENABLE_SPECS_TRUE@ ch02.xml \ +@ENABLE_SPECS_TRUE@ ch03.xml \ +@ENABLE_SPECS_TRUE@ ch04.xml \ +@ENABLE_SPECS_TRUE@ ch05.xml \ +@ENABLE_SPECS_TRUE@ ch06.xml \ +@ENABLE_SPECS_TRUE@ ch07.xml \ +@ENABLE_SPECS_TRUE@ ch08.xml \ +@ENABLE_SPECS_TRUE@ ch09.xml \ +@ENABLE_SPECS_TRUE@ ch10.xml \ +@ENABLE_SPECS_TRUE@ ch11.xml \ +@ENABLE_SPECS_TRUE@ ch12.xml \ +@ENABLE_SPECS_TRUE@ ch13.xml \ +@ENABLE_SPECS_TRUE@ ch14.xml \ +@ENABLE_SPECS_TRUE@ ch15.xml \ +@ENABLE_SPECS_TRUE@ ch16.xml \ +@ENABLE_SPECS_TRUE@ ch17.xml \ +@ENABLE_SPECS_TRUE@ ch18.xml \ +@ENABLE_SPECS_TRUE@ ch19.xml \ +@ENABLE_SPECS_TRUE@ ch20.xml \ +@ENABLE_SPECS_TRUE@ ch21.xml \ +@ENABLE_SPECS_TRUE@ ch22.xml \ +@ENABLE_SPECS_TRUE@ glossary.xml \ +@ENABLE_SPECS_TRUE@ XKBlib-1.svg \ +@ENABLE_SPECS_TRUE@ XKBlib-2.svg \ +@ENABLE_SPECS_TRUE@ XKBlib-3.svg \ +@ENABLE_SPECS_TRUE@ XKBlib-4.svg \ +@ENABLE_SPECS_TRUE@ XKBlib-5.svg \ +@ENABLE_SPECS_TRUE@ XKBlib-6.svg \ +@ENABLE_SPECS_TRUE@ XKBlib-7.svg \ +@ENABLE_SPECS_TRUE@ XKBlib-8.svg \ +@ENABLE_SPECS_TRUE@ XKBlib-9.svg \ +@ENABLE_SPECS_TRUE@ XKBlib-10.svg \ +@ENABLE_SPECS_TRUE@ XKBlib-11.svg \ +@ENABLE_SPECS_TRUE@ XKBlib-12.svg \ +@ENABLE_SPECS_TRUE@ XKBlib-13.svg \ +@ENABLE_SPECS_TRUE@ XKBlib-14.svg \ +@ENABLE_SPECS_TRUE@ XKBlib-15.svg \ +@ENABLE_SPECS_TRUE@ XKBlib-16.svg \ +@ENABLE_SPECS_TRUE@ XKBlib-17.svg \ +@ENABLE_SPECS_TRUE@ XKBlib-18.svg \ +@ENABLE_SPECS_TRUE@ XKBlib-19.svg \ +@ENABLE_SPECS_TRUE@ XKBlib-20.svg \ +@ENABLE_SPECS_TRUE@ XKBlib-21.svg # The location where the DocBook/XML files and their generated formats are installed -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@shelfdir = $(docdir)/XKB +@ENABLE_SPECS_TRUE@shelfdir = $(docdir)/XKB # DocBook/XML generated output formats to be installed -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@shelf_DATA = \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(docbook:.xml=.html) \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(am__append_1) \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(am__append_2) +@ENABLE_SPECS_TRUE@shelf_DATA = $(am__append_1) $(am__append_2) \ +@ENABLE_SPECS_TRUE@ $(am__append_3) $(am__append_4) # DocBook/XML file with chapters, appendix and images it includes -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@dist_shelf_DATA = $(docbook) $(chapters) +@ENABLE_SPECS_TRUE@dist_shelf_DATA = $(docbook) $(chapters) # # Generate DocBook/XML output formats with or without stylesheets @@ -378,15 +385,6 @@ target_alias = @target_alias@ @ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ -x $(STYLESHEET_SRCDIR)/xorg-fo.xsl -# -# Generate documents cross-reference target databases -# - -# This is only possible if the xorg-sgml-doctools package is installed - -# DocBook/XML generated document cross-reference database -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@sgmldbs_DATA = $(docbook:.xml=.html.db) $(docbook:.xml=.fo.db) - # Generate DocBook/XML document cross-reference database # Flags for the XSL Transformation processor generating xref target databases @ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLTPROC_FLAGS = \ @@ -395,7 +393,7 @@ target_alias = @target_alias@ @ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam collect.xref.targets "only" \ @ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --nonet --xinclude -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@CLEANFILES = $(shelf_DATA) $(sgmldbs_DATA) +@ENABLE_SPECS_TRUE@CLEANFILES = $(shelf_DATA) all: all-am .SUFFIXES: @@ -455,23 +453,6 @@ uninstall-dist_shelfDATA: echo " rm -f '$(DESTDIR)$(shelfdir)/$$f'"; \ rm -f "$(DESTDIR)$(shelfdir)/$$f"; \ done -install-sgmldbsDATA: $(sgmldbs_DATA) - @$(NORMAL_INSTALL) - test -z "$(sgmldbsdir)" || $(mkdir_p) "$(DESTDIR)$(sgmldbsdir)" - @list='$(sgmldbs_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(sgmldbsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sgmldbsdir)/$$f'"; \ - $(sgmldbsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sgmldbsdir)/$$f"; \ - done - -uninstall-sgmldbsDATA: - @$(NORMAL_UNINSTALL) - @list='$(sgmldbs_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(sgmldbsdir)/$$f'"; \ - rm -f "$(DESTDIR)$(sgmldbsdir)/$$f"; \ - done install-shelfDATA: $(shelf_DATA) @$(NORMAL_INSTALL) test -z "$(shelfdir)" || $(mkdir_p) "$(DESTDIR)$(shelfdir)" @@ -528,7 +509,7 @@ check-am: all-am check: check-am all-am: Makefile $(DATA) installdirs: - for dir in "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(sgmldbsdir)" "$(DESTDIR)$(shelfdir)"; do \ + for dir in "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-am @@ -574,8 +555,7 @@ info: info-am info-am: -install-data-am: install-dist_shelfDATA install-sgmldbsDATA \ - install-shelfDATA +install-data-am: install-dist_shelfDATA install-shelfDATA install-exec-am: @@ -602,19 +582,18 @@ ps: ps-am ps-am: uninstall-am: uninstall-dist_shelfDATA uninstall-info-am \ - uninstall-sgmldbsDATA uninstall-shelfDATA + uninstall-shelfDATA .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ install-data install-data-am install-dist_shelfDATA \ install-exec install-exec-am install-info install-info-am \ - install-man install-sgmldbsDATA install-shelfDATA \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-dist_shelfDATA \ - uninstall-info-am uninstall-sgmldbsDATA uninstall-shelfDATA + install-man install-shelfDATA install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_shelfDATA uninstall-info-am uninstall-shelfDATA @ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml $(chapters) @ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_XHTML_FLAGS) xhtml-nochunks $< diff --git a/lib/libX11/specs/i18n/Makefile.in b/lib/libX11/specs/i18n/Makefile.in index 4f52edd0f..7b59760e2 100644 --- a/lib/libX11/specs/i18n/Makefile.in +++ b/lib/libX11/specs/i18n/Makefile.in @@ -194,6 +194,7 @@ RAWCPPFLAGS = @RAWCPPFLAGS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ THRSTUBS_FALSE = @THRSTUBS_FALSE@ diff --git a/lib/libX11/specs/i18n/framework/Makefile.am b/lib/libX11/specs/i18n/framework/Makefile.am index 6e8b0106a..af7ae1d0e 100644 --- a/lib/libX11/specs/i18n/framework/Makefile.am +++ b/lib/libX11/specs/i18n/framework/Makefile.am @@ -1,6 +1,5 @@ if ENABLE_SPECS -if HAVE_XMLTO # Main DocBook/XML files (DOCTYPE book) docbook = framework.xml @@ -9,10 +8,9 @@ docbook = framework.xml chapters = framework.svg # The location where the DocBook/XML files and their generated formats are installed -shelfdir = $(docdir)/framework +shelfdir = $(docdir)/i18n/framework # Generate DocBook/XML output formats with or without stylesheets include $(top_srcdir)/docbook.am -endif HAVE_XMLTO endif ENABLE_SPECS diff --git a/lib/libX11/specs/i18n/framework/Makefile.in b/lib/libX11/specs/i18n/framework/Makefile.in index da978ce99..177d6dc80 100644 --- a/lib/libX11/specs/i18n/framework/Makefile.in +++ b/lib/libX11/specs/i18n/framework/Makefile.in @@ -54,8 +54,18 @@ build_triplet = @build@ host_triplet = @host@ DIST_COMMON = $(am__dist_shelf_DATA_DIST) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(top_srcdir)/docbook.am -@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(docbook:.xml=.pdf) $(docbook:.xml=.ps) -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(docbook:.xml=.txt) +@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(docbook:.xml=.html) +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(docbook:.xml=.pdf) $(docbook:.xml=.ps) +@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_3 = $(docbook:.xml=.txt) + +# +# Generate documents cross-reference target databases +# + +# This is only possible if the xorg-sgml-doctools package is installed + +# DocBook/XML generated document cross-reference database +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@am__append_4 = $(docbook:.xml=.html.db) $(docbook:.xml=.fo.db) subdir = specs/i18n/framework ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_define_dir.m4 \ @@ -75,12 +85,10 @@ am__vpath_adj = case $$p in \ *) f=$$p;; \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(sgmldbsdir)" \ - "$(DESTDIR)$(shelfdir)" +am__installdirs = "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)" dist_shelfDATA_INSTALL = $(INSTALL_DATA) -sgmldbsDATA_INSTALL = $(INSTALL_DATA) shelfDATA_INSTALL = $(INSTALL_DATA) -DATA = $(dist_shelf_DATA) $(sgmldbs_DATA) $(shelf_DATA) +DATA = $(dist_shelf_DATA) $(shelf_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADMIN_MAN_DIR = @ADMIN_MAN_DIR@ @@ -195,6 +203,7 @@ RAWCPPFLAGS = @RAWCPPFLAGS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ THRSTUBS_FALSE = @THRSTUBS_FALSE@ @@ -283,22 +292,20 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ # Main DocBook/XML files (DOCTYPE book) -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@docbook = framework.xml +@ENABLE_SPECS_TRUE@docbook = framework.xml # Included chapters, appendix, images -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@chapters = framework.svg +@ENABLE_SPECS_TRUE@chapters = framework.svg # The location where the DocBook/XML files and their generated formats are installed -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@shelfdir = $(docdir)/framework +@ENABLE_SPECS_TRUE@shelfdir = $(docdir)/i18n/framework # DocBook/XML generated output formats to be installed -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@shelf_DATA = \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(docbook:.xml=.html) \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(am__append_1) \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(am__append_2) +@ENABLE_SPECS_TRUE@shelf_DATA = $(am__append_1) $(am__append_2) \ +@ENABLE_SPECS_TRUE@ $(am__append_3) $(am__append_4) # DocBook/XML file with chapters, appendix and images it includes -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@dist_shelf_DATA = $(docbook) $(chapters) +@ENABLE_SPECS_TRUE@dist_shelf_DATA = $(docbook) $(chapters) # # Generate DocBook/XML output formats with or without stylesheets @@ -323,15 +330,6 @@ target_alias = @target_alias@ @ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ -x $(STYLESHEET_SRCDIR)/xorg-fo.xsl -# -# Generate documents cross-reference target databases -# - -# This is only possible if the xorg-sgml-doctools package is installed - -# DocBook/XML generated document cross-reference database -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@sgmldbs_DATA = $(docbook:.xml=.html.db) $(docbook:.xml=.fo.db) - # Generate DocBook/XML document cross-reference database # Flags for the XSL Transformation processor generating xref target databases @ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLTPROC_FLAGS = \ @@ -340,7 +338,7 @@ target_alias = @target_alias@ @ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam collect.xref.targets "only" \ @ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --nonet --xinclude -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@CLEANFILES = $(shelf_DATA) $(sgmldbs_DATA) +@ENABLE_SPECS_TRUE@CLEANFILES = $(shelf_DATA) all: all-am .SUFFIXES: @@ -400,23 +398,6 @@ uninstall-dist_shelfDATA: echo " rm -f '$(DESTDIR)$(shelfdir)/$$f'"; \ rm -f "$(DESTDIR)$(shelfdir)/$$f"; \ done -install-sgmldbsDATA: $(sgmldbs_DATA) - @$(NORMAL_INSTALL) - test -z "$(sgmldbsdir)" || $(mkdir_p) "$(DESTDIR)$(sgmldbsdir)" - @list='$(sgmldbs_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(sgmldbsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sgmldbsdir)/$$f'"; \ - $(sgmldbsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sgmldbsdir)/$$f"; \ - done - -uninstall-sgmldbsDATA: - @$(NORMAL_UNINSTALL) - @list='$(sgmldbs_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(sgmldbsdir)/$$f'"; \ - rm -f "$(DESTDIR)$(sgmldbsdir)/$$f"; \ - done install-shelfDATA: $(shelf_DATA) @$(NORMAL_INSTALL) test -z "$(shelfdir)" || $(mkdir_p) "$(DESTDIR)$(shelfdir)" @@ -473,7 +454,7 @@ check-am: all-am check: check-am all-am: Makefile $(DATA) installdirs: - for dir in "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(sgmldbsdir)" "$(DESTDIR)$(shelfdir)"; do \ + for dir in "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-am @@ -519,8 +500,7 @@ info: info-am info-am: -install-data-am: install-dist_shelfDATA install-sgmldbsDATA \ - install-shelfDATA +install-data-am: install-dist_shelfDATA install-shelfDATA install-exec-am: @@ -547,19 +527,18 @@ ps: ps-am ps-am: uninstall-am: uninstall-dist_shelfDATA uninstall-info-am \ - uninstall-sgmldbsDATA uninstall-shelfDATA + uninstall-shelfDATA .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ install-data install-data-am install-dist_shelfDATA \ install-exec install-exec-am install-info install-info-am \ - install-man install-sgmldbsDATA install-shelfDATA \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-dist_shelfDATA \ - uninstall-info-am uninstall-sgmldbsDATA uninstall-shelfDATA + install-man install-shelfDATA install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_shelfDATA uninstall-info-am uninstall-shelfDATA @ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml $(chapters) @ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_XHTML_FLAGS) xhtml-nochunks $< diff --git a/lib/libX11/specs/i18n/framework/framework.xml b/lib/libX11/specs/i18n/framework/framework.xml index f80cd5f5a..97a8264e9 100644 --- a/lib/libX11/specs/i18n/framework/framework.xml +++ b/lib/libX11/specs/i18n/framework/framework.xml @@ -195,7 +195,7 @@ typedef int XlcPosition; #define XlcTail </literallayout> -<funcsynopsis> +<funcsynopsis id='_xlcaddloader'> <funcprototype> <funcdef>Bool <function> _XlcAddLoader</function></funcdef> <paramdef>XLCdLoadProc<parameter> proc</parameter></paramdef> @@ -221,7 +221,7 @@ when calling time. <function>Remove a loader</function> </para> -<funcsynopsis> +<funcsynopsis id='_xlcremoveloader'> <funcprototype> <funcdef>void <function> _XlcRemoveLoader</function></funcdef> <paramdef>XLCdLoadProc<parameter> proc</parameter></paramdef> @@ -274,7 +274,7 @@ independently each other. <function>Open a Locale Method</function> </para> -<funcsynopsis> +<funcsynopsis id='_xopenlc'> <funcprototype> <funcdef>XLCd <function> _XOpenLC</function></funcdef> <paramdef>char<parameter> *name</parameter></paramdef> @@ -310,7 +310,7 @@ function returns an XLCd that are bound to current locale. <emphasis role="bold">Close a Locale Method</emphasis> </para> -<funcsynopsis> +<funcsynopsis id='_xcloselc'> <funcprototype> <funcdef>void <function> _XCloseLC</function></funcdef> <paramdef>XLCd<parameter> lcd</parameter></paramdef> @@ -328,7 +328,7 @@ function close a locale method the specified lcd. <emphasis role="bold">Obtain Locale Method values</emphasis> </para> -<funcsynopsis> +<funcsynopsis id='_xgetlcvalues'> <funcprototype> <funcdef>char *<function>_XGetLCValues</function></funcdef> <paramdef>XLCd<parameter> lcd</parameter></paramdef> @@ -439,7 +439,7 @@ typedef struct _XlcCharSetRec { <emphasis role="bold">Get an XlcCharSet</emphasis> </para> -<funcsynopsis> +<funcsynopsis id='_xlcgetcharset'> <funcprototype> <funcdef>XlcCharSet <function> _XlcGetCharSet</function></funcdef> <paramdef>char<parameter> *name</parameter></paramdef> @@ -594,7 +594,7 @@ The following character sets are pre-registered. <emphasis role="bold">Add an XlcCharSet</emphasis> </para> -<funcsynopsis> +<funcsynopsis id='_xlcaddcharset'> <funcprototype> <funcdef>Bool <function> _XlcAddCharSet</function></funcdef> <paramdef>XlcCharSet<parameter> charset</parameter></paramdef> @@ -613,7 +613,7 @@ function registers XlcCharSet specified by "<emphasis remap='I'>charset</emphasi <function>Obtain Character Set values</function> </para> -<funcsynopsis> +<funcsynopsis id='_xlcgetcsvalues'> <funcprototype> <funcdef>char * <function> _XlcGetCSValues</function></funcdef> <paramdef>XlcCharSet<parameter> charset</parameter></paramdef> @@ -720,7 +720,7 @@ typedef struct _XlcConvRec { <function>Open a converter</function> </para> -<funcsynopsis> +<funcsynopsis id='_xlcopenconverter'> <funcprototype> <funcdef>XlcConv <function> _XlcOpenConverter</function></funcdef> <paramdef>XLCd<parameter> from_lcd</parameter></paramdef> @@ -803,7 +803,7 @@ dependent. <emphasis role="bold">Close a converter</emphasis> </para> -<funcsynopsis> +<funcsynopsis id='_xlccloseconverter'> <funcprototype> <funcdef>void <function> _XlcCloseConverter</function></funcdef> <paramdef>XlcConv<parameter> conv</parameter></paramdef> @@ -820,7 +820,7 @@ function closes the specified converter "<emphasis remap='I'>conv</emphasis>". <emphasis role="bold">Code conversion</emphasis> </para> -<funcsynopsis> +<funcsynopsis id='_xlcconvert'> <funcprototype> <funcdef>int <function> _XlcConvert</function></funcdef> <paramdef>XlcConv<parameter> conv</parameter></paramdef> @@ -894,7 +894,7 @@ More than one segment cannot be converted in a call. <emphasis role="bold">Reset a converter</emphasis> </para> -<funcsynopsis> +<funcsynopsis id='_xlcresetconverter'> <funcprototype> <funcdef>void <function> _XlcResetConverter</function></funcdef> <paramdef>XlcConv<parameter> conv</parameter></paramdef> @@ -919,7 +919,7 @@ typedef XlcConv (*XlcOpenConverterProc)(<emphasis remap='I'>from_lcd</emphasis>, char <emphasis remap='I'>*to_type</emphasis>; </literallayout> -<funcsynopsis> +<funcsynopsis id='_xlcsetconverter'> <funcprototype> <funcdef>Bool <function> _XlcSetConverter</function></funcdef> <paramdef>XLCd<parameter> from_lcd</parameter></paramdef> @@ -954,7 +954,7 @@ X Locale Database Definition document. <emphasis role="bold">Get a resource from database</emphasis> </para> -<funcsynopsis> +<funcsynopsis id='_xlcgetresource'> <funcprototype> <funcdef>void <function> _XlcGetResource</function></funcdef> <paramdef>XLCd<parameter> lcd</parameter></paramdef> @@ -993,7 +993,7 @@ or freed by caller. <emphasis role="bold">Get a locale relative file name</emphasis> </para> -<funcsynopsis> +<funcsynopsis id='_xlcfilename'> <funcprototype> <funcdef>char *<function>_XlcFileName</function></funcdef> <paramdef>XLCd<parameter> lcd</parameter></paramdef> @@ -1028,14 +1028,14 @@ strings, a full locale name and a corresponding file name. <emphasis role="bold">Compare Latin-1 strings</emphasis> </para> -<funcsynopsis> +<funcsynopsis id='_xlccompareisolatin1'> <funcprototype> <funcdef>int <function> _XlcCompareISOLatin1</function></funcdef> <paramdef>char*str1,<parameter> *str2</parameter></paramdef> </funcprototype> </funcsynopsis> -<funcsynopsis> +<funcsynopsis id='_xlcncompareisolatin1'> <funcprototype> <funcdef>int <function> _XlcNCompareISOLatin1</function></funcdef> <paramdef>char*str1,<parameter> *str2</parameter></paramdef> @@ -1065,7 +1065,7 @@ except that at most "<emphasis remap='I'>len</emphasis>" bytes are compared. <emphasis role="bold">Resource Utility</emphasis> </para> -<funcsynopsis> +<funcsynopsis id='xlcnumber'> <funcprototype> <funcdef>int <function> XlcNumber</function></funcdef> <paramdef>ArrayType<parameter> array</parameter></paramdef> @@ -1076,7 +1076,7 @@ except that at most "<emphasis remap='I'>len</emphasis>" bytes are compared. Similar to XtNumber. </para> -<funcsynopsis> +<funcsynopsis id='_xlccopyfromarg'> <funcprototype> <funcdef>void <function> _XlcCopyFromArg</function></funcdef> <paramdef>char<parameter> *src</parameter></paramdef> @@ -1085,7 +1085,7 @@ Similar to XtNumber. </funcprototype> </funcsynopsis> -<funcsynopsis> +<funcsynopsis id='_xlccopytoarg'> <funcprototype> <funcdef>void <function> _XlcCopyToArg</function></funcdef> <paramdef>char<parameter> *src</parameter></paramdef> @@ -1101,7 +1101,7 @@ and <function>_XtCopyToArg.</function> </para> -<funcsynopsis> +<funcsynopsis id='_xlccountvalist'> <funcprototype> <funcdef>void <function> _XlcCountVaList</function></funcdef> <paramdef>va_list<parameter> var</parameter></paramdef> @@ -1114,7 +1114,7 @@ Similar to <function>_XtCountVaList.</function> </para> -<funcsynopsis> +<funcsynopsis id='_xlcvatoarglist'> <funcprototype> <funcdef>void <function> _XlcVaToArgList</function></funcdef> <paramdef>va_list<parameter> var</parameter></paramdef> @@ -1146,7 +1146,7 @@ typedef struct _XlcResource { #define XlcIgnoreMask (1L<<4) </literallayout> -<funcsynopsis> +<funcsynopsis id='_xlccompileresourcelist'> <funcprototype> <funcdef>void <function> _XlcCompileResourceList</function></funcdef> <paramdef>XlcResourceList<parameter> resources</parameter></paramdef> @@ -1159,7 +1159,7 @@ Similar to <function>_XtCompileResourceList.</function> </para> -<funcsynopsis> +<funcsynopsis id='_xlcgetvalues'> <funcprototype> <funcdef>char * <function> _XlcGetValues</function></funcdef> <paramdef>XPointer<parameter> base</parameter></paramdef> @@ -1175,7 +1175,7 @@ Similar to Similar to XtGetSubvalues. </para> -<funcsynopsis> +<funcsynopsis id='_xlcsetvalues'> <funcprototype> <funcdef>char * <function> _XlcSetValues</function></funcdef> <paramdef>XPointer<parameter> base</parameter></paramdef> @@ -1199,7 +1199,7 @@ Similar to XtSetSubvalues. The following are ANSI C/MSE Compatible Functions for non-ANSI C environment. </para> -<funcsynopsis> +<funcsynopsis id='_xmblen'> <funcprototype> <funcdef>int <function> _Xmblen</function></funcdef> <paramdef>char<parameter> *str</parameter></paramdef> @@ -1223,7 +1223,7 @@ is equivalent to _Xmbtowc(_Xmbtowc((<emphasis remap='I'>wchar_t*</emphasis>)NULL, <emphasis remap='I'>str</emphasis>, <emphasis remap='I'>len</emphasis>)) </para> -<funcsynopsis> +<funcsynopsis id='_xmbtowc'> <funcprototype> <funcdef>int <function> _Xmbtowc</function></funcdef> <paramdef>wchar_t<parameter> *wstr</parameter></paramdef> @@ -1248,7 +1248,7 @@ is equivalent to _Xlcmbtowc((XLCd)NULL, <emphasis remap='I'>wstr</emphasis>, <emphasis remap='I'>str</emphasis>, <emphasis remap='I'>len</emphasis>) </para> -<funcsynopsis> +<funcsynopsis id='_xlcmbtowc'> <funcprototype> <funcdef>int <function> _Xlcmbtowc</function></funcdef> <paramdef>XLCd<parameter> lcd</parameter></paramdef> @@ -1271,7 +1271,7 @@ calls to determine the current locale. </para> -<funcsynopsis> +<funcsynopsis id='_xwctomb'> <funcprototype> <funcdef>int <function> _Xwctomb</function></funcdef> <paramdef>char<parameter> *str</parameter></paramdef> @@ -1294,7 +1294,7 @@ is equivalent to _Xlcwctomb((XLCd)NULL, <emphasis remap='I'>str</emphasis>, <emphasis remap='I'>wstr</emphasis>) </para> -<funcsynopsis> +<funcsynopsis id='_xlcwctomb'> <funcprototype> <funcdef>int <function> _Xlcwctomb</function></funcdef> <paramdef>XLCd<parameter> lcd</parameter></paramdef> @@ -1314,7 +1314,7 @@ calls to determine the current locale. </para> -<funcsynopsis> +<funcsynopsis id='_xmbstowcs'> <funcprototype> <funcdef>int <function> _Xmbstowcs</function></funcdef> <paramdef>wchar_t<parameter> *wstr</parameter></paramdef> @@ -1338,7 +1338,7 @@ is equivalent to _Xlcmbstowcs((XLCd)NULL, <emphasis remap='I'>wstr</emphasis>, <emphasis remap='I'>str</emphasis>, <emphasis remap='I'>len</emphasis>) </para> -<funcsynopsis> +<funcsynopsis id='_xlcmbstowcs'> <funcprototype> <funcdef>int <function> _Xlcmbstowcs</function></funcdef> <paramdef>XLCd<parameter> lcd</parameter></paramdef> @@ -1359,7 +1359,7 @@ calls to determine the current locale. </para> -<funcsynopsis> +<funcsynopsis id='_xwcstombs'> <funcprototype> <funcdef>int <function> _Xwcstombs</function></funcdef> <paramdef>char<parameter> *str</parameter></paramdef> @@ -1383,7 +1383,7 @@ is equivalent to _Xlcwcstombs((XLCd)NULL, <emphasis remap='I'>str</emphasis>, <emphasis remap='I'>wstr</emphasis>, <emphasis remap='I'>len</emphasis>) </para> -<funcsynopsis> +<funcsynopsis id='_xlcwcstombs'> <funcprototype> <funcdef>int <function> _Xlcwcstombs</function></funcdef> <paramdef>XLCd<parameter> lcd</parameter></paramdef> @@ -1404,7 +1404,7 @@ calls to determine the current locale. </para> -<funcsynopsis> +<funcsynopsis id='_xwcslen'> <funcprototype> <funcdef>int <function> _Xwcslen</function></funcdef> <paramdef>wchar_t<parameter> *wstr</parameter></paramdef> @@ -1418,7 +1418,7 @@ function returns the count of wide characters in the (wchar_t) NULL terminated wide character string pointed to by "<emphasis remap='I'>wstr</emphasis>". </para> -<funcsynopsis> +<funcsynopsis id='_xwcscpy'> <funcprototype> <funcdef>wchar_t *<function> _Xwcscpy</function></funcdef> <paramdef>wchar_t<parameter> *wstr1</parameter></paramdef> @@ -1426,7 +1426,7 @@ terminated wide character string pointed to by "<emphasis remap='I'>wstr</emphas </funcprototype> </funcsynopsis> -<funcsynopsis> +<funcsynopsis id='_xwcsncpy'> <funcprototype> <funcdef>wchar_t * <function> _Xwcsncpy</function></funcdef> <paramdef>wchar_t<parameter> *wstr1</parameter></paramdef> @@ -1453,14 +1453,14 @@ except that it copies "<emphasis remap='I'>len</emphasis>" wide characters from pointed to by "<emphasis remap='I'>wstr2</emphasis>" to the object pointed to "<emphasis remap='I'>wstr1</emphasis>". </para> -<funcsynopsis> +<funcsynopsis id='_xwcscmp'> <funcprototype> <funcdef>int <function> _Xwcscmp</function></funcdef> <paramdef>wchar_t*wstr1,<parameter> *wstr2</parameter></paramdef> </funcprototype> </funcsynopsis> -<funcsynopsis> +<funcsynopsis id='_xwcsncmp'> <funcprototype> <funcdef>int <function> _Xwcsncmp</function></funcdef> <paramdef>wchar_t*wstr1,<parameter> *wstr2</parameter></paramdef> diff --git a/lib/libX11/specs/i18n/localedb/Makefile.am b/lib/libX11/specs/i18n/localedb/Makefile.am index 8db6a7bda..68a917c95 100644 --- a/lib/libX11/specs/i18n/localedb/Makefile.am +++ b/lib/libX11/specs/i18n/localedb/Makefile.am @@ -1,15 +1,13 @@ if ENABLE_SPECS -if HAVE_XMLTO # Main DocBook/XML files (DOCTYPE book) docbook = localedb.xml # The location where the DocBook/XML files and their generated formats are installed -shelfdir = $(docdir)/localedb +shelfdir = $(docdir)/i18n/localedb # Generate DocBook/XML output formats with or without stylesheets include $(top_srcdir)/docbook.am -endif HAVE_XMLTO endif ENABLE_SPECS diff --git a/lib/libX11/specs/i18n/localedb/Makefile.in b/lib/libX11/specs/i18n/localedb/Makefile.in index 05f34c04f..b0fd03604 100644 --- a/lib/libX11/specs/i18n/localedb/Makefile.in +++ b/lib/libX11/specs/i18n/localedb/Makefile.in @@ -54,8 +54,18 @@ build_triplet = @build@ host_triplet = @host@ DIST_COMMON = $(am__dist_shelf_DATA_DIST) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(top_srcdir)/docbook.am -@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(docbook:.xml=.pdf) $(docbook:.xml=.ps) -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(docbook:.xml=.txt) +@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(docbook:.xml=.html) +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(docbook:.xml=.pdf) $(docbook:.xml=.ps) +@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_3 = $(docbook:.xml=.txt) + +# +# Generate documents cross-reference target databases +# + +# This is only possible if the xorg-sgml-doctools package is installed + +# DocBook/XML generated document cross-reference database +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@am__append_4 = $(docbook:.xml=.html.db) $(docbook:.xml=.fo.db) subdir = specs/i18n/localedb ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_define_dir.m4 \ @@ -75,12 +85,10 @@ am__vpath_adj = case $$p in \ *) f=$$p;; \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(sgmldbsdir)" \ - "$(DESTDIR)$(shelfdir)" +am__installdirs = "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)" dist_shelfDATA_INSTALL = $(INSTALL_DATA) -sgmldbsDATA_INSTALL = $(INSTALL_DATA) shelfDATA_INSTALL = $(INSTALL_DATA) -DATA = $(dist_shelf_DATA) $(sgmldbs_DATA) $(shelf_DATA) +DATA = $(dist_shelf_DATA) $(shelf_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADMIN_MAN_DIR = @ADMIN_MAN_DIR@ @@ -195,6 +203,7 @@ RAWCPPFLAGS = @RAWCPPFLAGS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ THRSTUBS_FALSE = @THRSTUBS_FALSE@ @@ -283,19 +292,17 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ # Main DocBook/XML files (DOCTYPE book) -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@docbook = localedb.xml +@ENABLE_SPECS_TRUE@docbook = localedb.xml # The location where the DocBook/XML files and their generated formats are installed -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@shelfdir = $(docdir)/localedb +@ENABLE_SPECS_TRUE@shelfdir = $(docdir)/i18n/localedb # DocBook/XML generated output formats to be installed -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@shelf_DATA = \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(docbook:.xml=.html) \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(am__append_1) \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(am__append_2) +@ENABLE_SPECS_TRUE@shelf_DATA = $(am__append_1) $(am__append_2) \ +@ENABLE_SPECS_TRUE@ $(am__append_3) $(am__append_4) # DocBook/XML file with chapters, appendix and images it includes -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@dist_shelf_DATA = $(docbook) $(chapters) +@ENABLE_SPECS_TRUE@dist_shelf_DATA = $(docbook) $(chapters) # # Generate DocBook/XML output formats with or without stylesheets @@ -320,15 +327,6 @@ target_alias = @target_alias@ @ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ -x $(STYLESHEET_SRCDIR)/xorg-fo.xsl -# -# Generate documents cross-reference target databases -# - -# This is only possible if the xorg-sgml-doctools package is installed - -# DocBook/XML generated document cross-reference database -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@sgmldbs_DATA = $(docbook:.xml=.html.db) $(docbook:.xml=.fo.db) - # Generate DocBook/XML document cross-reference database # Flags for the XSL Transformation processor generating xref target databases @ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLTPROC_FLAGS = \ @@ -337,7 +335,7 @@ target_alias = @target_alias@ @ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam collect.xref.targets "only" \ @ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --nonet --xinclude -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@CLEANFILES = $(shelf_DATA) $(sgmldbs_DATA) +@ENABLE_SPECS_TRUE@CLEANFILES = $(shelf_DATA) all: all-am .SUFFIXES: @@ -397,23 +395,6 @@ uninstall-dist_shelfDATA: echo " rm -f '$(DESTDIR)$(shelfdir)/$$f'"; \ rm -f "$(DESTDIR)$(shelfdir)/$$f"; \ done -install-sgmldbsDATA: $(sgmldbs_DATA) - @$(NORMAL_INSTALL) - test -z "$(sgmldbsdir)" || $(mkdir_p) "$(DESTDIR)$(sgmldbsdir)" - @list='$(sgmldbs_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(sgmldbsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sgmldbsdir)/$$f'"; \ - $(sgmldbsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sgmldbsdir)/$$f"; \ - done - -uninstall-sgmldbsDATA: - @$(NORMAL_UNINSTALL) - @list='$(sgmldbs_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(sgmldbsdir)/$$f'"; \ - rm -f "$(DESTDIR)$(sgmldbsdir)/$$f"; \ - done install-shelfDATA: $(shelf_DATA) @$(NORMAL_INSTALL) test -z "$(shelfdir)" || $(mkdir_p) "$(DESTDIR)$(shelfdir)" @@ -470,7 +451,7 @@ check-am: all-am check: check-am all-am: Makefile $(DATA) installdirs: - for dir in "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(sgmldbsdir)" "$(DESTDIR)$(shelfdir)"; do \ + for dir in "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-am @@ -516,8 +497,7 @@ info: info-am info-am: -install-data-am: install-dist_shelfDATA install-sgmldbsDATA \ - install-shelfDATA +install-data-am: install-dist_shelfDATA install-shelfDATA install-exec-am: @@ -544,19 +524,18 @@ ps: ps-am ps-am: uninstall-am: uninstall-dist_shelfDATA uninstall-info-am \ - uninstall-sgmldbsDATA uninstall-shelfDATA + uninstall-shelfDATA .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ install-data install-data-am install-dist_shelfDATA \ install-exec install-exec-am install-info install-info-am \ - install-man install-sgmldbsDATA install-shelfDATA \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-dist_shelfDATA \ - uninstall-info-am uninstall-sgmldbsDATA uninstall-shelfDATA + install-man install-shelfDATA install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_shelfDATA uninstall-info-am uninstall-shelfDATA @ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml $(chapters) @ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_XHTML_FLAGS) xhtml-nochunks $< diff --git a/lib/libX11/specs/i18n/trans/Makefile.am b/lib/libX11/specs/i18n/trans/Makefile.am index cdec7509b..40a135a2f 100644 --- a/lib/libX11/specs/i18n/trans/Makefile.am +++ b/lib/libX11/specs/i18n/trans/Makefile.am @@ -1,15 +1,13 @@ if ENABLE_SPECS -if HAVE_XMLTO # Main DocBook/XML files (DOCTYPE book) docbook = trans.xml # The location where the DocBook/XML files and their generated formats are installed -shelfdir = $(docdir)/trans +shelfdir = $(docdir)/i18n/trans # Generate DocBook/XML output formats with or without stylesheets include $(top_srcdir)/docbook.am -endif HAVE_XMLTO endif ENABLE_SPECS diff --git a/lib/libX11/specs/i18n/trans/Makefile.in b/lib/libX11/specs/i18n/trans/Makefile.in index ed8e190aa..6f196f5e9 100644 --- a/lib/libX11/specs/i18n/trans/Makefile.in +++ b/lib/libX11/specs/i18n/trans/Makefile.in @@ -54,8 +54,18 @@ build_triplet = @build@ host_triplet = @host@ DIST_COMMON = $(am__dist_shelf_DATA_DIST) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(top_srcdir)/docbook.am -@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(docbook:.xml=.pdf) $(docbook:.xml=.ps) -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(docbook:.xml=.txt) +@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(docbook:.xml=.html) +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(docbook:.xml=.pdf) $(docbook:.xml=.ps) +@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_3 = $(docbook:.xml=.txt) + +# +# Generate documents cross-reference target databases +# + +# This is only possible if the xorg-sgml-doctools package is installed + +# DocBook/XML generated document cross-reference database +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@am__append_4 = $(docbook:.xml=.html.db) $(docbook:.xml=.fo.db) subdir = specs/i18n/trans ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_define_dir.m4 \ @@ -75,12 +85,10 @@ am__vpath_adj = case $$p in \ *) f=$$p;; \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(sgmldbsdir)" \ - "$(DESTDIR)$(shelfdir)" +am__installdirs = "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)" dist_shelfDATA_INSTALL = $(INSTALL_DATA) -sgmldbsDATA_INSTALL = $(INSTALL_DATA) shelfDATA_INSTALL = $(INSTALL_DATA) -DATA = $(dist_shelf_DATA) $(sgmldbs_DATA) $(shelf_DATA) +DATA = $(dist_shelf_DATA) $(shelf_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADMIN_MAN_DIR = @ADMIN_MAN_DIR@ @@ -195,6 +203,7 @@ RAWCPPFLAGS = @RAWCPPFLAGS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ THRSTUBS_FALSE = @THRSTUBS_FALSE@ @@ -283,19 +292,17 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ # Main DocBook/XML files (DOCTYPE book) -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@docbook = trans.xml +@ENABLE_SPECS_TRUE@docbook = trans.xml # The location where the DocBook/XML files and their generated formats are installed -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@shelfdir = $(docdir)/trans +@ENABLE_SPECS_TRUE@shelfdir = $(docdir)/i18n/trans # DocBook/XML generated output formats to be installed -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@shelf_DATA = \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(docbook:.xml=.html) \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(am__append_1) \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(am__append_2) +@ENABLE_SPECS_TRUE@shelf_DATA = $(am__append_1) $(am__append_2) \ +@ENABLE_SPECS_TRUE@ $(am__append_3) $(am__append_4) # DocBook/XML file with chapters, appendix and images it includes -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@dist_shelf_DATA = $(docbook) $(chapters) +@ENABLE_SPECS_TRUE@dist_shelf_DATA = $(docbook) $(chapters) # # Generate DocBook/XML output formats with or without stylesheets @@ -320,15 +327,6 @@ target_alias = @target_alias@ @ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ -x $(STYLESHEET_SRCDIR)/xorg-fo.xsl -# -# Generate documents cross-reference target databases -# - -# This is only possible if the xorg-sgml-doctools package is installed - -# DocBook/XML generated document cross-reference database -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@sgmldbs_DATA = $(docbook:.xml=.html.db) $(docbook:.xml=.fo.db) - # Generate DocBook/XML document cross-reference database # Flags for the XSL Transformation processor generating xref target databases @ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLTPROC_FLAGS = \ @@ -337,7 +335,7 @@ target_alias = @target_alias@ @ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam collect.xref.targets "only" \ @ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --nonet --xinclude -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@CLEANFILES = $(shelf_DATA) $(sgmldbs_DATA) +@ENABLE_SPECS_TRUE@CLEANFILES = $(shelf_DATA) all: all-am .SUFFIXES: @@ -397,23 +395,6 @@ uninstall-dist_shelfDATA: echo " rm -f '$(DESTDIR)$(shelfdir)/$$f'"; \ rm -f "$(DESTDIR)$(shelfdir)/$$f"; \ done -install-sgmldbsDATA: $(sgmldbs_DATA) - @$(NORMAL_INSTALL) - test -z "$(sgmldbsdir)" || $(mkdir_p) "$(DESTDIR)$(sgmldbsdir)" - @list='$(sgmldbs_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(sgmldbsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sgmldbsdir)/$$f'"; \ - $(sgmldbsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sgmldbsdir)/$$f"; \ - done - -uninstall-sgmldbsDATA: - @$(NORMAL_UNINSTALL) - @list='$(sgmldbs_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(sgmldbsdir)/$$f'"; \ - rm -f "$(DESTDIR)$(sgmldbsdir)/$$f"; \ - done install-shelfDATA: $(shelf_DATA) @$(NORMAL_INSTALL) test -z "$(shelfdir)" || $(mkdir_p) "$(DESTDIR)$(shelfdir)" @@ -470,7 +451,7 @@ check-am: all-am check: check-am all-am: Makefile $(DATA) installdirs: - for dir in "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(sgmldbsdir)" "$(DESTDIR)$(shelfdir)"; do \ + for dir in "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-am @@ -516,8 +497,7 @@ info: info-am info-am: -install-data-am: install-dist_shelfDATA install-sgmldbsDATA \ - install-shelfDATA +install-data-am: install-dist_shelfDATA install-shelfDATA install-exec-am: @@ -544,19 +524,18 @@ ps: ps-am ps-am: uninstall-am: uninstall-dist_shelfDATA uninstall-info-am \ - uninstall-sgmldbsDATA uninstall-shelfDATA + uninstall-shelfDATA .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ install-data install-data-am install-dist_shelfDATA \ install-exec install-exec-am install-info install-info-am \ - install-man install-sgmldbsDATA install-shelfDATA \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-dist_shelfDATA \ - uninstall-info-am uninstall-sgmldbsDATA uninstall-shelfDATA + install-man install-shelfDATA install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_shelfDATA uninstall-info-am uninstall-shelfDATA @ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml $(chapters) @ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_XHTML_FLAGS) xhtml-nochunks $< diff --git a/lib/libX11/specs/i18n/trans/trans.xml b/lib/libX11/specs/i18n/trans/trans.xml index c8447f934..61e2e7976 100644 --- a/lib/libX11/specs/i18n/trans/trans.xml +++ b/lib/libX11/specs/i18n/trans/trans.xml @@ -359,7 +359,7 @@ connection is established successfully, this function returns True. The Alternative Entry for this function is: </para> -<funcsynopsis> +<funcsynopsis id='_ximconnect'> <funcprototype> <funcdef>Bool <function> _XimConnect</function></funcdef> <paramdef>XIM<parameter> im</parameter></paramdef> @@ -419,7 +419,7 @@ connection is closed successfully, this function returns True. The Alternative Entry for this function is: </para> -<funcsynopsis> +<funcsynopsis id='_ximshutdown'> <funcprototype> <funcdef>Bool <function>_XimShutdown</function></funcdef> <paramdef>XIM<parameter> im</parameter></paramdef> @@ -448,7 +448,7 @@ The following function is called, when Xlib needs to write data to the IM Server. </para> -<funcsynopsis> +<funcsynopsis id='_ximwrite'> <funcprototype> <funcdef>Bool <function> _XimWrite</function></funcdef> <paramdef>XIM<parameter> im</parameter></paramdef> @@ -549,7 +549,7 @@ The following function is called when Xlib waits for response from IM server synchronously. </para> -<funcsynopsis> +<funcsynopsis id='_ximread'> <funcprototype> <funcdef>Bool <function> _XimRead</function></funcdef> <paramdef>XIM<parameter> im</parameter></paramdef> @@ -788,7 +788,7 @@ transport layer. If data transfer is completed, the function returns True. The Alternative Entry for this function is: </para> -<funcsynopsis> +<funcsynopsis id='_ximflush'> <funcprototype> <funcdef>void <function> _XimFlush</function></funcdef> <paramdef>XIM<parameter> im</parameter></paramdef> @@ -943,7 +943,7 @@ that the data has been processed by the upper layer. The Alternative Entry for this function is: </para> -<funcsynopsis> +<funcsynopsis id='_ximregisterdispatcher'> <funcprototype> <funcdef>Bool <function> _XimRegisterDispatcher</function></funcdef> <paramdef>XIM<parameter> im</parameter></paramdef> @@ -1052,7 +1052,7 @@ Protocol packet unit or not. The Alternative Entry for this function is: </para> -<funcsynopsis> +<funcsynopsis id='_ximcalldispatcher'> <funcprototype> <funcdef>Bool <function> _XimCallDispatcher</function></funcdef> <paramdef>XIM<parameter> im</parameter></paramdef> diff --git a/lib/libX11/specs/libX11/AppC.xml b/lib/libX11/specs/libX11/AppC.xml index f9371d21f..da687ecbb 100644 --- a/lib/libX11/specs/libX11/AppC.xml +++ b/lib/libX11/specs/libX11/AppC.xml @@ -36,7 +36,7 @@ and should use minor opcodes to distinguish the requests. <para> <!-- .LP --> The symbols and macros used for writing stubs to Xlib are listed in -<X11/Xlibint.h> . +<filename class="headerfile"><X11/Xlibint.h></filename>. <!-- .SH --> Basic Protocol Support Routines </para> @@ -48,7 +48,7 @@ and </para> <indexterm significance="preferred"><primary>XQueryExtension</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xqueryextension'> <funcprototype> <funcdef>Bool <function>XQueryExtension</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -133,7 +133,7 @@ the strings ``thing'', ``Thing'', and ``thinG'' are all considered different names. <indexterm significance="preferred"><primary>XListExtensions</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xlistextensions'> <funcprototype> <funcdef>char **<function>XListExtensions</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -175,7 +175,7 @@ then the returned strings are in the Host Portable Character Encoding. Otherwise, the result is implementation-dependent. <indexterm significance="preferred"><primary>XFreeExtensionList</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xfreeextensionlist'> <funcprototype> <funcdef><function>XFreeExtensionList</function></funcdef> <paramdef>char<parameter> **list</parameter></paramdef> @@ -236,7 +236,7 @@ The structure returns the information from <function>XInitExtension</function> and is defined in -<X11/Xlib.h> : +<filename class="headerfile"><X11/Xlib.h></filename>: </para> <para> <!-- .LP --> @@ -258,7 +258,7 @@ typedef struct _XExtCodes { /* public to extension, cannot be changed */ <!-- .eM --> <indexterm significance="preferred"><primary>XInitExtension</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xinitextension'> <funcprototype> <funcdef>XExtCodes *<function>XInitExtension</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -324,7 +324,7 @@ This extension number is unique only to a single connection. <!-- .LP --> <indexterm significance="preferred"><primary>XAddExtension</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xaddextension'> <funcprototype> <funcdef>XExtCodes *<function>XAddExtension</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -372,7 +372,7 @@ All of these functions return the previous procedure defined for this extension. <indexterm significance="preferred"><primary>XESetCloseDisplay</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xesetclosedisplay'> <funcprototype> <funcdef>int <function>XESetCloseDisplay</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -442,7 +442,7 @@ with these arguments: <para> <indexterm significance="preferred"><primary>XESetCreateGC</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xesetcreategc'> <funcprototype> <funcdef>int *<function>XESetCreateGC</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -510,7 +510,7 @@ your procedure is called with these arguments: </para> <indexterm significance="preferred"><primary>XESetCopyGC</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xesetcopygc'> <funcprototype> <funcdef>int *<function>XESetCopyGC</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -573,7 +573,7 @@ your procedure is called with these arguments: </funcprototype> </funcsynopsis> </para> -<funcsynopsis> +<funcsynopsis id='xesetfreegc'> <funcprototype> <funcdef>int *<function>XESetFreeGC</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -645,7 +645,7 @@ your procedure is called with these arguments: <!-- .eM --> <indexterm significance="preferred"><primary>XESetCreateFont</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xesetcreatefont'> <funcprototype> <funcdef>int *<function>XESetCreateFont</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -726,7 +726,7 @@ your procedure is called with these arguments: <!-- .eM --> <indexterm significance="preferred"><primary>XESetFreeFont</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xesetfreefont'> <funcprototype> <funcdef>int *<function>XESetFreeFont</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -838,7 +838,7 @@ in the structure will be fully portable between machines. <!-- .NE --> <indexterm significance="preferred"><primary>XESetWireToEvent</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xesetwiretoevent'> <funcprototype> <funcdef>int *<function>XESetWireToEvent</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -948,7 +948,7 @@ with the event and use the return value. <!-- .LP --> <indexterm significance="preferred"><primary>_XSetLastRequestRead</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsetlastrequestread'> <funcprototype> <funcdef>unsigned long<function>_XSetLastRequestRead</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -992,7 +992,7 @@ serial number in the event. <!-- .LP --> <indexterm significance="preferred"><primary>XESetEventToWire</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xeseteventtowire'> <funcprototype> <funcdef>Status *<function>XESetEventToWire</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1084,7 +1084,7 @@ All other members then should be copied from the host format to the structure. <indexterm significance="preferred"><primary>XESetWireToError</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xesetwiretoerror'> <funcprototype> <funcdef>Bool *<function>XESetWireToError</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1179,7 +1179,7 @@ otherwise, it should return <symbol>True</symbol>. <indexterm significance="preferred"><primary>XESetError</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xeseterror'> <funcprototype> <funcdef>int *<function>XESetError</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1262,14 +1262,15 @@ returned to. If your procedure returns a zero value, the error is not suppressed, and the client's error handler is called. -(For further information, see section 11.8.2.) +(For further information, +see <link linkend="Using_the_Default_Error_Handlers">section 11.8.2</link>.) If your procedure returns nonzero, the error is suppressed, and <function>_XReply</function> returns the value of ret_code. <indexterm significance="preferred"><primary>XESetErrorString</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xeseterrorstring'> <funcprototype> <funcdef>char *<function>XESetErrorString</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1345,7 +1346,7 @@ You should copy nbytes of a null-terminated string containing the error message into buffer. <indexterm significance="preferred"><primary>XESetPrintErrorValues</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xesetprinterrorvalues'> <funcprototype> <funcdef>void *<function>XESetPrintErrorValues</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1427,7 +1428,7 @@ The underlying type of the fp argument is system dependent; on a <acronym>POSIX</acronym>-compliant system, fp should be cast to type FILE*. <indexterm significance="preferred"><primary>XESetFlushGC</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xesetflushgc'> <funcprototype> <funcdef>int *<function>XESetFlushGC</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1572,7 +1573,7 @@ on these lists. <!-- .LP --> The following structure is used in the functions in this section and is defined in -<X11/Xlib.h> +<filename class="headerfile"><X11/Xlib.h></filename> </para> <para> <!-- .LP --> @@ -1617,7 +1618,7 @@ union { Display *display; <!-- .eM --> <indexterm significance="preferred"><primary>XEHeadOfExtensionList</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xeheadofextensionlist'> <funcprototype> <funcdef>XExtData **<function>XEHeadOfExtensionList</function></funcdef> <paramdef>XEDataObject<parameter> object</parameter></paramdef> @@ -1655,7 +1656,7 @@ of types contained in <!-- .LP --> <indexterm significance="preferred"><primary>XAddToExtensionList</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xaddtoextensionlist'> <funcprototype> <funcdef><function>XAddToExtensionList</function></funcdef> <paramdef>XExtData<parameter> **structure</parameter></paramdef> @@ -1695,7 +1696,7 @@ You must initialize ext_data->number with the extension number before calling this function. <indexterm significance="preferred"><primary>XFindOnExtensionList</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xfindonextensionlist'> <funcprototype> <funcdef>XExtData *<function>XFindOnExtensionList</function></funcdef> <paramdef>struct_XExtData<parameter> **structure</parameter></paramdef> @@ -1743,10 +1744,10 @@ There is no way to find additional structures. The <function>XAllocID</function> macro, which allocates and returns a resource ID, is defined in -<X11/Xlib.h>. +<filename class="headerfile"><X11/Xlib.h></filename>. <indexterm significance="preferred"><primary>XAllocID</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xallocid'> <funcprototype> <funcdef><function>XAllocID</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1781,7 +1782,7 @@ The macro allocates and returns an array of resource ID. <indexterm significance="preferred"><primary>XAllocIDs</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xallocids'> <funcprototype> <funcdef><function>XAllocIDs</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1858,7 +1859,7 @@ The macro is defined as follows: <indexterm significance="preferred"><primary>FlushGC</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='flushgc'> <funcprototype> <funcdef><function>FlushGC</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1908,7 +1909,7 @@ procedure is defined as follows: <indexterm significance="preferred"><primary>_XFlushGCCache</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='_xflushgccache'> <funcprototype> <funcdef><function>_XFlushGCCache</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2020,7 +2021,7 @@ XDrawPoint(dpy, d, gc, x, y) To keep clients from generating very long requests that may monopolize the server, there is a symbol defined in -<X11/Xlibint.h> +<filename class="headerfile"><X11/Xlibint.h></filename> of EPERBATCH on the number of requests batched. Most of the performance benefit occurs in the first few merged requests. Note that @@ -2047,7 +2048,7 @@ Requests, Replies, and Xproto.h <para> <!-- .LP --> The -<X11/Xproto.h> +<filename class="headerfile"><X11/Xproto.h></filename> file contains three sets of definitions that are of interest to the stub implementor: request names, request structures, and reply structures. @@ -2055,10 +2056,10 @@ request names, request structures, and reply structures. <para> <!-- .LP --> You need to generate a file equivalent to -<X11/Xproto.h> +<filename class="headerfile"><X11/Xproto.h></filename> for your extension and need to include it in your stub procedure. Each stub procedure also must include -<X11/Xlibint.h> . +<filename class="headerfile"><X11/Xlibint.h></filename>. </para> <para> <!-- .LP --> @@ -2066,14 +2067,14 @@ The identifiers are deliberately chosen in such a way that, if the request is called X_DoSomething, then its request structure is xDoSomethingReq, and its reply is xDoSomethingReply. The GetReq family of macros, defined in -<X11/Xlibint.h> , +<filename class="headerfile"><X11/Xlibint.h></filename>, takes advantage of this naming scheme. </para> <para> <!-- .LP --> For each X request, there is a definition in -<X11/Xproto.h> +<filename class="headerfile"><X11/Xproto.h></filename> that looks similar to this: </para> <para> @@ -2134,7 +2135,7 @@ these should be used for all 16-bit and 32-bit quantities, as discussed below. <para> <!-- .LP --> Most protocol requests have a corresponding structure typedef in -<X11/Xproto.h>, +<filename class="headerfile"><X11/Xproto.h></filename>, which looks like: </para> <para> @@ -2162,7 +2163,7 @@ you need not declare a request structure in your extension header file. Instead, such requests use the <structname>xResourceReq</structname> structure in -<X11/Xproto.h>. +<filename class="headerfile"><X11/Xproto.h></filename>. This structure is used for any request whose single argument is a <type>Window</type>, <type>Pixmap</type>, @@ -2215,14 +2216,14 @@ A few protocol requests take no arguments at all. Instead, they use the <structname>xReq</structname> structure in -<X11/Xproto.h>, +<filename class="headerfile"><X11/Xproto.h></filename>, which contains only a reqType and a length (and a pad byte). </para> <para> <!-- .LP --> If the protocol request requires a reply, then -<X11/Xproto.h> +<filename class="headerfile"><X11/Xproto.h></filename> also contains a reply structure typedef: </para> <para> @@ -2280,7 +2281,7 @@ have reply structures longer than 32 bytes in the core protocol. <para> <!-- .LP --> A few protocol requests return replies that contain no data. -<X11/Xproto.h> +<filename class="headerfile"><X11/Xproto.h></filename> does not define reply structures for these. Instead, they use the <structname>xGenericReply</structname> @@ -2331,7 +2332,7 @@ architecture. Two calls, which are generally implemented as macros, have been provided. <indexterm significance="preferred"><primary>LockDisplay</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='lockdisplay'> <funcprototype> <funcdef><function>LockDisplay</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2342,7 +2343,7 @@ Two calls, which are generally implemented as macros, have been provided. <para> <!-- .LP --> <indexterm significance="preferred"><primary>UnlockDisplay</primary></indexterm> -<funcsynopsis> +<funcsynopsis id='unlockdisplay'> <funcprototype> <funcdef><function>UnlockDisplay</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2372,7 +2373,7 @@ Sending the Protocol Request and Arguments <!-- .LP --> After the variable declarations, a stub procedure should call one of four macros defined in -<X11/Xlibint.h>: +<filename class="headerfile"><X11/Xlibint.h></filename>: <function>GetReq</function>, <function>GetReqExtra</function>, <function>GetResReq</function>, @@ -2380,7 +2381,7 @@ or <function>GetEmptyReq</function>. All of these macros take, as their first argument, the name of the protocol request as declared in -<X11/Xproto.h> +<filename class="headerfile"><X11/Xproto.h></filename> except with X_ removed. Each one declares a <type>Display</type> @@ -2526,7 +2527,7 @@ macros take three arguments: the display, a pointer to the beginning of the data, and the number of bytes to be sent. <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='data'> <funcprototype> <funcdef><function>Data</function></funcdef> <paramdef><parameter> display</parameter></paramdef> @@ -2582,7 +2583,7 @@ If any events arrive in the meantime, places them in the queue for later use. <indexterm significance="preferred"><primary>_XReply</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='_xreply'> <funcprototype> <funcdef>Status <function>_XReply</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2750,7 +2751,7 @@ function to read the variable-length data. <para> <!-- .LP --> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='_xread'> <funcprototype> <funcdef><function>_XRead</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2802,7 +2803,7 @@ function reads the specified number of bytes into data_return. <para> <!-- .LP --> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='_xread16'> <funcprototype> <funcdef><function>_XRead16</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2856,7 +2857,7 @@ into the specified array as shorts. <para> <!-- .LP --> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='_xread32'> <funcprototype> <funcdef><function>_XRead32</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2910,7 +2911,7 @@ into the specified array as longs. <para> <!-- .LP --> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='_xread16pad'> <funcprototype> <funcdef><function>_XRead16Pad</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2967,7 +2968,7 @@ reads and discards up to two additional pad bytes. <para> <!-- .LP --> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='_xreadpad'> <funcprototype> <funcdef><function>_XReadPad</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3067,7 +3068,7 @@ The following function returns a scratch buffer for use within a critical section: <indexterm significance="preferred"><primary>_XAllocScratch</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='_xallocscratch'> <funcprototype> <funcdef>char *<function>_XAllocScratch</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3124,7 +3125,7 @@ The following function returns a scratch buffer for use across critical sections: <indexterm significance="preferred"><primary>_XAllocTemp</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='_xalloctemp'> <funcprototype> <funcdef>char *<function>_XAllocTemp</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3163,7 +3164,7 @@ execute inside Xlib. The storage must be explicitly returned to Xlib. The following function returns the storage: <indexterm significance="preferred"><primary>_XFreeTemp</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='_xfreetemp'> <funcprototype> <funcdef>void <function>_XFreeTemp</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3297,7 +3298,7 @@ the simplest and fastest is outlined below. <para> Declare an array of pointers, _NFILE long (this is normally found in -<stdio.h> +<filename class="headerfile"><stdio.h></filename> and is the number of file descriptors supported on the system) of type <structname>XExtCodes</structname>. diff --git a/lib/libX11/specs/libX11/AppD.xml b/lib/libX11/specs/libX11/AppD.xml index 15b39cb50..3c8af3f6b 100644 --- a/lib/libX11/specs/libX11/AppD.xml +++ b/lib/libX11/specs/libX11/AppD.xml @@ -55,7 +55,7 @@ and sets all or portions of the and <property>WM_NORMAL_HINTS</property> properties. <indexterm significance="preferred"><primary>XSetStandardProperties</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsetstandardproperties'> <funcprototype> <funcdef><function>XSetStandardProperties</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -204,7 +204,7 @@ This function has been superseded by <function>XSetWMNormalHints</function>. <indexterm significance="preferred"><primary>XSetNormalHints</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsetnormalhints'> <funcprototype> <funcdef><function>XSetNormalHints</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -293,7 +293,7 @@ This function has been superseded by <function>XGetWMNormalHints</function>. <indexterm significance="preferred"><primary>XGetNormalHints</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xgetnormalhints'> <funcprototype> <funcdef>Status <function>XGetNormalHints</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -364,7 +364,7 @@ This function is no longer supported by the <emphasis remap='I'>Inter-Client Communication Conventions Manual</emphasis>. <indexterm significance="preferred"><primary>XSetZoomHints</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsetzoomhints'> <funcprototype> <funcdef><function>XSetZoomHints</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -434,7 +434,7 @@ This function is no longer supported by the <emphasis remap='I'>Inter-Client Communication Conventions Manual</emphasis>. <indexterm significance="preferred"><primary>XGetZoomHints</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xgetzoomhints'> <funcprototype> <funcdef>Status <function>XGetZoomHints</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -501,7 +501,7 @@ This function has been superseded by <function>XSetWMSizeHints</function>. <indexterm significance="preferred"><primary>XSetSizeHints</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsetsizehints'> <funcprototype> <funcdef><function>XSetSizeHints</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -588,7 +588,7 @@ This function has been superseded by <function>XGetWMSizeHints</function>. <indexterm significance="preferred"><primary>XGetSizeHints</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xgetsizehints'> <funcprototype> <funcdef>Status <function>XGetSizeHints</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -681,7 +681,7 @@ This function has been superseded by <function>XGetRGBColormaps</function>. <indexterm significance="preferred"><primary>XGetStandardColormap</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xgetstandardcolormap'> <funcprototype> <funcdef>Status <function>XGetStandardColormap</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -753,7 +753,8 @@ with the following syntax: <programlisting> XGetStandardColormap(dpy, DefaultRootWindow(dpy), &cmap, XA_RGB_GRAY_MAP); </programlisting> -See section 14.3 for the semantics of standard colormaps. +See <link linkend="Standard_Colormaps">section 14.3</link> for the +semantics of standard colormaps. </para> <para> <!-- .LP --> @@ -773,7 +774,7 @@ This function has been superseded by <function>XSetRGBColormaps</function>. <indexterm significance="preferred"><primary>XSetStandardColormap</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsetstandardcolormap'> <funcprototype> <funcdef><function>XSetStandardColormap</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -856,7 +857,7 @@ This function has been superseded by <indexterm><primary>Window</primary><secondary>determining location</secondary></indexterm> <indexterm significance="preferred"><primary>XGeometry</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xgeometry'> <funcprototype> <funcdef>int <function>XGeometry</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1050,7 +1051,7 @@ geometry specifications. The <function>XGetDefault</function> function provides a primitive interface to the resource manager facilities -discussed in chapter 15. <!-- xref --> +discussed in <link linkend="resource_manager_functions">chapter 15</link>. It is only useful in very simple applications. </para> <para> @@ -1058,7 +1059,7 @@ It is only useful in very simple applications. <!-- .sp --> <indexterm significance="preferred"><primary>XGetDefault</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xgetdefault'> <funcprototype> <funcdef>char *<function>XGetDefault</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1253,7 +1254,7 @@ use #include <X11/X10.h> </para> -<funcsynopsis> +<funcsynopsis id='xdraw'> <funcprototype> <funcdef>Status <function>XDraw</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1460,7 +1461,7 @@ use <para>#include <X11/X10.h></para> -<funcsynopsis> +<funcsynopsis id='xdrawfilled'> <funcprototype> <funcdef>Status <function>XDrawFilled</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1548,7 +1549,7 @@ dash-offset, dash-list, fill-style, and fill-rule. <para> <!-- .LP --> These functions have been superseded by the context management functions -(see section 16.10). +(see <link linkend="Using_the_Context_Manager">section 16.10</link>). It is often necessary to associate arbitrary information with resource IDs. Xlib provides the <function>XAssocTable</function> @@ -1616,7 +1617,7 @@ use <indexterm significance="preferred"><primary>XCreateAssocTable</primary></indexterm> <!-- .sM --> </para> -<funcsynopsis> +<funcsynopsis id='xcreateassoctable'> <funcprototype> <funcdef>XAssocTable *<function>XCreateAssocTable</function></funcdef> <paramdef>int<parameter> size</parameter></paramdef> @@ -1662,7 +1663,7 @@ use <indexterm significance="preferred"><primary>XMakeAssoc</primary></indexterm> <!-- .sM --> </para> -<funcsynopsis> +<funcsynopsis id='xmakeassoc'> <funcprototype> <funcdef><function>XMakeAssoc</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1736,7 +1737,7 @@ use <function>XLookUpAssoc</function>. <indexterm significance="preferred"><primary>XLookUpAssoc</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xlookupassoc'> <funcprototype> <funcdef>char *<function>XLookUpAssoc</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1801,7 +1802,7 @@ use <function>XDeleteAssoc</function>. <indexterm significance="preferred"><primary>XDeleteAssoc</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xdeleteassoc'> <funcprototype> <funcdef><function>XDeleteAssoc</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1865,7 +1866,7 @@ use </para> <indexterm significance="preferred"><primary>XDestroyAssocTable</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xdestroyassoctable'> <funcprototype> <funcdef><function>XDestroyAssocTable</function></funcdef> <paramdef>XAssocTable<parameter> *table</parameter></paramdef> diff --git a/lib/libX11/specs/libX11/CH01.xml b/lib/libX11/specs/libX11/CH01.xml index 7d03389b1..21750aba1 100644 --- a/lib/libX11/specs/libX11/CH01.xml +++ b/lib/libX11/specs/libX11/CH01.xml @@ -27,7 +27,7 @@ those provided by the toolkits for X) are built on top of the Xlib library. For further information about these higher-level libraries, see the appropriate toolkit documentation. The <citetitle>X Window System Protocol</citetitle> provides the -definitive word on the behavior of X. +definitive word on the behavior of X. Although additional information appears here, the protocol document is the ruling document. </para> @@ -255,7 +255,7 @@ Because Xlib usually does not transmit requests to the server immediately actually occur. For debugging purposes, however, Xlib provides a mechanism for forcing synchronous behavior -(see section 11.8.1). <!-- xref --> +(see <link linkend="Enabling_or_Disabling_Synchronization">section 11.8.1</link>). When synchronization is enabled, errors are reported as they are generated. </para> @@ -316,8 +316,8 @@ reference this file directly. <indexterm><primary>Headers</primary><secondary><X11/Xcms.h></secondary></indexterm> <para> This file contains symbols for much of the color management facilities -described in chapter 6. All functions, types, and symbols with the -prefix "Xcms", <!-- xref --> +described in <link linkend="color_management_functions">chapter 6</link>. +All functions, types, and symbols with the prefix "Xcms", plus the Color Conversion Contexts macros, are declared in this file. <filename class="headerfile"><X11/Xlib.h></filename> must be included before including this file. @@ -333,7 +333,9 @@ must be included before including this file. <para> This file declares various functions, types, and symbols used for inter-client communication and application utility functions, -which are described in chapters 14 and 16. <!-- xref --> +which are described in chapters +<link linkend="inter_client_communication_functions">14</link> and +<link linkend="application_utility_functions">16</link>. <filename class="headerfile"><X11/Xlib.h></filename> must be included before including this file. </para> </listitem> @@ -346,7 +348,8 @@ which are described in chapters 14 and 16. <!-- xref --> <indexterm><primary>Headers</primary><secondary><X11/Xresource.h></secondary></indexterm> <para> This file declares all functions, types, and symbols for the -resource manager facilities, which are described in chapter 15. +resource manager facilities, which are described in +<link linkend="resource_manager_functions">chapter 15</link>. <filename class="headerfile"><X11/Xlib.h></filename> <!-- xref --> must be included before including this file. </para> @@ -680,7 +683,7 @@ rather than presume control of the entire screen. What you do inside of your top-level window, however, is up to your application. For further information, -see chapter 14 <!-- xref --> +see <link linkend="inter_client_communication_functions">chapter 14</link> and the <citetitle>Inter-Client Communication Conventions Manual</citetitle>. </para> </listitem> @@ -812,7 +815,7 @@ Where applicable, the last paragraph of the explanation lists the possible Xlib error codes that the function can generate. For a complete discussion of the Xlib error codes, -see section 11.8.2. <!-- xref --> +see <link linkend="Using_the_Default_Error_Handlers">section 11.8.2</link>. </para> </listitem> <listitem> diff --git a/lib/libX11/specs/libX11/CH02.xml b/lib/libX11/specs/libX11/CH02.xml index e3bfedb1f..4a57266bd 100644 --- a/lib/libX11/specs/libX11/CH02.xml +++ b/lib/libX11/specs/libX11/CH02.xml @@ -66,17 +66,12 @@ To open a connection to the X server that controls a display, use <function>XOpenDisplay</function>. <indexterm significance="preferred"><primary>XOpenDisplay</primary></indexterm> </para> -<para> -<!-- .LP --> -<!-- .sM --> -</para> -<para> -AllPlanes() -</para> -<para> -XAllPlanes -</para> - +<funcsynopsis id='xopendisplay'> +<funcprototype> + <funcdef>Display *<function>XOpenDisplay</function></funcdef> + <paramdef>char *<parameter>display_name</parameter></paramdef> +</funcprototype> +</funcsynopsis> <variablelist> <varlistentry> <term> @@ -163,7 +158,8 @@ using the <function>DefaultScreen</function> macro or the <function>XDefaultScreen</function> -function if you are using languages other than C (see section 2.2.1). +function if you are using languages other than C +(see <link linkend="Display_Macros_">section 2.2.1</link>). </para> </listitem> </varlistentry> @@ -247,12 +243,12 @@ For information about using macros and functions to obtain information from the <type>Display</type> structure, -see section 2.2.1. +see <link linkend="Display_Macros_">section 2.2.1</link>. </para> <para> <!-- .LP --> X servers may implement various types of access control mechanisms -(see section 9.8). +(see <link linkend="Controlling_Host_Access">section 9.8</link>). </para> </sect1> <sect1 id="Obtaining_Information_about_the_Display_Image_Formats_or_Screens"> @@ -361,7 +357,7 @@ The names are intended to convey the expected relative intensity of the colors. <para> BlackPixel(<emphasis remap='I'>display</emphasis>, <emphasis remap='I'>screen_number</emphasis>) </para> -<funcsynopsis> +<funcsynopsis id='xblackpixel'> <funcprototype> <funcdef>unsigned long <function>XBlackPixel</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -406,7 +402,7 @@ Both return the black pixel value for the specified screen. <para> WhitePixel(<emphasis remap='I'>display</emphasis>, <emphasis remap='I'>screen_number</emphasis>) </para> -<funcsynopsis> +<funcsynopsis id='xwhitepixel'> <funcprototype> <funcdef>unsigned long <function>XWhitePixel</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -451,7 +447,7 @@ Both return the white pixel value for the specified screen. <para> ConnectionNumber(<emphasis remap='I'>display</emphasis>) </para> -<funcsynopsis> +<funcsynopsis id='xconnectionnumber'> <funcprototype> <funcdef>int <function>XConnectionNumber</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -488,7 +484,7 @@ this is the file descriptor of the connection. <para> DefaultColormap(<emphasis remap='I'>display</emphasis>, <emphasis remap='I'>screen_number</emphasis>) </para> -<funcsynopsis> +<funcsynopsis id='xdefaultcolormap'> <funcprototype> <funcdef>Colormap <function>XDefaultColormap</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -534,7 +530,7 @@ Most routine allocations of color should be made out of this colormap. <para> DefaultDepth(<emphasis remap='I'>display</emphasis>, <emphasis remap='I'>screen_number</emphasis>) </para> -<funcsynopsis> +<funcsynopsis id='xdefaultdepth'> <funcprototype> <funcdef>int <function>XDefaultDepth</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -585,7 +581,7 @@ To determine the number of depths that are available on a given screen, use <para> DefaultGC(<emphasis remap='I'>display</emphasis>, <emphasis remap='I'>screen_number</emphasis>) </para> -<funcsynopsis> +<funcsynopsis id='xdefaultgc'> <funcprototype> <funcdef>GC <function>XDefaultGC</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -703,7 +699,7 @@ This GC should never be freed. <para> DefaultRootWindow(<emphasis remap='I'>display</emphasis>) </para> -<funcsynopsis> +<funcsynopsis id='xdefaultrootwindow'> <funcprototype> <funcdef>Window <function>XDefaultRootWindow</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -737,7 +733,7 @@ Both return the root window for the default screen. <para> DefaultScreenOfDisplay(<emphasis remap='I'>display</emphasis>) </para> -<funcsynopsis> +<funcsynopsis id='xdefaultscreenofdisplay'> <funcprototype> <funcdef>Screen *<function>XDefaultScreenOfDisplay</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -771,7 +767,7 @@ Both return a pointer to the default screen. <para> ScreenOfDisplay(<emphasis remap='I'>display</emphasis>, <emphasis remap='I'>screen_number</emphasis>) </para> -<funcsynopsis> +<funcsynopsis id='xscreenofdisplay'> <funcprototype> <funcdef>Screen *<function>XScreenOfDisplay</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -816,7 +812,7 @@ Both return a pointer to the indicated screen. <para> DefaultScreen(<emphasis remap='I'>display</emphasis>) </para> -<funcsynopsis> +<funcsynopsis id='xdefaultscreen'> <funcprototype> <funcdef>int <function>XDefaultScreen</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -854,7 +850,7 @@ in applications that will use only a single screen. <para> DefaultVisual(<emphasis remap='I'>display</emphasis>, <emphasis remap='I'>screen_number</emphasis>) </para> -<funcsynopsis> +<funcsynopsis id='xdefaultvisual'> <funcprototype> <funcdef>Visual *<function>XDefaultVisual</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -891,7 +887,7 @@ Specifies the appropriate screen number on the host server. <indexterm significance="preferred"><primary>XDefaultVisual</primary></indexterm> Both return the default visual type for the specified screen. For further information about visual types, -see section 3.1. +see <link linkend="Visual_Types">section 3.1</link>. </para> <para> <!-- .LP --> @@ -901,7 +897,7 @@ see section 3.1. <para> DisplayCells(<emphasis remap='I'>display</emphasis>, <emphasis remap='I'>screen_number</emphasis>) </para> -<funcsynopsis> +<funcsynopsis id='xdisplaycells'> <funcprototype> <funcdef>int <function>XDisplayCells</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -946,7 +942,7 @@ Both return the number of entries in the default colormap. <para> DisplayPlanes(<emphasis remap='I'>display</emphasis>, <emphasis remap='I'>screen_number</emphasis>) </para> -<funcsynopsis> +<funcsynopsis id='xdisplayplanes'> <funcprototype> <funcdef>int <function>XDisplayPlanes</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -993,7 +989,7 @@ see the glossary. <para> DisplayString(<emphasis remap='I'>display</emphasis>) </para> -<funcsynopsis> +<funcsynopsis id='xdisplaystring'> <funcprototype> <funcdef>char *<function>XDisplayString</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1037,7 +1033,7 @@ child process as well as for printing error messages. <para> LastKnownRequestProcessed(<emphasis remap='I'>display</emphasis>) </para> -<funcsynopsis> +<funcsynopsis id='xlastknownrequestprocessed'> <funcprototype> <funcdef>unsigned long <function>XLastKnownRequestProcessed</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1180,7 +1176,7 @@ are received. <para> NextRequest(<emphasis remap='I'>display</emphasis>) </para> -<funcsynopsis> +<funcsynopsis id='xnextrequest'> <funcprototype> <funcdef>unsigned long <function>XNextRequest</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1216,7 +1212,7 @@ Serial numbers are maintained separately for each display connection. <para> ProtocolVersion(<emphasis remap='I'>display</emphasis>) </para> -<funcsynopsis> +<funcsynopsis id='xprotocolversion'> <funcprototype> <funcdef>int <function>XProtocolVersion</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1251,7 +1247,7 @@ the connected display. <para> ProtocolRevision(<emphasis remap='I'>display</emphasis>) </para> -<funcsynopsis> +<funcsynopsis id='xprotocolrevision'> <funcprototype> <funcdef>int <function>XProtocolRevision</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1285,7 +1281,7 @@ Both return the minor protocol revision number of the X server. <para> QLength(<emphasis remap='I'>display</emphasis>) </para> -<funcsynopsis> +<funcsynopsis id='xqlength'> <funcprototype> <funcdef>int <function>XQLength</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1322,7 +1318,7 @@ the queue yet (see <para> RootWindow(<emphasis remap='I'>display</emphasis>, <emphasis remap='I'>screen_number</emphasis>) </para> -<funcsynopsis> +<funcsynopsis id='xrootwindow'> <funcprototype> <funcdef>Window <function>XRootWindow</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1371,7 +1367,7 @@ and for creating top-level windows. <para> ScreenCount(<emphasis remap='I'>display</emphasis>) </para> -<funcsynopsis> +<funcsynopsis id='xscreencount'> <funcprototype> <funcdef>int <function>XScreenCount</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1405,7 +1401,7 @@ Both return the number of available screens. <para> ServerVendor(<emphasis remap='I'>display</emphasis>) </para> -<funcsynopsis> +<funcsynopsis id='xservervendor'> <funcprototype> <funcdef>char *<function>XServerVendor</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1443,7 +1439,7 @@ Otherwise, the contents of the string are implementation-dependent. <para> VendorRelease(<emphasis remap='I'>display</emphasis>) </para> -<funcsynopsis> +<funcsynopsis id='xvendorrelease'> <funcprototype> <funcdef>int <function>XVendorRelease</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1481,7 +1477,9 @@ Applications are required to present data to the X server in a format that the server demands. To help simplify applications, most of the work required to convert the data is provided by Xlib -(see sections 8.7 and 16.8). +(see sections +<link linkend="Transferring_Images_between_Client_and_Server">8.7</link> and +<link linkend="Manipulating_Images">16.8</link>). </para> <para> <!-- .LP --> @@ -1516,7 +1514,7 @@ To obtain the pixmap format information for a given display, use <para> ImageByteOrder(<emphasis remap='I'>display</emphasis>) </para> -<funcsynopsis> +<funcsynopsis id='ximagebyteorder'> <funcprototype> <funcdef>int <function>XImageByteOrder</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1619,7 +1617,7 @@ or <para> BitmapUnit(<emphasis remap='I'>display</emphasis>) </para> -<funcsynopsis> +<funcsynopsis id='xbitmapunit'> <funcprototype> <funcdef>int <function>XBitmapUnit</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1654,7 +1652,7 @@ The scanline is calculated in multiples of this value. <para> BitmapBitOrder(<emphasis remap='I'>display</emphasis>) </para> -<funcsynopsis> +<funcsynopsis id='xbitmpabitorder'> <funcprototype> <funcdef>int <function>XBitmapBitOrder</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1694,7 +1692,7 @@ or <para> BitmapPad(<emphasis remap='I'>display</emphasis>) </para> -<funcsynopsis> +<funcsynopsis id='xbitmappad'> <funcprototype> <funcdef>int <function>XBitmapPad</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1729,7 +1727,7 @@ by this macro or function. <para> DisplayHeight(<emphasis remap='I'>display</emphasis>, <emphasis remap='I'>screen_number</emphasis>) </para> -<funcsynopsis> +<funcsynopsis id='xdisplayheight'> <funcprototype> <funcdef>int <function>XDisplayHeight</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1775,7 +1773,7 @@ in pixels. <para> DisplayHeightMM(<emphasis remap='I'>display</emphasis>, <emphasis remap='I'>screen_number</emphasis>) </para> -<funcsynopsis> +<funcsynopsis id='xdisplayheightmm'> <funcprototype> <funcdef>int <function>XDisplayHeightMM</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1820,7 +1818,7 @@ Both return the height of the specified screen in millimeters. <para> DisplayWidth(<emphasis remap='I'>display</emphasis>, <emphasis remap='I'>screen_number</emphasis>) </para> -<funcsynopsis> +<funcsynopsis id='xdisplaywidth'> <funcprototype> <funcdef>int <function>XDisplayWidth</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1865,7 +1863,7 @@ Both return the width of the screen in pixels. <para> DisplayWidthMM(<emphasis remap='I'>display</emphasis>, <emphasis remap='I'>screen_number</emphasis>) </para> -<funcsynopsis> +<funcsynopsis id='xdisplaywidthmm'> <funcprototype> <funcdef>int <function>XDisplayWidthMM</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1924,7 +1922,7 @@ structure. <para> BlackPixelOfScreen(<emphasis remap='I'>screen</emphasis>) </para> -<funcsynopsis> +<funcsynopsis id='xblackpixelofscreen'> <funcprototype> <funcdef>unsigned long <function>XBlackPixelOfScreen</function></funcdef> <paramdef>Screen<parameter> *screen</parameter></paramdef> @@ -1960,7 +1958,7 @@ Both return the black pixel value of the specified screen. <para> WhitePixelOfScreen(<emphasis remap='I'>screen</emphasis>) </para> -<funcsynopsis> +<funcsynopsis id='xwhitepixelofscreen'> <funcprototype> <funcdef>unsigned long <function>XWhitePixelOfScreen</function></funcdef> <paramdef>Screen<parameter> *screen</parameter></paramdef> @@ -1996,7 +1994,7 @@ Both return the white pixel value of the specified screen. <para> CellsOfScreen(<emphasis remap='I'>screen</emphasis>) </para> -<funcsynopsis> +<funcsynopsis id='xcellsofscreen'> <funcprototype> <funcdef>int <function>XCellsOfScreen</function></funcdef> <paramdef>Screen<parameter> *screen</parameter></paramdef> @@ -2033,7 +2031,7 @@ of the specified screen. <para> DefaultColormapOfScreen(<emphasis remap='I'>screen</emphasis>) </para> -<funcsynopsis> +<funcsynopsis id='xdefaultcolormapofscreen'> <funcprototype> <funcdef>Colormap <function>XDefaultColormapOfScreen</function></funcdef> <paramdef>Screen<parameter> *screen</parameter></paramdef> @@ -2069,7 +2067,7 @@ Both return the default colormap of the specified screen. <para> DefaultDepthOfScreen(<emphasis remap='I'>screen</emphasis>) </para> -<funcsynopsis> +<funcsynopsis id='xdefaultdepthofscreen'> <funcprototype> <funcdef>int <function>XDefaultDepthOfScreen</function></funcdef> <paramdef>Screen<parameter> *screen</parameter></paramdef> @@ -2105,7 +2103,7 @@ Both return the depth of the root window. <para> DefaultGCOfScreen(<emphasis remap='I'>screen</emphasis>) </para> -<funcsynopsis> +<funcsynopsis id='xdefaultgcofscreen'> <funcprototype> <funcdef>GC <function>XDefaultGCOfScreen</function></funcdef> <paramdef>Screen<parameter> *screen</parameter></paramdef> @@ -2143,7 +2141,7 @@ The GC must never be freed. <para> DefaultVisualOfScreen(<emphasis remap='I'>screen</emphasis>) </para> -<funcsynopsis> +<funcsynopsis id='xdefaultvisualofscreen'> <funcprototype> <funcdef>Visual *<function>XDefaultVisualOfScreen</function></funcdef> <paramdef>Screen<parameter> *screen</parameter></paramdef> @@ -2171,7 +2169,7 @@ structure. <indexterm significance="preferred"><primary>XDefaultVisualOfScreen</primary></indexterm> Both return the default visual of the specified screen. For information on visual types, -see section 3.1. +see <link linkend="Visual_Types">section 3.1</link>. </para> <para> <!-- .LP --> @@ -2181,7 +2179,7 @@ see section 3.1. <para> DoesBackingStore(<emphasis remap='I'>screen</emphasis>) </para> -<funcsynopsis> +<funcsynopsis id='xdoesbackingstore'> <funcprototype> <funcdef>int <function>XDoesBackingStore</function></funcdef> <paramdef>Screen<parameter> *screen</parameter></paramdef> @@ -2214,7 +2212,7 @@ The value returned can be one of <symbol>NotUseful</symbol>, or <symbol>Always</symbol> -(see section 3.2.4). +(see <link linkend="Backing_Store_Attribute">section 3.2.4</link>). </para> <para> <!-- .LP --> @@ -2224,7 +2222,7 @@ or <para> DoesSaveUnders(<emphasis remap='I'>screen</emphasis>) </para> -<funcsynopsis> +<funcsynopsis id='xdoessaveunders'> <funcprototype> <funcdef>Bool <function>XDoesSaveUnders</function></funcdef> <paramdef>Screen<parameter> *screen</parameter></paramdef> @@ -2257,7 +2255,8 @@ If the screen supports save unders. If <symbol>False</symbol>, -the screen does not support save unders (see section 3.2.5). +the screen does not support save unders +(see <link linkend="Save_Under_Flag">section 3.2.5</link>). </para> <para> <!-- .LP --> @@ -2267,7 +2266,7 @@ the screen does not support save unders (see section 3.2.5). <para> DisplayOfScreen(<emphasis remap='I'>screen</emphasis>) </para> -<funcsynopsis> +<funcsynopsis id='xdisplayofscreen'> <funcprototype> <funcdef>Display *<function>XDisplayOfScreen</function></funcdef> <paramdef>Screen<parameter> *screen</parameter></paramdef> @@ -2304,7 +2303,7 @@ Both return the display of the specified screen. <para> EventMaskOfScreen(<emphasis remap='I'>screen</emphasis>) </para> -<funcsynopsis> +<funcsynopsis id='xeventmaskofscreen'> <funcprototype> <funcdef>long <function>XEventMaskOfScreen</function></funcdef> <paramdef>Screen<parameter> *screen</parameter></paramdef> @@ -2377,7 +2376,7 @@ at connection setup time. <para> WidthOfScreen(<emphasis remap='I'>screen</emphasis>) </para> -<funcsynopsis> +<funcsynopsis id='xwidthofscreen'> <funcprototype> <funcdef>int <function>XWidthOfScreen</function></funcdef> <paramdef>Screen<parameter> *screen</parameter></paramdef> @@ -2413,7 +2412,7 @@ Both return the width of the specified screen in pixels. <para> HeightOfScreen(<emphasis remap='I'>screen</emphasis>) </para> -<funcsynopsis> +<funcsynopsis id='xheightofscreen'> <funcprototype> <funcdef>int <function>XHeightOfScreen</function></funcdef> <paramdef>Screen<parameter> *screen</parameter></paramdef> @@ -2449,7 +2448,7 @@ Both return the height of the specified screen in pixels. <para> WidthMMOfScreen(<emphasis remap='I'>screen</emphasis>) </para> -<funcsynopsis> +<funcsynopsis id='xwidthmmofscreen'> <funcprototype> <funcdef>int <function>XWidthMMOfScreen</function></funcdef> <paramdef>Screen<parameter> *screen</parameter></paramdef> @@ -2485,7 +2484,7 @@ Both return the width of the specified screen in millimeters. <para> HeightMMOfScreen(<emphasis remap='I'>screen</emphasis>) </para> -<funcsynopsis> +<funcsynopsis id='xheightmmofscreen'> <funcprototype> <funcdef>int <function>XHeightMMOfScreen</function></funcdef> <paramdef>Screen<parameter> *screen</parameter></paramdef> @@ -2521,7 +2520,7 @@ Both return the height of the specified screen in millimeters. <para> MaxCmapsOfScreen(<emphasis remap='I'>screen</emphasis>) </para> -<funcsynopsis> +<funcsynopsis id='xmaxcmapsofscreen'> <funcprototype> <funcdef>int <function>XMaxCmapsOfScreen</function></funcdef> <paramdef>Screen<parameter> *screen</parameter></paramdef> @@ -2548,7 +2547,8 @@ structure. <indexterm significance="preferred"><primary>MaxCmapsOfScreen</primary></indexterm> <indexterm significance="preferred"><primary>XMaxCmapsOfScreen</primary></indexterm> Both return the maximum number of installed colormaps supported -by the specified screen (see section 9.3). +by the specified screen +(see <link linkend="Managing_Installed_Colormaps">section 9.3</link>). </para> <para> <!-- .LP --> @@ -2558,7 +2558,7 @@ by the specified screen (see section 9.3). <para> MinCmapsOfScreen(<emphasis remap='I'>screen</emphasis>) </para> -<funcsynopsis> +<funcsynopsis id='xmincmapsofscreen'> <funcprototype> <funcdef>int <function>XMinCmapsOfScreen</function></funcdef> <paramdef>Screen<parameter> *screen</parameter></paramdef> @@ -2585,7 +2585,8 @@ structure. <indexterm significance="preferred"><primary>MinCmapsOfScreen</primary></indexterm> <indexterm significance="preferred"><primary>XMinCmapsOfScreen</primary></indexterm> Both return the minimum number of installed colormaps supported -by the specified screen (see section 9.3). +by the specified screen +(see <link linkend="Managing_Installed_Colormaps">section 9.3</link>). </para> <para> <!-- .LP --> @@ -2595,7 +2596,7 @@ by the specified screen (see section 9.3). <para> PlanesOfScreen(<emphasis remap='I'>screen</emphasis>) </para> -<funcsynopsis> +<funcsynopsis id='xplanesofscreen'> <funcprototype> <funcdef>int <function>XPlanesOfScreen</function></funcdef> <paramdef>Screen<parameter> *screen</parameter></paramdef> @@ -2631,7 +2632,7 @@ Both return the depth of the root window. <para> RootWindowOfScreen(<emphasis remap='I'>screen</emphasis>) </para> -<funcsynopsis> +<funcsynopsis id='xrootwindowofscreen'> <funcprototype> <funcdef>Window <function>XRootWindowOfScreen</function></funcdef> <paramdef>Screen<parameter> *screen</parameter></paramdef> @@ -2675,7 +2676,7 @@ protocol request, use <indexterm significance="preferred"><primary>XNoOp</primary></indexterm> <!-- .sM --> </para> -<funcsynopsis> +<funcsynopsis id='xnoop'> <funcprototype> <funcdef><function>XNoOp</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2713,7 +2714,7 @@ To free in-memory data that was created by an Xlib function, use <indexterm significance="preferred"><primary>XFree</primary></indexterm> <!-- .sM --> </para> -<funcsynopsis> +<funcsynopsis id='xfree'> <funcprototype> <funcdef>XFree</funcdef> <paramdef>void<parameter> *data</parameter></paramdef> @@ -2759,7 +2760,7 @@ To close a display or disconnect from the X server, use <!-- .LP --> <!-- .sM --> </para> -<funcsynopsis> +<funcsynopsis id='xclosedisplay'> <funcprototype> <funcdef>XCloseDisplay</funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2827,7 +2828,7 @@ To change a client's close-down mode, use <indexterm significance="preferred"><primary>XSetCloseDownMode</primary></indexterm> <!-- .sM --> </para> -<funcsynopsis> +<funcsynopsis id='xsetclosedownmode'> <funcprototype> <funcdef>XSetCloseDownMode</funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2876,7 +2877,7 @@ close_mode argument is <symbol>RetainPermanent</symbol> or <symbol>RetainTemporary</symbol>, -see section 2.6. +see <link linkend="Using_X_Server_Connection_Close_Operations_">section 2.6</link>. </para> <para> <!-- .LP --> @@ -3025,7 +3026,8 @@ It deletes all but the predefined atom identifiers. </listitem> <listitem> <para> -It deletes all properties on all root windows (see section 4.3). +It deletes all properties on all root windows +(see <link linkend="Properties_and_Atoms">section 4.3</link>). </para> </listitem> <listitem> @@ -3112,7 +3114,7 @@ To lock a display across several Xlib calls, use <indexterm significance="preferred"><primary>XLockDisplay</primary></indexterm> <!-- .sM --> </para> -<funcsynopsis> +<funcsynopsis id='xlockdisplay'> <funcprototype> <funcdef>XLockDisplay</funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3157,7 +3159,7 @@ To unlock a display, use <indexterm significance="preferred"><primary>XUnlockDisplay</primary></indexterm> <!-- .sM --> </para> -<funcsynopsis> +<funcsynopsis id='xunlockdisplay'> <funcprototype> <funcdef>XUnlockDisplay</funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3203,7 +3205,9 @@ for threads using <!-- .LP --> In addition to the connection to the X server, an Xlib implementation may require connections to other kinds of servers (for example, to -input method servers as described in chapter 13). Toolkits and clients +input method servers as described in +<link linkend="locales_and_internationalized_text_functions">chapter 13</link>). +Toolkits and clients that use multiple displays, or that use displays in combination with other inputs, need to obtain these additional connections to correctly block until input is available and need to process that input @@ -3216,7 +3220,7 @@ facilities. To track internal connections for a display, use <function>XAddConnectionWatch</function>. </para> -<funcsynopsis> +<funcsynopsis id='xconnectionwatch'> <funcprototype> <funcdef>type void XConnectionWatchProc</funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3227,7 +3231,7 @@ To track internal connections for a display, use </funcprototype> </funcsynopsis> -<funcsynopsis> +<funcsynopsis id='xaddconnectionwatch'> <funcprototype> <funcdef>Status XAddConnectionWatch</funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3318,7 +3322,7 @@ To stop tracking internal connections for a display, use <para> () </para> -<funcsynopsis> +<funcsynopsis id='xremoveconnectionwatch'> <funcprototype> <funcdef>Status <function>XRemoveConnectionWatch</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3380,7 +3384,7 @@ To process input on an internal connection, use <para> () </para> -<funcsynopsis> +<funcsynopsis id='xprocessinternalconnection'> <funcprototype> <funcdef>void <function>XProcessInternalConnection</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3435,7 +3439,7 @@ To obtain all of the current internal connections for a display, use <para> () </para> -<funcsynopsis> +<funcsynopsis id='xinternalconnectionnumbers'> <funcprototype> <funcdef>Status <function>XInternalConnectionNumbers</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> diff --git a/lib/libX11/specs/libX11/CH03.xml b/lib/libX11/specs/libX11/CH03.xml index 700c7cb97..d26a814c3 100644 --- a/lib/libX11/specs/libX11/CH03.xml +++ b/lib/libX11/specs/libX11/CH03.xml @@ -23,7 +23,8 @@ Because default windows and visual types are defined for each screen, most simple applications need not deal with this complexity. Xlib provides macros and functions that return the default root window, the default depth of the default root window, and the default visual type -(see sections 2.2.1 and 16.7). +(see sections <link linkend="Display_Macros_">2.2.1</link> +and <link linkend="Determining_the_Appropriate_Visual_Type">16.7</link>). </para> <para> <!-- .LP --> @@ -31,7 +32,9 @@ Xlib uses an opaque <structname>Visual</structname> <indexterm significance="preferred"><primary>Visual</primary></indexterm> structure that contains information about the possible color mapping. -The visual utility functions (see section 16.7) use an +The visual utility functions +(see <link linkend="Determining_the_Appropriate_Visual_Type">section 16.7</link>) +use an <structname>XVisualInfo</structname> structure to return this information to an application. The members of this structure pertinent to this discussion are class, red_mask, @@ -176,7 +179,7 @@ use <function>XVisualIDFromVisual</function>. <indexterm significance="preferred"><primary>XVisualIDFromVisual</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xvisualidfromvisual'> <funcprototype> <funcdef>VisualID <function>XVisualIDFromVisual</function></funcdef> <paramdef>Visual *<parameter>visual</parameter></paramdef> @@ -217,7 +220,8 @@ All <symbol>InputOutput</symbol> windows have a border width of zero or more pixels, an optional background, an event suppression mask (which suppresses propagation of events from -children), and a property list (see section 4.3). +children), and a property list +(see <link linkend="Properties_and_Atoms">section 4.3</link>). The window border and background can be a solid color or a pattern, called a tile. All windows except the root have a parent and are clipped by their parent. @@ -231,7 +235,8 @@ obscured area. </para> <para> <!-- .LP --> -Windows also have associated property lists (see section 4.3). +Windows also have associated property lists +(see <link linkend="Properties_and_Atoms">section 4.3</link>). </para> <para> <!-- .LP --> @@ -644,7 +649,7 @@ Otherwise, the initial contents of the exposed regions are undefined. events are then generated for the regions, even if the background-pixmap is <symbol>None</symbol> -(see section 10.9). +(see <link linkend="Exposure_Events">section 10.9</link>). </para> </sect2> <sect2 id="Border_Attribute"> @@ -813,7 +818,8 @@ the corresponding pair defines the change in position of the window within the parent. When a window is so repositioned, a <symbol>GravityNotify</symbol> -event is generated (see section 10.10.5). +event is generated +(see <link linkend="GravityNotify_Events">section 10.10.5</link>). </para> <para> <!-- .LP --> @@ -1066,7 +1072,7 @@ or <symbol>False</symbol> (default). Window managers use this information to avoid tampering with pop-up windows -(see also chapter 14). +(see also <link linkend="inter_client_communication_functions">chapter 14</link>). </para> </sect2> <sect2 id="Colormap_Attribute"> @@ -1161,7 +1167,7 @@ which are discussed in the appropriate toolkit documentation. If you do not use a toolkit, however, you must provide some standard information or hints for the window manager by using the Xlib inter-client communication functions -(see chapter 14). +(see <link linkend="inter_client_communication_functions">chapter 14</link>). </para> <para> <!-- .LP --> @@ -1205,7 +1211,8 @@ you should set these properties for top-level windows before mapping them. <para> <!-- .LP --> For further information, -see chapter 14 and the <emphasis remap='I'>Inter-Client Communication Conventions Manual</emphasis>. +see <link linkend="inter_client_communication_functions">chapter 14</link> and +the <emphasis remap='I'>Inter-Client Communication Conventions Manual</emphasis>. </para> <para> <!-- .LP --> @@ -1241,7 +1248,7 @@ To create an unmapped window and set its window attributes, use <function>XCreateWindow</function>. <indexterm significance="preferred"><primary>XCreateWindow</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcreatewindow'> <funcprototype> <funcdef>Window <function>XCreateWindow</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1506,7 +1513,7 @@ subwindow of a given parent window, use <function>XCreateSimpleWindow</function>. <indexterm significance="preferred"><primary>XCreateSimpleWindow</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcreatesimplewindow'> <funcprototype> <funcdef>Window <function>XCreateSimpleWindow</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1676,7 +1683,7 @@ To destroy a window and all of its subwindows, use <function>XDestroyWindow</function>. <indexterm significance="preferred"><primary>XDestroyWindow</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xdestroywindow'> <funcprototype> <funcdef><function>XDestroyWindow</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1746,7 +1753,7 @@ To destroy all subwindows of a specified window, use <function>XDestroySubwindows</function>. <indexterm significance="preferred"><primary>XDestroySubwindows</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xdestroysubwindows'> <funcprototype> <funcdef><function>XDestroySubwindows</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1868,7 +1875,8 @@ windows and then decide to map the window to its final location. A window manager that wants to provide decoration might reparent the child into a frame first. For further information, -see sections 3.2.8 and 10.10. +see <link linkend="Override_Redirect_Flag">sections 3.2.8</link> +and <link linkend="Window_State_Change_Events_">10.10</link>. Only a single client at a time can select for <symbol>SubstructureRedirectMask</symbol>. </para> @@ -1889,7 +1897,7 @@ To map a given window, use <function>XMapWindow</function>. <indexterm significance="preferred"><primary>XMapWindow</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xmapwindow'> <funcprototype> <funcdef><function>XMapWindow</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2015,7 +2023,7 @@ To map and raise a window, use <function>XMapRaised</function>. <indexterm significance="preferred"><primary>XMapRaised</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xmapraised'> <funcprototype> <funcdef><function>XMapRaised</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2075,7 +2083,7 @@ To map all subwindows for a specified window, use <function>XMapSubwindows</function>. <indexterm significance="preferred"><primary>XMapSubwindows</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xmapsubwindows'> <funcprototype> <funcdef><function>XMapSubwindows</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2145,7 +2153,7 @@ To unmap a window, use <function>XUnmapWindow</function>. <indexterm significance="preferred"><primary>XUnmapWindow</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xunmapwindow'> <funcprototype> <funcdef><function>XUnmapWindow</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2212,7 +2220,7 @@ To unmap all subwindows for a specified window, use <function>XUnmapSubwindows</function>. <indexterm significance="preferred"><primary>XUnmapSubwindows</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xunmapsubwindows'> <funcprototype> <funcdef><function>XUnmapSubwindows</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2295,7 +2303,7 @@ structure are: <!-- .LP --> <literallayout class="monospaced"> -/* Configure window value mask bits */ +/* Configure window value mask bits */ #define CWX (1<<0) #define CWY (1<<1) #define CWWidth (1<<2) @@ -2398,7 +2406,8 @@ children of the window are affected as specified. If a window's size actually changes, the window's subwindows move according to their window gravity. Depending on the window's bit gravity, -the contents of the window also may be moved (see section 3.2.3). +the contents of the window also may be moved +(see <link linkend="Gravity_Attributes">section 3.2.3</link>). </para> <para> <!-- .LP --> @@ -2517,7 +2526,7 @@ To configure a window's size, location, stacking, or border, use <function>XConfigureWindow</function>. <indexterm significance="preferred"><primary>XConfigureWindow</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xconfigurewindow'> <funcprototype> <funcdef><function>XConfigureWindow</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2623,7 +2632,7 @@ To move a window without changing its size, use <function>XMoveWindow</function>. <indexterm significance="preferred"><primary>XMoveWindow</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xmovewindow'> <funcprototype> <funcdef><function>XMoveWindow</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2725,7 +2734,7 @@ To change a window's size without changing the upper-left coordinate, use <function>XResizeWindow</function>. <indexterm significance="preferred"><primary>XResizeWindow</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xresizewindow'> <funcprototype> <funcdef><function>XResizeWindow</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2828,7 +2837,7 @@ To change the size and location of a window, use <function>XMoveResizeWindow</function>. <indexterm significance="preferred"><primary>XMoveResizeWindow</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xmoveresizewindow'> <funcprototype> <funcdef><function>XMoveResizeWindow</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2949,7 +2958,7 @@ To change the border width of a given window, use <function>XSetWindowBorderWidth</function>. <indexterm significance="preferred"><primary>XSetWindowBorderWidth</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsetwindowborderwidth'> <funcprototype> <funcdef><function>XSetWindowBorderWidth</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3026,7 +3035,7 @@ To raise a window so that no sibling window obscures it, use <function>XRaiseWindow</function>. <indexterm significance="preferred"><primary>XRaiseWindow</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xraisewindow'> <funcprototype> <funcdef><function>XRaiseWindow</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3099,7 +3108,7 @@ To lower a window so that it does not obscure any sibling windows, use <function>XLowerWindow</function>. <indexterm significance="preferred"><primary>XLowerWindow</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xlowerwindow'> <funcprototype> <funcdef><function>XLowerWindow</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3173,7 +3182,7 @@ To circulate a subwindow up or down, use <function>XCirculateSubwindows</function>. <indexterm significance="preferred"><primary>XCirculateSubwindows</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcirculatesubwindows'> <funcprototype> <funcdef><function>XCirculateSubwindows</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3265,7 +3274,7 @@ occluded by another child, use <function>XCirculateSubwindowsUp</function>. <indexterm significance="preferred"><primary>XCirculateSubwindowsUp</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcirculatesubwindowsup'> <funcprototype> <funcdef><function>XCirculateSubwindowsUp</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3327,7 +3336,7 @@ completely occludes another child, use <function>XCirculateSubwindowsDown</function>. <indexterm significance="preferred"><primary>XCirculateSubwindowsDown</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcirculatesubwindowsdown'> <funcprototype> <funcdef><function>XCirculateSubwindowsDown</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3386,7 +3395,7 @@ To restack a set of windows from top to bottom, use <function>XRestackWindows</function>. <indexterm significance="preferred"><primary>XRestackWindows</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xrestackwindows'> <funcprototype> <funcdef><function>XRestackWindows</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3491,7 +3500,7 @@ To change one or more attributes for a given window, use <function>XChangeWindowAttributes</function>. <indexterm significance="preferred"><primary>XChangeWindowAttributes</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xchangewindowattributes'> <funcprototype> <funcdef><function>XChangeWindowAttributes</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3558,7 +3567,7 @@ Specifies the structure from which the values (as specified by the value mask) are to be taken. The value mask should have the appropriate bits set to indicate which attributes have been set in the structure -(see section 3.2). +(see <link linkend="Window_Attributes">section 3.2</link>). </para> </listitem> </varlistentry> @@ -3649,7 +3658,7 @@ To set the background of a window to a given pixel, use <function>XSetWindowBackground</function>. <indexterm significance="preferred"><primary>XSetWindowBackground</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsetwindowbackground'> <funcprototype> <funcdef><function>XSetWindowBackground</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3726,7 +3735,7 @@ To set the background of a window to a given pixmap, use <indexterm><primary>Window</primary><secondary>background</secondary></indexterm> <indexterm significance="preferred"><primary>XSetWindowBackgroundPixmap</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsetwindowbackgroundpixmap'> <funcprototype> <funcdef><function>XSetWindowBackgroundPixmap</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3818,7 +3827,7 @@ To change and repaint a window's border to a given pixel, use <function>XSetWindowBorder</function>. <indexterm significance="preferred"><primary>XSetWindowBorder</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsetwindowborder'> <funcprototype> <funcdef><function>XSetWindowBorder</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3888,7 +3897,7 @@ To change and repaint the border tile of a given window, use <function>XSetWindowBorderPixmap</function>. <indexterm significance="preferred"><primary>XSetWindowBorderPixmap</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsetwindowborderpixmap'> <funcprototype> <funcdef><function>XSetWindowBorderPixmap</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3967,7 +3976,7 @@ To set the colormap of a given window, use <function>XSetWindowColormap</function>. <indexterm significance="preferred"><primary>XSetWindowColormap</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsetwindowcolormap'> <funcprototype> <funcdef><function>XSetWindowColormap</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -4038,7 +4047,7 @@ To define which cursor will be used in a window, use <indexterm><primary>Window</primary><secondary>defining the cursor</secondary></indexterm> <indexterm significance="preferred"><primary>XDefineCursor</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xdefinecursor'> <funcprototype> <funcdef><function>XDefineCursor</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -4107,7 +4116,7 @@ To undefine the cursor in a given window, use <indexterm><primary>Window</primary><secondary>undefining the cursor</secondary></indexterm> <indexterm significance="preferred"><primary>XUndefineCursor</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xundefinecursor'> <funcprototype> <funcdef><function>XUndefineCursor</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> diff --git a/lib/libX11/specs/libX11/CH04.xml b/lib/libX11/specs/libX11/CH04.xml index 8a3e8c535..79f8fa949 100644 --- a/lib/libX11/specs/libX11/CH04.xml +++ b/lib/libX11/specs/libX11/CH04.xml @@ -40,7 +40,7 @@ a given window, use <indexterm><primary>Parent Window</primary></indexterm> <indexterm significance="preferred"><primary>XQueryTree</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xquerytree'> <funcprototype> <funcdef>Status <function>XQueryTree</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -147,7 +147,7 @@ To obtain the current attributes of a given window, use <function>XGetWindowAttributes</function>. <indexterm significance="preferred"><primary>XGetWindowAttributes</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xgetwindowattributes'> <funcprototype> <funcdef>Status <function>XGetWindowAttributes</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -291,7 +291,7 @@ and can be one of the following: <para> <!-- .LP --> For additional information on gravity, -see section 3.2.3. <!-- xref --> +see <link linkend="Gravity_Attributes">section 3.2.3</link>. </para> <para> <!-- .LP --> @@ -372,7 +372,7 @@ To obtain the current geometry of a given drawable, use <function>XGetGeometry</function>. <indexterm significance="preferred"><primary>XGetGeometry</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xgetgeometry'> <funcprototype> <funcdef>Status <function>XGetGeometry</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -533,7 +533,7 @@ space of another window, use <function>XTranslateCoordinates</function>. <indexterm significance="preferred"><primary>XTranslateCoordinates</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xtranslatecoordinates'> <funcprototype> <funcdef>Bool <function>XTranslateCoordinates</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -667,7 +667,7 @@ or to determine the pointer coordinates relative to a specified window, use <function>XQueryPointer</function>. <indexterm significance="preferred"><primary>XQueryPointer</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xquerypointer'> <funcprototype> <funcdef>Bool <function>XQueryPointer</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -817,7 +817,7 @@ the current state of the mouse buttons and the modifier keys. <!-- .LP --> Note that the logical state of a device (as seen through Xlib) may lag the physical state if device event processing is frozen -(see section 12.1). <!-- xref --> +(see <link linkend="Pointer_Grabbing_">section 12.1</link>). </para> <para> <!-- .LP --> @@ -867,7 +867,7 @@ If you define further properties of complex type, you must encode and decode them yourself. These functions must be carefully written if they are to be portable. For further information about how to write a library extension, -see appendix C. <!-- xref --> +see <link linkend="extensions">appendix C</link>. <!-- .NE --> The type of a property is defined by an atom, which allows for arbitrary extension in this type scheme. @@ -887,7 +887,7 @@ To avoid name clashes with user symbols, the name for each atom has the XA_ prefix. For an explanation of the functions that let you get and set much of the information stored in these predefined properties, -see chapter 14. <!-- xref --> +see <link linkend="inter_client_communication_functions">chapter 14</link>. </para> <para> <!-- .LP --> @@ -1040,7 +1040,7 @@ The built-in font property names are: <para> <!-- .LP --> For further information about font properties, -see section 8.5. <!-- xref --> +see <link linkend="Font_Metrics">section 8.5</link>. </para> <para> <!-- .LP --> @@ -1050,7 +1050,7 @@ To return an atom for a given name, use <indexterm><primary>Atom</primary><secondary>interning</secondary></indexterm> <indexterm significance="preferred"><primary>XInternAtom</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xinternatom'> <funcprototype> <funcdef>Atom <function>XInternAtom</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1132,7 +1132,7 @@ To return atoms for an array of names, use <indexterm><primary>Atom</primary><secondary>interning</secondary></indexterm> <indexterm significance="preferred"><primary>XInternAtoms</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xinternatoms'> <funcprototype> <funcdef>Status <function>XInternAtoms</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1233,7 +1233,7 @@ To return a name for a given atom identifier, use <indexterm><primary>Atom</primary><secondary>getting name</secondary></indexterm> <indexterm significance="preferred"><primary>XGetAtomName</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xgetatomname'> <funcprototype> <funcdef>char *<function>XGetAtomName</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1292,7 +1292,7 @@ To return the names for an array of atom identifiers, use <indexterm><primary>Atom</primary><secondary>getting name</secondary></indexterm> <indexterm significance="preferred"><primary>XGetAtomNames</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xgetatomnames'> <funcprototype> <funcdef>Status <function>XGetAtomNames</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1381,7 +1381,8 @@ error. <para> <!-- .LP --> You can attach a property list to every window. -Each property has a name, a type, and a value (see section 4.3). <!-- xref --> +Each property has a name, a type, and a value +(see <link linkend="Properties_and_Atoms">section 4.3</link>). The value is an array of 8-bit, 16-bit, or 32-bit quantities, whose interpretation is left to the clients. The type <type>char</type> @@ -1396,7 +1397,8 @@ is used to represent 32-bit quantities. Xlib provides functions that you can use to obtain, change, update, or interchange window properties. In addition, Xlib provides other utility functions for inter-client -communication (see chapter 14). <!-- xref --> +communication +(see <link linkend="inter_client_communication_functions">chapter 14</link>). </para> <para> <!-- .LP --> @@ -1409,7 +1411,7 @@ To obtain the type, format, and value of a property of a given window, use <!-- .LP --> <indexterm significance="preferred"><primary>XGetWindowProperty</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xgetwindowproperty'> <funcprototype> <funcdef>int <function>XGetWindowProperty</function></funcdef> <paramdef><parameter> display</parameter></paramdef> @@ -1689,7 +1691,7 @@ To obtain a given window's property list, use <indexterm><primary>Property</primary><secondary>listing</secondary></indexterm> <indexterm significance="preferred"><primary>XListProperties</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xlistproperties'> <funcprototype> <funcdef>Atom *<function>XListProperties</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1762,7 +1764,7 @@ To change a property of a given window, use <indexterm><primary>Property</primary><secondary>type</secondary></indexterm> <indexterm significance="preferred"><primary>XChangeProperty</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xchangeproperty'> <funcprototype> <funcdef><function>XChangeProperty</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1934,7 +1936,7 @@ The lifetime of a property is not tied to the storing client. Properties remain until explicitly deleted, until the window is destroyed, or until the server resets. For a discussion of what happens when the connection to the X server is closed, -see section 2.6. <!-- xref --> +see <link linkend="Using_X_Server_Connection_Close_Operations_">section 2.6</link>. The maximum size of a property is server dependent and can vary dynamically depending on the amount of memory the server has available. (If there is insufficient space, a @@ -1963,7 +1965,7 @@ To rotate a window's property list, use <!-- .LP --> <indexterm significance="preferred"><primary>XRotateWindowProperties</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xrotatewindowproperties'> <funcprototype> <funcdef><function>XRotateWindowProperties</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2077,7 +2079,7 @@ To delete a property on a given window, use <indexterm><primary>Property</primary><secondary>deleting</secondary></indexterm> <indexterm significance="preferred"><primary>XDeleteProperty</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xdeleteproperty'> <funcprototype> <funcdef><function>XDeleteProperty</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2200,7 +2202,7 @@ To set the selection owner, use <indexterm><primary>Selection</primary><secondary>setting the owner</secondary></indexterm> <indexterm significance="preferred"><primary>XSetSelectionOwner</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsetselectionowner'> <funcprototype> <funcdef><function>XSetSelectionOwner</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2323,7 +2325,7 @@ To return the selection owner, use <indexterm><primary>Selection</primary><secondary>getting the owner</secondary></indexterm> <indexterm significance="preferred"><primary>XGetSelectionOwner</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xgetselectionowner'> <funcprototype> <funcdef>Window <function>XGetSelectionOwner</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2385,7 +2387,7 @@ To request conversion of a selection, use <indexterm><primary>Selection</primary><secondary>converting</secondary></indexterm> <indexterm significance="preferred"><primary>XConvertSelection</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xconvertselection'> <funcprototype> <funcdef><function>XConvertSelection</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> diff --git a/lib/libX11/specs/libX11/CH05.xml b/lib/libX11/specs/libX11/CH05.xml index c5dcdcab8..6df3509a6 100644 --- a/lib/libX11/specs/libX11/CH05.xml +++ b/lib/libX11/specs/libX11/CH05.xml @@ -24,7 +24,7 @@ To create a pixmap of a given size, use <function>XCreatePixmap</function>. <indexterm significance="preferred"><primary>XCreatePixmap</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcreatepixmap'> <funcprototype> <funcdef>Pixmap <function>XCreatePixmap</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -136,7 +136,7 @@ To free all storage associated with a specified pixmap, use <function>XFreePixmap</function>. <indexterm significance="preferred"><primary>XFreePixmap</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xfreepixmap'> <funcprototype> <funcdef><function>XFreePixmap</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -228,7 +228,7 @@ To create a cursor from the standard cursor font, use <indexterm significance="preferred"><primary>XCreateFontCursor</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcreatefontcursor'> <funcprototype> <funcdef>Cursor <function>XCreateFontCursor</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -277,7 +277,7 @@ The initial colors of a cursor are a black foreground and a white background (see <function>XRecolorCursor</function>). For further information about cursor shapes, -see appendix B. +see <link linkend="x_font_cursors">appendix B</link>. </para> <para> <!-- .LP --> @@ -295,7 +295,7 @@ To create a cursor from font glyphs, use <function>XCreateGlyphCursor</function>. <indexterm significance="preferred"><primary>XCreateGlyphCursor</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcreateglyphcursor'> <funcprototype> <funcdef>Cursor <function>XCreateGlyphCursor</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -434,7 +434,7 @@ use <function>XCreatePixmapCursor</function>. <indexterm significance="preferred"><primary>XCreatePixmapCursor</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcreatepixmapcursor'> <funcprototype> <funcdef>Cursor <function>XCreatePixmapCursor</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -581,7 +581,7 @@ To determine useful cursor sizes, use <function>XQueryBestCursor</function>. <indexterm significance="preferred"><primary>XQueryBestCursor</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xquerybestcursor'> <funcprototype> <funcdef>Status <function>XQueryBestCursor</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -686,7 +686,7 @@ To change the color of a given cursor, use <function>XRecolorCursor</function>. <indexterm significance="preferred"><primary>XRecolorCursor</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xrecolorcursor'> <funcprototype> <funcdef><function>XRecolorCursor</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -764,7 +764,7 @@ To free (destroy) a given cursor, use <function>XFreeCursor</function>. <indexterm significance="preferred"><primary>XFreeCursor</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xfreecursor'> <funcprototype> <funcdef><function>XFreeCursor</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> diff --git a/lib/libX11/specs/libX11/CH06.xml b/lib/libX11/specs/libX11/CH06.xml index 832a4101e..bd3c1adc3 100644 --- a/lib/libX11/specs/libX11/CH06.xml +++ b/lib/libX11/specs/libX11/CH06.xml @@ -172,7 +172,7 @@ Possible visual types are <symbol>TrueColor</symbol>, or <symbol>DirectColor</symbol> -(see section 3.1). +(see <link linkend="Visual_Types">section 3.1</link>). </para> <sect1 id="Color_Structures"> <title>Color Structures</title> @@ -273,7 +273,7 @@ The following macros define standard formats. </para> <literallayout class="monospaced"> -#define XcmsUndefinedFormat 0x00000000 +#define XcmsUndefinedFormat 0x00000000 #define XcmsCIEXYZFormat 0x00000001 /* CIE XYZ */ #define XcmsCIEuvYFormat 0x00000002 /* CIE u'v'Y */ #define XcmsCIExyYFormat 0x00000003 /* CIE xyY */ @@ -294,7 +294,7 @@ it indicates that the color specification is in a device-dependent form; otherwise, it is in a device-independent form. If the 31st bit is set, this indicates that the color space has been added to Xlib at run time -(see section 6.12.4). +(see <link linkend="Creating_Additional_Color_Spaces">section 6.12.4</link>). The format value for a color space added at run time may be different each time the program is executed. If references to such a color space must be made outside the client @@ -814,7 +814,7 @@ To create a colormap for a screen, use <function>XCreateColormap</function>.</para> <indexterm significance="preferred"><primary>XCreateColormap</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcreatecolormap'> <funcprototype> <funcdef>Colormap <function>XCreateColormap</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -917,7 +917,7 @@ if alloc is the colormap initially has no allocated entries, and clients can allocate them. For information about the visual types, -see section 3.1. +see <link linkend="Visual_Types">section 3.1</link>. </para> <para> <!-- .LP --> @@ -963,7 +963,7 @@ shared colormap has failed because of resource exhaustion, use <function>XCopyColormapAndFree</function>. <indexterm significance="preferred"><primary>XCopyColormapAndFree</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcopycolormapandfree'> <funcprototype> <funcdef>Colormap <function>XCopyColormapAndFree</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1040,7 +1040,7 @@ To destroy a colormap, use <indexterm significance="preferred"><primary>XFreeColormap</primary></indexterm> </para> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xfreecolormap'> <funcprototype> <funcdef><function>XFreeColormap</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1119,7 +1119,7 @@ To map a color name to an <acronym>RGB</acronym> value, use <indexterm significance="preferred"><primary>XLookupColor</primary></indexterm> <!-- .sM --> </para> -<funcsynopsis> +<funcsynopsis id='xlookupcolor'> <funcprototype> <funcdef>Status <function>XLookupColor</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1216,7 +1216,7 @@ To map a color name to the exact <acronym>RGB</acronym> value, use <indexterm><primary>Color</primary><secondary>naming</secondary></indexterm> <indexterm significance="preferred"><primary>XParseColor</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xparsecolor'> <funcprototype> <funcdef>Status <function>XParseColor</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1306,7 +1306,7 @@ To map a color name to a value in an arbitrary color space, use <indexterm><primary>Color</primary><secondary>naming</secondary></indexterm> <indexterm significance="preferred"><primary>XcmsLookupColor</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcmslookupcolor'> <funcprototype> <funcdef>Status <function>XcmsLookupColor</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1462,7 +1462,7 @@ To allocate a read-only color cell with an <acronym>RGB</acronym> value, use <indexterm><primary>Color</primary><secondary>allocation</secondary></indexterm> <indexterm significance="preferred"><primary>XAllocColor</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xalloccolor'> <funcprototype> <funcdef>Status <function>XAllocColor</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1552,7 +1552,7 @@ To allocate a read-only color cell with a color in arbitrary format, use <indexterm><primary>Color</primary><secondary>allocation</secondary></indexterm> <indexterm significance="preferred"><primary>XcmsAllocColor</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcmsalloccolor'> <funcprototype> <funcdef>Status <function>XcmsAllocColor</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1657,7 +1657,7 @@ color supported by the hardware in <acronym>RGB</acronym> format, use <indexterm><primary>Color</primary><secondary>allocation</secondary></indexterm> <indexterm significance="preferred"><primary>XAllocNamedColor</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xallocnamedcolor'> <funcprototype> <funcdef>Status <function>XAllocNamedColor</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1762,7 +1762,7 @@ color supported by the hardware in an arbitrary format, use <indexterm><primary>Color</primary><secondary>allocation</secondary></indexterm> <indexterm significance="preferred"><primary>XcmsAllocNamedColor</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcmsallocnamedcolor'> <funcprototype> <funcdef>Status <function>XcmsAllocNamedColor</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1911,7 +1911,7 @@ model, use <indexterm><primary>Color</primary><secondary>allocation</secondary></indexterm> <indexterm significance="preferred"><primary>XAllocColorCells</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xalloccolorcells'> <funcprototype> <funcdef>Status <function>XAllocColorCells</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2065,7 +2065,7 @@ model, use <indexterm><primary>Color</primary><secondary>allocation</secondary></indexterm> <indexterm significance="preferred"><primary>XAllocColorPlanes</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xalloccolorplanes'> <funcprototype> <funcdef>Status <function>XAllocColorPlanes</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2267,7 +2267,7 @@ To free colormap cells, use <indexterm><primary>Color</primary><secondary>deallocation</secondary></indexterm> <!-- .sM --> </para> -<funcsynopsis> +<funcsynopsis id='xfreecolors'> <funcprototype> <funcdef><function>XFreeColors</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2408,7 +2408,7 @@ To store an <acronym>RGB</acronym> value in a single colormap cell, use <indexterm><primary>Color</primary><secondary>storing</secondary></indexterm> <indexterm significance="preferred"><primary>XStoreColor</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xstorecolor'> <funcprototype> <funcdef><function>XStoreColor</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2500,7 +2500,7 @@ To store multiple <acronym>RGB</acronym> values in multiple colormap cells, use <indexterm><primary>Color</primary><secondary>storing</secondary></indexterm> <indexterm significance="preferred"><primary>XStoreColors</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xstorecolors'> <funcprototype> <funcdef><function>XStoreColors</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2606,7 +2606,7 @@ To store a color of arbitrary format in a single colormap cell, use <indexterm><primary>Color</primary><secondary>storing</secondary></indexterm> <indexterm significance="preferred"><primary>XcmsStoreColor</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcmsstorecolor'> <funcprototype> <funcdef>Status <function>XcmsStoreColor</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2717,7 +2717,7 @@ To store multiple colors of arbitrary format in multiple colormap cells, use <indexterm><primary>Color</primary><secondary>storing</secondary></indexterm> <indexterm significance="preferred"><primary>XcmsStoreColors</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcmsstorecolors'> <funcprototype> <funcdef>Status <function>XcmsStoreColors</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2862,7 +2862,7 @@ To store a color specified by name in a single colormap cell, use <indexterm><primary>Color</primary><secondary>naming</secondary></indexterm> <indexterm significance="preferred"><primary>XStoreNamedColor</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xstorenamedcolor'> <funcprototype> <funcdef><function>XStoreNamedColor</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2992,7 +2992,7 @@ To query the <acronym>RGB</acronym> value of a single colormap cell, use <indexterm><primary>Color</primary><secondary>querying</secondary></indexterm> <indexterm significance="preferred"><primary>XQueryColor</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xquerycolor'> <funcprototype> <funcdef><function>XQueryColor</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3066,7 +3066,7 @@ To query the <acronym>RGB</acronym> values of multiple colormap cells, use <indexterm><primary>Color</primary><secondary>querying</secondary></indexterm> <indexterm significance="preferred"><primary>XQueryColors</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xquerycolors'> <funcprototype> <funcdef><function>XQueryColors</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3156,7 +3156,7 @@ To query the color of a single colormap cell in an arbitrary format, use <indexterm><primary>Color</primary><secondary>querying</secondary></indexterm> <indexterm significance="preferred"><primary>XcmsQueryColor</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcmsquerycolor'> <funcprototype> <funcdef>Status <function>XcmsQueryColor</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3245,7 +3245,7 @@ To query the color of multiple colormap cells in an arbitrary format, use <indexterm><primary>Color</primary><secondary>querying</secondary></indexterm> <indexterm significance="preferred"><primary>XcmsQueryColors</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcmsquerycolors'> <funcprototype> <funcdef>Status <function>XcmsQueryColors</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3404,7 +3404,7 @@ To obtain the CCC associated with a colormap, use <indexterm><primary>CCC</primary><secondary>of colormap</secondary></indexterm> <indexterm><primary>Color Conversion Context</primary><secondary>of colormap</secondary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcmscccofcolormap'> <funcprototype> <funcdef>XcmsCCC <function>XcmsCCCOfColormap</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3459,7 +3459,7 @@ To change the CCC associated with a colormap, use <indexterm><primary>CCC</primary><secondary>of colormap</secondary></indexterm> <indexterm><primary>Color Conversion Context</primary><secondary>of colormap</secondary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcmssetcccofcolormap'> <funcprototype> <funcdef>XcmsCCC <function>XcmsSetCCCOfColormap</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3539,7 +3539,7 @@ To obtain the default CCC for a screen, use <indexterm><primary>Color Conversion Context</primary><secondary>default</secondary></indexterm> <indexterm><primary>CCC</primary><secondary>default</secondary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcmsdefaultccc'> <funcprototype> <funcdef>XcmsCCC <function>XcmsDefaultCCC</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3601,14 +3601,14 @@ can return. <indexterm significance="preferred"><primary>XcmsDisplayOfCCC</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='displayofccc'> <funcprototype> <funcdef><function>DisplayOfCCC</function></funcdef> <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef> </funcprototype> </funcsynopsis> -<funcsynopsis> +<funcsynopsis id='xcmsdisplayofccc'> <funcprototype> <funcdef>Display *<function>XcmsDisplayOfCCC</function></funcdef> <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef> @@ -3638,14 +3638,14 @@ Both return the display associated with the specified CCC. <indexterm significance="preferred"><primary>VisualOfCCC</primary></indexterm> <indexterm significance="preferred"><primary>XcmsVisualOfCCC</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='visualofccc'> <funcprototype> <funcdef><function>VisualOfCCC</function></funcdef> <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef> </funcprototype> </funcsynopsis> -<funcsynopsis> +<funcsynopsis id='xcmsvisualofccc'> <funcprototype> <funcdef>Visual *<function>XcmsVisualOfCCC</function></funcdef> <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef> @@ -3675,14 +3675,14 @@ Both return the visual associated with the specified CCC. <indexterm significance="preferred"><primary>ScreenNumberOfCCC</primary></indexterm> <indexterm significance="preferred"><primary>XcmsScreenNumberOfCCC</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='screennumberofccc'> <funcprototype> <funcdef><function>ScreenNumberOfCCC</function></funcdef> <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef> </funcprototype> </funcsynopsis> -<funcsynopsis> +<funcsynopsis id='xcmsscreennumberofccc'> <funcprototype> <funcdef>int <function>XcmsScreenNumberOfCCC</function></funcdef> <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef> @@ -3712,13 +3712,13 @@ Both return the number of the screen associated with the specified CCC. <indexterm significance="preferred"><primary>ScreenWhitePointOfCCC</primary></indexterm> <indexterm significance="preferred"><primary>XcmsScreenWhitePointOfCCC</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='screenwhitepointofccc'> <funcprototype> <funcdef><function>ScreenWhitePointOfCCC</function></funcdef> <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef> </funcprototype> </funcsynopsis> -<funcsynopsis> +<funcsynopsis id='xcmsscreenwhitepointofccc'> <funcprototype> <funcdef>XcmsColor <function>XcmsScreenWhitePointOfCCC</function></funcdef> <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef> @@ -3748,14 +3748,14 @@ Both return the white point of the screen associated with the specified CCC. <indexterm significance="preferred"><primary>ClientWhitePointOfCCC</primary></indexterm> <indexterm significance="preferred"><primary>XcmsClientWhitePointOfCCC</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='clientwhitepointofccc'> <funcprototype> <funcdef> <function>ClientWhitePointOfCCC</function></funcdef> <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef> </funcprototype> </funcsynopsis> -<funcsynopsis> +<funcsynopsis id='xcmsclientwhitepointofccc'> <funcprototype> <funcdef>XcmsColor *<function>XcmsClientWhitePointOfCCC</function></funcdef> <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef> @@ -3795,7 +3795,7 @@ To set the Client White Point in the CCC, use <indexterm significance="preferred"><primary>XcmsSetWhitePoint</primary></indexterm> <indexterm><primary>Client White Point</primary><secondary>of Color Conversion Context</secondary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcmssetwhitepoint'> <funcprototype> <funcdef>Status <function>XcmsSetWhitePoint</function></funcdef> <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef> @@ -3866,7 +3866,7 @@ in a specified CCC, use <indexterm><primary>Gamut compression</primary><secondary>procedure</secondary></indexterm> <indexterm><primary>Gamut compression</primary><secondary>client data</secondary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcmssetcompressionproc'> <funcprototype> <funcdef>XcmsCompressionProc <function>XcmsSetCompressionProc</function></funcdef> <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef> @@ -3935,7 +3935,7 @@ in a specified CCC, use <indexterm><primary>White point adjustment</primary><secondary>setting in Color Conversion Context</secondary></indexterm> <indexterm><primary>White point adjustment</primary><secondary>procedure</secondary></indexterm> <indexterm><primary>White point adjustment</primary><secondary>client data</secondary></indexterm> -<funcsynopsis> +<funcsynopsis id='xcmssetwhiteadjustproc'> <funcprototype> <funcdef>XcmsWhiteAdjustProc <function>XcmsSetWhiteAdjustProc</function></funcdef> <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef> @@ -4012,7 +4012,7 @@ To create a CCC, use <indexterm><primary>Color Conversion Context</primary><secondary>creation</secondary></indexterm> <indexterm><primary>CCC</primary><secondary>creation</secondary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcmscreateccc'> <funcprototype> <funcdef>XcmsCCC <function>XcmsCreateCCC</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -4139,7 +4139,7 @@ To free a CCC, use <indexterm><primary>Color Conversion Context</primary><secondary>freeing</secondary></indexterm> <indexterm><primary>CCC</primary><secondary>freeing</secondary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcmsfreeccc'> <funcprototype> <funcdef>void <function>XcmsFreeCCC</function></funcdef> <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef> @@ -4186,7 +4186,7 @@ to a single destination format, use <indexterm><primary>Color</primary><secondary>conversion</secondary></indexterm> <indexterm significance="preferred"><primary>XcmsConvertColors</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcmsconvertcolors'> <funcprototype> <funcdef>Status <function>XcmsConvertColors</function></funcdef> <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef> @@ -4330,7 +4330,7 @@ following: </para> <indexterm significance="preferred"><primary>XcmsCompressionProc</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcmscompressionproc'> <funcprototype> <funcdef>typedef Status<function>(*XcmsCompressionProc</function>)</funcdef> <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef> @@ -4657,7 +4657,7 @@ The white point adjustment procedure interface must adhere to the following: </para> <indexterm significance="preferred"><primary>XcmsWhiteAdjustProc</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcmswhiteadjustproc'> <funcprototype> <funcdef>typedef Status <function>(*XcmsWhiteAdjustProc</function>)</funcdef> <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef> @@ -5020,7 +5020,7 @@ To obtain the color specification for black </para> <indexterm significance="preferred"><primary>XcmsQueryBlack</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcmsqueryblack'> <funcprototype> <funcdef>Status <function>XcmsQueryBlack</function></funcdef> <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef> @@ -5086,7 +5086,7 @@ To obtain the color specification for blue </para> <indexterm significance="preferred"><primary>XcmsQueryBlue</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcmsqueryblue'> <funcprototype> <funcdef>Status <function>XcmsQueryBlue</function></funcdef> <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef> @@ -5152,7 +5152,7 @@ To obtain the color specification for green </para> <indexterm significance="preferred"><primary>XcmsQueryGreen</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcmsquerygreen'> <funcprototype> <funcdef>Status <function>XcmsQueryGreen</function></funcdef> <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef> @@ -5218,7 +5218,7 @@ To obtain the color specification for red </para> <indexterm significance="preferred"><primary>XcmsQueryRed</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcmsqueryred'> <funcprototype> <funcdef>Status <function>XcmsQueryRed</function></funcdef> <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef> @@ -5284,7 +5284,7 @@ To obtain the color specification for white </para> <indexterm significance="preferred"><primary>XcmsQueryWhite</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcmsquerywhite'> <funcprototype> <funcdef>Status <function>XcmsQueryWhite</function></funcdef> <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef> @@ -5372,7 +5372,7 @@ for a given Psychometric Hue Angle and <acronym>CIE</acronym> metric lightness ( </para> <indexterm significance="preferred"><primary>XcmsCIELabQueryMaxC</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcmscielabquerymaxc'> <funcprototype> <funcdef>Status <function>XcmsCIELabQueryMaxC</function></funcdef> <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef> @@ -5456,7 +5456,7 @@ for a given Psychometric Hue Angle and Psychometric Chroma, use <indexterm><primary><acronym>CIE</acronym> metric lightness</primary><secondary>maximum</secondary></indexterm> <indexterm significance="preferred"><primary>XcmsCIELabQueryMaxL</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcmscielabquerymaxl'> <funcprototype> <funcdef>Status <function>XcmsCIELabQueryMaxL</function></funcdef> <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef> @@ -5547,7 +5547,7 @@ for a given Psychometric Hue Angle, use <indexterm><primary><acronym>CIE</acronym> metric lightness</primary><secondary>maximum</secondary></indexterm> <indexterm significance="preferred"><primary>XcmsCIELabQueryMaxLC</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcmscielabquerymaxlc'> <funcprototype> <funcdef>Status <function>XcmsCIELabQueryMaxLC</function></funcdef> <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef> @@ -5619,7 +5619,7 @@ for a given Psychometric Hue Angle and Psychometric Chroma, use <indexterm><primary><acronym>CIE</acronym> metric lightness</primary><secondary>minimum</secondary></indexterm> <indexterm significance="preferred"><primary>XcmsCIELabQueryMinL</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcmscielabqueryminlc'> <funcprototype> <funcdef>Status <function>XcmsCIELabQueryMinL</function></funcdef> <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef> @@ -5729,7 +5729,7 @@ for a given Psychometric Hue Angle and <acronym>CIE</acronym> metric lightness ( </para> <indexterm significance="preferred"><primary>XcmsCIELuvQueryMaxC</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcmxcieluvquerymaxc'> <funcprototype> <funcdef>Status <function>XcmsCIELuvQueryMaxC</function></funcdef> <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef> @@ -5813,7 +5813,7 @@ for a given Psychometric Hue Angle and Psychometric Chroma, use <indexterm><primary><acronym>CIE</acronym> metric lightness</primary><secondary>maximum</secondary></indexterm> <indexterm significance="preferred"><primary>XcmsCIELuvQueryMaxL</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcmscieluvquerymaxl'> <funcprototype> <funcdef>Status <function>XcmsCIELuvQueryMaxL</function></funcdef> <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef> @@ -5904,7 +5904,7 @@ for a given Psychometric Hue Angle, use <indexterm><primary><acronym>CIE</acronym> metric lightness</primary><secondary>maximum</secondary></indexterm> <indexterm significance="preferred"><primary>XcmsCIELuvQueryMaxLC</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcmscieluvquerymaxlc'> <funcprototype> <funcdef>Status <function>XcmsCIELuvQueryMaxLC</function></funcdef> <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef> @@ -5976,7 +5976,7 @@ for a given Psychometric Hue Angle and Psychometric Chroma, use <indexterm><primary><acronym>CIE</acronym> metric lightness</primary><secondary>minimum</secondary></indexterm> <indexterm significance="preferred"><primary>XcmsCIELuvQueryMinL</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcmscieluvqueryminl'> <funcprototype> <funcdef>Status <function>XcmsCIELuvQueryMinL</function></funcdef> <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef> @@ -6067,7 +6067,7 @@ To obtain the maximum Chroma for a given Hue and Value, use <indexterm><primary>Chroma</primary><secondary>maximum</secondary></indexterm> <indexterm significance="preferred"><primary>XcmsTekHVCQueryMaxC</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcmstekhvcquerymaxc'> <funcprototype> <funcdef>Status <function>XcmsTekHVCQueryMaxC</function></funcdef> <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef> @@ -6150,7 +6150,7 @@ To obtain the maximum Value for a given Hue and Chroma, use <indexterm><primary>Value</primary><secondary>maximum</secondary></indexterm> <indexterm significance="preferred"><primary>XcmsTekHVCQueryMaxV</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcmstekhvcquerymaxv'> <funcprototype> <funcdef>Status <function>XcmsTekHVCQueryMaxV</function></funcdef> <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef> @@ -6237,7 +6237,7 @@ for a specified Hue, use <indexterm><primary>Value</primary><secondary>maximum</secondary></indexterm> <indexterm significance="preferred"><primary>XcmsTekHVCQueryMaxVC</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcmstekhvcquerymaxvc'> <funcprototype> <funcdef>Status <function>XcmsTekHVCQueryMaxVC</function></funcdef> <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef> @@ -6315,7 +6315,7 @@ Chroma at which the maximum Values are reached, use <indexterm><primary>Value</primary><secondary>maximum</secondary></indexterm> <indexterm significance="preferred"><primary>XcmsTekHVCQueryMaxVSamples</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcmstekhvcquerymaxvsamples'> <funcprototype> <funcdef>Status <function>XcmsTekHVCQueryMaxVSamples</function></funcdef> <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef> @@ -6396,7 +6396,7 @@ To obtain the minimum Value for a given Hue and Chroma, use <indexterm><primary>Value</primary><secondary>minimum</secondary></indexterm> <indexterm significance="preferred"><primary>XcmsTekHVCQueryMinV</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcmstekhvcqueryminv'> <funcprototype> <funcdef>Status <function>XcmsTekHVCQueryMinV</function></funcdef> <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef> @@ -6554,7 +6554,7 @@ To add a device-independent color space, use </para> <indexterm significance="preferred"><primary>XcmsAddColorSpace</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcmsaddcolorspace'> <funcprototype> <funcdef>Status <function>XcmsAddColorSpace</function></funcdef> <paramdef>XcmsColorSpace<parameter> *color_space</parameter></paramdef> @@ -6622,7 +6622,7 @@ associated with a specified color string prefix, use </para> <indexterm significance="preferred"><primary>XcmsFormatOfPrefix</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcmsformatofprefix'> <funcprototype> <funcdef>XcmsColorFormat <function>XcmsFormatOfPrefix</function></funcdef> <paramdef>char<parameter> *prefix</parameter></paramdef> @@ -6664,7 +6664,7 @@ specified by a color format, use </para> <indexterm significance="preferred"><primary>XcmsPrefixOfFormat</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcmsprefixofformat'> <funcprototype> <funcdef>char *<function>XcmsPrefixOfFormat</function></funcdef> <paramdef>XcmsColorFormat<parameter> format</parameter></paramdef> @@ -6808,7 +6808,7 @@ adhere to the following software interface specification: </para> <indexterm significance="preferred"><primary>XcmsParseStringProc</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcmsparsestringproc'> <funcprototype> <funcdef>Status <function>XcmsParseStringProc</function></funcdef> <paramdef>char<parameter> *color_string</parameter></paramdef> @@ -6858,7 +6858,7 @@ spaces must adhere to the following software interface specification: </para> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='conversionproc'> <funcprototype> <funcdef>Status <function><replaceable>ConversionProc</replaceable></function></funcdef> <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef> @@ -7130,7 +7130,7 @@ To add a function set, use </para> <indexterm significance="preferred"><primary>XcmsAddFunctionSet</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcmsaddfunctionset'> <funcprototype> <funcdef>Status <function>XcmsAddFunctionSet</function></funcdef> <paramdef>XcmsFunctionSet<parameter> *function_set</parameter></paramdef> diff --git a/lib/libX11/specs/libX11/CH07.xml b/lib/libX11/specs/libX11/CH07.xml index 201680db8..32c94f15a 100644 --- a/lib/libX11/specs/libX11/CH07.xml +++ b/lib/libX11/specs/libX11/CH07.xml @@ -14,7 +14,7 @@ Sharing of GCs is highly discouraged because the library may cache GC state. </para> <para> Graphics operations can be performed to either windows or pixmaps, which collectively are -called drawables. Each drawable exists on a single screen. A GC is created for a specific screen +called drawables. Each drawable exists on a single screen. A GC is created for a specific screen and drawable depth and can only be used with drawables of matching screen and depth. </para> <para> @@ -965,7 +965,7 @@ depth of drawable, use <indexterm><primary>Graphics context</primary><secondary>initializing</secondary></indexterm> <indexterm significance="preferred"><primary>XCreateGC</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcreategc'> <funcprototype> <funcdef>GC <function>XCreateGC</function></funcdef> <paramdef>Display <parameter> *display</parameter></paramdef> @@ -1053,7 +1053,7 @@ To copy components from a source GC to a destination GC, use <function>XCopyGC</function>. <indexterm significance="preferred"><primary>XCopyGC</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcopygc'> <funcprototype> <funcdef><function>XCopyGC</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1139,7 +1139,7 @@ To change the components in a given GC, use <function>XChangeGC</function>. <indexterm significance="preferred"><primary>XChangeGC</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xchangegc'> <funcprototype> <funcdef><function>XChangeGC</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1235,7 +1235,7 @@ To obtain components of a given GC, use <function>XGetGCValues</function>. <indexterm significance="preferred"><primary>XGetGCValues</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xgetgcvalues'> <funcprototype> <funcdef>Status <function>XGetGCValues</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1347,7 +1347,7 @@ To free a given GC, use <function>XFreeGC</function>. <indexterm significance="preferred"><primary>XFreeGC</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xfreegc'> <funcprototype> <funcdef><function>XFreeGC</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1401,7 +1401,7 @@ resource ID for a given GC, use <function>XGContextFromGC</function>. <indexterm significance="preferred"><primary>XGContextFromGC</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xgcontextfromgc'> <funcprototype> <funcdef>GContext <function>XGContextFromGC</function></funcdef> <paramdef>GC<parameter> gc</parameter></paramdef> @@ -1437,7 +1437,7 @@ To force sending GC component changes, use <function>XFlushGC</function>. <indexterm significance="preferred"><primary>XFlushGC</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xflushgc'> <funcprototype> <funcdef>void <function>XFlushGC</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1531,7 +1531,7 @@ for a given GC, use <function>XSetState</function>. <indexterm significance="preferred"><primary>XSetState</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsetstate'> <funcprototype> <funcdef><function>XSetState</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1624,7 +1624,7 @@ To set the foreground of a given GC, use <function>XSetForeground</function>. <indexterm significance="preferred"><primary>XSetForeground</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsetforeground'> <funcprototype> <funcdef><function>XSetForeground</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1683,7 +1683,7 @@ To set the background of a given GC, use <function>XSetBackground</function>. <indexterm significance="preferred"><primary>XSetBackground</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsetbackground'> <funcprototype> <funcdef><function>XSetBackground</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1742,7 +1742,7 @@ To set the display function in a given GC, use <function>XSetFunction</function>. <indexterm significance="preferred"><primary>XSetFunction</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsetfunction'> <funcprototype> <funcdef><function>XSetFunction</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1802,7 +1802,7 @@ To set the plane mask of a given GC, use <function>XSetPlaneMask</function>. <indexterm significance="preferred"><primary>XSetPlaneMask</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsetplanemask'> <funcprototype> <funcdef><function>XSetPlaneMask</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1867,7 +1867,7 @@ To set the line drawing components of a given GC, use <function>XSetLineAttributes</function>. <indexterm significance="preferred"><primary>XSetLineAttributes</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsetlineattributes'> <funcprototype> <funcdef><function>XSetLineAttributes</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1976,7 +1976,7 @@ To set the dash-offset and dash-list for dashed line styles of a given GC, use <function>XSetDashes</function>. <indexterm significance="preferred"><primary>XSetDashes</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsetdashes'> <funcprototype> <funcdef><function>XSetDashes</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2105,7 +2105,7 @@ To set the fill-style of a given GC, use <function>XSetFillStyle</function>. <indexterm significance="preferred"><primary>XSetFillStyle</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsetfillstyle'> <funcprototype> <funcdef><function>XSetFillStyle</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2171,7 +2171,7 @@ To set the fill-rule of a given GC, use <function>XSetFillRule</function>. <indexterm significance="preferred"><primary>XSetFillRule</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsetfillrule'> <funcprototype> <funcdef><function>XSetFillRule</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2251,7 +2251,7 @@ To obtain the best size of a tile, stipple, or cursor, use <function>XQueryBestSize</function>. <indexterm significance="preferred"><primary>XQueryBestSize</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xquerybestsize'> <funcprototype> <funcdef>Status <function>XQueryBestSize</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2394,7 +2394,7 @@ To obtain the best fill tile shape, use <function>XQueryBestTile</function>. <indexterm significance="preferred"><primary>XQueryBestTile</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xquerybesttile'> <funcprototype> <funcdef>Status <function>XQueryBestTile</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2500,7 +2500,7 @@ To obtain the best stipple shape, use <function>XQueryBestStipple</function>. <indexterm significance="preferred"><primary>XQueryBestStipple</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xquerybeststipple'> <funcprototype> <funcdef>Status <function>XQueryBestStipple</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2606,7 +2606,7 @@ To set the fill tile of a given GC, use <function>XSetTile</function>. <indexterm significance="preferred"><primary>XSetTile</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsettile'> <funcprototype> <funcdef><function>XSetTile</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2674,7 +2674,7 @@ To set the stipple of a given GC, use <function>XSetStipple</function>. <indexterm significance="preferred"><primary>XSetStipple</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsetstipple'> <funcprototype> <funcdef><function>XSetStipple</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2742,7 +2742,7 @@ To set the tile or stipple origin of a given GC, use <function>XSetTSOrigin</function>. <indexterm significance="preferred"><primary>XSetTSOrigin</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsettsorigin'> <funcprototype> <funcdef><function>XSetTSOrigin</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2823,7 +2823,7 @@ To set the current font of a given GC, use <function>XSetFont</function>. <indexterm significance="preferred"><primary>XSetFont</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsetfont'> <funcprototype> <funcdef><function>XSetFont</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2894,7 +2894,7 @@ To set the clip-origin of a given GC, use <function>XSetClipOrigin</function>. <indexterm significance="preferred"><primary>XSetClipOrigin</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsetcliporigin'> <funcprototype> <funcdef><function>XSetClipOrigin</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2969,7 +2969,7 @@ To set the clip-mask of a given GC to the specified pixmap, use <function>XSetClipMask</function>. <indexterm significance="preferred"><primary>XSetClipMask</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsetclipmask'> <funcprototype> <funcdef><function>XSetClipMask</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3037,7 +3037,7 @@ To set the clip-mask of a given GC to the specified list of rectangles, use <function>XSetClipRectangles</function>. <indexterm significance="preferred"><primary>XSetClipRectangles</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsetcliprectangles'> <funcprototype> <funcdef><function>XSetClipRectangles</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3197,7 +3197,7 @@ errors. Xlib provides a set of basic functions for performing region arithmetic. For information about these functions, -see section 16.5. +see <link linkend="Manipulating_Regions">section 16.5</link>. </para> </sect2> <sect2 id="Setting_the_Arc_Mode_Subwindow_Mode_and_Graphics_Exposure_"> @@ -3211,7 +3211,7 @@ To set the arc mode of a given GC, use <function>XSetArcMode</function>. <indexterm significance="preferred"><primary>XSetArcMode</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsetarcmode'> <funcprototype> <funcdef><function>XSetArcMode</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3275,7 +3275,7 @@ To set the subwindow mode of a given GC, use <function>XSetSubwindowMode</function>. <indexterm significance="preferred"><primary>XSetSubwindowMode</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsetsubwindowmode'> <funcprototype> <funcdef><function>XSetSubwindowMode</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3339,7 +3339,7 @@ To set the graphics-exposures flag of a given GC, use <function>XSetGraphicsExposures</function>. <indexterm significance="preferred"><primary>XSetGraphicsExposures</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsetgraphicsexposures'> <funcprototype> <funcdef><function>XSetGraphicsExposures</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> diff --git a/lib/libX11/specs/libX11/CH08.xml b/lib/libX11/specs/libX11/CH08.xml index 376f1940f..e6eae13be 100644 --- a/lib/libX11/specs/libX11/CH08.xml +++ b/lib/libX11/specs/libX11/CH08.xml @@ -15,9 +15,9 @@ Once you have established a connection to a display, you can use the Xlib graphi <listitem><para>Transfer images between clients and the server</para></listitem> </itemizedlist> <para> -If the same drawable and GC is used for each call, Xlib batches back-to-back calls to XDraw- -Point, XDrawLine, XDrawRectangle, XFillArc, and XFillRectangle. Note that this reduces -the total number of requests sent to the server. +If the same drawable and GC is used for each call, Xlib batches back-to-back +calls to XDrawPoint, XDrawLine, XDrawRectangle, XFillArc, and XFillRectangle. +Note that this reduces the total number of requests sent to the server. </para> <sect1 id="Clearing_Areas"> <title>Clearing Areas</title> @@ -43,7 +43,7 @@ To clear a rectangular area of a given window, use <indexterm><primary>Clearing</primary><secondary>areas</secondary></indexterm> <indexterm significance="preferred"><primary>XClearArea</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcleararea'> <funcprototype> <funcdef><function>XClearArea</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -185,7 +185,7 @@ To clear the entire area in a given window, use <indexterm><primary>Clearing</primary><secondary>windows</secondary></indexterm> <indexterm significance="preferred"><primary>XClearWindow</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xclearwindow'> <funcprototype> <funcdef><function>XClearWindow</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -269,7 +269,7 @@ root and depth, use <indexterm><primary>Copying</primary><secondary>areas</secondary></indexterm> <indexterm significance="preferred"><primary>XCopyArea</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcopyarea'> <funcprototype> <funcdef><function>XCopyArea</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -464,7 +464,7 @@ To copy a single bit plane of a given drawable, use <indexterm><primary>Copying</primary><secondary>planes</secondary></indexterm> <indexterm significance="preferred"><primary>XCopyPlane</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcopyplane'> <funcprototype> <funcdef><function>XCopyPlane</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -768,7 +768,7 @@ To draw a single point in a given drawable, use <function>XDrawPoint</function>. <indexterm significance="preferred"><primary>XDrawPoint</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xdrawpoint'> <funcprototype> <funcdef><function>XDrawPoint</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -840,7 +840,7 @@ To draw multiple points in a given drawable, use <function>XDrawPoints</function>. <indexterm significance="preferred"><primary>XDrawPoints</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xdrawpoints'> <funcprototype> <funcdef><function>XDrawPoints</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -981,7 +981,7 @@ To draw a single line between two points in a given drawable, use <function>XDrawLine</function>. <indexterm significance="preferred"><primary>XDrawLine</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xdrawline'> <funcprototype> <funcdef><function>XDrawLine</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1075,7 +1075,7 @@ To draw multiple lines in a given drawable, use <function>XDrawLines</function>. <indexterm significance="preferred"><primary>XDrawLines</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xdrawlines'> <funcprototype> <funcdef><function>XDrawLines</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1163,7 +1163,7 @@ use <function>XDrawSegments</function>. <indexterm significance="preferred"><primary>XDrawSegments</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xdrawsegments'> <funcprototype> <funcdef><function>XDrawSegments</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1333,7 +1333,7 @@ To draw the outline of a single rectangle in a given drawable, use <function>XDrawRectangle</function>. <indexterm significance="preferred"><primary>XDrawRectangle</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xdrawrectangle'> <funcprototype> <funcdef><function>XDrawRectangle</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1430,7 +1430,7 @@ in a given drawable, use <function>XDrawRectangles</function>. <indexterm significance="preferred"><primary>XDrawRectangles</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xdrawrectangles'> <funcprototype> <funcdef><function>XDrawRectangles</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1564,7 +1564,7 @@ To draw a single arc in a given drawable, use <function>XDrawArc</function>. <indexterm significance="preferred"><primary>XDrawArc</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xdrawarc'> <funcprototype> <funcdef><function>XDrawArc</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1684,7 +1684,7 @@ To draw multiple arcs in a given drawable, use <function>XDrawArcs</function>. <indexterm significance="preferred"><primary>XDrawArcs</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xdrawarcs'> <funcprototype> <funcdef><function>XDrawArcs</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1922,7 +1922,7 @@ To fill a single rectangular area in a given drawable, use <function>XFillRectangle</function>. <indexterm significance="preferred"><primary>XFillRectangle</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xfillrectangle'> <funcprototype> <funcdef><function>XFillRectangle</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2019,7 +2019,7 @@ To fill multiple rectangular areas in a given drawable, use <function>XFillRectangles</function>. <indexterm significance="preferred"><primary>XFillRectangles</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xfillrectangles'> <funcprototype> <funcdef><function>XFillRectangles</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2154,7 +2154,7 @@ To fill a polygon area in a given drawable, use <indexterm><primary>Filling</primary><secondary>polygon</secondary></indexterm> <indexterm significance="preferred"><primary>XFillPolygon</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xfillpolygon'> <funcprototype> <funcdef><function>XFillPolygon</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2353,7 +2353,7 @@ To fill a single arc in a given drawable, use <function>XFillArc</function>. <indexterm significance="preferred"><primary>XFillArc</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xfillarc'> <funcprototype> <funcdef><function>XFillArc</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2473,7 +2473,7 @@ To fill multiple arcs in a given drawable, use <function>XFillArcs</function>. <indexterm significance="preferred"><primary>XFillArcs</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xfillarcs'> <funcprototype> <funcdef><function>XFillArcs</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3020,7 +3020,7 @@ To load a given font, use <function>XLoadFont</function>. <indexterm significance="preferred"><primary>XLoadFont</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xloadfont'> <funcprototype> <funcdef>Font <function>XLoadFont</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3096,7 +3096,7 @@ To return information about an available font, use <function>XQueryFont</function>. <indexterm significance="preferred"><primary>XQueryFont</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xqueryfont'> <funcprototype> <funcdef>XFontStruct *<function>XQueryFont</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3162,7 +3162,7 @@ in a single operation, use <function>XLoadQueryFont</function>. <indexterm significance="preferred"><primary>XLoadQueryFont</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xloadqueryfont'> <funcprototype> <funcdef>XFontStruct *<function>XLoadQueryFont</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3230,7 +3230,7 @@ use <function>XFreeFont</function>. <indexterm significance="preferred"><primary>XFreeFont</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xfreefont'> <funcprototype> <funcdef><function>XFreeFont</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3287,7 +3287,7 @@ To return a given font property, use <function>XGetFontProperty</function>. <indexterm significance="preferred"><primary>XGetFontProperty</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xgetfontproperty'> <funcprototype> <funcdef>Bool <function>XGetFontProperty</function></funcdef> <paramdef>XFontStruct<parameter> *font_struct</parameter></paramdef> @@ -3362,7 +3362,7 @@ use <function>XUnloadFont</function>. <indexterm significance="preferred"><primary>XUnloadFont</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xunloadfont'> <funcprototype> <funcdef><function>XUnloadFont</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3427,7 +3427,7 @@ To return a list of the available font names, use <function>XListFonts</function>. <indexterm significance="preferred"><primary>XListFonts</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xlistfonts'> <funcprototype> <funcdef>char **<function>XListFonts</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3514,7 +3514,7 @@ To free a font name array, use <function>XFreeFontNames</function>. <indexterm significance="preferred"><primary>XFreeFontNames</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xfreefontnames'> <funcprototype> <funcdef><function>XFreeFontNames</function></funcdef> <paramdef>char<parameter> *list[]</parameter></paramdef> @@ -3551,7 +3551,7 @@ To obtain the names and information about available fonts, use <function>XListFontsWithInfo</function>. <indexterm significance="preferred"><primary>XListFontsWithInfo</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xlistfontswithinfo'> <funcprototype> <funcdef>char **<function>XListFontsWithInfo</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3658,7 +3658,7 @@ To free font structures and font names, use <function>XFreeFontInfo</function>. <indexterm significance="preferred"><primary>XFreeFontInfo</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xfreefontinfo'> <funcprototype> <funcdef><function>XFreeFontInfo</function></funcdef> <paramdef>char<parameter> **names</parameter></paramdef> @@ -3742,7 +3742,7 @@ To determine the width of an 8-bit character string, use <function>XTextWidth</function>. <indexterm significance="preferred"><primary>XTextWidth</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xtextwidth'> <funcprototype> <funcdef>int <function>XTextWidth</function></funcdef> <paramdef>XFontStruct<parameter> *font_struct</parameter></paramdef> @@ -3792,7 +3792,7 @@ To determine the width of a 2-byte character string, use <function>XTextWidth16</function>. <indexterm significance="preferred"><primary>XTextWidth16</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xtextwidth16'> <funcprototype> <funcdef>int <function>XTextWidth16</function></funcdef> <paramdef>XFontStruct<parameter> *font_struct</parameter></paramdef> @@ -3850,7 +3850,7 @@ To compute the bounding box of an 8-bit character string in a given font, use <function>XTextExtents</function>. <indexterm significance="preferred"><primary>XTextExtents</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xtextextents'> <funcprototype> <funcdef><function>XTextExtents</function></funcdef> <paramdef>XFontStruct<parameter> *font_struct</parameter></paramdef> @@ -3950,7 +3950,7 @@ To compute the bounding box of a 2-byte character string in a given font, use <function>XTextExtents16</function>. <indexterm significance="preferred"><primary>XTextExtents16</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xtextextents16'> <funcprototype> <funcdef><function>XTextExtents16</function></funcdef> <paramdef>XFontStruct<parameter> *font_struct</parameter></paramdef> @@ -4097,7 +4097,7 @@ given font, use <function>XQueryTextExtents</function>. <indexterm significance="preferred"><primary>XQueryTextExtents</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xquerytextextents'> <funcprototype> <funcdef><function>XQueryTextExtents</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -4209,7 +4209,7 @@ in a given font, use <function>XQueryTextExtents16</function>. <indexterm significance="preferred"><primary>XQueryTextExtents16</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xquerytextextents16'> <funcprototype> <funcdef><function>XQueryTextExtents16</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -4482,7 +4482,7 @@ To draw 8-bit characters in a given drawable, use <function>XDrawText</function>. <indexterm significance="preferred"><primary>XDrawText</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xdrawtext'> <funcprototype> <funcdef><function>XDrawText</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -4578,7 +4578,7 @@ To draw 2-byte characters in a given drawable, use <function>XDrawText16</function>. <indexterm significance="preferred"><primary>XDrawText16</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xdrawtext16'> <funcprototype> <funcdef><function>XDrawText16</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -4738,13 +4738,14 @@ To draw 8-bit characters in a given drawable, use <function>XDrawString</function>. <indexterm significance="preferred"><primary>XDrawString</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xdrawstring'> <funcprototype> <funcdef><function>XDrawString</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> <paramdef>Drawable<parameter> d</parameter></paramdef> <paramdef>GC<parameter> gc</parameter></paramdef> - <paramdef>intx,<parameter> y</parameter></paramdef> + <paramdef>int<parameter> x</parameter></paramdef> + <paramdef>int<parameter> y</parameter></paramdef> <paramdef>char<parameter> *string</parameter></paramdef> <paramdef>int<parameter> length</parameter></paramdef> </funcprototype> @@ -4834,7 +4835,7 @@ To draw 2-byte characters in a given drawable, use <function>XDrawString16</function>. <indexterm significance="preferred"><primary>XDrawString16</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xdrawstring16'> <funcprototype> <funcdef><function>XDrawString16</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -4978,7 +4979,7 @@ To draw 8-bit image text characters in a given drawable, use <function>XDrawImageString</function>. <indexterm significance="preferred"><primary>XDrawImageString</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xdrawimagestring'> <funcprototype> <funcdef><function>XDrawImageString</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -5074,7 +5075,7 @@ To draw 2-byte image text characters in a given drawable, use <function>XDrawImageString16</function>. <indexterm significance="preferred"><primary>XDrawImageString16</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xdrawimagestring16'> <funcprototype> <funcdef><function>XDrawImageString16</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -5267,7 +5268,7 @@ frequently used data formats by replacing functions in the procedure vector with special case functions. Supported operations include destroying the image, getting a pixel, storing a pixel, extracting a subimage of an image, and adding a constant -to an image (see section 16.8). +to an image (see <link linkend="Manipulating_Images">section 16.8</link>). </para> <para> <!-- .LP --> @@ -5319,7 +5320,7 @@ To initialize the image manipulation routines of an image structure, use <function>XInitImage</function>. <indexterm significance="preferred"><primary>XInitImage</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xinitimage'> <funcprototype> <funcdef>Status <function>XInitImage</function></funcdef> <paramdef>XImage<parameter> *image</parameter></paramdef> @@ -5377,7 +5378,7 @@ use <function>XPutImage</function>. <indexterm significance="preferred"><primary>XPutImage</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xputimage'> <funcprototype> <funcdef><function>XPutImage</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -5566,7 +5567,7 @@ use This function specifically supports rudimentary screen dumps. <indexterm significance="preferred"><primary>XGetImage</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xgetimage'> <funcprototype> <funcdef>XImage *<function>XGetImage</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -5753,7 +5754,7 @@ to a location within a preexisting image structure, use <function>XGetSubImage</function>. <indexterm significance="preferred"><primary>XGetSubImage</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xgetsubimage'> <funcprototype> <funcdef>XImage *<function>XGetSubImage</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> diff --git a/lib/libX11/specs/libX11/CH09.xml b/lib/libX11/specs/libX11/CH09.xml index 66d1bc339..2389e824d 100644 --- a/lib/libX11/specs/libX11/CH09.xml +++ b/lib/libX11/specs/libX11/CH09.xml @@ -5,10 +5,11 @@ <title>Window and Session Manager Functions</title> <para> -Although it is difficult to categorize functions as exclusively for an application, a window man- -ager, or a session manager, the functions in this chapter are most often used by window managers -and session managers. It is not expected that these functions will be used by most application -programs. Xlib provides management functions to: +Although it is difficult to categorize functions as exclusively for an application, +a window manager, or a session manager, the functions in this chapter are most +often used by window managers and session managers. It is not expected that +these functions will be used by most application programs. Xlib provides +management functions to: </para> <itemizedlist> @@ -34,7 +35,7 @@ To change a window's parent to another window on the same screen, use There is no way to move a window between screens. <indexterm significance="preferred"><primary>XReparentWindow</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xreparentwindow'> <funcprototype> <funcdef><function>XReparentWindow</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -193,7 +194,7 @@ The save-set of a client is a list of other clients' windows that, if they are inferiors of one of the client's windows at connection close, should not be destroyed and should be remapped if they are unmapped. For further information about close-connection processing, -see section 2.6. +see <link linkend="Using_X_Server_Connection_Close_Operations_">section 2.6</link>. To allow an application's window to survive when a window manager that has reparented a window fails, Xlib provides the save-set functions that you can @@ -218,7 +219,7 @@ To add or remove a window from the client's save-set, use <function>XChangeSaveSet</function>. <indexterm significance="preferred"><primary>XChangeSaveSet</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xchangesaveset'> <funcprototype> <funcdef><function>XChangeSaveSet</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -293,7 +294,7 @@ To add a window to the client's save-set, use <function>XAddToSaveSet</function>. <indexterm significance="preferred"><primary>XAddToSaveSet</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xaddtosaveset'> <funcprototype> <funcdef><function>XAddToSaveSet</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -352,7 +353,7 @@ To remove a window from the client's save-set, use <function>XRemoveFromSaveSet</function>. <indexterm significance="preferred"><primary>XRemoveFromSaveSet</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xremovefromsaveset'> <funcprototype> <funcdef><function>XRemoveFromSaveSet</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -449,7 +450,7 @@ To install a colormap, use <function>XInstallColormap</function>. <indexterm significance="preferred"><primary>XInstallColormap</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xinstallcolormap'> <funcprototype> <funcdef><function>XInstallColormap</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -522,7 +523,7 @@ To uninstall a colormap, use <function>XUninstallColormap</function>. <indexterm significance="preferred"><primary>XUninstallColormap</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xuninstallcolormap'> <funcprototype> <funcdef><function>XUninstallColormap</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -593,7 +594,7 @@ To obtain a list of the currently installed colormaps for a given screen, use <function>XListInstalledColormaps</function>. <indexterm significance="preferred"><primary>XListInstalledColormaps</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xlistinstalledcolormaps'> <funcprototype> <funcdef>Colormap *<function>XListInstalledColormaps</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -675,7 +676,7 @@ To set the font search path, use <function>XSetFontPath</function>. <indexterm significance="preferred"><primary>XSetFontPath</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsetfontpath'> <funcprototype> <funcdef><function>XSetFontPath</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -753,7 +754,7 @@ To get the current font search path, use <function>XGetFontPath</function>. <indexterm significance="preferred"><primary>XGetFontPath</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xgetfontpath'> <funcprototype> <funcdef>char **<function>XGetFontPath</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -805,7 +806,7 @@ use <function>XFreeFontPath</function>. <indexterm significance="preferred"><primary>XFreeFontPath</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xfreefontpath'> <funcprototype> <funcdef><function>XFreeFontPath</function></funcdef> <paramdef>char<parameter> **list</parameter></paramdef> @@ -861,7 +862,7 @@ To grab the server, use <indexterm><primary>Grabbing</primary><secondary>server</secondary></indexterm> <indexterm significance="preferred"><primary>XGrabServer</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xgrabserver'> <funcprototype> <funcdef><function>XGrabServer</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -897,7 +898,7 @@ To ungrab the server, use <function>XUngrabServer</function>. <indexterm significance="preferred"><primary>XUngrabServer</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xungrabserver'> <funcprototype> <funcdef><function>XUngrabServer</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -939,7 +940,7 @@ To destroy a client, use <function>XKillClient</function>. <indexterm significance="preferred"><primary>XKillClient</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xkillclient'> <funcprototype> <funcdef><function>XKillClient</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -991,7 +992,7 @@ If <symbol>AllTemporary</symbol> is specified, the resources of all clients that have terminated in <symbol>RetainTemporary</symbol> -are destroyed (see section 2.5). +are destroyed (see <link linkend="Closing_the_Display">section 2.5</link>). This permits implementation of window manager facilities that aid debugging. A client can set its close-down mode to <symbol>RetainTemporary</symbol>. @@ -1026,7 +1027,7 @@ To set the screen saver mode, use <function>XSetScreenSaver</function>. <indexterm significance="preferred"><primary>XSetScreenSaver</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsetscreensaver'> <funcprototype> <funcdef><function>XSetScreenSaver</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1161,7 +1162,7 @@ To force the screen saver on or off, use <function>XForceScreenSaver</function>. <indexterm significance="preferred"><primary>XForceScreenSaver</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xforcescreensaver'> <funcprototype> <funcdef><function>XForceScreenSaver</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1227,7 +1228,7 @@ To activate the screen saver, use <function>XActivateScreenSaver</function>. <indexterm significance="preferred"><primary>XActivateScreenSaver</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xactivatescreensaver'> <funcprototype> <funcdef><function>XActivateScreenSaver</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1255,7 +1256,7 @@ To reset the screen saver, use <function>XResetScreenSaver</function>. <indexterm significance="preferred"><primary>XResetScreenSaver</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xresetscreensaver'> <funcprototype> <funcdef><function>XResetScreenSaver</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1283,7 +1284,7 @@ To get the current screen saver values, use <function>XGetScreenSaver</function>. <indexterm significance="preferred"><primary>XGetScreenSaver</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xgetscreensaver'> <funcprototype> <funcdef><function>XGetScreenSaver</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1530,7 +1531,7 @@ To add a single host, use <function>XAddHost</function>. <indexterm significance="preferred"><primary>XAddHost</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xaddhost'> <funcprototype> <funcdef><function>XAddHost</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1588,7 +1589,7 @@ To add multiple hosts at one time, use <function>XAddHosts</function>. <indexterm significance="preferred"><primary>XAddHosts</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xaddhosts'> <funcprototype> <funcdef><function>XAddHosts</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1657,7 +1658,7 @@ To obtain a host list, use <function>XListHosts</function>. <indexterm significance="preferred"><primary>XListHosts</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xlisthosts'> <funcprototype> <funcdef>XHostAddress *<function>XListHosts</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1721,7 +1722,7 @@ To remove a single host, use <function>XRemoveHost</function>. <indexterm significance="preferred"><primary>XRemoveHost</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xremovehost'> <funcprototype> <funcdef><function>XRemoveHost</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1783,7 +1784,7 @@ To remove multiple hosts at one time, use <function>XRemoveHosts</function>. <indexterm significance="preferred"><primary>XRemoveHosts</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xremovehosts'> <funcprototype> <funcdef><function>XRemoveHosts</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1874,7 +1875,7 @@ To change access control, use <function>XSetAccessControl</function>. <indexterm significance="preferred"><primary>XSetAccessControl</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsetaccesscontrol'> <funcprototype> <funcdef><function>XSetAccessControl</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1933,7 +1934,7 @@ To enable access control, use <function>XEnableAccessControl</function>. <indexterm significance="preferred"><primary>XEnableAccessControl</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xenableaccesscontrol'> <funcprototype> <funcdef><function>XEnableAccessControl</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1974,7 +1975,7 @@ To disable access control, use <function>XDisableAccessControl</function>. <indexterm significance="preferred"><primary>XDisableAccessControl</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xdisableaccesscontrol'> <funcprototype> <funcdef><function>XDisableAccessControl</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> diff --git a/lib/libX11/specs/libX11/CH10.xml b/lib/libX11/specs/libX11/CH10.xml index d36ac19fe..8a06a706f 100644 --- a/lib/libX11/specs/libX11/CH10.xml +++ b/lib/libX11/specs/libX11/CH10.xml @@ -6,8 +6,8 @@ <para> A client application communicates with the X server through the connection you establish with -the XOpenDisplay function. A client application sends requests to the X server over this con- -nection. These requests are made by the Xlib functions that are called in the client application. +the XOpenDisplay function. A client application sends requests to the X server over this +connection. These requests are made by the Xlib functions that are called in the client application. Many Xlib functions cause the X server to generate events, and the user’s typing or moving the pointer can generate events asynchronously. The X server returns events to the client on the same connection. @@ -24,7 +24,8 @@ This chapter discusses the following topics associated with events: </itemizedlist> <para> -Functions for handling events are dealt with in the next chapter. +Functions for handling events are dealt with in +<link linkend="event_handling_functions">the next chapter</link>. </para> <sect1 id="Event_Types"> @@ -226,8 +227,8 @@ dispatchers. The X server can send events at any time in the input stream. Xlib stores any events received while waiting for a reply in an event queue for later use. -Xlib also provides functions that allow you to check events -in the event queue (see section 11.3). +Xlib also provides functions that allow you to check events in the event queue +(see <link linkend="Event_Queue_Management">section 11.3</link>). </para> <para> <!-- .LP --> @@ -350,7 +351,8 @@ or <symbol>ClientMessage</symbol> cannot be masked. Selection-related events are only sent to clients cooperating -with selections (see section 4.5). +with selections +(see <link linkend="Obtaining_and_Changing_Window_Properties">section 4.5</link>). When the keyboard or pointer mapping is changed, <symbol>MappingNotify</symbol> is always sent to clients. @@ -998,7 +1000,7 @@ and the pointer events and <symbol>MotionNotify</symbol>. For information about the keyboard event-handling utilities, -see chapter 11. +see <link linkend="event_handling_functions">chapter 11</link>. </para> <para> <!-- .LP --> @@ -1282,7 +1284,8 @@ and structures, this member is called a keycode. It is set to a number that represents a physical key on the keyboard. The keycode is an arbitrary representation for any key on the keyboard -(see sections 12.7 and 16.1). +(see sections <link linkend="Manipulating_the_Keyboard_Encoding">12.7</link> + and <link linkend="Using_Keyboard_Utility_Functions">16.1</link>). </para> <para> <!-- .LP --> @@ -1900,7 +1903,7 @@ It generates <symbol>EnterNotify</symbol> and <symbol>LeaveNotify</symbol> -events (see section 10.6.1) +events (see <link linkend="Normal_Entry_Exit_Events">section 10.6.1</link>) with the mode members of the <type>XEnterWindowEvent</type> and @@ -1932,7 +1935,7 @@ It generates <symbol>EnterNotify</symbol> and <symbol>LeaveNotify</symbol> -events (see section 10.6.1) +events (see <link linkend="Normal_Entry_Exit_Events">section 10.6.1</link>) with the mode members of the <type>XEnterWindowEvent</type> and diff --git a/lib/libX11/specs/libX11/CH11.xml b/lib/libX11/specs/libX11/CH11.xml index ddbc095d8..3352d7e71 100644 --- a/lib/libX11/specs/libX11/CH11.xml +++ b/lib/libX11/specs/libX11/CH11.xml @@ -45,7 +45,7 @@ Another way is to use <function>XSelectInput</function>. <indexterm significance="preferred"><primary>XSelectInput</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xselectinput'> <funcprototype> <funcdef><function>XSelectInput</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -183,7 +183,7 @@ To flush the output buffer, use <function>XFlush</function>. <indexterm significance="preferred"><primary>XFlush</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xflush'> <funcprototype> <funcdef><function>XFlush</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -229,7 +229,7 @@ use <function>XSync</function>. <indexterm significance="preferred"><primary>XSync</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsync'> <funcprototype> <funcdef><function>XSync</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -273,7 +273,8 @@ and processed by the X server. Any errors generated must be handled by the error handler. For each protocol error received by Xlib, <function>XSync</function> -calls the client application's error handling routine (see section 11.8.2). +calls the client application's error handling routine +(see <link linkend="Using_the_Default_Error_Handlers">section 11.8.2</link>). Any events generated by the server are enqueued into the library's event queue. </para> @@ -312,7 +313,7 @@ To check the number of events in the event queue, use <function>XEventsQueued</function>. <indexterm significance="preferred"><primary>XEventsQueued</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xeventsqueued'> <funcprototype> <funcdef>int <function>XEventsQueued</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -398,7 +399,7 @@ To return the number of events that are pending, use <function>XPending</function>. <indexterm significance="preferred"><primary>XPending</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xpending'> <funcprototype> <funcdef>int <function>XPending</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -472,7 +473,7 @@ To get the next event and remove it from the queue, use <function>XNextEvent</function>. <indexterm significance="preferred"><primary>XNextEvent</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xnextevent'> <funcprototype> <funcdef><function>XNextEvent</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -522,7 +523,7 @@ To peek at the event queue, use <function>XPeekEvent</function>. <indexterm significance="preferred"><primary>XPeekEvent</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xpeekevent'> <funcprototype> <funcdef><function>XPeekEvent</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -659,7 +660,7 @@ and, if found, remove the event from the queue, use <function>XIfEvent</function>. <indexterm significance="preferred"><primary>XIfEvent</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xifevent'> <funcprototype> <funcdef><function>XIfEvent</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -738,7 +739,7 @@ To check the event queue for a matching event without blocking, use <function>XCheckIfEvent</function>. <indexterm significance="preferred"><primary>XCheckIfEvent</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcheckifevent'> <funcprototype> <funcdef>Bool <function>XCheckIfEvent</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -817,7 +818,7 @@ without removing the event from the queue, use <function>XPeekIfEvent</function>. <indexterm significance="preferred"><primary>XPeekIfEvent</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xpeekifevent'> <funcprototype> <funcdef><function>XPeekIfEvent</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -906,7 +907,7 @@ To remove the next event that matches both a window and an event mask, use <function>XWindowEvent</function>. <indexterm significance="preferred"><primary>XWindowEvent</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xwindowevent'> <funcprototype> <funcdef><function>XWindowEvent</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -991,7 +992,7 @@ except that it never blocks and it returns a indicating if the event was returned. <indexterm significance="preferred"><primary>XCheckWindowEvent</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcheckwindowevent'> <funcprototype> <funcdef>Bool <function>XCheckWindowEvent</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1073,7 +1074,7 @@ To remove the next event that matches an event mask, use <function>XMaskEvent</function>. <indexterm significance="preferred"><primary>XMaskEvent</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xmaskevent'> <funcprototype> <funcdef><function>XMaskEvent</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1144,7 +1145,7 @@ except that it never blocks and it returns a indicating if the event was returned. <indexterm significance="preferred"><primary>XCheckMaskEvent</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcheckmaskevent'> <funcprototype> <funcdef>Bool <function>XCheckMaskEvent</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1213,7 +1214,7 @@ To return and remove the next event in the queue that matches an event type, use <function>XCheckTypedEvent</function>. <indexterm significance="preferred"><primary>XCheckTypedEvent</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xchecktypedevent'> <funcprototype> <funcdef>Bool <function>XCheckTypedEvent</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1284,7 +1285,7 @@ and a window, use <function>XCheckTypedWindowEvent</function>. <indexterm significance="preferred"><primary>XCheckTypedWindowEvent</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xchecktypedwindowevent'> <funcprototype> <funcdef>Bool <function>XCheckTypedWindowEvent</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1372,7 +1373,7 @@ To push an event back into the event queue, use <function>XPutBackEvent</function>. <indexterm significance="preferred"><primary>XPutBackEvent</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xputbackevent'> <funcprototype> <funcdef><function>XPutBackEvent</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1435,7 +1436,7 @@ event to a requestor when a selection has been converted and stored as a property. <indexterm significance="preferred"><primary>XSendEvent</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsendevent'> <funcprototype> <funcdef>Status <function>XSendEvent</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1512,7 +1513,7 @@ determines which clients should receive the specified events, and ignores any active grabs. This function requires you to pass an event mask. For a discussion of the valid event mask names, -see section 10.3. +see <link linkend="Event_Masks">section 10.3</link>. This function uses the w argument to identify the destination window as follows: </para> <itemizedlist> @@ -1633,7 +1634,7 @@ use <function>XDisplayMotionBufferSize</function>. <indexterm significance="preferred"><primary>XDisplayMotionBufferSize</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xdisplaymotionbuffersize'> <funcprototype> <funcdef>unsigned <type>long</type></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1671,7 +1672,7 @@ To get the motion history for a specified window and time, use <function>XGetMotionEvents</function>. <indexterm significance="preferred"><primary>XGetMotionEvents</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xgetmotionevents'> <funcprototype> <funcdef>XTimeCoord *<function>XGetMotionEvents</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1827,7 +1828,7 @@ an after function. sets which function is to be called. <indexterm significance="preferred"><primary>XSetAfterFunction</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsetafterfunction'> <funcprototype> <funcdef><type>int</type></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1872,7 +1873,7 @@ To enable or disable synchronization, use <indexterm><primary>Debugging</primary><secondary>synchronous mode</secondary></indexterm> <indexterm significance="preferred"><primary>XSynchronize</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsynchronize'> <funcprototype> <funcdef><type>int</type></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1948,7 +1949,7 @@ To set the error handler, use <function>XSetErrorHandler</function>. <indexterm significance="preferred"><primary>XSetErrorHandler</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xseterrorhandler'> <funcprototype> <funcdef>int *<function>XSetErrorHandler</function></funcdef> <paramdef>int <parameter> *handler</parameter></paramdef> @@ -2029,7 +2030,7 @@ It is the number that was the value of immediately before the failing call was made. The request_code member is a protocol request of the procedure that failed, as defined in -< X11/Xproto.h .> +<filename class="headerfile"><X11/Xproto.h></filename>. The following error codes can be returned by the functions described in this chapter: </para> @@ -2060,7 +2061,7 @@ chapter: </thead> <tbody> <row> - <entry><errorname>BadAccess</errorname></entry> + <entry><errorname id='BadAccess'>BadAccess</errorname></entry> <entry>A client attempts to grab a key/button combination already grabbed by another client.</entry> </row> @@ -2084,7 +2085,7 @@ chapter: has already selected.</entry> </row> <row> - <entry><errorname>BadAlloc</errorname></entry> + <entry><errorname id='BadAlloc'>BadAlloc</errorname></entry> <entry>The server fails to allocate the requested resource. Note that the explicit listing of <errorname>BadAlloc</errorname> @@ -2099,42 +2100,42 @@ chapter: them.</entry> </row> <row> - <entry><errorname>BadAtom</errorname></entry> + <entry><errorname id='BadAtom'>BadAtom</errorname></entry> <entry>A value for an atom argument does not name a defined atom.</entry> </row> <row> - <entry><errorname>BadColor</errorname></entry> + <entry><errorname id='BadColor'>BadColor</errorname></entry> <entry>A value for a colormap argument does not name a defined colormap.</entry> </row> <row> - <entry><errorname>BadCursor</errorname></entry> + <entry><errorname id='BadCursor'>BadCursor</errorname></entry> <entry>A value for a cursor argument does not name a defined cursor.</entry> </row> <row> - <entry><errorname>BadDrawable</errorname></entry> + <entry><errorname id='BadDrawable'>BadDrawable</errorname></entry> <entry>A value for a drawable argument does not name a defined window or pixmap.</entry> </row> <row> - <entry><errorname>BadFont</errorname></entry> + <entry><errorname id='BadFont'>BadFont</errorname></entry> <entry>A value for a font argument does not name a defined font (or, in some cases, <type>GContext</type>).</entry> </row> <row> - <entry><errorname>BadGC</errorname></entry> + <entry><errorname id='BadGC'>BadGC</errorname></entry> <entry>A value for a <type>GContext</type> argument does not name a defined <type>GContext</type>.</entry> </row> <row> - <entry><errorname>BadIDChoice</errorname></entry> + <entry><errorname id='BadIDChoice'>BadIDChoice</errorname></entry> <entry>The value chosen for a resource identifier either is not included in the range assigned to the client or is already in use. Under normal circumstances, this cannot occur and should be considered a server or Xlib error.</entry> </row> <row> - <entry><errorname>BadImplementation</errorname></entry> + <entry><errorname id='BadImplementation'>BadImplementation</errorname></entry> <entry>The server does not implement some aspect of the request. A server that generates this error for a core request is deficient. As such, this error is not listed for any of the requests, @@ -2142,7 +2143,7 @@ chapter: and handle or discard them.</entry> </row> <row> - <entry><errorname>BadLength</errorname></entry> + <entry><errorname id='BadLength'>BadLength</errorname></entry> <entry>The length of a request is shorter or longer than that required to contain the arguments. This is an internal Xlib or server error.</entry> @@ -2153,7 +2154,7 @@ chapter: The length of a request exceeds the maximum length accepted by the server.</entry> </row> <row> - <entry><errorname>BadMatch</errorname></entry> + <entry><errorname id='BadMatch'>BadMatch</errorname></entry> <entry>In a graphics request, the root and depth of the graphics context do not match those of the drawable.</entry> </row> @@ -2173,20 +2174,20 @@ chapter: window lacks this attribute.</entry> </row> <row> - <entry><errorname>BadName</errorname></entry> + <entry><errorname id='BadName'>BadName</errorname></entry> <entry>A font or color of the specified name does not exist.</entry> </row> <row> - <entry><errorname>BadPixmap</errorname></entry> + <entry><errorname id='BadPixmap'>BadPixmap</errorname></entry> <entry>A value for a pixmap argument does not name a defined pixmap.</entry> </row> <row> - <entry><errorname>BadRequest</errorname></entry> + <entry><errorname id='BadRequest'>BadRequest</errorname></entry> <entry>The major or minor opcode does not specify a valid request. This usually is an Xlib or server error.</entry> </row> <row> - <entry><errorname>BadValue</errorname></entry> + <entry><errorname id='BadValue'>BadValue</errorname></entry> <entry>Some numeric value falls outside of the range of values accepted by the request. Unless a specific range is specified for an argument, @@ -2195,7 +2196,7 @@ chapter: this error (due to the encoding).</entry> </row> <row> - <entry><errorname>BadWindow</errorname></entry> + <entry><errorname id='BadWindow'>BadWindow</errorname></entry> <entry>A value for a window argument does not name a defined window.</entry> </row> </tbody> @@ -2238,7 +2239,7 @@ To obtain textual descriptions of the specified error code, use <indexterm significance="preferred"><primary>XGetErrorText</primary></indexterm> <indexterm><primary>Debugging</primary><secondary>error message strings</secondary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xgeterrortext'> <funcprototype> <funcdef><function>XGetErrorText</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2310,7 +2311,7 @@ To obtain error messages from the error database, use <function>XGetErrorDatabaseText</function>. <indexterm significance="preferred"><primary>XGetErrorDatabaseText</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xgeterrordatabasetext'> <funcprototype> <funcdef><function>XGetErrorDatabaseText</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2455,7 +2456,7 @@ To report an error to the user when the requested display does not exist, use <function>XDisplayName</function>. <indexterm significance="preferred"><primary>XDisplayName</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xdisplayname'> <funcprototype> <funcdef>char *<function>XDisplayName</function></funcdef> <paramdef>char<parameter> *string</parameter></paramdef> @@ -2498,7 +2499,7 @@ To handle fatal I/O errors, use <function>XSetIOErrorHandler</function>. <indexterm significance="preferred"><primary>XSetIOErrorHandler</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsetioerrorhandler'> <funcprototype> <funcdef><type>int</type></funcdef> <paramdef>int(*handler)(Display<parameter> *)</parameter></paramdef> diff --git a/lib/libX11/specs/libX11/CH12.xml b/lib/libX11/specs/libX11/CH12.xml index 6d4fc87eb..2a688bdc5 100644 --- a/lib/libX11/specs/libX11/CH12.xml +++ b/lib/libX11/specs/libX11/CH12.xml @@ -159,7 +159,7 @@ To grab the pointer, use <indexterm><primary>Pointer</primary><secondary>grabbing</secondary></indexterm> <indexterm significance="preferred"><primary>XGrabPointer</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xgrabpointer'> <funcprototype> <funcdef>int <function>XGrabPointer</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -425,7 +425,7 @@ To ungrab the pointer, use <indexterm><primary>Pointer</primary><secondary>ungrabbing</secondary></indexterm> <indexterm significance="preferred"><primary>XUngrabPointer</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xungrabpointer'> <funcprototype> <funcdef><function>XUngrabPointer</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -493,7 +493,7 @@ To change an active pointer grab, use <indexterm ><primary>Changing</primary><secondary>pointer grab</secondary></indexterm> <indexterm significance="preferred"><primary>XChangeActivePointerGrab</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xchangeactivepointergrab'> <funcprototype> <funcdef><function>XChangeActivePointerGrab</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -581,7 +581,7 @@ To grab a pointer button, use <indexterm><primary>Button</primary><secondary>grabbing</secondary></indexterm> <indexterm significance="preferred"><primary>XGrabButton</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xgrabbutton'> <funcprototype> <funcdef><function>XGrabButton</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -825,7 +825,7 @@ To ungrab a pointer button, use <indexterm><primary>Button</primary><secondary>ungrabbing</secondary></indexterm> <indexterm significance="preferred"><primary>XUngrabButton</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xungrabbutton'> <funcprototype> <funcdef><function>XUngrabButton</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -946,7 +946,7 @@ To grab the keyboard, use <indexterm><primary>Grabbing</primary><secondary>keyboard</secondary></indexterm> <indexterm significance="preferred"><primary>XGrabKeyboard</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xgrabkeyboard'> <funcprototype> <funcdef>int <function>XGrabKeyboard</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1134,7 +1134,7 @@ To ungrab the keyboard, use <indexterm><primary>Ungrabbing</primary><secondary>keyboard</secondary></indexterm> <indexterm significance="preferred"><primary>XUngrabKeyboard</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xungrabkeyboard'> <funcprototype> <funcdef><function>XUngrabKeyboard</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1201,7 +1201,7 @@ To passively grab a single key of the keyboard, use <indexterm><primary>Grabbing</primary><secondary>keys</secondary></indexterm> <indexterm significance="preferred"><primary>XGrabKey</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xgrabkey'> <funcprototype> <funcdef><function>XGrabKey</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1405,7 +1405,7 @@ To ungrab a key, use <indexterm><primary>Ungrabbing</primary><secondary>keys</secondary></indexterm> <indexterm significance="preferred"><primary>XUngrabKey</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xungrabkey'> <funcprototype> <funcdef><function>XUngrabKey</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1506,7 +1506,7 @@ To allow further events to be processed when the device has been frozen, use <function>XAllowEvents</function>. <indexterm significance="preferred"><primary>XAllowEvents</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xallowevents'> <funcprototype> <funcdef><function>XAllowEvents</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1761,7 +1761,7 @@ To move the pointer to an arbitrary point in a window, use <function>XWarpPointer</function>. <indexterm significance="preferred"><primary>XWarpPointer</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xwarppointer'> <funcprototype> <funcdef><function>XWarpPointer</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1935,7 +1935,7 @@ To set the input focus, use <function>XSetInputFocus</function>. <indexterm significance="preferred"><primary>XSetInputFocus</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsetinputfocus'> <funcprototype> <funcdef><function>XSetInputFocus</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2109,7 +2109,7 @@ To obtain the current input focus, use <function>XGetInputFocus</function>. <indexterm significance="preferred"><primary>XGetInputFocus</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xgetinputfocus'> <funcprototype> <funcdef><function>XGetInputFocus</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2324,7 +2324,7 @@ If an error is generated, a subset of the controls may have been altered. <!-- .sp --> <indexterm significance="preferred"><primary>XChangeKeyboardControl</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xchangekeyboardcontrol'> <funcprototype> <funcdef><function>XChangeKeyboardControl</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2393,7 +2393,7 @@ To obtain the current control values for the keyboard, use <function>XGetKeyboardControl</function>. <indexterm significance="preferred"><primary>XGetKeyboardControl</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xgetkeyboardcontrol'> <funcprototype> <funcdef><function>XGetKeyboardControl</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2477,7 +2477,7 @@ To turn on keyboard auto-repeat, use <function>XAutoRepeatOn</function>. <indexterm significance="preferred"><primary>XAutoRepeatOn</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xautorepeaton'> <funcprototype> <funcdef><function>XAutoRepeatOn</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2511,7 +2511,7 @@ To turn off keyboard auto-repeat, use <function>XAutoRepeatOff</function>. <indexterm significance="preferred"><primary>XAutoRepeatOff</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xautorepeatoff'> <funcprototype> <funcdef><function>XAutoRepeatOff</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2545,7 +2545,7 @@ To ring the bell, use <function>XBell</function>. <indexterm significance="preferred"><primary>XBell</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xbell'> <funcprototype> <funcdef><function>XBell</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2629,7 +2629,7 @@ To obtain a bit vector that describes the state of the keyboard, use <function>XQueryKeymap</function>. <indexterm significance="preferred"><primary>XQueryKeymap</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xquerykeymap'> <funcprototype> <funcdef><function>XQueryKeymap</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2685,7 +2685,7 @@ To set the mapping of the pointer buttons, use <function>XSetPointerMapping</function>. <indexterm significance="preferred"><primary>XSetPointerMapping</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsetpointermapping'> <funcprototype> <funcdef>int <function>XSetPointerMapping</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2773,7 +2773,7 @@ To get the pointer mapping, use <function>XGetPointerMapping</function>. <indexterm significance="preferred"><primary>XGetPointerMapping</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xgetpointermapping'> <funcprototype> <funcdef>int <function>XGetPointerMapping</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2836,7 +2836,7 @@ To control the pointer's interactive feel, use <function>XChangePointerControl</function>. <indexterm significance="preferred"><primary>XChangePointerControl</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xchangepointercontrol'> <funcprototype> <funcdef><function>XChangePointerControl</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2949,7 +2949,7 @@ To get the current pointer parameters, use <function>XGetPointerControl</function>. <indexterm significance="preferred"><primary>XGetPointerControl</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xgetpointercontrol'> <funcprototype> <funcdef><function>XGetPointerControl</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3224,7 +3224,7 @@ To obtain the legal KeyCodes for a display, use <function>XDisplayKeycodes</function>. <indexterm significance="preferred"><primary>XDisplayKeycodes</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xdisplaykeycodes'> <funcprototype> <funcdef><function>XDisplayKeycodes</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3283,7 +3283,7 @@ To obtain the symbols for the specified KeyCodes, use <function>XGetKeyboardMapping</function>. <indexterm significance="preferred"><primary>XGetKeyboardMapping</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xgetkeyboardmapping'> <funcprototype> <funcdef>KeySym *<function>XGetKeyboardMapping</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3408,7 +3408,7 @@ To change the keyboard mapping, use <function>XChangeKeyboardMapping</function>. <indexterm significance="preferred"><primary>XChangeKeyboardMapping</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xchangekeyboardmapping'> <funcprototype> <funcdef><function>XChangeKeyboardMapping</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3580,7 +3580,7 @@ structure, use <function>XNewModifiermap</function>. <indexterm significance="preferred"><primary>XNewModifiermap</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xnewmodifiermap'> <funcprototype> <funcdef>XModifierKeymap *<function>XNewModifiermap</function></funcdef> <paramdef>int<parameter> max_keys_per_mod</parameter></paramdef> @@ -3619,7 +3619,7 @@ structure, use <function>XInsertModifiermapEntry</function>. <indexterm significance="preferred"><primary>XInsertModifiermapEntry</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xinsertmodifiermapentry'> <funcprototype> <funcdef>XModifierKeymap *<function>XInsertModifiermapEntry</function></funcdef> <paramdef>XModifierKeymap<parameter> *modmap</parameter></paramdef> @@ -3682,7 +3682,7 @@ structure, use <function>XDeleteModifiermapEntry</function>. <indexterm significance="preferred"><primary>XDeleteModifiermapEntry</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xdeletemodifiermapentry'> <funcprototype> <funcdef>XModifierKeymap *<function>XDeleteModifiermapEntry</function></funcdef> <paramdef>XModifierKeymap<parameter> *modmap</parameter></paramdef> @@ -3745,7 +3745,7 @@ structure, use <function>XFreeModifiermap</function>. <indexterm significance="preferred"><primary>XFreeModifiermap</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xfreemodifiermap'> <funcprototype> <funcdef><function>XFreeModifiermap</function></funcdef> <paramdef>XModifierKeymap<parameter> *modmap</parameter></paramdef> @@ -3783,7 +3783,7 @@ To set the KeyCodes to be used as modifiers, use <function>XSetModifierMapping</function>. <indexterm significance="preferred"><primary>XSetModifierMapping</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsetmodifiermapping'> <funcprototype> <funcdef>int <function>XSetModifierMapping</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3897,7 +3897,7 @@ To obtain the KeyCodes used as modifiers, use <function>XGetModifierMapping</function>. <indexterm significance="preferred"><primary>XGetModifierMapping</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xgetmodifiermapping'> <funcprototype> <funcdef>XModifierKeymap *<function>XGetModifierMapping</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> diff --git a/lib/libX11/specs/libX11/CH13.xml b/lib/libX11/specs/libX11/CH13.xml index 25cb56fe3..37121ba47 100644 --- a/lib/libX11/specs/libX11/CH13.xml +++ b/lib/libX11/specs/libX11/CH13.xml @@ -8,22 +8,21 @@ An internationalized application is one that is adaptable to the requirements of different native languages, local customs, and character string encodings. The process of adapting the operation to a particular native language, local custom, or string encoding is called localization. A goal of -internationalization is to permit localization without program source modifications or recompila- -tion. +internationalization is to permit localization without program source modifications or recompilation. </para> <para> -As one of the localization mechanisms, Xlib provides an X Input Method (<acronym>XIM</acronym>) functional inter- -face for internationalized text input and an X Output Method (<acronym>XOM</acronym>) functional interface for -internationalized text output. +As one of the localization mechanisms, Xlib provides an X Input Method (<acronym>XIM</acronym>) +functional interface for internationalized text input and an X Output Method +(<acronym>XOM</acronym>) functional interface for internationalized text output. </para> <para> -Internationalization in X is based on the concept of a locale. A locale defines the localized +Internationalization in X is based on the concept of a locale. A locale defines the localized behavior of a program at run time. Locales affect Xlib in its: </para> <itemizedlist> <listitem><para>Encoding and processing of input method text</para></listitem> - <listitem><para>Encoding of resource files and values</para></listitem> + <listitem><para>Encoding of resource files and values</para></listitem> <listitem><para>Encoding and imaging of text strings</para></listitem> <listitem><para>Encoding and decoding for inter-client text communication</para></listitem> </itemizedlist> @@ -32,22 +31,22 @@ behavior of a program at run time. Locales affect Xlib in its: <para> • Encoding and decoding for inter-client text communication -Characters from various languages are represented in a computer using an encoding. Different -languages have different encodings, and there are even different encodings for the same charac- -ters in the same language. +Characters from various languages are represented in a computer using an encoding. +Different languages have different encodings, and there are even different +encodings for the same characters in the same language. </para> <para> -This chapter defines support for localized text imaging and text input and describes the locale +This chapter defines support for localized text imaging and text input and describes the locale mechanism that controls all locale-dependent Xlib functions. Sets of functions are provided for multibyte (char *) text as well as wide character (wchar_t) text in the form supported by the host C language environment. The multibyte and wide character functions are equivalent except for the form of the text argument. </para> <para> -The Xlib internationalization functions are not meant to provide support for multilingual applica- -tions (mixing multiple languages within a single piece of text), but they make it possible to imple- -ment applications that work in limited fashion with more than one language in independent con- -texts. +The Xlib internationalization functions are not meant to provide support for +multilingual applications (mixing multiple languages within a single piece of text), +but they make it possible to implement applications that work in limited +fashion with more than one language in independent contexts. </para> <para> The remainder of this chapter discusses: @@ -55,7 +54,7 @@ The remainder of this chapter discusses: <itemizedlist> <listitem><para>X locale management</para></listitem> - <listitem><para>Locale and modifier dependencies</para></listitem> + <listitem><para>Locale and modifier dependencies</para></listitem> <listitem><para>Variable argument lists</para></listitem> <listitem><para>Output methods</para></listitem> <listitem><para>Input methods</para></listitem> @@ -146,7 +145,7 @@ To configure Xlib locale modifiers for the current locale, use <function>XSetLocaleModifiers</function>. <indexterm significance="preferred"><primary>XSetLocaleModifiers</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsetlocalemodifiers'> <funcprototype> <funcdef>char *<function>XSetLocaleModifiers</function></funcdef> <paramdef>char<parameter> *modifier_list</parameter></paramdef> @@ -545,7 +544,7 @@ To allocate a nested variable argument list dynamically, use <function>XVaCreateNestedList</function>. <indexterm significance="preferred"><primary>XVaCreateNestedList</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xvacreatenestedlist'> <funcprototype> <funcdef>XVaNestedList <function>XVaCreateNestedList</function></funcdef> <paramdef>int<parameter> dummy</parameter></paramdef> @@ -732,7 +731,7 @@ To open an output method, use <function>XOpenOM</function>. <indexterm significance="preferred"><primary>XOpenOM</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xopenom'> <funcprototype> <funcdef>XOM <function>XOpenOM</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -850,7 +849,7 @@ To close an output method, use <function>XCloseOM</function>. <indexterm significance="preferred"><primary>XCloseOM</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcloseom'> <funcprototype> <funcdef>Status <function>XCloseOM</function></funcdef> <paramdef>XOM<parameter> om</parameter></paramdef> @@ -884,7 +883,7 @@ To set output method attributes, use <function>XSetOMValues</function>. <indexterm significance="preferred"><primary>XSetOMValues</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsetomvalues'> <funcprototype> <funcdef>char *<function>XSetOMValues</function></funcdef> <paramdef>XOM<parameter> om</parameter></paramdef> @@ -937,7 +936,7 @@ To query an output method, use <function>XGetOMValues</function>. <indexterm significance="preferred"><primary>XGetOMValues</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xgetomvalues'> <funcprototype> <funcdef>char *<function>XGetOMValues</function></funcdef> <paramdef>XOM<parameter> om</parameter></paramdef> @@ -985,7 +984,7 @@ To obtain the display associated with an output method, use <function>XDisplayOfOM</function>. <indexterm significance="preferred"><primary>XDisplayOfOM</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xdisplayofom'> <funcprototype> <funcdef>Display *<function>XDisplayOfOM</function></funcdef> <paramdef>XOM<parameter> om</parameter></paramdef> @@ -1019,7 +1018,7 @@ To get the locale associated with an output method, use <function>XLocaleOfOM</function>. <indexterm significance="preferred"><primary>XLocaleOfOM</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xlocaleofom'> <funcprototype> <funcdef>char *<function>XLocaleOfOM</function></funcdef> <paramdef>XOM<parameter> om</parameter></paramdef> @@ -1355,7 +1354,7 @@ To create an output context, use <function>XCreateOC</function>. <indexterm significance="preferred"><primary>XCreateOC</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcreateoc'> <funcprototype> <funcdef>XOC <function>XCreateOC</function></funcdef> <paramdef>XOM<parameter> om</parameter></paramdef> @@ -1441,7 +1440,7 @@ To destroy an output context, use <function>XDestroyOC</function>. <indexterm significance="preferred"><primary>XDestroyOC</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xdestroyoc'> <funcprototype> <funcdef>void <function>XDestroyOC</function></funcdef> <paramdef>XOC<parameter> oc</parameter></paramdef> @@ -1475,7 +1474,7 @@ To get the output method associated with an output context, use <function>XOMOfOC</function>. <indexterm significance="preferred"><primary>XOMOfOC</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xomofoc'> <funcprototype> <funcdef>XOM <function>XOMOfOC</function></funcdef> <paramdef>XOC<parameter> oc</parameter></paramdef> @@ -1522,7 +1521,7 @@ To set <acronym>XOC</acronym> values, use <function>XSetOCValues</function>. <indexterm significance="preferred"><primary>XSetOCValues</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsetocvalues'> <funcprototype> <funcdef>char *<function>XSetOCValues</function></funcdef> <paramdef>XOC<parameter> oc</parameter></paramdef> @@ -1599,7 +1598,7 @@ To obtain <acronym>XOC</acronym> values, use <function>XGetOCValues</function>. <indexterm significance="preferred"><primary>XGetOCValues</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xgetocvalues'> <funcprototype> <funcdef>char *<function>XGetOCValues</function></funcdef> <paramdef>XOC<parameter> oc</parameter></paramdef> @@ -2147,7 +2146,7 @@ or <function>XCreateFontSet</function>. <indexterm significance="preferred"><primary>XCreateFontSet</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcreatefontset'> <funcprototype> <funcdef>XFontSet <function>XCreateFontSet</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2477,7 +2476,7 @@ use <function>XFontsOfFontSet</function>. <indexterm significance="preferred"><primary>XFontsOfFontSet</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xfontsoffontset'> <funcprototype> <funcdef>int <function>XFontsOfFontSet</function></funcdef> <paramdef>XFontSet<parameter> font_set</parameter></paramdef> @@ -2586,7 +2585,7 @@ use <function>XBaseFontNameListOfFontSet</function>. <indexterm significance="preferred"><primary>XBaseFontNameListOfFontSet</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xbasefontnamelistoffontset'> <funcprototype> <funcdef>char *<function>XBaseFontNameListOfFontSet</function></funcdef> <paramdef>XFontSet<parameter> font_set</parameter></paramdef> @@ -2648,7 +2647,7 @@ use <function>XLocaleOfFontSet</function>. <indexterm significance="preferred"><primary>XLocaleOfFontSet</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xlocaleoffontset'> <funcprototype> <funcdef>char *<function>XLocaleOfFontSet</function></funcdef> <paramdef>XFontSet<parameter> font_set</parameter></paramdef> @@ -2701,7 +2700,7 @@ if the output context was created by <function>XCreateFontSet</function>. <indexterm significance="preferred"><primary>XFreeFontSet</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xfreefontset'> <funcprototype> <funcdef>void <function>XFreeFontSet</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2805,7 +2804,7 @@ To find out about direction-dependent rendering, use <function>XDirectionalDependentDrawing</function>. <indexterm significance="preferred"><primary>XDirectionalDependentDrawing</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xdirectionaldependentdrawing'> <funcprototype> <funcdef>Bool <function>XDirectionalDependentDrawing</function></funcdef> <paramdef>XFontSet<parameter> font_set</parameter></paramdef> @@ -2843,7 +2842,7 @@ To find out about context-dependent rendering, use <function>XContextualDrawing</function>. <indexterm significance="preferred"><primary>XContextualDrawing</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcontextualdrawing'> <funcprototype> <funcdef>Bool <function>XContextualDrawing</function></funcdef> <paramdef>XFontSet<parameter> font_set</parameter></paramdef> @@ -2881,7 +2880,7 @@ To find out about context-dependent or direction-dependent rendering, use <function>XContextDependentDrawing</function>. <indexterm significance="preferred"><primary>XContextDependentDrawing</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcontextdependentdrawing'> <funcprototype> <funcdef>Bool <function>XContextDependentDrawing</function></funcdef> <paramdef>XFontSet<parameter> font_set</parameter></paramdef> @@ -2995,7 +2994,7 @@ use <function>XExtentsOfFontSet</function>. <indexterm significance="preferred"><primary>XExtentsOfFontSet</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xextentsoffontset'> <funcprototype> <funcdef>XFontSetExtents *<function>XExtentsOfFontSet</function></funcdef> <paramdef>XFontSet<parameter> font_set</parameter></paramdef> @@ -3048,7 +3047,7 @@ or <indexterm significance="preferred"><primary>XmbTextEscapement</primary></indexterm> <indexterm significance="preferred"><primary>XwcTextEscapement</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xmbtextescapement'> <funcprototype> <funcdef>int <function>XmbTextEscapement</function></funcdef> <paramdef>XFontSet<parameter> font_set</parameter></paramdef> @@ -3057,7 +3056,7 @@ or </funcprototype> </funcsynopsis> <!-- .FN --> -<funcsynopsis> +<funcsynopsis id='xwctextescapement'> <funcprototype> <funcdef>int <function>XwcTextEscapement</function></funcdef> <paramdef>XFontSet<parameter> font_set</parameter></paramdef> @@ -3140,7 +3139,7 @@ use <indexterm significance="preferred"><primary>XmbTextExtents</primary></indexterm> <indexterm significance="preferred"><primary>XwcTextExtents</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xmbtextextents'> <funcprototype> <funcdef>int <function>XmbTextExtents</function></funcdef> <paramdef>XFontSet<parameter> font_set</parameter></paramdef> @@ -3152,7 +3151,7 @@ use </funcsynopsis> <!-- .FN --> <funcsynopsis> -<funcprototype> +<funcprototype id='xwctextextents'> <funcdef>int <function>XwcTextExtents</function></funcdef> <paramdef>XFontSet<parameter> font_set</parameter></paramdef> <paramdef>wchar_t<parameter> *string</parameter></paramdef> @@ -3300,7 +3299,7 @@ or <indexterm significance="preferred"><primary>XmbTextPerCharExtents</primary></indexterm> <indexterm significance="preferred"><primary>XwcTextPerCharExtents</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xmbtextpercharextents'> <funcprototype> <funcdef>Status <function>XmbTextPerCharExtents</function></funcdef> <paramdef>XFontSet<parameter> font_set</parameter></paramdef> @@ -3315,7 +3314,7 @@ or </funcprototype> </funcsynopsis> <!-- .FN --> -<funcsynopsis> +<funcsynopsis id='xwctextpercharextents'> <funcprototype> <funcdef>Status <function>XwcTextPerCharExtents</function></funcdef> <paramdef>XFontSet<parameter> font_set</parameter></paramdef> @@ -3521,7 +3520,8 @@ and except that they work with font sets instead of single fonts and interpret the text based on the locale of the font set instead of treating the bytes of the string as direct font indexes. -See section 8.6 for details of the use of Graphics Contexts (GCs) +See <link linkend="Drawing_Text">section 8.6</link> for details +of the use of Graphics Contexts (GCs) and possible protocol errors. If a <errorname>BadFont</errorname> @@ -3582,7 +3582,7 @@ or <indexterm significance="preferred"><primary>XmbDrawText</primary></indexterm> <indexterm significance="preferred"><primary>XwcDrawText</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xmbdrawtext'> <funcprototype> <funcdef>void <function>XmbDrawText</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3594,7 +3594,7 @@ or </funcprototype> </funcsynopsis> <!-- .FN --> -<funcsynopsis> +<funcsynopsis id='xwcdrawtext'> <funcprototype> <funcdef>void <function>XwcDrawText</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3733,7 +3733,7 @@ or <indexterm significance="preferred"><primary>XmbDrawString</primary></indexterm> <indexterm significance="preferred"><primary>XwcDrawString</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xmbdrawstring'> <funcprototype> <funcdef>void <function>XmbDrawString</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3746,7 +3746,7 @@ or </funcprototype> </funcsynopsis> <!-- .FN --> -<funcsynopsis> +<funcsynopsis id='xwcdrawstring'> <funcprototype> <funcdef>void <function>XwcDrawString</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3879,7 +3879,7 @@ or <indexterm significance="preferred"><primary>XmbDrawImageString</primary></indexterm> <indexterm significance="preferred"><primary>XwcDrawImageString</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xmbdrawimagestring'> <funcprototype> <funcdef>void <function>XmbDrawImageString</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3892,7 +3892,7 @@ or </funcprototype> </funcsynopsis> <!-- .FN --> -<funcsynopsis> +<funcsynopsis id='xwcdrawimagestring'> <funcprototype> <funcdef>void <function>XwcDrawImageString</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -4554,7 +4554,7 @@ is being used to do input for multiple text entry areas, it will also be necessary to set the focus window of the input context whenever the focus window changes -(see section 13.5.6.3). +(see <link linkend="Focus_Window">section 13.5.6.3</link>). </para> </sect3> <sect3 id="Geometry_Management"> @@ -4672,7 +4672,8 @@ may change the geometry desired by the input method. </para> <para> <!-- .LP --> -The table of <acronym>XIC</acronym> values (see section 13.5.6) +The table of <acronym>XIC</acronym> values +(see <link linkend="Input_Context_Values">section 13.5.6</link>) indicates the values that can cause the desired geometry to change when they are set. It is the responsibility of the client to renegotiate the geometry @@ -5185,7 +5186,7 @@ To open a connection, use <function>XOpenIM</function>. <indexterm significance="preferred"><primary>XOpenIM</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xopenim'> <funcprototype> <funcdef>XIM <function>XOpenIM</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -5306,7 +5307,7 @@ To close a connection, use <function>XCloseIM</function>. <indexterm significance="preferred"><primary>XCloseIM</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcloseim'> <funcprototype> <funcdef>Status <function>XCloseIM</function></funcdef> <paramdef>XIM<parameter> im</parameter></paramdef> @@ -5340,7 +5341,7 @@ To set input method attributes, use <function>XSetIMValues</function>. <indexterm significance="preferred"><primary>XSetIMValues</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsetimvalues'> <funcprototype> <funcdef>char *<function>XSetIMValues</function></funcdef> <paramdef>XIM<parameter> im</parameter></paramdef> @@ -5393,7 +5394,7 @@ To query an input method, use <function>XGetIMValues</function>. <indexterm significance="preferred"><primary>XGetIMValues</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xgetimvalues'> <funcprototype> <funcdef>char *<function>XGetIMValues</function></funcdef> <paramdef>XIM<parameter> im</parameter></paramdef> @@ -5456,7 +5457,7 @@ To obtain the display associated with an input method, use <function>XDisplayOfIM</function>. <indexterm significance="preferred"><primary>XDisplayOfIM</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xdisplayofim'> <funcprototype> <funcdef>Display *<function>XDisplayOfIM</function></funcdef> <paramdef>XIM<parameter> im</parameter></paramdef> @@ -5490,7 +5491,7 @@ To get the locale associated with an input method, use <function>XLocaleOfIM</function>. <indexterm significance="preferred"><primary>XLocaleOfIM</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xlocaleofim'> <funcprototype> <funcdef>char *<function>XLocaleOfIM</function></funcdef> <paramdef>XIM<parameter> im</parameter></paramdef> @@ -5524,7 +5525,7 @@ To register an input method instantiate callback, use <function>XRegisterIMInstantiateCallback</function>. <indexterm significance="preferred"><primary>XRegisterIMInstantiateCallback</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xregisteriminstantiatecallback'> <funcprototype> <funcdef>Bool <function>XRegisterIMInstantiateCallback</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -5620,7 +5621,7 @@ The function returns The generic prototype is as follows: <indexterm significance="preferred"><primary>IMInstantiateCallback</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='iminstantiatecallback'> <funcprototype> <funcdef>void <function><replaceable>IMInstantiateCallback</replaceable></function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -5669,7 +5670,7 @@ To unregister an input method instantiation callback, use <function>XUnregisterIMInstantiateCallback</function>. <indexterm significance="preferred"><primary>XUnregisterIMInstantiateCallback</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xunregisteriminstantiatecallback'> <funcprototype> <funcdef>Bool <function>XUnregisterIMInstantiateCallback</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -5858,7 +5859,8 @@ The following keys apply to this table. <para> <!-- .LP --> <symbol>XNR6PreeditCallback</symbol> -is obsolete and its use is not recommended (see section 13.5.4.6). +is obsolete and its use is not recommended +(see <link linkend="Preedit_Callback_Behavior">section 13.5.4.6</link>). </para> <sect3 id="Query_Input_Style"> @@ -6109,7 +6111,7 @@ or The generic prototype of this callback function is as follows: <indexterm significance="preferred"><primary>DestroyCallback</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='destroycallback'> <funcprototype> <funcdef>void <function><replaceable>DestroyCallback</replaceable></function></funcdef> <paramdef>XIM<parameter> im</parameter></paramdef> @@ -6345,7 +6347,7 @@ To create an input context, use <function>XCreateIC</function>. <indexterm significance="preferred"><primary>XCreateIC</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcreateic'> <funcprototype> <funcdef>XIC <function>XCreateIC</function></funcdef> <paramdef>XIM<parameter> im</parameter></paramdef> @@ -6438,7 +6440,7 @@ To destroy an input context, use <function>XDestroyIC</function>. <indexterm significance="preferred"><primary>XDestroyIC</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xdestroyic'> <funcprototype> <funcdef>void <function>XDestroyIC</function></funcdef> <paramdef>XIC<parameter> ic</parameter></paramdef> @@ -6475,7 +6477,7 @@ and <function>XUnsetICFocus</function>. <indexterm significance="preferred"><primary>XSetICFocus</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xseticfocus'> <funcprototype> <funcdef>void <function>XSetICFocus</function></funcdef> <paramdef>XIC<parameter> ic</parameter></paramdef> @@ -6516,7 +6518,7 @@ does not affect the focus window value. <!-- .sp --> <indexterm significance="preferred"><primary>XUnsetICFocus</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xunseticfocus'> <funcprototype> <funcdef>void <function>XUnsetICFocus</function></funcdef> <paramdef>XIC<parameter> ic</parameter></paramdef> @@ -6565,14 +6567,14 @@ or <indexterm significance="preferred"><primary>XmbResetIC</primary></indexterm> <indexterm significance="preferred"><primary>XwcResetIC</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xmbresetic'> <funcprototype> <funcdef>char *<function>XmbResetIC</function></funcdef> <paramdef>XIC<parameter> ic</parameter></paramdef> </funcprototype> </funcsynopsis> <!-- .FN --> -<funcsynopsis> +<funcsynopsis id='xwcresetic'> <funcprototype> <funcdef>wchar_t *<function>XwcResetIC</function></funcdef> <paramdef>XIC<parameter> ic</parameter></paramdef> @@ -6640,7 +6642,7 @@ To get the input method associated with an input context, use <function>XIMOfIC</function>. <indexterm significance="preferred"><primary>XIMOfIC</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='ximofic'> <funcprototype> <funcdef>XIM <function>XIMOfIC</function></funcdef> <paramdef>XIC<parameter> ic</parameter></paramdef> @@ -6685,7 +6687,7 @@ To set <acronym>XIC</acronym> values, use <function>XSetICValues</function>. <indexterm significance="preferred"><primary>XSetICValues</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xseticvalues'> <funcprototype> <funcdef>char *<function>XSetICValues</function></funcdef> <paramdef>XIC<parameter> ic</parameter></paramdef> @@ -6768,7 +6770,7 @@ To obtain <acronym>XIC</acronym> values, use <function>XGetICValues</function>. <indexterm significance="preferred"><primary>XGetICValues</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xgeticvalues'> <funcprototype> <funcdef>char *<function>XGetICValues</function></funcdef> <paramdef>XIC<parameter> ic</parameter></paramdef> @@ -7507,7 +7509,7 @@ The <symbol>XNGeometryCallback</symbol> argument is a structure of type <structname>XIMCallback</structname> -(see section 13.5.6.13.12). +(see <link linkend="Preedit_and_Status_Callbacks">section 13.5.6.13.12</link>). </para> <para> <!-- .LP --> @@ -7562,7 +7564,8 @@ The <symbol>XNDestroyCallback</symbol> argument is a pointer to a structure of type <structname>XIMCallback</structname> -(see section 13.5.6.13.12). This callback is triggered when the input method +(see <link linkend="Preedit_and_Status_Callbacks">section 13.5.6.13.12</link>). +This callback is triggered when the input method stops its service for any reason; for example, when a connection to an IM server is broken. After the destroy callback is called, the input context is destroyed and the input method is closed. @@ -7586,7 +7589,7 @@ The <symbol>XNStringConversionCallback</symbol> argument is a structure of type <structname>XIMCallback</structname> -(see section 13.5.6.13.12). +(see <link linkend="Preedit_and_Status_Callbacks">section 13.5.6.13.12</link>). </para> <para> <!-- .LP --> @@ -8035,7 +8038,7 @@ or <symbol>XIMStatusArea</symbol>. It is used for geometry negotiation between the client and the input method and has no other effect on the input method -(see section 13.5.1.5). +(see <link linkend="Geometry_Management">section 13.5.1.5</link>). </para> </sect4> <sect4 id="Spot_Location"> @@ -8321,7 +8324,7 @@ argument is a pointer to a structure of type The generic prototype is as follows: <indexterm significance="preferred"><primary>PreeditStateNotifyCallback</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='preeditstatenotifycallback'> <funcprototype> <funcdef>void <function><replaceable>PreeditStateNotifyCallback</replaceable></function></funcdef> <paramdef>XIC<parameter> ic</parameter></paramdef> @@ -8672,7 +8675,7 @@ After the callback is invoked, the input context will be freed by Xlib. The generic prototype is as follows: <indexterm significance="preferred"><primary>DestroyCallback</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='destroycallback_xic'> <funcprototype> <funcdef>void <function><replaceable>DestroyCallback</replaceable></function></funcdef> <paramdef>XIC<parameter> ic</parameter></paramdef> @@ -8734,7 +8737,7 @@ with an encoding matching the locale bound to the input context. The callback prototype is as follows: <indexterm significance="preferred"><primary>StringConversionCallback</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='stringconversioncallback'> <funcprototype> <funcdef>void <function><replaceable>StringConversionCallback</replaceable></function></funcdef> <paramdef>XIC<parameter> ic</parameter></paramdef> @@ -8784,7 +8787,8 @@ The callback is passed an structure in the call_data argument. The text member is an <structname>XIMStringConversionText</structname> -structure (see section 13.5.6.9) to be filled in by the client +structure (see <link linkend="String_Conversion_">section 13.5.6.9</link>) +to be filled in by the client and describes the text to be sent to the input method. The data pointed to by the string and feedback elements of the @@ -8895,7 +8899,7 @@ callback is triggered to let the toolkit do the setup or the cleanup for the preedit region. <indexterm significance="preferred"><primary>PreeditStartCallback</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='preeditstartcallback'> <funcprototype> <funcdef>int <function><replaceable>PreeditStartCallback</replaceable></function></funcdef> <paramdef>XIC<parameter> ic</parameter></paramdef> @@ -8949,7 +8953,7 @@ in the preedit string, and a value of -1 indicates there is no limit. <indexterm significance="preferred"><primary>PreeditDoneCallback</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='preeditdonecallback'> <funcprototype> <funcdef>void <function><replaceable>PreeditDoneCallback</replaceable></function></funcdef> <paramdef>XIC<parameter> ic</parameter></paramdef> @@ -9030,7 +9034,7 @@ The callback prototype is as follows: <indexterm significance="preferred"><primary>PreeditDrawCallback</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='preeditdrawcallback'> <funcprototype> <funcdef>void <function><replaceable>PreeditDrawCallback</replaceable></function></funcdef> <paramdef>XIC<parameter> ic</parameter></paramdef> @@ -9360,10 +9364,11 @@ typedef unsigned long XIMFeedback; #define XIMVisibleToBackward (1L<<9) #define XIMVisibleToCenter (1L<<10) -*† The values for XIMPrimary, XIMSecondary, and XIMTertiary were incorrectly defined in -the R5 specification. The X Consortium’s X11R5 implementation correctly implemented the val- -ues for these highlights. The value of these highlights has been corrected in this specification to -agree with the values in the Consortium’s X11R5 and X11R6 implementations. +*† The values for XIMPrimary, XIMSecondary, and XIMTertiary were incorrectly defined in +the R5 specification. The X Consortium’s X11R5 implementation correctly +implemented the values for these highlights. The value of these highlights has +been corrected in this specification to agree with the values in the +Consortium’s X11R5 and X11R6 implementations. </literallayout> @@ -9416,7 +9421,7 @@ should move the text insertion point. It then calls the PreeditCaretCallback. <indexterm significance="preferred"><primary>PreeditCaretCallback</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='preeditcaretcallback'> <funcprototype> <funcdef>void <function><replaceable>PreeditCaretCallback</replaceable></function></funcdef> <paramdef>XIC<parameter> ic</parameter></paramdef> @@ -9632,7 +9637,7 @@ When the input context is created or gains focus, the input method calls the StatusStartCallback callback. <indexterm significance="preferred"><primary>StatusStartCallback</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='statusstartcallback'> <funcprototype> <funcdef>void <function><replaceable>StatusStartCallback</replaceable></function></funcdef> <paramdef>XIC<parameter> ic</parameter></paramdef> @@ -9689,7 +9694,7 @@ When an input context is destroyed or when it loses focus, the input method calls StatusDoneCallback. <indexterm significance="preferred"><primary>StatusDoneCallback</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='statusdonecallback'> <funcprototype> <funcdef>void <function><replaceable>StatusDoneCallback</replaceable></function></funcdef> <paramdef>XIC<parameter> ic</parameter></paramdef> @@ -9744,7 +9749,7 @@ When an input context status has to be updated, the input method calls StatusDrawCallback. <indexterm significance="preferred"><primary>StatusDrawCallback</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='statusdrawcallback'> <funcprototype> <funcdef>void <function><replaceable>StatusDrawCallback</replaceable></function></funcdef> <paramdef>XIC<parameter> ic</parameter></paramdef> @@ -9882,7 +9887,7 @@ To filter an event, use <function>XFilterEvent</function>. <indexterm significance="preferred"><primary>XFilterEvent</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xfilterevent'> <funcprototype> <funcdef>Bool <function>XFilterEvent</function></funcdef> <paramdef>XEvent<parameter> *event</parameter></paramdef> @@ -9966,7 +9971,7 @@ or <indexterm significance="preferred"><primary>XmbLookupString</primary></indexterm> <indexterm significance="preferred"><primary>XwcLookupString</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xmblookupstring'> <funcprototype> <funcdef>int <function>XmbLookupString</function></funcdef> <paramdef>XIC<parameter> ic</parameter></paramdef> @@ -9978,7 +9983,7 @@ or </funcprototype> </funcsynopsis> <!-- .FN --> -<funcsynopsis> +<funcsynopsis id='xwclookupstring'> <funcprototype> <funcdef>int <function>XwcLookupString</function></funcdef> <paramdef>XIC<parameter> ic</parameter></paramdef> @@ -10285,7 +10290,7 @@ called back the client and obtained no response <para> <!-- .LP --> The following symbols for string constants are defined in -<X11/Xlib.h> . +<filename class="headerfile"><X11/Xlib.h></filename>. Although they are shown here with particular macro definitions, they may be implemented as macros, as global symbols, or as a mixture of the two. The string pointer value itself diff --git a/lib/libX11/specs/libX11/CH14.xml b/lib/libX11/specs/libX11/CH14.xml index 78d0e3fe4..b64830667 100644 --- a/lib/libX11/specs/libX11/CH14.xml +++ b/lib/libX11/specs/libX11/CH14.xml @@ -7,18 +7,21 @@ The Inter-Client Communication Conventions Manual, hereafter referred to as the <acronym>ICCCM</acronym>, details the X Consortium approved conventions that govern inter-client communications. These conventions ensure peer-to-peer client cooperation in the use of selections, cut buffers, and shared -resources as well as client cooperation with window and session managers. For further informa- -tion, see the Inter-Client Communication Conventions Manual. +resources as well as client cooperation with window and session managers. For further information, +see the Inter-Client Communication Conventions Manual. </para> <para> -Xlib provides a number of standard properties and programming interfaces that are <acronym>ICCCM</acronym> com- -pliant. The predefined atoms for some of these properties are defined in the <X11/Xatom.h> -header file, where to avoid name conflicts with user symbols their #define name has an XA_ pre- -fix. For further information about atoms and properties, see section 4.3. +Xlib provides a number of standard properties and programming interfaces that are <acronym>ICCCM</acronym> +compliant. The predefined atoms for some of these properties are defined in the <X11/Xatom.h> +header file, where to avoid name conflicts with user symbols their #define name has an XA_ prefix. +For further information about atoms and properties, +see <link linkend="Properties_and_Atoms">section 4.3</link>. </para> <para> Xlib’s selection and cut buffer mechanisms provide the primary programming interfaces by which -peer client applications communicate with each other (see sections 4.5 and 16.6). The functions +peer client applications communicate with each other +(see sections <link linkend="Selections">4.5</link> and +<link linkend="Using_Cut_Buffers">16.6</link>). The functions discussed in this chapter provide the primary programming interfaces by which client applications communicate with their window and session managers as well as share standard colormaps. </para> @@ -57,8 +60,7 @@ managers are: <entry>TEXT</entry> <entry></entry> <entry>The string name of the machine on - which the client application is run- - ning. + which the client application is running. </entry> </row> <row> @@ -74,7 +76,7 @@ managers are: <entry><property>WM_COMMAND</property></entry> <entry>TEXT</entry> <entry></entry> - <entry>The command and arguments, null- + <entry>The command and arguments, null separated, used to invoke the application. </entry> </row> @@ -134,8 +136,7 @@ managers are: <entry><property>WM_STATE</property></entry> <entry>32</entry> <entry>Intended for communication - between window and session man- - agers only. + between window and session managers only. </entry> </row> <row> @@ -250,7 +251,8 @@ of top-level windows (that is, those that were created as children of the root window). Note that the subwindows that you create are ignored by window managers. Therefore, -you should use the basic window functions described in chapter 3 +you should use the basic window functions described in +<link linkend="window_functions">chapter 3</link> to manipulate your application's subwindows. </para> <para> @@ -259,7 +261,7 @@ To request that a top-level window be iconified, use <function>XIconifyWindow</function>. <indexterm significance="preferred"><primary>XIconifyWindow</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xiconifywindow'> <funcprototype> <funcdef>Status <function>XIconifyWindow</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -333,7 +335,7 @@ To request that a top-level window be withdrawn, use <function>XWithdrawWindow</function>. <indexterm significance="preferred"><primary>XWithdrawWindow</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xwithdrawwindow'> <funcprototype> <funcdef>Status <function>XWithdrawWindow</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -407,7 +409,7 @@ To request that a top-level window be reconfigured, use <function>XReconfigureWMWindow</function>. <indexterm significance="preferred"><primary>XReconfigureWMWindow</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xreconfigurewmwindow'> <funcprototype> <funcdef>Status <function>XReconfigureWMWindow</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -581,7 +583,7 @@ or <indexterm significance="preferred"><primary>XmbTextListToTextProperty</primary></indexterm> <indexterm significance="preferred"><primary>XwcTextListToTextProperty</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xmbtextlisttotextproperty'> <funcprototype> <funcdef>int <function>XmbTextListToTextProperty</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -592,7 +594,7 @@ or </funcprototype> </funcsynopsis> <!-- .FN --> -<funcsynopsis> +<funcsynopsis id='xwctextlisttotextproperty'> <funcprototype> <funcdef>int <function>XwcTextListToTextProperty</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -743,7 +745,7 @@ or <indexterm significance="preferred"><primary>XmbTextPropertyToTextList</primary></indexterm> <indexterm significance="preferred"><primary>XwcTextPropertyToTextList</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xmbtextpropertytotextlist'> <funcprototype> <funcdef>int <function>XmbTextPropertyToTextList</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -753,7 +755,7 @@ or </funcprototype> </funcsynopsis> <!-- .FN --> -<funcsynopsis> +<funcsynopsis id='xwctextpropertytotextlist'> <funcprototype> <funcdef>int <function>XwcTextPropertyToTextList</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -901,7 +903,7 @@ wide character string list, use <function>XwcFreeStringList</function>. <indexterm significance="preferred"><primary>XwcFreeStringList</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xwcfreestringlist'> <funcprototype> <funcdef>void <function>XwcFreeStringList</function></funcdef> <paramdef>wchar_t<parameter> **list</parameter></paramdef> @@ -985,7 +987,7 @@ structure, use <function>XStringListToTextProperty</function>. <indexterm significance="preferred"><primary>XStringListToTextProperty</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xstringlisttotextproperty'> <funcprototype> <funcdef>Status <function>XStringListToTextProperty</function></funcdef> <paramdef>char<parameter> **list</parameter></paramdef> @@ -1060,7 +1062,7 @@ structure in the STRING encoding, use <function>XTextPropertyToStringList</function>. <indexterm significance="preferred"><primary>XTextPropertyToStringList</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xtextpropertytostringlist'> <funcprototype> <funcdef>Status <function>XTextPropertyToStringList</function></funcdef> <paramdef>XTextProperty<parameter> *text_prop</parameter></paramdef> @@ -1133,7 +1135,7 @@ To free the in-memory data associated with the specified string list, use <function>XFreeStringList</function>. <indexterm significance="preferred"><primary>XFreeStringList</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xfreestringlist'> <funcprototype> <funcdef>void <function>XFreeStringList</function></funcdef> <paramdef>char<parameter> **list</parameter></paramdef> @@ -1181,7 +1183,12 @@ In addition, Xlib provides separate convenience functions that you can use to set each of these properties. For further information about these convenience functions, -see sections 14.1.4, 14.1.5, 14.2.1, and 14.2.2, respectively. +see sections +<link linkend="Setting_and_Reading_the_WM_NAME_Property">14.1.4</link>, +<link linkend="Setting_and_Reading_the_WM_ICON_NAME_Property">14.1.5</link>, +<link linkend="Setting_and_Reading_the_WM_COMMAND_Property">14.2.1</link>, and +<link linkend="Setting_and_Reading_the_WM_CLIENT_MACHINE_Property">14.2.2</link>, +respectively. <!-- .sp --> </para> <para> @@ -1190,7 +1197,7 @@ To set one of a window's text properties, use <function>XSetTextProperty</function>. <indexterm significance="preferred"><primary>XSetTextProperty</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsettextproperty'> <funcprototype> <funcdef>void <function>XSetTextProperty</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1278,7 +1285,7 @@ To read one of a window's text properties, use <function>XGetTextProperty</function>. <indexterm significance="preferred"><primary>XGetTextProperty</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xgettextproperty'> <funcprototype> <funcdef>Status <function>XGetTextProperty</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1394,7 +1401,7 @@ To set a window's <property>WM_NAME</property> property with the supplied conven <function>XSetWMName</function>. <indexterm significance="preferred"><primary>XSetWMName</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsetwmname'> <funcprototype> <funcdef>void <function>XSetWMName</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1454,7 +1461,7 @@ To read a window's <property>WM_NAME</property> property with the supplied conve <function>XGetWMName</function>. <indexterm significance="preferred"><primary>XGetWMName</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xgetwmname'> <funcprototype> <funcdef>Status <function>XGetWMName</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1527,7 +1534,7 @@ To assign a name to a window, use <indexterm><primary>Window</primary><secondary>name</secondary></indexterm> <indexterm significance="preferred"><primary>XStoreName</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xstorename'> <funcprototype> <funcdef><function>XStoreName</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1600,7 +1607,7 @@ To get the name of a window, use <function>XFetchName</function>. <indexterm significance="preferred"><primary>XFetchName</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xfetchname'> <funcprototype> <funcdef>Status <function>XFetchName</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1688,7 +1695,7 @@ use <function>XSetWMIconName</function>. <indexterm significance="preferred"><primary>XSetWMIconName</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsetwmiconname'> <funcprototype> <funcdef>void <function>XSetWMIconName</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1749,7 +1756,7 @@ use <function>XGetWMIconName</function>. <indexterm significance="preferred"><primary>XGetWMIconName</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xgetwmiconname'> <funcprototype> <funcdef>Status <function>XGetWMIconName</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1823,7 +1830,7 @@ To set the name to be displayed in a window's icon, use <indexterm><primary>Window</primary><secondary>icon name</secondary></indexterm> <indexterm significance="preferred"><primary>XSetIconName</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xseticonname'> <funcprototype> <funcdef><function>XSetIconName</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1885,7 +1892,7 @@ To get the name a window wants displayed in its icon, use <function>XGetIconName</function>. <indexterm significance="preferred"><primary>XGetIconName</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xgeticonname'> <funcprototype> <funcdef>Status <function>XGetIconName</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2123,7 +2130,7 @@ To set a window's <property>WM_HINTS</property> property, use <function>XSetWMHints</function>. <indexterm significance="preferred"><primary>XSetWMHints</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsetwmhints'> <funcprototype> <funcdef><function>XSetWMHints</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2192,7 +2199,7 @@ To read a window's <property>WM_HINTS</property> property, use <function>XGetWMHints</function>. <indexterm significance="preferred"><primary>XGetWMHints</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xgetwmhints'> <funcprototype> <funcdef>XWMHints *<function>XGetWMHints</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2389,7 +2396,7 @@ To set a window's <property>WM_NORMAL_HINTS</property> property, use <function>XSetWMNormalHints</function>. <indexterm significance="preferred"><primary>XSetWMNormalHints</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsetwmnormalhints'> <funcprototype> <funcdef>void <function>XSetWMNormalHints</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2459,7 +2466,7 @@ To read a window's <property>WM_NORMAL_HINTS</property> property, use <function>XGetWMNormalHints</function>. <indexterm significance="preferred"><primary>XGetWMNormalHints</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xgetwmnormalhints'> <funcprototype> <funcdef>Status <function>XGetWMNormalHints</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2570,7 +2577,7 @@ To set a window's <property>WM_SIZE_HINTS</property> property, use <function>XSetWMSizeHints</function>. <indexterm significance="preferred"><primary>XSetWMSizeHints</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsetwmsizehints'> <funcprototype> <funcdef>void <function>XSetWMSizeHints</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2659,7 +2666,7 @@ To read a window's <property>WM_SIZE_HINTS</property> property, use <function>XGetWMSizeHints</function>. <indexterm significance="preferred"><primary>XGetWMSizeHints</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xgetwmsizehints'> <funcprototype> <funcdef>Status <function>XGetWMSizeHints</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2875,7 +2882,7 @@ To set a window's <property>WM_CLASS</property> property, use <function>XSetClassHint</function>. <indexterm significance="preferred"><primary>XSetClassHint</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsetclasshint'> <funcprototype> <funcdef><function>XSetClassHint</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2944,7 +2951,7 @@ To read a window's <property>WM_CLASS</property> property, use <function>XGetClassHint</function>. <indexterm significance="preferred"><primary>XGetClassHint</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xgetclasshint'> <funcprototype> <funcdef>Status <function>XGetClassHint</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3030,7 +3037,7 @@ To set a window's <property>WM_TRANSIENT_FOR</property> property, use <function>XSetTransientForHint</function>. <indexterm significance="preferred"><primary>XSetTransientForHint</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsettransientforhint'> <funcprototype> <funcdef><function>XSetTransientForHint</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3096,7 +3103,7 @@ To read a window's <property>WM_TRANSIENT_FOR</property> property, use <function>XGetTransientForHint</function>. <indexterm significance="preferred"><primary>XGetTransientForHint</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xgettransientforhint'> <funcprototype> <funcdef>Status <function>XGetTransientForHint</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3172,7 +3179,7 @@ To set a window's <property>WM_PROTOCOLS</property> property, use <function>XSetWMProtocols</function>. <indexterm significance="preferred"><primary>XSetWMProtocols</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsetwmprotocols'> <funcprototype> <funcdef>Status <function>XSetWMProtocols</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3259,7 +3266,7 @@ To read a window's <property>WM_PROTOCOLS</property> property, use <function>XGetWMProtocols</function>. <indexterm significance="preferred"><primary>XGetWMProtocols</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xgetwmprotocols'> <funcprototype> <funcdef>Status <function>XGetWMProtocols</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3358,7 +3365,7 @@ To set a window's <property>WM_COLORMAP_WINDOWS</property> property, use <function>XSetWMColormapWindows</function>. <indexterm significance="preferred"><primary>XSetWMColormapWindows</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsetwmcolormapwindows'> <funcprototype> <funcdef>Status <function>XSetWMColormapWindows</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3445,7 +3452,7 @@ To read a window's <property>WM_COLORMAP_WINDOWS</property> property, use <function>XGetWMColormapWindows</function>. <indexterm significance="preferred"><primary>XGetWMColormapWindows</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xgetwmcolormapwindows'> <funcprototype> <funcdef>Status <function>XGetWMColormapWindows</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3610,7 +3617,7 @@ To set a window's <property>WM_ICON_SIZE</property> property, use <function>XSetIconSizes</function>. <indexterm significance="preferred"><primary>XSetIconSizes</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xseticonsizes'> <funcprototype> <funcdef><function>XSetIconSizes</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3686,7 +3693,7 @@ To read a window's <property>WM_ICON_SIZE</property> property, use <function>XGetIconSizes</function>. <indexterm significance="preferred"><primary>XGetIconSizes</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xgeticonsizes'> <funcprototype> <funcdef>Status <function>XGetIconSizes</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3783,7 +3790,7 @@ The standard window manager properties for a given window are <property>WM_COMMAND</property>, <property>WM_CLIENT_MACHINE</property>, and <property>WM_LOCALE_NAME</property>. <indexterm significance="preferred"><primary>XmbSetWMProperties</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xmbsetwmproperties'> <funcprototype> <funcdef>void <function>XmbSetWMProperties</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3928,12 +3935,14 @@ If the normal_hints argument is non-NULL, <function>XmbSetWMProperties</function> calls <function>XSetWMNormalHints</function>, -which sets the <property>WM_NORMAL_HINTS</property> property (see section 14.1.7). +which sets the <property>WM_NORMAL_HINTS</property> property +(see <link linkend="Setting_and_Reading_the_WM_NORMAL_HINTS_Property">section 14.1.7</link>). If the wm_hints argument is non-NULL, <function>XmbSetWMProperties</function> calls <function>XSetWMHints</function>, -which sets the <property>WM_HINTS</property> property (see section 14.1.6). +which sets the <property>WM_HINTS</property> property +(see <link linkend="Setting_and_Reading_the_WM_HINTS_Property">section 14.1.6</link>). </para> <para> <!-- .LP --> @@ -3946,7 +3955,7 @@ An argc of zero indicates a zero-length command. <!-- .LP --> The hostname of the machine is stored using <function>XSetWMClientMachine</function> -(see section 14.2.2). +(see <link linkend="Setting_and_Reading_the_WM_CLIENT_MACHINE_Property">section 14.2.2</link>). </para> <para> <!-- .LP --> @@ -4001,7 +4010,7 @@ The standard window manager properties for a given window are <property>WM_COMMAND</property>, and <property>WM_CLIENT_MACHINE</property>. <indexterm significance="preferred"><primary>XSetWMProperties</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsetwmproperties'> <funcprototype> <funcdef>void <function>XSetWMProperties</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -4131,21 +4140,24 @@ If the window_name argument is non-NULL, <function>XSetWMProperties</function> calls <function>XSetWMName</function>, -which, in turn, sets the <property>WM_NAME</property> property (see section 14.1.4). +which, in turn, sets the <property>WM_NAME</property> property +(see <link linkend="Setting_and_Reading_the_WM_NAME_Property">section 14.1.4</link>). If the icon_name argument is non-NULL, <function>XSetWMProperties</function> calls <function>XSetWMIconName</function>, -which sets the <property>WM_ICON_NAME</property> property (see section 14.1.5). +which sets the <property>WM_ICON_NAME</property> property +(see <link linkend="Setting_and_Reading_the_WM_ICON_NAME_Property">section 14.1.5</link>). If the argv argument is non-NULL, <function>XSetWMProperties</function> calls <function>XSetCommand</function>, -which sets the <property>WM_COMMAND</property> property (see section 14.2.1). +which sets the <property>WM_COMMAND</property> property +(see <link linkend="Setting_and_Reading_the_WM_COMMAND_Property">section 14.2.1</link>). Note that an argc of zero is allowed to indicate a zero-length command. Note also that the hostname of this machine is stored using <function>XSetWMClientMachine</function> -(see section 14.2.2). +(see <link linkend="Setting_and_Reading_the_WM_CLIENT_MACHINE_Property">section 14.2.2</link>). </para> <para> <!-- .LP --> @@ -4153,12 +4165,14 @@ If the normal_hints argument is non-NULL, <function>XSetWMProperties</function> calls <function>XSetWMNormalHints</function>, -which sets the <property>WM_NORMAL_HINTS</property> property (see section 14.1.7). +which sets the <property>WM_NORMAL_HINTS</property> property +(see <link linkend="Setting_and_Reading_the_WM_NORMAL_HINTS_Property">section 14.1.7</link>). If the wm_hints argument is non-NULL, <function>XSetWMProperties</function> calls <function>XSetWMHints</function>, -which sets the <property>WM_HINTS</property> property (see section 14.1.6). +which sets the <property>WM_HINTS</property> property +(see <link linkend="Setting_and_Reading_the_WM_HINTS_Property">section 14.1.6</link>). </para> <para> <!-- .LP --> @@ -4166,7 +4180,8 @@ If the class_hints argument is non-NULL, <function>XSetWMProperties</function> calls <function>XSetClassHint</function>, -which sets the <property>WM_CLASS</property> property (see section 14.1.8). +which sets the <property>WM_CLASS</property> property +(see <link linkend="Setting_and_Reading_the_WM_CLASS_Property">section 14.1.8</link>). If the res_name member in the <structname>XClassHint</structname> structure is set to the NULL pointer and the RESOURCE_NAME environment @@ -4227,7 +4242,7 @@ To set a window's <property>WM_COMMAND</property> property, use <function>XSetCommand</function>. <indexterm significance="preferred"><primary>XSetCommand</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsetcommand'> <funcprototype> <funcdef><function>XSetCommand</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -4307,7 +4322,7 @@ To read a window's <property>WM_COMMAND</property> property, use <function>XGetCommand</function>. <indexterm significance="preferred"><primary>XGetCommand</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xgetcommand'> <funcprototype> <funcdef>Status <function>XGetCommand</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -4398,7 +4413,7 @@ To set a window's <property>WM_CLIENT_MACHINE</property> property, use <function>XSetWMClientMachine</function>. <indexterm significance="preferred"><primary>XSetWMClientMachine</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsetwmclientmachine'> <funcprototype> <funcdef>void <function>XSetWMClientMachine</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -4458,7 +4473,7 @@ To read a window's <property>WM_CLIENT_MACHINE</property> property, use <function>XGetWMClientMachine</function>. <indexterm significance="preferred"><primary>XGetWMClientMachine</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xgetwmclientmachine'> <funcprototype> <funcdef>Status <function>XGetWMClientMachine</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -4920,7 +4935,7 @@ structure, use <function>XSetRGBColormaps</function>. <indexterm significance="preferred"><primary>XSetRGBColormaps</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsetrgbcolormaps'> <funcprototype> <funcdef>void <function>XSetRGBColormaps</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -5100,7 +5115,7 @@ structure associated with the specified property, use <function>XGetRGBColormaps</function>. <indexterm significance="preferred"><primary>XGetRGBColormaps</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xgetrgbcolormaps'> <funcprototype> <funcdef>Status <function>XGetRGBColormaps</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> diff --git a/lib/libX11/specs/libX11/CH15.xml b/lib/libX11/specs/libX11/CH15.xml index 9c739b367..760adcfe5 100644 --- a/lib/libX11/specs/libX11/CH15.xml +++ b/lib/libX11/specs/libX11/CH15.xml @@ -419,7 +419,7 @@ or <indexterm significance="preferred"><primary>XrmStringToQuark</primary></indexterm> <indexterm significance="preferred"><primary>XrmPermStringToQuark</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xrmstringtoquark'> <funcprototype> <funcdef>XrmQuark <function>XrmStringToQuark</function></funcdef> <paramdef>char<parameter> *string</parameter></paramdef> @@ -477,7 +477,7 @@ To convert a quark to a string, use </literallayout> <indexterm significance="preferred"><primary>XrmQuarkToString</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xrmquarktostring'> <funcprototype> <funcdef>char *<function>XrmQuarkToString</function></funcdef> <paramdef>XrmQuark<parameter> quark</parameter></paramdef> @@ -524,7 +524,7 @@ To convert a string with one or more components to a quark list, use <indexterm significance="preferred"><primary>XrmStringToQuarkList</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xrmstringtoquarklist'> <funcprototype> <funcdef>void <function>XrmStringToQuarkList</function></funcdef> <paramdef>char<parameter> *string</parameter></paramdef> @@ -566,7 +566,7 @@ The function converts the null-terminated string (generally a fully qualified name) to a list of quarks. Note that the string must be in the valid ResourceName format -(see section 15.1). +(see <link linkend="Resource_File_Syntax">section 15.1</link>). If the string is not in the Host Portable Character Encoding, the conversion is implementation-dependent. </para> @@ -598,7 +598,7 @@ and a quark list, use <function>XrmStringToBindingQuarkList</function>. <indexterm significance="preferred"><primary>XrmStringToBindingQuarkList</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xrmstringtobindingquarklist'> <funcprototype> <funcdef><function>XrmStringToBindingQuarkList</function></funcdef> <paramdef>char<parameter> *string</parameter></paramdef> @@ -650,7 +650,8 @@ The caller must allocate sufficient space for the quarks list before calling <!-- .eM --> Component names in the list are separated by a period or an asterisk character. -The string must be in the format of a valid ResourceName (see section 15.1). +The string must be in the format of a valid ResourceName +(see <link linkend="Resource_File_Syntax">section 15.1</link>). If the string does not start with a period or an asterisk, a tight binding is assumed. For example, the string ``*a.b*c'' becomes: @@ -708,7 +709,7 @@ To initialize the resource manager, use <function>XrmInitialize</function>. <indexterm significance="preferred"><primary>XrmInitialize</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xrminitialize'> <funcprototype> <funcdef>void <function>XrmInitialize</function></funcdef> <paramdef>void<parameter> XrmInitialize(\|)</parameter></paramdef> @@ -723,7 +724,7 @@ To retrieve a database from disk, use <function>XrmGetFileDatabase</function>. <indexterm significance="preferred"><primary>XrmGetFileDatabase</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xrmgetfiledatabase'> <funcprototype> <funcdef>XrmDatabase <function>XrmGetFileDatabase</function></funcdef> <paramdef>char<parameter> *filename</parameter></paramdef> @@ -752,7 +753,8 @@ function opens the specified file, creates a new resource database, and loads it with the specifications read in from the specified file. The specified file should contain a sequence of entries in valid ResourceLine -format (see section 15.1); the database that results from reading a file +format (see <link linkend="Resource_File_Syntax">section 15.1</link>); +the database that results from reading a file with incorrect syntax is implementation-dependent. The file is parsed in the current locale, and the database is created in the current locale. @@ -767,7 +769,7 @@ To store a copy of a database to disk, use <function>XrmPutFileDatabase</function>. <indexterm significance="preferred"><primary>XrmPutFileDatabase</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xrmputfiledatabase'> <funcprototype> <funcdef>void <function>XrmPutFileDatabase</function></funcdef> <paramdef>XrmDatabase<parameter> database</parameter></paramdef> @@ -805,7 +807,8 @@ The <function>XrmPutFileDatabase</function> function stores a copy of the specified database in the specified file. Text is written to the file as a sequence of entries in valid -ResourceLine format (see section 15.1). +ResourceLine format +(see <link linkend="Resource_File_Syntax">section 15.1</link>). The file is written in the locale of the database. Entries containing resource names that are not in the Host Portable Character Encoding or containing values that are not in the encoding of the database @@ -820,7 +823,7 @@ To obtain a pointer to the screen-independent resources of a display, use <function>XResourceManagerString</function>. <indexterm significance="preferred"><primary>XResourceManagerString</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xresourcemanagerstring'> <funcprototype> <funcdef>char *<function>XResourceManagerString</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -864,7 +867,7 @@ To obtain a pointer to the screen-specific resources of a screen, use <function>XScreenResourceString</function>. <indexterm significance="preferred"><primary>XScreenResourceString</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xscreenresourcestring'> <funcprototype> <funcdef>char *<function>XScreenResourceString</function></funcdef> <paramdef>Screen<parameter> *screen</parameter></paramdef> @@ -908,7 +911,7 @@ To create a database from a string, use <function>XrmGetStringDatabase</function>. <indexterm significance="preferred"><primary>XrmGetStringDatabase</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xrmgetstringdatabase'> <funcprototype> <funcdef>XrmDatabase <function>XrmGetStringDatabase</function></funcdef> <paramdef>char<parameter> *data</parameter></paramdef> @@ -940,7 +943,8 @@ is similar to <function>XrmGetFileDatabase</function> except that it reads the information out of a string instead of out of a file. The string should contain a sequence of entries in valid ResourceLine -format (see section 15.1) terminated by a null character; +format (see <link linkend="Resource_File_Syntax">section 15.1</link>) +terminated by a null character; the database that results from using a string with incorrect syntax is implementation-dependent. The string is parsed in the current locale, @@ -953,7 +957,7 @@ To obtain the locale name of a database, use <function>XrmLocaleOfDatabase</function>. <indexterm significance="preferred"><primary>XrmLocaleOfDatabase</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xrmlocaleofdatabase'> <funcprototype> <funcdef>char *<function>XrmLocaleOfDatabase</function></funcdef> <paramdef>XrmDatabase<parameter> database</parameter></paramdef> @@ -993,7 +997,7 @@ To destroy a resource database and free its allocated memory, use <function>XrmDestroyDatabase</function>. <indexterm significance="preferred"><primary>XrmDestroyDatabase</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xrmdestroydatabase'> <funcprototype> <funcdef>void <function>XrmDestroyDatabase</function></funcdef> <paramdef>XrmDatabase<parameter> database</parameter></paramdef> @@ -1027,7 +1031,7 @@ To associate a resource database with a display, use <function>XrmSetDatabase</function>. <indexterm significance="preferred"><primary>XrmSetDatabase</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xrmsetdatabase'> <funcprototype> <funcdef>void <function>XrmSetDatabase</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1076,7 +1080,7 @@ To get the resource database associated with a display, use <function>XrmGetDatabase</function>. <indexterm significance="preferred"><primary>XrmGetDatabase</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xrmgetdatabase'> <funcprototype> <funcdef>XrmDatabase <function>XrmGetDatabase</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1116,7 +1120,7 @@ To merge the contents of a resource file into a database, use <function>XrmCombineFileDatabase</function>. <indexterm significance="preferred"><primary>XrmCombineFileDatabase</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xrmcombinefiledatabase'> <funcprototype> <funcdef>Status <function>XrmCombineFileDatabase</function></funcdef> <paramdef>char<parameter> *filename</parameter></paramdef> @@ -1190,7 +1194,7 @@ To merge the contents of one database into another database, use <function>XrmCombineDatabase</function>. <indexterm significance="preferred"><primary>XrmCombineDatabase</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xrmcombinedatabase'> <funcprototype> <funcdef>void <function>XrmCombineDatabase</function></funcdef> <paramdef>XrmDatabasesource_db,<parameter> *target_db</parameter></paramdef> @@ -1260,7 +1264,7 @@ semantics, use <function>XrmMergeDatabases</function>. <indexterm significance="preferred"><primary>XrmMergeDatabases</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xrmmergedatabases'> <funcprototype> <funcdef>void <function>XrmMergeDatabases</function></funcdef> <paramdef>XrmDatabasesource_db,<parameter> *target_db</parameter></paramdef> @@ -1320,7 +1324,7 @@ or <!-- .sp --> <indexterm significance="preferred"><primary>XrmGetResource</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xrmgetresource'> <funcprototype> <funcdef>Bool <function>XrmGetResource</function></funcdef> <paramdef>XrmDatabase<parameter> database</parameter></paramdef> @@ -1390,7 +1394,7 @@ Returns the value in the database. <!-- .sp --> <indexterm significance="preferred"><primary>XrmQGetResource</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xrmqgetresource'> <funcprototype> <funcdef>Bool <function>XrmQGetResource</function></funcdef> <paramdef>XrmDatabase<parameter> database</parameter></paramdef> @@ -1510,7 +1514,7 @@ To obtain a list of database levels, use <function>XrmQGetSearchList</function>. <indexterm significance="preferred"><primary>XrmQGetSearchList</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xrmqgetsearchlist'> <funcprototype> <funcdef>Bool <function>XrmQGetSearchResource</function></funcdef> <paramdef>XrmDatabase<parameter> database</parameter></paramdef> @@ -1619,7 +1623,7 @@ To search resource database levels for a given resource, use <function>XrmQGetSearchResource</function>. <indexterm significance="preferred"><primary>XrmQGetSearchResource</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xrmqgetsearchresource'> <funcprototype> <funcdef>Bool <function>XrmQGetSearchResource</function></funcdef> <paramdef>XrmSearchList<parameter> list</parameter></paramdef> @@ -1733,7 +1737,7 @@ This value is copied into the specified database. <!-- .sp --> <indexterm significance="preferred"><primary>XrmPutResource</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xrmputresource'> <funcprototype> <funcdef>void <function>XrmPutResource</function></funcdef> <paramdef>XrmDatabase<parameter> *database</parameter></paramdef> @@ -1811,7 +1815,7 @@ The value is stored in the database without modification. <!-- .sp --> <indexterm significance="preferred"><primary>XrmQPutResource</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xrmqputresource'> <funcprototype> <funcdef>void <function>XrmQPutResource</function></funcdef> <paramdef>XrmDatabase<parameter> *database</parameter></paramdef> @@ -1893,7 +1897,7 @@ To add a resource that is specified as a string, use <function>XrmPutStringResource</function>. <indexterm significance="preferred"><primary>XrmPutStringResource</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xrmputstringresource'> <funcprototype> <funcdef>void <function>XrmPutStringResource</function></funcdef> <paramdef>XrmDatabase<parameter> *database</parameter></paramdef> @@ -1960,7 +1964,7 @@ To add a string resource using quarks as a specification, use <function>XrmQPutStringResource</function>. <indexterm significance="preferred"><primary>XrmQPutStringResource</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xrmqputstringresource'> <funcprototype> <funcdef>void <function>XrmQPutStringResource</function></funcdef> <paramdef>XrmDatabase<parameter> *database</parameter></paramdef> @@ -2038,7 +2042,7 @@ both a name and a value, use <function>XrmPutLineResource</function>. <indexterm significance="preferred"><primary>XrmPutLineResource</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xrmputlineresource'> <funcprototype> <funcdef>void <function>XrmPutLineResource</function></funcdef> <paramdef>XrmDatabase<parameter> *database</parameter></paramdef> @@ -2077,7 +2081,8 @@ If database contains NULL, creates a new database and returns a pointer to it. <function>XrmPutLineResource</function> adds a single resource entry to the specified database. -The line should be in valid ResourceLine format (see section 15.1) +The line should be in valid ResourceLine format +(see <link linkend="Resource_File_Syntax">section 15.1</link>) terminated by a newline or null character; the database that results from using a string with incorrect syntax is implementation-dependent. @@ -2107,7 +2112,7 @@ To enumerate the entries of a database, use #define XrmEnumOneLevel 0 </literallayout> -<funcsynopsis> +<funcsynopsis id='xrmenumeratedatabase'> <funcprototype> <funcdef>Bool <function>XrmEnumerateDatabase</function></funcdef> <paramdef>XrmDatabase<parameter> database</parameter></paramdef> @@ -2311,7 +2316,7 @@ To load a resource database from a C command line, use <function>XrmParseCommand</function>. <indexterm significance="preferred"><primary>XrmParseCommand</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xrmparsecommand'> <funcprototype> <funcdef>void <function>XrmParseCommand</function></funcdef> <paramdef>XrmDatabase<parameter> *database</parameter></paramdef> diff --git a/lib/libX11/specs/libX11/CH16.xml b/lib/libX11/specs/libX11/CH16.xml index 8d6ccc3dc..fecbb2f49 100644 --- a/lib/libX11/specs/libX11/CH16.xml +++ b/lib/libX11/specs/libX11/CH16.xml @@ -100,7 +100,7 @@ To obtain a KeySym for the KeyCode of an event, use <function>XLookupKeysym</function>. <indexterm significance="preferred"><primary>XLookupKeysym</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xlookupkeysym'> <funcprototype> <funcdef>KeySym <function>XLookupKeysym</function></funcdef> <paramdef>XKeyEvent<parameter> *key_event</parameter></paramdef> @@ -158,7 +158,7 @@ To obtain a KeySym for a specific KeyCode, use <function>XKeycodeToKeysym</function>. <indexterm significance="preferred"><primary>XKeycodeToKeysym</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xkeycodetokeysym'> <funcprototype> <funcdef>KeySym <function>XKeycodeToKeysym</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -220,7 +220,7 @@ To obtain a KeyCode for a key having a specific KeySym, use <function>XKeysymToKeycode</function>. <indexterm significance="preferred"><primary>XKeysymToKeycode</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xkeysymtokeycode'> <funcprototype> <funcdef>KeyCode <function>XKeysymToKeycode</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -268,7 +268,7 @@ To refresh the stored modifier and keymap information, use <function>XRefreshKeyboardMapping</function>. <indexterm significance="preferred"><primary>XRefreshKeyboardMapping</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xrefreshkeyboardmapping'> <funcprototype> <funcdef><function>XRefreshKeyboardMapping</function></funcdef> <paramdef>XMappingEvent<parameter> *event_map</parameter></paramdef> @@ -310,7 +310,7 @@ To obtain the uppercase and lowercase forms of a KeySym, use <function>XConvertCase</function>. <indexterm significance="preferred"><primary>XConvertCase</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xconvertcase'> <funcprototype> <funcdef>void <function>XConvertCase</function></funcdef> <paramdef>KeySym<parameter> keysym</parameter></paramdef> @@ -373,7 +373,7 @@ To convert the name of the KeySym to the KeySym code, use <function>XStringToKeysym</function>. <indexterm significance="preferred"><primary>XStringToKeysym</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xstringtokeysym'> <funcprototype> <funcdef>KeySym <function>XStringToKeysym</function></funcdef> <paramdef>char<parameter> *string</parameter></paramdef> @@ -423,7 +423,7 @@ To convert a KeySym code to the name of the KeySym, use <function>XKeysymToString</function>. <indexterm significance="preferred"><primary>XKeysymToString</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xkeysymtostring'> <funcprototype> <funcdef>char *<function>XKeysymToString</function></funcdef> <paramdef>KeySym<parameter> keysym</parameter></paramdef> @@ -655,7 +655,8 @@ if the specified KeySym is a PF key. <!-- .XE --> <para> <!-- .LP --> -Chapter 13 describes internationalized text input facilities, +<link linkend="locales_and_internationalized_text_functions">Chapter 13</link> +describes internationalized text input facilities, but sometimes it is expedient to write an application that only deals with Latin-1 characters and ASCII controls, so Xlib provides a simple function for that purpose. @@ -671,7 +672,7 @@ To map a key event to an ISO Latin-1 string, use <function>XLookupString</function>. <indexterm significance="preferred"><primary>XLookupString</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xlookupstring'> <funcprototype> <funcdef>int <function>XLookupString</function></funcdef> <paramdef>XKeyEvent<parameter> *event_struct</parameter></paramdef> @@ -793,7 +794,7 @@ use <function>XRebindKeysym</function>. <indexterm significance="preferred"><primary>XRebindKeysym</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xrebindkeysym'> <funcprototype> <funcdef><function>XRebindKeysym</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -898,7 +899,7 @@ To allocate some memory you will never give back, use <function>Xpermalloc</function>. <indexterm significance="preferred"><primary>Xpermalloc</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xpermalloc'> <funcprototype> <funcdef>char *<function>Xpermalloc</function></funcdef> <paramdef>unsignedint<parameter> size</parameter></paramdef> @@ -932,7 +933,7 @@ To parse standard window geometry strings, use <para> <!-- .LP --> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xparsegeometry'> <funcprototype> <funcdef>int <function>XParseGeometry</function></funcdef> <paramdef>char<parameter> *parsestring</parameter></paramdef> @@ -1066,7 +1067,7 @@ To construct a window's geometry information, use <function>XWMGeometry</function>. <indexterm significance="preferred"><primary>XWMGeometry</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xwmgeometry'> <funcprototype> <funcdef>int <function>XWMGeometry</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1305,7 +1306,7 @@ To generate a region from a polygon, use </para> <indexterm significance="preferred"><primary>XPolygonRegion</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xpolygonregion'> <funcprototype> <funcdef>Region <function>XPolygonRegion</function></funcdef> <paramdef>XPoint<parameter> points[]</parameter></paramdef> @@ -1368,7 +1369,7 @@ To set the clip-mask of a GC to a region, use <function>XSetRegion</function>. <indexterm significance="preferred"><primary>XSetRegion</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsetregion'> <funcprototype> <funcdef><function>XSetRegion</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -1428,7 +1429,7 @@ To deallocate the storage associated with a specified region, use <function>XDestroyRegion</function>. <indexterm significance="preferred"><primary>XDestroyRegion</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xdestroyregion'> <funcprototype> <funcdef><function>XDestroyRegion</function></funcdef> <paramdef>Region<parameter> r</parameter></paramdef> @@ -1464,7 +1465,7 @@ To move a region by a specified amount, use <function>XOffsetRegion</function>. <indexterm significance="preferred"><primary>XOffsetRegion</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xoffsetregion'> <funcprototype> <funcdef><function>XOffsetRegion</function></funcdef> <paramdef>Region<parameter> r</parameter></paramdef> @@ -1516,7 +1517,7 @@ To reduce a region by a specified amount, use <function>XShrinkRegion</function>. <indexterm significance="preferred"><primary>XShrinkRegion</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xshrinkregion'> <funcprototype> <funcdef><function>XShrinkRegion</function></funcdef> <paramdef>Region<parameter> r</parameter></paramdef> @@ -1579,7 +1580,7 @@ To generate the smallest rectangle enclosing a region, use <function>XClipBox</function>. <indexterm significance="preferred"><primary>XClipBox</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xclipbox'> <funcprototype> <funcdef><function>XClipBox</function></funcdef> <paramdef>Region<parameter> r</parameter></paramdef> @@ -1624,7 +1625,7 @@ To compute the intersection of two regions, use <function>XIntersectRegion</function>. <indexterm significance="preferred"><primary>XIntersectRegion</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xintersectregion'> <funcprototype> <funcdef><function>XIntersectRegion</function></funcdef> <paramdef>Regionsra,srb,<parameter> dr_return</parameter></paramdef> @@ -1673,7 +1674,7 @@ To compute the union of two regions, use <function>XUnionRegion</function>. <indexterm significance="preferred"><primary>XUnionRegion</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xunionregion'> <funcprototype> <funcdef><function>XUnionRegion</function></funcdef> <paramdef>Regionsra,srb,<parameter> dr_return</parameter></paramdef> @@ -1722,7 +1723,7 @@ To create a union of a source region and a rectangle, use <function>XUnionRectWithRegion</function>. <indexterm significance="preferred"><primary>XUnionRectWithRegion</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xunionrectwithregion'> <funcprototype> <funcdef><function>XUnionRectWithRegion</function></funcdef> <paramdef>XRectangle<parameter> *rectangle</parameter></paramdef> @@ -1779,7 +1780,7 @@ To subtract two regions, use <function>XSubtractRegion</function>. <indexterm significance="preferred"><primary>XSubtractRegion</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsubtractregion'> <funcprototype> <funcdef><function>XSubtractRegion</function></funcdef> <paramdef>Regionsra,srb,<parameter> dr_return</parameter></paramdef> @@ -1835,7 +1836,7 @@ of two regions, use <function>XXorRegion</function>. <indexterm significance="preferred"><primary>XXorRegion</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xxorregion'> <funcprototype> <funcdef><function>XXorRegion</function></funcdef> <paramdef>Regionsra,srb,<parameter> dr_return</parameter></paramdef> @@ -1892,7 +1893,7 @@ To determine if the specified region is empty, use <function>XEmptyRegion</function>. <indexterm significance="preferred"><primary>XEmptyRegion</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xemptyregion'> <funcprototype> <funcdef>Bool <function>XEmptyRegion</function></funcdef> <paramdef>Region<parameter> r</parameter></paramdef> @@ -1928,7 +1929,7 @@ To determine if two regions have the same offset, size, and shape, use <function>XEqualRegion</function>. <indexterm significance="preferred"><primary>XEqualRegion</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xequalregion'> <funcprototype> <funcdef>Bool <function>XEqualRegion</function></funcdef> <paramdef>Regionr1,<parameter> r2</parameter></paramdef> @@ -1980,7 +1981,7 @@ To determine if a specified point resides in a specified region, use <function>XPointInRegion</function>. <indexterm significance="preferred"><primary>XPointInRegion</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xpointinregion'> <funcprototype> <funcdef>Bool <function>XPointInRegion</function></funcdef> <paramdef>Region<parameter> r</parameter></paramdef> @@ -2039,7 +2040,7 @@ To determine if a specified rectangle is inside a region, use <function>XRectInRegion</function>. <indexterm significance="preferred"><primary>XRectInRegion</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xrectinregion'> <funcprototype> <funcdef>int <function>XRectInRegion</function></funcdef> <paramdef>Region<parameter> r</parameter></paramdef> @@ -2132,7 +2133,8 @@ if the rectangle is partially in the specified region. Xlib provides functions to manipulate cut buffers, a very simple form of cut-and-paste inter-client communication. Selections are a much more powerful and useful mechanism for -interchanging data between clients (see section 4.5) +interchanging data between client +(see <link linkend="Selections">section 4.5</link>) and generally should be used instead of cut buffers. </para> <para> @@ -2151,7 +2153,7 @@ To store data in cut buffer 0, use <function>XStoreBytes</function>. <indexterm significance="preferred"><primary>XStoreBytes</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xstorebytes'> <funcprototype> <funcdef><function>XStoreBytes</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2216,7 +2218,7 @@ To store data in a specified cut buffer, use <function>XStoreBuffer</function>. <indexterm significance="preferred"><primary>XStoreBuffer</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xstorebuffer'> <funcprototype> <funcdef><function>XStoreBuffer</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2291,7 +2293,7 @@ To return data from cut buffer 0, use <function>XFetchBytes</function>. <indexterm significance="preferred"><primary>XFetchBytes</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xfetchbytes'> <funcprototype> <funcdef>char *<function>XFetchBytes</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2343,7 +2345,7 @@ To return data from a specified cut buffer, use <function>XFetchBuffer</function>. <indexterm significance="preferred"><primary>XFetchBuffer</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xfetchbuffer'> <funcprototype> <funcdef>char *<function>XFetchBuffer</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2402,7 +2404,7 @@ To rotate the cut buffers, use <function>XRotateBuffers</function>. <indexterm significance="preferred"><primary>XRotateBuffers</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xrotatebuffers'> <funcprototype> <funcdef><function>XRotateBuffers</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2522,7 +2524,7 @@ template, use <function>XGetVisualInfo</function>. <indexterm significance="preferred"><primary>XGetVisualInfo</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xgetvisualinfo'> <funcprototype> <funcdef>XVisualInfo *<function>XGetVisualInfo</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2597,7 +2599,7 @@ class of the screen, use <function>XMatchVisualInfo</function>. <indexterm significance="preferred"><primary>XMatchVisualInfo</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xmatchvisualinfo'> <funcprototype> <funcdef>Status <function>XMatchVisualInfo</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2736,7 +2738,7 @@ plane n must be located at the address (data + (n * height * bytes_per_line)). For a description of the <structname>XImage</structname> structure, -see section 8.7. +see <link linkend="Transferring_Images_between_Client_and_Server">section 8.7</link>. </para> <para> <!-- .LP --> @@ -2747,7 +2749,7 @@ structure and initialize it with image format values from a display, use <function>XCreateImage</function>. <indexterm significance="preferred"><primary>XCreateImage</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcreateimage'> <funcprototype> <funcdef>XImage *<function>XCreateImage</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -2930,7 +2932,7 @@ To obtain a pixel value in an image, use <function>XGetPixel</function>. <indexterm significance="preferred"><primary>XGetPixel</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xgetpixel'> <funcprototype> <funcdef>unsigned long <function>XGetPixel</function></funcdef> <paramdef>XImage<parameter> *ximage</parameter></paramdef> @@ -2991,7 +2993,7 @@ To set a pixel value in an image, use <function>XPutPixel</function>. <indexterm significance="preferred"><primary>XPutPixel</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xputpixel'> <funcprototype> <funcdef><function>XPutPixel</function></funcdef> <paramdef>XImage<parameter> *ximage</parameter></paramdef> @@ -3063,7 +3065,7 @@ To create a subimage, use <function>XSubImage</function>. <indexterm significance="preferred"><primary>XSubImage</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsubimage'> <funcprototype> <funcdef>XImage *<function>XSubImage</function></funcdef> <paramdef>XImage<parameter> *ximage</parameter></paramdef> @@ -3149,7 +3151,7 @@ To increment each pixel in an image by a constant value, use <function>XAddPixel</function>. <indexterm significance="preferred"><primary>XAddPixel</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xaddpixel'> <funcprototype> <funcdef><function>XAddPixel</function></funcdef> <paramdef>XImage<parameter> *ximage</parameter></paramdef> @@ -3198,7 +3200,7 @@ use <function>XDestroyImage</function>. <indexterm significance="preferred"><primary>XDestroyImage</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xdestroyimage'> <funcprototype> <funcdef><function>XDestroyImage</function></funcdef> <paramdef>XImage *<parameter>ximage</parameter></paramdef> @@ -3285,7 +3287,7 @@ To read a bitmap from a file and store it in a pixmap, use <function>XReadBitmapFile</function>. <indexterm significance="preferred"><primary>XReadBitmapFile</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xreadbitmapfile'> <funcprototype> <funcdef>int <function>XReadBitmapFile</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3440,7 +3442,7 @@ To read a bitmap from a file and return it as data, use <function>XReadBitmapFileData</function>. <indexterm significance="preferred"><primary>XReadBitmapFileData</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xreadbitmapfiledata'> <funcprototype> <funcdef>int <function>XReadBitmapFileData</function></funcdef> <paramdef>char<parameter> *filename</parameter></paramdef> @@ -3537,7 +3539,7 @@ To write out a bitmap from a pixmap to a file, use <function>XWriteBitmapFile</function>. <indexterm significance="preferred"><primary>XWriteBitmapFile</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xwritebitmapfile'> <funcprototype> <funcdef>int <function>XWriteBitmapFile</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3664,7 +3666,7 @@ To create a pixmap and then store bitmap-format data into it, use <function>XCreatePixmapFromBitmapData</function>. <indexterm significance="preferred"><primary>XCreatePixmapFromBitmapData</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcreatepixmapfrombitmapdata'> <funcprototype> <funcdef>Pixmap <function>XCreatePixmapFromBitmapData</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3796,7 +3798,7 @@ in a program directly, as opposed to reading it in every time at run time, use <function>XCreateBitmapFromData</function>. <indexterm significance="preferred"><primary>XCreateBitmapFromData</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xcreatebitmapfromdata'> <funcprototype> <funcdef>Pixmap <function>XCreateBitmapFromData</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -3942,7 +3944,7 @@ To save a data value that corresponds to a resource ID and context type, use <function>XSaveContext</function>. <indexterm significance="preferred"><primary>XSaveContext</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xsavecontext'> <funcprototype> <funcdef>int <function>XSaveContext</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -4016,7 +4018,7 @@ To get the data associated with a resource ID and type, use <function>XFindContext</function>. <indexterm significance="preferred"><primary>XFindContext</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xfindcontext'> <funcprototype> <funcdef>int <function>XFindContext</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> @@ -4089,7 +4091,7 @@ To delete an entry for a given resource ID and type, use <function>XDeleteContext</function>. <indexterm significance="preferred"><primary>XDeleteContext</primary></indexterm> <!-- .sM --> -<funcsynopsis> +<funcsynopsis id='xdeletecontext'> <funcprototype> <funcdef>int <function>XDeleteContext</function></funcdef> <paramdef>Display<parameter> *display</parameter></paramdef> diff --git a/lib/libX11/specs/libX11/Makefile.am b/lib/libX11/specs/libX11/Makefile.am index 0e59ad887..b87e568cd 100644 --- a/lib/libX11/specs/libX11/Makefile.am +++ b/lib/libX11/specs/libX11/Makefile.am @@ -1,6 +1,5 @@ if ENABLE_SPECS -if HAVE_XMLTO # Main DocBook/XML files (DOCTYPE book) docbook = libX11.xml @@ -31,10 +30,9 @@ chapters = \ glossary.xml # The location where the DocBook/XML files and their generated formats are installed -shelfdir = $(docdir) +shelfdir = $(docdir)/libX11 # Generate DocBook/XML output formats with or without stylesheets include $(top_srcdir)/docbook.am -endif HAVE_XMLTO endif ENABLE_SPECS diff --git a/lib/libX11/specs/libX11/Makefile.in b/lib/libX11/specs/libX11/Makefile.in index a0c73bad9..abdc38050 100644 --- a/lib/libX11/specs/libX11/Makefile.in +++ b/lib/libX11/specs/libX11/Makefile.in @@ -54,8 +54,18 @@ build_triplet = @build@ host_triplet = @host@ DIST_COMMON = $(am__dist_shelf_DATA_DIST) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(top_srcdir)/docbook.am -@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(docbook:.xml=.pdf) $(docbook:.xml=.ps) -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(docbook:.xml=.txt) +@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@am__append_1 = $(docbook:.xml=.html) +@ENABLE_SPECS_TRUE@@HAVE_FOP_TRUE@@HAVE_XMLTO_TRUE@am__append_2 = $(docbook:.xml=.pdf) $(docbook:.xml=.ps) +@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TEXT_TRUE@@HAVE_XMLTO_TRUE@am__append_3 = $(docbook:.xml=.txt) + +# +# Generate documents cross-reference target databases +# + +# This is only possible if the xorg-sgml-doctools package is installed + +# DocBook/XML generated document cross-reference database +@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@am__append_4 = $(docbook:.xml=.html.db) $(docbook:.xml=.fo.db) subdir = specs/libX11 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_define_dir.m4 \ @@ -78,12 +88,10 @@ am__vpath_adj = case $$p in \ *) f=$$p;; \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(sgmldbsdir)" \ - "$(DESTDIR)$(shelfdir)" +am__installdirs = "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)" dist_shelfDATA_INSTALL = $(INSTALL_DATA) -sgmldbsDATA_INSTALL = $(INSTALL_DATA) shelfDATA_INSTALL = $(INSTALL_DATA) -DATA = $(dist_shelf_DATA) $(sgmldbs_DATA) $(shelf_DATA) +DATA = $(dist_shelf_DATA) $(shelf_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ADMIN_MAN_DIR = @ADMIN_MAN_DIR@ @@ -198,6 +206,7 @@ RAWCPPFLAGS = @RAWCPPFLAGS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ THRSTUBS_FALSE = @THRSTUBS_FALSE@ @@ -286,45 +295,43 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ # Main DocBook/XML files (DOCTYPE book) -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@docbook = libX11.xml +@ENABLE_SPECS_TRUE@docbook = libX11.xml # Included chapters, appendix, images -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@chapters = \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ AppA.xml \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ AppB.xml \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ AppC.xml \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ AppD.xml \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ CH01.xml \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ CH02.xml \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ CH03.xml \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ CH04.xml \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ CH05.xml \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ CH06.xml \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ CH07.xml \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ CH08.xml \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ CH09.xml \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ CH10.xml \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ CH11.xml \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ CH12.xml \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ CH13.xml \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ CH14.xml \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ CH15.xml \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ CH16.xml \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ credits.xml \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ glossary.xml +@ENABLE_SPECS_TRUE@chapters = \ +@ENABLE_SPECS_TRUE@ AppA.xml \ +@ENABLE_SPECS_TRUE@ AppB.xml \ +@ENABLE_SPECS_TRUE@ AppC.xml \ +@ENABLE_SPECS_TRUE@ AppD.xml \ +@ENABLE_SPECS_TRUE@ CH01.xml \ +@ENABLE_SPECS_TRUE@ CH02.xml \ +@ENABLE_SPECS_TRUE@ CH03.xml \ +@ENABLE_SPECS_TRUE@ CH04.xml \ +@ENABLE_SPECS_TRUE@ CH05.xml \ +@ENABLE_SPECS_TRUE@ CH06.xml \ +@ENABLE_SPECS_TRUE@ CH07.xml \ +@ENABLE_SPECS_TRUE@ CH08.xml \ +@ENABLE_SPECS_TRUE@ CH09.xml \ +@ENABLE_SPECS_TRUE@ CH10.xml \ +@ENABLE_SPECS_TRUE@ CH11.xml \ +@ENABLE_SPECS_TRUE@ CH12.xml \ +@ENABLE_SPECS_TRUE@ CH13.xml \ +@ENABLE_SPECS_TRUE@ CH14.xml \ +@ENABLE_SPECS_TRUE@ CH15.xml \ +@ENABLE_SPECS_TRUE@ CH16.xml \ +@ENABLE_SPECS_TRUE@ credits.xml \ +@ENABLE_SPECS_TRUE@ glossary.xml # The location where the DocBook/XML files and their generated formats are installed -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@shelfdir = $(docdir) +@ENABLE_SPECS_TRUE@shelfdir = $(docdir)/libX11 # DocBook/XML generated output formats to be installed -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@shelf_DATA = \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(docbook:.xml=.html) \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(am__append_1) \ -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(am__append_2) +@ENABLE_SPECS_TRUE@shelf_DATA = $(am__append_1) $(am__append_2) \ +@ENABLE_SPECS_TRUE@ $(am__append_3) $(am__append_4) # DocBook/XML file with chapters, appendix and images it includes -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@dist_shelf_DATA = $(docbook) $(chapters) +@ENABLE_SPECS_TRUE@dist_shelf_DATA = $(docbook) $(chapters) # # Generate DocBook/XML output formats with or without stylesheets @@ -349,15 +356,6 @@ target_alias = @target_alias@ @ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@ -x $(STYLESHEET_SRCDIR)/xorg-fo.xsl -# -# Generate documents cross-reference target databases -# - -# This is only possible if the xorg-sgml-doctools package is installed - -# DocBook/XML generated document cross-reference database -@ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@sgmldbs_DATA = $(docbook:.xml=.html.db) $(docbook:.xml=.fo.db) - # Generate DocBook/XML document cross-reference database # Flags for the XSL Transformation processor generating xref target databases @ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@XSLTPROC_FLAGS = \ @@ -366,7 +364,7 @@ target_alias = @target_alias@ @ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --stringparam collect.xref.targets "only" \ @ENABLE_SPECS_TRUE@@HAVE_STYLESHEETS_TRUE@@HAVE_XMLTO_TRUE@@HAVE_XSLTPROC_TRUE@ --nonet --xinclude -@ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@CLEANFILES = $(shelf_DATA) $(sgmldbs_DATA) +@ENABLE_SPECS_TRUE@CLEANFILES = $(shelf_DATA) all: all-am .SUFFIXES: @@ -426,23 +424,6 @@ uninstall-dist_shelfDATA: echo " rm -f '$(DESTDIR)$(shelfdir)/$$f'"; \ rm -f "$(DESTDIR)$(shelfdir)/$$f"; \ done -install-sgmldbsDATA: $(sgmldbs_DATA) - @$(NORMAL_INSTALL) - test -z "$(sgmldbsdir)" || $(mkdir_p) "$(DESTDIR)$(sgmldbsdir)" - @list='$(sgmldbs_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(sgmldbsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sgmldbsdir)/$$f'"; \ - $(sgmldbsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sgmldbsdir)/$$f"; \ - done - -uninstall-sgmldbsDATA: - @$(NORMAL_UNINSTALL) - @list='$(sgmldbs_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(sgmldbsdir)/$$f'"; \ - rm -f "$(DESTDIR)$(sgmldbsdir)/$$f"; \ - done install-shelfDATA: $(shelf_DATA) @$(NORMAL_INSTALL) test -z "$(shelfdir)" || $(mkdir_p) "$(DESTDIR)$(shelfdir)" @@ -499,7 +480,7 @@ check-am: all-am check: check-am all-am: Makefile $(DATA) installdirs: - for dir in "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(sgmldbsdir)" "$(DESTDIR)$(shelfdir)"; do \ + for dir in "$(DESTDIR)$(shelfdir)" "$(DESTDIR)$(shelfdir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-am @@ -545,8 +526,7 @@ info: info-am info-am: -install-data-am: install-dist_shelfDATA install-sgmldbsDATA \ - install-shelfDATA +install-data-am: install-dist_shelfDATA install-shelfDATA install-exec-am: @@ -573,19 +553,18 @@ ps: ps-am ps-am: uninstall-am: uninstall-dist_shelfDATA uninstall-info-am \ - uninstall-sgmldbsDATA uninstall-shelfDATA + uninstall-shelfDATA .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ dvi-am html html-am info info-am install install-am \ install-data install-data-am install-dist_shelfDATA \ install-exec install-exec-am install-info install-info-am \ - install-man install-sgmldbsDATA install-shelfDATA \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-dist_shelfDATA \ - uninstall-info-am uninstall-sgmldbsDATA uninstall-shelfDATA + install-man install-shelfDATA install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_shelfDATA uninstall-info-am uninstall-shelfDATA @ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@%.html: %.xml $(chapters) @ENABLE_SPECS_TRUE@@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) $(XMLTO_FLAGS) $(XMLTO_XHTML_FLAGS) xhtml-nochunks $< diff --git a/lib/libX11/src/FSWrap.c b/lib/libX11/src/FSWrap.c index a94709365..45a2c34e3 100644 --- a/lib/libX11/src/FSWrap.c +++ b/lib/libX11/src/FSWrap.c @@ -85,10 +85,9 @@ _XParseBaseFontNameList( if (!*str) return (char **)NULL; - if (!(ptr = Xmalloc((unsigned)strlen(str) + 1))) { + if (!(ptr = strdup(str))) { return (char **)NULL; } - strcpy(ptr, str); psave = ptr; /* somebody who specifies more than XMAXLIST basefontnames will lose */ @@ -131,7 +130,7 @@ copy_string_list( char **string_list_ret, **list_src, **list_dst, *dst; int length, count; - if (string_list == NULL) + if (string_list == NULL || list_count == 0) return (char **) NULL; string_list_ret = (char **) Xmalloc(sizeof(char *) * list_count); diff --git a/lib/libX11/src/InitExt.c b/lib/libX11/src/InitExt.c index cb9191de6..19515ccd0 100644 --- a/lib/libX11/src/InitExt.c +++ b/lib/libX11/src/InitExt.c @@ -50,14 +50,13 @@ XExtCodes *XInitExtension ( LockDisplay (dpy); if (! (ext = (_XExtension *) Xcalloc (1, sizeof (_XExtension))) || - ! (ext->name = Xmalloc((unsigned) strlen(name) + 1))) { + ! (ext->name = strdup(name))) { if (ext) Xfree((char *) ext); UnlockDisplay(dpy); return (XExtCodes *) NULL; } codes.extension = dpy->ext_number++; ext->codes = codes; - (void) strcpy(ext->name, name); /* chain it onto the display list */ ext->next = dpy->ext_procs; diff --git a/lib/libX11/src/Makefile.in b/lib/libX11/src/Makefile.in index 4878a929f..b73a6a515 100644 --- a/lib/libX11/src/Makefile.in +++ b/lib/libX11/src/Makefile.in @@ -330,6 +330,7 @@ RAWCPPFLAGS = @RAWCPPFLAGS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ THRSTUBS_FALSE = @THRSTUBS_FALSE@ diff --git a/lib/libX11/src/Quarks.c b/lib/libX11/src/Quarks.c index d0eb69018..7a704b101 100644 --- a/lib/libX11/src/Quarks.c +++ b/lib/libX11/src/Quarks.c @@ -210,10 +210,9 @@ ExpandQuarkTable(void) #endif newmask = 0x1ff; } - entries = (Entry *)Xmalloc(sizeof(Entry) * (newmask + 1)); + entries = Xcalloc(newmask + 1, sizeof(Entry)); if (!entries) return False; - bzero((char *)entries, sizeof(Entry) * (newmask + 1)); quarkTable = entries; quarkMask = newmask; quarkRehash = quarkMask - 2; diff --git a/lib/libX11/src/RdBitF.c b/lib/libX11/src/RdBitF.c index 07967aebe..ab7d800d3 100644 --- a/lib/libX11/src/RdBitF.c +++ b/lib/libX11/src/RdBitF.c @@ -216,6 +216,11 @@ XReadBitmapFileData ( *ptr=value; } } + + /* If we got to this point, we read a full bitmap file. Break so we don't + * start reading another one from the same file and leak the memory + * allocated for the previous one. */ + break; } /* end while */ fclose(fstream); diff --git a/lib/libX11/src/SetLocale.c b/lib/libX11/src/SetLocale.c index 00c76ee45..c49cb2e4e 100644 --- a/lib/libX11/src/SetLocale.c +++ b/lib/libX11/src/SetLocale.c @@ -103,13 +103,12 @@ _Xsetlocale( if (!methods) return NULL; name = (*methods->lcname)(state); - xsl_name = Xmalloc(strlen(name) + 1); + xsl_name = strdup(name); if (!xsl_name) { xsl_name = old_name; (*methods->destroy)(state); return NULL; } - strcpy(xsl_name, name); if (old_name) Xfree(old_name); (*methods->destroy)(state); diff --git a/lib/libX11/src/Xrm.c b/lib/libX11/src/Xrm.c index c466cae7f..53467aedc 100644 --- a/lib/libX11/src/Xrm.c +++ b/lib/libX11/src/Xrm.c @@ -581,23 +581,21 @@ static void GrowTable( ltable = (LTable)table; /* cons up a copy to make MoveValues look symmetric */ otable = *ltable; - ltable->buckets = (VEntry *)Xmalloc(i * sizeof(VEntry)); + ltable->buckets = Xcalloc(i, sizeof(VEntry)); if (!ltable->buckets) { ltable->buckets = otable.buckets; return; } ltable->table.mask = i - 1; - bzero((char *)ltable->buckets, i * sizeof(VEntry)); MoveValues(&otable, ltable); } else { register NTable ntable; - ntable = (NTable)Xmalloc(sizeof(NTableRec) + i * sizeof(NTable)); + ntable = Xcalloc(1, sizeof(NTableRec) + (i * sizeof(NTable))); if (!ntable) return; *ntable = *table; ntable->mask = i - 1; - bzero((char *)NodeBuckets(ntable), i * sizeof(NTable)); *prev = ntable; MoveTables(table, ntable); } diff --git a/lib/libX11/src/util/Makefile.in b/lib/libX11/src/util/Makefile.in index 24b47a1d2..d4e87b6e3 100644 --- a/lib/libX11/src/util/Makefile.in +++ b/lib/libX11/src/util/Makefile.in @@ -181,6 +181,7 @@ RAWCPPFLAGS = @RAWCPPFLAGS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ THRSTUBS_FALSE = @THRSTUBS_FALSE@ diff --git a/lib/libX11/src/xcb_io.c b/lib/libX11/src/xcb_io.c index 893073669..0af47d888 100644 --- a/lib/libX11/src/xcb_io.c +++ b/lib/libX11/src/xcb_io.c @@ -15,6 +15,7 @@ #ifdef HAVE_INTTYPES_H #include <inttypes.h> #endif +#include <stdio.h> #include <stdint.h> #include <stdlib.h> #include <string.h> @@ -22,6 +23,28 @@ #include <sys/select.h> #endif +#define xcb_fail_assert(_message, _var) { \ + unsigned int _var = 1; \ + fprintf(stderr, "[xcb] Aborting, sorry about that.\n"); \ + assert(!_var); \ +} + +#define throw_thread_fail_assert(_message, _var) { \ + fprintf(stderr, "[xcb] " _message "\n"); \ + fprintf(stderr, "[xcb] Most likely this is a multi-threaded client " \ + "and XInitThreads has not been called\n"); \ + xcb_fail_assert(_message, _var); \ +} + +/* XXX: It would probably be most useful if we stored the last-processed + * request, so we could find the offender from the message. */ +#define throw_extlib_fail_assert(_message, _var) { \ + fprintf(stderr, "[xcb] " _message "\n"); \ + fprintf(stderr, "[xcb] This is most likely caused by a broken X " \ + "extension library\n"); \ + xcb_fail_assert(_message, _var); \ +} + static void return_socket(void *closure) { Display *dpy = closure; @@ -51,9 +74,14 @@ static void require_socket(Display *dpy) * happens while Xlib does not own the socket. A * complete fix would be to make XCB's public API use * 64-bit sequence numbers. */ - assert(!(sizeof(unsigned long) > sizeof(unsigned int) - && dpy->xcb->event_owner == XlibOwnsEventQueue - && (sent - dpy->last_request_read >= (UINT64_C(1) << 32)))); + if (sizeof(unsigned long) > sizeof(unsigned int) && + dpy->xcb->event_owner == XlibOwnsEventQueue && + (sent - dpy->last_request_read >= (UINT64_C(1) << 32))) { + throw_thread_fail_assert("Sequence number wrapped " + "beyond 32 bits while Xlib " + "did not own the socket", + xcb_xlib_seq_number_wrapped); + } dpy->xcb->last_flushed = dpy->request = sent; dpy->bufmax = dpy->xcb->real_bufmax; } @@ -125,8 +153,15 @@ static PendingRequest *append_pending_request(Display *dpy, unsigned long sequen node->reply_waiter = 0; if(dpy->xcb->pending_requests_tail) { - assert(XLIB_SEQUENCE_COMPARE(dpy->xcb->pending_requests_tail->sequence, <, node->sequence)); - assert(dpy->xcb->pending_requests_tail->next == NULL); + if (XLIB_SEQUENCE_COMPARE(dpy->xcb->pending_requests_tail->sequence, + >=, node->sequence)) + throw_thread_fail_assert("Unknown sequence number " + "while appending request", + xcb_xlib_unknown_seq_number); + if (dpy->xcb->pending_requests_tail->next != NULL) + throw_thread_fail_assert("Unknown request in queue " + "while appending request", + xcb_xlib_unknown_req_pending); dpy->xcb->pending_requests_tail->next = node; } else @@ -137,15 +172,26 @@ static PendingRequest *append_pending_request(Display *dpy, unsigned long sequen static void dequeue_pending_request(Display *dpy, PendingRequest *req) { - assert(req == dpy->xcb->pending_requests); + if (req != dpy->xcb->pending_requests) + throw_thread_fail_assert("Unknown request in queue while " + "dequeuing", + xcb_xlib_unknown_req_in_deq); + dpy->xcb->pending_requests = req->next; if(!dpy->xcb->pending_requests) { - assert(req == dpy->xcb->pending_requests_tail); + if (req != dpy->xcb->pending_requests_tail) + throw_thread_fail_assert("Unknown request in queue " + "while dequeuing", + xcb_xlib_unknown_req_in_deq); dpy->xcb->pending_requests_tail = NULL; } - else - assert(XLIB_SEQUENCE_COMPARE(req->sequence, <, dpy->xcb->pending_requests->sequence)); + else if (XLIB_SEQUENCE_COMPARE(req->sequence, >=, + dpy->xcb->pending_requests->sequence)) + throw_thread_fail_assert("Unknown sequence number while " + "dequeuing request", + xcb_xlib_threads_sequence_lost); + free(req); } @@ -218,7 +264,14 @@ static xcb_generic_reply_t *poll_for_event(Display *dpy) if(!req || XLIB_SEQUENCE_COMPARE(event_sequence, <, req->sequence) || (event->response_type != X_Error && event_sequence == req->sequence)) { - assert(XLIB_SEQUENCE_COMPARE(event_sequence, <=, dpy->request)); + if (XLIB_SEQUENCE_COMPARE(event_sequence, >, + dpy->request)) + { + throw_thread_fail_assert("Unknown sequence " + "number while " + "processing queue", + xcb_xlib_threads_sequence_lost); + } dpy->last_request_read = event_sequence; dpy->xcb->next_event = NULL; return (xcb_generic_reply_t *) event; @@ -237,7 +290,12 @@ static xcb_generic_reply_t *poll_for_response(Display *dpy) !req->reply_waiter && xcb_poll_for_reply(dpy->xcb->connection, req->sequence, &response, &error)) { - assert(XLIB_SEQUENCE_COMPARE(req->sequence, <=, dpy->request)); + if(XLIB_SEQUENCE_COMPARE(req->sequence, >, dpy->request)) + { + throw_thread_fail_assert("Unknown sequence number " + "while awaiting reply", + xcb_xlib_threads_sequence_lost); + } dpy->last_request_read = req->sequence; if(response) break; @@ -512,7 +570,9 @@ Status _XReply(Display *dpy, xReply *rep, int extra, Bool discard) char *reply; PendingRequest *current; - assert(!dpy->xcb->reply_data); + if (dpy->xcb->reply_data) + throw_extlib_fail_assert("Extra reply data still left in queue", + xcb_xlib_extra_reply_data_left); if(dpy->flags & XlibDisplayIOError) return 0; @@ -568,7 +628,11 @@ Status _XReply(Display *dpy, xReply *rep, int extra, Bool discard) req->reply_waiter = 0; ConditionBroadcast(dpy, dpy->xcb->reply_notify); - assert(XLIB_SEQUENCE_COMPARE(req->sequence, <=, dpy->request)); + if(XLIB_SEQUENCE_COMPARE(req->sequence, >, dpy->request)) { + throw_thread_fail_assert("Unknown sequence number " + "while processing reply", + xcb_xlib_threads_sequence_lost); + } dpy->last_request_read = req->sequence; if(!response) dequeue_pending_request(dpy, req); @@ -665,8 +729,10 @@ int _XRead(Display *dpy, char *data, long size) assert(size >= 0); if(size == 0) return 0; - assert(dpy->xcb->reply_data != NULL); - assert(dpy->xcb->reply_consumed + size <= dpy->xcb->reply_length); + if(dpy->xcb->reply_data == NULL || + dpy->xcb->reply_consumed + size > dpy->xcb->reply_length) + throw_extlib_fail_assert("Too much data requested from _XRead", + xcb_xlib_too_much_data_requested); memcpy(data, dpy->xcb->reply_data + dpy->xcb->reply_consumed, size); dpy->xcb->reply_consumed += size; _XFreeReplyData(dpy, False); diff --git a/lib/libX11/src/xcms/LRGB.c b/lib/libX11/src/xcms/LRGB.c index 2dca82ee8..5ecb7d120 100644 --- a/lib/libX11/src/xcms/LRGB.c +++ b/lib/libX11/src/xcms/LRGB.c @@ -653,7 +653,7 @@ LINEAR_RGB_InitSCCData( */ if (!(pScreenData = (LINEAR_RGB_SCCData *) Xcalloc (1, sizeof(LINEAR_RGB_SCCData)))) { - return(XcmsFailure); + goto Free_property_return; } /* copy matrices */ memcpy((char *)pScreenData, (char *)pScreenDefaultData, @@ -663,7 +663,7 @@ LINEAR_RGB_InitSCCData( if (!(pNewMap = (XcmsIntensityMap *) Xcalloc (1, sizeof(XcmsIntensityMap)))) { Xfree((char *)pScreenData); - return(XcmsFailure); + goto Free_property_return; } pNewMap->visualID = visualID; pNewMap->screenData = (XPointer)pScreenData; @@ -802,7 +802,7 @@ FreeBlueTbl: Xfree((char *)pScreenData->pBlueTbl); FreeGreenTblElements: - Xfree((char *)pScreenData->pBlueTbl->pBase); + Xfree((char *)pScreenData->pGreenTbl->pBase); FreeGreenTbl: Xfree((char *)pScreenData->pGreenTbl); @@ -817,7 +817,7 @@ Free_property_return: Xfree ((char *)property_return); FreeSCCData: - Xfree((char *)pScreenData); + Xfree((char *)pScreenDefaultData); pPerScrnInfo->state = XcmsInitNone; return(XcmsFailure); } diff --git a/lib/libX11/src/xcms/Makefile.in b/lib/libX11/src/xcms/Makefile.in index d55001ae1..657234ba5 100644 --- a/lib/libX11/src/xcms/Makefile.in +++ b/lib/libX11/src/xcms/Makefile.in @@ -201,6 +201,7 @@ RAWCPPFLAGS = @RAWCPPFLAGS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ THRSTUBS_FALSE = @THRSTUBS_FALSE@ diff --git a/lib/libX11/src/xcms/PrOfId.c b/lib/libX11/src/xcms/PrOfId.c index 831f17ab9..a96d28cec 100644 --- a/lib/libX11/src/xcms/PrOfId.c +++ b/lib/libX11/src/xcms/PrOfId.c @@ -66,7 +66,6 @@ XcmsPrefixOfFormat( */ { XcmsColorSpace **papColorSpaces; - char *prefix; /* * First try Device-Independent color spaces @@ -75,10 +74,7 @@ XcmsPrefixOfFormat( if (papColorSpaces != NULL) { while (*papColorSpaces != NULL) { if ((*papColorSpaces)->id == id) { - prefix = (char *)Xmalloc((strlen((*papColorSpaces)->prefix) + - 1) * sizeof(char)); - strcpy(prefix, (*papColorSpaces)->prefix); - return(prefix); + return strdup((*papColorSpaces)->prefix); } papColorSpaces++; } @@ -91,10 +87,7 @@ XcmsPrefixOfFormat( if (papColorSpaces != NULL) { while (*papColorSpaces != NULL) { if ((*papColorSpaces)->id == id) { - prefix = (char *)Xmalloc((strlen((*papColorSpaces)->prefix) + - 1) * sizeof(char)); - strcpy(prefix, (*papColorSpaces)->prefix); - return(prefix); + return strdup((*papColorSpaces)->prefix); } papColorSpaces++; } diff --git a/lib/libX11/src/xkb/Makefile.in b/lib/libX11/src/xkb/Makefile.in index 881d24d39..3e166b1ac 100644 --- a/lib/libX11/src/xkb/Makefile.in +++ b/lib/libX11/src/xkb/Makefile.in @@ -184,6 +184,7 @@ RAWCPPFLAGS = @RAWCPPFLAGS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ THRSTUBS_FALSE = @THRSTUBS_FALSE@ diff --git a/lib/libX11/src/xkb/XKBGAlloc.c b/lib/libX11/src/xkb/XKBGAlloc.c index 90ec2f9cf..7679496e3 100644 --- a/lib/libX11/src/xkb/XKBGAlloc.c +++ b/lib/libX11/src/xkb/XKBGAlloc.c @@ -684,9 +684,7 @@ register XkbPropertyPtr prop; if ((prop->name)&&(strcmp(name,prop->name)==0)) { if (prop->value) _XkbFree(prop->value); - prop->value= (char *)_XkbAlloc(strlen(value)+1); - if (prop->value) - strcpy(prop->value,value); + prop->value= strdup(value); return prop; } } @@ -695,17 +693,15 @@ register XkbPropertyPtr prop; return NULL; } prop= &geom->properties[geom->num_properties]; - prop->name= (char *)_XkbAlloc(strlen(name)+1); + prop->name= strdup(name); if (!prop->name) return NULL; - strcpy(prop->name,name); - prop->value= (char *)_XkbAlloc(strlen(value)+1); + prop->value= strdup(value); if (!prop->value) { _XkbFree(prop->name); prop->name= NULL; return NULL; } - strcpy(prop->value,value); geom->num_properties++; return prop; } @@ -757,10 +753,9 @@ register XkbColorPtr color; } color= &geom->colors[geom->num_colors]; color->pixel= pixel; - color->spec= (char *)_XkbAlloc(strlen(spec)+1); + color->spec= strdup(spec); if (!color->spec) return NULL; - strcpy(color->spec,spec); geom->num_colors++; return color; } diff --git a/lib/libX11/src/xkb/XKBGeom.c b/lib/libX11/src/xkb/XKBGeom.c index e9e36d0cb..7594a3de4 100644 --- a/lib/libX11/src/xkb/XKBGeom.c +++ b/lib/libX11/src/xkb/XKBGeom.c @@ -112,7 +112,6 @@ XkbBoundsPtr bounds,sbounds; if ((!geom)||(!section)||(!row)) return False; - pos= 0; bounds= &row->bounds; bzero(bounds,sizeof(XkbBoundsRec)); for (key=row->keys,pos=k=0;k<row->num_keys;k++,key++) { @@ -147,7 +146,7 @@ register int i; XkbShapePtr shape; XkbRowPtr row; XkbDoodadPtr doodad; -XkbBoundsPtr bounds,rbounds=NULL; +XkbBoundsPtr bounds,rbounds; if ((!geom)||(!section)) return False; @@ -186,6 +185,7 @@ XkbBoundsPtr bounds,rbounds=NULL; default: tbounds.x1= tbounds.x2= doodad->any.left; tbounds.y1= tbounds.y2= doodad->any.top; + rbounds= &tbounds; break; } _XkbCheckBounds(bounds,rbounds->x1,rbounds->y1); diff --git a/lib/libX11/src/xlibi18n/Makefile.in b/lib/libX11/src/xlibi18n/Makefile.in index af6d93746..e28fc77ea 100644 --- a/lib/libX11/src/xlibi18n/Makefile.in +++ b/lib/libX11/src/xlibi18n/Makefile.in @@ -219,6 +219,7 @@ RAWCPPFLAGS = @RAWCPPFLAGS@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ +STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ THRSTUBS_FALSE = @THRSTUBS_FALSE@ diff --git a/lib/libX11/src/xlibi18n/XDefaultIMIF.c b/lib/libX11/src/xlibi18n/XDefaultIMIF.c index ca6ee29de..e97d2f444 100644 --- a/lib/libX11/src/xlibi18n/XDefaultIMIF.c +++ b/lib/libX11/src/xlibi18n/XDefaultIMIF.c @@ -226,12 +226,10 @@ _XDefaultOpenIM( local_impart->ctow_conv = ctow_conv; if ((res_name != NULL) && (*res_name != '\0')){ - im->core.res_name = (char *)Xmalloc(strlen(res_name)+1); - strcpy(im->core.res_name,res_name); + im->core.res_name = strdup(res_name); } if ((res_class != NULL) && (*res_class != '\0')){ - im->core.res_class = (char *)Xmalloc(strlen(res_class)+1); - strcpy(im->core.res_class,res_class); + im->core.res_class = strdup(res_class); } return (XIM)im; diff --git a/lib/libX11/src/xlibi18n/XDefaultOMIF.c b/lib/libX11/src/xlibi18n/XDefaultOMIF.c index ae8ac79e4..b1dc66df6 100644 --- a/lib/libX11/src/xlibi18n/XDefaultOMIF.c +++ b/lib/libX11/src/xlibi18n/XDefaultOMIF.c @@ -128,10 +128,9 @@ init_fontset( data = XOM_GENERIC(oc->core.om)->data; - font_set = (FontSet) Xmalloc(sizeof(FontSetRec)); + font_set = Xcalloc(1, sizeof(FontSetRec)); if (font_set == NULL) return False; - bzero((char *) font_set, sizeof(FontSetRec)); gen = XOC_GENERIC(oc); gen->font_set = font_set; @@ -217,9 +216,8 @@ check_fontname( fname = prop_fname; } if (data) { - font_set->font_name = (char *) Xmalloc(strlen(fname) + 1); + font_set->font_name = strdup(fname); if (font_set->font_name) { - strcpy(font_set->font_name, fname); found_num++; } } @@ -388,9 +386,7 @@ get_font_name( list = XListFonts(dpy, pattern, 1, &count); if (list != NULL) { - name = (char *) Xmalloc(strlen(*list) + 1); - if (name) - strcpy(name, *list); + name = strdup(*list); XFreeFontNames(list); } else { @@ -460,13 +456,11 @@ parse_fontname( if (font_data == NULL) continue; - font_set->font_name = (char *) Xmalloc(strlen(font_name) + 1); + font_set->font_name = strdup(font_name); + Xfree(font_name); if (font_set->font_name == NULL) { - Xfree(font_name); goto err; } - strcpy(font_set->font_name, font_name); - Xfree(font_name); found_num++; goto found; } @@ -549,11 +543,10 @@ Limit the length of the string copy to prevent stack corruption. } } found: - base_name = (char *) Xmalloc(strlen(oc->core.base_name_list) + 1); + base_name = strdup(oc->core.base_name_list); if (base_name == NULL) goto err; - strcpy(base_name, oc->core.base_name_list); oc->core.base_name_list = base_name; XFreeStringList(name_list); @@ -1005,10 +998,9 @@ create_oc( { XOC oc; - oc = (XOC) Xmalloc(sizeof(XOCGenericRec)); + oc = Xcalloc(1, sizeof(XOCGenericRec)); if (oc == NULL) return (XOC) NULL; - bzero((char *) oc, sizeof(XOCGenericRec)); oc->core.om = om; @@ -1126,15 +1118,13 @@ add_data( XOMGenericPart *gen = XOM_GENERIC(om); OMData new; - new = (OMData) Xmalloc(sizeof(OMDataRec)); + new = Xcalloc(1, sizeof(OMDataRec)); if (new == NULL) return NULL; gen->data = new; - bzero((char *) new, sizeof(OMDataRec)); - return new; } @@ -1168,10 +1158,9 @@ init_om( if (data == NULL) return False; - font_data = (FontData) Xmalloc(sizeof(FontDataRec) * count); + font_data = Xcalloc(count, sizeof(FontDataRec)); if (font_data == NULL) return False; - bzero((char *) font_data, sizeof(FontDataRec) * count); data->font_data = font_data; data->font_data_count = count; @@ -1182,10 +1171,9 @@ This one is fine. *value points to one of the local strings in supported_charset_list[]. */ strcpy(buf, *value++); - font_data->name = (char *) Xmalloc(strlen(buf) + 1); + font_data->name = strdup(buf); if (font_data->name == NULL) return False; - strcpy(font_data->name, buf); } length += strlen(data->font_data->name) + 1; @@ -1237,26 +1225,23 @@ _XDefaultOpenOM(XLCd lcd, Display *dpy, XrmDatabase rdb, { XOM om; - om = (XOM) Xmalloc(sizeof(XOMGenericRec)); + om = Xcalloc(1, sizeof(XOMGenericRec)); if (om == NULL) return (XOM) NULL; - bzero((char *) om, sizeof(XOMGenericRec)); om->methods = (XOMMethods)&methods; om->core.lcd = lcd; om->core.display = dpy; om->core.rdb = rdb; if (res_name) { - om->core.res_name = (char *)Xmalloc(strlen(res_name) + 1); + om->core.res_name = strdup(res_name); if (om->core.res_name == NULL) goto err; - strcpy(om->core.res_name, res_name); } if (res_class) { - om->core.res_class = (char *)Xmalloc(strlen(res_class) + 1); + om->core.res_class = strdup(res_class); if (om->core.res_class == NULL) goto err; - strcpy(om->core.res_class, res_class); } if (om_resources[0].xrm_name == NULLQUARK) diff --git a/lib/libX11/src/xlibi18n/XlcDL.c b/lib/libX11/src/xlibi18n/XlcDL.c index bf064909e..75e193c05 100644 --- a/lib/libX11/src/xlibi18n/XlcDL.c +++ b/lib/libX11/src/xlibi18n/XlcDL.c @@ -86,16 +86,6 @@ Sun Microsystems, Inc. or its licensors is granted. #include "XlcPublic.h" #include "XlcPubI.h" -#if defined(_LP64) && defined(__sparcv9) -# define _MACH64_NAME "sparcv9" -#else -# undef _MACH64_NAME -#endif /* defined(_LP64) && defined(__sparcv9) */ - -#ifdef _MACH64_NAME -# define _MACH64_NAME_LEN (sizeof (_MACH64_NAME) - 1) -#endif - #define XI18N_DLREL 2 #define iscomment(ch) ((ch) == '\0' || (ch) == '#') @@ -269,35 +259,6 @@ __lc_path(const char *dl_name, const char *lc_dir) if (strstr (dl_name, "../")) return NULL; -#if defined (_LP64) && defined (_MACH64_NAME) - len = (lc_dir ? strlen(lc_dir) : 0 ) + - (dl_name ? strlen(dl_name) : 0) + _MACH64_NAME_LEN + 10; - path = Xmalloc(len + 1); - - if (strchr(dl_name, '/') != NULL) { - char *tmp = strdup(dl_name); - char *dl_dir, *dl_file; - char *slash_p; - slash_p = strchr(tmp, '/'); - *slash_p = '\0'; - dl_dir = tmp; - dl_file = ++slash_p; - - slash_p = strrchr(lc_dir, '/'); - *slash_p = '\0'; - strcpy(path, lc_dir); strcat(path, "/"); - strcat(path, dl_dir); strcat(path, "/"); - strcat(path, _MACH64_NAME); strcat(path, "/"); - strcat(path, dl_file); strcat(path, ".so.2"); - - *slash_p = '/'; - Xfree(tmp); - } else { - strcpy(path, lc_dir); strcat(path, "/"); - strcat(path, _MACH64_NAME); strcat(path, "/"); - strcat(path, dl_name); strcat(path, ".so.2"); - } -#else len = (lc_dir ? strlen(lc_dir) : 0 ) + (dl_name ? strlen(dl_name) : 0) + 10; #if defined POSTLOCALELIBDIR @@ -322,7 +283,6 @@ __lc_path(const char *dl_name, const char *lc_dir) #endif strcat(path, dl_name); strcat(path, ".so.2"); } -#endif return path; } diff --git a/lib/libX11/src/xlibi18n/lcCharSet.c b/lib/libX11/src/xlibi18n/lcCharSet.c index 0fa39d869..5d287811c 100644 --- a/lib/libX11/src/xlibi18n/lcCharSet.c +++ b/lib/libX11/src/xlibi18n/lcCharSet.c @@ -176,10 +176,9 @@ _XlcCreateDefaultCharSet( const char *colon; char *tmp; - charset = (XlcCharSet) Xmalloc(sizeof(XlcCharSetRec)); + charset = Xcalloc(1, sizeof(XlcCharSetRec)); if (charset == NULL) return (XlcCharSet) NULL; - bzero((char *) charset, sizeof(XlcCharSetRec)); name_len = strlen(name); ct_sequence_len = strlen(ct_sequence); diff --git a/lib/libX11/src/xlibi18n/lcDB.c b/lib/libX11/src/xlibi18n/lcDB.c index afff17455..97b22ac44 100644 --- a/lib/libX11/src/xlibi18n/lcDB.c +++ b/lib/libX11/src/xlibi18n/lcDB.c @@ -591,26 +591,23 @@ store_to_database( goto err; } - new = (Database)Xmalloc(sizeof(DatabaseRec)); + new = Xcalloc(1, sizeof(DatabaseRec)); if (new == (Database)NULL) { goto err; } - bzero(new, sizeof(DatabaseRec)); - new->category = (char *)Xmalloc(strlen(parse_info.category) + 1); + new->category = strdup(parse_info.category); if (new->category == NULL) { goto err; } - strcpy(new->category, parse_info.category); if (! construct_name(name, sizeof(name))) { goto err; } - new->name = (char *)Xmalloc(strlen(name) + 1); + new->name = strdup(name); if (new->name == NULL) { goto err; } - strcpy(new->name, name); new->next = *db; new->value = parse_info.value; new->value_num = parse_info.value_num; @@ -944,10 +941,9 @@ f_default( case S_NULL: if (parse_info.category != NULL) goto err; - p = (char *)Xmalloc(strlen(wordp) + 1); + p = strdup(wordp); if (p == NULL) goto err; - strcpy(p, wordp); parse_info.category = p; parse_info.pre_state = S_CATEGORY; break; @@ -961,10 +957,9 @@ f_default( break; } } - p = (char *)Xmalloc(strlen(wordp) + 1); + p = strdup(wordp); if (p == NULL) goto err; - strcpy(p, wordp); if (parse_info.name[parse_info.nest_depth] != NULL) { Xfree(parse_info.name[parse_info.nest_depth]); } @@ -1309,10 +1304,9 @@ _XlcCreateLocaleDataBase( return (XPointer)NULL; } n = CountDatabase(database); - lc_db = (XlcDatabase)Xmalloc(sizeof(XlcDatabaseRec) * (n + 1)); + lc_db = Xcalloc(n + 1, sizeof(XlcDatabaseRec)); if (lc_db == (XlcDatabase)NULL) goto err; - bzero(lc_db, sizeof(XlcDatabaseRec) * (n + 1)); for (p = database, i = 0; p && i < n; p = p->next, ++i) { lc_db[i].category_q = XrmStringToQuark(p->category); lc_db[i].name_q = XrmStringToQuark(p->name); diff --git a/lib/libX11/src/xlibi18n/lcFile.c b/lib/libX11/src/xlibi18n/lcFile.c index 18756c1ca..4e4439773 100644 --- a/lib/libX11/src/xlibi18n/lcFile.c +++ b/lib/libX11/src/xlibi18n/lcFile.c @@ -423,10 +423,7 @@ resolve_name( from = args[1], to = args[0]; /* right to left */ } if (! strcmp(from, lc_name)) { - name = Xmalloc(strlen(to) + 1); - if (name != NULL) { - strcpy(name, to); - } + name = strdup(to); break; } } @@ -579,8 +576,7 @@ _XlcResolveLocaleName( if (name == NULL) { /* vendor locale name == Xlocale name, no expansion of alias */ - pub->siname = Xmalloc (strlen (lc_name) + 1); - strcpy (pub->siname, lc_name); + pub->siname = strdup (lc_name); } else { pub->siname = name; } @@ -729,8 +725,7 @@ _XlcLocaleDirName(char *dir_name, size_t dir_len, char *lc_name) last_dir_len = strlen (dir_name) + 1; last_dir_name = Xmalloc (last_dir_len); strcpy (last_dir_name, dir_name); - last_lc_name = Xmalloc (strlen (lc_name) + 1); - strcpy (last_lc_name, lc_name); + last_lc_name = strdup (lc_name); return dir_name; } @@ -828,8 +823,7 @@ _XlcLocaleLibDirName(char *dir_name, size_t dir_len, char *lc_name) last_dir_len = strlen (dir_name) + 1; last_dir_name = Xmalloc (last_dir_len); strcpy (last_dir_name, dir_name); - last_lc_name = Xmalloc (strlen (lc_name) + 1); - strcpy (last_lc_name, lc_name); + last_lc_name = strdup (lc_name); return dir_name; } diff --git a/lib/libX11/src/xlibi18n/lcGeneric.c b/lib/libX11/src/xlibi18n/lcGeneric.c index 688a4cfc4..619cb47f9 100644 --- a/lib/libX11/src/xlibi18n/lcGeneric.c +++ b/lib/libX11/src/xlibi18n/lcGeneric.c @@ -60,15 +60,13 @@ create( XLCd lcd; XLCdPublicMethods new; - lcd = (XLCd) Xmalloc(sizeof(XLCdRec)); + lcd = Xcalloc(1, sizeof(XLCdRec)); if (lcd == NULL) return (XLCd) NULL; - bzero((char *) lcd, sizeof(XLCdRec)); - lcd->core = (XLCdCore) Xmalloc(sizeof(XLCdGenericRec)); + lcd->core = Xcalloc(1, sizeof(XLCdGenericRec)); if (lcd->core == NULL) goto err; - bzero((char *) lcd->core, sizeof(XLCdGenericRec)); new = (XLCdPublicMethods) Xmalloc(sizeof(XLCdPublicMethodsRec)); if (new == NULL) @@ -180,10 +178,9 @@ add_codeset( CodeSet new, *new_list; int num; - new = (CodeSet) Xmalloc(sizeof(CodeSetRec)); + new = Xcalloc(1, sizeof(CodeSetRec)); if (new == NULL) return NULL; - bzero((char *) new, sizeof(CodeSetRec)); if ((num = gen->codeset_num)) new_list = (CodeSet *) Xrealloc(gen->codeset_list, @@ -218,21 +215,18 @@ add_parse_list( unsigned char ch; int num; - str = (char *) Xmalloc(strlen(encoding) + 1); + str = strdup(encoding); if (str == NULL) return False; - strcpy(str, encoding); - new = (ParseInfo) Xmalloc(sizeof(ParseInfoRec)); + new = Xcalloc(1, sizeof(ParseInfoRec)); if (new == NULL) goto err; - bzero((char *) new, sizeof(ParseInfoRec)); if (gen->mb_parse_table == NULL) { - gen->mb_parse_table = (unsigned char *) Xmalloc(256); /* 2^8 */ + gen->mb_parse_table = Xcalloc(1, 256); /* 2^8 */ if (gen->mb_parse_table == NULL) goto err; - bzero((char *) gen->mb_parse_table, 256); } if ((num = gen->mb_parse_list_num)) @@ -468,10 +462,9 @@ read_charset_define( break; } if (new) { - tmp = (char *)Xmalloc(strlen(cset_name)+1); + tmp = strdup(cset_name); if (tmp == NULL) return; - strcpy(tmp,cset_name); charsetd->name = tmp; } /* side */ @@ -527,8 +520,7 @@ read_charset_define( Xfree(charsetd->encoding_name); } */ - tmp = (char *)Xmalloc(strlen(value[0])+1); - strcpy(tmp,value[0]); + tmp = strdup(value[0]); charsetd->encoding_name = tmp; charsetd->xrm_encoding_name = XrmStringToQuark(tmp); } @@ -598,10 +590,9 @@ read_segmentconversion( if (num > 0) { char *tmp; _XlcDbg_printValue(name,value,num); - tmp = (char *)Xmalloc(strlen(value[0])+1); + tmp = strdup(value[0]); if (tmp == NULL) return; - strcpy(tmp,value[0]); conversion->source_encoding = tmp; conversion->source = srch_charset_define(tmp,&new); } @@ -611,10 +602,9 @@ read_segmentconversion( if (num > 0) { char *tmp; _XlcDbg_printValue(name,value,num); - tmp = (char *)Xmalloc(strlen(value[0])+1); + tmp = strdup(value[0]); if (tmp == NULL) return; - strcpy(tmp,value[0]); conversion->destination_encoding = tmp; conversion->dest = srch_charset_define(tmp,&new); } @@ -650,12 +640,11 @@ create_ctextseg( ret = (ExtdSegment)Xmalloc(sizeof(ExtdSegmentRec)); if (ret == NULL) return NULL; - ret->name = (char *)Xmalloc(strlen(value[0]) + 1); + ret->name = strdup(value[0]); if (ret->name == NULL) { Xfree (ret); return NULL; } - strcpy(ret->name,value[0]); cset_name = (char*) Xmalloc (strlen(ret->name) + 1); if (cset_name == NULL) { Xfree (ret->name); diff --git a/lib/libX11/src/xlibi18n/lcPublic.c b/lib/libX11/src/xlibi18n/lcPublic.c index 2c02f5fba..1b1fb548a 100644 --- a/lib/libX11/src/xlibi18n/lcPublic.c +++ b/lib/libX11/src/xlibi18n/lcPublic.c @@ -80,15 +80,13 @@ create( XLCd lcd; XLCdPublicMethods new; - lcd = (XLCd) Xmalloc(sizeof(XLCdRec)); + lcd = Xcalloc(1, sizeof(XLCdRec)); if (lcd == NULL) return (XLCd) NULL; - bzero((char *) lcd, sizeof(XLCdRec)); - lcd->core = (XLCdCore) Xmalloc(sizeof(XLCdPublicRec)); + lcd->core = Xcalloc(1, sizeof(XLCdPublicRec)); if (lcd->core == NULL) goto err; - bzero((char *) lcd->core, sizeof(XLCdPublicRec)); new = (XLCdPublicMethods) Xmalloc(sizeof(XLCdPublicMethodsRec)); if (new == NULL) @@ -130,10 +128,9 @@ load_public( _XlcGetResource(lcd, "XLC_XLOCALE", "encoding_name", &values, &num); str = (num > 0) ? values[0] : "STRING"; - pub->encoding_name = (char*) Xmalloc(strlen(str) + 1); + pub->encoding_name = strdup(str); if (pub->encoding_name == NULL) return False; - strcpy(pub->encoding_name, str); return True; } |