aboutsummaryrefslogtreecommitdiff
path: root/src/Workspace.cc
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-12-18 18:03:23 (GMT)
committerfluxgen <fluxgen>2003-12-18 18:03:23 (GMT)
commitbb02a522fbc7c47ebd1ddacafd466ccf59e58915 (patch)
treeb55b5d4ae07eaf0794cb6e9b97b478cded7413e1 /src/Workspace.cc
parent8735c6a08bdab11172ec6e4c35271a4b8c374fc7 (diff)
downloadfluxbox_pavel-bb02a522fbc7c47ebd1ddacafd466ccf59e58915.zip
fluxbox_pavel-bb02a522fbc7c47ebd1ddacafd466ccf59e58915.tar.bz2
code cleaning
Diffstat (limited to 'src/Workspace.cc')
-rw-r--r--src/Workspace.cc20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/Workspace.cc b/src/Workspace.cc
index d2ebf60..74c5850 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.87 2003/12/14 01:10:39 fluxgen Exp $ 25// $Id: Workspace.cc,v 1.88 2003/12/18 18:03:22 fluxgen Exp $
26 26
27#include "Workspace.hh" 27#include "Workspace.hh"
28 28
@@ -110,7 +110,7 @@ Workspace::Workspace(BScreen &scrn, FbTk::MultLayers &layermanager,
110 const std::string &name, unsigned int id): 110 const std::string &name, unsigned int id):
111 m_screen(scrn), 111 m_screen(scrn),
112 m_lastfocus(0), 112 m_lastfocus(0),
113 m_clientmenu(*scrn.menuTheme(), scrn.imageControl(), 113 m_clientmenu(scrn.menuTheme(), scrn.imageControl(),
114 *scrn.layerManager().getLayer(Fluxbox::instance()->getMenuLayer())), 114 *scrn.layerManager().getLayer(Fluxbox::instance()->getMenuLayer())),
115 m_layermanager(layermanager), 115 m_layermanager(layermanager),
116 m_name(name), 116 m_name(name),
@@ -123,7 +123,7 @@ Workspace::Workspace(BScreen &scrn, FbTk::MultLayers &layermanager,
123 m_cascade_x[i] = 32 + scrn.getHeadX(i); 123 m_cascade_x[i] = 32 + scrn.getHeadX(i);
124 m_cascade_y[i] = 32 + scrn.getHeadY(i); 124 m_cascade_y[i] = 32 + scrn.getHeadY(i);
125 } 125 }
126 m_clientmenu.setInternalMenu(); 126 menu().setInternalMenu();
127 setName(name); 127 setName(name);
128} 128}
129 129
@@ -254,7 +254,7 @@ void Workspace::removeAll() {
254 254
255 255
256void Workspace::reconfigure() { 256void Workspace::reconfigure() {
257 m_clientmenu.reconfigure(); 257 menu().reconfigure();
258 258
259 Windows::iterator it = m_windowlist.begin(); 259 Windows::iterator it = m_windowlist.begin();
260 Windows::iterator it_end = m_windowlist.end(); 260 Windows::iterator it_end = m_windowlist.end();
@@ -361,7 +361,7 @@ bool Workspace::loadGroups(const std::string &filename) {
361} 361}
362 362
363void Workspace::update(FbTk::Subject *subj) { 363void Workspace::update(FbTk::Subject *subj) {
364 m_clientmenu.update(); 364 menu().update();
365} 365}
366 366
367 367
@@ -379,8 +379,8 @@ void Workspace::setName(const std::string &name) {
379 379
380 screen().updateWorkspaceNamesAtom(); 380 screen().updateWorkspaceNamesAtom();
381 381
382 m_clientmenu.setLabel(m_name.c_str()); 382 menu().setLabel(m_name.c_str());
383 m_clientmenu.update(); 383 menu().update();
384} 384}
385 385
386/** 386/**
@@ -400,7 +400,7 @@ void Workspace::shutdown() {
400 400
401void Workspace::updateClientmenu() { 401void Workspace::updateClientmenu() {
402 // remove all items and then add them again 402 // remove all items and then add them again
403 m_clientmenu.removeAll(); 403 menu().removeAll();
404 // for each fluxboxwindow add every client in them to our clientlist 404 // for each fluxboxwindow add every client in them to our clientlist
405 Windows::iterator win_it = m_windowlist.begin(); 405 Windows::iterator win_it = m_windowlist.begin();
406 Windows::iterator win_it_end = m_windowlist.end(); 406 Windows::iterator win_it_end = m_windowlist.end();
@@ -411,10 +411,10 @@ void Workspace::updateClientmenu() {
411 FluxboxWindow::ClientList::iterator client_it_end = 411 FluxboxWindow::ClientList::iterator client_it_end =
412 (*win_it)->clientList().end(); 412 (*win_it)->clientList().end();
413 for (; client_it != client_it_end; ++client_it) 413 for (; client_it != client_it_end; ++client_it)
414 m_clientmenu.insert(new ClientMenuItem(*(*client_it))); 414 menu().insert(new ClientMenuItem(*(*client_it)));
415 } 415 }
416 416
417 m_clientmenu.update(); 417 menu().update();
418} 418}
419 419
420void Workspace::placeWindow(FluxboxWindow &win) { 420void Workspace::placeWindow(FluxboxWindow &win) {