X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fapplication.cc;h=f101a5a3f7e6ebf1f74f22afa1b95ac31770b98e;hb=0dcbf985c11c850b30b2983e1e20cd8cf033f054;hp=2530fdd112c20cee6494f7280f76f4caa8b8157d;hpb=3bc1f37469a4933966f049cc57093fb564b721a3;p=chaz%2Fopenbox

diff --git a/otk/application.cc b/otk/application.cc
index 2530fdd1..f101a5a3 100644
--- a/otk/application.cc
+++ b/otk/application.cc
@@ -1,10 +1,16 @@
+// -*- 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"
+#include "property.hh"
 
 extern "C" {
-#include <X11/Xlib.h>
-  
 #ifdef HAVE_STDLIB_H
 # include <stdlib.h>
 #endif
@@ -14,77 +20,59 @@ extern "C" {
 
 namespace otk {
 
-OtkApplication::OtkApplication(int argc, char **argv)
-  : OtkEventDispatcher(), _main_widget(0), _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();
+  Property::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)
 {
-  if (!_main_widget) {
-    std::cerr << "ERROR: No main widget set. You must create a main " <<
-      "OtkWidget for the OtkApplication before calling " <<
-      "OtkApplication::exec().\n";
+  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 (1) {
-    dispatchEvents();
-    _timer_manager->fire(); // fire pending events
-  }
-}
 
-bool OtkApplication::setMainWidget(const OtkWidget *main_widget)
-{
-  // ignore it if it has already been set
-  if (_main_widget) {
-    std::cerr << "WARNING: More than one main OtkWidget being created for " <<
-      "the OtkApplication!\n";
-    return false;
+  while (_appwidget_count > 0) {
+    dispatchEvents();
+    Timer::dispatchTimers(); // fire pending events
   }
-
-  _main_widget = main_widget;
-
-  // set WM Protocols on the window
-  Atom protocols[2];
-  protocols[0] = XInternAtom(OBDisplay::display, "WM_PROTOCOLS", false);
-  protocols[1] = XInternAtom(OBDisplay::display, "WM_DELETE_WINDOW", false);
-  XSetWMProtocols(OBDisplay::display, _main_widget->getWindow(), protocols, 2);
-
-  return true;
 }
 
 }