From 31a05953e142b1ffff631cfb8b817880db7e4c27 Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Sun, 26 Feb 2012 00:42:53 +1100 Subject: FS#12586 - Modify %ss to be able to use numbers for conditionals i.e %?ss(1,1,%cM)<|one|two|three|...|> or %xd(numbers, %ss(1,1%cM) Change-Id: I74ecb3f253f3be1fd270f75c0ef79addd364a7de --- apps/gui/skin_engine/skin_parser.c | 4 ++++ apps/gui/skin_engine/skin_tokens.c | 4 ++++ apps/gui/skin_engine/wps_internals.h | 1 + 3 files changed, 9 insertions(+) (limited to 'apps/gui') diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c index 3899f605f3..340cbbdb01 100644 --- a/apps/gui/skin_engine/skin_parser.c +++ b/apps/gui/skin_engine/skin_parser.c @@ -824,6 +824,10 @@ static int parse_substring_tag(struct skin_element* element, else ss->length = get_param(element, 1)->data.number; ss->token = get_param_code(element, 2)->data; + if (element->params_count > 3) + ss->expect_number = !strcmp(get_param_text(element, 3), "number"); + else + ss->expect_number = false; token->value.data = PTRTOSKINOFFSET(skin_buffer, ss); return 0; } diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c index 82d96f6993..765102513a 100644 --- a/apps/gui/skin_engine/skin_tokens.c +++ b/apps/gui/skin_engine/skin_tokens.c @@ -942,6 +942,10 @@ const char *get_token_value(struct gui_wps *gwps, buf = &buf[start_byte]; buf[byte_len] = '\0'; + if (ss->expect_number && + intval && (buf[0] >= '0' && buf[0] <= '9')) + *intval = atoi(buf) + 1; /* so 0 is the first item */ + return buf; } return NULL; diff --git a/apps/gui/skin_engine/wps_internals.h b/apps/gui/skin_engine/wps_internals.h index 9c3fa1b5bc..c55c8d2515 100644 --- a/apps/gui/skin_engine/wps_internals.h +++ b/apps/gui/skin_engine/wps_internals.h @@ -286,6 +286,7 @@ struct logical_if { struct substring { int start; int length; + bool expect_number; OFFSETTYPE(struct wps_token *) token; }; -- cgit v1.2.3