X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fapplication.cc;h=70f9e24b7565339beccd5e52822679e1a473ddae;hb=52b83a9dbb2b7823d5f78781f5948dfd8d77d50b;hp=efe6ad85f9beaf8fd070d0e05ab17a0a1e82d0dd;hpb=6f5e60f0337e60d904a8f549aeaa631afefc8033;p=chaz%2Fopenbox

diff --git a/otk/application.cc b/otk/application.cc
index efe6ad85..70f9e24b 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,24 +51,27 @@ 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)
 {
-  const int xfd = ConnectionNumber(OBDisplay::display);
-  fd_set rfds;
-  timeval *timeout = 0;
+  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";
+    ::exit(1);
+  }
 
-  while (1) {
+  while (_appwidget_count > 0) {
     dispatchEvents();
-
-    FD_ZERO(&rfds);
-    FD_SET(xfd, &rfds);
-
-    select(xfd + 1, &rfds, 0, 0, timeout);
+    _timer_manager->fire(); // fire pending events
   }
 }