+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
+
+#include "config.h"
+
#include "application.hh"
#include "eventhandler.hh"
-#include "widget.hh"
-
-extern "C" {
-#ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-}
+#include "timer.hh"
+#include "property.hh"
+#include "rendercolor.hh"
+#include "renderstyle.hh"
+#include "display.hh"
+#include <cstdlib>
#include <iostream>
namespace otk {
-OtkApplication::OtkApplication(int argc, char **argv)
- : OtkEventDispatcher(),
+extern void initialize();
+extern void destroy();
+
+Application::Application(int argc, char **argv)
+ : EventDispatcher(),
_dockable(false),
_appwidget_count(0)
{
- argc = argc;
- argv = argv;
-
- OBDisplay::initialize(0);
- const ScreenInfo *s_info =
- OBDisplay::screenInfo(DefaultScreen(OBDisplay::display));
-
- _timer_manager = new OBTimerQueueManager();
- _img_ctrl = new BImageControl(_timer_manager, s_info, True, 4, 5, 200);
- _style_conf = new Configuration(False);
- _style = new Style(_img_ctrl);
+ (void)argc;
+ (void)argv;
+ otk::initialize();
+
+ _screen = DefaultScreen(**display);
+
loadStyle();
}
-OtkApplication::~OtkApplication()
+Application::~Application()
{
- delete _style_conf;
- delete _img_ctrl;
- delete _timer_manager;
- delete _style;
-
- OBDisplay::destroy();
+ otk::destroy();
}
-void OtkApplication::loadStyle(void)
+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);
+ otk::RenderStyle::setStyle(_screen, style);
}
-void OtkApplication::exec(void)
+void Application::run(void)
{
if (_appwidget_count <= 0) {
std::cerr << "ERROR: No main widgets exist. You must create and show() " <<
- "an OtkAppWidget for the OtkApplication before calling " <<
- "OtkApplication::exec().\n";
+ "an AppWidget for the Application before calling " <<
+ "Application::run().\n";
::exit(1);
}
while (_appwidget_count > 0) {
dispatchEvents();
- _timer_manager->fire(); // fire pending events
+ if (_appwidget_count > 0)
+ Timer::dispatchTimers(); // fire pending events
}
}