From 6efc6de67ed7d697a91224ca6fc7ef029d8caded Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Fri, 28 Sep 2007 11:37:36 +0200 Subject: [PATCH] use get_real_screen() in initcolor() --- config.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/config.c b/config.c index 68948b15..18c5de39 100644 --- a/config.c +++ b/config.c @@ -497,12 +497,7 @@ get_numlockmask(Display *disp) static unsigned long initcolor(Display *disp, int scr, const char *colstr) { - Colormap cmap; - /* bypass screen if scr is a Xinerama screen number */ - if(XineramaIsActive(disp)) - cmap = DefaultColormap(disp, DefaultScreen(disp)); - else - cmap = DefaultColormap(disp, scr); + Colormap cmap = DefaultColormap(disp, get_real_screen(disp, scr)); XColor color; if(!XAllocNamedColor(disp, cmap, colstr, &color, &color)) die("awesome: error, cannot allocate color '%s'\n", colstr);