Backported changes to tinywl

This commit is contained in:
Keith Bowes 2022-06-30 18:25:22 -04:00
parent 9fa7060dd4
commit 18950eb844
10 changed files with 288 additions and 30 deletions

View file

@ -11,11 +11,19 @@ struct wb_output {
struct wb_server *server;
struct {
#if WLR_CHECK_VERSION(0, 16, 0)
struct wlr_scene_tree *shell_background;
struct wlr_scene_tree *shell_bottom;
struct wlr_scene_tree *shell_fullscreen;
struct wlr_scene_tree *shell_overlay;
struct wlr_scene_tree *shell_top;
#else
struct wlr_scene_node *shell_background;
struct wlr_scene_node *shell_bottom;
struct wlr_scene_node *shell_fullscreen;
struct wlr_scene_node *shell_overlay;
struct wlr_scene_node *shell_top;
#endif
} layers;
struct wlr_scene_rect *background;
@ -31,10 +39,12 @@ struct wb_view {
struct wl_list link;
struct wb_server *server;
struct wlr_xdg_toplevel *xdg_toplevel;
#if !WLR_CHECK_VERSION(0, 16, 0)
#if WLR_CHECK_VERSION(0, 16, 0)
struct wlr_scene_tree *scene_tree;
#else
struct wlr_scene_node *scene_node;
struct wlr_xdg_surface *xdg_surface;
#endif
struct wlr_scene_node *scene_node;
struct wlr_xdg_toplevel_decoration_v1 *decoration;
@ -42,6 +52,7 @@ struct wb_view {
struct wl_listener unmap;
struct wl_listener destroy;
struct wl_listener new_popup;
struct wl_listener request_fullscreen;
struct wl_listener request_maximize;
struct wl_listener request_minimize;
struct wl_listener request_move;

View file

@ -17,7 +17,8 @@ struct wb_seat {
struct wb_keyboard {
struct wl_list link;
struct wb_server *server;
struct wlr_input_device *device;
struct wlr_input_device *device; /* wlroots 0.15.x */
struct wlr_keyboard *keyboard;
struct wl_listener destroy;
struct wl_listener modifiers;