ViewVC Help

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

root/Development/ray/src/rt/x11.c

Comparing ray/src/rt/x11.c (file contents):
Revision 1.12 by greg, Thu Mar 8 10:09:58 1990 UTC vs.
Revision 1.16 by greg, Wed Jul 18 12:25:07 1990 UTC

#	Line 67 | Line 67 | static GC  ourgc = 0;                  /* our graphics context for dr
67
68		static Colormap ourmap = 0;             /* our color map */
69
70	<	extern char  *malloc();
70	>	extern char  *malloc(), *getcombuf();
71
72	<	int  x11_close(), x11_clear(), x11_paintr(), x11_errout(),
72	>	static int  x11_close(), x11_clear(), x11_paintr(), x11_errout(),
73		x11_getcur(), x11_comout(), x11_comin(), x11_flush();
74
75		static struct driver  x11_driver = {
#	Line 100 | Line 100 | char  *name, *id;
100		} else if (nplanes <= 12) {
101		if (!XMatchVisualInfo(ourdisplay,ourscreen,
102		nplanes,PseudoColor,&ourvinfo)) {
103	<	stderr_v("PseudoColor not supported\n");
103	>	stderr_v("PseudoColor server required\n");
104		return(NULL);
105		}
106		} else if (!XMatchVisualInfo(ourdisplay,ourscreen,
107	<	nplanes,TrueColor,&ourvinfo)) {
108	<	stderr_v("TrueColor not supported\n");
107	>	nplanes,TrueColor,&ourvinfo) &&
108	>	/* kludge for DirectColor */
109	>	!XMatchVisualInfo(ourdisplay,ourscreen,
110	>	nplanes,DirectColor,&ourvinfo)) {
111	>	stderr_v("TrueColor server required\n");
112		return(NULL);
113		}
114		ourvisual = ourvinfo.visual;
#	Line 175 | Line 178 | static
178		x11_clear(xres, yres)                   /* clear our display */
179		int  xres, yres;
180		{
178	–	/* destroy command line */
179	–	if (comline != NULL)
180	–	xt_close(comline);
181		/* check limits */
182		if (xres < MINWIDTH)
183		xres = MINWIDTH;
#	Line 193 | Line 193 | int  xres, yres;
193		sleep(2);                       /* wait for window manager */
194		XSync(ourdisplay, 1);           /* discard input */
195		}
196	+	XClearWindow(ourdisplay, gwind);
197	+	/* reinitialize color table */
198	+	if (ourvisual->class == PseudoColor)
199	+	if (getpixels() == 0)
200	+	stderr_v("cannot allocate colors\n");
201	+	else
202	+	new_ctab(ncolors);
203		/* get new command line */
204	+	if (comline != NULL)
205	+	xt_close(comline);
206		comline = xt_open(ourdisplay,
207		DefaultGC(ourdisplay,ourscreen),
208		gwind, 0, gheight, gwidth, COMHEIGHT, 0, COMFN);
#	Line 202 | Line 211 | int  xres, yres;
211		quit(1);
212		}
213		XSelectInput(ourdisplay, comline->w, ExposureMask);
205	–	/* clear graphics window */
206	–	XClearWindow(ourdisplay, gwind);
207	–	/* reinitialize color table */
208	–	if (ourvisual->class == PseudoColor)
209	–	if (getpixels() == 0)
210	–	stderr_v("cannot allocate colors\n");
211	–	else
212	–	new_ctab(ncolors);
214		/* remove earmuffs */
215		XSelectInput(ourdisplay, gwind,
216		StructureNotifyMask|ExposureMask|KeyPressMask|ButtonPressMask);
#	Line 227 | Line 228 | int  xmin, ymin, xmax, ymax;
228
229		if (ncolors > 0)
230		pixel = pixval[get_pixel(col, xnewcolr)];
231	<	else if (ourvisual->class == TrueColor)
231	>	else if (ourvisual->class != PseudoColor)
232		pixel = true_pixel(col);
233		else
234		return;
#	Line 250 | Line 251 | static
251		x11_comin(inp, prompt)          /* read in a command line */
252		char  *inp, *prompt;
253		{
254	<	int  x11_getc(), x11_comout();
254	>	extern int  x11_getc();
255
256		if (prompt != NULL)
257		if (fromcombuf(inp, &x11_driver))
#	Line 335 | Line 336 | int  r, g, b;
336		static int
337		getpixels()                             /* get the color map */
338		{
339	+	XColor  thiscolor;
340	+	register int  i, j;
341	+
342		if (ncolors > 0)
343	<	return(ncolors);
343	>	goto donecolors;
344		if (ourvisual == DefaultVisual(ourdisplay,ourscreen)) {
345		ourmap = DefaultColormap(ourdisplay,ourscreen);
346		goto loop;
#	Line 362 | Line 366 | loop:
366		else
367		return(ncolors = 0);    /* failed */
368		}
369	<	if (ourmap != DefaultColormap(ourdisplay,ourscreen)) {
370	<	XColor  thiscolor;
367	<	register int  i, j;
368	<	/* reset black and white */
369	<	for (i = 0; i < ncolors; i++) {
369	>	if (ourmap != DefaultColormap(ourdisplay,ourscreen))
370	>	for (i = 0; i < ncolors; i++) { /* reset black and white */
371		if (pixval[i] != ourblack && pixval[i] != ourwhite)
372		continue;
373		thiscolor.pixel = pixval[i];
#	Line 380 | Line 381 | loop:
381		ncolors--;
382		i--;
383		}
383	–	}
384		XSetWindowColormap(ourdisplay, gwind, ourmap);
385	+	donecolors:
386	+	#ifdef  DEBUG
387	+	thiscolor.flags = DoRed|DoGreen|DoBlue;
388	+	thiscolor.red = thiscolor.green = thiscolor.blue = 0;
389	+	for (i = 0; i < ncolors; i++) {
390	+	thiscolor.pixel = pixval[i];
391	+	XStoreColor(ourdisplay, ourmap, &thiscolor);
392	+	}
393	+	#endif
394		return(ncolors);
395		}
396

Diff Legend

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