Merge branch 'master' into feature/xdg-popup

This commit is contained in:
Tony Crisci 2017-10-07 13:04:04 -04:00
commit 4f848000af
27 changed files with 204 additions and 66 deletions

View file

@ -81,7 +81,7 @@ struct roots_input {
struct wlr_seat *wl_seat;
enum roots_cursor_mode mode;
struct roots_view *active_view;
struct roots_view *active_view, *last_active_view;
int offs_x, offs_y;
int view_x, view_y, view_width, view_height;
float view_rotation;

View file

@ -65,11 +65,13 @@ struct roots_view {
void (*get_input_bounds)(struct roots_view *view, struct wlr_box *box);
void (*activate)(struct roots_view *view, bool active);
void (*resize)(struct roots_view *view, uint32_t width, uint32_t height);
void (*close)(struct roots_view *view);
};
void view_get_size(struct roots_view *view, struct wlr_box *box);
void view_get_input_bounds(struct roots_view *view, struct wlr_box *box);
void view_activate(struct roots_view *view, bool active);
void view_resize(struct roots_view *view, uint32_t width, uint32_t height);
void view_close(struct roots_view *view);
#endif