discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=d4aa1ba7c252a03654adb3434a22d2e6f6c73d42
commit d4aa1ba7c252a03654adb3434a22d2e6f6c73d42 Author: Mike Blumenkrantz <[email protected]> Date: Tue Aug 4 19:10:09 2015 -0400 add functionality for blocking wl screensaver activation --- src/bin/e_screensaver.c | 18 +++++++++++++++++- src/bin/e_screensaver.h | 1 + 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/bin/e_screensaver.c b/src/bin/e_screensaver.c index 9ad749f..cedfcae 100644 --- a/src/bin/e_screensaver.c +++ b/src/bin/e_screensaver.c @@ -27,6 +27,7 @@ static Eina_Bool screensaver_dimmed = EINA_FALSE; #ifdef HAVE_WAYLAND static Ecore_Timer *_e_screensaver_timer; +static Eina_Bool _e_screensaver_inhibited = EINA_FALSE; #endif E_API int E_EVENT_SCREENSAVER_ON = -1; @@ -537,7 +538,7 @@ E_API void e_screensaver_notidle(void) { #ifdef HAVE_WAYLAND - if (e_comp->comp_type != E_PIXMAP_TYPE_WL) return; + if (_e_screensaver_inhibited || (e_comp->comp_type != E_PIXMAP_TYPE_WL)) return; E_FREE_FUNC(_e_screensaver_timer, ecore_timer_del); if (e_screensaver_on_get()) { @@ -549,3 +550,18 @@ e_screensaver_notidle(void) #endif } +E_API void +e_screensaver_inhibit_toggle(Eina_Bool inhibit) +{ +#ifdef HAVE_WAYLAND + if (e_comp->comp_type != E_PIXMAP_TYPE_WL) return; + E_FREE_FUNC(_e_screensaver_timer, ecore_timer_del); + _e_screensaver_inhibited = !!inhibit; + if (inhibit) + e_screensaver_eval(0); + else + e_screensaver_notidle(); +#else + (void)inhibit; +#endif +} diff --git a/src/bin/e_screensaver.h b/src/bin/e_screensaver.h index 281e5c0..35e94cb 100644 --- a/src/bin/e_screensaver.h +++ b/src/bin/e_screensaver.h @@ -17,6 +17,7 @@ E_API void e_screensaver_deactivate(void); E_API void e_screensaver_eval(Eina_Bool saver_on); E_API void e_screensaver_notidle(void); +E_API void e_screensaver_inhibit_toggle(Eina_Bool inhibit); E_API extern int E_EVENT_SCREENSAVER_ON; E_API extern int E_EVENT_SCREENSAVER_OFF_PRE; --
