diff options
| -rw-r--r-- | include/wlr/types/wlr_idle.h | 4 | ||||
| -rw-r--r-- | types/wlr_idle.c | 6 | ||||
| -rw-r--r-- | types/wlr_surface.c | 6 |
3 files changed, 6 insertions, 10 deletions
diff --git a/include/wlr/types/wlr_idle.h b/include/wlr/types/wlr_idle.h index 689c33a4..1744f07c 100644 --- a/include/wlr/types/wlr_idle.h +++ b/include/wlr/types/wlr_idle.h @@ -19,7 +19,9 @@ struct wlr_idle { struct wl_event_loop *event_loop; struct wl_listener display_destroy; - struct wl_signal activity_notify; + struct { + struct wl_signal activity_notify; + } events; void *data; }; diff --git a/types/wlr_idle.c b/types/wlr_idle.c index 51963aea..a3981479 100644 --- a/types/wlr_idle.c +++ b/types/wlr_idle.c @@ -122,7 +122,7 @@ static void create_idle_timer(struct wl_client *client, wl_signal_add(&timer->seat->events.destroy, &timer->seat_destroy); timer->input_listener.notify = handle_input_notification; - wl_signal_add(&idle->activity_notify, &timer->input_listener); + wl_signal_add(&idle->events.activity_notify, &timer->input_listener); // create the timer timer->idle_source = wl_event_loop_add_timer(idle->event_loop, idle_notify, timer); @@ -181,7 +181,7 @@ struct wlr_idle *wlr_idle_create(struct wl_display *display) { return NULL; } wl_list_init(&idle->idle_timers); - wl_signal_init(&idle->activity_notify); + wl_signal_init(&idle->events.activity_notify); idle->event_loop = wl_display_get_event_loop(display); if (idle->event_loop == NULL) { @@ -204,5 +204,5 @@ struct wlr_idle *wlr_idle_create(struct wl_display *display) { } void wlr_idle_notify_activity(struct wlr_idle *idle, struct wlr_seat *seat) { - wlr_signal_emit_safe(&idle->activity_notify, seat); + wlr_signal_emit_safe(&idle->events.activity_notify, seat); } diff --git a/types/wlr_surface.c b/types/wlr_surface.c index e2588167..d63fc1f1 100644 --- a/types/wlr_surface.c +++ b/types/wlr_surface.c @@ -170,12 +170,6 @@ static bool wlr_surface_update_size(struct wlr_surface *surface, height = tmp; } - struct wlr_frame_callback *cb, *tmp; - wl_list_for_each_safe(cb, tmp, &state->frame_callback_list, link) { - wl_resource_destroy(cb->resource); - } - wl_list_init(&state->frame_callback_list); - bool update_damage = false; if (width != state->width || height != state->height) { // Damage the whole surface on resize |