From: Christoph Lohmann <20h@r-36.net> Date: Sat, 29 Sep 2012 09:23:34 +0000 (+0200) Subject: We need all the colors to be available, so die() on some not available. X-Git-Url: https://git.danieliu.xyz/?a=commitdiff_plain;h=ed5b8700a6e6c14b814dcc2e54a90eb1868070b5;p=st.git We need all the colors to be available, so die() on some not available. This is a new opportunity to see if X11 somewhen handled colors in a strange way. --- diff --git a/st.c b/st.c index ab8540c..5ed3753 100644 --- a/st.c +++ b/st.c @@ -1915,17 +1915,12 @@ xloadcols(void) { int i, r, g, b; XRenderColor xft_color = { .alpha = 0 }; - /* load default white color */ - if(!XftColorAllocName(xw.dpy, xw.vis, xw.cmap, colorname[256], &dc.xft_col[256])) - die("Could not allocate color '%s'\n", colorname[256]); - /* load colors [0-15] colors and [256-LEN(colorname)[ (config.h) */ for(i = 0; i < LEN(colorname); i++) { if(!colorname[i]) continue; if(!XftColorAllocName(xw.dpy, xw.vis, xw.cmap, colorname[i], &dc.xft_col[i])) { - dc.xft_col[i] = dc.xft_col[256]; - fprintf(stderr, "Could not allocate color '%s'\n", colorname[i]); + die("Could not allocate color '%s'\n", colorname[i]); } } @@ -1937,8 +1932,7 @@ xloadcols(void) { xft_color.green = g == 0 ? 0 : 0x3737 + 0x2828 * g; xft_color.blue = b == 0 ? 0 : 0x3737 + 0x2828 * b; if(!XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &xft_color, &dc.xft_col[i])) { - dc.xft_col[i] = dc.xft_col[256]; - fprintf(stderr, "Could not allocate color %d\n", i); + die("Could not allocate color %d\n", i); } i++; }