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 1.15 by greg, Tue Jul 10 08:47:07 1990 UTC vs.
Revision 1.17 by greg, Fri Dec 21 17:27:31 1990 UTC

# Line 45 | Line 45 | static char SCCSid[] = "$SunId$ LBL";
45   static XEvent  currentevent;            /* current event */
46  
47   static int  ncolors = 0;                /* color table size */
48 < static int  *pixval = NULL;             /* allocated pixels */
48 > static unsigned long  *pixval = NULL;   /* allocated pixels */
49  
50   static Display  *ourdisplay = NULL;     /* our display */
51  
# Line 138 | Line 138 | char  *name, *id;
138          XSetNormalHints(ourdisplay, gwind, &oursizhints);
139          XSelectInput(ourdisplay, gwind, ExposureMask);
140          XMapWindow(ourdisplay, gwind);
141 <        XWindowEvent(ourdisplay, gwind, ExposureMask, levptr(XExposeEvent));
141 >        XWindowEvent(ourdisplay, gwind, ExposureMask, levptr(XEvent));
142          gwidth = levptr(XExposeEvent)->width;
143          gheight = levptr(XExposeEvent)->height - COMHEIGHT;
144          x11_driver.xsiz = gwidth < MINWIDTH ? MINWIDTH : gwidth;
# Line 336 | Line 336 | int  r, g, b;
336   static int
337   getpixels()                             /* get the color map */
338   {
339 +        XColor  thiscolor;
340 +        register int  i, j;
341 +
342          if (ncolors > 0)
343 <                return(ncolors);
343 >                goto donecolors;
344          if (ourvisual == DefaultVisual(ourdisplay,ourscreen)) {
345                  ourmap = DefaultColormap(ourdisplay,ourscreen);
346                  goto loop;
# Line 348 | Line 351 | loop:
351          for (ncolors = ourvisual->map_entries;
352                          ncolors > ourvisual->map_entries/3;
353                          ncolors = ncolors*.937) {
354 <                pixval = (int *)malloc(ncolors*sizeof(int));
354 >                pixval = (unsigned long *)malloc(ncolors*sizeof(unsigned long));
355                  if (pixval == NULL)
356                          return(ncolors = 0);
357                  if (XAllocColorCells(ourdisplay,ourmap,0,NULL,0,
# Line 363 | Line 366 | loop:
366                  else
367                          return(ncolors = 0);    /* failed */
368          }
369 <        if (ourmap != DefaultColormap(ourdisplay,ourscreen)) {
370 <                XColor  thiscolor;
368 <                register int  i, j;
369 <                                                /* reset black and white */
370 <                for (i = 0; i < ncolors; i++) {
369 >        if (ourmap != DefaultColormap(ourdisplay,ourscreen))
370 >                for (i = 0; i < ncolors; i++) { /* reset black and white */
371                          if (pixval[i] != ourblack && pixval[i] != ourwhite)
372                                  continue;
373                          thiscolor.pixel = pixval[i];
# Line 381 | Line 381 | loop:
381                          ncolors--;
382                          i--;
383                  }
384 –        }
384          XSetWindowColormap(ourdisplay, gwind, ourmap);
385 + donecolors:
386 + #ifdef  DEBUG
387 +        thiscolor.flags = DoRed|DoGreen|DoBlue;
388 +        thiscolor.red = thiscolor.green = thiscolor.blue = 0;
389 +        for (i = 0; i < ncolors; i++) {
390 +                thiscolor.pixel = pixval[i];
391 +                XStoreColor(ourdisplay, ourmap, &thiscolor);
392 +        }
393 + #endif
394          return(ncolors);
395   }
396  

Diff Legend

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