shithub: riscv

Info  •  Files  •  Log  •  Branches

rio: undo previous commit, was a stupid idea

--- a/sys/src/cmd/rio/dat.h

+++ b/sys/src/cmd/rio/dat.h

@@ -325,7 +325,6 @@

 Image	*paleholdcol;

 Image	*paletextcol;

 Image	*sizecol;

-Image	*badsizecol;

 int	reverse;	/* there are no pastel paints in the dungeons and dragons world -- rob pike */

 Window	**window;

--- a/sys/src/cmd/rio/data.c

+++ b/sys/src/cmd/rio/data.c

@@ -196,7 +196,6 @@

 	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);

-	badsizecol = allocimage(display, Rect(0,0,1,1), CMAP8, 1, 0x880000FF);

 	if(reverse == 0)

 		holdcol = dholdcol;

--- a/sys/src/cmd/rio/rio.c

+++ b/sys/src/cmd/rio/rio.c

@@ -826,7 +826,7 @@

 				if(i == nil)

 					goto Rescue;

 				oi = i;

-				border(i, r, Selborder, goodrect(r)?sizecol:badsizecol, ZP);

+				border(i, r, Selborder, sizecol, ZP);

 				draw(i, insetrect(r, Selborder), cols[BACK], nil, ZP);

 			}

 		}

@@ -947,8 +947,8 @@

 			riosetcursor(corners[which]);

 		}

 		r = whichrect(or, p, owhich);

-		if(!eqrect(r, or)){

-			drawborder(r, goodrect(r)?sizecol:badsizecol);

+		if(!eqrect(r, or) && goodrect(r)){

+			drawborder(r, sizecol);

 			or = r;

 		}

 		readmouse(mousectl);