summaryrefslogtreecommitdiff
path: root/app/cwm/xutil.c
diff options
context:
space:
mode:
authorOkan Demirmen <okan@cvs.openbsd.org>2012-12-17 18:34:07 +0000
committerOkan Demirmen <okan@cvs.openbsd.org>2012-12-17 18:34:07 +0000
commitd2b08f3c9fddc97190e15eb6ba04acc245e55cab (patch)
tree0b199031c43c3c01131e59ef1d6076576c89a41e /app/cwm/xutil.c
parent7bd25721a6b9ea7d71fe5c34bf59c77a52c50943 (diff)
stash the default screen visual and colormap in screen_ctx
Diffstat (limited to 'app/cwm/xutil.c')
-rw-r--r--app/cwm/xutil.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/app/cwm/xutil.c b/app/cwm/xutil.c
index 53c191f97..cdb7321f5 100644
--- a/app/cwm/xutil.c
+++ b/app/cwm/xutil.c
@@ -15,7 +15,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $OpenBSD: xutil.c,v 1.50 2012/12/17 02:28:45 okan Exp $
+ * $OpenBSD: xutil.c,v 1.51 2012/12/17 18:34:06 okan Exp $
*/
#include <sys/param.h>
@@ -422,8 +422,7 @@ xu_getcolor(struct screen_ctx *sc, char *name)
{
XColor color, tmp;
- if (!XAllocNamedColor(X_Dpy, DefaultColormap(X_Dpy, sc->which),
- name, &color, &tmp)) {
+ if (!XAllocNamedColor(X_Dpy, sc->colormap, name, &color, &tmp)) {
warnx("XAllocNamedColor error: '%s'", name);
return (0);
}