summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Workspace.cc17
-rw-r--r--src/Workspace.hh6
2 files changed, 0 insertions, 23 deletions
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;
135Workspace::Workspace(BScreen &scrn, FbTk::MultLayers &layermanager, 135Workspace::Workspace(BScreen &scrn, FbTk::MultLayers &layermanager,
136 const std::string &name, unsigned int id): 136 const std::string &name, unsigned int id):
137 m_screen(scrn), 137 m_screen(scrn),
138 m_lastfocus(0),
139 m_clientmenu(scrn.menuTheme(), scrn.imageControl(), 138 m_clientmenu(scrn.menuTheme(), scrn.imageControl(),
140 *scrn.layerManager().getLayer(Layer::MENU)), 139 *scrn.layerManager().getLayer(Layer::MENU)),
141 m_layermanager(layermanager), 140 m_layermanager(layermanager),
@@ -151,14 +150,6 @@ Workspace::Workspace(BScreen &scrn, FbTk::MultLayers &layermanager,
151Workspace::~Workspace() { 150Workspace::~Workspace() {
152} 151}
153 152
154void Workspace::setLastFocusedWindow(FluxboxWindow *win) {
155 // make sure we have this window in the list
156 if (std::find(m_windowlist.begin(), m_windowlist.end(), win) != m_windowlist.end())
157 m_lastfocus = win;
158 else
159 m_lastfocus = 0;
160}
161
162void Workspace::addWindow(FluxboxWindow &w, bool place) { 153void Workspace::addWindow(FluxboxWindow &w, bool place) {
163 // we don't need to add a window that already exist in our list 154 // we don't need to add a window that already exist in our list
164 if (find(m_windowlist.begin(), m_windowlist.end(), &w) != m_windowlist.end()) 155 if (find(m_windowlist.begin(), m_windowlist.end(), &w) != m_windowlist.end())
@@ -197,10 +188,6 @@ int Workspace::removeWindow(FluxboxWindow *w, bool still_alive) {
197 // detach from signals 188 // detach from signals
198 w->titleSig().detach(this); 189 w->titleSig().detach(this);
199 190
200 if (m_lastfocus == w) {
201 m_lastfocus = 0;
202 }
203
204 if (w->isFocused() && still_alive) 191 if (w->isFocused() && still_alive)
205 FocusControl::unfocusWindow(w->winClient(), true, true); 192 FocusControl::unfocusWindow(w->winClient(), true, true);
206 193
@@ -212,10 +199,6 @@ int Workspace::removeWindow(FluxboxWindow *w, bool still_alive) {
212 199
213 updateClientmenu(); 200 updateClientmenu();
214 201
215 if (m_lastfocus == w || m_windowlist.empty())
216 m_lastfocus = 0;
217
218
219 if (!w->isStuck()) { 202 if (!w->isStuck()) {
220 FluxboxWindow::ClientList::iterator client_it = 203 FluxboxWindow::ClientList::iterator client_it =
221 w->clientList().begin(); 204 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:
52 unsigned int workspaceid = 0); 52 unsigned int workspaceid = 0);
53 ~Workspace(); 53 ~Workspace();
54 54
55 void setLastFocusedWindow(FluxboxWindow *w);
56
57 /// Set workspace name 55 /// Set workspace name
58 void setName(const std::string &name); 56 void setName(const std::string &name);
59 /// Deiconify all windows on this workspace 57 /// Deiconify all windows on this workspace
@@ -72,9 +70,6 @@ public:
72 BScreen &screen() { return m_screen; } 70 BScreen &screen() { return m_screen; }
73 const BScreen &screen() const { return m_screen; } 71 const BScreen &screen() const { return m_screen; }
74 72
75 FluxboxWindow *lastFocusedWindow() { return m_lastfocus; }
76 const FluxboxWindow *lastFocusedWindow() const { return m_lastfocus; }
77
78 FbTk::Menu &menu() { return m_clientmenu; } 73 FbTk::Menu &menu() { return m_clientmenu; }
79 const FbTk::Menu &menu() const { return m_clientmenu; } 74 const FbTk::Menu &menu() const { return m_clientmenu; }
80 /// name of this workspace 75 /// name of this workspace
@@ -97,7 +92,6 @@ private:
97 void placeWindow(FluxboxWindow &win); 92 void placeWindow(FluxboxWindow &win);
98 93
99 BScreen &m_screen; 94 BScreen &m_screen;
100 FluxboxWindow *m_lastfocus;
101 FbMenu m_clientmenu; 95 FbMenu m_clientmenu;
102 96
103 typedef std::vector<std::string> Group; 97 typedef std::vector<std::string> Group;