aboutsummaryrefslogtreecommitdiff
path: root/src/fluxbox.cc
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-04-09 23:20:40 (GMT)
committerfluxgen <fluxgen>2002-04-09 23:20:40 (GMT)
commit46e9b6e5462af0a05808c4d636526c04067a3623 (patch)
treebfd9ac1028247c732af84291e56a20391d8641ac /src/fluxbox.cc
parentbd7951bcdad7e1c4dd6b5ff267cb85fc8cbf6d7e (diff)
downloadfluxbox-46e9b6e5462af0a05808c4d636526c04067a3623.zip
fluxbox-46e9b6e5462af0a05808c4d636526c04067a3623.tar.bz2
update from Workspace changes
Diffstat (limited to 'src/fluxbox.cc')
-rw-r--r--src/fluxbox.cc15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index e0895d4..4d26daa 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.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: fluxbox.cc,v 1.48 2002/04/09 12:09:03 cout Exp $ 25// $Id: fluxbox.cc,v 1.49 2002/04/09 23:14:25 fluxgen Exp $
26 26
27//Use some GNU extensions 27//Use some GNU extensions
28#ifndef _GNU_SOURCE 28#ifndef _GNU_SOURCE
@@ -610,9 +610,8 @@ void Fluxbox::process_event(XEvent *e) {
610 610
611 if (iskdedockapp) { 611 if (iskdedockapp) {
612 XSelectInput(getXDisplay(), e->xmaprequest.window, StructureNotifyMask); 612 XSelectInput(getXDisplay(), e->xmaprequest.window, StructureNotifyMask);
613 std::list<BScreen *>::iterator it = screenList.begin(); 613 std::list<BScreen *>::iterator it = screenList.begin();
614 std::list<BScreen *>::iterator it_end = screenList.end(); 614 for (; (*it) == screenList.back(); ++it) {
615 for (; (*it) == screenList->last(); ++it) {
616 (*it)->getSlit()->addClient(e->xmaprequest.window); 615 (*it)->getSlit()->addClient(e->xmaprequest.window);
617 } 616 }
618 return; 617 return;
@@ -1850,8 +1849,8 @@ void Fluxbox::save_rc(void) {
1850 string workspaces_string(rc_string); 1849 string workspaces_string(rc_string);
1851 1850
1852 for (unsigned int workspace=0; workspace < screen->getCount(); workspace++) { 1851 for (unsigned int workspace=0; workspace < screen->getCount(); workspace++) {
1853 if (screen->getWorkspace(workspace)->getName()!=0) 1852 if (screen->getWorkspace(workspace)->name().size()!=0)
1854 workspaces_string.append(screen->getWorkspace(workspace)->getName()); 1853 workspaces_string.append(screen->getWorkspace(workspace)->name());
1855 else 1854 else
1856 workspaces_string.append("Null"); 1855 workspaces_string.append("Null");
1857 workspaces_string.append(","); 1856 workspaces_string.append(",");
@@ -2402,7 +2401,7 @@ void Fluxbox::setFocusedWindow(FluxboxWindow *win) {
2402 old_wkspc = old_screen->getWorkspace(old_win->getWorkspaceNumber()); 2401 old_wkspc = old_screen->getWorkspace(old_win->getWorkspaceNumber());
2403 2402
2404 old_win->setFocusFlag(False); 2403 old_win->setFocusFlag(False);
2405 old_wkspc->getMenu()->setItemSelected(old_win->getWindowNumber(), False); 2404 old_wkspc->menu()->setItemSelected(old_win->getWindowNumber(), false);
2406 2405
2407 } 2406 }
2408 2407
@@ -2413,7 +2412,7 @@ void Fluxbox::setFocusedWindow(FluxboxWindow *win) {
2413 wkspc = screen->getWorkspace(win->getWorkspaceNumber()); 2412 wkspc = screen->getWorkspace(win->getWorkspaceNumber());
2414 focused_window = win; 2413 focused_window = win;
2415 win->setFocusFlag(True); 2414 win->setFocusFlag(True);
2416 wkspc->getMenu()->setItemSelected(win->getWindowNumber(), True); 2415 wkspc->menu()->setItemSelected(win->getWindowNumber(), true);
2417 2416
2418 } else 2417 } else
2419 focused_window = (FluxboxWindow *) 0; 2418 focused_window = (FluxboxWindow *) 0;