ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/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.8 by greg, Mon Jul 19 15:18:10 1993 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 146 | Line 150 | Window w;
150          register int    i;
151          register unsigned char  *p;
152  
153 <        if (xr->ncolors == 0 || xr->image->depth != 8)
153 >        if (xr->ncolors == 0 || xr->image->depth > 8)
154                  return(NULL);
155          if (xr->pixels != NULL)
156                  return(xr->pixels);
# Line 189 | Line 193 | Window w;
193  
194  
195   Pixmap
196 < make_rpixmap(xr, d)                     /* make pixmap for raster */
196 > make_rpixmap(xr, w)                     /* make pixmap for raster */
197   register XRASTER        *xr;
198 < Drawable        d;
198 > Window  w;
199   {
200 +        XWindowAttributes       xwattr;
201          Pixmap  pm;
202  
203          if (xr->pm != 0)
204                  return(xr->pm);
205 <        pm = XCreatePixmap(xr->disp, d,
205 >        XGetWindowAttributes(xr->disp, w, &xwattr);
206 >        pm = XCreatePixmap(xr->disp, w,
207                          xr->image->width, xr->image->height,
208 <                        xr->image->depth);
208 >                        xwattr.depth);
209          if (pm == 0)
210                  return(0);
211          put_raster(pm, 0, 0, xr);

Diff Legend

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