commit 3d95a42e200d3ad1c16780aa0a77a54d96fb3a32 from: Omar Polo date: Fri Oct 19 17:57:34 2018 UTC Minor style improvements commit - 4b09b4b1455e3d085a28d8534f986fe3c06ad2bd commit + 3d95a42e200d3ad1c16780aa0a77a54d96fb3a32 blob - e626a79ecce000bb8af8f5ba78dd87491f400d27 blob + faba6fc64c39c3a31e0f233d74d2693bf991adb6 --- mymenu.c +++ mymenu.c @@ -2012,33 +2012,16 @@ main(int argc, char **argv) #ifdef USE_XFT r.xftdraw = XftDrawCreate(r.d, r.w, vinfo.visual, cmap); - { - rgba_t c; - XRenderColor xrcolor; + for (i = 0; i < 3; ++i) { + rgba_t c; + XRenderColor xrcolor; - /* Prompt */ - c = *(rgba_t*)&fgs[0]; - xrcolor.red = EXPANDBITS(c.rgba.r); - xrcolor.green = EXPANDBITS(c.rgba.g); - xrcolor.blue = EXPANDBITS(c.rgba.b); - xrcolor.alpha = EXPANDBITS(c.rgba.a); - XftColorAllocValue(r.d, DefaultVisual(r.d, 0), DefaultColormap(r.d, 0), &xrcolor, &r.xft_colors[0]); - - /* Completion */ - c = *(rgba_t*)&fgs[1]; + c = *(rgba_t*)&fgs[i]; xrcolor.red = EXPANDBITS(c.rgba.r); xrcolor.green = EXPANDBITS(c.rgba.g); xrcolor.blue = EXPANDBITS(c.rgba.b); xrcolor.alpha = EXPANDBITS(c.rgba.a); - XftColorAllocValue(r.d, DefaultVisual(r.d, 0), DefaultColormap(r.d, 0), &xrcolor, &r.xft_colors[1]); - - /* Completion highlighted */ - c = *(rgba_t*)&fgs[2]; - xrcolor.red = EXPANDBITS(c.rgba.r); - xrcolor.green = EXPANDBITS(c.rgba.g); - xrcolor.blue = EXPANDBITS(c.rgba.b); - xrcolor.alpha = EXPANDBITS(c.rgba.a); - XftColorAllocValue(r.d, DefaultVisual(r.d, 0), DefaultColormap(r.d, 0), &xrcolor, &r.xft_colors[2]); + XftColorAllocValue(r.d, vinfo.visual, cmap, &xrcolor, &r.xft_colors[i]); } #endif