Support a theme.config.local.

diff --git a/bigscreen/.gitignore b/bigscreen/.gitignore
new file mode 100644 (file)
index 0000000..b3cc2b6
--- /dev/null
+++ b/bigscreen/.gitignore
@@ -0,0 +1 @@
+theme.config.local

diff --git a/bigscreen/theme.cpp b/bigscreen/theme.cpp
index 03a26c1c56c45776f7df2835f68068ff8f5f5d43..eb5d54989fbb0b0c7f664abb35cddff40f24c566 100644 (file)
--- a/bigscreen/theme.cpp
+++ b/bigscreen/theme.cpp
@@ -7,11 +7,11 @@
 
 std::map<std::string, std::string> config;
 
 
 std::map<std::string, std::string> config;
 

-void init_theme()
+void read_config(const char *filename)

 {
 {

-       FILE *fp = fopen("theme.config", "rb");
+       FILE *fp = fopen(filename, "r");

        if (fp == NULL)
        if (fp == NULL)

-               throw std::runtime_error("Couldn't open theme.config.");
+               throw std::runtime_error("Couldn't open theme file.");

 
        while (!feof(fp)) {
                char buf[1024];
 
        while (!feof(fp)) {
                char buf[1024];


@@ -46,11 +46,22 @@ void init_theme()
                        continue;
                }
 
                        continue;
                }
 

-               config.insert(std::make_pair(key, value));
+               fprintf(stderr, "%s = %s\n", key, value);
+               config[key] = value;

        }
        fclose(fp);
 }
 
        }
        fclose(fp);
 }
 

+void init_theme()
+{
+       read_config("theme.config");
+       try {
+               read_config("theme.config.local");
+       } catch (...) {
+               // Ignore.
+       }
+}
+

 std::string get_theme_config(const std::string &key, const std::string subkey)
 {
        if (config.count(key + "." + subkey)) {
 std::string get_theme_config(const std::string &key, const std::string subkey)
 {
        if (config.count(key + "." + subkey)) {