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.2 by greg, Fri May 29 10:57:15 1992 UTC vs.
Revision 2.10 by greg, Tue Mar 2 10:56:33 1993 UTC

#	Line 1 | Line 1
1	+	/* Copyright (c) 1992 Regents of the University of California */
2	+
3		#ifndef lint
4		static char SCCSid[] = "$SunId$ LBL";
5		#endif
6
5	–	/* Copyright (c) 1989 Regents of the University of California */
6	–
7		/*
8	<	*  x11.c - driver for X-windows version 11.3
8	>	*  x11.c - driver for X-windows version 11
9		*
10		*     Jan 1990
11		*/
#	Line 23 | Line 23 | static char SCCSid[] = "$SunId$ LBL";
23		#include  "x11twind.h"
24		#include  "x11icon.h"
25
26	<	#define GAMMA           2.2             /* exponent for color correction */
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 38 | Line 38 | static char SCCSid[] = "$SunId$ LBL";
38
39		#define  ourscreen      DefaultScreen(ourdisplay)
40		#define  ourroot        RootWindow(ourdisplay,ourscreen)
41	–	#define  ourwhite       WhitePixel(ourdisplay,ourscreen)
42	–	#define  ourblack       BlackPixel(ourdisplay,ourscreen)
41
42		#define  levptr(etype)  ((etype *)&currentevent)
43
44		static XEvent  currentevent;            /* current event */
45
46		static int  ncolors = 0;                /* color table size */
47	+	static int  mapped = 0;                 /* window is mapped? */
48		static unsigned long  *pixval = NULL;   /* allocated pixels */
49	+	static unsigned long  ourblack=0, ourwhite=1;
50
51		static Display  *ourdisplay = NULL;     /* our display */
52
#	Line 83 | Line 83 | struct driver *
83		x11_init(name, id)              /* initialize driver */
84		char  *name, *id;
85		{
86	+	extern char  *getenv();
87	+	char  *gv;
88		int  nplanes;
89		XSetWindowAttributes    ourwinattr;
90		XWMHints  ourxwmhints;
#	Line 95 | Line 97 | char  *name, *id;
97		}
98		/* find a usable visual */
99		nplanes = DisplayPlanes(ourdisplay, ourscreen);
100	<	if (    !XMatchVisualInfo(ourdisplay,ourscreen,
101	<	24,TrueColor,&ourvinfo) &&
102	<	!XMatchVisualInfo(ourdisplay,ourscreen,
103	<	24,DirectColor,&ourvinfo)       )
100	>	if (XMatchVisualInfo(ourdisplay,ourscreen,
101	>	24,TrueColor,&ourvinfo) ||
102	>	XMatchVisualInfo(ourdisplay,ourscreen,
103	>	24,DirectColor,&ourvinfo)) {
104	>	ourblack = 0;
105	>	ourwhite = ourvinfo.red_mask |
106	>	ourvinfo.green_mask |
107	>	ourvinfo.blue_mask ;
108	>	} else {
109		if (nplanes < 4) {
110		stderr_v("not enough colors\n");
111		return(NULL);
112	<	} else if (!XMatchVisualInfo(ourdisplay,ourscreen,
112	>	}
113	>	if (!XMatchVisualInfo(ourdisplay,ourscreen,
114		nplanes,PseudoColor,&ourvinfo) &&
115		!XMatchVisualInfo(ourdisplay,ourscreen,
116		nplanes,GrayScale,&ourvinfo)) {
117		stderr_v("unsupported visual type\n");
118		return(NULL);
119		}
120	<	make_gmap(GAMMA);
121	<	/* open window */
120	>	ourblack = BlackPixel(ourdisplay,ourscreen);
121	>	ourwhite = WhitePixel(ourdisplay,ourscreen);
122	>	}
123	>	/* set gamma */
124	>	if ((gv = getenv("GAMMA")) != NULL)
125	>	make_gmap(atof(gv));
126	>	else
127	>	make_gmap(GAMMA);
128	>	/* open window */
129		ourwinattr.background_pixel = ourblack;
130		ourwinattr.border_pixel = ourblack;
131	<	/* this is a waste! */
131	>	/* this is stupid */
132		ourwinattr.colormap = XCreateColormap(ourdisplay, ourroot,
133		ourvinfo.visual, AllocNone);
134		gwind = XCreateWindow(ourdisplay, ourroot, 0, 0,
#	Line 125 | Line 140 | char  *name, *id;
140		stderr_v("cannot create window\n");
141		return(NULL);
142		}
143	<	XStoreName(ourdisplay, gwind, id);
143	>	XStoreName(ourdisplay, gwind, id);
144		/* create a cursor */
145		pickcursor = XCreateFontCursor(ourdisplay, XC_diamond_cross);
146		ourgc = XCreateGC(ourdisplay, gwind, 0, NULL);
#	Line 146 | Line 161 | char  *name, *id;
161		x11_driver.xsiz = gwidth < MINWIDTH ? MINWIDTH : gwidth;
162		x11_driver.ysiz = gheight < MINHEIGHT ? MINHEIGHT : gheight;
163		x11_driver.inpready = 0;
164	+	mapped = 1;
165		cmdvec = x11_comout;                    /* set error vectors */
166		if (wrnvec != NULL)
167		wrnvec = x11_errout;
#	Line 205 | Line 221 | int  xres, yres;
221		/* get new command line */
222		if (comline != NULL)
223		xt_close(comline);
224	<	comline = xt_open(ourdisplay,
225	<	DefaultGC(ourdisplay,ourscreen),
210	<	gwind, 0, gheight, gwidth, COMHEIGHT, 0, COMFN);
224	>	comline = xt_open(ourdisplay, gwind, 0, gheight,
225	>	gwidth, COMHEIGHT, 0, ourblack, ourwhite, COMFN);
226		if (comline == NULL) {
227		stderr_v("Cannot open command line window\n");
228		quit(1);
#	Line 228 | Line 243 | int  xmin, ymin, xmax, ymax;
243		extern unsigned long  true_pixel();
244		unsigned long  pixel;
245
246	+	if (!mapped)
247	+	return;
248		if (ncolors > 0)
249		pixel = pixval[get_pixel(col, xnewcolr)];
233	–	else if (ourvinfo.class == TrueColor || ourvinfo.class == DirectColor)
234	–	pixel = true_pixel(col);
250		else
251	<	return;
251	>	pixel = true_pixel(col);
252		XSetForeground(ourdisplay, ourgc, pixel);
253		XFillRectangle(ourdisplay, gwind,
254		ourgc, xmin, gheight-ymax, xmax-xmin, ymax-ymin);
#	Line 306 | Line 321 | int  *xp, *yp;
321		if (c_last > c_first)                   /* key pressed */
322		return(x11_getc());
323		/* button pressed */
324	<	if (levptr(XButtonPressedEvent)->button & Button1)
324	>	if (levptr(XButtonPressedEvent)->button == Button1)
325		return(MB1);
326	<	if (levptr(XButtonPressedEvent)->button & Button2)
326	>	if (levptr(XButtonPressedEvent)->button == Button2)
327		return(MB2);
328	<	if (levptr(XButtonPressedEvent)->button & Button3)
328	>	if (levptr(XButtonPressedEvent)->button == Button3)
329		return(MB3);
315	–	if (levptr(XButtonPressedEvent)->button & (Button4|Button5))
316	–	return(MB1);
330		return(ABORT);
331		}
332
#	Line 356 | Line 369 | loop:
369		pixval = (unsigned long *)malloc(ncolors*sizeof(unsigned long));
370		if (pixval == NULL)
371		return(ncolors = 0);
372	<	if (XAllocColorCells(ourdisplay,ourmap,0,NULL,0,
360	<	pixval,ncolors) != 0)
372	>	if (XAllocColorCells(ourdisplay,ourmap,0,NULL,0,pixval,ncolors))
373		break;
374		free((char *)pixval);
375		pixval = NULL;
#	Line 394 | Line 406 | freepixels()                           /* free our pixels */
406		if (ncolors == 0)
407		return;
408		XFreeColors(ourdisplay,ourmap,pixval,ncolors,0L);
409	+	free((char *)pixval);
410	+	pixval = NULL;
411		ncolors = 0;
412		if (ourmap != DefaultColormap(ourdisplay,ourscreen))
413		XFreeColormap(ourdisplay, ourmap);
#	Line 437 | Line 451 | getevent()                     /* get next event */
451		resizewindow(levptr(XConfigureEvent));
452		break;
453		case UnmapNotify:
454	+	mapped = 0;
455		freepixels();
456		break;
457		case MapNotify:
#	Line 446 | Line 461 | getevent()                     /* get next event */
461		stderr_v("Cannot allocate colors\n");
462		else
463		new_ctab(ncolors);
464	+	mapped = 1;
465		break;
466		case Expose:
467		fixwindow(levptr(XExposeEvent));

Diff Legend

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