[Bf-blender-cvs] [a3d6745] master: GHOST/X11: print description of error event
Campbell Barton
noreply at git.blender.org
Sat Apr 23 10:42:40 CEST 2016
Commit: a3d67456cd44b7095217a54136ed67276c2eb0d1
Author: Campbell Barton
Date: Sat Apr 23 18:38:43 2016 +1000
Branches: master
https://developer.blender.org/rBa3d67456cd44b7095217a54136ed67276c2eb0d1
GHOST/X11: print description of error event
===================================================================
M intern/ghost/intern/GHOST_SystemX11.cpp
===================================================================
diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp
index 3e1dbd1..0c87ee1 100644
--- a/intern/ghost/intern/GHOST_SystemX11.cpp
+++ b/intern/ghost/intern/GHOST_SystemX11.cpp
@@ -1925,10 +1925,19 @@ GHOST_TSuccess GHOST_SystemX11::pushDragDropEvent(GHOST_TEventType eventType,
* Basically it will not crash blender now if you have a X device that
* is configured but not plugged in.
*/
-int GHOST_X11_ApplicationErrorHandler(Display * /*display*/, XErrorEvent *theEvent)
+int GHOST_X11_ApplicationErrorHandler(Display *display, XErrorEvent *event)
{
- fprintf(stderr, "Ignoring Xlib error: error code %d request code %d\n",
- theEvent->error_code, theEvent->request_code);
+ char error_code_str[512];
+
+ XGetErrorText(display, event->error_code, error_code_str, sizeof(error_code_str));
+
+ fprintf(stderr,
+ "Received X11 Error:\n"
+ "\terror code: %d\n"
+ "\trequest code: %d\n"
+ "\tminor code: %d\n"
+ "\terror text: %s\n",
+ event->error_code, event->request_code, event->minor_code, error_code_str);
/* No exit! - but keep lint happy */
return 0;
More information about the Bf-blender-cvs
mailing list