From a6625f8ca520a8f77ec54035e33af57bf6d5f9e4 Mon Sep 17 00:00:00 2001 From: markt <markt> Date: Wed, 28 Jun 2006 20:06:49 +0000 Subject: cleanup dead function Workspace::setLastFocusedWindow --- ChangeLog | 2 ++ src/Workspace.cc | 17 ----------------- src/Workspace.hh | 6 ------ 3 files changed, 2 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index bd1695e..516104b 100644 --- a/ChangeLog +++ b/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) diff --git a/src/Workspace.cc b/src/Workspace.cc index 46d3078..f00d4c7 100644 --- a/src/Workspace.cc +++ b/src/Workspace.cc @@ -135,7 +135,6 @@ Workspace::GroupList Workspace::m_groups; 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), @@ -151,14 +150,6 @@ Workspace::Workspace(BScreen &scrn, FbTk::MultLayers &layermanager, 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) { // we don't need to add a window that already exist in our list if (find(m_windowlist.begin(), m_windowlist.end(), &w) != m_windowlist.end()) @@ -197,10 +188,6 @@ int Workspace::removeWindow(FluxboxWindow *w, bool still_alive) { // 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); @@ -212,10 +199,6 @@ int Workspace::removeWindow(FluxboxWindow *w, bool still_alive) { updateClientmenu(); - if (m_lastfocus == w || m_windowlist.empty()) - m_lastfocus = 0; - - if (!w->isStuck()) { FluxboxWindow::ClientList::iterator client_it = w->clientList().begin(); diff --git a/src/Workspace.hh b/src/Workspace.hh index ffcde8a..00c59fa 100644 --- a/src/Workspace.hh +++ b/src/Workspace.hh @@ -52,8 +52,6 @@ public: unsigned int workspaceid = 0); ~Workspace(); - void setLastFocusedWindow(FluxboxWindow *w); - /// Set workspace name void setName(const std::string &name); /// Deiconify all windows on this workspace @@ -72,9 +70,6 @@ public: 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; } /// name of this workspace @@ -97,7 +92,6 @@ private: void placeWindow(FluxboxWindow &win); BScreen &m_screen; - FluxboxWindow *m_lastfocus; FbMenu m_clientmenu; typedef std::vector<std::string> Group; -- cgit v0.11.2