ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/hd/rhd_x11.c
(Generate patch)

Comparing ray/src/hd/rhd_x11.c (file contents):
Revision 3.33 by greg, Mon Apr 14 16:56:19 2003 UTC vs.
Revision 3.36 by greg, Fri Sep 19 18:33:05 2003 UTC

# Line 176 | Line 176 | char  *id;
176                          DisplayWidth(ourdisplay, ourscreen);
177          pheight = (double)DisplayHeightMM(ourdisplay, ourscreen) /
178                          DisplayHeight(ourdisplay, ourscreen);
179 <        copystruct(&odev.v, &stdview);
179 >        odev.v = stdview;
180          odev.v.type = VT_PER;
181                                          /* map the window and get its size */
182          XMapWindow(ourdisplay, gwind);
# Line 258 | Line 258 | VIEW   *nv;
258                          XResizeWindow(ourdisplay, gwind, odev.hres, odev.vres);
259                          dev_input();    /* wait for resize event */
260                  }
261 <                copystruct(&odev.v, nv);
261 >                odev.v = *nv;
262          }
263          qtReplant();
264          return(1);
# Line 546 | Line 546 | int    dx, dy, mov, orb;
546          double  d;
547          register int    li;
548                                  /* start with old view */
549 <        copystruct(&nv, &odev.v);
549 >        nv = odev.v;
550                                  /* change view direction */
551          if (mov | orb) {
552                  if ((li = qtFindLeaf(dx, dy)) < 0)
# Line 595 | Line 595 | XButtonPressedEvent    *ebut;
595          XMaskEvent(ourdisplay, ButtonReleaseMask, levptr(XEvent));
596          endx = levptr(XButtonReleasedEvent)->x;
597          endy = levptr(XButtonReleasedEvent)->y;
598 <        if (endx == startx | endy == starty) {
598 >        if ((endx == startx) | (endy == starty)) {
599                  XBell(ourdisplay, 0);
600                  return;
601          }
# Line 613 | Line 613 | waitabit()                             /* pause a moment */
613   {
614          struct timespec ts;
615          ts.tv_sec = 0;
616 <        ts.tv_nsec = 50000000;
616 >        ts.tv_nsec = 100000000;
617          nanosleep(&ts, NULL);
618   }
619  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines