aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkt <markt>2006-12-27 04:49:17 (GMT)
committermarkt <markt>2006-12-27 04:49:17 (GMT)
commite9f7c0f2c03706e39fd97ec39a20aad5517f0371 (patch)
treeae9d0a8c737fe49334ef651834f0193e84e71bf9
parent9d1447b0d5711168486932c8bd86ad92b194ac99 (diff)
downloadfluxbox-e9f7c0f2c03706e39fd97ec39a20aad5517f0371.zip
fluxbox-e9f7c0f2c03706e39fd97ec39a20aad5517f0371.tar.bz2
fix some misbehaving settings in the apps file
-rw-r--r--ChangeLog5
-rw-r--r--src/Remember.cc11
2 files changed, 12 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 6badc9f..8db797a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.0rc3: 2Changes for 1.0rc3:
3*06/12/27:
4 * Don't assume "Jump" and "*Hidden" say "yes" in apps file (Mark)
5 * Jump to autogrouped windows on another workspace if set to do so in
6 apps file (Mark)
7 Remember.cc
3*06/12/20: 8*06/12/20:
4 * Fixed a few bugs with tabbed windows on restart (Mark) 9 * Fixed a few bugs with tabbed windows on restart (Mark)
5 Window.cc FocusControl.hh 10 Window.cc FocusControl.hh
diff --git a/src/Remember.cc b/src/Remember.cc
index 6106eb2..b705b0d 100644
--- a/src/Remember.cc
+++ b/src/Remember.cc
@@ -772,7 +772,7 @@ void Remember::save() {
772 772
773 if (a.focushiddenstate_remember || a.iconhiddenstate_remember) { 773 if (a.focushiddenstate_remember || a.iconhiddenstate_remember) {
774 if (a.focushiddenstate_remember && a.iconhiddenstate_remember && 774 if (a.focushiddenstate_remember && a.iconhiddenstate_remember &&
775 a.focushiddenstate && a.iconhiddenstate) 775 a.focushiddenstate == a.iconhiddenstate)
776 apps_file << " [Hidden]\t{" << ((a.focushiddenstate)?"yes":"no") << "}" << endl; 776 apps_file << " [Hidden]\t{" << ((a.focushiddenstate)?"yes":"no") << "}" << endl;
777 else if (a.focushiddenstate_remember) { 777 else if (a.focushiddenstate_remember) {
778 apps_file << " [FocusHidden]\t{" << ((a.focushiddenstate)?"yes":"no") << "}" << endl; 778 apps_file << " [FocusHidden]\t{" << ((a.focushiddenstate)?"yes":"no") << "}" << endl;
@@ -981,9 +981,9 @@ void Remember::setupFrame(FluxboxWindow &win) {
981 app->group = &win; 981 app->group = &win;
982 982
983 if (app->focushiddenstate_remember) 983 if (app->focushiddenstate_remember)
984 win.setFocusHidden(true); 984 win.setFocusHidden(app->focushiddenstate);
985 if (app->iconhiddenstate_remember) 985 if (app->iconhiddenstate_remember)
986 win.setIconHidden(true); 986 win.setIconHidden(app->iconhiddenstate);
987 if (app->layer_remember) 987 if (app->layer_remember)
988 win.moveToLayer(app->layer); 988 win.moveToLayer(app->layer);
989 if (app->decostate_remember) 989 if (app->decostate_remember)
@@ -998,7 +998,7 @@ void Remember::setupFrame(FluxboxWindow &win) {
998 if (app->workspace_remember) { 998 if (app->workspace_remember) {
999 // we use setWorkspace and not reassoc because we're still initialising 999 // we use setWorkspace and not reassoc because we're still initialising
1000 win.setWorkspace(app->workspace); 1000 win.setWorkspace(app->workspace);
1001 if (app->jumpworkspace_remember) 1001 if (app->jumpworkspace_remember && app->jumpworkspace)
1002 screen.changeWorkspaceID(app->workspace); 1002 screen.changeWorkspaceID(app->workspace);
1003 } 1003 }
1004 1004
@@ -1070,6 +1070,9 @@ void Remember::setupClient(WinClient &winclient) {
1070 1070
1071 if (winclient.fbwindow() == 0 && app->is_grouped && app->group) { 1071 if (winclient.fbwindow() == 0 && app->is_grouped && app->group) {
1072 app->group->attachClient(winclient); 1072 app->group->attachClient(winclient);
1073 if (app->jumpworkspace_remember && app->jumpworkspace)
1074 // jump to window, not saved workspace
1075 winclient.screen().changeWorkspaceID(app->group->workspaceNumber());
1073 } 1076 }
1074} 1077}
1075 1078