Merge branch 'master' into feature/data-device-selection

This commit is contained in:
Tony Crisci 2017-10-17 16:01:17 -04:00
commit b7c622a319
16 changed files with 170 additions and 85 deletions

View file

@ -88,8 +88,8 @@ struct roots_input {
struct wlr_xcursor_theme *theme;
struct wlr_xcursor *xcursor;
struct wlr_seat *wl_seat;
struct roots_view *client_cursor_view;
struct wl_list drag_icons;
struct wl_client *cursor_client;
enum roots_cursor_mode mode;
struct roots_view *active_view, *last_active_view;

View file

@ -17,8 +17,6 @@ struct roots_wl_shell_surface {
struct wl_listener request_set_maximized;
struct wl_listener surface_commit;
bool initialized;
};
struct roots_xdg_surface_v6 {
@ -32,8 +30,6 @@ struct roots_xdg_surface_v6 {
struct wl_listener request_move;
struct wl_listener request_resize;
struct wl_listener request_show_window_menu;
bool initialized;
};
struct roots_xwayland_surface {
@ -85,6 +81,6 @@ 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);
bool view_center(struct roots_view *view);
bool view_initialize(struct roots_view *view);
void view_initialize(struct roots_view *view);
#endif