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.18 by greg, Tue Sep 20 15:46:34 1994 UTC vs.
Revision 2.28 by gregl, Tue Dec 2 15:57:45 1997 UTC

#	Line 1 | Line 1
1	<	/* Copyright (c) 1992 Regents of the University of California */
1	>	/* Copyright (c) 1995 Regents of the University of California */
2
3		#ifndef lint
4		static char SCCSid[] = "$SunId$ LBL";
#	Line 10 | Line 10 | static char SCCSid[] = "$SunId$ LBL";
10		*     Jan 1990
11		*/
12
13	<	#include  <stdio.h>
14	<	#include  <math.h>
13	>	#include  "standard.h"
14		#include  <sys/ioctl.h>
15	+	#ifdef sparc
16	+	#include  <sys/conf.h>
17	+	#include  <sys/file.h>
18	+	#include  <sys/filio.h>
19	+	#endif
20	+	#if  !defined(FNDELAY) && defined(O_NONBLOCK)
21	+	#define  FNDELAY  O_NONBLOCK
22	+	#endif
23
24		#include  <X11/Xlib.h>
25		#include  <X11/cursorfont.h>
#	Line 69 | Line 76 | static GC  ourgc = 0;                  /* our graphics context for dr
76
77		static Colormap ourmap = 0;             /* our color map */
78
79	<	extern char  *malloc(), *getcombuf();
79	>	#define IC_X11          0
80	>	#define IC_IOCTL        1
81	>	#define IC_READ         2
82
83	+	static int  inpcheck;                   /* whence to check input */
84	+
85	+	extern char  *malloc();
86	+
87		static int  x11_close(), x11_clear(), x11_paintr(), x11_errout(),
88		x11_getcur(), x11_comout(), x11_comin(), x11_flush();
89
#	Line 99 | Line 112 | char  *name, *id;
112		/* open display server */
113		ourdisplay = XOpenDisplay(NULL);
114		if (ourdisplay == NULL) {
115	<	stderr_v("cannot open X-windows; DISPLAY variable set?\n");
115	>	eputs("cannot open X-windows; DISPLAY variable set?\n");
116		return(NULL);
117		}
118		/* find a usable visual */
119		nplanes = DisplayPlanes(ourdisplay, ourscreen);
120		if (XMatchVisualInfo(ourdisplay,ourscreen,
121	<	24,TrueColor,&ourvinfo) ||
121	>	nplanes>12?nplanes:24,TrueColor,&ourvinfo) ||
122		XMatchVisualInfo(ourdisplay,ourscreen,
123	<	24,DirectColor,&ourvinfo)) {
123	>	nplanes>12?nplanes:24,DirectColor,&ourvinfo)) {
124		ourblack = 0;
125		ourwhite = ourvinfo.red_mask |
126		ourvinfo.green_mask |
127		ourvinfo.blue_mask ;
128		} else {
129		if (nplanes < 4) {
130	<	stderr_v("not enough colors\n");
130	>	eputs("not enough colors\n");
131		return(NULL);
132		}
133		if (!XMatchVisualInfo(ourdisplay,ourscreen,
134		nplanes,PseudoColor,&ourvinfo) &&
135		!XMatchVisualInfo(ourdisplay,ourscreen,
136		nplanes,GrayScale,&ourvinfo)) {
137	<	stderr_v("unsupported visual type\n");
137	>	eputs("unsupported visual type\n");
138		return(NULL);
139		}
140		ourblack = BlackPixel(ourdisplay,ourscreen);
#	Line 136 | Line 149 | char  *name, *id;
149		/* X11 command line or no? */
150		if (!strcmp(name, "x11"))
151		comheight = COMHEIGHT;
152	<	else /* "x11d" */
152	>	else /* "x11d" */ {
153		comheight = 0;
154	+	#ifndef  FNDELAY
155	+	eputs("warning: x11d driver not fully functional on this machine\n");
156	+	#endif
157	+	}
158		/* open window */
159		ourwinattr.background_pixel = ourblack;
160		ourwinattr.border_pixel = ourblack;
#	Line 150 | Line 167 | char  *name, *id;
167		BORWIDTH, ourvinfo.depth, InputOutput, ourvinfo.visual,
168		CWBackPixel|CWBorderPixel|CWColormap, &ourwinattr);
169		if (gwind == 0) {
170	<	stderr_v("cannot create window\n");
170	>	eputs("cannot create window\n");
171		return(NULL);
172		}
173		XStoreName(ourdisplay, gwind, id);
#	Line 179 | Line 196 | char  *name, *id;
196		if (comheight) {
197		x11_driver.comin = x11_comin;
198		x11_driver.comout = x11_comout;
199	<	cmdvec = x11_comout;
200	<	if (wrnvec != NULL)
201	<	wrnvec = x11_errout;
199	>	erract[COMMAND].pf = x11_comout;
200	>	if (erract[WARNING].pf != NULL)
201	>	erract[WARNING].pf = x11_errout;
202	>	inpcheck = IC_X11;
203		} else {
204		x11_driver.comin = std_comin;
205		x11_driver.comout = std_comout;
206	<	cmdvec = std_comout;
206	>	erract[COMMAND].pf = std_comout;
207	>	inpcheck = IC_IOCTL;
208		}
209		return(&x11_driver);
210		}
#	Line 194 | Line 213 | char  *name, *id;
213		static
214		x11_close()                     /* close our display */
215		{
216	<	cmdvec = NULL;                          /* reset error vectors */
217	<	if (wrnvec != NULL)
218	<	wrnvec = stderr_v;
216	>	erract[COMMAND].pf = NULL;              /* reset error vectors */
217	>	if (erract[WARNING].pf != NULL)
218	>	erract[WARNING].pf = wputs;
219		if (ourdisplay == NULL)
220		return;
221		if (comline != NULL) {
#	Line 237 | Line 256 | int  xres, yres;
256		/* reinitialize color table */
257		if (ourvinfo.class == PseudoColor || ourvinfo.class == GrayScale)
258		if (getpixels() == 0)
259	<	stderr_v("cannot allocate colors\n");
259	>	eputs("cannot allocate colors\n");
260		else
261		new_ctab(ncolors);
262		/* get new command line */
#	Line 247 | Line 266 | int  xres, yres;
266		comline = xt_open(ourdisplay, gwind, 0, gheight, gwidth,
267		comheight, 0, ourblack, ourwhite, COMFN);
268		if (comline == NULL) {
269	<	stderr_v("Cannot open command line window\n");
269	>	eputs("cannot open command line window\n");
270		quit(1);
271		}
272		XSelectInput(ourdisplay, comline->w, ExposureMask);
#	Line 282 | Line 301 | int  xmin, ymin, xmax, ymax;
301		static
302		x11_flush()                     /* flush output */
303		{
304	+	char    buf[256];
305		int     n;
306		/* check for input */
307		XNoOp(ourdisplay);
308		n = XPending(ourdisplay);                       /* from X server */
309		while (n-- > 0)
310		getevent();
311	<	if (x11_driver.comin == std_comin) {            /* from stdin */
311	>	#ifdef FNDELAY
312	>	if (inpcheck == IC_IOCTL) {                     /* from stdin */
313	>	#ifdef FIONREAD
314		if (ioctl(fileno(stdin), FIONREAD, &n) < 0) {
315	<	stderr_v("ioctl error on stdin\n");
316	<	quit(1);
315	>	#else
316	>	if (1) {
317	>	#endif
318	>	if (fcntl(fileno(stdin), F_SETFL, FNDELAY) < 0) {
319	>	eputs("cannot change input mode\n");
320	>	quit(1);
321	>	}
322	>	inpcheck = IC_READ;
323	>	} else
324	>	x11_driver.inpready += n;
325	>	}
326	>	if (inpcheck == IC_READ) {
327	>	n = read(fileno(stdin), buf, sizeof(buf)-1);
328	>	if (n > 0) {
329	>	buf[n] = '\0';
330	>	tocombuf(buf, &x11_driver);
331		}
296	–	x11_driver.inpready += n;
332		}
333	+	#endif
334		}
335
336
#	Line 318 | Line 354 | static
354		x11_comout(outp)                /* output a string to command line */
355		char  *outp;
356		{
357	<	if (comline == NULL)
357	>	if (comline == NULL || outp == NULL || !outp[0])
358		return;
359		xt_puts(outp, comline);
360		if (outp[strlen(outp)-1] == '\n')
#	Line 330 | Line 366 | static
366		x11_errout(msg)                 /* output an error message */
367		char  *msg;
368		{
369	<	stderr_v(msg);          /* send to stderr also! */
369	>	eputs(msg);             /* send to stderr also! */
370		x11_comout(msg);
371		}
372
#	Line 345 | Line 381 | char  *inp, *prompt;
381		if (fromcombuf(inp, &x11_driver))
382		return;
383		if (!x11_driver.inpready)
384	<	fputs(prompt, stdout);
384	>	std_comout(prompt);
385		}
386	+	#ifdef FNDELAY
387	+	if (inpcheck == IC_READ) {      /* turn off FNDELAY */
388	+	if (fcntl(fileno(stdin), F_SETFL, 0) < 0) {
389	+	eputs("cannot change input mode\n");
390	+	quit(1);
391	+	}
392	+	inpcheck = IC_IOCTL;
393	+	}
394	+	#endif
395		if (gets(inp) == NULL) {
396		strcpy(inp, "quit");
397		return;
#	Line 362 | Line 407 | std_comout(outp)               /* write out string to stdout */
407		char    *outp;
408		{
409		fputs(outp, stdout);
410	+	fflush(stdout);
411		}
412
413
#	Line 521 | Line 567 | getevent()                     /* get next event */
567		if (ourvinfo.class == PseudoColor ||
568		ourvinfo.class == GrayScale)
569		if (getpixels() == 0)
570	<	stderr_v("Cannot allocate colors\n");
570	>	eputs("cannot allocate colors\n");
571		else
572		new_ctab(ncolors);
573		mapped = 1;
#	Line 555 | Line 601 | static
601		fixwindow(eexp)                         /* repair damage to window */
602		register XExposeEvent  *eexp;
603		{
604	+	char  buf[80];
605	+
606		if (eexp->window == gwind) {
607	<	sprintf(getcombuf(&x11_driver), "repaint %d %d %d %d\n",
607	>	sprintf(buf, "repaint %d %d %d %d\n",
608		eexp->x, gheight - eexp->y - eexp->height,
609		eexp->x + eexp->width, gheight - eexp->y);
610	+	tocombuf(buf, &x11_driver);
611		} else if (eexp->window == comline->w) {
612		if (eexp->count == 0)
613		xt_redraw(comline);
#	Line 578 | Line 627 | register XConfigureEvent  *ersz;
627		x11_driver.xsiz = gwidth < MINWIDTH ? MINWIDTH : gwidth;
628		x11_driver.ysiz = gheight < MINHEIGHT ? MINHEIGHT : gheight;
629
630	<	strcpy(getcombuf(&x11_driver), "new\n");
630	>	tocombuf("new\n", &x11_driver);
631		}

Diff Legend

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