diff options
author | Pavel Labath <pavelo@centrum.sk> | 2011-06-27 17:34:51 (GMT) |
---|---|---|
committer | Paul Tagliamonte <paultag@fluxbox.org> | 2012-04-07 02:11:29 (GMT) |
commit | 1ec69a741f1e800514f27a83ad8c0628ed57adc9 (patch) | |
tree | 7198c0a9c7d0af5befdc18a885cdaa124627899b /src/Screen.cc | |
parent | d85bd43fe28e611eb4bb5ea5a7740dec78447b42 (diff) | |
download | fluxbox_paul-1ec69a741f1e800514f27a83ad8c0628ed57adc9.zip fluxbox_paul-1ec69a741f1e800514f27a83ad8c0628ed57adc9.tar.bz2 |
A veeeery rough implementation of lua menu parsers
Diffstat (limited to 'src/Screen.cc')
-rw-r--r-- | src/Screen.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/Screen.cc b/src/Screen.cc index 52d7f8e..64512eb 100644 --- a/src/Screen.cc +++ b/src/Screen.cc | |||
@@ -1384,8 +1384,13 @@ void BScreen::reassociateWindow(FluxboxWindow *w, unsigned int wkspc_id, | |||
1384 | } | 1384 | } |
1385 | 1385 | ||
1386 | void BScreen::initMenus() { | 1386 | void BScreen::initMenus() { |
1387 | lua::state &l = Fluxbox::instance()->lua(); | ||
1387 | m_workspacemenu.reset(MenuCreator::createMenuType("workspacemenu", screenNumber())); | 1388 | m_workspacemenu.reset(MenuCreator::createMenuType("workspacemenu", screenNumber())); |
1388 | m_rootmenu->reloadHelper()->setMainFile(Fluxbox::instance()->getMenuFilename()); | 1389 | l.loadfile(FbTk::StringUtil::expandFilename(Fluxbox::instance()->getMenuFilename()).c_str()); |
1390 | l.call(0, 0); | ||
1391 | l.getglobal("menu"); | ||
1392 | m_rootmenu = MenuCreator::createMenu(l, 0); | ||
1393 | // m_rootmenu->reloadHelper()->setMainFile(Fluxbox::instance()->getMenuFilename()); | ||
1389 | m_windowmenu->reloadHelper()->setMainFile(windowMenuFilename()); | 1394 | m_windowmenu->reloadHelper()->setMainFile(windowMenuFilename()); |
1390 | } | 1395 | } |
1391 | 1396 | ||