--- ray/src/px/x11image.c	1990/10/21 10:48:17	1.10
+++ ray/src/px/x11image.c	1991/04/19 14:59:14	1.15
@@ -30,6 +30,7 @@ static char SCCSid[] = "$SunId$ LBL";
 #include  "pic.h"
 #include  "x11raster.h"
 #include  "random.h"
+#include  "x11icon.h"
 
 #define  FONTNAME	"8x13"		/* text font we'll use */
 
@@ -77,6 +78,8 @@ int  cury = 0;				/* current scan location */
 
 double  exposure = 1.0;			/* exposure compensation used */
 
+int  wrongformat = 0;			/* input in another format? */
+
 GC	revgc;				/* graphics context with GXinvert */
 
 XRASTER	*ourras;			/* our stored image */
@@ -156,10 +159,10 @@ char  *argv[];
 	} else if (i != argc)
 		goto userr;
 				/* get header */
-	getheader(fin, headline);
+	getheader(fin, headline, NULL);
 				/* get picture dimensions */
-	if (fgetresolu(&xmax, &ymax, fin) != (YMAJOR|YDECR))
-		quiterr("bad picture size");
+	if (wrongformat || fgetresolu(&xmax, &ymax, fin) != (YMAJOR|YDECR))
+		quiterr("bad picture format");
 				/* set view parameters */
 	if (gotview && setview(&ourview) != NULL)
 		gotview = 0;
@@ -183,10 +186,14 @@ char  *s;
 {
 	static char  *altname[] = {"rview","rpict","pinterp",VIEWSTR,NULL};
 	register char  **an;
+	char  fmt[32];
 
 	if (isexpos(s))
 		exposure *= exposval(s);
-	else
+	else if (isformat(s)) {
+		formatval(fmt, s);
+		wrongformat = strcmp(fmt, COLRFMT);
+	} else
 		for (an = altname; *an != NULL; an++)
 			if (!strncmp(*an, s, strlen(*an))) {
 				if (sscanview(&ourview, s+strlen(*an)) > 0)
@@ -198,6 +205,7 @@ char  *s;
 
 init()			/* get data and open window */
 {
+	XWMHints	ourxwmhints;
 	XSetWindowAttributes	ourwinattr;
 	XSizeHints  oursizhints;
 	register int  i;
@@ -240,7 +248,8 @@ init()			/* get data and open window */
 	if (geometry != NULL) {
 		bzero((char *)&oursizhints, sizeof(oursizhints));
 		i = XParseGeometry(geometry, &oursizhints.x, &oursizhints.y,
-				&oursizhints.width, &oursizhints.height);
+				(unsigned *)&oursizhints.width,
+				(unsigned *)&oursizhints.height);
 		if ((i&(WidthValue|HeightValue)) == (WidthValue|HeightValue))
 			oursizhints.flags |= USSize;
 		else {
@@ -259,6 +268,11 @@ init()			/* get data and open window */
 		}
 		XSetNormalHints(thedisplay, wind, &oursizhints);
 	}
+	ourxwmhints.flags = InputHint|IconPixmapHint;
+	ourxwmhints.input = True;
+	ourxwmhints.icon_pixmap = XCreateBitmapFromData(thedisplay,
+			wind, x11icon_bits, x11icon_width, x11icon_height);
+	XSetWMHints(thedisplay, wind, &ourxwmhints);
 	XSelectInput(thedisplay, wind, ButtonPressMask|ButtonReleaseMask
 			|ButtonMotionMask|StructureNotifyMask
 			|KeyPressMask|ExposureMask);
@@ -410,7 +424,7 @@ XKeyPressedEvent  *ekey;
 			sprintf(buf, "%.3f", intens(cval)/exposure);
 			break;
 		case 'l':				/* luminance */
-			sprintf(buf, "%.0fn", bright(cval)*683.0/exposure);
+			sprintf(buf, "%.0fn", luminance(cval)/exposure);
 			break;
 		case 'c':				/* color */
 			comp = pow(2.0, (double)scale);
@@ -734,7 +748,7 @@ colormap  map;
 	register int  i, val;
 
 	for (i = 0; i < 256; i++) {
-		val = pow(i/256.0, 1.0/gamcor) * 256.0;
+		val = pow((i+0.5)/256.0, 1.0/gamcor) * 256.0;
 		map[0][i] = map[1][i] = map[2][i] = val;
 	}
 }