save the titlebarLayout in the default config

[chaz/openbox] / src / openbox.cc

diff --git a/src/openbox.cc b/src/openbox.cc
index 25d274f1ae60e7425d3ee9773fa351618be3a814..77c5baca4b86a9c7c3df949583f72806fb943ada 100644 (file)
--- a/src/openbox.cc
+++ b/src/openbox.cc
@@ -182,11 +182,11 @@ Openbox::Openbox(int m_argc, char **m_argv, char *dpy_name, char *rc)
 
   no_focus = False;
 
-  resource.menu_file = resource.style_file = (char *) 0;
-  resource.titlebar_layout = (char *) NULL;
+  resource.menu_file = resource.style_file = NULL;
+  resource.titlebar_layout = NULL;
   resource.auto_raise_delay.tv_sec = resource.auto_raise_delay.tv_usec = 0;
 
-  focused_window = masked_window = (OpenboxWindow *) 0;
+  focused_window = masked_window = NULL;
   masked = None;
 
   windowSearchList = new LinkedList<WindowSearch>;
@@ -261,6 +261,9 @@ Openbox::~Openbox() {
   if (resource.style_file)
     delete [] resource.style_file;
 
+  if (resource.titlebar_layout)
+    delete [] resource.titlebar_layout;
+
   delete timer;
 
   delete screenList;
@@ -979,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",
@@ -986,13 +991,14 @@ 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()) {
     s->save();
     s->getToolbar()->save();
+#ifdef    SLIT
     s->getSlit()->save();
+#endif // SLIT
   }
 
   config.setAutoSave(true);
@@ -1001,7 +1007,7 @@ void Openbox::save() {
 
 void Openbox::load() {
   if (!config.load())
-    return;
+    config.create();
 
   std::string s;
   long l;
@@ -1137,15 +1143,16 @@ void Openbox::real_rereadMenu() {
 }
 
 
-void Openbox::saveStyleFilename(const char *filename) {
+void Openbox::setStyleFilename(const char *filename) {
   if (resource.style_file)
     delete [] resource.style_file;
 
   resource.style_file = bstrdup(filename);
+  config.setValue("session.styleFile", resource.style_file);
 }
 
 
-void Openbox::saveMenuFilename(const char *filename) {
+void Openbox::setMenuFilename(const char *filename) {
   Bool found = False;
 
   LinkedListIterator<MenuTimestamp> it(menuTimestamps);