qt-compositor: frameFinished() is a per-surface thing

Signed-off-by: Corentin Chary <corentin.chary@gmail.com>
Merge-request: 3
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>

diff --git a/src/qt-compositor/compositor_api/waylandcompositor.cpp b/src/qt-compositor/compositor_api/waylandcompositor.cpp
index 01ad70d..b3a0431 100644 (file)
--- a/src/qt-compositor/compositor_api/waylandcompositor.cpp
+++ b/src/qt-compositor/compositor_api/waylandcompositor.cpp
@@ -66,9 +66,10 @@ WaylandCompositor::~WaylandCompositor()
     delete m_compositor;
 }
 
-void WaylandCompositor::frameFinished()
+void WaylandCompositor::frameFinished(WaylandSurface *surface)
 {
-    m_compositor->frameFinished();
+    Wayland::Surface *surfaceImpl = surface? surface->handle():0;
+    m_compositor->frameFinished(surfaceImpl);
 }
 
 void WaylandCompositor::setInputFocus(WaylandSurface *surface)

diff --git a/src/qt-compositor/compositor_api/waylandcompositor.h b/src/qt-compositor/compositor_api/waylandcompositor.h
index 058f1fe..94a6139 100644 (file)
--- a/src/qt-compositor/compositor_api/waylandcompositor.h
+++ b/src/qt-compositor/compositor_api/waylandcompositor.h
@@ -64,7 +64,7 @@ public:
     WaylandCompositor(QWidget *topLevelWidget = 0);
     virtual ~WaylandCompositor();
 
-    void frameFinished();
+    void frameFinished(WaylandSurface *surface = 0);
 
     void setInputFocus(WaylandSurface *surface);
     void destroyClientForSurface(WaylandSurface *surface);

diff --git a/src/qt-compositor/compositor_api/waylandsurface.cpp b/src/qt-compositor/compositor_api/waylandsurface.cpp
index a8c54eb..6793152 100644 (file)
--- a/src/qt-compositor/compositor_api/waylandsurface.cpp
+++ b/src/qt-compositor/compositor_api/waylandsurface.cpp
@@ -105,6 +105,12 @@ void WaylandSurface::sendKeyReleaseEvent(uint code)
     d->surface->sendKeyReleaseEvent(code);
 }
 
+void WaylandSurface::frameFinished()
+{
+    Q_D(WaylandSurface);
+    d->surface->frameFinished();
+}
+
 void WaylandSurface::setInputFocus()
 {
     Q_D(WaylandSurface);

diff --git a/src/qt-compositor/compositor_api/waylandsurface.h b/src/qt-compositor/compositor_api/waylandsurface.h
index 93fbfb2..899bcae 100644 (file)
--- a/src/qt-compositor/compositor_api/waylandsurface.h
+++ b/src/qt-compositor/compositor_api/waylandsurface.h
@@ -88,6 +88,7 @@ public:
     void sendKeyPressEvent(uint code);
     void sendKeyReleaseEvent(uint code);
 
+    void frameFinished();
     void setInputFocus();
 
     Wayland::Surface *handle() const;

diff --git a/src/qt-compositor/wayland_wrapper/wlcompositor.cpp b/src/qt-compositor/wayland_wrapper/wlcompositor.cpp
index 0767784..e46f749 100644 (file)
--- a/src/qt-compositor/wayland_wrapper/wlcompositor.cpp
+++ b/src/qt-compositor/wayland_wrapper/wlcompositor.cpp
@@ -219,13 +219,16 @@ Compositor::~Compositor()
     delete m_display;
 }
 
-void Compositor::frameFinished()
+void Compositor::frameFinished(Surface *surface)
 {
-    QSet<Surface *>::iterator i;
-    for (i = m_dirty_surfaces.begin(); i != m_dirty_surfaces.end(); i++) {
-        wl_display_post_frame(m_display->handle(), (*i)->base(), currentTimeMsecs());
+    if (surface && m_dirty_surfaces.contains(surface)) {
+       wl_display_post_frame(m_display->handle(), surface->base(), currentTimeMsecs());
+       m_dirty_surfaces.remove(surface);
+    } else if (!surface) {
+       foreach (Surface *surface, m_dirty_surfaces)
+           wl_display_post_frame(m_display->handle(), surface->base(), currentTimeMsecs());
+       m_dirty_surfaces.clear();
     }
-    m_dirty_surfaces.clear();
 }
 
 void Compositor::createSurface(struct wl_client *client, int id)

diff --git a/src/qt-compositor/wayland_wrapper/wlcompositor.h b/src/qt-compositor/wayland_wrapper/wlcompositor.h
index 719d2c7..2481401 100644 (file)
--- a/src/qt-compositor/wayland_wrapper/wlcompositor.h
+++ b/src/qt-compositor/wayland_wrapper/wlcompositor.h
@@ -66,7 +66,7 @@ public:
     Compositor(WaylandCompositor *qt_compositor);
     ~Compositor();
 
-    void frameFinished();
+    void frameFinished(Surface *surface = 0);
     void setInputFocus(Surface *surface);
     void setKeyFocus(Surface *surface);
     void setPointerFocus(Surface *surface, const QPoint &point = QPoint());

diff --git a/src/qt-compositor/wayland_wrapper/wlsurface.cpp b/src/qt-compositor/wayland_wrapper/wlsurface.cpp
index 45b430a..92e464d 100644 (file)
--- a/src/qt-compositor/wayland_wrapper/wlsurface.cpp
+++ b/src/qt-compositor/wayland_wrapper/wlsurface.cpp
@@ -375,6 +375,12 @@ void Surface::sendKeyReleaseEvent(uint code)
     }
 }
 
+void Surface::frameFinished()
+{
+    Q_D(Surface);
+    d->compositor->frameFinished(this);
+}
+
 void Surface::setInputFocus()
 {
     Q_D(Surface);

diff --git a/src/qt-compositor/wayland_wrapper/wlsurface.h b/src/qt-compositor/wayland_wrapper/wlsurface.h
index 725acd9..ff345d1 100644 (file)
--- a/src/qt-compositor/wayland_wrapper/wlsurface.h
+++ b/src/qt-compositor/wayland_wrapper/wlsurface.h
@@ -93,6 +93,7 @@ public:
     void sendKeyPressEvent(uint code);
     void sendKeyReleaseEvent(uint code);
 
+    void frameFinished();
     void setInputFocus();
 
     WaylandSurface *handle() const;