X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fapplication.cc;h=94842ca5848dd96617e84a91d6cb20ed54cbfc52;hb=dca8c61a91cab29128a72f252b70f4bd9f7786ff;hp=dedefaef4b527a4fb9930a377fc229e0b09633a8;hpb=5869cc29ef15181427e65079d9a52c5d21190206;p=chaz%2Fopenbox

diff --git a/otk/application.cc b/otk/application.cc
index dedefaef..94842ca5 100644
--- a/otk/application.cc
+++ b/otk/application.cc
@@ -1,12 +1,13 @@
 // -*- 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"
 
 extern "C" {
 #ifdef HAVE_STDLIB_H
@@ -18,60 +19,53 @@ extern "C" {
 
 namespace otk {
 
-OtkApplication::OtkApplication(int argc, char **argv)
-  : OtkEventDispatcher(),
+Application::Application(int argc, char **argv)
+  : EventDispatcher(),
+    _display(),
     _dockable(false),
     _appwidget_count(0)
 {
-  argc = argc;
-  argv = argv;
-
-  OBDisplay::initialize(0);
-  const ScreenInfo *s_info =
-    OBDisplay::screenInfo(DefaultScreen(OBDisplay::display));
+  (void)argc;
+  (void)argv;
 
-  _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);
+  _screen = DefaultScreen(*_display);
+  
+  Timer::initialize();
+  RenderColor::initialize();
+  RenderStyle::initialize();
+  Property::initialize();
 
   loadStyle();
 }
 
-OtkApplication::~OtkApplication()
+Application::~Application()
 {
-  delete _style_conf;
-  delete _img_ctrl;
-  delete _timer_manager;
-  delete _style;
-  
-  OBDisplay::destroy();
+  RenderStyle::destroy();
+  RenderColor::destroy();
+  Timer::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);
 }
 
-void OtkApplication::run(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::run().\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)
+      break;
+    Timer::dispatchTimers(); // fire pending events
   }
 }