include stdio

[chaz/openbox] / otk / application.cc

diff --git a/otk/application.cc b/otk/application.cc
index e325a58218bc824557bcf4b5573a85b4b9bff9f3..efe86d153a21490decf652ab396bc9cdaf765c17 100644 (file)
--- a/otk/application.cc
+++ b/otk/application.cc
@@ -30,22 +30,16 @@ Application::Application(int argc, char **argv)
   (void)argc;
   (void)argv;
 
-  const ScreenInfo *s_info = _display.screenInfo(DefaultScreen(*_display));
-
   Timer::initialize();
   RenderColor::initialize();
   Property::initialize();
-  _img_ctrl = new ImageControl(s_info, True, 4, 5, 200);
-  _style_conf = new Configuration(False);
-  _style = new Style(_img_ctrl);
+  _style = new RenderStyle(DefaultScreen(*_display), ""); // XXX: get a path!
 
   loadStyle();
 }
 
 Application::~Application()
 {
-  delete _style_conf;
-  delete _img_ctrl;
   delete _style;
   RenderColor::destroy();
   Timer::destroy();
@@ -53,14 +47,9 @@ Application::~Application()
 
 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);
 }
 
 void Application::run(void)
@@ -74,6 +63,8 @@ void Application::run(void)
 
   while (_appwidget_count > 0) {
     dispatchEvents();
+    if (_appwidget_count <= 0)
+      break;
     Timer::dispatchTimers(); // fire pending events
   }
 }