Index: apps/screen_access.c =================================================================== --- apps/screen_access.c (révision 14867) +++ apps/screen_access.c (copie de travail) @@ -77,6 +77,11 @@ .get_foreground=&lcd_get_foreground, .set_background=&lcd_set_background, .set_foreground=&lcd_set_foreground, +#ifdef HAVE_LCD_COLOR + .set_selector_start=&lcd_set_selector_start, + .set_selector_end=&lcd_set_selector_end, + .set_selector_text=&lcd_set_selector_text, +#endif #endif /* LCD_DEPTH > 1 */ .update_rect=&lcd_update_rect, .fillrect=&lcd_fillrect, Index: apps/screen_access.h =================================================================== --- apps/screen_access.h (révision 14867) +++ apps/screen_access.h (copie de travail) @@ -107,6 +107,11 @@ void (*set_background)(unsigned background); void (*set_foreground)(unsigned foreground); #endif /* (LCD_DEPTH > 1) || (LCD_REMOTE_DEPTH > 1) */ +#if defined(HAVE_LCD_COLOR) + void (*set_selector_start)(unsigned selector); + void (*set_selector_end)(unsigned selector); + void (*set_selector_text)(unsigned selector_text); +#endif void (*update_rect)(int x, int y, int width, int height); void (*fillrect)(int x, int y, int width, int height); void (*drawrect)(int x, int y, int width, int height); Index: apps/recorder/recording.c =================================================================== --- apps/recorder/recording.c (révision 14867) +++ apps/recorder/recording.c (copie de travail) @@ -857,6 +857,16 @@ ID2P(LANG_GIGABYTE) }; + int style = STYLE_INVERT; +#ifdef HAVE_LCD_COLOR + if (global_settings.invert_cursor == 2) { + style |= STYLE_COLORBAR; + } + else if (global_settings.invert_cursor == 3) { + style |= STYLE_GRADIENT; + } +#endif + struct audio_recording_options rec_options; if (check_dir(global_settings.rec_directory) == false) { @@ -1559,7 +1569,7 @@ { for(i = 0; i < screen_update; i++) screens[i].puts_style_offset(0, filename_offset[i] + - PM_HEIGHT + 2, buf, STYLE_INVERT,0); + PM_HEIGHT + 2, buf, style,0); } else { @@ -1578,7 +1588,7 @@ { for(i = 0; i < screen_update; i++) screens[i].puts_style_offset(0, filename_offset[i] + - PM_HEIGHT + 3, buf, STYLE_INVERT,0); + PM_HEIGHT + 3, buf, style,0); } else { @@ -1602,7 +1612,7 @@ { for(i = 0; i < screen_update; i++) screens[i].puts_style_offset(0, filename_offset[i] + - PM_HEIGHT + 3, buf, STYLE_INVERT,0); + PM_HEIGHT + 3, buf, style,0); } else { @@ -1620,7 +1630,7 @@ { for(i = 0; i < screen_update; i++) screens[i].puts_style_offset(0, filename_offset[i] + - PM_HEIGHT + 4, buf, STYLE_INVERT,0); + PM_HEIGHT + 4, buf, style,0); } else { @@ -1705,7 +1715,7 @@ { for(i = 0; i < screen_update; i++) screens[i].puts_style_offset(0, filename_offset[i] + - PM_HEIGHT + line[i], buf, STYLE_INVERT,0); + PM_HEIGHT + line[i], buf, style,0); } else if ( global_settings.rec_source == AUDIO_SRC_MIC Index: apps/settings.c =================================================================== --- apps/settings.c (révision 14867) +++ apps/settings.c (copie de travail) @@ -778,6 +778,9 @@ #ifdef HAVE_LCD_COLOR screens[SCREEN_MAIN].set_foreground(global_settings.fg_color); screens[SCREEN_MAIN].set_background(global_settings.bg_color); + screens[SCREEN_MAIN].set_selector_start(global_settings.lss_color); + screens[SCREEN_MAIN].set_selector_end(global_settings.lse_color); + screens[SCREEN_MAIN].set_selector_text(global_settings.lst_color); #endif #if defined(HAVE_REMOTE_LCD) && (NB_SCREENS > 1) Index: apps/lang/english.lang =================================================================== --- apps/lang/english.lang (révision 14867) +++ apps/lang/english.lang (copie de travail) @@ -2899,15 +2899,15 @@ user: *: none - lcd_bitmap: "Line Selector" + lcd_bitmap: "Line Selector Type" *: none - lcd_bitmap: "Line Selector" + lcd_bitmap: "Line Selector Type" *: none - lcd_bitmap: "Line Selector" + lcd_bitmap: "Line Selector Type" @@ -11242,3 +11242,89 @@ usbstack: "Device Driver" + + id: LANG_SELECTOR_START_COLOR + desc: line selector color option + user: + + *: none + lcd_color: "Line Selector Start Colour" + + + *: none + lcd_color: "Line Selector Start Colour" + + + *: none + lcd_color: "Line Selector Start Colour" + + + + id: LANG_SELECTOR_END_COLOR + desc: line selector color option + user: + + *: none + lcd_color: "Line Selector End Colour" + + + *: none + lcd_color: "Line Selector End Colour" + + + *: none + lcd_color: "Line Selector End Colour" + + + + id: LANG_SELECTOR_TEXT_COLOR + desc: line selector text color option + user: + + *: none + lcd_color: "Line Selector Text Colour" + + + *: none + lcd_color: "Line Selector Text Colour" + + + *: none + lcd_color: "Line Selector Text Colour" + + + + id: LANG_INVERT_CURSOR_COLOR + desc: in settings_menu + user: + + *: none + lcd_color: "Bar (Solid Colour)" + + + *: none + lcd_color: "Bar (Solid Colour)" + + + *: none + lcd_color: "Bar (Solid Colour)" + + + + id: LANG_INVERT_CURSOR_GRADIENT + desc: in settings_menu + user: + + *: none + lcd_color: "Bar (Gradient Colour)" + + + *: none + lcd_color: "Bar (Gradient Colour)" + + + *: none + lcd_color: "Bar (Gradient Colour)" + + + Index: apps/gui/list.c =================================================================== --- apps/gui/list.c (révision 14867) +++ apps/gui/list.c (copie de travail) @@ -390,10 +390,27 @@ current_item < gui_list->selected_item + gui_list->selected_size) {/* The selected item must be displayed scrolling */ #ifdef HAVE_LCD_BITMAP - if (global_settings.invert_cursor)/* Display inverted-line-style*/ + if (global_settings.invert_cursor == 1 +#ifdef HAVE_REMOTE_LCD + || display->screen_type == SCREEN_REMOTE +#endif + ) { + /* Display inverted-line-style */ style |= STYLE_INVERT; } +#ifdef HAVE_LCD_COLOR + else if (global_settings.invert_cursor == 2) + { + /* Display colour line selector */ + style |= STYLE_COLORBAR; + } + else if (global_settings.invert_cursor == 3) + { + /* Display gradient line selector */ + style |= STYLE_GRADIENT; + } +#endif else /* if (!global_settings.invert_cursor) */ { if (current_item % gui_list->selected_size != 0) Index: apps/settings.h =================================================================== --- apps/settings.h (révision 14867) +++ apps/settings.h (copie de travail) @@ -412,7 +412,7 @@ int contrast; /* lcd contrast */ #endif bool invert; /* invert display */ - bool invert_cursor; /* invert the current file in dir browser and menu + int invert_cursor; /* invert the current file in dir browser and menu instead of using the default cursor */ bool flip_display; /* turn display (and button layout) by 180 degrees */ int poweroff; /* power off timer */ @@ -641,6 +641,9 @@ #ifdef HAVE_LCD_COLOR int bg_color; /* background color native format */ int fg_color; /* foreground color native format */ + int lss_color; /* background color for the selector or start color for the gradient */ + int lse_color; /* end color for the selector gradient */ + int lst_color; /* color of the text for the selector */ #endif bool party_mode; /* party mode - unstoppable music */ Index: apps/menus/display_menu.c =================================================================== --- apps/menus/display_menu.c (révision 14867) +++ apps/menus/display_menu.c (copie de travail) @@ -157,13 +157,55 @@ settings_save(); return res; } + +/* Line selector colour */ +static int set_lss_color(void) +{ + int res; + res = (int)set_color(&screens[SCREEN_MAIN],str(LANG_SELECTOR_START_COLOR), + &global_settings.lss_color,-1); + + screens[SCREEN_MAIN].set_selector_start(global_settings.lss_color); + settings_save(); + return res; +} + +static int set_lse_color(void) +{ + int res; + res = (int)set_color(&screens[SCREEN_MAIN],str(LANG_SELECTOR_END_COLOR), + &global_settings.lse_color,-1); + + screens[SCREEN_MAIN].set_selector_end(global_settings.lse_color); + settings_save(); + return res; +} + +/* Line selector text colour */ +static int set_lst_color(void) +{ + int res; + res = (int)set_color(&screens[SCREEN_MAIN],str(LANG_SELECTOR_TEXT_COLOR), + &global_settings.lst_color,global_settings.lss_color); + + screens[SCREEN_MAIN].set_selector_text(global_settings.lst_color); + settings_save(); + return res; +} + static int reset_color(void) { global_settings.fg_color = LCD_DEFAULT_FG; global_settings.bg_color = LCD_DEFAULT_BG; + global_settings.lss_color = LCD_DEFAULT_LS; + global_settings.lse_color = LCD_DEFAULT_BG; + global_settings.lst_color = LCD_DEFAULT_FG; screens[SCREEN_MAIN].set_foreground(global_settings.fg_color); screens[SCREEN_MAIN].set_background(global_settings.bg_color); + screens[SCREEN_MAIN].set_selector_start(global_settings.lss_color); + screens[SCREEN_MAIN].set_selector_end(global_settings.lse_color); + screens[SCREEN_MAIN].set_selector_text(global_settings.lst_color); settings_save(); return 0; } @@ -171,6 +213,12 @@ set_bg_color, NULL, NULL, Icon_NOICON); MENUITEM_FUNCTION(set_fg_col, 0, ID2P(LANG_FOREGROUND_COLOR), set_fg_color, NULL, NULL, Icon_NOICON); +MENUITEM_FUNCTION(set_lss_col, 0, ID2P(LANG_SELECTOR_START_COLOR), + set_lss_color, NULL, NULL, Icon_NOICON); +MENUITEM_FUNCTION(set_lse_col, 0, ID2P(LANG_SELECTOR_END_COLOR), + set_lse_color, NULL, NULL, Icon_NOICON); +MENUITEM_FUNCTION(set_lst_col, 0, ID2P(LANG_SELECTOR_TEXT_COLOR), + set_lst_color, NULL, NULL, Icon_NOICON); MENUITEM_FUNCTION(reset_colors, 0, ID2P(LANG_RESET_COLORS), reset_color, NULL, NULL, Icon_NOICON); #endif @@ -210,6 +258,9 @@ # endif ,&invert_cursor #endif /* HAVE_LCD_BITMAP */ +#ifdef HAVE_LCD_COLOR + ,&set_lss_col, &set_lse_col, &set_lst_col +#endif #if LCD_DEPTH > 1 ,&clear_main_bd, #endif Index: apps/settings_list.c =================================================================== --- apps/settings_list.c (révision 14867) +++ apps/settings_list.c (copie de travail) @@ -457,8 +457,16 @@ OFFON_SETTING(0,flip_display, LANG_FLIP_DISPLAY, false,"flip display", NULL), #endif /* display */ - BOOL_SETTING(F_TEMPVAR, invert_cursor, LANG_INVERT_CURSOR, true ,"invert cursor", off_on, - LANG_INVERT_CURSOR_BAR, LANG_INVERT_CURSOR_POINTER, NULL), + CHOICE_SETTING(F_TEMPVAR|F_THEMESETTING, invert_cursor, LANG_INVERT_CURSOR, 1, + #ifdef HAVE_LCD_COLOR + "selector type", "pointer,bar (inverse),bar (color),bar (gradient)", + NULL, 4, + ID2P(LANG_INVERT_CURSOR_POINTER), ID2P(LANG_INVERT_CURSOR_BAR), + ID2P(LANG_INVERT_CURSOR_COLOR), ID2P(LANG_INVERT_CURSOR_GRADIENT)), + #else + "selector type", "pointer,bar (inverse)", NULL, 2, + ID2P(LANG_INVERT_CURSOR_POINTER), ID2P(LANG_INVERT_CURSOR_BAR)), + #endif OFFON_SETTING(F_THEMESETTING|F_TEMPVAR, statusbar, LANG_STATUS_BAR, true,"statusbar", NULL), OFFON_SETTING(0,scrollbar, LANG_SCROLL_BAR, true,"scrollbar", NULL), @@ -625,6 +633,12 @@ "foreground color",NULL,UNUSED}, {F_T_INT|F_RGB|F_THEMESETTING ,&global_settings.bg_color,-1,INT(LCD_DEFAULT_BG), "background color",NULL,UNUSED}, + {F_T_INT|F_RGB|F_THEMESETTING ,&global_settings.lss_color,-1,INT(LCD_DEFAULT_LS), + "line selector start color",NULL,UNUSED}, + {F_T_INT|F_RGB|F_THEMESETTING ,&global_settings.lse_color,-1,INT(LCD_DEFAULT_BG), + "line selector end color",NULL,UNUSED}, + {F_T_INT|F_RGB|F_THEMESETTING ,&global_settings.lst_color,-1,INT(LCD_DEFAULT_FG), + "line selector text color",NULL,UNUSED}, #endif /* more playback */ OFFON_SETTING(0,play_selected,LANG_PLAY_SELECTED,true,"play selected",NULL), Index: firmware/export/scroll_engine.h =================================================================== --- firmware/export/scroll_engine.h (révision 14867) +++ firmware/export/scroll_engine.h (copie de travail) @@ -43,8 +43,12 @@ int startx; #ifdef HAVE_LCD_BITMAP int width; /* length of line in pixels */ - bool invert; /* invert the scrolled text */ +#ifdef HAVE_LCD_COLOR + int invert; /* invert the scrolled text */ +#else + bool invert; #endif +#endif/* HAVE_LCD_BITMAP */ bool backward; /* scroll presently forward or backward? */ bool bidir; long start_tick; Index: firmware/export/lcd.h =================================================================== --- firmware/export/lcd.h (révision 14867) +++ firmware/export/lcd.h (copie de travail) @@ -27,6 +27,8 @@ #define STYLE_DEFAULT 0x00000000 #define STYLE_INVERT 0x20000000 #define STYLE_COLORED 0x10000000 +#define STYLE_COLORBAR 0x40000000 +#define STYLE_GRADIENT 0x80000000 #define STYLE_COLOR_MASK 0x0000FFFF #ifdef SIMULATOR @@ -233,6 +235,7 @@ #define LCD_WHITE LCD_RGBPACK(255, 255, 255) #define LCD_DEFAULT_FG LCD_BLACK #define LCD_DEFAULT_BG LCD_RGBPACK(182, 198, 229) /* rockbox blue */ +#define LCD_DEFAULT_LS LCD_WHITE #elif LCD_DEPTH > 1 /* greyscale */ @@ -355,6 +358,11 @@ extern unsigned lcd_get_foreground(void); extern void lcd_set_background(unsigned background); extern unsigned lcd_get_background(void); +#ifdef HAVE_LCD_COLOR +extern void lcd_set_selector_start(unsigned selector); +extern void lcd_set_selector_end(unsigned selector); +extern void lcd_set_selector_text(unsigned selector_text); +#endif extern void lcd_set_drawinfo(int mode, unsigned foreground, unsigned background); void lcd_set_backdrop(fb_data* backdrop); Index: firmware/drivers/lcd-16bit.c =================================================================== --- firmware/drivers/lcd-16bit.c (révision 14867) +++ firmware/drivers/lcd-16bit.c (copie de travail) @@ -51,9 +51,15 @@ #if !defined(TOSHIBA_GIGABEAT_F) || defined(SIMULATOR) static unsigned fg_pattern IDATA_ATTR = LCD_DEFAULT_FG; static unsigned bg_pattern IDATA_ATTR = LCD_DEFAULT_BG; +static unsigned lss_pattern IDATA_ATTR = LCD_DEFAULT_LS; +static unsigned lse_pattern IDATA_ATTR = LCD_DEFAULT_BG; +static unsigned lst_pattern IDATA_ATTR = LCD_DEFAULT_FG; #else unsigned fg_pattern IDATA_ATTR = LCD_DEFAULT_FG; unsigned bg_pattern IDATA_ATTR = LCD_DEFAULT_BG; +unsigned lss_pattern IDATA_ATTR = LCD_DEFAULT_LS; +unsigned lse_pattern IDATA_ATTR = LCD_DEFAULT_BG; +unsigned lst_pattern IDATA_ATTR = LCD_DEFAULT_FG; #endif static int drawmode = DRMODE_SOLID; @@ -103,6 +109,21 @@ return bg_pattern; } +void lcd_set_selector_start(unsigned color) +{ + lss_pattern = color; +} + +void lcd_set_selector_end(unsigned color) +{ + lse_pattern = color; +} + +void lcd_set_selector_text(unsigned color) +{ + lst_pattern = color; +} + void lcd_set_drawinfo(int mode, unsigned fg_color, unsigned bg_color) { lcd_set_drawmode(mode); @@ -808,16 +829,48 @@ ypos = ymargin + y*h; drawmode = (style & STYLE_INVERT) ? (DRMODE_SOLID|DRMODE_INVERSEVID) : DRMODE_SOLID; - if (style & STYLE_COLORED) { + if (style & STYLE_GRADIENT || style & STYLE_COLORBAR) { + fg_pattern = lss_pattern; + } + else if (style & STYLE_COLORED) { if (drawmode == DRMODE_SOLID) fg_pattern = style & STYLE_COLOR_MASK; else bg_pattern = style & STYLE_COLOR_MASK; } - lcd_putsxyofs(xpos, ypos, offset, str); drawmode ^= DRMODE_INVERSEVID; xrect = xpos + MAX(w - offset, 0); - lcd_fillrect(xrect, ypos, LCD_WIDTH - xrect, h); + + if (style & STYLE_GRADIENT) { + int h_r = RGB_UNPACK_RED(lss_pattern) << 16; + int h_b = RGB_UNPACK_BLUE(lss_pattern) << 16; + int h_g = RGB_UNPACK_GREEN(lss_pattern) << 16; + int rstep = (h_r - ((signed)RGB_UNPACK_RED(lse_pattern) << 16)) / h; + int gstep = (h_g - ((signed)RGB_UNPACK_GREEN(lse_pattern) << 16)) / h; + int bstep = (h_b - ((signed)RGB_UNPACK_BLUE(lse_pattern) << 16)) / h; + int count; + + drawmode = DRMODE_FG; + for(count = 0; count < h; count++) { + lcd_hline(xpos, LCD_WIDTH, ypos + count); + h_r -= rstep; + h_g -= gstep; + h_b -= bstep; + fg_pattern = LCD_RGBPACK(h_r >> 16, h_g >> 16, h_b >> 16); + } + fg_pattern = lst_pattern; + } + else if (style & STYLE_COLORBAR) { + drawmode = DRMODE_FG; + lcd_fillrect(xpos, ypos, LCD_WIDTH - xpos, h); + fg_pattern = lst_pattern; + } + else { + lcd_fillrect(xrect, ypos, LCD_WIDTH - xrect, h); + drawmode = (style & STYLE_INVERT) ? + (DRMODE_SOLID|DRMODE_INVERSEVID) : DRMODE_SOLID; + } + lcd_putsxyofs(xpos, ypos, offset, str); drawmode = lastmode; fg_pattern = oldfgcolor; bg_pattern = oldbgcolor; @@ -852,8 +905,14 @@ s->start_tick = current_tick + lcd_scroll_info.delay; s->invert = false; if (style & STYLE_INVERT) { - s->invert = true; + s->invert = 1; } + else if (style & STYLE_COLORBAR) { + s->invert = 2; + } + else if (style & STYLE_GRADIENT) { + s->invert = 3; + } lcd_puts_style_offset(x,y,string,style,offset); lcd_getstringsize(string, &w, &h); @@ -961,8 +1020,37 @@ } lastmode = drawmode; - drawmode = s->invert ? + drawmode = s->invert == 1 ? (DRMODE_SOLID|DRMODE_INVERSEVID) : DRMODE_SOLID; + if (s->invert == 2) { + fg_pattern = lss_pattern; + drawmode = DRMODE_FG; + lcd_fillrect(0, ypos, LCD_WIDTH, pf->height); + fg_pattern = lst_pattern; + } + else if (s->invert == 3) { + int h_r = RGB_UNPACK_RED(lss_pattern) << 16; + int h_b = RGB_UNPACK_BLUE(lss_pattern) << 16; + int h_g = RGB_UNPACK_GREEN(lss_pattern) << 16; + int rstep = (h_r - ((signed)RGB_UNPACK_RED(lse_pattern) << 16)) + / pf->height; + int gstep = (h_g - ((signed)RGB_UNPACK_GREEN(lse_pattern) << 16)) + / pf->height; + int bstep = (h_b - ((signed)RGB_UNPACK_BLUE(lse_pattern) << 16)) + / pf->height; + unsigned int count; + + fg_pattern = lss_pattern; + drawmode = DRMODE_FG; + for(count = 0; count < pf->height; count++) { + lcd_hline(0, LCD_WIDTH , ypos + count); + h_r -= rstep; + h_g -= gstep; + h_b -= bstep; + fg_pattern = LCD_RGBPACK(h_r >> 16, h_g >> 16, h_b >> 16); + } + fg_pattern = lst_pattern; + } lcd_putsxyofs(xpos, ypos, s->offset, s->line); drawmode = lastmode; lcd_update_rect(xpos, ypos, LCD_WIDTH - xpos, pf->height);