Mixed relative and absolute values for apps

Allow setting relative value for x and y or width and height separately in
the apps configuration file. This makes these settings compatible with ones
available in the keys file.

Previous buggy behavior:
If someone has specified, e.g. "[Dimensions] {50% 100}" it was parsed as
"{50% 100%}" not as "{50% 100px}" which was inconsistent with the "keys"
configuration file.

From now on it is possible to write something like this:
[app]
  [Position] (RIGHT) {50% 0}
  [Dimensions] {300 100%}
[end]

Signed-off-by: Arkadiusz Bokowy <arkadiusz.bokowy@gmail.com>

1 files changed, 33 insertions, 2 deletions

diff --git a/src/FbTk/StringUtil.hh b/src/FbTk/StringUtil.hh
index 2f7c6fc..bfa3a5c 100644
--- a/src/FbTk/StringUtil.hh
+++ b/src/FbTk/StringUtil.hh
@@ -24,6 +24,12 @@
 
 #include <string>
 
+#ifdef HAVE_CSTDLIB
+#include <cstdlib>
+#else
+#include <stdlib.h>
+#endif
+
 namespace FbTk {
 
 namespace StringUtil {
@@ -61,12 +67,12 @@ std::string findExtension(const std::string &filename);
 /// @param found - position of found char in alphabet (optional)
 /// @return position of trigger if found
 /// @return std::string::npos if nothing found
-std::string::size_type findCharFromAlphabetAfterTrigger(const std::string& in, 
+std::string::size_type findCharFromAlphabetAfterTrigger(const std::string& in,
     char trigger,
     const char alphabet[], size_t len_alphabet, size_t* found);
 
 /// @return copy of original with find_string replaced with "replace"
-std::string replaceString(const std::string &original, 
+std::string replaceString(const std::string &original,
                           const char *find_string,
                           const char *replace);
 
@@ -143,6 +149,31 @@ stringtok (Container &container, std::string const &in,
     }
 }
 
+/// Parse token, which might be in formats as follows: <int>, <int>% or *.
+/// @param relative - parsed relative value (percentage suffix)
+/// @param ignore - this token should be ignored (asterisk)
+/// @return parsed integer value or 0 if not applicable
+template <typename Container>
+static int
+parseSizeToken(Container &container, bool &relative, bool &ignore) {
+
+    if (container.empty())
+        return 0;
+
+    relative = false;
+    ignore = false;
+
+    if (container[0] == '*') {
+        ignore = true;
+        return 0;
+    }
+
+    if (container[container.size() - 1] == '%')
+        relative = true;
+
+    return atoi(container.c_str());
+}
+
 } // end namespace StringUtil
 
 } // end namespace FbTk