#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>
+
namespace ob {
static PyObject *obdict = NULL;
{
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;
}
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)) {
+ 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);
+ }
+ if (!python_get_long("NUMBER_OF_DESKTOPS", (long*)&num_desktops)) {
+ fprintf(stderr, _("Unable to load config.%s\n"), "NUMBER_OF_DESKTOPS");
+ ::exit(1);
+ }
- if (!python_get_string("TITLEBAR_LAYOUT", &titlebar_layout))
- titlebar_layout = "NTIMC";
+ // 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);
+}
- 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;
+Config::Config(int screen)
+ : _screen(screen)
+{
+}
+
+Config::~Config()
+{
}
}