Merge branch 'master' into to_push

1 files changed, 82 insertions, 76 deletions

diff --git a/src/Screen.cc b/src/Screen.cc
index bf5a625..838a313 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -38,6 +38,7 @@
 #include "FbTk/BoolMenuItem.hh"
 #include "FbTk/IntMenuItem.hh"
 #include "FocusModelMenuItem.hh"
+#include "RadioMenuItem.hh"
 
 // menus
 #include "FbMenu.hh"
@@ -174,21 +175,21 @@ int anotherWMRunning(Display *display, XErrorEvent *) {
 }
 
 
-class TabPlacementMenuItem: public FbTk::MenuItem {
+class TabPlacementMenuItem: public FbTk::RadioMenuItem {
 public:
     TabPlacementMenuItem(FbTk::FbString & label, BScreen &screen,
                          FbWinFrame::TabPlacement place,
                          FbTk::RefCount<FbTk::Command<void> > &cmd):
-        FbTk::MenuItem(label, cmd),
+        FbTk::RadioMenuItem(label, cmd),
         m_screen(screen),
         m_place(place) {
         setCloseOnClick(false);
     }
 
-    bool isEnabled() const { return m_screen.getTabPlacement() != m_place; }
+    bool isSelected() const { return m_screen.getTabPlacement() == m_place; }
     void click(int button, int time, unsigned int mods) {
         m_screen.saveTabPlacement(m_place);
-        FbTk::MenuItem::click(button, time, mods);
+        FbTk::RadioMenuItem::click(button, time, mods);
     }
 
 
@@ -264,7 +265,6 @@ getString() const {
 BScreen::ScreenResource::ScreenResource(FbTk::ResourceManager &rm,
                                         const string &scrname,
                                         const string &altscrname):
-    image_dither(rm, false, scrname+".imageDither", altscrname+".ImageDither"),
     opaque_move(rm, false, scrname + ".opaqueMove", altscrname+".OpaqueMove"),
     full_max(rm, false, scrname+".fullMaximization", altscrname+".FullMaximization"),
     max_ignore_inc(rm, true, scrname+".maxIgnoreIncrement", altscrname+".MaxIgnoreIncrement"),
@@ -278,18 +278,19 @@ BScreen::ScreenResource::ScreenResource(FbTk::ResourceManager &rm,
     default_deco(rm, "NORMAL", scrname+".defaultDeco", altscrname+".DefaultDeco"),
     rootcommand(rm, "", scrname+".rootCommand", altscrname+".RootCommand"),
     tab_placement(rm, FbWinFrame::TOPLEFT, scrname+".tab.placement", altscrname+".Tab.Placement"),
-    windowmenufile(rm, "", scrname+".windowMenu", altscrname+".WindowMenu"),
+    windowmenufile(rm, Fluxbox::instance()->getDefaultDataFilename("windowmenu"), scrname+".windowMenu", altscrname+".WindowMenu"),
     typing_delay(rm, 0, scrname+".noFocusWhileTypingDelay", altscrname+".NoFocusWhileTypingDelay"),
     follow_model(rm, IGNORE_OTHER_WORKSPACES, scrname+".followModel", altscrname+".followModel"),
     user_follow_model(rm, FOLLOW_ACTIVE_WINDOW, scrname+".userFollowModel", altscrname+".UserFollowModel"),
     workspaces(rm, 1, scrname+".workspaces", altscrname+".Workspaces"),
-    edge_snap_threshold(rm, 0, scrname+".edgeSnapThreshold", altscrname+".EdgeSnapThreshold"),
+    edge_snap_threshold(rm, 10, scrname+".edgeSnapThreshold", altscrname+".EdgeSnapThreshold"),
     focused_alpha(rm, 255, scrname+".window.focus.alpha", altscrname+".Window.Focus.Alpha"),
     unfocused_alpha(rm, 255, scrname+".window.unfocus.alpha", altscrname+".Window.Unfocus.Alpha"),
     menu_alpha(rm, 255, scrname+".menu.alpha", altscrname+".Menu.Alpha"),
-    menu_delay(rm, 0, scrname + ".menuDelay", altscrname+".MenuDelay"),
-    menu_delay_close(rm, 0, scrname + ".menuDelayClose", altscrname+".MenuDelayClose"),
+    menu_delay(rm, 200, scrname + ".menuDelay", altscrname+".MenuDelay"),
+    menu_delay_close(rm, 200, scrname + ".menuDelayClose", altscrname+".MenuDelayClose"),
     tab_width(rm, 64, scrname + ".tab.width", altscrname+".Tab.Width"),
+    tooltip_delay(rm, 500, scrname + ".tooltipDelay", altscrname+".TooltipDelay"),
     menu_mode(rm, FbTk::MenuTheme::DELAY_OPEN, scrname+".menuMode", altscrname+".MenuMode"),
 
     gc_line_width(rm, 1, scrname+".overlay.lineWidth", altscrname+".Overlay.LineWidth"),
@@ -341,8 +342,9 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
     m_pressed_winbutton_theme(new WinButtonTheme(scrn, ".pressed", ".Pressed", *m_focused_windowtheme)),
     m_menutheme(new FbTk::MenuTheme(scrn)),
     m_root_window(scrn),
-    m_geom_window(m_root_window, *this, *m_focused_windowtheme),
-    m_pos_window(m_root_window, *this, *m_focused_windowtheme),
+    m_geom_window(new OSDWindow(m_root_window, *this, *m_focused_windowtheme)),
+    m_pos_window(new OSDWindow(m_root_window, *this, *m_focused_windowtheme)),
+    m_tooltip_window(new TooltipWindow(m_root_window, *this, *m_focused_windowtheme)),
     m_dummy_window(scrn, -1, -1, 1, 1, 0, true, false, CopyFromParent,
                    InputOnly),
     resource(rm, screenname, altscreenname),
@@ -423,12 +425,14 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
 
     _FB_USES_NLS;
 
+#ifdef DEBUG
     fprintf(stderr, _FB_CONSOLETEXT(Screen, ManagingScreen,
                             "BScreen::BScreen: managing screen %d "
                             "using visual 0x%lx, depth %d\n",
                             "informational message saying screen number (%d), visual (%lx), and colour depth (%d)").c_str(),
             screenNumber(), XVisualIDFromVisual(rootWindow().visual()),
             rootWindow().depth());
+#endif // DEBUG
 
     FbTk::EventManager *evm = FbTk::EventManager::instance();
     evm->add(*this, rootWindow());
@@ -442,7 +446,7 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
     fluxbox->load_rc(*this);
 
     // setup image cache engine
-    m_image_control.reset(new FbTk::ImageControl(scrn, true,
+    m_image_control.reset(new FbTk::ImageControl(scrn,
                                                  fluxbox->colorsPerChannel(),
                                                  fluxbox->getCacheLife(), fluxbox->getCacheMax()));
     imageControl().installRootColormap();
@@ -475,13 +479,12 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
     m_menutheme->setDelayOpen(*resource.menu_delay);
     m_menutheme->setDelayClose(*resource.menu_delay_close);
 
-    imageControl().setDither(*resource.image_dither);
-
     focusedWinFrameTheme()->reconfigSig().attach(this);// for geom window
 
 
     renderGeomWindow();
     renderPosWindow();
+    m_tooltip_window->setDelay(*resource.tooltip_delay);
 
     // setup workspaces and workspace menu
     int nr_ws = *resource.workspaces;
@@ -497,6 +500,15 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
     // own resources we must do this.
     fluxbox->load_rc(*this);
 
+    m_windowmenu.reset(createMenu(""));
+    m_windowmenu->setInternalMenu();
+    m_windowmenu->setReloadHelper(new FbTk::AutoReloadHelper());
+    m_windowmenu->reloadHelper()->setReloadCmd(FbTk::RefCount<FbTk::Command<void> >(new FbTk::SimpleCommand<BScreen>(*this, &BScreen::rereadWindowMenu)));
+
+    m_rootmenu.reset(createMenu(""));
+    m_rootmenu->setReloadHelper(new FbTk::AutoReloadHelper());
+    m_rootmenu->reloadHelper()->setReloadCmd(FbTk::RefCount<FbTk::Command<void> >(new FbTk::SimpleCommand<BScreen>(*this, &BScreen::rereadMenu)));
+
     m_configmenu.reset(createMenu(_FB_XTEXT(Menu, Configuration,
                                   "Configuration", "Title of configuration menu")));
     setupConfigmenu(*m_configmenu.get());
@@ -884,8 +896,8 @@ void BScreen::cycleFocus(int options, const ClientPattern *pat, bool reverse) {
 
 }
 
-FbTk::Menu *BScreen::createMenu(const string &label) {
-    FbTk::Menu *menu = new FbMenu(menuTheme(),
+FbMenu *BScreen::createMenu(const string &label) {
+    FbMenu *menu = new FbMenu(menuTheme(),
                                   imageControl(),
                                   *layerManager().getLayer(Layer::MENU));
     if (!label.empty())
@@ -893,8 +905,9 @@ FbTk::Menu *BScreen::createMenu(const string &label) {
 
     return menu;
 }
-FbTk::Menu *BScreen::createToggleMenu(const string &label) {
-    FbTk::Menu *menu = new ToggleMenu(menuTheme(),
+
+FbMenu *BScreen::createToggleMenu(const string &label) {
+    FbMenu *menu = new ToggleMenu(menuTheme(),
                                       imageControl(),
                                       *layerManager().getLayer(Layer::MENU));
     if (!label.empty())
@@ -907,9 +920,7 @@ void BScreen::addExtraWindowMenu(const FbTk::FbString &label, FbTk::Menu *menu)
     menu->setInternalMenu();
     menu->disableTitle();
     m_extramenus.push_back(make_pair(label, menu));
-    // recreate window menu
-    m_windowmenu.reset(MenuCreator::createMenuType("windowmenu", screenNumber()));
-    m_windowmenu->setInternalMenu();
+    rereadWindowMenu();
 }
 
 void BScreen::reconfigure() {
@@ -951,21 +962,9 @@ void BScreen::reconfigure() {
         }
     }
 
-    // if timestamp hasn't changed, then just a reconfigure is fine
-    // and that seems to happen somewhere else, anyway
-    if (fluxbox->menuTimestampsChanged()) {
-        // all bets are off, so just hide the menu and reset the filenames
-        fluxbox->clearMenuFilenames();
-        m_rootmenu->hide();
-        rereadMenu();
-    }
-
-    //reconfigure menus
-    m_workspacemenu->reconfigure();
-    m_configmenu->reconfigure();
-    // recreate window menu
-    m_windowmenu.reset(MenuCreator::createMenuType("windowmenu", screenNumber()));
-    m_windowmenu->setInternalMenu();
+    // update menu filenames
+    m_rootmenu->reloadHelper()->setMainFile(fluxbox->getMenuFilename());
+    m_windowmenu->reloadHelper()->setMainFile(windowMenuFilename());
 
     // reconfigure workspaces
     for_each(m_workspaces_list.begin(),
@@ -998,12 +997,6 @@ void BScreen::reconfigureTabs() {
         (*it)->fbwindow()->applyDecorations();
 }
 
-
-void BScreen::rereadMenu() {
-    initMenu();
-    m_rootmenu->reconfigure();
-}
-
 void BScreen::updateWorkspaceName(unsigned int w) {
     Workspace *space = getWorkspace(w);
     if (space) {
@@ -1205,7 +1198,7 @@ void BScreen::sendToWorkspace(unsigned int id, FluxboxWindow *win, bool changeWS
     if (!win)
         win = FocusControl::focusedFbWindow();
 
-    if (!win || &win->screen() != this)
+    if (!win || &win->screen() != this || win->isStuck())
         return;
 
     FbTk::App::instance()->sync(false);
@@ -1437,7 +1430,7 @@ void BScreen::clearStrut(Strut *str) {
         clearStrut(str->next());
     int head = str->head() ? str->head() - 1 : 0;
     /* The number of heads may have changed, be careful. */
-    if (head < numHeads())
+    if (head < (numHeads() ? numHeads() : 1))
         m_head_areas[head]->clearStrut(str);
     // str is invalid now
 }
@@ -1495,48 +1488,53 @@ void BScreen::reassociateWindow(FluxboxWindow *w, unsigned int wkspc_id,
 
 void BScreen::initMenus() {
     m_workspacemenu.reset(MenuCreator::createMenuType("workspacemenu", screenNumber()));
-    m_windowmenu.reset(MenuCreator::createMenuType("windowmenu", screenNumber()));
-    m_windowmenu->setInternalMenu();
-    initMenu();
+    m_rootmenu->reloadHelper()->setMainFile(Fluxbox::instance()->getMenuFilename());
+    m_windowmenu->reloadHelper()->setMainFile(windowMenuFilename());
 }
 
 
-void BScreen::initMenu() {
-
-    if (m_rootmenu.get()) {
-        // since all menus in root is submenus in m_rootmenu
-        // just remove every item in m_rootmenu and then clear m_rootmenu_list
-        while (m_rootmenu->numberOfItems())
-            m_rootmenu->remove(0);
-        m_rootmenu_list.clear();
+void BScreen::rereadMenu() {
 
-    } else
-        m_rootmenu.reset(createMenu(""));
+    m_rootmenu->removeAll();
+    m_rootmenu->setLabel("");
 
     Fluxbox * const fb = Fluxbox::instance();
-    if (!fb->getMenuFilename().empty()) {
-        m_rootmenu.reset(MenuCreator::createFromFile(fb->getMenuFilename(),
-                                                     screenNumber(), true));
-
-    }
+    if (!fb->getMenuFilename().empty())
+        MenuCreator::createFromFile(fb->getMenuFilename(), *m_rootmenu,
+                                    m_rootmenu->reloadHelper());
 
-    if (m_rootmenu.get() == 0) {
+    if (m_rootmenu->numberOfItems() == 0) {
         _FB_USES_NLS;
-        m_rootmenu.reset(createMenu(_FB_XTEXT(Menu, DefaultRootMenu, "Fluxbox default menu", "Title of fallback root menu")));
+        m_rootmenu->setLabel(_FB_XTEXT(Menu, DefaultRootMenu, "Fluxbox default menu", "Title of fallback root menu"));
         FbTk::RefCount<FbTk::Command<void> > restart_fb(FbTk::CommandParser<void>::instance().parse("restart"));
         FbTk::RefCount<FbTk::Command<void> > exit_fb(FbTk::CommandParser<void>::instance().parse("exit"));
         FbTk::RefCount<FbTk::Command<void> > execute_xterm(FbTk::CommandParser<void>::instance().parse("exec xterm"));
         m_rootmenu->setInternalMenu();
         m_rootmenu->insert("xterm", execute_xterm);
+        m_rootmenu->insert(_FB_XTEXT(Menu, Reconfigure, "Reconfigure",
+                                     "Reload Configuration command")),
         m_rootmenu->insert(_FB_XTEXT(Menu, Restart, "Restart", "Restart command"),
                            restart_fb);
         m_rootmenu->insert(_FB_XTEXT(Menu, Exit, "Exit", "Exit command"),
                            exit_fb);
     }
 
-    m_rootmenu->updateMenu();
 }
 
+const std::string BScreen::windowMenuFilename() const {
+    if ((*resource.windowmenufile).empty())
+        return Fluxbox::instance()->getDefaultDataFilename("windowmenu");
+    return *resource.windowmenufile;
+}
+
+void BScreen::rereadWindowMenu() {
+
+    m_windowmenu->removeAll();
+    if (!windowMenuFilename().empty())
+        MenuCreator::createFromFile(windowMenuFilename(), *m_windowmenu,
+                                    m_windowmenu->reloadHelper());
+
+}
 
 void BScreen::addConfigMenu(const FbTk::FbString &label, FbTk::Menu &menu) {
     m_configmenu_list.push_back(make_pair(label, &menu));
@@ -1775,9 +1773,6 @@ void BScreen::setupConfigmenu(FbTk::Menu &menu) {
     for (; it != it_end; ++it)
         menu.insert(it->first, it->second);
 
-    _BOOLITEM(menu, Configmenu, ImageDithering,
-              "Image Dithering", "Image Dithering",
-              resource.image_dither, save_and_reconfigure);
     _BOOLITEM(menu, Configmenu, OpaqueMove,
               "Opaque Window Moving",
               "Window Moving with whole window visible (as opposed to outline moving)",
@@ -1817,12 +1812,12 @@ void BScreen::showPosition(int x, int y) {
 
     char label[256];
     sprintf(label, "X:%5d x Y:%5d", x, y);
-    m_pos_window.showText(label);
+    m_pos_window->showText(label);
 }
 
 
 void BScreen::hidePosition() {
-    m_pos_window.hide();
+    m_pos_window->hide();
 }
 
 // can be negative when base_width/height > min_width/height
@@ -1838,12 +1833,23 @@ void BScreen::showGeometry(int gx, int gy) {
                     "W: %4d x H: %4d",
                     "Format for width and height window, %4d for width, and %4d for height").c_str(),
             gx, gy);
-    m_geom_window.showText(label);
+    m_geom_window->showText(label);
+}
+
+
+void BScreen::showTooltip(const std::string &text) {
+    if (*resource.tooltip_delay >= 0)
+        m_tooltip_window->showText(text);
+}
+
+void BScreen::hideTooltip() {
+    if (*resource.tooltip_delay >= 0)
+        m_tooltip_window->hide();
 }
 
 
 void BScreen::hideGeometry() {
-    m_geom_window.hide();
+    m_geom_window->hide();
 }
 
 void BScreen::setLayer(FbTk::XLayerItem &item, int layernum) {
@@ -1891,14 +1897,14 @@ void BScreen::renderGeomWindow() {
             _FB_XTEXT(Screen, GeometrySpacing,
             "W: %04d x H: %04d", "Representative maximum sized text for width and height dialog").c_str(),
             0, 0);
-    m_geom_window.resize(label);
-    m_geom_window.reconfigTheme();
+    m_geom_window->resize(label);
+    m_geom_window->reconfigTheme();
 }
 
 
 void BScreen::renderPosWindow() {
-    m_pos_window.resize("0:00000 x 0:00000");
-    m_pos_window.reconfigTheme();
+    m_pos_window->resize("0:00000 x 0:00000");
+    m_pos_window->reconfigTheme();
 }
 
 void BScreen::updateSize() {