nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use uppercase arguments to fbsetbg from styles

Browse source
This commit is contained in:
markt 2007-01-20 19:32:53 +00:00
parent 383b82bcbb
commit 5503545d8f
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -1,6 +1,8 @@
(Format: Year/Month/Day)
Changes for 1.0rc3:
*07/01/20:
* Make sure styles don't change the lastwallpaper in fbsetbg (Mark)
RootTheme.cc
* Let styles override rootCommand in init file -- for the old behavior, add
`background: none' to the overlay file (Mark)
RootTheme.cc/hh Screen.cc

12
src/RootTheme.cc
View file

@ -208,16 +208,16 @@ void RootTheme::reconfigTheme() {
filename = FbTk::StringUtil::expandFilename(filename);
if (FbTk::FileUtil::isRegularFile(filename.c_str())) {
// parse options
std::string options;
std::string options = "-F ";
if (strstr(m_background->options().c_str(), "tiled") != 0)
options += "-t ";
options = "-T ";
if (strstr(m_background->options().c_str(), "centered") != 0)
options += "-c ";
options = "-C ";
if (strstr(m_background->options().c_str(), "aspect") != 0)
options += "-a ";
options = "-A ";
// compose wallpaper application "fbsetbg" with argumetns
std::string commandargs = "fbsetbg " + options + " " + filename;
std::string commandargs = "fbsetbg " + options + filename;
// call command with options
FbCommands::ExecuteCmd exec(commandargs, screenNum());
@ -225,7 +225,7 @@ void RootTheme::reconfigTheme() {
} else if (FbTk::FileUtil::isDirectory(filename.c_str()) &&
strstr(m_background->options().c_str(), "random") != 0) {
std::string commandargs = "fbsetbg -r " + filename;
std::string commandargs = "fbsetbg -R " + filename;
FbCommands::ExecuteCmd exec(commandargs, screenNum());
exec.execute();
} else {