diff options
| -rw-r--r-- | include/wlr/types/wlr_scene.h | 2 | ||||
| -rw-r--r-- | tinywl/tinywl.c | 2 | ||||
| -rw-r--r-- | types/scene/surface.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/wlr/types/wlr_scene.h b/include/wlr/types/wlr_scene.h index 659a8b33..b5d37697 100644 --- a/include/wlr/types/wlr_scene.h +++ b/include/wlr/types/wlr_scene.h @@ -302,7 +302,7 @@ struct wlr_scene_buffer *wlr_scene_buffer_from_node(struct wlr_scene_node *node) * If this buffer is backed by a surface, then the struct wlr_scene_surface is * returned. If not, NULL will be returned. */ -struct wlr_scene_surface *wlr_scene_surface_from_buffer( +struct wlr_scene_surface *wlr_scene_surface_try_from_buffer( struct wlr_scene_buffer *scene_buffer); /** diff --git a/tinywl/tinywl.c b/tinywl/tinywl.c index 45b41877..ea810571 100644 --- a/tinywl/tinywl.c +++ b/tinywl/tinywl.c @@ -348,7 +348,7 @@ static struct tinywl_view *desktop_view_at( } struct wlr_scene_buffer *scene_buffer = wlr_scene_buffer_from_node(node); struct wlr_scene_surface *scene_surface = - wlr_scene_surface_from_buffer(scene_buffer); + wlr_scene_surface_try_from_buffer(scene_buffer); if (!scene_surface) { return NULL; } diff --git a/types/scene/surface.c b/types/scene/surface.c index 553cc421..a5f9ccfc 100644 --- a/types/scene/surface.c +++ b/types/scene/surface.c @@ -128,7 +128,7 @@ static void handle_scene_surface_surface_commit( static bool scene_buffer_point_accepts_input(struct wlr_scene_buffer *scene_buffer, int sx, int sy) { struct wlr_scene_surface *scene_surface = - wlr_scene_surface_from_buffer(scene_buffer); + wlr_scene_surface_try_from_buffer(scene_buffer); return wlr_surface_point_accepts_input(scene_surface->surface, sx, sy); } @@ -155,7 +155,7 @@ static const struct wlr_addon_interface surface_addon_impl = { .destroy = surface_addon_destroy, }; -struct wlr_scene_surface *wlr_scene_surface_from_buffer( +struct wlr_scene_surface *wlr_scene_surface_try_from_buffer( struct wlr_scene_buffer *scene_buffer) { struct wlr_addon *addon = wlr_addon_find(&scene_buffer->node.addons, scene_buffer, &surface_addon_impl); |