--- ray/src/px/x11image.c	1993/10/28 11:39:59	2.32
+++ ray/src/px/x11image.c	2003/02/22 02:07:28	2.56
@@ -1,9 +1,6 @@
-/* Copyright (c) 1993 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: x11image.c,v 2.56 2003/02/22 02:07:28 greg Exp $";
 #endif
-
 /*
  *  x11image.c - driver for X-windows
  *
@@ -28,18 +25,11 @@ static char SCCSid[] = "$SunId$ LBL";
 #include  <X11/Xatom.h>
 
 #include  "color.h"
+#include  "tonemap.h"
 #include  "view.h"
 #include  "x11raster.h"
 #include  "random.h"
-#include  "resolu.h"
 
-#ifdef  __alpha
-#define  int4		int
-#endif
-#ifndef  int4
-#define  int4		long
-#endif
-
 #define  FONTNAME	"8x13"		/* text font we'll use */
 
 #define  CTRL(c)	((c)-'@')
@@ -48,6 +38,8 @@ static char SCCSid[] = "$SunId$ LBL";
 
 #define  ICONSIZ	(8*10)		/* maximum icon dimension (even 8) */
 
+#define  FIXWEIGHT	20		/* weight to add for fixation points */
+
 #define  ourscreen	DefaultScreen(thedisplay)
 #define  ourroot	RootWindow(thedisplay,ourscreen)
 
@@ -56,6 +48,7 @@ static char SCCSid[] = "$SunId$ LBL";
 #define  redraw(x,y,w,h) patch_raster(wind,(x)-xoff,(y)-yoff,x,y,w,h,ourras)
 
 double  gamcor = 2.2;			/* gamma correction */
+char  *gamstr = NULL;			/* gamma value override */
 
 int  dither = 1;			/* dither colors? */
 int  fast = 0;				/* keep picture in Pixmap? */
@@ -73,17 +66,26 @@ int  xoff = 0;				/* x image offset */
 int  yoff = 0;				/* y image offset */
 
 int  parent = 0;			/* number of children, -1 if child */
+int  sequential = 0;			/* display images in sequence */
 
+char  *tout = "od";			/* output of 't' command */
+int  tinterv = 0;			/* interval between mouse reports */
+
+int  tmflags = TM_F_LINEAR;		/* tone mapping flags */
+
 VIEW  ourview = STDVIEW;		/* image view parameters */
 int  gotview = 0;			/* got parameters from file */
 
 COLR  *scanline;			/* scan line buffer */
+TMbright  *lscan;			/* encoded luminance scanline */
+BYTE  *cscan;				/* encoded chroma scanline */
+BYTE  *pscan;				/* compute pixel scanline */
 
 RESOLU  inpres;				/* input resolution and ordering */
 int  xmax, ymax;			/* picture dimensions */
 int  width, height;			/* window size */
 char  *fname = NULL;			/* input file name */
-FILE  *fin = stdin;			/* input file */
+FILE  *fin = NULL;			/* input file */
 long  *scanpos = NULL;			/* scan line positions in file */
 int  cury = 0;				/* current scan location */
 
@@ -101,7 +103,7 @@ unsigned char	*ourdata;		/* our image data */
 
 struct {
 	int  xmin, ymin, xsiz, ysiz;
-}  box = {0, 0, 0, 0};			/* current box */
+}  bbox = {0, 0, 0, 0};			/* current bbox */
 
 char  *geometry = NULL;			/* geometry specification */
 
@@ -112,10 +114,12 @@ char  *progname;
 
 char  errmsg[128];
 
-extern BYTE  clrtab[256][3];		/* global color map */
+BYTE  clrtab[256][3];			/* global color map */
 
 extern long  ftell();
 
+extern char  *getenv();
+
 Display  *thedisplay;
 Atom  closedownAtom, wmProtocolsAtom;
 
@@ -128,47 +132,63 @@ main(argc, argv)
 int  argc;
 char  *argv[];
 {
-	extern char  *getenv();
-	char  *gv;
 	int  headline();
 	int  i;
 	int  pid;
 	
 	progname = argv[0];
-	if ((gv = getenv("GAMMA")) != NULL)
-		gamcor = atof(gv);
+	fin = stdin;
 
 	for (i = 1; i < argc; i++)
 		if (argv[i][0] == '-')
 			switch (argv[i][1]) {
-			case 'c':
+			case 'c':			/* number of colors */
 				maxcolors = atoi(argv[++i]);
 				break;
-			case 'b':
+			case 'b':			/* greyscale only */
 				greyscale = !greyscale;
 				break;
-			case 'm':
+			case 'm':			/* monochrome */
+				greyscale = 1;
 				maxcolors = 2;
 				break;
-			case 'd':
+			case 'd':			/* display or dither */
 				if (argv[i][2] == 'i')
 					dispname = argv[++i];
 				else
 					dither = !dither;
 				break;
-			case 'f':
+			case 'f':			/* save pixmap */
 				fast = !fast;
 				break;
-			case 'e':
-				if (argv[i+1][0] != '+' && argv[i+1][0] != '-')
+			case 's':			/* one at a time */
+				sequential = !sequential;
+				break;
+			case 'o':			/* 't' output */
+				tout = argv[i]+2;
+				break;
+			case 't':			/* msec interval */
+				tinterv = atoi(argv[++i]);
+				break;
+			case 'e':			/* exposure comp. */
+				i++;
+				if (argv[i][0] == 'a') {
+					tmflags = TM_F_CAMERA;
+					break;
+				}
+				if (argv[i][0] == 'h') {
+					tmflags = TM_F_HUMAN;
+					break;
+				}
+				if (argv[i][0] != '+' && argv[i][0] != '-')
 					goto userr;
-				scale = atoi(argv[++i]);
+				scale = atoi(argv[i]);
 				break;
-			case 'g':
+			case 'g':			/* gamma comp. */
 				if (argv[i][2] == 'e')
 					geometry = argv[++i];
 				else
-					gamcor = atof(argv[++i]);
+					gamstr = argv[++i];
 				break;
 			default:
 				goto userr;
@@ -197,10 +217,8 @@ char  *argv[];
 	if (i < argc) {			/* open picture file */
 		fname = argv[i];
 		fin = fopen(fname, "r");
-		if (fin == NULL) {
-			sprintf(errmsg, "cannot open file \"%s\"", fname);
-			quiterr(errmsg);
-		}
+		if (fin == NULL)
+			quiterr("cannot open picture file");
 	}
 				/* get header */
 	getheader(fin, headline, NULL);
@@ -217,20 +235,17 @@ char  *argv[];
 
 	init(argc, argv);			/* get file and open window */
 
-	if (parent < 0) {
-		kill(getppid(), SIGCONT);	/* signal parent if child */
-		sigrecv--;
-	}
 	for ( ; ; )
 		getevent();		/* main loop */
 userr:
 	fprintf(stderr,
-"Usage: %s [-di disp][[-ge] spec][-b][-m][-d][-f][-c nclrs][-e +/-stops] pic ..\n",
+"Usage: %s [-di disp][[-ge] spec][-b][-m][-d][-f][-c nclrs][-e spec][-g gamcor][-s][-ospec][-t intvl] pic ..\n",
 			progname);
 	exit(1);
 }
 
 
+int
 headline(s)		/* get relevant info from header */
 char  *s;
 {
@@ -238,11 +253,11 @@ char  *s;
 
 	if (isexpos(s))
 		exposure *= exposval(s);
-	else if (isformat(s)) {
-		formatval(fmt, s);
+	else if (formatval(fmt, s))
 		wrongformat = strcmp(fmt, COLRFMT);
-	} else if (isview(s) && sscanview(&ourview, s) > 0)
+	else if (isview(s) && sscanview(&ourview, s) > 0)
 		gotview++;
+	return(0);
 }
 
 
@@ -275,6 +290,13 @@ char **argv;
 	name += i+1;
 	if ((thedisplay = XOpenDisplay(dispname)) == NULL)
 		quiterr("cannot open display");
+				/* set gamma value */
+	if (gamstr == NULL)		/* get it from the X server */
+		gamstr = XGetDefault(thedisplay, "radiance", "gamma");
+	if (gamstr == NULL)		/* get it from the environment */
+		gamstr = getenv("DISPLAY_GAMMA");
+	if (gamstr != NULL)
+		gamcor = atof(gamstr);
 				/* get best visual for default screen */
 	getbestvis();
 				/* store image */
@@ -301,17 +323,20 @@ char **argv;
 		}
 	}
 	/* open window */
+	i = CWEventMask|CWCursor|CWBackPixel|CWBorderPixel;
 	ourwinattr.border_pixel = ourwhite;
 	ourwinattr.background_pixel = ourblack;
-	ourwinattr.colormap = XCreateColormap(thedisplay, ourroot,
-			ourvis.visual, AllocNone);
+	if (ourvis.visual != DefaultVisual(thedisplay,ourscreen)) {
+		ourwinattr.colormap = newcmap(thedisplay, ourscreen, ourvis.visual);
+		i |= CWColormap;
+	}
 	ourwinattr.event_mask = ExposureMask|KeyPressMask|ButtonPressMask|
 			ButtonReleaseMask|ButtonMotionMask|StructureNotifyMask;
 	ourwinattr.cursor = XCreateFontCursor(thedisplay, XC_diamond_cross);
 	wind = XCreateWindow(thedisplay, ourroot, xszhints.x, xszhints.y,
 			xszhints.width, xszhints.height, BORWIDTH,
-			ourvis.depth, InputOutput, ourvis.visual, CWEventMask|
-			CWCursor|CWBackPixel|CWBorderPixel|CWColormap, &ourwinattr);
+			ourvis.depth, InputOutput, ourvis.visual,
+			i, &ourwinattr);
 	if (wind == 0)
 		quiterr("cannot create window");
 	width = xmax;
@@ -349,7 +374,6 @@ char **argv;
 	XSetWMProtocols(thedisplay, wind, &closedownAtom, 1);
 
 	XMapWindow(thedisplay, wind);
-	return;
 } /* end of init */
 
 
@@ -362,10 +386,9 @@ char  *err;
 	if (es = err != NULL)
 		fprintf(stderr, "%s: %s: %s\n", progname, 
 				fname==NULL?"<stdin>":fname, err);
-	if (parent > 0 & wind != 0) {
-		XDestroyWindow(thedisplay, wind);
-		XFlush(thedisplay);
-	} else if (parent < 0 & sigrecv == 0)
+	if (thedisplay != NULL)
+		XCloseDisplay(thedisplay);
+	if (parent < 0 & sigrecv == 0)
 		kill(getppid(), SIGCONT);
 	while (parent > 0 && wait(&cs) != -1) {	/* wait for any children */
 		if (es == 0)
@@ -390,19 +413,20 @@ register XVisualInfo	*v1, *v2;
 				return(-1);
 			if (v1->depth == 32 && v2->depth == 24)
 				return(1);
-			return(0);
+					/* go for maximum depth otherwise */
+			return(v2->depth - v1->depth);
 		}
 					/* don't be too greedy */
 		if (maxcolors <= 1<<v1->depth && maxcolors <= 1<<v2->depth)
 			return(v1->depth - v2->depth);
 		return(v2->depth - v1->depth);
 	}
-					/* prefer Pseudo when < 24-bit */
+					/* prefer Pseudo when < 15-bit */
 	if ((v1->class == TrueColor || v1->class == DirectColor) &&
-			v1->depth < 24)
+			v1->depth < 15)
 		bad1 = 1;
 	if ((v2->class == TrueColor || v2->class == DirectColor) &&
-			v2->depth < 24)
+			v2->depth < 15)
 		bad2 = -1;
 	if (bad1 | bad2)
 		return(bad1+bad2);
@@ -513,11 +537,12 @@ getras()				/* get raster file */
 			goto fail;
 		getmono();
 	} else if (ourvis.class == TrueColor | ourvis.class == DirectColor) {
-		ourdata = (unsigned char *)malloc(sizeof(int4)*xmax*ymax);
+		int  datsiz = ourvis.depth>16 ? sizeof(int4) : sizeof(int2);
+		ourdata = (unsigned char *)malloc(datsiz*xmax*ymax);
 		if (ourdata == NULL)
 			goto fail;
-		ourras = make_raster(thedisplay, &ourvis, sizeof(int4)*8,
-				ourdata, xmax, ymax, 32);
+		ourras = make_raster(thedisplay, &ourvis, datsiz*8,
+				ourdata, xmax, ymax, datsiz*8);
 		if (ourras == NULL)
 			goto fail;
 		getfull();
@@ -529,7 +554,7 @@ getras()				/* get raster file */
 				xmax, ymax, 8);
 		if (ourras == NULL)
 			goto fail;
-		if (greyscale | ourvis.class == StaticGray)
+		if (greyscale)
 			getgrey();
 		else
 			getmapped();
@@ -559,6 +584,10 @@ getevent()				/* process the next event */
 		map_rcolors(ourras, wind);
 		if (fast)
 			make_rpixmap(ourras, wind);
+		if (!sequential & parent < 0 & sigrecv == 0) {
+			kill(getppid(), SIGCONT);
+			sigrecv--;
+		}
 		break;
 	case UnmapNotify:
 		if (!fast)
@@ -571,10 +600,18 @@ getevent()				/* process the next event */
 	case ButtonPress:
 		if (xev.xbutton.state & (ShiftMask|ControlMask))
 			moveimage(&xev.xbutton);
-		else if (xev.xbutton.button == Button2)
-			traceray(xev.xbutton.x, xev.xbutton.y);
 		else
-			getbox(&xev.xbutton);
+			switch (xev.xbutton.button) {
+			case Button1:
+				getbox(&xev.xbutton);
+				break;
+			case Button2:
+				traceray(xev.xbutton.x, xev.xbutton.y);
+				break;
+			case Button3:
+				trackrays(&xev.xbutton);
+				break;
+			}
 		break;
 	case ClientMessage:
 		if ((xev.xclient.message_type == wmProtocolsAtom) &&
@@ -585,21 +622,45 @@ getevent()				/* process the next event */
 }
 
 
-traceray(xpos, ypos)			/* print ray corresponding to pixel */
+traceray(xpos, ypos)			/* print requested pixel data */
 int  xpos, ypos;
 {
+	extern char  *index();
 	FLOAT  hv[2];
 	FVECT  rorg, rdir;
+	COLOR  cval;
+	register char  *cp;
 
-	if (!gotview) {		/* no view, no can do */
-		XBell(thedisplay, 0);
-		return(-1);
-	}
+	bbox.xmin = xpos; bbox.xsiz = 1;
+	bbox.ymin = ypos; bbox.ysiz = 1;
+	avgbox(cval);
+	scalecolor(cval, 1./exposure);
 	pix2loc(hv, &inpres, xpos-xoff, ypos-yoff);
-	if (viewray(rorg, rdir, &ourview, hv[0], hv[1]) < 0)
-		return(-1);
-	printf("%e %e %e ", rorg[0], rorg[1], rorg[2]);
-	printf("%e %e %e\n", rdir[0], rdir[1], rdir[2]);
+	if (!gotview || viewray(rorg, rdir, &ourview, hv[0], hv[1]) < 0)
+		rorg[0] = rorg[1] = rorg[2] =
+		rdir[0] = rdir[1] = rdir[2] = 0.;
+
+	for (cp = tout; *cp; cp++)	/* print what they asked for */
+		switch (*cp) {
+		case 'o':			/* origin */
+			printf("%e %e %e ", rorg[0], rorg[1], rorg[2]);
+			break;
+		case 'd':			/* direction */
+			printf("%e %e %e ", rdir[0], rdir[1], rdir[2]);
+			break;
+		case 'v':			/* radiance value */
+			printf("%e %e %e ", colval(cval,RED),
+					colval(cval,GRN), colval(cval,BLU));
+			break;
+		case 'l':			/* luminance */
+			printf("%e ", luminance(cval));
+			break;
+		case 'p':			/* pixel position */
+			printf("%d %d ", (int)(hv[0]*inpres.xr),
+					(int)(hv[1]*inpres.yr));
+			break;
+		}
+	putchar('\n');
 	fflush(stdout);
 	return(0);
 }
@@ -628,7 +689,7 @@ XKeyPressedEvent  *ekey;
 	case '\r':
 	case 'l':
 	case 'c':				/* value */
-		if (avgbox(cval) == -1)
+		if (!avgbox(cval))
 			return(-1);
 		switch (com) {
 		case '\n':
@@ -636,7 +697,7 @@ XKeyPressedEvent  *ekey;
 			sprintf(buf, "%.3f", intens(cval)/exposure);
 			break;
 		case 'l':				/* luminance */
-			sprintf(buf, "%.0fL", luminance(cval)/exposure);
+			sprintf(buf, "%.1fL", luminance(cval)/exposure);
 			break;
 		case 'c':				/* color */
 			comp = pow(2.0, (double)scale);
@@ -647,7 +708,7 @@ XKeyPressedEvent  *ekey;
 			break;
 		}
 		XDrawImageString(thedisplay, wind, ourgc,
-				box.xmin, box.ymin+box.ysiz, buf, strlen(buf)); 
+				bbox.xmin, bbox.ymin+bbox.ysiz, buf, strlen(buf)); 
 		return(0);
 	case 'i':				/* identify (contour) */
 		if (ourras->pixels == NULL)
@@ -670,24 +731,48 @@ XKeyPressedEvent  *ekey;
 		return(0);
 	case 't':				/* trace */
 		return(traceray(ekey->x, ekey->y));
+	case 'a':				/* auto exposure */
+		if (fname == NULL)
+			return(-1);
+		tmflags = TM_F_CAMERA;
+		strcpy(buf, "auto exposure...");
+		goto remap;
+	case 'h':				/* human response */
+		if (fname == NULL)
+			return(-1);
+		tmflags = TM_F_HUMAN;
+		strcpy(buf, "human exposure...");
+		goto remap;
 	case '=':				/* adjust exposure */
 	case '@':				/* adaptation level */
-		if (avgbox(cval) == -1)
+		if (!avgbox(cval))
 			return(-1);
-		comp = com=='@'
-		? 106./pow(1.219+pow(luminance(cval)/exposure,.4),2.5)/exposure
-		: .5/bright(cval) ;
+		comp = bright(cval);
+		if (comp < 1e-20) {
+			XBell(thedisplay, 0);
+			return(-1);
+		}
+		if (com == '@')
+			comp = 106./exposure/
+			pow(1.219+pow(comp*WHTEFFICACY/exposure,.4),2.5);
+		else
+			comp = .5/comp;
 		comp = log(comp)/.69315 - scale;
 		n = comp < 0 ? comp-.5 : comp+.5 ;	/* round */
-		if (n == 0)
-			return(0);
-		scale_rcolors(ourras, pow(2.0, (double)n));
+		if (tmflags != TM_F_LINEAR)
+			tmflags = TM_F_LINEAR;	/* turn off tone mapping */
+		else {
+			if (n == 0)		/* else check if any change */
+				return(0);
+			scale_rcolors(ourras, pow(2.0, (double)n));
+		}
 		scale += n;
 		sprintf(buf, "%+d", scale);
+	remap:
 		XDrawImageString(thedisplay, wind, ourgc,
-				box.xmin, box.ymin+box.ysiz, buf, strlen(buf));
+				bbox.xmin, bbox.ymin+bbox.ysiz, buf, strlen(buf));
 		XFlush(thedisplay);
-		free(ourdata);
+		/* free(ourdata); 	This is done in XDestroyImage()! */
 		free_raster(ourras);
 		getras();
 	/* fall through */
@@ -716,7 +801,7 @@ XKeyPressedEvent  *ekey;
 		redraw(0, 0, width, height);
 		return(0);
 	case ' ':				/* clear */
-		redraw(box.xmin, box.ymin, box.xsiz, box.ysiz);
+		redraw(bbox.xmin, bbox.ymin, bbox.xsiz, bbox.ysiz);
 		return(0);
 	default:
 		XBell(thedisplay, 0);
@@ -750,35 +835,54 @@ XButtonPressedEvent  *ebut;
 }
 
 
-getbox(ebut)				/* get new box */
+getbox(ebut)				/* get new bbox */
 XButtonPressedEvent  *ebut;
 {
 	XEvent	e;
 
 	XMaskEvent(thedisplay, ButtonReleaseMask|ButtonMotionMask, &e);
 	while (e.type == MotionNotify) {
-		revbox(ebut->x, ebut->y, box.xmin = e.xmotion.x, box.ymin = e.xmotion.y);
+		revbox(ebut->x, ebut->y, bbox.xmin = e.xmotion.x, bbox.ymin = e.xmotion.y);
 		XMaskEvent(thedisplay,ButtonReleaseMask|ButtonMotionMask,&e);
-		revbox(ebut->x, ebut->y, box.xmin, box.ymin);
+		revbox(ebut->x, ebut->y, bbox.xmin, bbox.ymin);
 	}
-	box.xmin = e.xbutton.x<0 ? 0 : (e.xbutton.x>=width ? width-1 : e.xbutton.x);
-	box.ymin = e.xbutton.y<0 ? 0 : (e.xbutton.y>=height ? height-1 : e.xbutton.y);
-	if (box.xmin > ebut->x) {
-		box.xsiz = box.xmin - ebut->x + 1;
-		box.xmin = ebut->x;
+	bbox.xmin = e.xbutton.x<0 ? 0 : (e.xbutton.x>=width ? width-1 : e.xbutton.x);
+	bbox.ymin = e.xbutton.y<0 ? 0 : (e.xbutton.y>=height ? height-1 : e.xbutton.y);
+	if (bbox.xmin > ebut->x) {
+		bbox.xsiz = bbox.xmin - ebut->x + 1;
+		bbox.xmin = ebut->x;
 	} else {
-		box.xsiz = ebut->x - box.xmin + 1;
+		bbox.xsiz = ebut->x - bbox.xmin + 1;
 	}
-	if (box.ymin > ebut->y) {
-		box.ysiz = box.ymin - ebut->y + 1;
-		box.ymin = ebut->y;
+	if (bbox.ymin > ebut->y) {
+		bbox.ysiz = bbox.ymin - ebut->y + 1;
+		bbox.ymin = ebut->y;
 	} else {
-		box.ysiz = ebut->y - box.ymin + 1;
+		bbox.ysiz = ebut->y - bbox.ymin + 1;
 	}
 }
 
 
-revbox(x0, y0, x1, y1)			/* draw box with reversed lines */
+trackrays(ebut)				/* trace rays as mouse moves */
+XButtonPressedEvent  *ebut;
+{
+	XEvent	e;
+	unsigned long	lastrept;
+
+	traceray(ebut->x, ebut->y);
+	lastrept = ebut->time;
+	XMaskEvent(thedisplay, ButtonReleaseMask|ButtonMotionMask, &e);
+	while (e.type == MotionNotify) {
+		if (e.xmotion.time >= lastrept + tinterv) {
+			traceray(e.xmotion.x, e.xmotion.y);
+			lastrept = e.xmotion.time;
+		}
+		XMaskEvent(thedisplay,ButtonReleaseMask|ButtonMotionMask,&e);
+	}
+}
+
+
+revbox(x0, y0, x1, y1)			/* draw bbox with reversed lines */
 int  x0, y0, x1, y1;
 {
 	revline(x0, y0, x1, y0);
@@ -788,54 +892,180 @@ int  x0, y0, x1, y1;
 }
 
 
-avgbox(clr)				/* average color over current box */
-COLOR  clr;
+int
+colavg(scn, n, cavg)
+register COLR	*scn;
+register int	n;
+COLOR	cavg;
 {
-	static COLOR  lc;
-	static int  ll, lr, lt, lb;
+	COLOR	col;
+
+	while (n--) {
+		colr_color(col, *scn++);
+		addcolor(cavg, col);
+	}
+}
+
+
+int
+avgbox(cavg)				/* average color over current bbox */
+COLOR	cavg;
+{
+	double	d;
+	register int	rval;
+
+	setcolor(cavg, 0., 0., 0.);
+	rval = dobox(colavg, (char *)cavg);
+	if (rval > 0) {
+		d = 1./rval;
+		scalecolor(cavg, d);
+	}
+	return(rval);
+}
+
+
+int
+dobox(f, p)				/* run function over bbox */
+int	(*f)();			/* function to call for each subscan */
+char	*p;			/* pointer to private data */
+{
 	int  left, right, top, bottom;
 	int  y;
-	double  d;
-	COLOR  ctmp;
-	register int  x;
 
-	setcolor(clr, 0.0, 0.0, 0.0);
-	left = box.xmin - xoff;
-	right = left + box.xsiz;
+	left = bbox.xmin - xoff;
+	right = left + bbox.xsiz;
 	if (left < 0)
 		left = 0;
 	if (right > xmax)
 		right = xmax;
 	if (left >= right)
-		return(-1);
-	top = box.ymin - yoff;
-	bottom = top + box.ysiz;
+		return(0);
+	top = bbox.ymin - yoff;
+	bottom = top + bbox.ysiz;
 	if (top < 0)
 		top = 0;
 	if (bottom > ymax)
 		bottom = ymax;
 	if (top >= bottom)
-		return(-1);
-	if (left == ll && right == lr && top == lt && bottom == lb) {
-		copycolor(clr, lc);
 		return(0);
-	}
 	for (y = top; y < bottom; y++) {
 		if (getscan(y) == -1)
 			return(-1);
-		for (x = left; x < right; x++) {
-			colr_color(ctmp, scanline[x]);
-			addcolor(clr, ctmp);
+		(*f)(scanline+left, right-left, p);
+	}
+	return((right-left)*(bottom-top));
+}
+
+
+int
+addfix(scn, n)			/* add fixation points to histogram */
+COLR	*scn;
+int	n;
+{
+	if (tmCvColrs(lscan, TM_NOCHROM, scn, n))
+		goto tmerr;
+	if (tmAddHisto(lscan, n, FIXWEIGHT))
+		goto tmerr;
+	return;
+tmerr:
+	quiterr("tone mapping error");
+}
+
+
+make_tonemap()			/* initialize tone mapping */
+{
+	int  flags, y;
+
+	if (tmflags != TM_F_LINEAR && fname == NULL) {
+		fprintf(stderr, "%s: cannot adjust tone of standard input\n",
+				progname);
+		tmflags = TM_F_LINEAR;
+	}
+	if (tmflags == TM_F_LINEAR) {	/* linear with clamping */
+		setcolrcor(pow, 1.0/gamcor);
+		return;
+	}
+	flags = tmflags;		/* histogram adjustment */
+	if (greyscale) flags |= TM_F_BW;
+	if (tmTop != NULL) {		/* reuse old histogram if one */
+		tmDone(tmTop);
+		tmTop->flags = flags;
+	} else {			/* else initialize */
+		if ((lscan = (TMbright *)malloc(xmax*sizeof(TMbright))) == NULL)
+			goto memerr;
+		if (greyscale) {
+			cscan = TM_NOCHROM;
+			if ((pscan = (BYTE *)malloc(sizeof(BYTE)*xmax)) == NULL)
+				goto memerr;
+		} else if ((pscan=cscan = (BYTE *)malloc(3*sizeof(BYTE)*xmax))
+				== NULL)
+			goto memerr;
+						/* initialize tm library */
+		if (tmInit(flags, stdprims, gamcor) == NULL)
+			goto memerr;
+		if (tmSetSpace(stdprims, WHTEFFICACY/exposure))
+			goto tmerr;
+						/* compute picture histogram */
+		for (y = 0; y < ymax; y++) {
+			getscan(y);
+			if (tmCvColrs(lscan, TM_NOCHROM, scanline, xmax))
+				goto tmerr;
+			if (tmAddHisto(lscan, xmax, 1))
+				goto tmerr;
 		}
 	}
-	d = 1.0/((right-left)*(bottom-top));
-	scalecolor(clr, d);
-	ll = left; lr = right; lt = top; lb = bottom;
-	copycolor(lc, clr);
-	return(0);
+	tmDup();			/* add fixations to duplicate map */
+	dobox(addfix, NULL);
+					/* (re)compute tone mapping */
+	if (tmComputeMapping(gamcor, 0., 0.))
+		goto tmerr;
+	return;
+memerr:
+	quiterr("out of memory in make_tonemap");
+tmerr:
+	quiterr("tone mapping error");
 }
 
 
+tmap_colrs(scn, len)		/* apply tone mapping to scanline */
+register COLR  *scn;
+int  len;
+{
+	register BYTE  *ps;
+
+	if (tmflags == TM_F_LINEAR) {
+		if (scale)
+			shiftcolrs(scn, len, scale);
+		colrs_gambs(scn, len);
+		return;
+	}
+	if (len > xmax)
+		quiterr("code error 1 in tmap_colrs");
+	if (tmCvColrs(lscan, cscan, scn, len))
+		goto tmerr;
+	if (tmMapPixels(pscan, lscan, cscan, len))
+		goto tmerr;
+	ps = pscan;
+	if (greyscale)
+		while (len--) {
+			scn[0][RED] = scn[0][GRN] = scn[0][BLU] = *ps++;
+			scn[0][EXP] = COLXS;
+			scn++;
+		}
+	else
+		while (len--) {
+			scn[0][RED] = *ps++;
+			scn[0][GRN] = *ps++;
+			scn[0][BLU] = *ps++;
+			scn[0][EXP] = COLXS;
+			scn++;
+		}
+	return;
+tmerr:
+	quiterr("tone mapping error");
+}
+
+
 getmono()			/* get monochrome data */
 {
 	register unsigned char	*dp;
@@ -864,7 +1094,7 @@ getmono()			/* get monochrome data */
 			cerr[x] = err + errp;
 		}
 	}
-	free((char *)cerr);
+	free((void *)cerr);
 }
 
 
@@ -907,7 +1137,7 @@ COLR  *scan;
 		errp = err;
 		ti = x*xmax/iconwidth;
 		copycolr(clr, scan[ti]);
-		normcolrs(clr, 1, scale);
+		normcolrs(&clr, 1, scale);
 		err += normbright(clr) + cerr[x];
 		if (err > 127)
 			err -= 255;
@@ -924,27 +1154,65 @@ getfull()			/* get full (24-bit) data */
 {
 	int	y;
 	register unsigned int4	*dp;
+	register unsigned int2	*dph;
 	register int	x;
-					/* set gamma correction */
-	setcolrgam(gamcor);
+					/* initialize tone mapping */
+	make_tonemap();
 					/* read and convert file */
 	dp = (unsigned int4 *)ourdata;
+	dph = (unsigned int2 *)ourdata;
 	for (y = 0; y < ymax; y++) {
 		getscan(y);
 		add2icon(y, scanline);
-		if (scale)
-			shiftcolrs(scanline, xmax, scale);
-		colrs_gambs(scanline, xmax);
-		if (ourras->image->blue_mask & 1)
+		tmap_colrs(scanline, xmax);
+		switch (ourras->image->blue_mask) {
+		case 0xff:		/* 24-bit RGB */
 			for (x = 0; x < xmax; x++)
-				*dp++ =	scanline[x][RED] << 16 |
-					scanline[x][GRN] << 8 |
-					scanline[x][BLU] ;
-		else
+				*dp++ =	(unsigned int4)scanline[x][RED] << 16 |
+					(unsigned int4)scanline[x][GRN] << 8 |
+					(unsigned int4)scanline[x][BLU] ;
+			break;
+		case 0xff0000:		/* 24-bit BGR */
 			for (x = 0; x < xmax; x++)
-				*dp++ =	scanline[x][RED] |
-					scanline[x][GRN] << 8 |
-					scanline[x][BLU] << 16 ;
+				*dp++ =	(unsigned int4)scanline[x][RED] |
+					(unsigned int4)scanline[x][GRN] << 8 |
+					(unsigned int4)scanline[x][BLU] << 16 ;
+			break;
+#if 0
+		case 0x1f:		/* 15-bit RGB */
+			for (x = 0; x < xmax; x++)
+				*dph++ =	(scanline[x][RED] << 7 & 0x7c00) |
+					(scanline[x][GRN] << 2 & 0x3e0) |
+					(unsigned)scanline[x][BLU] >> 3 ;
+			break;
+		case 0x7c00:		/* 15-bit BGR */
+			for (x = 0; x < xmax; x++)
+				*dph++ =	(unsigned)scanline[x][RED] >> 3 |
+					(scanline[x][GRN] << 2 & 0x3e0) |
+					(scanline[x][BLU] << 7 & 0x7c00) ;
+			break;
+#endif
+		default:		/* unknown */
+			if (ourvis.depth > 16)
+				for (x = 0; x < xmax; x++) {
+					*dp = ourras->image->red_mask &
+						ourras->image->red_mask*scanline[x][RED]/255;
+					*dp |= ourras->image->green_mask &
+						ourras->image->green_mask*scanline[x][GRN]/255;
+					*dp++ |= ourras->image->blue_mask &
+						ourras->image->blue_mask*scanline[x][BLU]/255;
+				}
+			else
+				for (x = 0; x < xmax; x++) {
+					*dph = ourras->image->red_mask &
+						ourras->image->red_mask*scanline[x][RED]/255;
+					*dph |= ourras->image->green_mask &
+						ourras->image->green_mask*scanline[x][GRN]/255;
+					*dph++ |= ourras->image->blue_mask &
+						ourras->image->blue_mask*scanline[x][BLU]/255;
+				}
+			break;
+		}
 	}
 }
 
@@ -954,21 +1222,17 @@ getgrey()			/* get greyscale data */
 	int	y;
 	register unsigned char	*dp;
 	register int	x;
-					/* set gamma correction */
-	setcolrgam(gamcor);
+					/* initialize tone mapping */
+	make_tonemap();
 					/* read and convert file */
 	dp = ourdata;
 	for (y = 0; y < ymax; y++) {
 		getscan(y);
 		add2icon(y, scanline);
-		if (scale)
-			shiftcolrs(scanline, xmax, scale);
-		for (x = 0; x < xmax; x++)
-			scanline[x][GRN] = normbright(scanline[x]);
-		colrs_gambs(scanline, xmax);
+		tmap_colrs(scanline, xmax);
 		if (maxcolors < 256)
 			for (x = 0; x < xmax; x++)
-				*dp++ =	((long)scanline[x][GRN] *
+				*dp++ =	((int4)scanline[x][GRN] *
 					maxcolors + maxcolors/2) >> 8;
 		else
 			for (x = 0; x < xmax; x++)
@@ -976,7 +1240,7 @@ getgrey()			/* get greyscale data */
 	}
 	for (x = 0; x < maxcolors; x++)
 		clrtab[x][RED] = clrtab[x][GRN] =
-			clrtab[x][BLU] = ((long)x*256 + 128)/maxcolors;
+			clrtab[x][BLU] = ((int4)x*256 + 128)/maxcolors;
 }
 
 
@@ -986,17 +1250,16 @@ getmapped()			/* get color-mapped data */
 					/* make sure we can do it first */
 	if (fname == NULL)
 		quiterr("cannot map colors from standard input");
-					/* set gamma correction */
-	setcolrgam(gamcor);
+					/* initialize tone mapping */
+	make_tonemap();
 					/* make histogram */
-	new_histo();
+	if (new_histo((int4)xmax*ymax) == -1)
+		quiterr("cannot initialize histogram");
 	for (y = 0; y < ymax; y++) {
 		if (getscan(y) < 0)
 			break;
 		add2icon(y, scanline);
-		if (scale)
-			shiftcolrs(scanline, xmax, scale);
-		colrs_gambs(scanline, xmax);
+		tmap_colrs(scanline, xmax);
 		cnt_colrs(scanline, xmax);
 	}
 					/* map pixels */
@@ -1004,9 +1267,7 @@ getmapped()			/* get color-mapped data */
 		quiterr("cannot create color map");
 	for (y = 0; y < ymax; y++) {
 		getscan(y);
-		if (scale)
-			shiftcolrs(scanline, xmax, scale);
-		colrs_gambs(scanline, xmax);
+		tmap_colrs(scanline, xmax);
 		if (dither)
 			dith_colrs(ourdata+y*xmax, scanline, xmax);
 		else