#include "config.h"
-#include "config.hh"
-
-extern "C" {
-#include <Python.h>
-
-#include "gettext.h"
-#define _(str) gettext(str)
-}
-
-#include <cstring>
-
-namespace ob {
-
-static PyObject *obdict = NULL;
-
-bool python_get_long(const char *name, long *value)
-{
- PyObject *val = PyDict_GetItemString(obdict, const_cast<char*>(name));
- if (!(val && PyInt_Check(val))) return false;
-
- *value = PyInt_AsLong(val);
- return true;
-}
-
-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;
-
- std::string temp(PyString_AsString(val), PyString_Size(val));
- *value = temp;
- return true;
-}
-
-bool python_get_stringlist(const char *name, std::vector<otk::ustring> *value)
-{
- PyObject *val = PyDict_GetItemString(obdict, const_cast<char*>(name));
- if (!(val && PyList_Check(val))) return false;
-
- value->clear();
-
- for (int i = 0, end = PyList_Size(val); i < end; ++i) {
- PyObject *str = PyList_GetItem(val, i);
- if (PyString_Check(str))
- value->push_back(PyString_AsString(str));
- }
- return true;
-}
-
-Config::Config()
-{
- // set up access to the python global variables
- PyObject *obmodule = PyImport_ImportModule("config");
- obdict = PyModule_GetDict(obmodule);
- Py_DECREF(obmodule);
-
+/*
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");
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()
+Config::Config(int screen)
+ : _screen(screen)
{
}
+Config::~Config()
+{
}
+
+*/