From e7f0aebdfc458b3305aebf6a15bc6a3e3911a8e0 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Tue, 29 Sep 2009 06:18:04 +0000
Subject: Print some more information in X error handler.
---
xorg-server/hw/xwin/winclipboardthread.c | 16 +++++++++++-----
xorg-server/hw/xwin/winmultiwindowwm.c | 15 ++++++++++++++-
2 files changed, 25 insertions(+), 6 deletions(-)
(limited to 'xorg-server/hw/xwin')
diff --git a/xorg-server/hw/xwin/winclipboardthread.c b/xorg-server/hw/xwin/winclipboardthread.c
index f56f50fad..c88f1d7b2 100644
--- a/xorg-server/hw/xwin/winclipboardthread.c
+++ b/xorg-server/hw/xwin/winclipboardthread.c
@@ -488,11 +488,17 @@ winClipboardErrorHandler (Display *pDisplay, XErrorEvent *pErr)
pszErrorMsg,
sizeof (pszErrorMsg));
ErrorF ("winClipboardErrorHandler - ERROR: \n\t%s\n"
- "\tSerial: %d, Request Code: %d, Minor Code: %d\n",
- pszErrorMsg,
- pErr->serial,
- pErr->request_code,
- pErr->minor_code);
+ " errorCode %d\n"
+ " serial %d\n"
+ " resourceID %d\n"
+ " majorCode %d\n"
+ " minorCode %d\n"
+ , pszErrorMsg
+ , pErr->error_code
+ , pErr->serial,
+ , pErr->resourceid
+ , pErr->request_code
+ , pErr->minor_code);
return 0;
}
diff --git a/xorg-server/hw/xwin/winmultiwindowwm.c b/xorg-server/hw/xwin/winmultiwindowwm.c
index ed0f4b0a2..9261244db 100644
--- a/xorg-server/hw/xwin/winmultiwindowwm.c
+++ b/xorg-server/hw/xwin/winmultiwindowwm.c
@@ -1279,7 +1279,18 @@ winMultiWindowWMErrorHandler (Display *pDisplay, XErrorEvent *pErr)
pErr->error_code,
pszErrorMsg,
sizeof (pszErrorMsg));
- ErrorF ("winMultiWindowWMErrorHandler - ERROR: %s\n", pszErrorMsg);
+ ErrorF ("winMultiWindowWMErrorHandler - ERROR: %s\n"
+ " errorCode %d\n"
+ " serial %d\n"
+ " resourceID %d\n"
+ " majorCode %d\n"
+ " minorCode %d\n"
+ , pszErrorMsg
+ , pErr->error_code
+ , pErr->serial,
+ , pErr->resourceid
+ , pErr->request_code
+ , pErr->minor_code);
return 0;
}
@@ -1319,11 +1330,13 @@ winMultiWindowXMsgProcErrorHandler (Display *pDisplay, XErrorEvent *pErr)
sizeof (pszErrorMsg));
ErrorF ("winMultiWindowXMsgProcErrorHandler - ERROR: %s\n"
" errorCode %d\n"
+ " serial %d\n"
" resourceID %d\n"
" majorCode %d\n"
" minorCode %d\n"
, pszErrorMsg
, pErr->error_code
+ , pErr->serial,
, pErr->resourceid
, pErr->request_code
, pErr->minor_code);
--
cgit v1.2.3