hyprwm
/
wlroots-hyprland
mirror of https://github.com/hyprwm/wlroots-hyprland.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wlr_scene: Rename wlr_scene_surface_from_buffer 

This renames it to wlr_scene_surface_try_from_buffer to be more clear
that this function can return NULL. This is inline with the rest of
wlroots[1].

[1] https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/3991
This commit is contained in:
Alexander Orzechowski 2023-02-04 02:57:42 -05:00
parent dc7b5ab21e
commit 7b32c25a4f
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/wlr/types/wlr_scene.h
View File

@ -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 * If this buffer is backed by a surface, then the struct wlr_scene_surface is
* returned. If not, NULL will be returned. * 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); struct wlr_scene_buffer *scene_buffer);
/** /**

2
tinywl/tinywl.c
View File

@ -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_buffer *scene_buffer = wlr_scene_buffer_from_node(node);
struct wlr_scene_surface *scene_surface = struct wlr_scene_surface *scene_surface =
wlr_scene_surface_from_buffer(scene_buffer); wlr_scene_surface_try_from_buffer(scene_buffer);
if (!scene_surface) { if (!scene_surface) {
return NULL; return NULL;
} }

4
types/scene/surface.c
View File

@ -128,7 +128,7 @@ static void handle_scene_surface_surface_commit(
static bool scene_buffer_point_accepts_input(struct wlr_scene_buffer *scene_buffer, static bool scene_buffer_point_accepts_input(struct wlr_scene_buffer *scene_buffer,
int sx, int sy) { int sx, int sy) {
struct wlr_scene_surface *scene_surface = 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); 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, .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_scene_buffer *scene_buffer) {
struct wlr_addon *addon = wlr_addon_find(&scene_buffer->node.addons, struct wlr_addon *addon = wlr_addon_find(&scene_buffer->node.addons,
scene_buffer, &surface_addon_impl); scene_buffer, &surface_addon_impl);