--- /usr/local/plan9/src/cmd/acme/acme.c Wed Jan 17 18:49:47 2018 +++ /home/commagray/acme/acme.c Fri Feb 9 20:38:11 2018 @@ -71,6 +71,9 @@ ncol = -1; loadfile = nil; + + originalcolors = FALSE; + ARGBEGIN{ case 'D': {extern int _threaddebuglevel; @@ -106,6 +109,9 @@ if(loadfile == nil) goto Usage; break; + case 'o': + originalcolors = TRUE; + break; case 'm': mtpt = ARGF(); if(mtpt == nil) @@ -970,19 +976,35 @@ Image *tmp; if(tagcols[BACK] == nil) { + if (originalcolors) { /* Blue */ tagcols[BACK] = allocimagemix(display, DPalebluegreen, DWhite); tagcols[HIGH] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, DPalegreygreen); tagcols[BORD] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, DPurpleblue); tagcols[TEXT] = display->black; tagcols[HTEXT] = display->black; - + /* Yellow */ textcols[BACK] = allocimagemix(display, DPaleyellow, DWhite); textcols[HIGH] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, DDarkyellow); textcols[BORD] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, DYellowgreen); textcols[TEXT] = display->black; textcols[HTEXT] = display->black; + } else { + /* Blue */ + tagcols[BACK] = allocimage(display, Rect(0,0,1,1), RGBA32, 1, 0x2b303bFF); + tagcols[HIGH] = allocimage(display, Rect(0,0,1,1), RGBA32, 1, 0xc0c5ceFF); + tagcols[BORD] = allocimage(display, Rect(0,0,1,1), RGBA32, 1, 0xdfe1e8FF); + tagcols[TEXT] = allocimage(display, Rect(0,0,1,1), RGBA32, 1, 0xc0c5ceFF); + tagcols[HTEXT] = allocimage(display, Rect(0,0,1,1), RGBA32, 1, 0x2b303bFF); + + /* Yellow */ + textcols[BACK] = allocimage(display, Rect(0,0,1,1), RGBA32, 1, 0x2b303bFF); + textcols[HIGH] = allocimage(display, Rect(0,0,1,1), RGBA32, 1, 0xa7adbaFF); + textcols[BORD] = allocimage(display, Rect(0,0,1,1), RGBA32, 1, 0xdfe1e8FF); + textcols[TEXT] = allocimage(display, Rect(0,0,1,1), RGBA32, 1, 0xa7adbaFF); + textcols[HTEXT] = allocimage(display, Rect(0,0,1,1), RGBA32, 1, 0x2b303bFF); + } } r = Rect(0, 0, Scrollwid+ButtonBorder, font->height+1); @@ -1006,12 +1028,12 @@ r.max.x -= ButtonBorder; border(modbutton, r, ButtonBorder, tagcols[BORD], ZP); r = insetrect(r, ButtonBorder); - tmp = allocimage(display, Rect(0,0,1,1), screen->chan, 1, DMedblue); + tmp = allocimage(display, Rect(0,0,1,1), RGBA32, 1, 0x65737eFF); draw(modbutton, r, tmp, nil, ZP); freeimage(tmp); r = button->r; - colbutton = allocimage(display, r, screen->chan, 0, DPurpleblue); + colbutton = allocimage(display, r, RGBA32, 1, 0x4f5b66FF); but2col = allocimage(display, r, screen->chan, 1, 0xAA0000FF); but3col = allocimage(display, r, screen->chan, 1, 0x006600FF); --- /usr/local/plan9/src/cmd/acme/dat.h Wed Jan 17 18:49:47 2018 +++ /home/commagray/acme/dat.h Fri Feb 9 18:43:54 2018 @@ -552,6 +552,7 @@ int erroutfd; int messagesize; /* negotiated in 9P version setup */ int globalautoindent; +int originalcolors; int dodollarsigns; char* mtpt;