Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/qt3

1 files changed, 54 insertions, 50 deletions

diff --git a/src/kernel/qeventloop_x11.cpp b/src/kernel/qeventloop_x11.cpp
index 833be69..5ee41ca 100644
--- a/src/kernel/qeventloop_x11.cpp
+++ b/src/kernel/qeventloop_x11.cpp
@@ -146,55 +146,57 @@ bool QEventLoop::processEvents( ProcessEventsFlags flags )
     if ( qt_is_gui_used ) {
 	QApplication::sendPostedEvents();
 
-	// Two loops so that posted events accumulate
-	while ( XPending( QPaintDevice::x11AppDisplay() ) ) {
-	    // also flushes output buffer
-	    while ( XPending( QPaintDevice::x11AppDisplay() ) ) {
-		if ( d->shortcut ) {
-		    return FALSE;
-		}
-
-		XNextEvent( QPaintDevice::x11AppDisplay(), &event );
-
-		if ( flags & ExcludeUserInput ) {
-		    switch ( event.type ) {
-		    case ButtonPress:
-		    case ButtonRelease:
-		    case MotionNotify:
-		    case XKeyPress:
-		    case XKeyRelease:
-		    case EnterNotify:
-		    case LeaveNotify:
-			continue;
-
-		    case ClientMessage:
-			{
-			    // from qapplication_x11.cpp
-			    extern Atom qt_wm_protocols;
-			    extern Atom qt_wm_take_focus;
-			    extern Atom qt_qt_scrolldone;
-
-			    // only keep the wm_take_focus and
-			    // qt_qt_scrolldone protocols, discard all
-			    // other client messages
-			    if ( event.xclient.format != 32 )
-				continue;
-
-			    if ( event.xclient.message_type == qt_wm_protocols ||
-				 (Atom) event.xclient.data.l[0] == qt_wm_take_focus )
-				break;
-			    if ( event.xclient.message_type == qt_qt_scrolldone )
-				break;
+	if (QApplication::isGuiThread()) {
+		// Two loops so that posted events accumulate
+		while ( XPending( QPaintDevice::x11AppDisplay() ) ) {
+			// also flushes output buffer
+			while ( XPending( QPaintDevice::x11AppDisplay() ) ) {
+				if ( d->shortcut ) {
+					return FALSE;
+				}
+		
+				XNextEvent( QPaintDevice::x11AppDisplay(), &event );
+		
+				if ( flags & ExcludeUserInput ) {
+					switch ( event.type ) {
+						case ButtonPress:
+						case ButtonRelease:
+						case MotionNotify:
+						case XKeyPress:
+						case XKeyRelease:
+						case EnterNotify:
+						case LeaveNotify:
+							continue;
+				
+						case ClientMessage:
+							{
+							// from qapplication_x11.cpp
+							extern Atom qt_wm_protocols;
+							extern Atom qt_wm_take_focus;
+							extern Atom qt_qt_scrolldone;
+				
+							// only keep the wm_take_focus and
+							// qt_qt_scrolldone protocols, discard all
+							// other client messages
+							if ( event.xclient.format != 32 )
+								continue;
+				
+							if ( event.xclient.message_type == qt_wm_protocols ||
+								(Atom) event.xclient.data.l[0] == qt_wm_take_focus )
+								break;
+							if ( event.xclient.message_type == qt_qt_scrolldone )
+								break;
+							}
+				
+						default: break;
+					}
+				}
+		
+				nevents++;
+				if ( qApp->x11ProcessEvent( &event ) == 1 )
+				return TRUE;
 			}
-
-		    default: break;
-		    }
 		}
-
-		nevents++;
-		if ( qApp->x11ProcessEvent( &event ) == 1 )
-		    return TRUE;
-	    }
 	}
     }
 
@@ -261,7 +263,7 @@ bool QEventLoop::processEvents( ProcessEventsFlags flags )
 	FD_ZERO( &d->sn_vec[2].select_fds );
     }
 
-    if ( qt_is_gui_used ) {
+    if ( qt_is_gui_used && QApplication::isGuiThread() ) {
 	// select for events on the event socket - only on X11
 	FD_SET( d->xfd, &d->sn_vec[0].select_fds );
 	highest = QMAX( highest, d->xfd );
@@ -282,7 +284,8 @@ bool QEventLoop::processEvents( ProcessEventsFlags flags )
     // unlock the GUI mutex and select.  when we return from this function, there is
     // something for us to do
 #if defined(QT_THREAD_SUPPORT)
-    locker.mutex()->unlock();
+    if ( locker.mutex() ) locker.mutex()->unlock();
+    else return false;
 #endif
 
     int nsel;
@@ -296,7 +299,8 @@ bool QEventLoop::processEvents( ProcessEventsFlags flags )
 
     // relock the GUI mutex before processing any pending events
 #if defined(QT_THREAD_SUPPORT)
-    locker.mutex()->lock();
+    if ( locker.mutex() ) locker.mutex()->lock();
+    else return false;
 #endif
 
     // we are awake, broadcast it