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

Theme Editor: Committed FS#11477 to add a DECIMAL parameter type in the parser and adapt the Theme Editor to accomodate the change by Johnathan Gordon. Fixed bug in the parser caused by the patch (error was thrown on zero value) and adapted tag rendering for new format

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27426 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Robert Bieber 2010-07-15 06:24:11 +00:00
parent 387af97a26
commit 15488a00ea
10 changed files with 107 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/skin_parser/skin_debug.c
View file

@ -70,6 +70,9 @@ void skin_error(enum skin_errorcode error)
case INT_EXPECTED: case INT_EXPECTED:
error_message = "Expected integer"; error_message = "Expected integer";
break; break;
case DECIMAL_EXPECTED:
error_message = "Expected decimal";
break;
case SEPERATOR_EXPECTED: case SEPERATOR_EXPECTED:
error_message = "Expected argument seperator"; error_message = "Expected argument seperator";
break; break;
@ -236,8 +239,13 @@ void skin_debug_params(int count, struct skin_tag_parameter params[])
printf("[%s]", params[i].data.text); printf("[%s]", params[i].data.text);
break; break;
case NUMERIC: case INTEGER:
printf("[%d]", params[i].data.numeric); printf("[%d]", params[i].data.number);
break;
case DECIMAL:
printf("[%d.%d]", params[i].data.number/10,
params[i].data.number%10);
break; break;
case CODE: case CODE:

35
lib/skin_parser/skin_parser.c
View file

@ -23,6 +23,7 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <ctype.h> #include <ctype.h>
#include <stdbool.h>
#include "skin_buffer.h" #include "skin_buffer.h"
#include "skin_parser.h" #include "skin_parser.h"
@ -534,7 +535,7 @@ static int skin_parse_tag(struct skin_element* element, char** document)
/* Storing the type code */ /* Storing the type code */
element->params[i].type_code = *tag_args; element->params[i].type_code = *tag_args;
/* Checking a nullable argument for null */ /* Checking a nullable argument for null. */
if(*cursor == DEFAULTSYM && !isdigit(cursor[1])) if(*cursor == DEFAULTSYM && !isdigit(cursor[1]))
{ {
if(islower(*tag_args)) if(islower(*tag_args))
@ -557,8 +558,36 @@ static int skin_parse_tag(struct skin_element* element, char** document)
return 0; return 0;
} }
element->params[i].type = NUMERIC; element->params[i].type = INTEGER;
element->params[i].data.numeric = scan_int(&cursor); element->params[i].data.number = scan_int(&cursor);
}
else if(tolower(*tag_args) == 'd')
{
int val = 0;
bool have_point = false;
bool have_tenth = false;
while ( isdigit(*cursor) || *cursor == '.' )
{
if (*cursor != '.')
{
val *= 10;
val += *cursor - '0';
if (have_point)
{
have_tenth = true;
cursor++;
break;
}
}
else
have_point = true;
cursor++;
}
if (have_tenth == false)
val *= 10;
element->params[i].type = DECIMAL;
element->params[i].data.number = val;
} }
else if(tolower(*tag_args) == 'n' || else if(tolower(*tag_args) == 'n' ||
tolower(*tag_args) == 's' || tolower(*tag_args) == 'f') tolower(*tag_args) == 's' || tolower(*tag_args) == 'f')

6
lib/skin_parser/skin_parser.h
View file

@ -56,6 +56,7 @@ enum skin_errorcode
UNEXPECTED_NEWLINE, UNEXPECTED_NEWLINE,
INSUFFICIENT_ARGS, INSUFFICIENT_ARGS,
INT_EXPECTED, INT_EXPECTED,
DECIMAL_EXPECTED,
SEPERATOR_EXPECTED, SEPERATOR_EXPECTED,
CLOSE_EXPECTED, CLOSE_EXPECTED,
MULTILINE_EXPECTED MULTILINE_EXPECTED
@ -66,7 +67,8 @@ struct skin_tag_parameter
{ {
enum enum
{ {
NUMERIC, INTEGER,
DECIMAL, /* stored in data.number as (whole*10)+part */
STRING, STRING,
CODE, CODE,
DEFAULT DEFAULT
@ -74,7 +76,7 @@ struct skin_tag_parameter
union union
{ {
int numeric; int number;
char* text; char* text;
struct skin_element* code; struct skin_element* code;
} data; } data;

10
lib/skin_parser/tag_table.c
View file

@ -120,7 +120,7 @@ struct tag_info legal_tags[] =
{ SKIN_TOKEN_REMOTE_HOLD, "mr", "", 0 }, { SKIN_TOKEN_REMOTE_HOLD, "mr", "", 0 },
{ SKIN_TOKEN_REPEAT_MODE, "mm", "", 0 }, { SKIN_TOKEN_REPEAT_MODE, "mm", "", 0 },
{ SKIN_TOKEN_PLAYBACK_STATUS, "mp", "", 0 }, { SKIN_TOKEN_PLAYBACK_STATUS, "mp", "", 0 },
{ SKIN_TOKEN_BUTTON_VOLUME, "mv", "|S", 0 }, { SKIN_TOKEN_BUTTON_VOLUME, "mv", "|D", 0 },
{ SKIN_TOKEN_PEAKMETER, "pm", "", 0 }, { SKIN_TOKEN_PEAKMETER, "pm", "", 0 },
{ SKIN_TOKEN_PLAYER_PROGRESSBAR, "pf", "", 0 }, { SKIN_TOKEN_PLAYER_PROGRESSBAR, "pf", "", 0 },
@ -131,8 +131,8 @@ struct tag_info legal_tags[] =
{ SKIN_TOKEN_TRACK_TIME_ELAPSED, "pc", "", 0 }, { SKIN_TOKEN_TRACK_TIME_ELAPSED, "pc", "", 0 },
{ SKIN_TOKEN_TRACK_TIME_REMAINING, "pr", "", 0 }, { SKIN_TOKEN_TRACK_TIME_REMAINING, "pr", "", 0 },
{ SKIN_TOKEN_TRACK_LENGTH, "pt", "", 0 }, { SKIN_TOKEN_TRACK_LENGTH, "pt", "", 0 },
{ SKIN_TOKEN_TRACK_STARTING, "pS" , "|S", 0 }, { SKIN_TOKEN_TRACK_STARTING, "pS" , "|D", 0 },
{ SKIN_TOKEN_TRACK_ENDING, "pE" , "|S", 0 }, { SKIN_TOKEN_TRACK_ENDING, "pE" , "|D", 0 },
{ SKIN_TOKEN_PLAYLIST_POSITION, "pp", "", 0 }, { SKIN_TOKEN_PLAYLIST_POSITION, "pp", "", 0 },
{ SKIN_TOKEN_PLAYLIST_ENTRIES, "pe", "", 0 }, { SKIN_TOKEN_PLAYLIST_ENTRIES, "pe", "", 0 },
{ SKIN_TOKEN_PLAYLIST_NAME, "pn", "", 0 }, { SKIN_TOKEN_PLAYLIST_NAME, "pn", "", 0 },
@ -161,7 +161,7 @@ struct tag_info legal_tags[] =
{ SKIN_TOKEN_RDS_TEXT, "tz", "", 0 }, { SKIN_TOKEN_RDS_TEXT, "tz", "", 0 },
{ SKIN_TOKEN_SUBLINE_SCROLL, "s", "", 0 }, { SKIN_TOKEN_SUBLINE_SCROLL, "s", "", 0 },
{ SKIN_TOKEN_SUBLINE_TIMEOUT, "t" , "S", 0 }, { SKIN_TOKEN_SUBLINE_TIMEOUT, "t" , "D", 0 },
{ SKIN_TOKEN_ENABLE_THEME, "we", "", NOBREAK }, { SKIN_TOKEN_ENABLE_THEME, "we", "", NOBREAK },
{ SKIN_TOKEN_DISABLE_THEME, "wd", "", NOBREAK }, { SKIN_TOKEN_DISABLE_THEME, "wd", "", NOBREAK },
@ -196,7 +196,7 @@ struct tag_info legal_tags[] =
{ SKIN_TOKEN_TRANSLATEDSTRING, "Sx" , "S", 0 }, { SKIN_TOKEN_TRANSLATEDSTRING, "Sx" , "S", 0 },
{ SKIN_TOKEN_LANG_IS_RTL, "Sr" , "", 0 }, { SKIN_TOKEN_LANG_IS_RTL, "Sr" , "", 0 },
{ SKIN_TOKEN_LASTTOUCH, "Tl" , "|S", 0 }, { SKIN_TOKEN_LASTTOUCH, "Tl" , "|D", 0 },
{ SKIN_TOKEN_CURRENT_SCREEN, "cs", "", 0 }, { SKIN_TOKEN_CURRENT_SCREEN, "cs", "", 0 },
{ SKIN_TOKEN_TOUCHREGION, "T" , "IIiiS", NOBREAK }, { SKIN_TOKEN_TOUCHREGION, "T" , "IIiiS", NOBREAK },

3
lib/skin_parser/tag_table.h
View file

@ -246,6 +246,9 @@ enum skin_token_type {
* characters for parameters are: * characters for parameters are:
* I - Required integer * I - Required integer
* i - Nullable integer * i - Nullable integer
* D - Required decimal
* d - Nullable decimal
* Decimals are stored as (whole*10)+part
* S - Required string * S - Required string
* s - Nullable string * s - Nullable string
* F - Required file name * F - Required file name

8
utils/themeeditor/graphics/rbprogressbar.cpp
View file

@ -41,22 +41,22 @@ RBProgressBar::RBProgressBar(RBViewport *parent, const RBRenderInfo &info,
if(paramCount > 0 && params[0].type != skin_tag_parameter::DEFAULT) if(paramCount > 0 && params[0].type != skin_tag_parameter::DEFAULT)
{ {
x = params[0].data.numeric; x = params[0].data.number;
} }
if(paramCount > 1 && params[1].type != skin_tag_parameter::DEFAULT) if(paramCount > 1 && params[1].type != skin_tag_parameter::DEFAULT)
{ {
y = params[1].data.numeric; y = params[1].data.number;
} }
if(paramCount > 2 && params[2].type != skin_tag_parameter::DEFAULT) if(paramCount > 2 && params[2].type != skin_tag_parameter::DEFAULT)
{ {
w = params[2].data.numeric; w = params[2].data.number;
} }
if(paramCount > 3 && params[3].type != skin_tag_parameter::DEFAULT) if(paramCount > 3 && params[3].type != skin_tag_parameter::DEFAULT)
{ {
h = params[3].data.numeric; h = params[3].data.number;
} }
if(paramCount > 4 && params[4].type != skin_tag_parameter::DEFAULT) if(paramCount > 4 && params[4].type != skin_tag_parameter::DEFAULT)

10
utils/themeeditor/graphics/rbviewport.cpp
View file

@ -97,24 +97,24 @@ RBViewport::RBViewport(skin_element* node, const RBRenderInfo& info)
break; break;
} }
/* Now we grab the info common to all viewports */ /* Now we grab the info common to all viewports */
x = node->params[param++].data.numeric; x = node->params[param++].data.number;
if(x < 0) if(x < 0)
x = info.screen()->boundingRect().right() + x; x = info.screen()->boundingRect().right() + x;
y = node->params[param++].data.numeric; y = node->params[param++].data.number;
if(y < 0) if(y < 0)
y = info.screen()->boundingRect().bottom() + y; y = info.screen()->boundingRect().bottom() + y;
if(node->params[param].type == skin_tag_parameter::DEFAULT) if(node->params[param].type == skin_tag_parameter::DEFAULT)
w = info.screen()->getWidth() - x; w = info.screen()->getWidth() - x;
else else
w = node->params[param].data.numeric; w = node->params[param].data.number;
if(w < 0) if(w < 0)
w = info.screen()->getWidth() + w - x; w = info.screen()->getWidth() + w - x;
if(node->params[++param].type == skin_tag_parameter::DEFAULT) if(node->params[++param].type == skin_tag_parameter::DEFAULT)
h = info.screen()->getHeight() - y; h = info.screen()->getHeight() - y;
else else
h = node->params[param].data.numeric; h = node->params[param].data.number;
if(h < 0) if(h < 0)
h = info.screen()->getHeight() + h - y; h = info.screen()->getHeight() + h - y;
@ -128,7 +128,7 @@ RBViewport::RBViewport(skin_element* node, const RBRenderInfo& info)
if(node->params[++param].type == skin_tag_parameter::DEFAULT) if(node->params[++param].type == skin_tag_parameter::DEFAULT)
font = screen->getFont(1); font = screen->getFont(1);
else else
font = screen->getFont(node->params[param].data.numeric); font = screen->getFont(node->params[param].data.number);
setPos(x, y); setPos(x, y);
size = QRectF(0, 0, w, h); size = QRectF(0, 0, w, h);

6
utils/themeeditor/gui/devicestate.cpp
View file

@ -225,7 +225,7 @@ QVariant DeviceState::data(QString tag, int paramCount,
QString path = tag[0].isLower() QString path = tag[0].isLower()
? data("file").toString() : data("nextfile").toString(); ? data("file").toString() : data("nextfile").toString();
if(paramCount > 0) if(paramCount > 0)
return directory(path, params[0].data.numeric); return directory(path, params[0].data.number);
else else
return QVariant(); return QVariant();
} }
@ -255,7 +255,7 @@ QVariant DeviceState::data(QString tag, int paramCount,
else if(tag == "pS") else if(tag == "pS")
{ {
double threshhold = paramCount > 0 double threshhold = paramCount > 0
? std::atof(params[0].data.text) : 10; ? params[0].data.number / 10. : 10;
if(data("?pc").toDouble() <= threshhold) if(data("?pc").toDouble() <= threshhold)
return true; return true;
else else
@ -264,7 +264,7 @@ QVariant DeviceState::data(QString tag, int paramCount,
else if(tag == "pE") else if(tag == "pE")
{ {
double threshhold = paramCount > 0 double threshhold = paramCount > 0
? std::atof(params[0].data.text) : 10; ? params[0].data.number / 10. : 10;
if(data("?pt").toDouble() - data("?pc").toDouble() <= threshhold) if(data("?pt").toDouble() - data("?pc").toDouble() <= threshhold)
return true; return true;
else else

4
utils/themeeditor/models/parsetreemodel.cpp
View file

@ -246,8 +246,8 @@ bool ParseTreeModel::setData(const QModelIndex &index, const QVariant &value,
if(!value.canConvert(QVariant::Int)) if(!value.canConvert(QVariant::Int))
return false; return false;
param->type = skin_tag_parameter::NUMERIC; param->type = skin_tag_parameter::INTEGER;
param->data.numeric = value.toInt(); param->data.number = value.toInt();
} }
else else
{ {

63
utils/themeeditor/models/parsetreenode.cpp
View file

@ -246,8 +246,12 @@ QString ParseTreeNode::genCode() const
} }
break; break;
case skin_tag_parameter::NUMERIC: case skin_tag_parameter::INTEGER:
buffer.append(QString::number(param->data.numeric, 10)); buffer.append(QString::number(param->data.number, 10));
break;
case skin_tag_parameter::DECIMAL:
buffer.append(QString::number(param->data.number / 10., 'f', 1));
break; break;
case skin_tag_parameter::DEFAULT: case skin_tag_parameter::DEFAULT:
@ -318,8 +322,8 @@ int ParseTreeNode::genHash() const
case skin_tag_parameter::CODE: case skin_tag_parameter::CODE:
break; break;
case skin_tag_parameter::NUMERIC: case skin_tag_parameter::INTEGER:
hash += param->data.numeric * (param->data.numeric / 4); hash += param->data.number * (param->data.number / 4);
break; break;
case skin_tag_parameter::STRING: case skin_tag_parameter::STRING:
@ -331,6 +335,10 @@ int ParseTreeNode::genHash() const
hash += param->data.text[i]; hash += param->data.text[i];
} }
break; break;
case skin_tag_parameter::DECIMAL:
hash += param->data.number;
break;
} }
} }
@ -396,8 +404,11 @@ QVariant ParseTreeNode::data(int column) const
case skin_tag_parameter::STRING: case skin_tag_parameter::STRING:
return QObject::tr("String"); return QObject::tr("String");
case skin_tag_parameter::NUMERIC: case skin_tag_parameter::INTEGER:
return QObject::tr("Number"); return QObject::tr("Integer");
case skin_tag_parameter::DECIMAL:
return QObject::tr("Decimal");
case skin_tag_parameter::DEFAULT: case skin_tag_parameter::DEFAULT:
return QObject::tr("Default Argument"); return QObject::tr("Default Argument");
@ -445,11 +456,15 @@ QVariant ParseTreeNode::data(int column) const
case skin_tag_parameter::STRING: case skin_tag_parameter::STRING:
return QString(param->data.text); return QString(param->data.text);
case skin_tag_parameter::NUMERIC: case skin_tag_parameter::INTEGER:
return QString::number(param->data.numeric, 10); return QString::number(param->data.number, 10);
case skin_tag_parameter::DECIMAL:
return QString::number(param->data.number / 10., 'f', 1);
case skin_tag_parameter::CODE: case skin_tag_parameter::CODE:
return QObject::tr("Seriously, something's wrong here"); return QObject::tr("Seriously, something's wrong here");
} }
} }
else else
@ -742,10 +757,10 @@ bool ParseTreeNode::execTag(const RBRenderInfo& info, RBViewport* viewport)
id = element->params[0].data.text; id = element->params[0].data.text;
filename = info.settings()->value("imagepath", "") + "/" + filename = info.settings()->value("imagepath", "") + "/" +
element->params[1].data.text; element->params[1].data.text;
x = element->params[2].data.numeric; x = element->params[2].data.number;
y = element->params[3].data.numeric; y = element->params[3].data.number;
if(element->params_count > 4) if(element->params_count > 4)
tiles = element->params[4].data.numeric; tiles = element->params[4].data.number;
else else
tiles = 1; tiles = 1;
@ -758,8 +773,8 @@ bool ParseTreeNode::execTag(const RBRenderInfo& info, RBViewport* viewport)
id = element->params[0].data.text; id = element->params[0].data.text;
filename = info.settings()->value("imagepath", "") + "/" + filename = info.settings()->value("imagepath", "") + "/" +
element->params[1].data.text; element->params[1].data.text;
x = element->params[2].data.numeric; x = element->params[2].data.number;
y = element->params[3].data.numeric; y = element->params[3].data.number;
image = new RBImage(filename, 1, x, y, viewport); image = new RBImage(filename, 1, x, y, viewport);
info.screen()->loadImage(id, new RBImage(filename, 1, x, y, info.screen()->loadImage(id, new RBImage(filename, 1, x, y,
viewport)); viewport));
@ -780,10 +795,10 @@ bool ParseTreeNode::execTag(const RBRenderInfo& info, RBViewport* viewport)
case 'l': case 'l':
/* %Cl */ /* %Cl */
x = element->params[0].data.numeric; x = element->params[0].data.number;
y = element->params[1].data.numeric; y = element->params[1].data.number;
maxWidth = element->params[2].data.numeric; maxWidth = element->params[2].data.number;
maxHeight = element->params[3].data.numeric; maxHeight = element->params[3].data.number;
hAlign = element->params_count > 4 hAlign = element->params_count > 4
? element->params[4].data.text[0] : 'c'; ? element->params[4].data.text[0] : 'c';
vAlign = element->params_count > 5 vAlign = element->params_count > 5
@ -805,7 +820,7 @@ bool ParseTreeNode::execTag(const RBRenderInfo& info, RBViewport* viewport)
case 'l': case 'l':
/* %Fl */ /* %Fl */
x = element->params[0].data.numeric; x = element->params[0].data.number;
filename = info.settings()->value("themebase", "") + "/fonts/" + filename = info.settings()->value("themebase", "") + "/fonts/" +
element->params[1].data.text; element->params[1].data.text;
info.screen()->loadFont(x, new RBFont(filename)); info.screen()->loadFont(x, new RBFont(filename));
@ -822,10 +837,10 @@ bool ParseTreeNode::execTag(const RBRenderInfo& info, RBViewport* viewport)
/* %T */ /* %T */
if(element->params_count < 5) if(element->params_count < 5)
return false; return false;
int x = element->params[0].data.numeric; int x = element->params[0].data.number;
int y = element->params[1].data.numeric; int y = element->params[1].data.number;
int width = element->params[2].data.numeric; int width = element->params[2].data.number;
int height = element->params[3].data.numeric; int height = element->params[3].data.number;
QString action(element->params[4].data.text); QString action(element->params[4].data.text);
RBTouchArea* temp = new RBTouchArea(width, height, action, info); RBTouchArea* temp = new RBTouchArea(width, height, action, info);
temp->setPos(x, y); temp->setPos(x, y);
@ -863,7 +878,7 @@ bool ParseTreeNode::execTag(const RBRenderInfo& info, RBViewport* viewport)
case 'p': case 'p':
/* %Vp */ /* %Vp */
viewport->showPlaylist(info, element->params[0].data.numeric, viewport->showPlaylist(info, element->params[0].data.number,
element->params[1].data.code, element->params[1].data.code,
element->params[2].data.code); element->params[2].data.code);
return true; return true;
@ -1016,7 +1031,7 @@ double ParseTreeNode::findBranchTime(ParseTreeNode *branch,
if(current->element->tag->name[0] == 't' if(current->element->tag->name[0] == 't'
&& current->element->tag->name[1] == '\0') && current->element->tag->name[1] == '\0')
{ {
retval = atof(current->element->params[0].data.text); retval = current->element->params[0].data.number / 10.;
} }
} }
else if(current->element->type == CONDITIONAL) else if(current->element->type == CONDITIONAL)