X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=otk%2Fapplication.cc;h=fd8689ee83ee95b127a5d9ee52daf7d372021c3b;hb=a7207b7d8367af47ddb7e2733cb963148fd0379f;hp=16b9e0f5cbe57915c24da28b2799c4d071476817;hpb=804b8cc6e5913913a76894a753619590a291c204;p=chaz%2Fopenbox

diff --git a/otk/application.cc b/otk/application.cc
index 16b9e0f5..fd8689ee 100644
--- a/otk/application.cc
+++ b/otk/application.cc
@@ -1,5 +1,13 @@
+// -*- 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"
 
 extern "C" {
 #ifdef HAVE_STDLIB_H
@@ -11,50 +19,57 @@ extern "C" {
 
 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();
+  _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
   }
 }