diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/Workspace.cc | 17 | ||||
-rw-r--r-- | src/Workspace.hh | 8 |
2 files changed, 4 insertions, 21 deletions
diff --git a/src/Workspace.cc b/src/Workspace.cc index a93f7e0..3023994 100644 --- a/src/Workspace.cc +++ b/src/Workspace.cc | |||
@@ -22,7 +22,7 @@ | |||
22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
23 | // DEALINGS IN THE SOFTWARE. | 23 | // DEALINGS IN THE SOFTWARE. |
24 | 24 | ||
25 | // $Id: Workspace.cc,v 1.79 2003/08/04 16:28:10 fluxgen Exp $ | 25 | // $Id: Workspace.cc,v 1.80 2003/08/19 16:16:28 fluxgen Exp $ |
26 | 26 | ||
27 | #include "Workspace.hh" | 27 | #include "Workspace.hh" |
28 | 28 | ||
@@ -216,6 +216,7 @@ int Workspace::removeWindow(FluxboxWindow *w) { | |||
216 | if (m_lastfocus == w || m_windowlist.empty()) | 216 | if (m_lastfocus == w || m_windowlist.empty()) |
217 | m_lastfocus = 0; | 217 | m_lastfocus = 0; |
218 | 218 | ||
219 | |||
219 | if (!w->isStuck()) { | 220 | if (!w->isStuck()) { |
220 | FluxboxWindow::ClientList::iterator client_it = | 221 | FluxboxWindow::ClientList::iterator client_it = |
221 | w->clientList().begin(); | 222 | w->clientList().begin(); |
@@ -389,20 +390,6 @@ void Workspace::update() { | |||
389 | } | 390 | } |
390 | 391 | ||
391 | 392 | ||
392 | bool Workspace::isCurrent() const{ | ||
393 | return (m_id == screen().currentWorkspaceID()); | ||
394 | } | ||
395 | |||
396 | |||
397 | bool Workspace::isLastWindow(FluxboxWindow *w) const{ | ||
398 | return (w == m_windowlist.back()); | ||
399 | } | ||
400 | |||
401 | void Workspace::setCurrent() { | ||
402 | screen().changeWorkspaceID(m_id); | ||
403 | } | ||
404 | |||
405 | |||
406 | void Workspace::setName(const std::string &name) { | 393 | void Workspace::setName(const std::string &name) { |
407 | if (name.size() != 0) { | 394 | if (name.size() != 0) { |
408 | m_name = name; | 395 | m_name = name; |
diff --git a/src/Workspace.hh b/src/Workspace.hh index 9784635..466b3a2 100644 --- a/src/Workspace.hh +++ b/src/Workspace.hh | |||
@@ -60,7 +60,6 @@ public: | |||
60 | void removeAll(); | 60 | void removeAll(); |
61 | void reconfigure(); | 61 | void reconfigure(); |
62 | void update(); | 62 | void update(); |
63 | void setCurrent(); | ||
64 | void shutdown(); | 63 | void shutdown(); |
65 | void addWindow(FluxboxWindow &win, bool place = false); | 64 | void addWindow(FluxboxWindow &win, bool place = false); |
66 | int removeWindow(FluxboxWindow *win); | 65 | int removeWindow(FluxboxWindow *win); |
@@ -85,16 +84,13 @@ public: | |||
85 | const Windows &windowList() const { return m_windowlist; } | 84 | const Windows &windowList() const { return m_windowlist; } |
86 | Windows &windowList() { return m_windowlist; } | 85 | Windows &windowList() { return m_windowlist; } |
87 | 86 | ||
88 | bool isCurrent() const; | ||
89 | bool isLastWindow(FluxboxWindow *window) const; | ||
90 | int numberOfWindows() const; | 87 | int numberOfWindows() const; |
91 | bool checkGrouping(FluxboxWindow &win); | 88 | bool checkGrouping(FluxboxWindow &win); |
89 | |||
92 | static bool loadGroups(const std::string &filename); | 90 | static bool loadGroups(const std::string &filename); |
93 | protected: | ||
94 | void placeWindow(FluxboxWindow &win); | ||
95 | 91 | ||
96 | private: | 92 | private: |
97 | 93 | void placeWindow(FluxboxWindow &win); | |
98 | 94 | ||
99 | BScreen &m_screen; | 95 | BScreen &m_screen; |
100 | FluxboxWindow *m_lastfocus; | 96 | FluxboxWindow *m_lastfocus; |