Fixed update of workspaces and some indentation

This commit is contained in:
fluxgen 2002-01-21 02:10:25 +00:00
parent ca75fd7960
commit b3427664c4

View file

@ -86,10 +86,6 @@
# include <stdarg.h> # include <stdarg.h>
#endif // HAVE_STDARG_H #endif // HAVE_STDARG_H
#ifndef HAVE_SNPRINTF
# include "bsd-snprintf.h"
#endif // !HAVE_SNPRINTF
#ifndef MAXPATHLEN #ifndef MAXPATHLEN
#define MAXPATHLEN 255 #define MAXPATHLEN 255
#endif // MAXPATHLEN #endif // MAXPATHLEN
@ -210,6 +206,8 @@ full_max(rm, true, scrname+".fullMaximization", altscrname+".FullMaximization"),
max_over_slit(rm, true, scrname+".maxOverSlit",altscrname+".MaxOverSlit"), max_over_slit(rm, true, scrname+".maxOverSlit",altscrname+".MaxOverSlit"),
tab_rotate_vertical(rm, true, scrname+".tab.rotatevertical", altscrname+".Tab.RotateVertical"), tab_rotate_vertical(rm, true, scrname+".tab.rotatevertical", altscrname+".Tab.RotateVertical"),
sloppy_window_grouping(rm, true, scrname+".sloppywindowgrouping", altscrname+".SloppyWindowGrouping"), sloppy_window_grouping(rm, true, scrname+".sloppywindowgrouping", altscrname+".SloppyWindowGrouping"),
focus_last(rm, true, scrname+".focusLastWindow", altscrname+".FocusLastWindow"),
focus_new(rm, true, scrname+".focusNewWindows", altscrname+".FocusNewWindows"),
rootcommand(rm, "", scrname+".rootCommand", altscrname+".RootCommand"), rootcommand(rm, "", scrname+".rootCommand", altscrname+".RootCommand"),
workspaces(rm, 1, scrname+".workspaces", altscrname+".Workspaces"), workspaces(rm, 1, scrname+".workspaces", altscrname+".Workspaces"),
toolbar_width_percent(rm, 65, scrname+".toolbar.widthPercent", altscrname+".Toolbar.WidthPercent"), toolbar_width_percent(rm, 65, scrname+".toolbar.widthPercent", altscrname+".Toolbar.WidthPercent"),
@ -474,7 +472,7 @@ resource(rm, screenname, altscreenname)
delete tempwin; delete tempwin;
tempwin = 0; tempwin = 0;
} catch (...) { } catch (...) {
cerr<<"FATAL: Unknown catch"<<endl; cerr<<"FATAL: Unknown exception"<<endl;
} }
FluxboxWindow *win = fluxbox->searchWindow(children[i]); FluxboxWindow *win = fluxbox->searchWindow(children[i]);
@ -733,7 +731,7 @@ int BScreen::addWorkspace(void) {
workspacemenu->insert(wkspc->getName(), wkspc->getMenu(), workspacemenu->insert(wkspc->getName(), wkspc->getMenu(),
wkspc->getWorkspaceID() + 1); wkspc->getWorkspaceID() + 1);
workspacemenu->update(); workspacemenu->update();
saveWorkspaces(workspacesList->count());
toolbar->reconfigure(); toolbar->reconfigure();
updateNetizenWorkspaceCount(); updateNetizenWorkspaceCount();
@ -762,7 +760,7 @@ int BScreen::removeLastWorkspace(void) {
toolbar->reconfigure(); toolbar->reconfigure();
updateNetizenWorkspaceCount(); updateNetizenWorkspaceCount();
saveWorkspaces(workspacesList->count());
return workspacesList->count(); return workspacesList->count();
} }
@ -799,7 +797,7 @@ void BScreen::changeWorkspaceID(int id) {
current_workspace->showAll(); current_workspace->showAll();
if (resource.focus_last && current_workspace->getLastFocusedWindow()) if (*resource.focus_last && current_workspace->getLastFocusedWindow())
current_workspace->getLastFocusedWindow()->setInputFocus(); current_workspace->getLastFocusedWindow()->setInputFocus();
} }