M ChangeLog → ChangeLog

@@ -1,6 +1,8 @@ 
  (Format: Year/Month/Day)
 Changes for 1.0rc2:
 *06/06/28:
+   * Little cleanup of dead functions (Mark)
+     Workspace.cc/hh
    * Fixed more focus issues with linear cycling and tabbed windows (Mark)
      Window.cc FocusControl.cc Screen.cc
    * Fixed some focus issues on detach and restart (Mark)

M src/Workspace.cc → src/Workspace.cc

@@ -135,7 +135,6 @@ 
 Workspace::Workspace(BScreen &scrn, FbTk::MultLayers &layermanager, 
                      const std::string &name, unsigned int id):
     m_screen(scrn),
-    m_lastfocus(0),
     m_clientmenu(scrn.menuTheme(), scrn.imageControl(),
                  *scrn.layerManager().getLayer(Layer::MENU)),
     m_layermanager(layermanager),
@@ -149,14 +148,6 @@ }
 
 
 Workspace::~Workspace() {
-}
-
-void Workspace::setLastFocusedWindow(FluxboxWindow *win) {
-    // make sure we have this window in the list
-    if (std::find(m_windowlist.begin(), m_windowlist.end(), win) != m_windowlist.end())
-        m_lastfocus = win;
-    else
-        m_lastfocus = 0;
 }
 
 void Workspace::addWindow(FluxboxWindow &w, bool place) {
@@ -197,10 +188,6 @@ 
     // detach from signals
     w->titleSig().detach(this);
 
-    if (m_lastfocus == w) {
-        m_lastfocus = 0;
-    }
-
     if (w->isFocused() && still_alive)
         FocusControl::unfocusWindow(w->winClient(), true, true);
 	
@@ -211,10 +198,6 @@ if (erase_it != m_windowlist.end())
         m_windowlist.erase(erase_it);
 
     updateClientmenu();
-
-    if (m_lastfocus == w || m_windowlist.empty())
-        m_lastfocus = 0;
-
 
     if (!w->isStuck()) {
         FluxboxWindow::ClientList::iterator client_it = 

M src/Workspace.hh → src/Workspace.hh

@@ -52,8 +52,6 @@ Workspace(BScreen &screen, FbTk::MultLayers &layermanager, const std::string &name,
               unsigned int workspaceid = 0);
     ~Workspace();
 
-    void setLastFocusedWindow(FluxboxWindow *w);
-
     /// Set workspace name
     void setName(const std::string &name);
     /// Deiconify all windows on this workspace
@@ -71,9 +69,6 @@ void updateClientmenu();
 
     BScreen &screen() { return m_screen; }
     const BScreen &screen() const { return m_screen; }
-
-    FluxboxWindow *lastFocusedWindow() { return m_lastfocus; }
-    const FluxboxWindow *lastFocusedWindow() const { return m_lastfocus; }
 
     FbTk::Menu &menu() { return m_clientmenu; }
     const FbTk::Menu &menu() const { return m_clientmenu; }
@@ -97,7 +92,6 @@ void update(FbTk::Subject *subj);
     void placeWindow(FluxboxWindow &win);
 
     BScreen &m_screen;
-    FluxboxWindow *m_lastfocus;
     FbMenu m_clientmenu;
 
     typedef std::vector<std::string> Group;