Merge branch 'refactor'

Conflicts:
	src/qt-compositor/compositor_api/waylandcompositor.cpp
	src/qt-compositor/wayland_wrapper/wloutput.cpp

diff --cc src/qt-compositor/compositor_api/waylandcompositor.cpp
index ee3e949,317ca2b..a682237
--- 1/src/qt-compositor/compositor_api/waylandcompositor.cpp
--- 2/src/qt-compositor/compositor_api/waylandcompositor.cpp
+++ b/src/qt-compositor/compositor_api/waylandcompositor.cpp
@@@ -147,7 -154,26 +154,31 @@@ void WaylandCompositor::setScreenOrient
      m_compositor->setScreenOrientation(orientationInDegrees);
  }
  
 +void WaylandCompositor::setOutputGeometry(const QRect &geometry)
 +{
 +    m_compositor->setOutputGeometry(geometry);
 +}
++
+ bool WaylandCompositor::isDragging() const
+ {
+     return m_compositor->isDragging();
+ }
+ 
+ void WaylandCompositor::sendDragMoveEvent(const QPoint &global, const QPoint &local,
+                                           WaylandSurface *surface)
+ {
+     m_compositor->sendDragMoveEvent(global, local, surface ? surface->handle() : 0);
+ }
+ 
+ void WaylandCompositor::sendDragEndEvent()
+ {
+     m_compositor->sendDragEndEvent();
+ }
+ 
+ void WaylandCompositor::changeCursor(const QImage &image, int hotspotX, int hotspotY)
+ {
+     Q_UNUSED(image);
+     Q_UNUSED(hotspotX);
+     Q_UNUSED(hotspotY);
+     qDebug() << "changeCursor" << image.size() << hotspotX << hotspotY;
+ }

diff --cc src/qt-compositor/compositor_api/waylandcompositor.h
index 1075265,841a9a7..11660b8
--- 1/src/qt-compositor/compositor_api/waylandcompositor.h
--- 2/src/qt-compositor/compositor_api/waylandcompositor.h
+++ b/src/qt-compositor/compositor_api/waylandcompositor.h
@@@ -85,8 -84,13 +84,14 @@@ public
      const char *socketName() const;
  
      void setScreenOrientation(qint32 orientationInDegrees);
 +    void setOutputGeometry(const QRect &outputGeometry);
  
+     bool isDragging() const;
+     void sendDragMoveEvent(const QPoint &global, const QPoint &local, WaylandSurface *surface);
+     void sendDragEndEvent();
+ 
+     virtual void changeCursor(const QImage &image, int hotspotX, int hotspotY);
+ 
  private:
      static void retainedSelectionChanged(QMimeData *mimeData, void *param);
  

diff --cc src/qt-compositor/wayland_wrapper/wlcompositor.cpp
Simple merge

diff --cc src/qt-compositor/wayland_wrapper/wlcompositor.h
index 647bdf6,fd88df0..6f357ab
--- 1/src/qt-compositor/wayland_wrapper/wlcompositor.h
--- 2/src/qt-compositor/wayland_wrapper/wlcompositor.h
+++ b/src/qt-compositor/wayland_wrapper/wlcompositor.h
@@@ -108,8 -107,11 +107,12 @@@ public
      QList<struct wl_client *> clients() const;
  
      void setScreenOrientation(qint32 orientationInDegrees);
 +    void setOutputGeometry(const QRect &geometry);
  
+     bool isDragging() const;
+     void sendDragMoveEvent(const QPoint &global, const QPoint &local, Surface *surface);
+     void sendDragEndEvent();
+ 
  signals:
      void clientAdded(wl_client *client);
  

diff --cc src/qt-compositor/wayland_wrapper/wloutput.cpp
index 39bf7c9,fbc3ec2..ba3e45a
--- 1/src/qt-compositor/wayland_wrapper/wloutput.cpp
--- 2/src/qt-compositor/wayland_wrapper/wloutput.cpp
+++ b/src/qt-compositor/wayland_wrapper/wloutput.cpp
@@@ -58,16 -58,11 +58,16 @@@ void output_post_geometry(struct wl_cli
  
  
  Output::Output()
-     : m_geometry(QPoint(0,0), QApplication::desktop()->screenGeometry().size())
-     , m_displayId(-1)
+     : m_displayId(-1)
      , m_numQueued(0)
  {
- 
+     QScreen *screen = QGuiApplication::primaryScreen();
 -    m_size = screen->availableGeometry().size();
++    m_geometry = QRect(QPoint(0, 0), screen->availableGeometry().size());
  }
  
 +void Output::setGeometry(const QRect &geometry)
 +{
 +    m_geometry = geometry;
  }
 +
 +} // namespace Wayland

diff --cc src/qt-compositor/wayland_wrapper/wlsurface.cpp
index f13466d,6621882..f8862ee
--- 1/src/qt-compositor/wayland_wrapper/wlsurface.cpp
--- 2/src/qt-compositor/wayland_wrapper/wlsurface.cpp
+++ b/src/qt-compositor/wayland_wrapper/wlsurface.cpp
@@@ -114,11 -121,13 +121,14 @@@ public
      GLuint texture_id;
  #endif
      bool textureCreatedForBuffer;
-     wl_buffer *directRenderBuffer;
+     struct wl_buffer *directRenderBuffer;
      qint64 processId;
      QByteArray authenticationToken;
 +    QVariantMap windowProperties;
  
+     QPoint lastMousePos;
+ 
+     struct wl_buffer *previousBuffer;
  private:
      struct wl_buffer *surfaceBuffer;
      WaylandSurface::Type surfaceType;
@@@ -274,29 -292,13 +293,34 @@@ QByteArray Surface::authenticationToken
      return WindowManagerServerIntegration::instance()->managedClient(d->client)->authenticationToken();
  }
  
 +QVariantMap Surface::windowProperties() const
 +{
 +    Q_D(const Surface);
 +    return d->windowProperties;
 +}
 +
 +QVariant Surface::windowProperty(const QString &propertyName) const
 +{
 +    Q_D(const Surface);
 +    QVariantMap props = d->windowProperties;
 +    return props.value(propertyName);
 +}
 +
 +void Surface::setWindowProperty(const QString &name, const QVariant &value, bool writeUpdateToClient)
 +{
 +    Q_D(Surface);
 +    d->windowProperties.insert(name, value);
 +    if (writeUpdateToClient)
 +        WindowManagerServerIntegration::instance()->setWindowProperty(d->client, base(), name, value);
 +}
 +
  uint32_t toWaylandButton(Qt::MouseButton button)
  {
+ #ifndef BTN_LEFT
+ uint32_t BTN_LEFT = 0x110;
+ uint32_t BTN_RIGHT = 0x111;
+ uint32_t BTN_MIDDLE = 0x112;
+ #endif
      switch (button) {
      case Qt::LeftButton:
          return BTN_LEFT;

diff --cc src/qt-compositor/wayland_wrapper/wlsurface.h
index c921496,61f1a21..31e10c7
--- 1/src/qt-compositor/wayland_wrapper/wlsurface.h
--- 2/src/qt-compositor/wayland_wrapper/wlsurface.h
+++ b/src/qt-compositor/wayland_wrapper/wlsurface.h
@@@ -104,13 -104,12 +104,16 @@@ public
      qint64 processId() const;
      void setProcessId(qint64 processId);
      QByteArray authenticationToken() const;
+     void setAuthenticationToken(const QByteArray &authenticationToken);
  
 +    QVariantMap windowProperties() const;
 +    QVariant windowProperty(const QString &propertyName) const;
 +    void setWindowProperty(const QString &name, const QVariant &value, bool writeUpdateToClient = true);
 +
      void setSurfaceCreationFinished(bool isCreated);
  
+     QPoint lastMousePos() const;
+ 
  protected:
      QScopedPointer<SurfacePrivate> d_ptr;
  private: