ref: 6094625c3b1e6964bec9314ef07b1eea2dcf47cd
dir: /rio-col/
--- a/sys/src/cmd/rio/data.c +++ b/sys/src/cmd/rio/data.c @@ -175,30 +175,20 @@ void iconinit(void) { - background = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0x777777FF); + background = display->black; /* greys are multiples of 0x11111100+0xFF, 14* being palest */ - cols[BACK] = allocimage(display, Rect(0,0,1,1), CMAP8, 1, 0xFFFFFFFF^reverse); - cols[BORD] = allocimage(display, Rect(0,0,1,1), CMAP8, 1, 0x999999FF^reverse); - cols[TEXT] = allocimage(display, Rect(0,0,1,1), CMAP8, 1, 0x000000FF^reverse); - cols[HTEXT] = allocimage(display, Rect(0,0,1,1), CMAP8, 1, 0x000000FF); - if(!reverse) { - cols[HIGH] = allocimage(display, Rect(0,0,1,1), CMAP8, 1, 0xCCCCCCFF); - titlecol = allocimage(display, Rect(0,0,1,1), CMAP8, 1, DGreygreen); - lighttitlecol = allocimage(display, Rect(0,0,1,1), CMAP8, 1, DPalegreygreen); - } else { - cols[HIGH] = allocimage(display, Rect(0,0,1,1), CMAP8, 1, DPurpleblue); - titlecol = allocimage(display, Rect(0,0,1,1), CMAP8, 1, DPurpleblue); - lighttitlecol = allocimage(display, Rect(0,0,1,1), CMAP8, 1, 0x222222FF); - } - dholdcol = allocimage(display, Rect(0,0,1,1), CMAP8, 1, DMedblue); - lightholdcol = allocimage(display, Rect(0,0,1,1), CMAP8, 1, DGreyblue); - paleholdcol = allocimage(display, Rect(0,0,1,1), CMAP8, 1, DPalegreyblue); - paletextcol = allocimage(display, Rect(0,0,1,1), CMAP8, 1, 0x666666FF^reverse); - sizecol = allocimage(display, Rect(0,0,1,1), CMAP8, 1, DRed); - - if(reverse == 0) - holdcol = dholdcol; - else - holdcol = paleholdcol; + cols[BACK] = allocimage(display, Rect(0,0,1,1), CMAP8, 1, DBlack); + cols[BORD] = allocimage(display, Rect(0,0,1,1), CMAP8, 1, 0x111111FF); + cols[TEXT] = allocimage(display, Rect(0,0,1,1), CMAP8, 1, 0x884400FF); + cols[HTEXT] = allocimage(display, Rect(0,0,1,1), CMAP8, 1, 0x884400FF); + cols[HIGH] = allocimage(display, Rect(0,0,1,1), CMAP8, 1, 0x440000FF); + titlecol = allocimage(display, Rect(0,0,1,1), CMAP8, 1, 0x440000FF); + lighttitlecol = allocimage(display, Rect(0,0,1,1), CMAP8, 1, 0x111111FF); + dholdcol = allocimage(display, Rect(0,0,1,1), CMAP8, 1, 0x666666FF); + lightholdcol = allocimage(display, Rect(0,0,1,1), CMAP8, 1, 0x222222FF); + paleholdcol = allocimage(display, Rect(0,0,1,1), CMAP8, 1, 0x333333FF); + paletextcol = allocimage(display, Rect(0,0,1,1), CMAP8, 1, 0x550000FF); + sizecol = allocimage(display, Rect(0,0,1,1), CMAP8, 1, 0x550000FF); + holdcol = dholdcol; }