From c5488b943d32ea79f49239cbb476df12ff4f1c43 Mon Sep 17 00:00:00 2001 From: Diego Borghetti Date: Fri, 4 Jan 2008 23:17:08 +0000 Subject: [PATCH] Use XInternAtom by default. I don't know the name of the "SGI Fast" atom, but this is only request when blender start so i don't think that this make some "big" difference. So just use plain X11 calls (thanks GSR for the info). --- intern/ghost/intern/GHOST_SystemX11.cpp | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp index e02131498e4..0273555e79c 100644 --- a/intern/ghost/intern/GHOST_SystemX11.cpp +++ b/intern/ghost/intern/GHOST_SystemX11.cpp @@ -109,20 +109,15 @@ GHOST_SystemX11( if (!m_display) return; #ifdef __sgi - m_delete_window_atom - = XSGIFastInternAtom(m_display, - "WM_DELETE_WINDOW", - SGI_XA_WM_DELETE_WINDOW, False); - /* Some one with SGI can tell me about this ? */ - m_wm_state= None; - m_wm_change_state= None; - m_net_state= None; - m_net_max_horz= None; - m_net_max_vert= None; - m_net_fullscreen= None; - m_motif = None; + 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", False); + m_delete_window_atom = XInternAtom(m_display, + "WM_DELETE_WINDOW", False); +#endif + m_wm_state= XInternAtom(m_display, "WM_STATE", False); m_wm_change_state= XInternAtom(m_display, "WM_CHANGE_STATE", False); m_net_state= XInternAtom(m_display, "_NET_WM_STATE", False); @@ -133,7 +128,6 @@ GHOST_SystemX11( m_net_fullscreen= XInternAtom(m_display, "_NET_WM_STATE_FULLSCREEN", False); m_motif= XInternAtom(m_display, "_MOTIF_WM_HINTS", False); -#endif // compute the initial time timeval tv;