1 files changed, 90 insertions, 27 deletions

diff --git a/src/FocusControl.cc b/src/FocusControl.cc
index 2314f33..e653e22 100644
--- a/src/FocusControl.cc
+++ b/src/FocusControl.cc
@@ -60,18 +60,16 @@ FocusControl::FocusControl(BScreen &screen):
     m_was_iconic(false),
     m_cycling_last(0) {
 
-    m_cycling_window = m_focused_list.end();
+    m_cycling_window = m_focused_win_list.end();
     
 }
 
 // true if the windows should be skiped else false
-bool doSkipWindow(const WinClient &winclient, int opts) {
+bool doSkipWindow(const Focusable &winclient, int opts) {
     const FluxboxWindow *win = winclient.fbwindow();
     return (!win ||
     // skip if stuck
     (opts & FocusControl::CYCLESKIPSTUCK) != 0 && win->isStuck() || 
-    // skip if not active client (i.e. only visit each fbwin once)
-    (opts & FocusControl::CYCLEGROUPS) != 0 && win->winClient().window() != winclient.window() ||
     // skip if shaded
     (opts & FocusControl::CYCLESKIPSHADED) != 0 && win->isShaded() || 
     // skip if iconic
@@ -82,6 +80,15 @@ bool doSkipWindow(const WinClient &winclient, int opts) {
 }
 
 void FocusControl::cycleFocus(FocusedWindows *window_list, int opts, bool cycle_reverse) {
+    Focusables tmp_list;
+    FocusedWindows::iterator it = window_list->begin();
+    FocusedWindows::iterator it_end = window_list->end();
+    for (; it != it_end; ++it)
+        tmp_list.push_back(*it);
+    cycleFocus(&tmp_list, opts, cycle_reverse);
+}
+
+void FocusControl::cycleFocus(Focusables *window_list, int opts, bool cycle_reverse) {
 
     if (!m_cycling_list) {
         if (&m_screen == FbTk::EventManager::instance()->grabbingKeyboard())
@@ -92,12 +99,15 @@ void FocusControl::cycleFocus(FocusedWindows *window_list, int opts, bool cycle_
     } else if (m_cycling_list != window_list)
         m_cycling_list = window_list;
 
+    Focusables::iterator it_begin = window_list->begin();
+    Focusables::iterator it_end = window_list->end();
+
     // too many things can go wrong with remembering this
-    m_cycling_window = find(window_list->begin(),window_list->end(),s_focused_window);
+    m_cycling_window = find(it_begin, it_end, s_focused_window);
+    if (m_cycling_window == it_end)
+        m_cycling_window = find(it_begin, it_end, s_focused_fbwindow);
 
-    FocusedWindows::iterator it = m_cycling_window;
-    FocusedWindows::iterator it_begin = window_list->begin();
-    FocusedWindows::iterator it_end = window_list->end();
+    Focusables::iterator it = m_cycling_window;
 
     // find the next window in the list that works
     while (true) {
@@ -121,7 +131,7 @@ void FocusControl::cycleFocus(FocusedWindows *window_list, int opts, bool cycle_
             // keep track of the originally selected window in a set
             WinClient &last_client = fbwin->winClient();
 
-            if (! (doSkipWindow(**it, opts) || !fbwin->setCurrentClient(**it)) ) {
+            if (! (doSkipWindow(**it, opts) || !(*it)->focus()) ) {
                 // moved onto a new fbwin
                 if (!m_cycling_last || m_cycling_last->fbwindow() != fbwin) {
                     if (m_cycling_last) {
@@ -151,6 +161,38 @@ void FocusControl::cycleFocus(FocusedWindows *window_list, int opts, bool cycle_
     m_cycling_window = it;
 }
 
+void FocusControl::goToWindowNumber(Focusables *winlist, int num, int options) {
+    if (num > 0 && winlist) {
+        Focusables::iterator it = winlist->begin();
+        Focusables::iterator it_end = winlist->end();
+        for (; it != it_end; ++it) {
+            if (!doSkipWindow(**it, options) && (*it)->acceptsFocus()) {
+                --num;
+                if (!num) {
+                    if ((*it)->fbwindow() && (*it)->fbwindow()->isIconic())
+                        (*it)->fbwindow()->deiconify();
+                    (*it)->focus();
+                    return;
+                }
+            }
+        }
+    } else if (num < 0 && winlist) {
+        Focusables::reverse_iterator it = winlist->rbegin();
+        Focusables::reverse_iterator it_end = winlist->rend();
+        for (; it != it_end; ++it) {
+            if (!doSkipWindow(**it, options) && (*it)->acceptsFocus()) {
+                ++num;
+                if (!num) {
+                    if ((*it)->fbwindow() && (*it)->fbwindow()->isIconic())
+                        (*it)->fbwindow()->deiconify();
+                    (*it)->focus();
+                    return;
+                }
+            }
+        }
+    }
+}
+
 void FocusControl::addFocusBack(WinClient &client) {
     m_focused_list.push_back(&client);
     m_creation_order_list.push_back(&client);
@@ -161,6 +203,16 @@ void FocusControl::addFocusFront(WinClient &client) {
     m_creation_order_list.push_back(&client);
 }
 
+void FocusControl::addFocusWinBack(Focusable &win) {
+    m_focused_win_list.push_back(&win);
+    m_creation_order_win_list.push_back(&win);
+}
+
+void FocusControl::addFocusWinFront(Focusable &win) {
+    m_focused_win_list.push_front(&win);
+    m_creation_order_win_list.push_back(&win);
+}
+
 // move all clients in given window to back of focused list
 void FocusControl::setFocusBack(FluxboxWindow *fbwin) {
     // do nothing if there are no windows open
@@ -168,9 +220,9 @@ void FocusControl::setFocusBack(FluxboxWindow *fbwin) {
     if (m_focused_list.empty() || s_reverting)
         return;
 
-    FocusedWindows::iterator it = m_focused_list.begin();
+    Focusables::iterator it = m_focused_list.begin();
     // use back to avoid an infinite loop
-    FocusedWindows::iterator it_back = --m_focused_list.end();
+    Focusables::iterator it_back = --m_focused_list.end();
 
     while (it != it_back) {
         if ((*it)->fbwindow() == fbwin) {
@@ -184,6 +236,10 @@ void FocusControl::setFocusBack(FluxboxWindow *fbwin) {
         m_focused_list.push_back(*it);
         m_focused_list.erase(it);
     }
+
+    m_focused_win_list.remove(fbwin);
+    m_focused_win_list.push_back(fbwin);
+
 }
     
 void FocusControl::stopCyclingFocus() {
@@ -191,7 +247,7 @@ void FocusControl::stopCyclingFocus() {
     if (m_cycling_list == 0)
         return;
 
-    FocusedWindows::iterator it_end = m_cycling_list->end();
+    Focusables::iterator it_end = m_cycling_list->end();
     m_cycling_last = 0;
     m_cycling_list = 0;
 
@@ -200,10 +256,9 @@ void FocusControl::stopCyclingFocus() {
     // in which case we'll do a proper revert focus
     if (m_cycling_window != it_end && (*m_cycling_window)->fbwindow() &&
         (*m_cycling_window)->fbwindow()->isVisible()) {
-        WinClient *client = *m_cycling_window;
-        m_focused_list.remove(client);
-        m_focused_list.push_front(client);
-        client->fbwindow()->raise();
+        (*m_cycling_window)->fbwindow()->raise();
+        if (s_focused_window)
+            setScreenFocusedWindow(*s_focused_window);
     } else
         revertFocus(m_screen);
 }
@@ -213,13 +268,13 @@ void FocusControl::stopCyclingFocus() {
  * If workspace is outside the ID range, then the absolute last focused window
  * is given.
  */
-WinClient *FocusControl::lastFocusedWindow(int workspace) {
+Focusable *FocusControl::lastFocusedWindow(int workspace) {
     if (m_focused_list.empty()) return 0;
     if (workspace < 0 || workspace >= (int) m_screen.numberOfWorkspaces())
         return m_focused_list.front();
 
-    FocusedWindows::iterator it = m_focused_list.begin();    
-    FocusedWindows::iterator it_end = m_focused_list.end();
+    Focusables::iterator it = m_focused_win_list.begin();    
+    Focusables::iterator it_end = m_focused_win_list.end();
     for (; it != it_end; ++it) {
         if ((*it)->fbwindow() &&
             ((((int)(*it)->fbwindow()->workspaceNumber()) == workspace ||
@@ -238,12 +293,12 @@ WinClient *FocusControl::lastFocusedWindow(int workspace) {
 WinClient *FocusControl::lastFocusedWindow(FluxboxWindow &group, WinClient *ignore_client) {
     if (m_focused_list.empty()) return 0;
 
-    FocusedWindows::iterator it = m_focused_list.begin();    
-    FocusedWindows::iterator it_end = m_focused_list.end();
+    Focusables::iterator it = m_focused_list.begin();    
+    Focusables::iterator it_end = m_focused_list.end();
     for (; it != it_end; ++it) {
         if (((*it)->fbwindow() == &group) &&
             (*it) != ignore_client)
-            return *it;
+            return dynamic_cast<WinClient *>(*it);
     }
     return 0;
 }
@@ -257,6 +312,8 @@ void FocusControl::setScreenFocusedWindow(WinClient &win_client) {
             !Fluxbox::instance()->isStartup()) {
         m_focused_list.remove(&win_client);
         m_focused_list.push_front(&win_client);
+        m_focused_win_list.remove(win_client.fbwindow());
+        m_focused_win_list.push_front(win_client.fbwindow());
     }
 }
 
@@ -371,7 +428,7 @@ void FocusControl::removeClient(WinClient &client) {
     if (client.screen().isShuttingdown())
         return;
 
-    WinClient *cyc = 0;
+    Focusable *cyc = 0;
     if (m_cycling_list && m_cycling_window != m_cycling_list->end())
         cyc = *m_cycling_window;
 
@@ -384,12 +441,18 @@ void FocusControl::removeClient(WinClient &client) {
     }
 }
 
+void FocusControl::removeWindow(Focusable &win) {
+    m_focused_win_list.remove(&win);
+    m_creation_order_win_list.remove(&win);
+}
+
 void FocusControl::shutdown() {
     // restore windows backwards so they get put back correctly on restart
-    FocusedWindows::reverse_iterator it = m_focused_list.rbegin();
+    Focusables::reverse_iterator it = m_focused_list.rbegin();
     for (; it != m_focused_list.rend(); ++it) {
-        if (*it && (*it)->fbwindow())
-            (*it)->fbwindow()->restore(*it, true);
+        WinClient *client = dynamic_cast<WinClient *>(*it);
+        if (client && client->fbwindow())
+            client->fbwindow()->restore(client, true);
     }
 }
 
@@ -406,7 +469,7 @@ void FocusControl::revertFocus(BScreen &screen) {
 
     FocusControl::s_reverting = true;
 
-    WinClient *next_focus = 
+    Focusable *next_focus = 
         screen.focusControl().lastFocusedWindow(screen.currentWorkspaceID());
 
     // if setting focus fails, or isn't possible, fallback correctly