summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Screen.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index 8cade50..0d08768 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Screen.cc,v 1.45 2002/04/09 23:15:21 fluxgen Exp $ 25// $Id: Screen.cc,v 1.46 2002/04/12 14:56:15 fluxgen Exp $
26 26
27//use GNU extensions 27//use GNU extensions
28#ifndef _GNU_SOURCE 28#ifndef _GNU_SOURCE
@@ -201,6 +201,7 @@ full_max(rm, true, scrname+".fullMaximization", altscrname+".FullMaximization"),
201max_over_slit(rm, true, scrname+".maxOverSlit",altscrname+".MaxOverSlit"), 201max_over_slit(rm, true, scrname+".maxOverSlit",altscrname+".MaxOverSlit"),
202tab_rotate_vertical(rm, true, scrname+".tab.rotatevertical", altscrname+".Tab.RotateVertical"), 202tab_rotate_vertical(rm, true, scrname+".tab.rotatevertical", altscrname+".Tab.RotateVertical"),
203sloppy_window_grouping(rm, true, scrname+".sloppywindowgrouping", altscrname+".SloppyWindowGrouping"), 203sloppy_window_grouping(rm, true, scrname+".sloppywindowgrouping", altscrname+".SloppyWindowGrouping"),
204workspace_warping(rm, true, scrname+".workspacewarping", altscrname+".WorkspaceWarping"),
204focus_last(rm, true, scrname+".focusLastWindow", altscrname+".FocusLastWindow"), 205focus_last(rm, true, scrname+".focusLastWindow", altscrname+".FocusLastWindow"),
205focus_new(rm, true, scrname+".focusNewWindows", altscrname+".FocusNewWindows"), 206focus_new(rm, true, scrname+".focusNewWindows", altscrname+".FocusNewWindows"),
206rootcommand(rm, "", scrname+".rootCommand", altscrname+".RootCommand"), 207rootcommand(rm, "", scrname+".rootCommand", altscrname+".RootCommand"),
@@ -1233,7 +1234,7 @@ void BScreen::initMenu(void) {
1233 "%s: Empty menu file"), 1234 "%s: Empty menu file"),
1234 fluxbox->getMenuFilename()); 1235 fluxbox->getMenuFilename());
1235 } 1236 }
1236 1237 menu_file.close();
1237 } else 1238 } else
1238 perror(fluxbox->getMenuFilename()); 1239 perror(fluxbox->getMenuFilename());
1239 } 1240 }
@@ -1260,7 +1261,7 @@ void BScreen::initMenu(void) {
1260} 1261}
1261 1262
1262// looks through a menufile and adds correct items to the root-menu. 1263// looks through a menufile and adds correct items to the root-menu.
1263Bool BScreen::parseMenuFile(ifstream &file, Rootmenu *menu, int &row) { 1264bool BScreen::parseMenuFile(ifstream &file, Rootmenu *menu, int &row) {
1264 1265
1265 string line; 1266 string line;
1266 1267
@@ -1406,10 +1407,11 @@ Bool BScreen::parseMenuFile(ifstream &file, Rootmenu *menu, int &row) {
1406 else 1407 else
1407 submenu->setLabel(str_label.c_str()); 1408 submenu->setLabel(str_label.c_str());
1408 1409
1409 parseMenuFile(file, submenu, row); 1410 parseMenuFile(file, submenu, row);
1410 submenu->update(); 1411 submenu->update();
1411 menu->insert(str_label.c_str(), submenu); 1412 menu->insert(str_label.c_str(), submenu);
1412 rootmenuList.push_back(submenu); 1413 rootmenuList.push_back(submenu);
1414
1413 } 1415 }
1414 } // end of sub 1416 } // end of sub
1415 else if (str_key == "restart") { 1417 else if (str_key == "restart") {