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.16 by greg, Wed Jul 18 12:25: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 351 | 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,

Diff Legend

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