mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-03 09:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

wlr_scene: Add a way to choose when input interactions happen on a buffer

Browse source
This commit is contained in:
Alexander Orzechowski 2022-05-19 14:24:05 -04:00
parent 09c7fe0f90
commit 34be5da072
2 changed files with 20 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
include/wlr/types/wlr_scene.h
View file

@ -28,6 +28,11 @@ struct wlr_output_layout;
struct wlr_xdg_surface; struct wlr_xdg_surface;
struct wlr_layer_surface_v1; struct wlr_layer_surface_v1;
struct wlr_scene_buffer;
typedef bool (*wlr_scene_buffer_point_accepts_input_func_t)(
struct wlr_scene_buffer *buffer, int sx, int sy);
enum wlr_scene_node_type { enum wlr_scene_node_type {
WLR_SCENE_NODE_ROOT, WLR_SCENE_NODE_ROOT,
WLR_SCENE_NODE_TREE, WLR_SCENE_NODE_TREE,
@ -118,6 +123,9 @@ struct wlr_scene_buffer {
struct wl_signal frame_done; // struct timespec struct wl_signal frame_done; // struct timespec
} events; } events;
// May be NULL
wlr_scene_buffer_point_accepts_input_func_t point_accepts_input;
/** /**
* The output that the largest area of this buffer is displayed on. * The output that the largest area of this buffer is displayed on.
* This may be NULL if the buffer is not currently displayed on any * This may be NULL if the buffer is not currently displayed on any

14
types/scene/wlr_scene.c
View file

@ -771,12 +771,22 @@ struct wlr_scene_node *wlr_scene_node_at(struct wlr_scene_node *node,
struct wlr_scene_surface *scene_surface = wlr_scene_surface_from_node(node); struct wlr_scene_surface *scene_surface = wlr_scene_surface_from_node(node);
intersects = wlr_surface_point_accepts_input(scene_surface->surface, lx, ly); intersects = wlr_surface_point_accepts_input(scene_surface->surface, lx, ly);
break; break;
case WLR_SCENE_NODE_RECT: case WLR_SCENE_NODE_RECT:;
case WLR_SCENE_NODE_BUFFER:;
int width, height; int width, height;
scene_node_get_size(node, &width, &height); scene_node_get_size(node, &width, &height);
intersects = lx >= 0 && lx < width && ly >= 0 && ly < height; intersects = lx >= 0 && lx < width && ly >= 0 && ly < height;
break; break;
case WLR_SCENE_NODE_BUFFER:;
struct wlr_scene_buffer *scene_buffer = scene_buffer_from_node(node);
if (scene_buffer->point_accepts_input) {
intersects = scene_buffer->point_accepts_input(scene_buffer, lx, ly);
} else {
int width, height;
scene_node_get_size(node, &width, &height);
intersects = lx >= 0 && lx < width && ly >= 0 && ly < height;
}
break;
} }
if (intersects) { if (intersects) {