Merge branch 'master' into fullscreen

This commit is contained in:
emersion 2017-11-21 18:34:12 +01:00
commit dcb168914e
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
19 changed files with 335 additions and 216 deletions

View file

@ -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 {