skin_parser: Change the way hardware conditionals are done (i.e %?cc)

They now only parse the correct branch (so only the true branch, or only the false branch). This shuold allow you to load different images/backdrops with the same id's depending on the targets hardware.

Add a new %Tp - "touchscreen present?" tag to check if the target has a touchscreen

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28370 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 12 insertions, 0 deletions

diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c
index ed475acb2b..43c2ffa304 100644
--- a/apps/gui/skin_engine/skin_parser.c
+++ b/apps/gui/skin_engine/skin_parser.c
@@ -1031,6 +1031,12 @@ static bool check_feature_tag(const int type)
                 return true;
 #endif
             return false;
+        case SKIN_TOKEN_HAVE_TOUCH:
+#ifdef HAVE_TOUCHSCREEN
+            return true;
+#else
+            return false;
+#endif
 
 #if CONFIG_TUNER
         case SKIN_TOKEN_HAVE_RDS:
diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c
index 0af2e9dd6b..665e73a545 100644
--- a/apps/gui/skin_engine/skin_tokens.c
+++ b/apps/gui/skin_engine/skin_tokens.c
@@ -1377,6 +1377,12 @@ const char *get_token_value(struct gui_wps *gwps,
 #endif
             }
             return NULL;
+        case SKIN_TOKEN_HAVE_TOUCH:
+#ifdef HAVE_TOUCHSCREEN
+            return "t";
+#else
+            return NULL;
+#endif
 
         case SKIN_TOKEN_SETTING:
         {