all repos — fluxbox @ 1a2acd2ba7c50cadd390c1d6841c2aaabc1af550

custom fork of the fluxbox windowmanager

remove first and trailing white space in color string
fluxgen fluxgen
commit

1a2acd2ba7c50cadd390c1d6841c2aaabc1af550

parent

b1c9243ea4ee0d9623ce5e8ccb41f8e1bb8c4bfa

1 files changed, 6 insertions(+), 2 deletions(-)

jump to
M src/FbTk/Color.ccsrc/FbTk/Color.cc

@@ -19,11 +19,12 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. -// $Id: Color.cc,v 1.7 2004/01/09 01:54:37 fluxgen Exp $ +// $Id: Color.cc,v 1.8 2004/01/09 21:36:21 fluxgen Exp $ #include "Color.hh" #include "App.hh" +#include "StringUtil.hh" #include <iostream> using namespace std;

@@ -80,13 +81,16 @@ if (color_string == 0) {

free(); return false; } + string color_string_tmp = color_string; + StringUtil::removeFirstWhitespace(color_string_tmp); + StringUtil::removeTrailingWhitespace(color_string_tmp); Display *disp = App::instance()->display(); Colormap colm = DefaultColormap(disp, screen); XColor color; - if (! XParseColor(disp, colm, color_string, &color)) + if (! XParseColor(disp, colm, color_string_tmp.c_str(), &color)) return false; else if (! XAllocColor(disp, colm, &color)) return false;