From c7001437eff9ccf5add648d6210ea94c597e6a28 Mon Sep 17 00:00:00 2001 From: Bryce Harrington Date: Tue, 30 Aug 2016 12:04:50 -0700 Subject: [PATCH] Revert "libweston: Add a signal to fire when the idle inhibitor is dropped" This reverts commit ca5b62426a97b4607d60eaf1154881ac8c1ac994. (Accidental landing) --- libweston/compositor.c | 23 ++++++----------------- libweston/compositor.h | 1 - 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/libweston/compositor.c b/libweston/compositor.c index f5039333..92f74aaf 100644 --- a/libweston/compositor.c +++ b/libweston/compositor.c @@ -459,7 +459,6 @@ weston_surface_create(struct weston_compositor *compositor) wl_signal_init(&surface->destroy_signal); wl_signal_init(&surface->commit_signal); - wl_signal_init(&surface->drop_idle_inhibitor_signal); surface->compositor = compositor; surface->ref_count = 1; @@ -4730,33 +4729,23 @@ struct weston_idle_inhibitor { struct weston_surface *surface; }; -/* Called when the client requests destruction of the idle inhibitor */ static void -idle_inhibitor_destroy(struct wl_client *client, struct wl_resource *resource) +destroy_idle_inhibitor(struct wl_resource *resource) { struct weston_idle_inhibitor *inhibitor = wl_resource_get_user_data(resource); - assert(inhibitor); - - inhibitor->surface->inhibit_idling = false; - - // Notify to re-queue any idle behaviors - wl_signal_emit(&inhibitor->surface->drop_idle_inhibitor_signal, - inhibitor->surface); - - weston_log("idle_inhibitor_destroy\n"); + inhibitor->surface = NULL; + free(inhibitor); } -/* Called when the idle inhibitor is destroyed on the server-side */ static void -destroy_idle_inhibitor(struct wl_resource *resource) +idle_inhibitor_destroy(struct wl_client *client, struct wl_resource *resource) { struct weston_idle_inhibitor *inhibitor = wl_resource_get_user_data(resource); - weston_log("destroy_idle_inhibitor\n"); + assert(inhibitor); - inhibitor->surface = NULL; - free(inhibitor); + inhibitor->surface->inhibit_idling = false; } static const struct zwp_idle_inhibitor_v1_interface idle_inhibitor_interface = { diff --git a/libweston/compositor.h b/libweston/compositor.h index 0c688cc1..673a4e85 100644 --- a/libweston/compositor.h +++ b/libweston/compositor.h @@ -1071,7 +1071,6 @@ struct weston_surface { struct wl_signal destroy_signal; /* callback argument: this surface */ struct weston_compositor *compositor; struct wl_signal commit_signal; - struct wl_signal drop_idle_inhibitor_signal; /** Damage in local coordinates from the client, for tex upload. */ pixman_region32_t damage;