diff options
| author | noname <noname@inventati.org> | 2014-04-23 23:12:29 +0400 |
|---|---|---|
| committer | Roberto E. Vargas Caballero <k0ga@shike2.com> | 2014-04-25 23:57:43 +0200 |
| commit | 99d2d6007ace1d5558ee349224af275722fcc701 (patch) | |
| tree | e244f5442241b7e1c3f07174ac24ecf3e33707ef | |
| parent | fe31a3f6344b0a1dbe72540aad63812f1edb6c12 (diff) | |
| download | st-99d2d6007ace1d5558ee349224af275722fcc701.tar.gz st-99d2d6007ace1d5558ee349224af275722fcc701.tar.bz2 | |
Use BETWEEN macro in xsetcolorname and fix style.
| -rw-r--r-- | st.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -2751,10 +2751,10 @@ int xsetcolorname(int x, const char *name) { XRenderColor color = { .alpha = 0xffff }; Colour colour; - if (x < 0 || x > LEN(colorname)) + if(!BETWEEN(x, 0, LEN(colorname))) return -1; if(!name) { - if(16 <= x && x < 16 + 216) { + if(BETWEEN(x, 16, 16 + 215)) { int r = (x - 16) / 36, g = ((x - 16) % 36) / 6, b = (x - 16) % 6; color.red = sixd_to_16bit(r); color.green = sixd_to_16bit(g); @@ -2763,7 +2763,7 @@ xsetcolorname(int x, const char *name) { return 0; /* something went wrong */ dc.col[x] = colour; return 1; - } else if (16 + 216 <= x && x < 256) { + } else if(BETWEEN(x, 16 + 216, 255)) { color.red = color.green = color.blue = 0x0808 + 0x0a0a * (x - (16 + 216)); if(!XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &color, &colour)) return 0; /* something went wrong */ |