mirror of
git://slackware.nl/current.git
synced 2024-12-29 10:25:00 +01:00
d31c50870d
Thu Jun 30 20:26:57 UTC 2016 Slackware 14.2 x86_64 stable is released! The long development cycle (the Linux community has lately been living in "interesting times", as they say) is finally behind us, and we're proud to announce the release of Slackware 14.2. The new release brings many updates and modern tools, has switched from udev to eudev (no systemd), and adds well over a hundred new packages to the system. Thanks to the team, the upstream developers, the dedicated Slackware community, and everyone else who pitched in to help make this release a reality. The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware project by picking up a copy from store.slackware.com. We're taking pre-orders now, and offer a discount if you sign up for a subscription. Have fun! :-)
63 lines
2.7 KiB
Diff
63 lines
2.7 KiB
Diff
Author: Jan-Marek Glogowski <glogow@fbihome.de>
|
|
Date: Thu Mar 06 18:44:43 2014 +0100
|
|
|
|
Honor QEventLoop::ExcludeSocketNotifiers in glib event loop.
|
|
|
|
Implements QEventLoop::ExcludeSocketNotifiers in the same way
|
|
QEventLoop::X11ExcludeTimers is already implemented for the glib
|
|
event loop.
|
|
|
|
--- qt4-x11-4.8.1.orig/src/corelib/kernel/qeventdispatcher_glib.cpp
|
|
+++ qt4-x11-4.8.1/src/corelib/kernel/qeventdispatcher_glib.cpp
|
|
@@ -65,6 +65,7 @@ struct GPollFDWithQSocketNotifier
|
|
struct GSocketNotifierSource
|
|
{
|
|
GSource source;
|
|
+ QEventLoop::ProcessEventsFlags processEventsFlags;
|
|
QList<GPollFDWithQSocketNotifier *> pollfds;
|
|
};
|
|
|
|
@@ -80,6 +81,9 @@ static gboolean socketNotifierSourceChec
|
|
GSocketNotifierSource *src = reinterpret_cast<GSocketNotifierSource *>(source);
|
|
|
|
bool pending = false;
|
|
+ if (src->processEventsFlags & QEventLoop::ExcludeSocketNotifiers)
|
|
+ return pending;
|
|
+
|
|
for (int i = 0; !pending && i < src->pollfds.count(); ++i) {
|
|
GPollFDWithQSocketNotifier *p = src->pollfds.at(i);
|
|
|
|
@@ -103,6 +107,9 @@ static gboolean socketNotifierSourceDisp
|
|
QEvent event(QEvent::SockAct);
|
|
|
|
GSocketNotifierSource *src = reinterpret_cast<GSocketNotifierSource *>(source);
|
|
+ if (src->processEventsFlags & QEventLoop::ExcludeSocketNotifiers)
|
|
+ return true;
|
|
+
|
|
for (int i = 0; i < src->pollfds.count(); ++i) {
|
|
GPollFDWithQSocketNotifier *p = src->pollfds.at(i);
|
|
|
|
@@ -330,6 +337,7 @@ QEventDispatcherGlibPrivate::QEventDispa
|
|
reinterpret_cast<GSocketNotifierSource *>(g_source_new(&socketNotifierSourceFuncs,
|
|
sizeof(GSocketNotifierSource)));
|
|
(void) new (&socketNotifierSource->pollfds) QList<GPollFDWithQSocketNotifier *>();
|
|
+ socketNotifierSource->processEventsFlags = QEventLoop::AllEvents;
|
|
g_source_set_can_recurse(&socketNotifierSource->source, true);
|
|
g_source_attach(&socketNotifierSource->source, mainContext);
|
|
|
|
@@ -415,6 +423,7 @@ bool QEventDispatcherGlib::processEvents
|
|
// tell postEventSourcePrepare() and timerSource about any new flags
|
|
QEventLoop::ProcessEventsFlags savedFlags = d->timerSource->processEventsFlags;
|
|
d->timerSource->processEventsFlags = flags;
|
|
+ d->socketNotifierSource->processEventsFlags = flags;
|
|
|
|
if (!(flags & QEventLoop::EventLoopExec)) {
|
|
// force timers to be sent at normal priority
|
|
@@ -426,6 +435,7 @@ bool QEventDispatcherGlib::processEvents
|
|
result = g_main_context_iteration(d->mainContext, canWait);
|
|
|
|
d->timerSource->processEventsFlags = savedFlags;
|
|
+ d->socketNotifierSource->processEventsFlags = savedFlags;
|
|
|
|
if (canWait)
|
|
emit awake();
|