Merge branch 'master' into hovericons

This commit is contained in:
Simon Long 2023-12-05 07:16:08 +00:00
commit 308aa39d21
15 changed files with 114 additions and 130 deletions

View file

@ -5,13 +5,9 @@
#include <stdbool.h>
struct wlr_scene_node;
struct wlr_scene_rect;
struct wlr_scene_tree;
struct wlr_surface;
struct wlr_scene_output;
struct wlr_scene_rect *lab_wlr_scene_get_rect(struct wlr_scene_node *node);
struct wlr_scene_tree *lab_scene_tree_from_node(struct wlr_scene_node *node);
struct wlr_surface *lab_wlr_surface_from_node(struct wlr_scene_node *node);
/**

View file

@ -5,19 +5,6 @@
#include <wayland-server-core.h>
struct seat;
struct wlr_drag_icon;
struct wlr_scene_tree;
struct drag_icon {
struct wlr_scene_tree *icon_tree;
struct wlr_drag_icon *icon;
struct {
struct wl_listener map;
struct wl_listener commit;
struct wl_listener unmap;
struct wl_listener destroy;
} events;
};
void dnd_init(struct seat *seat);
void dnd_icons_show(struct seat *seat, bool show);

View file

@ -17,6 +17,7 @@
#include <wlr/types/wlr_cursor.h>
#include <wlr/types/wlr_data_device.h>
#include <wlr/types/wlr_foreign_toplevel_management_v1.h>
#include <wlr/types/wlr_gamma_control_v1.h>
#include <wlr/types/wlr_input_device.h>
#include <wlr/types/wlr_keyboard.h>
#include <wlr/types/wlr_keyboard_group.h>
@ -291,6 +292,9 @@ struct server {
*/
int pending_output_layout_change;
struct wlr_gamma_control_manager_v1 *gamma_control_manager_v1;
struct wl_listener gamma_control_set_gamma;
struct session_lock *session_lock;
struct wlr_foreign_toplevel_manager_v1 *foreign_toplevel_manager;
@ -343,6 +347,7 @@ struct output {
struct wl_listener request_state;
bool leased;
bool gamma_lut_changed;
};
#undef LAB_NR_LAYERS