--- ray/src/hd/rhd_x11.c	1998/05/14 13:06:32	3.25
+++ ray/src/hd/rhd_x11.c	1998/12/18 11:56:10	3.31
@@ -1,4 +1,4 @@
-/* Copyright (c) 1997 Silicon Graphics, Inc. */
+/* Copyright (c) 1998 Silicon Graphics, Inc. */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ SGI";
@@ -10,12 +10,10 @@ static char SCCSid[] = "$SunId$ SGI";
  */
 
 #include "standard.h"
-#include "rhd_qtree.h"
-
 #include  <X11/Xlib.h>
 #include  <X11/cursorfont.h>
 #include  <X11/Xutil.h>
-
+#include "rhd_qtree.h"
 #include  "x11icon.h"
 
 #ifndef RAYQLEN
@@ -28,6 +26,8 @@ static char SCCSid[] = "$SunId$ SGI";
 
 #define GAMMA		2.2		/* default gamma correction */
 
+#define FRAMESTATE(s)	(((s)&(ShiftMask|ControlMask))==(ShiftMask|ControlMask))
+
 #define MOVPCT		7		/* percent distance to move /frame */
 #define MOVDIR(b)	((b)==Button1 ? 1 : (b)==Button2 ? 0 : -1)
 #define MOVDEG		(-5)		/* degrees to orbit CW/down /frame */
@@ -49,6 +49,8 @@ static char SCCSid[] = "$SunId$ SGI";
 
 struct driver	odev;			/* global device driver structure */
 
+char odev_args[64];			/* command arguments */
+
 static XEvent  currentevent;		/* current event */
 
 static int  ncolors = 0;		/* color table size */
@@ -68,7 +70,7 @@ static int	inpresflags;		/* input result flags */
 
 static int	headlocked = 0;		/* lock vertical motion */
 
-static int  getpixels(), xnewcolr(), freepixels(), resizewindow(),
+static int  getpixels(), xnewcolr(), freepixels(), resizewindow(), getframe(),
 		getevent(), getkey(), moveview(), getmove(), fixwindow();
 static unsigned long  true_pixel();
 
@@ -265,6 +267,21 @@ VIEW	*nv;
 }
 
 
+dev_section(ofn)		/* add octree for geometry rendering */
+char	*ofn;
+{
+	/* unimplemented */
+}
+
+
+dev_auxcom(cmd, args)		/* process an auxiliary command */
+char	*cmd, *args;
+{
+	sprintf(errmsg, "%s: unknown command", cmd);
+	error(COMMAND, errmsg);
+}
+
+
 VIEW *
 dev_auxview(n, hvres)		/* return nth auxiliary view */
 int	n;
@@ -285,8 +302,10 @@ dev_input()			/* get X11 input */
 	do
 		getevent();
 
-	while (XQLength(ourdisplay) > 0);
+	while (XPending(ourdisplay) > 0);
 
+	odev.inpready = 0;
+
 	return(inpresflags);
 }
 
@@ -314,7 +333,7 @@ dev_flush()			/* flush output */
 {
 	qtUpdate();
 	rayqleft = RAYQLEN;
-	return(XPending(ourdisplay));
+	return(odev.inpready = XPending(ourdisplay));
 }
 
 
@@ -443,7 +462,10 @@ getevent()			/* get next event */
 		getkey(levptr(XKeyPressedEvent));
 		break;
 	case ButtonPress:
-		getmove(levptr(XButtonPressedEvent));
+		if (FRAMESTATE(levptr(XButtonPressedEvent)->state))
+			getframe(levptr(XButtonPressedEvent));
+		else
+			getmove(levptr(XButtonPressedEvent));
 		break;
 	}
 }
@@ -454,11 +476,29 @@ ilclip(dp, wp)			/* clip world coordinates to device *
 int	dp[2][2];
 FVECT	wp[2];
 {
-	static FVECT	vmin = {0.,0.,0.}, vmax = {1.,1.,FHUGE};
-	FVECT	ip[2];
-				/* not exactly right, but who cares? */
-	viewloc(ip[0], &odev.v, wp[0]);
-	viewloc(ip[1], &odev.v, wp[1]);
+	static FVECT	vmin = {0.,0.,0.}, vmax = {1.-FTINY,1.-FTINY,FHUGE};
+	FVECT	wpc[2], ip[2];
+	double	d, d0, d1;
+				/* check for points behind view */
+	d = DOT(odev.v.vp, odev.v.vdir);
+	d0 = DOT(wp[0], odev.v.vdir) - d;
+	d1 = DOT(wp[1], odev.v.vdir) - d;
+				/* work on copy of world points */
+	if (d0 <= d1) {
+		VCOPY(wpc[0], wp[0]); VCOPY(wpc[1], wp[1]);
+	} else {
+		d = d0; d0 = d1; d1 = d;
+		VCOPY(wpc[1], wp[0]); VCOPY(wpc[0], wp[1]);
+	}
+	if (d0 <= FTINY) {
+		if (d1 <= FTINY) return(0);
+		VSUB(wpc[0], wpc[0], wpc[1]);
+		d = .99*d1/(d1-d0);
+		VSUM(wpc[0], wpc[1], wpc[0], d);
+	}
+				/* get view coordinates and clip to window */
+	viewloc(ip[0], &odev.v, wpc[0]);
+	viewloc(ip[1], &odev.v, wpc[1]);
 	if (!clip(ip[0], ip[1], vmin, vmax))
 		return(0);
 	dp[0][0] = ip[0][0]*odev.hres;
@@ -489,8 +529,6 @@ draw_grids()			/* draw holodeck section grids */
 	static BYTE	gridrgb[3] = {0x0, 0xff, 0xff};
 	unsigned long  pixel;
 
-	if (!mapped)
-		return;
 	if (ncolors > 0)
 		pixel = pixval[get_pixel(gridrgb, xnewcolr)];
 	else
@@ -550,6 +588,29 @@ int	dx, dy, mov, orb;
 
 
 static
+getframe(ebut)				/* get focus frame */
+XButtonPressedEvent	*ebut;
+{
+	int	startx = ebut->x, starty = ebut->y;
+	int	endx, endy;
+
+	XMaskEvent(ourdisplay, ButtonReleaseMask, levptr(XEvent));
+	endx = levptr(XButtonReleasedEvent)->x;
+	endy = levptr(XButtonReleasedEvent)->y;
+	if (endx == startx | endy == starty) {
+		XBell(ourdisplay, 0);
+		return;
+	}
+	if (endx < startx) {register int c = endx; endx = startx; startx = c;}
+	if (endy < starty) {register int c = endy; endy = starty; starty = c;}
+	sprintf(odev_args, "%.3f %.3f %.3f %.3f",
+			(startx+.5)/odev.hres, 1.-(endy+.5)/odev.vres,
+			(endx+.5)/odev.hres, 1.-(starty+.5)/odev.vres);
+	inpresflags |= DFL(DC_FOCUS);
+}
+
+
+static
 getmove(ebut)				/* get view change */
 XButtonPressedEvent	*ebut;
 {
@@ -594,6 +655,9 @@ static
 getkey(ekey)				/* get input key */
 register XKeyPressedEvent  *ekey;
 {
+	Window	rootw, childw;
+	int	rootx, rooty, wx, wy;
+	unsigned int	statemask;
 	int  n;
 	char	buf[8];
 
@@ -609,6 +673,18 @@ register XKeyPressedEvent  *ekey;
 		return;
 	case 'l':			/* retrieve last view */
 		inpresflags |= DFL(DC_LASTVIEW);
+		return;
+	case 'f':			/* frame view position */
+		if (!XQueryPointer(ourdisplay, gwind, &rootw, &childw,
+				&rootx, &rooty, &wx, &wy, &statemask))
+			return;		/* on another screen */
+		sprintf(odev_args, "%.4f %.4f", (wx+.5)/odev.hres,
+				1.-(wy+.5)/odev.vres);
+		inpresflags |= DFL(DC_FOCUS);
+		return;
+	case 'F':			/* unfocus */
+		odev_args[0] = '\0';
+		inpresflags |= DFL(DC_FOCUS);
 		return;
 	case 'p':			/* pause computation */
 		inpresflags |= DFL(DC_PAUSE);