oops messed up centered

[chaz/openbox] / src / config.cc

diff --git a/src/config.cc b/src/config.cc
index e5ec74d49df7e2adeead2341db9f42cfabf6525d..04728de2b38c01d2ab39e28419de168772873da3 100644 (file)
--- a/src/config.cc
+++ b/src/config.cc
@@ -3,9 +3,17 @@
 #include "config.h"
 
 #include "config.hh"
+#include "otk/screeninfo.hh"
+#include "otk/renderstyle.hh"
+#include "otk/util.hh"
+#include "otk/property.hh"
+#include "otk/display.hh"
 
 extern "C" {
 #include <Python.h>
+
+#include "gettext.h"
+#define _(str) gettext(str)
 }
 
 #include <cstring>
@@ -48,48 +56,69 @@ bool python_get_stringlist(const char *name, std::vector<otk::ustring> *value)
   return true;
 }
 
-Config::Config()
+void Config::load()
 {
-  PyRun_SimpleString("import config;");
+  const otk::ScreenInfo *info = otk::display->screenInfo(_screen);
+  Window root = info->rootWindow();
+
   // set up access to the python global variables
-  PyObject *obmodule = PyImport_AddModule("config");
+  PyObject *obmodule = PyImport_ImportModule("config");
   obdict = PyModule_GetDict(obmodule);
+  Py_DECREF(obmodule);
 
-  std::vector<otk::ustring> names;
-  python_get_stringlist("DESKTOP_NAMES", &names);
+  python_get_stringlist("DESKTOP_NAMES", &desktop_names);
 
   python_get_string("THEME", &theme);
+  // initialize the screen's style
+  otk::RenderStyle::setStyle(_screen, theme);
+  // draw the root window
+  otk::bexec("obsetroot " + otk::RenderStyle::style(_screen)->rootArgs(),
+             info->displayString());
+
 
-  if (!python_get_string("TITLEBAR_LAYOUT", &titlebar_layout))
-    titlebar_layout = "NTIMC";
-
-  if (!python_get_long("DOUBLE_CLICK_DELAY", &double_click_delay))
-    double_click_delay = 300;
-  if (!python_get_long("DRAG_THRESHOLD", &drag_threshold))
-    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;
+  if (!python_get_string("TITLEBAR_LAYOUT", &titlebar_layout)) {
+    fprintf(stderr, _("Unable to load config.%s\n"), "TITLEBAR_LAYOUT");
+    ::exit(1);
+  }
+
+  if (!python_get_long("DOUBLE_CLICK_DELAY", &double_click_delay)) {
+    fprintf(stderr, _("Unable to load config.%s\n"), "DOUBLE_CLICK_DELAY");
+    ::exit(1);
+  }
+  if (!python_get_long("DRAG_THRESHOLD", &drag_threshold)) {
+    fprintf(stderr, _("Unable to load config.%s\n"), "DRAG_THRESHOLD");
+    ::exit(1);
   }
-      
-  icon_length = s.bytes();
+  if (!python_get_long("NUMBER_OF_DESKTOPS", (long*)&num_desktops)) {
+    fprintf(stderr, _("Unable to load config.%s\n"), "NUMBER_OF_DESKTOPS");
+    ::exit(1);
+  }
+
+  // Set the net_desktop_names property
+  otk::Property::set(root,
+                     otk::Property::atoms.net_desktop_names,
+                     otk::Property::utf8, desktop_names);
+  // the above set() will cause screen::updateDesktopNames to fire right away
+  // so we have a list of desktop names
+
+  XEvent ce;
+  ce.xclient.type = ClientMessage;
+  ce.xclient.message_type = otk::Property::atoms.net_number_of_desktops;
+  ce.xclient.display = **otk::display;
+  ce.xclient.window = root;
+  ce.xclient.format = 32;
+  ce.xclient.data.l[0] = num_desktops;
+  XSendEvent(**otk::display, root, False,
+            SubstructureNotifyMask | SubstructureRedirectMask, &ce);
+}
+
+Config::Config(int screen)
+  : _screen(screen)
+{
 }
 
 Config::~Config()
 {
-  if (default_icon) delete [] default_icon;
 }
 
 }