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

Comparing ray/src/rt/x11.c (file contents):
Revision 2.7 by greg, Thu Jun 25 13:32:47 1992 UTC vs.
Revision 2.10 by greg, Tue Mar 2 10:56:33 1993 UTC

# Line 26 | Line 26 | static char SCCSid[] = "$SunId$ LBL";
26   #define GAMMA           2.2             /* default exponent correction */
27  
28   #define MINWIDTH        (32*COMCW)      /* minimum graphics window width */
29 < #define MINHEIGHT       MINWIDTH        /* minimum graphics window height */
29 > #define MINHEIGHT       (MINWIDTH/2)    /* minimum graphics window height */
30  
31   #define BORWIDTH        5               /* border width */
32   #define COMHEIGHT       (COMLH*COMCH)   /* command line height (pixels) */
# Line 44 | Line 44 | static char SCCSid[] = "$SunId$ LBL";
44   static XEvent  currentevent;            /* current event */
45  
46   static int  ncolors = 0;                /* color table size */
47 + static int  mapped = 0;                 /* window is mapped? */
48   static unsigned long  *pixval = NULL;   /* allocated pixels */
49   static unsigned long  ourblack=0, ourwhite=1;
50  
# Line 160 | Line 161 | char  *name, *id;
161          x11_driver.xsiz = gwidth < MINWIDTH ? MINWIDTH : gwidth;
162          x11_driver.ysiz = gheight < MINHEIGHT ? MINHEIGHT : gheight;
163          x11_driver.inpready = 0;
164 +        mapped = 1;
165          cmdvec = x11_comout;                    /* set error vectors */
166          if (wrnvec != NULL)
167                  wrnvec = x11_errout;
# Line 241 | Line 243 | int  xmin, ymin, xmax, ymax;
243          extern unsigned long  true_pixel();
244          unsigned long  pixel;
245  
246 +        if (!mapped)
247 +                return;
248          if (ncolors > 0)
249                  pixel = pixval[get_pixel(col, xnewcolr)];
246 –        else if (ourvinfo.class == TrueColor || ourvinfo.class == DirectColor)
247 –                pixel = true_pixel(col);
250          else
251 <                return;
251 >                pixel = true_pixel(col);
252          XSetForeground(ourdisplay, ourgc, pixel);
253          XFillRectangle(ourdisplay, gwind,
254                  ourgc, xmin, gheight-ymax, xmax-xmin, ymax-ymin);
# Line 319 | Line 321 | int  *xp, *yp;
321          if (c_last > c_first)                   /* key pressed */
322                  return(x11_getc());
323                                                  /* button pressed */
324 <        if (levptr(XButtonPressedEvent)->button & Button1)
324 >        if (levptr(XButtonPressedEvent)->button == Button1)
325                  return(MB1);
326 <        if (levptr(XButtonPressedEvent)->button & Button2)
326 >        if (levptr(XButtonPressedEvent)->button == Button2)
327                  return(MB2);
328 <        if (levptr(XButtonPressedEvent)->button & Button3)
328 >        if (levptr(XButtonPressedEvent)->button == Button3)
329                  return(MB3);
328 –        if (levptr(XButtonPressedEvent)->button & (Button4|Button5))
329 –                return(MB1);
330          return(ABORT);
331   }
332  
# Line 369 | Line 369 | loop:
369                  pixval = (unsigned long *)malloc(ncolors*sizeof(unsigned long));
370                  if (pixval == NULL)
371                          return(ncolors = 0);
372 <                if (XAllocColorCells(ourdisplay,ourmap,0,NULL,0,
373 <                                pixval,ncolors) != 0)
372 >                if (XAllocColorCells(ourdisplay,ourmap,0,NULL,0,pixval,ncolors))
373                          break;
374                  free((char *)pixval);
375                  pixval = NULL;
# Line 452 | Line 451 | getevent()                     /* get next event */
451                  resizewindow(levptr(XConfigureEvent));
452                  break;
453          case UnmapNotify:
454 +                mapped = 0;
455                  freepixels();
456                  break;
457          case MapNotify:
# Line 461 | Line 461 | getevent()                     /* get next event */
461                                  stderr_v("Cannot allocate colors\n");
462                          else
463                                  new_ctab(ncolors);
464 +                mapped = 1;
465                  break;
466          case Expose:
467                  fixwindow(levptr(XExposeEvent));

Diff Legend

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