diff options
| author | marha <marha@users.sourceforge.net> | 2010-06-11 15:12:35 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-06-11 15:12:35 +0000 |
| commit | bb9571d3ede4adbb9396fdb25ab8e3e91aba1479 (patch) | |
| tree | 8e21e43376a5b106a5d9689a4349385101263325 /libX11 | |
| parent | d1e4f4b8546c7955c66dd023bfd6ef437db9d21d (diff) | |
| parent | f56cfbb54588917d9566277a669fa086a842b2f5 (diff) | |
| download | vcxsrv-bb9571d3ede4adbb9396fdb25ab8e3e91aba1479.tar.gz vcxsrv-bb9571d3ede4adbb9396fdb25ab8e3e91aba1479.tar.bz2 vcxsrv-bb9571d3ede4adbb9396fdb25ab8e3e91aba1479.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'libX11')
29 files changed, 823 insertions, 9451 deletions
diff --git a/libX11/ChangeLog b/libX11/ChangeLog deleted file mode 100644 index c3c74295f..000000000 --- a/libX11/ChangeLog +++ /dev/null @@ -1,5581 +0,0 @@ -commit 68530599e61cf9fef3fcc91650e7cef21837fce7 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Sat Jan 16 11:41:32 2010 -0800 - - libX11 1.3.3 - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit 1e5af224b9fbdb154620f898558704f2bc4bf4e9 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Thu Jan 14 18:33:39 2010 -0800 - - Update COPYING file with actual licenses from libX11 code & docs - - COPYING was previously a years out-of-date copy of the LICENSES - doc summarizing all licenses for all XFree86 components, many of - which did not apply to libX11. - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit ddb1786720d6136b1b28be599c75c10ad1b76a2a -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Thu Jan 14 17:38:26 2010 -0800 - - Purge CVS/RCS id tags - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit c1db9ddcfa7091f173478dca45bf720badedfca4 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Thu Jan 14 15:39:14 2010 -0800 - - Update Sun license notices to current X.Org standard form - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit 1aaa7c0358c5c035b99625f5715cb722bc2d2a2f -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Thu Jan 14 08:28:22 2010 -0800 - - Add %S substitutions to Compose man page - - Commit 9df349a7894725f9469b106af645f57f7f3f9af3 added support for %S - in Compose file include statements - this documents it in the Compose - file man page. - - Also changes the existing substitution documentation to list format - instead of a paragraph format to allow easier adding of %S. - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit 94b45db93058cffa25598fe27dd3e385ace9d305 -Author: Richard Purdie <rpurdie@linux.intel.com> -Date: Thu Jan 14 08:04:28 2010 -0800 - - Fix configure.ac PKG_ macro calls - - If the first call to PKG_CHECK_MODULES() may not be called during execution - which is the case here since its inside a case statement, call - PKG_PROG_PKG_CONFIG() to ensure things worked correctly. - - Fixes a configure failure introduced by commit - 87529c039050ce3336ff9ce00f1b5a21d15690da when xcb is enabled. - - http://bugs.freedesktop.org/show_bug.cgi?id=26041 - - Signed-off-by: Richard Purdie <rpurdie@linux.intel.com> - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit df559d8bc2238a2c369152fcb06e5b5ab132a5dc -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Tue Jan 12 09:18:15 2010 -0800 - - Raise xorg-macros requirement to 1.4 - - Needed since the changes in 464390f16d7ed4aa5bf80f89863ba92273075ec2 - depend on the INSTALL file delivered in xorg-macros 1.4 - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit 9df349a7894725f9469b106af645f57f7f3f9af3 -Author: James Cloos <cloos@jhcloos.com> -Date: Wed Jan 13 11:04:38 2010 -0500 - - Allow inclusion of system level compose files. - - With the release of XFree86 4.4 an inclusion system of compose files was - added to Xlib to allow inclusion of the default compose file (with %L), - any compose files from user’s home directory (with %H), or a compose - file with a hard coded path¹. However, even today including system level - compose files is not possible in a platform independent manner although - the machinery for including compose files and overriding previously - defined compositions is already in place. - - With the ability to include system level compose files one could greatly - reduce the need for compose file rule duplication and the work needed to - propagate changes in one compose file to others. For example, currently - the Finnish compose file fi_FI.UTF-8 weights over 5000 lines² but it - is almost identical with en_US.UTF-8 except for perhaps half a dozen - compositions. - - This commit allows one to include system level compose files with the - following kind of syntax: - - include "%S/en_US.UTF-8/Compose" - - 1] http://www.xfree86.org/4.4.0/RELNOTES5.html#42 - 2] http://cgit.freedesktop.org/xorg/lib/libX11/tree/nls/fi_FI.UTF-8/Compose.pre - - Signed-off-by: Marko Myllynen <myllynen@redhat.com> - Signed-off-by: James Cloos <cloos@jhcloos.com> - -commit ccf21a8877f40136e25f2f62d0668b0c76b3cfbd -Author: Thien-Thi Nguyen <ttn@gnuvola.org> -Date: Tue Dec 1 10:31:47 2009 +0100 - - libX11: Fix comment: Invert polarity (direction) of reformat description. - - Signed-off-by: Thien-Thi Nguyen <ttn@gnuvola.org> - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit 4d4676c0d6324d2ff9d00d15ab485fa5d848a369 -Author: Osamu Sayama <osamu.sayama@sun.com> -Date: Tue Jan 5 17:26:40 2010 -0800 - - set_fontset_extents crash after get_rotate_fontname fix in 2bef065b70f7 - - - In set_fontset_extents, check font_data is not NULL before running - loop that may increment it to a non-NULL invalid pointer. - - Make sure get_rotate_fontname counts the final field - - Fixes OpenSolaris bug 6913809: X application dumps core in ja_JP.UTF-8 locale - <http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6913809> - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - Reviewed-by: Adam Jackson <ajax@redhat.com> - -commit 87529c039050ce3336ff9ce00f1b5a21d15690da -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Tue Jan 5 18:02:37 2010 -0800 - - Merge X11, XKBPROTO, & XPROTO pkg-config lists - - Since the XPROTO_CFLAGS & XKBPROTO_CFLAGS are just merged into X11_CFLAGS - in configure.ac anyway, might as well combine the lists passed to - PKG_CHECK_MODULES to reduce duplication in the flags. - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - Reviewed-by: Rémi Cardona <remi@gentoo.org> - Acked-by: Peter Hutterer <peter.hutterer@who-t.net> - -commit 2dd053667b44c55e2bf601aec7b75fc6fee1cf44 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Tue Jan 5 17:56:58 2010 -0800 - - Add XCompose man page shadow for Compose man page - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit 02543bba816e065c02cd36e0c9e21519a9ee9c96 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Tue Jan 5 17:47:44 2010 -0800 - - Add $(AM_V_GEN) to silence lint rules too - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit db7c6fdeeaef9475458498e4cf09d6b1329e9aa3 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Tue Jan 5 17:42:42 2010 -0800 - - Remove GCC_WARNINGS now that XORG_CWARNFLAGS sets them for us - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit 6b4e526e7ba105622f6b143e8e2639b44cb6cc19 -Author: Gaetan Nadon <memsize@videotron.ca> -Date: Sun Nov 29 10:44:24 2009 -0500 - - configure.ac: restore correct order for XORG_DEFAULT_OPTIONS - - It must be following AC_USE_SYSTEM_EXTENSION - -commit 3dbaa11d1c8705e1b309c6686f354766b651ad20 -Author: Gaetan Nadon <memsize@videotron.ca> -Date: Sun Nov 29 10:01:44 2009 -0500 - - Add .gitignore in /specs for generated files - - Being in /specs, it will apply for all 3 subdirs - -commit f45d39d37aab04742e44cd8c3c993aad7587e40c -Author: Gaetan Nadon <memsize@videotron.ca> -Date: Fri Nov 27 20:56:03 2009 -0500 - - Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES - - Now that the INSTALL file is generated. - Allows running make maintainer-clean. - -commit 464390f16d7ed4aa5bf80f89863ba92273075ec2 -Author: Gaetan Nadon <memsize@videotron.ca> -Date: Wed Oct 28 14:09:10 2009 -0400 - - INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 - - Add missing INSTALL file. Use standard GNU file on building tarball - README may have been updated - Remove AUTHORS file as it is empty and no content available yet. - Remove NEWS file as it is empty and no content available yet. - -commit 6360e7f0ce6a75da2bed33ede7fea783a1fb80e1 -Author: Gaetan Nadon <memsize@videotron.ca> -Date: Tue Oct 27 15:07:25 2009 -0400 - - Deploy the new XORG_DEFAULT_OPTIONS #24242 - - This macro aggregate a number of existing macros that sets commmon - X.Org components configuration options. It shields the configuration file from - future changes. - -commit d02f943c98fde2f14319bc57fd9ad77eb9a2a572 -Author: Gaetan Nadon <memsize@videotron.ca> -Date: Mon Oct 26 22:08:42 2009 -0400 - - Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432 - - ChangeLog filename is known to Automake and requires no further - coding in the makefile. - -commit f77c89c751a6a63c8ef11ecdddca2aed11ff6e29 -Author: Gaetan Nadon <memsize@videotron.ca> -Date: Thu Oct 22 12:34:19 2009 -0400 - - .gitignore: use common defaults with custom section # 24239 - - Using common defaults will reduce errors and maintenance. - Only the very small or inexistent custom section need periodic maintenance - when the structure of the component changes. Do not edit defaults. - -commit 46c7b0e9d0d85cf5ccc0d40d19821fcc3335503b -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Thu Nov 12 23:05:40 2009 -0800 - - Add compose-check.pl to EXTRA_DIST - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit 54c64267cc8bc98641cc39a22cb7bd71673e89e0 -Author: Julien Cristau <jcristau@debian.org> -Date: Thu Oct 29 17:17:24 2009 +0100 - - man: fix XCopyGC argument order - - Ubuntu bug#408337 - -commit aad10032651cdc2a53b359035954454a28d6db67 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Fri Oct 23 13:55:14 2009 -0700 - - libX11 1.3.2 - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit 6303ada89cb228c0f9656036f798703afb42fc29 -Author: Peter Hutterer <peter.hutterer@who-t.net> -Date: Wed Oct 21 12:42:07 2009 +1000 - - Add smiley faces to compose sequences. - - I wonder how we could have lasted that long without them. - - Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> - Acked-by: Daniel Stone <daniel@fooishbar.org> - Acked-By: James Cloos <cloos@jhcloos.com> - -commit 0e104ebd8628803c27e36b16922ad1edd891325a -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Thu Oct 22 23:12:30 2009 -0700 - - Add man page for Compose file format - - Based on grammar description in modules/im/ximcp/imLcPrs.c and - note on XFree86 changes formerly found in xorg-docs RELNOTES.sgml - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit 9c95f2af7c442b3a59b1a30cf804f1ef4e7fc5b5 -Author: Jeremy Huddleston <jeremyhu@freedesktop.org> -Date: Tue Oct 20 12:46:03 2009 -0700 - - Add extra configuration and sanity checks for groff and ps2pdf - - 1) Add AC_ARG_VAR for GROFF and PS2PDF to inform users of these - environment variables. - 2) Check that groff -ms works - - Some distributions ship the ms macros as a separate package which may - not be installed together with groff, so we need to make sure that groff - works and the required macros are actually installed before attempting - to build the specs. - - Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org> - Signed-off-by: Dan Nicholson <dbn.lists@gmail.com> - Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> - -commit d3f801fd2f9198eaad6797414dba652f9c006c6d -Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> -Date: Sun Oct 18 17:34:53 2009 -0500 - - Fix VPATH build of libX11 specs - - Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> - -commit ad15e1a89d30ccc11d80745897b83def1448e8c0 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Sat Oct 17 16:14:34 2009 -0700 - - libX11 1.3.1 - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit 0cbf98c17a7484bb58b2464b98d63bb3b4ea2594 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Sat Oct 17 16:28:25 2009 -0700 - - Fix make distcheck - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit 082e62ad268ef16a3bebc5a3c9fa008dbdc483ed -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Fri Oct 16 19:25:35 2009 -0700 - - Use $(AM_V_GEN) to silence echo commands for generating shadow man pages - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit 4e66da0783b2e5e3b288aaecd3c89396ed425c20 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Wed Oct 14 16:18:24 2009 -0700 - - Move libX11 & XIM/locale specs from xorg-docs - - If groff is found, and --disable-specs is not passed to configure, - specs will be converted to text, html and ps (or pdf if ps2pdf is - found) and installed to $(docdir) - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit 5d3d817a42ddcc8d0c6efd33efd1442fe14f5c6b -Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> -Date: Tue Oct 13 19:15:51 2009 -0500 - - Provide _Xsetlocale compat wrappers on Cygwin - - Previous versions of Cygwin did not have proper locale support, so Cygwin/X - defined X_LOCALE, using _Xsetlocale instead. Cygwin 1.7 has added locale - support, but we can't remove the _Xsetlocale entry point without breaking - ABI. - - Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> - -commit 2c8b3a877a713bb66a6316a7051b43c46af6e1a0 -Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> -Date: Tue Oct 13 19:15:49 2009 -0500 - - dolt: add Cygwin to supported platforms - - Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> - -commit a2c8e3e34b15b57ff881a52101fc961a602f35e4 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Wed Oct 14 13:23:30 2009 -0700 - - Recognize XSUNBUFFERSIZE alias for XLIBBUFFERSIZE on Solaris - - Also fix indenting of the XLIBBUFFERSIZE code to match surrounding code - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit 34ddfca7b7d58240b0fe74bec6b2e0652d15c051 -Author: Jon TURNEY <jon.turney@dronecode.org.uk> -Date: Tue Feb 10 17:47:25 2009 +0000 - - Include sys/select.h for select() and struct timeval, if it exists - - This is a cygwin build fix - -commit 383165916ddac91740d4c780174d4c0d07cdb994 -Author: Xake <xake@rymdraket.net> -Date: Sun Sep 27 11:16:36 2009 +0200 - - Use AM_V_GEN instead of customized macros for AM_SILENT_RULES - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit 854269d55cdda8caf425515bfed2855e211a5ada -Author: Julien Cristau <jcristau@debian.org> -Date: Tue Oct 6 16:11:24 2009 +0200 - - configure: quote argument to m4_pattern_forbid - - Without this, configure spits out - ../configure: line 12364: ac_fn_c_check_member: command not found - ../configure: line 12378: ac_fn_c_check_type: command not found - - Also anchor the pattern to make it stricter. - - Signed-off-by: Julien Cristau <jcristau@debian.org> - -commit 3bb020587ce74e0737ec7aceb20041f1e77d3b87 -Author: Jeremy Huddleston <jeremyhu@freedesktop.org> -Date: Thu Oct 1 22:20:38 2009 -0700 - - Split CFLAGS into CPPFLAGS and CFLAGS - - On some build systems, CPPFLAGS is set to "-I/some/prefix/include". If older - X11 headers are in /some/prefix/include, they will be preferred over the - shipped headers. This corrects that problem. - -commit d54caf1c9c55af8247621b7ba6afb20b23699839 -Author: Peter Hutterer <peter.hutterer@who-t.net> -Date: Fri Oct 2 10:59:08 2009 +1000 - - libX11 1.3 - - Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> - -commit dd201bcf9e7f8863b7ef32273a5ef021678133c1 -Author: Peter Hutterer <peter.hutterer@who-t.net> -Date: Fri Oct 2 12:10:29 2009 +1000 - - nls: remove duplicate Compose sequences from pt_BR.UTF-8 - - Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> - -commit a293ae9e83739067fc92db1a39c262857bc2283e -Author: Peter Hutterer <peter.hutterer@who-t.net> -Date: Fri Sep 25 11:19:41 2009 +1000 - - Add XF86TouchpadToggle to XKeysymDB - - Lenovo laptops provide a key to enable or disable the touchpad and the - trackstick. This key is usually located on Fn + F8. - - Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> - Acked-by: Adam Jackson <ajax@redhat.com> - -commit 69839f8903a24eab08f17a781b3797fb64dce9cf -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Sun Sep 27 10:34:16 2009 -0700 - - Bug 24173: libX11 from git fails to build with automake older then 1.11 - - AM_CONDITIONAL must come *before* the AC_OUTPUT that creates the - Makefiles, instead of after. - <http://bugs.freedesktop.org/show_bug.cgi?id=24173> - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit f5effd041f58ef07703cca2b4f396758811e1eec -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Wed Apr 15 10:59:23 2009 -0700 - - Resolve conflicting Compose sequences in iso8859-2, el_GR.UTF-8 & pt_BR.UTF-8 - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit 3843778358d3a0cd6a2d07dba5dd061248053ac9 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Wed Apr 15 10:56:09 2009 -0700 - - Add perl script to check for duplicate or conflicting compose file entries - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit 19cc5e1fa17a285045662820a8b4de2a0f9a194d -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Fri Sep 18 17:10:04 2009 -0700 - - Use make rules instead of shell for loops to generate shadow man pages - - Allows parallel make and simpler build logs/error reporting - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit 7dabcac973d0b6692a3cd62bd6d8e0467b24200b -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Fri Sep 18 16:58:53 2009 -0700 - - Add AM_SILENT_RULES support for cpp rules for man & nls files - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit bfa19cddd8546b4930a773f3bbd81137c362d82b -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Fri Sep 18 16:58:16 2009 -0700 - - Update to using xorg-macros 1.3 & XORG_DEFAULT_OPTIONS - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit 51396066c8003a96a6399c9a4bed2a81e512b582 -Author: Mikko Niskanen <mikko.niskanen@iki.fi> -Date: Fri Sep 4 10:11:15 2009 +1000 - - Fix wrong typedef on HP-UX (#18998) - - shl_dt doesn't exist, the type is shl_t. - - X.Org Bug 18998 <http://bugs.freedesktop.org/show_bug.cgi?id=18998> - - Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> - -commit 615220a312b9430a580fe6dcf51703c6ef244f66 -Author: Paul Bender <pebender@gmail.com> -Date: Fri Sep 4 09:57:10 2009 +1000 - - Don't require xdmcp in configure.ac (#22583) - - X.Org Bug 22583 <http://bugs.freedesktop.org/show_bug.cgi?id=22583> - - Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> - -commit 20f9ecd86ad2a9ac6966f7eee32234cb5ef77c29 -Author: Peter Hutterer <peter.hutterer@who-t.net> -Date: Thu Sep 3 14:02:44 2009 +1000 - - man: fix parameters to XkbAllocGeomOverlay{Rows|Keys} (#23499) - - X.Org Bug 23499 <http://bugs.freedesktop.org/show_bug.cgi?id=23499> - - Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> - -commit c2814a614dc4d9409bfa0f44c18bfd69ad7f7b85 -Author: Peter Hutterer <peter.hutterer@who-t.net> -Date: Thu Sep 3 12:05:25 2009 +1000 - - man: XQueryTree may return BadWindow. (#23416) - - X.Org Bug 23416 <http://bugs.freedesktop.org/show_bug.cgi?id=XXX> - - Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> - -commit dbe98d456ccc6eeca9fa3e241a3db0a4d83c5a65 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Fri Aug 28 23:07:58 2009 +0800 - - Fix version tag in .TH line of several XKB man pages - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit bf24400936c10af6f5aa0c75cfe2207ab9b680b4 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Fri Aug 28 23:04:38 2009 +0800 - - XkbSetDeviceButtonActions.man: remove non-existent actions argument - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit 53affa9335116f2d367f041e6502a411d4619e47 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Fri Aug 28 23:00:17 2009 +0800 - - XkbQueryExtension.man: Arguments should be pointers - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit 6233948885acc5873a5abddfff235afec555f3c2 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Fri Aug 28 22:53:03 2009 +0800 - - XkbSAActionSetCtrls.man: Fix typo in formatting macro - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit 28a9ca57cdec4aa9ca92322f963b01f0c2daf47a -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Fri Aug 28 22:49:31 2009 +0800 - - Convert Xkb API man pages to ANSI prototypes - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit fa2eecca85baab9616f7143cc1a853a594b4a90c -Author: James Cloos <cloos@jhcloos.com> -Date: Mon Aug 24 06:35:17 2009 -0400 - - Add some (Serbian) Cyrillic NFD sequences. - - A number of characters in use in the various countries which use the - Cyrillic script do not appear as pre-composed characters in The UCS - or Unicode; they are only available as combining-character sequences. - - This commit adds support for using (prefix) dead keys and Multi_key- - initiated sequences to enter a number of these combining-character - sequences. This ensures that users can enter these scripts even - when using the current Cyrillic keymaps, which lack support for - the combining characters. - - Please see the discussions on the xkb mailing list. - - Signed-off-by: James Cloos <cloos@jhcloos.com> - -commit d1bdc909f9246119696c8b0d9afb7bd8afb71b60 -Author: Julien Cristau <jcristau@debian.org> -Date: Wed Aug 5 18:14:23 2009 +0200 - - man/xkb: delete spurious newline in .TH headers - -commit ee723b83b24682db833a2f0abd96cd319b8a62af -Author: Julien Cristau <jcristau@debian.org> -Date: Wed Aug 5 16:45:19 2009 +0200 - - man: use __libmansuffix__ instead of 3X11 for references to other pages - -commit 595e204feb82c798a92eea41fea03be6476ac181 -Author: Julien Cristau <jcristau@debian.org> -Date: Wed Aug 5 16:43:36 2009 +0200 - - man/xkb: use __libmansuffix__ instead of hardcoding 3Xkb for manpage sections - -commit 9da7e230d5320e1556ad2084fcd06ee7994385ea -Author: Peter Hutterer <peter.hutterer@who-t.net> -Date: Wed Aug 5 14:15:02 2009 +1000 - - Bump to 1.2.99.901 (1.3 RC1) - - Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> - -commit 8f78c7b4e3570cd46c5a220982963c17fe2157b8 -Author: Filippo Giunchedi <filippo@debian.org> -Date: Sat Jun 6 16:56:54 2009 +0200 - - nls: add {left,right}wards arrow to compose table - - Debian bug#532117 <http://bugs.debian.org/532117> - - Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> - -commit 7949bfa00390241d994f32463e50d4bd78920568 -Author: Julien Cristau <jcristau@debian.org> -Date: Fri Jul 31 13:33:52 2009 +0200 - - Update library version for new symbols - - Commit 554f755e5545f63d3c8f299297927238da155773 added generic event - cookie handling. Bump libX11 version number accordingly. - - Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> - -commit 640fec5f4feacd01a00eea3dcd4edb220907d3dc -Author: Julien Cristau <jcristau@debian.org> -Date: Sun Aug 2 17:18:31 2009 +0200 - - Add _XFUNCPROTOBEGIN/END to Xlib-xcb.h - - X.Org bug#22252 <https://bugs.freedesktop.org/show_bug.cgi?id=22252> - - Reported-by: Riku Salminen <rsalmin2@cc.hut.fi> - Signed-off-by: Julien Cristau <jcristau@debian.org> - -commit bc06d49e9dac1836d6824769ddb2ac5ba9f14df7 -Author: Peter Hutterer <peter.hutterer@who-t.net> -Date: Wed Jul 29 08:44:09 2009 +1000 - - Fix compiler warning 'unused variable qelt' - - Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> - -commit 03f4907e14f5755e72309f08742977b871e81e33 -Author: Peter Hutterer <peter.hutterer@who-t.net> -Date: Wed Jul 29 08:34:57 2009 +1000 - - Add utlist.h to the Makefile.am - - utlist.h contains the linked list macros, it was added with the recent - addition of event cookies but utlist.h wasn't added to the Makefile.am. As a - result, make dist failed. - - Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> - -commit 554f755e5545f63d3c8f299297927238da155773 -Author: Peter Hutterer <peter.hutterer@who-t.net> -Date: Fri Jun 26 11:27:43 2009 +1000 - - Add generic event cookie handling to libX11. - - Generic events require more bytes than Xlib provides in the standard XEvent. - Memory allocated by the extension and stored as pointers inside the event is - prone to leak by simple 'while (1) { XNextEvent(...); }' loops. - - This patch adds cookie handling for generic events. Extensions may register - a cookie handler in addition to the normal event vectors. If an extension - has registered a cookie handler, _all_ generic events for this extensions - must be handled through cookies. Otherwise, the default event handler is - used. - - The cookie handler must return an XGenericEventCookie with a pointer to the - data.The rest of the event (type, serialNumber, etc.) are to be filled as - normal. When a client retrieves such a cookie event, the data is stored in - an internal queue (the 'cookiejar'). This data is freed on the next call to - XNextEvent(). - - New extension interfaces: - XESetWireToEventCookie(display, extension_number, cookie_handler) - - Where cookie_handler must set cookie->data. The data pointer is of arbitray - size and type but must be a single memory block. This memory block - represents the actual extension's event. - - New client interfaces: - XGetEventData(display, *cookie); - XFreeEventData(display, *cookie); - - If the client needs the actual event data, it must call XGetEventData() with - the cookie. This returns the data pointer (and removes it from the cookie - jar) and the client is then responsible for freeing the event with - XFreeEventData(). It is safe to call either function with a non-cookie - event. Events unclaimed or not handled by the XGetEventData() are cleaned up - automatically. - - Example client code: - XEvent event; - XGenericEventCookie *cookie = &ev; - - XNextEvent(display, &event); - if (XGetEventData(display, cookie)) { - XIEvent *xievent = cookie->data; - ... - } else if (cookie->type == GenericEvent) { - /* handle generic event */ - } else { - /* handle extension/core event */ - } - XFreeEventData(display, cookie); - - Cookies are not multi-threading safe. Clients that use XGetEventData() must - lock between XNextEvent and XGetEventData to avoid other threads freeing - cookies. - - Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> - -commit d7675cb8fa7155e7aff1459636a117a97aa1bf28 -Author: Peter Hutterer <peter.hutterer@who-t.net> -Date: Mon Jul 6 13:17:35 2009 +1000 - - Bump to 1.2.99.1 - - Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> - -commit 75fe48e7a42a685d7098e8d7108b9b956c471563 -Author: Peter Hutterer <peter.hutterer@who-t.net> -Date: Fri Jul 10 14:07:34 2009 +1000 - - Bump to 1.2.2 - - Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> - -commit 5d0fe0e0e92759af5667c5dca2eacb1b6f2d66ea -Author: Peter Hutterer <peter.hutterer@who-t.net> -Date: Thu Jul 2 09:10:25 2009 +1000 - - XMaskEvent/XCheckMaskedEvents must not check for GenericEvents. - - GenericEvent cannot be selected for in the core event masks and they must - thus be treated like extension events. - - Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> - -commit c1bf65b89f4e361f6178a73dd5334c8f2bd95732 -Author: Peter Hutterer <peter.hutterer@who-t.net> -Date: Thu Jul 2 09:06:05 2009 +1000 - - XWindowEvent/XCheckWindowEvent must not return GenericEvents. - - GenericEvents have no fixed position for the window, so they must be treated - like extension events. - - Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> - -commit 38f9054554d63525d2dd51aafb5eb57821158ab9 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Mon Jun 15 19:00:43 2009 -0700 - - Drop ancient USG SysV #ifdefs - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit 7bfe1323f16a1a69cc474659f7ac0c2570b1cf42 -Author: Adam Jackson <ajax@redhat.com> -Date: Fri Jun 12 12:44:01 2009 -0400 - - Remove X_NOT_STDC_ENV usage. (#6527) - -commit 6dd74d7fb414ca1e99bae5c13e333961f396eb36 -Author: Julien Cristau <jcristau@debian.org> -Date: Fri May 29 11:18:11 2009 +0200 - - nls: remove more duplicated aliases - - Signed-off-by: Julien Cristau <jcristau@debian.org> - -commit e4b0899f516da224010e68bd2d953d5293d94993 -Author: parag <parag@rawhideTM.pnq.redhat.com> -Date: Thu May 28 11:29:35 2009 +0530 - - nls: Add pa_PK locale information and make pa_IN as default for pa. - - X.Org bug#21954 <http://bugs.freedesktop.org/show_bug.cgi?id=21954> - - [jcristau: removed the pa_PK.UTF-8 alias to itself] - - Signed-off-by: parag <pnemade@redhat.com> - Signed-off-by: Julien Cristau <jcristau@debian.org> - -commit f0ea1f6d51145592f8617854f9320ec5dbff3299 -Author: Julien Cristau <jcristau@debian.org> -Date: Fri May 29 10:58:20 2009 +0200 - - nls: remove broken sd_IN.UTF-8 alias - - Signed-off-by: Julien Cristau <jcristau@debian.org> - -commit e29e010dabdb17d6498f2ef1786f69b8830c18ca -Author: Julien Cristau <jcristau@debian.org> -Date: Fri May 29 10:57:43 2009 +0200 - - nls: remove duplicated en_US* aliases - - Signed-off-by: Julien Cristau <jcristau@debian.org> - -commit a89a300d87852c84389ad97db66dcb8930cb45dd -Author: Caolan McNamara <caolanm@redhat.com> -Date: Thu May 21 18:41:05 2009 +0200 - - man: missing space in XAllocColor man page - - X.Org bug#21854 <http://bugs.freedesktop.org/show_bug.cgi?id=21854> - -commit c1c001e36504fd304f76f69bf6af3643225c49ea -Author: James Cloos <cloos@jhcloos.com> -Date: Wed May 13 13:03:54 2009 -0400 - - [nls] Replace remaining UCS Combining Characters in Compose sequences. - - The replaces the instances of keysyms which match <U03[0-6][0-9A-Fa-f]>, - where the keysym is used as a dead_key, with an actual dead_key symbol. - - The only remaining instances of UCS combining characters in the - compose sequences are of U0338 COMBINING LONG SOLIDUS OVERLAY - used as a suffix in Multi_key-initiated sequences to create - mathematics characters such as ∉ U+2209 NOT AN ELEMENT OF - from ∈ U+2208 ELEMENT OF. - -commit e2b0bad3d3b9e9ca781fc264eb7584afbe2a1a4f -Author: James Cloos <cloos@jhcloos.com> -Date: Wed May 13 09:58:59 2009 -0400 - - [nls] Remove extraneous instances of UCS Combining Characters in Compose sequences. - - This removes those instances of keysyms which match <U03[0-6][0-9A-Fa-f]>, - where the matching keysym is used as a dead_key, and for which alternative - compose sequences exist. - -commit 79f47e6dff2f0a0b673bbfecc47528edca814baa -Author: James Cloos <cloos@jhcloos.com> -Date: Fri May 8 20:11:54 2009 -0400 - - [nls] Remove combining_ keysyms from the Compose files - - Some of the UTF-8 Compose tables included combining_ keysyms in - the compose sequences as though they were dead symbols. This - is contrary to how combining characters are used in the UCS. - Therefore, those lines have been removed from the Compose tables. - - There were also some combining_ keysyms as targets. As those - are not included in x11proto’s keysymdef.h, and as those do - exist there as Uxxxx keysyms, they are replaced with the Uxxxx - keysym names. - - This addresses http://bugzilla.freedesktop.org/show_bug.cgi?id=5107 - and is based on attachment 25644 by samuel.thibault@ens-lyon.org. - - Signed-off-by: James Cloos <cloos@jhcloos.com> - -commit 4a08a3dfbda497b2be46e3e5fe6b777815ea27f9 -Author: parag <pnemade@redhat.com> -Date: Tue May 5 16:50:47 2009 +0530 - - libX11: Add new Indic language information to nls directory files. #21560 - - Signed-off-by: parag <pnemade@redhat.com> - -commit aaf81096eb44b4c2812108721ba02738391884da -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Sat May 2 01:38:14 2009 -0700 - - Correct return type in XkbGetKeyboard man page - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit 2bef065b70f70af520b5de8fb23529254d15f003 -Author: Christoph Pfister <christophpfister@gmail.com> -Date: Mon Apr 27 22:32:57 2009 -0700 - - X.Org Bug #21117: crash in get_rotate_fontname (omGeneric.c) - - http://bugs.freedesktop.org/show_bug.cgi?id=21117 - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit 5c1cde105db10df24d3c532f032cbc59050c7313 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Fri Apr 17 22:14:47 2009 -0700 - - Use AC_USE_SYSTEM_EXTENSIONS instead of hand-rolled check for _GNU_SOURCE - - Raises minimum autoconf version required to 2.60 - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit 84b7a91ef84f345384e4b0e13907385ca3ca3255 -Author: Julien Cristau <jcristau@debian.org> -Date: Tue Apr 14 15:59:57 2009 +0100 - - Fix fi_FI.UTF-8, again - - Commit 97fc6babd4ccaf300e25708868aa2a738893dc30 "NLS: Add UTF-8 compose - file for Finnish" made fi_FI.UTF-8 use a broken empty XLC_LOCALE file. - This reverts it back to using the en_US.UTF-8 one. - -commit 128daff4422f973ea40dd1e31b2db230e643549e -Author: Theppitak Karoonboonyanan <thep@linux.thai.net> -Date: Thu Apr 9 12:01:07 2009 +0700 - - Thai XIM not retrieve MB surrounding on UTF-8 LC - - On th_TH.UTF-8 locale, Thai XIM rejects all combining characters for GTK+ apps - that use X Input Method. - - This is because GTK+ imxim immodule passes surrounding text in locale encoding, - which is UTF-8 for UTF-8 locales. But current Thai XIM in Xlib assumes the - multi-byte StringConversionText response for the StringConversionCallback to - always be TIS-620, by retrieving a single byte and using it as-is. - - If the Thai XIM tries to convert the multi-byte text based on locale codeset - before using it, it will work again. - - X.Org But 12759 <http://bugs.freedesktop.org/show_bug.cgi?id=12759> - - Signed-off-by: Theppitak Karoonboonyanan <thep@linux.thai.net> - Signed-off-by: Julien Cristau <jcristau@debian.org> - -commit e09f0d227fbf95b6252759af9d426efd57686f9f -Author: Theppitak Karoonboonyanan <thep@linux.thai.net> -Date: Thu Apr 9 11:47:55 2009 +0700 - - Thai XIM not filters when NumLock or CapsLock is on - - The Thai XIM component in libx11 activated on 'th*' locales normally filters - input sequence according to orthographic rules. However, when NumLock/CapsLock - is on, this stops working. All sequences are passed through. - - This is caused by missing masks in _XimThaiFilter(), which normally screens out - certain special keys from entering orthographic rules. Unfortunately, this - included events with NumLock/CapsLock on. Negating the masks from the check - allows the events to be tested by the rules. - - X.Org Bug 12517 <http://bugs.freedesktop.org/show_bug.cgi?id=12517> - - Signed-off-by: Theppitak Karoonboonyanan <thep@linux.thai.net> - Signed-off-by: Julien Cristau <jcristau@debian.org> - -commit d108d3c706af3502820b5202564488ea19908b77 -Author: Theppitak Karoonboonyanan <thep@linux.thai.net> -Date: Thu Apr 9 11:25:25 2009 +0700 - - CharSet-to-CompoundText Conversion Failed for Thai Locales - - SCIM fails to commit Thai input characters on Thai locales, because it commits - string in compound text form, which was converted via - XwcTextListToTextProperty(). But the XLC_LOCALE for th_TH and th_TH.UTF-8 - declares cs1's ct_encoding as TIS620-0:GR, which was commented out in - src/xlibi18n/lcCT.c default_ct_data, in favor of ISO8859-11 ESC sequence. - So, declaring cs1 as ISO8859-11:GR instead makes it work. - - Besides, for th_TH.UTF-8, adding cs2 class with ISO10646-1 encoding also adds - support for UTF-8 input. - - And, along discussion in the bug, a similar problem was found for fontset, too, - by causing delays on X apps startups on systems without tis620-0 fonts. This - is normally the case, as mkfontdir and mkfontscale generate iso8859-11 entries - by default for Thai X fonts. So, Thai fontset charset is also patched. - - X.Org Bug 16475 <http://bugs.freedesktop.org/show_bug.cgi?id=16475> - - Signed-off-by: Theppitak Karoonboonyanan <thep@linux.thai.net> - Signed-off-by: Julien Cristau <jcristau@debian.org> - -commit fd62d3318c846cd43d66a505946e94704d7d83dc -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Wed Apr 8 19:42:25 2009 -0700 - - Revert "Change masculine to ordmasculine in Compose file comments" - - This reverts commit 892b401d5acc055803a20e349ede0d64490f2230. - - As Julien Cristau correctly points out, I misread the Compose file grammar - in modules/im/ximcp/imLcPrs.c, and those are keysyms, not comments, and - the keysym is named XK_masculine in keysymdef.h. This change is thus a - bug in the Solaris compose tables to be fixed, not an improvement to bring - upstream. - -commit eac57c77afdf44f50692225b8b0345a7c927bc84 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Tue Apr 7 15:38:45 2009 -0700 - - Version bump: 1.2.1 - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit bfbec08baec33c5024510b0bcbbee6e4a8473e79 -Author: Yaakov Selkowitz (Cygwin Ports maintainer) <yselkowitz@users.sourceforge.net> -Date: Tue Apr 7 13:46:57 2009 -0700 - - Bug 20773: Xcursor dynamic loading on Cygwin - - X.Org Bug #20773 <http://bugs.freedesktop.org/show_bug.cgi?id=20773> - Patch #24096 <http://bugs.freedesktop.org/attachment.cgi?id=24096> - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit c8c41614911be4fa222fa22478677d263b41c751 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Mon Apr 6 16:52:46 2009 -0700 - - Fix a several sparse warnings: Using plain integer as NULL pointer - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit b336c3d0cc2aefc8926500cff5f76b5a3e803886 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Mon Apr 6 16:32:05 2009 -0700 - - Further ansify prototypes & reduce #ifdefs in locking.c - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit 892b401d5acc055803a20e349ede0d64490f2230 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Mon Apr 6 10:50:09 2009 -0700 - - Change masculine to ordmasculine in Compose file comments - - Matches the ordfeminine name used for the matching character, - and the ordmasculine name used in many font descriptions of the glyph. - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit e3198b55dc16ec57346cc28aa8d34165ce8cde96 -Author: Julien Cristau <jcristau@debian.org> -Date: Fri Mar 13 13:52:33 2009 +0100 - - Add a ru_RU.UTF-8 locale - - Based on patch by Eugene Konev <ejka@imfi.kspu.ru> for X.Org 6.9.0. - - Debian bug#330144 <http://bugs.debian.org/330144> - X.Org bug#15887 <http://bugs.freedesktop.org/show_bug.cgi?id=15887> - -commit d239de9452691d6f875e6e5ace3d499ec3bf14d9 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Wed Mar 25 17:59:09 2009 -0700 - - Delete some unused "#ifdef notdef" static functions - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit 4281892e31058ef3aecc96a5767824b34d88d415 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Wed Mar 25 17:52:48 2009 -0700 - - Remove _XP_PRINT_SERVER_ #ifdefs from Xrm.c - - This copy of Xrm.c is never compiled into the Xprint server any more, so - this old code-sharing #ifdef from the monolith tree isn't needed. - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit 27a2e16e8ea11c1604e28645fae4d6ba4371d513 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Tue Mar 17 18:38:58 2009 -0700 - - makekeys: combine malloc(strlen)+strcpy into strdup - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit 78a894231ae8ec4959007b6d9b8d2a15d6333a1e -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Tue Mar 17 15:42:19 2009 -0700 - - When makekeys fails to find a good hash, print error instead of divide-by-zero - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit c9f84af591d15fbc3fa890bcd955d94f1ff82a0b -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Tue Mar 17 14:59:16 2009 -0700 - - Remove ifdef checks for macII left over from ancient A/UX 3.0 support - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit 4b90da0ffb32b791d915ecae11996cc2f2cac9a7 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Mon Mar 16 18:37:49 2009 -0700 - - XErrorDB additions for DRI2 requests - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit 273f45af1441be9d2135e4cac8c46ceb33470236 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Mon Mar 16 18:35:44 2009 -0700 - - XErrorDB additions for XInput errors and new XInput 1.5 requests - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit 90ef36f6336068183bf9d13ca972202db35b1202 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Mon Mar 16 18:23:05 2009 -0700 - - XErrorDB additions for RANDR 1.3 - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit 124a4efaccf329f1a44f6b824e70278bdd1cad83 -Author: Lubos Lunak <l.lunak@suse.cz> -Date: Mon Mar 16 18:03:36 2009 -0700 - - XErrorDB updates for XTEST, RANDR, DAMAGE extensions - - From http://lists.freedesktop.org/archives/xorg/2008-January/031937.html - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit 80811846e37b805fddb37c71589fd5f6f6037b3f -Author: Lubos Lunak <l.lunak@suse.cz> -Date: Mon Mar 16 17:57:52 2009 -0700 - - XGetErrorText() fails for extension error codes equal to the error base - - From http://lists.freedesktop.org/archives/xorg/2008-January/031937.html - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit da95ecbbdcacc483cd0b5fd7db1fb2e2543341bd -Author: Milos Komarcevic <miloskomarcevic@netscape.net> -Date: Mon Mar 16 17:43:26 2009 -0700 - - Bug 11456: Serbian locale updates (sr_RS and sr_ME) - - X.Org Bug #11456 <http://bugs.freedesktop.org/show_bug.cgi?id=11456> - Patch #23937 <http://bugs.freedesktop.org/attachment.cgi?id=23937> - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit 934a6c0519a9e32505beee55b004f36c2a710217 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Mon Mar 16 14:55:22 2009 -0700 - - Bug 10082: Compose entries for some standard mathematical operators - - X.Org Bug #10082 <http://bugs.freedesktop.org/show_bug.cgi?id=10082> - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit abf4da1ed0f735ca7ce471dc13a0ec3677391486 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Mon Mar 16 14:27:46 2009 -0700 - - Bug 14651: We need to add new locale specification for Belarusian Latin locale - - X.Org Bug #14651 <http://bugs.freedesktop.org/show_bug.cgi?id=14651> - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit 837703c8651e1321a50147a8311c56e4758ce08a -Author: Caolan McNamara <caolanm@redhat.com> -Date: Mon Mar 16 14:15:50 2009 -0700 - - Bug 20575: man page for XCreatePixmapFromBitmapData doesn't match signature - - X.Org Bug #20575 <http://bugs.freedesktop.org/show_bug.cgi?id=20575> - Patch #23717 <http://bugs.freedesktop.org/attachment.cgi?id=23717> - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit 22199018879055d8653e59d8236bef57164fac66 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Mon Mar 16 13:28:18 2009 -0700 - - Correct locale alias for sh_BA.ISO8859-2@bosnia (should be sr, not nr) - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit 4c63c27eab2b88f5556dbf72c36321f50f6de35e -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Thu Mar 12 18:57:20 2009 -0700 - - Bug 9953: Please provide locale alias hu_HU.utf8 - - X.Org Bug #9953 <http://bugs.freedesktop.org/show_bug.cgi?id=9953> - Debian Bug #407573 <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=407573> - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit 501f4e0ada1690783ada05ad412e4b191ad55336 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Thu Mar 12 17:38:21 2009 -0700 - - Bug 6820: Xlib shouldn't handle EAGAIN as a fatal IO error - - X.Org Bug #6820 <http://bugs.freedesktop.org/show_bug.cgi?id=6820> - Patch #17637 <http://bugs.freedesktop.org/attachment.cgi?id=17637> - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit 7b9c543e7210c7da204871c31a160e79d3a949b6 -Author: Paul Bender <pebender@gmail.com> -Date: Thu Mar 12 17:11:42 2009 -0700 - - Bug 15664: xau & xdmcp not needed in x11.pc dependencies when built with xcb - - X.Org bug #15664 <https://bugs.freedesktop.org/show_bug.cgi?id=15664> - Patch #16128 <https://bugs.freedesktop.org/attachment.cgi?id=16128> - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit fd2cf1ef66c2aff3dc758956c9e9e567b9892c06 -Author: Xue Wei <Wei.Xue@Sun.COM> -Date: Wed Mar 4 19:32:29 2009 -0800 - - Add UTF-8 locale entries for es_US, kk_KZ, mt_MT, and sh_BA - - Sun bug 6809309 Add new utf8 locales supported by Xlib - <http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6809309> - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit cb70c9bc43267577859a3674ca9de9be396ba69e -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Mon Feb 23 19:29:15 2009 -0800 - - Add --with-locale-lib-dir configure option to set locale lib install dir - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit ccd3584f0330db8dac90b9313c33ab8b5b2ec6af -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Mon Feb 23 18:33:51 2009 -0800 - - Incorporate more locale names/aliases from Solaris libX11 - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit 83ce4daefdf544f801c7d666c89162690a36ce41 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Mon Feb 23 18:32:34 2009 -0800 - - Incorporate char range comments from Solaris version of ksc5601.h - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit ee279c84e34f1ebb8a6ff17d54ee146d11e29764 -Author: Chris Ball <cjb@laptop.org> -Date: Sat Feb 21 14:48:42 2009 -0500 - - Fix fi_FI locale install directory. - - fi_FI was setting "x11thislocaledir" to en_US, with the result that its - locale data was written in that locale dir. - - Signed-off-by: Chris Ball <cjb@laptop.org> - -commit da6bbca07c796c69172a649405474f03bee66754 -Author: Emilio Jesús Gallego Arias <egallego@babel.ls.fi.upm.es> -Date: Sat Feb 21 20:17:23 2009 +0100 - - xcb_io: Avoid datatype overflow on AMD64 and friends. - -commit 4ef6491afa69e8441caee7bbebc583e6e796275e -Author: Chris Ball <cjb@laptop.org> -Date: Sat Feb 21 12:51:03 2009 -0500 - - Build fix for fi_FI. - - Commit 642c4e928e770e0.. instructs make to enter nls/fi_FI, but no - Makefile is written there by configure. - - Signed-off-by: Chris Ball <cjb@laptop.org> - -commit 642c4e928e770e012379539a6ce09e11c02f09a6 -Author: Julien Cristau <jcristau@debian.org> -Date: Sat Feb 21 03:12:05 2009 +0100 - - nls: actually use the fi_FI.UTF-8 files - - The subdir wasn't added to nls/Makefile.am - -commit 9bad8309ef289bb943651abf6967b24fa2252aac -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Fri Feb 20 14:45:54 2009 -0800 - - flags member of Display structure needs to be marked volatile - - Since the Xlib multithreaded code checks the flags variable in _XFlushInt - to see if the other threads are done yet, it has to be marked volatile so - the compiler doesn't optimize out re-loading it on each trip through the - while loop and end up in an impossible-to-exit infinite loop of CPU chewing. - - Part of fix for Sun bug 6409332: infinite loop in XFlushInt() on x86/32-bit - <http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6409332> - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit ef5c446395aa30d7b1096a112e241a81c5b358e7 -Author: Xue Wei <Wei.Xue@Sun.COM> -Date: Fri Feb 20 15:12:35 2009 -0800 - - Add nn_NO.UTF-8 to compose.dir.pre for Norwegian Nynorsk - - Sun bug 6691236: Swing applications dump core when locale is nn_NO.UTF-8 - <http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6691236> - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit 3822f2654e9630167f0c6cae317b472c09771672 -Author: Xue Wei <Wei.Xue@Sun.COM> -Date: Fri Feb 20 15:03:51 2009 -0800 - - Add locale aliases for no_NO & sh_BA locale variants - - Fixes Sun bug id 6691219: xterm refuses to start in some locales - <http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6691219> - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit 63b6b5b5f522c0a606b32163c643edb64ca91d54 -Author: Xue Wei <Wei.Xue@Sun.COM> -Date: Fri Feb 20 14:23:11 2009 -0800 - - Add kk_KZ.UTF-8 to locale.dir.pre for Kazakhstan - - Fixes Sun bug id 6737254 ("kk_KZ.UTF-8 locale: In Java applications - changing keyboard layout with gimlet does not work") - <http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6737254> - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit d497301707962f3b94542e999a36abffcfbd303d -Author: Julien Cristau <jcristau@debian.org> -Date: Tue Feb 17 16:09:41 2009 +0100 - - Bump to 1.2 - -commit 990e71361d1d7b79bf07b1dc93e4e905d4f1bdaf -Author: Julien Cristau <jcristau@debian.org> -Date: Tue Feb 17 15:23:40 2009 +0100 - - Check Xmalloc return value in _XConnectXCB - - X.Org bug#19137 <http://bugs.freedesktop.org/show_bug.cgi?id=19137> - - Signed-off-by: Julien Cristau <jcristau@debian.org> - -commit b4b5893f69419ff577bbaa4d18f78e4ffd729a0c -Author: James Cloos <cloos@jhcloos.com> -Date: Sat Feb 14 12:35:56 2009 -0500 - - dolt: allow older versions of bash to compile the library - - Cf xserver commit 7be6520d and bugzilla #19031. - -commit 20982d6866e24453642b0b592fa0f13a88aa747c -Author: Will Thompson <will@willthompson.co.uk> -Date: Thu Feb 5 02:53:06 2009 +1100 - - NLS: Compose: Non-aliasing CCCP - - Oops, cccp aliased cc for question mark. Upper-case it to avoid fail. - - Signed-off-by: Will Thompson <will@willthompson.co.uk> - Signed-off-by: Daniel Stone <daniel@fooishbar.org> (sorry) - -commit f052665394f3f0319e93a98f1d5d4ea287e1dd07 -Author: Will Thompson <will@willthompson.co.uk> -Date: Wed Feb 4 14:51:11 2009 +0000 - - Add two essential compose sequences - - Signed-off-by: Will Thompson <will@willthompson.co.uk> - Signed-off-by: Daniel Stone <daniel@fooishbar.org> - -commit d7bea6fa909bf34c43efe0ca8239ab0f9f3a415f -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Mon Feb 2 20:34:31 2009 -0800 - - Add README with pointers to mailing list, bugzilla & git repos - - Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> - -commit f682c27e93512773122887d2cbabb1657af45d2e -Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> -Date: Mon Feb 2 16:36:39 2009 -0200 - - Check if a function argument is NULL. - - This was an addition to patch (also by me) - https://bugs.freedesktop.org/attachment.cgi?id=14660 - that was not added when rediscovering/correcting the problem. - -commit 427e9d45d424b84efd9fc499aebf8d72392844c5 -Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> -Date: Thu Feb 28 15:58:12 2008 -0300 - - Allow multiple inclusions of cursorfont.h, cosmetic patch. - -commit b91524a53e691f6a5d278fd8972b48a14ebeedeb -Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> -Date: Thu Feb 28 15:54:43 2008 -0300 - - Don't add prototypes for functions that don't exist. - - Note that a full review was not done, only for functions that receive - char/short arguments, or one of it's parameters is a function pointer - that requires char/short arguments. - -commit 537eb52fe266ac439c4b383bb04a70017b709911 -Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> -Date: Thu Feb 28 15:50:27 2008 -0300 - - WORD64 compile fix. This bug catched on a overview of the code. - - The code is wrong since the first git revision, so it seens that it has - not been compiled with WORD64 for quite some time, there is also another - interesting code in xkb/XKBRdBuf.c: - <hash>ifdef WORD64 - _XkbWriteCopyData32 Not Implemented Yet for sizeof(int)==8 - <hash>endif - and possibly there are other similar problems. - -commit ffd0300fb74c6183208ae599133f2ded09e08d97 -Author: Brian Rogers <brian@xyzw.org> -Date: Sat Jan 31 10:37:51 2009 -0800 - - Initialize event_notify after allocating the memory for it. - - An uninitialized or otherwise invalid condition variable can apparently - cause a hang in pthread_cond_broadcast. Ekiga, openoffice, and xine - at least are freezing as a result of event_notify never being initialized. - - Signed-off-by: Brian Rogers <brian@xyzw.org> - Signed-off-by: Bart Massey <bart@cs.pdx.edu> - -commit 97fc6babd4ccaf300e25708868aa2a738893dc30 -Author: James Cloos <cloos@jhcloos.com> -Date: Thu Jan 29 20:10:41 2009 -0500 - - NLS: Add UTF-8 compose file for Finnish - - From bug report: - - https://bugs.freedesktop.org/show_bug.cgi?id=18747 - -commit 1bd2966ed88f83479a066c6ca7da23a515979550 -Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> -Date: Thu Jan 29 20:25:15 2009 -0200 - - patches to avoid gcc warnings for libX11 (#4) - - Author is Peter Breitenlohner <peb@mppmu.mpg.de> - Bug #17946, attachment #19443 - - This patch avoids the gcc warning - ../../../../libX11-1.1.5/modules/im/ximcp/imDefLkup.c:223: warning: passing arg 1 of `_XimProcSyncReply' from incompatible pointer type - (same as already done at other places) - - BTW: what is the difference between XIM (the type of ic->core.im) - and Xim ? - -commit f16dd6af3eb17a25b8ee03d6617a7acc6e919fb0 -Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> -Date: Thu Jan 29 20:22:21 2009 -0200 - - patches to avoid gcc warnings for libX11 (#3) - - Author is Peter Breitenlohner <peb@mppmu.mpg.de> - Bug #17946, attachment #19441 - - This patch avoids the two gcc warnings - ../../../../libX11-1.1.5/modules/im/ximcp/imRm.c:413: warning: assignment discards qualifiers from pointer target type - ../../../../libX11-1.1.5/modules/im/ximcp/imRm.c:450: warning: assignment discards qualifiers from pointer target type - - Note, that this as a rather crude fix of the problem (and it is really a - shame to cast name_table to non-const). - - The right solution would be to declare XIMValuesList.supported_values - (in include/X11/Xlib.h) as 'const char **' (or '_Xconst char **'). - This will, however, require extensive modifications in various places. - -commit cce75c5dce73fe1f8626ed9e6798138ada09a860 -Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> -Date: Thu Jan 29 20:20:18 2009 -0200 - - patches to avoid gcc warnings for libX11 (#2) - - Author is Peter Breitenlohner <peb@mppmu.mpg.de> - Bug #17946, attachment #19440 - - Avoid a preprocessor message - <stdin>:194: warning: no newline at end of file - - Two more such warnings (in XkbSAGroup.man and XkbSASetGroup.man) - seem to be caused by a truncated (or otherwise incomplete) - manpage. - -commit 692baebcc50f1e952800bfe4e2e6bc42f54e62fe -Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> -Date: Thu Jan 29 20:12:24 2009 -0200 - - patches to avoid gcc warnings for libX11 (#1) - - Author is Peter Breitenlohner <peb@mppmu.mpg.de> - Bug #17946, attachment #19439 - - Define as 1 (one) as done by autoconf and the command line - option, e.g. -DX11_t, not as empty. - - This avoids the gcc (3.4.6) warnings: - ../../libX11-1.1.5/src/x11_trans.c:27:1: warning: "X11_t" redefined - <command line>:7:1: warning: this is the location of the previous definition - ../../libX11-1.1.5/src/x11_trans.c:28:1: warning: "TRANS_CLIENT" redefined - <command line>:8:1: warning: this is the location of the previous definition - - Similarly, follow the autoconf convention to define XTHREADS - and XUSE_MTSAFE_API as one. - - This avoids analogous warnings when compiling libXcomposite, - libXcursor, and libXdamage. - - No reason to AC_SUBST XTHREADS and XUSE_MTSAFE_API (unused). - -commit a1977883c9f5ef0e515569d6e2ebccb07411f98c -Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> -Date: Thu Jan 29 15:01:06 2009 -0200 - - Janitor: Correct some gcc/sparse warnings. - - Most remaining warnings are about XIM/Xim to/from conversion - and discarding const from pointers. - -commit 8ba0ca32a63c532f128bdca7f1bf982cab8e12be -Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> -Date: Wed Jan 28 20:31:42 2009 -0200 - - Janitor: ansification, make distcheck, compiler warnings. - - Only convert to use "ansi prototypes" the functions warned from - compilation with "./autogen.sh --prefix=/usr", on a Linux computer. - - Also, only address "trivial" compiler warning fixes in this commit. - - The new .gitignore is the output of a command like: - % find . -name .gitignore -exec cat {} \; | sort | uniq - and only the toplevel .gitignore file was kept. - -commit 091c1624fd2f9d933329d6152e4ecd865aa7903a -Author: Peter Hutterer <peter.hutterer@who-t.net> -Date: Tue Jan 13 12:05:54 2009 +1000 - - Fix wrong implies symbol. - - Quote Simos Xenitellis: - > I checked the gtk+ commit logs that go back to 2000, and I see that still it - > was - > - > { 0x08ce, 0x21d2 }, /* implies ⇒ RIGHTWARDS - > DOUBLE ARROW */ - > - > In XFree86, it appears there was an error when they converted the - > original table to - > http://cvsweb.xfree86.org/cvsweb/xc/lib/X11/imKStoUCS.c?rev=1.1&content-type=text/vnd.viewcvs-markup - > and the problem still shows up there (November 2000). - - http://lists.freedesktop.org/archives/xorg/2008-October/039743.html - - Reported by Erik Streb del Toro. - -commit e32521f19e0b07649b7e3a03d56a2bd556b138fb -Author: James Cloos <cloos@jhcloos.com> -Date: Sun Dec 7 04:13:34 2008 -0500 - - [i18n] s/U00DC/Udiaeresis/g - - The xkeyboard-config keyboards generate the symbol Udiaeresis, not - U00DC. Make sure the relevant Compose sequences expect the symbol - which the keyboards actually send. - -commit b7502abfe22f8dc009b21cda1172af221d8f9f32 -Author: James Cloos <cloos@jhcloos.com> -Date: Sun Dec 7 04:09:46 2008 -0500 - - Revert "For nls/*.pre, allow people to comment lines by starting them with '##'." - - As of commit c9d20e3 the initial double-hashes are replaced with proper C comments. - - This reverts commit a225a0be48770beb689d5ac5da97073634f7deab. - -commit c9d20e3f697c9cfae5511412023362c1db7449b1 -Author: James Cloos <cloos@jhcloos.com> -Date: Sun Dec 7 04:08:23 2008 -0500 - - Use C comments rather than initial doubled hashes to exclude lines from .pre files - -commit c34ce54d9eac2d8052dc5f205a2ab09866ef5d25 -Author: vehemens <vehemens@verizon.net> -Date: Sun Dec 7 01:18:26 2008 -0500 - - [i18n] Distribute new headers which were added for gb18030 support. - - big5hkscs.h and gbk.h, added in 67e34d7a, need to be in SOURCES to - make it into the tar. - - Completes 67e34d7a82ccd31f1208c0c43a6d58c3c05bf51. - - Signed-off-by: James Cloos <cloos@jhcloos.com> - -commit 418819558d2c60e58b4e3022ce0fadf2143488ac -Author: Stefan Dirsch <sndirsch@suse.de> -Date: Sat Nov 22 22:01:07 2008 +0100 - - Fixed strange font mixups, when fontsets are still used (#2676, Novell #74299). - -commit 67e34d7a82ccd31f1208c0c43a6d58c3c05bf51a -Author: Stefan Dirsch <sndirsch@suse.de> -Date: Sat Nov 22 19:40:54 2008 +0100 - - Added remaining xlib patch required for gb18030 support (#1573). - -commit 55782a0a1fe1560f1a9c0ed78bc7f2575c15abcf -Author: Stefan Dirsch <sndirsch@suse.de> -Date: Sat Nov 22 17:53:06 2008 +0100 - - Added remaining hunk of Egbert's patch to prevent XIM deadlocks (#1182). - -commit c859446c500c883a67f7a86cab1a44844e24dade -Author: Ken Thomases <ken@codeweavers.com> -Date: Fri Nov 21 13:58:10 2008 -0500 - - [i18n] Provide translation from XK_partialderivative (8ef) to Unicode (U2202) - - Signed-off-by: James Cloos <cloos@jhcloos.com> - -commit 5e68e94d852c730ef9264fc0d8ca61a2ffe98b53 -Author: Jeremy Huddleston <jeremyhu@freedesktop.org> -Date: Mon Nov 17 20:47:26 2008 -0800 - - Force local transport when using the launchd socket. - - Fixes a regression due to - bf53987eaf0fbd7f7627783fc39e7ee99e8361ba - -commit 7aca689ce14d314b5c8c72c8df76f53f76ab467c -Author: Peter Hutterer <peter.hutterer@redhat.com> -Date: Fri Nov 14 10:32:50 2008 +1000 - - Add XF86Suspend, XF86Hibernate to KeysymDB. - -commit d16b11f25f8265e651def8d80bcd430c0448e664 -Author: James Cloos <cloos@jhcloos.com> -Date: Tue Nov 11 19:43:39 2008 -0500 - - [nls] Annotate the Bépo compose sequences - - Add comments with the UCS names. - Add utf-8 strings for each result. - Format for easy reading. - -commit 730298464240be6f65b32416b3f9b20062c61825 -Author: James Cloos <cloos@jhcloos.com> -Date: Tue Nov 11 16:41:34 2008 -0500 - - [nls] Add some UTF-8 Compose sequences - - As requested for the Bépo keyboard layout (http://clavier-dvorak.org/wiki/). - - Cf. bugs: - - https://bugs.freedesktop.org/show_bug.cgi?id=17821 - https://bugs.freedesktop.org/show_bug.cgi?id=17822 - -commit ad6008a0c92733826983eb93f063d3d6276007d8 -Author: Colin Harrison <colin.harrison@virgin.net> -Date: Thu Nov 6 17:48:21 2008 -0500 - - Fix copy/paste typo in imLcPrs - - Signed-off-by: James Cloos <cloos@jhcloos.com> - -commit 0f0168ad18f8a280fc5a689eb02cfaa62d022ea6 -Author: Adam Jackson <ajax@redhat.com> -Date: Thu Nov 6 14:54:13 2008 -0500 - - Fix leak in _XimXGetReadData - - Spotted by Denis Dzyubenko - -commit ae23c25b9349ab1d7ff81f3075c000cf35fc442b -Author: Julien Cristau <jcristau@debian.org> -Date: Wed Nov 5 22:09:37 2008 +0100 - - Bump to 1.1.99.2 - -commit d31e644c65c52828ea3e7abd94a8cf9aee12265c -Author: Julien Cristau <jcristau@debian.org> -Date: Wed Nov 5 21:33:13 2008 +0100 - - Fix distcheck - -commit e6a7b70cdb2ae8b713012839a0a0bbb93817b8ef -Author: Jamey Sharp <jamey@minilop.net> -Date: Wed Oct 29 14:00:33 2008 -0700 - - Support multiple independent internal sync handlers - - Xlib has several independent tasks that need to be performed with the - display unlocked. It does this by replacing the existing sync handler with - one of a variety of internal sync handlers. However, if multiple internal - sync handlers need to run, then the last one registering wins and - previously registered internal sync handlers are never invoked. This - manifested as a bug with DRI applications on Xlib/XCB as that requires - both an XID handler after every XID allocation, and the periodic sequence - number handler. The XID handler would win, and the sequence number handler - would never be invoked. - - Fix this by unifying the internal sync handler mechanism into a single - function that calls all of the known internal sync handlers. They all need - to deal with being called when not strictly necessary now. - - Signed-off-by: Keith Packard <keithp@keithp.com> - Signed-off-by: Jamey Sharp <jamey@minilop.net> - Signed-off-by: Josh Triplett <josh@freedesktop.org> - -commit 2dbaaab9c4e3894b33dcae850551dee5473431d5 -Author: Keith Packard <keithp@keithp.com> -Date: Sat Oct 11 21:44:21 2008 -0700 - - Ensure that _XReadEvents always leaves an event in the queue on return - - XNextEvent assumes that the event queue will be non-empty on return from - _XReadEvents, but with multiple event readers running, the previous change - could leave the queue empty on return from process_responses. Re-invoke - process_responses until the queue is non-empty. - - Signed-off-by: Keith Packard <keithp@keithp.com> - -commit bedfe68259037c5564fe52758c92b9c97729640a -Author: Keith Packard <keithp@keithp.com> -Date: Sat Oct 11 21:10:23 2008 -0700 - - Permit only one Xlib thread to block waiting for events - - As Xlib queues events internally, we must prevent multiple Xlib threads from - entering XCB to wait for an event in case the queued event is to be - delivered to the thread which didn't manage to read it. In other words, let - only one Xlib thread into xcb_wait_for_event at a time. - - Jamey Sharp looked over my shoulder while making this fix and, while hating - my whitespace conventions, appears happy enough with the actual code. - - Signed-off-by: Keith Packard <keithp@keithp.com> - -commit cc19618d2eb3ed92a0b574aee26a7da8b4aed5d2 -Author: Jamey Sharp <jamey@minilop.net> -Date: Sun Mar 23 16:33:50 2008 -0700 - - Fix XAllocID race: hold the user display lock until we have a new XID. - - Xlib built --without-xcb is also vulnerable to this race, and a similar - fix might work there too. - - Also, use an XID that's truly invalid while waiting for the next XID to be - requested. - -commit 54e5c0941b0ded1628d559a9f0a3451ea96c299b -Author: Josh Triplett <josh@freedesktop.org> -Date: Sat Mar 15 17:22:23 2008 -0700 - - Use XCB's new socket handoff mechanism rather than the old XCB Xlib lock. - - Previously, Xlib/XCB used XCB's Xlib lock to prevent XCB from sending - requests between calls to Xlib's LockDisplay and UnlockDisplay macros. - Xlib/XCB then sent all of its requests using XCB's xcb_send_request, and - had to flush its requests when unlocking the display. - - XCB 1.2 adds a new socket handoff mechanism, xcb_take_socket. Replace - much of the existing Xlib/XCB implementation with the use of - xcb_take_socket to take ownership of the write side of the X connection - socket, and a return_socket callback which writes any outstanding requests - with xcb_writev. This approach allows Xlib/XCB to use the same buffering - as traditional Xlib did. In particular, programs which use Xlib/XCB and - never make XCB calls will never need to hand the socket back to XCB, and - vice versa. - - This allows us to discard large quantities of synchronization code from - Xlib/XCB, together with the synchronization bugs present in that code. - Several test cases which previously failed now work perfectly, including - multi-threaded ico. In addition, the infamous locking correctness - assertions, triggered when double-locking or when unlocking without a - previous lock, no longer exist, because Xlib/XCB no longer has any reason - to care more about application locking than traditional Xlib does. - - Furthermore, the handoff approach provides great improvements to - performance. Results from x11perf's XNoOp test, which represented the - worst case for the lock-based Xlib/XCB: - - Traditional Xlib: average 19100000/sec - Lock-based Xlib/XCB: average 3350000/sec - Handoff-based Xlib/XCB: average 17400000/sec - - Thus, for no-ops, the handoff mechanism provides more than a 4x speedup to - Xlib/XCB, bringing Xlib/XCB within 9% of traditional Xlib no-op - performance. Of course, real-world workloads do not use no-op, so your - mileage may vary. In particular, since no-ops represent the worst case, - we expect real workloads to more closely match the performance of - traditional Xlib. - - While removing synchronization code, we changed _XReply to not drop any - locks when calling xcb_wait_for_reply; previously, we had to carefully - avoid a deadlock between the Display lock and the XCB Xlib lock. Holding - the locks reduces implementation complexity and should not impact - applications. - - Commit by Jamey Sharp and Josh Triplett. - XCB's handoff mechanism inspired by Keith Packard. - -commit 5a19ac473f7a8046b0421fbd5d53da160c22ed75 -Author: Chris Ball <cjb@laptop.org> -Date: Mon Nov 3 22:57:29 2008 -0500 - - Remove configure check for xcb-xlib. - - xcb-xlib has been intentionally removed from libxcb; stop checking for - it at configure-time. - -commit 34b35dda0bb7f3cf0ad9ab95ad7953d35d24f71b -Author: Josh Triplett <josh@freedesktop.org> -Date: Wed Oct 29 14:37:44 2008 -0700 - - .gitignore: Add dolt files - -commit 1290cccf2d90083eba852f5f413f7e3dff48ccd2 -Author: Peter Hutterer <peter.hutterer@redhat.com> -Date: Tue Oct 28 11:56:55 2008 +1030 - - man: fix formatting error in XkbGetIndicatorState man page. - -commit b1022fa6d7e97640049e93ffa108083fc8d71b05 -Author: James Cloos <cloos@jhcloos.com> -Date: Sat Oct 25 09:13:08 2008 -0400 - - Increase size of working arrays in the makekeys utility program. - - Makekeys is used to create an optimal hash of the keysyms defined - in x11proto’s keysymdef.h. - - The recent addition of new keysyms there has triggered a bug in - makekeys where it tries to use a zero on the rhs of the % (mod) - operator (resulting in a divide by zero error) whenever it fails - to find a solution within its constraints. - - Increasing the size of the arrays allows it to find a solution for - the current set of keysyms. - - Makekeys is only run durring the build process, so this has no impact - on users of libX11, only on the amount of VM needed to build it. - - It still needs a more complete fix, but this allows compiles to - progress until that is completed. - -commit 3e9afd501e40d76040635bd9a3045bcaf5a03b60 -Author: James Cloos <cloos@jhcloos.com> -Date: Sat Oct 11 01:03:14 2008 -0400 - - Dolt-ify - - Add dolt to acinclude.m4 and call it it configure.ac to speed compiles. - -commit 39c0b266cac8cbc15bf501d7869186862f01d823 -Author: Peter Hutterer <peter.hutterer@redhat.com> -Date: Wed Oct 15 14:30:20 2008 +1030 - - Add more keysyms for PS3 BD remotes, Ericsson Phones #16519 - - X.Org Bug 16519 <https://bugs.freedesktop.org/show_bug.cgi?id=16519> - -commit d23aad31338e7d869d878d5aa1b6b91d20287005 -Author: Peter Hutterer <peter.hutterer@redhat.com> -Date: Mon Oct 13 09:41:59 2008 +1030 - - Add XF86Battery, XF86Bluetooth, XF86WLAN, XF86UWB to keysymdb. - -commit 214ea6f5fd6aeaa7303ea4a69f9aedabf219ec4c -Author: Peter Hutterer <peter.hutterer@who-t.net> -Date: Thu Jul 24 15:44:26 2008 +0930 - - xkb: fix out-by-1 error in _XkbWriteKeyExplicit. - - Thanks to Michael Meeks, Novell Bug 369263. - https://bugzilla.novell.com/show_bug.cgi?id=369263 - -commit e7ece39afc8e0adc3b6b1e70b337b98376754462 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Tue Oct 7 15:41:38 2008 -0700 - - Sun bug #6739431: double free in _X11TransConnectDisplay() - - Double free() introduced in bf53987eaf0fbd7f7627783fc39e7ee99e8361ba - After copying original_hostname to phostname, set original_hostname - to NULL, so we don't free the same pointer twice when we free both - original_hostname and phostname. - - <http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6739431> - -commit 0877bc916afbd1ff8f1833edc930b765ea783576 -Author: Daniel Stone <daniel@fooishbar.org> -Date: Tue Sep 23 19:02:02 2008 +0300 - - configure.ac: Fix CC_FOR_BUILD logic error - - Turns out we were accidentally smashing it so that you couldn't set it - externally at all. Oops. - -commit 58bf3aa746908f01c37be7045699e43a4e270944 -Author: John Tapsell <johnflux@gmail.com> -Date: Tue Sep 23 17:30:13 2008 +0300 - - Build: Use native compiler for makekeys - - makekeys needs to be run during the build process, as opposed to on the - target, so build it with either of gcc or cc to fix cross-compiling. - This can be overridden by setting $CC_FOR_BUILD. - -commit 340422a5c7a413faef18666cada27cee14615250 -Author: Adam Jackson <ajax@redhat.com> -Date: Wed Sep 17 12:54:34 2008 -0400 - - Fix the previous patch for the BadFont case. - -commit 2335eafe4b53c27f6f9ee1bab3e1f5842f896428 -Author: Matthias Clasen <mclasen@redhat.com> -Date: Wed Sep 17 10:43:52 2008 -0400 - - Bug #17616: Fix an XCB leak when the client has a non-fatal error handler. - -commit db0b85db29699be6bf7e78dede655d59ba926dfc -Author: Rafael Ávila de Espíndola <rafael.espindola@gmail.com> -Date: Sun Sep 14 19:15:26 2008 -0400 - - Fix problem with <dead_acute> <c> in pt_BR.UTF-8 - - The <dead_acute> <C> and <dead_acute> <c> lines in the pt_BR UTF-8 - Compose file show "Ç" and "ç" (c with cedilla accent) (akin to the - ISO 8859 pt_BR Compose file) as the string but specify the keysym - and comment for Ć and ć (c with acute accent). - - This commit normalizes those two lines to match the specified string. - - Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=4671 - - Signed-off-by: James Cloos <cloos@jhcloos.com> - -commit b065c011baa69b69e3ea77c30d5e153c0d103e2d -Author: Michael Verret <michael.verret@gmail.com> -Date: Mon Sep 8 16:33:35 2008 -0400 - - Fix documentation typo - - Signed-off-by: James Cloos <cloos@jhcloos.com> - -commit 4213ea95185377bdd1b51e82933f331fc0f52e5b -Author: James Cloos <cloos@jhcloos.com> -Date: Sat Sep 6 04:19:19 2008 -0400 - - Remove extraneous <angle brackets> from the Ethiopic Compose file. - - The am_ET.UTF-8 Compose file submitted in: - - https://bugs.freedesktop.org/show_bug.cgi?id=11307 - - for the OLCP project used incorrect syntax. (It has angle brackets around the - Uxxxx symbols on the right hand side rather than only on the left hand side). - - This bug is noted in OLPC’s ticket: - - http://dev.laptop.org/ticket/7474 - http://dev.laptop.org/attachment/ticket/7474/olpc_7474_dead_vowels_libX11.patch - -commit 9df84b513dd2b6e65e6d528cfac6d4cc3ea46918 -Author: James Cloos <cloos@jhcloos.com> -Date: Mon Sep 1 17:49:33 2008 -0400 - - Complete the set of vulgar fractions - - Unicode 1.1 added thirds, fifths, sixths and eights; - we might as well catch up. - - (Unicode and ISO 10646 have 1/7 (U2150), 1/9 (U2151), 1/10 (U2152) - and 0/3 (U2189) in their pipelines, but those four can be added - here after they are published.) - -commit a788792e9de95f8db0639557859722a35087481d -Author: James Cloos <cloos@jhcloos.com> -Date: Wed Aug 20 15:28:07 2008 -0400 - - nls (en_US) Re-remove long compositions that override shorter - - As reported in <https://bugs.freedesktop.org/show_bug.cgi?id=17228>: - - Commit a6f4bbf7 - nls (en_US): remove long compositions that override shorter [...] - removed some longer compose sequences because there are shorter - ones which take preference over the longer. For example the - sequences: - - <Multi_key> <apostrophe> <comma> <c> : U1E09 # ḉ - <Multi_key> <apostrophe> <comma> <C> : U1E08 # Ḉ - - were removed becase there already was: - - <Multi_key> <apostrophe> <comma> : U201A # ‚ - - Then commit 4ba09125 - Work on making the en_US and pt_BR UTF-8 Compose as similar as - possible added exactly the same key sequences again. Obviusly - they won't work. - -commit 55248e5c84c3fd8c349a3bb4cb15a1ec86989d74 -Author: James Cloos <cloos@jhcloos.com> -Date: Thu Jul 17 21:01:42 2008 -0400 - - Add more <Multi_key> <cedilla> Compose tuples - - The last commit missed the el_GR UTF-8 Compose.pre as well as - the various ISO 8859 locales which have compose sequences - generating ‘WITH CEDILLA’ characters. - - (Interestingly, some of the 8859 locales already supported - <Multi_key> <cedilla> for some CEDILLA characters, but not - for Ç or ç.) - - This is further work on bug 10397. - -commit 4ba091255bb953d53078ba5619d6751052c739f7 -Author: James Cloos <cloos@jhcloos.com> -Date: Thu Jul 17 17:16:50 2008 -0400 - - Work on making the en_US and pt_BR UTF-8 Compose as similar as possible. - - The eventual goal here is to have a single primary UTF-8 Compose - file which the locale-specific UTF-8 Compose.pre files can #include. - -commit 254522d3c24e0590732fc03cdd61ff4564819d94 -Author: James Cloos <cloos@jhcloos.com> -Date: Thu Jul 17 17:13:36 2008 -0400 - - Add <Multi_key> <cedilla> Compose tuples - - The en_US and pt_BR UTF-8 Compose tables had support for using <comma> - with <Multi_key> to enter CEDILLA characters. Bug 10397 requests - support for using <cedilla> instead of <comma> in said sequences. - - This commit makes both styles work. - -commit 7dc907f6032e1d5cbe4da0e414bdf2c569c04b44 -Author: James Cloos <cloos@jhcloos.com> -Date: Sat Jun 28 15:25:23 2008 -0400 - - Fix commit 21e464ec682ab23ba20ddf6bd72c6db214cfbe01 - - The new block was added twice to the en_US.UTF-8 Compose.pre; - delete the duplicate. - -commit 596e081b7457dcd1c4ad555ac140e6999239bc0d -Author: Peter Hutterer <peter@cs.unisa.edu.au> -Date: Sat Jun 28 20:14:05 2008 +0930 - - Fix unbalanced parenthesis in XKBlib.h # 16551 - - X.Org Bug 16551 <http://bugs.freedesktop.org/show_bug.cgi?id=16551> - -commit f6af6dd2f76c12b56ec166bb771457b9f08fe246 -Author: Adam Jackson <ajax@redhat.com> -Date: Tue Jun 24 13:16:53 2008 -0400 - - Bug #14898: Don't abuse the sprintf() implementation. - - The thing you're printing into should not itself appear in the list of - things to print from, that's bad juju. Just use strcat(). - -commit 21e464ec682ab23ba20ddf6bd72c6db214cfbe01 -Author: Khaled Hosny <khaledhosny@eglug.org> -Date: Thu Jun 19 18:26:11 2008 -0400 - - NLS: Add Arabic Lam-Alef ligature compose sequences (bug #16426) - - Add some Arabic digraphs to utf-8 locales with a Compose.pre - - Signed-off-by: James Cloos <cloos@jhcloos.com> - -commit bf53987eaf0fbd7f7627783fc39e7ee99e8361ba -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Wed Jun 18 20:00:25 2008 -0700 - - Rework code to choose local connection types and fallback to others - - Adds --with-local-transport-order configure flag if you don't like the - default ordering (which is platform dependent) - - Includes fixes for these Sun/Solaris bug ids: - 6678250 X Commands returning incorrect display value unix:0.0 not <system>:0.0 - <http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6678250> - 6716481 libX11 should prefer Unix domain sockets over named pipes on Solaris - <http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6716481> - -commit cf49e537014c3cb5aaee07e57400933e0bb72b6b -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Tue Jun 17 14:41:17 2008 -0700 - - Strip whitespace from end of lines in source files - -commit f76fd81dfbbd5cfae75c87ce0511e88e08529cf3 -Author: Jeff Smith <whydoubt@yahoo.com> -Date: Sun Jun 15 23:52:20 2008 -0500 - - Fix memory leak in XOpenDisplay - - Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au> - -commit fca0b0ba3f72b7284601d4690bba99fc80a92614 -Author: Jens Herden <jens@khmeros.info> -Date: Tue Jun 10 20:07:30 2008 +0300 - - NLS: Add Khmer compose sequences (bug #5706) - - Add some Khmer digraphs to all locales with a Compose.pre. - -commit e54cffb649b1622c17457e470cfab8cc56d38c97 -Merge: 19802cc... 721b574... -Author: Daniel Stone <daniel@fooishbar.org> -Date: Tue Jun 10 20:04:30 2008 +0300 - - Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/lib/libX11 - -commit 721b574d36f1884c3f1bf7bd933646e2ed6680b5 -Author: Peter Hutterer <peter@cs.unisa.edu.au> -Date: Thu May 29 10:57:21 2008 +0930 - - Bump to 1.1.99.1 - -commit 631d32d13247d1cf52c0833d438c5b38b01b17a4 -Author: Peter Hutterer <peter@cs.unisa.edu.au> -Date: Wed May 28 17:31:59 2008 +0930 - - Require xproto 7.0.13 and libxcb 1.1.90 (for GenericEvents) - -commit e9195db7257e418f83707233baeeb84b225caf4f -Merge: c34f76f... a7f8556... -Author: Peter Hutterer <peter@cs.unisa.edu.au> -Date: Thu May 22 12:14:28 2008 +0930 - - Merge branch 'master' into xge - -commit 19802ccd3909145e3ba2f6c073271cb5f3701685 -Author: Daniel Stone <daniel@fooishbar.org> -Date: Mon May 19 19:22:31 2008 +0300 - - gitignore: Update with loads more bits from server - -commit a7f85567a3e850fba0c44571453d2852ab1a09be -Author: Adam Jackson <ajax@redhat.com> -Date: Tue May 13 10:28:39 2008 -0400 - - Bug #15884: Remove useless sleep()'s from the connection code. - - For network transports, there's enough delay in the network layer - already without adding more. For local transports, just hurry up - and fail if the server isn't there. - -commit c34f76f475bc632490122e67b5a82575d69d5569 -Author: Peter Hutterer <peter@cs.unisa.edu.au> -Date: Mon May 12 21:46:24 2008 +0930 - - Pull down extra bytes when reading a GenericEvent (non-xcb). - - I refuse to take any responsibily for this code. It works, I guess. - But - all the flushing is done somewhere before that, so we might need to - flush here. Under some circumstances anyway. Don't ask me, I'm an optical - illusion. - - Build with xcb as transport layer highly recommended. - -commit c9b2ff1e6a607463993afa4a8d085857d97cc2f3 -Merge: 17d7dcb... 9129057... -Author: Peter Hutterer <peter@cs.unisa.edu.au> -Date: Mon May 12 17:58:37 2008 +0930 - - Merge branch 'master' into xge - -commit 9129057bdbff0ec9cd8bb780cf7f85f134a291eb -Author: Teemu Likonen <tlikonen@iki.fi> -Date: Wed May 7 21:44:22 2008 +0300 - - Change <dead_belowdot> to <dead_belowring> for U+1E00 and U+U1E01 - - Commit 6b6caeea830a977bdb54688cfb648d879821e752 added <dead_belowdot> - <A> and <dead_belowdot> <a> compose sequences for letters U+1E00 and - U+U1E01 (LATIN CAPITAL/SMALL LETTER A WITH RING BELOW). This caused - duplicate compose sequences since these have already been defined. Also, - using <dead_belowring> is more logical since the diacritic is indeed - a "RING BELOW". - -commit 01a9cb58888d290cc3d319feec4ee4a0297a844c -Author: Daniel Stone <daniel@fooishbar.org> -Date: Wed May 7 20:04:44 2008 +0300 - - NLS: Make UTF-8 the default for Russian - - No-one uses 8859-5 anymore, so make the default for Russian UTF-8; the - only other possible answer would be KOI8-R. - - Signed-off-by: Sergey V. Udaltsov <sergey.udaltsov@gmail.com> - -commit 407b81bfbbabf6feb565d6da22f9ef9a69016ab8 -Author: Ross Burton <ross@burtonini.com> -Date: Tue Apr 29 13:38:10 2008 +0300 - - NLS: Add interrobang to UTF-8 compose tables (bug #15653) - - It is what it says on the box. - -commit 0b6682303e9c61fefc3818acfda616b1e3691abf -Author: Theppitak Karoonboonyanan <thep@linux.thai.net> -Date: Mon Apr 28 11:51:25 2008 +0300 - - IM: Respect XMODIFIERS for Thai locale (bug #15719) - - When looking at Thai input methods, make sure XMODIFIERS is checked - before jumping straight into built-in Thai processing, so external XIM - servers such as SCIM can be used with Thai. - -commit c13aded1b2f830ba5004abb0ec5518f9ea16087e -Author: Colin Harrison <colin.harrison-at-virgin.net> -Date: Sat Apr 26 18:56:05 2008 +0100 - - Fix missing error condition - -commit f5c5ffc175cb383c92ea0fa8c08cfb087c5f3083 -Author: Colin Harrison <colin.harrison-at-virgin.net> -Date: Mon Apr 21 17:24:33 2008 +0100 - - Xlib warning fixes - -commit 6b6caeea830a977bdb54688cfb648d879821e752 -Author: James Cloos <cloos@jhcloos.com> -Date: Fri Apr 18 02:50:55 2008 -0400 - - Add some dead_key sequences to en_US.UTF-8 Compose table - - Make use of the new dead key symbols added to x11proto’s - commit 44e24a27bca023cf7b799f191fe6d52e12efbe5f (which - was in responce to bug #15446). - -commit 8f9b039580deaf658e464b7d6254064fcf183df6 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Mon Apr 14 19:09:42 2008 -0700 - - Update ac_define_dir macro in acinclude.m4 to 2008-04-12 version - -commit 9f5e96eb91ab55dd441c3e94b75caf48c588778f -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Mon Apr 14 18:21:14 2008 -0700 - - Fix mismatched brace indenting - -commit a19f9c65ee9e5e5d783feaa84998c36439b0288b -Author: Bart Massey <bart@cs.pdx.edu> -Date: Fri Apr 4 18:58:45 2008 -0700 - - added error check in Xcms color file parser; closes bug #15305 - -commit 12e8d0d01dd72ce98e7683ddb1bde181b7ed246f -Author: Christian Weisgerber <naddy@mips.inka.de> -Date: Tue Mar 18 07:30:05 2008 +0100 - - ConnDis: properly cast 'addr' before accessing it as a byte array. - - If you use XDM-AUTHORIZATION-1 authorization keys for remote X11 - clients over IPv6, the clients are liable to segfaults. - -commit 64325f38bab082a8e0e9ce779a8e582de5c8588e -Author: Josh Triplett <josh@freedesktop.org> -Date: Sat Mar 15 12:29:33 2008 -0700 - - Fix fd.o bug 15023: make Xlib sync correctly given many void requests - - If given many requests without replies, Xlib may not sync until it flushes - the output buffer. Thus, if Xlib can fit enough requests in the buffer to - pass by the number of requests it would normally sync after (65536 - - BUFSIZE/sizeof(xReq)), it will sync too late. The test case in bug 15023 - demonstrated this by issuing a request with a reply (ListExtensions) at - just the right time to get confused with the GetInputFocus reply issued in - response to the sync 65,536 requests later; the test case used an async - handler to watch the replies, since otherwise it could not issue a request - without waiting for the response. When the test case failed, Xlib's sync - handler would eat the ListExtensions reply, and the test case's async - handler would see the GetInputFocus reply. - - Fix this by replacing SEQLIMIT with a function sync_hazard() that uses the - buffer size to figure out when the sequence numbers could potentially wrap - before the next flush. - - With this commit, the test case consistently passed, and the async reply - handler always saw the ListExtensions reply. - - Commit by Jamey Sharp and Josh Triplett. - -commit a5395563bbee15fabe1e8fd7aa86f9f314d8d30e -Author: Colin Harrison <colin.harrison@virgin.net> -Date: Sat Mar 15 13:39:13 2008 -0400 - - Fix typo - - Signed-off-by: James Cloos <cloos@jhcloos.com> - -commit f07585ca27a8487bc66dfe41486c823f0fdcea7d -Author: Daniel Stone <daniel@fooishbar.org> -Date: Sat Mar 15 17:32:57 2008 +0200 - - configure.ac: Don't search for legacy X11 headers - - This can actually break cross-compiles, so don't do it anymore. - -commit bf69541238c7df6606340c0f389e5c47149b29c7 -Author: Matthieu Herrb <matthieu.herrb@laas.fr> -Date: Sun Mar 9 09:08:07 2008 +0100 - - nuke RCS Ids - -commit 5e98aed13e529638df744e45893c471d5f2014fb -Author: Adam Jackson <ajax@redhat.com> -Date: Thu Mar 6 16:10:33 2008 -0500 - - libX11 1.1.4 - -commit 8e085971dc661da9f80ff6b67747459c0fb15c08 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Thu Feb 28 20:17:41 2008 -0800 - - Man page typo fixes - -commit 1a1a42a3ca1dfaf42f1094936b71c140fc030fcb -Author: Søren Sandmann Pedersen <sandmann@redhat.com> -Date: Sun Feb 24 20:03:35 2008 -0500 - - XIM: Fix a hand when switching input context. - - Red Hat bug #201284. - -commit e02e4ccafcaf3eb8993152dfcbfbee0240ea2db2 -Author: Adam Jackson <ajax@redhat.com> -Date: Sun Feb 24 20:00:43 2008 -0500 - - Bug #14029: Don't LockDisplay() recursively. - - See also Red Hat bugzilla #326461. - -commit e5892467ae3308c8651be76e06db322dcbc08522 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Fri Feb 15 17:27:53 2008 -0800 - - Add support for building lint library with --enable-lint-library - -commit e3eb83ec6a9bffa63cdffd94f077c12f85ad7240 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Mon Feb 11 20:11:43 2008 -0800 - - Spell out number in XkbGetKeyVirtualModMap man page to avoid cpp errors from # - -commit d5ceed7a73a6b61758ddb6ff4e194955fbd5c185 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Fri Feb 8 16:46:46 2008 -0800 - - Add WM_LOCALE_NAME to list of properties set in XSetWMProperties comment - -commit 416a812200f24d19149dcc497e5c51a0608120f6 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Fri Feb 8 15:31:31 2008 -0800 - - XErrorDB updates for Render 0.9 & XFixes 4.0 - -commit 16a76091cd632e5a3708e235ff864b58f3e4613e -Author: Kim Woelders <kim@woelders.dk> -Date: Sat Dec 22 21:45:23 2007 +0100 - - Fix bs_BA entries in locale.dir.pre - - X.Org bug#13786 <http://bugs.freedesktop.org/show_bug.cgi?id=13786> - -commit 32115c563b87d2f37e3f9de70fbd0f4d9e424aea -Merge: 8f0bd3f... e8d4cef... -Author: James Cloos <cloos@jhcloos.com> -Date: Fri Dec 14 22:43:47 2007 -0500 - - Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/lib/libX11 - -commit 8f0bd3f445cbdcc67650f6e8e3baf2ed89cb3695 -Author: James Cloos <cloos@jhcloos.com> -Date: Fri Dec 14 22:42:59 2007 -0500 - - add a comment to en_US.UTF-8/Compose - -commit 4d6c45e60ed13d3b0fea10413873d6a74f9d6a3b -Author: James Cloos <cloos@jhcloos.com> -Date: Fri Dec 14 22:40:13 2007 -0500 - - Add <dead_stroke> compose sequences - - The added sequences match the existing <Multi_key> <slash> sequences. - - This is related to bug #12765¹. - - 1] https://bugs.freedesktop.org/show_bug.cgi?id=12765 - -commit e8d4cefa0837afa149a10e981528b368485a9e38 -Author: Jeremy Huddleston <jeremy@yuffie.local> -Date: Mon Dec 10 23:00:44 2007 -0800 - - Added launchd support. - -commit 17d7dcbfced4a9417b33507bd3fd9b7dd8268242 -Merge: 5dfefd3... 13ac804... -Author: Peter Hutterer <peter@cs.unisa.edu.au> -Date: Thu Dec 6 14:08:29 2007 +1030 - - Merge branch 'master' into xge - -commit 5dfefd3829d3ba7e41d5db0ad28e9dfee92fadd5 -Merge: a68a1cd... eff33ae... -Author: Peter Hutterer <peter@cs.unisa.edu.au> -Date: Thu Dec 6 13:57:09 2007 +1030 - - Merge branch 'master' into xge - - Conflicts: - - src/xcb_io.c - -commit 13ac80469f6958cabac596834e203bd9cb6d4c94 -Author: James Cloos <cloos@jhcloos.com> -Date: Wed Dec 5 20:14:03 2007 -0500 - - Update the currency symbols block of en_US.UTF-8/Compose.pre - Add XCOMM lines a la the existing NEW SHEQEL SIGN entry for - the KIP, TUGRIK, DRACHMA. GERMAN PENNY, PESO, GUARANI, - AUSTRAL, HRYVNIA and CEDI SIGNs. - -commit b0a8f2ec4ba698841683f8ce389f9d72e6bce53e -Author: Anton Zinoviev <anton@lml.bas.bg> -Date: Wed Dec 5 19:56:03 2007 -0500 - - Additions to the Compose file for UTF-8 - From bug #5371¹ - - Commit 5cf5bc76642bfece7cb5b76faf414bf445f14489 left out this change - from those in attachment #4122². The post³ on xorg resulted in only - a positive reply⁴ from Daniel, so this block is now also commited. - - 1] https://bugs.freedesktop.org/show_bug.cgi?id=5371 - 2] https://bugs.freedesktop.org/attachment.cgi?id=4122 - 3] http://article.gmane.org/gmane.comp.freedesktop.xorg/20628 - 4] http://article.gmane.org/gmane.comp.freedesktop.xorg/23966 - - Signed-off-by: James Cloos <cloos@jhcloos.com> - Acked-by: Daniel Stone <daniel@fooishbar.org> - -commit 438d02ebc08ee171cf1d3936f4c81050d428ab92 -Author: James Cloos <cloos@jhcloos.com> -Date: Tue Dec 4 17:25:39 2007 -0500 - - Fix the <U\x+> keysyms in the en_US.UTF-8 Compose file - - Based on src/KeysymStr.c and src/StrKeysym.c and comments in - bugs #11930¹ and #5129² it is clear that <U100XXXXX> is invalid; - those should be in the form U plus the hex of the UCS Code Point. - - The 0x01000000 is ORed in by the code. - - This update fixes all of those. - - 1] https://bugs.freedesktop.org/show_bug.cgi?id=11930 - 2] https://bugs.freedesktop.org/show_bug.cgi?id=5129 - -commit 02e04059c89e175f51647e3b031344f743286b34 -Merge: 1254c57... b57129e... -Author: James Cloos <cloos@jhcloos.com> -Date: Tue Dec 4 06:55:04 2007 -0500 - - Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/lib/libX11 - -commit 1254c57dd3a8d6ea87041b2f63024f99094f290f -Author: James Cloos <cloos@jhcloos.com> -Date: Tue Dec 4 06:53:55 2007 -0500 - - Use the new dead_psili and dead_dasia keysyms added to proto/x11proto 7.0.11 - Inspired by bug 11930¹: - - Commit 40ed4eef92e31fcf7ea0a436e1a00cdf49484c1b to x11proto added dead_psili - and dead_dasia keysyms. Make use of them in the en_US.UTF-8 and el_GR.UTF-8 - Compose files. - - This was done with a pair of perl scripts based on the one quoted in the - log for commit c76d30253f1483ac8200ad5c032a818907e65030. - - 1] https://bugs.freedesktop.org/show_bug.cgi?id=11930 - -commit b57129ef324c73ee91c2a796b800c4b45f4d4855 -Author: Jeremy Huddleston <jeremy@yuffie.local> -Date: Mon Dec 3 20:04:19 2007 -0800 - - Use __APPLE__ instead of __DARWIN__ - -commit b9c032e1d5ed08510863dfb91b8bda588e6c8c9e -Author: Jeremy Huddleston <jeremy@yuffie.local> -Date: Wed Nov 28 16:43:49 2007 -0800 - - Define __DARWIN__ when host_os == darwin* as needed in SetLocale.c - -commit 4b91ed099554626f1ec17d5bdf7bd77ce1a70037 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Wed Nov 21 16:50:04 2007 -0800 - - X.Org Bug #4312: incorrect comment asterisk in XAnyEvent.3x man page - - X.Org Bugzilla #4312 <http://bugs.freedesktop.org/show_bug.cgi?id=4312> - - Protect /* sequences from cpp pre-processor removal without transforming - to Unicode mathematical asterisk character - -commit 2af660c2fcd15c86c66459bfc074c190ea1462e6 -Author: Jamey Sharp <jamey@minilop.net> -Date: Mon Oct 29 10:46:20 2007 -0700 - - Two threads can request sequence sync and XID fetch simultaneously. - - So don't assert that they can't. - - This makes the Xlib/XCB implementation of _XAllocID more closely - resemble the traditional Xlib version. - -commit 6e5485e0a5e3ab738becad12193e760c5fee83a4 -Author: Samuel Thibault <samuel.thibault@ens-lyon.org> -Date: Sun Oct 28 04:44:00 2007 -0800 - - X.Org Bug #12983: Typos in ./man/XChangeKeyboardControl.man - - <http://bugs.freedesktop.org/show_bug.cgi?id=12983> - -commit 24527c92fd1f433ea135e85ec876a94a529fe500 -Author: Yann Droneaud <ydroneaud@mandriva.com> -Date: Wed Oct 24 19:26:07 2007 +0300 - - XIM: Properly initialise client event - - Make sure all ClientMessage fields are initialised to 0 before we send it. - -commit e41477f37b0d9b74a056d22dbf0073a94eecb9d6 -Author: Daniel Stone <daniel@fooishbar.org> -Date: Wed Oct 24 19:22:22 2007 +0300 - - Colours: Fix --disable-xcms - - Disable large tracts of colour management code when passing - --disable-xcms. - -commit 11ea09745efa8de7dc82fe30ebd2393f08390957 -Author: Eric Anholt <eric@anholt.net> -Date: Fri Aug 31 17:30:33 2007 -0700 - - Bug #2081: Note the range limitation of XSetScreenSaver arguments. - -commit 31540f1438ec63faf37044f2fd654b335ddf80f0 -Author: Kristian Høgsberg <krh@redhat.com> -Date: Wed Aug 29 19:50:57 2007 -0400 - - Add GLX 1.4 requests and errors. - -commit 7c996f78914c77fe17e9f4feede980d895d9df51 -Author: Eric Anholt <eric@anholt.net> -Date: Tue Aug 28 15:15:11 2007 -0700 - - Add XF86 keyboard/monitor brightness keysyms to the keysymbdb. - -commit fa4effe82759f864a22a2dc6c920fa72ddb175a8 -Author: Eric S. Raymond <esr@thyrsus.com> -Date: Sun Jan 14 10:48:00 2007 -0800 - - Bug #9658: Bad markup on XIfEvent.3x - - X.Org Bugzilla #9658 <https://bugs.freedesktop.org/show_bug.cgi?id=9658> - -commit 74cba78daa738ef4d92096107d95c1a585933666 -Author: Eric S. Raymond <esr@thyrsus.com> -Date: Sun Jan 14 10:43:00 2007 -0800 - - Bug #9655: Bad markup in XrmUniqueQuark.3x - - X.Org Bugzilla #9655 <https://bugs.freedesktop.org/show_bug.cgi?id=9655> - -commit 4341d1a34b2a2e460b58131b6fd81935f3355bbc -Author: Eric S. Raymond <esr@thyrsus.com> -Date: Sun Jan 14 10:43:00 2007 -0800 - - Bug #9654: Bad markup in XrmGetFileDatabase.3x - - X.Org Bugzilla #9654 <https://bugs.freedesktop.org/show_bug.cgi?id=9654> - -commit 2db713252090cae08f0200fecad4fc25fb64c8b1 -Author: Eric S. Raymond <esr@thyrsus.com> -Date: Sun Jan 14 10:40:00 2007 -0800 - - Bug #9653: Bad markup in XQueryColor.3x - - X.Org Bugzilla #9653 <https://bugs.freedesktop.org/show_bug.cgi?id=9653> - -commit 9d3ceea4b902e0471824c1e07ad64342b9a1114e -Author: Eric S. Raymond <esr@thyrsus.com> -Date: Sun Jan 14 10:40:00 2007 -0800 - - Bug #9652: Bad markup in XDrawArc.3x - - X.Org Bugzilla #9652 <https://bugs.freedesktop.org/show_bug.cgi?id=9652> - -commit 2e7e0748d353d7f53bbd65ec6bf0df8758528ddc -Author: Eric S. Raymond <esr@thyrsus.com> -Date: Sun Jan 14 10:39:00 2007 -0800 - - Bug #9651: Bad markup in XcmsColor.3x - - X.Org Bugzilla #9651 <https://bugs.freedesktop.org/show_bug.cgi?id=9651> - -commit c316aaf0aab06951db9dc5c9c1148bfea835d885 -Author: Eric S. Raymond <esr@thyrsus.com> -Date: Sun Jan 14 10:38:00 2007 -0800 - - Bug #9650: Bad markup in XLoadFont.3x manual page - - X.Org Bugzilla #9650 <https://bugs.freedesktop.org/show_bug.cgi?id=9650> - -commit ca5d9a625ea0965853fa9e74a448b8c29c78ec95 -Author: Eric S. Raymond <esr@thyrsus.com> -Date: Tue Jan 2 10:18:00 2007 -0800 - - Bug 9523: Markup problems in XQueryExtension.3x - - X.Org Bugzilla #9523 <https://bugs.freedesktop.org/show_bug.cgi?id=9523> - -commit fe713c616e29ba19c179b43c18eca1035079ce18 -Author: Ian Romanick <idr@us.ibm.com> -Date: Tue Aug 21 14:56:33 2007 -0700 - - Make sure nls/am_ET.UTF-8/Makefile is created by configure. - -commit e3430616f26b68e1439143cbe10732f3fc329d20 -Author: Eric S. Raymond <esr@thyrsus.com> -Date: Tue Jan 2 08:40:00 2007 -0800 - - Bug #9516: Markup error in XAllocWMHints.3x - - X.Org Bugzilla #9516 <https://bugs.freedesktop.org/show_bug.cgi?id=9516> - -commit d8fe979fc929833e8c754aed32641786d5a0622b -Merge: 21ca953... 4ec1723... -Author: James Cloos <cloos@jhcloos.com> -Date: Mon Aug 20 15:34:50 2007 -0400 - - Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/lib/libX11 - -commit 21ca953337fb221b85345bf35ce1a98a0dcb2bf2 -Author: James Cloos <cloos@jhcloos.com> -Date: Mon Aug 20 15:34:03 2007 -0400 - - Fix typo - The code <U1000000D> was used where <U10000DC> was obviously intended. - - It is possible that <Udiaeresis> should be used instead, if that will - not break anyone’s setup. - -commit 4ec1723fff729440cd3349c1f95d87d2a6ba89cf -Author: James Cloos <cloos@jhcloos.com> -Date: Mon Aug 20 15:25:48 2007 -0400 - - Add compose file for Ethiopic to match new keyboard in xkeyboard-config - From bug report: - - https://bugs.freedesktop.org/show_bug.cgi?id=11307 - -commit eff33ae525337ce2026be135a26464c7b1237113 -Author: James Cloos <cloos@jhcloos.com> -Date: Sat Aug 18 17:58:23 2007 -0400 - - Patch for Catalan locales - From bugzilla bug 10943¹: - - There are several Catalan locale codes which presently can - be used in X11 systems; especially after they were accepted - in belocs-locale-data². - - In the following patches, I³ add ca_AD, ca_FR and ca_IT Catalan - locale codes. For instance, without this, using ca_AD (actually - a quite used locale⁴) some applications (eg. Emacs or Skype) - cannot display Catalan diacritic marks as you type them. - - 1] https://bugs.freedesktop.org/show_bug.cgi?id=10943 - 2] http://lists.debian.org/debian-devel-changes/2005/07/msg01429.html - 3] Toni Hermoso Pulido <toniher@softcatala.org> - 4] https://launchpad.net/~ubuntu.cat/+members - -commit 1f980cb7d022f53d0aee9e793b08203fb888e86e -Author: James Cloos <cloos@jhcloos.com> -Date: Sat Aug 18 17:47:04 2007 -0400 - - Add additional Euro signs to compose - Inspired by bug 7419¹ make all of: - - C=, =C, c=, =c, E=, =E, e=, E= - - after <Multi_key> generate € U+20AC EURO SIGN. - - 1] https://bugs.freedesktop.org/show_bug.cgi?id=7419 - -commit 4b0a14521449dfce8b4347bd17243efd1d3eae2d -Author: James Cloos <cloos@jhcloos.com> -Date: Sat Aug 18 17:29:08 2007 -0400 - - Compose fix for Latin-1 (from Debian) - The description from bugzilla bug 7417¹ is: - - We've been shipping this patch for some time in Debian now. The - problem description from the patch header is reproduced below. You - may want to note the licensing issue mentioned below, but we've been - shipping it because the method by which this particular patch was - generated and updated was also given below. - - This patch by Denis Barbier. - - The X11 protocol states that Unicode keysyms are in the range - 0x01000100 - 0x0110FFFF. If the result of composing characters is a - Unicode codepoint, X returns the corresponding Unicode keysym, which - is its Unicode codepoint augmented by 0x01000000. Latin-1 - characters must not appear with their Unicode codepoints in compose - files, otherwise the returned composed character lies in the range - 0x01000000 - 0x010000FF which is not valid. - - There are two solutions: either fix composing routines to return - 0xZZ instead of 0x010000ZZ (where Z is an hexadecimal digit), or - replace U00ZZ by their corresponding keysyms in compose files. The - latter is more logical and less error prone, so compose files will - be patched. Many applications accept these invalid Unicode keysyms, - but few of them don't, most notably xemacs. Only UTF-8 locales are - affected. - - This has been fixed very recently in XFree86 CVS (but not xorg), but - for licensing reasons, this patch is not grabbed. Instead automatic - conversion is performed by: - - sed -e '/XK_LATIN1/,/XK_LATIN1/!d' /usr/include/X11/keysymdef.h \ - | grep -v deprecated | grep 0x0 \ - | sed -e 's/0x0/U0/' -e 's/XK_//' \ - | awk '{ printf "s/\\b%s\\b/%s/ig\n", $3, $2; }' > sedfile - for f in nls/*.UTF-8/Compose.pre - do - sed -f sedfile $f > $f.tmp && mv $f.tmp $f - done - - [I edited the quoted script to update it for the current location of - the installed keysymdef.h and the current layout of the libX11 - repo. -JimC] - - I applied the script, not the patch attached to the bugreport. - - 1] https://bugs.freedesktop.org/show_bug.cgi?id=7417 - -commit 5cf5bc76642bfece7cb5b76faf414bf445f14489 -Author: James Cloos <cloos@jhcloos.com> -Date: Sat Aug 18 17:13:41 2007 -0400 - - Add some compose sequences - - Add some compose sequences from the patch in bug 5371 (attachment 4122). - - Cf: - - https://bugs.freedesktop.org/show_bug.cgi?id=5371 - https://bugs.freedesktop.org/attachment.cgi?id=4122 - -commit d4002e389dd69780dfc7c2f7bd3cb0c57f05d4f8 -Author: James Cloos <cloos@jhcloos.com> -Date: Sat Aug 18 13:57:31 2007 -0400 - - Fix SMP Compose targets - The compose targets from the SMP (plane 1) were incorrect. - - At some point the 0x10000 bit had been lost. - -commit f1ed3da9a30a1f0264fdc7d1c6466f27fe2a3d7d -Author: Jeremy C. Reed <reed@glacier.reedmedia.net> -Date: Thu Aug 16 17:37:22 2007 -0500 - - Fix a mutex reference-counting bug. - - I was told that some systems have a much more permissive libpthread. - I was asked to commit this. This is from NetBSD's X source. - (I didn't receive any feedback on xorg list for over two weeks - about this.) - -commit ac00a44b4875de70382da5a40dd87f976e5b9327 -Author: Tilman Sauerbeck <tilman@code-monkey.de> -Date: Wed Aug 1 20:36:03 2007 +0200 - - Bumped version to 1.1.3. - -commit 76fae9cba1e9bdf7f0eb2ff2b90153d622136cf0 -Author: Joerg Sonnenberger <joerg@netbsd.org> -Date: Fri Jul 27 11:15:47 2007 -0700 - - Fail properly on errors in recursive make. - -commit 1a18319b3bde08dd9ef69c7cd735a76000cf3177 -Author: Brice Goglin <Brice.Goglin@ens-lyon.org> -Date: Thu Jul 26 23:31:15 2007 +0200 - - Add missing override parameter in XrmCombineDatabase prototype in the manpage - - Reported by Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr> - in http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=393434 - and https://bugs.freedesktop.org/show_bug.cgi?id=9948 - - Also add the type of the second argument in XrmMergeDatabases. - -commit 6f0764d4b56f64786b4980839ca262f10a51af6f -Author: Brice Goglin <Brice.Goglin@ens-lyon.org> -Date: Thu Jul 26 22:53:52 2007 +0200 - - Clarify return value of XGetCommand in case of error in the manpage - - Reported by Sean Perry <shalehperry@attbi.com> - in http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=133348 - and https://bugs.freedesktop.org/show_bug.cgi?id=9828 - -commit b8bef57342632cc2d25580bb7daa3839bae04d89 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Wed Jul 25 17:44:06 2007 -0700 - - Include comment/copyright/license for AC_DEFINE_DIR in acinclude.m4 - -commit 590cde811a79375231c59ed8583e02b111ed567c -Author: Kean Johnston <kean@armory.com> -Date: Thu Jul 19 16:44:20 2007 -0700 - - Reset hostname when falling back from :0 to hostname/localhost:0 as well - -commit d334665e619e9db657a2ea2764a8b852401d4a3f -Author: Kean Johnston <kean@armory.com> -Date: Tue Jul 17 16:34:30 2007 -0700 - - LOCALCONN fallback changes DisplayString() output, breaks KDE - - See <http://lists.freedesktop.org/archives/xorg/2007-July/026443.html> - -commit 8e76bcf3cafda85058ce5f35f1f81929f4772f72 -Author: Olivier Blin <blino@mandriva.org> -Date: Mon Jun 11 18:32:09 2007 +1000 - - fix XGetMotionEvents arguments order - Fixes bug 11222 - -commit c2f88cdf5cd9c94b77e5bfdac572b5ac06ab4aa8 -Author: Jamey Sharp <jamey@minilop.net> -Date: Sun Jun 10 16:19:59 2007 -0700 - - Fix locking in _XimGetWindowEventmask. - - Now that XFilterEvent drops the Display lock before invoking callback - functions, _XimGetWindowEventmask is called without the lock held. So - when it called _XGetWindowAttributes, a variant of XGetWindowAttributes - that does not lock the Display, Xlib/XCB would assert: - - xcb_xlib.c:50: xcb_xlib_unlock: Assertion `c->xlib.lock' failed. - - Should fix Gentoo #156367, Ubuntu #87947, Debian #427296. And others? - -commit 65f0ab5d46d80d55fc04d4eb14fa05f130eb8b9c -Author: Jamey Sharp <jamey@minilop.net> -Date: Sun Jun 3 21:41:47 2007 -0700 - - Move security fixes to the top of NEWS, and fix spacing. - - Commit by Josh Triplett and Jamey Sharp. - -commit a549a258b8fcb1ba9d0c1b01b72967e385f67cab -Author: Jamey Sharp <jamey@minilop.net> -Date: Sun Jun 3 21:29:40 2007 -0700 - - Add NEWS item for bugfix in commit e2c1d788d1fe7bd2d34756493951552441e59b8c. - - Commit by Josh Triplett and Jamey Sharp - -commit 5123b77a3d32d3ad479462f319762c328278aed9 -Author: Jamey Sharp <jamey@minilop.net> -Date: Sun Jun 3 21:24:54 2007 -0700 - - Xlib/XCB: Inline and simplify handle_event, since only process_responses calls it now. - - Commit by Josh Triplett and Jamey Sharp. - -commit 582ca690ea4f3ffd2b94826c4db97229bd3c7238 -Author: Jamey Sharp <jamey@minilop.net> -Date: Sun Jun 3 20:59:12 2007 -0700 - - Xlib/XCB: Fix _XReadEvents to always enqueue a new event, even if an error occurs - - Commit c337f9de7cfd89f983f83956b7457a274dd412f3 broke the invariant that - _XReadEvents always enqueues at least one event even if an error occurred, - because the one call to xcb_wait_for_event would then return an error, not an - event, and nothing else ensured that process_responses would obtain an event. - Fix this by reverting most of c337f9de7cfd89f983f83956b7457a274dd412f3 and - f417570735aac865eb6b576d1ea76b5bfcd8573b and implementing the correct fix. In - process_responses, wait_for_first_event now serves as a flag, cleared when - actually handling an event. - - Commit by Josh Triplett and Jamey Sharp. - -commit e2c1d788d1fe7bd2d34756493951552441e59b8c -Author: Jamey Sharp <jamey@minilop.net> -Date: Sun Jun 3 17:33:23 2007 -0700 - - Xlib/XCB: Only remove pending_requests when there are provably no more responses. - -commit 7a6dbd4b07ca0a49c30ca7a1d2437eafb2e15eab -Author: Josh Triplett <josh@freedesktop.org> -Date: Sun Jun 3 15:39:39 2007 -0700 - - Bump version number to 1.1.2, and add NEWS entry for 1.1.2 - - Signed-off-by: Josh Triplett <josh@freedesktop.org> - -commit 416f38f2e67ee1979b3d2feac6f06b3670238804 -Author: Josh Triplett <josh@freedesktop.org> -Date: Sun Jun 3 12:13:44 2007 -0700 - - Revert "Revert "include: don't distribute XlibConf.h"" - - This reverts commit 79fa3d8070d95b960ba486f2439225872471dadd. - - Re-revert the XlibConf.h change, which prevented distribution, not - installation. - -commit 79fa3d8070d95b960ba486f2439225872471dadd -Author: Josh Triplett <josh@freedesktop.org> -Date: Sat Jun 2 22:05:16 2007 -0700 - - Revert "include: don't distribute XlibConf.h" - - This reverts commit c9e28e05ae01ce8a29bea09df759b6271865b44c. - - The installed XlibInt.h includes XlibConf.h , so libX11 should ship - XlibConf.h. (Commit c9e28e05ae01ce8a29bea09df759b6271865b44c didn't actually - prevent automake from shipping XlibConf.h, because it used - nodist_x11include_HEADERS rather than nodist_HEADERS.) - -commit f417570735aac865eb6b576d1ea76b5bfcd8573b -Author: Jamey Sharp <jamey@minilop.net> -Date: Sat Jun 2 17:59:15 2007 -0700 - - Xlib/XCB: inline wait_or_poll_for_event, which now had only one caller. - - Commit by Josh Triplett and Jamey Sharp. - -commit c337f9de7cfd89f983f83956b7457a274dd412f3 -Author: Jamey Sharp <jamey@minilop.net> -Date: Sat Jun 2 17:46:41 2007 -0700 - - Xlib/XCB: Ensure _XReadEvents reads at least one new event and blocks for exactly one event. - - Commit by Jamey Sharp and Josh Triplett. - -commit 7f66c897f04806b75e574b55b48921b48045e3f9 -Author: Jamey Sharp <jamey@minilop.net> -Date: Sat Jun 2 16:43:39 2007 -0700 - - Update _XReply's copy of _XCBUnlockDisplay's guts. - - We introduced this bug in 6b81cbbedfb521ce046b77ee3cc54e884a1dc0c5. - - Also add a comment in _XCBUnlockDisplay to discourage this problem from - respawning. - - Commit by Josh Triplett and Jamey Sharp. - -commit 740ead23512f8d2eaafaa69e514f1ebafad475b9 -Author: Jamey Sharp <jamey@minilop.net> -Date: Sat Jun 2 16:01:01 2007 -0700 - - Xlib/XCB: Avoid re-crashing after _XIOError. - - Commit by Josh Triplett and Jamey Sharp. - -commit 6b81cbbedfb521ce046b77ee3cc54e884a1dc0c5 -Author: Jamey Sharp <jamey@minilop.net> -Date: Sat Jun 2 12:30:30 2007 -0700 - - Hold XCB's Xlib lock even when only the user lock (XLockDisplay) is held. - - An Xlib client can query Display state, such as with NextRequest, while - it holds only the Xlib user lock (between XLockDisplay and - XUnlockDisplay), so XCB requests in other threads should be blocked when - the Xlib user lock is held. - - We acquire the lock even when XInitThreads was not called, so that pure - XCB code can use multiple threads even in an otherwise single-threaded - Xlib application. - - Commit by Josh Triplett and Jamey Sharp. - -commit 95523387d619af5b400748898d722e080b5ce1a6 -Author: Jamey Sharp <jamey@minilop.net> -Date: Sat Jun 2 11:57:39 2007 -0700 - - Allow re-entrant Xlib calls from _XIOError. - - Some libraries try to clean up X resources from atexit handlers, _fini, - or C++ destructors. To make these work, the Display lock should be - downgraded to a user lock (as in XLockDisplay) before calling exit(3). - This blocks Xlib calls from threads other than the one calling exit(3) - while still allowing the exit handlers to call Xlib. - - This assumes that the thread calling exit will call any atexit handlers. - If this does not hold, then an alternate solution would involve - registering an atexit handler to take over the lock, which would only - assume that the same thread calls all the atexit handlers. - - Commit by Josh Triplett and Jamey Sharp. - -commit 91b02b8064f4e0bcc56019f0722914850008a597 -Author: Tilman Sauerbeck <tilman@code-monkey.de> -Date: Thu May 17 19:07:34 2007 +0200 - - More constification. - -commit a4f3841940158351f9424c3f59b305cce877177d -Author: Tilman Sauerbeck <tilman@code-monkey.de> -Date: Thu May 17 00:29:43 2007 +0200 - - Constified composite text charset table. - -commit 0581c0aa6039e6b2abb9f7b0a4f9904d8e01f00e -Author: Tilman Sauerbeck <tilman@code-monkey.de> -Date: Wed May 16 23:19:22 2007 +0200 - - Have the compiler fill in hexTable so we don't have to do it at runtime. - -commit 0e8d9ca47dab0d069e305d5784d05f2ade04f0a8 -Author: Tilman Sauerbeck <tilman@code-monkey.de> -Date: Wed May 16 19:36:23 2007 +0200 - - More constification. - -commit 6d2bed8f04942b4de086a519ac693e729c9fdeea -Author: Tilman Sauerbeck <tilman@code-monkey.de> -Date: Wed May 16 19:18:20 2007 +0200 - - Constify and clean up token table. - -commit 6c508eab5df5d517f7e4cbe6087308cd53a564b2 -Author: Tilman Sauerbeck <tilman@code-monkey.de> -Date: Wed May 16 18:24:42 2007 +0200 - - Constified more tables. - -commit e699c4231c205ef00d687b6412308d031b99806b -Author: Tilman Sauerbeck <tilman@code-monkey.de> -Date: Wed May 16 18:01:23 2007 +0200 - - Constified error list. - -commit a68a1cd7cb990ba276fbc36a7591044d78b3d3c1 -Author: Peter Hutterer <peter@cs.unisa.edu.au> -Date: Tue May 15 16:54:01 2007 +0930 - - Add XGenericEvent definition and handling for long events. - -commit c76d30253f1483ac8200ad5c032a818907e65030 -Author: Jan Willem Stumpel <jstumpel@planet.nl> -Date: Fri May 4 12:00:49 2007 -0700 - - Update el_GR.UTF-8/Compose.pre to match changes in xkeyboard-config cvs - - Cf: - - https://bugs.freedesktop.org/show_bug.cgi?id=10851 - https://bugs.freedesktop.org/show_bug.cgi?id=10824 - http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=386385 - - The greek keyboard definition was changed to replace dead_horn and - dead_ogonek with U0313 COMBINING COMMA ABOVE (aka Psili) and U0314 - COMBINING REVERSED COMMA ABOVE (aka Dasia). - - This patch modifies the Greek Compose.pre to match. - - It is generated by the script Jan Willem Stumpel <jstumpel@planet.nl> - posted to 386385@bugs.debian.org: - - #!/usr/bin/perl - while (<>) { - print $_; - if (/dead_horn/) { - s/dead_horn/U0313/; - print $_; - } - elsif (/dead_ogonek/) { - s/dead_ogonek/U0314/; - print $_; - } - } - -commit a48386ce6b5f8fd2d9dc11a966c9bf5da59f3831 -Author: Magnus Kessler <Magnus.Kessler@gmx.net> -Date: Tue May 1 15:20:08 2007 +0200 - - Switched function definitions from K&R to ANSI style. - -commit 605d357074d556a05a3fba2e85cbea36a3204248 -Author: Tilman Sauerbeck <tilman@code-monkey.de> -Date: Tue May 1 14:47:03 2007 +0200 - - Tweaked configure output about the man pages suffix. - -commit 9824b40d2af4ca2376512c1be7743da0d5065900 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Sat Apr 28 00:42:18 2007 -0700 - - Fix typo in nroff macro in XkbAddGeomOverlayKey.man - -commit f93849dcc68bd5042ea0884e5190dc7c35b31d68 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Sat Apr 28 00:30:55 2007 -0700 - - Protect C comments and #defines in XKB man pages from being mangled by cpp - -commit f2f27d4763c7665e422fab10b96b4cf5ad6c0a6f -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Sat Apr 28 00:14:50 2007 -0700 - - Add Makefile to process/install XKB man pages - -commit d9954c6f6f3a8c406b946acd0d034ff83c656156 -Author: Dennis Arellano <Dennis.Arellano@Sun.COM> -Date: Thu Aug 19 00:00:00 1999 -0700 - - Add man pages for XKB API's - - Man pages originally written for X11R6.4 integration to Solaris 7 11/99 - Sun bug id 4258344: Add new XKB API manpages for 6.4 upgrade - <http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=4258344> - - (Volunteer needed to convert prototypes in man pages to ANSI C style...) - -commit f640a49b5e2ebf29f9d655df544c63bf826f619a -Author: Tilman Sauerbeck <tilman@code-monkey.de> -Date: Fri Apr 20 18:39:59 2007 +0200 - - Markup tweak for XOpenIM. - -commit e972b0bb255af4f3258217852542faf5afa60b28 -Author: Julien Cristau <jcristau@debian.org> -Date: Fri Apr 20 18:35:09 2007 +0200 - - Bug #9695: Fixed a few argument types in the XOpenIM manpage. - -commit b4e2276f329fa42397cb8609cfcd34ebafd3d96b -Author: Julien Cristau <jcristau@debian.org> -Date: Fri Apr 20 18:28:52 2007 +0200 - - Bug #9697: Fixed documentation of XVisualInfo struct. - - The "depth" member was said to be unsigned int, but it's signed. - -commit 4068f3dae01c630f825002673b1d3a047ad61863 -Author: Julien Cristau <jcristau@debian.org> -Date: Fri Apr 20 16:41:21 2007 +0200 - - Bug #9696: refer to XDefineCursor() instead of XDefineCusor(). - -commit 603c2f88d4e57ce1a3c16e8b6246866e6edd8fa8 -Author: Tilman Sauerbeck <tilman@code-monkey.de> -Date: Sat Apr 7 14:42:55 2007 +0200 - - Use unistd.h to get getresuid() and friends. - - This works since we now have _GNU_SOURCE defined. - -commit 0300f295bbd3a0c7c46baac8e0a27aeaf53c9d9b -Author: Tilman Sauerbeck <tilman@code-monkey.de> -Date: Sat Apr 7 14:27:12 2007 +0200 - - Bug #10562: Define _GNU_SOURCE on glibc systems. - -commit a225a0be48770beb689d5ac5da97073634f7deab -Author: Tilman Sauerbeck <tilman@code-monkey.de> -Date: Fri Apr 6 12:46:25 2007 +0200 - - For nls/*.pre, allow people to comment lines by starting them with '##'. - - This fixes a bunch of cpp warnings from nls/en_US.UTF-8/Compose.pre. - Fixing that file would have been a larger diff, and using ## may be - nicer to use anyway. - -commit 1c75a9479011e5f1ad01c950628d0ef5a302d8b6 -Author: Tilman Sauerbeck <tilman@code-monkey.de> -Date: Fri Apr 6 11:59:31 2007 +0200 - - Bug #10475: Fixed lots of char*/const char* mixups. - - I didn't fix all of them, as that would require touching - public headers. - -commit 680dd50193b5b3fcabdd3f1fcbd6a889d5a95c54 -Author: Matthias Hopf <mhopf@suse.de> -Date: Thu Apr 5 11:53:18 2007 +0200 - - Fix 64bit issues with reallocation. - -commit 4d38aeaca42d0bdfe34a833a142ee4d895de03bf -Author: Tilman Sauerbeck <tilman@code-monkey.de> -Date: Wed Apr 4 18:41:18 2007 +0200 - - Fixed a few warnings. - -commit 7dc7ef398b6ad90ccd1680ed9cd1cfdd47312f5a -Author: Matthieu Herrb <matthieu@roadrock.(none)> -Date: Tue Apr 3 15:39:52 2007 +0200 - - Multiple integer overflows in the XGetPixel() and XInitImage functions - - CVE-2007-1667 - -commit 0284b144340a455a4b5b5011d81ac5a610372291 -Author: David Baron <dbaron@dbaron.org> -Date: Fri Mar 30 17:07:46 2007 +0200 - - Bug #7703: Fixed XSetSizeHints() et al wrt use of uninitialized data. - - Now only those fields of the respective hint struct are set that - are actually valid in the input data. - The changed functions are: - XSetSizeHints(), XSetWMHints() and XSetWMSizeHints(). - -commit 0994faa0c76c45b106442db461b8a30a3e1c9395 -Author: Tilman Sauerbeck <tilman@code-monkey.de> -Date: Thu Mar 29 17:31:25 2007 +0200 - - Fixed the change from the previous SendEvent commit. - - Testing a different patch than the one you commit is bad, right? - -commit 398d75528a84f4b8414eb0e363cf53b1b16f6fdf -Author: Tilman Sauerbeck <tilman@code-monkey.de> -Date: Wed Mar 28 22:23:44 2007 +0200 - - Bug #10292: Fixed a memory leak related to XOpenDisplay() in the XCB code. - -commit ab0bcd07957cecc8e7c0e75d5160a625e91264fe -Author: David Baron <dbaron@dbaron.org> -Date: Wed Mar 28 22:21:40 2007 +0200 - - Bug #7713: Initialize all of the event's fields before sending it. - -commit bc80f9fe3ccce40ee41246b97470c4f0519756ad -Author: Julien Cristau <jcristau@debian.org> -Date: Sun Mar 18 13:14:48 2007 +0100 - - Bug #9279: Fixed a file descriptor leak. - -commit c9e28e05ae01ce8a29bea09df759b6271865b44c -Author: Daniel Stone <daniel@fooishbar.org> -Date: Sat Dec 16 00:45:19 2006 +0200 - - include: don't distribute XlibConf.h - - Since XlibConf.h is built by configure, don't distribute it. - -commit dd1705ced2cac6b4b6b21e79272fcf9bed4bf376 -Merge: 129bbb9... 769b985... -Author: Jeremy C. Reed <reed@glacier.reedmedia.net> -Date: Thu Dec 14 14:23:20 2006 -0600 - - Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/lib/libX11 - -commit 129bbb9f9114a571556fa3a24f15ba58a5cdb2de -Author: Jeremy C. Reed <reed@glacier.reedmedia.net> -Date: Thu Dec 14 14:21:19 2006 -0600 - - For NetBSD, define the XTHREADLIB and XTHREAD_CFLAGS. - -commit 769b9854f7eb1d6d20dd0b4a1c1215ad8e1b77b6 -Author: Daniel Stone <daniel@fooishbar.org> -Date: Wed Dec 6 18:53:00 2006 +0200 - - Makefile.am: make ChangeLog hook safer - - Make ChangeLog hook as safe as possible. - (cherry picked from f5d6a3d24095c7ffed86705995d0874c885e7676 commit) - -commit 8a8185a649e93b90ffa820387ffdca831227f5a9 -Author: Josh Triplett <josh@freedesktop.org> -Date: Thu Nov 30 18:33:13 2006 -0800 - - Add autogen.sh to EXTRA_DIST. - -commit efe817f95ef8d05e863c83147e903140bc860de4 -Author: Jamey Sharp <jamey@minilop.net> -Date: Thu Nov 30 17:58:35 2006 -0800 - - Release libX11 1.1.1. - -commit f637a5b03164263a3af2e644cf655e52b015f1bb -Author: Ross Combs <rocombs@cs.nmsu.edu> -Date: Sat Nov 25 14:45:17 2006 -0800 - - Debian bug #354315: Clarify return value in XGetWindowAttributes man page - - This man page does not discuss the actual return values of the - function, but says they are of type "Status". One might assume - that this means you could compare it with the "Success" macro. - One would be wrong. - - The X functions seem to have two three types representing status. - If it is an "int" there are a number of error codes or "Success" - which can be compared against. If it is a bool, the result can be - compared with "True" or "False". If the return type is "Status" it - appears that the return type is either 0 or 1. Unfortunately the - value for Success is zero, so it is important to distinguish - between the first two types of return values and the third; - otherwise the conditional will be inverted. - - XGetWindowAttributes() is one of the functions which returns zero - for failure. The man page should make this clear. - -commit c6a0b0f18ed1242eeb908f5cf767ab8381edd456 -Author: Jamey Sharp <jamey@minilop.net> -Date: Sat Nov 25 14:23:45 2006 -0800 - - Bug #9154: Always process an event for _XReadEvents, even if an error occurs - - Previously, process_responses (in the wait_for_first_event case called - from _XReadEvents) considered any return from xcb_wait_for_event - sufficient to think it had processed an event. If xcb_wait_for_event - returned an error, and no more events occurred before process_responses - called xcb_poll_for_event, process_responses would try to return with - dpy->head NULL, and would fail an assertion for the _XReadEvents - postcondition. Now, process_responses continues using xcb_wait_for_event - until it gets an event. - -commit d56e78acce9b2aa1dd1bf172afedaa3bccd5e1c8 -Author: Tilman Sauerbeck <tilman@code-monkey.de> -Date: Sat Nov 25 05:29:31 2006 -0800 - - Bug #9153: Fix access to freed memory. - - The fix for bug #8622 introduced a smaller bug where _XReply would - read memory shortly after freeing it. This patch caches the needed - value in a stack-allocated variable before the heap-allocated memory - is freed. - -commit 934ca763bbc0dd7ae460469bfc000ba101602bcc -Author: Josh Triplett <josh@freedesktop.org> -Date: Fri Nov 24 19:57:58 2006 -0800 - - libx11 doesn't use inputproto in public headers; don't require it in x11.pc - - Based on a Debian patch. - -commit 4255997ef2d92740d51f6e63e9eabcfa089683f0 -Author: Josh Triplett <josh@freedesktop.org> -Date: Thu Nov 23 07:19:32 2006 -0800 - - Release libX11 1.1 - -commit a1168e11ec9377307c51a7271faec3bf88a63a66 -Author: Jamey Sharp <jamey@minilop.net> -Date: Tue Nov 21 17:52:34 2006 -0800 - - Add note in man-page that XListFontsWithInfo is not thread-safe. - - _XReply drops the Display lock, so the value of dpy->request may change - before _XReply is called again. - - I discovered this by inspection a year or two ago. I'm pretty confident - in the claim, and nobody has come up with an argument for why it's safe - despite appearances. - -commit 67abe024268c6b1fdee516e5d3a046ccffd7e80a -Author: Jamey Sharp <jamey@minilop.net> -Date: Sat Nov 18 15:39:26 2006 -0800 - - Bug #8622: Fix response processing order for threaded apps - - Previously, process_responses (the common code for _XReply, - _XReadEvents, and _XEventsQueued) took the current request sequence - number as an argument, and did some highly complicated processing to - attempt to process responses in order across threads. This didn't - actually work. - - Now, process_responses handles responses in order, by adding condition - variables to the list of outstanding requests in - dpy->xcb->pending_requests, and blocking on them when those requests - should get processed to allow _XReply to process them; if actually - called from _XReply, it returns when _XReply's request should get - processed. _XReply broadcasts on the condition variable after it has - read its reply and re-acquired the display lock. - - Another great commit brought to you by Jamey Sharp, Josh Triplett, the - Gobby collaborative text editor, conspy, and ridiculous amounts of SSH - forwarding. - - Signed-off-by: Josh Triplett <josh@freedesktop.org> - Signed-off-by: Jamey Sharp <jamey@minilop.net> - -commit 941f02ede63baa46f93ed8abccebe76fb29c0789 -Author: Lars Knoll <lars@trolltech.com> -Date: Wed Nov 8 12:17:41 2006 -0800 - - Don't hold the display lock around callbacks to the application. - - This fixes an XCB locking assertion failure, particularly with emacs. - -commit e494ecaac1ec8a22bd9a85f800fca74d02e9d358 -Author: Diego 'Flameeyes' Pettenò <flameeyes@gentoo.org> -Date: Tue Nov 7 09:32:00 2006 -0800 - - Add xcb-xlib dependency to x11.pc when built against XCB. - -commit 2302008a3793eb4df8ede777d54fe06505c47eaf -Author: Eric Anholt <eric@anholt.net> -Date: Mon Nov 6 17:11:42 2006 -0800 - - XCB: Allocate the right amount of memory for dpy->lock_fns. - - Fixes a crash I was experiencing on startup of anything using gdk. - -commit 5f860655be88108b03ccd97470a0814819254bf0 -Author: Jamey Sharp <jamey@minilop.net> -Date: Thu Nov 2 17:55:31 2006 -0800 - - Release libX11 1.1 RC2 (1.0.99.2). - -commit a6f4bbf7b1d725b0f04bd660f57b861a76b19831 -Author: Benno Schulenberg <bensberg@justemail.net> -Date: Sun Oct 29 03:10:30 2006 +0300 - - nls (en_US): remove long compositions that override shorter (bug #2286) - Remove long compositions that override (or get overriden by) later shorter - compositions, e.g. a four-key compose sequence that gets overriden by a - later three-key compose sequence. - -commit 0280bf11ef88673a9b5bba3a91a599260f1f0949 -Author: Benno Schulenberg <bensberg@justemail.net> -Date: Sun Oct 29 03:08:36 2006 +0300 - - nls: remove shadowed compose entries (bug #2286) - Remove compose entries shadowed by others later on. - -commit d118f2b1ef10997194b281524177dea7396da7dd -Author: Benno Schulenberg <bensberg@justemail.net> -Date: Sun Oct 29 03:07:15 2006 +0300 - - nls: remove duplicate compose entries (bug #2286) - Remove a bunch of duplicate entries from various Compose files. - -commit 5e1cc2fe20e5904ca1e05a4cb7be13d450a593bb -Author: Caolan McNamara <caolanm@redhat.com> -Date: Sun Oct 29 02:46:15 2006 +0300 - - XKB geometry: fix leaks in GetKeyboardByName (bug #8099) - Don't leak the name and value of every property we parse, as well as the - name of every colour. - -commit 686bb8b35acf6cecae80fe89b2b5853f5816ce19 -Author: Matthias Hopf <mhopf@suse.de> -Date: Wed Oct 18 14:25:04 2006 +0200 - - Fix double open of compose file. - - Issue found by Kees Cook <kees@canonical.com>. - -commit d3e65cb8cddf08913d83c9df2bb9b1517f2ad3a8 -Author: Jamey Sharp <jamey@minilop.net> -Date: Sat Oct 14 21:25:10 2006 -0700 - - XCB: check for and handle I/O errors in _XGetXCBBuffer. - -commit 256eba6b40c5f811a03b04abf5f85f728ee3ab5d -Author: Jamey Sharp <jamey@minilop.net> -Date: Wed Oct 11 00:06:50 2006 -0700 - - XKB bugfix: SyncHandle must be called after UnlockDisplay, not before. - -commit 1eedf1bd033e496843cfde42ae4ae5a119298605 -Author: Jamey Sharp <jamey@minilop.net> -Date: Tue Oct 10 23:03:28 2006 -0700 - - Add correct Display locking to XKB functions. - - Some XKB functions didn't correctly call LockDisplay or UnlockDisplay. - This patch fixes at least some instances of that problem. - - Thanks to Magnus Kessler <Magnus.Kessler@gmx.net> for finding these bugs - and proposing a fix, which this patch is based on. - -commit e17c2cbe9fbaa1600d4b9463ec800a874b0d87cd -Author: David Nusinow <dnusinow@debian.org> -Date: Tue Oct 10 22:11:05 2006 -0400 - - Dynamically generate internal manpage section using __libmanpagesuffix__ so that it actually matches the section if you don't use 3X11 - -commit e53557da969b706dbc843f6fde3db31ffe382e0f -Author: Jamey Sharp <jamey@minilop.net> -Date: Sat Oct 7 21:00:36 2006 -0700 - - Release libX11 1.1 RC1 (1.0.99.1). - -commit bf237409c5fce32c557d298f62f44d456c2b5bc8 -Merge: ba47719... 2d426d1... -Author: Jamey Sharp <jamey@minilop.net> -Date: Sat Oct 7 21:07:16 2006 -0700 - - As XCB support is about to be released in libX11, stable is now subsumed by master. - -commit ba477191c67ce93e61423cc1abe35275704cce50 -Author: Jamey Sharp <jamey@minilop.net> -Date: Sat Oct 7 03:48:13 2006 -0700 - - XCB: Don't rely on having the definition of struct xcb_setup_t available. - -commit 117b55cbd0b0ce51362df88363ed83d44a493ac7 -Author: Jamey Sharp <jamey@minilop.net> -Date: Fri Oct 6 16:27:31 2006 -0700 - - xcb_poll_for_event no longer takes an 'int *error' out-parameter. - -commit caaa8e8a55e837b3585c1dee7bef194fc4c79d16 -Author: Josh Triplett <josh@freedesktop.org> -Date: Fri Oct 6 16:26:11 2006 -0700 - - Actually ship Xxcbint.h - -commit 7b027e53b5e393082f4f515c8ba18077eb97163f -Author: Josh Triplett <josh@freedesktop.org> -Date: Fri Oct 6 16:25:50 2006 -0700 - - Clean ChangeLog only in "make maintainer-clean", not "make clean" - - ChangeLog requires a git repo to generate; make clean and make distclean - shouldn't get rid of it. - -commit cab22e02e78b3e5b8a73d1cd55cf6686426b47e0 -Author: Josh Triplett <josh@freedesktop.org> -Date: Fri Oct 6 16:24:58 2006 -0700 - - Add ChangeLog and "make dist"-generated files to .gitignore - -commit e4c7cfdee4a40e466c0c6b370cabd432e9e855a0 -Author: Josh Triplett <josh@freedesktop.org> -Date: Fri Oct 6 15:53:27 2006 -0700 - - Add manual pages for XGetXCBConnection and XSetEventQueueOwner - -commit 688224cea95e453f94c5a602dc6fce84bc93dfc0 -Author: Josh Triplett <josh@freedesktop.org> -Date: Fri Oct 6 13:41:16 2006 -0700 - - Remove unnecessary prototype for _XFreeDisplayStructure in xcb_disp.c - -commit ab728ca372288d0db1b486c265e34c1376f29104 -Author: Josh Triplett <josh@freedesktop.org> -Date: Fri Oct 6 12:36:39 2006 -0700 - - XCL is dead; long live Xlib/XCB - - Rename all instances of "XCL" to Xlib/XCB-derived names. - - The only user-visible change: rename the include file <X11/xcl.h> to - <X11/Xlib-xcb.h>; programs will need to change their #include lines to match. - - Remove the XCL cast inlines from Xlib-xcb.h. - -commit 5b73093203039d307eb7ab3845c3ced207e9e26c -Author: Josh Triplett <josh@freedesktop.org> -Date: Fri Oct 6 11:33:49 2006 -0700 - - Add XCB developers to AUTHORS - -commit 1cb71ff139276a0a58c60ea5f261f64b94706b9b -Author: Josh Triplett <josh@freedesktop.org> -Date: Fri Oct 6 11:21:28 2006 -0700 - - Fix email addresses in README - -commit 12f038669278019594ca0ed53dadcf4e84092422 -Author: Jamey Sharp <jamey@minilop.net> -Date: Fri Oct 6 02:13:05 2006 -0700 - - XCB: Handle all responses in order of monotonically increasing sequence number. - -commit f392680273278b43079302206897f794e60f3c70 -Author: Josh Triplett <josh@freedesktop.org> -Date: Fri Oct 6 01:11:08 2006 -0700 - - Actually install x11-xcb.pc, and ship x11-xcb.pc.in - -commit f1fcad2e3fd17aaf1294f1d8e9f406fd5b32a863 -Author: Jamey Sharp <jamey@minilop.net> -Date: Thu Oct 5 18:32:29 2006 -0700 - - XCB: correctly handle failure to connect to X server. - -commit e754b3b078d556c7861da56aad47d244e9199e06 -Author: Josh Triplett <josh@freedesktop.org> -Date: Thu Oct 5 17:44:22 2006 -0700 - - Split public Xlib/XCB functions into libX11-xcb - - We can never change the libX11 soname, and we don't want to commit to never - changing the public Xlib/XCB functions, so split them into a separate library - libX11-xcb. This also means that a program linked solely against libX11 - should work with either Xlib or Xlib/XCB, which will make life easier for - package maintainers. - - Signed-off-by: Josh Triplett <josh@freedesktop.org> - Acked-by: Jamey Sharp <jamey@minilop.net> - -commit ffd367f708b295abaedf3a23a1bfd4710d171d6f -Author: Jamey Sharp <jamey@minilop.net> -Date: Wed Oct 4 17:16:46 2006 -0700 - - No longer #include Xmd from xcl.h: we do not need it. - -commit 3aff149d42ba8ed620091971b3766bdf96c62aaf -Author: Jamey Sharp <jamey@minilop.net> -Date: Wed Oct 4 16:58:32 2006 -0700 - - XCB: Revert locking to simple wrapper around libX11's normal locks. - - No more recursive mutexes, no more banging XCB's I/O lock in-place, and - reduces the differences between the previous stable release and an - XCB-enabled one. Sadly, Xlib's pluggable thread functions work again - too, now. I apologize to the world. - -commit 8ff122fb529bdb1c2b9a86b12d06b6da1b35d708 -Author: Jamey Sharp <jamey@minilop.net> -Date: Mon Sep 25 04:54:52 2006 -0700 - - Link explicitly against XCB's Xlib compatibility functions. - -commit bde3cd123d65a2f36ee0c417f5f231b7e01d0671 -Author: Jamey Sharp <jamey@minilop.net> -Date: Mon Sep 25 04:13:20 2006 -0700 - - libxcb now installs header files in <xcb>, not <X11/XCB>. - -commit 87d00207f5a1f25a45a153618739cd6481814f89 -Author: Ian Osgood <iano@quirkster.com> -Date: Sun Sep 24 23:39:01 2006 -0700 - - Track XCB's "Great Renaming". - -commit 85a5e98dff9b7752fae157fad9b8c9825cb0efab -Author: Jamey Sharp <jamey@minilop.net> -Date: Tue Sep 12 23:02:42 2006 -0700 - - Quit using XCBGetQueuedRequestRead. - -commit a61936fc4e9bd93b108764bbacd5b8f786e51915 -Author: Tollef Fog Heen <tfheen@err.no> -Date: Wed Aug 30 00:05:54 2006 +0300 - - nls: use _XlcUtf8Loader for en_US (bug #7982) - Use _XlcUtf8Loader instead of _XlcUnicodeLoade,r bringing it into line with - every other locale. - -commit abcc7e1865cdfbd591f6520cfe4257f0b0b1c03e -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Wed Aug 23 18:49:30 2006 -0700 - - When opening display, if LOCALCONN fails, fall back to UNIXCONN, then TCPCONN - - Port to X11R7 of Sun bug fix 4061225 by Alex Chen for X11R6 - when failing to - connect on a named pipe, try a Unix socket first, to better support people who - replace their X servers with ones that don't support named pipe transport. - <http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=4061225> - -commit 1ddc44c1cada7e926bd4787406444ce7c36b61e1 -Author: Mark Brown <mark.brown@sun.com> -Date: Thu Jul 27 19:17:10 2006 -0700 - - Sun bug 1149809: Document event delivery when grab is terminated. - -commit 171107b03ac89d94f9006c7cda242aeefb9ecd16 -Author: Dennis Arellano <Dennis.Arellano@Sun.COM> -Date: Thu Jul 27 18:47:06 2006 -0700 - - Sun bug 4091271: XGetWindowProperty is missing a crucial prop_return description - - Document that 32-bit format properties are always returned in arrays of type - long, even on systems where long is 64-bits. - <http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=4091271> - -commit 8309efe6550877cd0bf22979904b3f6bd3e6cffa -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Mon Jul 24 15:52:00 2006 -0700 - - Add support for "make lint" to check code with lint/sparse/etc. - -commit 931e02fbd1acd09aae2b0954c34342c86c72dff6 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Mon Jul 24 15:50:52 2006 -0700 - - ANSIfy some static function definitions - -commit 20b7abcaac324d90454de63f32f4a2b398e69e63 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Mon Jul 24 15:01:40 2006 -0700 - - Fix sparse warning: Using plain integer as NULL pointer - -commit d158ab29930513c4097f5b67e7bea08ed2bfd62c -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Mon Jul 24 14:00:24 2006 -0700 - - Remove unused variable - -commit 30377000375bdb958042dcb1f38503c94ef21eaf -Author: Eric Anholt <anholt@FreeBSD.org> -Date: Fri Jul 21 18:55:36 2006 -0400 - - Bug #7188: Fix the documentation of XUrgencyHint (not UrgencyHint). - -commit 4eba45879aea4e415ab550ee56b900d060099110 -Author: Matthieu Herrb <matthieu.herrb@laas.fr> -Date: Sun Jul 16 10:55:39 2006 +0200 - - set GIT_DIR=${srcdir}/.git for git-log - -commit 2d426d1f2608fedb77bd7d010dabece76b8d4a60 -Author: Aaron Plattner <aplattner@nvidia.com> -Date: Tue Jul 11 13:27:49 2006 -0700 - - Add a .PHONY to ensure the ChangeLog isn't stale. - - Setting the ChangeLog rule as phony forces it to be re-run even when the - ChangeLog file already exists. Research indicates .PHONY is portable to BSD and - Solaris make. - (cherry picked from b8a98809ed81e1226775e6447ef219ffc01334b5 commit) - -commit b8a98809ed81e1226775e6447ef219ffc01334b5 -Author: Aaron Plattner <aplattner@nvidia.com> -Date: Tue Jul 11 13:27:49 2006 -0700 - - Add a .PHONY to ensure the ChangeLog isn't stale. - - Setting the ChangeLog rule as phony forces it to be re-run even when the - ChangeLog file already exists. Research indicates .PHONY is portable to BSD and - Solaris make. - -commit 8f2be66089b88e4ed6acb0211ea107f4bb910bd3 -Author: Mayank Jain <majain@redhat.com> -Date: Tue Jul 11 19:42:47 2006 +0100 - - add Indian language locales - Add as, kn, ml, or, ur, and te locales. - -commit a92eb6785699bbc9c6c3813f6af3bb9431a3f6b0 -Author: Matthias Hopf <mhopf@suse.de> -Date: Tue Jul 4 12:16:30 2006 +0200 - - Fix for autoconf 2.60 issue. - - Updated AC_DEFINE_DIR. - Reverted datarootdir change. - -commit 644f4828b15bce42b597eb123ba0bbc372c46c03 -Author: Keith Packard <keithp@neko.keithp.com> -Date: Sat Jul 1 21:31:23 2006 -0700 - - Work around recent autoconf (2.59?) changes in directory expansion. - - Recent autoconf versions have changed how directory names are managed in the - configure.ac script; automatic 'eval' invocations now occur as a part of the - AC_DEFINE_DIR macro which make it imperative that AC_DEFINE_DIR be executed - before the variables are used in further macro definitions. Also, ${datadir} - is apparantly an old name for ${datarootdir} as ${datadir} doesn't get - expanded correctly by AC_DEFINE_DIR. This looks like an autoconf bug, but it - is easy to work around by just using ${datarootdir} instead of ${datadir}. - -commit be70a31229aa106aff0a09d78c00812682cd3475 -Author: Keith Packard <keithp@neko.keithp.com> -Date: Sat Jul 1 01:56:05 2006 -0700 - - Xlib/XCB: handle 32-bit sequence wrap. - - Replace broken sequence compares with XCB_SEQUENCE_COMPARE (copied from - XCB). - Account for XCB sequence 0 handling. - -commit 99c711707ad08e1396e123b1c7df687c560a489a -Author: Donnie Berkholz <spyderous@gentoo.org> -Date: Thu Jun 29 19:43:20 2006 -0700 - - Bump version to 1.0.3. - -commit cde3c0dd72af2b490e80cffca962e3487dd31be4 -Author: Donnie Berkholz <spyderous@gentoo.org> -Date: Thu Jun 29 19:39:36 2006 -0700 - - Bug #7349: Missed one of the setuid fixes. - (cherry picked from e9614c963b532f46a7932c2305a4b177a996a222 commit) - -commit df3fef8983d96c59d481c4cdaf1f271d54a116d2 -Author: Matthias Hopf <mhopf@suse.de> -Date: Thu Jun 29 18:59:57 2006 +0200 - - Update to final Compose cache directory location. - (cherry picked from abda4d223e9cce9ac6e7b5d82a5680d9a502e52a commit) - -commit 912ef198292d3053daa810f842510e5d62ded0f0 -Author: Matthias Hopf <mhopf@suse.de> -Date: Thu Jun 29 17:41:41 2006 +0200 - - Fix alignment of trees and wide chars in the cache. - (cherry picked from 40a64c61f8bc33d497e1224e02c41dea2d424d97 commit) - -commit 2ece832118b3ee5d8ed19f1ee9b1c822b70ec6e9 -Author: Matthias Hopf <mhopf@suse.de> -Date: Wed Jun 28 19:17:03 2006 +0200 - - First (dummy) entry of compose caches was not initialized and thus contained varying garbage. - (cherry picked from f442dcaa56f8ecb7443e8e51c88ed97e10dbdba3 commit) - -commit e9614c963b532f46a7932c2305a4b177a996a222 -Author: Donnie Berkholz <spyderous@gentoo.org> -Date: Thu Jun 29 19:39:36 2006 -0700 - - Bug #7349: Missed one of the setuid fixes. - -commit abda4d223e9cce9ac6e7b5d82a5680d9a502e52a -Author: Matthias Hopf <mhopf@suse.de> -Date: Thu Jun 29 18:59:57 2006 +0200 - - Update to final Compose cache directory location. - -commit 40a64c61f8bc33d497e1224e02c41dea2d424d97 -Author: Matthias Hopf <mhopf@suse.de> -Date: Thu Jun 29 17:41:41 2006 +0200 - - Fix alignment of trees and wide chars in the cache. - -commit f442dcaa56f8ecb7443e8e51c88ed97e10dbdba3 -Author: Matthias Hopf <mhopf@suse.de> -Date: Wed Jun 28 19:17:03 2006 +0200 - - First (dummy) entry of compose caches was not initialized and thus contained varying garbage. - -commit bdbe464d774e01d317f67c63ebbda2fd0edbbdd1 -Author: Donnie Berkholz <spyderous@gentoo.org> -Date: Thu Jun 22 23:59:03 2006 -0700 - - Delete ChangeLog, and add a rule to autogenerate it for distribution. Also - add 'foreign' to AM_INIT_AUTOMAKE to make autotools happy with not having a - ChangeLog. - (cherry picked from b0edfb8df16ab8c9959b83a4c966d55a59c4e295 commit) - -commit b0edfb8df16ab8c9959b83a4c966d55a59c4e295 -Author: Donnie Berkholz <donnie@comet.(none)> -Date: Thu Jun 22 23:47:38 2006 -0700 - - Delete ChangeLog, and add a rule to autogenerate it for distribution. Also - add 'foreign' to AM_INIT_AUTOMAKE to make autotools happy with not having a - ChangeLog. - -commit dd54981aa76e9dfdc4c3302d6105b4b229447c84 -Author: Donnie Berkholz <donnie@comet.(none)> -Date: Thu Jun 22 15:47:38 2006 -0700 - - Bump version to 1.0.2. - -commit c93539d974a67f596a5eb5b65042d26602546c72 -Author: Matthieu Herrb <matthieu@deville.herrb.com> -Date: Tue Jun 20 21:04:03 2006 +0200 - - Check setuid() return value. - (cherry picked from 5169d0e08ff6acb350a6ea768623f5ff0b85b05f commit) - -commit 605533f814ab7892991578706a6458f61a89ca4d -Author: Derek Wang <derek.wang@sun.com> -Date: Mon Jun 19 11:05:37 2006 -0700 - - Sun bug 6209243: XExtentsOfFontSet causes segfault when font set not loaded - (cherry picked from eff50c94a07194297e705da53d9fbb3a40fb9ad4 commit) - -commit 5bbd0822c5a926de0ed293437fb9f2b75cf3c4f4 -Author: Scott Revelt <scott.revelt@sun.com> -Date: Fri Jun 16 19:11:13 2006 -0700 - - Sun bug 4022903: Xcms routines may fail if sscanf() is looking for separators - based on locale that doesn't match those used in the Xcms.txt - (cherry picked from 94f3213fc4bd6ec49bfb68e8b4a4fddea2bf3baa commit) - -commit 0b05cd4da6134df527fb010384a9fd569bd5d6a3 -Author: Alan Coopersmith <alanc@alf.(none)> -Date: Fri Jun 16 18:53:33 2006 -0700 - - Add *~ to ignore emacs droppings - (cherry picked from c33d7b8282ac196b36229be26442296768c16f3e commit) - -commit 214658b76b56768f69c3959a11525aae7813f448 -Author: Matthias Hopf <mhopf@suse.de> -Date: Fri Jun 16 15:36:40 2006 +0200 - - Bug #3104: Compose table cache for faster X11 application starts. - (cherry picked from 1f4c9893ade08bad30c9bd12a36bee57d30b001e commit) - -commit 13968a23aaea838ba4b69e42e8900f803499e091 -Author: Matthias Hopf <mhopf@suse.de> -Date: Tue Jun 13 20:23:46 2006 +0200 - - Bug #3104: Compose table cache for faster X11 application starts. - (cherry picked from 4fe22647e6010a2886c2f3a7093adeaeb6678faa commit) - -commit e7f8bca08f5476d0ca262097639ac7d424bb4d10 -Author: Lubos Lunak <llunak@suse.de> -Date: Mon Jun 12 18:48:08 2006 +0200 - - Bug #3104: Compose table cache for faster X11 application starts. - (cherry picked from 1d28a655629a11ea7fd1e5df4c7b77dd4b63e3be commit) - -commit f506aaf8ac9aae1ee8daaef6cde34ee85aecd641 -Author: Matthias Hopf <mhopf@suse.de> -Date: Fri Jun 9 18:24:02 2006 +0200 - - Bug #3104: Compose table cache for faster X11 application starts. Part 1: Pointerless compose data structure, using indices instead of pointers, needed for mmap()ing data structure. - (cherry picked from 9354351fcb8baeaab85250d14409cfb4fa50f3e9 commit) - -commit 0e6d5e979aacb0c295ce79369ecc5f22ffa7922c -Author: Jamey Sharp <jamey@minilop.net> -Date: Wed Jun 7 20:29:05 2006 -0700 - - Fix bug #7035: unnecessary memmove in XOpenDisplay. - Using memmove on the connection setup data causes a problem for XCB, but making - Xlib stop doing that should be harmless for non-XCB as well. - (cherry picked from b18713ec3f36a10b3cdb1e16f9550e1d2e05dff0 commit) - -commit cd7328c46ae72903ed02832828891b2dab4d5ee0 -Author: Daniel Stone <daniels@preemptive.fooishbar.org> -Date: Sat Jun 3 13:51:51 2006 +0300 - - Fix threading support on GNU/kFreeBSD systems. (Robert Millan) - (cherry picked from e3acee88cfcc4ef0fa8a7db39763a5ebe2e985cb commit) - -commit c336eb6b80a6f91da1d0b3d28634a2cfde324670 -Merge: 33556ca... ad9ebbd... -Author: Donnie Berkholz <donnie@comet.(none)> -Date: Thu Jun 22 14:25:35 2006 -0700 - - Merge branch 'stable' of http://people.freedesktop.org/~jamey/libX11 into stable - -commit 213dacad21740466e7ab31b01d3fc513fe4b3e74 -Author: Daniel Stone <daniel@fooishbar.org> -Date: Thu Jun 22 17:20:59 2006 +0300 - - Bump to 1.0.99.0 to avoid confusion. - -commit efedfd68e31bcee2d21ac340be8dc9e1825ec890 -Merge: e3acee8... 4b8eb5d... -Author: Daniel Stone <daniel@fooishbar.org> -Date: Thu Jun 22 16:53:45 2006 +0300 - - Merge branch 'master' of git+ssh://git.freedesktop.org/srv/git.freedesktop.org/git/xorg/lib/libX11 - -commit 4b8eb5d4a1da73a94b5a6ab12e34784aae4c79c5 -Merge: 5169d0e... eff50c9... -Author: Matthieu Herrb <matthieu@deville.herrb.com> -Date: Tue Jun 20 21:05:15 2006 +0200 - - Merge branch 'master' of git+ssh://herrb@git.freedesktop.org/git/xorg/lib/libX11 - -commit 5169d0e08ff6acb350a6ea768623f5ff0b85b05f -Author: Matthieu Herrb <matthieu@deville.herrb.com> -Date: Tue Jun 20 21:04:03 2006 +0200 - - Check setuid() return value. - -commit eff50c94a07194297e705da53d9fbb3a40fb9ad4 -Author: Derek Wang <derek.wang@sun.com> -Date: Mon Jun 19 11:05:37 2006 -0700 - - Sun bug 6209243: XExtentsOfFontSet causes segfault when font set not loaded - -commit 94f3213fc4bd6ec49bfb68e8b4a4fddea2bf3baa -Author: Scott Revelt <scott.revelt@sun.com> -Date: Fri Jun 16 19:11:13 2006 -0700 - - Sun bug 4022903: Xcms routines may fail if sscanf() is looking for separators - based on locale that doesn't match those used in the Xcms.txt - -commit c33d7b8282ac196b36229be26442296768c16f3e -Author: Alan Coopersmith <alanc@alf.(none)> -Date: Fri Jun 16 18:53:33 2006 -0700 - - Add *~ to ignore emacs droppings - -commit 1f4c9893ade08bad30c9bd12a36bee57d30b001e -Author: Matthias Hopf <mhopf@suse.de> -Date: Fri Jun 16 15:36:40 2006 +0200 - - Bug #3104: Compose table cache for faster X11 application starts. - -commit 4fe22647e6010a2886c2f3a7093adeaeb6678faa -Author: Matthias Hopf <mhopf@suse.de> -Date: Tue Jun 13 20:23:46 2006 +0200 - - Bug #3104: Compose table cache for faster X11 application starts. - -commit 1d28a655629a11ea7fd1e5df4c7b77dd4b63e3be -Author: Lubos Lunak <llunak@suse.de> -Date: Mon Jun 12 18:48:08 2006 +0200 - - Bug #3104: Compose table cache for faster X11 application starts. - -commit 9354351fcb8baeaab85250d14409cfb4fa50f3e9 -Author: Matthias Hopf <mhopf@suse.de> -Date: Fri Jun 9 18:24:02 2006 +0200 - - Bug #3104: Compose table cache for faster X11 application starts. Part 1: Pointerless compose data structure, using indices instead of pointers, needed for mmap()ing data structure. - -commit b18713ec3f36a10b3cdb1e16f9550e1d2e05dff0 -Author: Jamey Sharp <jamey@minilop.net> -Date: Wed Jun 7 20:29:05 2006 -0700 - - Fix bug #7035: unnecessary memmove in XOpenDisplay. - Using memmove on the connection setup data causes a problem for XCB, but making - Xlib stop doing that should be harmless for non-XCB as well. - -commit ad9ebbd2424bc2699944ffdf4e19e13f9dd8ab84 -Author: Daniel Stone <daniels@preemptive.fooishbar.org> -Date: Sat Jun 3 12:57:55 2006 +0300 - - Bug #2186: Add cs_CZ.iso8859-2 alias. - -commit 9e7765e0b1cbaae6643072d91066ba1201b36227 -Author: Daniel Stone <daniel@fooishbar.org> -Date: Fri Jun 2 02:46:29 2006 +0300 - - nls: Serbian (sr_CS) update (#5575) - - Bug #5575: 'Yugoslavia' has changed to Serbia & Montenegro, along with a - corresponding locale change. Update compose.dir.pre, locale.alias.pre, - and locale.dir.pre. (Milos Komarcevic) - -commit a4ac2242b588da23044a20aa999ae84d4de7b2d8 -Author: Daniel Stone <daniel@fooishbar.org> -Date: Fri Jun 2 02:24:25 2006 +0300 - - im: add Braille input method (#6296) - - Bug #6296: Add a Braille input method. (Samuel Thibault) - -commit 90de1e2e141ec591048a76cb695579ef809a28d3 -Author: Daniel Stone <daniel@fooishbar.org> -Date: Fri Jun 2 02:22:17 2006 +0300 - - xkb support: small typo - -commit 4c3e34bece7402f08139d34d1ef5834e3cf533c7 -Author: Daniel Stone <daniel@fooishbar.org> -Date: Fri Jun 2 01:50:24 2006 +0300 - - en_US.UTF-8 Compose.pre: updates from Simos (#5129) - - Bug #5129: Numerous updates from Simos Xenitellis, fixing Unicode keysyms, - adding Unicode character names, removing duplicate entries, et al. - -commit 0c6473dd329c7334ae511884bcb6e73e632c784f -Author: Daniel Stone <daniel@fooishbar.org> -Date: Fri Jun 2 01:44:53 2006 +0300 - - nls: fix use of non-keysym dead_space (#5107) - - Bug #5107: Change users of dead_space to space. - -commit 6f99f6349de5120f1cb7e02fbc97849341bc48e8 -Author: Daniel Stone <daniel@fooishbar.org> -Date: Fri Jun 2 01:41:18 2006 +0300 - - optional XKB support fix - - Fix compilation with --disable-xkb. - -commit 217d43ed44ced901122093af3ef1294e1736bb77 -Author: Daniel Stone <daniel@fooishbar.org> -Date: Fri Jun 2 01:39:12 2006 +0300 - - i18n: separate data and lib directories - - Break out locale data into separate data and library directories, under - $(datadir) and $(libdir), respectively, by default. - -commit 92fa7fcde8df22830fca7c0275ab201033f7909c -Author: Adam Jackson <ajax@benzedrine.nwnk.net> -Date: Thu May 11 14:04:48 2006 -0400 - - libXcursor.so.1, not libXcursor.so - -commit 135b4df13ed7c35dbae8975f302fc1fb8412d7c0 -Author: Daniel Stone <daniels@preemptive.fooishbar.org> -Date: Wed May 10 18:06:03 2006 +0300 - - XKBMisc.c: use Xfree, not xfree - - Use Xfree() instead of xfree() when freeing interps. - -commit 3518d772b08e3433bc28b4d8d293fa53ca25f0ee -Author: Daniel Stone <daniels@preemptive.fooishbar.org> -Date: Wed May 10 14:51:37 2006 +0300 - - locale.alias.pre: bg_BG typo fix - - Fix typo (be_BG.UTF-8 rather than bg_BG.UTF-8) in locale.alias.pre. - -commit cc533db60cb64dc163c66451933a9bf77c519062 -Author: Daniel Stone <daniels@endtroducing.localdomain> -Date: Sun Apr 9 22:22:03 2006 +0300 - - Coverity #203, #204: Fix potential NULL dereferences. - -commit b83adf7dfd6157694fe4f232012fef36cd9666da -Author: Daniel Stone <daniels@endtroducing.localdomain> -Date: Sun Apr 9 22:20:25 2006 +0300 - - Coverity #205: Fix potential NULL dereference. - -commit 2d0cd10ad907864d0136739eaac459779c9a5332 -Author: Daniel Stone <daniels@endtroducing.localdomain> -Date: Sun Apr 9 22:18:20 2006 +0300 - - Coverity #209: Fix potential NULL dereference. (Alan Coopersmith) - -commit dc2f3966068d66a564aa452cab9f0c26657fa1df -Author: Daniel Stone <daniels@preemptive.research.nokia.com> -Date: Fri Apr 7 18:11:52 2006 +0300 - - Coverity #826: Fix potential memory leak. - -commit 23df609ec451a01c77e8f31ecc85c5af7c62efed -Author: Daniel Stone <daniels@preemptive.research.nokia.com> -Date: Fri Apr 7 17:49:41 2006 +0300 - - Bug #1625: Include keysym.h from Xutil.h. - -commit 5262a1945c543a3419ed626e1deb09ef5b4584c1 -Author: Eric Anholt <anholt@leguin.anholt.net> -Date: Wed Apr 5 17:12:15 2006 -0700 - - Check if visualList == NULL, not nVisualsMatched == 0. NULL happens in more - - cases (allocation failure) than nVisualsMatched == 0. Noticed from inspection - of Coverity #599, #600. - -commit 8b42635f577468bb143ca593cdd9fb3450ad712c -Author: Eric Anholt <anholt@leguin.anholt.net> -Date: Wed Apr 5 16:42:26 2006 -0700 - - Coverity #558: Free newly-allocated Database in error path. - -commit 6d06e41d1f431b3f1a1fcf69161e0af411325e9f -Author: Eric Anholt <anholt@leguin.anholt.net> -Date: Wed Apr 5 16:38:52 2006 -0700 - - Coverity #582: Free newly-allocated region in error path. - -commit 5fd8f79ad3e38df74d9a6cb573617542c101df1a -Author: Daniel Stone <daniels@preemptive.research.nokia.com> -Date: Fri Mar 17 15:58:39 2006 +0200 - - Properly clip bounds when only one point is defining an outline. - -commit 1e1572eb7f8394ce152e99d96f711ccf9083baf9 -Author: Matthieu Herrb <matthieu@bluenote.herrb.com> -Date: Sat Mar 11 15:39:15 2006 +0100 - - Fix prototype of XConfigureWindow(). Bugzilla #6023. - -commit 1da8bd904f1fc79d63d368473531b438d08bfe37 -Author: Jeremy C. Reed <reed@reedmedia.net> -Date: Tue Feb 21 14:10:22 2006 -0800 - - Set XTHREADLIB correctly for dragonfly platforms. - -commit c9768133e3f65ac4bb64e3941e2d6ae36897ec9c -Author: Jamey Sharp <jamey@minilop.net> -Date: Sun Feb 19 12:29:27 2006 -0800 - - Update .gitignores for *.o and nls/locale.dir*. - -commit efcbde6ba0b770bb0d4c7818e307712161011f10 -Author: Jamey Sharp <jamey@minilop.net> -Date: Sun Feb 19 12:28:41 2006 -0800 - - Move .cvsignore to .gitignore. - -commit e3acee88cfcc4ef0fa8a7db39763a5ebe2e985cb -Author: Daniel Stone <daniels@preemptive.fooishbar.org> -Date: Sat Jun 3 13:51:51 2006 +0300 - - Fix threading support on GNU/kFreeBSD systems. (Robert Millan) - -commit f1bd3152359ddfadd0d043006036c239f3e2907b -Author: Daniel Stone <daniels@preemptive.fooishbar.org> -Date: Sat Jun 3 12:57:55 2006 +0300 - - Bug #2186: Add cs_CZ.iso8859-2 alias. - -commit 2b1b79d90db1d7f0472718b8c010c36275994195 -Author: Daniel Stone <daniel@fooishbar.org> -Date: Fri Jun 2 02:46:29 2006 +0300 - - nls: Serbian (sr_CS) update (#5575) - Bug #5575: 'Yugoslavia' has changed to Serbia & Montenegro, along with a - corresponding locale change. Update compose.dir.pre, locale.alias.pre, - and locale.dir.pre. (Milos Komarcevic) - -commit d6fba1f44d404362d3be1b421f57d7ccc3c8cdac -Author: Daniel Stone <daniel@fooishbar.org> -Date: Fri Jun 2 02:24:25 2006 +0300 - - im: add Braille input method (#6296) - Bug #6296: Add a Braille input method. (Samuel Thibault) - -commit 0fed7d3185addd610e917dcdaa0676f0256c0ec5 -Author: Daniel Stone <daniel@fooishbar.org> -Date: Fri Jun 2 02:22:17 2006 +0300 - - xkb support: small typo - -commit cf7d9f9e46f3ce01ac04a95978918d5c0f3f3cf9 -Author: Daniel Stone <daniel@fooishbar.org> -Date: Fri Jun 2 01:50:24 2006 +0300 - - en_US.UTF-8 Compose.pre: updates from Simos (#5129) - Bug #5129: Numerous updates from Simos Xenitellis, fixing Unicode keysyms, - adding Unicode character names, removing duplicate entries, et al. - -commit 332d45fce9fdbf59168d90a133af1f580a589e54 -Author: Daniel Stone <daniel@fooishbar.org> -Date: Fri Jun 2 01:44:53 2006 +0300 - - nls: fix use of non-keysym dead_space (#5107) - Bug #5107: Change users of dead_space to space. - -commit 34f59ce3d1e2eb2971b732d11871c6fff8a1c75b -Author: Daniel Stone <daniel@fooishbar.org> -Date: Fri Jun 2 01:41:18 2006 +0300 - - optional XKB support fix - Fix compilation with --disable-xkb. - -commit c5940a0b85edec4003f91a59fc3c44f538accfe1 -Author: Daniel Stone <daniel@fooishbar.org> -Date: Fri Jun 2 01:39:12 2006 +0300 - - i18n: separate data and lib directories - Break out locale data into separate data and library directories, under - $(datadir) and $(libdir), respectively, by default. - -commit 33556ca81db2419b9d2a37664c4cea2069414b37 -Author: Adam Jackson <ajax@benzedrine.nwnk.net> -Date: Fri May 12 14:49:17 2006 -0400 - - Bump to 1.0.1 - -commit 80d88557626fae9debc404de33d7fb5d69a6049d -Author: Adam Jackson <ajax@benzedrine.nwnk.net> -Date: Thu May 11 14:06:28 2006 -0400 - - libXcursor.so.1, not libXcursor.so - -commit 5384f27dfe3c94c462c137ab3540eaa5646ca4c6 -Author: Adam Jackson <ajax@benzedrine.nwnk.net> -Date: Thu May 11 14:04:48 2006 -0400 - - libXcursor.so.1, not libXcursor.so - -commit 01f4d433eed6b70c6e9636157acac022054fdeb6 -Author: Jamey Sharp <jamey@minilop.net> -Date: Wed May 10 17:02:52 2006 -0700 - - Count any partial request towards the current Xlib sequence number. - -commit 770cfbd1fcc80a83a9be0c4f68727b8af2c8f4a4 -Author: Daniel Stone <daniels@preemptive.fooishbar.org> -Date: Wed May 10 18:06:03 2006 +0300 - - XKBMisc.c: use Xfree, not xfree - Use Xfree() instead of xfree() when freeing interps. - -commit 22a5255b80b80772612279bc840a953edd0e3442 -Author: Daniel Stone <daniels@preemptive.fooishbar.org> -Date: Wed May 10 14:51:37 2006 +0300 - - locale.alias.pre: bg_BG typo fix - Fix typo (be_BG.UTF-8 rather than bg_BG.UTF-8) in locale.alias.pre. - -commit 9cac8c9824874ca7d835f001a4efa910b7fdd822 -Merge: 19b8840... e514bc8... -Author: Daniel Stone <daniels@preemptive.fooishbar.org> -Date: Wed May 10 14:50:37 2006 +0300 - - Merge branch 'master' of git+ssh://git.freedesktop.org/srv/git.freedesktop.org/git/xorg/lib/libX11 - -commit e514bc875f27f4bf197b06b8315eeca526195915 -Author: Jamey Sharp <jamey@minilop.net> -Date: Tue May 9 12:41:59 2006 -0700 - - Assert that dpy->request does not go backwards. Catches #5839 earlier. - -commit fc1159137365a599bf611ee001f439416952c4e0 -Author: Jamey Sharp <jamey@minilop.net> -Date: Sun May 7 17:40:01 2006 -0700 - - In _XPutXCBBuffer, set aside any trailing partial request until the last byte is available. - -commit c394480a4247213239822808e3f6e7c6cd6decd9 -Author: Jamey Sharp <jamey@minilop.net> -Date: Sun May 7 16:58:13 2006 -0700 - - Update for XCB ConnSetupSuccessRep name change. - -commit 7672bf93bc1200905461aeb0a2dc2c2696410b93 -Author: Daniel Stone <daniels@endtroducing.localdomain> -Date: Sun Apr 9 22:22:03 2006 +0300 - - Coverity #203, #204: Fix potential NULL dereferences. - -commit cfcafbe48d22d9a0cd50eb9454ce0ff88f0129d3 -Author: Daniel Stone <daniels@endtroducing.localdomain> -Date: Sun Apr 9 22:20:25 2006 +0300 - - Coverity #205: Fix potential NULL dereference. - -commit b6771501feea98d037032f82117b6d4f15779f07 -Author: Daniel Stone <daniels@endtroducing.localdomain> -Date: Sun Apr 9 22:18:20 2006 +0300 - - Coverity #209: Fix potential NULL dereference. (Alan Coopersmith) - -commit 19b8840af241087bb17b1edabcaa9b28fdd0a1dc -Author: Daniel Stone <daniels@preemptive.research.nokia.com> -Date: Fri Apr 7 18:11:52 2006 +0300 - - Coverity #826: Fix potential memory leak. - -commit 3a16f262abe48b44ed641525e894bc22e13bf72a -Author: Daniel Stone <daniels@preemptive.research.nokia.com> -Date: Fri Apr 7 17:49:41 2006 +0300 - - Bug #1625: Include keysym.h from Xutil.h. - -commit 2481b767ae96e2f2503c0390545932c8397b090f -Author: Eric Anholt <anholt@leguin.anholt.net> -Date: Wed Apr 5 17:12:15 2006 -0700 - - Check if visualList == NULL, not nVisualsMatched == 0. NULL happens in more - cases (allocation failure) than nVisualsMatched == 0. Noticed from inspection - of Coverity #599, #600. - -commit 152b17e47d878c2d928eb74581aa69d925a29123 -Author: Eric Anholt <anholt@leguin.anholt.net> -Date: Wed Apr 5 16:42:26 2006 -0700 - - Coverity #558: Free newly-allocated Database in error path. - -commit bc62b99ef36edb34035911c42104be7f6f9d2333 -Author: Eric Anholt <anholt@leguin.anholt.net> -Date: Wed Apr 5 16:38:52 2006 -0700 - - Coverity #582: Free newly-allocated region in error path. - -commit d47f0b3cec1388f7ce60ab2af91df0dea0f221c5 -Author: Jamey Sharp <jamey@minilop.net> -Date: Fri Mar 31 22:53:07 2006 -0800 - - Fix buggy interaction with XCB when running out of XIDs. - -commit e3f452571824d6a875bbf582946de185de9e01e9 -Author: Jamey Sharp <jamey@minilop.net> -Date: Fri Mar 31 22:52:14 2006 -0800 - - Add explicit include of Xmd.h to work around bug including both xcb.h and Xmd.h simultaneously. - -commit 2363b74ca795c1b3a73c9e572532ba5191adec5b -Author: Daniel Stone <daniels@preemptive.research.nokia.com> -Date: Fri Mar 17 15:58:39 2006 +0200 - - Properly clip bounds when only one point is defining an outline. - -commit e876efb8aa410f2f5c87aaaa7042f847c4ff96f7 -Merge: be266b2... f71ea0b... -Author: Matthieu Herrb <matthieu@bluenote.herrb.com> -Date: Sat Mar 11 15:40:35 2006 +0100 - - Merge branch 'master' of git+ssh://herrb@git.freedesktop.org/git/xorg/lib/libX11 - -commit be266b201dc13530a302a7572283ccd3f32aad87 -Author: Matthieu Herrb <matthieu@bluenote.herrb.com> -Date: Sat Mar 11 15:39:15 2006 +0100 - - Fix prototype of XConfigureWindow(). Bugzilla #6023. - -commit f71ea0bc737c5a42e9e022b86e7ec3b4f846d31c -Author: Jamey Sharp <jamey@minilop.net> -Date: Fri Mar 3 11:08:41 2006 -0800 - - Update for XCBSendRequest sequence number API changes. - -commit a11d1b0ae674320cf9897f6a83ec08c65eca8d9b -Author: Jamey Sharp <jamey@minilop.net> -Date: Fri Mar 3 01:42:49 2006 -0800 - - Use the full_sequence from XCBGenericError/Event for setting last_request_read, and quit replacing _XSetLastRequestRead with an XCB-specific version. - -commit d8ba4ae7045b227f8b675628b9094dded02f1c08 -Author: Jamey Sharp <jamey@minilop.net> -Date: Thu Mar 2 23:43:26 2006 -0800 - - Bugfix: Rely on XCBSendRequest to leave iov in a well-defined state, and place the spare iovecs at the beginning of the array. - -commit f9afb5a54435c30961306080e9358d4240ecb844 -Author: Jamey Sharp <jamey@minilop.net> -Date: Thu Mar 2 23:34:19 2006 -0800 - - assert() that we will not infinite loop or read uninitialized memory. - -commit d3512ef3aae5b036a8ce6579318108f1ec20ee22 -Author: Jamey Sharp <jamey@minilop.net> -Date: Thu Mar 2 15:58:52 2006 -0800 - - Quit relying on XCBSendRequest to pad to 4-byte boundaries and do it ourselves. - -commit fb590c15a740264ee867d15a2547072e43b21eed -Author: Jamey Sharp <jamey@minilop.net> -Date: Thu Mar 2 12:06:04 2006 -0800 - - Handle errors correctly when Xlib owns the event queue and XCB has the checked error feature. - -commit 8356ba37d307a9eda895a6bf41ef727bbfc9a695 -Author: Jamey Sharp <jamey@minilop.net> -Date: Mon Feb 27 11:51:47 2006 -0800 - - Use the new XCBSendRequest flag, XCB_REQUEST_RAW, to hand a bag-o-bytes down uninterpreted. - -commit 07bdf1fbbf2418f866df1a2140d514dd3f035139 -Author: Jamey Sharp <jamey@minilop.net> -Date: Sun Feb 26 15:46:01 2006 -0800 - - Update for new XCBSendRequest API. - -commit 409a08cff8347d39e0e6c53c9f380d21f221f5ac -Author: Jamey Sharp <jamey@minilop.net> -Date: Thu Feb 23 18:12:31 2006 -0800 - - Performance fix: Replace calls to XCBGetRequestRead with the new XCBGetQueuedRequestRead. Cuts a lot of syscalls. - -commit ec30a27341b97620b07dd886f98d1d7664a67685 -Author: Jamey Sharp <jamey@minilop.net> -Date: Thu Feb 23 18:01:46 2006 -0800 - - Minor performance fix: Access dpy->xcl->connection directly instead of calling XCBConnectionOfDisplay. It happens a lot. - -commit 53c471c6a835d5cedeca99f2c97058d196a3fd7e -Author: Jamey Sharp <jamey@minilop.net> -Date: Thu Feb 23 11:46:09 2006 -0800 - - XCBFlush used to return non-positive on failure, and this test did not catch 0. Now it returns boolean: 0 or 1. Testing <= 0 covers both cases. I probably want to switch to a boolean test eventually. - -commit 41c0121a8718b530feaf7fe315b673d9b8defce2 -Author: Jamey Sharp <jamey@minilop.net> -Date: Tue Feb 21 21:25:41 2006 -0800 - - Refactor the code that passes requests down to XCB into a separate issue_complete_request function. - -commit 67d06e0fe468dca22847aa14d3f917128f89f9cf -Author: Jamey Sharp <jamey@minilop.net> -Date: Tue Feb 21 15:33:05 2006 -0800 - - If we have not actually put the buffer back, deferred invariants may not hold. This is OK. - -commit 434bf80b4053ff1ba82adf65de1f76b4d3731bf1 -Author: Jeremy C. Reed <reed@reedmedia.net> -Date: Tue Feb 21 14:10:22 2006 -0800 - - Set XTHREADLIB correctly for dragonfly platforms. - -commit b24834762e975bd319f9ab5c7cf790b2a02a9474 -Author: Jamey Sharp <jamey@minilop.net> -Date: Tue Feb 21 14:03:26 2006 -0800 - - Sometimes functions other than _XUnlockDisplay call _XPutXCBBuffer. Some invariants appropriate for Unlock are not appropriate otherwise: move them to _XUnlockDisplay. - -commit 99b8defd0d5e6993071e21638128c9de2574b37d -Author: Jamey Sharp <jamey@minilop.net> -Date: Tue Feb 21 13:04:21 2006 -0800 - - Execute BeforeFlush hooks on complete buffers, not request-at-a-time. - Traditional Xlib worked this way; I dunno why I changed it. - -commit 9b01e7849775749182052fe324df9d8e6ceeee99 -Author: Jamey Sharp <jamey@minilop.net> -Date: Tue Feb 21 12:51:44 2006 -0800 - - Factor the XCBSendRequest call out of the conditional in _XPutXCBBuffer. - -commit 7ce7ac882de128955751a5307889db9d712d8a72 -Author: Jamey Sharp <jamey@minilop.net> -Date: Tue Feb 21 12:44:30 2006 -0800 - - Quit using a triple-pointer. Almost as if I were a sensible person. - -commit 35a858be218cdbfa4593d44a67663d5c25297016 -Author: Jamey Sharp <jamey@minilop.net> -Date: Tue Feb 21 12:21:01 2006 -0800 - - Remove the XCL_PAD macro. - -commit e741b70ed2542c5463c57dac44bc37328616733b -Author: Jamey Sharp <jamey@minilop.net> -Date: Sun Feb 19 12:29:27 2006 -0800 - - Update .gitignores for *.o and nls/locale.dir*. - -commit f25b4b00e1683b0d97dba46dac46d65a9c2270a6 -Author: Jamey Sharp <jamey@minilop.net> -Date: Sun Feb 19 12:28:41 2006 -0800 - - Move .cvsignore to .gitignore. - -commit c7cda56eebaf6ab11403363be14d4948d7d8be38 -Author: Jamey Sharp <jamey@minilop.net> -Date: Sun Feb 19 11:49:15 2006 -0800 - - Land XCB support on X.org HEAD. - -commit 881467b3032261791ef5ec61b3879bb68d0a3d8c -Author: Jamey Sharp <jamey@minilop.net> -Date: Sun Feb 19 02:14:11 2006 +0000 - - Merge the X11 and BIGREQS package sets: they were used in exactly the same places. - -commit 6b0158dfad714db5b89c04dbea3aedeafa0fb146 -Author: Jamey Sharp <jamey@minilop.net> -Date: Tue Feb 14 19:37:36 2006 +0000 - - Refactor _XFlush and _XSend code that sets dpy->synchandler to _XSeqSyncFunction into a new function, _XSetSeqSyncFunction. It makes the patch for XCB cleaner, but is arguably a good idea anyway. - -commit 010c3acbb3a6993d39274f42d88c00849acb0fb0 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Sun Feb 12 18:19:17 2006 +0000 - - Bug #5628 <https://bugs.freedesktop.org/show_bug.cgi?id=5628> Shadow pages not created correctly when MANDIR & MANSUFFIX don't match. - -commit fe8c01c80263457f01b70dc1511b2bd9466b7c96 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Fri Feb 3 23:34:43 2006 +0000 - - Fix typo in .TH line - -commit b091c217f3c3f60dde78b09a95c150df6c83d7ba -Author: Kevin E Martin <kem@kem.org> -Date: Thu Dec 15 00:24:28 2005 +0000 - - Update package version number for final X11R7 release candidate. - -commit e7c04e0e65a2a0c70c6ad29ec2d6f4350fd81c2a -Author: Kevin E Martin <kem@kem.org> -Date: Tue Dec 6 22:48:41 2005 +0000 - - Change *man_SOURCES ==> *man_PRE to fix autotools warnings. - -commit b5c495854d5270e64e6d588388ffa906bfcaac22 -Author: Kevin E Martin <kem@kem.org> -Date: Sat Dec 3 05:49:42 2005 +0000 - - Update package version number for X11R7 RC3 release. - -commit 9e96dbc343c7f27ff47607acd75378ab23903e2a -Author: Kevin E Martin <kem@kem.org> -Date: Sat Dec 3 04:41:47 2005 +0000 - - Add check and cflags for malloc(0) returning NULL. - -commit 649c37b47909620ccafde3e983de8321cddd74ce -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Mon Nov 28 22:03:04 2005 +0000 - - Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4 update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir) - -commit 8d1500df66d796ebff2b0d8c02205e5fa6796d4a -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Wed Nov 23 22:33:06 2005 +0000 - - Bug #5003 <https://bugs.freedesktop.org/show_bug.cgi?id=5003> Patch #3763 <https://bugs.freedesktop.org/attachment.cgi?id=3763> Xorg code misuses S_IF* macros - -commit 93cf3747f9ae8d30bd485b41c5ff10397f68f078 -Author: Eric Anholt <anholt@freebsd.org> -Date: Sun Nov 20 23:17:39 2005 +0000 - - Add/improve libs .cvsignores. - -commit fa1f4a08112bfa14d3758f4702733dd3892966c3 -Author: Kevin E Martin <kem@kem.org> -Date: Sat Nov 19 07:15:39 2005 +0000 - - Update pkgconfig files to separate library build-time dependencies from application build-time dependencies, and update package deps to work with separate build roots. - -commit 7012f9b56c594cf40855ba0dbf93af1263417a8c -Author: Kevin E Martin <kem@kem.org> -Date: Mon Nov 14 21:51:07 2005 +0000 - - Fix xf86bigfont pkgconfig dep typo. - -commit 60a72f47951f46b4e0505d9903a94af3b6bed8ca -Author: Kevin E Martin <kem@kem.org> -Date: Wed Nov 9 21:19:12 2005 +0000 - - Update package version number for X11R7 RC2 release. - -commit 6bb0c3796b6e1beddc376a896e865704886e1462 -Author: Kean Johnson <kean@armory.com> -Date: Tue Nov 8 06:33:25 2005 +0000 - - See ChangeLog entry 2005-11-07 for details. - -commit 14be0098ad90c3e68bd2d21b00ffabb76f1fd780 -Author: Kevin E Martin <kem@kem.org> -Date: Tue Nov 1 15:11:50 2005 +0000 - - Update pkgcheck dependencies to work with separate build roots. - -commit 1bf71462a972e0fc56de63f5c7fd613b37fc70f1 -Author: Donnie Berkholz <spyderous@gentoo.org> -Date: Fri Oct 28 10:44:03 2005 +0000 - - Revert that, it's redundant. But it is worth noting that --disable-xkb is broken, if anyone cares. - -commit be627a39fe373e2e81fdc263780e70a271d9e0c5 -Author: Donnie Berkholz <spyderous@gentoo.org> -Date: Fri Oct 28 08:28:08 2005 +0000 - - Add dependency on inputproto for XI.h. - -commit 5fae4cb456cb03fb70cd065dbc2ca94c8ed99082 -Author: Adam Jackson <ajax@nwnk.net> -Date: Fri Oct 21 18:44:24 2005 +0000 - - Bug #4736: Error decoding for Damage extension. (Jonathan Lennox) - -commit 1171fa9dc77413f0e90933a565ec07068052afb4 -Author: Kevin E Martin <kem@kem.org> -Date: Wed Oct 19 02:48:08 2005 +0000 - - Update package version number for RC1 release. - -commit 2a2d905706308b9d5a1c16af1067fb390f43850c -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Tue Oct 18 00:00:08 2005 +0000 - - Use @LIB_MAN_SUFFIX@ instead of $(LIB_MAN_SUFFIX) in macro substitutions to work better with BSD make - -commit 66d35b6971fb26762392a2a8e2c47db46c11116a -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Mon Oct 17 21:13:15 2005 +0000 - - Rename .shadows.DONE to shadows.DONE to avoid some make's thinking it's a suffix rule (reported by Matthieu Herrb) - -commit a316995a17c084e98ef1b7f25d287c2c08b6d749 -Author: Donnie Berkholz <spyderous@gentoo.org> -Date: Sun Oct 16 03:03:35 2005 +0000 - - Change '==' to portable '='. - -commit b76a072530e884bcbea6ed8fed5aef39361dcfc0 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Wed Oct 12 00:04:50 2005 +0000 - - configure.ac Use XORG_MAN_SECTIONS instead of custom man section configuration. Add shadow man pages for man pages that document multiple functions. - -commit 8ee5c1429af98206e05a0536f87c0f21a529cdf0 -Author: Eric Anholt <anholt@freebsd.org> -Date: Tue Oct 11 02:18:36 2005 +0000 - - Add appropriate pthread libs/flags for FreeBSD, fixing the build of ico and probably others. - -commit 41ff3b9d1f194a7b56437b650d5f589225c078c6 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Sun Oct 9 22:28:39 2005 +0000 - - Bug #3021 <https://bugs.freedesktop.org/show_bug.cgi?id=3021> Requests and Errors for XFixes are not in XErrorDB (Jonathan Lennox) - -commit 91ed79852e790049ab54e68f288afb3c953194c9 -Author: Kevin E Martin <kem@kem.org> -Date: Fri Oct 7 15:00:00 2005 +0000 - - Clean up generated files - Add missing dist tarball files - -commit 440399b470c97b159a530602fff11c315aca8d97 -Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> -Date: Wed Oct 5 18:27:10 2005 +0000 - - Add el_GR.UTF-8 compose file - -commit 010f0647e25ac617d0f92c8d2b8dda684da545db -Author: Daniel Stone <daniel@fooishbar.org> -Date: Fri Sep 30 07:52:46 2005 +0000 - - Bug #2609: Add Kyrgyz locale (Ilyas Bakirov). - -commit 3ef2fb67bd8905b208ad7eb790c3843e14cea7ed -Author: Daniel Stone <daniel@fooishbar.org> -Date: Fri Sep 30 07:47:55 2005 +0000 - - Bug #1640: Kinyarwanda locale support. (Steve Murphy) - -commit 4ae0decabe0960870df0ec165f495166c10a053c -Author: Daniel Stone <daniel@fooishbar.org> -Date: Fri Sep 30 07:40:03 2005 +0000 - - Bug #2268: Add South African locales (Dwayne Bailey). Some whitespace cleanups, as the parser is a little touchy. - -commit 3f79eb4c99844f618f1889741d1631c2ffe5385f -Author: Daniel Stone <daniel@fooishbar.org> -Date: Fri Sep 30 07:11:19 2005 +0000 - - Generate locale.alias and compose.dir exactly like we do in the monolith, which fixes non-UTF-8 locales in particular (so we get foo: bar, as well as foo bar). Switch to generating locale.dir the same way. - -commit d1237d1483ff972c76a0ac344ec97d5280db0007 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Thu Sep 29 21:27:12 2005 +0000 - - Add Xcms.txt to lib/X11 - -commit 4a86f299693f7376cbe98175f0b0c44d691802b3 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Sat Sep 24 20:11:06 2005 +0000 - - Add XQueryExtension.man - -commit a057a66e2041d45198a13a4ece7c07068f76f21b -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Sat Sep 24 00:16:32 2005 +0000 - - Add XTHREAD_CFLAGS for platforms that need special defines like - -D_REENTRANT or -D_POSIX_whatever to get re-entrant function definitions. Set XDMCP_LIBS correctly for later libXdmcp tests. - -commit 3e920a65a7c376ad63eae2240fd06904d25d18bf -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Fri Sep 2 23:00:30 2005 +0000 - - Issue an error if XTRANS macros were not found when generating configure from configure.ac to flag errors early, instead of when people wonder why libX11 can't talk to an Xserver because it has no transports defined - -commit 3eb9f2d693af89d04e2fd92492c8205dce332c9c -Author: Kristian Høgsberg <krh@redhat.com> -Date: Thu Sep 1 19:24:13 2005 +0000 - - Use $(X11_LOCALEDATADIR) instead of @X11_LOCALEDATADIR@ so this install destination can be overridden at make install time. - -commit 7afa64325183b78d2d6a4862821f8b3e9866105c -Author: Matthieu Herrb <matthieu.herrb@laas.fr> -Date: Sun Aug 28 19:45:48 2005 +0000 - - OpenBSD needs -lpthread for threaded applications too. - -commit 2b2f3d3877cb7927f196d01a5df6a27bf8d0518a -Author: Daniel Stone <daniel@fooishbar.org> -Date: Fri Aug 26 05:16:46 2005 +0000 - - Define ERRORDB/KEYSYMDB to XERRORDB/XKEYSYMDB if the former is undefined but the latter is. (Gerte Hoogewerf) - -commit 07066da0902df91c71f2adb81d1a17ec29165553 -Author: Matthieu Herrb <matthieu.herrb@laas.fr> -Date: Sun Aug 21 15:45:04 2005 +0000 - - update - -commit de44d8b111f57bd2f015e085fd8298c5f2a15ef3 -Author: Matthieu Herrb <matthieu.herrb@laas.fr> -Date: Sun Aug 21 15:38:39 2005 +0000 - - Threads support for BSD systems: - - need to check for gewtpwuid_r to define mtsafeapi - - build UIThrstubs if needed. - -commit 60217fdb918bafb2082519efe5cba3b13ad3082a -Author: Adam Jackson <ajax@nwnk.net> -Date: Wed Aug 17 19:46:08 2005 +0000 - - Add xthreadlib variable to x11.pc. Bump to 0.99.1. - -commit e1f4c6f5e36c1511f66fa1fac76520fd97eecbad -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Wed Aug 17 01:27:08 2005 +0000 - - Fix more broken multi-line .ds macros. Remove extraneous ;'s . - -commit 1909786f4a7d686369edcfc05a938df115fab37c -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Tue Aug 16 19:23:15 2005 +0000 - - Bugzilla #4112 <https://bugs.freedesktop.org/show_bug.cgi?id=4112> Patch #2687 <https://bugs.freedesktop.org/attachment.cgi?id=2897> Fix multi-line macros in XPutImage man page. (Debian bug #323210, fix by David Mart?nez Moreno) - -commit 83406d69c62070d2eeef23eb47f1ca887f711ee5 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Mon Aug 15 19:53:37 2005 +0000 - - Move RAWCPP macro to xorg-macros.m4 so other modules can use it Add check for whether or not RAWCPP needs -traditional instead of hardcoding it, so non-gcc cpp's can be used - -commit 5bb43de17de8e71d967488a713bf2b3448533444 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Sat Aug 6 18:59:49 2005 +0000 - - Typo fix in output message - -commit afe34b95862bb3c06cdbe724cb5ec3001a4a5215 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Thu Aug 4 02:55:49 2005 +0000 - - //bugs.freedesktop.org/show_bug.cgi?id=1887> Patch #3005 <https://bugs.freedesktop.org/attachment.cgi?id=3005> libX11 locale defs severely adrift from glibc: adding new aliases (From Debian via Nathanael Nerode) - -commit 3979a0b88edf6475ce5cfaa386e18ef980bda13c -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Thu Aug 4 02:51:30 2005 +0000 - - //bugs.freedesktop.org/show_bug.cgi?id=1887> Patch #3002 <https://bugs.freedesktop.org/attachment.cgi?id=3002> libX11 locale defs severely adrift from glibc: locales bugfix for bs_BA (From Debian via Nathanael Nerode) - -commit 34b454df192f4563499c453ccdb8c079f4a20cbe -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Sat Jul 30 20:30:46 2005 +0000 - - Include config.h so Xtrans knows which transport types to build code for - -commit cd9c9936b49c125eda779b99887d7e6ae4cf56cd -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Sat Jul 30 19:15:16 2005 +0000 - - Add -D flags to clear various warnings (Stefan Dirsch) - -commit e7fef67b4531faddd805d8f2157903006d3117ed -Author: Kevin E Martin <kem@kem.org> -Date: Fri Jul 29 21:22:50 2005 +0000 - - Various changes preparing packages for RC0: - - Verify and update package version numbers as needed - - Implement versioning scheme - - Change bug address to point to bugzilla bug entry form - - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to reenable it) - - Fix makedepend to use pkgconfig and pass distcheck - - Update build script to build macros first - - Update modular Xorg version - -commit 2ebb00244928237088e68325b1032b3550455ce9 -Author: Matthieu Herrb <matthieu.herrb@laas.fr> -Date: Sat Jul 23 20:19:31 2005 +0000 - - remove orphan TAB at begin of line - -commit dd7a9cdecda73e024ca84c5b9a22b18688038d94 -Author: Kevin E Martin <kem@kem.org> -Date: Sat Jul 23 18:09:39 2005 +0000 - - Modify modular libs to use Xregion.h instead of region.h - -commit 6d635a88d91647b1b63611c3591f74916f88cd1c -Author: Kevin E Martin <kem@kem.org> -Date: Sat Jul 23 18:06:16 2005 +0000 - - lib/Xrender/Picture.c Change region.h to Xregion.h and modify internal references to include <X11/Xregion.h>. - -commit 36283f50fd9748733ae84cb7fb52ca8d9e661c15 -Author: Daniel Stone <daniel@fooishbar.org> -Date: Sat Jul 16 06:25:35 2005 +0000 - - Set soversion to 6.2.0. - -commit 75fd5ae6e4683b9b9dcc13bc2f0faf223610a74f -Author: Keith Packard <keithp@keithp.com> -Date: Fri Jul 15 04:27:32 2005 +0000 - - Add missing Makefile.am to lib/X11/modules - -commit 6d84a8b1329af1fcfe86b198f1a6e7dd6ff616c3 -Author: Keith Packard <keithp@keithp.com> -Date: Fri Jul 15 04:08:51 2005 +0000 - - Move i18n modules to top-level so they can be built in the right order (before xlib for non-loadable, after xlib for loadable). - Link i18n modules against xlib to resolve Xlib symbols used by them. - -commit 45f40126a73295345bb5eb187b1167874842ab6e -Author: Alexander Gottwald <ago@freedesktop.org> -Date: Thu Jul 14 19:50:00 2005 +0000 - - Add $(top_srcdir)/src to include list - -commit 0aed7d91f5928d09d541617aad03709b5090658d -Author: Matthieu Herrb <matthieu.herrb@laas.fr> -Date: Thu Jul 14 17:04:49 2005 +0000 - - Build fix for non-GNU make. - -commit b79422ccb02ab44548d1038956ab0cd4e2638645 -Author: Adam Jackson <ajax@nwnk.net> -Date: Thu Jul 14 15:12:44 2005 +0000 - - typo fixes (Matthieu Herrb) - -commit 419304cde2fda19457c667870edefc0b227651b3 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Wed Jul 13 02:41:36 2005 +0000 - - Add missing backslashes to xlocale_la_SOURCES - -commit d14cc5c8964c4539b57c6cb51ef653292e410b79 -Author: Keith Packard <keithp@keithp.com> -Date: Mon Jul 11 20:32:55 2005 +0000 - - Ammend AM_CFLAGS with all needed includes; cannot figure out an easy way to automate this. - -commit 424c2d8905eb2ad0a2df15b1da2f96140bfbcffb -Author: Lars Knoll <lars@trolltech.com> -Date: Mon Jul 11 15:24:32 2005 +0000 - - compile - -commit de9784eb1bde46efc316da279e3da27c6cc288a7 -Author: Keith Packard <keithp@keithp.com> -Date: Mon Jul 11 09:26:40 2005 +0000 - - Ignore built man page files - -commit 0c258c36d1523113790c599b16d2947d7aa6469a -Author: Keith Packard <keithp@keithp.com> -Date: Mon Jul 11 09:18:31 2005 +0000 - - Minor changes to help modular Xlib build i18n modules - -commit 6e752ea1203b786423e40f43340bce15ca3de0f0 -Author: Keith Packard <keithp@keithp.com> -Date: Mon Jul 11 08:29:18 2005 +0000 - - Enable loadable i18n modules, making them configurable on the configure command line. - Clean up conditionals for XKB, XCMS, XLOCALEDIR - Create new lib directory for locale modules in ${X11_LIBDIR}/locale/lib. Add this to the default XLOCALEDIR search path. - Create separate X11_LOCALEDATADIR variable pointing at ${datadir}/X11/locale for installing locale data. - Split out xcms, xkb, xlibi18n sources from main xlib bits so they can be conditionally included more easily. Lots of source files have been moved with this step; the result seems like it might be easier to maintain. - Display message at end of configure script with selected options. - Fix manual building with cpp to add -traditional in cpprules.in. This isn't conditionalized at all, so it will break on systems not using GNU cpp. - -commit b46cf0d879f1dbf92dcf5a0305d18986c766ed84 -Author: Daniel Stone <daniel@fooishbar.org> -Date: Sun Jul 10 22:37:33 2005 +0000 - - Fix segfault when _XimProtoCreateIC() fails to create a context; Debian #239991. (Chung-chieh Shan) - -commit 6f2132b18e61ca9755e4b45550f3f5097dd1fbb7 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Sat Jul 9 20:06:04 2005 +0000 - - Set __libmansuffix__ & __xorgversion__ correctly when cpp processing man pages - -commit 3939ac4410446b46071c9d714f4270c12bf904fe -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Sat Jul 9 18:44:14 2005 +0000 - - - Since all but one line of all the nls/*/Makefile.am files are identical, move common bits to nls/localerules.in for easier updating and use automake includes to include in all the nls/*/Makefile.am files - - Don't assume $(CPP) can take gcc-only -traditional flag - - CPP process man pages as is done in the monolithic tree - -commit 19ba9d0df86c688319377467254b9ea9c4b0eccc -Author: Keith Packard <keithp@keithp.com> -Date: Sat Jul 9 06:01:49 2005 +0000 - - Clean up .cvsignore files - -commit f4bba6fa9b9ce637be7662754750054567e9250a -Author: Adam Jackson <ajax@nwnk.net> -Date: Sat Jul 9 02:53:29 2005 +0000 - - typo fix. i suck. - -commit 3305da61a61695e24c1ea11d3f59dddb52873d47 -Author: Adam Jackson <ajax@nwnk.net> -Date: Sat Jul 9 02:41:18 2005 +0000 - - Check for bigfont proto headers via pkgconfig (Arwed von Merkatz) - -commit afdae2e8ccb93de2987b5a5e850695af15ece7e0 -Author: Keith Packard <keithp@keithp.com> -Date: Fri Jul 8 07:11:56 2005 +0000 - - Create and use XlibConf.h to match modular build which needs XTHREADS defined when building extensions - -commit 86fa88dc594ca2093030acf5c84973ee2b33eb4c -Author: Keith Packard <keithp@keithp.com> -Date: Fri Jul 8 06:57:06 2005 +0000 - - Create and install XlibConf.h to provide external users of Xlibint.h the defines necessary to correctly use the library. Xlibint.h should #include this new file. - Add a bunch of .cvsignore files - -commit 30f6ffedeaf899e699f0c6b14c9471ce9bcc430c -Author: Chris Less <clee@c133.org> -Date: Mon Jul 4 23:01:48 2005 +0000 - - Fixing bug #380 - add a man page for XQueryExtension, XListExtensions, and XFreeExtensionList. - -commit 55328bb6caabd37885cd19d7a5821ed425daf321 -Author: Eric Anholt <anholt@freebsd.org> -Date: Sun Jul 3 10:17:38 2005 +0000 - - Avoid a gmake-specific construct, and instead just write the name of the current directory into each Makefile.am. - -commit 726538ba21b631bfb0b8094a5546acdaf57379ff -Author: Daniel Stone <daniel@fooishbar.org> -Date: Sun Jul 3 07:37:33 2005 +0000 - - Fix more include paths; add dix-config.h to XKB code. - -commit 8c7677138e70e14eca0255f2168583f0ecc21994 -Author: Daniel Stone <daniel@fooishbar.org> -Date: Sun Jul 3 07:00:55 2005 +0000 - - Add Xtrans definitions (FONT_t, TRANS_CLIENT) to clean up warnings. - Add XSERV_t, TRANS_SERVER, TRANS_REOPEN to quash warnings. - Add #include <dix-config.h> or <xorg-config.h>, as appropriate, to all source files in the xserver/xorg tree, predicated on defines of HAVE_{DIX,XORG}_CONFIG_H. Change all Xfont includes to <X11/fonts/foo.h>. - -commit 197697c92a63091a4cc3cc04dcb7fa29d2655758 -Author: Daniel Stone <daniel@fooishbar.org> -Date: Fri Jul 1 22:13:35 2005 +0000 - - Fix objdir != srcdir, as well as make distcheck. - Don't attempt to create Compose.pre files; formatting fixes. - Added if not already present. - -commit c162d60ad8f124563f94a2a266de59373936266c -Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> -Date: Wed Jun 22 22:46:31 2005 +0000 - - Apply these patches from Theo van Klaveren: - lib-dmx.patch lib-FS.patch lib-X11.patch lib-XRes.patch lib-XScrnSaver.patch lib-xtrans.patch - to make the libraries distcheck. - -commit 9ee8abdab03ea605a6327118ab7dacab6adf8876 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Sat Jun 18 07:48:43 2005 +0000 - - Move Secure RPC flags from X11/configure.ac to xtrans/xtrans.m4 since multiple modules will need them - -commit 12afc57b7d455781eee305e9ed6a899ceec8729e -Author: Daniel Stone <daniel@fooishbar.org> -Date: Wed Jun 15 16:50:47 2005 +0000 - - Typo fix to locale/error/keysym location declarations. - -commit 9a895777e30762f61b98d25be3b5d8b1169baa17 -Author: Daniel Stone <daniel@fooishbar.org> -Date: Wed Jun 15 13:37:43 2005 +0000 - - Typo in ImUtil.h commit -- I AM CAPTAIN SKILL. - -commit add49285663684875ab7a5c58ec7a2cf8b775f67 -Author: Daniel Stone <daniel@fooishbar.org> -Date: Wed Jun 15 13:32:35 2005 +0000 - - Define locations for XErrorDB, XKeysymDB, and locale data in configure.ac. Add AC_DEFINE_DIR macro from autoconf-archive.cryp.to towards this end. - Move ImUtil.h from src/ to include/X11/. - -commit 845dfc6b42b950890866ee4df27761e086f50dca -Author: Daniel Stone <daniel@fooishbar.org> -Date: Wed Jun 15 13:27:48 2005 +0000 - - Move ImUtil.h from src/ to include/X11/. Additionally, copy Cmap.h as a distribution file. - -commit bba117f0d98f62cfb060d0fab97b407a3a0bfda9 -Author: Daniel Stone <daniel@fooishbar.org> -Date: Fri Jun 10 14:11:36 2005 +0000 - - Remove pointless include of Xlib.h. - Fix #include path to bigreqstr.h. - -commit 1a0de49da1274882bab05b0f7240936b37955e5c -Author: Alexander Gottwald <ago@freedesktop.org> -Date: Thu Jun 9 21:30:15 2005 +0000 - - Use $(srcdir) for Compose.pre and XLC_LOCALE.pre - -commit af4f0f302644ebfbb0ca9f4016a4aee85c973d37 -Author: Alexander Gottwald <ago@freedesktop.org> -Date: Thu Jun 9 15:55:33 2005 +0000 - - Replace <X11/transport.c> with <X11/Xtrans/transport.c> - -commit fd5f58e0baf692e34b9b622286f18762cc2500d3 -Author: Alexander Gottwald <ago@freedesktop.org> -Date: Thu Jun 9 15:52:02 2005 +0000 - - Replace <X11/Xtrans.h> with <X11/Xtrans/Xtrans.h> - Copy Xtrans.h to exports/include/X11/Xtrans only - -commit 44538f9940f969d46c0e5e4b201c684cde2ba611 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Sun Jun 5 03:29:33 2005 +0000 - - Port Imake flags to autoconf tests & --enable-* flags: HASSETUGID, HASGETRESUID, NO_XLOCALEDIR, HAS_SHM and XF86BIGFONT - -commit 588e30e9ec65fa6205a34be650b79d5e2243edec -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Sat Jun 4 22:53:21 2005 +0000 - - Add --enable-secure-rpc flag and checks for needed functions for Secure RPC ("SUN-DES-1") authentication method - -commit a547afee2ef49cc41bbb67f9cff5a52a283c0854 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Sat Jun 4 21:20:20 2005 +0000 - - Bug #3436 <https://bugs.freedesktop.org/show_bug.cgi?id=3436> Conndis.c uses incorrect type for args to XdmcpWrap() (Mike Harris - mharris@www.linux.org.uk) - -commit ca93c761559ae464189c7ea7cf11c6a6679f2431 -Author: Matthieu Herrb <matthieu.herrb@laas.fr> -Date: Sat May 28 01:02:32 2005 +0000 - - Don't use $< in explicit rules. This only works with GNU make. <https://bugs.freedesktop.org/show_bug.cgi?id=3383> - -commit 09ebb349359e3dd9131fa2fa8b07559faa173654 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Sun May 22 19:05:11 2005 +0000 - - Convert man pages to long file names in lib/X11, lib/Xt, & lib/Xext - -commit 761219b1ef9befc350c8a35b6f96d047e5f008cc -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Sat May 21 23:07:48 2005 +0000 - - xtrans: - Create autoconf macro XTRANS_CONNECTION_FLAGS to provide standard set of --enable flags for which transports to support and common place to update for required libraries for platforms that need certain libs for certain transports - ICE: - Add ICE_t #define required by Xtrans headers. Replace static defines of LOCALCONN & UNIXCONN with new XTRANS_CONNECTION_FLAGS macro. - X11: - Moved transport type checks to new macro XTRANS_CONNECTION_FLAGS in xtrans.m4 in xtrans module so they can be shared by all modules using xtrans. - -commit 4b1ba6eb975b547b808f4d5c8825a3261de5e02a -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Sat May 21 04:26:12 2005 +0000 - - Quote $ac_cv_search_* variables to prevent errors from test when they are set to "none required" (as happens on Solaris since dlopen is in libc) - Comment out "override CC = gcc" line as it breaks builds with non-GNU makes, and its incorrect to force a specific compiler. Change LINK line from gcc to $(CC). - -commit 1d425d5e2092dd18a7dd599b37ed9af61cf59819 -Author: Adam Jackson <ajax@nwnk.net> -Date: Thu May 19 00:22:32 2005 +0000 - - revert last change, didn't do right thing at all, sorry for the noise - -commit 1b0c46c1ae61d751dd3ca96de8e2c3fe21c5f4f2 -Author: Adam Jackson <ajax@nwnk.net> -Date: Thu May 19 00:10:07 2005 +0000 - - Require automake 1.7 in AM_INIT_AUTOMAKE - -commit cd4657c175dbab6aaca36f18a0ca92c95b5567dd -Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> -Date: Tue May 17 22:32:09 2005 +0000 - - - Check for xproto as its CFLAGS are needed in the .pc file - -commit 46e8d8a65430dd87c10b066b5cff99a689c22241 -Author: Egbert Eich <eich-at-freedesktop-dot-org> -Date: Tue May 17 08:10:10 2005 +0000 - - gcc4 allows to check if sentinels are correct (a sentinel is the terminating element in a varargs list). A sentinel needs to be NULL, not 0 - which doesn't make a difference on 32bit but matters on 64bit. Furthermore it can be told that functions have a printf-like format string and argument list so that they can verify that both match. To use these features certain attributes need to be set - which are compiler specific. To do this we define macros which are expanded depending on the compiler version. For now we put those in include/Xfuncproto.h (the XFree86 DDX layer contains a file compiler.h which however is not visible outside the DDX) (Bugzilla #3268). - -commit 23198d2bfbf0049b2630235cd4d4a4ffba7ec6c1 -Author: <ssp@aware-of-vacuity.boston.redhat.com> -Date: Mon May 16 22:35:27 2005 +0000 - - Make Xdmcp unconditionally required, require various protocol modules. - Mon May 16 17:48:03 2005 Søren Sandmann <sandmann@redhat.com> - Check for kbproto if using XKB. - Require xextproto rather than xextensions - Remove the entries from the xlibs tree, as they are not relevant here. - -commit 8bd3aea84ce54b8b76a898f3ae00e2b499c14a5e -Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> -Date: Mon May 16 21:48:36 2005 +0000 - - Mon May 16 17:48:03 2005 Søren Sandmann <sandmann@redhat.com> - Check for kbproto if using XKB. - -commit 9b1fa9ca3ed852ed40860f137511683f4bdae6fa -Author: <ssp@aware-of-vacuity.boston.redhat.com> -Date: Mon May 16 21:27:35 2005 +0000 - - Require xextproto rather than xextensions - Remove the entries from the xlibs tree, as they are not relevant here. - -commit 7eee605e3aeed549d1053325a03027c5e8cbf71b -Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> -Date: Fri May 13 22:53:36 2005 +0000 - - - For now put xtrans in X11/Xtrans/X11, since libX11 is looking for it in <X11/...> - - For Xcomposite and Xdamage, don't link the build system out of the xc tree - - Link the public X11 headers into their own directory - - Add links to XKeysymDB and XErrorDB - - Add links to all the Xlib man pages - - Add links to the lcUniConv subdirectory - - Conditionally include config.h in Xlib source - -commit 6769ccda88caf27d1441d335ef2b318a047a612b -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Mon Mar 21 04:58:21 2005 +0000 - - xc/lib/X11/ErrDes.c - //bugs.freedesktop.org/show_bug.cgi?id=132) Patch #2168 (https://bugs.freedesktop.org/attachment.cgi?id=2168) Replace a couple of BUFSIZE uses with better values to check against. Fixes by Stuart Anderson <anderson@netsweng.com> - -commit 3b9e8ece93b916c55a82df53e85f097418edf471 -Author: Roland Mainz <roland.mainz@nrubsig.org> -Date: Sat Mar 19 22:04:55 2005 +0000 - - xc/nls/Compose/iso8859-2 - xc/nls/Compose/iso8859-3 - xc/nls/Compose/iso8859-9 - //bugs.freedesktop.org/show_bug.cgi?id=2592) attachment #2156 (https://bugs.freedesktop.org/attachment.cgi?id=2156) Fix a couple of typos in ISO8859-* Compose files ("asciicircum" instead "of asciicirum"). Patch by Matthias Hopf <mhopf@suse.de>. - -commit 0ce5950a08b9ab23ca8a32effdd40c421e92df84 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Tue Mar 8 02:53:36 2005 +0000 - - Bugzilla Bug 2006 (https://bugs.freedesktop.org/show_bug.cgi?id=2006) Patch #2031 (https://bugs.freedesktop.org/attachment.cgi?id=2031) XEmbed client doesn't receive key events from XIM: Use | to set a bit, not &. Patch by Hidetoshi Tajima <hidetoshi.tajima@sun.com>. - -commit df341cd2f2f263f13323e8c0936ea8aa0d7fbba1 -Author: Roland Mainz <roland.mainz@nrubsig.org> -Date: Tue Feb 1 03:12:28 2005 +0000 - - xc/nls/Compose/pt_BR.UTF-8 - //bugs.freedesktop.org/show_bug.cgi?id=2400) attachment #1762 (https://bugs.freedesktop.org/attachment.cgi?id=1762): Fix build bustage caused by broken patch for brazillian locale support (see Bugzilla #1896). Patch by Kevin E. Martin <kem@freedesktop.org>. - -commit 483d3973f56dda51f9251d3ea808aaf7f3b48c10 -Author: Markus Kuhn <Markus.Kuhn@cl.cam.ac.uk> -Date: Fri Jan 28 18:31:31 2005 +0000 - - cleaned up boundary-case handling for Uxxxx Unicode keysym notation - -commit f234188a4c1e6b655aef0e3957ccad20d4c5847f -Author: Roland Mainz <roland.mainz@nrubsig.org> -Date: Wed Jan 19 01:53:55 2005 +0000 - - xc/nls/compose.dir - xc/nls/locale.dir - xc/nls/Compose/Imakefile - xc/nls/Compose/pt_BR.UTF-8 - xc/nls/XI18N_OBJS/Imakefile - xc/nls/XI18N_OBJS/pt_BR.UTF-8 - xc/nls/XLC_LOCALE/Imakefile - xc/nls/XLC_LOCALE/pt_BR.UTF-8 - //bugs.freedesktop.org/show_bug.cgi?id=1896) attachment #1675 (https://bugs.freedesktop.org/attachment.cgi?id=1675): Add support for pt_BR.UTF-8 locale. Patch by Gustavo Noronha Silva, Branden Robinson, Julien Lafon. - -commit 7448ea7ef425d35cfc31eb41d46f4d879774f376 -Author: Egbert Eich <eich-at-freedesktop-dot-org> -Date: Fri Jan 14 18:03:09 2005 +0000 - - Made some security enhancements: - - no writing past end of buffer caused by bogus locale. - - explicitely add a \0 character at end of string. (Bugzilla #2262) - -commit 5557d47fcf22a6f3adf327691158f2270e3d5094 -Author: Roland Mainz <roland.mainz@nrubsig.org> -Date: Fri Jan 14 04:59:05 2005 +0000 - - xc/nls/compose.dir - xc/nls/locale.alias - xc/nls/locale.dir - //bugs.freedesktop.org/show_bug.cgi?id=1830) attachment #1674 (https://bugs.freedesktop.org/attachment.cgi?id=1674): Adding support for the bs_BA (bs, bs_BA, bs_BA.iso88592, bs_BA.ISO-8859-2, bs_BA.ISO_8859-2, bs_BA.UTF-8) locale. Patch by Vedran Ljubovic <vljubovic@smartnet.ba>. - -commit 1fa3737f042f798fa11a9ff5b03f3b3ba3529824 -Author: Egbert Eich <eich-at-freedesktop-dot-org> -Date: Tue Jan 11 17:37:57 2005 +0000 - - 'Normalize' locale names (ie. remove any '-' and '_' and convert to lower case after the <language>_<territory> part) before matching against locale.alias (Bugzilla #2262). This needs adequate testing that we don't accidentally introduce undesirable side effects. - -commit 642cd269f94a234aa470a1d43385bd42625d89a1 -Author: Egbert Eich <eich-at-freedesktop-dot-org> -Date: Tue Dec 14 08:59:20 2004 +0000 - - Removed #ifdef'ed out code together with the comment explaining why it was #ifdef'ed out. - Fixed typo. - Added comment to a changed that's been committed with one of the previous commits. - -commit a07ccae36e629741d2e48de7730114d30a975a41 -Author: Matthieu Herrb <matthieu.herrb@laas.fr> -Date: Sun Dec 12 08:42:50 2004 +0000 - - Fix missing XChangeProperty() prototype missing in synopsis section. - -commit c73adb1c8ad806c2f9f0ba32f4b449e7a871501c -Author: Alexander Gottwald <ago at freedesktop dot org> -Date: Wed Dec 8 13:42:01 2004 +0000 - - Bugzilla #1980 (https://bugs.freedesktop.org/show_bug.cgi?id=1980) Handle XERRORDB only on WIN32 platform - -commit d5e7ab194103e22fd6c5094aaa107d90210bb600 -Author: Jim Gettys <jg@freedesktop.org> -Date: Thu Dec 2 16:18:16 2004 +0000 - - fix comment to indicate additional possible mode. i bug 1756 reported by Owen Taylor. - -commit 03940d7330cb1bbf93d49c650aefb19de457da7c -Author: Alexander Gottwald <ago at freedesktop dot org> -Date: Wed Dec 1 13:06:55 2004 +0000 - - Bugzilla #1980, https://bugs.freedesktop.org/show_bug.cgi?id=1980 Make location of XErrorDB configurable - -commit 11a03ab908bfcfab8a3492684e8e9320e492d552 -Author: Alexander Gottwald <ago at freedesktop dot org> -Date: Wed Dec 1 12:42:17 2004 +0000 - - Bugzilla #1864, http://freedesktop.org/bugzilla/show_bug.cgi?id=1864 Initialize pointer to NULL to avoid freeing random memory - -commit f3d83ee153f42e8899b844377e6b842d93411e62 -Author: Alexander Gottwald <ago@freedesktop.org> -Date: Mon Nov 15 15:06:54 2004 +0000 - - Bufzilla #1802, http://freedesktop.org/bugzilla/show_bug.cgi?id=1802 Added mingw (Win32) port - -commit b798ea11911ac58a8e6e7d15a2a643b023859749 -Author: Alexander Gottwald <ago at freedesktop dot org> -Date: Mon Nov 15 13:29:56 2004 +0000 - - Bugzilla #1864, http://freedesktop.org/bugzilla/show_bug.cgi?id=1864 Initialize pointer to NULL to avoid freeing random memory - -commit 436108cd6c84053698e5ca629096f59b34f50c2a -Author: Kristian Høgsberg <krh@redhat.com> -Date: Thu Nov 11 15:37:01 2004 +0000 - - Fix #1818 - -commit bf2e6ef66ba55f90efa4a4ba8c8b6d3ec0d1531c -Author: Roland Mainz <roland.mainz@nrubsig.org> -Date: Tue Nov 9 00:56:56 2004 +0000 - - xc/nls/compose.dir - xc/nls/locale.alias - xc/nls/locale.dir - //freedesktop.org/bugzilla/show_bug.cgi?id=1544): Adding support for the si_LK (si, sinhala, si_LK, si_LK.UTF-8) locale. Patch by Anuradha Ratnaweera <gnu.slash.linux@gmail.com>. - -commit 443890ceefbd6dafe68e30d103ec4f9d316ed655 -Author: Roland Mainz <roland.mainz@nrubsig.org> -Date: Fri Nov 5 00:58:49 2004 +0000 - - xc/nls/compose.dir - xc/nls/locale.alias - xc/nls/locale.dir - Adding some of the major indic locales (bn_IN.UTF-8, bn_IN.utf8, gu_IN.UTF-8, gu_IN.utf8, pa_IN.UTF-8, pa_IN.utf8) to X. Patch by Leon Ho <llch@redhat.com>. - -commit af7467ec734321f127b957921cce7792902b6794 -Author: Egbert Eich <eich-at-freedesktop-dot-org> -Date: Mon Oct 18 17:29:03 2004 +0000 - - Correcting font encodings for GB18030, GBK and BIG5-HKSCS. Adding nls support for those encodings (Bugzilla 1573, James Su). - -commit 1b900b59cb24fe8be3db0d434b04d462c0eeb206 -Author: Egbert Eich <eich-at-freedesktop-dot-xorg> -Date: Mon Oct 18 14:21:45 2004 +0000 - - Made handling of DevelDrivers for x86-64 more conformant to other platforms. - Compress all font encodings (Stefan Dirsch). - Fixed warnings. - Turn on forwarding XNSpotLocation event to XIM server in OffTheSpot and Root mode (bugzilla #1580, James Su). - Added another compose key combination for the Euro symbol (Stefan Dirsch). - Added support for UTF-8 in ja_JP, ko_KR and zh_TW locales (Mike Fabian). - Changed default encoding for ru from KOI8-R to ISO8859-5 (Mike Fabian). This is the encoding that is also used by glibc. We may break other libcs - lets see who complains. - Added explanation for DESTDIR to install to a different directory than /. - Added some early bailouts to atiprobe if PCI structure pointer is NULL to prevent sig11. - XV support doesn't depend on 2D acceleration any more. This patch removes this limitation from the NSC driver. This is a patch that I have committed to XFree86 a while ago but never ported over to X.Org. Matthieu Herrb contributed some build fixes. - Fixing SetDPMSTimers() so that DPMS*Time == 0 disables the appropriate timer. This takes advantage of the fact that TimerSet() with a timeout argument 0 behaves like TimerCanel(). - Use /dev/xconsole (named pipe) or devpts for system logger (Werner Fink). - Create missing links for backward compatibility to XFree86 (Stefan Dirsch). - Changed comment to mention xorg. - Changed cursor for the 'kill' action from XC_draped_box to XC_Pirate. If you don't like it we can change it back (original author unkown). - Added 'pic' to the man page rendering command pipeline (Werner Fink). - Added missing return value (Stefan Dirsch, Roland Mainz) - -commit 1ba103c3cad2329db3a31f88d7798b913affc570 -Author: Eric Anholt <anholt@freebsd.org> -Date: Wed Oct 13 07:38:00 2004 +0000 - - Use attributes instead of pragmas for weak symbols on gcc 2.95 as well. Using pragmas may result in the symbols being undefined with big -O. (FreeBSD ports/69708, Masakazu HIGAKI <higamasa@dream.com>) - -commit d80237db627bf71ad5615ff4ba05e6ab436aa740 -Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> -Date: Fri Oct 8 22:57:56 2004 +0000 - - Fri Oct 8 18:53:11 2004 Soeren Sandmann <sandmann@redhat.com> - Move iso10646 last so the "fallback" fonts will actually be used if they are better matches. - -commit d1f76d17ecf418396627b1a58319f2b9b255548a -Author: Markus Kuhn <Markus.Kuhn@cl.cam.ac.uk> -Date: Sun Sep 26 22:54:57 2004 +0000 - - bug fix for previous patch - -commit 48932d9b71d10e15812f47d5b842ab6aa8dac625 -Author: Markus Kuhn <Markus.Kuhn@cl.cam.ac.uk> -Date: Sun Sep 26 20:46:17 2004 +0000 - - The big keysym cleanup, to bring implementation in line with the recent revision of Appendix A of the protocol spec. (Markus Kuhn) - -commit 2e02a95dcc43dd3ec7bbaf4675ffb94f5074f543 -Author: Egbert Eich <eich@freedesktop.org> -Date: Wed Sep 15 09:05:22 2004 +0000 - - Unregistering events in XSelectInput() when unregistering IM filter callbacks may be a bad idea as others may be interested in this event. Removed the call to XSelectInput() altogether as we are in root window anyway (Lubos Lunak). - Fix size of a variable that gets assigned the value of SmartScheduleTime (long) to long. This should help to prevent smart scheduler lockup on 64 bit systems due to overruns (Andreas Schwab). - -commit 2d3afb68a104a80a21ee622b9abb9c95e83505d3 -Author: Egbert Eich <eich@freedesktop.org> -Date: Tue Aug 31 11:37:03 2004 +0000 - - Fixed some lockups in XIM code when the application is running with multi thread support. These lockups occur deep down in XFilterEvents() which itself locks when another Xlib function gets called that also locks. This fixes two instances by separating those Xlib functions into an internal (non-locking) call and a locking wrapper that is used as an external function. There may be several other such instances therefore another more general patch is eventually required (Bugzilla #1182). - -commit e689746c8d0e21e9011e8b91a3071d235d3a2a74 -Author: Kevin E Martin <kem@kem.org> -Date: Thu Aug 19 06:48:06 2004 +0000 - - Fix header file to #ifdef the XKB keysyms when they are used. This fixes the X test suite build failure. - -commit d558a53a6f57eecfcaadce5141fe3a08860defcb -Author: Keith Packard <keithp@keithp.com> -Date: Sat Aug 14 07:12:36 2004 +0000 - - Use XLIB_SKIP_ARGB_VISUALS environment variable to disable all depth 32 visuals. Necessary to keep Flash from crashing. - Must call ValidateGC/ValidatePicture on "real" GC/Picture to ensure pCompositeClip is set correctly. - Need to take the composite clip from the "real" GC/Picture and turn it into the clientClip for the backing version. - Adjust pixmap screen origin to account for drawable->x/y Change debugging output a bit (disabled by default) - -commit 85c2d81f299ed3444658011b7d6fb0a7ab8a6f55 -Author: Alexander Gottwald <ago@freedesktop.org> -Date: Fri Aug 13 16:28:19 2004 +0000 - - Set most significant bit to be a one. (Bug #1024, Kensuke Matsuzaki) - Fix conversion from sjis and euc. (Bug #1024, Toshio Takabe) - -commit c4d56e4e288d4e48b84b021a61638f46e9a45e27 -Author: Adam Jackson <ajax@nwnk.net> -Date: Wed Aug 11 05:25:13 2004 +0000 - - Bug #372: Prevent a crash in XPolygonRegion when called with a bogus point count. Reported by Andreas Luik. - -commit 92487437173f600f208d825f65756d3ad14a4f7e -Author: Kevin E Martin <kem@kem.org> -Date: Mon Aug 9 22:37:22 2004 +0000 - - Fix install problem on platforms not using xorg.cf/xfree86.cf (Bug #339, Harold L. Hunt II, Alexander Gottwald). - Fix crash when using X core font in zh_CN.UTF-8 locale (Bug #368, Yu Shao, David Dawes). - Fix glXMakeCurrent(Dpy, None, NULL) crash (Bug #719, Adam Jackson). - HP-PA build fix (Bug #828, Guy Martin, Paul Anderson). - Fix SDK build for GATOS and Wacom driver (Bug #829, Bryan Stine). - Fix attempt to read video ROM before enabling it (Bug #843, Ivan Kokshaysky, Mike A. Harris). - Fix detection of primary adapter (Bug #843, Ivan Kokshaysky, Mike A. Harris). - Clarify xset man page description of how to use the keyboard repeat rate settings (Bug #846, Mike A. Harris). - Fix problem where print-screen key would get remapped to sys-req in certain keymaps, which broke GNOME printscreen functionality (Bug #847, Owen Taylor). - Fix several render problems: - - MMIO mode support - - Hang on IGP chips - - VT switching hang - - 3D render corruption (Bug #922, Hui Yu). - -commit 55c2ee568e7d3903258286a13bdf96ce5348ffda -Author: Matthieu Herrb <matthieu.herrb@laas.fr> -Date: Tue Jul 27 06:06:05 2004 +0000 - - - remove remaining AMOEBA references. - - remove unused file. - -commit 6e884b12911eedfb003e90a3829ce66f7fc9cf2d -Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk> -Date: Tue Jul 20 17:48:09 2004 +0000 - - Tue Jul 20 19:38:06 2004 Soeren Sandmann <sandmann@daimi.au.dk> - Set font_data->xlfd_data to NULL after XFree(). (#837, patch from Bastien Nocera). - Tue Jul 20 18:23:32 2004 Soeren Sandmann <sandmann@daimi.au.dk> - Use /dev/urandom on Linux.(#761). - -commit 6f0bc97aa4e6de5a4b001f40ac10795cfdf09fc1 -Author: Eric Anholt <anholt@freebsd.org> -Date: Fri May 28 23:26:44 2004 +0000 - - Forced commit to note repocopy from xc/lib/XThrStub, will be connected to the build after this. - -commit aa7010c43ae9f39fb84b5ff155f76117c9e527a0 -Author: Egbert Eich <eich@pdx.freedesktop.org> -Date: Mon May 24 19:02:11 2004 +0000 - - Improve 'uniqueness' of authorization cookie sent by client for XDM-AUTHORIZATION-1. Old 'uniquness' consisted of the PID of the client, a time stamp (in seconds) and a number obtained by starting to count down from 0xffff. When a client did an XOpenDisplay() then execv'ed a child and did XOpenDisplay() again within the same second, the cookie was identical to the previous one (as the PID did not change but the static 'count down' variable was reinitialized) and thus refused by the server. - -commit 720702da29769d80ad1254d92edbad5b30f8a8da -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Sat May 22 03:47:42 2004 +0000 - - Bugzilla #658: XStringToKeysym fails for Greek_IOTAdiaeresis (Fixes VSW5 testcase XStringToKeysym-7 failure) - -commit 3aed873292424b497d9a7dcee2975b95bf5ac966 -Author: Alan Coopersmith <alan.coopersmith@sun.com> -Date: Sat Apr 24 23:39:25 2004 +0000 - - XOpenDisplay should try tcp connection if local connections fail (aka Sun bug id #4624183). - Also includes fix from NetBSD Problem Report #25098 (Michael van Elst) (Xlib segfaults with IPv6 if compiled with HASXDMAUTH). - xc/config/cf/sunLib.tmpl - xc/lib/FS/Imakefile Add missing shared library dependencies for Solaris - -commit c6349f43193b74a3c09945f3093a871b0157ba47 -Author: Egbert Eich <eich@freedesktop.org> -Date: Fri Apr 23 18:42:09 2004 +0000 - - Merging XORG-CURRENT into trunk - -commit c3c4ddc682950a01b80825021f3e2503ab01ea7f -Author: Kaleb Keithley <kaleb@freedesktop.org> -Date: Tue Nov 25 19:28:07 2003 +0000 - - Initial revision - -commit dc4268a7dadc8da0d561757a68461246728613d3 -Author: Kaleb Keithley <kaleb@freedesktop.org> -Date: Fri Nov 14 16:48:47 2003 +0000 - - Initial revision - -commit deae12c6b683898f5213992d561a59d4ea889cca -Author: Kaleb Keithley <kaleb@freedesktop.org> -Date: Fri Nov 14 15:54:30 2003 +0000 - - R6.6 is the Xorg base-line diff --git a/libX11/Makefile.am b/libX11/Makefile.am index b3d8cf5c4..1ad40303e 100644 --- a/libX11/Makefile.am +++ b/libX11/Makefile.am @@ -8,10 +8,7 @@ SUBDIRS=include $(ORDER) nls man specs ACLOCAL_AMFLAGS = -I m4
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = x11.pc
-if XCB
-pkgconfig_DATA += x11-xcb.pc
-endif
+pkgconfig_DATA = x11.pc x11-xcb.pc
MAINTAINERCLEANFILES = ChangeLog INSTALL
DISTCLEANFILES = doltcompile doltlibtool
diff --git a/libX11/autogen.sh b/libX11/autogen.sh new file mode 100644 index 000000000..6fcae015c --- /dev/null +++ b/libX11/autogen.sh @@ -0,0 +1,12 @@ +#! /bin/sh
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+ORIGDIR=`pwd`
+cd $srcdir
+
+autoreconf -v --install || exit 1
+cd $ORIGDIR || exit $?
+
+$srcdir/configure --enable-maintainer-mode "$@"
diff --git a/libX11/configure.ac b/libX11/configure.ac index 9bfc9815b..dfd93605b 100644 --- a/libX11/configure.ac +++ b/libX11/configure.ac @@ -3,11 +3,13 @@ AC_PREREQ(2.60)
AC_INIT([libX11],
- 1.3.3,
+ 1.3.4,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
libX11)
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_MACRO_DIR([m4])
+AC_CANONICAL_BUILD
+AC_CANONICAL_HOST
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
@@ -32,6 +34,7 @@ XORG_WITH_PS2PDF AC_PROG_LIBTOOL
DOLT
AC_PROG_CC
+PKG_PROG_PKG_CONFIG
if test x"$CC_FOR_BUILD" = x; then
if test x"$cross_compiling" = xyes; then
@@ -42,6 +45,27 @@ if test x"$CC_FOR_BUILD" = x; then fi
AC_SUBST([CC_FOR_BUILD])
+if test x"$CPPFLAGS_FOR_BUILD" = x; then
+ if test ! x"$cross_compiling" = xyes; then
+ CPPFLAGS_FOR_BUILD=${CPPFLAGS}
+ fi
+fi
+AC_SUBST(CPPFLAGS_FOR_BUILD)
+
+if test x"$CFLAGS_FOR_BUILD" = x; then
+ if test ! x"$cross_compiling" = xyes; then
+ CFLAGS_FOR_BUILD=${CFLAGS}
+ fi
+fi
+AC_SUBST(CFLAGS_FOR_BUILD)
+
+if test x"$LDFLAGS_FOR_BUILD" = x; then
+ if test ! x"$cross_compiling" = xyes; then
+ LDFLAGS_FOR_BUILD=${LDFLAGS}
+ fi
+fi
+AC_SUBST(LDFLAGS_FOR_BUILD)
+
XORG_PROG_RAWCPP
# Find perl for "make check" tests in nls/localerules.in
@@ -53,44 +77,14 @@ AC_ARG_WITH(perl, AC_CHECK_PROGS([PERL], [perl], [no]))
AM_CONDITIONAL(HAVE_PERL, test x$PERL != xno)
-# Build with XCB support?
-AC_ARG_WITH(xcb,
- AC_HELP_STRING([--with-xcb], [use XCB for low-level protocol implementation]),
- [ac_cv_use_xcb=$withval], [ac_cv_use_xcb=yes])
-AC_CACHE_CHECK([whether to use XCB], [ac_cv_use_xcb], [ac_cv_use_xcb=yes])
-AM_CONDITIONAL(XCB, test x$ac_cv_use_xcb != xno)
-
# Checks for pkg-config packages
# Always required
-X11_REQUIRES='xproto >= 7.0.13 xextproto xtrans'
+X11_REQUIRES='xproto >= 7.0.13 xextproto xtrans xcb >= 1.1.92'
+X11_EXTRA_DEPS="xcb >= 1.1.92"
PKG_PROG_PKG_CONFIG()
-case "$ac_cv_use_xcb" in
-no)
- X11_REQUIRES="${X11_REQUIRES} xau xcmiscproto bigreqsproto"
- X11_EXTRA_DEPS="xau"
- PKG_CHECK_MODULES(XDMCP, xdmcp,
- AC_CHECK_LIB(Xdmcp, XdmcpWrap,
- [
- AC_CHECK_LIB(Xdmcp, XdmcpWrap, [xdmauth="yes"], [xdmauth="no"], [$XDMCP_LIBS])
- X11_EXTRA_DEPS="$X11_EXTRA_DEPS xdmcp"
- ],
- [
- XDMCP_CFLAGS=
- XDMCP_LIBS=
- ], [$XDMCP_LIBS]),
- [AC_MSG_RESULT(no)])
- AC_DEFINE(USE_XCB, 0, [Use XCB for low-level protocol implementation])
- ;;
-*)
- X11_REQUIRES="${X11_REQUIRES} xcb >= 1.1.92"
- X11_EXTRA_DEPS="xcb >= 1.1.92"
- xdmauth="no" # XCB handles all auth
- AC_DEFINE(USE_XCB, 1, [Use XCB for low-level protocol implementation])
- ;;
-esac
AC_SUBST(X11_EXTRA_DEPS)
dnl Issue an error if xtrans.m4 was not found and XTRANS_CONNECTION_FLAGS macro
@@ -110,18 +104,64 @@ XTRANS_SECURE_RPC_FLAGS # Preferred order to try transports for local connections
AC_MSG_CHECKING([what order to try transports in for local connections])
+DEFAULT_LOCAL_TRANS=""
case $host_os in
solaris*)
# On Solaris 2.6 through 9, named pipes (LOCAL_TRANS) were
# faster than Unix domain sockets, but on Solaris 10 & later,
# Unix domain sockets are faster now.
- DEFAULT_LOCAL_TRANS="UNIX_TRANS,LOCAL_TRANS,TCP_TRANS"
+ if test "$UNIXCONN" = "yes" ; then
+ if test ! "x$DEFAULT_LOCAL_TRANS" = "x" ; then
+ DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS},"
+ fi
+ DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS}UNIX_TRANS"
+ fi
+ if test "$LOCALCONN" = "yes" ; then
+ if test ! "x$DEFAULT_LOCAL_TRANS" = "x" ; then
+ DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS},"
+ fi
+ DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS}LOCAL_TRANS"
+ fi
+ if test "$TCPCONN" = "yes" ; then
+ if test ! "x$DEFAULT_LOCAL_TRANS" = "x" ; then
+ DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS},"
+ fi
+ DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS}TCP_TRANS"
+ fi
+ ;;
+ linux*)
+ # LOCAL_TRANS is used for abstract sockets.
+ if test "$UNIXCONN" = "yes" ; then
+ if test ! "x$DEFAULT_LOCAL_TRANS" = "x" ; then
+ DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS},"
+ fi
+ DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS}LOCAL_TRANS,UNIX_TRANS"
+ fi
+ if test "$TCPCONN" = "yes" ; then
+ if test ! "x$DEFAULT_LOCAL_TRANS" = "x" ; then
+ DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS},"
+ fi
+ DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS}TCP_TRANS"
+ fi
;;
*)
- if test "$LOCALCONN" = "yes"; then
- DEFAULT_LOCAL_TRANS="LOCAL_TRANS,UNIX_TRANS,TCP_TRANS"
- else
- DEFAULT_LOCAL_TRANS="UNIX_TRANS,TCP_TRANS"
+ if test "$LOCALCONN" = "yes" ; then
+ if test ! "x$DEFAULT_LOCAL_TRANS" = "x" ; then
+ DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS},"
+ fi
+ DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS}LOCAL_TRANS"
+ fi
+ if test "$UNIXCONN" = "yes" ; then
+ if test ! "x$DEFAULT_LOCAL_TRANS" = "x" ; then
+ DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS},"
+ fi
+ DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS}UNIX_TRANS"
+ fi
+ if test "$TCPCONN" = "yes" ; then
+ if test ! "x$DEFAULT_LOCAL_TRANS" = "x" ; then
+ DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS},"
+ fi
+ DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS}TCP_TRANS"
fi
;;
esac
@@ -268,24 +308,13 @@ fi AC_SUBST(XTHREADLIB)
AC_SUBST(XTHREAD_CFLAGS)
-case x$xdmauth in
-xyes)
- XDMCP_CFLAGS="$XDMCP_CFLAGS -DHASXDMAUTH"
- ;;
-xno)
- XDMCP_LIBS=""
- ;;
-esac
-AC_SUBST(XDMCP_CFLAGS)
-AC_SUBST(XDMCP_LIBS)
-
AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], )
#
# Find keysymdef.h
#
AC_MSG_CHECKING([keysymdef.h])
-dir=`pkg-config --variable=includedir xproto`
+dir=`$PKG_CONFIG --variable=includedir xproto`
KEYSYMDEF="$dir/X11/keysymdef.h"
if test -f "$KEYSYMDEF"; then
AC_MSG_RESULT([$KEYSYMDEF])
@@ -509,7 +538,7 @@ AC_OUTPUT([Makefile x11.pc
x11-xcb.pc])
-man_pages_suffix=$LIBMAN_SUFFIX
+man_pages_suffix=$LIB_MAN_SUFFIX
if test -z "$man_pages_suffix"; then
man_pages_suffix=none
fi
@@ -518,7 +547,6 @@ echo "" echo "X11 will be built with the following settings:"
echo " Loadable i18n module support: "$XLIB_LOADABLE_I18N
echo " Loadable xcursor library support: "$XLIB_LOADABLE_XCURSOR
-echo " Use XCB: "$ac_cv_use_xcb
echo " Threading support: "$xthreads
echo " Use Threads safe API: "$mtsafeapi
echo " Threads stubs in libX11: "$thrstubs
diff --git a/libX11/include/Makefile.am b/libX11/include/Makefile.am index 582772321..bf8fcb954 100644 --- a/libX11/include/Makefile.am +++ b/libX11/include/Makefile.am @@ -1,22 +1,19 @@ -x11includedir=${includedir}/X11 -x11include_HEADERS=\ - X11/XKBlib.h \ - X11/Xcms.h \ - X11/Xlib.h \ - X11/Xlibint.h \ - X11/Xlocale.h \ - X11/Xresource.h \ - X11/Xutil.h \ - X11/cursorfont.h \ - X11/Xregion.h \ - X11/ImUtil.h - -nodist_x11include_HEADERS=\ - X11/XlibConf.h - -EXTRA_DIST = \ - X11/XlibConf.h.in - -if XCB -x11include_HEADERS += X11/Xlib-xcb.h -endif +x11includedir=${includedir}/X11
+x11include_HEADERS=\
+ X11/XKBlib.h \
+ X11/Xcms.h \
+ X11/Xlib.h \
+ X11/Xlibint.h \
+ X11/Xlocale.h \
+ X11/Xresource.h \
+ X11/Xutil.h \
+ X11/cursorfont.h \
+ X11/Xregion.h \
+ X11/ImUtil.h \
+ X11/Xlib-xcb.h
+
+nodist_x11include_HEADERS=\
+ X11/XlibConf.h
+
+EXTRA_DIST = \
+ X11/XlibConf.h.in
diff --git a/libX11/m4/ax_define_dir.m4 b/libX11/m4/ax_define_dir.m4 new file mode 100644 index 000000000..6e854daa0 --- /dev/null +++ b/libX11/m4/ax_define_dir.m4 @@ -0,0 +1,49 @@ +# ===========================================================================
+# http://www.gnu.org/software/autoconf-archive/ax_define_dir.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+# AX_DEFINE_DIR(VARNAME, DIR [, DESCRIPTION])
+#
+# DESCRIPTION
+#
+# This macro sets VARNAME to the expansion of the DIR variable, taking
+# care of fixing up ${prefix} and such.
+#
+# VARNAME is then offered as both an output variable and a C preprocessor
+# symbol.
+#
+# Example:
+#
+# AX_DEFINE_DIR([DATADIR], [datadir], [Where data are placed to.])
+#
+# LICENSE
+#
+# Copyright (c) 2008 Stepan Kasal <kasal@ucw.cz>
+# Copyright (c) 2008 Andreas Schwab <schwab@suse.de>
+# Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
+# Copyright (c) 2008 Alexandre Oliva
+#
+# Copying and distribution of this file, with or without modification, are
+# permitted in any medium without royalty provided the copyright notice
+# and this notice are preserved. This file is offered as-is, without any
+# warranty.
+
+#serial 6
+
+AU_ALIAS([AC_DEFINE_DIR], [AX_DEFINE_DIR])
+AC_DEFUN([AX_DEFINE_DIR], [
+ prefix_NONE=
+ exec_prefix_NONE=
+ test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
+ test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
+dnl In Autoconf 2.60, ${datadir} refers to ${datarootdir}, which in turn
+dnl refers to ${prefix}. Thus we have to use `eval' twice.
+ eval ax_define_dir="\"[$]$2\""
+ eval ax_define_dir="\"$ax_define_dir\""
+ AC_SUBST($1, "$ax_define_dir")
+ AC_DEFINE_UNQUOTED($1, "$ax_define_dir", [$3])
+ test "$prefix_NONE" && prefix=NONE
+ test "$exec_prefix_NONE" && exec_prefix=NONE
+])
diff --git a/libX11/m4/dolt.m4 b/libX11/m4/dolt.m4 new file mode 100644 index 000000000..ae14d705d --- /dev/null +++ b/libX11/m4/dolt.m4 @@ -0,0 +1,185 @@ +dnl dolt, a replacement for libtool
+dnl Copyright © 2007-2008 Josh Triplett <josh@freedesktop.org>
+dnl Copying and distribution of this file, with or without modification,
+dnl are permitted in any medium without royalty provided the copyright
+dnl notice and this notice are preserved.
+dnl
+dnl To use dolt, invoke the DOLT macro immediately after the libtool macros.
+dnl Optionally, copy this file into acinclude.m4, to avoid the need to have it
+dnl installed when running autoconf on your project.
+
+#
+# This is the 2008-11-05 version of dolt.m4 to which
+# cygwin support has been added at line 34
+#
+
+AC_DEFUN([DOLT], [
+AC_REQUIRE([AC_CANONICAL_HOST])
+# dolt, a replacement for libtool
+# Josh Triplett <josh@freedesktop.org>
+AC_PATH_PROG(DOLT_BASH, bash)
+AC_MSG_CHECKING([if dolt supports this host])
+dolt_supported=yes
+if test x$DOLT_BASH = x; then
+ dolt_supported=no
+fi
+if test x$GCC != xyes; then
+ dolt_supported=no
+fi
+case $host in
+i?86-*-linux*|x86_64-*-linux*|powerpc-*-linux* \
+|amd64-*-freebsd*|i?86-*-freebsd*|ia64-*-freebsd*)
+ pic_options='-fPIC'
+ ;;
+i?86-pc-cygwin*)
+ pic_options='-DDLL_EXPORT'
+ ;;
+i?86-apple-darwin*)
+ pic_options='-fno-common'
+ ;;
+*)
+ dolt_supported=no
+ ;;
+esac
+if test x$dolt_supported = xno ; then
+ AC_MSG_RESULT([no, falling back to libtool])
+ LTCOMPILE='$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(COMPILE)'
+ LTCXXCOMPILE='$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXXCOMPILE)'
+else
+ AC_MSG_RESULT([yes, replacing libtool])
+
+dnl Start writing out doltcompile.
+ cat <<__DOLTCOMPILE__EOF__ >doltcompile
+#!$DOLT_BASH
+__DOLTCOMPILE__EOF__
+ cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
+args=("$[]@")
+for ((arg=0; arg<${#args@<:@@@:>@}; arg++)) ; do
+ if test x"${args@<:@$arg@:>@}" = x-o ; then
+ objarg=$((arg+1))
+ break
+ fi
+done
+if test x$objarg = x ; then
+ echo 'Error: no -o on compiler command line' 1>&2
+ exit 1
+fi
+lo="${args@<:@$objarg@:>@}"
+obj="${lo%.lo}"
+if test x"$lo" = x"$obj" ; then
+ echo "Error: libtool object file name \"$lo\" does not end in .lo" 1>&2
+ exit 1
+fi
+objbase="${obj##*/}"
+__DOLTCOMPILE__EOF__
+
+dnl Write out shared compilation code.
+ if test x$enable_shared = xyes; then
+ cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
+libobjdir="${obj%$objbase}.libs"
+if test ! -d "$libobjdir" ; then
+ mkdir_out="$(mkdir "$libobjdir" 2>&1)"
+ mkdir_ret=$?
+ if test "$mkdir_ret" -ne 0 && test ! -d "$libobjdir" ; then
+ echo "$mkdir_out" 1>&2
+ exit $mkdir_ret
+ fi
+fi
+pic_object="$libobjdir/$objbase.o"
+args@<:@$objarg@:>@="$pic_object"
+__DOLTCOMPILE__EOF__
+ cat <<__DOLTCOMPILE__EOF__ >>doltcompile
+"\${args@<:@@@:>@}" $pic_options -DPIC || exit \$?
+__DOLTCOMPILE__EOF__
+ fi
+
+dnl Write out static compilation code.
+dnl Avoid duplicate compiler output if also building shared objects.
+ if test x$enable_static = xyes; then
+ cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
+non_pic_object="$obj.o"
+args@<:@$objarg@:>@="$non_pic_object"
+__DOLTCOMPILE__EOF__
+ if test x$enable_shared = xyes; then
+ cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
+"${args@<:@@@:>@}" >/dev/null 2>&1 || exit $?
+__DOLTCOMPILE__EOF__
+ else
+ cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
+"${args@<:@@@:>@}" || exit $?
+__DOLTCOMPILE__EOF__
+ fi
+ fi
+
+dnl Write out the code to write the .lo file.
+dnl The second line of the .lo file must match "^# Generated by .*libtool"
+ cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
+{
+echo "# $lo - a libtool object file"
+echo "# Generated by doltcompile, not libtool"
+__DOLTCOMPILE__EOF__
+
+ if test x$enable_shared = xyes; then
+ cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
+echo "pic_object='.libs/${objbase}.o'"
+__DOLTCOMPILE__EOF__
+ else
+ cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
+echo pic_object=none
+__DOLTCOMPILE__EOF__
+ fi
+
+ if test x$enable_static = xyes; then
+ cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
+echo "non_pic_object='${objbase}.o'"
+__DOLTCOMPILE__EOF__
+ else
+ cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
+echo non_pic_object=none
+__DOLTCOMPILE__EOF__
+ fi
+
+ cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
+} > "$lo"
+__DOLTCOMPILE__EOF__
+
+dnl Done writing out doltcompile; substitute it for libtool compilation.
+ chmod +x doltcompile
+ LTCOMPILE='$(top_builddir)/doltcompile $(COMPILE)'
+ LTCXXCOMPILE='$(top_builddir)/doltcompile $(CXXCOMPILE)'
+
+dnl automake ignores LTCOMPILE and LTCXXCOMPILE when it has separate CFLAGS for
+dnl a target, so write out a libtool wrapper to handle that case.
+dnl Note that doltlibtool does not handle inferred tags or option arguments
+dnl without '=', because automake does not use them.
+ cat <<__DOLTLIBTOOL__EOF__ > doltlibtool
+#!$DOLT_BASH
+__DOLTLIBTOOL__EOF__
+ cat <<'__DOLTLIBTOOL__EOF__' >>doltlibtool
+top_builddir_slash="${0%%doltlibtool}"
+: ${top_builddir_slash:=./}
+args=()
+modeok=false
+tagok=false
+for arg in "$[]@"; do
+ case "$arg" in
+ --mode=compile) modeok=true ;;
+ --tag=CC|--tag=CXX) tagok=true ;;
+ *) args@<:@${#args[@]}@:>@="$arg" ;;
+ esac
+done
+if $modeok && $tagok ; then
+ . ${top_builddir_slash}doltcompile "${args@<:@@@:>@}"
+else
+ exec ${top_builddir_slash}libtool "$[]@"
+fi
+__DOLTLIBTOOL__EOF__
+
+dnl Done writing out doltlibtool; substitute it for libtool.
+ chmod +x doltlibtool
+ LIBTOOL='$(top_builddir)/doltlibtool'
+fi
+AC_SUBST(LTCOMPILE)
+AC_SUBST(LTCXXCOMPILE)
+# end dolt
+])
diff --git a/libX11/man/XRaiseWindow.man b/libX11/man/XRaiseWindow.man index 8d7446606..071a884bc 100644 --- a/libX11/man/XRaiseWindow.man +++ b/libX11/man/XRaiseWindow.man @@ -1,346 +1,346 @@ -.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium -.\" -.\" Permission is hereby granted, free of charge, to any person obtaining -.\" a copy of this software and associated documentation files (the -.\" "Software"), to deal in the Software without restriction, including -.\" without limitation the rights to use, copy, modify, merge, publish, -.\" distribute, sublicense, and/or sell copies of the Software, and to -.\" permit persons to whom the Software is furnished to do so, subject to -.\" the following conditions: -.\" -.\" The above copyright notice and this permission notice shall be included -.\" in all copies or substantial portions of the Software. -.\" -.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -.\" IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR -.\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -.\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -.\" OTHER DEALINGS IN THE SOFTWARE. -.\" -.\" Except as contained in this notice, the name of the X Consortium shall -.\" not be used in advertising or otherwise to promote the sale, use or -.\" other dealings in this Software without prior written authorization -.\" from the X Consortium. -.\" -.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by -.\" Digital Equipment Corporation -.\" -.\" Portions Copyright \(co 1990, 1991 by -.\" Tektronix, Inc. -.\" -.\" Permission to use, copy, modify and distribute this documentation for -.\" any purpose and without fee is hereby granted, provided that the above -.\" copyright notice appears in all copies and that both that copyright notice -.\" and this permission notice appear in all copies, and that the names of -.\" Digital and Tektronix not be used in in advertising or publicity pertaining -.\" to this documentation without specific, written prior permission. -.\" Digital and Tektronix makes no representations about the suitability -.\" of this documentation for any purpose. -.\" It is provided ``as is'' without express or implied warranty. -.\" -.\" -.ds xT X Toolkit Intrinsics \- C Language Interface -.ds xW Athena X Widgets \- C Language X Toolkit Interface -.ds xL Xlib \- C Language X Interface -.ds xC Inter-Client Communication Conventions Manual -.na -.de Ds -.nf -.\\$1D \\$2 \\$1 -.ft 1 -.\".ps \\n(PS -.\".if \\n(VS>=40 .vs \\n(VSu -.\".if \\n(VS<=39 .vs \\n(VSp -.. -.de De -.ce 0 -.if \\n(BD .DF -.nr BD 0 -.in \\n(OIu -.if \\n(TM .ls 2 -.sp \\n(DDu -.fi -.. -.de FD -.LP -.KS -.TA .5i 3i -.ta .5i 3i -.nf -.. -.de FN -.fi -.KE -.LP -.. -.de IN \" send an index entry to the stderr -.. -.de C{ -.KS -.nf -.D -.\" -.\" choose appropriate monospace font -.\" the imagen conditional, 480, -.\" may be changed to L if LB is too -.\" heavy for your eyes... -.\" -.ie "\\*(.T"480" .ft L -.el .ie "\\*(.T"300" .ft L -.el .ie "\\*(.T"202" .ft PO -.el .ie "\\*(.T"aps" .ft CW -.el .ft R -.ps \\n(PS -.ie \\n(VS>40 .vs \\n(VSu -.el .vs \\n(VSp -.. -.de C} -.DE -.R -.. -.de Pn -.ie t \\$1\fB\^\\$2\^\fR\\$3 -.el \\$1\fI\^\\$2\^\fP\\$3 -.. -.de ZN -.ie t \fB\^\\$1\^\fR\\$2 -.el \fI\^\\$1\^\fP\\$2 -.. -.de hN -.ie t <\fB\\$1\fR>\\$2 -.el <\fI\\$1\fP>\\$2 -.. -.de NT -.ne 7 -.ds NO Note -.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2 -.if \\n(.$ .if !'\\$1'C' .ds NO \\$1 -.ie n .sp -.el .sp 10p -.TB -.ce -\\*(NO -.ie n .sp -.el .sp 5p -.if '\\$1'C' .ce 99 -.if '\\$2'C' .ce 99 -.in +5n -.ll -5n -.R -.. -. \" Note End -- doug kraft 3/85 -.de NE -.ce 0 -.in -5n -.ll +5n -.ie n .sp -.el .sp 10p -.. -.ny0 -.TH XRaiseWindow __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS" -.SH NAME -XRaiseWindow, XLowerWindow, XCirculateSubwindows, XCirculateSubwindowsUp, XCirculateSubwindowsDown, XRestackWindows \- change window stacking order -.SH SYNTAX -.HP -int XRaiseWindow\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^); -.HP -int XLowerWindow\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^); -.HP -int XCirculateSubwindows\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, int -\fIdirection\fP\^); -.HP -int XCirculateSubwindowsUp\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^); -.HP -int XCirculateSubwindowsDown\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^); -.HP -int XRestackWindows\^(\^Display *\fIdisplay\fP\^, Window \fIwindows\fP\^[], int -\fInwindows\fP\^); -.SH ARGUMENTS -.IP \fIdirection\fP 1i -Specifies the direction (up or down) that you want to circulate -the window. -You can pass -.ZN RaiseLowest -or -.ZN LowerHighest . -.IP \fIdisplay\fP 1i -Specifies the connection to the X server. -.IP \fInwindows\fP 1i -Specifies the number of windows to be restacked. -.IP \fIw\fP 1i -Specifies the window. -.IP \fIwindows\fP 1i -Specifies an array containing the windows to be restacked. -.SH DESCRIPTION -The -.ZN XRaiseWindow -function -raises the specified window to the top of the stack so that no sibling window -obscures it. -If the windows are regarded as overlapping sheets of paper stacked -on a desk, -then raising a window is analogous to moving the sheet to the top of -the stack but leaving its x and y location on the desk constant. -Raising a mapped window may generate -.ZN Expose -events for the window and any mapped subwindows that were formerly obscured. -.LP -If the override-redirect attribute of the window is -.ZN False -and some -other client has selected -.ZN SubstructureRedirectMask -on the parent, the X server generates a -.ZN ConfigureRequest -event, and no processing is performed. -Otherwise, the window is raised. -.LP -.ZN XRaiseWindow -can generate a -.ZN BadWindow -error. -.LP -The -.ZN XLowerWindow -function lowers the specified window to the bottom of the stack -so that it does not obscure any sibling -windows. -If the windows are regarded as overlapping sheets of paper -stacked on a desk, then lowering a window is analogous to moving the -sheet to the bottom of the stack but leaving its x and y location on -the desk constant. -Lowering a mapped window will generate -.ZN Expose -events on any windows it formerly obscured. -.LP -If the override-redirect attribute of the window is -.ZN False -and some -other client has selected -.ZN SubstructureRedirectMask -on the parent, the X server generates a -.ZN ConfigureRequest -event, and no processing is performed. -Otherwise, the window is lowered to the bottom of the -stack. -.LP -.ZN XLowerWindow -can generate a -.ZN BadWindow -error. -.LP -The -.ZN XCirculateSubwindows -function circulates children of the specified window in the specified -direction. -If you specify -.ZN RaiseLowest , -.ZN XCirculateSubwindows -raises the lowest mapped child (if any) that is occluded -by another child to the top of the stack. -If you specify -.ZN LowerHighest , -.ZN XCirculateSubwindows -lowers the highest mapped child (if any) that occludes another child -to the bottom of the stack. -Exposure processing is then performed on formerly obscured windows. -If some other client has selected -.ZN SubstructureRedirectMask -on the window, the X server generates a -.ZN CirculateRequest -event, and no further processing is performed. -If a child is actually restacked, -the X server generates a -.ZN CirculateNotify -event. -.LP -.ZN XCirculateSubwindows -can generate -.ZN BadValue -and -.ZN BadWindow -errors. -.LP -The -.ZN XCirculateSubwindowsUp -function raises the lowest mapped child of the specified window that -is partially -or completely -occluded by another child. -Completely unobscured children are not affected. -This is a convenience function equivalent to -.ZN XCirculateSubwindows -with -.ZN RaiseLowest -specified. -.LP -.ZN XCirculateSubwindowsUp -can generate a -.ZN BadWindow -error. -.LP -The -.ZN XCirculateSubwindowsDown -function lowers the highest mapped child of the specified window that partially -or completely occludes another child. -Completely unobscured children are not affected. -This is a convenience function equivalent to -.ZN XCirculateSubwindows -with -.ZN LowerHighest -specified. -.LP -.ZN XCirculateSubwindowsDown -can generate a -.ZN BadWindow -error. -.LP -The -.ZN XRestackWindows -function restacks the windows in the order specified, -from top to bottom. -The stacking order of the first window in the windows array is unaffected, -but the other windows in the array are stacked underneath the first window, -in the order of the array. -The stacking order of the other windows is not affected. -For each window in the window array that is not a child of the specified window, -a -.ZN BadMatch -error results. -.LP -If the override-redirect attribute of a window is -.ZN False -and some -other client has selected -.ZN SubstructureRedirectMask -on the parent, the X server generates -.ZN ConfigureRequest -events for each window whose override-redirect flag is not set, -and no further processing is performed. -Otherwise, the windows will be restacked in top-to-bottom order. -.LP -.ZN XRestackWindows -can generate -.ZN BadWindow -error. -.SH DIAGNOSTICS -.TP 1i -.ZN BadValue -Some numeric value falls outside the range of values accepted by the request. -Unless a specific range is specified for an argument, the full range defined -by the argument's type is accepted. Any argument defined as a set of -alternatives can generate this error. -.TP 1i -.ZN BadWindow -A value for a Window argument does not name a defined Window. -.SH "SEE ALSO" -XChangeWindowAttributes(__libmansuffix__), -XConfigureWindow(__libmansuffix__), -XCreateWindow(__libmansuffix__), -XDestroyWindow(__libmansuffix__), -XMapWindow(__libmansuffix__), -XUnmapWindow(__libmansuffix__) -.br -\fI\*(xL\fP +.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+.\"
+.\" Permission is hereby granted, free of charge, to any person obtaining
+.\" a copy of this software and associated documentation files (the
+.\" "Software"), to deal in the Software without restriction, including
+.\" without limitation the rights to use, copy, modify, merge, publish,
+.\" distribute, sublicense, and/or sell copies of the Software, and to
+.\" permit persons to whom the Software is furnished to do so, subject to
+.\" the following conditions:
+.\"
+.\" The above copyright notice and this permission notice shall be included
+.\" in all copies or substantial portions of the Software.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+.\" IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
+.\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+.\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+.\" OTHER DEALINGS IN THE SOFTWARE.
+.\"
+.\" Except as contained in this notice, the name of the X Consortium shall
+.\" not be used in advertising or otherwise to promote the sale, use or
+.\" other dealings in this Software without prior written authorization
+.\" from the X Consortium.
+.\"
+.\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991 by
+.\" Digital Equipment Corporation
+.\"
+.\" Portions Copyright \(co 1990, 1991 by
+.\" Tektronix, Inc.
+.\"
+.\" Permission to use, copy, modify and distribute this documentation for
+.\" any purpose and without fee is hereby granted, provided that the above
+.\" copyright notice appears in all copies and that both that copyright notice
+.\" and this permission notice appear in all copies, and that the names of
+.\" Digital and Tektronix not be used in in advertising or publicity pertaining
+.\" to this documentation without specific, written prior permission.
+.\" Digital and Tektronix makes no representations about the suitability
+.\" of this documentation for any purpose.
+.\" It is provided ``as is'' without express or implied warranty.
+.\"
+.\"
+.ds xT X Toolkit Intrinsics \- C Language Interface
+.ds xW Athena X Widgets \- C Language X Toolkit Interface
+.ds xL Xlib \- C Language X Interface
+.ds xC Inter-Client Communication Conventions Manual
+.na
+.de Ds
+.nf
+.\\$1D \\$2 \\$1
+.ft 1
+.\".ps \\n(PS
+.\".if \\n(VS>=40 .vs \\n(VSu
+.\".if \\n(VS<=39 .vs \\n(VSp
+..
+.de De
+.ce 0
+.if \\n(BD .DF
+.nr BD 0
+.in \\n(OIu
+.if \\n(TM .ls 2
+.sp \\n(DDu
+.fi
+..
+.de FD
+.LP
+.KS
+.TA .5i 3i
+.ta .5i 3i
+.nf
+..
+.de FN
+.fi
+.KE
+.LP
+..
+.de IN \" send an index entry to the stderr
+..
+.de C{
+.KS
+.nf
+.D
+.\"
+.\" choose appropriate monospace font
+.\" the imagen conditional, 480,
+.\" may be changed to L if LB is too
+.\" heavy for your eyes...
+.\"
+.ie "\\*(.T"480" .ft L
+.el .ie "\\*(.T"300" .ft L
+.el .ie "\\*(.T"202" .ft PO
+.el .ie "\\*(.T"aps" .ft CW
+.el .ft R
+.ps \\n(PS
+.ie \\n(VS>40 .vs \\n(VSu
+.el .vs \\n(VSp
+..
+.de C}
+.DE
+.R
+..
+.de Pn
+.ie t \\$1\fB\^\\$2\^\fR\\$3
+.el \\$1\fI\^\\$2\^\fP\\$3
+..
+.de ZN
+.ie t \fB\^\\$1\^\fR\\$2
+.el \fI\^\\$1\^\fP\\$2
+..
+.de hN
+.ie t <\fB\\$1\fR>\\$2
+.el <\fI\\$1\fP>\\$2
+..
+.de NT
+.ne 7
+.ds NO Note
+.if \\n(.$>$1 .if !'\\$2'C' .ds NO \\$2
+.if \\n(.$ .if !'\\$1'C' .ds NO \\$1
+.ie n .sp
+.el .sp 10p
+.TB
+.ce
+\\*(NO
+.ie n .sp
+.el .sp 5p
+.if '\\$1'C' .ce 99
+.if '\\$2'C' .ce 99
+.in +5n
+.ll -5n
+.R
+..
+. \" Note End -- doug kraft 3/85
+.de NE
+.ce 0
+.in -5n
+.ll +5n
+.ie n .sp
+.el .sp 10p
+..
+.ny0
+.TH XRaiseWindow __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+.SH NAME
+XRaiseWindow, XLowerWindow, XCirculateSubwindows, XCirculateSubwindowsUp, XCirculateSubwindowsDown, XRestackWindows \- change window stacking order
+.SH SYNTAX
+.HP
+int XRaiseWindow\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^);
+.HP
+int XLowerWindow\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^);
+.HP
+int XCirculateSubwindows\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^, int
+\fIdirection\fP\^);
+.HP
+int XCirculateSubwindowsUp\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^);
+.HP
+int XCirculateSubwindowsDown\^(\^Display *\fIdisplay\fP\^, Window \fIw\fP\^);
+.HP
+int XRestackWindows\^(\^Display *\fIdisplay\fP\^, Window \fIwindows\fP\^[], int
+\fInwindows\fP\^);
+.SH ARGUMENTS
+.IP \fIdirection\fP 1i
+Specifies the direction (up or down) that you want to circulate
+the window.
+You can pass
+.ZN RaiseLowest
+or
+.ZN LowerHighest .
+.IP \fIdisplay\fP 1i
+Specifies the connection to the X server.
+.IP \fInwindows\fP 1i
+Specifies the number of windows to be restacked.
+.IP \fIw\fP 1i
+Specifies the window.
+.IP \fIwindows\fP 1i
+Specifies an array containing the windows to be restacked.
+.SH DESCRIPTION
+The
+.ZN XRaiseWindow
+function
+raises the specified window to the top of the stack so that no sibling window
+obscures it.
+If the windows are regarded as overlapping sheets of paper stacked
+on a desk,
+then raising a window is analogous to moving the sheet to the top of
+the stack but leaving its x and y location on the desk constant.
+Raising a mapped window may generate
+.ZN Expose
+events for the window and any mapped subwindows that were formerly obscured.
+.LP
+If the override-redirect attribute of the window is
+.ZN False
+and some
+other client has selected
+.ZN SubstructureRedirectMask
+on the parent, the X server generates a
+.ZN ConfigureRequest
+event, and no processing is performed.
+Otherwise, the window is raised.
+.LP
+.ZN XRaiseWindow
+can generate a
+.ZN BadWindow
+error.
+.LP
+The
+.ZN XLowerWindow
+function lowers the specified window to the bottom of the stack
+so that it does not obscure any sibling
+windows.
+If the windows are regarded as overlapping sheets of paper
+stacked on a desk, then lowering a window is analogous to moving the
+sheet to the bottom of the stack but leaving its x and y location on
+the desk constant.
+Lowering a mapped window will generate
+.ZN Expose
+events on any windows it formerly obscured.
+.LP
+If the override-redirect attribute of the window is
+.ZN False
+and some
+other client has selected
+.ZN SubstructureRedirectMask
+on the parent, the X server generates a
+.ZN ConfigureRequest
+event, and no processing is performed.
+Otherwise, the window is lowered to the bottom of the
+stack.
+.LP
+.ZN XLowerWindow
+can generate a
+.ZN BadWindow
+error.
+.LP
+The
+.ZN XCirculateSubwindows
+function circulates children of the specified window in the specified
+direction.
+If you specify
+.ZN RaiseLowest ,
+.ZN XCirculateSubwindows
+raises the lowest mapped child (if any) that is occluded
+by another child to the top of the stack.
+If you specify
+.ZN LowerHighest ,
+.ZN XCirculateSubwindows
+lowers the highest mapped child (if any) that occludes another child
+to the bottom of the stack.
+Exposure processing is then performed on formerly obscured windows.
+If some other client has selected
+.ZN SubstructureRedirectMask
+on the window, the X server generates a
+.ZN CirculateRequest
+event, and no further processing is performed.
+If a child is actually restacked,
+the X server generates a
+.ZN CirculateNotify
+event.
+.LP
+.ZN XCirculateSubwindows
+can generate
+.ZN BadValue
+and
+.ZN BadWindow
+errors.
+.LP
+The
+.ZN XCirculateSubwindowsUp
+function raises the lowest mapped child of the specified window that
+is partially
+or completely
+occluded by another child.
+Completely unobscured children are not affected.
+This is a convenience function equivalent to
+.ZN XCirculateSubwindows
+with
+.ZN RaiseLowest
+specified.
+.LP
+.ZN XCirculateSubwindowsUp
+can generate a
+.ZN BadWindow
+error.
+.LP
+The
+.ZN XCirculateSubwindowsDown
+function lowers the highest mapped child of the specified window that partially
+or completely occludes another child.
+Completely unobscured children are not affected.
+This is a convenience function equivalent to
+.ZN XCirculateSubwindows
+with
+.ZN LowerHighest
+specified.
+.LP
+.ZN XCirculateSubwindowsDown
+can generate a
+.ZN BadWindow
+error.
+.LP
+The
+.ZN XRestackWindows
+function restacks the windows in the order specified,
+from top to bottom.
+The stacking order of the first window in the windows array is unaffected,
+but the other windows in the array are stacked underneath the first window,
+in the order of the array.
+The stacking order of the other windows is not affected.
+For each window in the window array that is not a sibling of the first window,
+a
+.ZN BadMatch
+error results.
+.LP
+If the override-redirect attribute of a window is
+.ZN False
+and some
+other client has selected
+.ZN SubstructureRedirectMask
+on the parent, the X server generates
+.ZN ConfigureRequest
+events for each window whose override-redirect flag is not set,
+and no further processing is performed.
+Otherwise, the windows will be restacked in top-to-bottom order.
+.LP
+.ZN XRestackWindows
+can generate
+.ZN BadWindow
+error.
+.SH DIAGNOSTICS
+.TP 1i
+.ZN BadValue
+Some numeric value falls outside the range of values accepted by the request.
+Unless a specific range is specified for an argument, the full range defined
+by the argument's type is accepted. Any argument defined as a set of
+alternatives can generate this error.
+.TP 1i
+.ZN BadWindow
+A value for a Window argument does not name a defined Window.
+.SH "SEE ALSO"
+XChangeWindowAttributes(__libmansuffix__),
+XConfigureWindow(__libmansuffix__),
+XCreateWindow(__libmansuffix__),
+XDestroyWindow(__libmansuffix__),
+XMapWindow(__libmansuffix__),
+XUnmapWindow(__libmansuffix__)
+.br
+\fI\*(xL\fP
diff --git a/libX11/modules/im/ximcp/Makefile.am b/libX11/modules/im/ximcp/Makefile.am index d696b867c..319b3089e 100644 --- a/libX11/modules/im/ximcp/Makefile.am +++ b/libX11/modules/im/ximcp/Makefile.am @@ -11,7 +11,6 @@ AM_CPPFLAGS= \ AM_CFLAGS= \
$(X11_CFLAGS) \
$(BIGFONT_CFLAGS) \
- $(XDMCP_CFLAGS) \
$(MALLOC_ZERO_CFLAGS) \
$(CWARNFLAGS)
diff --git a/libX11/modules/lc/Utf8/Makefile.am b/libX11/modules/lc/Utf8/Makefile.am index ffe33f1ac..01ad75185 100644 --- a/libX11/modules/lc/Utf8/Makefile.am +++ b/libX11/modules/lc/Utf8/Makefile.am @@ -11,7 +11,6 @@ AM_CPPFLAGS= \ AM_CFLAGS= \
$(X11_CFLAGS) \
$(BIGFONT_CFLAGS) \
- $(XDMCP_CFLAGS) \
$(MALLOC_ZERO_CFLAGS) \
$(CWARNFLAGS)
diff --git a/libX11/modules/lc/def/Makefile.am b/libX11/modules/lc/def/Makefile.am index e17cee0c3..b9bd31d6d 100644 --- a/libX11/modules/lc/def/Makefile.am +++ b/libX11/modules/lc/def/Makefile.am @@ -11,7 +11,6 @@ AM_CPPFLAGS= \ AM_CFLAGS= \
$(X11_CFLAGS) \
$(BIGFONT_CFLAGS) \
- $(XDMCP_CFLAGS) \
$(CWARNFLAGS)
if XLIB_LOADABLE_I18N
diff --git a/libX11/modules/lc/gen/Makefile.am b/libX11/modules/lc/gen/Makefile.am index 2567cf88f..91004a3c5 100644 --- a/libX11/modules/lc/gen/Makefile.am +++ b/libX11/modules/lc/gen/Makefile.am @@ -11,7 +11,6 @@ AM_CPPFLAGS= \ AM_CFLAGS= \
$(X11_CFLAGS) \
$(BIGFONT_CFLAGS) \
- $(XDMCP_CFLAGS) \
$(CWARNFLAGS)
if XLIB_LOADABLE_I18N
diff --git a/libX11/modules/lc/xlocale/Makefile.am b/libX11/modules/lc/xlocale/Makefile.am index 07fbd8052..ce1fd0976 100644 --- a/libX11/modules/lc/xlocale/Makefile.am +++ b/libX11/modules/lc/xlocale/Makefile.am @@ -11,7 +11,6 @@ AM_CPPFLAGS= \ AM_CFLAGS= \
$(X11_CFLAGS) \
$(BIGFONT_CFLAGS) \
- $(XDMCP_CFLAGS) \
$(CWARNFLAGS)
if XLIB_LOADABLE_I18N
diff --git a/libX11/modules/om/generic/Makefile.am b/libX11/modules/om/generic/Makefile.am index 9076edb48..435a0aa66 100644 --- a/libX11/modules/om/generic/Makefile.am +++ b/libX11/modules/om/generic/Makefile.am @@ -12,7 +12,6 @@ AM_CPPFLAGS= \ AM_CFLAGS= \
$(X11_CFLAGS) \
$(BIGFONT_CFLAGS) \
- $(XDMCP_CFLAGS) \
$(MALLOC_ZERO_CFLAGS) \
$(CWARNFLAGS)
diff --git a/libX11/specs/libX11/indexmacros.t b/libX11/specs/libX11/indexmacros.t new file mode 100644 index 000000000..ec5d4fa6d --- /dev/null +++ b/libX11/specs/libX11/indexmacros.t @@ -0,0 +1,3 @@ +.eh '\fBXlib \- C Library\fP''\fB\*(xV\fP'
+.oh '\fBXlib \- C Library\fP''\fB\*(xV\fP'
+.so index.pageno
diff --git a/libX11/specs/troffrules.in b/libX11/specs/troffrules.in index 17e55fddd..3e643ecdc 100644 --- a/libX11/specs/troffrules.in +++ b/libX11/specs/troffrules.in @@ -84,7 +84,7 @@ SUFFIXES = .ms .ps .txt .html .pdf $< 2> index.$@.raw > $@
.ms.html:
- $(AM_V_GEN) $(GROFF) -Thtml -P-Dimages -P-I$*-image $(GROFF_FLAGS) $< 2> index.$@.raw > $@
+ $(AM_V_GEN) $(GROFF) $(GROFF_FLAGS) -Thtml -P-Dimages -P-I$*-image $< 2> index.$@.raw > $@
.ps.pdf:
$(AM_V_GEN) $(PS2PDF) $< $@
diff --git a/libX11/src/ClDisplay.c b/libX11/src/ClDisplay.c index cc0e3315b..148284ff9 100644 --- a/libX11/src/ClDisplay.c +++ b/libX11/src/ClDisplay.c @@ -1,82 +1,74 @@ - -/* - -Copyright 1985, 1990, 1998 The Open Group - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appear in all copies and that both that -copyright notice and this permission notice appear in supporting -documentation. - -The above copyright notice and this permission notice shall be included -in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR -OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of The Open Group shall -not be used in advertising or otherwise to promote the sale, use or -other dealings in this Software without prior written authorization -from The Open Group. - -*/ - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif -#if USE_XCB -#include "Xxcbint.h" -#else /* !USE_XCB */ -#include <X11/Xtrans/Xtrans.h> -#endif /* USE_XCB */ -#include "Xlib.h" -#include "Xlibint.h" -#include "Xintconn.h" - -/* - * XCloseDisplay - XSync the connection to the X Server, close the connection, - * and free all associated storage. Extension close procs should only free - * memory and must be careful about the types of requests they generate. - */ - -int -XCloseDisplay ( - register Display *dpy) -{ - register _XExtension *ext; - register int i; - - if (!(dpy->flags & XlibDisplayClosing)) - { - dpy->flags |= XlibDisplayClosing; - for (i = 0; i < dpy->nscreens; i++) { - register Screen *sp = &dpy->screens[i]; - XFreeGC (dpy, sp->default_gc); - } - if (dpy->cursor_font != None) { - XUnloadFont (dpy, dpy->cursor_font); - } - XSync(dpy, 1); /* throw away pending events, catch errors */ - /* call out to any extensions interested */ - for (ext = dpy->ext_procs; ext; ext = ext->next) { - if (ext->close_display) - (*ext->close_display)(dpy, &ext->codes); - } - /* if the closes generated more protocol, sync them up */ - if (dpy->request != dpy->last_request_read) - XSync(dpy, 1); - } -#if USE_XCB - xcb_disconnect(dpy->xcb->connection); -#else /* !USE_XCB */ - _XDisconnectDisplay(dpy->trans_conn); -#endif /* USE_XCB */ - _XFreeDisplayStructure (dpy); - return 0; -} +
+/*
+
+Copyright 1985, 1990, 1998 The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of The Open Group shall
+not be used in advertising or otherwise to promote the sale, use or
+other dealings in this Software without prior written authorization
+from The Open Group.
+
+*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include "Xxcbint.h"
+#include "Xlib.h"
+#include "Xlibint.h"
+#include "Xintconn.h"
+
+/*
+ * XCloseDisplay - XSync the connection to the X Server, close the connection,
+ * and free all associated storage. Extension close procs should only free
+ * memory and must be careful about the types of requests they generate.
+ */
+
+int
+XCloseDisplay (
+ register Display *dpy)
+{
+ register _XExtension *ext;
+ register int i;
+
+ if (!(dpy->flags & XlibDisplayClosing))
+ {
+ dpy->flags |= XlibDisplayClosing;
+ for (i = 0; i < dpy->nscreens; i++) {
+ register Screen *sp = &dpy->screens[i];
+ XFreeGC (dpy, sp->default_gc);
+ }
+ if (dpy->cursor_font != None) {
+ XUnloadFont (dpy, dpy->cursor_font);
+ }
+ XSync(dpy, 1); /* throw away pending events, catch errors */
+ /* call out to any extensions interested */
+ for (ext = dpy->ext_procs; ext; ext = ext->next) {
+ if (ext->close_display)
+ (*ext->close_display)(dpy, &ext->codes);
+ }
+ /* if the closes generated more protocol, sync them up */
+ if (dpy->request != dpy->last_request_read)
+ XSync(dpy, 1);
+ }
+ xcb_disconnect(dpy->xcb->connection);
+ _XFreeDisplayStructure (dpy);
+ return 0;
+}
diff --git a/libX11/src/ConnDis.c b/libX11/src/ConnDis.c deleted file mode 100644 index 4eb94f34d..000000000 --- a/libX11/src/ConnDis.c +++ /dev/null @@ -1,1251 +0,0 @@ -/*
-
-Copyright 1989, 1998 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-
-/*
- * This file contains operating system dependencies.
- */
-
-#define NEED_EVENTS
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <X11/Xlibint.h>
-#include <X11/Xtrans/Xtrans.h>
-#include <X11/Xauth.h>
-#ifdef HASXDMAUTH
-#include <X11/Xdmcp.h>
-#endif
-#include <stdio.h>
-#include <ctype.h>
-#include <unistd.h>
-
-#if !defined(WIN32)
-#ifndef Lynx
-#include <sys/socket.h>
-#else
-#include <socket.h>
-#endif
-#else
-#include <X11/Xwindows.h>
-#endif
-
-#ifndef X_CONNECTION_RETRIES /* number retries on ECONNREFUSED */
-#define X_CONNECTION_RETRIES 5
-#endif
-
-#include "Xintconn.h"
-
-/* prototypes */
-static void GetAuthorization(
- XtransConnInfo trans_conn,
- int family,
- char *saddr,
- int saddrlen,
- int idisplay,
- char **auth_namep,
- int *auth_namelenp,
- char **auth_datap,
- int *auth_datalenp);
-
-/* functions */
-static char *copystring (const char *src, int len)
-{
- char *dst = Xmalloc (len + 1);
-
- if (dst) {
- strncpy (dst, src, len);
- dst[len] = '\0';
- }
-
- return dst;
-}
-
-#define Xstrdup(s) copystring(s, strlen(s))
-
-#ifdef TCPCONN
-# define TCP_TRANS "tcp"
-#endif
-#ifdef UNIXCONN
-# define UNIX_TRANS "unix"
-#endif
-#if defined(LOCALCONN) || defined(OS2PIPECONN)
-# define LOCAL_TRANS "local"
-#endif
-
-/*
- * Attempts to connect to server, given display name. Returns file descriptor
- * (network socket) or -1 if connection fails. Display names may be of the
- * following format:
- *
- * [protocol/] [hostname] : [:] displaynumber [.screennumber]
- *
- * A string with exactly two colons seperating hostname from the display
- * indicates a DECnet style name. Colons in the hostname may occur if an
- * IPv6 numeric address is used as the hostname. An IPv6 numeric address
- * may also end in a double colon, so three colons in a row indicates an
- * IPv6 address ending in :: followed by :display. To make it easier for
- * people to read, an IPv6 numeric address hostname may be surrounded by
- * [ ] in a similar fashion to the IPv6 numeric address URL syntax defined
- * by IETF RFC 2732.
- *
- * If no hostname and no protocol is specified, the string is interpreted
- * as the most efficient local connection to a server on the same machine.
- * This is usually:
- *
- * o shared memory
- * o local stream
- * o UNIX domain socket
- * o TCP to local host
- *
- * This function will eventually call the X Transport Interface functions
- * which expects the hostname in the format:
- *
- * [protocol/] [hostname] : [:] displaynumber
- *
- */
-XtransConnInfo
-_X11TransConnectDisplay (
- char *display_name,
- char **fullnamep, /* RETURN */
- int *dpynump, /* RETURN */
- int *screenp, /* RETURN */
- char **auth_namep, /* RETURN */
- int *auth_namelenp, /* RETURN */
- char **auth_datap, /* RETURN */
- int *auth_datalenp) /* RETURN */
-{
- int family;
- int saddrlen;
- Xtransaddr *saddr;
- char *lastp, *lastc, *p; /* char pointers */
- char *pprotocol = NULL; /* start of protocol name */
- char *phostname = NULL; /* start of host of display */
- char *pdpynum = NULL; /* start of dpynum of display */
- char *pscrnum = NULL; /* start of screen of display */
- Bool dnet = False; /* if true, then DECnet format */
- int idisplay = 0; /* required display number */
- int iscreen = 0; /* optional screen number */
- /* int (*connfunc)(); */ /* method to create connection */
- int len, hostlen; /* length tmp variable */
- int retry; /* retry counter */
- char addrbuf[128]; /* final address passed to
- X Transport Interface */
- char* address = addrbuf;
- XtransConnInfo trans_conn = NULL; /* transport connection object */
- int connect_stat;
-#if defined(LOCALCONN) || defined(UNIXCONN) || defined(TCPCONN)
- Bool reset_hostname = False; /* Reset hostname? */
- char *original_hostname = NULL;
- int local_transport_index = -1;
- const char *local_transport[] = { LOCAL_TRANSPORT_LIST, NULL };
-#endif
-
- p = display_name;
-
- saddrlen = 0; /* set so that we can clear later */
- saddr = NULL;
-
- /*
- * Step 0, find the protocol. This is delimited by the optional
- * slash ('/').
- */
- for (lastp = p; *p && *p != ':' && *p != '/'; p++) ;
- if (!*p) return NULL; /* must have a colon */
-
- if (p != lastp && *p != ':') { /* protocol given? */
- pprotocol = copystring (lastp, p - lastp);
- if (!pprotocol) goto bad; /* no memory */
- p++; /* skip the '/' */
- } else
- p = display_name; /* reset the pointer in
- case no protocol was given */
-
- /*
- * Step 1, find the hostname. This is delimited by either one colon,
- * or two colons in the case of DECnet (DECnet Phase V allows a single
- * colon in the hostname). (See note above regarding IPv6 numeric
- * addresses with triple colons or [] brackets.)
- */
-
- lastp = p;
- lastc = NULL;
- for (; *p; p++)
- if (*p == ':')
- lastc = p;
-
- if (!lastc) return NULL; /* must have a colon */
-
- if ((lastp != lastc) && (*(lastc - 1) == ':')
-#if defined(IPv6) && defined(AF_INET6)
- && ( ((lastc - 1) == lastp) || (*(lastc - 2) != ':'))
-#endif
- ) {
- /* DECnet display specified */
-
-#ifndef DNETCONN
- goto bad;
-#else
- dnet = True;
- /* override the protocol specified */
- if (pprotocol)
- Xfree (pprotocol);
- pprotocol = copystring ("dnet", 4);
- hostlen = lastc - 1 - lastp;
-#endif
- }
- else
- hostlen = lastc - lastp;
-
- if (hostlen > 0) { /* hostname given? */
- phostname = copystring (lastp, hostlen);
- if (!phostname) goto bad; /* no memory */
- }
-
- p = lastc;
-
-#if defined(LOCALCONN) || defined(UNIXCONN) || defined(TCPCONN)
- /* check if phostname == localnodename AND protocol not specified */
- if (!pprotocol && phostname) {
- char localhostname[256];
-
- if ((_XGetHostname (localhostname, sizeof localhostname) > 0)
- && (strcmp(phostname, localhostname) == 0)) {
- original_hostname = phostname;
- phostname = NULL;
- reset_hostname = True;
- }
- }
-#endif
-
-
- /*
- * Step 2, find the display number. This field is required and is
- * delimited either by a nul or a period, depending on whether or not
- * a screen number is present.
- */
-
- for (lastp = ++p; *p && isascii(*p) && isdigit(*p); p++) ;
- if ((p == lastp) || /* required field */
- (*p != '\0' && *p != '.') || /* invalid non-digit terminator */
- !(pdpynum = copystring (lastp, p - lastp))) /* no memory */
- goto bad;
- idisplay = atoi (pdpynum);
-
-
- /*
- * Step 3, find the screen number. This field is optional. It is
- * present only if the display number was followed by a period (which
- * we've already verified is the only non-nul character).
- */
-
- if (*p) {
- for (lastp = ++p; *p && isascii(*p) && isdigit (*p); p++) ;
- if (p != lastp) {
- if (*p || /* non-digits */
- !(pscrnum = copystring (lastp, p - lastp))) /* no memory */
- goto bad;
- iscreen = atoi (lastp);
- }
- }
-
- /*
- * At this point, we know the following information:
- *
- * pprotocol protocol string or NULL
- * phostname hostname string or NULL
- * idisplay display number
- * iscreen screen number
- * dnet DECnet boolean
- *
- * We can now decide which transport to use based on the defined
- * connection types and the hostname string.
- * If phostname & pprotocol are NULL, then choose the best transport.
- * If phostname is "unix" & pprotocol is NULL, then choose UNIX domain
- * sockets (if configured).
- */
-
-#if defined(TCPCONN) || defined(UNIXCONN) || defined(LOCALCONN) || defined(MNX_TCPCONN) || defined(OS2PIPECONN)
- if (!pprotocol) {
-#if defined(UNIXCONN)
- if (phostname && (strcmp (phostname, "unix") == 0)) {
- Xfree(pprotocol);
- pprotocol = copystring ("unix", 4);
- } else
-#endif
-#ifdef HAVE_LAUNCHD
- if (phostname && phostname[0]=='/') {
- pprotocol = copystring ("local", 5);
- }
-#endif
- if (!phostname)
- {
- if (local_transport[0] != NULL) {
- pprotocol = Xstrdup(local_transport[0]);
- local_transport_index = 0;
- }
- }
-
- if (!pprotocol) { /* if still not found one, tcp is our last resort */
- pprotocol = copystring ("tcp", 3);
- }
- }
-#endif
-
-
- connect:
- /*
- * This seems kind of backwards, but we need to put the protocol,
- * host, and port back together to pass to _X11TransOpenCOTSClient().
- */
-
- {
- int olen = 3 + (pprotocol ? strlen(pprotocol) : 0) +
- (phostname ? strlen(phostname) : 0) +
- (pdpynum ? strlen(pdpynum) : 0);
- if (olen > sizeof addrbuf) address = Xmalloc (olen);
- }
- if (!address) goto bad;
-
- sprintf(address,"%s/%s:%d",
- pprotocol ? pprotocol : "",
- phostname ? phostname : "",
- idisplay );
-
- /*
- * Make the connection, also need to get the auth address info for
- * the connection. Do retries in case server host has hit its
- * backlog (which, unfortunately, isn't distinguishable from there not
- * being a server listening at all, which is why we have to not retry
- * too many times).
- */
- for(retry=X_CONNECTION_RETRIES; retry>=0; retry-- )
- {
- if ( (trans_conn = _X11TransOpenCOTSClient(address)) == NULL )
- {
- break;
- }
- if ((connect_stat = _X11TransConnect(trans_conn,address)) < 0 )
- {
- _X11TransClose(trans_conn);
- trans_conn = NULL;
-
- if (connect_stat == TRANS_TRY_CONNECT_AGAIN)
- continue;
- else
- break;
- }
-
- _X11TransGetPeerAddr(trans_conn, &family, &saddrlen, &saddr);
-
- /*
- * The family is given in a socket format (ie AF_INET). This
- * will convert it to the format used by the authorization and
- * X protocol (ie FamilyInternet).
- */
-
- if( _X11TransConvertAddress(&family, &saddrlen, &saddr) < 0 )
- {
- _X11TransClose(trans_conn);
- trans_conn = NULL;
- if (saddr)
- {
- free ((char *) saddr);
- saddr = NULL;
- }
- continue;
- }
-
- break;
- }
-
- if (address != addrbuf) Xfree (address);
- address = addrbuf;
-
- if( trans_conn == NULL )
- goto bad;
-
- /*
- * Set close-on-exec so that programs that fork() doesn't get confused.
- */
-
- _X11TransSetOption(trans_conn,TRANS_CLOSEONEXEC,1);
-
- /*
- * Build the expanded display name:
- *
- * [host] : [:] dpy . scr \0
- */
-#if defined(LOCALCONN) || defined(TCPCONN) || defined(UNIXCONN)
- /*
- * If we computed the host name, get rid of it so that
- * XDisplayString() and XDisplayName() agree.
- */
- if (reset_hostname && (phostname != original_hostname)) {
- Xfree (phostname);
- phostname = original_hostname;
- original_hostname = NULL;
- }
-#endif
- len = ((phostname ? strlen(phostname) : 0) + 1 + (dnet ? 1 : 0) +
- strlen(pdpynum) + 1 + (pscrnum ? strlen(pscrnum) : 1) + 1);
- *fullnamep = (char *) Xmalloc (len);
- if (!*fullnamep) goto bad;
-
-#ifdef HAVE_LAUNCHD
- if (phostname && strlen(phostname) > 11 && !strncmp(phostname, "/tmp/launch", 11))
- sprintf (*fullnamep, "%s%s%d",
- (phostname ? phostname : ""),
- (dnet ? "::" : ":"),
- idisplay);
- else
-#endif
- sprintf (*fullnamep, "%s%s%d.%d",
- (phostname ? phostname : ""),
- (dnet ? "::" : ":"),
- idisplay, iscreen);
-
- *dpynump = idisplay;
- *screenp = iscreen;
- if (pprotocol) Xfree (pprotocol);
- if (phostname) Xfree (phostname);
- if (pdpynum) Xfree (pdpynum);
- if (pscrnum) Xfree (pscrnum);
-#if defined(LOCALCONN) || defined(UNIXCONN) || defined(TCPCONN)
- if (original_hostname) Xfree (original_hostname);
-#endif
-
- GetAuthorization(trans_conn, family, (char *) saddr, saddrlen, idisplay,
- auth_namep, auth_namelenp, auth_datap, auth_datalenp);
- return trans_conn;
-
-
- /*
- * error return; make sure everything is cleaned up.
- */
- bad:
- if (trans_conn) (void)_X11TransClose(trans_conn);
- if (saddr) free ((char *) saddr);
- if (pprotocol) Xfree (pprotocol);
- if (phostname) Xfree (phostname);
- if (address && address != addrbuf) { Xfree(address); address = addrbuf; }
-
-#if defined(LOCALCONN) || defined(UNIXCONN) || defined(TCPCONN)
- /* If connecting to the local machine, and we failed, try again with
- * the next transport type available, if there is one.
- */
- if (local_transport_index >= 0) {
- if (local_transport[++local_transport_index] != NULL) {
- pprotocol = Xstrdup(local_transport[local_transport_index]);
-#ifdef TCPCONN
- if (strcmp(pprotocol, "tcp") == 0) {
- if (original_hostname != NULL) {
- phostname = original_hostname;
- original_hostname = NULL;
- } else {
- phostname = copystring("localhost", 9);
- }
- } else
-#endif /* TCPCONN */
- {
- if ((phostname != NULL) && (original_hostname == NULL)) {
- original_hostname = phostname;
- }
- phostname = NULL;
- }
- goto connect;
- }
- }
-
- /* No more to try, we've failed all available local transports */
- if (original_hostname) Xfree(original_hostname);
-#endif /* LOCALCONN || UNIXCONN || TCPCONN */
-
- if (pdpynum) Xfree (pdpynum);
- if (pscrnum) Xfree (pscrnum);
- return NULL;
-
-}
-
-/*
- * This is gross, but we need it for compatiblity.
- * The test suite relies on the following interface.
- *
- */
-
-int _XConnectDisplay (
- char *display_name,
- char **fullnamep, /* RETURN */
- int *dpynump, /* RETURN */
- int *screenp, /* RETURN */
- char **auth_namep, /* RETURN */
- int *auth_namelenp, /* RETURN */
- char **auth_datap, /* RETURN */
- int *auth_datalenp) /* RETURN */
-{
- XtransConnInfo trans_conn;
-
- trans_conn = _X11TransConnectDisplay (
- display_name, fullnamep, dpynump, screenp,
- auth_namep, auth_namelenp, auth_datap, auth_datalenp);
-
- if (trans_conn)
- {
- int fd = _X11TransGetConnectionNumber (trans_conn);
- _X11TransFreeConnInfo (trans_conn);
- return (fd);
- }
- else
- return (-1);
-}
-
-
-/*****************************************************************************
- * *
- * Connection Utility Routines *
- * *
- *****************************************************************************/
-
-/*
- * Disconnect from server.
- */
-
-int _XDisconnectDisplay (XtransConnInfo trans_conn)
-{
- _X11TransDisconnect(trans_conn);
- _X11TransClose(trans_conn);
- return 0;
-}
-
-
-
-Bool
-_XSendClientPrefix(
- Display *dpy,
- xConnClientPrefix *client, /* contains count for auth_* */
- char *auth_proto, char *auth_string, /* NOT null-terminated */
- xConnSetupPrefix *prefix) /* prefix information */
-{
- int auth_length = client->nbytesAuthProto;
- int auth_strlen = client->nbytesAuthString;
- static char padbuf[3]; /* for padding to 4x bytes */
- int pad;
- struct iovec iovarray[5], *iov = iovarray;
- int niov = 0;
- int len = 0;
-
-#define add_to_iov(b,l) \
- { iov->iov_base = (b); iov->iov_len = (l); iov++, niov++; len += (l); }
-
- add_to_iov ((caddr_t) client, SIZEOF(xConnClientPrefix));
-
- /*
- * write authorization protocol name and data
- */
- if (auth_length > 0) {
- add_to_iov (auth_proto, auth_length);
- pad = -auth_length & 3; /* pad auth_length to a multiple of 4 */
- if (pad) add_to_iov (padbuf, pad);
- }
- if (auth_strlen > 0) {
- add_to_iov (auth_string, auth_strlen);
- pad = -auth_strlen & 3; /* pad auth_strlen to a multiple of 4 */
- if (pad) add_to_iov (padbuf, pad);
- }
-
-#undef add_to_iov
-
- len -= _X11TransWritev (dpy->trans_conn, iovarray, niov);
-
- /*
- * Set the connection non-blocking since we use select() to block.
- */
-
- _X11TransSetOption(dpy->trans_conn, TRANS_NONBLOCKING, 1);
-
- if (len != 0)
- return -1;
-
-#ifdef K5AUTH
- if (auth_length == 14 &&
- !strncmp(auth_proto, "MIT-KERBEROS-5", 14))
- {
- return k5_clientauth(dpy, prefix);
- } else
-#endif
- return 0;
-}
-
-
-#ifdef STREAMSCONN
-#ifdef SVR4
-#include <tiuser.h>
-#else
-#undef HASXDMAUTH
-#endif
-#endif
-
-#ifdef SECURE_RPC
-#include <rpc/rpc.h>
-#ifdef ultrix
-#include <time.h>
-#include <rpc/auth_des.h>
-#endif
-#endif
-
-#ifdef HASXDMAUTH
-#include <time.h>
-#define Time_t time_t
-#endif
-
-/*
- * First, a routine for setting authorization data
- */
-static int xauth_namelen = 0;
-static char *xauth_name = NULL; /* NULL means use default mechanism */
-static int xauth_datalen = 0;
-static char *xauth_data = NULL; /* NULL means get default data */
-
-/*
- * This is a list of the authorization names which Xlib currently supports.
- * Xau will choose the file entry which matches the earliest entry in this
- * array, allowing us to prioritize these in terms of the most secure first
- */
-
-static char *default_xauth_names[] = {
-#ifdef K5AUTH
- "MIT-KERBEROS-5",
-#endif
-#ifdef SECURE_RPC
- "SUN-DES-1",
-#endif
-#ifdef HASXDMAUTH
- "XDM-AUTHORIZATION-1",
-#endif
- "MIT-MAGIC-COOKIE-1"
-};
-
-static _Xconst int default_xauth_lengths[] = {
-#ifdef K5AUTH
- 14, /* strlen ("MIT-KERBEROS-5") */
-#endif
-#ifdef SECURE_RPC
- 9, /* strlen ("SUN-DES-1") */
-#endif
-#ifdef HASXDMAUTH
- 19, /* strlen ("XDM-AUTHORIZATION-1") */
-#endif
- 18 /* strlen ("MIT-MAGIC-COOKIE-1") */
-};
-
-#define NUM_DEFAULT_AUTH (sizeof (default_xauth_names) / sizeof (default_xauth_names[0]))
-
-static char **xauth_names = default_xauth_names;
-static _Xconst int *xauth_lengths = default_xauth_lengths;
-
-static int xauth_names_length = NUM_DEFAULT_AUTH;
-
-void XSetAuthorization (
- char *name, int namelen, /* *len are lengths of name and data */
- char *data, int datalen) /* name/data are NULL or arbitrary array of bytes */
-{
- char *tmpname, *tmpdata;
-
- _XLockMutex(_Xglobal_lock);
- if (xauth_name) Xfree (xauth_name); /* free any existing data */
- if (xauth_data) Xfree (xauth_data);
-
- xauth_name = xauth_data = NULL; /* mark it no longer valid */
- xauth_namelen = xauth_datalen = 0;
- _XUnlockMutex(_Xglobal_lock);
-
- if (namelen < 0) namelen = 0; /* check for bogus inputs */
- if (datalen < 0) datalen = 0; /* maybe should return? */
-
- if (namelen > 0) { /* try to allocate space */
- tmpname = Xmalloc ((unsigned) namelen);
- if (!tmpname) return;
- memcpy (tmpname, name, namelen);
- } else {
- tmpname = NULL;
- }
-
- if (datalen > 0) {
- tmpdata = Xmalloc ((unsigned) datalen);
- if (!tmpdata) {
- if (tmpname) (void) Xfree (tmpname);
- return;
- }
- memcpy (tmpdata, data, datalen);
- } else {
- tmpdata = NULL;
- }
-
- _XLockMutex(_Xglobal_lock);
- xauth_name = tmpname; /* and store the suckers */
- xauth_namelen = namelen;
- if (tmpname)
- {
- xauth_names = &xauth_name;
- xauth_lengths = &xauth_namelen;
- xauth_names_length = 1;
- }
- else
- {
- xauth_names = default_xauth_names;
- xauth_lengths = default_xauth_lengths;
- xauth_names_length = NUM_DEFAULT_AUTH;
- }
- xauth_data = tmpdata;
- xauth_datalen = datalen;
- _XUnlockMutex(_Xglobal_lock);
- return;
-}
-
-#ifdef SECURE_RPC
-/*
- * Create a credential that we can send to the X server.
- */
-static int
-auth_ezencode(
- char *servername,
- int window,
- char *cred_out,
- int *len)
-{
- AUTH *a;
- XDR xdr;
-
-#if defined(SVR4) && defined(sun)
- a = authdes_seccreate(servername, window, NULL, NULL);
-#else
- a = (AUTH *)authdes_create(servername, window, NULL, NULL);
-#endif
- if (a == (AUTH *)NULL) {
- perror("auth_create");
- return 0;
- }
- xdrmem_create(&xdr, cred_out, *len, XDR_ENCODE);
- if (AUTH_MARSHALL(a, &xdr) == FALSE) {
- perror("auth_marshall");
- AUTH_DESTROY(a);
- return 0;
- }
- *len = xdr_getpos(&xdr);
- AUTH_DESTROY(a);
- return 1;
-}
-#endif
-
-#ifdef K5AUTH
-#include <com_err.h>
-
-extern krb5_flags krb5_kdc_default_options;
-
-/*
- * k5_clientauth
- *
- * Returns non-zero if the setup prefix has been read,
- * so we can tell XOpenDisplay to not bother looking for it by
- * itself.
- */
-static int k5_clientauth(dpy, sprefix)
- Display *dpy;
- xConnSetupPrefix *sprefix;
-{
- krb5_error_code retval;
- xReq prefix;
- char *buf;
- CARD16 plen, tlen;
- krb5_data kbuf;
- krb5_ccache cc;
- krb5_creds creds;
- krb5_principal cprinc, sprinc;
- krb5_ap_rep_enc_part *repl;
-
- krb5_init_ets();
- /*
- * stage 0: get encoded principal and tgt from server
- */
- _XRead(dpy, (char *)&prefix, sz_xReq);
- if (prefix.reqType != 2 && prefix.reqType != 3)
- /* not an auth packet... so deal */
- if (prefix.reqType == 0 || prefix.reqType == 1)
- {
- memcpy((char *)sprefix, (char *)&prefix, sz_xReq);
- _XRead(dpy, (char *)sprefix + sz_xReq,
- sz_xConnSetupPrefix - sz_xReq); /* ewww... gross */
- return 1;
- }
- else
- {
- fprintf(stderr,
- "Xlib: Krb5 stage 0: got illegal connection setup success code %d\n",
- prefix.reqType);
- return -1;
- }
- if (prefix.data != 0)
- {
- fprintf(stderr, "Xlib: got out of sequence (%d) packet in Krb5 auth\n",
- prefix.data);
- return -1;
- }
- buf = (char *)malloc((prefix.length << 2) - sz_xReq);
- if (buf == NULL) /* malloc failed. Run away! */
- {
- fprintf(stderr, "Xlib: malloc bombed in Krb5 auth\n");
- return -1;
- }
- tlen = (prefix.length << 2) - sz_xReq;
- _XRead(dpy, buf, tlen);
- if (prefix.reqType == 2 && tlen < 6)
- {
- fprintf(stderr, "Xlib: Krb5 stage 0 reply from server too short\n");
- free(buf);
- return -1;
- }
- if (prefix.reqType == 2)
- {
- plen = *(CARD16 *)buf;
- kbuf.data = buf + 2;
- kbuf.length = (plen > tlen) ? tlen : plen;
- }
- else
- {
- kbuf.data = buf;
- kbuf.length = tlen;
- }
- if (XauKrb5Decode(kbuf, &sprinc))
- {
- free(buf);
- fprintf(stderr, "Xlib: XauKrb5Decode bombed\n");
- return -1;
- }
- if (prefix.reqType == 3) /* do some special stuff here */
- {
- char *sname, *hostname = NULL;
-
- sname = (char *)malloc(krb5_princ_component(sprinc, 0)->length + 1);
- if (sname == NULL)
- {
- free(buf);
- krb5_free_principal(sprinc);
- fprintf(stderr, "Xlib: malloc bombed in Krb5 auth\n");
- return -1;
- }
- memcpy(sname, krb5_princ_component(sprinc, 0)->data,
- krb5_princ_component(sprinc, 0)->length);
- sname[krb5_princ_component(sprinc, 0)->length] = '\0';
- krb5_free_principal(sprinc);
- if (dpy->display_name[0] != ':') /* hunt for a hostname */
- {
- char *t;
-
- if ((hostname = (char *)malloc(strlen(dpy->display_name)))
- == NULL)
- {
- free(buf);
- free(sname);
- fprintf(stderr, "Xlib: malloc bombed in Krb5 auth\n");
- return -1;
- }
- strcpy(hostname, dpy->display_name);
- t = strchr(hostname, ':');
- if (t == NULL)
- {
- free(buf);
- free(sname);
- free(hostname);
- fprintf(stderr,
- "Xlib: shouldn't get here! malformed display name.");
- return -1;
- }
- if ((t - hostname + 1 < strlen(hostname)) && t[1] == ':')
- t++;
- *t = '\0'; /* truncate the dpy number out */
- }
- retval = krb5_sname_to_principal(hostname, sname,
- KRB5_NT_SRV_HST, &sprinc);
- free(sname);
- if (hostname)
- free(hostname);
- if (retval)
- {
- free(buf);
- fprintf(stderr, "Xlib: krb5_sname_to_principal failed: %s\n",
- error_message(retval));
- return -1;
- }
- }
- if (retval = krb5_cc_default(&cc))
- {
- free(buf);
- krb5_free_principal(sprinc);
- fprintf(stderr, "Xlib: krb5_cc_default failed: %s\n",
- error_message(retval));
- return -1;
- }
- if (retval = krb5_cc_get_principal(cc, &cprinc))
- {
- free(buf);
- krb5_free_principal(sprinc);
- fprintf(stderr, "Xlib: cannot get Kerberos principal from \"%s\": %s\n",
- krb5_cc_default_name(), error_message(retval));
- return -1;
- }
- bzero((char *)&creds, sizeof(creds));
- creds.server = sprinc;
- creds.client = cprinc;
- if (prefix.reqType == 2)
- {
- creds.second_ticket.length = tlen - plen - 2;
- creds.second_ticket.data = buf + 2 + plen;
- retval = krb5_get_credentials(KRB5_GC_USER_USER |
- krb5_kdc_default_options,
- cc, &creds);
- }
- else
- retval = krb5_get_credentials(krb5_kdc_default_options,
- cc, &creds);
- if (retval)
- {
- free(buf);
- krb5_free_cred_contents(&creds);
- fprintf(stderr, "Xlib: cannot get Kerberos credentials: %s\n",
- error_message(retval));
- return -1;
- }
- /*
- * now format the ap_req to send to the server
- */
- if (prefix.reqType == 2)
- retval = krb5_mk_req_extended(AP_OPTS_USE_SESSION_KEY |
- AP_OPTS_MUTUAL_REQUIRED, NULL,
- 0, 0, NULL, cc,
- &creds, NULL, &kbuf);
- else
- retval = krb5_mk_req_extended(AP_OPTS_MUTUAL_REQUIRED, NULL,
- 0, 0, NULL, cc, &creds, NULL,
- &kbuf);
- free(buf);
- if (retval) /* Some manner of Kerberos lossage */
- {
- krb5_free_cred_contents(&creds);
- fprintf(stderr, "Xlib: krb5_mk_req_extended failed: %s\n",
- error_message(retval));
- return -1;
- }
- prefix.reqType = 1;
- prefix.data = 0;
- prefix.length = (kbuf.length + sz_xReq + 3) >> 2;
- /*
- * stage 1: send ap_req to server
- */
- _XSend(dpy, (char *)&prefix, sz_xReq);
- _XSend(dpy, (char *)kbuf.data, kbuf.length);
- free(kbuf.data);
- /*
- * stage 2: get ap_rep from server to mutually authenticate
- */
- _XRead(dpy, (char *)&prefix, sz_xReq);
- if (prefix.reqType != 2)
- if (prefix.reqType == 0 || prefix.reqType == 1)
- {
- memcpy((char *)sprefix, (char *)&prefix, sz_xReq);
- _XRead(dpy, (char *)sprefix + sz_xReq,
- sz_xConnSetupPrefix - sz_xReq);
- return 1;
- }
- else
- {
- fprintf(stderr,
- "Xlib: Krb5 stage 2: got illegal connection setup success code %d\n",
- prefix.reqType);
- return -1;
- }
- if (prefix.data != 2)
- return -1;
- kbuf.length = (prefix.length << 2) - sz_xReq;
- kbuf.data = (char *)malloc(kbuf.length);
- if (kbuf.data == NULL)
- {
- fprintf(stderr, "Xlib: malloc bombed in Krb5 auth\n");
- return -1;
- }
- _XRead(dpy, (char *)kbuf.data, kbuf.length);
- retval = krb5_rd_rep(&kbuf, &creds.keyblock, &repl);
- if (retval)
- {
- free(kbuf.data);
- fprintf(stderr, "Xlib: krb5_rd_rep failed: %s\n",
- error_message(retval));
- return -1;
- }
- free(kbuf.data);
- /*
- * stage 3: send a short ack to the server and return
- */
- prefix.reqType = 3;
- prefix.data = 0;
- prefix.length = sz_xReq >> 2;
- _XSend(dpy, (char *)&prefix, sz_xReq);
- return 0;
-}
-#endif /* K5AUTH */
-
-static void
-GetAuthorization(
- XtransConnInfo trans_conn,
- int family,
- char *saddr,
- int saddrlen,
- int idisplay,
- char **auth_namep, /* RETURN */
- int *auth_namelenp, /* RETURN */
- char **auth_datap, /* RETURN */
- int *auth_datalenp) /* RETURN */
-{
-#ifdef SECURE_RPC
- char rpc_cred[MAX_AUTH_BYTES];
-#endif
-#ifdef HASXDMAUTH
- unsigned char xdmcp_data[192/8];
-#endif
- char *auth_name;
- int auth_namelen;
- unsigned char *auth_data;
- int auth_datalen;
- Xauth *authptr = NULL;
-
-/*
- * Look up the authorization protocol name and data if necessary.
- */
- if (xauth_name && xauth_data) {
- auth_namelen = xauth_namelen;
- auth_name = xauth_name;
- auth_datalen = xauth_datalen;
- auth_data = (unsigned char *) xauth_data;
- } else {
- char dpynumbuf[40]; /* big enough to hold 2^64 and more */
- (void) sprintf (dpynumbuf, "%d", idisplay);
-
- authptr = XauGetBestAuthByAddr ((unsigned short) family,
- (unsigned short) saddrlen,
- saddr,
- (unsigned short) strlen (dpynumbuf),
- dpynumbuf,
- xauth_names_length,
- xauth_names,
- xauth_lengths);
- if (authptr) {
- auth_namelen = authptr->name_length;
- auth_name = (char *)authptr->name;
- auth_datalen = authptr->data_length;
- auth_data = (unsigned char *) authptr->data;
- } else {
- auth_namelen = 0;
- auth_name = NULL;
- auth_datalen = 0;
- auth_data = NULL;
- }
- }
-#ifdef HASXDMAUTH
- /*
- * build XDM-AUTHORIZATION-1 data
- */
- if (auth_namelen == 19 && !strncmp (auth_name, "XDM-AUTHORIZATION-1", 19))
- {
- int i, j;
- Time_t now;
- int family, addrlen;
- Xtransaddr *addr = NULL;
-
- for (j = 0; j < 8; j++)
- xdmcp_data[j] = auth_data[j];
-
- _X11TransGetMyAddr(trans_conn, &family, &addrlen, &addr);
-
- switch( family )
- {
-#ifdef AF_INET
- case AF_INET:
- {
- /*
- * addr will contain a sockaddr_in with all
- * of the members already in network byte order.
- */
-
- for(i=4; i<8; i++) /* do sin_addr */
- xdmcp_data[j++] = ((char *)addr)[i];
- for(i=2; i<4; i++) /* do sin_port */
- xdmcp_data[j++] = ((char *)addr)[i];
- break;
- }
-#endif /* AF_INET */
-#if defined(IPv6) && defined(AF_INET6)
- case AF_INET6:
- /* XXX This should probably never happen */
- {
- unsigned char ipv4mappedprefix[] = {
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xff, 0xff };
-
- /* In the case of v4 mapped addresses send the v4
- part of the address - addr is already in network byte order */
- if (memcmp((char*)addr+8, ipv4mappedprefix, 12) == 0) {
- for (i = 20 ; i < 24; i++)
- xdmcp_data[j++] = ((char *)addr)[i];
-
- /* Port number */
- for (i=2; i<4; i++)
- xdmcp_data[j++] = ((char *)addr)[i];
- } else {
- /* Fake data to keep the data aligned. Otherwise the
- the server will bail about incorrect timing data */
- for (i = 0; i < 6; i++) {
- xdmcp_data[j++] = 0;
- }
- }
- break;
- }
-#endif /* AF_INET6 */
-#ifdef AF_UNIX
- case AF_UNIX:
- {
- /*
- * We don't use the sockaddr_un for this encoding.
- * Instead, we create a sockaddr_in filled with
- * a decreasing counter for the address, and the
- * pid for the port.
- */
-
- static unsigned long unix_addr = 0xFFFFFFFF;
- unsigned long the_addr;
- unsigned short the_port;
- unsigned long the_utime;
- struct timeval tp;
-
- X_GETTIMEOFDAY(&tp);
- _XLockMutex(_Xglobal_lock);
- the_addr = unix_addr--;
- _XUnlockMutex(_Xglobal_lock);
- the_utime = (unsigned long) tp.tv_usec;
- the_port = getpid ();
-
- xdmcp_data[j++] = (the_utime >> 24) & 0xFF;
- xdmcp_data[j++] = (the_utime >> 16) & 0xFF;
- xdmcp_data[j++] = ((the_utime >> 8) & 0xF0)
- | ((the_addr >> 8) & 0x0F);
- xdmcp_data[j++] = (the_addr >> 0) & 0xFF;
- xdmcp_data[j++] = (the_port >> 8) & 0xFF;
- xdmcp_data[j++] = (the_port >> 0) & 0xFF;
- break;
- }
-#endif /* AF_UNIX */
-#ifdef AF_DECnet
- case AF_DECnet:
- /*
- * What is the defined encoding for this?
- */
- break;
-#endif /* AF_DECnet */
- default:
- /*
- * Need to return some kind of errro status here.
- * maybe a NULL auth??
- */
- break;
- } /* switch */
-
- if (addr)
- free ((char *) addr);
-
- time (&now);
- xdmcp_data[j++] = (now >> 24) & 0xFF;
- xdmcp_data[j++] = (now >> 16) & 0xFF;
- xdmcp_data[j++] = (now >> 8) & 0xFF;
- xdmcp_data[j++] = (now >> 0) & 0xFF;
- while (j < 192 / 8)
- xdmcp_data[j++] = 0;
- _XLockMutex(_Xglobal_lock);
- /* this function might use static data, hence the lock around it */
- XdmcpWrap (xdmcp_data, auth_data + 8,
- xdmcp_data, j);
- _XUnlockMutex(_Xglobal_lock);
- auth_data = xdmcp_data;
- auth_datalen = j;
- }
-#endif /* HASXDMAUTH */
-#ifdef SECURE_RPC
- /*
- * The SUN-DES-1 authorization protocol uses the
- * "secure RPC" mechanism in SunOS 4.0+.
- */
- if (auth_namelen == 9 && !strncmp(auth_name, "SUN-DES-1", 9)) {
- char servernetname[MAXNETNAMELEN + 1];
-
- /*
- * Copy over the server's netname from the authorization
- * data field filled in by XauGetAuthByAddr().
- */
- if (auth_datalen > MAXNETNAMELEN) {
- auth_datalen = 0;
- auth_data = NULL;
- } else {
- memcpy(servernetname, auth_data, auth_datalen);
- servernetname[auth_datalen] = '\0';
-
- auth_datalen = sizeof (rpc_cred);
- if (auth_ezencode(servernetname, 100, rpc_cred,
- &auth_datalen))
- auth_data = (unsigned char *) rpc_cred;
- else {
- auth_datalen = 0;
- auth_data = NULL;
- }
- }
- }
-#endif
- if (saddr) free ((char *) saddr);
- if ((*auth_namelenp = auth_namelen))
- {
- if ((*auth_namep = Xmalloc(auth_namelen)))
- memcpy(*auth_namep, auth_name, auth_namelen);
- else
- *auth_namelenp = 0;
- }
- else
- *auth_namep = NULL;
- if ((*auth_datalenp = auth_datalen))
- {
- if ((*auth_datap = Xmalloc(auth_datalen)))
- memcpy(*auth_datap, auth_data, auth_datalen);
- else
- *auth_datalenp = 0;
- }
- else
- *auth_datap = NULL;
- if (authptr) XauDisposeAuth (authptr);
-}
diff --git a/libX11/src/Makefile.am b/libX11/src/Makefile.am index a433fa78a..d3ab2ecb3 100644 --- a/libX11/src/Makefile.am +++ b/libX11/src/Makefile.am @@ -3,7 +3,7 @@ XKB_SUBDIRS = xkb endif
SUBDIRS = util xcms xlibi18n $(XKB_SUBDIRS)
-lib_LTLIBRARIES=libX11.la
+lib_LTLIBRARIES = libX11.la libX11-xcb.la
BUILT_SOURCES=ks_tables.h
CLEANFILES=ks_tables.h ks_tables_h
@@ -21,7 +21,6 @@ AM_CPPFLAGS= \ AM_CFLAGS= \
$(X11_CFLAGS) \
$(BIGFONT_CFLAGS) \
- $(XDMCP_CFLAGS) \
$(XMALLOC_ZERO_CFLAGS) \
$(CWARNFLAGS)
@@ -312,6 +311,8 @@ libX11_la_SOURCES = \ WMProps.c \
WrBitF.c \
Xatomtype.h \
+ xcb_disp.c \
+ xcb_io.c \
Xintatom.h \
Xintconn.h \
XlibAsync.c \
@@ -320,7 +321,8 @@ libX11_la_SOURCES = \ XomGeneric.h \
Xresinternal.h \
Xrm.c \
- XrmI.h
+ XrmI.h \
+ Xxcbint.h
#
# ========================= Extra stuff ============================
@@ -347,21 +349,9 @@ EXTRA_DIST = \ udcInf.c \
UIThrStubs.c
-if XCB
-libX11_la_SOURCES += \
- xcb_disp.c \
- xcb_io.c \
- Xxcbint.h
-
-lib_LTLIBRARIES += libX11-xcb.la
libX11_xcb_la_SOURCES = x11_xcb.c Xxcbint.h
libX11_xcb_la_LDFLAGS = -version-info 1:0:0 -no-undefined
libX11_xcb_la_LIBADD = libX11.la
-else
-libX11_la_SOURCES += \
- ConnDis.c \
- x11_trans.c
-endif
#
# Figure out which sub-libraries to link into Xlib
@@ -385,8 +375,7 @@ libX11_la_LIBADD = \ $(USE_I18N_LIBS) \
$(USE_XCMS_LIBS) \
$(USE_XKB_LIBS) \
- $(X11_LIBS) \
- $(XDMCP_LIBS)
+ $(X11_LIBS)
preprocess: $(patsubst %.c,%.ii,$(libX11_la_SOURCES))
.c.ii:
diff --git a/libX11/src/OpenDis.c b/libX11/src/OpenDis.c index 16f72b30e..a225bb437 100644 --- a/libX11/src/OpenDis.c +++ b/libX11/src/OpenDis.c @@ -30,12 +30,7 @@ in this Software without prior written authorization from The Open Group. #include <config.h>
#endif
#include "Xlibint.h"
-#if USE_XCB
#include "Xxcbint.h"
-#else /* !USE_XCB */
-#include <X11/Xtrans/Xtrans.h>
-#include <X11/extensions/bigreqstr.h>
-#endif /* USE_XCB */
#include <X11/Xatom.h>
#include <X11/Xresource.h>
#include <stdio.h>
@@ -46,21 +41,6 @@ in this Software without prior written authorization from The Open Group. #include "XKBlib.h"
#endif /* XKB */
-#if !USE_XCB
-#ifdef X_NOT_POSIX
-#define Size_t unsigned int
-#else
-#define Size_t size_t
-#endif
-
-#define bignamelen (sizeof(XBigReqExtensionName) - 1)
-
-typedef struct {
- unsigned long seq;
- int opcode;
-} _XBigReqState;
-#endif /* !USE_XCB */
-
#ifdef XTHREADS
#include "locking.h"
int (*_XInitDisplayLock_fn)(Display *dpy) = NULL;
@@ -77,11 +57,7 @@ static xReq _dummy_request = { 0, 0, 0
};
-static void OutOfMemory(Display *dpy, char *setup);
-#if !USE_XCB
-static Bool _XBigReqHandler(Display *dpy, xReply *rep, char *buf, int len,
- XPointer data);
-#endif /* !USE_XCB */
+static void OutOfMemory(Display *dpy);
/*
* Connects to a server, creates a Display object and returns a pointer to
@@ -95,14 +71,6 @@ XOpenDisplay ( register int i;
int j, k; /* random iterator indexes */
char *display_name; /* pointer to display name */
-#if !USE_XCB
- int endian; /* to determine which endian. */
- xConnClientPrefix client; /* client information */
- int idisplay; /* display number */
- int prefixread = 0; /* setup prefix already read? */
- char *conn_auth_name, *conn_auth_data;
- int conn_auth_namelen, conn_auth_datalen;
-#endif /* !USE_XCB */
char *setup = NULL; /* memory allocated at startup */
char *fullname = NULL; /* expanded name of display */
int iscreen; /* screen number */
@@ -123,11 +91,6 @@ XOpenDisplay ( long int conn_buf_size;
char *xlib_buffer_size;
-#if !USE_XCB
- bzero((char *) &client, sizeof(client));
- bzero((char *) &prefix, sizeof(prefix));
-#endif /* !USE_XCB */
-
/*
* If the display specifier string supplied as an argument to this
* routine is NULL or a pointer to NULL, read the DISPLAY variable.
@@ -163,7 +126,6 @@ XOpenDisplay ( * will set fullname to point to the expanded name.
*/
-#if USE_XCB
if(!_XConnectXCB(dpy, display, &fullname, &iscreen)) {
/* Try falling back on other transports if no transport specified */
const char *slash = strrchr(display_name, '/');
@@ -184,22 +146,10 @@ XOpenDisplay ( }
dpy->display_name = fullname;
- OutOfMemory(dpy, NULL);
+ OutOfMemory(dpy);
return NULL;
}
fallback_success:
-#else /* !USE_XCB */
- if ((dpy->trans_conn = _X11TransConnectDisplay (
- display_name, &fullname, &idisplay,
- &iscreen, &conn_auth_name,
- &conn_auth_namelen, &conn_auth_data,
- &conn_auth_datalen)) == NULL) {
- Xfree ((char *) dpy);
- return(NULL);
- }
-
- dpy->fd = _X11TransGetConnectionNumber (dpy->trans_conn);
-#endif /* USE_XCB */
/* Initialize as much of the display structure as we can.
* Initialize pointers to NULL so that XFreeDisplayStructure will
@@ -275,12 +225,12 @@ fallback_success: /* Initialize the display lock */
if (InitDisplayLock(dpy) != 0) {
- OutOfMemory (dpy, setup);
+ OutOfMemory (dpy);
return(NULL);
}
if (!_XPollfdCacheInit(dpy)) {
- OutOfMemory (dpy, setup);
+ OutOfMemory (dpy);
return(NULL);
}
@@ -306,14 +256,11 @@ fallback_success: conn_buf_size = XLIBMINBUFSIZE;
if ((dpy->bufptr = dpy->buffer = Xcalloc(1, conn_buf_size)) == NULL) {
- OutOfMemory (dpy, setup);
+ OutOfMemory (dpy);
return(NULL);
}
- dpy->bufmax = dpy->buffer + conn_buf_size;
-#if USE_XCB
- dpy->xcb->real_bufmax = dpy->bufmax;
+ dpy->xcb->real_bufmax = dpy->buffer + conn_buf_size;
dpy->bufmax = dpy->buffer;
-#endif
/* Set up the input event queue and input event queue parameters. */
dpy->head = dpy->tail = NULL;
@@ -323,68 +270,10 @@ fallback_success: if ((dpy->free_funcs = (_XFreeFuncRec *)Xcalloc(1,
sizeof(_XFreeFuncRec)))
== NULL) {
- OutOfMemory (dpy, setup);
- return(NULL);
- }
-
-#if !USE_XCB
-/*
- * The xConnClientPrefix describes the initial connection setup information
- * and is followed by the authorization information. Sites that are interested
- * in security are strongly encouraged to use an authentication and
- * authorization system such as Kerberos.
- */
- endian = 1;
- if (*(char *) &endian)
- client.byteOrder = '\154'; /* 'l' */
- else
- client.byteOrder = '\102'; /* 'B' */
- client.majorVersion = X_PROTOCOL;
- client.minorVersion = X_PROTOCOL_REVISION;
- client.nbytesAuthProto = conn_auth_namelen;
- client.nbytesAuthString = conn_auth_datalen;
- prefixread = _XSendClientPrefix(dpy, &client,
- conn_auth_name, conn_auth_data,
- &prefix);
- if (prefixread < 0)
- {
- _XDisconnectDisplay (dpy->trans_conn);
- Xfree ((char *)dpy);
- return(NULL);
- }
- if (conn_auth_name) Xfree(conn_auth_name);
- if (conn_auth_data) Xfree(conn_auth_data);
-/*
- * Now see if connection was accepted...
- */
- /* these internal functions expect the display to be locked */
- LockDisplay(dpy);
-
- if (prefixread == 0)
- _XRead (dpy, (char *)&prefix,(long)SIZEOF(xConnSetupPrefix));
-
- /* an Authenticate reply we weren't expecting? */
- if (prefix.success != xTrue && prefix.success != xFalse) {
- fprintf (stderr,
- "Xlib: unexpected connection setup reply from server, type %d.\r\n",
- prefix.success);
- _XDisconnectDisplay (dpy->trans_conn);
- Xfree ((char *)dpy);
- return(NULL);
- }
-
- if (prefix.majorVersion != X_PROTOCOL) {
- /* XXX - printing messages marks a bad programming interface */
- fprintf (stderr,
- "Xlib: client uses different protocol version (%d) than server (%d)!\r\n",
- X_PROTOCOL, prefix.majorVersion);
- _XDisconnectDisplay (dpy->trans_conn);
- Xfree ((char *)dpy);
+ OutOfMemory (dpy);
return(NULL);
}
-#endif /* !USE_XCB */
-#if USE_XCB
{
const struct xcb_setup_t *xcbsetup = xcb_get_setup(dpy->xcb->connection);
memcpy(&prefix, xcbsetup, sizeof(prefix));
@@ -393,38 +282,6 @@ fallback_success: setup += SIZEOF(xConnSetupPrefix);
u.setup = (xConnSetup *) setup;
}
-#else /* !USE_XCB */
- setuplength = prefix.length << 2;
- if ( (u.setup = (xConnSetup *)
- (setup = Xmalloc ((unsigned) setuplength))) == NULL) {
- _XDisconnectDisplay (dpy->trans_conn);
- Xfree ((char *)dpy);
- return(NULL);
- }
- _XRead (dpy, (char *)u.setup, setuplength);
-
-/*
- * If the connection was not accepted by the server due to problems,
- * give error message to the user....
- */
- if (prefix.success != xTrue) {
- /* XXX - printing messages marks a bad programming interface */
- fprintf (stderr,
- "Xlib: connection to \"%s\" refused by server\r\nXlib: ",
- fullname);
-
- if (prefix.lengthReason > setuplength) {
- fprintf (stderr, "Xlib: Broken initial reply: length of reason > length of packet\r\n");
- }else{
- (void) fwrite (u.failure, (Size_t)sizeof(char),
- (Size_t)prefix.lengthReason, stderr);
- (void) fwrite ("\r\n", sizeof(char), 2, stderr);
- }
-
- OutOfMemory(dpy, setup);
- return (NULL);
- }
-#endif /* USE_XCB */
/*
* Check if the reply was long enough to get any information out of it.
@@ -432,7 +289,7 @@ fallback_success: usedbytes = sz_xConnSetup;
if (setuplength < usedbytes ) {
fprintf (stderr, "Xlib: Broken initial reply: Too short (%ld)\n", setuplength);
- OutOfMemory(dpy, setup);
+ OutOfMemory(dpy);
return (NULL);
}
@@ -461,7 +318,7 @@ fallback_success: {
fprintf (stderr, "Xlib: connection to \"%s\" invalid setup\n",
fullname);
- OutOfMemory(dpy, setup);
+ OutOfMemory(dpy);
return (NULL);
}
@@ -476,13 +333,13 @@ fallback_success: */
/* Check for a sane vendor string length */
if (u.setup->nbytesVendor > 256) {
- OutOfMemory(dpy, setup);
+ OutOfMemory(dpy);
return (NULL);
}
dpy->vendor = (char *) Xmalloc((unsigned) (u.setup->nbytesVendor + 1));
if (dpy->vendor == NULL) {
- OutOfMemory(dpy, setup);
+ OutOfMemory(dpy);
return (NULL);
}
vendorlen = u.setup->nbytesVendor;
@@ -493,7 +350,7 @@ fallback_success: usedbytes += (vendorlen + 3) & ~3;
if (setuplength < usedbytes) {
fprintf (stderr, "Xlib: Broken initial reply: Too short (%ld)\n", setuplength);
- OutOfMemory(dpy, setup);
+ OutOfMemory(dpy);
return (NULL);
}
@@ -510,7 +367,7 @@ fallback_success: (ScreenFormat *)Xmalloc(
(unsigned) (dpy->nformats *sizeof(ScreenFormat)));
if (dpy->pixmap_format == NULL) {
- OutOfMemory (dpy, setup);
+ OutOfMemory (dpy);
return(NULL);
}
/*
@@ -520,7 +377,7 @@ fallback_success: if (setuplength < usedbytes) {
fprintf (stderr, "Xlib: Broken initial reply: Too short (%ld)\n", setuplength);
- OutOfMemory (dpy, setup);
+ OutOfMemory (dpy);
return(NULL);
}
@@ -539,7 +396,7 @@ fallback_success: dpy->screens =
(Screen *)Xmalloc((unsigned) dpy->nscreens*sizeof(Screen));
if (dpy->screens == NULL) {
- OutOfMemory (dpy, setup);
+ OutOfMemory (dpy);
return(NULL);
}
@@ -553,7 +410,7 @@ fallback_success: usedbytes += sz_xWindowRoot;
if (setuplength < usedbytes) {
fprintf (stderr, "Xlib: Broken initial reply: Too short (%ld)\n", setuplength);
- OutOfMemory (dpy, setup);
+ OutOfMemory (dpy);
return(NULL);
}
@@ -582,7 +439,7 @@ fallback_success: sp->depths = (Depth *)Xmalloc(
(unsigned)sp->ndepths*sizeof(Depth));
if (sp->depths == NULL) {
- OutOfMemory (dpy, setup);
+ OutOfMemory (dpy);
return(NULL);
}
/*
@@ -594,7 +451,7 @@ fallback_success: usedbytes += sz_xDepth;
if (setuplength < usedbytes) {
fprintf (stderr, "Xlib: Broken initial reply: Too short (%ld)\n", setuplength);
- OutOfMemory (dpy, setup);
+ OutOfMemory (dpy);
return(NULL);
}
@@ -605,7 +462,7 @@ fallback_success: dp->visuals =
(Visual *)Xmalloc((unsigned)dp->nvisuals*sizeof(Visual));
if (dp->visuals == NULL) {
- OutOfMemory (dpy, setup);
+ OutOfMemory (dpy);
return(NULL);
}
for (k = 0; k < dp->nvisuals; k++) {
@@ -614,7 +471,7 @@ fallback_success: usedbytes += sz_xVisualType;
if (setuplength < usedbytes) {
fprintf (stderr, "Xlib: Broken initial reply: Too short (%ld)\n", setuplength);
- OutOfMemory (dpy, setup);
+ OutOfMemory (dpy);
return(NULL);
}
@@ -647,7 +504,7 @@ fallback_success: fprintf(stderr, "Xlib: Did not parse entire setup message: "
"parsed: %ld, message: %ld\n",
usedbytes, setuplength);
- OutOfMemory(dpy, setup);
+ OutOfMemory(dpy);
return(NULL);
}
@@ -655,30 +512,17 @@ fallback_success: * Now start talking to the server to setup all other information...
*/
-#if !USE_XCB
- Xfree (setup); /* all finished with setup information */
-#endif /* !USE_XCB */
-
/*
* Make sure default screen is legal.
*/
if (iscreen >= dpy->nscreens) {
- OutOfMemory(dpy, (char *) NULL);
+ OutOfMemory(dpy);
return(NULL);
}
-#if !USE_XCB
-/*
- * finished calling internal routines, now unlock for external routines
- */
- UnlockDisplay(dpy);
-#endif /* !USE_XCB */
-
-#if USE_XCB
dpy->bigreq_size = xcb_get_maximum_request_length(dpy->xcb->connection);
if(dpy->bigreq_size <= dpy->max_request_size)
dpy->bigreq_size = 0;
-#endif /* USE_XCB */
/*
* Set up other stuff clients are always going to use.
@@ -691,7 +535,7 @@ fallback_success: if ((sp->default_gc = XCreateGC (dpy, sp->root,
GCForeground|GCBackground,
&values)) == NULL) {
- OutOfMemory(dpy, (char *) NULL);
+ OutOfMemory(dpy);
return (NULL);
}
}
@@ -709,24 +553,6 @@ fallback_success: {
xGetPropertyReply reply;
xGetPropertyReq *req;
-#if !USE_XCB
- _XAsyncHandler async;
- _XBigReqState async_state;
- xQueryExtensionReq *qreq;
- xBigReqEnableReq *breq;
- xBigReqEnableReply brep;
-
- GetReq(QueryExtension, qreq);
- async_state.seq = dpy->request;
- async_state.opcode = 0;
- async.next = dpy->async_handlers;
- async.handler = _XBigReqHandler;
- async.data = (XPointer)&async_state;
- dpy->async_handlers = &async;
- qreq->nbytes = bignamelen;
- qreq->length += (bignamelen+3)>>2;
- Data(dpy, XBigReqExtensionName, bignamelen);
-#endif /* !USE_XCB */
GetReq (GetProperty, req);
req->window = RootWindow(dpy, 0);
@@ -747,16 +573,6 @@ fallback_success: else if (reply.propertyType != None)
_XEatData(dpy, reply.nItems * (reply.format >> 3));
}
-#if !USE_XCB
- DeqAsyncHandler(dpy, &async);
- if (async_state.opcode) {
- GetReq(BigReqEnable, breq);
- breq->reqType = async_state.opcode;
- breq->brReqType = X_BigReqEnable;
- if (_XReply(dpy, (xReply *)&brep, 0, xFalse))
- dpy->bigreq_size = brep.max_request_size;
- }
-#endif /* !USE_XCB */
}
UnlockDisplay(dpy);
@@ -775,35 +591,6 @@ fallback_success: return(dpy);
}
-#if !USE_XCB
-static Bool
-_XBigReqHandler(
- register Display *dpy,
- register xReply *rep,
- char *buf,
- int len,
- XPointer data)
-{
- _XBigReqState *state;
- xQueryExtensionReply replbuf;
- xQueryExtensionReply *repl;
-
- state = (_XBigReqState *)data;
- if (dpy->last_request_read != state->seq)
- return False;
- if (rep->generic.type == X_Error)
- return True;
- repl = (xQueryExtensionReply *)
- _XGetAsyncReply(dpy, (char *)&replbuf, rep, buf, len,
- (SIZEOF(xQueryExtensionReply) - SIZEOF(xReply)) >> 2,
- True);
- if (repl->present)
- state->opcode = repl->major_opcode;
- return True;
-}
-#endif /* !USE_XCB */
-
-
/* XFreeDisplayStructure frees all the storage associated with a
* Display. It is used by XOpenDisplay if it runs out of memory,
* and also by XCloseDisplay. It needs to check whether all pointers
@@ -939,9 +726,7 @@ void _XFreeDisplayStructure(Display *dpy) if (dpy->filedes)
Xfree (dpy->filedes);
-#if USE_XCB
_XFreeX11XCBStructure(dpy);
-#endif /* USE_XCB */
Xfree ((char *)dpy);
}
@@ -949,16 +734,9 @@ void _XFreeDisplayStructure(Display *dpy) /* OutOfMemory is called if malloc fails. XOpenDisplay returns NULL
after this returns. */
-static void OutOfMemory(Display *dpy, char *setup)
+static void OutOfMemory(Display *dpy)
{
-#if USE_XCB
if(dpy->xcb->connection)
xcb_disconnect(dpy->xcb->connection);
-#else /* !USE_XCB */
- _XDisconnectDisplay (dpy->trans_conn);
-#endif /* USE_XCB */
_XFreeDisplayStructure (dpy);
-#if !USE_XCB
- if (setup) Xfree (setup);
-#endif /* !USE_XCB */
}
diff --git a/libX11/src/Xintconn.h b/libX11/src/Xintconn.h index ee975ac44..c51e3c721 100644 --- a/libX11/src/Xintconn.h +++ b/libX11/src/Xintconn.h @@ -1,37 +1,14 @@ - -#ifndef _XINTCONN_H_ -#define _XINTCONN_H_ 1 - -#include <X11/Xfuncproto.h> - -_XFUNCPROTOBEGIN - -#if !USE_XCB -/* ConnDis.c */ - -int _XConnectDisplay ( - char *display_name, - char **fullnamep, /* RETURN */ - int *dpynump, /* RETURN */ - int *screenp, /* RETURN */ - char **auth_namep, /* RETURN */ - int *auth_namelenp, /* RETURN */ - char **auth_datap, /* RETURN */ - int *auth_datalenp); /* RETURN */ -extern int _XDisconnectDisplay(XtransConnInfo trans_conn); -extern Bool _XSendClientPrefix(Display *dpy, xConnClientPrefix *client, - char *auth_proto, char *auth_string, - xConnSetupPrefix *prefix); -extern XtransConnInfo _X11TransConnectDisplay(char *display_name, - char **fullnamep, int *dpynump, - int *screenp, char **auth_namep, - int *auth_namelenp, char **auth_datap, - int *auth_datalenp); -#endif /* !USE_XCB */ - -/* OpenDis.c */ -extern void _XFreeDisplayStructure(Display *dpy); - -_XFUNCPROTOEND - -#endif /* _XINTCONN_H_ */ +
+#ifndef _XINTCONN_H_
+#define _XINTCONN_H_ 1
+
+#include <X11/Xfuncproto.h>
+
+_XFUNCPROTOBEGIN
+
+/* OpenDis.c */
+extern void _XFreeDisplayStructure(Display *dpy);
+
+_XFUNCPROTOEND
+
+#endif /* _XINTCONN_H_ */
diff --git a/libX11/src/XlibInt.c b/libX11/src/XlibInt.c index 13f8702aa..6ac93005f 100644 --- a/libX11/src/XlibInt.c +++ b/libX11/src/XlibInt.c @@ -43,10 +43,6 @@ from The Open Group. #include "Xlibint.h"
#include "Xprivate.h"
#include <X11/Xpoll.h>
-#if !USE_XCB
-#include <X11/Xtrans/Xtrans.h>
-#include <X11/extensions/xcmiscstr.h>
-#endif /* !USE_XCB */
#include <assert.h>
#include <stdio.h>
#ifdef WIN32
@@ -79,24 +75,7 @@ xthread_t (*_Xthread_self_fn)(void) = NULL; #define XThread_Self() ((*_Xthread_self_fn)())
-#if !USE_XCB
-#define UnlockNextReplyReader(d) if ((d)->lock) \
- (*(d)->lock->pop_reader)((d),&(d)->lock->reply_awaiters,&(d)->lock->reply_awaiters_tail)
-
-#define QueueReplyReaderLock(d) ((d)->lock ? \
- (*(d)->lock->push_reader)(d,&(d)->lock->reply_awaiters_tail) : NULL)
-#define QueueEventReaderLock(d) ((d)->lock ? \
- (*(d)->lock->push_reader)(d,&(d)->lock->event_awaiters_tail) : NULL)
-#endif /* !USE_XCB */
-
-#else /* XTHREADS else */
-
-#if !USE_XCB
-#define UnlockNextReplyReader(d)
-#define UnlockNextEventReader(d)
-#endif /* !USE_XCB */
-
-#endif /* XTHREADS else */
+#endif /* XTHREADS */
/* check for both EAGAIN and EWOULDBLOCK, because some supposedly POSIX
* systems are broken and return EWOULDBLOCK when they should return EAGAIN
@@ -145,50 +124,10 @@ xthread_t (*_Xthread_self_fn)(void) = NULL; #endif
#ifdef __UNIXOS2__
-#if !USE_XCB
-#define select(n,r,w,x,t) os2ClientSelect(n,r,w,x,t)
-#endif /* !USE_XCB */
#include <limits.h>
#define MAX_PATH _POSIX_PATH_MAX
#endif
-#if !USE_XCB
-#ifdef MUSTCOPY
-
-#define STARTITERATE(tpvar,type,start,endcond) \
- { register char *cpvar; \
- for (cpvar = (char *) (start); endcond; ) { \
- type dummy; memcpy ((char *) &dummy, cpvar, SIZEOF(type)); \
- tpvar = &dummy;
-#define ITERPTR(tpvar) cpvar
-#define RESETITERPTR(tpvar,type,start) cpvar = start
-#define INCITERPTR(tpvar,type) cpvar += SIZEOF(type)
-#define ENDITERATE }}
-
-#else
-
-#define STARTITERATE(tpvar,type,start,endcond) \
- for (tpvar = (type *) (start); endcond; )
-#define ITERPTR(tpvar) (char *)tpvar
-#define RESETITERPTR(tpvar,type,start) tpvar = (type *) (start)
-#define INCITERPTR(tpvar,type) tpvar++
-#define ENDITERATE
-
-#endif /* MUSTCOPY */
-
-typedef union {
- xReply rep;
- char buf[BUFSIZE];
-} _XAlignedBuffer;
-
-static char *_XAsyncReply(
- Display *dpy,
- register xReply *rep,
- char *buf,
- register int *lenp,
- Bool discard);
-#endif /* !USE_XCB */
-
/*
* The following routines are internal routines used by Xlib for protocol
* packet transmission and reception.
@@ -207,163 +146,6 @@ static char *_XAsyncReply( * the object they have created.
*/
-#if !USE_XCB
-static xReq _dummy_request = {
- 0, 0, 0
-};
-
-/*
- * This is an OS dependent routine which:
- * 1) returns as soon as the connection can be written on....
- * 2) if the connection can be read, must enqueue events and handle errors,
- * until the connection is writable.
- */
-static void
-_XWaitForWritable(
- Display *dpy
-#ifdef XTHREADS
- ,
- xcondition_t cv /* our reading condition variable */
-#endif
- )
-{
-#ifdef USE_POLL
- struct pollfd filedes;
-#else
- fd_set r_mask;
- fd_set w_mask;
-#endif
- int nfound;
-
-#ifdef USE_POLL
- filedes.fd = dpy->fd;
- filedes.events = 0;
-#else
- FD_ZERO(&r_mask);
- FD_ZERO(&w_mask);
-#endif
-
- for (;;) {
-#ifdef XTHREADS
- /* We allow only one thread at a time to read, to minimize
- passing of read data between threads.
- Now, who is it? If there is a non-NULL reply_awaiters and
- we (i.e., our cv) are not at the head of it, then whoever
- is at the head is the reader, and we don't read.
- Otherwise there is no reply_awaiters or we are at the
- head, having just appended ourselves.
- In this case, if there is a event_awaiters, then whoever
- is at the head of it got there before we did, and they are the
- reader.
-
- Last cases: no event_awaiters and we are at the head of
- reply_awaiters or reply_awaiters is NULL: we are the reader,
- since there is obviously no one else involved.
-
- XXX - what if cv is NULL and someone else comes along after
- us while we are waiting?
- */
-
- if (!dpy->lock ||
- (!dpy->lock->event_awaiters &&
- (!dpy->lock->reply_awaiters ||
- dpy->lock->reply_awaiters->cv == cv)))
-#endif
-#ifdef USE_POLL
- filedes.events = POLLIN;
- filedes.events |= POLLOUT;
-#else
- FD_SET(dpy->fd, &r_mask);
- FD_SET(dpy->fd, &w_mask);
-#endif
-
- do {
- UnlockDisplay(dpy);
-#ifdef USE_POLL
- nfound = poll (&filedes, 1, -1);
-#else
- nfound = Select (dpy->fd + 1, &r_mask, &w_mask, NULL, NULL);
-#endif
- InternalLockDisplay(dpy, cv != NULL);
- if (nfound < 0 && !(ECHECK(EINTR) || ETEST()))
- _XIOError(dpy);
- } while (nfound <= 0);
-
- if (
-#ifdef USE_POLL
- filedes.revents & POLLIN
-#else
- FD_ISSET(dpy->fd, &r_mask)
-#endif
- )
- {
- _XAlignedBuffer buf;
- BytesReadable_t pend;
- register int len;
- register xReply *rep;
-
- /* find out how much data can be read */
- if (_X11TransBytesReadable(dpy->trans_conn, &pend) < 0)
- _XIOError(dpy);
- len = pend;
-
- /* must read at least one xEvent; if none is pending, then
- we'll just block waiting for it */
- if (len < SIZEOF(xReply)
-#ifdef XTHREADS
- || dpy->async_handlers
-#endif
- )
- len = SIZEOF(xReply);
-
- /* but we won't read more than the max buffer size */
- if (len > BUFSIZE) len = BUFSIZE;
-
- /* round down to an integral number of XReps */
- len = (len / SIZEOF(xReply)) * SIZEOF(xReply);
-
- (void) _XRead (dpy, buf.buf, (long) len);
-
- STARTITERATE(rep,xReply,buf.buf,len > 0) {
- if (rep->generic.type == X_Reply) {
- int tmp = len;
- RESETITERPTR(rep,xReply,
- _XAsyncReply (dpy, rep,
- ITERPTR(rep), &tmp, True));
- len = tmp;
- pend = len;
- } else {
- if (rep->generic.type == X_Error)
- _XError (dpy, (xError *)rep);
- else /* must be an event packet */
- _XEnq (dpy, (xEvent *)rep);
- INCITERPTR(rep,xReply);
- len -= SIZEOF(xReply);
- }
- } ENDITERATE
-#ifdef XTHREADS
- if (dpy->lock && dpy->lock->event_awaiters)
- ConditionSignal(dpy, dpy->lock->event_awaiters->cv);
-#endif
- }
-#ifdef USE_POLL
- if (filedes.revents & (POLLOUT|POLLHUP|POLLERR))
-#else
- if (FD_ISSET(dpy->fd, &w_mask))
-#endif
- {
-#ifdef XTHREADS
- if (dpy->lock) {
- ConditionBroadcast(dpy, dpy->lock->writers);
- }
-#endif
- return;
- }
- }
-}
-#endif /* !USE_XCB */
-
-
#define POLLFD_CACHE_SIZE 5
/* initialize the struct array passed to poll() below */
@@ -419,138 +201,6 @@ void _XPollfdCacheDel( #endif
}
-#if !USE_XCB
-/* returns True iff there is an event in the queue newer than serial_num */
-
-static Bool
-_XNewerQueuedEvent(
- Display *dpy,
- int serial_num)
-{
- _XQEvent *qev;
-
- if (dpy->next_event_serial_num == serial_num)
- return False;
-
- qev = dpy->head;
- while (qev) {
- if (qev->qserial_num >= serial_num) {
- return True;
- }
- qev = qev->next;
- }
- return False;
-}
-
-static int
-_XWaitForReadable(
- Display *dpy)
-{
- int result;
- int fd = dpy->fd;
- struct _XConnectionInfo *ilist;
- register int saved_event_serial = 0;
- int in_read_events = 0;
- register Bool did_proc_conni = False;
-#ifdef USE_POLL
- struct pollfd *filedes;
-#else
- fd_set r_mask;
- int highest_fd = fd;
-#endif
-
-#ifdef USE_POLL
- if (dpy->im_fd_length + 1 > POLLFD_CACHE_SIZE
- && !(dpy->flags & XlibDisplayProcConni)) {
- /* XXX - this fallback is gross */
- int i;
-
- filedes = (struct pollfd *)Xmalloc(dpy->im_fd_length * sizeof(struct pollfd));
- filedes[0].fd = fd;
- filedes[0].events = POLLIN;
- for (ilist=dpy->im_fd_info, i=1; ilist; ilist=ilist->next, i++) {
- filedes[i].fd = ilist->fd;
- filedes[i].events = POLLIN;
- }
- } else {
- filedes = (struct pollfd *)dpy->filedes;
- }
-#else
- FD_ZERO(&r_mask);
-#endif
- for (;;) {
-#ifndef USE_POLL
- FD_SET(fd, &r_mask);
- if (!(dpy->flags & XlibDisplayProcConni))
- for (ilist=dpy->im_fd_info; ilist; ilist=ilist->next) {
- FD_SET(ilist->fd, &r_mask);
- if (ilist->fd > highest_fd)
- highest_fd = ilist->fd;
- }
-#endif
- UnlockDisplay(dpy);
-#ifdef USE_POLL
- result = poll(filedes,
- (dpy->flags & XlibDisplayProcConni) ? 1 : 1+dpy->im_fd_length,
- -1);
-#else
- result = Select(highest_fd + 1, &r_mask, NULL, NULL, NULL);
-#endif
- InternalLockDisplay(dpy, dpy->flags & XlibDisplayReply);
- if (result == -1 && !(ECHECK(EINTR) || ETEST())) _XIOError(dpy);
- if (result <= 0)
- continue;
-#ifdef USE_POLL
- if (filedes[0].revents & (POLLIN|POLLHUP|POLLERR))
-#else
- if (FD_ISSET(fd, &r_mask))
-#endif
- break;
- if (!(dpy->flags & XlibDisplayProcConni)) {
- int i;
-
- saved_event_serial = dpy->next_event_serial_num;
- /* dpy flags can be clobbered by internal connection callback */
- in_read_events = dpy->flags & XlibDisplayReadEvents;
- for (ilist=dpy->im_fd_info, i=1; ilist; ilist=ilist->next, i++) {
-#ifdef USE_POLL
- if (filedes[i].revents & POLLIN)
-#else
- if (FD_ISSET(ilist->fd, &r_mask))
-#endif
- {
- _XProcessInternalConnection(dpy, ilist);
- did_proc_conni = True;
- }
- }
-#ifdef USE_POLL
- if (dpy->im_fd_length + 1 > POLLFD_CACHE_SIZE)
- Xfree(filedes);
-#endif
- }
- if (did_proc_conni) {
- /* some internal connection callback might have done an
- XPutBackEvent. We notice it here and if we needed an event,
- we can return all the way. */
- if (_XNewerQueuedEvent(dpy, saved_event_serial)
- && (in_read_events
-#ifdef XTHREADS
- || (dpy->lock && dpy->lock->event_awaiters)
-#endif
- ))
- return -2;
- did_proc_conni = False;
- }
- }
-#ifdef XTHREADS
-#ifdef XTHREADS_DEBUG
- printf("thread %x _XWaitForReadable returning\n", XThread_Self());
-#endif
-#endif
- return 0;
-}
-#endif /* !USE_XCB */
-
#ifdef _MSC_VER
#undef min
#define min __min
@@ -631,548 +281,6 @@ void _XSetSeqSyncFunction(Display *dpy) _XSetPrivSyncFunction (dpy);
}
-#if !USE_XCB
-#ifdef XTHREADS
-static void _XFlushInt(
- register Display *dpy,
- register xcondition_t cv);
-#endif
-
-/*
- * _XFlush - Flush the X request buffer. If the buffer is empty, no
- * action is taken. This routine correctly handles incremental writes.
- * This routine may have to be reworked if int < long.
- */
-void _XFlush(
- register Display *dpy)
-{
-#ifdef XTHREADS
- /* With multi-threading we introduce an internal routine to which
- we can pass a condition variable to do locking correctly. */
-
- _XFlushInt(dpy, NULL);
-}
-
-/* _XFlushInt - Internal version of _XFlush used to do multi-threaded
- * locking correctly.
- */
-
-static void _XFlushInt(
- register Display *dpy,
- register xcondition_t cv)
-{
-#endif /* XTHREADS*/
- register long size, todo;
- register int write_stat;
- register char *bufindex;
- _XExtension *ext;
-
- /* This fix resets the bufptr to the front of the buffer so
- * additional appends to the bufptr will not corrupt memory. Since
- * the server is down, these appends are no-op's anyway but
- * callers of _XFlush() are not verifying this before they call it.
- */
- if (dpy->flags & XlibDisplayIOError)
- {
- dpy->bufptr = dpy->buffer;
- dpy->last_req = (char *)&_dummy_request;
- return;
- }
-
-#ifdef XTHREADS
- while (dpy->flags & XlibDisplayWriting) {
- if (dpy->lock) {
- ConditionWait(dpy, dpy->lock->writers);
- } else {
- _XWaitForWritable (dpy, cv);
- }
- }
-#endif
- size = todo = dpy->bufptr - dpy->buffer;
- if (!size) return;
-#ifdef XTHREADS
- dpy->flags |= XlibDisplayWriting;
- /* make sure no one else can put in data */
- dpy->bufptr = dpy->bufmax;
-#endif
- for (ext = dpy->flushes; ext; ext = ext->next_flush)
- (*ext->before_flush)(dpy, &ext->codes, dpy->buffer, size);
- bufindex = dpy->buffer;
- /*
- * While write has not written the entire buffer, keep looping
- * until the entire buffer is written. bufindex will be
- * incremented and size decremented as buffer is written out.
- */
- while (size) {
- ESET(0);
- write_stat = _X11TransWrite(dpy->trans_conn,
- bufindex, (int) todo);
- if (write_stat >= 0) {
- size -= write_stat;
- todo = size;
- bufindex += write_stat;
- } else if (ETEST()) {
- _XWaitForWritable(dpy
-#ifdef XTHREADS
- , cv
-#endif
- );
-#ifdef SUNSYSV
- } else if (ECHECK(0)) {
- _XWaitForWritable(dpy
-#ifdef XTHREADS
- , cv
-#endif
- );
-#endif
-#ifdef ESZTEST
- } else if (ESZTEST()) {
- if (todo > 1)
- todo >>= 1;
- else {
- _XWaitForWritable(dpy
-#ifdef XTHREADS
- , cv
-#endif
- );
- }
-#endif
- } else if (!ECHECK(EINTR)) {
- /* Write failed! */
- /* errno set by write system call. */
- _XIOError(dpy);
- }
- }
- dpy->last_req = (char *)&_dummy_request;
- _XSetSeqSyncFunction(dpy);
- dpy->bufptr = dpy->buffer;
-#ifdef XTHREADS
- dpy->flags &= ~XlibDisplayWriting;
-#endif
-}
-
-int
-_XEventsQueued(
- register Display *dpy,
- int mode)
-{
- register int len;
- BytesReadable_t pend;
- _XAlignedBuffer buf;
- register xReply *rep;
- char *read_buf;
-#ifdef XTHREADS
- int entry_event_serial_num;
- struct _XCVList *cvl = NULL;
- xthread_t self;
-
-#ifdef XTHREADS_DEBUG
- printf("_XEventsQueued called in thread %x\n", XThread_Self());
-#endif
-#endif /* XTHREADS*/
-
- if (mode == QueuedAfterFlush)
- {
- _XFlush(dpy);
- if (dpy->qlen)
- return(dpy->qlen);
- }
- if (dpy->flags & XlibDisplayIOError) return(dpy->qlen);
-
-#ifdef XTHREADS
- /* create our condition variable and append to list,
- * unless we were called from within XProcessInternalConnection
- * or XLockDisplay
- */
- xthread_clear_id(self);
- if (dpy->lock && (xthread_have_id (dpy->lock->conni_thread)
- || xthread_have_id (dpy->lock->locking_thread)))
- /* some thread is in XProcessInternalConnection or XLockDisplay
- so we have to see if we are it */
- self = XThread_Self();
- if (!xthread_have_id(self)
- || (!xthread_equal(self, dpy->lock->conni_thread)
- && !xthread_equal(self, dpy->lock->locking_thread))) {
- /* In the multi-threaded case, if there is someone else
- reading events, then there aren't any available, so
- we just return. If we waited we would block.
- */
- if (dpy->lock && dpy->lock->event_awaiters)
- return dpy->qlen;
- /* nobody here but us, so lock out any newcomers */
- cvl = QueueEventReaderLock(dpy);
- }
-
- while (dpy->lock && cvl && dpy->lock->reply_first) {
- /* note which events we have already seen so we'll know
- if _XReply (in another thread) reads one */
- entry_event_serial_num = dpy->next_event_serial_num;
- ConditionWait(dpy, cvl->cv);
- /* did _XReply read an event we can return? */
- if (_XNewerQueuedEvent(dpy, entry_event_serial_num))
- {
- UnlockNextEventReader(dpy);
- return 0;
- }
- }
-#endif /* XTHREADS*/
-
- if (_X11TransBytesReadable(dpy->trans_conn, &pend) < 0)
- _XIOError(dpy);
-#ifdef XCONN_CHECK_FREQ
- /* This is a crock, required because FIONREAD or equivalent is
- * not guaranteed to detect a broken connection.
- */
- if (!pend && !dpy->qlen && ++dpy->conn_checker >= XCONN_CHECK_FREQ)
- {
- int result;
-#ifdef USE_POLL
- struct pollfd filedes;
-#else
- fd_set r_mask;
- static struct timeval zero_time;
-#endif
-
- dpy->conn_checker = 0;
-#ifdef USE_POLL
- filedes.fd = dpy->fd;
- filedes.events = POLLIN;
- if ((result = poll(&filedes, 1, 0)))
-#else
- FD_ZERO(&r_mask);
- FD_SET(dpy->fd, &r_mask);
- if ((result = Select(dpy->fd + 1, &r_mask, NULL, NULL, &zero_time)))
-#endif
- {
- if (result > 0)
- {
- if (_X11TransBytesReadable(dpy->trans_conn, &pend) < 0)
- _XIOError(dpy);
- /* we should not get zero, if we do, force a read */
- if (!pend)
- pend = SIZEOF(xReply);
- }
- else if (result < 0 && !(ECHECK(EINTR) || ETEST()))
- _XIOError(dpy);
- }
- }
-#endif /* XCONN_CHECK_FREQ */
- if (!(len = pend)) {
- /* _XFlush can enqueue events */
-#ifdef XTHREADS
- if (cvl)
-#endif
- {
- UnlockNextEventReader(dpy);
- }
- return(dpy->qlen);
- }
- /* Force a read if there is not enough data. Otherwise,
- * a select() loop at a higher-level will spin undesirably,
- * and we've seen at least one OS that appears to not update
- * the result from FIONREAD once it has returned nonzero.
- */
-#ifdef XTHREADS
- if (dpy->lock && dpy->lock->reply_awaiters) {
- read_buf = (char *)dpy->lock->reply_awaiters->buf;
- len = SIZEOF(xReply);
- } else
-#endif /* XTHREADS*/
- {
- read_buf = buf.buf;
-
- if (len < SIZEOF(xReply)
-#ifdef XTHREADS
- || dpy->async_handlers
-#endif
- )
- len = SIZEOF(xReply);
- else if (len > BUFSIZE)
- len = BUFSIZE;
- len = (len / SIZEOF(xReply)) * SIZEOF(xReply);
- }
-#ifdef XCONN_CHECK_FREQ
- dpy->conn_checker = 0;
-#endif
-
- (void) _XRead (dpy, read_buf, (long) len);
-
-#ifdef XTHREADS
- /* what did we actually read: reply or event? */
- if (dpy->lock && dpy->lock->reply_awaiters) {
- if (((xReply *)read_buf)->generic.type == X_Reply ||
- ((xReply *)read_buf)->generic.type == X_Error)
- {
- dpy->lock->reply_was_read = True;
- dpy->lock->reply_first = True;
- if (read_buf != (char *)dpy->lock->reply_awaiters->buf)
- memcpy(dpy->lock->reply_awaiters->buf, read_buf,
- len);
- if (cvl) {
- UnlockNextEventReader(dpy);
- }
- return(dpy->qlen); /* we read, so we can return */
- } else if (read_buf != buf.buf)
- memcpy(buf.buf, read_buf, len);
- }
-#endif /* XTHREADS*/
-
- STARTITERATE(rep,xReply,buf.buf,len > 0) {
- if (rep->generic.type == X_Reply) {
- int tmp = len;
- RESETITERPTR(rep,xReply,
- _XAsyncReply (dpy, rep,
- ITERPTR(rep), &tmp, True));
- len = tmp;
- pend = len;
- } else {
- if (rep->generic.type == X_Error)
- _XError (dpy, (xError *)rep);
- else /* must be an event packet */
- _XEnq (dpy, (xEvent *)rep);
- INCITERPTR(rep,xReply);
- len -= SIZEOF(xReply);
- }
- } ENDITERATE
-
-#ifdef XTHREADS
- if (cvl)
-#endif
- {
- UnlockNextEventReader(dpy);
- }
- return(dpy->qlen);
-}
-
-/* _XReadEvents - Flush the output queue,
- * then read as many events as possible (but at least 1) and enqueue them
- */
-void _XReadEvents(
- register Display *dpy)
-{
- _XAlignedBuffer buf;
- BytesReadable_t pend;
- int len;
- register xReply *rep;
- Bool not_yet_flushed = True;
- char *read_buf;
- int i;
- int entry_event_serial_num = dpy->next_event_serial_num;
-#ifdef XTHREADS
- struct _XCVList *cvl = NULL;
- xthread_t self;
-
-#ifdef XTHREADS_DEBUG
- printf("_XReadEvents called in thread %x\n",
- XThread_Self());
-#endif
- /* create our condition variable and append to list,
- * unless we were called from within XProcessInternalConnection
- * or XLockDisplay
- */
- xthread_clear_id(self);
- if (dpy->lock && (xthread_have_id (dpy->lock->conni_thread)
- || xthread_have_id (dpy->lock->locking_thread)))
- /* some thread is in XProcessInternalConnection or XLockDisplay
- so we have to see if we are it */
- self = XThread_Self();
- if (!xthread_have_id(self)
- || (!xthread_equal(self, dpy->lock->conni_thread)
- && !xthread_equal(self, dpy->lock->locking_thread)))
- cvl = QueueEventReaderLock(dpy);
-#endif /* XTHREADS */
-
- do {
-#ifdef XTHREADS
- /* if it is not our turn to read an event off the wire,
- wait til we're at head of list */
- if (dpy->lock && cvl &&
- (dpy->lock->event_awaiters != cvl ||
- dpy->lock->reply_first)) {
- ConditionWait(dpy, cvl->cv);
- continue;
- }
-#endif /* XTHREADS */
- /* find out how much data can be read */
- if (_X11TransBytesReadable(dpy->trans_conn, &pend) < 0)
- _XIOError(dpy);
- len = pend;
-
- /* must read at least one xEvent; if none is pending, then
- we'll just flush and block waiting for it */
- if (len < SIZEOF(xEvent)
-#ifdef XTHREADS
- || dpy->async_handlers
-#endif
- ) {
- len = SIZEOF(xEvent);
- /* don't flush until the first time we would block */
- if (not_yet_flushed) {
- _XFlush (dpy);
- if (_XNewerQueuedEvent(dpy, entry_event_serial_num)) {
- /* _XReply has read an event for us */
- goto got_event;
- }
- not_yet_flushed = False;
- }
- }
-
-#ifdef XTHREADS
- /* If someone is waiting for a reply, gamble that
- the reply will be the next thing on the wire
- and read it into their buffer. */
- if (dpy->lock && dpy->lock->reply_awaiters) {
- read_buf = (char *)dpy->lock->reply_awaiters->buf;
- len = SIZEOF(xReply);
- } else
-#endif /* XTHREADS*/
- {
- read_buf = buf.buf;
-
- /* but we won't read more than the max buffer size */
- if (len > BUFSIZE)
- len = BUFSIZE;
-
- /* round down to an integral number of XReps */
- len = (len / SIZEOF(xEvent)) * SIZEOF(xEvent);
- }
-
-#ifdef XTHREADS
- if (xthread_have_id(self))
- /* save value we may have to stick in conni_thread */
- dpy->lock->reading_thread = self;
-#endif /* XTHREADS */
- dpy->flags |= XlibDisplayReadEvents;
- i = _XRead (dpy, read_buf, (long) len);
- dpy->flags &= ~XlibDisplayReadEvents;
- if (i == -2) {
- /* special flag from _XRead to say that internal connection has
- done XPutBackEvent. Which we can use so we're done. */
- got_event:
-#ifdef XTHREADS
- if (dpy->lock && dpy->lock->lock_wait) {
- if (dpy->lock->event_awaiters != cvl)
- /* since it is not us, must be user lock thread */
- ConditionSignal(dpy,
- dpy->lock->event_awaiters->cv);
- (*dpy->lock->lock_wait)(dpy);
- continue;
- }
-#endif
- break;
- }
-#ifdef XTHREADS
- if (xthread_have_id(self))
- xthread_clear_id(dpy->lock->reading_thread);
-
- /* what did we actually read: reply or event? */
- if (dpy->lock && dpy->lock->reply_awaiters) {
- if (((xReply *)read_buf)->generic.type == X_Reply ||
- ((xReply *)read_buf)->generic.type == X_Error)
- {
- dpy->lock->reply_was_read = True;
- dpy->lock->reply_first = True;
- if (read_buf != (char *)dpy->lock->reply_awaiters->buf)
- memcpy(dpy->lock->reply_awaiters->buf,
- read_buf, len);
- ConditionSignal(dpy, dpy->lock->reply_awaiters->cv);
- continue;
- } else if (read_buf != buf.buf)
- memcpy(buf.buf, read_buf, len);
- }
-#endif /* XTHREADS */
-
- STARTITERATE(rep,xReply,buf.buf,len > 0) {
- if (rep->generic.type == X_Reply) {
- RESETITERPTR(rep,xReply,
- _XAsyncReply (dpy, rep,
- ITERPTR(rep), &len, True));
- pend = len;
- } else {
- if (rep->generic.type == X_Error)
- _XError (dpy, (xError *) rep);
- else /* must be an event packet */
- {
- if (rep->generic.type == GenericEvent)
- {
- int evlen;
- evlen = (rep->generic.length << 2);
- if (_XRead(dpy, &read_buf[len], evlen) == -2)
- goto got_event; /* XXX: aargh! */
- }
-
- _XEnq (dpy, (xEvent *)rep);
- }
- INCITERPTR(rep,xReply);
- len -= SIZEOF(xReply);
- }
- } ENDITERATE;
- } while (!_XNewerQueuedEvent(dpy, entry_event_serial_num));
-
- UnlockNextEventReader(dpy);
-}
-
-/*
- * _XRead - Read bytes from the socket taking into account incomplete
- * reads. This routine may have to be reworked if int < long.
- */
-int _XRead(
- register Display *dpy,
- register char *data,
- register long size)
-{
- register long bytes_read;
-#ifdef XTHREADS
- int original_size = size;
-#endif
-
- if ((dpy->flags & XlibDisplayIOError) || size == 0)
- return 0;
- ESET(0);
- while ((bytes_read = _X11TransRead(dpy->trans_conn, data, (int)size))
- != size) {
-
- if (bytes_read > 0) {
- size -= bytes_read;
- data += bytes_read;
- }
- else if (ETEST()) {
- if (_XWaitForReadable(dpy) == -2)
- return -2; /* internal connection did XPutBackEvent */
- ESET(0);
- }
-#ifdef SUNSYSV
- else if (ECHECK(0)) {
- if (_XWaitForReadable(dpy) == -2)
- return -2; /* internal connection did XPutBackEvent */
- }
-#endif
- else if (bytes_read == 0) {
- /* Read failed because of end of file! */
- ESET(EPIPE);
- _XIOError(dpy);
- }
-
- else /* bytes_read is less than 0; presumably -1 */ {
- /* If it's a system call interrupt, it's not an error. */
- if (!ECHECK(EINTR))
- _XIOError(dpy);
- }
- }
-#ifdef XTHREADS
- if (dpy->lock && dpy->lock->reply_bytes_left > 0)
- {
- dpy->lock->reply_bytes_left -= original_size;
- if (dpy->lock->reply_bytes_left == 0) {
- dpy->flags &= ~XlibDisplayReply;
- UnlockNextReplyReader(dpy);
- }
- }
-#endif /* XTHREADS*/
- return 0;
-}
-#endif /* !USE_XCB */
-
#ifdef LONG64
void _XRead32(
Display *dpy,
@@ -1312,348 +420,6 @@ void _XRead16Pad( }
#endif /* WORD64 */
-
-#if !USE_XCB
-/*
- * _XReadPad - Read bytes from the socket taking into account incomplete
- * reads. If the number of bytes is not 0 mod 4, read additional pad
- * bytes. This routine may have to be reworked if int < long.
- */
-void _XReadPad(
- register Display *dpy,
- register char *data,
- register long size)
-{
- register long bytes_read;
- struct iovec iov[2];
- char pad[3];
-#ifdef XTHREADS
- int original_size;
-#endif
-
- if ((dpy->flags & XlibDisplayIOError) || size == 0) return;
- iov[0].iov_len = (int)size;
- iov[0].iov_base = data;
- /*
- * The following hack is used to provide 32 bit long-word
- * aligned padding. The [1] vector is of length 0, 1, 2, or 3,
- * whatever is needed.
- */
-
- iov[1].iov_len = -size & 3;
- iov[1].iov_base = pad;
- size += iov[1].iov_len;
-#ifdef XTHREADS
- original_size = size;
-#endif
- ESET(0);
- while ((bytes_read = _X11TransReadv (dpy->trans_conn, iov, 2)) != size) {
-
- if (bytes_read > 0) {
- size -= bytes_read;
- if (iov[0].iov_len < bytes_read) {
- int pad_bytes_read = bytes_read - iov[0].iov_len;
- iov[1].iov_len -= pad_bytes_read;
- iov[1].iov_base =
- (char *)iov[1].iov_base + pad_bytes_read;
- iov[0].iov_len = 0;
- }
- else {
- iov[0].iov_len -= bytes_read;
- iov[0].iov_base = (char *)iov[0].iov_base + bytes_read;
- }
- }
- else if (ETEST()) {
- _XWaitForReadable(dpy);
- ESET(0);
- }
-#ifdef SUNSYSV
- else if (ECHECK(0)) {
- _XWaitForReadable(dpy);
- }
-#endif
- else if (bytes_read == 0) {
- /* Read failed because of end of file! */
- ESET(EPIPE);
- _XIOError(dpy);
- }
-
- else /* bytes_read is less than 0; presumably -1 */ {
- /* If it's a system call interrupt, it's not an error. */
- if (!ECHECK(EINTR))
- _XIOError(dpy);
- }
- }
-#ifdef XTHREADS
- if (dpy->lock && dpy->lock->reply_bytes_left > 0)
- {
- dpy->lock->reply_bytes_left -= original_size;
- if (dpy->lock->reply_bytes_left == 0) {
- dpy->flags &= ~XlibDisplayReply;
- UnlockNextReplyReader(dpy);
- }
- }
-#endif /* XTHREADS*/
-}
-
-/*
- * _XSend - Flush the buffer and send the client data. 32 bit word aligned
- * transmission is used, if size is not 0 mod 4, extra bytes are transmitted.
- * This routine may have to be reworked if int < long;
- */
-void
-_XSend (
- register Display *dpy,
- _Xconst char *data,
- register long size)
-{
- struct iovec iov[3];
- static char const pad[3] = {0, 0, 0};
- /* XText8 and XText16 require that the padding bytes be zero! */
-
- long skip, dbufsize, padsize, total, todo;
- _XExtension *ext;
-
- if (!size || (dpy->flags & XlibDisplayIOError)) return;
- dbufsize = dpy->bufptr - dpy->buffer;
-#ifdef XTHREADS
- dpy->flags |= XlibDisplayWriting;
- /* make sure no one else can put in data */
- dpy->bufptr = dpy->bufmax;
-#endif
- padsize = -size & 3;
- for (ext = dpy->flushes; ext; ext = ext->next_flush) {
- (*ext->before_flush)(dpy, &ext->codes, dpy->buffer, dbufsize);
- (*ext->before_flush)(dpy, &ext->codes, (char *)data, size);
- if (padsize)
- (*ext->before_flush)(dpy, &ext->codes, pad, padsize);
- }
- skip = 0;
- todo = total = dbufsize + size + padsize;
-
- /*
- * There are 3 pieces that may need to be written out:
- *
- * o whatever is in the display buffer
- * o the data passed in by the user
- * o any padding needed to 32bit align the whole mess
- *
- * This loop looks at all 3 pieces each time through. It uses skip
- * to figure out whether or not a given piece is needed.
- */
- while (total) {
- long before = skip; /* amount of whole thing written */
- long remain = todo; /* amount to try this time, <= total */
- int i = 0;
- long len;
-
- /* You could be very general here and have "in" and "out" iovecs
- * and write a loop without using a macro, but what the heck. This
- * translates to:
- *
- * how much of this piece is new?
- * if more new then we are trying this time, clamp
- * if nothing new
- * then bump down amount already written, for next piece
- * else put new stuff in iovec, will need all of next piece
- *
- * Note that todo had better be at least 1 or else we'll end up
- * writing 0 iovecs.
- */
-#define InsertIOV(pointer, length) \
- len = (length) - before; \
- if (len > remain) \
- len = remain; \
- if (len <= 0) { \
- before = (-len); \
- } else { \
- iov[i].iov_len = len; \
- iov[i].iov_base = (pointer) + before; \
- i++; \
- remain -= len; \
- before = 0; \
- }
-
- InsertIOV (dpy->buffer, dbufsize)
- InsertIOV ((char *)data, size)
- InsertIOV ((char *)pad, padsize)
-
- ESET(0);
- if ((len = _X11TransWritev(dpy->trans_conn, iov, i)) >= 0) {
- skip += len;
- total -= len;
- todo = total;
- } else if (ETEST()) {
- _XWaitForWritable(dpy
-#ifdef XTHREADS
- , NULL
-#endif
- );
-#ifdef SUNSYSV
- } else if (ECHECK(0)) {
- _XWaitForWritable(dpy
-#ifdef XTHREADS
- , NULL
-#endif
- );
-#endif
-#ifdef ESZTEST
- } else if (ESZTEST()) {
- if (todo > 1)
- todo >>= 1;
- else {
- _XWaitForWritable(dpy
-#ifdef XTHREADS
- , NULL
-#endif
- );
- }
-#endif
- } else if (!ECHECK(EINTR)) {
- _XIOError(dpy);
- }
- }
- dpy->last_req = (char *) & _dummy_request;
- _XSetSeqSyncFunction(dpy);
- dpy->bufptr = dpy->buffer;
-#ifdef XTHREADS
- dpy->flags &= ~XlibDisplayWriting;
-#endif
- return;
-}
-
-static void
-_XGetMiscCode(
- register Display *dpy)
-{
- xQueryExtensionReply qrep;
- register xQueryExtensionReq *qreq;
- xXCMiscGetVersionReply vrep;
- register xXCMiscGetVersionReq *vreq;
-
- if (dpy->xcmisc_opcode)
- return;
- GetReq(QueryExtension, qreq);
- qreq->nbytes = sizeof(XCMiscExtensionName) - 1;
- qreq->length += (qreq->nbytes+(unsigned)3)>>2;
- _XSend(dpy, XCMiscExtensionName, (long)qreq->nbytes);
- if (!_XReply (dpy, (xReply *)&qrep, 0, xTrue))
- dpy->xcmisc_opcode = -1;
- else {
- GetReq(XCMiscGetVersion, vreq);
- vreq->reqType = qrep.major_opcode;
- vreq->miscReqType = X_XCMiscGetVersion;
- vreq->majorVersion = XCMiscMajorVersion;
- vreq->minorVersion = XCMiscMinorVersion;
- if (!_XReply (dpy, (xReply *)&vrep, 0, xTrue))
- dpy->xcmisc_opcode = -1;
- else
- dpy->xcmisc_opcode = qrep.major_opcode;
- }
-}
-
-void
-_XIDHandler(
- register Display *dpy)
-{
- xXCMiscGetXIDRangeReply grep;
- register xXCMiscGetXIDRangeReq *greq;
-
- if (dpy->resource_max == dpy->resource_mask + 1) {
- _XGetMiscCode(dpy);
- if (dpy->xcmisc_opcode > 0) {
- GetReq(XCMiscGetXIDRange, greq);
- greq->reqType = dpy->xcmisc_opcode;
- greq->miscReqType = X_XCMiscGetXIDRange;
- if (_XReply (dpy, (xReply *)&grep, 0, xTrue) && grep.count) {
- dpy->resource_id = ((grep.start_id - dpy->resource_base) >>
- dpy->resource_shift);
- dpy->resource_max = dpy->resource_id;
- if (grep.count > 5)
- dpy->resource_max += grep.count - 6;
- dpy->resource_max <<= dpy->resource_shift;
- }
- sync_while_locked(dpy);
- }
- }
-}
-
-/*
- * _XAllocID - resource ID allocation routine.
- */
-XID _XAllocID(
- register Display *dpy)
-{
- XID id;
-
- id = dpy->resource_id << dpy->resource_shift;
- if (id >= dpy->resource_max) {
- _XSetPrivSyncFunction(dpy);
- dpy->resource_max = dpy->resource_mask + 1;
- }
- if (id <= dpy->resource_mask) {
- dpy->resource_id++;
- return (dpy->resource_base + id);
- }
- if (id != 0x10000000) {
- (void) fprintf(stderr,
- "Xlib: resource ID allocation space exhausted!\n");
- id = 0x10000000;
- dpy->resource_id = id >> dpy->resource_shift;
- }
- return id;
-}
-
-/*
- * _XAllocIDs - multiple resource ID allocation routine.
- */
-void _XAllocIDs(
- register Display *dpy,
- XID *ids,
- int count)
-{
- XID id;
- int i;
- xXCMiscGetXIDListReply grep;
- register xXCMiscGetXIDListReq *greq;
-
- id = dpy->resource_id << dpy->resource_shift;
- if (dpy->resource_max <= dpy->resource_mask &&
- id <= dpy->resource_mask &&
- (dpy->resource_max - id) > ((count - 1) << dpy->resource_shift)) {
- id += dpy->resource_base;
- for (i = 0; i < count; i++) {
- ids[i] = id;
- id += (1 << dpy->resource_shift);
- dpy->resource_id++;
- }
- return;
- }
- grep.count = 0;
- _XGetMiscCode(dpy);
- if (dpy->xcmisc_opcode > 0) {
- GetReq(XCMiscGetXIDList, greq);
- greq->reqType = dpy->xcmisc_opcode;
- greq->miscReqType = X_XCMiscGetXIDList;
- greq->count = count;
- if (_XReply(dpy, (xReply *)&grep, 0, xFalse) && grep.count) {
- _XRead32(dpy, (long *) ids, 4L * (long) (grep.count));
- for (i = 0; i < grep.count; i++) {
- id = (ids[i] - dpy->resource_base) >> dpy->resource_shift;
- if (id >= dpy->resource_id)
- dpy->resource_id = id;
- }
- if (id >= dpy->resource_max) {
- _XSetPrivSyncFunction(dpy);
- dpy->resource_max = dpy->resource_mask + 1;
- }
- }
- }
- for (i = grep.count; i < count; i++)
- ids[i] = XAllocID(dpy);
-}
-#endif /* !USE_XCB */
-
/*
* The hard part about this is that we only get 16 bits from a reply.
* We have three values that will march along, with the following invariant:
@@ -1697,263 +463,6 @@ _XSetLastRequestRead( return(newseq);
}
-#if !USE_XCB
-/*
- * _XReply - Wait for a reply packet and copy its contents into the
- * specified rep. Meanwhile we must handle error and event packets that
- * we may encounter.
- */
-Status
-_XReply (
- register Display *dpy,
- register xReply *rep,
- int extra, /* number of 32-bit words expected after the reply */
- Bool discard) /* should I discard data following "extra" words? */
-{
- /* Pull out the serial number now, so that (currently illegal) requests
- * generated by an error handler don't confuse us.
- */
- unsigned long cur_request = dpy->request;
-#ifdef XTHREADS
- struct _XCVList *cvl;
-#endif
-
- if (dpy->flags & XlibDisplayIOError)
- return 0;
-
-#ifdef XTHREADS
- /* create our condition variable and append to list */
- cvl = QueueReplyReaderLock(dpy);
- if (cvl) {
- cvl->buf = rep;
- if (dpy->lock->reply_awaiters == cvl && !dpy->lock->event_awaiters)
- dpy->lock->reply_first = True;
- }
-
-#ifdef XTHREADS_DEBUG
- printf("_XReply called in thread %x, adding %x to cvl\n",
- XThread_Self(), cvl);
-#endif
-
- _XFlushInt(dpy, cvl ? cvl->cv : NULL);
- /* if it is not our turn to read a reply off the wire,
- * wait til we're at head of list. if there is an event waiter,
- * and our reply hasn't been read, they'll be in select and will
- * hand control back to us next.
- */
- if(dpy->lock &&
- (dpy->lock->reply_awaiters != cvl || !dpy->lock->reply_first)) {
- ConditionWait(dpy, cvl->cv);
- }
- dpy->flags |= XlibDisplayReply;
-#else /* XTHREADS else */
- _XFlush(dpy);
-#endif
-
- for (;;) {
-#ifdef XTHREADS
- /* Did another thread's _XReadEvents get our reply by accident? */
- if (!dpy->lock || !dpy->lock->reply_was_read)
-#endif
- (void) _XRead(dpy, (char *)rep, (long)SIZEOF(xReply));
-#ifdef XTHREADS
- if (dpy->lock)
- dpy->lock->reply_was_read = False;
-#endif
-
- switch ((int)rep->generic.type) {
-
- case X_Reply:
- /* Reply received. Fast update for synchronous replies,
- * but deal with multiple outstanding replies.
- */
- if (rep->generic.sequenceNumber == (cur_request & 0xffff))
- dpy->last_request_read = cur_request;
- else {
- int pend = SIZEOF(xReply);
- if (_XAsyncReply(dpy, rep, (char *)rep, &pend, False)
- != (char *)rep)
- continue;
- }
- if (extra <= rep->generic.length) {
- if (extra > 0)
- /*
- * Read the extra data into storage immediately
- * following the GenericReply structure.
- */
- (void) _XRead (dpy, (char *) (NEXTPTR(rep,xReply)),
- ((long)extra) << 2);
- if (discard) {
- if (extra < rep->generic.length)
- _XEatData(dpy, (rep->generic.length - extra) << 2);
- }
-#ifdef XTHREADS
- if (dpy->lock) {
- if (discard) {
- dpy->lock->reply_bytes_left = 0;
- } else {
- dpy->lock->reply_bytes_left =
- (rep->generic.length - extra) << 2;
- }
- if (dpy->lock->reply_bytes_left == 0) {
- dpy->flags &= ~XlibDisplayReply;
- UnlockNextReplyReader(dpy);
- }
- } else
- dpy->flags &= ~XlibDisplayReply;
-#endif
- return 1;
- }
- /*
- *if we get here, then extra > rep->generic.length--meaning we
- * read a reply that's shorter than we expected. This is an
- * error, but we still need to figure out how to handle it...
- */
- (void) _XRead (dpy, (char *) (NEXTPTR(rep,xReply)),
- ((long) rep->generic.length) << 2);
- dpy->flags &= ~XlibDisplayReply;
- UnlockNextReplyReader(dpy);
- _XIOError (dpy);
- return (0);
-
- case X_Error:
- {
- register _XExtension *ext;
- register Bool ret = False;
- int ret_code;
- xError *err = (xError *) rep;
- unsigned long serial;
-
- dpy->flags &= ~XlibDisplayReply;
- serial = _XSetLastRequestRead(dpy, (xGenericReply *)rep);
- if (serial == cur_request)
- /* do not die on "no such font", "can't allocate",
- "can't grab" failures */
- switch ((int)err->errorCode) {
- case BadName:
- switch (err->majorCode) {
- case X_LookupColor:
- case X_AllocNamedColor:
- UnlockNextReplyReader(dpy);
- return(0);
- }
- break;
- case BadFont:
- if (err->majorCode == X_QueryFont) {
- UnlockNextReplyReader(dpy);
- return (0);
- }
- break;
- case BadAlloc:
- case BadAccess:
- UnlockNextReplyReader(dpy);
- return (0);
- }
- /*
- * we better see if there is an extension who may
- * want to suppress the error.
- */
- for (ext = dpy->ext_procs; !ret && ext; ext = ext->next) {
- if (ext->error)
- ret = (*ext->error)(dpy, err, &ext->codes, &ret_code);
- }
- if (!ret) {
- _XError(dpy, err);
- ret_code = 0;
- }
- if (serial == cur_request) {
- UnlockNextReplyReader(dpy);
- return(ret_code);
- }
-
- } /* case X_Error */
- break;
- default:
- _XEnq(dpy, (xEvent *) rep);
-#ifdef XTHREADS
- if (dpy->lock && dpy->lock->event_awaiters)
- ConditionSignal(dpy, dpy->lock->event_awaiters->cv);
-#endif
- break;
- }
- }
-}
-
-static char *
-_XAsyncReply(
- Display *dpy,
- register xReply *rep,
- char *buf,
- register int *lenp,
- Bool discard)
-{
- register _XAsyncHandler *async, *next;
- register int len;
- register Bool consumed = False;
- char *nbuf;
-
- (void) _XSetLastRequestRead(dpy, &rep->generic);
- len = SIZEOF(xReply) + (rep->generic.length << 2);
- if (len < SIZEOF(xReply)) {
- _XIOError (dpy);
- buf += *lenp;
- *lenp = 0;
- return buf;
- }
-
- for (async = dpy->async_handlers; async; async = next) {
- next = async->next;
- if ((consumed = (*async->handler)(dpy, rep, buf, *lenp, async->data)))
- break;
- }
- if (!consumed) {
- if (!discard)
- return buf;
- (void) fprintf(stderr,
- "Xlib: unexpected async reply (sequence 0x%lx)!\n",
- dpy->last_request_read);
-#ifdef XTHREADS
-#ifdef XTHREADS_DEBUG
- printf("thread %x, unexpected async reply\n", XThread_Self());
-#endif
-#endif
- if (len > *lenp)
- _XEatData(dpy, len - *lenp);
- }
- if (len < SIZEOF(xReply))
- {
- _XIOError (dpy);
- buf += *lenp;
- *lenp = 0;
- return buf;
- }
- if (len >= *lenp) {
- buf += *lenp;
- *lenp = 0;
- return buf;
- }
- *lenp -= len;
- buf += len;
- len = *lenp;
- nbuf = buf;
- while (len > SIZEOF(xReply)) {
- if (*buf == X_Reply)
- return nbuf;
- buf += SIZEOF(xReply);
- len -= SIZEOF(xReply);
- }
- if (len > 0 && len < SIZEOF(xReply)) {
- buf = nbuf;
- len = SIZEOF(xReply) - len;
- nbuf -= len;
- memmove(nbuf, buf, *lenp);
- (void) _XRead(dpy, nbuf + *lenp, (long)len);
- *lenp += len;
- }
- return nbuf;
-}
-#endif /* !USE_XCB */
-
/*
* Support for internal connections, such as an IM might use.
* By Stephen Gildea, X Consortium, September 1993
@@ -2103,22 +612,9 @@ void _XProcessInternalConnection( struct _XConnectionInfo *conn_info)
{
dpy->flags |= XlibDisplayProcConni;
-#if defined(XTHREADS) && !USE_XCB
- if (dpy->lock) {
- /* check cache to avoid call to thread_self */
- if (xthread_have_id(dpy->lock->reading_thread))
- dpy->lock->conni_thread = dpy->lock->reading_thread;
- else
- dpy->lock->conni_thread = XThread_Self();
- }
-#endif /* XTHREADS && !USE_XCB */
UnlockDisplay(dpy);
(*conn_info->read_callback) (dpy, conn_info->fd, conn_info->call_data);
LockDisplay(dpy);
-#if defined(XTHREADS) && !USE_XCB
- if (dpy->lock)
- xthread_clear_id(dpy->lock->conni_thread);
-#endif /* XTHREADS && !USE_XCB */
dpy->flags &= ~XlibDisplayProcConni;
}
@@ -2246,26 +742,6 @@ XRemoveConnectionWatch( /* end of internal connections support */
-
-#if !USE_XCB
-/* Read and discard "n" 8-bit bytes of data */
-
-void _XEatData(
- Display *dpy,
- register unsigned long n)
-{
-#define SCRATCHSIZE 2048
- char buf[SCRATCHSIZE];
-
- while (n > 0) {
- register long bytes_read = (n > SCRATCHSIZE) ? SCRATCHSIZE : n;
- (void) _XRead (dpy, buf, bytes_read);
- n -= bytes_read;
- }
-#undef SCRATCHSIZE
-}
-#endif /* !USE_XCB */
-
/* Cookie jar implementation
dpy->cookiejar is a linked list. _XEnq receives the events but leaves
them in the normal EQ. _XStoreEvent returns the cookie event (minus
@@ -3102,19 +1578,7 @@ int _XError ( !(*dpy->error_vec[rep->errorCode])(dpy, &event.xerror, rep))
return 0;
if (_XErrorFunction != NULL) {
- int rtn_val;
-#if defined(XTHREADS) && !USE_XCB
- if (dpy->lock)
- (*dpy->lock->user_lock_display)(dpy);
- UnlockDisplay(dpy);
-#endif /* XTHREADS && !USE_XCB */
- rtn_val = (*_XErrorFunction)(dpy, (XErrorEvent *)&event); /* upcall */
-#if defined(XTHREADS) && !USE_XCB
- LockDisplay(dpy);
- if (dpy->lock)
- (*dpy->lock->user_unlock_display)(dpy);
-#endif /* XTHREADS && !USE_XCB */
- return rtn_val;
+ return (*_XErrorFunction)(dpy, (XErrorEvent *)&event); /* upcall */
} else {
return _XDefaultError(dpy, (XErrorEvent *)&event);
}
diff --git a/libX11/src/Xprivate.h b/libX11/src/Xprivate.h index ce6e431ec..5e31befcc 100644 --- a/libX11/src/Xprivate.h +++ b/libX11/src/Xprivate.h @@ -8,10 +8,10 @@ #ifndef XPRIVATE_H
#define XPRIVATE_H
-extern void _XIDHandler(Display *dpy);
-extern void _XSeqSyncFunction(Display *dpy);
-extern void _XSetPrivSyncFunction(Display *dpy);
-extern void _XSetSeqSyncFunction(Display *dpy);
+extern _X_HIDDEN void _XIDHandler(Display *dpy);
+extern _X_HIDDEN void _XSeqSyncFunction(Display *dpy);
+extern _X_HIDDEN void _XSetPrivSyncFunction(Display *dpy);
+extern _X_HIDDEN void _XSetSeqSyncFunction(Display *dpy);
#ifdef XTHREADS
#if defined(XTHREADS_WARN) || defined(XTHREADS_FILE_LINE)
diff --git a/libX11/src/config.h.in b/libX11/src/config.h.in deleted file mode 100644 index 12ed0ac75..000000000 --- a/libX11/src/config.h.in +++ /dev/null @@ -1,231 +0,0 @@ -/* src/config.h.in. Generated from configure.ac by autoheader. */ - -/* Define to 1 if `struct sockaddr_in' has a `sin_len' member */ -#undef BSD44SOCKETS - -/* Include compose table cache support */ -#undef COMPOSECACHE - -/* Has getresuid() & getresgid() functions */ -#undef HASGETRESUID - -/* Has issetugid() function */ -#undef HASSETUGID - -/* Has shm*() functions */ -#undef HAS_SHM - -/* Define to 1 if you have the `authdes_create' function. */ -#undef HAVE_AUTHDES_CREATE - -/* Define to 1 if you have the `authdes_seccreate' function. */ -#undef HAVE_AUTHDES_SECCREATE - -/* Define to 1 if you have the <dlfcn.h> header file. */ -#undef HAVE_DLFCN_H - -/* Use dlopen to load shared libraries */ -#undef HAVE_DLOPEN - -/* Define to 1 if you have the <dl.h> header file. */ -#undef HAVE_DL_H - -/* Define to 1 if you have the `getpagesize' function. */ -#undef HAVE_GETPAGESIZE - -/* Define to 1 if you have the <inttypes.h> header file. */ -#undef HAVE_INTTYPES_H - -/* launchd support available */ -#undef HAVE_LAUNCHD - -/* Define to 1 if you have the `ws2_32' library (-lws2_32). */ -#undef HAVE_LIBWS2_32 - -/* Define to 1 if you have the <memory.h> header file. */ -#undef HAVE_MEMORY_H - -/* Define to 1 if you have a working `mmap' system call. */ -#undef HAVE_MMAP - -/* Use shl_load to load shared libraries */ -#undef HAVE_SHL_LOAD - -/* Define to 1 if the system has the type `socklen_t'. */ -#undef HAVE_SOCKLEN_T - -/* Define to 1 if you have the <stdint.h> header file. */ -#undef HAVE_STDINT_H - -/* Define to 1 if you have the <stdlib.h> header file. */ -#undef HAVE_STDLIB_H - -/* Define to 1 if you have the <strings.h> header file. */ -#undef HAVE_STRINGS_H - -/* Define to 1 if you have the <string.h> header file. */ -#undef HAVE_STRING_H - -/* Define to 1 if you have the `strtol' function. */ -#undef HAVE_STRTOL - -/* Define to 1 if you have the <sys/param.h> header file. */ -#undef HAVE_SYS_PARAM_H - -/* Define to 1 if you have the <sys/select.h> header file. */ -#undef HAVE_SYS_SELECT_H - -/* Define to 1 if you have the <sys/stat.h> header file. */ -#undef HAVE_SYS_STAT_H - -/* Define to 1 if you have the <sys/types.h> header file. */ -#undef HAVE_SYS_TYPES_H - -/* Define to 1 if you have the <unistd.h> header file. */ -#undef HAVE_UNISTD_H - -/* Support IPv6 for TCP connections */ -#undef IPv6 - -/* Support os-specific local connections */ -#undef LOCALCONN - -/* preference sorted list of transport types to try for local connections */ -#undef LOCAL_TRANSPORT_LIST - -/* Disable XLOCALEDIR environment variable */ -#undef NO_XLOCALEDIR - -/* Name of package */ -#undef PACKAGE - -/* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#undef PACKAGE_NAME - -/* Define to the full name and version of this package. */ -#undef PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME - -/* Define to the home page for this package. */ -#undef PACKAGE_URL - -/* Define to the version of this package. */ -#undef PACKAGE_VERSION - -/* Major version of this package */ -#undef PACKAGE_VERSION_MAJOR - -/* Minor version of this package */ -#undef PACKAGE_VERSION_MINOR - -/* Patch version of this package */ -#undef PACKAGE_VERSION_PATCHLEVEL - -/* Define as the return type of signal handlers (`int' or `void'). */ -#undef RETSIGTYPE - -/* Support Secure RPC ("SUN-DES-1") authentication for X11 clients */ -#undef SECURE_RPC - -/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS - -/* Support TCP socket connections */ -#undef TCPCONN - -/* launchd support available */ -#undef TRANS_REOPEN - -/* Support UNIX socket connections */ -#undef UNIXCONN - -/* Split some i18n functions into loadable modules */ -#undef USE_DYNAMIC_LC - -/* Use the X cursor library to load cursors */ -#undef USE_DYNAMIC_XCURSOR - -/* poll() function is available */ -#undef USE_POLL - -/* Enable extensions on AIX 3, Interix. */ -#ifndef _ALL_SOURCE -# undef _ALL_SOURCE -#endif -/* Enable GNU extensions on systems that have them. */ -#ifndef _GNU_SOURCE -# undef _GNU_SOURCE -#endif -/* Enable threading extensions on Solaris. */ -#ifndef _POSIX_PTHREAD_SEMANTICS -# undef _POSIX_PTHREAD_SEMANTICS -#endif -/* Enable extensions on HP NonStop. */ -#ifndef _TANDEM_SOURCE -# undef _TANDEM_SOURCE -#endif -/* Enable general extensions on Solaris. */ -#ifndef __EXTENSIONS__ -# undef __EXTENSIONS__ -#endif - - -/* Use XCB for low-level protocol implementation */ -#undef USE_XCB - -/* Version number of package */ -#undef VERSION - -/* Location of libX11 data */ -#undef X11_DATADIR - -/* Location of libX11 library data */ -#undef X11_LIBDIR - -/* Include support for XCMS */ -#undef XCMS - -/* Location of error message database */ -#undef XERRORDB - -/* Enable XF86BIGFONT extension */ -#undef XF86BIGFONT - -/* Use XKB */ -#undef XKB - -/* Location of keysym database */ -#undef XKEYSYMDB - -/* support for X Locales */ -#undef XLOCALE - -/* Location of libX11 locale data */ -#undef XLOCALEDATADIR - -/* Location of libX11 locale data */ -#undef XLOCALEDIR - -/* Location of libX11 locale libraries */ -#undef XLOCALELIBDIR - -/* Whether libX11 is compiled with thread support */ -#undef XTHREADS - -/* Whether libX11 needs to use MT safe API's */ -#undef XUSE_MTSAFE_API - -/* Define to 1 if on MINIX. */ -#undef _MINIX - -/* Define to 2 if the system does not provide POSIX.1 features except with - this defined. */ -#undef _POSIX_1_SOURCE - -/* Define to 1 if you need to in order for `stat' and other things to work. */ -#undef _POSIX_SOURCE diff --git a/libX11/src/util/Makefile.am b/libX11/src/util/Makefile.am index c0d4e7fe9..4c611316f 100644 --- a/libX11/src/util/Makefile.am +++ b/libX11/src/util/Makefile.am @@ -6,6 +6,9 @@ makekeys_CFLAGS = \ $(CWARNFLAGS)
CC = @CC_FOR_BUILD@
+CPPFLAGS = @CPPFLAGS_FOR_BUILD@
+CFLAGS = @CFLAGS_FOR_BUILD@
+LDFLAGS = @LDFLAGS_FOR_BUILD@
EXTRA_DIST = mkks.sh
diff --git a/libX11/src/x11_trans.c b/libX11/src/x11_trans.c deleted file mode 100644 index 6620b4dca..000000000 --- a/libX11/src/x11_trans.c +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright © 2003 Keith Packard - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation, and that the name of Keith Packard not be used in - * advertising or publicity pertaining to distribution of the software without - * specific, written prior permission. Keith Packard makes no - * representations about the suitability of this software for any purpose. It - * is provided "as is" without express or implied warranty. - * - * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#define X11_t 1 -#define TRANS_CLIENT 1 -#include <X11/Xtrans/transport.c> - diff --git a/libX11/src/xcms/Makefile.am b/libX11/src/xcms/Makefile.am index aa4758063..3097fe7e4 100644 --- a/libX11/src/xcms/Makefile.am +++ b/libX11/src/xcms/Makefile.am @@ -14,7 +14,6 @@ AM_CPPFLAGS= \ AM_CFLAGS= \
$(X11_CFLAGS) \
$(BIGFONT_CFLAGS) \
- $(XDMCP_CFLAGS) \
$(XMALLOC_ZERO_CFLAGS) \
$(CWARNFLAGS)
diff --git a/libX11/src/xkb/Makefile.am b/libX11/src/xkb/Makefile.am index 3e7ca1951..ba21bbc7b 100644 --- a/libX11/src/xkb/Makefile.am +++ b/libX11/src/xkb/Makefile.am @@ -11,7 +11,6 @@ AM_CPPFLAGS= \ AM_CFLAGS= \
$(X11_CFLAGS) \
$(BIGFONT_CFLAGS) \
- $(XDMCP_CFLAGS) \
$(XMALLOC_ZERO_CFLAGS) \
$(CWARNFLAGS)
diff --git a/libX11/src/xlibi18n/Makefile.am b/libX11/src/xlibi18n/Makefile.am index 3215a42e6..1cdae3e39 100644 --- a/libX11/src/xlibi18n/Makefile.am +++ b/libX11/src/xlibi18n/Makefile.am @@ -12,7 +12,6 @@ AM_CPPFLAGS= \ AM_CFLAGS= \
$(X11_CFLAGS) \
$(BIGFONT_CFLAGS) \
- $(XDMCP_CFLAGS) \
$(XMALLOC_ZERO_CFLAGS) \
$(CWARNFLAGS)
|