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