--- ray/src/px/ximage.c	1989/10/03 09:11:43	1.11
+++ ray/src/px/ximage.c	1989/11/29 16:50:39	1.15
@@ -29,6 +29,8 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #include  "pic.h"
 
+#include  "random.h"
+
 #define  controlshift(e)	(((XButtonEvent *)(e))->detail & (ShiftMask|ControlMask))
 
 #define  FONTNAME	"9x15"		/* text font we'll use */
@@ -144,10 +146,12 @@ char  *argv[];
 	if (fgetresolu(&xmax, &ymax, fin) != (YMAJOR|YDECR))
 		quiterr("bad picture size");
 				/* set view parameters */
-	if (gotview)
+	if (gotview) {
+		ourview.hresolu = xmax;
+		ourview.vresolu = ymax;
 		if (setview(&ourview) != NULL)
 			gotview = 0;
-
+	}
 	if ((scanline = (COLR *)malloc(xmax*sizeof(COLR))) == NULL)
 		quiterr("out of memory");
 
@@ -358,6 +362,7 @@ XKeyEvent  *ekey;
 {
 	char  buf[80];
 	COLOR  cval;
+	Color  cvx;
 	char  *cp;
 	int  n;
 	double  comp;
@@ -368,7 +373,7 @@ XKeyEvent  *ekey;
 		return(0);
 	switch (*cp) {			/* interpret command */
 	case 'q':
-	case CTRL(D):				/* quiterr */
+	case CTRL(D):				/* quit */
 		quit(0);
 	case '\n':
 	case '\r':
@@ -395,6 +400,17 @@ XKeyEvent  *ekey;
 		XText(wind, box.xmin, box.ymin, buf, strlen(buf),
 				fontid, BlackPixel, WhitePixel);
 		return(0);
+	case 'i':				/* identify (contour) */
+		if (ourras->ncolors == 0)
+			return(-1);
+		n = ourras->data.bz[ekey->x-xoff+BZPixmapSize(xmax,ekey->y-yoff)];
+		n = ourras->pmap[n];
+		cvx.pixel = ourras->cdefs[n].pixel;
+		cvx.red = random() & 65535;
+		cvx.green = random() & 65535;
+		cvx.blue = random() & 65535;
+		XStoreColor(&cvx);
+		return(0);
 	case 'p':				/* position */
 		sprintf(buf, "(%d,%d)", ekey->x-xoff, ymax-1-ekey->y+yoff);
 		XText(wind, ekey->x, ekey->y, buf, strlen(buf),
@@ -429,6 +445,7 @@ XKeyEvent  *ekey;
 	case CTRL(R):				/* redraw */
 	case CTRL(L):
 		XClear(wind);
+		XStoreColors(ourras->ncolors, ourras->cdefs);
 		return(redraw(0, 0, width, height));
 	case ' ':				/* clear */
 		return(redraw(box.xmin, box.ymin, box.xsiz, box.ysiz));
@@ -646,35 +663,20 @@ picreadline3(y, l3)			/* read in 3-byte scanline */
 int  y;
 register rgbpixel  *l3;
 {
-	register BYTE	*l4;
-	register int	shift, c;
-	int	i;
-
+	register int	i;
+							/* read scanline */
 	if (getscan(y) < 0)
 		quiterr("cannot seek for picreadline");
 							/* convert scanline */
-	for (l4=scanline[0], i=xmax; i--; l4+=4, l3++) {
-		shift = l4[EXP] - COLXS + scale;
-		if (shift >= 8) {
-			l3->r = l3->g = l3->b = 255;
-		} else if (shift <= -8) {
-			l3->r = l3->g = l3->b = 0;
-		} else if (shift > 0) {
-			c = l4[RED] << shift;
-			l3->r = c > 255 ? 255 : c;
-			c = l4[GRN] << shift;
-			l3->g = c > 255 ? 255 : c;
-			c = l4[BLU] << shift;
-			l3->b = c > 255 ? 255 : c;
-		} else if (shift < 0) {
-			l3->r = l4[RED] >> -shift;
-			l3->g = l4[GRN] >> -shift;
-			l3->b = l4[BLU] >> -shift;
-		} else {
-			l3->r = l4[RED];
-			l3->g = l4[GRN];
-			l3->b = l4[BLU];
-		}
+	if (scale != 0)
+		for (i = 0; i < xmax; i++)
+			if (scanline[i][EXP]+scale >= 0)
+				scanline[i][EXP] += scale;
+	normcolrs(scanline, xmax);
+	for (i = 0; i < xmax; i++) {
+		l3[i].r = scanline[i][RED];
+		l3[i].g = scanline[i][GRN];
+		l3[i].b = scanline[i][BLU];
 	}
 }