ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/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.8 by greg, Wed Sep 16 16:15:42 1992 UTC

# 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 369 | Line 371 | loop:
371                  pixval = (unsigned long *)malloc(ncolors*sizeof(unsigned long));
372                  if (pixval == NULL)
373                          return(ncolors = 0);
374 <                if (XAllocColorCells(ourdisplay,ourmap,0,NULL,0,
373 <                                pixval,ncolors) != 0)
374 >                if (XAllocColorCells(ourdisplay,ourmap,0,NULL,0,pixval,ncolors))
375                          break;
376                  free((char *)pixval);
377                  pixval = NULL;
# Line 452 | Line 453 | getevent()                     /* get next event */
453                  resizewindow(levptr(XConfigureEvent));
454                  break;
455          case UnmapNotify:
456 +                mapped = 0;
457                  freepixels();
458                  break;
459          case MapNotify:
# Line 461 | Line 463 | getevent()                     /* get next event */
463                                  stderr_v("Cannot allocate colors\n");
464                          else
465                                  new_ctab(ncolors);
466 +                mapped = 1;
467                  break;
468          case Expose:
469                  fixwindow(levptr(XExposeEvent));

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)