ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/px/x11image.c

Comparing ray/src/px/x11image.c (file contents):
Revision 2.13 by greg, Mon Oct 12 12:59:22 1992 UTC vs.
Revision 2.22 by greg, Tue Mar 2 10:54:08 1993 UTC

#	Line 109 | Line 109 | extern long  ftell();
109
110		extern char  *malloc(), *calloc();
111
112	–	extern double  pow(), log();
113	–
112		Display  *thedisplay;
113
114	+
115		main(argc, argv)
116		int  argc;
117		char  *argv[];
#	Line 194 | Line 193 | char  *argv[];
193		getevent();             /* main loop */
194		userr:
195		fprintf(stderr,
196	<	"Usage: %s [-display disp][-geometry spec][-b][-m][-d][-f][-c ncolors][-e +/-stops] file\n",
196	>	"Usage: %s [-di disp][[-ge] spec][-b][-m][-d][-f][-c nclrs][-e +/-stops] pic\n",
197		progname);
198	<	quit(1);
198	>	exit(1);
199		}
200
201
#	Line 235 | Line 234 | init()                 /* get data and open window */
234		getbestvis();
235		/* store image */
236		getras();
237	+	/* get size and position */
238	+	bzero((char *)&oursizhints, sizeof(oursizhints));
239	+	oursizhints.width = xmax; oursizhints.height = ymax;
240	+	if (geometry != NULL) {
241	+	i = XParseGeometry(geometry, &oursizhints.x, &oursizhints.y,
242	+	(unsigned *)&oursizhints.width,
243	+	(unsigned *)&oursizhints.height);
244	+	if ((i&(WidthValue|HeightValue)) == (WidthValue|HeightValue))
245	+	oursizhints.flags |= USSize;
246	+	else
247	+	oursizhints.flags |= PSize;
248	+	if ((i&(XValue|YValue)) == (XValue|YValue)) {
249	+	oursizhints.flags |= USPosition;
250	+	if (i & XNegative)
251	+	oursizhints.x += DisplayWidth(thedisplay,
252	+	ourscreen)-1-oursizhints.width-2*BORWIDTH;
253	+	if (i & YNegative)
254	+	oursizhints.y += DisplayHeight(thedisplay,
255	+	ourscreen)-1-oursizhints.height-2*BORWIDTH;
256	+	}
257	+	}
258		/* open window */
259		ourwinattr.border_pixel = ourblack;
260		ourwinattr.background_pixel = ourwhite;
261		ourwinattr.colormap = XCreateColormap(thedisplay, ourroot,
262		ourvis.visual, AllocNone);
263	<	wind = XCreateWindow(thedisplay, ourroot, 0, 0, xmax, ymax, BORWIDTH,
263	>	wind = XCreateWindow(thedisplay, ourroot, oursizhints.x, oursizhints.y,
264	>	oursizhints.width, oursizhints.height, BORWIDTH,
265		ourvis.depth, InputOutput, ourvis.visual,
266		CWBackPixel|CWBorderPixel|CWColormap, &ourwinattr);
267		if (wind == 0)
#	Line 259 | Line 280 | init()                 /* get data and open window */
280		XDefineCursor(thedisplay, wind, XCreateFontCursor(thedisplay,
281		XC_diamond_cross));
282		XStoreName(thedisplay, wind, fname == NULL ? progname : fname);
283	<	if (geometry != NULL) {
263	<	bzero((char *)&oursizhints, sizeof(oursizhints));
264	<	i = XParseGeometry(geometry, &oursizhints.x, &oursizhints.y,
265	<	(unsigned *)&oursizhints.width,
266	<	(unsigned *)&oursizhints.height);
267	<	if ((i&(WidthValue|HeightValue)) == (WidthValue|HeightValue))
268	<	oursizhints.flags |= USSize;
269	<	else {
270	<	oursizhints.width = xmax;
271	<	oursizhints.height = ymax;
272	<	oursizhints.flags |= PSize;
273	<	}
274	<	if ((i&(XValue|YValue)) == (XValue|YValue)) {
275	<	oursizhints.flags |= USPosition;
276	<	if (i & XNegative)
277	<	oursizhints.x += DisplayWidth(thedisplay,
278	<	ourscreen)-1-oursizhints.width-2*BORWIDTH;
279	<	if (i & YNegative)
280	<	oursizhints.y += DisplayHeight(thedisplay,
281	<	ourscreen)-1-oursizhints.height-2*BORWIDTH;
282	<	}
283	>	if (oursizhints.flags)
284		XSetNormalHints(thedisplay, wind, &oursizhints);
284	–	}
285		ourxwmhints.flags = InputHint|IconPixmapHint;
286		ourxwmhints.input = True;
287		ourxwmhints.icon_pixmap = XCreateBitmapFromData(thedisplay,
#	Line 308 | Line 308 | char  *err;
308		}
309
310
311	–	eputs(s)
312	–	char    *s;
313	–	{
314	–	fputs(s, stderr);
315	–	}
316	–
317	–
318	–	quit(code)
319	–	int  code;
320	–	{
321	–	exit(code);
322	–	}
323	–
324	–
311		static int
312		viscmp(v1,v2)           /* compare visual to see which is better, descending */
313		register XVisualInfo    *v1, *v2;
#	Line 522 | Line 508 | getevent()                             /* process the next event */
508		case ButtonPress:
509		if (e.b.state & (ShiftMask|ControlMask))
510		moveimage(&e.b);
511	+	else if (e.b.button == Button2)
512	+	traceray(e.b.x, e.b.y);
513		else
514		getbox(&e.b);
515		break;
#	Line 529 | Line 517 | getevent()                             /* process the next event */
517		}
518
519
520	<	docom(ekey)                                     /* execute command */
520	>	traceray(xpos, ypos)                    /* print ray corresponding to pixel */
521	>	int  xpos, ypos;
522	>	{
523	>	FLOAT  hv[2];
524	>	FVECT  rorg, rdir;
525	>
526	>	if (!gotview) {         /* no view, no can do */
527	>	XBell(thedisplay, 0);
528	>	return(-1);
529	>	}
530	>	pix2loc(hv, &inpres, xpos-xoff, ypos-yoff);
531	>	if (viewray(rorg, rdir, &ourview, hv[0], hv[1]) < 0)
532	>	return(-1);
533	>	printf("%e %e %e ", rorg[0], rorg[1], rorg[2]);
534	>	printf("%e %e %e\n", rdir[0], rdir[1], rdir[2]);
535	>	fflush(stdout);
536	>	return(0);
537	>	}
538	>
539	>
540	>	docom(ekey)                             /* execute command */
541		XKeyPressedEvent  *ekey;
542		{
543		char  buf[80];
#	Line 538 | Line 546 | XKeyPressedEvent  *ekey;
546		int  com, n;
547		double  comp;
548		FLOAT  hv[2];
541	–	FVECT  rorg, rdir;
549
550		n = XLookupString(ekey, buf, sizeof(buf), NULL, NULL);
551		if (n == 0)
#	Line 546 | Line 553 | XKeyPressedEvent  *ekey;
553		com = buf[0];
554		switch (com) {                  /* interpret command */
555		case 'q':
556	+	case 'Q':
557		case CTRL('D'):                         /* quit */
558	<	quit(0);
558	>	quiterr(NULL);
559		case '\n':
560		case '\r':
561		case 'l':
#	Line 593 | Line 601 | XKeyPressedEvent  *ekey;
601		buf, strlen(buf));
602		return(0);
603		case 't':                               /* trace */
604	<	if (!gotview) {
597	<	XBell(thedisplay, 0);
598	<	return(-1);
599	<	}
600	<	pix2loc(hv, &inpres, ekey->x-xoff, ekey->y-yoff);
601	<	if (viewray(rorg, rdir, &ourview, hv[0], hv[1]) < 0)
602	<	return(-1);
603	<	printf("%e %e %e ", rorg[0], rorg[1], rorg[2]);
604	<	printf("%e %e %e\n", rdir[0], rdir[1], rdir[2]);
605	<	fflush(stdout);
606	<	return(0);
604	>	return(traceray(ekey->x, ekey->y));
605		case '=':                               /* adjust exposure */
606		if (avgbox(cval) == -1)
607		return(-1);
#	Line 629 | Line 627 | XKeyPressedEvent  *ekey;
627		make_rpixmap(ourras, wind);
628		redraw(0, 0, width, height);
629		return(0);
630	+	case '0':                               /* recenter origin */
631	+	if (xoff == 0 & yoff == 0)
632	+	return(0);
633	+	xoff = yoff = 0;
634	+	XClearWindow(thedisplay, wind);
635	+	redraw(0, 0, width, height);
636	+	return(0);
637		case ' ':                               /* clear */
638		redraw(box.xmin, box.ymin, box.xsiz, box.ysiz);
639		return(0);
#	Line 740 | Line 745 | COLOR  clr;
745		return(-1);
746		if (left == ll && right == lr && top == lt && bottom == lb) {
747		copycolor(clr, lc);
748	<	return;
748	>	return(0);
749		}
750		for (y = top; y < bottom; y++) {
751		if (getscan(y) == -1)
#	Line 769 | Line 774 | getmono()                      /* get monochrome data */
774		quiterr("out of memory in getmono");
775		dp = ourdata - 1;
776		for (y = 0; y < ymax; y++) {
777	<	if (getscan(y) < 0)
773	<	quiterr("seek error in getmono");
774	<	normcolrs(scanline, xmax, scale);
777	>	getscan(y);
778		add2icon(y, scanline);
779	+	normcolrs(scanline, xmax, scale);
780		err = 0;
781		for (x = 0; x < xmax; x++) {
782		if (!(x&7))
#	Line 798 | Line 802 | COLR  *scan;
802		static short  cerr[ICONSIZ];
803		static int  ynext;
804		static char  *dp;
805	+	COLR  clr;
806		register int  err;
807		register int    x, ti;
808		int  errp;
#	Line 828 | Line 833 | COLR  *scan;
833		*++dp = 0;
834		errp = err;
835		ti = x*xmax/iconwidth;
836	<	err += normbright(scan[ti]) + cerr[x];
836	>	copycolr(clr, scan[ti]);
837	>	normcolrs(clr, 1, scale);
838	>	err += normbright(clr) + cerr[x];
839		if (err > 127)
840		err -= 255;
841		else
#	Line 850 | Line 857 | getfull()                      /* get full (24-bit) data */
857		/* read and convert file */
858		dp = (unsigned long *)ourdata;
859		for (y = 0; y < ymax; y++) {
860	<	if (getscan(y) < 0)
861	<	quiterr("seek error in getfull");
860	>	getscan(y);
861	>	add2icon(y, scanline);
862		if (scale)
863		shiftcolrs(scanline, xmax, scale);
864		colrs_gambs(scanline, xmax);
858	–	add2icon(y, scanline);
865		if (ourras->image->blue_mask & 1)
866		for (x = 0; x < xmax; x++)
867		*dp++ = scanline[x][RED] << 16 |
#	Line 880 | Line 886 | getgrey()                      /* get greyscale data */
886		/* read and convert file */
887		dp = ourdata;
888		for (y = 0; y < ymax; y++) {
889	<	if (getscan(y) < 0)
890	<	quiterr("seek error in getgrey");
889	>	getscan(y);
890	>	add2icon(y, scanline);
891		if (scale)
892		shiftcolrs(scanline, xmax, scale);
893	+	for (x = 0; x < xmax; x++)
894	+	scanline[x][GRN] = normbright(scanline[x]);
895		colrs_gambs(scanline, xmax);
888	–	add2icon(y, scanline);
896		if (maxcolors < 256)
897		for (x = 0; x < xmax; x++)
898	<	*dp++ = ((long)normbright(scanline[x]) *
899	<	maxcolors + 128) >> 8;
898	>	*dp++ = ((long)scanline[x][GRN] *
899	>	maxcolors + maxcolors/2) >> 8;
900		else
901		for (x = 0; x < xmax; x++)
902	<	*dp++ = normbright(scanline[x]);
902	>	*dp++ = scanline[x][GRN];
903		}
904		for (x = 0; x < maxcolors; x++)
905		clrtab[x][RED] = clrtab[x][GRN] =
906	<	clrtab[x][BLU] = (x*256+maxcolors/2)/maxcolors;
906	>	clrtab[x][BLU] = ((long)x*256 + 128)/maxcolors;
907		}
908
909
#	Line 910 | Line 917 | getmapped()                    /* get color-mapped data */
917		for (y = 0; y < ymax; y++) {
918		if (getscan(y) < 0)
919		quiterr("seek error in getmapped");
920	+	add2icon(y, scanline);
921		if (scale)
922		shiftcolrs(scanline, xmax, scale);
923		colrs_gambs(scanline, xmax);
916	–	add2icon(y, scanline);
924		cnt_colrs(scanline, xmax);
925		}
926		/* map pixels */

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)