aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-06-12 14:30:01 (GMT)
committerfluxgen <fluxgen>2003-06-12 14:30:01 (GMT)
commitfa254cccd4f35b787dc1d75004d4d5a0a6b38105 (patch)
treec8b64ae512bbc3a02c9b15c84c45136336da1b71
parente9ae291109cc44d86b53875a65470a6f34a32aef (diff)
downloadfluxbox-fa254cccd4f35b787dc1d75004d4d5a0a6b38105.zip
fluxbox-fa254cccd4f35b787dc1d75004d4d5a0a6b38105.tar.bz2
getting workspace name directly in constructor
-rw-r--r--src/Workspace.cc15
-rw-r--r--src/Workspace.hh2
2 files changed, 8 insertions, 9 deletions
diff --git a/src/Workspace.cc b/src/Workspace.cc
index 11a972b..dc60873 100644
--- a/src/Workspace.cc
+++ b/src/Workspace.cc
@@ -22,11 +22,11 @@
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.70 2003/06/05 13:21:10 rathnor Exp $ 25// $Id: Workspace.cc,v 1.71 2003/06/12 14:30:00 fluxgen Exp $
26 26
27#include "Workspace.hh" 27#include "Workspace.hh"
28 28
29#include "i18n.hh" 29#include "I18n.hh"
30#include "fluxbox.hh" 30#include "fluxbox.hh"
31#include "Screen.hh" 31#include "Screen.hh"
32#include "Window.hh" 32#include "Window.hh"
@@ -113,24 +113,23 @@ private:
113 113
114Workspace::GroupList Workspace::m_groups; 114Workspace::GroupList Workspace::m_groups;
115 115
116Workspace::Workspace(BScreen &scrn, FbTk::MultLayers &layermanager, unsigned int i): 116Workspace::Workspace(BScreen &scrn, FbTk::MultLayers &layermanager,
117 const std::string &name, unsigned int i):
117 m_screen(scrn), 118 m_screen(scrn),
118 m_lastfocus(0), 119 m_lastfocus(0),
119 m_clientmenu(*scrn.menuTheme(), scrn.screenNumber(), scrn.imageControl()), 120 m_clientmenu(*scrn.menuTheme(), scrn.screenNumber(), scrn.imageControl()),
120 m_layermanager(layermanager), 121 m_layermanager(layermanager),
121 m_name(""), 122 m_name(name),
122 m_id(i) { 123 m_id(i) {
123 124
124 125
125 m_cascade_x = new int[scrn.numHeads()+1]; 126 m_cascade_x = new int[scrn.numHeads() + 1];
126 m_cascade_y = new int[scrn.numHeads()+1]; 127 m_cascade_y = new int[scrn.numHeads() + 1];
127 for (int i=0; i < scrn.numHeads()+1; i++) { 128 for (int i=0; i < scrn.numHeads()+1; i++) {
128 m_cascade_x[i] = 32 + scrn.getHeadX(i); 129 m_cascade_x[i] = 32 + scrn.getHeadX(i);
129 m_cascade_y[i] = 32 + scrn.getHeadY(i); 130 m_cascade_y[i] = 32 + scrn.getHeadY(i);
130 } 131 }
131 m_clientmenu.setInternalMenu(); 132 m_clientmenu.setInternalMenu();
132 setName(screen().getNameOfWorkspace(m_id));
133
134} 133}
135 134
136 135
diff --git a/src/Workspace.hh b/src/Workspace.hh
index a8c6e8c..bca7e41 100644
--- a/src/Workspace.hh
+++ b/src/Workspace.hh
@@ -47,7 +47,7 @@ class Workspace:private FbTk::NotCopyable {
47public: 47public:
48 typedef std::vector<FluxboxWindow *> Windows; 48 typedef std::vector<FluxboxWindow *> Windows;
49 49
50 Workspace(BScreen &screen, FbTk::MultLayers &layermanager, 50 Workspace(BScreen &screen, FbTk::MultLayers &layermanager, const std::string &name,
51 unsigned int workspaceid = 0); 51 unsigned int workspaceid = 0);
52 ~Workspace(); 52 ~Workspace();
53 53