X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fopenbox.cc;h=29f9ea9424612556460a4b6843665bc2f77d7b6b;hb=02b63185a22e64edaed916daa8559d769eb7bc5f;hp=727b403ebbe8c543bf55ef36f1c0b8b9c171e6f3;hpb=05a8e51f177b1d0215bcd8c4b6f7b65e7ba7d3ed;p=chaz%2Fopenbox

diff --git a/src/openbox.cc b/src/openbox.cc
index 727b403e..29f9ea94 100644
--- a/src/openbox.cc
+++ b/src/openbox.cc
@@ -360,13 +360,31 @@ 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, or for the
+  // cycling list, it relies on this behavior. don't just return if its already
+  // set as focused
+  
+  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();