attempts at making modal dialogs without parent work - failed

[wxWidgets.git] / src / qt / threadpsx.cpp

diff --git a/src/qt/threadpsx.cpp b/src/qt/threadpsx.cpp
index 363f0636eafc5bbab35e30b72e7e042fb81e61e5..2d4912c05a32cd4b4d73b2e94867c8a081ba277d 100644 (file)
--- a/src/qt/threadpsx.cpp
+++ b/src/qt/threadpsx.cpp
@@ -23,6 +23,8 @@
 enum thread_state {
   STATE_IDLE = 0,
   STATE_RUNNING,
 enum thread_state {
   STATE_IDLE = 0,
   STATE_RUNNING,

+  STATE_PAUSING,
+  STATE_PAUSED,

   STATE_CANCELED,
   STATE_EXITED
 };
   STATE_CANCELED,
   STATE_EXITED
 };


@@ -32,7 +34,10 @@ enum thread_state {
 /////////////////////////////////////////////////////////////////////////////
 
 static pthread_t p_mainid;
 /////////////////////////////////////////////////////////////////////////////
 
 static pthread_t p_mainid;

-wxMutex wxMainMutex; // controls access to all GUI functions
+static wxMutex p_list_mutex;
+static wxList p_threads_list;
+
+wxMutex *wxMainMutex; // controls access to all GUI functions

 
 /////////////////////////////////////////////////////////////////////////////
 // GUI thread manager
 
 /////////////////////////////////////////////////////////////////////////////
 // GUI thread manager


@@ -157,14 +162,24 @@ public:
   pthread_t thread_id;
   int state;
   int prio;
   pthread_t thread_id;
   int state;
   int prio;

+  int defer_destroy;
+  int id;

 };
 
 void *wxThreadInternal::PthreadStart(void *ptr)
 {
   wxThread *thread = (wxThread *)ptr;
 
 };
 
 void *wxThreadInternal::PthreadStart(void *ptr)
 {
   wxThread *thread = (wxThread *)ptr;
 

+  // Add the current thread to the list
+  p_list_mutex.Lock();
+  thread->p_internal->id = p_threads_list.Number();
+  p_threads_list.Append((wxObject *)thread);
+  p_list_mutex.Unlock();
+
+  // Call the main entry

   pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
   void* status = thread->Entry();
   pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
   void* status = thread->Entry();

+

   thread->Exit(status);
 
   return NULL;
   thread->Exit(status);
 
   return NULL;


@@ -200,6 +215,7 @@ wxThreadError wxThread::Create()
     return THREAD_NO_RESOURCE;
   }
   pthread_attr_destroy(&a);
     return THREAD_NO_RESOURCE;
   }
   pthread_attr_destroy(&a);

+

   return THREAD_NO_ERROR;
 }
 
   return THREAD_NO_ERROR;
 }
 


@@ -237,6 +253,27 @@ wxThreadError wxThread::Destroy()
     if (res == 0)
       p_internal->state = STATE_CANCELED;
   }
     if (res == 0)
       p_internal->state = STATE_CANCELED;
   }

+
+  return THREAD_NO_ERROR;
+}
+
+wxThreadError wxThread::Pause()
+{
+  if (p_internal->state != STATE_RUNNING)
+    return THREAD_NOT_RUNNING;
+
+  if (!p_internal->defer_destroy)
+    return THREAD_MISC_ERROR;
+
+  p_internal->state = STATE_PAUSING;
+  return THREAD_NO_ERROR;
+}
+
+wxThreadError wxThread::Resume()
+{
+  if (p_internal->state == STATE_PAUSING || p_internal->state == STATE_PAUSED)
+    p_internal->state = STATE_RUNNING;
+

   return THREAD_NO_ERROR;
 }
 
   return THREAD_NO_ERROR;
 }
 


@@ -251,10 +288,15 @@ void *wxThread::Join()
       wxYield();
 
     if (do_unlock)
       wxYield();
 
     if (do_unlock)

-      wxMainMutex.Unlock();
+      wxMainMutex->Unlock();

     pthread_join(p_internal->thread_id, &status);
     if (do_unlock)
     pthread_join(p_internal->thread_id, &status);
     if (do_unlock)

-      wxMainMutex.Lock();
+      wxMainMutex->Lock();
+
+    p_list_mutex.Lock();
+    delete p_threads_list.Nth(p_internal->id);
+    p_list_mutex.Unlock();
+

     p_internal->state = STATE_IDLE;
   }
   return status;
     p_internal->state = STATE_IDLE;
   }
   return status;


@@ -262,7 +304,16 @@ void *wxThread::Join()
 
 unsigned long wxThread::GetID() const
 {
 
 unsigned long wxThread::GetID() const
 {

-  return (unsigned long)p_internal->thread_id;
+  return p_internal->id;
+}
+
+wxThread *wxThread::GetThreadFromID(unsigned long id)
+{
+  wxNode *node = p_threads_list.Nth(id);
+
+  if (!node)
+    return NULL;
+  return (wxThread *)node->Data();

 }
 
 void wxThread::Exit(void *status)
 }
 
 void wxThread::Exit(void *status)


@@ -276,6 +327,13 @@ void wxThread::Exit(void *status)
 
 void wxThread::TestDestroy()
 {
 
 void wxThread::TestDestroy()
 {

+  if (p_internal->state == STATE_PAUSING) {
+    p_internal->state = STATE_PAUSED;
+    while (p_internal->state == STATE_PAUSED) {
+      pthread_testcancel();
+      usleep(1);
+    }
+  }

   pthread_testcancel();
 }
 
   pthread_testcancel();
 }
 


@@ -284,6 +342,18 @@ bool wxThread::IsMain()
   return (bool)pthread_equal(pthread_self(), p_mainid);
 }
 
   return (bool)pthread_equal(pthread_self(), p_mainid);
 }
 

+bool wxThread::IsRunning() const
+{
+  return (p_internal->state == STATE_RUNNING);
+}
+
+bool wxThread::IsAlive() const
+{
+  return (p_internal->state == STATE_RUNNING) ||
+         (p_internal->state == STATE_PAUSING) ||
+         (p_internal->state == STATE_PAUSED);
+}
+

 wxThread::wxThread()
 {
   p_internal = new wxThreadInternal();
 wxThread::wxThread()
 {
   p_internal = new wxThreadInternal();


@@ -299,6 +369,7 @@ wxThread::~wxThread()
 // The default callback just joins the thread and throws away the result.
 void wxThread::OnExit()
 {
 // The default callback just joins the thread and throws away the result.
 void wxThread::OnExit()
 {

+  Join();

 }
 
 // Automatic initialization
 }
 
 // Automatic initialization


@@ -306,16 +377,19 @@ class wxThreadModule : public wxModule {
   DECLARE_DYNAMIC_CLASS(wxThreadModule)
 public:
   virtual bool OnInit() {
   DECLARE_DYNAMIC_CLASS(wxThreadModule)
 public:
   virtual bool OnInit() {

+    wxMainMutex = new wxMutex();

     wxThreadGuiInit();
     p_mainid = pthread_self();
     wxThreadGuiInit();
     p_mainid = pthread_self();

-    wxMainMutex.Lock();
+    p_threads_list = wxList(wxKEY_INTEGER);
+    wxMainMutex->Lock();

 
     return TRUE;
   }
 
   virtual void OnExit() {
 
     return TRUE;
   }
 
   virtual void OnExit() {

-    wxMainMutex.Unlock();
+    wxMainMutex->Unlock();

     wxThreadGuiExit();
     wxThreadGuiExit();

+    delete wxMainMutex;

   }
 };
 
   }
 };