Add a config option specifying themes directory

Author: oxij

app.cpp

@@ -232,7 +232,7 @@ void App::Run()
 	if (testing) {
 		themeName = testtheme;
 	} else {
-		themebase = string(THEMESDIR) + "/";
+		themebase = cfg.getOption("themes_dir") + "/";
 		themeName = cfg.getOption("current_theme");
 		string::size_type pos;
 		if ((pos = themeName.find(",")) != string::npos) {
@@ -1252,7 +1252,7 @@ string App::findValidRandomTheme(const string & set)
 		int sel = Util::random() % themes.size();
 
 		name = Cfg::Trim(themes[sel]);
-		themefile = string(THEMESDIR) + "/" + name + THEMESFILE;
+		themefile = cfg.getOption("themes_dir") + "/" + name + THEMESFILE;
 		if (stat(themefile.c_str(), &buf) != 0) {
 			themes.erase(find(themes.begin(), themes.end(), name));
 			logStream << APPNAME << ": Invalid theme in config: " << name

cfg.cpp

@@ -56,6 +56,7 @@ Cfg::Cfg() : currentSession(-1)
 	options.insert(option("default_user", ""));
 	options.insert(option("focus_password", "no"));
 	options.insert(option("auto_login", "no"));
+	options.insert(option("themes_dir", PKGDATADIR "/themes"));
 	options.insert(option("current_theme", "default"));
 	options.insert(option("lockfile", "/var/run/slim.lock"));
 	options.insert(option("logfile", "/dev/stderr"));

cfg.h

@@ -19,7 +19,6 @@
 #define INPUT_MAXLENGTH_PASSWD 50
 
 #define CFGFILE SYSCONFDIR "/slim.conf"
-#define THEMESDIR PKGDATADIR "/themes"
 #define THEMESFILE "/slim.theme"
 
 class Cfg

slim.conf

@@ -92,6 +92,8 @@ reboot_msg         The system is rebooting...
 # the password. Set to "yes" to enable this feature
 #auto_login          no
 
+# Directory containing themes
+#themes_dir          /usr/share/slim/themes
 
 # current theme, use comma separated list to specify a set to 
 # randomly choose from

slimlock.cpp

@@ -112,7 +112,7 @@ int main(int argc, char ** argv)
 	string themefile = "";
 	string themedir = "";
 	themeName = "";
-	themebase = string(THEMESDIR) + "/";
+	themebase = cfg.getOption("themes_dir") + "/";
 	themeName = cfg.getOption("current_theme");
 	string::size_type pos;
 	if ((pos = themeName.find(",")) != string::npos) {