qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to libXt 1.1.1

Browse Source
This commit is contained in:
matthieu 2011-09-10 09:36:19 +00:00
parent 9993018eda
commit c36e354560
85 changed files with 6745 additions and 15285 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libXt/COPYING
View File

@ -19,7 +19,7 @@ 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.
Copyright (c) 1993, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 1993, 2011, Oracle and/or its affiliates. All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),

271
lib/libXt/ChangeLog
View File

@ -1,3 +1,274 @@
commit c16d3cc264c45601f0e59bdd29e438c7c9679721
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Mar 10 10:19:59 2011 +0100
Bump to 1.1.1
Signed-off-by: Julien Cristau <jcristau@debian.org>
commit fe2cf6e2b70e57624aad71f510ff8c6addaae196
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Mar 8 16:09:49 2011 +0100
XtAsprintf: Fix memory corruption.
Don't write the null terminator to a random place, this can trigger some
segfault in XtOpenDisplay() and other annoyances.
Debian Bug #617208 <http://bugs.debian.org/617208>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit f6c791b5f318d8805db4cb6c74b1bc2e91d6c15c
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Mar 6 13:43:46 2011 -0500
man: replace hard coded section number 3Xt with __libmansuffix__ #35050
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=512130
The Xt manpages are installed in section 3 (and not 3Xt as upstream
would have it). But, internal cross-references (in particular, in the
SEE ALSO part) are left alone, and keep pointing at Foo(3Xt). The
result is that they can't be automatically followed from manpage
sanitizers such as dwww or emacs.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit 9ccf14fddedc11bd17b3ae30612c6f70f4cd7e14
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Mar 4 16:31:59 2011 -0800
Don't need to use target-specific CFLAGS for makestrs
It's the only thing built in that directory, so we can use AM_CFLAGS
and drop the requirement for AM_PROG_CC_C_O in configure.ac
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
Tested-by: Gaetan Nadon <memsize@videotron.ca>
commit 16d9941f3aa38dde115cbff639e131761c1b36d0
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Mar 4 15:43:43 2011 -0800
Incorrect cast in XtCvtIntToPixmap could cause bus error on 64-bit machines
Originally fixed by Leo Binchy for Sun Bug 4163152 to resolve bus error
on VSW5 (XTS) testing on 64-bit SPARC test run on Solaris 7.
( Testcase: XtCvtIntToPixmap, Purpose: 1)
Since we're converting from Int to Pixmap, need to access the argument
passed in as an int, not a Pixmap, which is consistent with the other
IntToXXX converters in this file.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
commit 994443524ade46bad03eea0acbd1410d561c591d
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Fri Mar 4 16:30:58 2011 -0800
configure: Bump version to 1.1.0 for release
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit c0a233895cc8270ec0ff0bd2abb88d3f6dd524c3
Author: Jeremy Huddleston <jeremyhu@apple.com>
Date: Fri Mar 4 12:49:48 2011 -0800
darwin: Don't use poll() when expected to run on darwin10 and prior
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
commit abf6062715c7d1390e516261a31abde4ed7ea64e
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Feb 2 23:29:46 2011 -0800
Shell.c: TopLevelSetValues ignores iconic state if shell not yet realized
Fix originally created by Leo Binchy for Sun to fix Solaris bug
1243761 The XmNiconic resource doesn't work
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit b1eaa18835ec7c3a11e580340625b35c18edf7ca
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Feb 2 23:21:02 2011 -0800
GetResources: protect against underflow when type conversion fails
Fix originally created by Leo Binchy for Sun to fix Solaris bug 1211553:
XtVaCreateManagedWidget with list of resources XtVaTypedArg cause core dump
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 21c1cc98d8210a3ce2a4bf62ecee9168fdd99dcb
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Feb 2 22:42:13 2011 -0800
Remove unused #ifdef UNALIGNED version of Xt macros & functions
Trying to outsmart the compiler and libc is a losing battle, but
since UNALIGNED was never defined, we weren't even trying.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 19538f2b4553221b35831e13ec70ed9db436dd32
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Feb 2 11:43:44 2011 -0500
config: comment, minor upgrade, quote and layout configure.ac
Group statements per section as per Autoconf standard layout
Quote statements where appropriate.
Autoconf recommends not using dnl instead of # for comments
Use AC_CONFIG_FILES to replace the deprecated AC_OUTPUT with parameters.
Add AC_CONFIG_SRCDIR([Makefile.am])
This helps automated maintenance and release activities.
Details can be found in http://wiki.x.org/wiki/NewModuleGuidelines
commit 7fd1e98987967b23f66da4b18ebf9798a68cd370
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Jan 28 16:07:07 2011 -0500
config: replace deprecated AC_HELP_STRING with AS_HELP_STRING
This silences an Automake warning.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit 84e512a94295387bd0625ce619fc8bd381395c71
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Dec 22 10:49:42 2010 -0800
Convert ALLOCATE_LOCAL + sprintf to XtAsprintf
Now that we don't need to separately strlen the format string, put it
directly into the function call to clear gcc warnings of:
Initialize.c:397: warning: format not a string literal, argument types not checked
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit c80650fddec8596ef7278e37aa12ce2076c54e93
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Dec 9 23:36:31 2010 -0800
Convert ResConfig.c to use XtAsprintf() instead of XtMalloc + sprintf
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit ac07da253415ccb8b6322feedf7969967357050e
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Jan 12 23:09:29 2011 -0800
Add XtAsprintf() as a new exported API
Like asprintf() but using XtMalloc() to tie into the Xt memory allocation
and error handling subsystems.
Bumps libXt version to 1.0.99.1 so that modules can set their pkg-config
dependency to libXt >= 1.0.99.1 to require XtAsprintf().
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 84f73c49db8071c06f27609ce7cc7a32a17351a9
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Dec 9 23:44:42 2010 -0800
Convert some sprintf calls to snprintf
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
commit 14145f3e87a039640cd8bdb2e2f4f30ca9b2a710
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Dec 5 01:21:06 2010 -0800
config: AC_PROG_CC is provided by XORG_DEFAULT_OPTIONS now
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit a73b8f06b95216083c8335fad45dd0de7f44a529
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Dec 5 01:19:10 2010 -0800
config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
Regroup AC statements under the Autoconf initialization section.
Regroup AM statements under the Automake initialization section.
Add missing AC_CONFIG_SRCDIR
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 2bf988d229d2b85208cc42094ce7202204d628af
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Dec 5 00:33:44 2010 -0800
Remove ancient #if defined(macII) hack for A/UX from makestrs.c
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 96508e1b9da790d4b824a42246d1e86379101733
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Dec 5 00:19:30 2010 -0800
Remove non-USE_SNPRINTF case from src/Error.c
unifdef -DUSE_SNPRINTF src/Error.c
Plus manual removal of old #ifdef notyet section that said not enough
platforms had snprintf support yet. Welcome to the new millenium!
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 0b780f8cc8bc2606fc3173628c4d3065aae190f8
Author: walter harms <wharms@bfs.de>
Date: Sun Nov 7 18:51:19 2010 +0100
remove strcmp in src/ResConfig.c
Make remainder check like in the rest of code and replace strcmp()
Signed-off-by: walter harms <wharms@bfs.de>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 59598f20ba160fd92abcf88a30f0008425e7b1ec
Author: walter harms <wharms@bfs.de>
Date: Tue Oct 26 13:46:32 2010 +0200
QueryEventMask: fix NULL check
_XtGetPerWidgetInput may return NULL
avoid possible NULL references
Signed-off-by: walter harms <wharms@bfs.de>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 8572cba2b9094dcd8ee5b4c5bcf3c38f1f291918
Author: walter harms <wharms@bfs.de>
Date: Sat Oct 30 10:47:23 2010 +0200
src/Resource.c: Fix possible NULL access
Signed-off-by: walter harms <wharms@bfs.de>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 6c75b449f6436b787247e164bee03691af2a4f55
Author: walter harms <wharms@bfs.de>
Date: Fri Oct 29 17:24:48 2010 +0200
XtFree() can handle NULL , remove check
Signed-off-by: walter harms <wharms@bfs.de>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 0d29ca61b94cd34b04c5eedae443620a616d01c3
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Oct 28 12:03:25 2010 -0700

4
lib/libXt/Makefile.bsd-wrapper
View File

@ -1,6 +1,6 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.4 2007/03/15 23:00:48 matthieu Exp $
# $OpenBSD: Makefile.bsd-wrapper,v 1.5 2011/09/10 09:36:19 matthieu Exp $
SHARED_LIBS= Xt 10.0
SHARED_LIBS= Xt 10.1
CONFIGURE_ARGS= --with-appdefaultdir=/etc/X11/app-defaults

25
lib/libXt/Makefile.in
View File

@ -64,7 +64,9 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_define_dir.m4 \
$(top_srcdir)/configure.ac
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@ -126,24 +128,19 @@ CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CWARNFLAGS = @CWARNFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
FGREP = @FGREP@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
@ -152,6 +149,7 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LD = @LD@
LDFLAGS = @LDFLAGS@
LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
LIBOBJS = @LIBOBJS@
@ -159,6 +157,7 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@ -169,8 +168,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MAN_SUBSTS = @MAN_SUBSTS@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@ -193,12 +196,9 @@ XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
XT_CFLAGS = @XT_CFLAGS@
XT_LIBS = @XT_LIBS@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@ -229,6 +229,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@

320
lib/libXt/aclocal.m4 vendored
View File

@ -7134,18 +7134,6 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
[AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
])
# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# serial 8
# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
# Do all the work for Automake. -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
@ -7376,34 +7364,6 @@ AC_MSG_RESULT([$_am_result])
rm -f confinc confmf
])
# Copyright (C) 1999, 2000, 2001, 2003, 2005 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# serial 3
# AM_PROG_CC_C_O
# --------------
# Like AC_PROG_CC_C_O, but changed for automake.
AC_DEFUN([AM_PROG_CC_C_O],
[AC_REQUIRE([AC_PROG_CC_C_O])dnl
AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
# FIXME: we rely on the cache variable name because
# there is no other way.
set dummy $CC
ac_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
# Losing compiler, so override with the script.
# FIXME: It is wrong to rewrite CC.
# But if we don't then we get into trouble of one sort or another.
# A longer-term fix would be to have automake use am__CC in this case,
# and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
CC="$am_aux_dir/compile $CC"
fi
])
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
@ -7660,6 +7620,11 @@ AC_SUBST([am__untar])
]) # _AM_PROG_TAR
m4_include([m4/ax_define_dir.m4])
m4_include([m4/libtool.m4])
m4_include([m4/ltoptions.m4])
m4_include([m4/ltsugar.m4])
m4_include([m4/ltversion.m4])
m4_include([m4/lt~obsolete.m4])
dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure.
dnl
dnl Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
@ -7699,7 +7664,7 @@ dnl DEALINGS IN THE SOFTWARE.
# See the "minimum version" comment for each macro you use to see what
# version you require.
m4_defun([XORG_MACROS_VERSION],[
m4_define([vers_have], [1.11.0])
m4_define([vers_have], [1.13.0])
m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.])))
m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.])))
m4_if(m4_cmp(maj_have, maj_needed), 0,,
@ -8094,6 +8059,69 @@ AM_CONDITIONAL([HAVE_XMLTO_TEXT], [test $have_xmlto_text = yes])
AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes])
]) # XORG_WITH_XMLTO
# XORG_WITH_XSLTPROC([MIN-VERSION], [DEFAULT])
# --------------------------------------------
# Minimum version: 1.12.0
# Minimum version for optional DEFAULT argument: 1.12.0
#
# XSLT (Extensible Stylesheet Language Transformations) is a declarative,
# XML-based language used for the transformation of XML documents.
# The xsltproc command line tool is for applying XSLT stylesheets to XML documents.
# It is used under the cover by xmlto to generate html files from DocBook/XML.
# The XSLT processor is often used as a standalone tool for transformations.
# It should not be assumed that this tool is used only to work with documnetation.
# When DEFAULT is not specified, --with-xsltproc assumes 'auto'.
#
# Interface to module:
# HAVE_XSLTPROC: used in makefiles to conditionally generate documentation
# XSLTPROC: returns the path of the xsltproc program found
# returns the path set by the user in the environment
# --with-xsltproc: 'yes' user instructs the module to use xsltproc
# 'no' user instructs the module not to use xsltproc
# have_xsltproc: returns yes if xsltproc found in PATH or no
#
# If the user sets the value of XSLTPROC, AC_PATH_PROG skips testing the path.
#
AC_DEFUN([XORG_WITH_XSLTPROC],[
AC_ARG_VAR([XSLTPROC], [Path to xsltproc command])
m4_define([_defopt], m4_default([$2], [auto]))
AC_ARG_WITH(xsltproc,
AS_HELP_STRING([--with-xsltproc],
[Use xsltproc for the transformation of XML documents (default: ]_defopt[)]),
[use_xsltproc=$withval], [use_xsltproc=]_defopt)
m4_undefine([_defopt])
if test "x$use_xsltproc" = x"auto"; then
AC_PATH_PROG([XSLTPROC], [xsltproc])
if test "x$XSLTPROC" = "x"; then
AC_MSG_WARN([xsltproc not found - cannot transform XML documents])
have_xsltproc=no
else
have_xsltproc=yes
fi
elif test "x$use_xsltproc" = x"yes" ; then
AC_PATH_PROG([XSLTPROC], [xsltproc])
if test "x$XSLTPROC" = "x"; then
AC_MSG_ERROR([--with-xsltproc=yes specified but xsltproc not found in PATH])
fi
have_xsltproc=yes
elif test "x$use_xsltproc" = x"no" ; then
if test "x$XSLTPROC" != "x"; then
AC_MSG_WARN([ignoring XSLTPROC environment variable since --with-xsltproc=no was specified])
fi
have_xsltproc=no
else
AC_MSG_ERROR([--with-xsltproc expects 'yes' or 'no'])
fi
# Checking for minimum version is not implemented
# but we want to keep the interface consistent with other commands
m4_ifval([$1],[AC_MSG_WARN(Checking for MIN-VERSION is not implemented.)])
AM_CONDITIONAL([HAVE_XSLTPROC], [test "$have_xsltproc" = yes])
]) # XORG_WITH_XSLTPROC
# XORG_WITH_ASCIIDOC([MIN-VERSION], [DEFAULT])
# ----------------
# Minimum version: 1.5.0
@ -8473,12 +8501,12 @@ AM_CONDITIONAL([HAVE_PS2PDF], [test "$have_ps2pdf" = yes])
# parm1: specify the default value, yes or no.
#
AC_DEFUN([XORG_ENABLE_DOCS],[
m4_define([default], m4_default([$1], [yes]))
m4_define([docs_default], m4_default([$1], [yes]))
AC_ARG_ENABLE(docs,
AS_HELP_STRING([--enable-docs],
[Enable building the documentation (default: ]default[)]),
[build_docs=$enableval], [build_docs=]default)
m4_undefine([default])
[Enable building the documentation (default: ]docs_default[)]),
[build_docs=$enableval], [build_docs=]docs_default)
m4_undefine([docs_default])
AM_CONDITIONAL(ENABLE_DOCS, [test x$build_docs = xyes])
AC_MSG_CHECKING([whether to build documentation])
AC_MSG_RESULT([$build_docs])
@ -8550,6 +8578,194 @@ AC_MSG_CHECKING([whether to build functional specifications])
AC_MSG_RESULT([$build_specs])
]) # XORG_ENABLE_SPECS
# XORG_ENABLE_UNIT_TESTS (enable_unit_tests=auto)
# ----------------------------------------------
# Minimum version: 1.13.0
#
# This macro enables a builder to enable/disable unit testing
# It makes no assumption about the test cases implementation
# Test cases may or may not use Automake "Support for test suites"
# They may or may not use the software utility library GLib
#
# When used in conjunction with XORG_WITH_GLIB, use both AM_CONDITIONAL
# ENABLE_UNIT_TESTS and HAVE_GLIB. Not all unit tests may use glib.
# The variable enable_unit_tests is used by other macros in this file.
#
# Interface to module:
# ENABLE_UNIT_TESTS: used in makefiles to conditionally build tests
# enable_unit_tests: used in configure.ac for additional configuration
# --enable-unit-tests: 'yes' user instructs the module to build tests
# 'no' user instructs the module not to build tests
# parm1: specify the default value, yes or no.
#
AC_DEFUN([XORG_ENABLE_UNIT_TESTS],[
AC_BEFORE([$0], [XORG_WITH_GLIB])
AC_BEFORE([$0], [XORG_LD_WRAP])
m4_define([_defopt], m4_default([$1], [auto]))
AC_ARG_ENABLE(unit-tests, AS_HELP_STRING([--enable-unit-tests],
[Enable building unit test cases (default: ]_defopt[)]),
[enable_unit_tests=$enableval], [enable_unit_tests=]_defopt)
m4_undefine([_defopt])
AM_CONDITIONAL(ENABLE_UNIT_TESTS, [test "x$enable_unit_tests" != xno])
AC_MSG_CHECKING([whether to build unit test cases])
AC_MSG_RESULT([$enable_unit_tests])
]) # XORG_ENABLE_UNIT_TESTS
# XORG_WITH_GLIB([MIN-VERSION], [DEFAULT])
# ----------------------------------------
# Minimum version: 1.13.0
#
# GLib is a library which provides advanced data structures and functions.
# This macro enables a module to test for the presence of Glib.
#
# When used with ENABLE_UNIT_TESTS, it is assumed GLib is used for unit testing.
# Otherwise the value of $enable_unit_tests is blank.
#
# Interface to module:
# HAVE_GLIB: used in makefiles to conditionally build targets
# with_glib: used in configure.ac to know if GLib has been found
# --with-glib: 'yes' user instructs the module to use glib
# 'no' user instructs the module not to use glib
#
AC_DEFUN([XORG_WITH_GLIB],[
AC_REQUIRE([PKG_PROG_PKG_CONFIG])
m4_define([_defopt], m4_default([$2], [auto]))
AC_ARG_WITH(glib, AS_HELP_STRING([--with-glib],
[Use GLib library for unit testing (default: ]_defopt[)]),
[with_glib=$withval], [with_glib=]_defopt)
m4_undefine([_defopt])
have_glib=no
# Do not probe GLib if user explicitly disabled unit testing
if test "x$enable_unit_tests" != x"no"; then
# Do not probe GLib if user explicitly disabled it
if test "x$with_glib" != x"no"; then
m4_ifval(
[$1],
[PKG_CHECK_MODULES([GLIB], [glib-2.0 >= $1], [have_glib=yes], [have_glib=no])],
[PKG_CHECK_MODULES([GLIB], [glib-2.0], [have_glib=yes], [have_glib=no])]
)
fi
fi
# Not having GLib when unit testing has been explicitly requested is an error
if test "x$enable_unit_tests" = x"yes"; then
if test "x$have_glib" = x"no"; then
AC_MSG_ERROR([--enable-unit-tests=yes specified but glib-2.0 not found])
fi
fi
# Having unit testing disabled when GLib has been explicitly requested is an error
if test "x$enable_unit_tests" = x"no"; then
if test "x$with_glib" = x"yes"; then
AC_MSG_ERROR([--enable-unit-tests=yes specified but glib-2.0 not found])
fi
fi
# Not having GLib when it has been explicitly requested is an error
if test "x$with_glib" = x"yes"; then
if test "x$have_glib" = x"no"; then
AC_MSG_ERROR([--with-glib=yes specified but glib-2.0 not found])
fi
fi
AM_CONDITIONAL([HAVE_GLIB], [test "$have_glib" = yes])
]) # XORG_WITH_GLIB
# XORG_LD_WRAP
# ------------
# Minimum version: 1.13.0
#
# Check if linker supports -wrap, passed via compiler flags
#
# When used with ENABLE_UNIT_TESTS, it is assumed -wrap is used for unit testing.
# Otherwise the value of $enable_unit_tests is blank.
#
AC_DEFUN([XORG_LD_WRAP],[
XORG_CHECK_LINKER_FLAGS([-Wl,-wrap,exit],[have_ld_wrap=yes],[have_ld_wrap=no])
# Not having ld wrap when unit testing has been explicitly requested is an error
if test "x$enable_unit_tests" = x"yes"; then
if test "x$have_ld_wrap" = x"no"; then
AC_MSG_ERROR([--enable-unit-tests=yes specified but ld -wrap support is not available])
fi
fi
AM_CONDITIONAL([HAVE_LD_WRAP], [test "$have_ld_wrap" = yes])
#
]) # XORG_LD_WRAP
# XORG_CHECK_LINKER_FLAGS
# -----------------------
# SYNOPSIS
#
# XORG_CHECK_LINKER_FLAGS(FLAGS, [ACTION-SUCCESS], [ACTION-FAILURE])
#
# DESCRIPTION
#
# Check whether the given linker FLAGS work with the current language's
# linker, or whether they give an error.
#
# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
# success/failure.
#
# NOTE: Based on AX_CHECK_COMPILER_FLAGS.
#
# LICENSE
#
# Copyright (c) 2009 Mike Frysinger <vapier@gentoo.org>
# Copyright (c) 2009 Steven G. Johnson <stevenj@alum.mit.edu>
# Copyright (c) 2009 Matteo Frigo
#
# This program is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
# Free Software Foundation, either version 3 of the License, or (at your
# option) any later version.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
# Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see <http://www.gnu.org/licenses/>.
#
# As a special exception, the respective Autoconf Macro's copyright owner
# gives unlimited permission to copy, distribute and modify the configure
# scripts that are the output of Autoconf when processing the Macro. You
# need not follow the terms of the GNU General Public License when using
# or distributing such scripts, even though portions of the text of the
# Macro appear in them. The GNU General Public License (GPL) does govern
# all other use of the material that constitutes the Autoconf Macro.
#
# This special exception to the GPL applies to versions of the Autoconf
# Macro released by the Autoconf Archive. When you make and distribute a
# modified version of the Autoconf Macro, you may extend this special
# exception to the GPL to apply to your modified version as well.#
AC_DEFUN([XORG_CHECK_LINKER_FLAGS],
[AC_MSG_CHECKING([whether the linker accepts $1])
dnl Some hackery here since AC_CACHE_VAL can't handle a non-literal varname:
AS_LITERAL_IF([$1],
[AC_CACHE_VAL(AS_TR_SH(xorg_cv_linker_flags_[$1]), [
ax_save_FLAGS=$LDFLAGS
LDFLAGS="$1"
AC_LINK_IFELSE([AC_LANG_PROGRAM()],
AS_TR_SH(xorg_cv_linker_flags_[$1])=yes,
AS_TR_SH(xorg_cv_linker_flags_[$1])=no)
LDFLAGS=$ax_save_FLAGS])],
[ax_save_FLAGS=$LDFLAGS
LDFLAGS="$1"
AC_LINK_IFELSE([AC_LANG_PROGRAM()],
eval AS_TR_SH(xorg_cv_linker_flags_[$1])=yes,
eval AS_TR_SH(xorg_cv_linker_flags_[$1])=no)
LDFLAGS=$ax_save_FLAGS])
eval xorg_check_linker_flags=$AS_TR_SH(xorg_cv_linker_flags_[$1])
AC_MSG_RESULT($xorg_check_linker_flags)
if test "x$xorg_check_linker_flags" = xyes; then
m4_default([$2], :)
else
m4_default([$3], :)
fi
]) # XORG_CHECK_LINKER_FLAGS
# XORG_CHECK_MALLOC_ZERO
# ----------------------
# Minimum version: 1.0.0
@ -8566,18 +8782,16 @@ AC_ARG_ENABLE(malloc0returnsnull,
AC_MSG_CHECKING([whether malloc(0) returns NULL])
if test "x$MALLOC_ZERO_RETURNS_NULL" = xauto; then
AC_RUN_IFELSE([
char *malloc();
char *realloc();
char *calloc();
main() {
AC_RUN_IFELSE([AC_LANG_PROGRAM([
#include <stdlib.h>
],[
char *m0, *r0, *c0, *p;
m0 = malloc(0);
p = malloc(10);
r0 = realloc(p,0);
c0 = calloc(0);
exit(m0 == 0 || r0 == 0 || c0 == 0 ? 0 : 1);
}],
c0 = calloc(0,10);
exit((m0 == 0 || r0 == 0 || c0 == 0) ? 0 : 1);
])],
[MALLOC_ZERO_RETURNS_NULL=yes],
[MALLOC_ZERO_RETURNS_NULL=no],
[MALLOC_ZERO_RETURNS_NULL=yes])

10
lib/libXt/config.h.in
View File

@ -36,8 +36,9 @@
/* Define to 1 if Xalloca.h should include <alloca.h> */
#undef INCLUDE_ALLOCA_H
/* Define to 1 if your C compiler doesn't accept -c and -o together. */
#undef NO_MINUS_C_MINUS_O
/* Define to the sub-directory in which libtool stores uninstalled libraries.
*/
#undef LT_OBJDIR
/* Name of package */
#undef PACKAGE
@ -69,12 +70,9 @@
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
/* Define to 1 if you have the "poll" function. */
/* poll() function is available */
#undef USE_POLL
/* Define to 1 if you have the "snprintf" function. */
#undef USE_SNPRINTF
/* Version number of package */
#undef VERSION

20624
lib/libXt/configure vendored
View File

File diff suppressed because it is too large Load Diff

120
lib/libXt/configure.ac
View File

@ -1,48 +1,54 @@
dnl
dnl Copyright © 2003 Keith Packard, Noah Levitt
dnl
dnl Permission to use, copy, modify, distribute, and sell this software and its
dnl documentation for any purpose is hereby granted without fee, provided that
dnl the above copyright notice appear in all copies and that both that
dnl copyright notice and this permission notice appear in supporting
dnl documentation, and that the name of Keith Packard not be used in
dnl advertising or publicity pertaining to distribution of the software without
dnl specific, written prior permission. Keith Packard makes no
dnl representations about the suitability of this software for any purpose. It
dnl is provided "as is" without express or implied warranty.
dnl
dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
dnl PERFORMANCE OF THIS SOFTWARE.
dnl
dnl Process this file with autoconf to create configure.
#
# Copyright © 2003 Keith Packard, Noah Levitt
#
# 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.
#
# Initialize Autoconf
AC_PREREQ([2.60])
dnl
dnl
AC_INIT([libXt], [1.0.9],
AC_INIT([libXt], [1.1.1],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXt])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4])
# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
# Initialize libtool
AC_PROG_LIBTOOL
# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
m4_ifndef([XORG_MACROS_VERSION],
[m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
AM_CONFIG_HEADER(config.h)
XORG_CHECK_MALLOC_ZERO
# Check for progs
AC_PROG_CC
AC_PROG_LIBTOOL
AM_PROG_CC_C_O
# Checks for header files.
AC_CHECK_HEADER([alloca.h], AC_DEFINE(INCLUDE_ALLOCA_H, 1, [Define to 1 if Xalloca.h should include <alloca.h>]))
# Obtain compiler/linker options for depedencies
PKG_CHECK_MODULES(XT, sm ice x11 xproto kbproto)
# Set-up variables to use build machine compiler when cross-compiling
if test x"$CC_FOR_BUILD" = x; then
if test x"$cross_compiling" = xyes; then
AC_CHECK_PROGS(CC_FOR_BUILD, gcc cc)
@ -56,27 +62,34 @@ AC_SUBST(CFLAGS_FOR_BUILD)
LDFLAGS_FOR_BUILD=${LDFLAGS_FOR_BUILD-${LDFLAGS}}
AC_SUBST(LDFLAGS_FOR_BUILD)
PKG_CHECK_MODULES(XT, sm ice x11 xproto kbproto)
# Needed for including Xalloca.h
AC_CHECK_HEADER([alloca.h], AC_DEFINE(INCLUDE_ALLOCA_H, 1, [Define to 1 if Xalloca.h should include <alloca.h>]))
# Map function checks to old Imake #defines
case $host_os in
# darwin has poll() but can't be used to poll character devices (atleast through SnowLeopard)
darwin*) ;;
# darwin through Snow Leopard has poll() but can't be used to poll character devices.
darwin@<:@789@:>@*|darwin10*) ;;
darwin*)
_ac_xorg_macosx_version_min=""
if echo $CPPFLAGS $CFLAGS | grep -q mmacosx-version-min ; then
_ac_xorg_macosx_version_min=`echo $CPPFLAGS $CFLAGS | sed 's/^.*-mmacosx-version-min=\(@<:@^ @:>@*\).*$/\1/'`
else
_ac_xorg_macosx_version_min=$MACOSX_DEPLOYMENT_TARGET
fi
case $_ac_xorg_macosx_version_min in
10.@<:@0123456@:>@|10.@<:@0123456@:>@.*) ;;
*)
AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], )
;;
esac
unset _ac_xorg_macosx_version_min
;;
*)
AC_CHECK_FUNC(poll, AC_DEFINE(USE_POLL,1,
[Define to 1 if you have the "poll" function.]))
AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], )
;;
esac
AC_CHECK_FUNC(snprintf, AC_DEFINE(USE_SNPRINTF,1,
[Define to 1 if you have the "snprintf" function.]))
AC_HAVE_LIBRARY(ws2_32)
# Options
AC_ARG_ENABLE(xkb, AC_HELP_STRING([--disable-xkb], [Disable XKB support]),
AC_ARG_ENABLE(xkb, AS_HELP_STRING([--disable-xkb], [Disable XKB support]),
XKB="$enableval", XKB="yes")
if test "x$XKB" = "xyes" ; then
AC_DEFINE(XKB, 1, [Define to 1 to use XKB for keysym resolution.])
@ -86,13 +99,13 @@ fi
XFILESEARCHPATHDEFAULT='$(sysconfdir)/X11/%L/%T/%N%C%S:$(sysconfdir)/X11/%l/%T/%N%C%S:$(sysconfdir)/X11/%T/%N%C%S:$(sysconfdir)/X11/%L/%T/%N%S:$(sysconfdir)/X11/%l/%T/%N%S:$(sysconfdir)/X11/%T/%N%S:$(datadir)/X11/%L/%T/%N%C%S:$(datadir)/X11/%l/%T/%N%C%S:$(datadir)/X11/%T/%N%C%S:$(datadir)/X11/%L/%T/%N%S:$(datadir)/X11/%l/%T/%N%S:$(datadir)/X11/%T/%N%S:$(libdir)/X11/%L/%T/%N%C%S:$(libdir)/X11/%l/%T/%N%C%S:$(libdir)/X11/%T/%N%C%S:$(libdir)/X11/%L/%T/%N%S:$(libdir)/X11/%l/%T/%N%S:$(libdir)/X11/%T/%N%S'
AC_ARG_WITH(xfile-search-path,
AC_HELP_STRING([--with-xfile-search-path=<path>],
AS_HELP_STRING([--with-xfile-search-path=<path>],
[Set path to search for app-defaults and other files]),
[XFILESEARCHPATHDEFAULT="$withval"], [])
AC_SUBST([XFILESEARCHPATHDEFAULT])
AC_ARG_WITH(appdefaultdir,
AC_HELP_STRING([--with-appdefaultdir=<path>],
AS_HELP_STRING([--with-appdefaultdir=<path>],
[Set app-default directory (default: ${datadir}/X11/app-defaults)]),
[appdefaultdir="$withval"],
[appdefaultdir=${datadir}/X11/app-defaults])
@ -125,12 +138,11 @@ esac
XT_CFLAGS="$XT_CFLAGS $OS_CFLAGS"
XORG_CHECK_MALLOC_ZERO
AC_OUTPUT([Makefile
src/Makefile
util/Makefile
include/Makefile
man/Makefile
specs/Makefile
xt.pc])
AC_CONFIG_FILES([Makefile
src/Makefile
util/Makefile
include/Makefile
man/Makefile
specs/Makefile
xt.pc])
AC_OUTPUT

25
lib/libXt/include/Makefile.in
View File

@ -41,7 +41,9 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(xtinclude_HEADERS)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_define_dir.m4 \
$(top_srcdir)/configure.ac
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(install_sh) -d
@ -86,24 +88,19 @@ CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CWARNFLAGS = @CWARNFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
FGREP = @FGREP@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
@ -112,6 +109,7 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LD = @LD@
LDFLAGS = @LDFLAGS@
LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
LIBOBJS = @LIBOBJS@
@ -119,6 +117,7 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@ -129,8 +128,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MAN_SUBSTS = @MAN_SUBSTS@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@ -153,12 +156,9 @@ XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
XT_CFLAGS = @XT_CFLAGS@
XT_LIBS = @XT_LIBS@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@ -189,6 +189,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@

9
lib/libXt/include/X11/Intrinsic.h
View File

@ -1855,6 +1855,15 @@ extern void XtFree(
char* /* ptr */
);
#ifndef _X_RESTRICT_KYWD
# define _X_RESTRICT_KYWD
#endif
extern Cardinal XtAsprintf(
String *new_string,
_Xconst char * _X_RESTRICT_KYWD format,
...
) _X_ATTRIBUTE_PRINTF(2,3);
#ifdef XTTRACEMEMORY
extern char *_XtMalloc( /* implementation-private */

33
lib/libXt/include/X11/IntrinsicI.h
View File

@ -108,37 +108,6 @@ SOFTWARE.
#define _XBCOPYFUNC _XtBcopy
#include <X11/Xfuncs.h>
/* If the alignment characteristics of your machine are right, these may be
faster */
#ifdef UNALIGNED
#define XtMemmove(dst, src, size) \
if ((char *)(dst) != (char *)(src)) { \
if (size == sizeof(int)) \
*((int *) (dst)) = *((int *) (src)); \
else if (size == sizeof(char)) \
*((char *) (dst)) = *((char *) (src)); \
else if (size == sizeof(short)) \
*((short *) (dst)) = *((short *) (src)); \
else \
(void) memcpy((char *) (dst), (char *) (src), (int) (size)); \
}
#define XtBZero(dst, size) \
if (size == sizeof(int)) \
*((int *) (dst)) = 0; \
else \
bzero((char *) (dst), (int) (size))
#define XtMemcmp(b1, b2, size) \
(size == sizeof(int) ? \
*((int *) (b1)) != *((int *) (b2)) \
: memcmp((char *) (b1), (char *) (b2), (int) (size)) \
)
#else
#define XtMemmove(dst, src, size) \
if ((char *)(dst) != (char *)(src)) { \
(void) memcpy((char *) (dst), (char *) (src), (int) (size)); \
@ -150,8 +119,6 @@ SOFTWARE.
#define XtMemcmp(b1, b2, size) \
memcmp((char *) (b1), (char *) (b2), (int) (size))
#endif
/****************************************************************
*

3
lib/libXt/man/Makefile.am
View File

@ -330,7 +330,8 @@ XtMalloc_shadows = \
XtRealloc \
XtFree \
XtNew \
XtNewString
XtNewString \
XtAsprintf
XtManageChildren_shadows = \
XtManageChild \

28
lib/libXt/man/Makefile.in
View File

@ -40,7 +40,9 @@ subdir = man
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_define_dir.m4 \
$(top_srcdir)/configure.ac
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(install_sh) -d
@ -81,24 +83,19 @@ CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CWARNFLAGS = @CWARNFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
FGREP = @FGREP@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
@ -107,6 +104,7 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LD = @LD@
LDFLAGS = @LDFLAGS@
LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
LIBOBJS = @LIBOBJS@
@ -114,6 +112,7 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@ -124,8 +123,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MAN_SUBSTS = @MAN_SUBSTS@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@ -148,12 +151,9 @@ XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
XT_CFLAGS = @XT_CFLAGS@
XT_LIBS = @XT_LIBS@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@ -184,6 +184,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@ -523,7 +524,8 @@ XtMalloc_shadows = \
XtRealloc \
XtFree \
XtNew \
XtNewString
XtNewString \
XtAsprintf
XtManageChildren_shadows = \
XtManageChild \

2
lib/libXt/man/XtAddActions.man
View File

@ -139,7 +139,7 @@ Specifies the number of entries in this action table.
has been replaced by
.ZN XtAppAddActions .
.SH "SEE ALSO"
XtAppAddActions(3Xt)
XtAppAddActions(__libmansuffix__)
.br
\fI\*(xT\fP
.br

2
lib/libXt/man/XtAddCallback.man
View File

@ -182,7 +182,7 @@ The
function removes all the callback procedures from the specified
widget's callback list.
.SH "SEE ALSO"
XtCallCallbacks(3Xt)
XtCallCallbacks(__libmansuffix__)
.br
\fI\*(xT\fP
.br

4
lib/libXt/man/XtAddEventHandler.man
View File

@ -230,8 +230,8 @@ for the specified events. If the procedure is already registered with the
same \fIclient_data\fP value, the specified mask augments the existing
mask and the procedure is repositioned in the list.
.SH "SEE ALSO"
XtAppNextEvent(3Xt),
XtBuildEventMask(3Xt)
XtAppNextEvent(__libmansuffix__),
XtBuildEventMask(__libmansuffix__)
.br
\fI\*(xT\fP
.br

2
lib/libXt/man/XtAddInput.man
View File

@ -161,7 +161,7 @@ has been replaced by
has been replaced by
.ZN XtAppAddWorkProc .
.SH "SEE ALSO"
XtAppAddInput(3Xt), XtAppAddTimeOut(3Xt), XtAppAddWorkProc(3Xt)
XtAppAddInput(__libmansuffix__), XtAppAddTimeOut(__libmansuffix__), XtAppAddWorkProc(__libmansuffix__)
.br
\fI\*(xT\fP
.br

2
lib/libXt/man/XtAppAddActions.man
View File

@ -143,7 +143,7 @@ The
function adds the specified action table and registers it with the
translation manager.
.SH "SEE ALSO"
XtParseTranslationTable(3Xt)
XtParseTranslationTable(__libmansuffix__)
.br
\fI\*(xT\fP
.br

4
lib/libXt/man/XtAppAddConverter.man
View File

@ -165,8 +165,8 @@ with \fIcache_type\fP equal to
for old-format type converters. It has been superseded by
.ZN XtSetTypeConverter .
.SH "SEE ALSO"
XtConvert(3Xt),
XtStringConversionWarning(3Xt)
XtConvert(__libmansuffix__),
XtStringConversionWarning(__libmansuffix__)
.br
\fI\*(xT\fP
.br

2
lib/libXt/man/XtAppAddInput.man
View File

@ -178,7 +178,7 @@ The
function causes the \*(xI read routine to stop watching for input
from the input source.
.SH "SEE ALSO"
XtAppAddTimeOut(3Xt),XtAppAddSignal(3Xt)
XtAppAddTimeOut(__libmansuffix__),XtAppAddSignal(__libmansuffix__)
.br
\fI\*(xT\fP
.br

2
lib/libXt/man/XtAppAddSignal.man
View File

@ -187,7 +187,7 @@ function is called to remove the specified Intrinsics signal handler. The
client should disable the source of the signal before calling
.ZN XtRemoveSignal .
.SH "SEE ALSO"
XtAppAddTimeOut(3Xt),XtAppAddInput(3Xt),XtAppAddWorkProc(3Xt)
XtAppAddTimeOut(__libmansuffix__),XtAppAddInput(__libmansuffix__),XtAppAddWorkProc(__libmansuffix__)
.br
\fI\*(xT\fP
.br

2
lib/libXt/man/XtAppAddTimeOut.man
View File

@ -159,7 +159,7 @@ The
function removes the timeout.
Note that timeouts are automatically removed once they trigger.
.SH "SEE ALSO"
XtAppAddInput(3Xt),XtAppAddSignal(3Xt)
XtAppAddInput(__libmansuffix__),XtAppAddSignal(__libmansuffix__)
.br
\fI\*(xT\fP
.br

2
lib/libXt/man/XtAppAddWorkProc.man
View File

@ -154,7 +154,7 @@ The
.ZN XtRemoveWorkProc
function explicitly removes the specified background work procedure.
.SH "SEE ALSO"
XtAppNextEvent(3Xt)
XtAppNextEvent(__libmansuffix__)
.br
\fI\*(xT\fP
.br

2
lib/libXt/man/XtAppCreateShell.man
View File

@ -171,7 +171,7 @@ Note that the widget returned by
has the \s-1WM_COMMAND\s+1
property set for session managers (see Chapter 4).
.SH "SEE ALSO"
XtCreateWidget(3Xt)
XtCreateWidget(__libmansuffix__)
.br
\fI\*(xT\fP
.br

4
lib/libXt/man/XtAppError.man
View File

@ -169,8 +169,8 @@ The
function calls the installed nonfatal error procedure and passes the
specified message.
.SH "SEE ALSO"
XtAppGetErrorDatabase(3Xt),
XtAppErrorMsg(3Xt)
XtAppGetErrorDatabase(__libmansuffix__),
XtAppErrorMsg(__libmansuffix__)
.br
\fI\*(xT\fP
.br

4
lib/libXt/man/XtAppErrorMsg.man
View File

@ -182,8 +182,8 @@ The
function calls the high-level error handler and passes the specified
information.
.SH "SEE ALSO"
XtAppGetErrorDatabase(3Xt),
XtAppError(3Xt)
XtAppGetErrorDatabase(__libmansuffix__),
XtAppError(__libmansuffix__)
.br
\fI\*(xT\fP
.br

4
lib/libXt/man/XtAppGetErrorDatabase.man
View File

@ -168,8 +168,8 @@ returns the appropriate message from the error database
or returns the specified default message if one is not found in the
error database.
.SH "SEE ALSO"
XtAppError(3Xt),
XtAppErrorMsg(3Xt)
XtAppError(__libmansuffix__),
XtAppErrorMsg(__libmansuffix__)
.br
\fI\*(xT\fP
.br

2
lib/libXt/man/XtAppGetSelectionTimeout.man
View File

@ -155,7 +155,7 @@ The
function sets the \*(xI's selection timeout mechanism.
Note that most applications should not set the selection timeout.
.SH "SEE ALSO"
XtOwnSelection(3Xt)
XtOwnSelection(__libmansuffix__)
.br
\fI\*(xT\fP
.br

2
lib/libXt/man/XtAppInitialize.man
View File

@ -198,7 +198,7 @@ and
.ZN XtVaOpenApplication
respectively.
.SH "SEE ALSO"
XtOpenApplication(3Xt), XtVaOpenApplication(3Xt)
XtOpenApplication(__libmansuffix__), XtVaOpenApplication(__libmansuffix__)
.br
\fI\*(xT\fP
.br

1
lib/libXt/man/XtAsprintf.man Normal file
View File

@ -0,0 +1 @@
.so man__libmansuffix__/XtMalloc.__libmansuffix__

2
lib/libXt/man/XtBuildEventMask.man
View File

@ -147,7 +147,7 @@ structure by
and sent to the server when event handlers and translations are installed or
removed on the realized widget.
.SH "SEE ALSO"
XtAddEventHandler(3Xt)
XtAddEventHandler(__libmansuffix__)
.br
\fI\*(xT\fP
.br

2
lib/libXt/man/XtCallAcceptFocus.man
View File

@ -145,7 +145,7 @@ If accept_focus is NULL,
returns
.ZN False .
.SH "SEE ALSO"
XtSetKeyboardFocus(3Xt)
XtSetKeyboardFocus(__libmansuffix__)
.br
\fI\*(xT\fP
.br

2
lib/libXt/man/XtCallCallbacks.man
View File

@ -177,7 +177,7 @@ If the callback list exists and has at least one callback registered,
it returns
.ZN XtCallbackHasSome .
.SH "SEE ALSO"
XtAddCallback(3Xt)
XtAddCallback(__libmansuffix__)
.br
\fI\*(xT\fP
.br

4
lib/libXt/man/XtClass.man
View File

@ -232,8 +232,8 @@ and
.LP
The
.SH "SEE ALSO"
XtAppErrorMsg(3Xt),
XtDisplay(3Xt)
XtAppErrorMsg(__libmansuffix__),
XtDisplay(__libmansuffix__)
.br
\fI\*(xT\fP
.br

4
lib/libXt/man/XtConfigureWidget.man
View File

@ -212,8 +212,8 @@ There are very few times to use
instead, you should use
.ZN XtResizeWidget .
.SH "SEE ALSO"
XtMakeGeometryRequest(3Xt),
XtQueryGeometry(3Xt)
XtMakeGeometryRequest(__libmansuffix__),
XtQueryGeometry(__libmansuffix__)
.br
\fI\*(xT\fP
.br

8
lib/libXt/man/XtConvert.man
View File

@ -179,10 +179,10 @@ the client should check to_return.address for non-NULL.
has been replaced by
.ZN XtCallConverter .
.SH "SEE ALSO"
XtAppAddConverter(3Xt),
XtStringConversionWarning(3Xt),
XtConvertAndStore(3Xt),
XtCallConverter(3Xt)
XtAppAddConverter(__libmansuffix__),
XtStringConversionWarning(__libmansuffix__),
XtConvertAndStore(__libmansuffix__),
XtCallConverter(__libmansuffix__)
.br
\fI\*(xT\fP
.br

2
lib/libXt/man/XtConvertAndStore.man
View File

@ -214,7 +214,7 @@ in order to decrement the reference count when the converted value
is no longer required. The \fIcache_ref_return\fP argument should be
NULL if the caller is unwilling or unable to store the value.
.SH "SEE ALSO"
XtAppReleaseCacheRefs(3Xt)
XtAppReleaseCacheRefs(__libmansuffix__)
.br
\fI\*(xT\fP
.br

2
lib/libXt/man/XtCreateApplicationContext.man
View File

@ -168,7 +168,7 @@ If
was previously called it returns immediately.
.LP
.SH "SEE ALSO"
XtDisplayInitialize(3Xt)
XtDisplayInitialize(__libmansuffix__)
.br
\fI\*(xT\fP
.br

2
lib/libXt/man/XtCreateApplicationShell.man
View File

@ -149,7 +149,7 @@ and the default application context created by
This routine has been replaced by
.ZN XtAppCreateShell .
.SH "SEE ALSO"
XtAppCreateShell(3Xt)
XtAppCreateShell(__libmansuffix__)
.br
\fI\*(xT\fP
.br

6
lib/libXt/man/XtCreatePopupShell.man
View File

@ -168,9 +168,9 @@ an unspecified number of pop-ups.
You can look to see if an appropriate unused shell (that is, not
currently popped up) exists and create a new shell if needed.
.SH "SEE ALSO"
XtCreateWidget(3Xt),
XtPopdown(3Xt),
XtPopup(3Xt)
XtCreateWidget(__libmansuffix__),
XtPopdown(__libmansuffix__),
XtPopup(__libmansuffix__)
.br
\fI\*(xT\fP
.br

4
lib/libXt/man/XtCreateWidget.man
View File

@ -300,8 +300,8 @@ records, callback lists and, if the widget is a subclass of
.ZN compositeWidgetClass ,
children.
.SH "SEE ALSO"
XtAppCreateShell(3Xt),
XtCreatePopupShell(3Xt)
XtAppCreateShell(__libmansuffix__),
XtCreatePopupShell(__libmansuffix__)
.br
\fI\*(xT\fP
.br

4
lib/libXt/man/XtDisplayInitialize.man
View File

@ -259,8 +259,8 @@ initialized by
.ZN XtDisplayInitialize ,
the results are undefined.
.SH "SEE ALSO"
XtAppCreateShell(3Xt),
XtCreateApplicationContext(3Xt)
XtAppCreateShell(__libmansuffix__),
XtCreateApplicationContext(__libmansuffix__)
.br
\fI\*(xT\fP
.br

2
lib/libXt/man/XtError.man
View File

@ -165,7 +165,7 @@ The
function has been superceded by
.ZN XtAppWarning .
.SH "SEE ALSO"
.BR XtAppError (3Xt)
.BR XtAppError (__libmansuffix__)
.br
\fI\*(xT\fP
.br

2
lib/libXt/man/XtErrorMsg.man
View File

@ -175,7 +175,7 @@ The
function has been superceded by
.ZN XtAppWarningMsg
.SH "SEE ALSO"
.BR XtAppErrorMsg (3Xt)
.BR XtAppErrorMsg (__libmansuffix__)
.br
\fI\*(xT\fP
.br

2
lib/libXt/man/XtGetApplicationNameAndClass.man
View File

@ -146,7 +146,7 @@ has been closed, the result is undefined. The returned strings are
owned by the Intrinsics and must not be modified or freed by the
caller.
.SH "SEE ALSO"
.BR XtDisplayInitialize (3Xt)
.BR XtDisplayInitialize (__libmansuffix__)
.br
\fI\*(xT\fP
.br

4
lib/libXt/man/XtGetErrorDatabase.man
View File

@ -160,8 +160,8 @@ The
function has been superceded by
.ZN XtAppGetErrorDatabaseText .
.SH "SEE ALSO"
.BR XtAppGetErrorDatabase (3Xt)
.BR XtAppGetErrorDatabaseText (3Xt)
.BR XtAppGetErrorDatabase (__libmansuffix__)
.BR XtAppGetErrorDatabaseText (__libmansuffix__)
.br
\fI\*(xT\fP
.br

6
lib/libXt/man/XtGetKeyboardFocusWidget.man
View File

@ -137,9 +137,9 @@ Must be of class Core or any subclass thereof.
function returns the widget that would be the end result of keyboard
event forwarding for a keyboard event for the specified widget.
.SH "SEE ALSO"
XtInsertEventTypeHandler(3Xt), XtRemoveEventTypeHandler(3Xt),
XtRegisterExtensionSelector(3Xt), XtSetEventDispatcher(3Xt),
XtDispatchEventToWidget(3Xt)
XtInsertEventTypeHandler(__libmansuffix__), XtRemoveEventTypeHandler(__libmansuffix__),
XtRegisterExtensionSelector(__libmansuffix__), XtSetEventDispatcher(__libmansuffix__),
XtDispatchEventToWidget(__libmansuffix__)
.br
\fI\*(xT\fP
.br

4
lib/libXt/man/XtGetResourceList.man
View File

@ -179,8 +179,8 @@ should be freed using
.ZN XtFree
when it is no longer needed.
.SH "SEE ALSO"
XtGetSubresources(3Xt),
XtOffset(3Xt)
XtGetSubresources(__libmansuffix__),
XtOffset(__libmansuffix__)
.br
\fI\*(xT\fP
.br

2
lib/libXt/man/XtGetSelectionParameters.man
View File

@ -160,7 +160,7 @@ or from within the last call to an
.ZN XtConvertSelectionIncrProc
with a new request_id.
.SH "SEE ALSO"
XtSetSelectionParameters(3Xt)
XtSetSelectionParameters(__libmansuffix__)
.br
\fI\*(xT\fP
.br

2
lib/libXt/man/XtGetSelectionTimeout.man
View File

@ -144,7 +144,7 @@ The
function has been superceded by
.ZN XtAppSetSelectionTimeout .
.SH "SEE ALSO"
.BR XtAppGetSelectionTimeout (3Xt)
.BR XtAppGetSelectionTimeout (__libmansuffix__)
.br
\fI\*(xT\fP
.br

4
lib/libXt/man/XtGetSelectionValue.man
View File

@ -188,8 +188,8 @@ as would be when calling
.ZN XtGetSelectionValue
repeatedly.
.SH "SEE ALSO"
XtAppGetSelectionTimeout(3Xt),
XtOwnSelection(3Xt)
XtAppGetSelectionTimeout(__libmansuffix__),
XtOwnSelection(__libmansuffix__)
.br
\fI\*(xT\fP
.br

2
lib/libXt/man/XtInitialize.man
View File

@ -165,7 +165,7 @@ created shell. The semantics of calling
more than once are undefined. This routine has been replaced by
.ZN XtAppInitialize .
.SH "SEE ALSO"
.BR XtAppInitialize (3Xt)
.BR XtAppInitialize (__libmansuffix__)
.br
\fI\*(xT\fP
.br

2
lib/libXt/man/XtInsertEventTypeHandler.man
View File

@ -282,7 +282,7 @@ if any event handler was called and
otherwise.
.LP
.SH "SEE ALSO"
XtGetKeyboardFocusWidget(3Xt)
XtGetKeyboardFocusWidget(__libmansuffix__)
.br
\fI\*(xT\fP
.br

4
lib/libXt/man/XtMakeGeometryRequest.man
View File

@ -229,8 +229,8 @@ If the widget is not interested in
replies,
it can pass NULL for width_return and height_return.
.SH "SEE ALSO"
XtConfigureWidget(3Xt),
XtQueryGeometery(3Xt)
XtConfigureWidget(__libmansuffix__),
XtQueryGeometery(__libmansuffix__)
.br
\fI\*(xT\fP
.br

18
lib/libXt/man/XtMalloc.man
View File

@ -139,6 +139,8 @@ void XtFree(char *\fIptr\fP);
\fItype\fP *XtNew(\fItype\fP);
.HP
String XtNewString(String \fIstring\fP);
.HP
Cardinal XtAsprintf(String *\fInew_string\fP, const char *\fIformat\fP, ...);
.SH ARGUMENTS
.IP \fInum\fP 1i
Specifies the number of bytes or array elements.
@ -152,6 +154,10 @@ desired.
Specifies a previously declared string.
.IP \fItype\fP 1i
Specifies a previously declared data type.
.IP \fInew_string\fP 1i
Specifies a pointer to write a newly allocated string to.
.IP \fIformat\fP 1i
Specifies a formatting string as defined by sprintf(3c)
.SH DESCRIPTION
The
.ZN XtMalloc
@ -226,6 +232,18 @@ with the following arguments specified:
.ta .5i
(strcpy(XtMalloc((unsigned) strlen(str) + 1), str))
.De
.LP
The
.ZN XtAsprintf
function allocates space for a string large enough to hold the string
specified by the sprintf(3c) format pattern when used with the remaining
arguments, and fills it with the formatted results.
The address of the allocated string is placed into the pointer passed as ret.
The length of the string (not including the terminating null byte) is returned.
If there is insufficient memory to allocate the new block,
.ZN XtAsprintf
calls
.ZN XtErrorMsg .
.SH "SEE ALSO"
.br
\fI\*(xT\fP

4
lib/libXt/man/XtManageChildren.man
View File

@ -341,8 +341,8 @@ is managed, or
.ZN False
otherwise.
.SH "SEE ALSO"
XtMapWidget(3Xt),
XtRealizeWidget(3Xt)
XtMapWidget(__libmansuffix__),
XtRealizeWidget(__libmansuffix__)
.br
\fI\*(xT\fP
.br

2
lib/libXt/man/XtMapWidget.man
View File

@ -165,7 +165,7 @@ and
.ZN XtUnmapWidget
explicitly.
.SH "SEE ALSO"
XtManageChildren(3Xt)
XtManageChildren(__libmansuffix__)
.br
\fI\*(xT\fP
.br

4
lib/libXt/man/XtNextEvent.man
View File

@ -175,8 +175,8 @@ has been replaced by
has been replaced by
.ZN XtAppMainLoop .
.SH "SEE ALSO"
XtAppNextEvent(3xt), XtAppPending(3Xt), XtAppPeekEvent(3Xt),
XtAppProcessEvent(3Xt), XtAppMainLoop(3Xt)
XtAppNextEvent(3xt), XtAppPending(__libmansuffix__), XtAppPeekEvent(__libmansuffix__),
XtAppProcessEvent(__libmansuffix__), XtAppMainLoop(__libmansuffix__)
.br
\fI\*(xT\fP
.br

4
lib/libXt/man/XtOffset.man
View File

@ -162,8 +162,8 @@ The
macro returns the number of elements in the specified argument lists,
resources lists, and other counted arrays.
.SH "SEE ALSO"
XtGetResourceList(3Xt),
XtSetArg(3Xt)
XtGetResourceList(__libmansuffix__),
XtSetArg(__libmansuffix__)
.br
\fI\*(xT\fP
.br

2
lib/libXt/man/XtOpenApplication.man
View File

@ -200,7 +200,7 @@ and
.ZN XtVaOpenApplication
respectively.
.SH "SEE ALSO"
XtAppInitialize(3Xt), XtVaAppInitialize(3Xt)
XtAppInitialize(__libmansuffix__), XtVaAppInitialize(__libmansuffix__)
.br
\fI\*(xT\fP
.br

4
lib/libXt/man/XtOwnSelection.man
View File

@ -218,8 +218,8 @@ before the call to
finishes after the call to
.ZN XtDisownSelection .
.SH "SEE ALSO"
XtAppGetSelectionTimeout(3Xt),
XtGetSelectionValue(3Xt)
XtAppGetSelectionTimeout(__libmansuffix__),
XtGetSelectionValue(__libmansuffix__)
.br
\fI\*(xT\fP
.br

8
lib/libXt/man/XtParseTranslationTable.man
View File

@ -180,10 +180,10 @@ The
.ZN XtUninstallTranslations
function causes the entire translation table for widget to be removed.
.SH "SEE ALSO"
XtAppAddActions(3Xt),
XtCreatePopupShell(3Xt),
XtParseAcceleratorTable(3Xt),
XtPopup(3Xt)
XtAppAddActions(__libmansuffix__),
XtCreatePopupShell(__libmansuffix__),
XtParseAcceleratorTable(__libmansuffix__),
XtPopup(__libmansuffix__)
.br
\fI\*(xT\fP
.br

4
lib/libXt/man/XtPopdown.man
View File

@ -223,8 +223,8 @@ gets to the application top-level shell widget
and cannot find a matching shell,
it generates an error.
.SH "SEE ALSO"
XtCreatePopupShell(3Xt),
XtPopup(3Xt)
XtCreatePopupShell(__libmansuffix__),
XtPopup(__libmansuffix__)
.br
\fI\*(xT\fP
.br

4
lib/libXt/man/XtPopup.man
View File

@ -316,8 +316,8 @@ If
gets to the application widget and cannot find a matching shell,
it generates an error.
.SH "SEE ALSO"
XtCreatePopupShell(3Xt),
XtPopdown(3Xt)
XtCreatePopupShell(__libmansuffix__),
XtPopdown(__libmansuffix__)
.br
\fI\*(xT\fP
.br

4
lib/libXt/man/XtQueryGeometry.man
View File

@ -159,8 +159,8 @@ replaces it with a pointer to an
.ZN XtWidgetGeometry
structure with request_mode=0 before calling query_geometry.
.SH "SEE ALSO"
XtConfigureWidget(3Xt),
XtMakeGeometryRequest(3Xt)
XtConfigureWidget(__libmansuffix__),
XtMakeGeometryRequest(__libmansuffix__)
.br
\fI\*(xT\fP
.br

2
lib/libXt/man/XtRealizeWidget.man
View File

@ -204,7 +204,7 @@ again.
If the widget was managed,
it will be unmanaged automatically before its window is freed.
.SH "SEE ALSO"
XtManageChildren(3Xt)
XtManageChildren(__libmansuffix__)
.br
\fI\*(xT\fP
.br

2
lib/libXt/man/XtSetArg.man
View File

@ -199,7 +199,7 @@ When it is no longer needed,
free the returned storage by using
.ZN XtFree .
.SH "SEE ALSO"
XtOffset(3Xt)
XtOffset(__libmansuffix__)
.br
\fI\*(xT\fP
.br

2
lib/libXt/man/XtSetKeyboardFocus.man
View File

@ -181,7 +181,7 @@ event is generated for descendant if
.ZN FocusNotify
events have been selected by the descendant.
.SH "SEE ALSO"
XtCallAcceptFocus(3Xt)
XtCallAcceptFocus(__libmansuffix__)
.br
\fI\*(xT\fP
.br

2
lib/libXt/man/XtSetSelectionParameters.man
View File

@ -180,7 +180,7 @@ and
.ZN XtGetSelectionValuesIncremental
cannot be used to make selection requests with parameterized targets.
.SH "SEE ALSO"
XtGetSelectionParameters(3Xt)
XtGetSelectionParameters(__libmansuffix__)
.br
\fI\*(xT\fP
.br

6
lib/libXt/man/XtStringConversionWarning.man
View File

@ -145,10 +145,10 @@ type ``string'', class ``XtToolkitError, and the default message string
has been replaced by
.ZN XtDisplayStringConversionWarning .
.SH "SEE ALSO"
XtAppAddConverter(3Xt),
XtAppAddConverter(__libmansuffix__),
XtAppErrorMsg(3t),
XtConvert(3Xt),
XtDisplayStringConversionWarning(3Xt)
XtConvert(__libmansuffix__),
XtDisplayStringConversionWarning(__libmansuffix__)
.br
\fI\*(xT\fP
.br

25
lib/libXt/specs/Makefile.in
View File

@ -39,7 +39,9 @@ subdir = specs
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_define_dir.m4 \
$(top_srcdir)/configure.ac
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(install_sh) -d
@ -71,24 +73,19 @@ CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CWARNFLAGS = @CWARNFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
FGREP = @FGREP@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
@ -97,6 +94,7 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LD = @LD@
LDFLAGS = @LDFLAGS@
LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
LIBOBJS = @LIBOBJS@
@ -104,6 +102,7 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@ -114,8 +113,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MAN_SUBSTS = @MAN_SUBSTS@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@ -138,12 +141,9 @@ XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
XT_CFLAGS = @XT_CFLAGS@
XT_LIBS = @XT_LIBS@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@ -174,6 +174,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@

41
lib/libXt/src/Alloc.c
View File

@ -1,5 +1,5 @@
/***********************************************************
Copyright (c) 1993, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 1993, 2011, Oracle and/or its affiliates. All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
@ -82,6 +82,8 @@ in this Software without prior written authorization from The Open Group.
#undef _XBCOPYFUNC
#include <stdlib.h>
#include <stdio.h>
#include <stdarg.h>
#define Xmalloc(size) malloc((size))
#define Xrealloc(ptr, size) realloc((ptr), (size))
@ -121,6 +123,43 @@ void _XtHeapInit(
heap->bytes_remaining = 0;
}
/* Version of asprintf() using XtMalloc
* Not currently available in XTTRACEMEMORY version, since that would
* require varargs macros everywhere, which are only standard in C99 & later.
*/
Cardinal XtAsprintf(
String *new_string,
_Xconst char * _X_RESTRICT_KYWD format,
...)
{
char buf[256];
Cardinal len;
va_list ap;
va_start(ap, format);
len = vsnprintf(buf, sizeof(buf), format, ap);
va_end(ap);
if (len < 0)
_XtAllocError("vsnprintf");
*new_string = XtMalloc(len + 1); /* snprintf doesn't count trailing '\0' */
if (len < sizeof(buf))
{
strncpy(*new_string, buf, len);
(*new_string)[len] = '\0';
}
else
{
va_start(ap, format);
if (vsnprintf(*new_string, len + 1, format, ap) < 0)
_XtAllocError("vsnprintf");
va_end(ap);
}
return len;
}
#ifndef XTTRACEMEMORY
char *XtMalloc(

2
lib/libXt/src/Converters.c
View File

@ -1360,7 +1360,7 @@ Boolean XtCvtIntToPixmap(
XtNwrongParameters,"cvtIntToPixmap",XtCXtToolkitError,
"Integer to Pixmap conversion needs no extra arguments",
(String *) NULL, (Cardinal *)NULL);
done(Pixmap, *(Pixmap*)fromVal->addr);
done(Pixmap, *(int*)fromVal->addr);
}
#ifdef MOTIFBC

18
lib/libXt/src/Error.c
View File

@ -233,11 +233,6 @@ static void DefaultMsg (
void (*fn)(_Xconst _XtString))
{
#define BIGBUF 1024
#ifdef notyet /* older versions don't, might want to wait until more do */
#if defined(__linux__) || defined(CSRG_BASED) /* everyone else needs to get with the program */
#define USE_SNPRINTF
#endif
#endif
char buffer[BIGBUF];
char* message;
XtGetErrorDatabaseText(name,type,class,defaultp, buffer, BIGBUF);
@ -302,18 +297,9 @@ program as a non-root user or by removing the suid bit on the executable.");
* to be a performance issue.
*/
if ((message = __XtMalloc (BIGBUF))) {
#ifndef USE_SNPRINTF
message[BIGBUF-1] = 0;
(void) sprintf (message, buffer,
#else
(void) snprintf (message, BIGBUF, buffer,
#endif
par[0], par[1], par[2], par[3], par[4],
par[5], par[6], par[7], par[8], par[9]);
#ifndef USE_SNPRINTF
if (message[BIGBUF-1] != '\0')
XtWarning ("Possible heap corruption in Xt{Error,Warning}MsgHandler");
#endif
par[0], par[1], par[2], par[3], par[4],
par[5], par[6], par[7], par[8], par[9]);
(*fn)(message);
XtFree(message);
} else {

25
lib/libXt/src/Initialize.c
View File

@ -380,7 +380,7 @@ static void CombineAppUserDefaults(
XrmDatabase *pdb)
{
char* filename;
char* path;
char* path = NULL;
Boolean deallocate = False;
if (!(path = getenv("XUSERFILESEARCHPATH"))) {
@ -389,20 +389,14 @@ static void CombineAppUserDefaults(
char homedir[PATH_MAX];
GetRootDirName(homedir, PATH_MAX);
if (!(old_path = getenv("XAPPLRESDIR"))) {
char *path_default = "%s/%%L/%%N%%C:%s/%%l/%%N%%C:%s/%%N%%C:%s/%%L/%%N:%s/%%l/%%N:%s/%%N";
if (!(path =
ALLOCATE_LOCAL(6*strlen(homedir) + strlen(path_default))))
_XtAllocError(NULL);
sprintf( path, path_default,
homedir, homedir, homedir, homedir, homedir, homedir );
XtAsprintf(&path,
"%s/%%L/%%N%%C:%s/%%l/%%N%%C:%s/%%N%%C:%s/%%L/%%N:%s/%%l/%%N:%s/%%N",
homedir, homedir, homedir, homedir, homedir, homedir);
} else {
char *path_default = "%s/%%L/%%N%%C:%s/%%l/%%N%%C:%s/%%N%%C:%s/%%N%%C:%s/%%L/%%N:%s/%%l/%%N:%s/%%N:%s/%%N";
if (!(path =
ALLOCATE_LOCAL( 6*strlen(old_path) + 2*strlen(homedir)
+ strlen(path_default))))
_XtAllocError(NULL);
sprintf(path, path_default, old_path, old_path, old_path, homedir,
old_path, old_path, old_path, homedir );
XtAsprintf(&path,
"%s/%%L/%%N%%C:%s/%%l/%%N%%C:%s/%%N%%C:%s/%%N%%C:%s/%%L/%%N:%s/%%l/%%N:%s/%%N:%s/%%N",
old_path, old_path, old_path, homedir,
old_path, old_path, old_path, homedir);
}
deallocate = True;
#endif
@ -414,7 +408,8 @@ static void CombineAppUserDefaults(
XtFree(filename);
}
if (deallocate) DEALLOCATE_LOCAL(path);
if (deallocate)
XtFree(path);
}
static void CombineUserDefaults(

24
lib/libXt/src/Keyboard.c
View File

@ -727,18 +727,22 @@ static void QueryEventMask(
*/
Widget ancestor = (Widget)client_data;
XtPerWidgetInput pwi = _XtGetPerWidgetInput(ancestor, FALSE);
Widget target = pwi->queryEventDescendant;
/* use of 'target' is non-standard hackery; allows focus to non-widget */
if (pwi && (pwi->focusKid == target)) {
AddFocusHandler(ancestor, target, pwi,
_XtGetPerWidgetInput(GetShell(ancestor), TRUE),
_XtGetPerDisplayInput(XtDisplay(ancestor)),
(EventMask)0);
if (pwi) {
Widget target = pwi->queryEventDescendant;
/* use of 'target' is non-standard hackery;
allows focus to non-widget */
if ( pwi->focusKid == target ) {
AddFocusHandler(ancestor, target, pwi,
_XtGetPerWidgetInput(GetShell(ancestor), TRUE),
_XtGetPerDisplayInput(XtDisplay(ancestor)),
(EventMask)0);
}
XtRemoveEventHandler(widget, XtAllEvents, True,
QueryEventMask, client_data);
pwi->map_handler_added = FALSE;
}
XtRemoveEventHandler(widget, XtAllEvents, True,
QueryEventMask, client_data);
pwi->map_handler_added = FALSE;
}

25
lib/libXt/src/Makefile.in
View File

@ -40,7 +40,9 @@ subdir = src
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_define_dir.m4 \
$(top_srcdir)/configure.ac
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(install_sh) -d
@ -108,24 +110,19 @@ CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CWARNFLAGS = @CWARNFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
FGREP = @FGREP@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
@ -134,6 +131,7 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LD = @LD@
LDFLAGS = @LDFLAGS@
LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
LIBOBJS = @LIBOBJS@
@ -141,6 +139,7 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@ -151,8 +150,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MAN_SUBSTS = @MAN_SUBSTS@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@ -175,12 +178,9 @@ XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
XT_CFLAGS = @XT_CFLAGS@
XT_LIBS = @XT_LIBS@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@ -211,6 +211,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@

42
lib/libXt/src/ResConfig.c
View File

@ -174,18 +174,13 @@ _set_resource_values (
* create resource name string
*/
if (resource_name) {
temp = XtMalloc (sizeof(char) *
(2 + strlen(cur->core.name)
+ strlen(resource_name)));
sprintf (temp, ".%s%s", cur->core.name, resource_name);
XtAsprintf (&temp, ".%s%s", cur->core.name, resource_name);
XtFree (resource_name);
} else if (!XtIsWidget (cur) || !cur->core.name) {
cur = XtParent(cur);
continue;
} else {
temp = XtMalloc (sizeof(char) *
(2 + strlen(cur->core.name)));
sprintf (temp, ".%s", cur->core.name);
XtAsprintf (&temp, ".%s", cur->core.name);
}
resource_name = temp;
@ -197,31 +192,19 @@ _set_resource_values (
(ApplicationShellWidget) (cur);
if (resource_class) {
temp = XtMalloc (sizeof(char) *
(2 + strlen(top->application.class)
+ strlen(resource_class)));
sprintf (temp, ".%s%s",
XtAsprintf (&temp, ".%s%s",
top->application.class, resource_class);
} else {
temp = XtMalloc (sizeof(char) *
(2 + strlen(top->application.class)));
sprintf (temp, ".%s",
XtAsprintf (&temp, ".%s",
top->application.class);
}
} else {
if (resource_class) {
temp = XtMalloc (sizeof(char) *
(2 + strlen(
cur->core.widget_class->core_class.class_name)
+ strlen(resource_class)));
sprintf (temp, ".%s%s",
XtAsprintf (&temp, ".%s%s",
cur->core.widget_class->core_class.class_name,
resource_class);
} else {
temp = XtMalloc (sizeof(char) *
(2 + strlen(
cur->core.widget_class->core_class.class_name)));
sprintf (temp, ".%s",
XtAsprintf (&temp, ".%s",
cur->core.widget_class->core_class.class_name);
}
}
@ -235,9 +218,7 @@ _set_resource_values (
/*
* add the resource name to the end of the resource name string
*/
temp = XtMalloc (2 + strlen(resource_name) +
strlen(resources_return[res_index].resource_name));
sprintf (temp, "%s.%s", resource_name,
XtAsprintf (&temp, "%s.%s", resource_name,
resources_return[res_index].resource_name);
if (resource_name != NULL)
XtFree (resource_name);
@ -246,9 +227,7 @@ _set_resource_values (
/*
* add the resource class to the end of the resource class string
*/
temp = XtMalloc (2 + strlen(resource_class) +
strlen(resources_return[res_index].resource_class));
sprintf (temp, "%s.%s", resource_class,
XtAsprintf (&temp, "%s.%s", resource_class,
resources_return[res_index].resource_class);
if (resource_class != NULL)
XtFree (resource_class);
@ -746,7 +725,7 @@ _search_widget_tree (
/*
* this case covers resources of only one level (eg. *background)
*/
if (strcmp (remainder, "") == 0) {
if (remainder[0] == 0) {
_set_resource_values (w, resource, value, last_part);
if (last_token == '*')
_apply_values_to_children (parent, remainder, resource,
@ -757,8 +736,7 @@ _search_widget_tree (
*/
} else {
if (remainder[0] != '*' && remainder[0] != '.') {
copy = XtMalloc (strlen(remainder) + 2);
sprintf (copy, ".%s", remainder);
XtAsprintf (&copy, ".%s", remainder);
XtFree (remainder);
remainder = copy;
}

95
lib/libXt/src/Resources.c
View File

@ -109,92 +109,6 @@ void _XtCopyFromParent(
} /* _XtCopyFromParent */
/* If the alignment characteristics of your machine are right, these may be
faster */
#ifdef UNALIGNED
void _XtCopyFromArg(
XtArgVal src,
char* dst,
register unsigned int size)
{
if (size == sizeof(long)) *(long *)dst = (long)src;
else if (size == sizeof(short)) *(short *)dst = (short)src;
else if (size == sizeof(char)) *(char *)dst = (char)src;
else if (size == sizeof(XtPointer)) *(XtPointer *)dst = (XtPointer)src;
else if (size == sizeof(char*)) *(char **)dst = (char*)src;
else if (size == sizeof(XtArgVal)) *(XtArgVal *)dst = src;
else if (size > sizeof(XtArgVal))
(void) memmove((char *) dst, (char *) src, (int) size);
else
(void) memmove((char *) dst, (char *) &src, (int) size);
} /* _XtCopyFromArg */
void _XtCopyToArg(
char* src,
XtArgVal *dst,
register unsigned int size)
{
if (! (*dst)) {
#ifdef GETVALUES_BUG
/* old GetValues semantics (storing directly into arglists) are bad,
* but preserve for compatibility as long as arglist contains NULL.
*/
if (size == sizeof(long)) *dst = (XtArgVal)*(long*)src;
else if (size == sizeof(short)) *dst = (XtArgVal)*(short*)src;
else if (size == sizeof(char)) *dst = (XtArgVal)*(char*)src;
else if (size == sizeof(XtPointer)) *dst = (XtArgVal)*(XtPointer*)src;
else if (size == sizeof(char*)) *dst = (XtArgVal)*(char**)src;
else if (size == sizeof(XtArgVal)) *dst = *(XtArgVal*)src;
else (void) memmove((char*)dst, (char*)src, (int)size);
#else
XtErrorMsg("invalidGetValues", "xtGetValues", XtCXtToolkitError,
"NULL ArgVal in XtGetValues", (String*) NULL, (Cardinal*) NULL);
#endif
}
else {
/* proper GetValues semantics: argval is pointer to destination */
if (size == sizeof(long)) *((long*)*dst) = *(long*)src;
else if (size == sizeof(short)) *((short*)*dst) = *(short*)src;
else if (size == sizeof(char)) *((char*)*dst) = *(char*)src;
else if (size == sizeof(XtPointer)) *((XtPointer*)*dst) = *(XtPointer*)src;
else if (size == sizeof(char*)) *((char**)*dst) = *(char**)src;
else if (size == sizeof(XtArgVal)) *((XtArgVal*)*dst)= *(XtArgVal*)src;
else (void) memmove((char*)*dst, (char*)src, (int)size);
}
} /* _XtCopyToArg */
static void CopyToArg(
char* src,
XtArgVal *dst,
register unsigned int size)
{
if (! (*dst)) {
/* old GetValues semantics (storing directly into arglists) are bad,
* but preserve for compatibility as long as arglist contains NULL.
*/
if (size == sizeof(long)) *dst = (XtArgVal)*(long*)src;
else if (size == sizeof(short)) *dst = (XtArgVal)*(short*)src;
else if (size == sizeof(char)) *dst = (XtArgVal)*(char*)src;
else if (size == sizeof(XtPointer)) *dst = (XtArgVal)*(XtPointer*)src;
else if (size == sizeof(char*)) *dst = (XtArgVal)*(char**)src;
else if (size == sizeof(XtArgVal)) *dst = *(XtArgVal*)src;
else (void) memmove((char*)dst, (char*)src, (int)size);
}
else {
/* proper GetValues semantics: argval is pointer to destination */
if (size == sizeof(long)) *((long*)*dst) = *(long*)src;
else if (size == sizeof(short)) *((short*)*dst) = *(short*)src;
else if (size == sizeof(char)) *((char*)*dst) = *(char*)src;
else if (size == sizeof(XtPointer)) *((XtPointer*)*dst) = *(XtPointer*)src;
else if (size == sizeof(char*)) *((char**)*dst) = *(char**)src;
else if (size == sizeof(XtArgVal)) *((XtArgVal*)*dst)= *(XtArgVal*)src;
else (void) memmove((char*)*dst, (char*)src, (int)size);
}
} /* CopyToArg */
#else
void _XtCopyFromArg(
XtArgVal src,
char* dst,
@ -313,7 +227,6 @@ static void CopyToArg(
}
} /* CopyToArg */
#endif
static Cardinal CountTreeDepth(
Widget w)
@ -944,7 +857,7 @@ static XtCacheRef *GetResources(
register XtTypedArg* arg = typed_args + typed[j] - 1;
register int i;
for (i = num_typed_args - typed[j]; i; i--, arg++) {
for (i = num_typed_args - typed[j]; i > 0; i--, arg++) {
*arg = *(arg+1);
}
num_typed_args--;
@ -967,8 +880,10 @@ static XtCacheRef *GetResources(
if (cache_ptr && *cache_ptr)
cache_ptr++;
} else {
*((XtTranslations *)&widget->core.tm.current_state) =
*((XtTranslations *)value.addr);
/* value.addr can be NULL see: !already_copied */
if (value.addr)
*((XtTranslations *)&widget->core.tm.current_state) =
*((XtTranslations *)value.addr);
}
}
}

2
lib/libXt/src/Selection.c
View File

@ -226,7 +226,7 @@ static Atom GetSelectionProperty(
propCount = sarray->propCount++;
sarray->list = (SelectionProp) XtRealloc((XtPointer)sarray->list,
(unsigned)(sarray->propCount*sizeof(SelectionPropRec)));
(void) sprintf(propname, "%s%d", "_XT_SELECTION_", propCount);
(void) snprintf(propname, sizeof(propname), "_XT_SELECTION_%d", propCount);
sarray->list[propCount].prop = XInternAtom(dpy, propname, FALSE);
sarray->list[propCount].avail = FALSE;
return(sarray->list[propCount].prop);

9
lib/libXt/src/Shell.c
View File

@ -1780,7 +1780,8 @@ static void GetGeometry(
}
else hints.flags = 0;
sprintf( def_geom, "%dx%d+%d+%d", width, height, x, y );
snprintf( def_geom, sizeof(def_geom), "%dx%d+%d+%d",
width, height, x, y );
flag = XWMGeometry( XtDisplay(W),
XScreenNumberOfScreen(XtScreen(W)),
w->shell.geometry, def_geom,
@ -2481,6 +2482,10 @@ static Boolean TopLevelSetValues(
XFree((XPointer)icon_name.value);
}
}
else if (new->topLevel.iconic != old->topLevel.iconic) {
if (new->topLevel.iconic)
new->wm.wm_hints.initial_state = IconicState;
}
return False;
}
@ -3013,7 +3018,7 @@ static void SetSessionProperties(
user_name = _XtGetUserName(nam_buf, sizeof nam_buf);
if (user_name)
props[num_props++] = ArrayPack(SmUserID, &user_name);
sprintf(pid, "%ld", (long)getpid());
snprintf(pid, sizeof(pid), "%ld", (long)getpid());
props[num_props++] = ArrayPack(SmProcessID, &pidp);
if (num_props) {

5
lib/libXt/src/Varargs.c
View File

@ -318,7 +318,7 @@ _XtFreeArgList(
if (args) {
if (typed_count)
for (p = args + total_count; total_count--; ++p) {
if (p->value) XtFree((char *)p->value);
XtFree((char *)p->value);
}
XtFree((char *)args);
}
@ -398,8 +398,7 @@ _XtVaToArgList(
}
}
if (resources != NULL)
XtFree((XtPointer)resources);
XtFree((XtPointer)resources);
*num_args_return = (Cardinal)count;
*args_return = (ArgList)args;

2
lib/libXt/util/Makefile.am
View File

@ -10,7 +10,7 @@ EXTRA_DIST = \
StrDefs.ht \
string.list
makestrs_CFLAGS = $(XT_CFLAGS)
AM_CFLAGS = $(XT_CFLAGS)
makestrs_SOURCES = makestrs.c

45
lib/libXt/util/Makefile.in
View File

@ -42,14 +42,16 @@ subdir = util
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_define_dir.m4 \
$(top_srcdir)/configure.ac
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
PROGRAMS = $(noinst_PROGRAMS)
am_makestrs_OBJECTS = makestrs-makestrs.$(OBJEXT)
am_makestrs_OBJECTS = makestrs.$(OBJEXT)
makestrs_OBJECTS = $(am_makestrs_OBJECTS)
makestrs_LDADD = $(LDADD)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
@ -92,24 +94,19 @@ CHANGELOG_CMD = @CHANGELOG_CMD@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CWARNFLAGS = @CWARNFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
FGREP = @FGREP@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
@ -118,6 +115,7 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LD = @LD@
LDFLAGS = @LDFLAGS_FOR_BUILD@
LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
LIBOBJS = @LIBOBJS@
@ -125,6 +123,7 @@ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
@ -135,8 +134,12 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
MAN_SUBSTS = @MAN_SUBSTS@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@ -159,12 +162,9 @@ XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
XT_CFLAGS = @XT_CFLAGS@
XT_LIBS = @XT_LIBS@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@ -195,6 +195,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@ -207,7 +208,7 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
EXTRA_DIST = Shell.ht StrDefs.ct StrDefs.ht string.list $(appman_PRE)
makestrs_CFLAGS = $(XT_CFLAGS)
AM_CFLAGS = $(XT_CFLAGS)
makestrs_SOURCES = makestrs.c
# Man page
@ -266,7 +267,7 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/makestrs-makestrs.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/makestrs.Po@am__quote@
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@ -289,20 +290,6 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
makestrs-makestrs.o: makestrs.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -MT makestrs-makestrs.o -MD -MP -MF "$(DEPDIR)/makestrs-makestrs.Tpo" -c -o makestrs-makestrs.o `test -f 'makestrs.c' || echo '$(srcdir)/'`makestrs.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/makestrs-makestrs.Tpo" "$(DEPDIR)/makestrs-makestrs.Po"; else rm -f "$(DEPDIR)/makestrs-makestrs.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='makestrs.c' object='makestrs-makestrs.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -c -o makestrs-makestrs.o `test -f 'makestrs.c' || echo '$(srcdir)/'`makestrs.c
makestrs-makestrs.obj: makestrs.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -MT makestrs-makestrs.obj -MD -MP -MF "$(DEPDIR)/makestrs-makestrs.Tpo" -c -o makestrs-makestrs.obj `if test -f 'makestrs.c'; then $(CYGPATH_W) 'makestrs.c'; else $(CYGPATH_W) '$(srcdir)/makestrs.c'; fi`; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/makestrs-makestrs.Tpo" "$(DEPDIR)/makestrs-makestrs.Po"; else rm -f "$(DEPDIR)/makestrs-makestrs.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='makestrs.c' object='makestrs-makestrs.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makestrs_CFLAGS) $(CFLAGS) -c -o makestrs-makestrs.obj `if test -f 'makestrs.c'; then $(CYGPATH_W) 'makestrs.c'; else $(CYGPATH_W) '$(srcdir)/makestrs.c'; fi`
mostlyclean-libtool:
-rm -f *.lo

3
lib/libXt/util/makestrs.c
View File

@ -30,9 +30,6 @@ in this Software without prior written authorization from The Open Group.
#include <X11/Xos.h>
#include <stdlib.h>
#include <unistd.h>
#if defined(macII) && !defined(__STDC__) /* stdlib.h fails to define these */
char *malloc();
#endif /* macII */
typedef struct _TableEnt {
struct _TableEnt* next;