aboutsummaryrefslogtreecommitdiff
path: root/libXt/src
diff options
context:
space:
mode:
Diffstat (limited to 'libXt/src')
-rw-r--r--libXt/src/ActionHook.c5
-rw-r--r--libXt/src/Alloc.c44
-rw-r--r--libXt/src/ArgList.c2
-rw-r--r--libXt/src/Callback.c5
-rw-r--r--libXt/src/ClickTime.c4
-rw-r--r--libXt/src/Composite.c5
-rw-r--r--libXt/src/Constraint.c5
-rw-r--r--libXt/src/Convert.c5
-rw-r--r--libXt/src/Converters.c7
-rw-r--r--libXt/src/Core.c4
-rw-r--r--libXt/src/Create.c5
-rw-r--r--libXt/src/Destroy.c5
-rw-r--r--libXt/src/Display.c5
-rw-r--r--libXt/src/Error.c23
-rw-r--r--libXt/src/Event.c5
-rw-r--r--libXt/src/EventUtil.c4
-rw-r--r--libXt/src/Functions.c4
-rw-r--r--libXt/src/GCManager.c5
-rw-r--r--libXt/src/Geometry.c5
-rw-r--r--libXt/src/GetActKey.c4
-rw-r--r--libXt/src/GetResList.c5
-rw-r--r--libXt/src/GetValues.c4
-rw-r--r--libXt/src/HookObj.c3
-rw-r--r--libXt/src/Hooks.c3
-rw-r--r--libXt/src/Initialize.c30
-rw-r--r--libXt/src/Intrinsic.c5
-rw-r--r--libXt/src/Keyboard.c30
-rw-r--r--libXt/src/Makefile.am12
-rw-r--r--libXt/src/Makefile.in731
-rw-r--r--libXt/src/Manage.c5
-rw-r--r--libXt/src/NextEvent.c5
-rw-r--r--libXt/src/Object.c5
-rw-r--r--libXt/src/PassivGrab.c4
-rw-r--r--libXt/src/Pointer.c2
-rw-r--r--libXt/src/Popup.c3
-rw-r--r--libXt/src/PopupCB.c2
-rw-r--r--libXt/src/RectObj.c3
-rw-r--r--libXt/src/ResConfig.c44
-rw-r--r--libXt/src/Resources.c101
-rw-r--r--libXt/src/Selection.c12
-rw-r--r--libXt/src/SetSens.c5
-rw-r--r--libXt/src/SetValues.c5
-rw-r--r--libXt/src/SetWMCW.c5
-rw-r--r--libXt/src/Shell.c14
-rw-r--r--libXt/src/TMaction.c12
-rw-r--r--libXt/src/TMgrab.c5
-rw-r--r--libXt/src/TMkey.c4
-rw-r--r--libXt/src/TMparse.c5
-rw-r--r--libXt/src/TMprint.c15
-rw-r--r--libXt/src/TMstate.c5
-rw-r--r--libXt/src/Threads.c5
-rw-r--r--libXt/src/VarCreate.c5
-rw-r--r--libXt/src/VarGet.c4
-rw-r--r--libXt/src/Varargs.c8
-rw-r--r--libXt/src/Vendor.c3
-rw-r--r--libXt/src/sharedlib.c3
56 files changed, 157 insertions, 1106 deletions
diff --git a/libXt/src/ActionHook.c b/libXt/src/ActionHook.c
index 4e02ca7c6..efa898ed0 100644
--- a/libXt/src/ActionHook.c
+++ b/libXt/src/ActionHook.c
@@ -1,9 +1,7 @@
-/* $Xorg: ActionHook.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */
-
/*LINTLIBRARY*/
/***********************************************************
-Copyright 1993 Sun Microsystems, Inc. All rights reserved.
+Copyright (c) 1993, 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"),
@@ -71,7 +69,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/Xt/ActionHook.c,v 1.2 2001/08/22 22:52:17 dawes Exp $ */
/*
* Contains XtAppAddActionHook, XtRemoveActionHook
diff --git a/libXt/src/Alloc.c b/libXt/src/Alloc.c
index 871396e02..be643a822 100644
--- a/libXt/src/Alloc.c
+++ b/libXt/src/Alloc.c
@@ -1,7 +1,5 @@
-/* $Xorg: Alloc.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */
-
/***********************************************************
-Copyright 1993 Sun Microsystems, Inc. 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"),
@@ -69,7 +67,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/Xt/Alloc.c,v 1.9 2001/12/14 19:56:07 dawes Exp $ */
/*
* X Toolkit Memory Allocation Routines
@@ -85,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))
@@ -124,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(
diff --git a/libXt/src/ArgList.c b/libXt/src/ArgList.c
index 622f31351..a88341c38 100644
--- a/libXt/src/ArgList.c
+++ b/libXt/src/ArgList.c
@@ -1,5 +1,3 @@
-/* $Xorg: ArgList.c,v 1.4 2001/02/09 02:03:53 xorgcvs Exp $ */
-
/***********************************************************
Copyright 1987, 1988, 1998 The Open Group
diff --git a/libXt/src/Callback.c b/libXt/src/Callback.c
index feb431818..a1231ecae 100644
--- a/libXt/src/Callback.c
+++ b/libXt/src/Callback.c
@@ -1,7 +1,5 @@
-/* $Xorg: Callback.c,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */
-
/***********************************************************
-Copyright 1993 Sun Microsystems, Inc. All rights reserved.
+Copyright (c) 1993, 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"),
@@ -69,7 +67,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/Xt/Callback.c,v 1.8 2001/12/14 19:56:08 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libXt/src/ClickTime.c b/libXt/src/ClickTime.c
index 25f17a621..7a836cc3d 100644
--- a/libXt/src/ClickTime.c
+++ b/libXt/src/ClickTime.c
@@ -1,7 +1,5 @@
-/* $Xorg: ClickTime.c,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */
-
/***********************************************************
-Copyright 1993 Sun Microsystems, Inc. All rights reserved.
+Copyright (c) 1993, 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"),
diff --git a/libXt/src/Composite.c b/libXt/src/Composite.c
index 24cf0a1b9..29893d820 100644
--- a/libXt/src/Composite.c
+++ b/libXt/src/Composite.c
@@ -1,7 +1,5 @@
-/* $Xorg: Composite.c,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */
-
/***********************************************************
-Copyright 1993 Sun Microsystems, Inc. All rights reserved.
+Copyright (c) 1993, 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"),
@@ -69,7 +67,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
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 $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libXt/src/Constraint.c b/libXt/src/Constraint.c
index 79bc41a3c..92b61b6ed 100644
--- a/libXt/src/Constraint.c
+++ b/libXt/src/Constraint.c
@@ -1,7 +1,5 @@
-/* $Xorg: Constraint.c,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */
-
/***********************************************************
-Copyright 1993 Sun Microsystems, Inc. All rights reserved.
+Copyright (c) 1993, 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"),
@@ -69,7 +67,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
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 $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libXt/src/Convert.c b/libXt/src/Convert.c
index f3017d757..cea8fd3ed 100644
--- a/libXt/src/Convert.c
+++ b/libXt/src/Convert.c
@@ -1,7 +1,5 @@
-/* $Xorg: Convert.c,v 1.5 2001/02/09 02:03:54 xorgcvs Exp $ */
-
/***********************************************************
-Copyright 1993 Sun Microsystems, Inc. All rights reserved.
+Copyright (c) 1993, 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"),
@@ -43,7 +41,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/lib/Xt/Convert.c,v 3.7 2001/12/14 19:56:09 dawes Exp $ */
/*
diff --git a/libXt/src/Converters.c b/libXt/src/Converters.c
index 45777bda1..6574ce05b 100644
--- a/libXt/src/Converters.c
+++ b/libXt/src/Converters.c
@@ -1,7 +1,5 @@
-/* $Xorg: Converters.c,v 1.5 2001/02/09 02:03:54 xorgcvs Exp $ */
-
/***********************************************************
-Copyright 1993 Sun Microsystems, Inc. All rights reserved.
+Copyright (c) 1993, 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"),
@@ -43,7 +41,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/lib/Xt/Converters.c,v 3.14tsi Exp $ */
/*
@@ -1363,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
diff --git a/libXt/src/Core.c b/libXt/src/Core.c
index 8a1ca7f82..d61f43e02 100644
--- a/libXt/src/Core.c
+++ b/libXt/src/Core.c
@@ -1,7 +1,5 @@
-/* $Xorg: Core.c,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */
-
/***********************************************************
-Copyright 1993 Sun Microsystems, Inc. All rights reserved.
+Copyright (c) 1993, 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"),
diff --git a/libXt/src/Create.c b/libXt/src/Create.c
index 7db4a23ce..da0019231 100644
--- a/libXt/src/Create.c
+++ b/libXt/src/Create.c
@@ -1,7 +1,5 @@
-/* $Xorg: Create.c,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */
-
/***********************************************************
-Copyright 1993 Sun Microsystems, Inc. All rights reserved.
+Copyright (c) 1993, 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"),
@@ -43,7 +41,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/lib/Xt/Create.c,v 3.10 2002/12/17 04:50:58 dawes Exp $ */
/*
diff --git a/libXt/src/Destroy.c b/libXt/src/Destroy.c
index 0beacbf38..e952bccc5 100644
--- a/libXt/src/Destroy.c
+++ b/libXt/src/Destroy.c
@@ -1,7 +1,5 @@
-/* $Xorg: Destroy.c,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */
-
/***********************************************************
-Copyright 1993 Sun Microsystems, Inc. All rights reserved.
+Copyright (c) 1993, 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"),
@@ -69,7 +67,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/Xt/Destroy.c,v 1.2 2001/08/22 22:52:18 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libXt/src/Display.c b/libXt/src/Display.c
index 1e444f89c..4ccf079ce 100644
--- a/libXt/src/Display.c
+++ b/libXt/src/Display.c
@@ -1,7 +1,5 @@
-/* $Xorg: Display.c,v 1.6 2001/02/09 02:03:54 xorgcvs Exp $ */
-
/***********************************************************
-Copyright 1993 Sun Microsystems, Inc. All rights reserved.
+Copyright (c) 1993, 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"),
@@ -43,7 +41,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/lib/Xt/Display.c,v 3.15 2002/09/18 01:25:01 dawes Exp $ */
/*
diff --git a/libXt/src/Error.c b/libXt/src/Error.c
index 7a6cedfe4..fc9b11a84 100644
--- a/libXt/src/Error.c
+++ b/libXt/src/Error.c
@@ -1,7 +1,5 @@
-/* $Xorg: Error.c,v 1.5 2001/02/09 02:03:54 xorgcvs Exp $ */
-
/***********************************************************
-Copyright 1993 Sun Microsystems, Inc. All rights reserved.
+Copyright (c) 1993, 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"),
@@ -43,7 +41,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/lib/Xt/Error.c,v 3.13tsi Exp $ */
/*
@@ -236,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);
@@ -305,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 {
diff --git a/libXt/src/Event.c b/libXt/src/Event.c
index 0bad788f6..7be598787 100644
--- a/libXt/src/Event.c
+++ b/libXt/src/Event.c
@@ -1,7 +1,5 @@
-/* $Xorg: Event.c,v 1.5 2001/02/09 02:03:54 xorgcvs Exp $ */
-
/***********************************************************
-Copyright 1993 Sun Microsystems, Inc. All rights reserved.
+Copyright (c) 1993, 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"),
@@ -69,7 +67,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/Xt/Event.c,v 3.10 2001/12/14 19:56:11 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libXt/src/EventUtil.c b/libXt/src/EventUtil.c
index 29ae3f370..91ad31fae 100644
--- a/libXt/src/EventUtil.c
+++ b/libXt/src/EventUtil.c
@@ -1,7 +1,6 @@
-/* $Xorg: EventUtil.c,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */
/*
-Copyright 1993 Sun Microsystems, Inc. All rights reserved.
+Copyright (c) 1993, 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"),
@@ -72,7 +71,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/Xt/EventUtil.c,v 1.6 2001/12/14 19:56:13 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libXt/src/Functions.c b/libXt/src/Functions.c
index 4be27203a..9937a50ab 100644
--- a/libXt/src/Functions.c
+++ b/libXt/src/Functions.c
@@ -1,8 +1,6 @@
-/* $Xorg: Functions.c,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */
-
/*
-Copyright 1993 Sun Microsystems, Inc. All rights reserved.
+Copyright (c) 1993, 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"),
diff --git a/libXt/src/GCManager.c b/libXt/src/GCManager.c
index 5870459c6..ba3d9c492 100644
--- a/libXt/src/GCManager.c
+++ b/libXt/src/GCManager.c
@@ -1,7 +1,5 @@
-/* $Xorg: GCManager.c,v 1.5 2001/02/09 02:03:54 xorgcvs Exp $ */
-
/***********************************************************
-Copyright 1993 Sun Microsystems, Inc. All rights reserved.
+Copyright (c) 1993, 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"),
@@ -69,7 +67,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/Xt/GCManager.c,v 1.5 2001/08/22 22:52:18 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libXt/src/Geometry.c b/libXt/src/Geometry.c
index e725be8ef..d64c8e292 100644
--- a/libXt/src/Geometry.c
+++ b/libXt/src/Geometry.c
@@ -1,7 +1,5 @@
-/* $Xorg: Geometry.c,v 1.5 2001/02/09 02:03:54 xorgcvs Exp $ */
-
/***********************************************************
-Copyright 1993 Sun Microsystems, Inc. All rights reserved.
+Copyright (c) 1993, 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"),
@@ -69,7 +67,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/Xt/Geometry.c,v 1.12 2001/12/14 19:56:15 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libXt/src/GetActKey.c b/libXt/src/GetActKey.c
index b3baf53d4..cf1278ebb 100644
--- a/libXt/src/GetActKey.c
+++ b/libXt/src/GetActKey.c
@@ -1,9 +1,7 @@
-/* $Xorg: GetActKey.c,v 1.4 2001/02/09 02:03:55 xorgcvs Exp $ */
-
/*LINTLIBRARY*/
/***********************************************************
-Copyright 1993 Sun Microsystems, Inc. All rights reserved.
+Copyright (c) 1993, 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"),
diff --git a/libXt/src/GetResList.c b/libXt/src/GetResList.c
index fafcbd5a1..c22725c11 100644
--- a/libXt/src/GetResList.c
+++ b/libXt/src/GetResList.c
@@ -1,7 +1,5 @@
-/* $Xorg: GetResList.c,v 1.4 2001/02/09 02:03:55 xorgcvs Exp $ */
-
/***********************************************************
-Copyright 1993 Sun Microsystems, Inc. All rights reserved.
+Copyright (c) 1993, 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"),
@@ -43,7 +41,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/lib/Xt/GetResList.c,v 3.5 2001/08/22 22:52:18 dawes Exp $ */
/*
diff --git a/libXt/src/GetValues.c b/libXt/src/GetValues.c
index df85b8c6b..511b8d807 100644
--- a/libXt/src/GetValues.c
+++ b/libXt/src/GetValues.c
@@ -1,8 +1,7 @@
-/* $Xorg: GetValues.c,v 1.4 2001/02/09 02:03:55 xorgcvs Exp $ */
/*LINTLIBRARY*/
/***********************************************************
-Copyright 1993 Sun Microsystems, Inc. All rights reserved.
+Copyright (c) 1993, 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"),
@@ -70,7 +69,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/Xt/GetValues.c,v 1.2 2001/08/22 22:52:18 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libXt/src/HookObj.c b/libXt/src/HookObj.c
index f4ac749b2..8aefa53ac 100644
--- a/libXt/src/HookObj.c
+++ b/libXt/src/HookObj.c
@@ -1,5 +1,3 @@
-/* $Xorg: HookObj.c,v 1.4 2001/02/09 02:03:55 xorgcvs Exp $ */
-
/*
Copyright 1994, 1998 The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/Xt/HookObj.c,v 1.2 2001/08/22 22:52:18 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libXt/src/Hooks.c b/libXt/src/Hooks.c
index 05b67ce05..bf26a13e0 100644
--- a/libXt/src/Hooks.c
+++ b/libXt/src/Hooks.c
@@ -1,5 +1,3 @@
-/* $Xorg: Hooks.c,v 1.4 2001/02/09 02:03:55 xorgcvs Exp $ */
-
/*
Copyright 1994, 1998 The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/Xt/Hooks.c,v 1.3 2001/12/14 19:56:18 dawes Exp $ */
/*LINTLIBRARY*/
diff --git a/libXt/src/Initialize.c b/libXt/src/Initialize.c
index 27e3d8441..e9543dab1 100644
--- a/libXt/src/Initialize.c
+++ b/libXt/src/Initialize.c
@@ -1,7 +1,5 @@
-/* $Xorg: Initialize.c,v 1.8 2001/02/09 02:03:55 xorgcvs Exp $ */
-
/***********************************************************
-Copyright 1993 Sun Microsystems, Inc. All rights reserved.
+Copyright (c) 1993, 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"),
@@ -43,7 +41,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/lib/Xt/Initialize.c,v 3.21 2003/04/21 16:34:27 herrb Exp $ */
/*
@@ -383,7 +380,7 @@ static void CombineAppUserDefaults(
XrmDatabase *pdb)
{
char* filename;
- char* path;
+ char* path = NULL;
Boolean deallocate = False;
if (!(path = getenv("XUSERFILESEARCHPATH"))) {
@@ -392,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
@@ -417,7 +408,8 @@ static void CombineAppUserDefaults(
XtFree(filename);
}
- if (deallocate) DEALLOCATE_LOCAL(path);
+ if (deallocate)
+ XtFree(path);
}
static void CombineUserDefaults(
diff --git a/libXt/src/Intrinsic.c b/libXt/src/Intrinsic.c
index 77402ce8e..684bda252 100644
--- a/libXt/src/Intrinsic.c
+++ b/libXt/src/Intrinsic.c
@@ -1,7 +1,5 @@
-/* $Xorg: Intrinsic.c,v 1.4 2001/02/09 02:03:55 xorgcvs Exp $ */
-
/***********************************************************
-Copyright 1993 Sun Microsystems, Inc. All rights reserved.
+Copyright (c) 1993, 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"),
@@ -43,7 +41,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/lib/Xt/Intrinsic.c,v 3.22 2003/01/12 03:55:46 tsi Exp $ */
/*
diff --git a/libXt/src/Keyboard.c b/libXt/src/Keyboard.c
index c3c5b2732..c8ba863ba 100644
--- a/libXt/src/Keyboard.c
+++ b/libXt/src/Keyboard.c
@@ -1,7 +1,6 @@
-/* $Xorg: Keyboard.c,v 1.5 2001/02/09 02:03:55 xorgcvs Exp $ */
/*
-Copyright 1993 Sun Microsystems, Inc. All rights reserved.
+Copyright (c) 1993, 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"),
@@ -72,7 +71,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/Xt/Keyboard.c,v 3.3 2001/08/22 22:52:19 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
@@ -729,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;
}
diff --git a/libXt/src/Makefile.am b/libXt/src/Makefile.am
index a43fb2283..2b39ec541 100644
--- a/libXt/src/Makefile.am
+++ b/libXt/src/Makefile.am
@@ -97,9 +97,9 @@ all-local: $(BUILT_FILES)
$(BUILT_HEADER): $(BUILT_SOURCE)
$(BUILT_SOURCE):
- $(top_builddir)/util/makestrs -i $(top_srcdir) $(STRINGSABIOPTIONS) < $(STRING_LIST) > StringDefs.c
- mkdir -p $(top_builddir)/src
- mkdir -p $(top_builddir)/include/X11
- cp StringDefs.h $(top_builddir)/include/X11
- cp Shell.h $(top_builddir)/include/X11
- rm StringDefs.h Shell.h
+ $(AM_V_GEN)$(top_builddir)/util/makestrs -i $(top_srcdir) $(STRINGSABIOPTIONS) < $(STRING_LIST) > StringDefs.c
+ $(AM_V_at)mkdir -p $(top_builddir)/src
+ $(AM_V_at)mkdir -p $(top_builddir)/include/X11
+ $(AM_V_at)cp StringDefs.h $(top_builddir)/include/X11
+ $(AM_V_at)cp Shell.h $(top_builddir)/include/X11
+ $(AM_V_at)rm StringDefs.h Shell.h
diff --git a/libXt/src/Makefile.in b/libXt/src/Makefile.in
deleted file mode 100644
index 8196d5ba9..000000000
--- a/libXt/src/Makefile.in
+++ /dev/null
@@ -1,731 +0,0 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
-# This Makefile.in 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.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = src
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
- $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
- for p in $$list; do echo "$$p $$p"; done | \
- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
- $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
- if (++n[$$2] == $(am__install_max)) \
- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
- END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(libdir)"
-LTLIBRARIES = $(lib_LTLIBRARIES)
-libXt_la_DEPENDENCIES =
-am_libXt_la_OBJECTS = ActionHook.lo Alloc.lo ArgList.lo Callback.lo \
- ClickTime.lo Composite.lo Constraint.lo Convert.lo \
- Converters.lo Core.lo Create.lo Destroy.lo Display.lo Error.lo \
- Event.lo EventUtil.lo Functions.lo GCManager.lo Geometry.lo \
- GetActKey.lo GetResList.lo GetValues.lo HookObj.lo Hooks.lo \
- Initialize.lo Intrinsic.lo Keyboard.lo Manage.lo NextEvent.lo \
- Object.lo PassivGrab.lo Pointer.lo Popup.lo PopupCB.lo \
- RectObj.lo ResConfig.lo Resources.lo Selection.lo SetSens.lo \
- SetValues.lo SetWMCW.lo Shell.lo TMaction.lo TMgrab.lo \
- TMkey.lo TMparse.lo TMprint.lo TMstate.lo Threads.lo \
- VarCreate.lo VarGet.lo Varargs.lo Vendor.lo sharedlib.lo
-nodist_libXt_la_OBJECTS = StringDefs.lo
-libXt_la_OBJECTS = $(am_libXt_la_OBJECTS) $(nodist_libXt_la_OBJECTS)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
-am__v_lt_0 = --silent
-libXt_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(libXt_la_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo " CC " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CCLD_0 = @echo " CCLD " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo " GEN " $@;
-SOURCES = $(libXt_la_SOURCES) $(nodist_libXt_la_SOURCES)
-DIST_SOURCES = $(libXt_la_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
-ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-APP_MAN_DIR = @APP_MAN_DIR@
-APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CC_FOR_BUILD = @CC_FOR_BUILD@
-CFLAGS = @CFLAGS@
-CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
-CHANGELOG_CMD = @CHANGELOG_CMD@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CWARNFLAGS = @CWARNFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
-DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-FILE_MAN_DIR = @FILE_MAN_DIR@
-FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_CMD = @INSTALL_CMD@
-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@
-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@
-MAKEINFO = @MAKEINFO@
-MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
-MISC_MAN_DIR = @MISC_MAN_DIR@
-MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-RANLIB = @RANLIB@
-RAWCPP = @RAWCPP@
-RAWCPPFLAGS = @RAWCPPFLAGS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRINGSABIOPTIONS = @STRINGSABIOPTIONS@
-STRIP = @STRIP@
-VERSION = @VERSION@
-XFILESEARCHPATHDEFAULT = @XFILESEARCHPATHDEFAULT@
-XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
-XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
-XT_CFLAGS = @XT_CFLAGS@
-XT_LIBS = @XT_LIBS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-appdefaultdir = @appdefaultdir@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-lib_LTLIBRARIES = libXt.la
-BUILT_SOURCES = $(BUILT_FILES)
-CLEANFILES = $(BUILT_SOURCES)
-SRCH_DEFINES = -DXFILESEARCHPATHDEFAULT=\"$(XFILESEARCHPATHDEFAULT)\"
-ERRORDB_DEFINES = -DERRORDB=\"$(libdir)/X11/XtErrorDB\"
-AM_CFLAGS = $(CWARNFLAGS) $(XT_CFLAGS) $(SRCH_DEFINES) $(ERRORDB_DEFINES) \
- $(XTMALLOC_ZERO_CFLAGS)
-
-INCLUDES = -I$(top_srcdir)/include/ -I$(top_srcdir)/include/X11 \
- -I$(top_builddir)/include -I$(top_builddir)/include/X11
-
-nodist_libXt_la_SOURCES = StringDefs.c
-libXt_la_SOURCES = \
- ActionHook.c \
- Alloc.c \
- ArgList.c \
- Callback.c \
- ClickTime.c \
- Composite.c \
- Constraint.c \
- Convert.c \
- Converters.c \
- Core.c \
- Create.c \
- Destroy.c \
- Display.c \
- Error.c \
- Event.c \
- EventUtil.c \
- Functions.c \
- GCManager.c \
- Geometry.c \
- GetActKey.c \
- GetResList.c \
- GetValues.c \
- HookObj.c \
- Hooks.c \
- Initialize.c \
- Intrinsic.c \
- Keyboard.c \
- Manage.c \
- NextEvent.c \
- Object.c \
- PassivGrab.c \
- Pointer.c \
- Popup.c \
- PopupCB.c \
- RectObj.c \
- ResConfig.c \
- Resources.c \
- Selection.c \
- SetSens.c \
- SetValues.c \
- SetWMCW.c \
- Shell.c \
- TMaction.c \
- TMgrab.c \
- TMkey.c \
- TMparse.c \
- TMprint.c \
- TMstate.c \
- Threads.c \
- VarCreate.c \
- VarGet.c \
- Varargs.c \
- Vendor.c \
- sharedlib.c
-
-DISTCLEANFILES = StringDefs.c
-libXt_la_LIBADD = @XT_LIBS@
-libXt_la_LDFLAGS = -version-number 6:0:0 -no-undefined
-
-#
-# The util directory contains a program that builds some of the sources.
-# The input to this program is given in files. Unfortunately those input
-# files refers to things like
-#
-# util/foo
-#
-# so the generating program must be run from the top directory.
-#
-BUILT_SOURCE = StringDefs.c
-BUILT_HEADER = $(top_builddir)/include/X11/StringDefs.h $(top_builddir)/include/X11/Shell.h
-BUILT_FILES = $(BUILT_SOURCE) $(BUILT_HEADER)
-STRING_LIST = $(top_srcdir)/util/string.list
-all: $(BUILT_SOURCES)
- $(MAKE) $(AM_MAKEFLAGS) all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
- && { if test -f $@; then exit 0; else break; fi; }; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
- esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
- list2=; for p in $$list; do \
- if test -f $$p; then \
- list2="$$list2 $$p"; \
- else :; fi; \
- done; \
- test -z "$$list2" || { \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
- }
-
-uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
- @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
- for p in $$list; do \
- $(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
- done
-
-clean-libLTLIBRARIES:
- -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
- @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
- test "$$dir" != "$$p" || dir=.; \
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
-libXt.la: $(libXt_la_OBJECTS) $(libXt_la_DEPENDENCIES)
- $(AM_V_CCLD)$(libXt_la_LINK) -rpath $(libdir) $(libXt_la_OBJECTS) $(libXt_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
- -rm -f *.$(OBJEXT)
-
-distclean-compile:
- -rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ActionHook.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Alloc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ArgList.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Callback.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ClickTime.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Composite.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Constraint.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Convert.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Converters.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Core.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Create.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Destroy.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Display.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Error.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Event.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/EventUtil.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Functions.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GCManager.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Geometry.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GetActKey.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GetResList.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/GetValues.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/HookObj.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Hooks.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Initialize.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Intrinsic.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Keyboard.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Manage.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NextEvent.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Object.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PassivGrab.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Pointer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Popup.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PopupCB.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RectObj.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ResConfig.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Resources.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Selection.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetSens.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetValues.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SetWMCW.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Shell.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StringDefs.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TMaction.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TMgrab.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TMkey.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TMparse.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TMprint.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TMstate.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Threads.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/VarCreate.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/VarGet.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Varargs.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Vendor.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sharedlib.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
-tags: TAGS
-
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- set x; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- shift; \
- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- if test $$# -gt 0; then \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- "$$@" $$unique; \
- else \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$unique; \
- fi; \
- fi
-ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$unique
-
-GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
- && $(am__cd) $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
- dist_files=`for file in $$list; do echo $$file; done | \
- sed -e "s|^$$srcdirstrip/||;t" \
- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
- case $$dist_files in \
- */*) $(MKDIR_P) `echo "$$dist_files" | \
- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
- sort -u` ;; \
- esac; \
- for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d "$(distdir)/$$file"; then \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-check-am: all-am
-check: $(BUILT_SOURCES)
- $(MAKE) $(AM_MAKEFLAGS) check-am
-all-am: Makefile $(LTLIBRARIES) all-local
-installdirs:
- for dir in "$(DESTDIR)$(libdir)"; do \
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
-install: $(BUILT_SOURCES)
- $(MAKE) $(AM_MAKEFLAGS) install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
- -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
-
-maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
- -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-clean: clean-am
-
-clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
- mostlyclean-am
-
-distclean: distclean-am
- -rm -rf ./$(DEPDIR)
- -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
- distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am: install-libLTLIBRARIES
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-libLTLIBRARIES
-
-.MAKE: all check install install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am all-local check check-am clean \
- clean-generic clean-libLTLIBRARIES clean-libtool ctags \
- distclean distclean-compile distclean-generic \
- distclean-libtool distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-data \
- install-data-am install-dvi install-dvi-am install-exec \
- install-exec-am install-html install-html-am install-info \
- install-info-am install-libLTLIBRARIES install-man install-pdf \
- install-pdf-am install-ps install-ps-am install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-libLTLIBRARIES
-
-
-all-local: $(BUILT_FILES)
-
-$(BUILT_HEADER): $(BUILT_SOURCE)
-
-$(BUILT_SOURCE):
- $(top_builddir)/util/makestrs -i $(top_srcdir) $(STRINGSABIOPTIONS) < $(STRING_LIST) > StringDefs.c
- mkdir -p $(top_builddir)/src
- mkdir -p $(top_builddir)/include/X11
- cp StringDefs.h $(top_builddir)/include/X11
- cp Shell.h $(top_builddir)/include/X11
- rm StringDefs.h Shell.h
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/libXt/src/Manage.c b/libXt/src/Manage.c
index 4c9a80fdc..575be7dfe 100644
--- a/libXt/src/Manage.c
+++ b/libXt/src/Manage.c
@@ -1,7 +1,5 @@
-/* $Xorg: Manage.c,v 1.4 2001/02/09 02:03:55 xorgcvs Exp $ */
-
/***********************************************************
-Copyright 1993 Sun Microsystems, Inc. All rights reserved.
+Copyright (c) 1993, 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"),
@@ -43,7 +41,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/lib/Xt/Manage.c,v 3.10tsi Exp $ */
/*
diff --git a/libXt/src/NextEvent.c b/libXt/src/NextEvent.c
index 4bade1322..181d20e87 100644
--- a/libXt/src/NextEvent.c
+++ b/libXt/src/NextEvent.c
@@ -1,7 +1,5 @@
-/* $Xorg: NextEvent.c,v 1.8 2001/02/09 02:03:55 xorgcvs Exp $ */
-
/***********************************************************
-Copyright 1993 Sun Microsystems, Inc. All rights reserved.
+Copyright (c) 1993, 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"),
@@ -69,7 +67,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/Xt/NextEvent.c,v 3.26 2002/06/04 21:55:42 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libXt/src/Object.c b/libXt/src/Object.c
index 8bfbcb2f7..ae1ac757b 100644
--- a/libXt/src/Object.c
+++ b/libXt/src/Object.c
@@ -1,7 +1,5 @@
-/* $Xorg: Object.c,v 1.4 2001/02/09 02:03:56 xorgcvs Exp $ */
-
/***********************************************************
-Copyright 1993 Sun Microsystems, Inc. All rights reserved.
+Copyright (c) 1993, 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"),
@@ -69,7 +67,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
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 $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libXt/src/PassivGrab.c b/libXt/src/PassivGrab.c
index b7648d1a6..8d3a1d151 100644
--- a/libXt/src/PassivGrab.c
+++ b/libXt/src/PassivGrab.c
@@ -1,7 +1,6 @@
-/* $Xorg: PassivGrab.c,v 1.5 2001/02/09 02:03:56 xorgcvs Exp $ */
/*
-Copyright 1993 Sun Microsystems, Inc. All rights reserved.
+Copyright (c) 1993, 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"),
@@ -46,7 +45,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86$ */
/*
diff --git a/libXt/src/Pointer.c b/libXt/src/Pointer.c
index bbcb13371..4e537173d 100644
--- a/libXt/src/Pointer.c
+++ b/libXt/src/Pointer.c
@@ -1,5 +1,3 @@
-/* $Xorg: Pointer.c,v 1.4 2001/02/09 02:03:56 xorgcvs Exp $ */
-
/********************************************************
Copyright 1988 by Hewlett-Packard Company
diff --git a/libXt/src/Popup.c b/libXt/src/Popup.c
index aac712da1..3f4554b69 100644
--- a/libXt/src/Popup.c
+++ b/libXt/src/Popup.c
@@ -1,5 +1,3 @@
-/* $Xorg: Popup.c,v 1.4 2001/02/09 02:03:56 xorgcvs Exp $ */
-
/***********************************************************
Copyright 1987, 1988, 1994, 1998 The Open Group
@@ -46,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86$ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libXt/src/PopupCB.c b/libXt/src/PopupCB.c
index be5fd8502..dece66b1f 100644
--- a/libXt/src/PopupCB.c
+++ b/libXt/src/PopupCB.c
@@ -1,5 +1,3 @@
-/* $Xorg: PopupCB.c,v 1.4 2001/02/09 02:03:56 xorgcvs Exp $ */
-
/***********************************************************
Copyright 1987, 1988, 1998 The Open Group
diff --git a/libXt/src/RectObj.c b/libXt/src/RectObj.c
index 0835d5b47..73e962506 100644
--- a/libXt/src/RectObj.c
+++ b/libXt/src/RectObj.c
@@ -1,5 +1,3 @@
-/* $Xorg: RectObj.c,v 1.4 2001/02/09 02:03:56 xorgcvs Exp $ */
-
/***********************************************************
Copyright 1987, 1988, 1998 The Open Group
@@ -46,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/lib/Xt/RectObj.c,v 1.2 2001/08/22 22:52:19 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libXt/src/ResConfig.c b/libXt/src/ResConfig.c
index fd6d057c9..68da5364c 100644
--- a/libXt/src/ResConfig.c
+++ b/libXt/src/ResConfig.c
@@ -1,4 +1,3 @@
-/* $Xorg: ResConfig.c,v 1.5 2001/02/09 02:03:56 xorgcvs Exp $ */
/*
Copyright 1987, 1988, 1998 The Open Group
@@ -52,7 +51,6 @@ dealings in this Software without prior written authorization from the IBM
Corporation.
******************************************************************/
-/* $XFree86: xc/lib/Xt/ResConfig.c,v 3.7 2001/08/22 22:52:19 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
@@ -176,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;
@@ -199,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);
}
}
@@ -237,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);
@@ -248,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);
@@ -748,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,
@@ -759,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;
}
diff --git a/libXt/src/Resources.c b/libXt/src/Resources.c
index 0f5bf1c32..dc0f563cc 100644
--- a/libXt/src/Resources.c
+++ b/libXt/src/Resources.c
@@ -1,7 +1,5 @@
-/* $Xorg: Resources.c,v 1.4 2001/02/09 02:03:56 xorgcvs Exp $ */
-
/***********************************************************
-Copyright 1993 Sun Microsystems, Inc. All rights reserved.
+Copyright (c) 1993, 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"),
@@ -70,8 +68,6 @@ in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/Xt/Resources.c,v 1.11tsi Exp $ */
-
/*LINTLIBRARY*/
#ifdef HAVE_CONFIG_H
#include <config.h>
@@ -113,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,
@@ -317,7 +227,6 @@ static void CopyToArg(
}
} /* CopyToArg */
-#endif
static Cardinal CountTreeDepth(
Widget w)
@@ -948,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--;
@@ -971,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);
}
}
}
diff --git a/libXt/src/Selection.c b/libXt/src/Selection.c
index b35b5a06d..101ea6aaa 100644
--- a/libXt/src/Selection.c
+++ b/libXt/src/Selection.c
@@ -1,7 +1,5 @@
-/* $Xorg: Selection.c,v 1.4 2001/02/09 02:03:56 xorgcvs Exp $ */
-
/***********************************************************
-Copyright 1993 Sun Microsystems, Inc. All rights reserved.
+Copyright (c) 1993, 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"),
@@ -69,7 +67,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/Xt/Selection.c,v 3.9 2001/12/14 19:56:29 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
@@ -229,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);
@@ -831,9 +828,10 @@ static void HandleSelectionEvents(
event->xselectionrequest.property = event->xselectionrequest.target;
if (ctx->widget != widget || ctx->was_disowned
|| ((event->xselectionrequest.time != CurrentTime)
- && (event->xselectionrequest.time < ctx->time)))
+ && (event->xselectionrequest.time < ctx->time))) {
ev.property = None;
- else {
+ StartProtectedSection(ev.display, ev.requestor);
+ } else {
if (ev.target == ctx->prop_list->indirect_atom) {
IndirectPair *p;
int format;
diff --git a/libXt/src/SetSens.c b/libXt/src/SetSens.c
index 0e2fe4571..fd7777c53 100644
--- a/libXt/src/SetSens.c
+++ b/libXt/src/SetSens.c
@@ -1,7 +1,5 @@
-/* $Xorg: SetSens.c,v 1.4 2001/02/09 02:03:58 xorgcvs Exp $ */
-
/***********************************************************
-Copyright 1993 Sun Microsystems, Inc. All rights reserved.
+Copyright (c) 1993, 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"),
@@ -69,7 +67,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/Xt/SetSens.c,v 1.3 2001/12/14 19:56:29 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libXt/src/SetValues.c b/libXt/src/SetValues.c
index 2cbc4e249..e432ec75d 100644
--- a/libXt/src/SetValues.c
+++ b/libXt/src/SetValues.c
@@ -1,7 +1,5 @@
-/* $Xorg: SetValues.c,v 1.4 2001/02/09 02:03:58 xorgcvs Exp $ */
-
/***********************************************************
-Copyright 1993 Sun Microsystems, Inc. All rights reserved.
+Copyright (c) 1993, 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"),
@@ -69,7 +67,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/Xt/SetValues.c,v 1.2 2001/08/22 22:52:19 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libXt/src/SetWMCW.c b/libXt/src/SetWMCW.c
index af33a62e2..8a065d776 100644
--- a/libXt/src/SetWMCW.c
+++ b/libXt/src/SetWMCW.c
@@ -1,12 +1,11 @@
-/* $Xorg: SetWMCW.c,v 1.4 2001/02/09 02:03:58 xorgcvs Exp $ */
-/* $XdotOrg: $
+/*
*
* Author: Chris D. Peterson, MIT X Consortium
*/
/************************************************************
-Copyright 1993 Sun Microsystems, Inc. All rights reserved.
+Copyright (c) 1993, 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"),
diff --git a/libXt/src/Shell.c b/libXt/src/Shell.c
index 2699808d3..8a44651d1 100644
--- a/libXt/src/Shell.c
+++ b/libXt/src/Shell.c
@@ -1,7 +1,5 @@
-/* $Xorg: Shell.c,v 1.4 2001/02/09 02:03:58 xorgcvs Exp $ */
-
/***********************************************************
-Copyright 1993 Sun Microsystems, Inc. All rights reserved.
+Copyright (c) 1993, 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"),
@@ -43,7 +41,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/lib/Xt/Shell.c,v 3.16tsi Exp $ */
/*
@@ -1783,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,
@@ -2484,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;
}
@@ -3016,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) {
diff --git a/libXt/src/TMaction.c b/libXt/src/TMaction.c
index 9389ffa54..bbf1e340a 100644
--- a/libXt/src/TMaction.c
+++ b/libXt/src/TMaction.c
@@ -1,8 +1,7 @@
-/* $Xorg: TMaction.c,v 1.5 2001/02/09 02:03:58 xorgcvs Exp $ */
/*LINTLIBRARY*/
/***********************************************************
-Copyright 1993 Sun Microsystems, Inc. All rights reserved.
+Copyright (c) 1993, 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"),
@@ -70,7 +69,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/Xt/TMaction.c,v 3.7 2001/12/14 19:56:30 dawes Exp $ */
/* TMaction.c -- maintains the state table of actions for the translation
* manager.
@@ -808,9 +806,11 @@ void XtGetActionList(
list = *actions_return = (XtActionList)
__XtMalloc(*num_actions_return * sizeof(XtActionsRec));
table = GetClassActions(widget_class);
- for (i= (*num_actions_return); --i >= 0; list++, table++) {
- list->string = XrmQuarkToString(table->signature);
- list->proc = table->proc;
+ if (table != NULL) {
+ for (i= (*num_actions_return); --i >= 0; list++, table++) {
+ list->string = XrmQuarkToString(table->signature);
+ list->proc = table->proc;
+ }
}
}
UNLOCK_PROCESS;
diff --git a/libXt/src/TMgrab.c b/libXt/src/TMgrab.c
index db016eb7f..08cb4869a 100644
--- a/libXt/src/TMgrab.c
+++ b/libXt/src/TMgrab.c
@@ -1,7 +1,5 @@
-/* $Xorg: TMgrab.c,v 1.4 2001/02/09 02:03:58 xorgcvs Exp $ */
-
/***********************************************************
-Copyright 1993 Sun Microsystems, Inc. All rights reserved.
+Copyright (c) 1993, 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"),
@@ -69,7 +67,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/Xt/TMgrab.c,v 1.3 2001/12/14 19:56:30 dawes Exp $ */
/*LINTLIBRARY*/
#ifdef HAVE_CONFIG_H
diff --git a/libXt/src/TMkey.c b/libXt/src/TMkey.c
index 8ba9d37be..e59bccae2 100644
--- a/libXt/src/TMkey.c
+++ b/libXt/src/TMkey.c
@@ -1,8 +1,7 @@
-/* $Xorg: TMkey.c,v 1.4 2001/02/09 02:03:58 xorgcvs Exp $ */
/*LINTLIBRARY*/
/***********************************************************
-Copyright 1993 Sun Microsystems, Inc. All rights reserved.
+Copyright (c) 1993, 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"),
@@ -70,7 +69,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/Xt/TMkey.c,v 3.10 2001/12/14 19:56:30 dawes Exp $ */
#define XK_MISCELLANY
#define XK_LATIN1
diff --git a/libXt/src/TMparse.c b/libXt/src/TMparse.c
index 4acc92dc0..5fddb8230 100644
--- a/libXt/src/TMparse.c
+++ b/libXt/src/TMparse.c
@@ -1,7 +1,5 @@
-/* $Xorg: TMparse.c,v 1.6 2001/02/09 02:03:58 xorgcvs Exp $ */
-
/***********************************************************
-Copyright 1993 Sun Microsystems, Inc. All rights reserved.
+Copyright (c) 1993, 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"),
@@ -43,7 +41,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/lib/Xt/TMparse.c,v 3.10tsi Exp $ */
/*
diff --git a/libXt/src/TMprint.c b/libXt/src/TMprint.c
index 56f7de1f8..6c469f167 100644
--- a/libXt/src/TMprint.c
+++ b/libXt/src/TMprint.c
@@ -1,7 +1,5 @@
-/* $Xorg: TMprint.c,v 1.4 2001/02/09 02:03:58 xorgcvs Exp $ */
-
/***********************************************************
-Copyright 1993 Sun Microsystems, Inc. All rights reserved.
+Copyright (c) 1993, 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"),
@@ -69,7 +67,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/Xt/TMprint.c,v 1.6 2001/12/14 19:56:31 dawes Exp $ */
/*LINTLIBRARY*/
#ifdef HAVE_CONFIG_H
@@ -782,12 +779,16 @@ void _XtDisplayInstalledAccelerators(
PrintRec stackPrints[STACKPRINTSIZE];
PrintRec *prints;
TMShortCard numPrints, maxPrints;
- TMBindData bindData = (TMBindData) eventWidget->core.tm.proc_table;
+ TMBindData bindData ;
TMComplexBindProcs complexBindProcs;
if ((eventWidget == NULL) ||
- ((xlations = eventWidget->core.tm.translations) == NULL) ||
- (bindData->simple.isComplex == False))
+ (eventWidget->core.tm.translations == NULL) )
+ return;
+
+ xlations = eventWidget->core.tm.translations;
+ bindData = (TMBindData) eventWidget->core.tm.proc_table;
+ if (bindData->simple.isComplex == False)
return;
sb->current = sb->start = __XtMalloc((Cardinal)1000);
diff --git a/libXt/src/TMstate.c b/libXt/src/TMstate.c
index bbae90887..4a634b439 100644
--- a/libXt/src/TMstate.c
+++ b/libXt/src/TMstate.c
@@ -1,7 +1,5 @@
-/* $Xorg: TMstate.c,v 1.6 2001/02/09 02:03:58 xorgcvs Exp $ */
-
/***********************************************************
-Copyright 1993 Sun Microsystems, Inc. All rights reserved.
+Copyright (c) 1993, 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"),
@@ -43,7 +41,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/lib/Xt/TMstate.c,v 1.8 2001/12/14 19:56:31 dawes Exp $ */
/*
diff --git a/libXt/src/Threads.c b/libXt/src/Threads.c
index 520a475bd..7ae9e18f4 100644
--- a/libXt/src/Threads.c
+++ b/libXt/src/Threads.c
@@ -1,7 +1,5 @@
-/* $Xorg: Threads.c,v 1.4 2001/02/09 02:03:59 xorgcvs Exp $ */
-
/************************************************************
-Copyright 1993 Sun Microsystems, Inc. All rights reserved.
+Copyright (c) 1993, 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"),
@@ -49,7 +47,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/Xt/Threads.c,v 3.6 2001/12/14 19:56:31 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libXt/src/VarCreate.c b/libXt/src/VarCreate.c
index acfe13e37..9821fc124 100644
--- a/libXt/src/VarCreate.c
+++ b/libXt/src/VarCreate.c
@@ -1,8 +1,6 @@
-/* $Xorg: VarCreate.c,v 1.4 2001/02/09 02:03:59 xorgcvs Exp $ */
-
/*
-Copyright 1993 Sun Microsystems, Inc. All rights reserved.
+Copyright (c) 1993, 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"),
@@ -50,7 +48,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/Xt/VarCreate.c,v 3.6 2001/08/22 22:52:20 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libXt/src/VarGet.c b/libXt/src/VarGet.c
index c38147519..7b4cea65d 100644
--- a/libXt/src/VarGet.c
+++ b/libXt/src/VarGet.c
@@ -1,7 +1,6 @@
-/* $Xorg: VarGet.c,v 1.4 2001/02/09 02:03:59 xorgcvs Exp $ */
/*
-Copyright 1993 Sun Microsystems, Inc. All rights reserved.
+Copyright (c) 1993, 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"),
@@ -49,7 +48,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/Xt/VarGet.c,v 1.7 2001/07/29 05:01:12 tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
diff --git a/libXt/src/Varargs.c b/libXt/src/Varargs.c
index 37d3c64db..6c9f9ee5f 100644
--- a/libXt/src/Varargs.c
+++ b/libXt/src/Varargs.c
@@ -1,5 +1,3 @@
-/* $Xorg: Varargs.c,v 1.4 2001/02/09 02:03:59 xorgcvs Exp $ */
-
/*
Copyright 1985, 1986, 1987, 1988, 1989, 1994, 1998 The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/Xt/Varargs.c,v 3.10 2001/12/14 19:56:32 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
@@ -321,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);
}
@@ -401,8 +398,7 @@ _XtVaToArgList(
}
}
- if (resources != NULL)
- XtFree((XtPointer)resources);
+ XtFree((XtPointer)resources);
*num_args_return = (Cardinal)count;
*args_return = (ArgList)args;
diff --git a/libXt/src/Vendor.c b/libXt/src/Vendor.c
index 2d3090189..e4fd24fa5 100644
--- a/libXt/src/Vendor.c
+++ b/libXt/src/Vendor.c
@@ -1,5 +1,3 @@
-/* $Xorg: Vendor.c,v 1.4 2001/02/09 02:03:59 xorgcvs Exp $ */
-
/***********************************************************
Copyright 1987, 1988, 1998 The Open Group
@@ -46,7 +44,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
******************************************************************/
-/* $XFree86: xc/lib/Xt/Vendor.c,v 1.7 2002/05/31 18:45:46 dawes Exp $ */
/* Make sure all wm properties can make it out of the resource manager */
diff --git a/libXt/src/sharedlib.c b/libXt/src/sharedlib.c
index 699302ced..1322d8c85 100644
--- a/libXt/src/sharedlib.c
+++ b/libXt/src/sharedlib.c
@@ -1,5 +1,3 @@
-/* $Xorg: sharedlib.c,v 1.4 2001/02/09 02:03:59 xorgcvs Exp $ */
-
/*
Copyright 1989, 1994, 1998 The Open Group
@@ -25,7 +23,6 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/Xt/sharedlib.c,v 3.7 2002/05/31 18:45:46 dawes Exp $ */
#if (defined(SUNSHLIB) || defined(AIXSHLIB)) && !defined(SHAREDCODE)
#ifdef HAVE_CONFIG_H