initialize _font

[chaz/openbox] / src / config.cc

diff --git a/src/config.cc b/src/config.cc
index e4df70e15f4a157cb69f8d7dc8ed39cc627fd611..e5ec74d49df7e2adeead2341db9f42cfabf6525d 100644 (file)
--- a/src/config.cc
+++ b/src/config.cc
@@ -8,6 +8,8 @@ extern "C" {
 #include <Python.h>
 }
 
+#include <cstring>
+
 namespace ob {
 
 static PyObject *obdict = NULL;
@@ -25,8 +27,9 @@ bool python_get_string(const char *name, otk::ustring *value)
 {
   PyObject *val = PyDict_GetItemString(obdict, const_cast<char*>(name));
   if (!(val && PyString_Check(val))) return false;
-  
-  *value = PyString_AsString(val);
+
+  std::string temp(PyString_AsString(val), PyString_Size(val));
+  *value = temp;
   return true;
 }
 
@@ -66,6 +69,27 @@ Config::Config()
     drag_threshold = 3;
   if (!python_get_long("NUMBER_OF_DESKTOPS", (long*)&num_desktops))
     num_desktops = 1;
+
+  otk::ustring s;
+  long w, h;
+  if (python_get_string("DEFAULT_ICON", &s) && s.bytes() > 2 &&
+      python_get_long("DEFAULT_ICON_WIDTH", &w) &&
+      python_get_long("DEFAULT_ICON_HEIGHT", &h) &&
+      (unsigned)(w * h) == s.bytes() / sizeof(unsigned long)) {
+    default_icon = new unsigned long[s.bytes() / sizeof(unsigned long) + 2];
+    default_icon[0] = w;
+    default_icon[1] = h;
+    memcpy(default_icon + 2, s.data(), s.bytes());
+  } else {
+    default_icon = 0;
+  }
+      
+  icon_length = s.bytes();
+}
+
+Config::~Config()
+{
+  if (default_icon) delete [] default_icon;
 }
 
 }