From a70c6b9b1e2bcf7a5a207017d6c40f5254f6ef98 Mon Sep 17 00:00:00 2001
From: Hristo Kovachev <bger@rockbox.org>
Date: Sat, 25 Mar 2006 19:16:45 +0000
Subject: Patch #4913 by David Rothenberger with some changes by me: add only
 backlight on first keypress to the lcd remotes, too.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9253 a1c6a512-1295-4272-9138-f99709370657
---
 apps/settings.c      | 14 ++++++++++++--
 apps/settings.h      |  3 +++
 apps/settings_menu.c | 10 ++++++++++
 3 files changed, 25 insertions(+), 2 deletions(-)

(limited to 'apps')

diff --git a/apps/settings.c b/apps/settings.c
index 4487361e8d..8c4e3dea71 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -297,11 +297,18 @@ static const struct bit_entry rtc_bits[] =
 #endif
 
 #ifdef CONFIG_BACKLIGHT
+    {1, S_O(bl_filter_first_keypress), 
 #ifdef HAVE_LCD_COLOR
-    {1, S_O(bl_filter_first_keypress), true, "backlight filters first keypress", off_on },
+            true,
 #else
-    {1, S_O(bl_filter_first_keypress), false, "backlight filters first keypress", off_on },
+            false,
 #endif
+            "backlight filters first keypress", off_on },
+#ifdef HAVE_REMOTE_LCD
+    {1, S_O(remote_bl_filter_first_keypress), false, 
+            "backlight filters first remote keypress", off_on },
+#endif    
+
 #endif
 
     /* new stuff to be added here */
@@ -1126,6 +1133,9 @@ void settings_apply(void)
 
 #ifdef CONFIG_BACKLIGHT
     set_backlight_filter_keypress(global_settings.bl_filter_first_keypress);
+#ifdef HAVE_REMOTE_LCD
+    set_remote_backlight_filter_keypress(global_settings.remote_bl_filter_first_keypress);
+#endif
 #endif
 }
 
diff --git a/apps/settings.h b/apps/settings.h
index 2fd52aea9e..424341f340 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -475,6 +475,9 @@ struct user_settings
     
 #ifdef CONFIG_BACKLIGHT
     bool bl_filter_first_keypress;   /* filter first keypress when dark? */
+#ifdef HAVE_REMOTE_LCD
+    bool remote_bl_filter_first_keypress; /* filter first remote keypress when remote dark? */
+#endif
 #endif
 };
 
diff --git a/apps/settings_menu.c b/apps/settings_menu.c
index e5aa7f44d7..ab0e21d098 100644
--- a/apps/settings_menu.c
+++ b/apps/settings_menu.c
@@ -1082,6 +1082,15 @@ static bool set_bl_filter_first_keypress(void)
     set_backlight_filter_keypress(global_settings.bl_filter_first_keypress);
     return result;
 }
+#ifdef HAVE_REMOTE_LCD
+static bool set_remote_bl_filter_first_keypress(void)
+{
+    bool result = set_bool( str(LANG_BACKLIGHT_FILTER_FIRST_KEYPRESS), 
+                            &global_settings.remote_bl_filter_first_keypress );
+    set_remote_backlight_filter_keypress(global_settings.remote_bl_filter_first_keypress);
+    return result;
+}
+#endif
 #endif 
 
 static bool ff_rewind_accel(void) 
@@ -1694,6 +1703,7 @@ static bool lcd_remote_settings_menu(void)
                                       remote_backlight_timer_plugged },
 #endif
         { ID2P(LANG_CAPTION_BACKLIGHT), remote_caption_backlight },
+        { ID2P(LANG_BACKLIGHT_FILTER_FIRST_KEYPRESS), set_remote_bl_filter_first_keypress },
         { ID2P(LANG_CONTRAST),        remote_contrast },
         { ID2P(LANG_INVERT),          remote_invert },
         { ID2P(LANG_FLIP_DISPLAY),    remote_flip_display },
-- 
cgit v1.2.3