aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkt <markt>2006-07-13 06:36:05 (GMT)
committermarkt <markt>2006-07-13 06:36:05 (GMT)
commite44da5f926c5e61818a130071ecaa5a41d900fc2 (patch)
tree3e2b003a1e611c0122008196554a867c969cf63b
parenta7da03c0221933e75063f1a4f5759dd9ba45a5c8 (diff)
downloadfluxbox_pavel-e44da5f926c5e61818a130071ecaa5a41d900fc2.zip
fluxbox_pavel-e44da5f926c5e61818a130071ecaa5a41d900fc2.tar.bz2
fix background: random so that background.pixmap allows a directory name
-rw-r--r--ChangeLog3
-rw-r--r--src/RootTheme.cc7
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 90f7627..cac729e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.0rc3: 2Changes for 1.0rc3:
3*06/07/13:
4 * Fix background: random (Mark)
5 RootTheme.cc
3*06/07/10: 6*06/07/10:
4 * Next/PrevWindow toolbar buttons break MouseFocus: bug #1519913 (Mark) 7 * Next/PrevWindow toolbar buttons break MouseFocus: bug #1519913 (Mark)
5 WorkspaceCmd.cc FocusControl.cc 8 WorkspaceCmd.cc FocusControl.cc
diff --git a/src/RootTheme.cc b/src/RootTheme.cc
index 12c809e..19e8c8d 100644
--- a/src/RootTheme.cc
+++ b/src/RootTheme.cc
@@ -180,8 +180,6 @@ void RootTheme::reconfigTheme() {
180 options += "-t "; 180 options += "-t ";
181 if (strstr(m_background->options().c_str(), "centered") != 0) 181 if (strstr(m_background->options().c_str(), "centered") != 0)
182 options += "-c "; 182 options += "-c ";
183 if (strstr(m_background->options().c_str(), "random") != 0)
184 options += "-r ";
185 if (strstr(m_background->options().c_str(), "aspect") != 0) 183 if (strstr(m_background->options().c_str(), "aspect") != 0)
186 options += "-a "; 184 options += "-a ";
187 185
@@ -192,6 +190,11 @@ void RootTheme::reconfigTheme() {
192 FbCommands::ExecuteCmd exec(commandargs, screenNum()); 190 FbCommands::ExecuteCmd exec(commandargs, screenNum());
193 exec.execute(); 191 exec.execute();
194 192
193 } else if (FbTk::FileUtil::isDirectory(filename.c_str()) &&
194 strstr(m_background->options().c_str(), "random") != 0) {
195 std::string commandargs = "fbsetbg -r " + filename;
196 FbCommands::ExecuteCmd exec(commandargs, screenNum());
197 exec.execute();
195 } else { 198 } else {
196 // render normal texture with fbsetroot 199 // render normal texture with fbsetroot
197 200