summaryrefslogtreecommitdiff
path: root/src/Screen.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/Screen.cc')
-rw-r--r--src/Screen.cc19
1 files changed, 18 insertions, 1 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index c82ab07c..3a94a4a5 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -727,7 +727,7 @@ void BScreen::rereadMenu(void) {
void BScreen::LoadStyle(void) {
- Configuration style;
+ Configuration style(False);
const char *sfile = blackbox->getStyleFilename();
if (sfile != NULL) {
@@ -741,6 +741,23 @@ void BScreen::LoadStyle(void) {
string s;
+ if (config->getValue("rootCommand", s))
+ printf("config.rootCommand: %s\n", s.c_str());
+
+ if (style.getValue("rootCommand", s))
+ printf("style.rootCommand: %s\n", s.c_str());
+
+ // merge in the rc file
+ style.merge(config, True);
+
+ printf("merged databases\n");
+
+ if (style.getValue("rootCommand", s))
+ printf("style.rootCommand: %s\n", s.c_str());
+
+ if (style.getValue("session.cacheMax", s))
+ printf("session.cacheMax: %s\n", s.c_str());
+
// load fonts/fontsets
if (resource.wstyle.font)
delete resource.wstyle.font;