aboutsummaryrefslogtreecommitdiff
path: root/src/fluxbox.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/fluxbox.cc
parent9049dd33d31ccc03dd3f130681eb481d2b3ff0e6 (diff)
downloadfluxbox_pavel-1727656e0a36cd9095e173dfa43200ed14c178d1.zip
fluxbox_pavel-1727656e0a36cd9095e173dfa43200ed14c178d1.tar.bz2
cleaning, change getCount to numberOfWorkspace
Diffstat (limited to 'src/fluxbox.cc')
-rw-r--r--src/fluxbox.cc17
1 files changed, 7 insertions, 10 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 58222d7..732e8a6 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -931,10 +931,10 @@ void Fluxbox::handleButtonEvent(XButtonEvent &be) {
931 if (! screen->isRootColormapInstalled()) 931 if (! screen->isRootColormapInstalled())
932 screen->imageControl().installRootColormap(); 932 screen->imageControl().installRootColormap();
933 // hide menus 933 // hide menus
934 if (screen->getRootmenu().isVisible()) 934 if (screen->rootMenu().isVisible())
935 screen->getRootmenu().hide(); 935 screen->rootMenu().hide();
936 if (screen->getWorkspacemenu().isVisible()) 936 if (screen->workspaceMenu().isVisible())
937 screen->getWorkspacemenu().hide(); 937 screen->workspaceMenu().hide();
938 938
939 } else if (be.button == 2) { 939 } else if (be.button == 2) {
940 FbCommands::ShowWorkspaceMenuCmd cmd; 940 FbCommands::ShowWorkspaceMenuCmd cmd;
@@ -1033,7 +1033,7 @@ void Fluxbox::handleClientMessage(XClientMessageEvent &ce) {
1033 BScreen *screen = searchScreen(ce.window); 1033 BScreen *screen = searchScreen(ce.window);
1034 1034
1035 if (screen && ce.data.l[0] >= 0 && 1035 if (screen && ce.data.l[0] >= 0 &&
1036 ce.data.l[0] < (signed)screen->getCount()) 1036 ce.data.l[0] < (signed)screen->numberOfWorkspaces())
1037 screen->changeWorkspaceID(ce.data.l[0]); 1037 screen->changeWorkspaceID(ce.data.l[0]);
1038 1038
1039 } else if (ce.message_type == m_fbatoms->getFluxboxChangeWindowFocusAtom()) { 1039 } else if (ce.message_type == m_fbatoms->getFluxboxChangeWindowFocusAtom()) {
@@ -1468,7 +1468,7 @@ void Fluxbox::save_rc() {
1468 sprintf(rc_string, "session.screen%d.workspaceNames: ", screen_number); 1468 sprintf(rc_string, "session.screen%d.workspaceNames: ", screen_number);
1469 string workspaces_string(rc_string); 1469 string workspaces_string(rc_string);
1470 1470
1471 for (unsigned int workspace=0; workspace < screen->getCount(); workspace++) { 1471 for (unsigned int workspace=0; workspace < screen->numberOfWorkspaces(); workspace++) {
1472 if (screen->getWorkspace(workspace)->name().size()!=0) 1472 if (screen->getWorkspace(workspace)->name().size()!=0)
1473 workspaces_string.append(screen->getWorkspace(workspace)->name()); 1473 workspaces_string.append(screen->getWorkspace(workspace)->name());
1474 else 1474 else
@@ -1575,10 +1575,7 @@ void Fluxbox::load_rc(BScreen &screen) {
1575 sprintf(class_lookup, "Session.Screen%d.WorkspaceNames", screen_number); 1575 sprintf(class_lookup, "Session.Screen%d.WorkspaceNames", screen_number);
1576 if (XrmGetResource(*database, name_lookup, class_lookup, &value_type, 1576 if (XrmGetResource(*database, name_lookup, class_lookup, &value_type,
1577 &value)) { 1577 &value)) {
1578#ifdef DEBUG 1578
1579 cerr<<__FILE__<<"("<<__FUNCTION__<<"): Workspaces="<<
1580 screen.getNumberOfWorkspaces()<<endl;
1581#endif // DEBUG
1582 string values(value.addr); 1579 string values(value.addr);
1583 BScreen::WorkspaceNames names; 1580 BScreen::WorkspaceNames names;
1584 1581