X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.cc;h=89e541aa7d29e4a18a60a963f938d86466ae8320;hb=e936cba57ee8d749d7c559dadff1ba09e886d2ec;hp=50146e270dad245e0a025535aab917cba032c75c;hpb=1cd253f4684ee126340fae38094b637f1b0010ea;p=chaz%2Fopenbox

diff --git a/src/openbox.cc b/src/openbox.cc
index 50146e27..89e541aa 100644
--- a/src/openbox.cc
+++ b/src/openbox.cc
@@ -1,8 +1,6 @@
 // -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 
-#ifdef HAVE_CONFIG_H
-# include "../config.h"
-#endif
+#include "config.h"
 
 #include "openbox.hh"
 #include "client.hh"
@@ -15,18 +13,11 @@
 #include "otk/property.hh"
 #include "otk/util.hh"
 #include "otk/rendercolor.hh"
+#include "otk/renderstyle.hh"
 
 extern "C" {
 #include <X11/cursorfont.h>
 
-#ifdef    HAVE_STDIO_H
-#  include <stdio.h>
-#endif // HAVE_STDIO_H
-
-#ifdef    HAVE_STDLIB_H
-#  include <stdlib.h>
-#endif // HAVE_STDLIB_H
-
 #ifdef    HAVE_SIGNAL_H
 #  include <signal.h>
 #endif // HAVE_SIGNAL_H
@@ -44,6 +35,8 @@ extern "C" {
 }
 
 #include <algorithm>
+#include <cstdio>
+#include <cstdlib>
 
 namespace ob {
 
@@ -120,6 +113,7 @@ Openbox::Openbox(int argc, char **argv)
   while (waitpid(-1, NULL, WNOHANG) > 0);
 
   otk::RenderColor::initialize();
+  otk::RenderStyle::initialize();
   otk::Timer::initialize();
   otk::Property::initialize();
   _actions = new Actions();
@@ -180,7 +174,7 @@ Openbox::Openbox(int argc, char **argv)
   for (it = _screens.begin(); it != end; ++it) {
     (*it)->manageExisting();
   }
- 
+  
   // grab any keys set up before the screens existed
   _bindings->grabKeys(true);
 
@@ -212,6 +206,7 @@ Openbox::~Openbox()
   //delete _display;
 
   otk::Timer::destroy();
+  otk::RenderStyle::destroy();
   otk::RenderColor::destroy();
 }
 
@@ -360,7 +355,10 @@ Client *Openbox::findClient(Window window)
 
 void Openbox::setFocusedClient(Client *c)
 {
-  if (c == _focused_client) return;
+  // sometimes this is called with the already-focused window, this is
+  // important for the python scripts to work (eg, c = 0 twice). don't just
+  // return if _focused_client == c
+
   assert(_focused_screen);
 
   // uninstall the old colormap