libxt: Changes to 'upstream-unstable'
.gitignore | 11 ++++++++
COPYING | 1
Makefile.am | 9 +++---
README | 58 +++++++++++++++++++++++++++++++++++++++++++++
acinclude.m4 | 42 ++++++++++++++++++++++++++------
configure.ac | 51 +++++++++++++++++++++++++++++++--------
include/.gitignore | 2 -
include/X11/.gitignore | 2 -
include/X11/CallbackI.h | 4 +++
include/X11/Composite.h | 2 -
include/X11/CompositeP.h | 4 +++
include/X11/ConstrainP.h | 4 +++
include/X11/Constraint.h | 6 +++-
include/X11/ConvertI.h | 3 ++
include/X11/Core.h | 6 +++-
include/X11/CoreP.h | 4 +++
include/X11/CreateI.h | 7 +++++
include/X11/EventI.h | 4 +++
include/X11/HookObjI.h | 4 +++
include/X11/InitialI.h | 4 +++
include/X11/IntrinsicI.h | 4 +++
include/X11/Object.h | 7 ++++-
include/X11/ObjectP.h | 4 +++
include/X11/PassivGraI.h | 4 +++
include/X11/RectObj.h | 7 ++++-
include/X11/RectObjP.h | 4 +++
include/X11/ResourceI.h | 3 ++
include/X11/ShellP.h | 8 ++++++
include/X11/ThreadsI.h | 6 +++-
include/X11/TranslateI.h | 3 ++
include/X11/VarargsI.h | 4 +++
include/X11/Vendor.h | 4 +++
include/X11/VendorP.h | 4 +++
man/.gitignore | 3 --
man/XtGetErrorDatabase.man | 5 ---
man/XtResolvePathname.man | 2 -
src/.gitignore | 7 -----
src/Composite.c | 3 --
src/Constraint.c | 1
src/Converters.c | 6 ++--
src/Core.c | 2 -
src/Create.c | 3 --
src/Display.c | 4 +--
src/Initialize.c | 14 +++++++++-
src/Intrinsic.c | 21 ++++++++++------
src/Keyboard.c | 2 -
src/Makefile.am | 2 -
src/NextEvent.c | 5 ++-
src/Object.c | 1
src/RectObj.c | 1
src/ResConfig.c | 1
src/Selection.c | 18 ++++++-------
src/SetValues.c | 2 -
src/Shell.c | 4 ---
src/TMkey.c | 5 +++
src/TMparse.c | 3 +-
src/TMprint.c | 12 ++++++---
src/Vendor.c | 4 +--
util/.gitignore | 8 ------
util/Makefile.am | 2 +
util/makestrs.man | 12 ++++-----
61 files changed, 332 insertions(+), 111 deletions(-)
New commits:
commit 369629611609f20c89499c1f6b5562a4f3cca983
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Jul 2 13:28:01 2009 -0400
libXt 1.0.6
diff --git a/configure.ac b/configure.ac
index 8c7a031..043ab5f 100755
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,7 @@ AC_PREREQ([2.57])
dnl
dnl
-AC_INIT(libXt, 1.0.5, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXt)
+AC_INIT(libXt, 1.0.6, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXt)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
commit 28677468c56888b18c44d71a62903d23e5c294cf
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
Date: Tue May 19 23:25:15 2009 +0100
Cygwin/X: Build fix
Commit c59dd27ecb1751f0b097046b2f892028e5a10a3e replaces __CYGWIN__ with WIN32
in a preprocessor check, as the code is appropriate for both Cygwin and Mingw.
But this isn't quite the right was to do this. Being a Win32 platform is
Cygwin's secret shame, and WIN32 isn't actually defined to avoid turning on
code specific to native-Win API ports
(See http://www.cygwin.com/faq/faq.programming.html#faq.programming.preprocessor)
Yes, this probably means WIN32 could bereplaced by __MINGW32__ everywhere in the
X sources...
diff --git a/src/Initialize.c b/src/Initialize.c
index d2af1b1..f2c9c68 100644
--- a/src/Initialize.c
+++ b/src/Initialize.c
@@ -188,7 +188,7 @@ void _XtInherit(void)
#endif
-#ifdef WIN32
+#if defined (WIN32) || defined(__CYGWIN__)
/*
* The Symbol _XtInherit is used in two different manners.
* First it could be used as a generic function and second
commit 535f8c5324205b92c15e8755008c33a2766832c8
Author: John McKernan <john.mckernan@sun.com>
Date: Fri May 1 13:53:03 2009 -0700
Sun bug 4010369: Too slow to process Keycode 0 events in Xt Translation Mgr.
Evaluation from original bug report against Solaris 2.6 in 1996:
According to my investigation with the problem using debuggable
libXt and libXm, keycode 0 keypress events, which are given to
Xt's Translation Manager when inputting any cyrillic/greek characters,
are not cached in Xt's Translation Manager. At the TRANSLATE macro
in the Xt's source lib/Xt/TMkey.c, keycode 0 keyevents are always
given to XtTranslateKeycode() and it consumes a long time to parse
Motif's Translation Manager tables as many times as keycode 0
keyevent are given.
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/src/TMkey.c b/src/TMkey.c
index 4194445..71bfddb 100644
--- a/src/TMkey.c
+++ b/src/TMkey.c
@@ -129,7 +129,10 @@ FM(0x1e), FM(0x9e), FM(0x5e), FM(0xde), FM(0x3e), FM(0xbe), FM(0x7e), FM(0xfe)
{ \
int _i_ = (((key) - (pd)->min_keycode + modmix[(mod) & 0xff]) & \
(TMKEYCACHESIZE-1)); \
- if ((key) != 0 && /* Xlib XIM composed input */ \
+ if ((key) == 0) { /* Xlib XIM composed input */ \
+ mod_ret = 0; \
+ sym_ret = 0; \
+ } else if ( /* not Xlib XIM composed input */ \
(ctx)->keycache.keycode[_i_] == (key) && \
(ctx)->keycache.modifiers[_i_] == (mod)) { \
mod_ret = MOD_RETURN(ctx, key); \
commit 061d3eebf7a0502afcd9c1831d67c8961feece8d
Author: John McKernan <john.mckernan@sun.com>
Date: Fri May 1 13:41:26 2009 -0700
Sun bug #1237023: Dtterm crashes in XtDisplayAccelerators()
Don't try to printf if returned string is NULL
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/src/TMprint.c b/src/TMprint.c
index 7b7bde2..aeb6b30 100644
--- a/src/TMprint.c
+++ b/src/TMprint.c
@@ -729,8 +729,10 @@ void _XtDisplayTranslations(
widget->core.tm.translations,
NULL,
True);
- printf("%s\n",xString);
- XtFree(xString);
+ if (xString) {
+ printf("%s\n",xString);
+ XtFree(xString);
+ }
}
/*ARGSUSED*/
@@ -747,8 +749,10 @@ void _XtDisplayAccelerators(
widget->core.accelerators,
NULL,
True);
- printf("%s\n",xString);
- XtFree(xString);
+ if (xString) {
+ printf("%s\n",xString);
+ XtFree(xString);
+ }
}
/*ARGSUSED*/
commit e500631954c8d390e8705fde7f50d1acc006406e
Author: Jeremy Huddleston <jeremy@yuffie.local>
Date: Thu Mar 12 01:03:39 2009 -0700
darwin: Don't use poll() on versions of darwin before darwin10
diff --git a/configure.ac b/configure.ac
index d707499..8c7a031 100755
--- a/configure.ac
+++ b/configure.ac
@@ -55,8 +55,15 @@ PKG_CHECK_MODULES(XT, sm x11 xproto kbproto)
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
-AC_CHECK_FUNC(poll, AC_DEFINE(USE_POLL,1,
- [Define to 1 if you have the "poll" function.]))
+case $host_os in
+ # darwin has poll() but can't be used to poll character devices
+ # darwin10 (SnowLeopard) should be tested as well once released
+ darwin7*) ;; darwin8*) ;; darwin9*) ;;
+ *)
+ AC_CHECK_FUNC(poll, AC_DEFINE(USE_POLL,1,
+ [Define to 1 if you have the "poll" function.]))
+ ;;
+esac
AC_CHECK_FUNC(snprintf, AC_DEFINE(USE_SNPRINTF,1,
[Define to 1 if you have the "snprintf" function.]))
commit 81792a4cb402c4e5275d63465bc5d65599e34a25
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Feb 2 20:34:36 2009 -0800
Add README with pointers to mailing list, bugzilla & git repos
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/README b/README
index e69de29..5677335 100644
--- a/README
+++ b/README
@@ -0,0 +1,58 @@
+libXt - X Toolkit Intrinsics library
+
+Documentation for this library can be found in the included man pages,
+the libXt spec from the doc/xorg-docs module, also available at:
+
+ http://xorg.freedesktop.org/releases/X11R7.0/doc/PDF/intrinsics.pdf
+
+and the O'Reilly X Toolkit books, which they have made freely available online:
+
+ - X Series Volume 4: X Toolkit Intrinsics Programming Manual,
+ 1st Edition (1990, covers X11R3)
+
+ http://www.archive.org/details/xtoolkitintrsin20400nyemiss
+
+ - X Series Volume 4: X Toolkit Intrinsics Programming Manual,
+ 2nd Edition (1990, covers X11R4)
+
+ http://www.archive.org/details/xtoolkitintrinsi04nyemiss
+
+ - X Series Volume 4: X Toolkit Intrinsics Programming Manual,
+ Motif Edition (1990, covers X11R4/Motif 1.1)
+
+ http://www.archive.org/details/xtoolktintrmotif04nyemiss
+
+ - X Series Volume 4: X Toolkit Intrinsics Programming Manual,
+ 3rd Edition (1993, covers X11R5)
+
+ http://www.archive.org/details/xtoolkitintrinsic04nyemiss
+
+ - X Series Volume 5: X Toolkit Intrinsics Reference Manual
+ (1990, covers X11R4)
+
+ http://www.archive.org/details/xtoolkitintrinsi04nyemiss
+
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+ http://lists.freedesktop.org/mailman/listinfo/xorg
+
+Please submit bug reports to the Xorg bugzilla:
+
+ https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+The master development code repository can be found at:
+
+ git://anongit.freedesktop.org/git/xorg/lib/libXt
+
+ http://cgit.freedesktop.org/xorg/lib/libXt
+
+For patch submission instructions, see:
+
+ http://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
+For more information on the git code manager, see:
+
+ http://wiki.x.org/wiki/GitPage
+
commit f56a69f2cf7df1e7cdf2494c5408786e53467374
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Fri Jan 30 18:22:10 2009 -0200
Janitor: ansification, make distcheck, compiler warnings, .gitignore.
Most "compiler" warnings were actually sparse warnings, due to
assigning a integer to a pointer, or an external symbol without
a previous declaration.
diff --git a/.gitignore b/.gitignore
index 44ff901..1a61357 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+.deps
+.libs
aclocal.m4
autom4te.cache
compile
@@ -15,6 +17,7 @@ ltmain.sh
Makefile
Makefile.in
MakeOut
+makestrs
missing
mkinstalldirs
Shell.h
@@ -23,3 +26,11 @@ StringDefs.c
StringDefs.h
xt.pc
*~
+*.1
+*.3
+*.o
+*.la
+*.lo
+libXt-*.tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index 8409cfb..1d96895 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,19 +21,16 @@
SUBDIRS = util src include man
-AM_CFLAGS = $(XT_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/include/X11 -I$(top_builddir)/include/X11
-
-
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xt.pc
-EXTRA_DIST = xt.pc.in ChangeLog autogen.sh
+EXTRA_DIST = xt.pc.in ChangeLog
MAINTAINERCLEANFILES=ChangeLog
.PHONY: ChangeLog
ChangeLog:
- (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+ $(CHANGELOG_CMD)
dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index 105e5c6..d707499 100755
--- a/configure.ac
+++ b/configure.ac
@@ -29,12 +29,16 @@ AC_INIT(libXt, 1.0.5, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
+# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.2)
AM_CONFIG_HEADER(config.h)
# Check for progs
AC_PROG_CC
AC_PROG_LIBTOOL
AM_PROG_CC_C_O
+XORG_CWARNFLAGS
if test x"$CC_FOR_BUILD" = x; then
if test x"$cross_compiling" = xyes; then
@@ -52,9 +56,9 @@ AC_CHECK_HEADER([alloca.h], AC_DEFINE(INCLUDE_ALLOCA_H, 1, [Define to 1 if Xallo
# Map function checks to old Imake #defines
AC_CHECK_FUNC(poll, AC_DEFINE(USE_POLL,1,
- [Define to 1 if you have the `poll' function.]))
+ [Define to 1 if you have the "poll" function.]))
AC_CHECK_FUNC(snprintf, AC_DEFINE(USE_SNPRINTF,1,
- [Define to 1 if you have the `snprintf' function.]))
+ [Define to 1 if you have the "snprintf" function.]))
AC_HAVE_LIBRARY(ws2_32)
@@ -112,7 +116,7 @@ case $host_os in
;;
esac
-CFLAGS="$CFLAGS $OS_CFLAGS"
+XT_CFLAGS="$CWARNFLAGS $XT_CFLAGS $OS_CFLAGS"
# Man page processing requirements
XORG_PROG_RAWCPP
@@ -123,6 +127,7 @@ XORG_MANPAGE_SECTIONS
XORG_CHECK_MALLOC_ZERO
XORG_RELEASE_VERSION
+XORG_CHANGELOG
AC_OUTPUT([Makefile
src/Makefile
diff --git a/include/.gitignore b/include/.gitignore
deleted file mode 100644
index 282522d..0000000
--- a/include/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/include/X11/.gitignore b/include/X11/.gitignore
deleted file mode 100644
index c3f163c..0000000
--- a/include/X11/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Shell.h
-StringDefs.h
diff --git a/include/X11/Composite.h b/include/X11/Composite.h
index 0a58332..c3c9828 100644
--- a/include/X11/Composite.h
+++ b/include/X11/Composite.h
@@ -97,7 +97,7 @@ extern void XtChangeManagedSet(
_XFUNCPROTOEND
-#ifndef XT_COMPOSITE
+#ifndef VMS
externalref WidgetClass compositeWidgetClass;
#endif
diff --git a/include/X11/Constraint.h b/include/X11/Constraint.h
index b8bd902..977e7ee 100644
--- a/include/X11/Constraint.h
+++ b/include/X11/Constraint.h
@@ -54,7 +54,7 @@ _XFUNCPROTOBEGIN
typedef struct _ConstraintClassRec *ConstraintWidgetClass;
-#ifndef CONSTRAINT
+#ifndef VMS
externalref WidgetClass constraintWidgetClass;
#endif
diff --git a/include/X11/Core.h b/include/X11/Core.h
index e1a7c28..5127b50 100644
--- a/include/X11/Core.h
+++ b/include/X11/Core.h
@@ -59,7 +59,7 @@ typedef struct _WidgetClassRec *CoreWidgetClass;
typedef struct _WidgetRec *CoreWidget;
externalref WidgetClass coreWidgetClass;
-#ifndef _XT_CORE_C
+#ifndef VMS
externalref WidgetClass widgetClass;
#endif
diff --git a/include/X11/Object.h b/include/X11/Object.h
index 2c84aaf..5ef65de 100644
--- a/include/X11/Object.h
+++ b/include/X11/Object.h
@@ -55,7 +55,7 @@ _XFUNCPROTOBEGIN
typedef struct _ObjectRec *Object;
typedef struct _ObjectClassRec *ObjectClass;
-#ifndef OBJECT
+#ifndef VMS
externalref WidgetClass objectClass;
#endif
diff --git a/include/X11/RectObj.h b/include/X11/RectObj.h
index dced5c3..81e43a5 100644
--- a/include/X11/RectObj.h
+++ b/include/X11/RectObj.h
@@ -55,7 +55,7 @@ _XFUNCPROTOBEGIN
typedef struct _RectObjRec *RectObj;
typedef struct _RectObjClassRec *RectObjClass;
-#ifndef RECTOBJ
+#ifndef VMS
externalref WidgetClass rectObjClass;
#endif
diff --git a/include/X11/ThreadsI.h b/include/X11/ThreadsI.h
index 28cbc98..f07fe29 100644
--- a/include/X11/ThreadsI.h
+++ b/include/X11/ThreadsI.h
@@ -115,7 +115,7 @@ _XFUNCPROTOEND
XtWidgetToApplicationContext(w) : NULL)
#define DPY_TO_APPCON(d) \
- XtAppContext app = (_XtProcessLock ? XtDisplayToApplicationContext(d): 0)
+ XtAppContext app = (_XtProcessLock ? XtDisplayToApplicationContext(d): NULL)
#else /* defined(XTHREADS) */
diff --git a/man/.gitignore b/man/.gitignore
deleted file mode 100644
index 2d0f344..0000000
--- a/man/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-Makefile.in
-*.3*
diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644
index b37a5f8..0000000
--- a/src/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-libXt.la
-*.lo
-Makefile
-Makefile.in
-StringDefs.c
diff --git a/src/Composite.c b/src/Composite.c
index 7a90975..c5fbf12 100644
--- a/src/Composite.c
+++ b/src/Composite.c
@@ -60,7 +60,6 @@ in this Software without prior written authorization from The Open Group.
*/
/* $XFree86: xc/lib/Xt/Composite.c,v 1.5 2001/08/22 22:52:17 dawes Exp $ */
-#define XT_COMPOSITE
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
@@ -71,7 +70,7 @@ static XtResource resources[] = {
{XtNchildren, XtCReadOnly, XtRWidgetList, sizeof(WidgetList),
XtOffsetOf(CompositeRec, composite.children), XtRImmediate, NULL},
{XtNnumChildren, XtCReadOnly, XtRCardinal, sizeof(Cardinal),
- XtOffsetOf(CompositeRec, composite.num_children), XtRImmediate, 0},
+ XtOffsetOf(CompositeRec, composite.num_children), XtRImmediate, NULL},
{XtNinsertPosition, XtCInsertPosition, XtRFunction, sizeof(XtOrderProc),
XtOffsetOf(CompositeRec, composite.insert_position), XtRImmediate, NULL},
};
diff --git a/src/Constraint.c b/src/Constraint.c
index dd9b523..aeb6e38 100644
--- a/src/Constraint.c
+++ b/src/Constraint.c
@@ -60,7 +60,6 @@ in this Software without prior written authorization from The Open Group.
*/
/* $XFree86: xc/lib/Xt/Constraint.c,v 1.2 2001/08/22 22:52:17 dawes Exp $ */
-#define CONSTRAINT
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
diff --git a/src/Converters.c b/src/Converters.c
index acb572e..a1f7f2b 100644
--- a/src/Converters.c
+++ b/src/Converters.c
@@ -487,12 +487,12 @@ Boolean XtCvtStringToPixel(
colormap = *((Colormap *) args[1].addr);
if (CompareISOLatin1(str, XtDefaultBackground) == 0) {
- *closure_ret = False;
+ *closure_ret = NULL;
if (pd->rv) donestr(Pixel, BlackPixelOfScreen(screen), XtRPixel)
else donestr(Pixel, WhitePixelOfScreen(screen), XtRPixel);
}
if (CompareISOLatin1(str, XtDefaultForeground) == 0) {
- *closure_ret = False;
+ *closure_ret = NULL;
if (pd->rv) donestr(Pixel, WhitePixelOfScreen(screen), XtRPixel)
else donestr(Pixel, BlackPixelOfScreen(screen), XtRPixel);
}
@@ -515,7 +515,7 @@ Boolean XtCvtStringToPixel(
XtAppWarningMsg(pd->appContext, type, "cvtStringToPixel",
XtCXtToolkitError, msg, params, &num_params);
- *closure_ret = False;
+ *closure_ret = NULL;
return False;
} else {
*closure_ret = (char*)True;
diff --git a/src/Core.c b/src/Core.c
index d30b493..24b7044 100644
--- a/src/Core.c
+++ b/src/Core.c
@@ -59,8 +59,6 @@ in this Software without prior written authorization from The Open Group.
*/
-#define _XT_CORE_C
-
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
diff --git a/src/Create.c b/src/Create.c
index d3417a1..ab98c3d 100644
--- a/src/Create.c
+++ b/src/Create.c
@@ -87,8 +87,7 @@ CallClassPartInit(WidgetClass ancestor, WidgetClass wc)
}
void
-XtInitializeWidgetClass(wc)
- WidgetClass wc;
+XtInitializeWidgetClass(WidgetClass wc)
{
XtEnum inited;
LOCK_PROCESS;
diff --git a/src/Display.c b/src/Display.c
index 2812aa8..de57a6b 100644
--- a/src/Display.c
+++ b/src/Display.c
@@ -244,7 +244,7 @@ Display *XtOpenDisplay(
String *argv)
{
Display *d;
- XrmDatabase db = 0;
+ XrmDatabase db = NULL;
XtPerDisplay pd;
String language = NULL;
@@ -357,7 +357,7 @@ XtDisplayInitialize(
)
{
XtPerDisplay pd;
- XrmDatabase db = 0;
+ XrmDatabase db = NULL;
LOCK_APP(app);
pd = InitPerDisplay(dpy, app, name, classname);
diff --git a/src/Initialize.c b/src/Initialize.c
index 84c720e..d2af1b1 100644
--- a/src/Initialize.c
+++ b/src/Initialize.c
@@ -748,7 +748,7 @@ XrmDatabase _XtPreparseCommandLine(
String *displayName,
String *language)
{
- XrmDatabase db = 0;
+ XrmDatabase db = NULL;
XrmOptionDescRec *options;
Cardinal num_options;
XrmName name_list[3];
diff --git a/src/Intrinsic.c b/src/Intrinsic.c
index a86884e..c3b6f5d 100644
--- a/src/Intrinsic.c
+++ b/src/Intrinsic.c
@@ -559,7 +559,7 @@ static Widget SearchChildren(
NameMatchProc matchproc,
int in_depth, int *out_depth, int *found_depth)
{
- Widget w1 = 0, w2;
+ Widget w1 = NULL, w2;
int d1, d2;
if (XtIsComposite(root)) {
diff --git a/src/Keyboard.c b/src/Keyboard.c
index 82bcc24..6c4a62a 100644
--- a/src/Keyboard.c
+++ b/src/Keyboard.c
@@ -737,7 +737,7 @@ static void FocusDestroyCallback(
XtPointer closure, /* Widget */
XtPointer call_data)
{
- XtSetKeyboardFocus((Widget)closure, None);
+ XtSetKeyboardFocus((Widget)closure, NULL);
}
void XtSetKeyboardFocus(
diff --git a/src/Makefile.am b/src/Makefile.am
index 5127b42..4a818ad 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,7 +6,7 @@ CLEANFILES = $(BUILT_SOURCES)
SRCH_DEFINES = -DXFILESEARCHPATHDEFAULT=\"$(XFILESEARCHPATHDEFAULT)\"
ERRORDB_DEFINES = -DERRORDB=\"$(libdir)/X11/XtErrorDB\"
-AM_CFLAGS = $(XT_CFLAGS) $(X11_CFLAGS) $(SRCH_DEFINES) $(ERRORDB_DEFINES) \
+AM_CFLAGS = $(XT_CFLAGS) $(SRCH_DEFINES) $(ERRORDB_DEFINES) \
$(XTMALLOC_ZERO_CFLAGS)
INCLUDES = -I$(top_srcdir)/include/ -I$(top_srcdir)/include/X11 \
diff --git a/src/NextEvent.c b/src/NextEvent.c
index bcc00d5..c696af3 100644
--- a/src/NextEvent.c
+++ b/src/NextEvent.c
@@ -579,6 +579,7 @@ int _XtWaitForSomething(
#ifdef USE_POLL
wf.fdlist = NULL;
wf.stack = fdlist;
+ wf.fdlistlen = wf.num_dpys = 0;
#endif
WaitLoop:
@@ -1438,7 +1439,7 @@ XtInputMask XtAppPending(
X_GETTIMEOFDAY (&cur_time);
FIXUP_TIMEVAL(cur_time);
if ((IS_AT_OR_AFTER(app->timerQueue->te_timer_value, cur_time)) &&
- (app->timerQueue->te_proc != 0)) {
+ (app->timerQueue->te_proc != NULL)) {
ret |= XtIMTimer;
}
}
diff --git a/src/Object.c b/src/Object.c
index f762a25..777fd68 100644
--- a/src/Object.c
+++ b/src/Object.c
@@ -60,7 +60,6 @@ in this Software without prior written authorization from The Open Group.
*/
/* $XFree86: xc/lib/Xt/Object.c,v 1.5 2001/01/17 19:43:06 dawes Exp $ */
-#define OBJECT
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
diff --git a/src/RectObj.c b/src/RectObj.c
index 07bbd1f..0835d5b 100644
--- a/src/RectObj.c
+++ b/src/RectObj.c
@@ -48,7 +48,6 @@ SOFTWARE.
******************************************************************/
/* $XFree86: xc/lib/Xt/RectObj.c,v 1.2 2001/08/22 22:52:19 dawes Exp $ */
-#define RECTOBJ
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
diff --git a/src/ResConfig.c b/src/ResConfig.c
index 4c2e736..fd6d057 100644
--- a/src/ResConfig.c
+++ b/src/ResConfig.c
@@ -661,6 +661,7 @@ _get_last_part (
*part = XtNewString (loose);
return ('*');
}
+ *part = NULL;
return ('0'); /* error - return 0 */
}
diff --git a/src/Selection.c b/src/Selection.c
index 46c75f8..aea4914 100644
--- a/src/Selection.c
+++ b/src/Selection.c
@@ -1011,10 +1011,10 @@ Boolean XtOwnSelectionIncremental(
}
-void XtDisownSelection(widget, selection, time)
- Widget widget;
- Atom selection;
- Time time;
+void XtDisownSelection(
+ Widget widget,
+ Atom selection,
+ Time time)
{
Select ctx;
WIDGET_TO_APPCON(widget);
@@ -1972,7 +1972,7 @@ static void CleanupRequest(
}
}
-extern void XtCreateSelectionRequest(
+void XtCreateSelectionRequest(
Widget widget,
Atom selection)
{
@@ -1988,7 +1988,7 @@ extern void XtCreateSelectionRequest(
(void) XFindContext(dpy, window, multipleContext, (XPointer*) &queueInfo);
/* If there is one, then cancel it */
- if (queueInfo != 0)
+ if (queueInfo != NULL)
CleanupRequest(dpy, queueInfo, selection);
else {
/* Create it */
@@ -2013,7 +2013,7 @@ extern void XtCreateSelectionRequest(
UNLOCK_PROCESS;
}
-extern void XtSendSelectionRequest(
+void XtSendSelectionRequest(
Widget widget,
Atom selection,
Time time)
@@ -2098,7 +2098,7 @@ extern void XtSendSelectionRequest(
UNLOCK_PROCESS;
}
-extern void XtCancelSelectionRequest(
+void XtCancelSelectionRequest(
Widget widget,
Atom selection)
{
@@ -2112,7 +2112,7 @@ extern void XtCancelSelectionRequest(
queueInfo = NULL;
(void) XFindContext(dpy, window, multipleContext, (XPointer*) &queueInfo);
/* If there is one, then cancel it */
- if (queueInfo != 0)
+ if (queueInfo != NULL)
CleanupRequest(dpy, queueInfo, selection);
UNLOCK_PROCESS;
}
diff --git a/src/SetValues.c b/src/SetValues.c
index d9e8a46..8695ede 100644
--- a/src/SetValues.c
+++ b/src/SetValues.c
@@ -194,7 +194,7 @@ void XtSetValues(
XtGeometryResult result;
XtWidgetGeometry geoReq, geoReply;
WidgetClass wc;
- ConstraintWidgetClass cwc = 0;
+ ConstraintWidgetClass cwc = NULL;
Boolean hasConstraints;
XtAlmostProc set_values_almost;
XtAppContext app = XtWidgetToApplicationContext(w);
diff --git a/src/Shell.c b/src/Shell.c
index b3e57b8..292777b 100644
--- a/src/Shell.c
+++ b/src/Shell.c
@@ -60,8 +60,6 @@ in this Software without prior written authorization from The Open Group.
*/
-#define SHELL
-
#ifndef DEFAULT_WM_TIMEOUT
#define DEFAULT_WM_TIMEOUT 5000
#endif
@@ -152,7 +150,7 @@ static XtResource shellResources[]=
XtRBoolean, sizeof(Boolean), Offset(shell.override_redirect),
XtRImmediate, (XtPointer)False},
{ XtNvisual, XtCVisual, XtRVisual, sizeof(Visual*),
- Offset(shell.visual), XtRImmediate, CopyFromParent}
+ Offset(shell.visual), XtRImmediate, (XtPointer)CopyFromParent}
};
static void ClassPartInitialize(WidgetClass);
diff --git a/src/TMparse.c b/src/TMparse.c
index 25522fb..43ee8c9 100644
--- a/src/TMparse.c
+++ b/src/TMparse.c
@@ -1533,7 +1533,7 @@ static String ParseEventSeq(
while ( *str != '\0' && !IsNewline(*str)) {
static Event nullEvent =
- {0, 0,0L, 0, 0L, 0L,_XtRegularMatch,FALSE};
+ {0, 0,NULL, 0, 0L, 0L,_XtRegularMatch,FALSE};
EventPtr event;
ScanWhitespace(str);
@@ -1836,6 +1836,7 @@ static String ParseTranslationTableProduction(
ActionPtr *actionsP;
String production = str;
+ actionsP = NULL;
str = ParseEventSeq(str, &eventSeq, &actionsP,error);
if (*error == TRUE) {
ShowProduction(production);
diff --git a/util/.gitignore b/util/.gitignore
deleted file mode 100644
index 11e8923..0000000
--- a/util/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-makestrs
-makestrs.1
-makestrs.1x
-*.o
commit c1f227f94aec6f4555182965fc0d2d8f33fef01f
Author: Peter Breitenlohner <peb@mppmu.mpg.de>
Date: Mon Oct 20 18:50:37 2008 -0700
X.Org Bug 17942: libXt manpage formatting
<http://bugs.freedesktop.org/show_bug.cgi?id=17942>
diff --git a/man/XtResolvePathname.man b/man/XtResolvePathname.man
index 9d89c9f..d1bed41 100644
--- a/man/XtResolvePathname.man
+++ b/man/XtResolvePathname.man
@@ -215,7 +215,7 @@ which contains at least 6 entries. These entries
must contain the following substitutions:
.nf
-.ta .3i 2i 2.5i
+.ta 3n 23n 27n
1. %C, %N, %S, %T, %L or %C, %N, %S, %T, %l, %t, %c
2. %C, %N, %S, %T, %l
3. %C, %N, %S, %T
diff --git a/util/makestrs.man b/util/makestrs.man
index 6bb4661..bb91839 100644
--- a/util/makestrs.man
+++ b/util/makestrs.man
@@ -40,16 +40,16 @@ If
is not specified
.I makestrs
will read from
-.I stdin.
+.IR stdin .
The C source file is always written to
-.I stdout.
+.IR stdout .
.I makestrs
creates one or more C header files as specified in the source file.
The following options may be specified:
-.I -sparcabi,
-.I -intelabi,
-.I -functionabi,
-.I -arrayperabi,
+.IR -sparcabi ,
+.IR -intelabi ,
+.IR -functionabi ,
+.IR -arrayperabi ,
and
.I -defaultabi.
.LP
commit f488a6a218da6b543d1495e607ff1b31b0b48900
Author: Daniel Stone <daniel@fooishbar.org>
Date: Tue Sep 23 19:14:09 2008 +0300
configure.ac: Minor thinko
diff --git a/configure.ac b/configure.ac
index c576e98..105e5c6 100755
--- a/configure.ac
+++ b/configure.ac
@@ -37,7 +37,7 @@ AC_PROG_LIBTOOL
AM_PROG_CC_C_O
if test x"$CC_FOR_BUILD" = x; then
- test x"$cross_compiling" = xyes; then
+ if test x"$cross_compiling" = xyes; then
AC_CHECK_PROGS(CC_FOR_BUILD, gcc cc)
else
CC_FOR_BUILD="$CC"
commit 36e9f0d351afbf7fd2595990b2d39e7c551f6420
Author: John Tapsell <johnflux@gmail.com>
Date: Tue Sep 23 19:00:42 2008 +0300
configure.ac: Use native compiler for build tools
makestrs is used during the build, so use the native compiler (either
gcc or cc in $PATH, can be overridden as $CC_FOR_BUILD) instead of the
(possibly cross-) compiler.
diff --git a/configure.ac b/configure.ac
index 426e178..c576e98 100755
--- a/configure.ac
+++ b/configure.ac
@@ -36,6 +36,15 @@ AC_PROG_CC
AC_PROG_LIBTOOL
AM_PROG_CC_C_O
+if test x"$CC_FOR_BUILD" = x; then
+ test x"$cross_compiling" = xyes; then
+ AC_CHECK_PROGS(CC_FOR_BUILD, gcc cc)
+ else
+ CC_FOR_BUILD="$CC"
+ fi
+fi
+AC_SUBST([CC_FOR_BUILD])
+
PKG_CHECK_MODULES(XT, sm x11 xproto kbproto)
# Needed for including Xalloca.h
diff --git a/util/Makefile.am b/util/Makefile.am
index 2c13f0b..0d3ff01 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -4,6 +4,8 @@ else
noinst_PROGRAMS = makestrs
endif
+CC = @CC_FOR_BUILD@
+
EXTRA_DIST = \
Shell.ht \
StrDefs.ct \
commit ace1676b0630dfe739c3bd712ed2b6e46bdb52f1
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Jun 23 20:04:29 2008 -0700
Update ac_define_dir.m4 to 2008-04-12 version
diff --git a/acinclude.m4 b/acinclude.m4
Reply to: