Merge lp:~loic.molinari/nux/nux-clean-up-at-destruction-2 into lp:nux

[Loïc Molinari]

That branch fixes some crashes at destruction.

[lp:~loic.molinari/nux/nux-clean-up-at-destruction-2]

331. By Loïc Molinari on 2011-04-14

Fixed ABI break

[Didier Roche-Tolomelli (didrocks)]

Approved, looks good and doesn't break the ABI :)

review: Approve

=== modified file 'NuxCore/ThreadGNU.h'
--- NuxCore/ThreadGNU.h	2011-04-06 21:54:09 +0000
+++ NuxCore/ThreadGNU.h	2011-04-14 15:38:09 +0000
@@ -426,9 +426,13 @@
     class NThreadContext
     {
     public:
-      NThreadContext()
+      NThreadContext ()
+        : m_pUserData (NULL)
+        , m_pParent (NULL)
+        , m_dwExitCode (0)
       {
-        //memset(this, 0, sizeof(this));
+        memset (&m_ThreadAttribute, 0, sizeof (m_ThreadAttribute));
+        memset (&m_dwTID, 0, sizeof (m_dwTID));
       }
 
       /*

=== modified file 'NuxGraphics/GraphicsDisplayX11.cpp'
--- NuxGraphics/GraphicsDisplayX11.cpp	2011-04-08 23:11:56 +0000
+++ NuxGraphics/GraphicsDisplayX11.cpp	2011-04-14 15:38:09 +0000
@@ -63,6 +63,7 @@
 
   GraphicsDisplay::GraphicsDisplay()
   {
+    m_CreatedFromForeignWindow      = false;
     m_ParentWindow                  = 0;
     m_GLCtx                         = 0;
     m_Fullscreen                    = false;
@@ -87,8 +88,6 @@
     m_WindowSize.SetWidth (0);
     m_WindowSize.SetHeight (0);
 
-    // A window never starts in a minimized state.
-    m_is_window_minimized = false;
     _has_glx_13 = false;
     _glx_major = 0;
     _glx_minor = 0;
@@ -114,7 +113,9 @@
     NUX_SAFE_DELETE ( m_GraphicsContext );
     NUX_SAFE_DELETE ( m_DeviceFactory );
 
-    DestroyOpenGLWindow();
+    if (m_CreatedFromForeignWindow == false)
+      DestroyOpenGLWindow ();
+
     NUX_SAFE_DELETE ( m_pEvent );
 
     inlSetThreadLocalStorage (_TLS_GraphicsDisplay, 0);
@@ -554,6 +555,8 @@
 
     InitGlobalGrabWindow ();
 
+    m_CreatedFromForeignWindow = true;
+
     return true;
   }
 

=== modified file 'NuxGraphics/GraphicsDisplayX11.h'
--- NuxGraphics/GraphicsDisplayX11.h	2011-04-06 21:54:09 +0000
+++ NuxGraphics/GraphicsDisplayX11.h	2011-04-14 15:38:09 +0000
@@ -128,7 +128,7 @@
     void GetDisplayInfo();
     int m_BestMode;
 
-    bool m_is_window_minimized;
+    bool m_CreatedFromForeignWindow;
 
   public:
     typedef void (*GrabReleaseCallback) (bool replaced, void *user_data);
@@ -217,9 +217,11 @@
     
     IEvent &GetCurrentEvent();
 
+    // That method is deprecated, it always returns false and still here in
+    // order to maintain API compatibility.
     bool isWindowMinimized() const
     {
-      return m_is_window_minimized;
+      return false;
     }
 
     void ShowWindow();