New option: First keypress enables backlight only. Patch #2920 by Nicolas Pennequin.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9228 a1c6a512-1295-4272-9138-f99709370657

4 files changed, 32 insertions, 0 deletions

diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index 057282f81a..65e45cff5c 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -3832,3 +3832,9 @@ desc: "pitch" in the pitch screen
 eng: "Pitch"
 voice: "Pitch"
 new:
+
+id: LANG_BACKLIGHT_FILTER_FIRST_KEYPRESS
+desc: Backlight behaviour setting
+eng: "First keypress enables backlight only"
+voice: "First keypress enables backlight only"
+new:
diff --git a/apps/settings.c b/apps/settings.c
index f5c0ba7c2d..4487361e8d 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -296,6 +296,14 @@ static const struct bit_entry rtc_bits[] =
 #endif
 #endif
 
+#ifdef CONFIG_BACKLIGHT
+#ifdef HAVE_LCD_COLOR
+    {1, S_O(bl_filter_first_keypress), true, "backlight filters first keypress", off_on },
+#else
+    {1, S_O(bl_filter_first_keypress), false, "backlight filters first keypress", off_on },
+#endif
+#endif
+
     /* new stuff to be added here */
     /* If values are just added to the end, no need to bump the version. */
 
@@ -1115,6 +1123,10 @@ void settings_apply(void)
 #ifdef HAVE_SPDIF_POWER
     spdif_power_enable(global_settings.spdif_enable);
 #endif
+
+#ifdef CONFIG_BACKLIGHT
+    set_backlight_filter_keypress(global_settings.bl_filter_first_keypress);
+#endif
 }
 
 
diff --git a/apps/settings.h b/apps/settings.h
index 52e949ea9e..2fd52aea9e 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -472,6 +472,10 @@ struct user_settings
     int fg_color; /* foreground color native format */
 #endif
     bool party_mode;    /* party mode - unstoppable music */
+    
+#ifdef CONFIG_BACKLIGHT
+    bool bl_filter_first_keypress;   /* filter first keypress when dark? */
+#endif
 };
 
 enum optiontype { INT, BOOL };
diff --git a/apps/settings_menu.c b/apps/settings_menu.c
index 6e8d62191f..70703a23ce 100644
--- a/apps/settings_menu.c
+++ b/apps/settings_menu.c
@@ -1046,6 +1046,15 @@ static bool set_party_mode(void)
     return set_bool( str(LANG_PARTY_MODE), &global_settings.party_mode );
 }
 
+#ifdef CONFIG_BACKLIGHT
+static bool set_bl_filter_first_keypress(void)
+{
+    bool result = set_bool( str(LANG_BACKLIGHT_FILTER_FIRST_KEYPRESS), 
+                            &global_settings.bl_filter_first_keypress );
+    set_backlight_filter_keypress(global_settings.bl_filter_first_keypress);
+    return result;
+}
+#endif 
 
 static bool ff_rewind_accel(void) 
 { 
@@ -1621,6 +1630,7 @@ static bool lcd_settings_menu(void)
 #ifdef HAVE_BACKLIGHT_BRIGHTNESS
         { ID2P(LANG_BRIGHTNESS), brightness },
 #endif
+        { ID2P(LANG_BACKLIGHT_FILTER_FIRST_KEYPRESS), set_bl_filter_first_keypress },
 #endif /* CONFIG_BACKLIGHT */
         { ID2P(LANG_CONTRAST),        contrast },
 #ifdef HAVE_LCD_BITMAP