[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kwin] libkwineffects: use a global static for animation ids
From:       Marco Martin <notmart () gmail ! com>
Date:       2016-03-04 17:19:46
Message-ID: E1abtOE-0005nd-0V () scm ! kde ! org
[Download RAW message or body]

Git commit 595c5937c9a1e13bdeed2759034ed66d8c89d614 by Marco Martin.
Committed on 04/03/2016 at 17:19.
Pushed by mart into branch 'master'.

use a global static for animation ids

using stack adresses makes it possible (even tough not frequent)
for two animations (onle just killed, one just created) to have
the same id, causing scripts to be potentially really confused.
this replaces the id with a global counter, and the
"flying tooltips" bug is gone.

REVIEW:127276
BUG:360068
CCBUG:352254

M  +2    -0    libkwineffects/anidata_p.h
M  +8    -4    libkwineffects/kwinanimationeffect.cpp

http://commits.kde.org/kwin/595c5937c9a1e13bdeed2759034ed66d8c89d614

diff --git a/libkwineffects/anidata_p.h b/libkwineffects/anidata_p.h
index 75c7f47..a55557f 100644
--- a/libkwineffects/anidata_p.h
+++ b/libkwineffects/anidata_p.h
@@ -38,6 +38,8 @@ public:
     inline bool isOneDimensional() const {
         return from[0] == from[1] && to[0] == to[1];
     }
+
+    quint64 id{0};
     static QList<AniData> list(const QString &str);
     QString toString() const;
     QString debugInfo() const;
diff --git a/libkwineffects/kwinanimationeffect.cpp \
b/libkwineffects/kwinanimationeffect.cpp index 15ab44e..1c1bd28 100644
--- a/libkwineffects/kwinanimationeffect.cpp
+++ b/libkwineffects/kwinanimationeffect.cpp
@@ -47,11 +47,14 @@ public:
     EffectWindowList m_zombies;
     bool m_animated, m_damageDirty, m_needSceneRepaint, m_animationsTouched, \
m_isInitialized;  quint64 m_justEndedAnimation; // protect against cancel
+    static quint64 m_animCounter;
 };
 }
 
 using namespace KWin;
 
+quint64 AnimationEffectPrivate::m_animCounter = 0;
+
 AnimationEffect::AnimationEffect() : d_ptr(new AnimationEffectPrivate())
 {
     Q_D(AnimationEffect);
@@ -235,7 +238,8 @@ quint64 AnimationEffect::p_animate( EffectWindow *w, Attribute a, \
uint meta, int  if (it == d->m_animations.end())
         it = d->m_animations.insert(w, QPair<QList<AniData>, \
                QRect>(QList<AniData>(), QRect()));
     it->first.append(AniData(a, meta, ms, to, curve, delay, from, waitAtSource, \
                keepAtTarget));
-    quint64 ret_id = quint64(&it->first.last());
+    quint64 ret_id = ++d->m_animCounter;
+    it->first.last().id = ret_id;
     it->second = QRect();
 
     d->m_animationsTouched = true;
@@ -261,7 +265,7 @@ bool AnimationEffect::retarget(quint64 animationId, FPx2 \
                newTarget, int newRemai
                          mapEnd = d->m_animations.end(); entry != mapEnd; ++entry) {
         for (QList<AniData>::iterator anim = entry->first.begin(),
                                    animEnd = entry->first.end(); anim != animEnd; \
                ++anim) {
-            if (quint64(&(*anim)) == animationId) {
+            if (anim->id == animationId) {
                 anim->from.set(interpolated(*anim, 0), interpolated(*anim, 1));
                 validate(anim->attribute, anim->meta, nullptr, &newTarget, \
entry.key());  anim->to.set(newTarget[0], newTarget[1]);
@@ -280,7 +284,7 @@ bool AnimationEffect::cancel(quint64 animationId)
         return true; // this is just ending, do not try to cancel it but fake \
                success
     for (AniMap::iterator entry = d->m_animations.begin(), mapEnd = \
                d->m_animations.end(); entry != mapEnd; ++entry) {
         for (QList<AniData>::iterator anim = entry->first.begin(), animEnd = \
                entry->first.end(); anim != animEnd; ++anim) {
-            if (quint64(&(*anim)) == animationId) {
+            if (anim->id == animationId) {
                 entry->first.erase(anim); // remove the animation
                 if (entry->first.isEmpty()) { // no other animations on the window, \
release it.  const int i = d->m_zombies.indexOf(entry.key());
@@ -340,7 +344,7 @@ void AnimationEffect::prePaintScreen( ScreenPrePaintData& data, \
int time )  oldW->unreferencePreviousWindowPixmap();
                     effects->addRepaint(oldW->expandedGeometry());
                 }
-                d->m_justEndedAnimation = quint64(&(*anim));
+                d->m_justEndedAnimation = anim->id;
                 animationEnded(oldW, anim->attribute, anim->meta);
                 d->m_justEndedAnimation = 0;
                 // NOTICE animationEnded is an external call and might have called \
"::animate"


[prev in list] [next in list] [prev in thread] [next in thread]