From 119f98f2b8f98789197b5acacd15546f14b43714 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Sun, 1 Jun 2025 15:08:50 +0200 Subject: [PATCH] xdg_shell: rename xdg_toplevel signal handlers These handlers aren't invoked for all types of xdg_shell surfaces: they are only invoked for xdg_toplevel, and are not for xdg_popup. Rename them accordingly. --- xdg_shell.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/xdg_shell.c b/xdg_shell.c index 10224ae..cc86bf6 100644 --- a/xdg_shell.c +++ b/xdg_shell.c @@ -184,7 +184,7 @@ destroy(struct cg_view *view) } static void -handle_xdg_shell_surface_request_fullscreen(struct wl_listener *listener, void *data) +handle_xdg_toplevel_request_fullscreen(struct wl_listener *listener, void *data) { struct cg_xdg_shell_view *xdg_shell_view = wl_container_of(listener, xdg_shell_view, request_fullscreen); @@ -201,7 +201,7 @@ handle_xdg_shell_surface_request_fullscreen(struct wl_listener *listener, void * } static void -handle_xdg_shell_surface_unmap(struct wl_listener *listener, void *data) +handle_xdg_toplevel_unmap(struct wl_listener *listener, void *data) { struct cg_xdg_shell_view *xdg_shell_view = wl_container_of(listener, xdg_shell_view, unmap); struct cg_view *view = &xdg_shell_view->view; @@ -210,7 +210,7 @@ handle_xdg_shell_surface_unmap(struct wl_listener *listener, void *data) } static void -handle_xdg_shell_surface_map(struct wl_listener *listener, void *data) +handle_xdg_toplevel_map(struct wl_listener *listener, void *data) { struct cg_xdg_shell_view *xdg_shell_view = wl_container_of(listener, xdg_shell_view, map); struct cg_view *view = &xdg_shell_view->view; @@ -219,7 +219,7 @@ handle_xdg_shell_surface_map(struct wl_listener *listener, void *data) } static void -handle_xdg_shell_surface_commit(struct wl_listener *listener, void *data) +handle_xdg_toplevel_commit(struct wl_listener *listener, void *data) { struct cg_xdg_shell_view *xdg_shell_view = wl_container_of(listener, xdg_shell_view, commit); @@ -233,7 +233,7 @@ handle_xdg_shell_surface_commit(struct wl_listener *listener, void *data) } static void -handle_xdg_shell_surface_destroy(struct wl_listener *listener, void *data) +handle_xdg_toplevel_destroy(struct wl_listener *listener, void *data) { struct cg_xdg_shell_view *xdg_shell_view = wl_container_of(listener, xdg_shell_view, destroy); struct cg_view *view = &xdg_shell_view->view; @@ -273,15 +273,15 @@ handle_new_xdg_toplevel(struct wl_listener *listener, void *data) view_init(&xdg_shell_view->view, server, CAGE_XDG_SHELL_VIEW, &xdg_shell_view_impl); xdg_shell_view->xdg_toplevel = toplevel; - xdg_shell_view->commit.notify = handle_xdg_shell_surface_commit; + xdg_shell_view->commit.notify = handle_xdg_toplevel_commit; wl_signal_add(&toplevel->base->surface->events.commit, &xdg_shell_view->commit); - xdg_shell_view->map.notify = handle_xdg_shell_surface_map; + xdg_shell_view->map.notify = handle_xdg_toplevel_map; wl_signal_add(&toplevel->base->surface->events.map, &xdg_shell_view->map); - xdg_shell_view->unmap.notify = handle_xdg_shell_surface_unmap; + xdg_shell_view->unmap.notify = handle_xdg_toplevel_unmap; wl_signal_add(&toplevel->base->surface->events.unmap, &xdg_shell_view->unmap); - xdg_shell_view->destroy.notify = handle_xdg_shell_surface_destroy; + xdg_shell_view->destroy.notify = handle_xdg_toplevel_destroy; wl_signal_add(&toplevel->events.destroy, &xdg_shell_view->destroy); - xdg_shell_view->request_fullscreen.notify = handle_xdg_shell_surface_request_fullscreen; + xdg_shell_view->request_fullscreen.notify = handle_xdg_toplevel_request_fullscreen; wl_signal_add(&toplevel->events.request_fullscreen, &xdg_shell_view->request_fullscreen); toplevel->base->data = xdg_shell_view;