Index: apps/screen_access.c =================================================================== --- apps/screen_access.c (revision 14037) +++ apps/screen_access.c (working copy) @@ -46,7 +46,8 @@ screen->height=LCD_REMOTE_HEIGHT; screen->setmargins=&lcd_remote_setmargins; screen->getymargin=&lcd_remote_getymargin; - screen->getxmargin=&lcd_remote_getxmargin; + screen->getleftmargin=&lcd_remote_getleftmargin; + screen->getrightmargin=&lcd_remote_getrightmargin; screen->getstringsize=&lcd_remote_getstringsize; #if 1 /* all remote LCDs are bitmapped so far */ screen->setfont=&lcd_remote_setfont; @@ -128,7 +129,8 @@ screen->height=LCD_HEIGHT; screen->setmargins=&lcd_setmargins; screen->getymargin=&lcd_getymargin; - screen->getxmargin=&lcd_getxmargin; + screen->getleftmargin=&lcd_getleftmargin; + screen->getrightmargin=&lcd_getrightmargin; screen->getstringsize=&lcd_getstringsize; #ifdef HAVE_LCD_BITMAP screen->setfont=&lcd_setfont; Index: apps/playlist.c =================================================================== --- apps/playlist.c (revision 14037) +++ apps/playlist.c (working copy) @@ -479,9 +479,9 @@ #ifdef HAVE_LCD_BITMAP if(global_settings.statusbar) - lcd_setmargins(0, STATUSBAR_HEIGHT); + lcd_setmargins(0, LCD_WIDTH, STATUSBAR_HEIGHT); else - lcd_setmargins(0, 0); + lcd_setmargins(0, LCD_WIDTH, 0); #endif gui_syncsplash(0, str(LANG_PLAYLIST_LOAD)); @@ -1661,9 +1661,9 @@ #ifdef HAVE_LCD_BITMAP if(global_settings.statusbar) - lcd_setmargins(0, STATUSBAR_HEIGHT); + lcd_setmargins(0, LCD_WIDTH, STATUSBAR_HEIGHT); else - lcd_setmargins(0, 0); + lcd_setmargins(0, LCD_WIDTH, 0); #endif gui_syncsplash(0, fmt, count, Index: apps/screens.c =================================================================== --- apps/screens.c (revision 14037) +++ apps/screens.c (working copy) @@ -647,7 +647,7 @@ struct option_select left_option; struct option_select bottom_option; struct option_select right_option; - int oldrepeat, old_x_margin, old_y_margin; + int oldrepeat, old_left_margin, old_right_margin, old_y_margin; static const struct opt_items left_items[] = { [0]={ STR(LANG_SYSFONT_OFF) }, @@ -670,9 +670,10 @@ }; struct gui_quickscreen qs; - old_x_margin = lcd_getxmargin(); + old_left_margin = lcd_getleftmargin(); + old_right_margin = lcd_getrightmargin(); old_y_margin = lcd_getymargin(); - lcd_setmargins(0, 0); + lcd_setmargins(0, LCD_WIDTH, 0); option_select_init_items(&left_option, (char *)str(LANG_SYSFONT_SHUFFLE), @@ -713,7 +714,7 @@ } settings_save(); } - lcd_setmargins(old_x_margin, old_y_margin); + lcd_setmargins(old_left_margin, old_right_margin, old_y_margin); return(res); } @@ -736,7 +737,7 @@ struct option_select left_option; struct option_select bottom_option; struct option_select right_option; - int old_x_margin, old_y_margin; + int old_left_margin, old_right_margin, old_y_margin; static const struct opt_items onoff_items[] = { [0]={ STR(LANG_SYSFONT_OFF) }, @@ -749,9 +750,10 @@ struct gui_quickscreen qs; - old_x_margin = lcd_getxmargin(); + old_left_margin = lcd_getrightmargin(); + old_right_margin = lcd_getleftmargin(); old_y_margin = lcd_getymargin(); - lcd_setmargins(0, 0); + lcd_setmargins(0, LCD_WIDTH, 0); option_select_init_items(&left_option, str(LANG_SYSFONT_SCROLL_BAR), @@ -773,7 +775,7 @@ res=gui_syncquickscreen_run(&qs, button_enter); if(!res) settings_save(); - lcd_setmargins(old_x_margin, old_y_margin); + lcd_setmargins(old_left_margin, old_right_margin, old_y_margin); return(res); } #endif /* BUTTON_F3 */ Index: apps/screen_access.h =================================================================== --- apps/screen_access.h (revision 14037) +++ apps/screen_access.h (working copy) @@ -66,8 +66,9 @@ #ifdef HAS_BUTTONBAR bool has_buttonbar; #endif - void (*setmargins)(int x, int y); - int (*getxmargin)(void); + void (*setmargins)(int x1, int x2, int y); + int (*getleftmargin)(void); + int (*getrightmargin)(void); int (*getymargin)(void); int (*getstringsize)(const unsigned char *str, int *w, int *h); @@ -159,10 +160,10 @@ /* * Sets the x margin in pixels for the given screen * - screen : the screen structure - * - xmargin : the number of pixels to the left of the screen + * - leftmargin : the number of pixels to the left of the screen */ #define screen_set_xmargin(screen, xmargin) \ - (screen)->setmargins(xmargin, (screen)->getymargin()); + (screen)->setmargins(xmargin, (screen)->width, (screen)->getymargin()); /* * Sets the y margin in pixels for the given screen @@ -170,7 +171,7 @@ * - xmargin : the number of pixels to the top of the screen */ #define screen_set_ymargin(screen, ymargin) \ - (screen)->setmargins((screen)->getxmargin(), ymargin); + (screen)->setmargins((screen)->getleftmargin(), (screen)->width, ymargin); #if defined(HAVE_LCD_BITMAP) || defined(HAVE_REMOTE_LCD) /* Index: apps/recorder/recording.c =================================================================== --- apps/recorder/recording.c (revision 14037) +++ apps/recorder/recording.c (working copy) @@ -887,7 +887,7 @@ { screens[i].setfont(FONT_SYSFIXED); screens[i].getstringsize("M", &w, &h); - screens[i].setmargins(global_settings.invert_cursor ? 0 : w, 8); + screens[i].setmargins(global_settings.invert_cursor ? 0 : w, screens[i].width, 8); filename_offset[i] = ((screens[i].height >= 80) ? 1 : 0); pm_y[i] = 8 + h * (2 + filename_offset[i]); } @@ -1288,7 +1288,7 @@ { screens[i].setfont(FONT_SYSFIXED); screens[i].setmargins( - global_settings.invert_cursor ? 0 : w, 8); + global_settings.invert_cursor ? 0 : w, screens[i].width, 8); } } } Index: apps/plugins/solitaire.c =================================================================== --- apps/plugins/solitaire.c (revision 14037) +++ apps/plugins/solitaire.c (working copy) @@ -650,7 +650,7 @@ break; case 3: - rb->lcd_setmargins(0, 0); + rb->lcd_setmargins(0, LCD_WIDTH, 0); if (solitaire_help() == HELP_USB) result = MENU_USB; break; @@ -665,7 +665,7 @@ } } menu_exit(m); - rb->lcd_setmargins(0, 0); + rb->lcd_setmargins(0, LCD_WIDTH, 0); return result; } Index: apps/plugins/viewer.c =================================================================== --- apps/plugins/viewer.c (revision 14037) +++ apps/plugins/viewer.c (working copy) @@ -1291,7 +1291,7 @@ result = menu_run(m); menu_exit(m); #ifdef HAVE_LCD_BITMAP - rb->lcd_setmargins(0,0); + rb->lcd_setmargins(0,LCD_WIDTH,0); /* Show-scrollbar mode for current view-width mode */ if (!ONE_SCREEN_FITS_ALL()) @@ -1333,7 +1333,7 @@ } menu_exit(m); #ifdef HAVE_LCD_BITMAP - rb->lcd_setmargins(0,0); + rb->lcd_setmargins(0,LCD_WIDTH,0); #endif viewer_draw(col); } Index: apps/gui/gwps-common.c =================================================================== --- apps/gui/gwps-common.c (revision 14037) +++ apps/gui/gwps-common.c (working copy) @@ -21,6 +21,7 @@ #include #include #include +#include #include "system.h" #include "settings.h" #include "rbunicode.h" @@ -1333,6 +1334,14 @@ return NULL; #endif + case WPS_TOKEN_ALIGN_SCROLLMARGIN_LEFT: + gwps->display->setmargins( token->value.i, gwps->display->getrightmargin(), gwps->display->getymargin() ); + return NULL; + + case WPS_TOKEN_ALIGN_SCROLLMARGIN_RIGHT: + gwps->display->setmargins( gwps->display->getleftmargin(), token->value.i, gwps->display->getymargin() ); + return NULL; + default: return NULL; } @@ -1659,6 +1668,7 @@ int ypos; int space_width; int string_height; + const int scroll_width = display->getrightmargin()-display->getleftmargin(); /* calculate different string sizes and positions */ display->getstringsize((unsigned char *)" ", &space_width, &string_height); @@ -1669,7 +1679,7 @@ else { left_width = 0; } - left_xpos = 0; + left_xpos = display->getleftmargin(); if (format_align->center != 0) { display->getstringsize((unsigned char *)format_align->center, @@ -1678,7 +1688,7 @@ else { center_width = 0; } - center_xpos=(display->width - center_width) / 2; + center_xpos=(display->getrightmargin() + display->getleftmargin() - center_width)/2; if (format_align->right != 0) { display->getstringsize((unsigned char *)format_align->right, @@ -1687,7 +1697,7 @@ else { right_width = 0; } - right_xpos = (display->width - right_width); + right_xpos = (display->getrightmargin() - right_width); /* Checks for overlapping strings. If needed the overlapping strings will be merged, separated by a @@ -1702,7 +1712,7 @@ *(--format_align->center) = ' '; /* calculate the new width and position of the merged string */ left_width = left_width + space_width + center_width; - left_xpos = 0; + /* left_xpos unchanged */ /* there is no centered string anymore */ center_width = 0; } @@ -1713,7 +1723,7 @@ format_align->left = format_align->center; /* calculate the new width and position of the string */ left_width = center_width; - left_xpos = 0; + /* left_xpos unchanged */ /* there is no centered string anymore */ center_width = 0; } @@ -1729,7 +1739,7 @@ format_align->right = format_align->center; /* calculate the new width and position of the merged string */ right_width = center_width + space_width + right_width; - right_xpos = (display->width - right_width); + right_xpos = (display->getrightmargin() - right_width); /* there is no centered string anymore */ center_width = 0; } @@ -1740,7 +1750,7 @@ format_align->right = format_align->center; /* calculate the new width and position of the string */ right_width = center_width; - right_xpos = (display->width - right_width); + right_xpos = (display->getrightmargin() - right_width); /* there is no centered string anymore */ center_width = 0; } @@ -1756,7 +1766,7 @@ *(--format_align->right) = ' '; /* calculate the new width and position of the string */ left_width = left_width + space_width + right_width; - left_xpos = 0; + /* left_xpos unchanged */ /* there is no right string anymore */ right_width = 0; } @@ -1767,7 +1777,7 @@ format_align->left = format_align->right; /* calculate the new width and position of the string */ left_width = right_width; - left_xpos = 0; + /* left_xpos unchanged */ /* there is no right string anymore */ right_width = 0; } @@ -1775,7 +1785,7 @@ ypos = (line * string_height) + display->getymargin(); - if (scroll && left_width > display->width) + if (scroll && ( left_width > scroll_width || center_width > scroll_width || right_width > scroll_width ) ) { display->puts_scroll(0, line, (unsigned char *)format_align->left); Index: apps/gui/list.c =================================================================== --- apps/gui/list.c (revision 14037) +++ apps/gui/list.c (working copy) @@ -143,7 +143,7 @@ int line_ypos=display->getymargin()+display->char_height*selected_line; if (global_settings.invert_cursor) { - int line_xpos=display->getxmargin(); + int line_xpos=display->getleftmargin(); display->set_drawmode(DRMODE_COMPLEMENT); display->fillrect(line_xpos, line_ypos, display->width, display->char_height); @@ -215,7 +215,7 @@ static int last_lines[NB_SCREENS] = {0}; #ifdef HAVE_LCD_BITMAP int item_offset; - int old_margin = display->getxmargin(); + int old_margin = display->getleftmargin(); #endif int start, end; bool partial_draw = false; Index: apps/gui/gwps.c =================================================================== --- apps/gui/gwps.c (revision 14037) +++ apps/gui/gwps.c (working copy) @@ -84,11 +84,10 @@ { int offset = 0; struct wps_data *data = gwps->data; - if(data->wps_sb_tag && data->show_sb_on_wps) + if((data->wps_sb_tag && data->show_sb_on_wps) || + (global_settings.statusbar && !data->wps_sb_tag)) offset = STATUSBAR_HEIGHT; - else if ( global_settings.statusbar && !data->wps_sb_tag) - offset = STATUSBAR_HEIGHT; - gwps->display->setmargins(0, offset); + gwps->display->setmargins(0, gwps->display->width, offset); } #endif Index: apps/gui/gwps.h =================================================================== --- apps/gui/gwps.h (revision 14037) +++ apps/gui/gwps.h (working copy) @@ -107,6 +107,8 @@ WPS_TOKEN_ALIGN_LEFT, WPS_TOKEN_ALIGN_CENTER, WPS_TOKEN_ALIGN_RIGHT, + WPS_TOKEN_ALIGN_SCROLLMARGIN_LEFT, + WPS_TOKEN_ALIGN_SCROLLMARGIN_RIGHT, /* Sublines */ WPS_TOKEN_SUBLINE_TIMEOUT, Index: apps/gui/wps_parser.c =================================================================== --- apps/gui/wps_parser.c (revision 14037) +++ apps/gui/wps_parser.c (working copy) @@ -113,6 +113,8 @@ struct wps_token *token, struct wps_data *wps_data); static int parse_dir_level(const char *wps_bufptr, struct wps_token *token, struct wps_data *wps_data); +static int parse_scrollmargins(const char *wps_bufptr, + struct wps_token *token, struct wps_data *wps_data); #ifdef HAVE_LCD_BITMAP static int parse_image_special(const char *wps_bufptr, struct wps_token *token, struct wps_data *wps_data); @@ -278,6 +280,8 @@ parse_image_display }, { WPS_TOKEN_IMAGE_DISPLAY, "x", 0, parse_image_load }, + { WPS_NO_TOKEN, "m", 0, parse_scrollmargins }, + { WPS_TOKEN_IMAGE_PROGRESS_BAR, "P", 0, parse_image_special }, #if (LCD_DEPTH > 1) || (defined(HAVE_LCD_REMOTE) && (LCD_REMOTE_DEPTH > 1)) { WPS_TOKEN_IMAGE_BACKDROP, "X", 0, parse_image_special }, @@ -602,6 +606,33 @@ #endif } +static int parse_scrollmargins(const char *wps_bufptr, struct wps_token *token, struct wps_data *wps_data) +{ + /* valid tag looks like %m|12|34| */ + if(*wps_bufptr == '|') + { + const char * _pleft = wps_bufptr + 1; + const char * _pright = NULL, * _pend = NULL; + if( isdigit(*_pleft) && ( _pright = strchr( _pleft, '|' ) ) ) + { + _pright++; + if( isdigit(*_pright) && ( _pend = strchr( _pright, '|' ) ) ) + { + wps_data->num_tokens += 2; + token->type = WPS_TOKEN_ALIGN_SCROLLMARGIN_LEFT; + token->value.i = atoi(_pleft); + token++; + token->type = WPS_TOKEN_ALIGN_SCROLLMARGIN_RIGHT; + token->value.i = atoi(_pright); + + return( _pend - wps_bufptr + 1 ); + } + } + } + + return(0); +} + /* Parse a generic token from the given string. Return the length read */ static int parse_token(const char *wps_bufptr, struct wps_data *wps_data) { Index: apps/menus/recording_menu.c =================================================================== --- apps/menus/recording_menu.c (revision 14037) +++ apps/menus/recording_menu.c (working copy) @@ -431,7 +431,7 @@ int exit_request = false; enum trigger_menu_option selected = TRIGGER_MODE; bool retval = false; - int old_x_margin[NB_SCREENS]; + int old_left_margin[NB_SCREENS], old_right_margin[NB_SCREENS]; int old_y_margin[NB_SCREENS]; #define TRIGGER_MODE_COUNT 3 @@ -503,12 +503,13 @@ { screens[i].clear_display(); - old_x_margin[i] = screens[i].getxmargin(); + old_left_margin[i] = screens[i].getleftmargin(); + old_right_margin[i] = screens[i].getrightmargin(); old_y_margin[i] = screens[i].getymargin(); if(global_settings.statusbar) - screens[i].setmargins(0, STATUSBAR_HEIGHT); + screens[i].setmargins(0, screens[i].width, STATUSBAR_HEIGHT); else - screens[i].setmargins(0, 0); + screens[i].setmargins(0, screens[i].width, 0); screens[i].getstringsize("M", &w, &h); @@ -789,7 +790,7 @@ FOR_NB_SCREENS(i) { screens[i].setfont(FONT_UI); - screens[i].setmargins(old_x_margin[i], old_y_margin[i]); + screens[i].setmargins(old_left_margin[i], old_right_margin[i], old_y_margin[i]); } return retval; } Index: apps/menus/main_menu.c =================================================================== --- apps/menus/main_menu.c (revision 14037) +++ apps/menus/main_menu.c (working copy) @@ -159,7 +159,7 @@ }; #if defined(HAVE_LCD_BITMAP) FOR_NB_SCREENS(i) - screens[i].setmargins(0, 0); + screens[i].setmargins(0, screens[i].width, 0); #endif while (!done) { Index: apps/alarm_menu.c =================================================================== --- apps/alarm_menu.c (revision 14037) +++ apps/alarm_menu.c (working copy) @@ -70,7 +70,7 @@ { FOR_NB_SCREENS(i) { - screens[i].setmargins(0, 0); + screens[i].setmargins(0, screens[i].width, 0); gui_textarea_clear(&screens[i]); screens[i].puts(0, 3, str(LANG_ALARM_MOD_KEYS)); } Index: apps/plugin.c =================================================================== --- apps/plugin.c (revision 14037) +++ apps/plugin.c (working copy) @@ -589,9 +589,9 @@ plugin_loaded = true; - xm = lcd_getxmargin(); - ym = lcd_getymargin(); - lcd_setmargins(0,0); + xm = lcd_getleftmargin(); + ym = lcd_getrightmargin(); + lcd_setmargins(0,LCD_WIDTH,0); #if defined HAVE_LCD_BITMAP && LCD_DEPTH > 1 old_backdrop = lcd_get_backdrop(); @@ -600,9 +600,9 @@ lcd_update(); #ifdef HAVE_REMOTE_LCD - rxm = lcd_remote_getxmargin(); + rxm = lcd_remote_getleftmargin(); rym = lcd_remote_getymargin(); - lcd_remote_setmargins(0, 0); + lcd_remote_setmargins(0, LCD_REMOTE_WIDTH, 0); lcd_remote_clear_display(); lcd_remote_update(); #endif @@ -629,7 +629,7 @@ #endif /* HAVE_LCD_BITMAP */ /* restore margins */ - lcd_setmargins(xm,ym); + lcd_setmargins(xm, LCD_WIDTH, ym); lcd_clear_display(); lcd_update(); @@ -640,7 +640,7 @@ #else lcd_remote_set_drawmode(DRMODE_SOLID); #endif - lcd_remote_setmargins(rxm, rym); + lcd_remote_setmargins(rxm, LCD_REMOTE_WIDTH, rym); lcd_remote_clear_display(); lcd_remote_update(); #endif Index: apps/plugin.h =================================================================== --- apps/plugin.h (revision 14037) +++ apps/plugin.h (working copy) @@ -138,7 +138,7 @@ void (*lcd_set_contrast)(int x); void (*lcd_update)(void); void (*lcd_clear_display)(void); - void (*lcd_setmargins)(int x, int y); + void (*lcd_setmargins)(int leftmargin, int rightmargin, int ymargin); int (*lcd_getstringsize)(const unsigned char *str, int *w, int *h); void (*lcd_putsxy)(int x, int y, const unsigned char *string); void (*lcd_puts)(int x, int y, const unsigned char *string); Index: apps/logfdisp.c =================================================================== --- apps/logfdisp.c (revision 14037) +++ apps/logfdisp.c (working copy) @@ -64,7 +64,7 @@ if(!lines) return false; - lcd_setmargins(0, 0); + lcd_setmargins(0, LCD_WIDTH, 0); lcd_clear_display(); do { Index: apps/debug_menu.c =================================================================== --- apps/debug_menu.c (revision 14037) +++ apps/debug_menu.c (working copy) @@ -266,7 +266,7 @@ char buf[32]; struct audio_debug d; - lcd_setmargins(0, 0); + lcd_setmargins(0, LCD_WIDTH, 0); lcd_setfont(FONT_SYSFIXED); while(1) @@ -338,7 +338,7 @@ tick_add_task(dbg_audio_task); - lcd_setmargins(0, 0); + lcd_setmargins(0, LCD_WIDTH, 0); lcd_setfont(FONT_SYSFIXED); while(!done) { @@ -529,7 +529,7 @@ system_memory_guard(oldmode); /* re-enable memory guard */ - lcd_setmargins(0, 0); + lcd_setmargins(0, LCD_WIDTH, 0); lcd_setfont(FONT_SYSFIXED); lcd_clear_display(); @@ -580,7 +580,7 @@ system_memory_guard(oldmode); /* re-enable memory guard */ - lcd_setmargins(0, 0); + lcd_setmargins(0, LCD_WIDTH, 0); lcd_setfont(FONT_SYSFIXED); lcd_clear_display(); @@ -631,7 +631,7 @@ (PP_VER1 >> 24) & 0xff, (PP_VER1 >> 16) & 0xff, (PP_VER1 >> 8) & 0xff, (PP_VER1) & 0xff, '\0' }; - lcd_setmargins(0, 0); + lcd_setmargins(0, LCD_WIDTH, 0); lcd_setfont(FONT_SYSFIXED); lcd_clear_display(); @@ -821,7 +821,7 @@ int spdif_source = spdif_get_output_source(&spdif_src_on); spdif_set_output_source(AUDIO_SRC_SPDIF IF_SPDIF_POWER_(, true)); - lcd_setmargins(0, 0); + lcd_setmargins(0, LCD_WIDTH, 0); lcd_clear_display(); lcd_setfont(FONT_SYSFIXED); @@ -1025,7 +1025,7 @@ int adc_battery_voltage, adc_battery_level; lcd_setfont(FONT_SYSFIXED); - lcd_setmargins(0, 0); + lcd_setmargins(0, LCD_WIDTH, 0); lcd_clear_display(); while(1) @@ -1072,7 +1072,7 @@ char buf[128]; int line; - lcd_setmargins(0, 0); + lcd_setmargins(0, LCD_WIDTH ,0); lcd_clear_display(); lcd_setfont(FONT_SYSFIXED); @@ -1156,7 +1156,7 @@ char buf[128]; int line; - lcd_setmargins(0, 0); + lcd_setmargins(0, LCD_WIDTH, 0); lcd_clear_display(); lcd_setfont(FONT_SYSFIXED); @@ -1257,7 +1257,7 @@ char buf[128]; int line; - lcd_setmargins(0, 0); + lcd_setmargins(0, LCD_WIDTH, 0); lcd_clear_display(); lcd_setfont(FONT_SYSFIXED); @@ -1297,7 +1297,7 @@ char buf[50]; int line; - lcd_setmargins(0, 0); + lcd_setmargins(0, LCD_WIDTH, 0); lcd_clear_display(); lcd_setfont(FONT_SYSFIXED); @@ -1438,7 +1438,7 @@ int button; #ifdef HAVE_LCD_BITMAP - lcd_setmargins(0, 0); + lcd_setmargins(0, LCD_WIDTH, 0); lcd_setfont(FONT_SYSFIXED); #endif lcd_clear_display(); @@ -1499,7 +1499,7 @@ unsigned short maxv, minv; char buf[32]; - lcd_setmargins(0, 0); + lcd_setmargins(0, LCD_WIDTH, 0); lcd_setfont(FONT_SYSFIXED); while(1) @@ -2133,7 +2133,7 @@ static bool dbg_lcd_power_off(void) { - lcd_setmargins(0, 0); + lcd_setmargins(0, LCD_WIDTH, 0); while(1) { @@ -2216,7 +2216,7 @@ int lines = LCD_HEIGHT/SYSFONT_HEIGHT; char *str; bool done; - lcd_setmargins(0, 0); + lcd_setmargins(0, LCD_WIDTH, 0); lcd_setfont(FONT_SYSFIXED); str = cpu_boost_log_getlog_first(); while (i < count) Index: firmware/export/lcd.h =================================================================== --- firmware/export/lcd.h (revision 14037) +++ firmware/export/lcd.h (working copy) @@ -60,8 +60,9 @@ extern void lcd_backlight(bool on); extern int lcd_default_contrast(void); extern void lcd_set_contrast(int val); -extern void lcd_setmargins(int xmargin, int ymargin); -extern int lcd_getxmargin(void); +extern void lcd_setmargins(int leftmargin, int rightmargin, int ymargin); +extern int lcd_getleftmargin(void); +extern int lcd_getrightmargin(void); extern int lcd_getymargin(void); extern int lcd_getstringsize(const unsigned char *str, int *w, int *h); Index: firmware/export/scroll_engine.h =================================================================== --- firmware/export/scroll_engine.h (revision 14037) +++ firmware/export/scroll_engine.h (working copy) @@ -48,6 +48,8 @@ bool backward; /* scroll presently forward or backward? */ bool bidir; long start_tick; + int left_margin; + int right_margin; #ifdef HAVE_LCD_COLOR int line_color; #endif Index: firmware/export/lcd-remote.h =================================================================== --- firmware/export/lcd-remote.h (revision 14037) +++ firmware/export/lcd-remote.h (working copy) @@ -138,8 +138,9 @@ extern void lcd_remote_set_drawmode(int mode); extern int lcd_remote_get_drawmode(void); -extern void lcd_remote_setmargins(int xmargin, int ymargin); -extern int lcd_remote_getxmargin(void); +extern void lcd_remote_setmargins(int leftmargin, int rightmargin, int ymargin); +extern int lcd_remote_getleftmargin(void); +extern int lcd_remote_getrightmargin(void); extern int lcd_remote_getymargin(void); extern void lcd_remote_setfont(int font); extern int lcd_remote_getstringsize(const unsigned char *str, int *w, int *h); Index: firmware/logf.c =================================================================== --- firmware/logf.c (revision 14037) +++ firmware/logf.c (working copy) @@ -54,7 +54,7 @@ lcd_remote_getstringsize("A", &w, &h); lines = LCD_REMOTE_HEIGHT/h; columns = LCD_REMOTE_WIDTH/w; - lcd_remote_setmargins(0, 0); + lcd_remote_setmargins(0, LCD_REMOTE_WIDTH, 0); lcd_remote_clear_display(); index = logfindex; Index: firmware/drivers/lcd-1bit-vert.c =================================================================== --- firmware/drivers/lcd-1bit-vert.c (revision 14037) +++ firmware/drivers/lcd-1bit-vert.c (working copy) @@ -36,7 +36,8 @@ unsigned char lcd_framebuffer[LCD_FBHEIGHT][LCD_FBWIDTH]; static int drawmode = DRMODE_SOLID; -static int xmargin = 0; +static int leftmargin = 0; +static int rightmargin = 0; static int ymargin = 0; static int curfont = FONT_SYSFIXED; @@ -61,17 +62,23 @@ return drawmode; } -void lcd_setmargins(int x, int y) +void lcd_setmargins(int x1, int x2, int y) { - xmargin = x; + leftmargin = x1; + rightmargin = x2; ymargin = y; } -int lcd_getxmargin(void) +int lcd_getleftmargin(void) { - return xmargin; + return leftmargin; } +int lcd_getrightmargin(void) +{ + return rightmargin; +} + int lcd_getymargin(void) { return ymargin; @@ -114,7 +121,7 @@ flippixel, nopixel, setpixel, setpixel, nopixel, clearpixel, nopixel, clearpixel }; - + static void flipblock(unsigned char *address, unsigned mask, unsigned bits) ICODE_ATTR; static void flipblock(unsigned char *address, unsigned mask, unsigned bits) @@ -172,7 +179,7 @@ static void solidinvblock(unsigned char *address, unsigned mask, unsigned bits) { unsigned data = *(char *)address; - + bits = ~bits ^ data; *address = data ^ (bits & mask); } @@ -286,17 +293,17 @@ x1 = x2; x2 = x; } - + /* nothing to draw? */ if (((unsigned)y >= LCD_HEIGHT) || (x1 >= LCD_WIDTH) || (x2 < 0)) - return; - + return; + /* clipping */ if (x1 < 0) x1 = 0; if (x2 >= LCD_WIDTH) x2 = LCD_WIDTH-1; - + bfunc = lcd_blockfuncs[drawmode]; dst = &lcd_framebuffer[y>>3][x1]; mask = 1 << (y & 7); @@ -325,14 +332,14 @@ /* nothing to draw? */ if (((unsigned)x >= LCD_WIDTH) || (y1 >= LCD_HEIGHT) || (y2 < 0)) - return; - + return; + /* clipping */ if (y1 < 0) y1 = 0; if (y2 >= LCD_HEIGHT) y2 = LCD_HEIGHT-1; - + bfunc = lcd_blockfuncs[drawmode]; dst = &lcd_framebuffer[y1>>3][x]; ny = y2 - (y1 & ~7); @@ -394,7 +401,7 @@ width = LCD_WIDTH - x; if (y + height > LCD_HEIGHT) height = LCD_HEIGHT - y; - + if (drawmode & DRMODE_INVERSEVID) { if (drawmode & DRMODE_BG) @@ -473,7 +480,7 @@ if ((width <= 0) || (height <= 0) || (x >= LCD_WIDTH) || (y >= LCD_HEIGHT) || (x + width <= 0) || (y + height <= 0)) return; - + /* clipping */ if (x < 0) { @@ -502,7 +509,7 @@ bfunc = lcd_blockfuncs[drawmode]; mask = 0xFFu << (shift + src_y); mask_bottom = 0xFFu >> (~ny & 7); - + if (shift == 0) { bool copyopt = (drawmode == DRMODE_SOLID); @@ -515,9 +522,9 @@ { const unsigned char *src_row = src; unsigned char *dst_row = dst; - + dst_end = dst_row + width; - do + do bfunc(dst_row++, mask, *src_row++); while (dst_row < dst_end); } @@ -547,7 +554,7 @@ unsigned char *dst_col = dst++; unsigned mask_col = mask; unsigned data = 0; - + for (y = ny; y >= 8; y -= 8) { data |= *src_col << shift; @@ -604,7 +611,7 @@ lcd_mono_bitmap_part(bits, ofs, 0, width, x, y, width - ofs, pf->height); - + x += width - ofs; ofs = 0; } @@ -648,14 +655,17 @@ return; lcd_getstringsize(str, &w, &h); - xpos = xmargin + x*w / utf8length(str); + xpos = leftmargin + x*w / utf8length(str); ypos = ymargin + y*h; drawmode = (style & STYLE_INVERT) ? (DRMODE_SOLID|DRMODE_INVERSEVID) : DRMODE_SOLID; lcd_putsxyofs(xpos, ypos, offset, str); drawmode ^= DRMODE_INVERSEVID; xrect = xpos + MAX(w - offset, 0); - lcd_fillrect(xrect, ypos, LCD_WIDTH - xrect, h); + lcd_fillrect(xpos + w, ypos, rightmargin - (xpos + w), h); + if (LCD_WIDTH>rightmargin) { + lcd_fillrect(rightmargin, ypos, LCD_WIDTH - rightmargin, h); + } drawmode = lastmode; } @@ -674,8 +684,8 @@ int offset) { lcd_puts_scroll_style_offset(x, y, string, STYLE_DEFAULT, offset); -} - +} + void lcd_puts_scroll_style_offset(int x, int y, const unsigned char *string, int style, int offset) { @@ -697,7 +707,7 @@ lcd_getstringsize(string, &w, &h); - if (LCD_WIDTH - x * 8 - xmargin < w) { + if (rightmargin - x * 8 - leftmargin < w) { /* prepare scroll line */ char *end; @@ -710,7 +720,7 @@ /* scroll bidirectional or forward only depending on the string width */ if ( lcd_scroll_info.bidir_limit ) { - s->bidir = s->width < (LCD_WIDTH - xmargin) * + s->bidir = s->width < (rightmargin - leftmargin) * (100 + lcd_scroll_info.bidir_limit) / 100; } else @@ -723,12 +733,14 @@ } end = strchr(s->line, '\0'); - strncpy(end, string, LCD_WIDTH/2); + strncpy(end, string, rightmargin/2); s->len = utf8length(string); s->offset = offset; - s->startx = xmargin + x * s->width / s->len;; + s->startx = leftmargin + x * s->width / s->len;; s->backward = false; + s->left_margin=leftmargin; + s->right_margin=rightmargin; lcd_scroll_info.lines |= (1<backward = false; s->start_tick = current_tick + lcd_scroll_info.delay * 2; } - if (s->offset >= s->width - (LCD_WIDTH - xpos)) { + if (s->offset >= s->width - (s->right_margin - xpos)) { /* at end of line */ - s->offset = s->width - (LCD_WIDTH - xpos); + s->offset = s->width - (s->right_margin - xpos); s->backward = true; s->start_tick = current_tick + lcd_scroll_info.delay * 2; } @@ -788,7 +800,11 @@ drawmode = s->invert ? (DRMODE_SOLID|DRMODE_INVERSEVID) : DRMODE_SOLID; lcd_putsxyofs(xpos, ypos, s->offset, s->line); + if (LCD_WIDTH>s->right_margin) { + drawmode ^= DRMODE_INVERSEVID; + lcd_fillrect(s->right_margin, ypos, LCD_WIDTH - s->right_margin, pf->height); + } drawmode = lastmode; - lcd_update_rect(xpos, ypos, LCD_WIDTH - xpos, pf->height); + lcd_update_rect(xpos, ypos, s->right_margin - xpos, pf->height); } } Index: firmware/drivers/lcd-2bit-vert.c =================================================================== --- firmware/drivers/lcd-2bit-vert.c (revision 14037) +++ firmware/drivers/lcd-2bit-vert.c (working copy) @@ -51,7 +51,8 @@ static unsigned fg_pattern IDATA_ATTR = 0xFF; /* initially black */ static unsigned bg_pattern IDATA_ATTR = 0x00; /* initially white */ static int drawmode = DRMODE_SOLID; -static int xmargin = 0; +static int leftmargin = 0; +static int rightmargin = 0; static int ymargin = 0; static int curfont = FONT_SYSFIXED; @@ -103,17 +104,25 @@ lcd_set_background(bg_brightness); } -void lcd_setmargins(int x, int y) +void lcd_setmargins(int x1, int x2, int y) { - xmargin = x; + leftmargin = x1; + rightmargin = x2; ymargin = y; + } -int lcd_getxmargin(void) +int lcd_getleftmargin(void) { - return xmargin; + return leftmargin; } +int lcd_getrightmargin(void) +{ + return rightmargin; +} + + int lcd_getymargin(void) { return ymargin; @@ -226,7 +235,7 @@ { unsigned data = *address; unsigned bgp = bg_pattern; - + bits = bgp ^ ((bgp ^ fg_pattern) & bits); *address = data ^ ((data ^ bits) & mask); } @@ -237,7 +246,7 @@ { unsigned data = *address; unsigned bgp = *(address + lcd_backdrop_offset); - + bits = bgp ^ ((bgp ^ fg_pattern) & bits); *address = data ^ ((data ^ bits) & mask); } @@ -282,7 +291,7 @@ { unsigned data = *address; unsigned fgp = fg_pattern; - + bits = fgp ^ ((fgp ^ bg_pattern) & bits); *address = data ^ ((data ^ bits) & mask); } @@ -293,7 +302,7 @@ { unsigned data = *address; unsigned fgp = fg_pattern; - + bits = fgp ^ ((fgp ^ *(address + lcd_backdrop_offset)) & bits); *address = data ^ ((data ^ bits) & mask); } @@ -320,7 +329,7 @@ lcd_pixelfuncs = lcd_pixelfuncs_backdrop; lcd_blockfuncs = lcd_blockfuncs_backdrop; } - else + else { lcd_backdrop_offset = 0; lcd_pixelfuncs = lcd_pixelfuncs_bgcolor; @@ -455,17 +464,17 @@ x1 = x2; x2 = x; } - + /* nothing to draw? */ if (((unsigned)y >= LCD_HEIGHT) || (x1 >= LCD_WIDTH) || (x2 < 0)) - return; - + return; + /* clipping */ if (x1 < 0) x1 = 0; if (x2 >= LCD_WIDTH) x2 = LCD_WIDTH-1; - + bfunc = lcd_blockfuncs[drawmode]; dst = &lcd_framebuffer[y>>2][x1]; mask = pixmask[y & 3]; @@ -494,14 +503,14 @@ /* nothing to draw? */ if (((unsigned)x >= LCD_WIDTH) || (y1 >= LCD_HEIGHT) || (y2 < 0)) - return; - + return; + /* clipping */ if (y1 < 0) y1 = 0; if (y2 >= LCD_HEIGHT) y2 = LCD_HEIGHT-1; - + bfunc = lcd_blockfuncs[drawmode]; dst = &lcd_framebuffer[y1>>2][x]; ny = y2 - (y1 & ~3); @@ -563,7 +572,7 @@ width = LCD_WIDTH - x; if (y + height > LCD_HEIGHT) height = LCD_HEIGHT - y; - + if (drawmode & DRMODE_INVERSEVID) { if ((drawmode & DRMODE_BG) && !lcd_backdrop) @@ -643,7 +652,7 @@ if ((width <= 0) || (height <= 0) || (x >= LCD_WIDTH) || (y >= LCD_HEIGHT) || (x + width <= 0) || (y + height <= 0)) return; - + /* clipping */ if (x < 0) { @@ -672,7 +681,7 @@ bfunc = lcd_blockfuncs[drawmode]; mask = 0xFFu << (shift + src_y); mask_bottom = 0xFFu >> (~ny & 7); - + if (shift == 0) { unsigned dmask1, dmask2, data; @@ -681,7 +690,7 @@ { const unsigned char *src_row = src; fb_data *dst_row = dst + LCD_WIDTH; - + dmask1 = lcd_dibits[mask&0x0F]; dmask2 = lcd_dibits[(mask>>4)&0x0F]; dst_end = dst_row + width; @@ -710,7 +719,7 @@ dmask1 = lcd_dibits[mask&0x0F]; dmask2 = lcd_dibits[(mask>>4)&0x0F]; dst_end = dst + width; - + if (dmask1 != 0) { if (dmask2 != 0) @@ -746,8 +755,8 @@ fb_data *dst_col = dst++; unsigned mask_col = mask; unsigned data = 0; - - for (y = ny; y >= 8; y -= 8) + + for (y = ny; y >= 8; y -= 8) { data |= *src_col << shift; @@ -810,7 +819,7 @@ if ((width <= 0) || (height <= 0) || (x >= LCD_WIDTH) || (y >= LCD_HEIGHT) || (x + width <= 0) || (y + height <= 0)) return; - + /* clipping */ if (x < 0) { @@ -838,7 +847,7 @@ mask = 0xFFu << (2 * (shift + src_y)); mask_bottom = 0xFFu >> (2 * (~ny & 3)); - + if (shift == 0) { for (; ny >= 4; ny -= 4) @@ -849,9 +858,9 @@ { const fb_data *src_row = src; fb_data *dst_row = dst; - + dst_end = dst_row + width; - do + do setblock(dst_row++, mask, *src_row++); while (dst_row < dst_end); } @@ -881,7 +890,7 @@ fb_data *dst_col = dst++; unsigned mask_col = mask; unsigned data = 0; - + for (y = ny; y >= 4; y -= 4) { data |= *src_col << shift; @@ -938,7 +947,7 @@ lcd_mono_bitmap_part(bits, ofs, 0, width, x, y, width - ofs, pf->height); - + x += width - ofs; ofs = 0; } @@ -983,14 +992,17 @@ return; lcd_getstringsize(str, &w, &h); - xpos = xmargin + x*w / utf8length((char *)str); + xpos = leftmargin + x*w / utf8length((char *)str); ypos = ymargin + y*h; drawmode = (style & STYLE_INVERT) ? (DRMODE_SOLID|DRMODE_INVERSEVID) : DRMODE_SOLID; lcd_putsxyofs(xpos, ypos, offset, str); drawmode ^= DRMODE_INVERSEVID; xrect = xpos + MAX(w - offset, 0); - lcd_fillrect(xrect, ypos, LCD_WIDTH - xrect, h); + lcd_fillrect(xpos + w, ypos, rightmargin - (xpos + w), h); + if (LCD_WIDTH>rightmargin) { + lcd_fillrect(rightmargin, ypos, LCD_WIDTH - rightmargin, h); + } drawmode = lastmode; } @@ -1009,8 +1021,8 @@ void lcd_puts_scroll_offset(int x, int y, const unsigned char *string, int offset) { lcd_puts_scroll_style_offset(x, y, string, STYLE_DEFAULT, offset); -} - +} + void lcd_puts_scroll_style_offset(int x, int y, const unsigned char *string, int style, int offset) { @@ -1032,7 +1044,7 @@ lcd_getstringsize(string, &w, &h); - if (LCD_WIDTH - x * 8 - xmargin < w) { + if (rightmargin - x * 8 - leftmargin < w) { /* prepare scroll line */ char *end; @@ -1045,7 +1057,7 @@ /* scroll bidirectional or forward only depending on the string width */ if ( lcd_scroll_info.bidir_limit ) { - s->bidir = s->width < (LCD_WIDTH - xmargin) * + s->bidir = s->width < (rightmargin - leftmargin) * (100 + lcd_scroll_info.bidir_limit) / 100; } else @@ -1058,12 +1070,14 @@ } end = strchr(s->line, '\0'); - strncpy(end, (char *)string, LCD_WIDTH/2); + strncpy(end, (char *)string, rightmargin/2); s->len = utf8length((char *)string); s->offset = offset; - s->startx = xmargin + x * s->width / s->len; + s->startx = leftmargin + x * s->width / s->len; s->backward = false; + s->left_margin=leftmargin; + s->right_margin=rightmargin; lcd_scroll_info.lines |= (1<backward = false; s->start_tick = current_tick + lcd_scroll_info.delay * 2; } - if (s->offset >= s->width - (LCD_WIDTH - xpos)) { + if (s->offset >= s->width - (s->right_margin - xpos)) { /* at end of line */ - s->offset = s->width - (LCD_WIDTH - xpos); + s->offset = s->width - (s->right_margin - xpos); s->backward = true; s->start_tick = current_tick + lcd_scroll_info.delay * 2; } @@ -1123,7 +1137,11 @@ drawmode = s->invert ? (DRMODE_SOLID|DRMODE_INVERSEVID) : DRMODE_SOLID; lcd_putsxyofs(xpos, ypos, s->offset, s->line); + if (LCD_WIDTH>s->right_margin) { + drawmode ^= DRMODE_INVERSEVID; + lcd_fillrect(s->right_margin, ypos, LCD_WIDTH - s->right_margin, pf->height); + } drawmode = lastmode; - lcd_update_rect(xpos, ypos, LCD_WIDTH - xpos, pf->height); + lcd_update_rect(xpos, ypos, s->right_margin - xpos, pf->height); } } Index: firmware/drivers/lcd-2bit-horz.c =================================================================== --- firmware/drivers/lcd-2bit-horz.c (revision 14037) +++ firmware/drivers/lcd-2bit-horz.c (working copy) @@ -49,7 +49,8 @@ static unsigned fg_pattern IDATA_ATTR = 0xFF; /* initially black */ static unsigned bg_pattern IDATA_ATTR = 0x00; /* initially white */ static int drawmode = DRMODE_SOLID; -static int xmargin = 0; +static int leftmargin = 0; +static int rightmargin = 0; static int ymargin = 0; static int curfont = FONT_SYSFIXED; @@ -101,17 +102,23 @@ lcd_set_background(bg_brightness); } -void lcd_setmargins(int x, int y) +void lcd_setmargins(int x1, int x2, int y) { - xmargin = x; + leftmargin = x1; + rightmargin = x2; ymargin = y; } -int lcd_getxmargin(void) +int lcd_getleftmargin(void) { - return xmargin; + return leftmargin; } +int lcd_getrightmargin(void) +{ + return rightmargin; +} + int lcd_getymargin(void) { return ymargin; @@ -160,7 +167,7 @@ { unsigned mask = pixmask[x & 3]; fb_data *address = &lcd_framebuffer[y][x>>2]; - + *address ^= mask; } @@ -335,7 +342,7 @@ static inline void setblock(fb_data *address, unsigned mask, unsigned bits) { unsigned data = *address; - + bits ^= data; *address = data ^ (bits & mask); } @@ -453,11 +460,11 @@ x1 = x2; x2 = nx; } - + /* nothing to draw? */ if (((unsigned)y >= LCD_HEIGHT) || (x1 >= LCD_WIDTH) || (x2 < 0)) - return; - + return; + /* clipping */ if (x1 < 0) x1 = 0; @@ -469,7 +476,7 @@ nx = x2 - (x1 & ~3); mask = 0xFFu >> (2 * (x1 & 3)); mask_right = 0xFFu << (2 * (~nx & 3)); - + for (; nx >= 4; nx -= 4) { bfunc(dst++, mask, 0xFFu); @@ -497,18 +504,18 @@ /* nothing to draw? */ if (((unsigned)x >= LCD_WIDTH) || (y1 >= LCD_HEIGHT) || (y2 < 0)) - return; - + return; + /* clipping */ if (y1 < 0) y1 = 0; if (y2 >= LCD_HEIGHT) y2 = LCD_HEIGHT-1; - + bfunc = lcd_blockfuncs[drawmode]; dst = &lcd_framebuffer[y1][x>>2]; mask = pixmask[x & 3]; - + dst_end = dst + (y2 - y1) * LCD_FBWIDTH; do { @@ -567,7 +574,7 @@ nx = width - 1 + (x & 3); mask = 0xFFu >> (2 * (x & 3)); mask_right = 0xFFu << (2 * (~nx & 3)); - + for (; nx >= 4; nx -= 4) { unsigned char *dst_col = dst; @@ -619,7 +626,7 @@ if ((width <= 0) || (height <= 0) || (x >= LCD_WIDTH) || (y >= LCD_HEIGHT) || (x + width <= 0) || (y + height <= 0)) return; - + /* clipping */ if (x < 0) { @@ -642,15 +649,15 @@ src_y &= 7; src_end = src + width; - fgfunc = lcd_pixelfuncs[drawmode]; - bgfunc = lcd_pixelfuncs[drawmode ^ DRMODE_INVERSEVID]; + fgfunc = lcd_pixelfuncs[drawmode]; + bgfunc = lcd_pixelfuncs[drawmode ^ DRMODE_INVERSEVID]; nx = x; do { const unsigned char *src_col = src++; unsigned data = *src_col >> src_y; int numbits = 8 - ((int)src_y); - + ymax = y + height; ny = y; do @@ -707,7 +714,7 @@ if ((width <= 0) || (height <= 0) || (x >= LCD_WIDTH) || (y >= LCD_HEIGHT) || (x + width <= 0) || (y + height <= 0)) return; - + /* clipping */ if (x < 0) { @@ -737,7 +744,7 @@ mask = 0xFF00u >> (2 * (shift + src_x)); mask_right = 0xFFu << (2 * (~nx & 3)); - + shift *= 2; dst_end = dst + height * LCD_FBWIDTH; do @@ -746,11 +753,11 @@ unsigned char *dst_row = dst; unsigned mask_row = mask >> 8; unsigned data = 0; - + for (x = nx; x >= 4; x -= 4) { data = (data << 8) | *src_row++; - + if (mask_row & 0xFF) { setblock(dst_row, mask_row, data >> shift); @@ -803,7 +810,7 @@ lcd_mono_bitmap_part(bits, ofs, 0, width, x, y, width - ofs, pf->height); - + x += width - ofs; ofs = 0; } @@ -848,7 +855,7 @@ return; lcd_getstringsize(str, &w, &h); - xpos = xmargin + x*w / utf8length((char *)str); + xpos = leftmargin + x*w / utf8length((char *)str); ypos = ymargin + y*h; drawmode = (style & STYLE_INVERT) ? (DRMODE_SOLID|DRMODE_INVERSEVID) : DRMODE_SOLID; @@ -873,8 +880,8 @@ void lcd_puts_scroll_offset(int x, int y, const unsigned char *string, int offset) { lcd_puts_scroll_style_offset(x, y, string, STYLE_DEFAULT, offset); -} - +} + void lcd_puts_scroll_style_offset(int x, int y, const unsigned char *string, int style, int offset) { @@ -896,7 +903,7 @@ lcd_getstringsize(string, &w, &h); - if (LCD_WIDTH - x * 8 - xmargin < w) { + if (LCD_WIDTH - x * 8 - leftmargin < w) { /* prepare scroll line */ char *end; @@ -909,7 +916,7 @@ /* scroll bidirectional or forward only depending on the string width */ if ( lcd_scroll_info.bidir_limit ) { - s->bidir = s->width < (LCD_WIDTH - xmargin) * + s->bidir = s->width < (LCD_WIDTH - leftmargin) * (100 + lcd_scroll_info.bidir_limit) / 100; } else @@ -926,7 +933,7 @@ s->len = utf8length((char *)string); s->offset = offset; - s->startx = xmargin + x * s->width / s->len;; + s->startx = leftmargin + x * s->width / s->len;; s->backward = false; lcd_scroll_info.lines |= (1<>3][x]; unsigned data = *address; - *address = data ^ ((data ^ *(fb_remote_data *)((long)address + *address = data ^ ((data ^ *(fb_remote_data *)((long)address + remote_backdrop_offset)) & mask); } @@ -267,7 +274,7 @@ { unsigned data = *address; - *address = data ^ ((data ^ *(fb_remote_data *)((long)address + *address = data ^ ((data ^ *(fb_remote_data *)((long)address + remote_backdrop_offset)) & mask & bits); } @@ -984,7 +991,7 @@ return; lcd_remote_getstringsize(str, &w, &h); - xpos = xmargin + x*w / utf8length((char *)str); + xpos = leftmargin + x*w / utf8length((char *)str); ypos = ymargin + y*h; drawmode = (style & STYLE_INVERT) ? (DRMODE_SOLID|DRMODE_INVERSEVID) : DRMODE_SOLID; @@ -1032,7 +1039,7 @@ lcd_remote_getstringsize(string, &w, &h); - if (LCD_REMOTE_WIDTH - x * 8 - xmargin < w) { + if (LCD_REMOTE_WIDTH - x * 8 - leftmargin < w) { /* prepare scroll line */ char *end; @@ -1045,7 +1052,7 @@ /* scroll bidirectional or forward only depending on the string width */ if ( lcd_remote_scroll_info.bidir_limit ) { - s->bidir = s->width < (LCD_REMOTE_WIDTH - xmargin) * + s->bidir = s->width < (LCD_REMOTE_WIDTH - leftmargin) * (100 + lcd_remote_scroll_info.bidir_limit) / 100; } else @@ -1062,7 +1069,7 @@ s->len = utf8length((char *)string); s->offset = offset; - s->startx = xmargin + x * s->width / s->len;; + s->startx = leftmargin + x * s->width / s->len;; s->backward = false; lcd_remote_scroll_info.lines |= (1<> src_y; @@ -570,7 +577,7 @@ int numbits = 8 - src_y; fb_data *backdrop_col = backdrop++; dst_end = dst_col + height * LCD_WIDTH; - do + do { switch (drawmode) { @@ -600,7 +607,7 @@ dst_col += LCD_WIDTH; backdrop_col += LCD_WIDTH; data >>= 1; - if (--numbits == 0) + if (--numbits == 0) { src_col += stride; data = *src_col; @@ -803,7 +810,7 @@ return; lcd_getstringsize(str, &w, &h); - xpos = xmargin + x*w / utf8length(str); + xpos = leftmargin + x*w / utf8length(str); ypos = ymargin + y*h; drawmode = (style & STYLE_INVERT) ? (DRMODE_SOLID|DRMODE_INVERSEVID) : DRMODE_SOLID; @@ -816,7 +823,10 @@ lcd_putsxyofs(xpos, ypos, offset, str); drawmode ^= DRMODE_INVERSEVID; xrect = xpos + MAX(w - offset, 0); - lcd_fillrect(xrect, ypos, LCD_WIDTH - xrect, h); + lcd_fillrect(xpos + w, ypos, rightmargin - (xpos + w), h); + if (LCD_WIDTH>rightmargin) { + lcd_fillrect(rightmargin, ypos, LCD_WIDTH - rightmargin, h); + } drawmode = lastmode; fg_pattern = oldfgcolor; bg_pattern = oldbgcolor; @@ -857,7 +867,7 @@ lcd_getstringsize(string, &w, &h); - if (LCD_WIDTH - x * 8 - xmargin < w) { + if (rightmargin - x * 8 - leftmargin < w) { /* prepare scroll line */ char *end; @@ -870,7 +880,7 @@ /* scroll bidirectional or forward only depending on the string width */ if ( lcd_scroll_info.bidir_limit ) { - s->bidir = s->width < (LCD_WIDTH - xmargin) * + s->bidir = s->width < (rightmargin - leftmargin) * (100 + lcd_scroll_info.bidir_limit) / 100; } else @@ -883,12 +893,14 @@ } end = strchr(s->line, '\0'); - strncpy(end, string, LCD_WIDTH/2); + strncpy(end, string, rightmargin/2); s->len = utf8length(string); s->offset = offset; - s->startx = xmargin + x * s->width / s->len; + s->startx = leftmargin + x * s->width / s->len; s->backward = false; + s->left_margin=leftmargin; + s->right_margin=rightmargin; s->line_color = (style&STYLE_COLORED)? (style&STYLE_COLOR_MASK): -1; lcd_scroll_info.lines |= (1<backward = false; s->start_tick = current_tick + lcd_scroll_info.delay * 2; } - if (s->offset >= s->width - (LCD_WIDTH - xpos)) { + if (s->offset >= s->width - (s->right_margin - xpos)) { /* at end of line */ - s->offset = s->width - (LCD_WIDTH - xpos); + s->offset = s->width - (s->right_margin - xpos); s->backward = true; s->start_tick = current_tick + lcd_scroll_info.delay * 2; } @@ -963,8 +975,12 @@ drawmode = s->invert ? (DRMODE_SOLID|DRMODE_INVERSEVID) : DRMODE_SOLID; lcd_putsxyofs(xpos, ypos, s->offset, s->line); + if (LCD_WIDTH>s->right_margin) { + drawmode ^= DRMODE_INVERSEVID; + lcd_fillrect(s->right_margin, ypos, LCD_WIDTH - s->right_margin, pf->height); + } drawmode = lastmode; - lcd_update_rect(xpos, ypos, LCD_WIDTH - xpos, pf->height); + lcd_update_rect(xpos, ypos, s->right_margin - xpos, pf->height); } fg_pattern = old_fgcolor; Index: firmware/drivers/lcd-remote-1bit-v.c =================================================================== --- firmware/drivers/lcd-remote-1bit-v.c (revision 14037) +++ firmware/drivers/lcd-remote-1bit-v.c (working copy) @@ -39,7 +39,8 @@ IBSS_ATTR; static int drawmode = DRMODE_SOLID; -static int xmargin = 0; +static int leftmargin = 0; +static int rightmargin = 0; static int ymargin = 0; static int curfont = FONT_SYSFIXED; @@ -55,17 +56,23 @@ return drawmode; } -void lcd_remote_setmargins(int x, int y) +void lcd_remote_setmargins(int x1, int x2, int y) { - xmargin = x; + leftmargin = x1; + rightmargin = x2; ymargin = y; } -int lcd_remote_getxmargin(void) +int lcd_remote_getleftmargin(void) { - return xmargin; + return leftmargin; } +int lcd_remote_getrightmargin(void) +{ + return rightmargin; +} + int lcd_remote_getymargin(void) { return ymargin; @@ -636,7 +643,7 @@ void lcd_remote_puts_style_offset(int x, int y, const unsigned char *str, int style, int offset) { - int xpos,ypos,w,h,xrect; + int xpos,ypos,w,h; int lastmode = drawmode; /* make sure scrolling is turned off on the line we are updating */ @@ -646,14 +653,16 @@ return; lcd_remote_getstringsize(str, &w, &h); - xpos = xmargin + x*w / utf8length((char *)str); + xpos = leftmargin + x*w / utf8length((char *)str); ypos = ymargin + y*h; drawmode = (style & STYLE_INVERT) ? (DRMODE_SOLID|DRMODE_INVERSEVID) : DRMODE_SOLID; lcd_remote_putsxyofs(xpos, ypos, offset, str); drawmode ^= DRMODE_INVERSEVID; - xrect = xpos + MAX(w - offset, 0); - lcd_remote_fillrect(xrect, ypos, LCD_REMOTE_WIDTH - xrect, h); + lcd_remote_fillrect(xpos + w, ypos, rightmargin - (xpos + w), h); + if (LCD_REMOTE_WIDTH>rightmargin) { + lcd_remote_fillrect(rightmargin, ypos, LCD_WIDTH - rightmargin, h); + } drawmode = lastmode; } @@ -695,7 +704,7 @@ lcd_remote_getstringsize(string, &w, &h); - if (LCD_REMOTE_WIDTH - x * 8 - xmargin < w) { + if (rightmargin - x * 8 - leftmargin < w) { /* prepare scroll line */ char *end; @@ -708,7 +717,7 @@ /* scroll bidirectional or forward only depending on the string width */ if ( lcd_remote_scroll_info.bidir_limit ) { - s->bidir = s->width < (LCD_REMOTE_WIDTH - xmargin) * + s->bidir = s->width < (rightmargin - leftmargin) * (100 + lcd_remote_scroll_info.bidir_limit) / 100; } else @@ -721,12 +730,14 @@ } end = strchr(s->line, '\0'); - strncpy(end, (char *)string, LCD_REMOTE_WIDTH/2); + strncpy(end, (char *)string, rightmargin/2); s->len = utf8length((char *)string); s->offset = offset; - s->startx = xmargin + x * s->width / s->len;; + s->startx = leftmargin + x * s->width / s->len;; s->backward = false; + s->left_margin=leftmargin; + s->right_margin=rightmargin; lcd_remote_scroll_info.lines |= (1<backward = false; s->start_tick = current_tick + lcd_remote_scroll_info.delay*2; } - if (s->offset >= s->width - (LCD_REMOTE_WIDTH - xpos)) { + if (s->offset >= s->width - (s->right_margin - xpos)) { /* at end of line */ - s->offset = s->width - (LCD_REMOTE_WIDTH - xpos); + s->offset = s->width - (s->right_margin - xpos); s->backward = true; s->start_tick = current_tick + lcd_remote_scroll_info.delay*2; } @@ -786,8 +797,12 @@ drawmode = s->invert ? (DRMODE_SOLID|DRMODE_INVERSEVID) : DRMODE_SOLID; lcd_remote_putsxyofs(xpos, ypos, s->offset, s->line); + if (LCD_REMOTE_WIDTH > s->right_margin) { + drawmode ^= DRMODE_INVERSEVID; + lcd_remote_fillrect(s->right_margin, ypos, LCD_WIDTH - s->right_margin, pf->height); + } drawmode = lastmode; - lcd_remote_update_rect(xpos, ypos, LCD_REMOTE_WIDTH - xpos, pf->height); + lcd_remote_update_rect(xpos, ypos, s->right_margin - xpos, pf->height); } }