aboutsummaryrefslogtreecommitdiff
path: root/include/rootston
diff options
context:
space:
mode:
authoremersion <contact@emersion.fr>2017-11-21 18:34:12 +0100
committeremersion <contact@emersion.fr>2017-11-21 18:34:12 +0100
commitdcb168914e714156605eb9be03e175de78092e50 (patch)
tree98415a19a4c3cf2c9a1f2508949eebc1d28d300b /include/rootston
parent9a6f799d8f72c1dcd24e22749d43eb2ed54681c6 (diff)
parent1228d0da19edbfc1730b6918760aef444fac8887 (diff)
downloadwlroots-dcb168914e714156605eb9be03e175de78092e50.tar.xz
Merge branch 'master' into fullscreen
Diffstat (limited to 'include/rootston')
-rw-r--r--include/rootston/view.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/include/rootston/view.h b/include/rootston/view.h
index 5901f0a5..bb7297d0 100644
--- a/include/rootston/view.h
+++ b/include/rootston/view.h
@@ -28,6 +28,8 @@ struct roots_xdg_surface_v6 {
struct wl_listener request_resize;
struct wl_listener request_maximize;
struct wl_listener request_fullscreen;
+
+ uint32_t pending_move_resize_configure_serial;
};
struct roots_xwayland_surface {
@@ -41,6 +43,8 @@ struct roots_xwayland_surface {
struct wl_listener request_fullscreen;
struct wl_listener map_notify;
struct wl_listener unmap_notify;
+
+ struct wl_listener surface_commit;
};
enum roots_view_type {
@@ -64,6 +68,12 @@ struct roots_view {
float rotation;
} saved;
+ struct {
+ bool update_x, update_y;
+ double x, y;
+ uint32_t width, height;
+ } pending_move_resize;
+
// TODO: Something for roots-enforced width/height
enum roots_view_type type;
union {