X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fapplication.cc;h=dedefaef4b527a4fb9930a377fc229e0b09633a8;hb=2b2f81b93c89c2a2d6abc3b12dee66b8e2a0452d;hp=490486ecd21e9e88d2ec09a44e5439ea24328285;hpb=7df3b620e21777dbefa24f381c1a95fafed1c16e;p=chaz%2Fopenbox

diff --git a/otk/application.cc b/otk/application.cc
index 490486ec..dedefaef 100644
--- a/otk/application.cc
+++ b/otk/application.cc
@@ -1,18 +1,34 @@
+// -*- 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"
+
+extern "C" {
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+}
 
 #include <iostream>
 
 namespace otk {
 
 OtkApplication::OtkApplication(int argc, char **argv)
-  : OtkEventDispatcher(), _dockable(false)
+  : OtkEventDispatcher(),
+    _dockable(false),
+    _appwidget_count(0)
 {
   argc = argc;
   argv = argv;
 
   OBDisplay::initialize(0);
-  const ScreenInfo *s_info = OBDisplay::screenInfo(DefaultScreen(OBDisplay::display));
+  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);
@@ -35,14 +51,25 @@ OtkApplication::~OtkApplication()
 void OtkApplication::loadStyle(void)
 {
   // find the style name as a property
-  _style_conf->setFile("/usr/local/share/openbox/styles/artwiz");
-  _style_conf->load();
+  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);
 }
 
-void OtkApplication::exec(void)
+void OtkApplication::run(void)
 {
-  while (1) {
+  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";
+    ::exit(1);
+  }
+
+  while (_appwidget_count > 0) {
     dispatchEvents();
     _timer_manager->fire(); // fire pending events
   }