X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fapplication.cc;h=afe06f803a41b5048604ca4f49e112dd8330fe67;hb=d2dcef46752df01312cbb3c5a89b3227c6959087;hp=fda65dc1fd0ec84a8881564cb0cdc5172a31cd42;hpb=8f8acc24933830d4f5784616b9b0c5896bde0b93;p=chaz%2Fopenbox

diff --git a/otk/application.cc b/otk/application.cc
index fda65dc1..afe06f80 100644
--- a/otk/application.cc
+++ b/otk/application.cc
@@ -1,23 +1,23 @@
 // -*- 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"
-
-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 {
 
+extern void initialize();
+extern void destroy();
+
 Application::Application(int argc, char **argv)
   : EventDispatcher(),
     _dockable(false),
@@ -26,38 +26,23 @@ Application::Application(int argc, char **argv)
   (void)argc;
   (void)argv;
 
-  Display::initialize(0);
-  const ScreenInfo *s_info =
-    Display::screenInfo(DefaultScreen(Display::display));
-
-  _timer_manager = new TimerQueueManager();
-  _img_ctrl = new ImageControl(_timer_manager, 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 _timer_manager;
-  delete _style;
-  
-  Display::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)
@@ -71,7 +56,9 @@ void Application::run(void)
 
   while (_appwidget_count > 0) {
     dispatchEvents();
-    _timer_manager->fire(); // fire pending events
+    if (_appwidget_count <= 0)
+      break;
+    Timer::dispatchTimers(); // fire pending events
   }
 }