aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJim Ramsay <i.am@jimramsay.com>2009-04-24 15:25:08 (GMT)
committerJim Ramsay <i.am@jimramsay.com>2009-05-26 20:36:13 (GMT)
commitedffe9c93f051e863f9fb9c768a837534c2e567f (patch)
tree061461d4ae5db49cc02123f02b93b9134d7d064d /src
parentff6a46391f29922476556f8f198730610f3707c2 (diff)
downloadfluxbox-edffe9c93f051e863f9fb9c768a837534c2e567f.zip
fluxbox-edffe9c93f051e863f9fb9c768a837534c2e567f.tar.bz2
Allow 'background: unset'
When a user sets 'background: none' it really means "Do not let themes touch the background I have already set with fbsetbg" -> It does still actually call fbsetbeg to re-assert the proper background. This new value 'unset' is for users who will use an alternate method to set their background (root-tail, xscreensaver, or whatever). It instructs fluxbox to *never* run fbsetbg.
Diffstat (limited to 'src')
-rw-r--r--src/RootTheme.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/RootTheme.cc b/src/RootTheme.cc
index 049eb27..34c06e9 100644
--- a/src/RootTheme.cc
+++ b/src/RootTheme.cc
@@ -202,6 +202,10 @@ void RootTheme::reconfigTheme() {
202 filename = FbTk::StringUtil::expandFilename(filename); 202 filename = FbTk::StringUtil::expandFilename(filename);
203 std::string cmd = realProgramName("fbsetbg") + (m_first ? " -z " : " -Z "); 203 std::string cmd = realProgramName("fbsetbg") + (m_first ? " -z " : " -Z ");
204 204
205 // user explicitly requests NO background be set at all
206 if (strstr(m_background->options().c_str(), "unset") != 0) {
207 return;
208 }
205 // style doesn't wish to change the background 209 // style doesn't wish to change the background
206 if (strstr(m_background->options().c_str(), "none") != 0) { 210 if (strstr(m_background->options().c_str(), "none") != 0) {
207 if (!m_first) 211 if (!m_first)