--- ray/src/hd/rhd_x11.c 1997/12/19 14:44:58 3.17 +++ ray/src/hd/rhd_x11.c 1998/01/01 13:00:15 3.20 @@ -18,6 +18,10 @@ static char SCCSid[] = "$SunId$ SGI"; #include "x11icon.h" +#ifndef RAYQLEN +#define RAYQLEN 50000 /* max. rays to queue before flush */ +#endif + #ifndef FEQ #define FEQ(a,b) ((a)-(b) <= FTINY && (a)-(b) >= -FTINY) #endif @@ -81,9 +85,9 @@ mytmflags() /* figure out tone mapping flags */ for (cp = tail; *cp && *cp != '.'; cp++) ; if (cp-tail == 3 && !strncmp(tail, "x11", 3)) - return(TM_F_CAMERA); + return(TM_F_CAMERA|TM_F_NOSTDERR); if (cp-tail == 4 && !strncmp(tail, "x11h", 4)) - return(TM_F_HUMAN); + return(TM_F_HUMAN|TM_F_NOSTDERR); error(USER, "illegal driver name"); } @@ -158,25 +162,22 @@ char *id; oursizhints.min_height = MINHEIGHT; oursizhints.flags = PMinSize; XSetNormalHints(ourdisplay, gwind, &oursizhints); + /* figure out sensible view */ + pwidth = (double)DisplayWidthMM(ourdisplay, ourscreen) / + DisplayWidth(ourdisplay, ourscreen); + pheight = (double)DisplayHeightMM(ourdisplay, ourscreen) / + DisplayHeight(ourdisplay, ourscreen); + copystruct(&odev.v, &stdview); + odev.v.type = VT_PER; /* map the window and get its size */ XMapWindow(ourdisplay, gwind); - dev_input(); + dev_input(); /* sets size and view angles */ /* allocate our leaf pile */ if (!qtAllocLeaves(DisplayWidth(ourdisplay,ourscreen) * DisplayHeight(ourdisplay,ourscreen) / (qtMinNodesiz*qtMinNodesiz))) error(SYSTEM, "insufficient memory for leaf storage"); - - /* figure out sensible view */ - pwidth = (double)DisplayWidthMM(ourdisplay, ourscreen) / - DisplayWidth(ourdisplay, ourscreen); - pheight = (double)DisplayHeightMM(ourdisplay, ourscreen) / - DisplayHeight(ourdisplay, ourscreen); - copystruct(&odev.v, &stdview); odev.name = id; - odev.v.type = VT_PER; - odev.v.horiz = 2.*180./PI * atan(0.5/VIEWDIST*pwidth*odev.hres); - odev.v.vert = 2.*180./PI * atan(0.5/VIEWDIST*pheight*odev.vres); odev.ifd = ConnectionNumber(ourdisplay); } @@ -236,6 +237,7 @@ VIEW *nv; odev.vres = dh; } XResizeWindow(ourdisplay, gwind, odev.hres, odev.vres); + dev_input(); /* wait for resize event */ } copystruct(&odev.v, nv); } @@ -280,6 +282,7 @@ int dev_flush() /* flush output */ { qtUpdate(); + rayqleft = RAYQLEN; return(XPending(ourdisplay)); } @@ -455,7 +458,7 @@ draw_grids() /* draw holodeck section grids */ static BYTE gridrgb[3] = {0x0, 0xff, 0xff}; unsigned long pixel; - if (!mapped || odev.v.type != VT_PER) + if (!mapped) return; if (ncolors > 0) pixel = pixval[get_pixel(gridrgb, xnewcolr)];