X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.cc;h=de7767a2151c10594c5ad08771385f464667c63f;hb=9e6b0d5a8d0226232802bdece77665b167f98dae;hp=caacb63ba6f2e75f2e1351fbd216eaa5b9c70794;hpb=88a4e59f44d077bae57e4c2be762c88d3141ed36;p=chaz%2Fopenbox

diff --git a/src/openbox.cc b/src/openbox.cc
index caacb63b..de7767a2 100644
--- a/src/openbox.cc
+++ b/src/openbox.cc
@@ -152,10 +152,12 @@ Openbox::Openbox(int argc, char **argv)
 
   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()) {
       _screens.push_back(screen);
@@ -358,13 +360,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();