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
This commit is contained in:
Carsten Haitzler 2021-05-12 23:13:16 +01:00
parent 66d7f6f43a
commit 15e395b88e
6 changed files with 21 additions and 13 deletions

View File

@ -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();

View File

@ -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();

View File

@ -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);

View File

@ -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)

View File

@ -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;

View File

@ -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;