summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore11
-rw-r--r--Makefile.am7
-rwxr-xr-xconfigure.ac11
-rw-r--r--include/.gitignore2
-rw-r--r--include/X11/.gitignore2
-rw-r--r--include/X11/Composite.h2
-rw-r--r--include/X11/Constraint.h2
-rw-r--r--include/X11/Core.h2
-rw-r--r--include/X11/Object.h2
-rw-r--r--include/X11/RectObj.h2
-rw-r--r--include/X11/ThreadsI.h2
-rw-r--r--man/.gitignore3
-rw-r--r--src/.gitignore7
-rw-r--r--src/Composite.c3
-rw-r--r--src/Constraint.c1
-rw-r--r--src/Converters.c6
-rw-r--r--src/Core.c2
-rw-r--r--src/Create.c3
-rw-r--r--src/Display.c4
-rw-r--r--src/Initialize.c2
-rw-r--r--src/Intrinsic.c2
-rw-r--r--src/Keyboard.c2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/NextEvent.c3
-rw-r--r--src/Object.c1
-rw-r--r--src/RectObj.c1
-rw-r--r--src/ResConfig.c1
-rw-r--r--src/Selection.c18
-rw-r--r--src/SetValues.c2
-rw-r--r--src/Shell.c4
-rw-r--r--src/TMparse.c3
-rw-r--r--util/.gitignore8
32 files changed, 54 insertions, 69 deletions
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