[ViewVC] Diff of: radiance/ray/src/rt/x11.c

Comparing ray/src/rt/x11.c (file contents):
Revision 2.21 by greg, Wed Oct 26 10:04:15 1994 UTC vs.
Revision 2.24 by greg, Tue Mar 7 14:18:34 1995 UTC

#	Line 14 \| Line 14 \| static char SCCSid[] = "$SunId$ LBL";
14		#include <math.h>
15		#include <sys/ioctl.h>
16		#include <fcntl.h>
17	+	#ifdef sparc
18	+	#include <sys/conf.h>
19	+	#include <sys/file.h>
20	+	#include <sys/filio.h>
21	+	#endif
22
23		#include <X11/Xlib.h>
24		#include <X11/cursorfont.h>
#	Line 298 \| Line 303 \| *x11_flush() / flush output /*
303		n = XPending(ourdisplay); /* from X server */
304		while (n-- > 0)
305		getevent();
306	+	#ifdef FNDELAY
307		if (inpcheck == IC_IOCTL) { /* from stdin */
308	+	#ifdef FIONREAD
309		if (ioctl(fileno(stdin), FIONREAD, &n) < 0) {
310	+	#else
311	+	if (1) {
312	+	#endif
313		if (fcntl(fileno(stdin), F_SETFL, FNDELAY) < 0) {
314		stderr_v("Cannot change input mode\n");
315		quit(1);
#	Line 315 \| Line 325 \| *x11_flush() / flush output /*
325		tocombuf(buf, &x11_driver);
326		}
327		}
328	+	#endif
329		}
330
331
#	Line 367 \| Line 378 \| *char inp, prompt;*
378		if (!x11_driver.inpready)
379		fputs(prompt, stdout);
380		}
381	+	#ifdef FNDELAY
382	+	if (inpcheck == IC_READ) { /* turn off FNDELAY */
383	+	if (fcntl(fileno(stdin), F_SETFL, 0) < 0) {
384	+	stderr_v("Cannot change input mode\n");
385	+	quit(1);
386	+	}
387	+	inpcheck = IC_IOCTL;
388	+	}
389	+	#endif
390		if (gets(inp) == NULL) {
391		strcpy(inp, "quit");
392		return;

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines