From 2841111025323a184986a98e11e9d83b86cebb6b Mon Sep 17 00:00:00 2001 From: Pekka Paalanen Date: Tue, 15 Nov 2011 13:34:50 +0200 Subject: [PATCH] compositor: remove idle_inhibit optimization With the idle_inhibit optimization, wlsc_compositor_wake() is a no-op if idle_inhibit > 0. When the shell is waking up the compositor from SLEEPING state as an indirect response to input activity, it does not work. The call path is: notify_key() / notify_button() wlsc_compositor_idle_inhibit() wlsc_compositor_activity() shell->unlock() send prepare_lock_surface event idle_inhibit++ and when the desktop-shell client responds to the event: desktop_shell_set_lock_surface() / desktop_shell_unlock() wlsc_compositor_wake() no-op, because idle_inhibit > 0 Fix this by removing the idle_inhibit check from wlsc_compositor_wake(). The optimization did not work for pointer motion while no keys pressed, anyway, so the performance hit is probably unobservable. Now the compositor wakes up also on key or button press. Signed-off-by: Pekka Paalanen --- compositor/compositor.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/compositor/compositor.c b/compositor/compositor.c index 42aff23e..803bd2f9 100644 --- a/compositor/compositor.c +++ b/compositor/compositor.c @@ -1331,9 +1331,6 @@ static const struct wl_grab_interface implicit_grab_interface = { WL_EXPORT void wlsc_compositor_wake(struct wlsc_compositor *compositor) { - if (compositor->idle_inhibit) - return; - wlsc_compositor_fade(compositor, 0.0); compositor->state = WLSC_COMPOSITOR_ACTIVE;