diff options
Diffstat (limited to 'src/RootTheme.cc')
-rw-r--r-- | src/RootTheme.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/RootTheme.cc b/src/RootTheme.cc index 892e219..de28e14 100644 --- a/src/RootTheme.cc +++ b/src/RootTheme.cc | |||
@@ -1,6 +1,6 @@ | |||
1 | // RootTheme.cc | 1 | // RootTheme.cc |
2 | // Copyright (c) 2003 - 2006 Henrik Kinnunen (fluxgen at fluxbox dot org) | 2 | // Copyright (c) 2003 - 2006 Henrik Kinnunen (fluxgen at fluxbox dot org) |
3 | // | 3 | // |
4 | // Permission is hereby granted, free of charge, to any person obtaining a | 4 | // Permission is hereby granted, free of charge, to any person obtaining a |
5 | // copy of this software and associated documentation files (the "Software"), | 5 | // copy of this software and associated documentation files (the "Software"), |
6 | // to deal in the Software without restriction, including without limitation | 6 | // to deal in the Software without restriction, including without limitation |
@@ -57,7 +57,7 @@ public: | |||
57 | BackgroundItem(FbTk::Theme &tm, const std::string &name, const std::string &altname): | 57 | BackgroundItem(FbTk::Theme &tm, const std::string &name, const std::string &altname): |
58 | FbTk::ThemeItem<FbTk::Texture>(tm, name, altname), | 58 | FbTk::ThemeItem<FbTk::Texture>(tm, name, altname), |
59 | m_changed(false), m_loaded(false) { | 59 | m_changed(false), m_loaded(false) { |
60 | 60 | ||
61 | } | 61 | } |
62 | 62 | ||
63 | void load(const std::string *o_name = 0, const std::string *o_altname = 0) { | 63 | void load(const std::string *o_name = 0, const std::string *o_altname = 0) { |
@@ -190,7 +190,7 @@ void RootTheme::reconfigTheme() { | |||
190 | return; | 190 | return; |
191 | 191 | ||
192 | // | 192 | // |
193 | // Else parse background from style | 193 | // Else parse background from style |
194 | // | 194 | // |
195 | 195 | ||
196 | m_background->setApplied(); | 196 | m_background->setApplied(); |
@@ -200,7 +200,7 @@ void RootTheme::reconfigTheme() { | |||
200 | FbTk::StringUtil::removeTrailingWhitespace(filename); | 200 | FbTk::StringUtil::removeTrailingWhitespace(filename); |
201 | FbTk::StringUtil::removeFirstWhitespace(filename); | 201 | FbTk::StringUtil::removeFirstWhitespace(filename); |
202 | // if background argument is a file then | 202 | // if background argument is a file then |
203 | // parse image options and call image setting | 203 | // parse image options and call image setting |
204 | // command specified in the resources | 204 | // command specified in the resources |
205 | filename = FbTk::StringUtil::expandFilename(filename); | 205 | filename = FbTk::StringUtil::expandFilename(filename); |
206 | if (FbTk::FileUtil::isRegularFile(filename.c_str())) { | 206 | if (FbTk::FileUtil::isRegularFile(filename.c_str())) { |
@@ -212,7 +212,7 @@ void RootTheme::reconfigTheme() { | |||
212 | options = "-C "; | 212 | options = "-C "; |
213 | if (strstr(m_background->options().c_str(), "aspect") != 0) | 213 | if (strstr(m_background->options().c_str(), "aspect") != 0) |
214 | options = "-A "; | 214 | options = "-A "; |
215 | 215 | ||
216 | // compose wallpaper application "fbsetbg" with argumetns | 216 | // compose wallpaper application "fbsetbg" with argumetns |
217 | std::string commandargs = realProgramName("fbsetbg") + " " + options + | 217 | std::string commandargs = realProgramName("fbsetbg") + " " + options + |
218 | filename; | 218 | filename; |
@@ -231,12 +231,12 @@ void RootTheme::reconfigTheme() { | |||
231 | // render normal texture with fbsetroot | 231 | // render normal texture with fbsetroot |
232 | 232 | ||
233 | 233 | ||
234 | // Make sure the color strings are valid, | 234 | // Make sure the color strings are valid, |
235 | // so we dont pass any `commands` that can be executed | 235 | // so we dont pass any `commands` that can be executed |
236 | bool color_valid = | 236 | bool color_valid = |
237 | FbTk::Color::validColorString(m_background->colorString().c_str(), | 237 | FbTk::Color::validColorString(m_background->colorString().c_str(), |
238 | screenNum()); | 238 | screenNum()); |
239 | bool color_to_valid = | 239 | bool color_to_valid = |
240 | FbTk::Color::validColorString(m_background->colorToString().c_str(), | 240 | FbTk::Color::validColorString(m_background->colorToString().c_str(), |
241 | screenNum()); | 241 | screenNum()); |
242 | 242 | ||