--- ray/src/px/x11image.c	1992/05/28 09:43:09	2.7
+++ ray/src/px/x11image.c	1992/09/15 12:15:48	2.12
@@ -1,4 +1,4 @@
-/* Copyright (c) 1991 Regents of the University of California */
+/* Copyright (c) 1992 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -41,8 +41,6 @@ static char SCCSid[] = "$SunId$ LBL";
 #define  ICONSIZ	(8*10)		/* maximum icon dimension (even 8) */
 
 #define  ourscreen	DefaultScreen(thedisplay)
-#define  ourblack	BlackPixel(thedisplay,ourscreen)
-#define  ourwhite	WhitePixel(thedisplay,ourscreen)
 #define  ourroot	RootWindow(thedisplay,ourscreen)
 
 #define  revline(x0,y0,x1,y1)	XDrawLine(thedisplay,wind,revgc,x0,y0,x1,y1)
@@ -57,6 +55,7 @@ int  fast = 0;				/* keep picture in Pixmap? */
 char	*dispname = NULL;		/* our display name */
 
 Window  wind = 0;			/* our output window */
+unsigned long  ourblack=0, ourwhite=1;	/* black and white for this visual */
 Font  fontid;				/* our font */
 
 int  maxcolors = 0;			/* maximum colors */
@@ -117,10 +116,14 @@ main(argc, argv)
 int  argc;
 char  *argv[];
 {
+	extern char  *getenv();
+	char  *gv;
 	int  headline();
 	int  i;
 	
 	progname = argv[0];
+	if ((gv = getenv("GAMMA")) != NULL)
+		gamcor = atof(gv);
 
 	for (i = 1; i < argc; i++)
 		if (argv[i][0] == '-')
@@ -241,11 +244,11 @@ init()			/* get data and open window */
 			CWBackPixel|CWBorderPixel|CWColormap, &ourwinattr);
 	if (wind == 0)
 		quiterr("cannot create window");
+	XFreeColormap(thedisplay, ourwinattr.colormap);
 	width = xmax;
 	height = ymax;
 	ourgc = XCreateGC(thedisplay, wind, 0, 0);
-	XSetState(thedisplay, ourgc, BlackPixel(thedisplay,ourscreen),
-			WhitePixel(thedisplay,ourscreen), GXcopy, AllPlanes);
+	XSetState(thedisplay, ourgc, ourblack, ourwhite, GXcopy, AllPlanes);
 	revgc = XCreateGC(thedisplay, wind, 0, 0);
 	XSetFunction(thedisplay, revgc, GXinvert);
 	fontid = XLoadFont(thedisplay, FONTNAME);
@@ -416,12 +419,27 @@ static char  vistype[][12] = {
 	fprintf(stderr, "Selected visual type %s, depth %d\n",
 			vistype[ourvis.class], ourvis.depth);
 #endif
+					/* make appropriate adjustments */
 	if (ourvis.class == GrayScale || ourvis.class == StaticGray)
 		greyscale = 1;
 	if (ourvis.depth <= 8 && ourvis.colormap_size < maxcolors)
 		maxcolors = ourvis.colormap_size;
 	if (maxcolors > 4)
 		maxcolors -= 2;
+	if (ourvis.class == StaticGray) {
+		ourblack = 0;
+		ourwhite = 255;
+	} else if (ourvis.class == PseudoColor) {
+		ourblack = BlackPixel(thedisplay,ourscreen);
+		ourwhite = WhitePixel(thedisplay,ourscreen);
+		if ((ourblack|ourwhite) & ~255L) {
+			ourblack = 0;
+			ourwhite = 1;
+		}
+	} else {
+		ourblack = 0;
+		ourwhite = ourvis.red_mask|ourvis.green_mask|ourvis.blue_mask;
+	}
 	XFree((char *)xvi);
 }
 
@@ -613,7 +631,7 @@ XKeyPressedEvent  *ekey;
 		XClearWindow(thedisplay, wind);
 		map_rcolors(ourras, wind);
 		if (fast)
-			make_rpixmap(ourras);
+			make_rpixmap(ourras, wind);
 		redraw(0, 0, width, height);
 		return(0);
 	case ' ':				/* clear */
@@ -921,7 +939,7 @@ int  y;
 		if (fseek(fin, scanpos[y], 0) == -1)
 			quiterr("fseek error");
 		cury = y;
-	} else if (scanpos != NULL)
+	} else if (scanpos != NULL && scanpos[y] == -1)
 		scanpos[y] = ftell(fin);
 
 	if (freadcolrs(scanline, xmax, fin) < 0)