save the titlebarLayout in the default config

[chaz/openbox] / src / openbox.cc

diff --git a/src/openbox.cc b/src/openbox.cc
index 99d623e5c99f4c3f4c556b0078a9a5540c87c356..77c5baca4b86a9c7c3df949583f72806fb943ada 100644 (file)
--- a/src/openbox.cc
+++ b/src/openbox.cc
@@ -479,19 +479,9 @@ void Openbox::process_event(XEvent *e) {
     if (! win)
       win = new OpenboxWindow(*this, e->xmaprequest.window);
 
-    if ((win = searchWindow(e->xmaprequest.window))) {
+    if ((win = searchWindow(e->xmaprequest.window)))
       win->mapRequestEvent(&e->xmaprequest);
-      // if we're using the click to place placement type, then immediately
-      // after the window is mapped, we need to start interactively moving it
-      if (win->getScreen()->placementPolicy() == BScreen::ClickMousePlacement) {
-        int x, y, rx, ry;
-        Window c, r;
-        unsigned int m;
-        XQueryPointer(getXDisplay(), win->getScreen()->getRootWindow(),
-                      &r, &c, &rx, &ry, &x, &y, &m);
-        win->startMove(rx, ry);
-      }
-    }
+
     break;
   }
 
@@ -992,6 +982,8 @@ void Openbox::save() {
   config.setValue("session.menuFile", getMenuFilename());
   config.setValue("session.colorsPerChannel",
                   resource.colors_per_channel);
+  config.setValue("session.styleFile", resource.style_file);
+  config.setValue("session.titlebarLayout", resource.titlebar_layout);
   config.setValue("session.doubleClickInterval",
                   (long)resource.double_click_interval);
   config.setValue("session.autoRaiseDelay",
@@ -999,7 +991,6 @@ void Openbox::save() {
            (resource.auto_raise_delay.tv_usec / 1000)));
   config.setValue("session.cacheLife", (long)resource.cache_life / 60000);
   config.setValue("session.cacheMax", (long)resource.cache_max);
-  config.setValue("session.styleFile", resource.style_file);
 
   LinkedListIterator<BScreen> it(screenList);
   for (BScreen *s = it.current(); s != NULL; it++, s = it.current()) {