X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fapplication.cc;h=1f65046b361c8727cedc5692c37d51984bfa628c;hb=a91a6f97daeb058f346246081e1c83a788787f9b;hp=94842ca5848dd96617e84a91d6cb20ed54cbfc52;hpb=115fedf432d73f17ade48eaa2fa12dfd333bfcaa;p=chaz%2Fopenbox

diff --git a/otk/application.cc b/otk/application.cc
index 94842ca5..1f65046b 100644
--- a/otk/application.cc
+++ b/otk/application.cc
@@ -8,41 +8,34 @@
 #include "property.hh"
 #include "rendercolor.hh"
 #include "renderstyle.hh"
+#include "display.hh"
 
-extern "C" {
-#ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-}
-
+#include <cstdlib>
 #include <iostream>
 
 namespace otk {
 
+extern void initialize();
+extern void destroy();
+
 Application::Application(int argc, char **argv)
   : EventDispatcher(),
-    _display(),
     _dockable(false),
     _appwidget_count(0)
 {
   (void)argc;
   (void)argv;
 
-  _screen = DefaultScreen(*_display);
+  otk::initialize();
+  
+  _screen = DefaultScreen(**display);
   
-  Timer::initialize();
-  RenderColor::initialize();
-  RenderStyle::initialize();
-  Property::initialize();
-
   loadStyle();
 }
 
 Application::~Application()
 {
-  RenderStyle::destroy();
-  RenderColor::destroy();
-  Timer::destroy();
+  otk::destroy();
 }
 
 void Application::loadStyle(void)
@@ -50,6 +43,7 @@ void Application::loadStyle(void)
   // XXX: find the style name as a property
   std::string style = "/usr/local/share/openbox/styles/artwiz";
   //_style->load(style);
+  otk::RenderStyle::setStyle(_screen, style);
 }
 
 void Application::run(void)
@@ -63,9 +57,8 @@ void Application::run(void)
 
   while (_appwidget_count > 0) {
     dispatchEvents();
-    if (_appwidget_count <= 0)
-      break;
-    Timer::dispatchTimers(); // fire pending events
+    if (_appwidget_count > 0)
+      Timer::dispatchTimers(); // fire pending events
   }
 }