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 1.11 by greg, Thu Mar 8 09:47:23 1990 UTC vs.
Revision 1.12 by greg, Thu Mar 8 10:09:58 1990 UTC

#	Line 86 | Line 86 | char  *name, *id;
86		XVisualInfo  ourvinfo;
87		XSetWindowAttributes    ourwinattr;
88		XWMHints  ourxwmhints;
89	+	XSizeHints      oursizhints;
90
91		ourdisplay = XOpenDisplay(NULL);
92		if (ourdisplay == NULL) {
#	Line 110 | Line 111 | char  *name, *id;
111		ourvisual = ourvinfo.visual;
112		make_gmap(GAMMA);
113		/* open window */
114	<	ourwinattr.background_pixel = ourwhite;
114	>	ourwinattr.background_pixel = ourblack;
115		ourwinattr.border_pixel = ourblack;
116		gwind = XCreateWindow(ourdisplay, ourroot, 0, 0,
117		DisplayWidth(ourdisplay,ourscreen)-2*BORWIDTH,
#	Line 128 | Line 129 | char  *name, *id;
129		ourxwmhints.flags = InputHint;
130		ourxwmhints.input = True;
131		XSetWMHints(ourdisplay, gwind, &ourxwmhints);
132	+	oursizhints.min_width = MINWIDTH;
133	+	oursizhints.min_height = MINHEIGHT+COMHEIGHT;
134	+	oursizhints.flags = PMinSize;
135	+	XSetNormalHints(ourdisplay, gwind, &oursizhints);
136		XSelectInput(ourdisplay, gwind, ExposureMask);
137		XMapWindow(ourdisplay, gwind);
138		XWindowEvent(ourdisplay, gwind, ExposureMask, levptr(XExposeEvent));
#	Line 170 | Line 175 | static
175		x11_clear(xres, yres)                   /* clear our display */
176		int  xres, yres;
177		{
178	<	if (xres != gwidth || yres != gheight) {        /* change window */
179	<	if (comline != NULL)
180	<	xt_close(comline);
178	>	/* destroy command line */
179	>	if (comline != NULL)
180	>	xt_close(comline);
181	>	/* check limits */
182	>	if (xres < MINWIDTH)
183	>	xres = MINWIDTH;
184	>	if (yres < MINHEIGHT)
185	>	yres = MINHEIGHT;
186	>	/* resize window */
187	>	if (xres != gwidth || yres != gheight) {
188		XSelectInput(ourdisplay, gwind, 0);
189		XResizeWindow(ourdisplay, gwind, xres, yres+COMHEIGHT);
178	–	comline = xt_open(ourdisplay,
179	–	DefaultGC(ourdisplay,ourscreen),
180	–	gwind, 0, yres, xres, COMHEIGHT, 0, COMFN);
181	–	if (comline == NULL) {
182	–	stderr_v("Cannot open command line window\n");
183	–	quit(1);
184	–	}
185	–	XSelectInput(ourdisplay, comline->w, ExposureMask);
190		gwidth = xres;
191		gheight = yres;
192		XFlush(ourdisplay);
193		sleep(2);                       /* wait for window manager */
194		XSync(ourdisplay, 1);           /* discard input */
195		}
196	+	/* get new command line */
197	+	comline = xt_open(ourdisplay,
198	+	DefaultGC(ourdisplay,ourscreen),
199	+	gwind, 0, gheight, gwidth, COMHEIGHT, 0, COMFN);
200	+	if (comline == NULL) {
201	+	stderr_v("Cannot open command line window\n");
202	+	quit(1);
203	+	}
204	+	XSelectInput(ourdisplay, comline->w, ExposureMask);
205	+	/* clear graphics window */
206		XClearWindow(ourdisplay, gwind);
207	<	if (ourvisual->class == PseudoColor)    /* reinitialize color table */
207	>	/* reinitialize color table */
208	>	if (ourvisual->class == PseudoColor)
209		if (getpixels() == 0)
210		stderr_v("cannot allocate colors\n");
211		else
212		new_ctab(ncolors);
213	<
213	>	/* remove earmuffs */
214		XSelectInput(ourdisplay, gwind,
215		StructureNotifyMask|ExposureMask|KeyPressMask|ButtonPressMask);
216		}

Diff Legend

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