1 files changed, 56 insertions, 56 deletions

diff --git a/src/client/qwaylandxdgsurface.cpp b/src/client/qwaylandxdgsurface.cpp
index 318ff86d..7f0c7f41 100644
--- a/src/client/qwaylandxdgsurface.cpp
+++ b/src/client/qwaylandxdgsurface.cpp
@@ -48,7 +48,6 @@
 #include "qwaylandscreen_p.h"
 #include "qwaylandextendedsurface_p.h"
 
-#include <QtCore/QDebug>
 
 QT_BEGIN_NAMESPACE
 
@@ -94,36 +93,32 @@ void QWaylandXdgSurface::move(QWaylandInputDevice *inputDevice)
 void QWaylandXdgSurface::setMaximized()
 {
     if (!m_maximized)
-        request_change_state(XDG_SURFACE_STATE_MAXIMIZED, true, 0);
+        set_maximized();
 }
 
 void QWaylandXdgSurface::setFullscreen()
 {
     if (!m_fullscreen)
-        request_change_state(XDG_SURFACE_STATE_FULLSCREEN, true, 0);
+        set_fullscreen(Q_NULLPTR);
 }
 
 void QWaylandXdgSurface::setNormal()
 {
     if (m_fullscreen || m_maximized  || m_minimized) {
         if (m_maximized) {
-            request_change_state(XDG_SURFACE_STATE_MAXIMIZED, false, 0);
+            unset_maximized();
         }
         if (m_fullscreen) {
-            request_change_state(XDG_SURFACE_STATE_FULLSCREEN, false, 0);
+            unset_fullscreen();
         }
 
         m_fullscreen = m_maximized = m_minimized = false;
-        setTopLevel();
-        QMargins m = m_window->frameMargins();
-        m_window->configure(0, m_size.width() + m.left() + m.right(), m_size.height() + m.top() + m.bottom());
     }
 }
 
 void QWaylandXdgSurface::setMinimized()
 {
     m_minimized = true;
-    m_size = m_window->window()->geometry().size();
     set_minimized();
 }
 
@@ -138,22 +133,7 @@ void QWaylandXdgSurface::updateTransientParent(QWindow *parent)
     if (!parent_wayland_window)
         return;
 
-    // set_transient expects a position relative to the parent
-    QPoint transientPos = m_window->geometry().topLeft(); // this is absolute
-    QWindow *parentWin = m_window->window()->transientParent();
-    transientPos -= parentWin->geometry().topLeft();
-    if (parent_wayland_window->decoration()) {
-        transientPos.setX(transientPos.x() + parent_wayland_window->decoration()->margins().left());
-        transientPos.setY(transientPos.y() + parent_wayland_window->decoration()->margins().top());
-    }
-
-    uint32_t flags = 0;
-    Qt::WindowFlags wf = m_window->window()->flags();
-    if (wf.testFlag(Qt::ToolTip)
-            || wf.testFlag(Qt::WindowTransparentForInput))
-        flags |= XDG_SURFACE_SET_TRANSIENT_FOR;
-
-    set_transient_for(parent_wayland_window->object());
+    set_parent(parent_wayland_window->object());
 }
 
 void QWaylandXdgSurface::setTitle(const QString & title)
@@ -196,44 +176,64 @@ void QWaylandXdgSurface::sendProperty(const QString &name, const QVariant &value
         m_extendedWindow->updateGenericProperty(name, value);
 }
 
-void QWaylandXdgSurface::xdg_surface_configure(int32_t width, int32_t height)
-{
-    m_window->configure(0 , width, height);
-}
-
-void QWaylandXdgSurface::xdg_surface_change_state(uint32_t state,
-                                                  uint32_t value,
-                                                  uint32_t serial)
-{
-
-    if (state == XDG_SURFACE_STATE_MAXIMIZED
-            || state == XDG_SURFACE_STATE_FULLSCREEN) {
-        if (value) {
-            m_size = m_window->window()->geometry().size();
-        } else {
-            QMargins m = m_window->frameMargins();
-            m_window->configure(0, m_size.width() + m.left() + m.right(), m_size.height() + m.top() + m.bottom());
+void QWaylandXdgSurface::xdg_surface_configure(int32_t width, int32_t height, struct wl_array *states,uint32_t serial)
+{
+    uint32_t *state = 0;
+    bool aboutToMaximize = false;
+    bool aboutToFullScreen = false;
+
+    state = (uint32_t*) states->data;
+
+    for (uint32_t i=0; i < states->size; i++)
+    {
+        switch (*(state+i)) {
+        case XDG_SURFACE_STATE_MAXIMIZED:
+            aboutToMaximize = true;
+            break;
+        case XDG_SURFACE_STATE_FULLSCREEN:
+            aboutToFullScreen = true;
+            break;
+        case XDG_SURFACE_STATE_RESIZING:
+            m_margins = m_window->frameMargins();
+            width -= m_margins.left() + m_margins.right();
+            height -= m_margins.top() + m_margins.bottom();
+            m_size = QSize(width,height);
+            break;
+        case XDG_SURFACE_STATE_ACTIVATED:
+            // TODO: here about the missing window activation
+            break;
+        default:
+            break;
         }
     }
 
-    switch (state) {
-    case XDG_SURFACE_STATE_MAXIMIZED:
-        m_maximized = value;
-        break;
-    case XDG_SURFACE_STATE_FULLSCREEN:
-        m_fullscreen = value;
-        break;
+    if (!m_fullscreen && aboutToFullScreen) {
+        m_fullscreen = true;
+        m_size = m_window->window()->geometry().size();
+        m_window->window()->showFullScreen();
+    } else if (m_fullscreen && !aboutToFullScreen) {
+        m_fullscreen = false;
+        m_window->window()->showNormal();
+    } else if (!m_maximized && aboutToMaximize) {
+        m_maximized = true;
+        m_size = m_window->window()->geometry().size();
+        m_window->window()->showMaximized();
+    } else if (m_maximized && !aboutToMaximize) {
+        m_maximized = false;
+        m_window->window()->showNormal();
     }
 
-    xdg_surface_ack_change_state(object(), state, value, serial);
-}
+    if (width == 0 && height == 0) {
+        width = m_size.width();
+        height = m_size.height();
+    }
 
-void QWaylandXdgSurface::xdg_surface_activated()
-{
-}
+    if (width > 0 && height > 0) {
+        m_margins = m_window->frameMargins();
+        m_window->configure(0, width + m_margins.left() + m_margins.right(), height + m_margins.top() + m_margins.bottom());
+    }
 
-void QWaylandXdgSurface::xdg_surface_deactivated()
-{
+    xdg_surface_ack_configure(object(), serial);
 }
 
 void QWaylandXdgSurface::xdg_surface_close()