Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

1 files changed, 48 insertions, 0 deletions

diff --git a/opensuse/core/tqt3/qtimer-debug.diff b/opensuse/core/tqt3/qtimer-debug.diff
new file mode 100644
index 000000000..f4dbf1201
--- /dev/null
+++ b/opensuse/core/tqt3/qtimer-debug.diff
@@ -0,0 +1,48 @@
+--- src/kernel/qeventloop_unix.cpp
++++ src/kernel/qeventloop_unix.cpp
+@@ -517,6 +531,17 @@
+     return (tm->tv_sec*1000) + (tm->tv_usec/1000);
+ }
+ 
++static TQString fullName(TQObject* obj)
++{
++    TQString oname;
++    if (obj && obj->name())
++        oname = TQString(obj->name()) + "(" + TQString(obj->className()) + ")";
++
++    if (obj && obj->parent())
++        return fullName(obj->parent()) + "/" + oname;
++    return oname;
++}
++
+ int TQEventLoop::activateTimers()
+ {
+     if ( !timerList || !timerList->count() )	// no timers
+@@ -552,9 +577,27 @@
+ 	t->timeout += t->interval;
+ 	if ( t->timeout < currentTime )
+ 	    t->timeout = currentTime + t->interval;
++        // prefer system clock ticks for low resolution timers
++        // to save cpu power
++        if (t->interval.tv_sec * 1000 + t->interval.tv_usec / 1000 >= 1000) {
++            timeval drift;
++            drift.tv_sec = 0;
++            drift.tv_usec = (t->interval.tv_usec / 8) + (t->interval.tv_sec % 8) * 1000 * 1000 / 8;
++            timeval synced = t->timeout + drift;
++            if (synced.tv_usec < 2 * drift.tv_usec)
++                synced.tv_usec = 0;
++            t->timeout = synced;
++        }
+ 	insertTimer( t );			// relink timer
+ 	if ( t->interval.tv_usec > 0 || t->interval.tv_sec > 0 )
+ 	    n_act++;
++
++        if (t->obj && getenv("TQT_DEBUG_TIMER"))
++            qDebug("qtimer: %ld/%s %d ms for %p/%s %s",
++                    getpid(), qApp && qApp->name() ? qApp->name() : "", 
++                    t->interval.tv_sec * 1000 + t->interval.tv_usec / 1000,
++                    t->obj, fullName(t->obj).latin1(), t->obj->className());
++
+ 	TQTimerEvent e( t->id );
+ 	TQApplication::sendEvent( t->obj, &e );	// send event
+ 	if ( timerList->findRef( begin ) == -1 )