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.3 by greg, Fri May 29 15:42:49 1992 UTC vs.
Revision 2.11 by greg, Mon Mar 8 12:51:45 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 44 | Line 44 | static char SCCSid[] = "$SunId$ LBL";
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
#	Line 77 | Line 78 | static struct driver  x11_driver = {
78		x11_comout, x11_comin, x11_flush, 1.0
79		};
80
81	+	static int  getpixels(), xnewcolr(), freepixels(),
82	+	getevent(), getkey(), fixwindow();
83	+	static unsigned long  true_pixel();
84
85	+
86		struct driver *
87		x11_init(name, id)              /* initialize driver */
88		char  *name, *id;
89		{
90	+	extern char  *getenv();
91	+	char  *gv;
92		int  nplanes;
93		XSetWindowAttributes    ourwinattr;
94		XWMHints  ourxwmhints;
#	Line 94 | Line 101 | char  *name, *id;
101		}
102		/* find a usable visual */
103		nplanes = DisplayPlanes(ourdisplay, ourscreen);
104	<	if (    !XMatchVisualInfo(ourdisplay,ourscreen,
105	<	24,TrueColor,&ourvinfo) &&
106	<	!XMatchVisualInfo(ourdisplay,ourscreen,
107	<	24,DirectColor,&ourvinfo)       ) {
104	>	if (XMatchVisualInfo(ourdisplay,ourscreen,
105	>	24,TrueColor,&ourvinfo) ||
106	>	XMatchVisualInfo(ourdisplay,ourscreen,
107	>	24,DirectColor,&ourvinfo)) {
108	>	ourblack = 0;
109	>	ourwhite = ourvinfo.red_mask |
110	>	ourvinfo.green_mask |
111	>	ourvinfo.blue_mask ;
112	>	} else {
113		if (nplanes < 4) {
114		stderr_v("not enough colors\n");
115		return(NULL);
116	<	} else if (!XMatchVisualInfo(ourdisplay,ourscreen,
116	>	}
117	>	if (!XMatchVisualInfo(ourdisplay,ourscreen,
118		nplanes,PseudoColor,&ourvinfo) &&
119		!XMatchVisualInfo(ourdisplay,ourscreen,
120		nplanes,GrayScale,&ourvinfo)) {
#	Line 110 | Line 123 | char  *name, *id;
123		}
124		ourblack = BlackPixel(ourdisplay,ourscreen);
125		ourwhite = WhitePixel(ourdisplay,ourscreen);
113	–	} else {
114	–	ourblack = 0;
115	–	ourwhite = ~0;
126		}
127	<	make_gmap(GAMMA);
128	<	/* open window */
127	>	/* set gamma */
128	>	if ((gv = getenv("GAMMA")) != NULL)
129	>	make_gmap(atof(gv));
130	>	else
131	>	make_gmap(GAMMA);
132	>	/* open window */
133		ourwinattr.background_pixel = ourblack;
134		ourwinattr.border_pixel = ourblack;
135	<	/* this is a waste! */
135	>	/* this is stupid */
136		ourwinattr.colormap = XCreateColormap(ourdisplay, ourroot,
137		ourvinfo.visual, AllocNone);
138		gwind = XCreateWindow(ourdisplay, ourroot, 0, 0,
#	Line 130 | Line 144 | char  *name, *id;
144		stderr_v("cannot create window\n");
145		return(NULL);
146		}
147	<	XStoreName(ourdisplay, gwind, id);
147	>	XStoreName(ourdisplay, gwind, id);
148		/* create a cursor */
149		pickcursor = XCreateFontCursor(ourdisplay, XC_diamond_cross);
150		ourgc = XCreateGC(ourdisplay, gwind, 0, NULL);
#	Line 151 | Line 165 | char  *name, *id;
165		x11_driver.xsiz = gwidth < MINWIDTH ? MINWIDTH : gwidth;
166		x11_driver.ysiz = gheight < MINHEIGHT ? MINHEIGHT : gheight;
167		x11_driver.inpready = 0;
168	+	mapped = 1;
169		cmdvec = x11_comout;                    /* set error vectors */
170		if (wrnvec != NULL)
171		wrnvec = x11_errout;
#	Line 228 | Line 243 | x11_paintr(col, xmin, ymin, xmax, ymax)                /* fill a rec
243		COLOR  col;
244		int  xmin, ymin, xmax, ymax;
245		{
231	–	extern int  xnewcolr();         /* pixel assignment routine */
232	–	extern unsigned long  true_pixel();
246		unsigned long  pixel;
247
248	+	if (!mapped)
249	+	return;
250		if (ncolors > 0)
251		pixel = pixval[get_pixel(col, xnewcolr)];
237	–	else if (ourvinfo.class == TrueColor || ourvinfo.class == DirectColor)
238	–	pixel = true_pixel(col);
252		else
253	<	return;
253	>	pixel = true_pixel(col);
254		XSetForeground(ourdisplay, ourgc, pixel);
255		XFillRectangle(ourdisplay, gwind,
256		ourgc, xmin, gheight-ymax, xmax-xmin, ymax-ymin);
#	Line 310 | Line 323 | int  *xp, *yp;
323		if (c_last > c_first)                   /* key pressed */
324		return(x11_getc());
325		/* button pressed */
326	<	if (levptr(XButtonPressedEvent)->button & Button1)
326	>	if (levptr(XButtonPressedEvent)->button == Button1)
327		return(MB1);
328	<	if (levptr(XButtonPressedEvent)->button & Button2)
328	>	if (levptr(XButtonPressedEvent)->button == Button2)
329		return(MB2);
330	<	if (levptr(XButtonPressedEvent)->button & Button3)
330	>	if (levptr(XButtonPressedEvent)->button == Button3)
331		return(MB3);
319	–	if (levptr(XButtonPressedEvent)->button & (Button4|Button5))
320	–	return(MB1);
332		return(ABORT);
333		}
334
#	Line 360 | Line 371 | loop:
371		pixval = (unsigned long *)malloc(ncolors*sizeof(unsigned long));
372		if (pixval == NULL)
373		return(ncolors = 0);
374	<	if (XAllocColorCells(ourdisplay,ourmap,0,NULL,0,
364	<	pixval,ncolors) != 0)
374	>	if (XAllocColorCells(ourdisplay,ourmap,0,NULL,0,pixval,ncolors))
375		break;
376		free((char *)pixval);
377		pixval = NULL;
#	Line 398 | Line 408 | freepixels()                           /* free our pixels */
408		if (ncolors == 0)
409		return;
410		XFreeColors(ourdisplay,ourmap,pixval,ncolors,0L);
411	+	free((char *)pixval);
412	+	pixval = NULL;
413		ncolors = 0;
414		if (ourmap != DefaultColormap(ourdisplay,ourscreen))
415		XFreeColormap(ourdisplay, ourmap);
#	Line 441 | Line 453 | getevent()                     /* get next event */
453		resizewindow(levptr(XConfigureEvent));
454		break;
455		case UnmapNotify:
456	+	mapped = 0;
457		freepixels();
458		break;
459		case MapNotify:
#	Line 450 | Line 463 | getevent()                     /* get next event */
463		stderr_v("Cannot allocate colors\n");
464		else
465		new_ctab(ncolors);
466	+	mapped = 1;
467		break;
468		case Expose:
469		fixwindow(levptr(XExposeEvent));

Diff Legend

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