svn merge ^/branches/released .

1 files changed, 169 insertions, 172 deletions

diff --git a/libXmu/src/DefErrMsg.c b/libXmu/src/DefErrMsg.c
index b6a6f6452..836fd67bc 100644
--- a/libXmu/src/DefErrMsg.c
+++ b/libXmu/src/DefErrMsg.c
@@ -1,172 +1,169 @@
-/* $Xorg: DefErrMsg.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */
-
-/*
-
-Copyright 1988, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-*/
-/* $XFree86: xc/lib/Xmu/DefErrMsg.c,v 1.7 2001/01/17 19:42:54 dawes Exp $ */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-#include <stdio.h>
-#include <X11/Xlibint.h>
-#include <X11/Xproto.h>
-#include <X11/Xmu/Error.h>
-#include <X11/Xmu/SysUtil.h>
-
-/*
- * XmuPrintDefaultErrorMessage - print a nice error that looks like the usual 
- * message.  Returns 1 if the caller should consider exitting else 0.
- */
-int
-XmuPrintDefaultErrorMessage(Display *dpy, XErrorEvent *event, FILE *fp)
-{
-    char buffer[BUFSIZ];
-    char mesg[BUFSIZ];
-    char number[32];
-    char *mtype = "XlibMessage";
-    register _XExtension *ext = (_XExtension *)NULL;
-    _XExtension *bext = (_XExtension *)NULL;
-    XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
-    XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
-    (void) fprintf(fp, "%s:  %s\n  ", mesg, buffer);
-    XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", 
-	mesg, BUFSIZ);
-    (void) fprintf(fp, mesg, event->request_code);
-    if (event->request_code < 128) {
-	XmuSnprintf(number, sizeof(number), "%d", event->request_code);
-	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
-    } else {
-	/* XXX this is non-portable */
-	for (ext = dpy->ext_procs;
-	     ext && (ext->codes.major_opcode != event->request_code);
-	     ext = ext->next)
-	  ;
-	if (ext)
-	  XmuSnprintf(buffer, sizeof(buffer), "%s", ext->name);
-	else
-	    buffer[0] = '\0';
-    }
-    (void) fprintf(fp, " (%s)", buffer);
-    fputs("\n  ", fp);
-    if (event->request_code >= 128) {
-	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
-			      mesg, BUFSIZ);
-	(void) fprintf(fp, mesg, event->minor_code);
-	if (ext) {
-	    XmuSnprintf(mesg, sizeof(mesg),
-			"%s.%d", ext->name, event->minor_code);
-	    XGetErrorDatabaseText(dpy, "XRequest", mesg, "", buffer, BUFSIZ);
-	    (void) fprintf(fp, " (%s)", buffer);
-	}
-	fputs("\n  ", fp);
-    }
-    if (event->error_code >= 128) {
-	/* kludge, try to find the extension that caused it */
-	buffer[0] = '\0';
-	for (ext = dpy->ext_procs; ext; ext = ext->next) {
-	    if (ext->error_string) 
-		(*ext->error_string)(dpy, event->error_code, &ext->codes,
-				     buffer, BUFSIZ);
-	    if (buffer[0]) {
-		bext = ext;
-		break;
-	    }
-	    if (ext->codes.first_error &&
-		ext->codes.first_error < event->error_code &&
-		(!bext || ext->codes.first_error > bext->codes.first_error))
-		bext = ext;
-	}    
-	if (bext)
-	    XmuSnprintf(buffer, sizeof(buffer), "%s.%d", bext->name,
-			event->error_code - bext->codes.first_error);
-	else
-	    strcpy(buffer, "Value");
-	XGetErrorDatabaseText(dpy, mtype, buffer, "", mesg, BUFSIZ);
-	if (mesg[0]) {
-	    fputs("  ", fp);
-	    (void) fprintf(fp, mesg, event->resourceid);
-	    fputs("\n", fp);
-	}
-	/* let extensions try to print the values */
-	for (ext = dpy->ext_procs; ext; ext = ext->next) {
-	    if (ext->error_values)
-		(*ext->error_values)(dpy, event, fp);
-	}
-    } else if ((event->error_code == BadWindow) ||
-	       (event->error_code == BadPixmap) ||
-	       (event->error_code == BadCursor) ||
-	       (event->error_code == BadFont) ||
-	       (event->error_code == BadDrawable) ||
-	       (event->error_code == BadColor) ||
-	       (event->error_code == BadGC) ||
-	       (event->error_code == BadIDChoice) ||
-	       (event->error_code == BadValue) ||
-	       (event->error_code == BadAtom)) {
-	if (event->error_code == BadValue)
-	    XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
-				  mesg, BUFSIZ);
-	else if (event->error_code == BadAtom)
-	    XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
-				  mesg, BUFSIZ);
-	else
-	    XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
-				  mesg, BUFSIZ);
-	(void) fprintf(fp, mesg, event->resourceid);
-	fputs("\n  ", fp);
-    }
-    XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 
-	mesg, BUFSIZ);
-    (void) fprintf(fp, mesg, event->serial);
-    fputs("\n  ", fp);
-    XGetErrorDatabaseText(dpy, mtype, "CurrentSerial", "Current Serial #%d",
-	mesg, BUFSIZ);
-    (void) fprintf(fp, mesg, NextRequest(dpy)-1);
-    fputs("\n", fp);
-    if (event->error_code == BadImplementation) return 0;
-    return 1;
-}
-
-
-/*
- * XmuSimpleErrorHandler - ignore errors for XQueryTree, XGetWindowAttributes,
- * and XGetGeometry; print a message for everything else.  In all case, do
- * not exit.
- */
-int
-XmuSimpleErrorHandler(Display *dpy, XErrorEvent *errorp)
-{
-    switch (errorp->request_code) {
-      case X_QueryTree:
-      case X_GetWindowAttributes:
-        if (errorp->error_code == BadWindow) return 0;
-	break;
-      case X_GetGeometry:
-	if (errorp->error_code == BadDrawable) return 0;
-	break;
-    }
-    /* got a "real" X error */
-    return XmuPrintDefaultErrorMessage (dpy, errorp, stderr);
-}	
+/*

+

+Copyright 1988, 1998  The Open Group

+

+Permission to use, copy, modify, distribute, and sell this software and its

+documentation for any purpose is hereby granted without fee, provided that

+the above copyright notice appear in all copies and that both that

+copyright notice and this permission notice appear in supporting

+documentation.

+

+The above copyright notice and this permission notice shall be included in

+all copies or substantial portions of the Software.

+

+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN

+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+

+Except as contained in this notice, the name of The Open Group shall not be

+used in advertising or otherwise to promote the sale, use or other dealings

+in this Software without prior written authorization from The Open Group.

+

+*/

+

+#ifdef HAVE_CONFIG_H

+#include <config.h>

+#endif

+#include <stdio.h>

+#include <X11/Xlibint.h>

+#include <X11/Xproto.h>

+#include <X11/Xmu/Error.h>

+#include <X11/Xmu/SysUtil.h>

+

+/*

+ * XmuPrintDefaultErrorMessage - print a nice error that looks like the usual 

+ * message.  Returns 1 if the caller should consider exitting else 0.

+ */

+int

+XmuPrintDefaultErrorMessage(Display *dpy, XErrorEvent *event, FILE *fp)

+{

+    char buffer[BUFSIZ];

+    char mesg[BUFSIZ];

+    char number[32];

+    char *mtype = "XlibMessage";

+    register _XExtension *ext = (_XExtension *)NULL;

+    _XExtension *bext = (_XExtension *)NULL;

+    XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);

+    XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);

+    (void) fprintf(fp, "%s:  %s\n  ", mesg, buffer);

+    XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", 

+	mesg, BUFSIZ);

+    (void) fprintf(fp, mesg, event->request_code);

+    if (event->request_code < 128) {

+	XmuSnprintf(number, sizeof(number), "%d", event->request_code);

+	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);

+    } else {

+	/* XXX this is non-portable */

+	for (ext = dpy->ext_procs;

+	     ext && (ext->codes.major_opcode != event->request_code);

+	     ext = ext->next)

+	  ;

+	if (ext)

+	  XmuSnprintf(buffer, sizeof(buffer), "%s", ext->name);

+	else

+	    buffer[0] = '\0';

+    }

+    (void) fprintf(fp, " (%s)", buffer);

+    fputs("\n  ", fp);

+    if (event->request_code >= 128) {

+	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",

+			      mesg, BUFSIZ);

+	(void) fprintf(fp, mesg, event->minor_code);

+	if (ext) {

+	    XmuSnprintf(mesg, sizeof(mesg),

+			"%s.%d", ext->name, event->minor_code);

+	    XGetErrorDatabaseText(dpy, "XRequest", mesg, "", buffer, BUFSIZ);

+	    (void) fprintf(fp, " (%s)", buffer);

+	}

+	fputs("\n  ", fp);

+    }

+    if (event->error_code >= 128) {

+	/* kludge, try to find the extension that caused it */

+	buffer[0] = '\0';

+	for (ext = dpy->ext_procs; ext; ext = ext->next) {

+	    if (ext->error_string) 

+		(*ext->error_string)(dpy, event->error_code, &ext->codes,

+				     buffer, BUFSIZ);

+	    if (buffer[0]) {

+		bext = ext;

+		break;

+	    }

+	    if (ext->codes.first_error &&

+		ext->codes.first_error < event->error_code &&

+		(!bext || ext->codes.first_error > bext->codes.first_error))

+		bext = ext;

+	}    

+	if (bext)

+	    XmuSnprintf(buffer, sizeof(buffer), "%s.%d", bext->name,

+			event->error_code - bext->codes.first_error);

+	else

+	    strcpy(buffer, "Value");

+	XGetErrorDatabaseText(dpy, mtype, buffer, "", mesg, BUFSIZ);

+	if (mesg[0]) {

+	    fputs("  ", fp);

+	    (void) fprintf(fp, mesg, event->resourceid);

+	    fputs("\n", fp);

+	}

+	/* let extensions try to print the values */

+	for (ext = dpy->ext_procs; ext; ext = ext->next) {

+	    if (ext->error_values)

+		(*ext->error_values)(dpy, event, fp);

+	}

+    } else if ((event->error_code == BadWindow) ||

+	       (event->error_code == BadPixmap) ||

+	       (event->error_code == BadCursor) ||

+	       (event->error_code == BadFont) ||

+	       (event->error_code == BadDrawable) ||

+	       (event->error_code == BadColor) ||

+	       (event->error_code == BadGC) ||

+	       (event->error_code == BadIDChoice) ||

+	       (event->error_code == BadValue) ||

+	       (event->error_code == BadAtom)) {

+	if (event->error_code == BadValue)

+	    XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",

+				  mesg, BUFSIZ);

+	else if (event->error_code == BadAtom)

+	    XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",

+				  mesg, BUFSIZ);

+	else

+	    XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",

+				  mesg, BUFSIZ);

+	(void) fprintf(fp, mesg, event->resourceid);

+	fputs("\n  ", fp);

+    }

+    XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 

+	mesg, BUFSIZ);

+    (void) fprintf(fp, mesg, event->serial);

+    fputs("\n  ", fp);

+    XGetErrorDatabaseText(dpy, mtype, "CurrentSerial", "Current Serial #%d",

+	mesg, BUFSIZ);

+    (void) fprintf(fp, mesg, NextRequest(dpy)-1);

+    fputs("\n", fp);

+    if (event->error_code == BadImplementation) return 0;

+    return 1;

+}

+

+

+/*

+ * XmuSimpleErrorHandler - ignore errors for XQueryTree, XGetWindowAttributes,

+ * and XGetGeometry; print a message for everything else.  In all case, do

+ * not exit.

+ */

+int

+XmuSimpleErrorHandler(Display *dpy, XErrorEvent *errorp)

+{

+    switch (errorp->request_code) {

+      case X_QueryTree:

+      case X_GetWindowAttributes:

+        if (errorp->error_code == BadWindow) return 0;

+	break;

+      case X_GetGeometry:

+	if (errorp->error_code == BadDrawable) return 0;

+	break;

+    }

+    /* got a "real" X error */

+    return XmuPrintDefaultErrorMessage (dpy, errorp, stderr);

+}