aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkt <markt>2007-01-20 19:32:53 (GMT)
committermarkt <markt>2007-01-20 19:32:53 (GMT)
commit5503545d8f3228dee6db0c7a1d9de18c77a92ca4 (patch)
treeeb6325e6ed30c1db3a1cf88bc6f3c4de1f9f7bd5
parent383b82bcbb6d0efbba523cef00ecb994657d7d3c (diff)
downloadfluxbox-5503545d8f3228dee6db0c7a1d9de18c77a92ca4.zip
fluxbox-5503545d8f3228dee6db0c7a1d9de18c77a92ca4.tar.bz2
use uppercase arguments to fbsetbg from styles
-rw-r--r--ChangeLog2
-rw-r--r--src/RootTheme.cc12
2 files changed, 8 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 278219f..1d51ace 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.0rc3: 2Changes for 1.0rc3:
3*07/01/20: 3*07/01/20:
4 * Make sure styles don't change the lastwallpaper in fbsetbg (Mark)
5 RootTheme.cc
4 * Let styles override rootCommand in init file -- for the old behavior, add 6 * Let styles override rootCommand in init file -- for the old behavior, add
5 `background: none' to the overlay file (Mark) 7 `background: none' to the overlay file (Mark)
6 RootTheme.cc/hh Screen.cc 8 RootTheme.cc/hh Screen.cc
diff --git a/src/RootTheme.cc b/src/RootTheme.cc
index 98d9067..afe0ca0 100644
--- a/src/RootTheme.cc
+++ b/src/RootTheme.cc
@@ -208,16 +208,16 @@ void RootTheme::reconfigTheme() {
208 filename = FbTk::StringUtil::expandFilename(filename); 208 filename = FbTk::StringUtil::expandFilename(filename);
209 if (FbTk::FileUtil::isRegularFile(filename.c_str())) { 209 if (FbTk::FileUtil::isRegularFile(filename.c_str())) {
210 // parse options 210 // parse options
211 std::string options; 211 std::string options = "-F ";
212 if (strstr(m_background->options().c_str(), "tiled") != 0) 212 if (strstr(m_background->options().c_str(), "tiled") != 0)
213 options += "-t "; 213 options = "-T ";
214 if (strstr(m_background->options().c_str(), "centered") != 0) 214 if (strstr(m_background->options().c_str(), "centered") != 0)
215 options += "-c "; 215 options = "-C ";
216 if (strstr(m_background->options().c_str(), "aspect") != 0) 216 if (strstr(m_background->options().c_str(), "aspect") != 0)
217 options += "-a "; 217 options = "-A ";
218 218
219 // compose wallpaper application "fbsetbg" with argumetns 219 // compose wallpaper application "fbsetbg" with argumetns
220 std::string commandargs = "fbsetbg " + options + " " + filename; 220 std::string commandargs = "fbsetbg " + options + filename;
221 221
222 // call command with options 222 // call command with options
223 FbCommands::ExecuteCmd exec(commandargs, screenNum()); 223 FbCommands::ExecuteCmd exec(commandargs, screenNum());
@@ -225,7 +225,7 @@ void RootTheme::reconfigTheme() {
225 225
226 } else if (FbTk::FileUtil::isDirectory(filename.c_str()) && 226 } else if (FbTk::FileUtil::isDirectory(filename.c_str()) &&
227 strstr(m_background->options().c_str(), "random") != 0) { 227 strstr(m_background->options().c_str(), "random") != 0) {
228 std::string commandargs = "fbsetbg -r " + filename; 228 std::string commandargs = "fbsetbg -R " + filename;
229 FbCommands::ExecuteCmd exec(commandargs, screenNum()); 229 FbCommands::ExecuteCmd exec(commandargs, screenNum());
230 exec.execute(); 230 exec.execute();
231 } else { 231 } else {