aboutsummaryrefslogtreecommitdiff
path: root/src/Screen.cc
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2005-07-04 18:18:32 (GMT)
committerfluxgen <fluxgen>2005-07-04 18:18:32 (GMT)
commit1727656e0a36cd9095e173dfa43200ed14c178d1 (patch)
tree200a048b9f7ed888047fb0a4fd82660c349087c6 /src/Screen.cc
parent9049dd33d31ccc03dd3f130681eb481d2b3ff0e6 (diff)
downloadfluxbox_pavel-1727656e0a36cd9095e173dfa43200ed14c178d1.zip
fluxbox_pavel-1727656e0a36cd9095e173dfa43200ed14c178d1.tar.bz2
cleaning, change getCount to numberOfWorkspace
Diffstat (limited to 'src/Screen.cc')
-rw-r--r--src/Screen.cc24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index 926193d..3df9266 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -650,9 +650,9 @@ void BScreen::hideMenus() {
650#endif // SLIT 650#endif // SLIT
651 651
652 // hide icon menus 652 // hide icon menus
653 if (getIconList().size()) { 653 if (iconList().size()) {
654 Icons::iterator it = getIconList().begin(); 654 Icons::iterator it = iconList().begin();
655 const Icons::iterator it_end = getIconList().end(); 655 const Icons::iterator it_end = iconList().end();
656 for (; it != it_end; ++it) 656 for (; it != it_end; ++it)
657 (*it)->menu().hide(); 657 (*it)->menu().hide();
658 } 658 }
@@ -804,7 +804,7 @@ void BScreen::addIcon(FluxboxWindow *w) {
804 return; 804 return;
805 805
806 // make sure we have a unique list 806 // make sure we have a unique list
807 if (find(getIconList().begin(), getIconList().end(), w) != getIconList().end()) 807 if (find(iconList().begin(), iconList().end(), w) != iconList().end())
808 return; 808 return;
809 809
810 m_icon_list.push_back(w); 810 m_icon_list.push_back(w);
@@ -818,13 +818,13 @@ void BScreen::removeIcon(FluxboxWindow *w) {
818 if (w == 0) 818 if (w == 0)
819 return; 819 return;
820 820
821 Icons::iterator erase_it = remove_if(getIconList().begin(), 821 Icons::iterator erase_it = remove_if(iconList().begin(),
822 getIconList().end(), 822 iconList().end(),
823 bind2nd(equal_to<FluxboxWindow *>(), w)); 823 bind2nd(equal_to<FluxboxWindow *>(), w));
824 // no need to send iconlist signal if we didn't 824 // no need to send iconlist signal if we didn't
825 // change the iconlist 825 // change the iconlist
826 if (erase_it != m_icon_list.end()) { 826 if (erase_it != m_icon_list.end()) {
827 getIconList().erase(erase_it); 827 iconList().erase(erase_it);
828 m_iconlist_sig.notify(); 828 m_iconlist_sig.notify();
829 } 829 }
830} 830}
@@ -1354,7 +1354,7 @@ void BScreen::reassociateWindow(FluxboxWindow *w, unsigned int wkspc_id,
1354 if (w == 0) 1354 if (w == 0)
1355 return; 1355 return;
1356 1356
1357 if (wkspc_id >= getCount()) 1357 if (wkspc_id >= numberOfWorkspaces())
1358 wkspc_id = currentWorkspace()->workspaceID(); 1358 wkspc_id = currentWorkspace()->workspaceID();
1359 1359
1360 if (!w->isIconic() && w->workspaceNumber() == wkspc_id) 1360 if (!w->isIconic() && w->workspaceNumber() == wkspc_id)
@@ -1992,21 +1992,21 @@ void BScreen::setLayer(FbTk::XLayerItem &item, int layernum) {
1992 Goes to the workspace "right" of the current 1992 Goes to the workspace "right" of the current
1993*/ 1993*/
1994void BScreen::nextWorkspace(const int delta) { 1994void BScreen::nextWorkspace(const int delta) {
1995 changeWorkspaceID( (currentWorkspaceID() + delta) % getCount()); 1995 changeWorkspaceID( (currentWorkspaceID() + delta) % numberOfWorkspaces());
1996} 1996}
1997 1997
1998/** 1998/**
1999 Goes to the workspace "left" of the current 1999 Goes to the workspace "left" of the current
2000*/ 2000*/
2001void BScreen::prevWorkspace(const int delta) { 2001void BScreen::prevWorkspace(const int delta) {
2002 changeWorkspaceID( (currentWorkspaceID() - delta + getCount()) % getCount()); 2002 changeWorkspaceID( (currentWorkspaceID() - delta + numberOfWorkspaces()) % numberOfWorkspaces());
2003} 2003}
2004 2004
2005/** 2005/**
2006 Goes to the workspace "right" of the current 2006 Goes to the workspace "right" of the current
2007*/ 2007*/
2008void BScreen::rightWorkspace(const int delta) { 2008void BScreen::rightWorkspace(const int delta) {
2009 if (currentWorkspaceID()+delta < getCount()) 2009 if (currentWorkspaceID()+delta < numberOfWorkspaces())
2010 changeWorkspaceID(currentWorkspaceID()+delta); 2010 changeWorkspaceID(currentWorkspaceID()+delta);
2011} 2011}
2012 2012
@@ -2152,7 +2152,7 @@ void BScreen::notifyReleasedKeys(XKeyEvent &ke) {
2152 */ 2152 */
2153WinClient *BScreen::getLastFocusedWindow(int workspace) { 2153WinClient *BScreen::getLastFocusedWindow(int workspace) {
2154 if (focused_list.empty()) return 0; 2154 if (focused_list.empty()) return 0;
2155 if (workspace < 0 || workspace >= (int) getCount()) 2155 if (workspace < 0 || workspace >= (int) numberOfWorkspaces())
2156 return focused_list.front(); 2156 return focused_list.front();
2157 2157
2158 FocusedWindows::iterator it = focused_list.begin(); 2158 FocusedWindows::iterator it = focused_list.begin();