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

display current backlight mode in backlight settings 

SVN revision: 72852
This commit is contained in:
Mike Blumenkrantz 2012-06-26 07:14:27 +00:00
parent ded80790e8
commit 386ab914b9
3 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/bin/e_backlight.c
View File

@ -13,7 +13,6 @@
static double bl_val = 1.0; static double bl_val = 1.0;
static double bl_animval = 1.0; static double bl_animval = 1.0;
static E_Backlight_Mode bl_mode = E_BACKLIGHT_MODE_NORMAL;
static int sysmode = MODE_NONE; static int sysmode = MODE_NONE;
static Ecore_Animator *bl_anim = NULL; static Ecore_Animator *bl_anim = NULL;
@ -207,7 +206,7 @@ e_backlight_update(void)
/* timer is 0 seconds: return */ /* timer is 0 seconds: return */
if (!e_config->backlight.timer) return; if (!e_config->backlight.timer) return;
/* current mode is dimmed: undim */ /* current mode is dimmed: undim */
if (bl_mode == E_BACKLIGHT_MODE_DIM) if (e_config->backlight.mode == E_BACKLIGHT_MODE_DIM)
e_backlight_mode_set(NULL, E_BACKLIGHT_MODE_NORMAL); e_backlight_mode_set(NULL, E_BACKLIGHT_MODE_NORMAL);
_e_backlight_timer = ecore_timer_add(e_config->backlight.timer, _e_backlight_timer_cb, NULL); _e_backlight_timer = ecore_timer_add(e_config->backlight.timer, _e_backlight_timer_cb, NULL);
} }
@ -226,7 +225,7 @@ e_backlight_level_set(E_Zone *zone, double val, double tim)
if (!zone) zone = e_util_zone_current_get(e_manager_current_get()); if (!zone) zone = e_util_zone_current_get(e_manager_current_get());
bl_now = bl_val; bl_now = bl_val;
bl_val = val; bl_val = val;
if (bl_mode != E_BACKLIGHT_MODE_NORMAL) return; if (e_config->backlight.mode != E_BACKLIGHT_MODE_NORMAL) return;
if (tim < 0.0) tim = e_config->backlight.transition; if (tim < 0.0) tim = e_config->backlight.transition;
if (tim == 0.0) if (tim == 0.0)
{ {
@ -254,15 +253,15 @@ EAPI void
e_backlight_mode_set(E_Zone *zone, E_Backlight_Mode mode) e_backlight_mode_set(E_Zone *zone, E_Backlight_Mode mode)
{ {
// zone == NULL == everything // zone == NULL == everything
if (bl_mode == mode) return; if (e_config->backlight.mode == mode) return;
bl_mode = mode; e_config->backlight.mode = mode;
if (bl_mode == E_BACKLIGHT_MODE_NORMAL) if (e_config->backlight.mode == E_BACKLIGHT_MODE_NORMAL)
e_backlight_level_set(zone, bl_val, -1.0); e_backlight_level_set(zone, bl_val, -1.0);
else if (bl_mode == E_BACKLIGHT_MODE_OFF) else if (e_config->backlight.mode == E_BACKLIGHT_MODE_OFF)
e_backlight_level_set(zone, 0.0, -1.0); e_backlight_level_set(zone, 0.0, -1.0);
else if (bl_mode == E_BACKLIGHT_MODE_DIM) else if (e_config->backlight.mode == E_BACKLIGHT_MODE_DIM)
e_backlight_level_set(zone, e_config->backlight.dim, -1.0); e_backlight_level_set(zone, e_config->backlight.dim, -1.0);
else if (bl_mode == E_BACKLIGHT_MODE_MAX) else if (e_config->backlight.mode == E_BACKLIGHT_MODE_MAX)
e_backlight_level_set(zone, 1.0, -1.0); e_backlight_level_set(zone, 1.0, -1.0);
} }
@ -270,7 +269,7 @@ EAPI E_Backlight_Mode
e_backlight_mode_get(E_Zone *zone __UNUSED__) e_backlight_mode_get(E_Zone *zone __UNUSED__)
{ {
// zone == NULL == everything // zone == NULL == everything
return bl_mode; return e_config->backlight.mode;
} }
/* local subsystem functions */ /* local subsystem functions */

1
src/bin/e_config.h
View File

@ -327,6 +327,7 @@ struct _E_Config
double transition; // GUI double transition; // GUI
unsigned char idle_dim; // GUI unsigned char idle_dim; // GUI
double timer; // GUI double timer; // GUI
E_Backlight_Mode mode; /* not saved, display-only */
} backlight; } backlight;
struct struct

17
src/modules/conf_display/e_int_config_dpms.c
View File

@ -297,6 +297,23 @@ _advanced_create_widgets(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_D
o = e_widget_list_add(evas, 0, 0); o = e_widget_list_add(evas, 0, 0);
{
char buf[32];
switch (e_config->backlight.mode)
{
case 0:
snprintf(buf, sizeof(buf), "%s: RANDR", _("Mode"));
break;
case 1:
snprintf(buf, sizeof(buf), "%s: EEZE", _("Mode"));
break;
default:
snprintf(buf, sizeof(buf), "%s: NONE", _("Mode"));
}
ob = e_widget_label_add(evas, buf);
e_widget_list_object_append(o, ob, 0, 1, 0.5);
}
ob = e_widget_label_add(evas, _("Normal Backlight")); ob = e_widget_label_add(evas, _("Normal Backlight"));
e_widget_list_object_append(o, ob, 1, 1, 0.5); e_widget_list_object_append(o, ob, 1, 1, 0.5);
ob = e_widget_slider_add(evas, 1, 0, _("%3.0f"), 0.0, 100.0, 1.0, 0, ob = e_widget_slider_add(evas, 1, 0, _("%3.0f"), 0.0, 100.0, 1.0, 0,