X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fapplication.cc;h=1f65046b361c8727cedc5692c37d51984bfa628c;hb=bfea000a7407e51b5659590415e410a47f6f046b;hp=8e4d93b3641fdcaef3273e0890002a4302234789;hpb=638d4e6f1902c92e73b04246f349318236378437;p=chaz%2Fopenbox

diff --git a/otk/application.cc b/otk/application.cc
index 8e4d93b3..1f65046b 100644
--- a/otk/application.cc
+++ b/otk/application.cc
@@ -1,71 +1,64 @@
+// -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
+
+#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 {
 
-OtkApplication::OtkApplication(int argc, char **argv)
-  : OtkEventDispatcher(),
+extern void initialize();
+extern void destroy();
+
+Application::Application(int argc, char **argv)
+  : EventDispatcher(),
     _dockable(false),
     _appwidget_count(0)
 {
-  argc = argc;
-  argv = argv;
-
-  OBDisplay::initialize(0);
-  const ScreenInfo *s_info =
-    OBDisplay::screenInfo(DefaultScreen(OBDisplay::display));
-
-  _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);
+  (void)argc;
+  (void)argv;
 
+  otk::initialize();
+  
+  _screen = DefaultScreen(**display);
+  
   loadStyle();
 }
 
-OtkApplication::~OtkApplication()
+Application::~Application()
 {
-  delete _style_conf;
-  delete _img_ctrl;
-  delete _timer_manager;
-  delete _style;
-  
-  OBDisplay::destroy();
+  otk::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);
+  otk::RenderStyle::setStyle(_screen, style);
 }
 
-void OtkApplication::exec(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::exec().\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)
+      Timer::dispatchTimers(); // fire pending events
   }
 }