all repos — openbox @ 87e63d53af67d5ea98f55a27007663d4c9c8fc6c

openbox fork - make it a bit more like ryudo 

Take menu file from rc file if it isn't specified on the command line.
It doesn't act correctly when using reconfigure, but only because I am unsure what the correct behaviour is.
Scott Moynes smoynes@nexus.carleton.ca
commit

87e63d53af67d5ea98f55a27007663d4c9c8fc6c

parent

9af642d29918e8b36d7f1fd17e4c771662d4fe97

1 files changed, 11 insertions(+), 2 deletions(-)

jump to
M src/blackbox.cc → src/blackbox.cc 
@@ -134,8 +134,17 @@ 
   if (! rc) rc = "~/.openbox/rc";
   rc_file = expandTilde(rc);
   config.setFile(rc_file);  
-  if (! menu) menu = "~/.openbox/menu";
-  menu_file = expandTilde(menu);
+
+  string rcmenu;
+  if (! menu) {
+    //have to come up with something better than this
+    config.load();
+    if (! config.getValue("session.menuFile", rcmenu))
+      rcmenu = "~/.openbox/menu";
+  } else {
+    rcmenu = menu;
+  }
+  menu_file = expandTilde(rcmenu.c_str());
 
   no_focus = False;