all repos — openbox @ 4602d87180951a4b7a40283a2fb77f31cad4d789

openbox fork - make it a bit more like ryudo 

now yuo can change styles again! (oops) wasnt saving teh nwe style file to the Resource class when it changed.
Dana Jansens danakj@orodu.net
commit

4602d87180951a4b7a40283a2fb77f31cad4d789

parent

e148f58d0ec90f532df7c6c882e331c8bc8b7a59

6 files changed, 11 insertions(+), 10 deletions(-)

jump to
M src/Iconmenu.cc → src/Iconmenu.cc 
@@ -1,4 +1,4 @@ 
-// Icon.cc for Openbox
+// Iconmenu.cc for Openbox
 // Copyright (c) 2001 Sean 'Shaleh' Perry <shaleh@debian.org>
 // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
 //
M src/Iconmenu.h → src/Iconmenu.h 
@@ -1,4 +1,4 @@ 
-// Icon.h for Openbox
+// Iconmenu.h for Openbox
 // Copyright (c) 2001 Sean 'Shaleh' Perry <shaleh@debian.org>
 // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
 //
M src/Rootmenu.cc → src/Rootmenu.cc 
@@ -102,7 +102,7 @@ break;
 
   case BScreen::SetStyle:
     if (item->exec())
-      openbox.saveStyleFilename(item->exec());
+      openbox.setStyleFilename(item->exec());
 
   case BScreen::Reconfigure:
     openbox.reconfigure();
M src/Screen.cc → src/Screen.cc 
@@ -2160,7 +2160,7 @@ BScreen::Restart);
     rootmenu->insert(i18n->getMessage(ScreenSet, ScreenExit, "Exit"),
 		     BScreen::Exit);
   } else {
-    openbox.saveMenuFilename(openbox.getMenuFilename());
+    openbox.setMenuFilename(openbox.getMenuFilename());
   }
 }
 

@@ -2361,7 +2361,7 @@ }
 
 		if (! feof(submenufile)) {
 		  if (! parseMenuFile(submenufile, menu))
-		    openbox.saveMenuFilename(newfile);
+		    openbox.setMenuFilename(newfile);
 
 		  fclose(submenufile);
 		}

@@ -2520,7 +2520,7 @@ menu->insert(label, stylesmenu);
                   rootmenuList->insert(stylesmenu);
                 }
 
-                openbox.saveMenuFilename(stylesdir);
+                openbox.setMenuFilename(stylesdir);
               } else {
                 fprintf(stderr, i18n->getMessage(ScreenSet,
 						 ScreenSTYLESDIRErrorNotDir,
M src/openbox.cc → src/openbox.cc 
@@ -1137,15 +1137,16 @@ screen->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);
M src/openbox.h → src/openbox.h 
@@ -178,8 +178,8 @@ inline void setNoFocus(Bool f) { no_focus = f; }
 
   void setFocusedWindow(OpenboxWindow *w);
   void shutdown();
-  void saveStyleFilename(const char *);
-  void saveMenuFilename(const char *);
+  void setStyleFilename(const char *);
+  void setMenuFilename(const char *);
   void saveMenuSearch(Window, Basemenu *);
   void saveWindowSearch(Window, OpenboxWindow *);
   void saveToolbarSearch(Window, Toolbar *);