diff options
| author | Chris Want <cwant@ualberta.ca> | 2003-01-29 22:49:22 +0300 |
|---|---|---|
| committer | Chris Want <cwant@ualberta.ca> | 2003-01-29 22:49:22 +0300 |
| commit | 2d9d906cb326371677e516983997b969ba7cb6af (patch) | |
| tree | 3ee13e1cceec97b3a065f89b27759efeaed2fbb9 | |
| parent | a8f71970543c6903795b3554676dd8954c838717 (diff) | |
Ignore WM_DELETE_WINDOW on IRIX (somebody smarter than me please
check this for correctness).
| -rwxr-xr-x | intern/ghost/intern/GHOST_SystemX11.cpp | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp index f6645125575..f57957e853c 100755 --- a/intern/ghost/intern/GHOST_SystemX11.cpp +++ b/intern/ghost/intern/GHOST_SystemX11.cpp @@ -79,6 +79,16 @@ #include <X11/Xatom.h> #include <X11/keysym.h> +#ifdef __sgi + +#if defined(_SGI_EXTRA_PREDEFINES) && !defined(NO_FAST_ATOMS) +#include <X11/SGIFastAtom.h> +#else +#define XSGIFastInternAtom(dpy,string,fast_name,how) XInternAtom(dpy,string,how) +#endif + +#endif + // For timing #include <sys/time.h> @@ -98,7 +108,15 @@ GHOST_SystemX11( if (!m_display) return; - m_delete_window_atom = XInternAtom(m_display, "WM_DELETE_WINDOW", True); +#ifdef __sgi + m_delete_window_atom + = XSGIFastInternAtom(m_display, + "WM_DELETE_WINDOW", + SGI_XA_WM_DELETE_WINDOW, False); +#else + m_delete_window_atom + = XInternAtom(m_display, "WM_DELETE_WINDOW", True); +#endif // compute the initial time timeval tv; @@ -457,7 +475,8 @@ processEvent( case ClientMessage: { XClientMessageEvent & xcme = xe->xclient; - + +#ifndef __sgi if (xcme.data.l[0] == m_delete_window_atom) { g_event = new GHOST_Event( @@ -468,7 +487,7 @@ processEvent( } else { /* Unknown client message, ignore */ } - +#endif break; } |