shithub: patch

Info  •  Files  •  Log

remove patches superceded by /dev/theme

--- a/bar-col

+++ /dev/null

@@ -1,45 +1,0 @@

-diff 46d9e65b6623956bc7b1f8d982dc986951cb4962 uncommitted

---- a/bar.c

-+++ b/bar.c

-@@ -241,7 +241,7 @@

- 	uvlong t, oldt;

- 	int oldbuttons;

- 	char *s, *v[3];

--	u32int brgb;

-+	u32int trgb;

- 	Biobuf *b;

- 	Rune key;

- 	Mouse m;

-@@ -286,12 +286,12 @@

- 	if((local = tzload("local")) == nil)

- 		sysfatal("zone: %r");

- 

--	brgb = DPalegreygreen;

-+	trgb = 0xff;

- 	if((b = Bopen("/dev/theme", OREAD)) != nil){

- 		while((s = Brdline(b, '\n')) != nil){

- 			s[Blinelen(b)-1] = 0;

--			if(tokenize(s, v, nelem(v)) > 1 && strcmp(v[0], "ltitle") == 0){

--				brgb = strtoul(v[1], nil, 16)<<8 | 0xff;

-+			if(tokenize(s, v, nelem(v)) > 1 && strcmp(v[0], "menutext") == 0){

-+				trgb = strtoul(v[1], nil, 16)<<8 | 0xff;

- 				break;

- 			}

- 		}

-@@ -311,14 +311,8 @@

- 	if((kctl = initkeyboard(nil)) == nil)

- 		sysfatal("initkeyboard: %r");

- 

--	cback = allocimage(display, Rect(0,0,1,1), RGB24, 1, brgb);

--	if(brgb == DPalegreygreen)

--		brgb = DBlack;

--	else{ /* dunno, just invert */

--		brgb = ~(brgb>>8 | brgb>>16 | brgb>>24);

--		brgb = brgb<<8 | brgb<<16 | brgb<<24 | 0xff;

--	}

--	ctext = allocimage(display, Rect(0,0,1,1), RGB24, 1, brgb);

-+	cback = display->black;

-+	ctext = allocimage(display, Rect(0,0,1,1), RGB24, 1, trgb);

- 

- 	a[Emouse].c = mctl->c;

- 	a[Eresize].c = mctl->resizec;

--- a/jamterm-pastel

+++ /dev/null

@@ -1,29 +1,0 @@

-diff 50202c8311abb165337bd7ee613d9a7ce6b2ea5b uncommitted

---- a/jamterm/flayer.c

-+++ b/jamterm/flayer.c

-@@ -30,17 +30,17 @@

- 

- 	/* Main text is yellowish */

- 	maincols[BACK] = display->black;

--	maincols[HIGH] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0x440000FF);

--	maincols[BORD] = allocimage(display, Rect(0,0,2,2), screen->chan, 1, 0x222222FF);

--	maincols[TEXT] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0x884400FF);

--	maincols[HTEXT] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0x884400FF);

-+	maincols[HIGH] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0x8F8F8FFF);

-+	maincols[BORD] = allocimage(display, Rect(0,0,2,2), screen->chan, 1, 0x363636FF);

-+	maincols[TEXT] = display->white;

-+	maincols[HTEXT] = display->black;

- 

- 	/* Command text is blueish */

- 	cmdcols[BACK] = display->black;

--	cmdcols[HIGH] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0x111111FF);

--	cmdcols[BORD] = allocimage(display, Rect(0,0,2,2), screen->chan, 1, 0x440000FF);

--	cmdcols[TEXT] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0x770000FF);

--	cmdcols[HTEXT] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0x770000FF);

-+	cmdcols[HIGH] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0x9C9C9CFF);

-+	cmdcols[BORD] = allocimage(display, Rect(0,0,2,2), screen->chan, 1, 0xDCBC72FF);

-+	cmdcols[TEXT] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0xFFAD00FF);

-+	cmdcols[HTEXT] = display->black;

- }

- 

- void

--- a/samterm-pastelcol

+++ /dev/null

@@ -1,63 +1,0 @@

---- a//sys/src/cmd/samterm/flayer.c

-+++ b//sys/src/cmd/samterm/flayer.c

-@@ -29,17 +29,17 @@

- 	lDrect = r;

- 

- 	/* Main text is yellowish */

--	maincols[BACK] = allocimagemix(display, DPaleyellow, DWhite);

--	maincols[HIGH] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, DDarkyellow);

--	maincols[BORD] = allocimage(display, Rect(0,0,2,2), screen->chan, 1, DYellowgreen);

--	maincols[TEXT] = display->black;

-+	maincols[BACK] = display->black;

-+	maincols[HIGH] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0x8F8F8FFF);

-+	maincols[BORD] = allocimage(display, Rect(0,0,2,2), screen->chan, 1, 0x363636FF);

-+	maincols[TEXT] = display->white;

- 	maincols[HTEXT] = display->black;

- 

- 	/* Command text is blueish */

--	cmdcols[BACK] = allocimagemix(display, DPalebluegreen, DWhite);

--	cmdcols[HIGH] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, DPalegreygreen);

--	cmdcols[BORD] = allocimage(display, Rect(0,0,2,2), screen->chan, 1, DPurpleblue);

--	cmdcols[TEXT] = display->black;

-+	cmdcols[BACK] = display->black;

-+	cmdcols[HIGH] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0x9C9C9CFF);

-+	cmdcols[BORD] = allocimage(display, Rect(0,0,2,2), screen->chan, 1, 0xDCBC72FF);

-+	cmdcols[TEXT] = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0xFFAD00FF);

- 	cmdcols[HTEXT] = display->black;

- }

- 

-@@ -89,12 +89,12 @@

- flclose(Flayer *l)

- {

- 	if(l->visible == All)

--		draw(screen, l->entire, display->white, nil, ZP);

-+		draw(screen, l->entire, display->black, nil, ZP);

- 	else if(l->visible == Some){

- 		if(l->f.b == 0)

- 			l->f.b = allocimage(display, l->entire, screen->chan, 0, DNofill);

- 		if(l->f.b){

--			draw(l->f.b, l->entire, display->white, nil, ZP);

-+			draw(l->f.b, l->entire, display->black, nil, ZP);

- 			flrefresh(l, l->entire, 0);

- 		}

- 	}

-@@ -362,7 +362,7 @@

- 	if(0 && Dx(dr)==Dx(olDrect) && Dy(dr)==Dy(olDrect))

- 		move = 1;

- 	else

--		draw(screen, lDrect, display->white, nil, ZP);

-+		draw(screen, lDrect, display->black, nil, ZP);

- 	for(i=0; i<nllist; i++){

- 		l = llist[i];

- 		l->lastsr = ZR;

---- a//sys/src/cmd/samterm/plan9.c

-+++ b//sys/src/cmd/samterm/plan9.c

-@@ -46,7 +46,7 @@

- 	if(t != nil)

- 		maxtab = strtoul(t, nil, 0);

- 	free(t);

--	draw(screen, screen->clipr, display->white, nil, ZP);

-+	draw(screen, screen->clipr, display->black, nil, ZP);

- }

- 

- int

--- a/vdir-col

+++ /dev/null

@@ -1,50 +1,0 @@

-diff 848a598df06df0557bfe37dd6711d8ed966a56b6 uncommitted

---- a/alert.c

-+++ b/alert.c

-@@ -38,8 +38,8 @@

- 	alts[2].v  = nil;

- 	while(nbrecv(kctl->c, nil)==1)

- 		;

--	bg = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0xf8d7daff);

--	fg = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0x721c24ff);

-+	bg = display->black;

-+	fg = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0x790000ff);

- 	tf = openfont(display, Titlefont);

- 	if(tf==nil)

- 		sysfatal("openfont: %r");

---- a/vdir.c

-+++ b/vdir.c

-@@ -224,11 +224,11 @@

- void

- initcolors(void)

- {

--	toolbg = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0xEFEFEFFF);

-+	toolbg = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0x790000ff);

- 	toolfg = display->black;

--	viewbg = display->white;

--	viewfg = display->black;

--	scrollbg = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0x999999FF);

-+	viewbg = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0x222222ff);

-+	viewfg = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0xdb7100ff);

-+	scrollbg = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0x790000ff);

- 	scrollfg = display->white;

- }

- 

-@@ -352,7 +352,7 @@

- 	Point p;

- 	int i, h, y;

- 

--	draw(screen, screen->r, display->white, nil, ZP);

-+	draw(screen, screen->r, display->black, nil, ZP);

- 	p = addpt(screen->r.min, Pt(0, Toolpadding));

- 	draw(screen, toolr, toolbg, nil, ZP);

- 	line(screen, Pt(toolr.min.x, toolr.max.y), toolr.max, 0, 0, 0, toolfg, ZP);

-@@ -374,7 +374,7 @@

- 		scrposr = Rect(scrollr.min.x, scrollr.min.y+y, scrollr.max.x-1, scrollr.min.y+y+h);

- 	}else

- 		scrposr = Rect(scrollr.min.x, scrollr.min.y, scrollr.max.x-1, scrollr.max.y);

--	draw(screen, scrposr, display->white, nil, ZP);

-+	draw(screen, scrposr, display->black, nil, ZP);

- 	for(i = 0; i<nlines && offset+i<ndirs; i++){

- 		drawdir(i, 0);

- 	}

--- a/vdir-pastelcol

+++ /dev/null

@@ -1,52 +1,0 @@

-diff 848a598df06df0557bfe37dd6711d8ed966a56b6 uncommitted

---- a/alert.c

-+++ b/alert.c

-@@ -38,8 +38,8 @@

- 	alts[2].v  = nil;

- 	while(nbrecv(kctl->c, nil)==1)

- 		;

--	bg = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0xf8d7daff);

--	fg = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0x721c24ff);

-+	bg = display->black;

-+	fg = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0x777777ff);

- 	tf = openfont(display, Titlefont);

- 	if(tf==nil)

- 		sysfatal("openfont: %r");

---- a/vdir.c

-+++ b/vdir.c

-@@ -224,12 +224,12 @@

- void

- initcolors(void)

- {

--	toolbg = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0xEFEFEFFF);

-+	toolbg = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0x555555FF);

- 	toolfg = display->black;

--	viewbg = display->white;

--	viewfg = display->black;

--	scrollbg = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0x999999FF);

--	scrollfg = display->white;

-+	viewbg = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0x111111FF);

-+	viewfg = allocimage(display, Rect(0,0,1,1), screen->chan, 1, 0xAAAAAAFF);

-+	scrollbg = toolbg;

-+	scrollfg = toolfg;

- }

- 

- Image*

-@@ -352,7 +352,7 @@

- 	Point p;

- 	int i, h, y;

- 

--	draw(screen, screen->r, display->white, nil, ZP);

-+	draw(screen, screen->r, display->black, nil, ZP);

- 	p = addpt(screen->r.min, Pt(0, Toolpadding));

- 	draw(screen, toolr, toolbg, nil, ZP);

- 	line(screen, Pt(toolr.min.x, toolr.max.y), toolr.max, 0, 0, 0, toolfg, ZP);

-@@ -374,7 +374,7 @@

- 		scrposr = Rect(scrollr.min.x, scrollr.min.y+y, scrollr.max.x-1, scrollr.min.y+y+h);

- 	}else

- 		scrposr = Rect(scrollr.min.x, scrollr.min.y, scrollr.max.x-1, scrollr.max.y);

--	draw(screen, scrposr, display->white, nil, ZP);

-+	draw(screen, scrposr, display->black, nil, ZP);

- 	for(i = 0; i<nlines && offset+i<ndirs; i++){

- 		drawdir(i, 0);

- 	}