diff options
| -rw-r--r-- | include/wlr/types/wlr_surface.h | 2 | ||||
| -rw-r--r-- | rootston/wl_shell.c | 2 | ||||
| -rw-r--r-- | types/wlr_seat.c | 4 | ||||
| -rw-r--r-- | types/wlr_surface.c | 10 | ||||
| -rw-r--r-- | types/wlr_wl_shell.c | 2 | ||||
| -rw-r--r-- | types/wlr_xdg_shell_v6.c | 4 |
6 files changed, 12 insertions, 12 deletions
diff --git a/include/wlr/types/wlr_surface.h b/include/wlr/types/wlr_surface.h index 23e53811..9f898b38 100644 --- a/include/wlr/types/wlr_surface.h +++ b/include/wlr/types/wlr_surface.h @@ -71,7 +71,7 @@ struct wlr_surface { struct { struct wl_signal commit; struct wl_signal destroy; - } signals; + } events; // destroy listener used by compositor struct wl_listener compositor_listener; diff --git a/rootston/wl_shell.c b/rootston/wl_shell.c index eb977367..009a8c06 100644 --- a/rootston/wl_shell.c +++ b/rootston/wl_shell.c @@ -102,7 +102,7 @@ void handle_wl_shell_surface(struct wl_listener *listener, void *data) { wl_list_init(&roots_surface->request_set_maximized.link); wl_list_init(&roots_surface->surface_commit.link); roots_surface->surface_commit.notify = handle_surface_commit; - wl_signal_add(&surface->surface->signals.commit, + wl_signal_add(&surface->surface->events.commit, &roots_surface->surface_commit); struct roots_view *view = calloc(1, sizeof(struct roots_view)); diff --git a/types/wlr_seat.c b/types/wlr_seat.c index 4f8d3744..4566053d 100644 --- a/types/wlr_seat.c +++ b/types/wlr_seat.c @@ -417,7 +417,7 @@ void wlr_seat_pointer_enter(struct wlr_seat *wlr_seat, wl_list_remove(&wlr_seat->pointer_state.resource_destroy.link); wl_list_init(&wlr_seat->pointer_state.resource_destroy.link); if (surface) { - wl_signal_add(&surface->signals.destroy, + wl_signal_add(&surface->events.destroy, &wlr_seat->pointer_state.surface_destroy); wl_resource_add_destroy_listener(surface->resource, &wlr_seat->pointer_state.resource_destroy); @@ -733,7 +733,7 @@ void wlr_seat_keyboard_enter(struct wlr_seat *wlr_seat, wl_list_remove(&wlr_seat->keyboard_state.resource_destroy.link); wl_list_init(&wlr_seat->keyboard_state.resource_destroy.link); if (surface) { - wl_signal_add(&surface->signals.destroy, + wl_signal_add(&surface->events.destroy, &wlr_seat->keyboard_state.surface_destroy); wl_resource_add_destroy_listener(surface->resource, &wlr_seat->keyboard_state.resource_destroy); diff --git a/types/wlr_surface.c b/types/wlr_surface.c index 8fd8baaa..e675ac69 100644 --- a/types/wlr_surface.c +++ b/types/wlr_surface.c @@ -360,7 +360,7 @@ static void wlr_surface_commit_pending(struct wlr_surface *surface) { oldh != surface->current->buffer_height; // TODO: add the invalid bitfield to this callback - wl_signal_emit(&surface->signals.commit, surface); + wl_signal_emit(&surface->events.commit, surface); } static bool wlr_subsurface_is_synchronized(struct wlr_subsurface *subsurface) { @@ -583,7 +583,7 @@ void wlr_subsurface_destroy(struct wlr_subsurface *subsurface) { static void destroy_surface(struct wl_resource *resource) { struct wlr_surface *surface = wl_resource_get_user_data(resource); - wl_signal_emit(&surface->signals.destroy, surface); + wl_signal_emit(&surface->events.destroy, surface); if (surface->subsurface) { wlr_subsurface_destroy(surface->subsurface); @@ -611,8 +611,8 @@ struct wlr_surface *wlr_surface_create(struct wl_resource *res, surface->current = wlr_surface_state_create(); surface->pending = wlr_surface_state_create(); - wl_signal_init(&surface->signals.commit); - wl_signal_init(&surface->signals.destroy); + wl_signal_init(&surface->events.commit); + wl_signal_init(&surface->events.destroy); wl_list_init(&surface->subsurface_list); wl_list_init(&surface->subsurface_pending_list); wl_resource_set_implementation(res, &surface_interface, @@ -803,7 +803,7 @@ void wlr_surface_make_subsurface(struct wlr_surface *surface, // link parent subsurface->parent = parent; - wl_signal_add(&parent->signals.destroy, + wl_signal_add(&parent->events.destroy, &subsurface->parent_destroy_listener); subsurface->parent_destroy_listener.notify = subsurface_handle_parent_destroy; diff --git a/types/wlr_wl_shell.c b/types/wlr_wl_shell.c index 80b8567b..e1507e2f 100644 --- a/types/wlr_wl_shell.c +++ b/types/wlr_wl_shell.c @@ -334,7 +334,7 @@ static void wl_shell_get_shell_surface(struct wl_client *client, wl_signal_init(&wl_surface->events.set_title); wl_signal_init(&wl_surface->events.set_class); - wl_signal_add(&wl_surface->surface->signals.destroy, + wl_signal_add(&wl_surface->surface->events.destroy, &wl_surface->surface_destroy_listener); wl_surface->surface_destroy_listener.notify = handle_wlr_surface_destroyed; diff --git a/types/wlr_xdg_shell_v6.c b/types/wlr_xdg_shell_v6.c index fbe01528..5f2554f8 100644 --- a/types/wlr_xdg_shell_v6.c +++ b/types/wlr_xdg_shell_v6.c @@ -1109,11 +1109,11 @@ static void xdg_shell_get_xdg_surface(struct wl_client *wl_client, wl_signal_init(&surface->events.ack_configure); wl_signal_init(&surface->events.ping_timeout); - wl_signal_add(&surface->surface->signals.destroy, + wl_signal_add(&surface->surface->events.destroy, &surface->surface_destroy_listener); surface->surface_destroy_listener.notify = handle_wlr_surface_destroyed; - wl_signal_add(&surface->surface->signals.commit, + wl_signal_add(&surface->surface->events.commit, &surface->surface_commit_listener); surface->surface_commit_listener.notify = handle_wlr_surface_committed; |