diff options
| author | Philippe Coval <philippe.coval@open.eurogiciel.org> | 2014-11-05 16:13:17 +0100 |
|---|---|---|
| committer | Philippe Coval <rzr@gna.org> | 2014-12-28 15:30:59 +0100 |
| commit | 97091ce346cebac7f03a1a98c58d44d8d22edc2e (patch) | |
| tree | 741ff7938442b781816cb545a9fc5f5202e7a6ef /src/client/qwaylandxdgsurface_p.h | |
| parent | 7ef5e2e4863bde5495cc17b60680271d3c09f78f (diff) | |
xdg-shell: upgrade to support current version (weston-1.6.0)
Many inprovements on windows's decorations,
Also handle compositor events
(test: Super+Shift+F , Super+Shift+M)
The protocol file is a raw copy of
Source: http://cgit.freedesktop.org/wayland/weston/plain/protocol/xdg-shell.xml?id=1.6.0
Task-number: QTBUG-38633/related
Change-Id: I667ec52c8a7e34d74b60174a671c89671f841d6b
Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
Diffstat (limited to 'src/client/qwaylandxdgsurface_p.h')
| -rw-r--r-- | src/client/qwaylandxdgsurface_p.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/client/qwaylandxdgsurface_p.h b/src/client/qwaylandxdgsurface_p.h index 635c9496a..c5ae9c792 100644 --- a/src/client/qwaylandxdgsurface_p.h +++ b/src/client/qwaylandxdgsurface_p.h @@ -43,6 +43,7 @@ #define QWAYLANDXDGSURFACE_H #include <QtCore/QSize> +#include <QtCore/QMargins> #include <wayland-client.h> @@ -99,15 +100,13 @@ private: bool m_minimized; bool m_fullscreen; QSize m_size; + QMargins m_margins; QWaylandExtendedSurface *m_extendedWindow; void xdg_surface_configure(int32_t width, - int32_t height) Q_DECL_OVERRIDE; - void xdg_surface_change_state(uint32_t state, - uint32_t value, - uint32_t serial) Q_DECL_OVERRIDE; - void xdg_surface_activated() Q_DECL_OVERRIDE; - void xdg_surface_deactivated() Q_DECL_OVERRIDE; + int32_t height, + struct wl_array *states, + uint32_t serial) Q_DECL_OVERRIDE; void xdg_surface_close() Q_DECL_OVERRIDE; friend class QWaylandWindow; |