styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix screen blanking while fullscreen window is up - work again 

@fix - this fixes T1019 - when a window is fullscreen the display just
NVER can blank no mater what. it's hrdcoded, and wrong to enforce. if
an app wants to display screensaver - there is the xscreensaver extn -
or maybe supporting an explicit property on a window would work
better, but just equating fullscreen == never blank is wrong. it's an
option now. off by default.
This commit is contained in:
Carsten Haitzler 2014-03-01 08:04:09 +09:00
parent e77d536466
commit 5c8710ded3
4 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/bin/e_config.c
View File

@ -597,6 +597,7 @@ _e_config_edd_init(Eina_Bool old)
E_CONFIG_VAL(D, T, dpms_standby_timeout, INT);
E_CONFIG_VAL(D, T, dpms_suspend_timeout, INT);
E_CONFIG_VAL(D, T, dpms_off_timeout, INT);
E_CONFIG_VAL(D, T, no_dpms_on_fullscreen, UCHAR);
E_CONFIG_VAL(D, T, clientlist_group_by, INT);
E_CONFIG_VAL(D, T, clientlist_include_all_zones, INT);

1
src/bin/e_config.h
View File

@ -240,6 +240,7 @@ struct _E_Config
int dpms_suspend_timeout; // GUI
int dpms_off_enable; // GUI
int dpms_off_timeout; // GUI
unsigned char no_dpms_on_fullscreen; // GUI
int clientlist_group_by; // GUI
int clientlist_include_all_zones; // GUI

9
src/bin/e_dpms.c
View File

@ -23,7 +23,8 @@ e_dpms_update(void)
enabled = ((e_config->screensaver_enable) &&
(!e_config->mode.presentation) &&
(!e_util_fullscreen_current_any()));
((!e_util_fullscreen_current_any()) && (!e_config->no_dpms_on_fullscreen))
);
if (_e_dpms_enabled != enabled)
{
_e_dpms_enabled = enabled;
@ -88,21 +89,21 @@ _e_dpms_handler_config_mode_cb(void *data __UNUSED__, int type __UNUSED__, void
static Eina_Bool
_e_dpms_handler_border_fullscreen_check_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
{
e_dpms_update();
if (e_config->no_dpms_on_fullscreen) e_dpms_update();
return ECORE_CALLBACK_PASS_ON;
}
static Eina_Bool
_e_dpms_handler_border_desk_set_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
{
e_dpms_update();
if (e_config->no_dpms_on_fullscreen) e_dpms_update();
return ECORE_CALLBACK_PASS_ON;
}
static Eina_Bool
_e_dpms_handler_desk_show_cb(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
{
e_dpms_update();
if (e_config->no_dpms_on_fullscreen) e_dpms_update();
return ECORE_CALLBACK_PASS_ON;
}

11
src/modules/conf_display/e_int_config_screensaver.c
View File

@ -30,6 +30,7 @@ struct _E_Config_Dialog_Data
int wake_on_notify;
int wake_on_urgent;
int no_dpms_on_fullscreen;
struct
{
@ -73,6 +74,7 @@ _fill_data(E_Config_Dialog_Data *cfdata)
cfdata->wake_on_notify = e_config->screensaver_wake_on_notify;
cfdata->wake_on_urgent = e_config->screensaver_wake_on_urgent;
cfdata->no_dpms_on_fullscreen = e_config->no_dpms_on_fullscreen;
}
static void *
@ -127,6 +129,8 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
e_config->dpms_off_timeout = e_config->screensaver_timeout;
}
e_config->no_dpms_on_fullscreen = cfdata->no_dpms_on_fullscreen;
/* Apply settings */
e_screensaver_update();
e_dpms_update();
@ -146,7 +150,8 @@ _basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfda
(e_config->screensaver_suspend_on_ac != cfdata->screensaver_suspend_on_ac) ||
(e_config->screensaver_suspend_delay != cfdata->screensaver_suspend_delay) ||
(e_config->screensaver_wake_on_notify != cfdata->wake_on_notify) ||
(e_config->screensaver_wake_on_urgent != cfdata->wake_on_urgent)
(e_config->screensaver_wake_on_urgent != cfdata->wake_on_urgent) ||
(e_config->dpms_off_timeout != cfdata->no_dpms_on_fullscreen)
);
}
@ -188,6 +193,10 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data
e_widget_check_widget_disable_on_unchecked_add(oc, ow);
e_widget_list_object_append(ol, ow, 1, 1, 0.5);
oc = e_widget_check_add(evas, _("Disable blanking for Fullscreen Windows"),
&(cfdata->no_dpms_on_fullscreen));
e_widget_list_object_append(ol, oc, 1, 1, 0.5);
e_widget_toolbook_page_append(otb, NULL, _("Blanking"), ol,
1, 0, 1, 0, 0.5, 0.0);