shithub: patch

Download patch

ref: 06dffbcd89b0d8698efb4da4b4d1c18d27824f0f
parent: f591988340e35552f29f9d50e7fdda00ee04a4e7
author: qwx <qwx@sciops.net>
date: Sun Mar 20 19:48:20 EDT 2022 

nuke a bunch of theme patches


--- a/colors-col
+++ /dev/null
@@ -1,23 +1,0 @@
-diff -r 20a0f09456ec sys/src/cmd/colors.c
---- a/sys/src/cmd/colors.c	Sun Apr 17 07:33:35 2016 +0200
-+++ b/sys/src/cmd/colors.c	Mon Apr 18 06:29:26 2016 +0200
-@@ -28,7 +28,7 @@
- 	}
- 
- 	ny = n/nx;
--	draw(screen, screen->r, display->white, nil, ZP);
-+	draw(screen, screen->r, display->black, nil, ZP);
- 	r = insetrect(screen->r, 5);
- 	r.min.y+=20;
- 	b.max.y=r.min.y;
-@@ -155,8 +155,8 @@
- 							rgb&0xFF,
- 							(rgb<<8) | 0xFF);
- 						p = addpt(screen->r.min, Pt(2,2));
--						draw(screen, Rpt(p, addpt(p, stringsize(font, buf))), display->white, nil, p);
--						string(screen, p, display->black, ZP, font, buf);
-+						draw(screen, Rpt(p, addpt(p, stringsize(font, buf))), display->black, nil, p);
-+						string(screen, p, display->white, ZP, font, buf);
- 						prev=i;
- 						break;
- 					}
--- a/faces-col
+++ /dev/null
@@ -1,86 +1,0 @@
-diff -r a620b482772f sys/src/cmd/faces/main.c
---- a/sys/src/cmd/faces/main.c	Sun Mar 18 07:53:10 2018 +0100
-+++ b/sys/src/cmd/faces/main.c	Wed Mar 21 02:18:49 2018 +0200
-@@ -53,8 +53,10 @@
- 	0x18, 0x00, 0x00, 0x10, 0x00
- };
- 
--Image	*blue;		/* full arrow */
--Image	*bgrnd;		/* pale blue background color */
-+Image	*arrow;		/* full arrow */
-+Image	*smallfg;
-+Image	*bgrnd;		/* background color */
-+Image	*facebg;	/* background for face */
- Image	*left;		/* left-pointing arrow mask */
- Image	*right;		/* right-pointing arrow mask */
- Font	*tinyfont;
-@@ -97,11 +99,13 @@
- 	initplumb();
- 
- 	/* make background color */
--	bgrnd = allocimagemix(display, DPalebluegreen, DWhite);
--	blue = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0x008888FF);	/* blue-green */
-+	bgrnd = display->black;
-+	arrow = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0x550000FF);
-+	smallfg = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0x884400FF);
-+	facebg = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0xCCCCCCFF);
- 	left = allocimage(display, leftright, GREY1, 0, DWhite);
- 	right = allocimage(display, leftright, GREY1, 0, DWhite);
--	if(bgrnd==nil || blue==nil || left==nil || right==nil){
-+	if(bgrnd==nil || arrow==nil || smallfg == nil || facebg == nil || left==nil || right==nil){
- 		fprint(2, "faces: can't create images: %r\n");
- 		exits("image");
- 	}
-@@ -113,7 +117,7 @@
- 	tinyfont = openfont(display, "/lib/font/bit/misc/ascii.5x7.font");
- 	if(tinyfont == nil)
- 		tinyfont = font;
-- 	mediumfont = openfont(display, "/lib/font/bit/misc/unicode.6x13.font");
-+ 	mediumfont = openfont(display, "/lib/font/bit/vga/unicode.font");
-  	if(mediumfont == nil)
-  		mediumfont = font;
- 	datefont = font;
-@@ -138,7 +142,7 @@
- 	r.max.x = enddate.x;
- 	r.max.y = enddate.y+datefont->height;
- 	draw(screen, r, bgrnd, nil, ZP);
--	string(screen, r.min, display->black, ZP, datefont, date);
-+	string(screen, r.min, smallfg, ZP, datefont, date);
- }
- 
- void
-@@ -257,18 +261,19 @@
- 		return;
- 	r = facerect(i-first);
- 	draw(screen, r, bgrnd, nil, ZP);
-+	draw(screen, Rpt(r.min, addpt(r.min, Pt(Facesize, Facesize))), facebg, nil, ZP);
- 	draw(screen, r, f->bit, f->mask, ZP);
- 	r.min.y += Facesize;
--	center(mediumfont, r.min, f->str[Suser], display->black);
-+	center(mediumfont, r.min, f->str[Suser], smallfg);
- 	r.min.y += mediumfont->height;
- 	tstr = facetime(f, &f->recent);
--	center(mediumfont, r.min, tstr, display->black);
-+	center(mediumfont, r.min, tstr, facebg);
- 	if(f->unknown){
- 		r.min.y -= mediumfont->height + tinyfont->height + 2;
- 		for(p.x=-1; p.x<=1; p.x++)
- 			for(p.y=-1; p.y<=1; p.y++)
--				center(tinyfont, addpt(r.min, p), f->str[Sdomain], display->white);
--		center(tinyfont, r.min, f->str[Sdomain], display->black);
-+				center(tinyfont, addpt(r.min, p), f->str[Sdomain], display->black);
-+		center(tinyfont, r.min, f->str[Sdomain], facebg);
- 	}
- }
- 
-@@ -307,8 +312,8 @@
- 	leftr = rectaddpt(leftright, p);
- 	p.x += Dx(leftright) + Facesep;
- 	rightr = rectaddpt(leftright, p);
--	draw(screen, leftr, first>0? blue : bgrnd, left, leftright.min);
--	draw(screen, rightr, last<nfaces? blue : bgrnd, right, leftright.min);
-+	draw(screen, leftr, first>0? arrow : bgrnd, left, leftright.min);
-+	draw(screen, rightr, last<nfaces? arrow : bgrnd, right, leftright.min);
- }
- 
- void
--- a/fplot-col
+++ /dev/null
@@ -1,112 +1,0 @@
-diff -r 2eab60542a43 sys/src/cmd/fplot.c
---- a/sys/src/cmd/fplot.c	Fri Nov 27 10:51:16 2020 +0100
-+++ b/sys/src/cmd/fplot.c	Fri Nov 27 21:58:23 2020 +0100
-@@ -119,7 +119,7 @@
- double ymin = -10, ymax = 10;
- double gymin, gymax;
- int icolors[] = {
--	DBlack,
-+	0x777777FF,
- 	0xCC0000FF,
- 	0x00CC00FF,
- 	0x0000CCFF,
-@@ -475,7 +475,7 @@
- 		lr = rectsubpt(lr, Pt(0, lr.min.y - ny));
- 	}
- 	if(rectinrect(lr, screen->r) && (lr.min.x > x || lr.max.x <= x)){
--		string(screen, lr.min, display->black, ZP, display->defaultfont, buf);
-+		string(screen, lr.min, colors[0], ZP, display->defaultfont, buf);
- 		return 1;
- 	}
- 	return 0;
-@@ -497,7 +497,7 @@
- 		lr = rectsubpt(lr, Pt(lr.min.x - nx, 0));
- 	}
- 	if(rectinrect(lr, screen->r) && (lr.min.y > y || lr.max.y <= y)){
--		string(screen, lr.min, display->black, ZP, display->defaultfont, buf);
-+		string(screen, lr.min, colors[0], ZP, display->defaultfont, buf);
- 		return 1;
- 	}
- 	return 0;
-@@ -564,25 +564,25 @@
- 		x = deconvx(&screen->r, 0);
- 	else
- 		x = screen->r.min.x+5;
--	line(screen, Pt(x, screen->r.min.y), Pt(x, screen->r.max.y), Endarrow, 0, 0, display->black, ZP);
-+	line(screen, Pt(x, screen->r.min.y), Pt(x, screen->r.max.y), Endarrow, 0, 0, colors[0], ZP);
- 	if(ymin < 0 && ymax > 0)
- 		y = deconvy(&screen->r, 0);
- 	else
- 		y = screen->r.max.y-5;
--	line(screen, Pt(screen->r.min.x, y), Pt(screen->r.max.x, y), 0, Endarrow, 0, display->black, ZP);
-+	line(screen, Pt(screen->r.min.x, y), Pt(screen->r.max.x, y), 0, Endarrow, 0, colors[0], ZP);
- 	nx = ticks(xmin, xmax, &dx, &mx);
- 	tickfmt(dx, mx, nx, fmt);
- 	for(i = 0; i <= nx; i++){
- 		p = deconvx(&screen->r, dx*i+mx);
- 		if(xticklabel(fmt, dx*i+mx, p, x, y))
--			line(screen, Pt(p, y), Pt(p, y-5), 0, 0, 0, display->black, ZP);
-+			line(screen, Pt(p, y), Pt(p, y-5), 0, 0, 0, colors[0], ZP);
- 	}
- 	ny = ticks(ymin, ymax, &dy, &my);
- 	tickfmt(dy, my, ny, fmt);
- 	for(i = 0; i <= ny; i++){
- 		p = deconvy(&screen->r, dy*i+my);
- 		if(yticklabel(fmt, dy*i+my, p, x, y))
--			line(screen, Pt(x, p), Pt(x+5, p), 0, 0, 0, display->black, ZP);
-+			line(screen, Pt(x, p), Pt(x+5, p), 0, 0, 0, colors[0], ZP);
- 	}
- }
- 
-@@ -630,7 +630,7 @@
- 	xmax = xmax_;
- 	ymin = ymin_;
- 	ymax = ymax_;
--	draw(screen, screen->r, display->white, nil, ZP);
-+	draw(screen, screen->r, display->black, nil, ZP);
- 	drawgraphs();
- }
- 
-@@ -644,7 +644,7 @@
- 	ymax = zoomst[nzoomst - 1].ymax;
- 	zoomst = realloc(zoomst, sizeof(FRectangle) * --nzoomst);
- 	if(zoomst == nil && nzoomst != 0) sysfatal("realloc: %r");
--	draw(screen, screen->r, display->white, nil, ZP);
-+	draw(screen, screen->r, display->black, nil, ZP);
- 	drawgraphs();
- }
- 
-@@ -759,7 +759,6 @@
- 	parsefns(argc, argv);
- 	if(cflag) {
- 		imagedata = emalloc(picx * picy * 3);
--		memset(imagedata, 0xFF, picx * picy * 3);
- 		print("%11s %11d %11d %11d %11d ", "r8g8b8", 0, 0, picx, picy);
- 		r.min.x = r.min.y = 0;
- 		r.max.x = picx;
-@@ -776,6 +775,7 @@
- 		picy = Dy(screen->r);
- 		pixels = emalloc(picx * picy);
- 		alloccolors();
-+		draw(screen, screen->r, display->black, nil, ZP);
- 		drawgraphs();
- 		for(;;) {
- 			switch(event(&e)) {
-@@ -783,7 +783,7 @@
- 				if((e.mouse.buttons & 1) != 0)
- 					zoom();
- 				if(((lbut|e.mouse.buttons) & 2) != 0){
--					draw(screen, screen->r, display->white, nil, ZP);
-+					draw(screen, screen->r, display->black, nil, ZP);
- 					drawgraphs();
- 				}
- 				if((e.mouse.buttons & 2) != 0)
-@@ -802,7 +802,7 @@
- 						zoomst[nzoomst++] = (FRectangle){xmin, xmax, ymin, ymax};
- 						ymin = gymin-0.05*(gymax-gymin);
- 						ymax = gymax+0.05*(gymax-gymin);
--						draw(screen, screen->r, display->white, nil, ZP);
-+						draw(screen, screen->r, display->black, nil, ZP);
- 						drawgraphs();
- 					}
- 					break;
--- a/kbmap-col
+++ /dev/null
@@ -1,58 +1,0 @@
-diff -r 49bd5e4c9bde sys/src/cmd/kbmap.c
---- a/sys/src/cmd/kbmap.c	Wed Feb 07 18:53:08 2018 +0000
-+++ b/sys/src/cmd/kbmap.c	Wed Feb 14 15:12:34 2018 +0100
-@@ -14,8 +14,7 @@
- 
- KbMap *map;
- int nmap;
--Image *lightblue;
--Image *justblue;
-+Image *txt, *sel;
- 
- enum {
- 	PAD = 3,
-@@ -86,14 +85,14 @@
- drawmap(int i)
- {
- 	if(map[i].current)
--		draw(screen, map[i].r, justblue, nil, ZP);
-+		draw(screen, map[i].r, sel, nil, ZP);
- 	else
--		draw(screen, map[i].r, lightblue, nil, ZP);
-+		draw(screen, map[i].r, display->black, nil, ZP);
- 
--	_string(screen, addpt(map[i].r.min, Pt(2,0)), display->black, ZP,
-+	_string(screen, addpt(map[i].r.min, Pt(2,0)), txt, ZP,
- 		font, map[i].name, nil, strlen(map[i].name), 
- 		map[i].r, nil, ZP, SoverD);
--	border(screen, map[i].r, 1, display->black, ZP);	
-+	border(screen, map[i].r, 1, txt, ZP);	
- }
- 
- void
-@@ -116,7 +115,7 @@
- {
- 	int i;
- 
--	draw(screen, screen->r, lightblue, nil, ZP);
-+	draw(screen, screen->r, display->black, nil, ZP);
- 	for(i=0; i<nmap; i++)
- 		drawmap(i);
- 	flushimage(display, 1);
-@@ -233,12 +232,10 @@
- 		fprint(2, "kbmap: initdraw failed: %r\n");
- 		exits("initdraw");
- 	}
--	lightblue = allocimagemix(display, DPalebluegreen, DWhite);
--	if(lightblue == nil)
--		sysfatal("allocimagemix: %r");
--	justblue = allocimagemix(display, DBlue, DWhite);
--	if(justblue == nil)
--		sysfatal("allocimagemix: %r");
-+	txt = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0x884400FF);
-+	sel = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0x440000FF);
-+	if(txt == nil || sel == nil)
-+		sysfatal("allocimage: %r");
- 
- 	eresized(0);
- 	einit(Emouse|Ekeyboard);
--- a/mothra-col
+++ /dev/null
@@ -1,158 +1,0 @@
-diff -r 8b4cfdf43705 sys/src/cmd/mothra/libpanel/draw.c
---- a/sys/src/cmd/mothra/libpanel/draw.c	Tue Feb 16 22:04:50 2021 +0100
-+++ b/sys/src/cmd/mothra/libpanel/draw.c	Tue Feb 16 22:52:10 2021 +0100
-@@ -14,21 +14,22 @@
- #define	CKINSET	1	/* space around check mark frame */
- #define	CKBORDER 2	/* space around X inside frame */
- static Image *pl_light, *pl_dark, *pl_tick, *pl_hilit;
--Image *pl_blue, *pl_white, *pl_black;
-+Image *pl_blue, *pl_white, *pl_black, *pl_txt;
- int pl_drawinit(void){
--	pl_white=allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0xFFFFFFFF);
--	pl_light=allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0xFFFFFFFF);
--	pl_dark=allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0x777777FF);
--	pl_black=allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0x000000FF);
-+	pl_white=display->black;
-+	pl_light=display->black;
-+	pl_dark=allocimage(display, Rect(0,0,1,1), CMAP8, 1, 0x222222FF);
-+	pl_black=allocimage(display, Rect(0,0,1,1), CMAP8, 1, 0x770000FF);
- 	pl_hilit=allocimage(display, Rect(0,0,1,1), CHAN1(CAlpha,8), 1, 0x80);
--	pl_blue=allocimage(display, Rect(0,0,1,1), RGB24, 1, 0x0000FFFF);
--	if((pl_tick = allocimage(display, Rect(0, 0, TICKW, font->height), screen->chan, 0, DNofill)) != nil){
-+	pl_blue=allocimage(display, Rect(0,0,1,1), CMAP8, 1, 0x666666FF);
-+	pl_txt=allocimage(display, Rect(0,0,1,1), CMAP8, 1, 0x884400FF);
-+	if((pl_tick = allocimage(display, Rect(0, 0, TICKW, font->height), screen->chan, 0x00ff00, DNofill)) != nil){
- 		draw(pl_tick, pl_tick->r, pl_white, nil, ZP);
- 		draw(pl_tick, Rect(TICKW/2, 0, TICKW/2+1, font->height), pl_black, nil, ZP);
- 		draw(pl_tick, Rect(0, 0, TICKW, TICKW), pl_black, nil, ZP);
- 		draw(pl_tick, Rect(0, font->height-TICKW, TICKW, font->height), pl_black, nil, ZP);
- 	}
--	if(pl_white==0 || pl_light==0 || pl_black==0 || pl_dark==0 || pl_blue==0 || pl_tick==0) sysfatal("allocimage: %r");
-+	if(pl_white==0 || pl_light==0 || pl_black==0 || pl_dark==0 || pl_blue==0 || pl_tick==0 || pl_txt==0) sysfatal("allocimage: %r");
- 	return 1;
- }
- Rectangle pl_boxoutline(Image *b, Rectangle r, int style, int fill){
-@@ -237,7 +238,7 @@
- 	draw(b, r, pl_tick, nil, ZP);
- }
- void pl_clr(Image *b, Rectangle r){
--	draw(b, r, display->white, 0, ZP);
-+	draw(b, r, pl_white, 0, ZP);
- }
- void pl_fill(Image *b, Rectangle r){
- 	draw(b, r, pl_light, 0, ZP);
-diff -r 8b4cfdf43705 sys/src/cmd/mothra/libpanel/message.c
---- a/sys/src/cmd/mothra/libpanel/message.c	Tue Feb 16 22:04:50 2021 +0100
-+++ b/sys/src/cmd/mothra/libpanel/message.c	Tue Feb 16 22:52:10 2021 +0100
-@@ -29,7 +29,7 @@
- 			end=s;
- 		c=*end;
- 		*end='\0';
--		string(b, where, display->black, ZP, f, start);
-+		string(b, where, pl_txt, ZP, f, start);
- 		*end=c;
- 		where.y+=font->height;
- 		s=end;
-diff -r 8b4cfdf43705 sys/src/cmd/mothra/libpanel/pldefs.h
---- a/sys/src/cmd/mothra/libpanel/pldefs.h	Tue Feb 16 22:04:50 2021 +0100
-+++ b/sys/src/cmd/mothra/libpanel/pldefs.h	Tue Feb 16 22:52:10 2021 +0100
-@@ -41,7 +41,7 @@
- 	SCROLLABSX,
- };
- 
--extern Image *pl_blue, *pl_white, *pl_black;
-+extern Image *pl_blue, *pl_white, *pl_black, *pl_txt;
- 
- /*
-  * Scrollbar, slider orientations
-diff -r 8b4cfdf43705 sys/src/cmd/mothra/libpanel/rtext.c
---- a/sys/src/cmd/mothra/libpanel/rtext.c	Tue Feb 16 22:04:50 2021 +0100
-+++ b/sys/src/cmd/mothra/libpanel/rtext.c	Tue Feb 16 22:52:10 2021 +0100
-@@ -194,14 +194,15 @@
- 		&& dr.max.x>r.min.x
- 		&& dr.min.x<r.max.x){
- 			if(t->b){
-+				if(t->flags&PL_HOT) border(b, dr, 1, pl_blue, ZP);
- 				draw(b, insetrect(dr, BORD), t->b, 0, t->b->r.min);
- 				if(t->flags&PL_STR) {
- 					line(b, Pt(dr.min.x, dr.min.y), Pt(dr.max.x, dr.max.y),
- 						Endsquare, Endsquare, 0,
--						display->black, ZP);
-+						pl_txt, ZP);
- 					line(b, Pt(dr.min.x, dr.max.y), Pt(dr.max.x, dr.min.y),
- 						Endsquare, Endsquare, 0,
--						display->black, ZP);
-+						pl_txt, ZP);
- 				}
- 				if(t->flags&PL_SEL)
- 					pl_highlight(b, dr);
-@@ -216,7 +217,7 @@
- 				if(t->flags&PL_HOT)
- 					string(b, dr.min, pl_blue, ZP, t->font, t->text);
- 				else
--					string(b, dr.min, display->black, ZP, t->font, t->text);
-+					string(b, dr.min, pl_txt, ZP, t->font, t->text);
- 				if(t->flags&PL_SEL)
- 					pl_highlight(b, dr);
- 				if(t->flags&PL_STR){
-@@ -225,10 +226,19 @@
- 						sp = Pt(dr.min.x, y);
- 					line(b, sp, Pt(dr.max.x, y),
- 						Endsquare, Endsquare, 0,
--						display->black, ZP);
-+						pl_txt, ZP);
- 					sp = Pt(dr.max.x, y);
- 				} else
- 					sp = ZP;
-+				if(t->flags&PL_HOT){
-+					int y = dr.max.y - 1;
-+					if(lp.y != y)
-+						lp = Pt(dr.min.x, y);
-+					line(b, lp, Pt(dr.max.x, y),
-+						Endsquare, Endsquare, 0,
-+						pl_blue, ZP);
-+					lp = Pt(dr.max.x, y);
-+				} else
- 					lp = ZP;
- 				continue;
- 			}
-diff -r 8b4cfdf43705 sys/src/cmd/mothra/libpanel/textwin.c
---- a/sys/src/cmd/mothra/libpanel/textwin.c	Tue Feb 16 22:04:50 2021 +0100
-+++ b/sys/src/cmd/mothra/libpanel/textwin.c	Tue Feb 16 22:52:10 2021 +0100
-@@ -155,7 +155,7 @@
- 		default:
- 			buf[runetochar(buf, r)]='\0';
- 	/***/		pl_clr(t->b, Rpt(*lp, addpt(*lp, stringsize(t->font, buf))));
--			ur=string(t->b, *lp, display->black, ZP, t->font, buf);
-+			ur=string(t->b, *lp, pl_txt, ZP, t->font, buf);
- 			break;
- 		}
- 		if(lp[1].y!=lp[0].y)
-diff -r 8b4cfdf43705 sys/src/cmd/mothra/mothra.c
---- a/sys/src/cmd/mothra/mothra.c	Tue Feb 16 22:04:50 2021 +0100
-+++ b/sys/src/cmd/mothra/mothra.c	Tue Feb 16 22:52:10 2021 +0100
-@@ -12,6 +12,7 @@
- #include <regexp.h>
- #include "mothra.h"
- #include "rtext.h"
-+#include "pldefs.h"
- int debug=0;
- int verbose=0;		/* -v flag causes html errors to be written to file-descriptor 2 */
- int killimgs=0;	/* should mothra kill images? */
-@@ -355,12 +356,10 @@
- 	hrule=allocimage(display, Rect(0, 0, 1, 5), screen->chan, 1, DWhite);
- 	if(hrule==0)
- 		sysfatal("can't allocimage!");
--	draw(hrule, Rect(0,1,1,3), display->black, 0, ZP);
--	linespace=allocimage(display, Rect(0, 0, 1, 5), screen->chan, 1, DWhite);
--	if(linespace==0)
--		sysfatal("can't allocimage!");
--	bullet=allocimage(display, Rect(0,0,25, 8), screen->chan, 0, DWhite);
--	fillellipse(bullet, Pt(4,4), 3, 3, display->black, ZP);
-+	draw(hrule, Rect(0,1,1,3), pl_txt, 0, ZP);
-+	linespace=display->black;
-+	bullet=allocimage(display, Rect(0,0,25, 8), screen->chan, 0, DBlack);
-+	fillellipse(bullet, Pt(4,4), 3, 3, pl_txt, ZP);
- 	mkpanels();
- 	unlockdisplay(display);
- 	eresized(0);
--- a/spewaplay-col
+++ /dev/null
@@ -1,75 +1,0 @@
-diff -Naur a/aplay.c b/aplay.c
---- a/aplay.c	Sun Feb 14 06:54:35 2016
-+++ b/aplay.c	Sun Feb 14 06:54:42 2016
-@@ -85,7 +85,7 @@
- 	codecargs.pidchan = chancreate(sizeof(ulong), 0);
- 	waitchan = threadwaitchan();
- 	initdraw(nil, nil, argv0);
--	back = allocimagemix(display, DPalebluegreen, DWhite);
-+	back = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0x441100ff);
- 	threadcreate(mousethread, &codecargs, STACK);
- 	kbdargs.exit = chancreate(sizeof(char*), 0);
- 	kbdargs.codecargs = &codecargs;
-@@ -262,7 +262,8 @@
- 		r1.max.x = r1.min.x + ((vlong)Dx(r2) * curoff) / maxoff;
- 	r2.min.x = r1.max.x;
- 	draw(screen, r1, back, nil, ZP);
--	draw(screen, r2, display->white, nil, ZP);
-+	draw(screen, r2, display->black, nil, ZP);
-+	/*
- 	if(pause)
- 		strcpy(buf, "pause");
- 	else
-@@ -273,9 +274,10 @@
- 	r2 = rectaddpt(r2, subpt(divpt(r1.max, 2), divpt(r2.max, 2)));
- 	r2 = rectaddpt(r2, screen->r.min);
- 	r1 = insetrect(r2, -4);
--	draw(screen, r1, display->white, nil, ZP);
--	border(screen, insetrect(r1, 1), 2, display->black, ZP);
--	string(screen, r2.min, display->black, ZP, display->defaultfont, buf);
-+	draw(screen, r1, display->black, nil, ZP);
-+	border(screen, insetrect(r1, 1), 2, display->white, ZP);
-+	string(screen, r2.min, display->white, ZP, display->defaultfont, buf);
-+	*/
- 	flushimage(display, 1);
- }
- 
-diff -Naur a/volume.c b/volume.c
---- a/volume.c	Sun Feb 14 06:55:07 2016
-+++ b/volume.c	Sun Feb 14 06:55:10 2016
-@@ -4,8 +4,6 @@
- #include <event.h>
- #include <keyboard.h>
- 
--char volstr[] = "volume";
--char mutestr[] = "muted";
- int volume, muted;
- Image *back;
- 
-@@ -21,16 +19,7 @@
- 	r1.min.y = r1.max.y - ((vlong)Dy(r2) * volume) / 100;
- 	r2.max.y = r1.min.y;
- 	draw(screen, r1, back, nil, ZP);
--	draw(screen, r2, display->white, nil, ZP);
--	r2.min = ZP;
--	r2.max = stringsize(display->defaultfont, muted ? mutestr : volstr);
--	r1 = rectsubpt(screen->r, screen->r.min);
--	r2 = rectaddpt(r2, subpt(divpt(r1.max, 2), divpt(r2.max, 2)));
--	r2 = rectaddpt(r2, screen->r.min);
--	r1 = insetrect(r2, -4);
--	draw(screen, r1, display->white, nil, ZP);
--	border(screen, insetrect(r1, 1), 2, display->black, ZP);
--	string(screen, r2.min, display->black, ZP, display->defaultfont, muted ? mutestr : volstr);
-+	draw(screen, r2, display->black, nil, ZP);
- 	flushimage(display, 1);
- }
- 
-@@ -64,7 +53,7 @@
- 	if(initdraw(0, 0, "volume") < 0)
- 		sysfatal("initdraw failed: %r");
- 	einit(Emouse|Ekeyboard);
--	back = allocimagemix(display, DPalebluegreen, DWhite);
-+	back = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0x441100ff);
- 	eresized(0);
- 	for(;;) switch(event(&e)){
- 	default:
--- a/sudoku-col
+++ /dev/null
@@ -1,75 +1,0 @@
-diff -r 3b33f587ad27 sys/src/games/sudoku/sudoku.c
---- a/sys/src/games/sudoku/sudoku.c	Wed Oct 03 00:53:10 2018 +0200
-+++ b/sys/src/games/sudoku/sudoku.c	Sat Oct 06 16:12:35 2018 +0200
-@@ -14,10 +14,10 @@
- 
- Image *background;	/* DPaleyellow */
- Image *backselect;	/* DPalebluegreen */
--Image *blink;		/* DDarkyellow */
- Image *brdr;		/* 0x55555555 */
- Image *fixed;		/* DBlue */
- Image *wrong;		/* DRed */
-+Image *normal;
- Image *dig[10];		/* digit masks */
- 
- Dir *dir;
-@@ -200,7 +200,7 @@
- 	int i;
- 
- 	for(i = 0; i < Psize; i++) {
--		drawcell(i / Brdsize, i % Brdsize, brd[i].digit, brd[i].locked ? fixed : display->black);
-+		drawcell(i / Brdsize, i % Brdsize, brd[i].digit, brd[i].locked ? fixed : normal);
- 	}
- }
- 
-@@ -214,7 +214,7 @@
- 			drawcell(i / Brdsize, i % Brdsize, brd[i].digit, fixed);
- 		else 
- 			drawcell(i / Brdsize, i % Brdsize, brd[i].digit, 
--					checkpossible(brd, i / Brdsize, i % Brdsize, brd[i].digit) ? display->black : wrong);
-+					checkpossible(brd, i / Brdsize, i % Brdsize, brd[i].digit) ? normal : wrong);
- 	}
- }
- 
-@@ -224,7 +224,7 @@
- 	Point l1, l2;
- 	int i;
- 
--	draw(screen, screen->r, brdr, nil, ZP);
-+	draw(screen, screen->r, display->black, nil, ZP);
- 	draw(screen, insetrect(screen->r, Border), background, nil, ZP);
- 	for(i = 0; i < Brdsize; i++) {
- 		l1 = addpt(screen->r.min, Pt(i*Square, Square));
-@@ -253,7 +253,7 @@
- 	r = insetrect(r, Border);
- 	r.max = addpt(r.max, Pt(2, 2));
- 	draw(screen, rectaddpt(r, screen->r.min), selected ? backselect : background, nil, ZP);
--	draw(screen, rectaddpt(r, screen->r.min), display->black, dig[digit-1], ZP);
-+	draw(screen, rectaddpt(r, screen->r.min), normal, dig[digit-1], ZP);
- }
- 
- void
-@@ -267,17 +267,17 @@
- 		sysfatal("can't reattach to window");
- 	
- 	if(background == nil) 
--		background = eallocimage(Rect(0, 0, 1, 1), 1, DPaleyellow);
-+		background = display->black;
- 	if(backselect == nil) 
--		backselect = eallocimage(Rect(0, 0, 1, 1), 1, DPalebluegreen);
--	if(blink == nil) 
--		blink = eallocimage(Rect(0, 0, 1, 1), 1, DDarkyellow);
-+		backselect = eallocimage(Rect(0, 0, 1, 1), 1, 0x440000FF);
- 	if(brdr == nil)
--		brdr = eallocimage(Rect(0, 0, 1, 1), 1, 0x55555555);
-+		brdr = eallocimage(Rect(0, 0, 1, 1), 1, 0x222222FF);
- 	if(fixed == nil)
--		fixed = eallocimage(Rect(0, 0, 1, 1), 1, DBlue);
-+		fixed = eallocimage(Rect(0, 0, 1, 1), 1, 0x550000FF);
- 	if(wrong == nil)
- 		wrong = eallocimage(Rect(0, 0, 1, 1), 1, DRed);
-+	if(normal == nil)
-+		normal = eallocimage(Rect(0, 0, 1, 1), 1, 0x884400FF);
- 	if(dig[0] == nil) {
- 		for(i = 0; i < 9; i++) {
- 			snprint(path, 256, "%s/%d.bit", imgdir, i+1);
--- a/winwatch-col
+++ /dev/null
@@ -1,66 +1,0 @@
-diff 87a823332f9eaa4ff1e72f8524f6e59d1cc4f407 uncommitted
---- a/sys/src/cmd/winwatch.c
-+++ b/sys/src/cmd/winwatch.c
-@@ -26,8 +26,7 @@
- int mwin;
- int onwin;
- int rows, cols;
--Image *lightblue;
--Image *statecol[4];
-+Image *bgcol, *txtcol, *statecol[4];
- 
- enum {
- 	PAD = 3,
-@@ -168,7 +167,7 @@
- 	r = Rect(0,0,(Dx(screen->r)-2*MARGIN+PAD)/cols-PAD, font->height);
- 	r = rectaddpt(rectaddpt(r, Pt(MARGIN+(PAD+Dx(r))*(i/rows),
- 				MARGIN+(PAD+Dy(r))*(i%rows))), screen->r.min);
--	draw(screen, insetrect(r, -1), lightblue, nil, ZP);
-+	draw(screen, insetrect(r, -1), bgcol, nil, ZP);
- }
- 
- void
-@@ -175,10 +174,10 @@
- drawwin(int i)
- {
- 	draw(screen, win[i].r, statecol[win[i].state], nil, ZP);
--	_string(screen, addpt(win[i].r.min, Pt(2,0)), display->black, ZP,
-+	_string(screen, addpt(win[i].r.min, Pt(2,0)), txtcol, ZP,
- 		font, win[i].label, nil, strlen(win[i].label), 
- 		win[i].r, nil, ZP, SoverD);
--	border(screen, win[i].r, 1, display->black, ZP);	
-+	border(screen, win[i].r, 1, txtcol, ZP);	
- 	win[i].dirty = 0;
- }
- 
-@@ -217,7 +216,7 @@
- 
- 	all |= geometry();
- 	if(all)
--		draw(screen, screen->r, lightblue, nil, ZP);
-+		draw(screen, screen->r, bgcol, nil, ZP);
- 	for(i=0; i<nwin; i++)
- 		if(all || win[i].dirty)
- 			drawwin(i);
-@@ -339,13 +338,14 @@
- 
- 	if(initdraw(0, fontname, "winwatch") < 0)
- 		sysfatal("initdraw: %r");
--	lightblue = allocimagemix(display, DPalebluegreen, DWhite);
--
--	statecol[0] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0xCCCCCCFF);
--	statecol[1] = lightblue;
--	statecol[2] = lightblue;
--	statecol[3] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, DPalegreygreen);
--
-+	bgcol = display->black;
-+	txtcol = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0x884400FF);
-+	statecol[0] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0x111111FF);
-+	statecol[1] = display->black;
-+	statecol[2] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0x440000FF);
-+	statecol[3] = statecol[2];
-+	if(bgcol == nil || txtcol == nil)
-+		sysfatal("allocimage: %r");
- 	for(i=0; i<nelem(statecol); i++)
- 		if(statecol[i] == nil)
- 			sysfatal("allocimage: %r");
--- a/zuke-col
+++ /dev/null
@@ -1,26 +1,0 @@
-diff -r bc91b685ad60 sys/src/cmd/audio/zuke/zuke.c
---- a/sys/src/cmd/audio/zuke/zuke.c	Tue Apr 13 15:55:19 2021 +0200
-+++ b/sys/src/cmd/audio/zuke/zuke.c	Tue Apr 13 23:00:17 2021 +0200
-@@ -101,14 +101,14 @@
- 
- static Color colors[Numcolors] =
- {
--	[Dback]  = {0xf0f0f0},
--	[Dfhigh] = {0xffffff},
--	[Dfmed]  = {0x343434},
--	[Dflow]  = {0xa5a5a5},
--	[Dfinv]  = {0x323232},
--	[Dbmed]  = {0x72dec2},
--	[Dblow]  = {0x404040},
--	[Dbinv]  = {0xffb545},
-+	[Dback]  = {0x000000},
-+	[Dfhigh] = {0xdb7100},
-+	[Dfmed]  = {0x790000},
-+	[Dflow]  = {0x777777},
-+	[Dfinv]  = {0xb85e00},
-+	[Dbmed]  = {0xdb7100},
-+	[Dblow]  = {0x2c0000},
-+	[Dbinv]  = {0x340404},
- };
- 
- static int Scrollwidth;
-- 
⑨