[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13133] branches/blender2.5/blender/intern /ghost/intern/GHOST_SystemX11.cpp: Use XInternAtom by default.

Diego Borghetti (Plumiferos) bdiego at gmail.com
Sat Jan 5 00:17:09 CET 2008


Revision: 13133
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13133
Author:   bdiego
Date:     2008-01-05 00:17:08 +0100 (Sat, 05 Jan 2008)

Log Message:
-----------
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).

Modified Paths:
--------------
    branches/blender2.5/blender/intern/ghost/intern/GHOST_SystemX11.cpp

Modified: branches/blender2.5/blender/intern/ghost/intern/GHOST_SystemX11.cpp
===================================================================
--- branches/blender2.5/blender/intern/ghost/intern/GHOST_SystemX11.cpp	2008-01-04 21:12:48 UTC (rev 13132)
+++ branches/blender2.5/blender/intern/ghost/intern/GHOST_SystemX11.cpp	2008-01-04 23:17:08 UTC (rev 13133)
@@ -109,20 +109,15 @@
 	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 @@
 	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;





More information about the Bf-blender-cvs mailing list