--- ray/src/rt/x11.c	1990/02/23 14:50:38	1.7
+++ ray/src/rt/x11.c	1990/03/08 10:09:58	1.12
@@ -84,8 +84,9 @@ char  *name, *id;
 {
 	int  nplanes;
 	XVisualInfo  ourvinfo;
+	XSetWindowAttributes	ourwinattr;
 	XWMHints  ourxwmhints;
-	Pixmap  bmCursorSrc, bmCursorMsk;
+	XSizeHints	oursizhints;
 
 	ourdisplay = XOpenDisplay(NULL);
 	if (ourdisplay == NULL) {
@@ -109,22 +110,29 @@ char  *name, *id;
 	}
 	ourvisual = ourvinfo.visual;
 	make_gmap(GAMMA);
-	/* create a cursor */
-	pickcursor = XCreateFontCursor (ourdisplay, XC_diamond_cross);
 	/* open window */
-	gwind = XCreateSimpleWindow(ourdisplay, ourroot, 0, 0,
+	ourwinattr.background_pixel = ourblack;
+	ourwinattr.border_pixel = ourblack;
+	gwind = XCreateWindow(ourdisplay, ourroot, 0, 0,
 		DisplayWidth(ourdisplay,ourscreen)-2*BORWIDTH,
 		DisplayHeight(ourdisplay,ourscreen)-2*BORWIDTH,
-		BORWIDTH, ourblack, ourwhite);
+		BORWIDTH, nplanes, InputOutput, ourvisual,
+		CWBackPixel|CWBorderPixel, &ourwinattr);
 	if (gwind == 0) {
 		stderr_v("cannot create window\n");
 		return(NULL);
 	}
 	XStoreName(ourdisplay, gwind, id);
+	/* create a cursor */
+	pickcursor = XCreateFontCursor(ourdisplay, XC_diamond_cross);
 	ourgc = XCreateGC(ourdisplay, gwind, 0, NULL);
 	ourxwmhints.flags = InputHint;
 	ourxwmhints.input = True;
 	XSetWMHints(ourdisplay, gwind, &ourxwmhints);
+	oursizhints.min_width = MINWIDTH;
+	oursizhints.min_height = MINHEIGHT+COMHEIGHT;
+	oursizhints.flags = PMinSize;
+	XSetNormalHints(ourdisplay, gwind, &oursizhints);
 	XSelectInput(ourdisplay, gwind, ExposureMask);
 	XMapWindow(ourdisplay, gwind);
 	XWindowEvent(ourdisplay, gwind, ExposureMask, levptr(XExposeEvent));
@@ -152,13 +160,11 @@ x11_close()			/* close our display */
 		xt_close(comline);
 		comline = NULL;
 	}
-	if (gwind != 0) {
-		freepixels();
-		XFreeGC(ourdisplay, ourgc);
-		XDestroyWindow(ourdisplay, gwind);
-		gwind = 0;
-		ourgc = 0;
-	}
+	freepixels();
+	XFreeGC(ourdisplay, ourgc);
+	XDestroyWindow(ourdisplay, gwind);
+	gwind = 0;
+	ourgc = 0;
 	XFreeCursor(ourdisplay, pickcursor);
 	XCloseDisplay(ourdisplay);
 	ourdisplay = NULL;
@@ -169,31 +175,42 @@ static
 x11_clear(xres, yres)			/* clear our display */
 int  xres, yres;
 {
-	if (xres != gwidth || yres != gheight) {	/* change window */
-		if (comline != NULL)
-			xt_close(comline);
+						/* destroy command line */
+	if (comline != NULL)
+		xt_close(comline);
+						/* check limits */
+	if (xres < MINWIDTH)
+		xres = MINWIDTH;
+	if (yres < MINHEIGHT)
+		yres = MINHEIGHT;
+						/* resize window */
+	if (xres != gwidth || yres != gheight) {
 		XSelectInput(ourdisplay, gwind, 0);
 		XResizeWindow(ourdisplay, gwind, xres, yres+COMHEIGHT);
-		comline = xt_open(ourdisplay,
-				DefaultGC(ourdisplay,ourscreen),
-				gwind, 0, yres, xres, COMHEIGHT, 0, COMFN);
-		if (comline == NULL) {
-			stderr_v("Cannot open command line window\n");
-			quit(1);
-		}
-		XSelectInput(ourdisplay, comline->w, ExposureMask);
 		gwidth = xres;
 		gheight = yres;
-		XSync(ourdisplay, 1);		/* discard input */
+		XFlush(ourdisplay);
 		sleep(2);			/* wait for window manager */
+		XSync(ourdisplay, 1);		/* discard input */
 	}
+						/* get new command line */
+	comline = xt_open(ourdisplay,
+			DefaultGC(ourdisplay,ourscreen),
+			gwind, 0, gheight, gwidth, COMHEIGHT, 0, COMFN);
+	if (comline == NULL) {
+		stderr_v("Cannot open command line window\n");
+		quit(1);
+	}
+	XSelectInput(ourdisplay, comline->w, ExposureMask);
+						/* clear graphics window */
 	XClearWindow(ourdisplay, gwind);
-	if (ourvisual->class == PseudoColor)	/* reinitialize color table */
+						/* reinitialize color table */
+	if (ourvisual->class == PseudoColor)
 		if (getpixels() == 0)
 			stderr_v("cannot allocate colors\n");
 		else
 			new_ctab(ncolors);
-
+						/* remove earmuffs */
 	XSelectInput(ourdisplay, gwind,
 		StructureNotifyMask|ExposureMask|KeyPressMask|ButtonPressMask);
 }
@@ -223,8 +240,7 @@ int  xmin, ymin, xmax, ymax;
 static
 x11_flush()			/* flush output */
 {
-	if (ncolors <= 0)	/* output necessary for death */
-		XFillRectangle(ourdisplay, gwind, ourgc, 0, 0, 1 ,1);
+	XNoOp(ourdisplay);
 	while (XPending(ourdisplay) > 0)
 		getevent();
 }
@@ -251,9 +267,11 @@ static
 x11_comout(out)			/* output a string to command line */
 char  *out;
 {
-	if (comline != NULL)
-		xt_puts(out, comline);
-	XFlush(ourdisplay);
+	if (comline == NULL)
+		return;
+	xt_puts(out, comline);
+	if (out[strlen(out)-1] == '\n')
+		XFlush(ourdisplay);
 }
 
 
@@ -261,8 +279,8 @@ static
 x11_errout(msg)			/* output an error message */
 char  *msg;
 {
-	x11_comout(msg);
 	stderr_v(msg);		/* send to stderr also! */
+	x11_comout(msg);
 }
 
 
@@ -375,7 +393,7 @@ freepixels()				/* free our pixels */
 		return;
 	XFreeColors(ourdisplay,ourmap,pixval,ncolors,0L);
 	ncolors = 0;
-	if (ourmap != 0 && ourmap != DefaultColormap(ourdisplay,ourscreen))
+	if (ourmap != DefaultColormap(ourdisplay,ourscreen))
 		XFreeColormap(ourdisplay, ourmap);
 	ourmap = 0;
 }
@@ -442,7 +460,7 @@ static
 getkey(ekey)				/* get input key */
 register XKeyPressedEvent  *ekey;
 {
-	int  n;
+	register int  n;
 
 	n = XLookupString(ekey, c_queue+c_last, sizeof(c_queue)-c_last,
 				NULL, NULL);