// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
-#ifdef HAVE_CONFIG_H
-# include "../config.h"
-#endif
+#include "config.h"
#include "application.hh"
#include "eventhandler.hh"
#include "property.hh"
#include "rendercolor.hh"
#include "renderstyle.hh"
+#include "display.hh"
-extern "C" {
-#ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-}
-
+#include <cstdlib>
#include <iostream>
namespace otk {
+extern void initialize();
+extern void destroy();
+
Application::Application(int argc, char **argv)
: EventDispatcher(),
- _display(),
_dockable(false),
_appwidget_count(0)
{
(void)argc;
(void)argv;
- _screen = DefaultScreen(*_display);
+ otk::initialize();
+
+ _screen = DefaultScreen(**display);
- Timer::initialize();
- RenderColor::initialize();
- RenderStyle::initialize();
- Property::initialize();
-
loadStyle();
}
Application::~Application()
{
- RenderStyle::destroy();
- RenderColor::destroy();
- Timer::destroy();
+ otk::destroy();
}
void Application::loadStyle(void)
// XXX: find the style name as a property
std::string style = "/usr/local/share/openbox/styles/artwiz";
//_style->load(style);
+ otk::RenderStyle::setStyle(_screen, style);
}
void Application::run(void)
while (_appwidget_count > 0) {
dispatchEvents();
- if (_appwidget_count <= 0)
- break;
- Timer::dispatchTimers(); // fire pending events
+ if (_appwidget_count > 0)
+ Timer::dispatchTimers(); // fire pending events
}
}