Merge branch 'master' into argbtesting/argbargb

Conflicts:
	src/FbTk/FbWindow.cc

1 files changed, 18 insertions, 4 deletions

diff --git a/src/WindowState.cc b/src/WindowState.cc
index 50a88fc..d062907 100644
--- a/src/WindowState.cc
+++ b/src/WindowState.cc
@@ -23,7 +23,17 @@
 
 #include "FbTk/StringUtil.hh"
 
-#include <stdlib.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif // HAVE_CONFIG_H
+
+#ifdef HAVE_CSTDLIB
+  #include <cstdlib>
+#else
+  #include <stdlib.h>
+#endif
+
+#include <errno.h>
 
 bool WindowState::useBorder() const {
     return !fullscreen && maximized != MAX_FULL && deco_mask & DECORM_BORDER;
@@ -92,10 +102,14 @@ int WindowState::getDecoMaskFromString(const std::string &str_label) {
         return DECOR_BORDER;
     if (label == "tab")
         return DECOR_TAB;
+
     int mask = -1;
-    if ((str_label.size() > 1 && str_label[0] == '0' && str_label[1] == 'x') ||
-        (str_label.size() > 0 && isdigit(str_label[0])))
-        mask = strtol(str_label.c_str(), NULL, 0);
+    int tmp;
+    errno = 0;
+    tmp = strtol(str_label.c_str(), NULL, 0);
+    if (errno == 0)
+        mask = tmp;
+
     return mask;
 }