devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Allow setting a margin on a non-scrolling line by using %m|margin| instead of %s|margin|. This allows to easily place dynamic info next to album art.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15610 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Nicolas Pennequin 2007-11-14 00:45:04 +00:00
parent bb999f9eb3
commit f554e00b61
4 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/gui/gwps-common.c
View file

@ -1353,7 +1353,7 @@ static char *get_token_value(struct gui_wps *gwps,
#endif
#ifdef HAVE_LCD_BITMAP
case WPS_TOKEN_ALIGN_SCROLLMARGIN:
case WPS_TOKEN_LEFTMARGIN:
gwps->display->setmargins(token->value.i,
gwps->display->getymargin());
return NULL;

2
apps/gui/gwps.h
View file

@ -124,7 +124,7 @@ enum wps_token_type {
WPS_TOKEN_ALIGN_LEFT,
WPS_TOKEN_ALIGN_CENTER,
WPS_TOKEN_ALIGN_RIGHT,
WPS_TOKEN_ALIGN_SCROLLMARGIN,
WPS_TOKEN_LEFTMARGIN,
/* Sublines */
WPS_TOKEN_SUBLINE_TIMEOUT,

5
apps/gui/wps_debug.c
View file

@ -81,6 +81,11 @@ static void dump_wps_tokens(struct wps_data *data)
case WPS_TOKEN_ALIGN_RIGHT:
snprintf(buf, sizeof(buf), "align right");
break;
case WPS_TOKEN_LEFTMARGIN:
snprintf(buf, sizeof(buf), "left margin, value: %d",
token->value.i);
break;
#endif
case WPS_TOKEN_SUBLINE_TIMEOUT:

13
apps/gui/wps_parser.c
View file

@ -245,11 +245,17 @@ static const struct wps_tag all_tags[] = {
#ifdef HAS_REMOTE_BUTTON_HOLD
{ WPS_TOKEN_REMOTE_HOLD, "mr", WPS_REFRESH_DYNAMIC, NULL },
#else
{ WPS_TOKEN_UNKNOWN, "mr", 0, NULL },
#endif
{ WPS_TOKEN_REPEAT_MODE, "mm", WPS_REFRESH_DYNAMIC, NULL },
{ WPS_TOKEN_PLAYBACK_STATUS, "mp", WPS_REFRESH_DYNAMIC, NULL },
#ifdef HAVE_LCD_BITMAP
{ WPS_TOKEN_LEFTMARGIN, "m", 0, parse_scrollmargin },
#endif
#ifdef HAVE_LCD_BITMAP
{ WPS_TOKEN_PEAKMETER, "pm", WPS_REFRESH_PEAK_METER, NULL },
#else
@ -279,12 +285,7 @@ static const struct wps_tag all_tags[] = {
{ WPS_TOKEN_CROSSFADE, "xf", WPS_REFRESH_DYNAMIC, NULL },
#endif
#ifdef HAVE_LCD_BITMAP
{ WPS_TOKEN_ALIGN_SCROLLMARGIN, "s", WPS_REFRESH_SCROLL,
parse_scrollmargin },
#else
{ WPS_NO_TOKEN, "s", WPS_REFRESH_SCROLL, NULL },
#endif
{ WPS_TOKEN_SUBLINE_TIMEOUT, "t", 0, parse_subline_timeout },
#ifdef HAVE_LCD_BITMAP
@ -848,7 +849,7 @@ static int parse_scrollmargin(const char *wps_bufptr, struct wps_token *token,
(void)wps_data; /* Kill the warning */
/* valid tag looks like %s or %s|12| */
/* valid tag looks like %m or %m|12| */
if(*wps_bufptr == '|')
{
p = wps_bufptr + 1;