aboutsummaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authormarkt <markt>2007-03-30 20:29:46 (GMT)
committermarkt <markt>2007-03-30 20:29:46 (GMT)
commit3ab6b48974c32c742bda5dc6c3f217f9d58e3d99 (patch)
tree7a9852f2513e4677e636cd6261c87ba3002b3ab4 /util
parentaef362350332d80febe1a4b72ee9b4b962ed527b (diff)
downloadfluxbox-3ab6b48974c32c742bda5dc6c3f217f9d58e3d99.zip
fluxbox-3ab6b48974c32c742bda5dc6c3f217f9d58e3d99.tar.bz2
pattern matching for window cycling
Diffstat (limited to 'util')
-rw-r--r--util/fluxbox-update_configs.cc18
1 files changed, 9 insertions, 9 deletions
diff --git a/util/fluxbox-update_configs.cc b/util/fluxbox-update_configs.cc
index 5aa0d6c..c3b5a85 100644
--- a/util/fluxbox-update_configs.cc
+++ b/util/fluxbox-update_configs.cc
@@ -67,10 +67,15 @@ void save_all_files();
67int run_updates(int old_version, FbTk::ResourceManager rm) { 67int run_updates(int old_version, FbTk::ResourceManager rm) {
68 int new_version = old_version; 68 int new_version = old_version;
69 69
70 FbTk::Resource<string> rc_keyfile(rm, "~/.fluxbox/keys",
71 "session.keyFile", "Session.KeyFile");
72 FbTk::Resource<string> rc_appsfile(rm, "~/.fluxbox/apps",
73 "session.appsFile", "Session.AppsFile");
74
75 string appsfilename = FbTk::StringUtil::expandFilename(*rc_appsfile);
76 string keyfilename = FbTk::StringUtil::expandFilename(*rc_keyfile);
77
70 if (old_version < 1) { // add mouse events to keys file 78 if (old_version < 1) { // add mouse events to keys file
71 FbTk::Resource<string> rc_keyfile(rm, "~/.fluxbox/keys",
72 "session.keyFile", "Session.KeyFile");
73 string keyfilename = FbTk::StringUtil::expandFilename(*rc_keyfile);
74 79
75 string whole_keyfile = read_file(keyfilename); 80 string whole_keyfile = read_file(keyfilename);
76 string new_keyfile = ""; 81 string new_keyfile = "";
@@ -111,12 +116,7 @@ int run_updates(int old_version, FbTk::ResourceManager rm) {
111 "session.groupFile", "Session.GroupFile"); 116 "session.groupFile", "Session.GroupFile");
112 string groupfilename = FbTk::StringUtil::expandFilename(*rc_groupfile); 117 string groupfilename = FbTk::StringUtil::expandFilename(*rc_groupfile);
113 string whole_groupfile = read_file(groupfilename); 118 string whole_groupfile = read_file(groupfilename);
114
115 FbTk::Resource<string> rc_appsfile(rm, "~/.fluxbox/apps",
116 "session.appsFile", "Session.AppsFile");
117 string appsfilename = FbTk::StringUtil::expandFilename(*rc_appsfile);
118 string whole_appsfile = read_file(appsfilename); 119 string whole_appsfile = read_file(appsfilename);
119
120 string new_appsfile = ""; 120 string new_appsfile = "";
121 121
122 list<string> lines; 122 list<string> lines;
@@ -125,7 +125,7 @@ int run_updates(int old_version, FbTk::ResourceManager rm) {
125 list<string>::iterator line_it = lines.begin(); 125 list<string>::iterator line_it = lines.begin();
126 list<string>::iterator line_it_end = lines.end(); 126 list<string>::iterator line_it_end = lines.end();
127 for (; line_it != line_it_end; ++line_it) { 127 for (; line_it != line_it_end; ++line_it) {
128 new_appsfile += "[group] (workspace)\n"; 128 new_appsfile += "[group] (workspace=[current])\n";
129 129
130 list<string> apps; 130 list<string> apps;
131 FbTk::StringUtil::stringtok(apps, *line_it); 131 FbTk::StringUtil::stringtok(apps, *line_it);