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 2.37 by greg, Mon Aug 5 21:54:01 2024 UTC vs.
Revision 2.38 by greg, Tue Dec 3 19:36:58 2024 UTC

#	Line 256 | Line 256 | x11_clear(                     /* clear our display */
256		if (yres < MINHEIGHT)
257		yres = MINHEIGHT;
258		/* resize window */
259	<	if (xres != gwidth || yres != gheight) {
259	>	if ((xres != gwidth) | (yres != gheight)) {
260		XSelectInput(ourdisplay, gwind, 0);
261		XResizeWindow(ourdisplay, gwind, xres, yres+comheight);
262		gwidth = xres;
#	Line 267 | Line 267 | x11_clear(                     /* clear our display */
267		}
268		XClearWindow(ourdisplay, gwind);
269		/* reinitialize color table */
270	<	if (ourvinfo.class == PseudoColor || ourvinfo.class == GrayScale) {
270	>	if ((ourvinfo.class == PseudoColor) | (ourvinfo.class == GrayScale)) {
271		if (getpixels() == 0)
272		eputs("cannot allocate colors\n");
273		else
#	Line 375 | Line 375 | x11_comout(            /* output a string to command line */
375		const char  *outp
376		)
377		{
378	<	if (comline == NULL || outp == NULL || !outp[0])
378	>	if ((comline == NULL) | (outp == NULL) || !outp[0])
379		return;
380		xt_puts(outp, comline);
381		if (outp[strlen(outp)-1] == '\n')

Diff Legend

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