all repos — openbox @ 1da5287620ed531e1f4a531bcc777a6392572c87

openbox fork - make it a bit more like ryudo

dont need to XrmInit outside of the Config class. fix indenting.
Dana Jansens danakj@orodu.net
commit

1da5287620ed531e1f4a531bcc777a6392572c87

parent

abb124bdb27fad4c89c3731965c776d47c76d0db

1 files changed, 18 insertions(+), 1 deletions(-)

jump to
M src/Screen.ccsrc/Screen.cc

@@ -727,7 +727,7 @@ }

void BScreen::LoadStyle(void) { - Configuration style; + Configuration style(False); const char *sfile = blackbox->getStyleFilename(); if (sfile != NULL) {

@@ -740,6 +740,23 @@ }

} 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)