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

include/private/qeventloop_glib_p.h

@@ -0,0 +1 @@
+../../src/kernel/qeventloop_glib_p.h

src/kernel/ntqeventloop.h

@@ -44,9 +44,12 @@
 #include "ntqsocketnotifier.h"
 #endif // QT_H
 
+#ifdef Q_QDOC
+#else // Q_QDOC
 #if defined(QT_USE_GLIBMAINLOOP)
 #include <glib.h>
 #endif // QT_USE_GLIBMAINLOOP
+#endif // Q_QDOC
 
 class TQEventLoopPrivate;
 class TQSocketNotifier;
@@ -99,6 +102,8 @@ public:
 
     virtual void wakeUp();
 
+#ifdef Q_QDOC
+#else // Q_QDOC
 #if defined(QT_USE_GLIBMAINLOOP)
 	
     // glib main loop support
@@ -114,6 +119,9 @@ public:
     // end glib main loop support
 	
 #endif //QT_USE_GLIBMAINLOOP
+#endif // Q_QDOC
+
+    void setSingleToolkitEventHandling(bool enabled);
 
 signals:
     void awake();

src/kernel/qeventloop_glib_p.h

@@ -95,6 +95,7 @@ public:
         quitnow = FALSE;
         exitloop = FALSE;
         shortcut = FALSE;
+        singletoolkit = TRUE;
     }
 
     int looplevel;
@@ -124,6 +125,7 @@ public:
 	// My GSource
 	
 	GSource * gSource;
+	bool singletoolkit;
 
 };
 

src/kernel/qeventloop_x11.cpp

@@ -415,3 +415,7 @@ void TQEventLoop::appClosingDown()
 {
     d->xfd = -1;
 }
+
+void TQEventLoop::setSingleToolkitEventHandling(bool enabled) {
+    // Do nothing
+}

src/kernel/qeventloop_x11_glib.cpp

@@ -96,6 +96,9 @@ static gboolean qt_gsource_check    ( GSource *source )
 static gboolean qt_gsource_dispatch ( GSource *source,
     GSourceFunc  callback, gpointer user_data ) 
 {
+    Q_UNUSED(callback);
+    Q_UNUSED(user_data);
+
     TQtGSource * qtGSource = (TQtGSource*) source;
     return qtGSource->qeventLoop->gsourceDispatch(source); 
 }
@@ -166,7 +169,9 @@ void TQEventLoop::init()
 	d->pev_flags = AllEvents | WaitForMore;	
 	
     // initialize the common parts of the event loop
-    pipe( d->thread_pipe );
+    if (pipe( d->thread_pipe ) < 0) {
+	// Error!
+    }
     fcntl(d->thread_pipe[0], F_SETFD, FD_CLOEXEC);
     fcntl(d->thread_pipe[1], F_SETFD, FD_CLOEXEC);
 
@@ -341,6 +346,7 @@ bool TQEventLoop::processX11Events()
 
 bool TQEventLoop::gsourcePrepare(GSource *gs, int * timeout) 
 {
+	Q_UNUSED(gs);
 
 	#ifdef DEBUG_QT_GLIBMAINLOOP
 		printf("inside gsourcePrepare(1)\n");
@@ -447,6 +453,7 @@ bool TQEventLoop::gsourcePrepare(GSource *gs, int * timeout)
 
 
 bool TQEventLoop::gsourceCheck(GSource *gs) {
+	Q_UNUSED(gs);
 
 	#ifdef DEBUG_QT_GLIBMAINLOOP
 		printf("inside gsourceCheck(1)\n");
@@ -512,6 +519,7 @@ bool TQEventLoop::gsourceCheck(GSource *gs) {
 
 
 bool TQEventLoop::gsourceDispatch(GSource *gs) {
+	Q_UNUSED(gs);
 
 	// relock the GUI mutex before processing any pending events
 #if defined(QT_THREAD_SUPPORT)
@@ -538,7 +546,9 @@ bool TQEventLoop::gsourceDispatch(GSource *gs) {
 
 	if ( d->threadPipe_gPollFD.revents) {
 	    char c;
-	    ::read( d->thread_pipe[0], &c, 1 );
+	    if (::read( d->thread_pipe[0], &c, 1 ) < 0) {
+		// Error!
+	    }
     }
 
     if ( qt_postselect_handler ) {
@@ -583,6 +593,7 @@ bool TQEventLoop::gsourceDispatch(GSource *gs) {
 		printf("inside gsourceDispatch(2) hasPendingEvents=%d\n", hasPendingEvents());
 	#endif
 
+
 	if (hasPendingEvents()) {
 
 		// color approx. optimization - only on X11
@@ -596,8 +607,12 @@ bool TQEventLoop::gsourceDispatch(GSource *gs) {
     locker.mutex()->unlock();
 #endif
 
-	return TRUE;
-	
+	if (d->singletoolkit) {
+		return TRUE;	// Eat the event
+	}
+	else {
+		return FALSE;	// Pass the event on to GTK
+	}
 }
 
 bool TQEventLoop::hasPendingEvents() const
@@ -616,3 +631,7 @@ void TQEventLoop::appClosingDown()
 {
     d->xfd = -1;
 }
+
+void TQEventLoop::setSingleToolkitEventHandling(bool enabled) {
+    d->singletoolkit = enabled;
+}

src/kernel/qt_kernel.pri

@@ -23,6 +23,7 @@ kernel {
 		  $$KERNEL_H/ntqevent.h \
 		  $$KERNEL_H/ntqeventloop.h \
 		  $$KERNEL_P/qeventloop_p.h \
+		  $$KERNEL_P/qeventloop_glib_p.h \
 		  $$KERNEL_H/ntqfocusdata.h \
 		  $$KERNEL_H/ntqfont.h \
 		  $$KERNEL_P/qfontdata_p.h \