1 files changed, 52 insertions, 22 deletions

diff --git a/src/FocusControl.hh b/src/FocusControl.hh
index ee66b9e..c55aa6a 100644
--- a/src/FocusControl.hh
+++ b/src/FocusControl.hh
@@ -39,66 +39,96 @@ class BScreen;
 class FocusControl {
 public:
     typedef std::list<WinClient *> FocusedWindows;
-
+    /// main focus model
     enum FocusModel { 
-        MOUSEFOCUS = 0, ///< focus follows 
-        CLICKFOCUS ///< focus on click
+        MOUSEFOCUS = 0, ///< focus follows mouse
+        CLICKFOCUS      ///< focus on click
     };
+
+    /// focus model for tabs
     enum TabFocusModel { 
         MOUSETABFOCUS = 0, ///< tab focus follows mouse
         CLICKTABFOCUS  ///< tab focus on click
     };
 
+    /// focus direction for windows
     enum FocusDir { 
-        FOCUSUP,
-        FOCUSDOWN,
-        FOCUSLEFT, 
-        FOCUSRIGHT 
+        FOCUSUP,    ///< window is above
+        FOCUSDOWN,  ///< window is down
+        FOCUSLEFT,  ///< window is left
+        FOCUSRIGHT  ///< window is right
     };
 
-    // prevFocus/nextFocus option bits
-    enum { 
-        CYCLEGROUPS = 0x01, 
-        CYCLESKIPSTUCK = 0x02, 
-        CYCLESKIPSHADED = 0x04,
-        CYCLELINEAR = 0x08, 
-        CYCLESKIPICONIC = 0x10,
-        CYCLEDEFAULT = 0x00 
+    /// prevFocus/nextFocus option bits
+    enum FocusOption { 
+        CYCLEGROUPS = 0x01,      ///< cycle groups
+        CYCLESKIPSTUCK = 0x02,   ///< skip stuck windows
+        CYCLESKIPSHADED = 0x04,  ///< skip shaded windows
+        CYCLELINEAR = 0x08,      ///< linear cycle
+        CYCLESKIPICONIC = 0x10,  ///< skip iconified windows
+        CYCLEDEFAULT = 0x00      ///< default
     };
 
+    /// @param screen the screen to control focus for
     explicit FocusControl(BScreen &screen);
 
+    /// cycle previous focuable 
     void prevFocus() { cycleFocus(&m_focused_list, 0, true); }
+    /// cycle next focusable
     void nextFocus() { cycleFocus(&m_focused_list, 0, false); }
+    /**
+     * Cycle focus for a set of windows.
+     * @param winlist the windowlist to cycle through
+     * @param options cycle options @see FocusOption
+     * @param reverse reverse the cycle order
+     */
     void cycleFocus(FocusedWindows *winlist, int options, bool reverse = false);
-
+    /// sets the focused window on a screen
     void setScreenFocusedWindow(WinClient &win_client);
+    /// sets the main focus model
     void setFocusModel(FocusModel model);
-    void setTabFocusModel(TabFocusModel model);
+    /// sets tab focus model
+   void setTabFocusModel(TabFocusModel model);
 
+    /// stop cycling mode
     void stopCyclingFocus();
-
+    /** 
+     * Do directional focus mode.
+     * @param win current window
+     * @param dir direction from current window to focus.
+     */
     void dirFocus(FluxboxWindow &win, FocusDir dir);
+    /// @return true if focus mode is mouse focus
     bool isMouseFocus() const { return focusModel() == MOUSEFOCUS; }
+    /// @return true if tab focus mode is mouse tab focus
     bool isMouseTabFocus() const { return tabFocusModel() == MOUSETABFOCUS; }
+    /// @return true if cycling is in progress
     bool isCycling() const { return m_cycling_list != 0; }
+    /// Appends a client to the back of the focus list
     void addFocusBack(WinClient &client);
+    /// Appends a client to the front of the focus list
     void addFocusFront(WinClient &client);
     void setFocusBack(FluxboxWindow *fbwin);
-
+    /// @return main focus model
     FocusModel focusModel() const { return *m_focus_model; }
+    /// @return tab focus model
     TabFocusModel tabFocusModel() const { return *m_tab_focus_model; }
+    /// @return true if newly created windows are focused
     bool focusNew() const { return *m_focus_new; }
-
+    /// @return last focused client in a specific workspace, or NULL.
     WinClient *lastFocusedWindow(int workspace);
+    
     WinClient *lastFocusedWindow(FluxboxWindow &group, WinClient *ignore_client);
 
+    /// @return focus list in creation order
     FocusedWindows &creationOrderList() { return m_creation_order_list; }
+    /// @return the focus list
     FocusedWindows &focusedOrderList() { return m_focused_list; }
-
+    /// removes a client from the focus list
     void removeClient(WinClient &client);
+    /// starts terminating this control
     void shutdown();
-
+    /// do fallback focus for screen if normal focus control failed.
     static void revertFocus(BScreen &screen);
     // like revertFocus, but specifically related to this window (transients etc)
     static void unfocusWindow(WinClient &client, bool full_revert = true, bool unfocus_frame = false);