adding .cvsignore files to the repository to clean up the output whenever you commit...

[chaz/openbox] / src / blackbox.cc

diff --git a/src/blackbox.cc b/src/blackbox.cc
index 63a5055b8d8b143d41aa4565bec43db9afdc7dc7..eb5072dca3567c358c8cd5b09ed1221d2596c4a1 100644 (file)
--- a/src/blackbox.cc
+++ b/src/blackbox.cc
@@ -988,6 +988,7 @@ void Blackbox::save_rc(void) {
   config.setValue("session.cacheLife", resource.cache_life / 60000);
   config.setValue("session.cacheMax", resource.cache_max);
   config.setValue("session.styleFile", resource.style_file);
+  config.setValue("session.titlebarLayout", resource.titlebar_layout);
   
   std::for_each(screenList.begin(), screenList.end(),
                 std::mem_fun(&BScreen::save_rc));
@@ -1032,6 +1033,9 @@ void Blackbox::load_rc(void) {
 
   if (! config.getValue("session.cacheMax", resource.cache_max))
     resource.cache_max = 200;
+  
+  if (! config.getValue("session.titlebarLayout", resource.titlebar_layout))
+    resource.titlebar_layout = "ILMC";
 }
 
 
@@ -1157,17 +1161,17 @@ void Blackbox::setFocusedWindow(BlackboxWindow *win) {
       if (active_screen) {
         // set input focus to the toolbar of the screen with mouse
         XSetInputFocus(getXDisplay(),
-                       active_screen->getToolbar()->getWindowID(),
+                       active_screen->getRootWindow(),
                        RevertToPointerRoot, CurrentTime);
       } else {
         // set input focus to the toolbar of the first managed screen
         XSetInputFocus(getXDisplay(),
-                       screenList.front()->getToolbar()->getWindowID(),
+                       screenList.front()->getRootWindow(),
                        RevertToPointerRoot, CurrentTime);
       }
     } else {
       // set input focus to the toolbar of the last screen
-      XSetInputFocus(getXDisplay(), old_screen->getToolbar()->getWindowID(),
+      XSetInputFocus(getXDisplay(), old_screen->getRootWindow(),
                      RevertToPointerRoot, CurrentTime);
     }
   }