#include "python.hh"
#include "otk/property.hh"
#include "otk/assassin.hh"
+#include "otk/property.hh"
#include "otk/util.hh"
extern "C" {
sigaction(SIGINT, &action, (struct sigaction *) 0);
sigaction(SIGHUP, &action, (struct sigaction *) 0);
- _property = new otk::Property();
+ otk::Timer::initialize();
+ otk::Property::initialize();
_actions = new Actions();
_bindings = new Bindings();
delete _bindings;
delete _actions;
- delete _property;
python_destroy();
// all im gunna do is the same.
//otk::display->destroy();
+ otk::Timer::destroy();
+
if (_restart) {
if (!_restart_prog.empty()) {
const std::string &dstr =
XFlush(**otk::display); // flush here before we go wait for timers
// don't wait if we're to shutdown
if (_shutdown) break;
- _timermanager.fire(!_sync); // wait if not in sync mode
+ otk::Timer::dispatchTimers(!_sync); // wait if not in sync mode
}
}
for (it = _screens.begin(); it != end; ++it) {
int num = (*it)->number();
Window root = otk::display->screenInfo(num)->rootWindow();
- _property->set(root, otk::Property::net_active_window,
- otk::Property::Atom_Window,
- (c && _focused_screen == *it) ? c->window() : None);
+ otk::Property::set(root, otk::Property::atoms.net_active_window,
+ otk::Property::atoms.window,
+ (c && _focused_screen == *it) ? c->window() : None);
}
// call the python Focus callbacks