diff --git a/src/resources.c b/src/resources.c index aee511bc..3d7ba65f 100644 --- a/src/resources.c +++ b/src/resources.c @@ -35,19 +35,24 @@ #include "resources.h" #include "screen.h" -int wGetColor(WScreen * scr, char *color_name, XColor * color) +int wGetColorForColormap(Colormap colormap, char *color_name, XColor * color) { - if (!XParseColor(dpy, scr->w_colormap, color_name, color)) { + if (!XParseColor(dpy, colormap, color_name, color)) { wwarning(_("could not parse color \"%s\""), color_name); return False; } - if (!XAllocColor(dpy, scr->w_colormap, color)) { + if (!XAllocColor(dpy, colormap, color)) { wwarning(_("could not allocate color \"%s\""), color_name); return False; } return True; } +int wGetColor(WScreen * scr, char *color_name, XColor * color) +{ + return wGetColorForColormap(scr->w_colormap, color_name, color); +} + void wFreeColor(WScreen * scr, unsigned long pixel) { if (pixel != scr->white_pixel && pixel != scr->black_pixel) { diff --git a/src/resources.h b/src/resources.h index 90aab340..bbc92784 100644 --- a/src/resources.h +++ b/src/resources.h @@ -21,6 +21,7 @@ #ifndef WMRESOURCES_H_ #define WMRESOURCES_H_ +int wGetColorForColormap(Colormap colormap, char *color_name, XColor *color); int wGetColor(WScreen *scr, char *color_name, XColor *color); void wFreeColor(WScreen *scr, unsigned long pixel);