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.8 by greg, Wed Sep 16 16:15:42 1992 UTC vs.
Revision 2.16 by greg, Mon Sep 12 14:41:54 1994 UTC

#	Line 11 | Line 11 | static char SCCSid[] = "$SunId$ LBL";
11		*/
12
13		#include  <stdio.h>
14	<
14	>	#include  <math.h>
15		#include  <sys/ioctl.h>
16
17		#include  <X11/Xlib.h>
#	Line 26 | Line 26 | static char SCCSid[] = "$SunId$ LBL";
26		#define GAMMA           2.2             /* default exponent correction */
27
28		#define MINWIDTH        (32*COMCW)      /* minimum graphics window width */
29	<	#define MINHEIGHT       MINWIDTH        /* minimum graphics window height */
29	>	#define MINHEIGHT       (MINWIDTH/2)    /* minimum graphics window height */
30
31		#define BORWIDTH        5               /* border width */
32		#define COMHEIGHT       (COMLH*COMCH)   /* command line height (pixels) */
#	Line 78 | Line 78 | static struct driver  x11_driver = {
78		x11_comout, x11_comin, x11_flush, 1.0
79		};
80
81	+	static int  getpixels(), xnewcolr(), freepixels(), resizewindow(),
82	+	getevent(), getkey(), fixwindow(), x11_getc();
83	+	static unsigned long  true_pixel();
84
85	+
86		struct driver *
87		x11_init(name, id)              /* initialize driver */
88		char  *name, *id;
#	Line 121 | Line 125 | char  *name, *id;
125		ourwhite = WhitePixel(ourdisplay,ourscreen);
126		}
127		/* set gamma */
128	<	if ((gv = getenv("GAMMA")) != NULL)
128	>	if ((gv = XGetDefault(ourdisplay, "radiance", "gamma")) != NULL
129	>	|| (gv = getenv("GAMMA")) != NULL)
130		make_gmap(atof(gv));
131		else
132		make_gmap(GAMMA);
#	Line 239 | Line 244 | x11_paintr(col, xmin, ymin, xmax, ymax)                /* fill a rec
244		COLOR  col;
245		int  xmin, ymin, xmax, ymax;
246		{
242	–	extern int  xnewcolr();         /* pixel assignment routine */
243	–	extern unsigned long  true_pixel();
247		unsigned long  pixel;
248
249		if (!mapped)
#	Line 258 | Line 261 | int  xmin, ymin, xmax, ymax;
261		static
262		x11_flush()                     /* flush output */
263		{
264	+	int     n;
265	+	char    *buf;
266	+	/* check for input */
267		XNoOp(ourdisplay);
268	<	while (XPending(ourdisplay) > 0)
268	>	n = XPending(ourdisplay);                       /* from X server */
269	>	while (n-- > 0)
270		getevent();
271	+	if (ioctl(0, FIONREAD, &n) == 0 && n > 0) {     /* from stdin */
272	+	buf = getcombuf(&x11_driver);
273	+	n = read(0, buf, n);
274	+	if (n > 0)
275	+	buf[n] = '\0';
276	+	}
277		}
278
279
#	Line 268 | Line 281 | static
281		x11_comin(inp, prompt)          /* read in a command line */
282		char  *inp, *prompt;
283		{
284	<	extern int  x11_getc();
285	<
273	<	if (prompt != NULL)
284	>	if (prompt != NULL) {
285	>	x11_flush();            /* make sure we get everything */
286		if (fromcombuf(inp, &x11_driver))
287		return;
288	<	else
289	<	xt_puts(prompt, comline);
288	>	xt_puts(prompt, comline);
289	>	}
290		xt_cursor(comline, TBLKCURS);
291		editline(inp, x11_getc, x11_comout);
292		xt_cursor(comline, TNOCURS);
#	Line 321 | Line 333 | int  *xp, *yp;
333		if (c_last > c_first)                   /* key pressed */
334		return(x11_getc());
335		/* button pressed */
336	<	if (levptr(XButtonPressedEvent)->button & Button1)
336	>	if (levptr(XButtonPressedEvent)->button == Button1)
337		return(MB1);
338	<	if (levptr(XButtonPressedEvent)->button & Button2)
338	>	if (levptr(XButtonPressedEvent)->button == Button2)
339		return(MB2);
340	<	if (levptr(XButtonPressedEvent)->button & Button3)
340	>	if (levptr(XButtonPressedEvent)->button == Button3)
341		return(MB3);
330	–	if (levptr(XButtonPressedEvent)->button & (Button4|Button5))
331	–	return(MB1);
342		return(ABORT);
343		}
344

Diff Legend

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