mirrors/waybox
1
0
Fork 0
mirror of https://github.com/wizbright/waybox.git synced 2026-02-08 10:06:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updated for wlroots 0.16.0

Browse source
This commit is contained in:
Keith Bowes 2022-12-01 17:51:28 -05:00
parent 31d0ef57e5
commit 0c2f744dbf
14 changed files with 17 additions and 298 deletions
Download patch file Download diff file Expand all files Collapse all files

16
include/waybox/output.h
View file

@ -11,22 +11,17 @@ 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;
#if ! WLR_CHECK_VERSION(0, 17, 0)
/* DEPRECATED: Use a tool like swaybg instead */
struct wlr_scene_rect *background;
#endif
struct wlr_box geometry;
struct wl_listener destroy;
@ -39,12 +34,7 @@ struct wb_view {
struct wl_list link;
struct wb_server *server;
struct wlr_xdg_toplevel *xdg_toplevel;
#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_xdg_toplevel_decoration_v1 *decoration;

1
include/waybox/seat.h
View file

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

4
include/waybox/server.h
View file

@ -17,9 +17,7 @@
#include <wlr/types/wlr_output_layout.h>
#include <wlr/types/wlr_scene.h>
#include <wlr/types/wlr_screencopy_v1.h>
#if WLR_CHECK_VERSION(0, 16, 0)
#include <wlr/types/wlr_subcompositor.h>
#endif
#include <wlr/types/wlr_xdg_output_v1.h>
#include <wlr/types/wlr_xdg_shell.h>
#include <wlr/util/log.h>
@ -49,9 +47,7 @@ struct wb_server {
struct wlr_xdg_output_manager_v1 *output_manager;
struct wlr_renderer *renderer;
struct wlr_scene *scene;
#if WLR_CHECK_VERSION(0, 16, 0)
struct wlr_subcompositor *subcompositor;
#endif
struct wb_config *config;
char *config_file;