--- ray/src/px/x11image.c 1994/09/20 15:48:15 2.38 +++ ray/src/px/x11image.c 1997/01/27 15:07:03 2.43 @@ -1,4 +1,4 @@ -/* Copyright (c) 1993 Regents of the University of California */ +/* Copyright (c) 1997 Regents of the University of California */ #ifndef lint static char SCCSid[] = "$SunId$ LBL"; @@ -74,7 +74,11 @@ int xoff = 0; /* x image offset */ int yoff = 0; /* y image offset */ int parent = 0; /* number of children, -1 if child */ +int sequential = 0; /* display images in sequence */ +char *tout = "od"; /* output of 't' command */ +int tinterv = 0; /* interval between mouse reports */ + VIEW ourview = STDVIEW; /* image view parameters */ int gotview = 0; /* got parameters from file */ @@ -140,30 +144,40 @@ char *argv[]; for (i = 1; i < argc; i++) if (argv[i][0] == '-') switch (argv[i][1]) { - case 'c': + case 'c': /* number of colors */ maxcolors = atoi(argv[++i]); break; - case 'b': + case 'b': /* greyscale only */ greyscale = !greyscale; break; - case 'm': + case 'm': /* monochrome */ + greyscale = 1; maxcolors = 2; break; - case 'd': + case 'd': /* display or dither */ if (argv[i][2] == 'i') dispname = argv[++i]; else dither = !dither; break; - case 'f': + case 'f': /* save pixmap */ fast = !fast; break; - case 'e': + case 's': /* one at a time */ + sequential = !sequential; + break; + case 'o': /* 't' output */ + tout = argv[i]+2; + break; + case 't': /* msec interval */ + tinterv = atoi(argv[++i]); + break; + case 'e': /* exposure comp. */ if (argv[i+1][0] != '+' && argv[i+1][0] != '-') goto userr; scale = atoi(argv[++i]); break; - case 'g': + case 'g': /* gamma comp. */ if (argv[i][2] == 'e') geometry = argv[++i]; else @@ -214,15 +228,11 @@ char *argv[]; init(argc, argv); /* get file and open window */ - if (parent < 0) { - kill(getppid(), SIGCONT); /* signal parent if child */ - sigrecv--; - } for ( ; ; ) getevent(); /* main loop */ userr: fprintf(stderr, -"Usage: %s [-di disp][[-ge] spec][-b][-m][-d][-f][-c nclrs][-e +/-stops][-g gamcor] pic ..\n", +"Usage: %s [-di disp][[-ge] spec][-b][-m][-d][-f][-c nclrs][-e +/-stops][-g gamcor][-s][-ospec][-t intvl] pic ..\n", progname); exit(1); } @@ -305,17 +315,20 @@ char **argv; } } /* open window */ + i = CWEventMask|CWCursor|CWBackPixel|CWBorderPixel; ourwinattr.border_pixel = ourwhite; ourwinattr.background_pixel = ourblack; - ourwinattr.colormap = XCreateColormap(thedisplay, ourroot, - ourvis.visual, AllocNone); + if (ourvis.visual != DefaultVisual(thedisplay,ourscreen)) { + ourwinattr.colormap = newcmap(thedisplay, ourscreen, ourvis.visual); + i |= CWColormap; + } ourwinattr.event_mask = ExposureMask|KeyPressMask|ButtonPressMask| ButtonReleaseMask|ButtonMotionMask|StructureNotifyMask; ourwinattr.cursor = XCreateFontCursor(thedisplay, XC_diamond_cross); wind = XCreateWindow(thedisplay, ourroot, xszhints.x, xszhints.y, xszhints.width, xszhints.height, BORWIDTH, - ourvis.depth, InputOutput, ourvis.visual, CWEventMask| - CWCursor|CWBackPixel|CWBorderPixel|CWColormap, &ourwinattr); + ourvis.depth, InputOutput, ourvis.visual, + i, &ourwinattr); if (wind == 0) quiterr("cannot create window"); width = xmax; @@ -353,7 +366,6 @@ char **argv; XSetWMProtocols(thedisplay, wind, &closedownAtom, 1); XMapWindow(thedisplay, wind); - return; } /* end of init */ @@ -562,6 +574,10 @@ getevent() /* process the next event */ map_rcolors(ourras, wind); if (fast) make_rpixmap(ourras, wind); + if (!sequential & parent < 0 & sigrecv == 0) { + kill(getppid(), SIGCONT); + sigrecv--; + } break; case UnmapNotify: if (!fast) @@ -574,10 +590,18 @@ getevent() /* process the next event */ case ButtonPress: if (xev.xbutton.state & (ShiftMask|ControlMask)) moveimage(&xev.xbutton); - else if (xev.xbutton.button == Button2) - traceray(xev.xbutton.x, xev.xbutton.y); else - getbox(&xev.xbutton); + switch (xev.xbutton.button) { + case Button1: + getbox(&xev.xbutton); + break; + case Button2: + traceray(xev.xbutton.x, xev.xbutton.y); + break; + case Button3: + trackrays(&xev.xbutton); + break; + } break; case ClientMessage: if ((xev.xclient.message_type == wmProtocolsAtom) && @@ -588,21 +612,45 @@ getevent() /* process the next event */ } -traceray(xpos, ypos) /* print ray corresponding to pixel */ +traceray(xpos, ypos) /* print requested pixel data */ int xpos, ypos; { + extern char *index(); FLOAT hv[2]; FVECT rorg, rdir; + COLOR cval; + register char *cp; - if (!gotview) { /* no view, no can do */ - XBell(thedisplay, 0); - return(-1); - } + box.xmin = xpos; box.xsiz = 1; + box.ymin = ypos; box.ysiz = 1; + avgbox(cval); + scalecolor(cval, 1./exposure); pix2loc(hv, &inpres, xpos-xoff, ypos-yoff); - if (viewray(rorg, rdir, &ourview, hv[0], hv[1]) < 0) - return(-1); - printf("%e %e %e ", rorg[0], rorg[1], rorg[2]); - printf("%e %e %e\n", rdir[0], rdir[1], rdir[2]); + if (!gotview || viewray(rorg, rdir, &ourview, hv[0], hv[1]) < 0) + rorg[0] = rorg[1] = rorg[2] = + rdir[0] = rdir[1] = rdir[2] = 0.; + + for (cp = tout; *cp; cp++) /* print what they asked for */ + switch (*cp) { + case 'o': /* origin */ + printf("%e %e %e ", rorg[0], rorg[1], rorg[2]); + break; + case 'd': /* direction */ + printf("%e %e %e ", rdir[0], rdir[1], rdir[2]); + break; + case 'v': /* radiance value */ + printf("%e %e %e ", colval(cval,RED), + colval(cval,GRN), colval(cval,BLU)); + break; + case 'l': /* luminance */ + printf("%e ", luminance(cval)); + break; + case 'p': /* pixel position */ + printf("%d %d ", (int)(hv[0]*inpres.xr), + (int)(hv[1]*inpres.yr)); + break; + } + putchar('\n'); fflush(stdout); return(0); } @@ -784,6 +832,25 @@ XButtonPressedEvent *ebut; box.ymin = ebut->y; } else { box.ysiz = ebut->y - box.ymin + 1; + } +} + + +trackrays(ebut) /* trace rays as mouse moves */ +XButtonPressedEvent *ebut; +{ + XEvent e; + unsigned long lastrept; + + traceray(ebut->x, ebut->y); + lastrept = ebut->time; + XMaskEvent(thedisplay, ButtonReleaseMask|ButtonMotionMask, &e); + while (e.type == MotionNotify) { + if (e.xmotion.time >= lastrept + tinterv) { + traceray(e.xmotion.x, e.xmotion.y); + lastrept = e.xmotion.time; + } + XMaskEvent(thedisplay,ButtonReleaseMask|ButtonMotionMask,&e); } }