6 files changed, 131 insertions, 91 deletions

diff --git a/src/FocusModelMenuItem.hh b/src/FocusModelMenuItem.hh
index a48d0b4..3c7dd89 100644
--- a/src/FocusModelMenuItem.hh
+++ b/src/FocusModelMenuItem.hh
@@ -50,4 +50,24 @@ private:
     BScreen::FocusModel m_focusmodel;
 };
 
+class TabFocusModelMenuItem : public FbTk::MenuItem {
+public:
+    TabFocusModelMenuItem(const char *label, BScreen &screen, 
+                       BScreen::TabFocusModel model, 
+                       FbTk::RefCount<FbTk::Command> &cmd):
+        FbTk::MenuItem(label, cmd), m_screen(screen), m_tabfocusmodel(model) {
+    }
+    bool isEnabled() const { return m_screen.getTabFocusModel() != m_tabfocusmodel; }
+
+    void click(int button, int time) {
+        m_screen.saveTabFocusModel(m_tabfocusmodel);
+        FbTk::MenuItem::click(button, time);
+    }
+
+private:
+    BScreen &m_screen;
+    BScreen::TabFocusModel m_tabfocusmodel;
+};
+
+
 #endif // FOCUSMODELMENUITEM_HH
diff --git a/src/Screen.cc b/src/Screen.cc
index 3df9266..6d30cef 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -176,7 +176,8 @@ BScreen::ScreenResource::ScreenResource(FbTk::ResourceManager &rm,
     rootcommand(rm, "", scrname+".rootCommand", altscrname+".RootCommand"),
     resize_model(rm, BOTTOMRESIZE, scrname+".resizeMode", altscrname+".ResizeMode"),
     windowmenufile(rm, "", scrname+".windowMenu", altscrname+".WindowMenu"),
-    focus_model(rm, CLICKTOFOCUS, scrname+".focusModel", altscrname+".FocusModel"),
+    focus_model(rm, CLICKFOCUS, scrname+".focusModel", altscrname+".FocusModel"),
+    tabfocus_model(rm, CLICKTABFOCUS, scrname+".tabFocusModel", altscrname+".TabFocusModel"),
     follow_model(rm, IGNORE_OTHER_WORKSPACES, scrname+".followModel", altscrname+".followModel"),
     workspaces(rm, 1, scrname+".workspaces", altscrname+".Workspaces"),
     edge_snap_threshold(rm, 0, scrname+".edgeSnapThreshold", altscrname+".EdgeSnapThreshold"),
@@ -1771,15 +1772,16 @@ void BScreen::setupConfigmenu(FbTk::Menu &menu) {
 
 #define _FOCUSITEM(a, b, c, d, e) focus_menu->insert(new FocusModelMenuItem(_FBTEXT(a, b, c, d), *this, e, save_and_reconfigure))
 
-    _FOCUSITEM(Configmenu, ClickToFocus,
+    _FOCUSITEM(Configmenu, ClickFocus,
                "Click To Focus", "Click to focus",
-               CLICKTOFOCUS);
-    _FOCUSITEM(Configmenu, SloppyFocus,
-               "Sloppy Focus", "Sloppy Focus",
-               SLOPPYFOCUS);
-    _FOCUSITEM(Configmenu, SemiSloppyFocus,
-               "Semi Sloppy Focus", "Semi Sloppy Focus",
-               SEMISLOPPYFOCUS);
+               CLICKFOCUS);
+    _FOCUSITEM(Configmenu, MouseFocus,
+               "Mouse Focus", "Mouse Focus",
+               MOUSEFOCUS);
+
+    focus_menu->insert(new TabFocusModelMenuItem("ClickTabFocus", *this, CLICKTABFOCUS, save_and_reconfigure));
+    focus_menu->insert(new TabFocusModelMenuItem("MouseTabFocus", *this, MOUSETABFOCUS, save_and_reconfigure));
+    
 #undef _FOCUSITEM
 
     focus_menu->insert(new BoolMenuItem(_FBTEXT(Configmenu, 
diff --git a/src/Screen.hh b/src/Screen.hh
index d5de5bc..3316fab 100644
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -78,7 +78,8 @@ class Subject;
 class BScreen : public FbTk::Observer, private FbTk::NotCopyable {
 public:
     enum ResizeModel { BOTTOMRESIZE = 0, QUADRANTRESIZE, DEFAULTRESIZE = BOTTOMRESIZE };
-    enum FocusModel { SLOPPYFOCUS = 0, SEMISLOPPYFOCUS, CLICKTOFOCUS };
+    enum FocusModel { MOUSEFOCUS = 0, CLICKFOCUS };
+    enum TabFocusModel { MOUSETABFOCUS = 0, CLICKTABFOCUS };
     enum FollowModel { ///< a window becomes active / focussed on a different workspace
         IGNORE_OTHER_WORKSPACES = 0, ///< who cares?
         FOLLOW_ACTIVE_WINDOW, ///< go to that workspace
@@ -106,24 +107,24 @@ public:
 
     void initWindows();
     void initMenus();
-    inline bool isSloppyFocus() const { return (*resource.focus_model == SLOPPYFOCUS); }
-    inline bool isSemiSloppyFocus() const { return (*resource.focus_model == SEMISLOPPYFOCUS); }
-    inline bool isRootColormapInstalled() const { return root_colormap_installed; }
-    inline bool isScreenManaged() const { return managed; }
-    inline bool isSloppyWindowGrouping() const { return *resource.sloppy_window_grouping; }
-    inline bool isWorkspaceWarping() const { return *resource.workspace_warping; }
-    inline bool isDesktopWheeling() const { return *resource.desktop_wheeling; }
-    inline bool doAutoRaise() const { return *resource.auto_raise; }
-    inline bool clickRaises() const { return *resource.click_raises; }
-    inline bool doOpaqueMove() const { return *resource.opaque_move; }
-    inline bool doFullMax() const { return *resource.full_max; }
-    inline bool doFocusNew() const { return *resource.focus_new; }
-    inline bool doFocusLast() const { return *resource.focus_last; }
-    inline bool doShowWindowPos() const { return *resource.show_window_pos; }
-    inline bool antialias() const { return *resource.antialias; }
-    inline bool decorateTransient() const { return *resource.decorate_transient; }
-    inline const std::string &windowMenuFilename() const { return *resource.windowmenufile; }
-    inline FbTk::ImageControl &imageControl() { return *m_image_control.get(); }
+    bool isMouseFocus() const { return (*resource.focus_model == MOUSEFOCUS); }
+    bool isMouseTabFocus() const { return (*resource.tabfocus_model == MOUSETABFOCUS); }
+    bool isRootColormapInstalled() const { return root_colormap_installed; }
+    bool isScreenManaged() const { return managed; }
+    bool isSloppyWindowGrouping() const { return *resource.sloppy_window_grouping; }
+    bool isWorkspaceWarping() const { return *resource.workspace_warping; }
+    bool isDesktopWheeling() const { return *resource.desktop_wheeling; }
+    bool doAutoRaise() const { return *resource.auto_raise; }
+    bool clickRaises() const { return *resource.click_raises; }
+    bool doOpaqueMove() const { return *resource.opaque_move; }
+    bool doFullMax() const { return *resource.full_max; }
+    bool doFocusNew() const { return *resource.focus_new; }
+    bool doFocusLast() const { return *resource.focus_last; }
+    bool doShowWindowPos() const { return *resource.show_window_pos; }
+    bool antialias() const { return *resource.antialias; }
+    bool decorateTransient() const { return *resource.decorate_transient; }
+    const std::string &windowMenuFilename() const { return *resource.windowmenufile; }
+    FbTk::ImageControl &imageControl() { return *m_image_control.get(); }
     // menus
     const FbTk::Menu &rootMenu() const { return *m_rootmenu.get(); }
     FbTk::Menu &rootMenu() { return *m_rootmenu.get(); }
@@ -134,8 +135,10 @@ public:
     ExtraMenus &extraWindowMenus() { return m_extramenus; }
     const ExtraMenus &extraWindowMenus() const { return m_extramenus; }
 
-    inline ResizeModel getResizeModel() const { return *resource.resize_model; }
-    inline FocusModel getFocusModel() const { return *resource.focus_model; }
+    ResizeModel getResizeModel() const { return *resource.resize_model; }
+    FocusModel getFocusModel() const { return *resource.focus_model; }
+    TabFocusModel getTabFocusModel() const { return *resource.tabfocus_model; }
+    
     inline FollowModel getFollowModel() const { return *resource.follow_model; }
 
     inline Slit *slit() { return m_slit.get(); }
@@ -217,38 +220,40 @@ public:
     inline RowDirection getRowPlacementDirection() const { return *resource.row_direction; }
     inline ColumnDirection getColPlacementDirection() const { return *resource.col_direction; }
 
-    inline void setRootColormapInstalled(bool r) { root_colormap_installed = r;  }
-    inline void saveRootCommand(std::string rootcmd) { *resource.rootcommand = rootcmd;  }
-    inline void saveFocusModel(FocusModel model) { resource.focus_model = model; }
-    inline void saveWorkspaces(int w) { *resource.workspaces = w;  }
+    void setRootColormapInstalled(bool r) { root_colormap_installed = r;  }
+    void saveRootCommand(std::string rootcmd) { *resource.rootcommand = rootcmd;  }
+    void saveFocusModel(FocusModel model) { resource.focus_model = model; }
+    void saveTabFocusModel(TabFocusModel model) { resource.tabfocus_model = model; }
+
+    void saveWorkspaces(int w) { *resource.workspaces = w;  }
 
     void saveMenu(FbTk::Menu &menu) { m_rootmenu_list.push_back(&menu); }
 
-    inline FbWinFrameTheme &winFrameTheme() { return *m_windowtheme.get(); }
-    inline const FbWinFrameTheme &winFrameTheme() const { return *m_windowtheme.get(); }
-    inline MenuTheme &menuTheme() { return *m_menutheme.get(); }
-    inline const MenuTheme &menuTheme() const { return *m_menutheme.get(); }
-    inline const RootTheme &rootTheme() const { return *m_root_theme.get(); }
-    inline WinButtonTheme &winButtonTheme() { return *m_winbutton_theme.get(); }
-    inline const WinButtonTheme &winButtonTheme() const { return *m_winbutton_theme.get(); }
+    FbWinFrameTheme &winFrameTheme() { return *m_windowtheme.get(); }
+    const FbWinFrameTheme &winFrameTheme() const { return *m_windowtheme.get(); }
+    MenuTheme &menuTheme() { return *m_menutheme.get(); }
+    const MenuTheme &menuTheme() const { return *m_menutheme.get(); }
+    const RootTheme &rootTheme() const { return *m_root_theme.get(); }
+    WinButtonTheme &winButtonTheme() { return *m_winbutton_theme.get(); }
+    const WinButtonTheme &winButtonTheme() const { return *m_winbutton_theme.get(); }
 
-    inline FbRootWindow &rootWindow() { return m_root_window; }
-    inline const FbRootWindow &rootWindow() const { return m_root_window; }
+    FbRootWindow &rootWindow() { return m_root_window; }
+    const FbRootWindow &rootWindow() const { return m_root_window; }
 
-    inline FbTk::MultLayers &layerManager() { return m_layermanager; }
-    inline const FbTk::MultLayers &layerManager() const { return m_layermanager; }
-    inline FbTk::ResourceManager &resourceManager() { return m_resource_manager; }
-    inline const FbTk::ResourceManager &resourceManager() const { return m_resource_manager; }
-    inline const std::string &name() const { return m_name; }
-    inline const std::string &altName() const { return m_altname; }
-    inline bool isShuttingdown() const { return m_shutdown; }
+    FbTk::MultLayers &layerManager() { return m_layermanager; }
+    const FbTk::MultLayers &layerManager() const { return m_layermanager; }
+    FbTk::ResourceManager &resourceManager() { return m_resource_manager; }
+    const FbTk::ResourceManager &resourceManager() const { return m_resource_manager; }
+    const std::string &name() const { return m_name; }
+    const std::string &altName() const { return m_altname; }
+    bool isShuttingdown() const { return m_shutdown; }
 
 
     int addWorkspace();
     int removeLastWorkspace();
     // scroll workspaces
-    inline void nextWorkspace() { nextWorkspace(1); }
-    inline void prevWorkspace() { prevWorkspace(1); }
+    void nextWorkspace() { nextWorkspace(1); }
+    void prevWorkspace() { prevWorkspace(1); }
     void nextWorkspace(int delta);
     void prevWorkspace(int delta);
     void rightWorkspace(int delta);
@@ -272,8 +277,8 @@ public:
                          bool changeworkspace=true);
     void reassociateWindow(FluxboxWindow *window, unsigned int workspace_id, 
                            bool ignore_sticky);
-    inline void prevFocus() { prevFocus(0); }
-    inline void nextFocus() { nextFocus(0); }
+    void prevFocus() { prevFocus(0); }
+    void nextFocus() { nextFocus(0); }
     void prevFocus(int options);
     void nextFocus(int options);
     void raiseFocus();
@@ -303,8 +308,8 @@ public:
     void updateSize();
 
     // Xinerama-related functions
-    inline bool hasXinerama() const { return m_xinerama_avail; }
-    inline int numHeads() const { return m_xinerama_num_heads; }
+    bool hasXinerama() const { return m_xinerama_avail; }
+    int numHeads() const { return m_xinerama_num_heads; }
 
     void initXinerama();
 
@@ -447,6 +452,7 @@ private:
         FbTk::Resource<ResizeModel> resize_model;
         FbTk::Resource<std::string> windowmenufile;
         FbTk::Resource<FocusModel> focus_model;
+        FbTk::Resource<TabFocusModel> tabfocus_model;
         FbTk::Resource<FollowModel> follow_model;
         bool ordered_dither;
         FbTk::Resource<int> workspaces, edge_snap_threshold, focused_alpha,
diff --git a/src/ScreenResources.cc b/src/ScreenResources.cc
index dd42b18..db92b19 100644
--- a/src/ScreenResources.cc
+++ b/src/ScreenResources.cc
@@ -176,31 +176,46 @@ template<>
 std::string FbTk::Resource<BScreen::FocusModel>::
 getString() {
     switch (m_value) {
-    case BScreen::SLOPPYFOCUS:
-        return string("SloppyFocus");
-    case BScreen::SEMISLOPPYFOCUS:
-        return string("SemiSloppyFocus");
-    case BScreen::CLICKTOFOCUS:
-        return string("ClickToFocus");
+    case BScreen::MOUSEFOCUS:
+        return string("MouseFocus");
+    case BScreen::CLICKFOCUS:
+        return string("ClickFocus");
     }
     // default string
-    return string("ClickToFocus");
+    return string("ClickFocus");
 }
 
 template<>
 void FbTk::Resource<BScreen::FocusModel>::
 setFromString(char const *strval) {
-    // auto raise options here for backwards read compatibility
-    // they are not supported for saving purposes. Nor does the "AutoRaise" 
-    // part actually do anything
-    if (strcasecmp(strval, "SloppyFocus") == 0 
-        || strcasecmp(strval, "AutoRaiseSloppyFocus") == 0) 
-        m_value = BScreen::SLOPPYFOCUS;
-    else if (strcasecmp(strval, "SemiSloppyFocus") == 0
-        || strcasecmp(strval, "AutoRaiseSemiSloppyFocus") == 0) 
-        m_value = BScreen::SEMISLOPPYFOCUS;
+    if (strcasecmp(strval, "MouseFocus") == 0) 
+        m_value = BScreen::MOUSEFOCUS;
     else if (strcasecmp(strval, "ClickToFocus") == 0) 
-        m_value = BScreen::CLICKTOFOCUS;
+        m_value = BScreen::CLICKFOCUS;
+    else
+        setDefaultValue();
+}
+
+template<>
+std::string FbTk::Resource<BScreen::TabFocusModel>::
+getString() {
+    switch (m_value) {
+    case BScreen::MOUSETABFOCUS:
+        return string("SloppyTabFocus");
+    case BScreen::CLICKTABFOCUS:
+        return string("ClickToTabFocus");
+    }
+    // default string
+    return string("ClickToTabFocus");
+}
+
+template<>
+void FbTk::Resource<BScreen::TabFocusModel>::
+setFromString(char const *strval) {
+    if (strcasecmp(strval, "SloppyTabFocus") == 0 )
+        m_value = BScreen::MOUSETABFOCUS;
+    else if (strcasecmp(strval, "ClickToTabFocus") == 0) 
+        m_value = BScreen::CLICKTABFOCUS;
     else
         setDefaultValue();
 }
diff --git a/src/Window.cc b/src/Window.cc
index 71f597e..88690ce 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -1070,7 +1070,7 @@ bool FluxboxWindow::setCurrentClient(WinClient &client, bool setinput) {
     if (setinput && setInputFocus()) {
         return true;
     }
-
+    
     return false;
 }
 
@@ -2033,7 +2033,7 @@ void FluxboxWindow::setFocusFlag(bool focus) {
     if (focus != frame().focused())
         frame().setFocus(focus);
 
-    if ((screen().isSloppyFocus() || screen().isSemiSloppyFocus())
+    if ((screen().isMouseFocus())
         && screen().doAutoRaise()) {
         if (focused)
             m_timer.start();
@@ -2637,7 +2637,7 @@ void FluxboxWindow::buttonPressEvent(XButtonEvent &be) {
     frame().buttonPressEvent(be);
 
     if (be.button == 1 || (be.button == 3 && be.state == Mod1Mask)) {
-        if ((! focused) && (! screen().isSloppyFocus())) { //check focus
+        if ((! focused) && (! screen().isMouseFocus())) { //check focus
             setInputFocus();
         }
 
@@ -2916,8 +2916,7 @@ void FluxboxWindow::enterNotifyEvent(XCrossingEvent &ev) {
     }
 
     WinClient *client = 0;
-    // don't waste our time scanning if we aren't real sloppy focus
-    if (screen().isSloppyFocus()) {
+    if (screen().isMouseTabFocus()) {
         // determine if we're in a label button (tab)
         Client2ButtonMap::iterator it = 
             find_if(m_labelbuttons.begin(),
@@ -2929,13 +2928,12 @@ void FluxboxWindow::enterNotifyEvent(XCrossingEvent &ev) {
             client = (*it).first;
                 
     }
+
     if (ev.window == frame().window() ||
         ev.window == m_client->window() ||
         client) {
-        if ((screen().isSloppyFocus() || screen().isSemiSloppyFocus())
-            && !isFocused() ||
-            // or, we are focused, but it isn't the one we want
-            client && screen().isSloppyFocus() && (m_client != client)) {
+
+        if (screen().isMouseFocus() && !isFocused()) {
 
             // check that there aren't any subsequent leave notify events in the
             // X event queue
@@ -2945,16 +2943,16 @@ void FluxboxWindow::enterNotifyEvent(XCrossingEvent &ev) {
             sa.enter = sa.leave = False;
             XCheckIfEvent(display, &dummy, queueScanner, (char *) &sa);
 
-            // if client is set, use setCurrent client, otherwise just setInputFocus
             if ((!sa.leave || sa.inferior)) {
-                if (client)
-                    setCurrentClient(*client, true);
-                else
-                    setInputFocus();
+                setInputFocus();
             }
-
         }
     }
+
+    if (screen().isMouseTabFocus() && client && client != m_client) {
+        setCurrentClient(*client, isFocused());
+    }
+
 }
 
 void FluxboxWindow::leaveNotifyEvent(XCrossingEvent &ev) {
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 732e8a6..ef90d4e 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -1892,12 +1892,11 @@ void Fluxbox::revertFocus(BScreen &screen) {
           next_focus->fbwindow()->setCurrentClient(*next_focus, true))) {
         setFocusedWindow(0); // so we don't get dangling m_focused_window pointer
         switch (screen.getFocusModel()) {
-        case BScreen::SLOPPYFOCUS:
-        case BScreen::SEMISLOPPYFOCUS:
+        case BScreen::MOUSEFOCUS:
             XSetInputFocus(FbTk::App::instance()->display(),
                            PointerRoot, None, CurrentTime);
             break;
-        case BScreen::CLICKTOFOCUS:
+        case BScreen::CLICKFOCUS:
             screen.rootWindow().setInputFocus(RevertToPointerRoot, CurrentTime);
             break;
         }