all repos — fluxbox @ e44da5f926c5e61818a130071ecaa5a41d900fc2

custom fork of the fluxbox windowmanager

fix background: random so that background.pixmap allows a directory name
markt markt
commit

e44da5f926c5e61818a130071ecaa5a41d900fc2

parent

a7da03c0221933e75063f1a4f5759dd9ba45a5c8

2 files changed, 8 insertions(+), 2 deletions(-)

jump to
M ChangeLogChangeLog

@@ -1,5 +1,8 @@

(Format: Year/Month/Day) Changes for 1.0rc3: +*06/07/13: + * Fix background: random (Mark) + RootTheme.cc *06/07/10: * Next/PrevWindow toolbar buttons break MouseFocus: bug #1519913 (Mark) WorkspaceCmd.cc FocusControl.cc
M src/RootTheme.ccsrc/RootTheme.cc

@@ -180,8 +180,6 @@ if (strstr(m_background->options().c_str(), "tiled") != 0)

options += "-t "; if (strstr(m_background->options().c_str(), "centered") != 0) options += "-c "; - if (strstr(m_background->options().c_str(), "random") != 0) - options += "-r "; if (strstr(m_background->options().c_str(), "aspect") != 0) options += "-a ";

@@ -192,6 +190,11 @@ // call command with options

FbCommands::ExecuteCmd exec(commandargs, screenNum()); exec.execute(); + } else if (FbTk::FileUtil::isDirectory(filename.c_str()) && + strstr(m_background->options().c_str(), "random") != 0) { + std::string commandargs = "fbsetbg -r " + filename; + FbCommands::ExecuteCmd exec(commandargs, screenNum()); + exec.execute(); } else { // render normal texture with fbsetroot