diff options
author | Kirill Primak <vyivel@eclair.cafe> | 2022-01-08 22:52:49 +0300 |
---|---|---|
committer | Kirill Primak <vyivel@eclair.cafe> | 2022-02-02 21:04:59 +0300 |
commit | 05dd990e432436523ff8f2572c41e0d0e648d3a6 (patch) | |
tree | 6d2ba93cd3e4b54feceb1b92dd21439d388e2d99 | |
parent | cddc1c1bd9f796709c50f4bbb300788edd42fd4f (diff) |
xdg-shell: rename surface role handlers
-rw-r--r-- | include/types/wlr_xdg_shell.h | 4 | ||||
-rw-r--r-- | types/xdg_shell/wlr_xdg_popup.c | 4 | ||||
-rw-r--r-- | types/xdg_shell/wlr_xdg_surface.c | 4 | ||||
-rw-r--r-- | types/xdg_shell/wlr_xdg_toplevel.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/include/types/wlr_xdg_shell.h b/include/types/wlr_xdg_shell.h index 8b2c66cc..d8905bcf 100644 --- a/include/types/wlr_xdg_shell.h +++ b/include/types/wlr_xdg_shell.h @@ -19,8 +19,8 @@ struct wlr_xdg_surface *create_xdg_surface( void unmap_xdg_surface(struct wlr_xdg_surface *surface); void reset_xdg_surface(struct wlr_xdg_surface *xdg_surface); void destroy_xdg_surface(struct wlr_xdg_surface *surface); -void handle_xdg_surface_commit(struct wlr_surface *wlr_surface); -void handle_xdg_surface_precommit(struct wlr_surface *wlr_surface, +void xdg_surface_role_commit(struct wlr_surface *wlr_surface); +void xdg_surface_role_precommit(struct wlr_surface *wlr_surface, const struct wlr_surface_state *state); void create_xdg_positioner(struct wlr_xdg_client *client, uint32_t id); diff --git a/types/xdg_shell/wlr_xdg_popup.c b/types/xdg_shell/wlr_xdg_popup.c index 3718ef74..c8d76ee1 100644 --- a/types/xdg_shell/wlr_xdg_popup.c +++ b/types/xdg_shell/wlr_xdg_popup.c @@ -293,8 +293,8 @@ static void xdg_popup_handle_resource_destroy(struct wl_resource *resource) { const struct wlr_surface_role xdg_popup_surface_role = { .name = "xdg_popup", - .commit = handle_xdg_surface_commit, - .precommit = handle_xdg_surface_precommit, + .commit = xdg_surface_role_commit, + .precommit = xdg_surface_role_precommit, }; void create_xdg_popup(struct wlr_xdg_surface *xdg_surface, diff --git a/types/xdg_shell/wlr_xdg_surface.c b/types/xdg_shell/wlr_xdg_surface.c index d54c058e..62251d53 100644 --- a/types/xdg_shell/wlr_xdg_surface.c +++ b/types/xdg_shell/wlr_xdg_surface.c @@ -305,7 +305,7 @@ static void xdg_surface_handle_surface_commit(struct wl_listener *listener, } } -void handle_xdg_surface_commit(struct wlr_surface *wlr_surface) { +void xdg_surface_role_commit(struct wlr_surface *wlr_surface) { struct wlr_xdg_surface *surface = wlr_xdg_surface_from_wlr_surface(wlr_surface); if (surface == NULL) { @@ -338,7 +338,7 @@ void handle_xdg_surface_commit(struct wlr_surface *wlr_surface) { } } -void handle_xdg_surface_precommit(struct wlr_surface *wlr_surface, +void xdg_surface_role_precommit(struct wlr_surface *wlr_surface, const struct wlr_surface_state *state) { struct wlr_xdg_surface *surface = wlr_xdg_surface_from_wlr_surface(wlr_surface); diff --git a/types/xdg_shell/wlr_xdg_toplevel.c b/types/xdg_shell/wlr_xdg_toplevel.c index b5a7239b..47a324d2 100644 --- a/types/xdg_shell/wlr_xdg_toplevel.c +++ b/types/xdg_shell/wlr_xdg_toplevel.c @@ -443,8 +443,8 @@ static void xdg_toplevel_handle_resource_destroy(struct wl_resource *resource) { const struct wlr_surface_role xdg_toplevel_surface_role = { .name = "xdg_toplevel", - .commit = handle_xdg_surface_commit, - .precommit = handle_xdg_surface_precommit, + .commit = xdg_surface_role_commit, + .precommit = xdg_surface_role_precommit, }; void create_xdg_toplevel(struct wlr_xdg_surface *xdg_surface, |