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

diff --git a/otk/application.cc b/otk/application.cc
index 2530fdd1..dedefaef 100644
--- a/otk/application.cc
+++ b/otk/application.cc
@@ -1,10 +1,14 @@
+// -*- 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" {
-#include <X11/Xlib.h>
-  
 #ifdef HAVE_STDLIB_H
 # include <stdlib.h>
 #endif
@@ -15,13 +19,16 @@ extern "C" {
 namespace otk {
 
 OtkApplication::OtkApplication(int argc, char **argv)
-  : OtkEventDispatcher(), _main_widget(0), _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);
@@ -47,44 +54,25 @@ void OtkApplication::loadStyle(void)
   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 OtkApplication::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 OtkAppWidget for the OtkApplication before calling " <<
+      "OtkApplication::run().\n";
     ::exit(1);
   }
-  while (1) {
+
+  while (_appwidget_count > 0) {
     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;
-  }
-
-  _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;
-}
-
 }