support for global variables type 'double'

HISTORY

@@ -16,3 +16,4 @@ Version 0.0.2
 - added {durationhours} and {durationminutes} tokens in several view elements
 - added discusage icons to menu header view element so that it discusage can be displayed in every menu view
 - added numeric day, month and year tokens in different view elements
+- support for global variables type "double"

dtd/globals.dtd

@@ -13,7 +13,7 @@
 <!ELEMENT var (#PCDATA)>
 <!ATTLIST var
   name NMTOKEN #REQUIRED
-  type (int|string) #REQUIRED>
+  type (int|double|string) #REQUIRED>
 
 <!ELEMENT token (trans)+>
 <!ATTLIST token

libtemplate/globals.h

@@ -27,6 +27,7 @@ public:
     virtual ~cGlobals(void) {};
     map <string, tColor> colors;
     map <string, int> intVars;
+    map <string, double> doubleVars;
     map <string, string> stringVars;
     map <string, string> fonts;
     map <string, map< string, string > > translations;

libtemplate/parameter.c

@@ -156,6 +156,17 @@ bool cNumericParameter::CheckExpression(int &val, string &parsedVal) {
                 parsedValue = parsedValue.replace(foundToken, token.size(), st.str());
             }
         }
+        for (map<string, double>::iterator globDouble = globals->doubleVars.begin(); globDouble != globals->doubleVars.end(); globDouble++) {
+            stringstream sToken;
+            sToken << "{" << globDouble->first << "}";
+            string token = sToken.str();
+            size_t foundToken = parsedValue.find(token);
+            if (foundToken != string::npos) {
+                stringstream st;
+                st << globDouble->second;
+                parsedValue = parsedValue.replace(foundToken, token.size(), st.str());
+            }
+        }
     }
 
     if (IsNumber(parsedValue)) {

libtemplate/xmlparser.c

@@ -291,6 +291,9 @@ void cXmlParser::InsertVariable(string name, string type, string value) {
     if (!type.compare("int")) {
         int val = atoi(value.c_str());
         globals->intVars.insert(pair<string, int>(name, val));
+    } else if (!type.compare("double")) {
+        double val = atof(value.c_str());
+        globals->doubleVars.insert(pair<string, double>(name, val));
     } else if (!type.compare("string")) {
         globals->stringVars.insert(pair<string, string>(name, value));
     }

skins/metrixhd/themes/default/globals.xml

@@ -28,6 +28,7 @@
         <var type="int" name="border">5</var>
         <var type="int" name="fadeTime">0</var>
         <var type="string" name="stringglobal">hützligrütz</var>
+        <var type="double" name="pi">3.14</var>
     </variables>
     <!--
     translations used in the skin