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

Comparing ray/src/px/x11raster.c (file contents):
Revision 2.5 by greg, Wed May 27 14:28:54 1992 UTC vs.
Revision 2.9 by greg, Wed Nov 23 14:24:32 1994 UTC

# Line 14 | Line 14 | static char SCCSid[] = "$SunId$ LBL";
14   #include <X11/Xlib.h>
15   #include <X11/Xutil.h>
16  
17 + #include "color.h"
18   #include "x11raster.h"
19  
20 + extern char  *malloc(), *realloc(), *calloc();
21  
22 +
23   XRASTER *
24   make_raster(disp, vis, npixbits, data, width, height, bm_pad)
25   Display *disp;
# Line 41 | Line 44 | int    bm_pad;
44                  xr->image = XCreateImage(disp,vis->visual,vis->depth,
45                                  ZPixmap,0,data,width,height,bm_pad,0);
46          xr->image->bitmap_bit_order = MSBFirst;
47 +        xr->image->bitmap_unit = bm_pad;
48          xr->image->byte_order = *(char *)&swaptest ? LSBFirst : MSBFirst;
49          if (vis->depth >= 24 && (xr->image->red_mask != 0xff ||
50                          xr->image->green_mask != 0xff00 ||
# Line 58 | Line 62 | int    bm_pad;
62  
63  
64   int
65 < init_rcolors(xr, rmap, gmap, bmap)              /* initialize colors */
65 > init_rcolors(xr, cmap)                  /* initialize colors */
66   register XRASTER        *xr;
67 < int     rmap[256], gmap[256], bmap[256];
67 > BYTE    cmap[][3];
68   {
69          register unsigned char  *p;
70          register int    i;
71  
72 <        if (xr->image->depth != 8 || xr->ncolors != 0)
72 >        if (xr->image->depth > 8 | xr->ncolors != 0)
73                  return(xr->ncolors);
74          xr->pmap = (short *)malloc(256*sizeof(short));
75          if (xr->pmap == NULL)
# Line 79 | Line 83 | int    rmap[256], gmap[256], bmap[256];
83                          i = xr->image->width*xr->image->height;
84                          i--; p++)
85                  if (xr->pmap[*p] == -1) {
86 <                        xr->cdefs[xr->ncolors].red = rmap[*p] << 8;
87 <                        xr->cdefs[xr->ncolors].green = gmap[*p] << 8;
88 <                        xr->cdefs[xr->ncolors].blue = bmap[*p] << 8;
86 >                        xr->cdefs[xr->ncolors].red = cmap[*p][RED] << 8;
87 >                        xr->cdefs[xr->ncolors].green = cmap[*p][GRN] << 8;
88 >                        xr->cdefs[xr->ncolors].blue = cmap[*p][BLU] << 8;
89                          xr->cdefs[xr->ncolors].pixel = *p;
90                          xr->cdefs[xr->ncolors].flags = DoRed|DoGreen|DoBlue;
91                          xr->pmap[*p] = xr->ncolors++;
# Line 95 | Line 99 | int    rmap[256], gmap[256], bmap[256];
99  
100  
101   Colormap
102 < newcmap(disp, scrn, w, vis)             /* get colormap and fix b & w */
102 > newcmap(disp, scrn, vis)                /* get colormap and fix b & w */
103   Display *disp;
104   int     scrn;
101 – Window  w;
105   Visual  *vis;
106   {
107          XColor  thiscolor;
# Line 107 | Line 110 | Visual *vis;
110          int     n;
111          register int    i, j;
112  
113 <        cmap = XCreateColormap(disp, w, vis, AllocNone);
114 <        if (cmap == 0)
115 <                return(0);
113 >        cmap = XCreateColormap(disp, RootWindow(disp,scrn), vis, AllocNone);
114 >        if (cmap == 0 || vis->class != PseudoColor)
115 >                return(cmap);
116          pixels=(unsigned long *)malloc(vis->map_entries*sizeof(unsigned long));
117          if (pixels == NULL)
118                  return(0);
# Line 139 | Line 142 | Visual *vis;
142  
143  
144   unsigned long *
145 < map_rcolors(xr, w)                              /* get and assign pixels */
145 > map_rcolors(xr, w)                      /* get and assign pixels */
146   register XRASTER        *xr;
147   Window  w;
148   {
149          register int    i;
150          register unsigned char  *p;
151  
152 <        if (xr->ncolors == 0 || xr->image->depth != 8)
152 >        if (xr->ncolors == 0 || xr->image->depth > 8)
153                  return(NULL);
154          if (xr->pixels != NULL)
155                  return(xr->pixels);
# Line 156 | Line 159 | Window w;
159          if (xr->visual == DefaultVisual(xr->disp, xr->screen))
160                  xr->cmap = DefaultColormap(xr->disp, xr->screen);
161          else
162 <                xr->cmap = newcmap(xr->disp, xr->screen, w, xr->visual);
162 >                xr->cmap = newcmap(xr->disp, xr->screen, xr->visual);
163          while (XAllocColorCells(xr->disp, xr->cmap, 0,
164                          NULL, 0, xr->pixels, xr->ncolors) == 0)
165                  if (xr->cmap == DefaultColormap(xr->disp, xr->screen))
166 <                        xr->cmap = newcmap(xr->disp, xr->screen, w, xr->visual);
166 >                        xr->cmap = newcmap(xr->disp, xr->screen, xr->visual);
167                  else {
168                          free((char *)xr->pixels);
169                          xr->pixels = NULL;
# Line 189 | Line 192 | Window w;
192  
193  
194   Pixmap
195 < make_rpixmap(xr, d)                     /* make pixmap for raster */
195 > make_rpixmap(xr, w)                     /* make pixmap for raster */
196   register XRASTER        *xr;
197 < Drawable        d;
197 > Window  w;
198   {
199 +        XWindowAttributes       xwattr;
200          Pixmap  pm;
201  
202          if (xr->pm != 0)
203                  return(xr->pm);
204 <        pm = XCreatePixmap(xr->disp, d,
204 >        XGetWindowAttributes(xr->disp, w, &xwattr);
205 >        pm = XCreatePixmap(xr->disp, w,
206                          xr->image->width, xr->image->height,
207 <                        xr->image->depth);
207 >                        xwattr.depth);
208          if (pm == 0)
209                  return(0);
210          put_raster(pm, 0, 0, xr);

Diff Legend

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