merged changes from pre-devel

1 files changed, 176 insertions, 41 deletions

diff --git a/util/fluxbox-update_configs.cc b/util/fluxbox-update_configs.cc
index 8cfe8ef..2dc5eb6 100644
--- a/util/fluxbox-update_configs.cc
+++ b/util/fluxbox-update_configs.cc
@@ -38,23 +38,17 @@
 #define  _GNU_SOURCE
 #endif // _GNU_SOURCE
 
-#ifdef HAVE_CSTDIO
-  #include <cstdio>
-#else
-  #include <stdio.h>
-#endif
-#ifdef HAVE_CSTDLIB
-  #include <cstdlib>
-#else
-  #include <stdlib.h>
-#endif
 #ifdef HAVE_CSTRING
   #include <cstring>
 #else
   #include <string.h>
 #endif
+
 #include <iostream>
 #include <fstream>
+#include <set>
+#include <map>
+#include <list>
 
 using std::cout;
 using std::cerr;
@@ -62,39 +56,34 @@ using std::endl;
 using std::string;
 using std::ifstream;
 using std::ofstream;
+using std::set;
+using std::map;
+using std::list;
 
-#define VERSION 1
+string read_file(string filename);
+void write_file(string filename, string &contents);
+void save_all_files();
 
 int run_updates(int old_version, FbTk::ResourceManager rm) {
     int new_version = old_version;
 
-    if (old_version < 1) { // add mouse events to keys file
-        FbTk::Resource<string> rc_keyfile(rm, DEFAULTKEYSFILE,
-                "session.keyFile", "Session.KeyFile");
-        string keyfilename = FbTk::StringUtil::expandFilename(*rc_keyfile);
-
-        // ok, I don't know anything about file handling in c++
-        // what's it to you?!?!
-        // I assume there should be some error handling in here, but I sure
-        // don't know how, and I don't have documentation
+    FbTk::Resource<string> rc_keyfile(rm, "~/.fluxbox/keys",
+            "session.keyFile", "Session.KeyFile");
+    FbTk::Resource<string> rc_appsfile(rm, "~/.fluxbox/apps",
+            "session.appsFile", "Session.AppsFile");
 
-        ifstream in_keyfile(keyfilename.c_str());
-        string whole_keyfile = "";
+    string appsfilename = FbTk::StringUtil::expandFilename(*rc_appsfile);
+    string keyfilename = FbTk::StringUtil::expandFilename(*rc_keyfile);
 
-        while (!in_keyfile.eof()) {
-            string linebuffer;
-
-            getline(in_keyfile, linebuffer);
-            whole_keyfile += linebuffer + "\n";
-        }
-        in_keyfile.close();
+    if (old_version < 1) { // add mouse events to keys file
 
-        ofstream out_keyfile(keyfilename.c_str());
+        string whole_keyfile = read_file(keyfilename);
+        string new_keyfile = "";
         // let's put our new keybindings first, so they're easy to find
-        out_keyfile << "!mouse actions added by fluxbox-update_configs" << endl
-                    << "OnDesktop Mouse1 :hideMenus" << endl
-                    << "OnDesktop Mouse2 :workspaceMenu" << endl
-                    << "OnDesktop Mouse3 :rootMenu" << endl;
+        new_keyfile += "!mouse actions added by fluxbox-update_configs\n";
+        new_keyfile += "OnDesktop Mouse1 :hideMenus\n";
+        new_keyfile += "OnDesktop Mouse2 :workspaceMenu\n";
+        new_keyfile += "OnDesktop Mouse3 :rootMenu\n";
 
         // scrolling on desktop needs to match user's desktop wheeling settings
         // hmmm, what are the odds that somebody wants this to be different on
@@ -108,25 +97,97 @@ int run_updates(int old_version, FbTk::ResourceManager rm) {
                                         "Session.Screen0.ReverseWheeling");
         if (*rc_wheeling) {
             if (*rc_reverse) { // if you ask me, this should have been default
-                out_keyfile << "OnDesktop Mouse4 :prevWorkspace" << endl
-                            << "OnDesktop Mouse5 :nextWorkspace" << endl;
+                new_keyfile += "OnDesktop Mouse4 :prevWorkspace\n";
+                new_keyfile += "OnDesktop Mouse5 :nextWorkspace\n";
             } else {
-                out_keyfile << "OnDesktop Mouse4 :nextWorkspace" << endl
-                            << "OnDesktop Mouse5 :prevWorkspace" << endl;
+                new_keyfile += "OnDesktop Mouse4 :nextWorkspace\n";
+                new_keyfile += "OnDesktop Mouse5 :prevWorkspace\n";
             }
         }
-        out_keyfile << endl; // just for good looks
+        new_keyfile += "\n"; // just for good looks
+        new_keyfile += whole_keyfile; // don't forget user's old keybindings
 
-        // now, restore user's old keybindings
-        out_keyfile << whole_keyfile;
+        write_file(keyfilename, new_keyfile);
         new_version = 1;
     }
 
+    if (old_version < 2) { // move groups entries to apps file
+        FbTk::Resource<string> rc_groupfile(rm, "~/.fluxbox/groups",
+                "session.groupFile", "Session.GroupFile");
+        string groupfilename = FbTk::StringUtil::expandFilename(*rc_groupfile);
+        string whole_groupfile = read_file(groupfilename);
+        string whole_appsfile = read_file(appsfilename);
+        string new_appsfile = "";
+
+        list<string> lines;
+        FbTk::StringUtil::stringtok(lines, whole_groupfile, "\n");
+
+        list<string>::iterator line_it = lines.begin();
+        list<string>::iterator line_it_end = lines.end();
+        for (; line_it != line_it_end; ++line_it) {
+            new_appsfile += "[group] (workspace=[current])\n";
+
+            list<string> apps;
+            FbTk::StringUtil::stringtok(apps, *line_it);
+
+            list<string>::iterator it = apps.begin();
+            list<string>::iterator it_end = apps.end();
+            for (; it != it_end; ++it) {
+                new_appsfile += " [app] (name=";
+                new_appsfile += *it;
+                new_appsfile += ")\n";
+            }
+
+            new_appsfile += "[end]\n";
+        }
+
+        new_appsfile += whole_appsfile;
+        write_file(appsfilename, new_appsfile);
+        new_version = 2;
+    }
+
+    if (old_version < 3) { // move toolbar wheeling to keys file
+        string whole_keyfile = read_file(keyfilename);
+        string new_keyfile = "";
+        // let's put our new keybindings first, so they're easy to find
+        new_keyfile += "!mouse actions added by fluxbox-update_configs\n";
+        bool keep_changes = false;
+
+        // scrolling on toolbar needs to match user's toolbar wheeling settings
+        FbTk::Resource<string> rc_wheeling(rm, "Off",
+                                           "session.screen0.iconbar.wheelMode",
+                                           "Session.Screen0.Iconbar.WheelMode");
+        FbTk::Resource<bool> rc_screen(rm, true,
+                                       "session.screen0.desktopwheeling",
+                                       "Session.Screen0.DesktopWheeling");
+        FbTk::Resource<bool> rc_reverse(rm, false,
+                                        "session.screen0.reversewheeling",
+                                        "Session.Screen0.ReverseWheeling");
+        if (strcasecmp((*rc_wheeling).c_str(), "On") == 0 ||
+            (strcasecmp((*rc_wheeling).c_str(), "Screen") && *rc_screen)) {
+            keep_changes = true;
+            if (*rc_reverse) { // if you ask me, this should have been default
+                new_keyfile += "OnToolbar Mouse4 :prevWorkspace\n";
+                new_keyfile += "OnToolbar Mouse5 :nextWorkspace\n";
+            } else {
+                new_keyfile += "OnToolbar Mouse4 :nextWorkspace\n";
+                new_keyfile += "OnToolbar Mouse5 :prevWorkspace\n";
+            }
+        }
+        new_keyfile += "\n"; // just for good looks
+        new_keyfile += whole_keyfile; // don't forget user's old keybindings
+
+        if (keep_changes)
+            write_file(keyfilename, new_keyfile);
+        new_version = 3;
+    }
+
     return new_version;
 }
 
 int main(int argc, char **argv) {
     string rc_filename;
+    set<string> style_filenames;
     int i = 1;
     pid_t fb_pid = 0;
 
@@ -184,8 +245,10 @@ int main(int argc, char **argv) {
     int old_version = *config_version;
     int new_version = run_updates(old_version, resource_manager);
     if (new_version > old_version) {
+        // configs were updated -- let's save our changes
         config_version = new_version;
         resource_manager.save(rc_filename.c_str(), rc_filename.c_str());
+        save_all_files();
 
 #ifdef HAVE_SIGNAL_H
         // if we were given a fluxbox pid, send it a reconfigure signal
@@ -197,3 +260,75 @@ int main(int argc, char **argv) {
 
     return 0;
 }
+
+static set<string> modified_files;
+// we may want to put a size limit on this cache, so it doesn't grow too big
+static map<string,string> file_cache;
+
+// returns the contents of the file given, either from the cache or by reading
+// the file from disk
+string read_file(string filename) {
+    // check if we already have the file in memory
+    map<string,string>::iterator it = file_cache.find(filename);
+    if (it != file_cache.end())
+        return it->second;
+
+    // nope, we'll have to read the file
+    ifstream infile(filename.c_str());
+    string whole_file = "";
+
+    if (!infile) // failed to open file
+        return whole_file;
+
+    while (!infile.eof()) {
+        string linebuffer;
+
+        getline(infile, linebuffer);
+        whole_file += linebuffer + "\n";
+    }
+    infile.close();
+
+    file_cache[filename] = whole_file;
+    return whole_file;
+}
+
+#ifdef NOT_USED
+// remove the file from the cache, writing to disk if it's been changed
+void forget_file(string filename) {
+    map<string,string>::iterator cache_it = file_cache.find(filename);
+    // check if we knew about the file to begin with
+    if (cache_it == file_cache.end())
+        return;
+
+    // check if we've actually modified it
+    set<string>::iterator mod_it = modified_files.find(filename);
+    if (mod_it == modified_files.end()) {
+        file_cache.erase(cache_it);
+        return;
+    }
+
+    // flush our changes to disk and remove all traces
+    ofstream outfile(filename.c_str());
+    outfile << cache_it->second;
+    file_cache.erase(cache_it);
+    modified_files.erase(mod_it);
+}
+#endif // NOT_USED
+
+// updates the file contents in the cache and marks the file as modified so it
+// gets saved later
+void write_file(string filename, string &contents) {
+    modified_files.insert(filename);
+    file_cache[filename] = contents;
+}
+
+// actually save all the files we've modified
+void save_all_files() {
+    set<string>::iterator it = modified_files.begin();
+    set<string>::iterator it_end = modified_files.end();
+    for (; it != it_end; ++it) {
+        ofstream outfile(it->c_str());
+        outfile << file_cache[it->c_str()];
+    }
+    modified_files.clear();
+}