Sync up with the latest wayland developments.

This commit makes the qtwayland module compatible with
wayland sha1 677c5180e67be18b7a0867fafb7f205b57a6e9ff.

Change-Id: I5af0510034b7e4a038313b80f1f6e0b18fa48eb3
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>

6 files changed, 19 insertions, 12 deletions

diff --git a/src/plugins/platforms/wayland/qwaylandinputdevice.cpp b/src/plugins/platforms/wayland/qwaylandinputdevice.cpp
index 7ac47f9a9..88cde461e 100644
--- a/src/plugins/platforms/wayland/qwaylandinputdevice.cpp
+++ b/src/plugins/platforms/wayland/qwaylandinputdevice.cpp
@@ -165,9 +165,11 @@ void QWaylandInputDevice::inputHandleMotion(void *data,
 
 void QWaylandInputDevice::inputHandleButton(void *data,
 					    struct wl_input_device *input_device,
-					    uint32_t time, uint32_t button, uint32_t state)
+                                            uint32_t serial, uint32_t time,
+                                            uint32_t button, uint32_t state)
 {
     Q_UNUSED(input_device);
+    Q_UNUSED(serial);
     QWaylandInputDevice *inputDevice = (QWaylandInputDevice *) data;
     QWaylandWindow *window = inputDevice->mPointerFocus;
     Qt::MouseButton qt_button;
@@ -295,9 +297,11 @@ static uint32_t translateKey(uint32_t sym, char *string, size_t size)
 
 void QWaylandInputDevice::inputHandleKey(void *data,
 					 struct wl_input_device *input_device,
-					 uint32_t time, uint32_t key, uint32_t state)
+                                         uint32_t serial, uint32_t time,
+                                         uint32_t key, uint32_t state)
 {
     Q_UNUSED(input_device);
+    Q_UNUSED(serial);
     QWaylandInputDevice *inputDevice = (QWaylandInputDevice *) data;
     QWaylandWindow *window = inputDevice->mKeyboardFocus;
 #ifndef QT_NO_WAYLAND_XKB
@@ -446,6 +450,7 @@ void QWaylandInputDevice::inputHandleKeyboardLeave(void *data,
 
 void QWaylandInputDevice::inputHandleTouchDown(void *data,
                                                struct wl_input_device *wl_input_device,
+                                               uint32_t serial,
                                                uint32_t time,
                                                struct wl_surface *surface,
                                                int id,
@@ -453,6 +458,7 @@ void QWaylandInputDevice::inputHandleTouchDown(void *data,
                                                int y)
 {
     Q_UNUSED(wl_input_device);
+    Q_UNUSED(serial);
     Q_UNUSED(time);
     QWaylandInputDevice *inputDevice = (QWaylandInputDevice *) data;
     inputDevice->mTouchFocus = static_cast<QWaylandWindow *>(wl_surface_get_user_data(surface));
@@ -461,10 +467,12 @@ void QWaylandInputDevice::inputHandleTouchDown(void *data,
 
 void QWaylandInputDevice::inputHandleTouchUp(void *data,
                                              struct wl_input_device *wl_input_device,
+                                             uint32_t serial,
                                              uint32_t time,
                                              int id)
 {
     Q_UNUSED(wl_input_device);
+    Q_UNUSED(serial);
     Q_UNUSED(time);
     QWaylandInputDevice *inputDevice = (QWaylandInputDevice *) data;
     inputDevice->mTouchFocus = 0;
diff --git a/src/plugins/platforms/wayland/qwaylandinputdevice.h b/src/plugins/platforms/wayland/qwaylandinputdevice.h
index 7c80c1fca..e6528f399 100644
--- a/src/plugins/platforms/wayland/qwaylandinputdevice.h
+++ b/src/plugins/platforms/wayland/qwaylandinputdevice.h
@@ -92,7 +92,8 @@ private:
 				  int32_t sx, int32_t sy);
     static void inputHandleButton(void *data,
 				  struct wl_input_device *input_device,
-				  uint32_t time, uint32_t button, uint32_t state);
+                                  uint32_t serial, uint32_t time,
+                                  uint32_t button, uint32_t state);
     static void inputHandleAxis(void *data,
                                 struct wl_input_device *wl_input_device,
                                 uint32_t time,
@@ -100,7 +101,8 @@ private:
                                 int32_t value);
     static void inputHandleKey(void *data,
 			       struct wl_input_device *input_device,
-			       uint32_t time, uint32_t key, uint32_t state);
+                               uint32_t serial, uint32_t time,
+                               uint32_t key, uint32_t state);
     static void inputHandlePointerEnter(void *data,
                                         struct wl_input_device *input_device,
                                         uint32_t time, struct wl_surface *surface,
@@ -119,6 +121,7 @@ private:
                                          struct wl_surface *surface);
     static void inputHandleTouchDown(void *data,
                                      struct wl_input_device *wl_input_device,
+                                     uint32_t serial,
                                      uint32_t time,
                                      struct wl_surface *surface,
                                      int id,
@@ -126,6 +129,7 @@ private:
                                      int y);
     static void inputHandleTouchUp(void *data,
                                    struct wl_input_device *wl_input_device,
+                                   uint32_t serial,
                                    uint32_t time,
                                    int id);
     static void inputHandleTouchMotion(void *data,
diff --git a/src/plugins/platforms/wayland/qwaylandshellsurface.cpp b/src/plugins/platforms/wayland/qwaylandshellsurface.cpp
index 69848f282..96c3fb24b 100644
--- a/src/plugins/platforms/wayland/qwaylandshellsurface.cpp
+++ b/src/plugins/platforms/wayland/qwaylandshellsurface.cpp
@@ -90,14 +90,13 @@ void QWaylandShellSurface::updateTransientParent(QWindow *parent)
 
 void QWaylandShellSurface::configure(void *data,
                                      wl_shell_surface *wl_shell_surface,
-                                     uint32_t time,
                                      uint32_t edges,
                                      int32_t width,
                                      int32_t height)
 {
     Q_UNUSED(wl_shell_surface);
     QWaylandShellSurface *shell_surface = static_cast<QWaylandShellSurface *>(data);
-    shell_surface->m_window->configure(time,edges,width,height);
+    shell_surface->m_window->configure(edges, width, height);
 }
 
 void QWaylandShellSurface::popup_done(void *data,
diff --git a/src/plugins/platforms/wayland/qwaylandshellsurface.h b/src/plugins/platforms/wayland/qwaylandshellsurface.h
index e7e46ab6d..148bb0e18 100644
--- a/src/plugins/platforms/wayland/qwaylandshellsurface.h
+++ b/src/plugins/platforms/wayland/qwaylandshellsurface.h
@@ -69,7 +69,6 @@ private:
 
     static void configure(void *data,
               struct wl_shell_surface *wl_shell_surface,
-              uint32_t time,
               uint32_t edges,
               int32_t width,
               int32_t height);
diff --git a/src/plugins/platforms/wayland/qwaylandwindow.cpp b/src/plugins/platforms/wayland/qwaylandwindow.cpp
index 9f0d31c6f..afd648918 100644
--- a/src/plugins/platforms/wayland/qwaylandwindow.cpp
+++ b/src/plugins/platforms/wayland/qwaylandwindow.cpp
@@ -176,10 +176,8 @@ bool QWaylandWindow::isExposed() const
 }
 
 
-void QWaylandWindow::configure(uint32_t time, uint32_t edges,
-                               int32_t width, int32_t height)
+void QWaylandWindow::configure(uint32_t edges, int32_t width, int32_t height)
 {
-    Q_UNUSED(time);
     Q_UNUSED(edges);
 
     int widthWithoutMargins = qMax(width-(frameMargins().left() +frameMargins().right()),1);
diff --git a/src/plugins/platforms/wayland/qwaylandwindow.h b/src/plugins/platforms/wayland/qwaylandwindow.h
index a07368b70..3f472e9db 100644
--- a/src/plugins/platforms/wayland/qwaylandwindow.h
+++ b/src/plugins/platforms/wayland/qwaylandwindow.h
@@ -76,8 +76,7 @@ public:
 
     void setGeometry(const QRect &rect);
 
-    void configure(uint32_t time, uint32_t edges,
-                   int32_t width, int32_t height);
+    void configure(uint32_t edges, int32_t width, int32_t height);
 
     void attach(QWaylandBuffer *buffer);
     QWaylandBuffer *attached() const;