Automated update from Qt3

configure

@@ -734,6 +734,9 @@ while [ "$#" -gt 0 ]; do
     glibmainloop)
 	if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
 	    CFG_GLIBMAINLOOP="$VAL"
+	    if [ "$VAL" = "yes" ]; then
+		echo "WARNING: glib main loop support is ***incomplete*** and will cause problems with threaded applications and/or those using non-standard event loops!"
+	    fi
 	else
 	    UNKNOWN_OPT=yes
 	fi

src/kernel/qapplication.cpp

@@ -2767,18 +2767,21 @@ bool TQApplication::internalNotify( TQObject *receiver, TQEvent * e)
 
     if (!handled) {
 #if defined(QT_THREAD_SUPPORT)
-	bool locked = false;
+	int locklevel = 0;
+	int llcount;
 	if (TQApplication::tqt_mutex) {
-	    locked = TQApplication::tqt_mutex->locked();
-	}
-	if (locked) {
+	    TQApplication::tqt_mutex->lock();	// 1 of 2
+	    locklevel = tqt_mutex->level() - 1;
+	    for (llcount=0; llcount<locklevel; llcount++) {
 		TQApplication::tqt_mutex->unlock();
 	    }
+	    TQApplication::tqt_mutex->unlock();	// 2 of 2
+	}
 #endif
 	consumed = receiver->event( e );
 #if defined(QT_THREAD_SUPPORT)
-	if (locked) {
 	if (TQApplication::tqt_mutex) {
+	    for (llcount=0; llcount<locklevel; llcount++) {
 		TQApplication::tqt_mutex->lock();
 	    }
 	}

src/kernel/qeventloop_x11_glib.cpp

@@ -54,6 +54,8 @@
 
 #include <glib.h>
 
+// #define DEBUG_QT_GLIBMAINLOOP 1
+
 // TQt-GSource Structure and Callbacks
 
 typedef struct {
@@ -595,12 +597,16 @@ bool TQEventLoop::gsourceDispatch(GSource *gs) {
 		// color approx. optimization - only on X11
 		qt_reset_color_avail();
 
+#if defined(QT_THREAD_SUPPORT)
+		locker.mutex()->unlock();
+#endif
 		processX11Events();
 	}
-
+	else {
 #if defined(QT_THREAD_SUPPORT)
 		locker.mutex()->unlock();
 #endif
+	}
 
 	if (d->singletoolkit) {
 		return TRUE;	// Eat the event

src/tools/ntqmutex.h

@@ -74,6 +74,9 @@ private:
     TQMutex( const TQMutex & );
     TQMutex &operator=( const TQMutex & );
 #endif
+
+public:
+    int level();
 };
 
 class Q_EXPORT TQMutexLocker

src/tools/qmutex_p.h

@@ -67,6 +67,7 @@ public:
     virtual bool locked() = 0;
     virtual bool trylock() = 0;
     virtual int type() const = 0;
+    virtual int level() = 0;
 };
 
 

src/tools/qmutex_unix.cpp

@@ -85,6 +85,7 @@ public:
     bool locked();
     bool trylock();
     int type() const;
+    int level();
 
     bool recursive;
 };
@@ -101,6 +102,7 @@ public:
     bool locked();
     bool trylock();
     int type() const;
+    int level();
 
     int count;
     unsigned long owner;
@@ -196,6 +198,11 @@ int TQRealMutexPrivate::type() const
     return recursive ? Q_MUTEX_RECURSIVE : Q_MUTEX_NORMAL;
 }
 
+int TQRealMutexPrivate::level()
+{
+    return locked();
+}
+
 
 #ifndef    Q_RECURSIVE_MUTEX_TYPE
 TQRecursiveMutexPrivate::TQRecursiveMutexPrivate()
@@ -329,6 +336,11 @@ int TQRecursiveMutexPrivate::type() const
     return Q_MUTEX_RECURSIVE;
 }
 
+int TQRecursiveMutexPrivate::level()
+{
+    return count;
+}
+
 #endif // !Q_RECURSIVE_MUTEX_TYPE
 
 
@@ -510,6 +522,22 @@ bool TQMutex::tryLock()
     return d->trylock();
 }
 
+/*!
+    Returns the current lock level of the mutex.
+    0 means the mutex is unlocked
+    This method should only be called when the mutex has already been locked
+    by lock(), otherwise the lock level could change before the next line
+    of code is executed.
+
+    WARNING: Non-recursive mutexes will never exceed a lock level of 1!
+
+    \sa lock(), unlock(), locked()
+*/
+int TQMutex::level()
+{
+    return d->level();
+}
+
 /*!
     \class TQMutexLocker ntqmutex.h
     \brief The TQMutexLocker class simplifies locking and unlocking TQMutexes.