diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/gui/skin_engine/skin_parser.c | 6 | ||||
-rw-r--r-- | apps/gui/skin_engine/skin_render.c | 5 | ||||
-rw-r--r-- | apps/gui/viewport.c | 5 | ||||
-rw-r--r-- | apps/plugins/lua/rocklib.c | 5 | ||||
-rw-r--r-- | apps/plugins/reversi/reversi-gui.c | 3 | ||||
-rw-r--r-- | apps/plugins/test_viewports.c | 20 | ||||
-rw-r--r-- | apps/screen_access.c | 5 | ||||
-rw-r--r-- | apps/screen_access.h | 5 | ||||
-rw-r--r-- | apps/settings.c | 3 |
9 files changed, 3 insertions, 54 deletions
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c index 1945bfbc57..1946e179c0 100644 --- a/apps/gui/skin_engine/skin_parser.c +++ b/apps/gui/skin_engine/skin_parser.c | |||
@@ -1957,9 +1957,9 @@ static int convert_viewport(struct wps_data *data, struct skin_element* element) | |||
1957 | skin_vp->start_bgcolour = skin_vp->vp.bg_pattern; | 1957 | skin_vp->start_bgcolour = skin_vp->vp.bg_pattern; |
1958 | #endif | 1958 | #endif |
1959 | #ifdef HAVE_LCD_COLOR | 1959 | #ifdef HAVE_LCD_COLOR |
1960 | skin_vp->start_gradient.start = skin_vp->vp.lss_pattern; | 1960 | skin_vp->start_gradient.start = global_settings.lss_color; |
1961 | skin_vp->start_gradient.end = skin_vp->vp.lse_pattern; | 1961 | skin_vp->start_gradient.end = global_settings.lse_color; |
1962 | skin_vp->start_gradient.text = skin_vp->vp.lst_pattern; | 1962 | skin_vp->start_gradient.text = global_settings.lst_color; |
1963 | #endif | 1963 | #endif |
1964 | 1964 | ||
1965 | 1965 | ||
diff --git a/apps/gui/skin_engine/skin_render.c b/apps/gui/skin_engine/skin_render.c index f40c3b90e0..43914699d6 100644 --- a/apps/gui/skin_engine/skin_render.c +++ b/apps/gui/skin_engine/skin_render.c | |||
@@ -859,11 +859,6 @@ void skin_render(struct gui_wps *gwps, unsigned refresh_mode) | |||
859 | skin_backdrop_show(data->backdrop_id); | 859 | skin_backdrop_show(data->backdrop_id); |
860 | } | 860 | } |
861 | #endif | 861 | #endif |
862 | #ifdef HAVE_LCD_COLOR | ||
863 | skin_viewport->vp.lss_pattern = skin_viewport->start_gradient.start; | ||
864 | skin_viewport->vp.lse_pattern = skin_viewport->start_gradient.end; | ||
865 | skin_viewport->vp.lst_pattern = skin_viewport->start_gradient.text; | ||
866 | #endif | ||
867 | 862 | ||
868 | /* dont redraw the viewport if its disabled */ | 863 | /* dont redraw the viewport if its disabled */ |
869 | if (skin_viewport->hidden_flags&VP_NEVER_VISIBLE) | 864 | if (skin_viewport->hidden_flags&VP_NEVER_VISIBLE) |
diff --git a/apps/gui/viewport.c b/apps/gui/viewport.c index b91c7441dd..aeb884a95d 100644 --- a/apps/gui/viewport.c +++ b/apps/gui/viewport.c | |||
@@ -329,11 +329,6 @@ void viewport_set_fullscreen(struct viewport *vp, | |||
329 | { | 329 | { |
330 | vp->fg_pattern = FG_FALLBACK; | 330 | vp->fg_pattern = FG_FALLBACK; |
331 | vp->bg_pattern = BG_FALLBACK; | 331 | vp->bg_pattern = BG_FALLBACK; |
332 | #ifdef HAVE_LCD_COLOR | ||
333 | vp->lss_pattern = global_settings.lss_color; | ||
334 | vp->lse_pattern = global_settings.lse_color; | ||
335 | vp->lst_pattern = global_settings.lst_color; | ||
336 | #endif | ||
337 | } | 332 | } |
338 | #endif | 333 | #endif |
339 | 334 | ||
diff --git a/apps/plugins/lua/rocklib.c b/apps/plugins/lua/rocklib.c index 1290a7f298..27c1177748 100644 --- a/apps/plugins/lua/rocklib.c +++ b/apps/plugins/lua/rocklib.c | |||
@@ -240,11 +240,6 @@ static struct viewport* opt_viewport(lua_State *L, int narg, struct viewport* al | |||
240 | #if LCD_DEPTH > 1 | 240 | #if LCD_DEPTH > 1 |
241 | check_tablevalue(L, "fg_pattern", tablepos, &vp->fg_pattern, true); | 241 | check_tablevalue(L, "fg_pattern", tablepos, &vp->fg_pattern, true); |
242 | check_tablevalue(L, "bg_pattern", tablepos, &vp->bg_pattern, true); | 242 | check_tablevalue(L, "bg_pattern", tablepos, &vp->bg_pattern, true); |
243 | #ifdef HAVE_LCD_COLOR | ||
244 | check_tablevalue(L, "lss_pattern", tablepos, &vp->lss_pattern, true); | ||
245 | check_tablevalue(L, "lse_pattern", tablepos, &vp->lse_pattern, true); | ||
246 | check_tablevalue(L, "lst_pattern", tablepos, &vp->lst_pattern, true); | ||
247 | #endif | ||
248 | #endif | 243 | #endif |
249 | 244 | ||
250 | return vp; | 245 | return vp; |
diff --git a/apps/plugins/reversi/reversi-gui.c b/apps/plugins/reversi/reversi-gui.c index e59a91e341..39a7d2d91c 100644 --- a/apps/plugins/reversi/reversi-gui.c +++ b/apps/plugins/reversi/reversi-gui.c | |||
@@ -188,9 +188,6 @@ static bool game_finished; | |||
188 | * int drawmode- Modes defined in lcd.h | 188 | * int drawmode- Modes defined in lcd.h |
189 | * unsigned fg_pattern - foreground color | 189 | * unsigned fg_pattern - foreground color |
190 | * unsigned bg_pattern - backbround color | 190 | * unsigned bg_pattern - backbround color |
191 | * unsigned lss_pattern - Selector colors (currently unused) | ||
192 | * unsigned lse_pattern - | | ||
193 | * unsigned lst_pattern - \/ | ||
194 | * | 191 | * |
195 | * The rest of the touch button elements are: | 192 | * The rest of the touch button elements are: |
196 | * bool repeat - requires the area be held for the action | 193 | * bool repeat - requires the area be held for the action |
diff --git a/apps/plugins/test_viewports.c b/apps/plugins/test_viewports.c index be61c7792e..9fc9caa451 100644 --- a/apps/plugins/test_viewports.c +++ b/apps/plugins/test_viewports.c | |||
@@ -47,11 +47,6 @@ static struct viewport vp0 = | |||
47 | .fg_pattern = LCD_DEFAULT_FG, | 47 | .fg_pattern = LCD_DEFAULT_FG, |
48 | .bg_pattern = BGCOLOR_1, | 48 | .bg_pattern = BGCOLOR_1, |
49 | #endif | 49 | #endif |
50 | #ifdef HAVE_LCD_COLOR | ||
51 | .lss_pattern = LCD_DEFAULT_BG, | ||
52 | .lse_pattern = LCD_DEFAULT_BG, | ||
53 | .lst_pattern = LCD_DEFAULT_BG, | ||
54 | #endif | ||
55 | }; | 50 | }; |
56 | 51 | ||
57 | static struct viewport vp1 = | 52 | static struct viewport vp1 = |
@@ -65,11 +60,6 @@ static struct viewport vp1 = | |||
65 | #if LCD_DEPTH > 1 | 60 | #if LCD_DEPTH > 1 |
66 | .fg_pattern = LCD_DEFAULT_FG, | 61 | .fg_pattern = LCD_DEFAULT_FG, |
67 | .bg_pattern = LCD_DEFAULT_BG, | 62 | .bg_pattern = LCD_DEFAULT_BG, |
68 | #ifdef HAVE_LCD_COLOR | ||
69 | .lss_pattern = LCD_DEFAULT_BG, | ||
70 | .lse_pattern = LCD_DEFAULT_BG, | ||
71 | .lst_pattern = LCD_DEFAULT_BG, | ||
72 | #endif | ||
73 | #endif | 63 | #endif |
74 | }; | 64 | }; |
75 | 65 | ||
@@ -84,11 +74,6 @@ static struct viewport vp2 = | |||
84 | #if LCD_DEPTH > 1 | 74 | #if LCD_DEPTH > 1 |
85 | .fg_pattern = FGCOLOR_1, | 75 | .fg_pattern = FGCOLOR_1, |
86 | .bg_pattern = BGCOLOR_2, | 76 | .bg_pattern = BGCOLOR_2, |
87 | #ifdef HAVE_LCD_COLOR | ||
88 | .lss_pattern = LCD_DEFAULT_BG, | ||
89 | .lse_pattern = LCD_DEFAULT_BG, | ||
90 | .lst_pattern = LCD_DEFAULT_BG, | ||
91 | #endif | ||
92 | #endif | 77 | #endif |
93 | }; | 78 | }; |
94 | 79 | ||
@@ -104,11 +89,6 @@ static struct viewport vp3 = | |||
104 | #if LCD_DEPTH > 1 | 89 | #if LCD_DEPTH > 1 |
105 | .fg_pattern = LCD_BLACK, | 90 | .fg_pattern = LCD_BLACK, |
106 | .bg_pattern = LCD_WHITE, | 91 | .bg_pattern = LCD_WHITE, |
107 | #ifdef HAVE_LCD_COLOR | ||
108 | .lss_pattern = LCD_DEFAULT_BG, | ||
109 | .lse_pattern = LCD_DEFAULT_BG, | ||
110 | .lst_pattern = LCD_DEFAULT_BG, | ||
111 | #endif | ||
112 | #endif | 92 | #endif |
113 | }; | 93 | }; |
114 | 94 | ||
diff --git a/apps/screen_access.c b/apps/screen_access.c index 31a946080c..1c339d9705 100644 --- a/apps/screen_access.c +++ b/apps/screen_access.c | |||
@@ -231,11 +231,6 @@ struct screen screens[NB_SCREENS] = | |||
231 | .get_foreground=&lcd_get_foreground, | 231 | .get_foreground=&lcd_get_foreground, |
232 | .set_background=&lcd_set_background, | 232 | .set_background=&lcd_set_background, |
233 | .set_foreground=&lcd_set_foreground, | 233 | .set_foreground=&lcd_set_foreground, |
234 | #ifdef HAVE_LCD_COLOR | ||
235 | .set_selector_start=&lcd_set_selector_start, | ||
236 | .set_selector_end=&lcd_set_selector_end, | ||
237 | .set_selector_text=&lcd_set_selector_text, | ||
238 | #endif | ||
239 | #endif /* LCD_DEPTH > 1 */ | 234 | #endif /* LCD_DEPTH > 1 */ |
240 | .update_rect=&lcd_update_rect, | 235 | .update_rect=&lcd_update_rect, |
241 | .update_viewport_rect=&lcd_update_viewport_rect, | 236 | .update_viewport_rect=&lcd_update_viewport_rect, |
diff --git a/apps/screen_access.h b/apps/screen_access.h index c5684fc0c7..7efc38b174 100644 --- a/apps/screen_access.h +++ b/apps/screen_access.h | |||
@@ -102,11 +102,6 @@ struct screen | |||
102 | void (*set_background)(unsigned background); | 102 | void (*set_background)(unsigned background); |
103 | void (*set_foreground)(unsigned foreground); | 103 | void (*set_foreground)(unsigned foreground); |
104 | #endif /* (LCD_DEPTH > 1) || (LCD_REMOTE_DEPTH > 1) */ | 104 | #endif /* (LCD_DEPTH > 1) || (LCD_REMOTE_DEPTH > 1) */ |
105 | #if defined(HAVE_LCD_COLOR) | ||
106 | void (*set_selector_start)(unsigned selector); | ||
107 | void (*set_selector_end)(unsigned selector); | ||
108 | void (*set_selector_text)(unsigned selector_text); | ||
109 | #endif | ||
110 | void (*update_rect)(int x, int y, int width, int height); | 105 | void (*update_rect)(int x, int y, int width, int height); |
111 | void (*update_viewport_rect)(int x, int y, int width, int height); | 106 | void (*update_viewport_rect)(int x, int y, int width, int height); |
112 | void (*fillrect)(int x, int y, int width, int height); | 107 | void (*fillrect)(int x, int y, int width, int height); |
diff --git a/apps/settings.c b/apps/settings.c index 1d92df270b..e4a44dafe1 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -994,9 +994,6 @@ void settings_apply(bool read_disk) | |||
994 | #ifdef HAVE_LCD_COLOR | 994 | #ifdef HAVE_LCD_COLOR |
995 | screens[SCREEN_MAIN].set_foreground(global_settings.fg_color); | 995 | screens[SCREEN_MAIN].set_foreground(global_settings.fg_color); |
996 | screens[SCREEN_MAIN].set_background(global_settings.bg_color); | 996 | screens[SCREEN_MAIN].set_background(global_settings.bg_color); |
997 | screens[SCREEN_MAIN].set_selector_start(global_settings.lss_color); | ||
998 | screens[SCREEN_MAIN].set_selector_end(global_settings.lse_color); | ||
999 | screens[SCREEN_MAIN].set_selector_text(global_settings.lst_color); | ||
1000 | #endif | 997 | #endif |
1001 | 998 | ||
1002 | #ifdef HAVE_LCD_BITMAP | 999 | #ifdef HAVE_LCD_BITMAP |