// -*- 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 "widget.hh"
#include "timer.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;
- const ScreenInfo *s_info = _display.screenInfo(DefaultScreen(*_display));
-
- Timer::initialize();
- _img_ctrl = new ImageControl(s_info, True, 4, 5, 200);
- _style_conf = new Configuration(False);
- _style = new Style(_img_ctrl);
-
+ otk::initialize();
+
+ _screen = DefaultScreen(**display);
+
loadStyle();
}
Application::~Application()
{
- delete _style_conf;
- delete _img_ctrl;
- delete _style;
- Timer::destroy();
+ otk::destroy();
}
void Application::loadStyle(void)
{
- // find the style name as a property
+ // XXX: find the style name as a property
std::string style = "/usr/local/share/openbox/styles/artwiz";
- _style_conf->setFile(style);
- if (!_style_conf->load()) {
- std::cerr << "ERROR: Unable to load style \"" << style << "\".\n";
- ::exit(1);
- }
- _style->load(*_style_conf);
+ //_style->load(style);
}
void Application::run(void)
while (_appwidget_count > 0) {
dispatchEvents();
+ if (_appwidget_count <= 0)
+ break;
Timer::dispatchTimers(); // fire pending events
}
}