X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.cc;h=24b3278615bed12dfec0a3679567e103c6d0607e;hb=ee9eaed6cd48db249711912133758679a029b5b1;hp=bd72ea9f0d58c765e4d8828de8ee7b62d8dfbe2b;hpb=3a8af58b19891cc8d12642229a690b3b4e5bc58b;p=chaz%2Fopenbox

diff --git a/src/openbox.cc b/src/openbox.cc
index bd72ea9f..24b32786 100644
--- a/src/openbox.cc
+++ b/src/openbox.cc
@@ -15,6 +15,7 @@
 #include "otk/property.hh"
 #include "otk/util.hh"
 #include "otk/rendercolor.hh"
+#include "otk/renderstyle.hh"
 
 extern "C" {
 #include <X11/cursorfont.h>
@@ -35,15 +36,6 @@ extern "C" {
 #  include <fcntl.h>
 #endif // HAVE_FCNTL_H
 
-#ifdef    HAVE_UNISTD_H
-#  include <sys/types.h>
-#  include <unistd.h>
-#endif // HAVE_UNISTD_H
-
-#ifdef    HAVE_SYS_SELECT_H
-#  include <sys/select.h>
-#endif // HAVE_SYS_SELECT_H
-
 #ifdef    HAVE_SYS_WAIT_H
 #  include <sys/wait.h>
 #endif // HAVE_SYS_WAIT_H
@@ -129,6 +121,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();
@@ -157,21 +150,29 @@ Openbox::Openbox(int argc, char **argv)
     python_exec(SCRIPTDIR"/defaults.py"); // system default bahaviors
 
   // initialize all the screens
+  _focused_screen = 0;
+
   for (int i = 0, max = ScreenCount(**otk::display); i < max; ++i) {
     Screen *screen;
+    // in single mode skip the screens we don't want to manage
     if (_single && i != DefaultScreen(**otk::display)) {
       _screens.push_back(0);
       continue;
     }
+    // try manage the screen
     screen = new Screen(i);
-    if (screen->managed())
+    if (screen->managed()) {
       _screens.push_back(screen);
-    else {
+      if (!_focused_screen) // set this to the first screen managed
+        _focused_screen = screen;
+    } else {
       delete screen;
       _screens.push_back(0);
     }
   }
 
+  assert(_focused_screen);
+
   if (_screens.empty()) {
     printf(_("No screens were found without a window manager. Exiting.\n"));
     ::exit(1);
@@ -181,12 +182,11 @@ 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);
 
   // set up input focus
-  _focused_screen = _screens[0];
   setFocusedClient(0);
   
   _state = State_Normal; // done starting
@@ -197,8 +197,6 @@ Openbox::~Openbox()
 {
   _state = State_Exiting; // time to kill everything
 
-  int first_screen = _screens.front()->number();
-  
   std::for_each(_screens.begin(), _screens.end(), otk::PointerAssassin());
 
   delete _bindings;
@@ -216,19 +214,8 @@ Openbox::~Openbox()
   //delete _display;
 
   otk::Timer::destroy();
+  otk::RenderStyle::destroy();
   otk::RenderColor::destroy();
-
-  if (_restart) {
-    if (!_restart_prog.empty()) {
-      otk::putenv(otk::display->screenInfo(first_screen)->displayString());
-      execl("/bin/sh", "/bin/sh", "-c", _restart_prog.c_str(), NULL); 
-      perror(_restart_prog.c_str());
-    }
-    
-    // fall back in case the above execlp doesn't work
-    execvp(_argv[0], _argv);
-    execvp(otk::basename(_argv[0]).c_str(), _argv);
-  }
 }
 
 
@@ -376,13 +363,30 @@ Client *Openbox::findClient(Window window)
 
 void Openbox::setFocusedClient(Client *c)
 {
+  // 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
+  if (_focused_client)
+    _focused_client->installColormap(false);
+  else
+    _focused_screen->installColormap(false);
+  
   _focused_client = c;
   if (c) {
     _focused_screen = _screens[c->screen()];
+
+    // install the client's colormap
+    c->installColormap(true);
   } else {
-    assert(_focused_screen);
     XSetInputFocus(**otk::display, _focused_screen->focuswindow(),
                    RevertToNone, CurrentTime);
+
+    // install the root window colormap
+    _focused_screen->installColormap(true);
   }
   // set the NET_ACTIVE_WINDOW hint for all screens
   ScreenList::iterator it, end = _screens.end();