sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix compilation with WITH_X11_XINPUT=OFF

Browse Source
This commit is contained in:
Sv. Lockal 2013-01-23 15:01:33 +00:00
parent 6558a22b91
commit 36641078f8
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
intern/ghost/intern/GHOST_WindowX11.cpp
View File

@ -1211,11 +1211,13 @@ installDrawingContext(
switch (type) { switch (type) {
case GHOST_kDrawingContextTypeOpenGL: case GHOST_kDrawingContextTypeOpenGL:
{ {
#ifdef WITH_X11_XINPUT
/* use our own event handlers to avoid exiting blender, /* use our own event handlers to avoid exiting blender,
* this would happen for eg: * this would happen for eg:
* if you open blender, unplug a tablet, then open a new window. */ * if you open blender, unplug a tablet, then open a new window. */
XErrorHandler old_handler = XSetErrorHandler(GHOST_X11_ApplicationErrorHandler); XErrorHandler old_handler = XSetErrorHandler(GHOST_X11_ApplicationErrorHandler);
XIOErrorHandler old_handler_io = XSetIOErrorHandler(GHOST_X11_ApplicationIOErrorHandler); XIOErrorHandler old_handler_io = XSetIOErrorHandler(GHOST_X11_ApplicationIOErrorHandler);
#endif
m_context = glXCreateContext(m_display, m_visual, s_firstContext, True); m_context = glXCreateContext(m_display, m_visual, s_firstContext, True);
if (m_context != NULL) { if (m_context != NULL) {
@ -1231,10 +1233,11 @@ installDrawingContext(
success = GHOST_kFailure; success = GHOST_kFailure;
} }
#ifdef WITH_X11_XINPUT
/* Restore handler */ /* Restore handler */
(void) XSetErrorHandler(old_handler); (void) XSetErrorHandler(old_handler);
(void) XSetIOErrorHandler(old_handler_io); (void) XSetIOErrorHandler(old_handler_io);
#endif
break; break;
} }
case GHOST_kDrawingContextTypeNone: case GHOST_kDrawingContextTypeNone: