From 15e395b88ed0c6ced742d55a9fc4d1de46b865c4 Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Wed, 12 May 2021 23:13:16 +0100 Subject: [PATCH] blanking - fiddling with it to try find a vbox bug... fix some things make dpms delay longer - 10 sec. force pointers to not render if comp not rendering nuke open menus on blank remove unused vars --- src/bin/e_comp.c | 4 ---- src/bin/e_comp_x.c | 11 +++++++++++ src/bin/e_config.c | 6 +++--- src/bin/e_dpms.c | 6 +++--- src/bin/e_pointer.c | 1 + src/modules/conf_display/e_int_config_screensaver.c | 6 +++--- 6 files changed, 21 insertions(+), 13 deletions(-) diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c index 49b21228b..cd613b908 100644 --- a/src/bin/e_comp.c +++ b/src/bin/e_comp.c @@ -34,8 +34,6 @@ static Ecore_Timer *action_timeout = NULL; static Eina_Bool gl_avail = EINA_FALSE; static Eina_Bool shape_debug = EINA_FALSE; -static double ecore_frametime = 0; - static int _e_comp_log_dom = -1; E_API int E_EVENT_COMPOSITOR_UPDATE = -1; @@ -1073,7 +1071,6 @@ _e_comp_screensaver_on(void *data EINA_UNUSED, int type EINA_UNUSED, void *event Eina_List *l; E_Zone *zone; - ecore_frametime = ecore_animator_frametime_get(); if (e_comp->saver) return ECORE_CALLBACK_RENEW; e_comp_override_add(); e_comp->saver = EINA_TRUE; @@ -1200,7 +1197,6 @@ e_comp_init(void) { _e_comp_log_dom = eina_log_domain_register("e_comp", EINA_COLOR_YELLOW); - ecore_frametime = ecore_animator_frametime_get(); shape_debug = !!getenv("E_SHAPE_DEBUG"); E_EVENT_COMPOSITOR_UPDATE = ecore_event_type_new(); diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c index 632c204a1..69dc1d333 100644 --- a/src/bin/e_comp_x.c +++ b/src/bin/e_comp_x.c @@ -5307,6 +5307,17 @@ _e_comp_x_screensaver_on() if ((s) && (atoi(s) == 1)) { + if (e_menu_is_active()) + { + E_Menu *m = e_menu_active_get(); + + if (m) + { + E_Menu *m2 = e_menu_root_get(m); + + if (m2) e_menu_deactivate(m2); + } + } if (!e_desklock_state_get()) { _e_comp_pointer_ungrab(); diff --git a/src/bin/e_config.c b/src/bin/e_config.c index 8d242a973..9588e1d3c 100644 --- a/src/bin/e_config.c +++ b/src/bin/e_config.c @@ -1917,9 +1917,9 @@ e_config_load(void) E_CONFIG_LIMIT(e_config->dpms_standby_enable, 0, 1); E_CONFIG_LIMIT(e_config->dpms_suspend_enable, 0, 1); E_CONFIG_LIMIT(e_config->dpms_off_enable, 0, 1); - E_CONFIG_LIMIT(e_config->dpms_standby_timeout, 30, 5400); - E_CONFIG_LIMIT(e_config->dpms_suspend_timeout, 30, 5400); - E_CONFIG_LIMIT(e_config->dpms_off_timeout, 30, 5400); + E_CONFIG_LIMIT(e_config->dpms_standby_timeout, 5, 5400); + E_CONFIG_LIMIT(e_config->dpms_suspend_timeout, 5, 5400); + E_CONFIG_LIMIT(e_config->dpms_off_timeout, 5, 5400); E_CONFIG_LIMIT(e_config->scale.min, 0.1, 40.0); E_CONFIG_LIMIT(e_config->scale.max, 0.1, 40.0); diff --git a/src/bin/e_dpms.c b/src/bin/e_dpms.c index cea42679c..93b021676 100644 --- a/src/bin/e_dpms.c +++ b/src/bin/e_dpms.c @@ -21,9 +21,9 @@ static Ecore_Timer *suspend_timer; static Ecore_Timer *off_timer; #endif -#define STANDBY 5 -#define SUSPEND 6 -#define OFF 7 +#define STANDBY 10 +#define SUSPEND 11 +#define OFF 12 E_API void e_dpms_update(void) diff --git a/src/bin/e_pointer.c b/src/bin/e_pointer.c index a8d9918cc..22a040fb4 100644 --- a/src/bin/e_pointer.c +++ b/src/bin/e_pointer.c @@ -783,6 +783,7 @@ e_pointer_idler_before(void) if (!e_config->show_cursor) return; + if (ecore_evas_manual_render_get(e_comp->ee)) return; EINA_LIST_FOREACH(_ptrs, l, ptr) { if ((!ptr->e_cursor) || (!ptr->buffer_evas)) continue; diff --git a/src/modules/conf_display/e_int_config_screensaver.c b/src/modules/conf_display/e_int_config_screensaver.c index 2041c9b03..1809e4d93 100644 --- a/src/modules/conf_display/e_int_config_screensaver.c +++ b/src/modules/conf_display/e_int_config_screensaver.c @@ -131,9 +131,9 @@ _basic_apply(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata) (e_config->backlight.timer > (e_config->screensaver_timeout))) { e_config->screensaver_timeout = e_config->backlight.timer; - e_config->dpms_standby_timeout = e_config->screensaver_timeout; - e_config->dpms_suspend_timeout = e_config->screensaver_timeout; - e_config->dpms_off_timeout = e_config->screensaver_timeout; + e_config->dpms_standby_timeout = e_config->screensaver_timeout + 5; + e_config->dpms_suspend_timeout = e_config->screensaver_timeout + 6; + e_config->dpms_off_timeout = e_config->screensaver_timeout + 7; } e_config->no_dpms_on_fullscreen = cfdata->no_dpms_on_fullscreen;