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

Comparing ray/src/px/x11raster.h (file contents):
Revision 1.2 by greg, Thu Mar 1 18:13:36 1990 UTC vs.
Revision 2.5 by greg, Fri May 20 02:06:39 2011 UTC

# Line 1 | Line 1
1 < /* Copyright 1990 Regents of the University of California */
2 <
3 < /* SCCSid "$SunId$ LBL" */
4 <
1 > /* RCSid: $Id$ */
2   /*
3   * x11raster.h - header file for X routines using images.
4   *
5   *      3/1/90
6   */
7 + #ifndef _RAD_X11RASTER_H_
8 + #define _RAD_X11RASTER_H_
9  
10 + #ifdef __cplusplus
11 + extern "C" {
12 + #endif
13 +
14 +
15   typedef struct {
16          Display *disp;                          /* the display */
17          int     screen;                         /* the screen */
# Line 22 | Line 26 | typedef struct {
26          Pixmap  pm;                             /* storage on server side */
27   }       XRASTER;
28  
29 < extern unsigned long    *map_rcolors();
29 > extern Colormap newcmap(Display *disp, int      scrn, Visual    *vis);
30 > extern int init_rcolors(XRASTER *xr, uby8       cmap[][3]);
31 > extern unsigned long * map_rcolors(XRASTER      *xr, Window     w);
32 > extern Pixmap make_rpixmap(XRASTER      *xr, Window     w);
33 > extern XRASTER * make_raster( Display   *disp, XVisualInfo      *vis,
34 >        int     npixbits, char  *data, int      width, int height, int  bm_pad);
35 > extern void patch_raster(Drawable       d, int  xsrc, int       ysrc,
36 >        int     xdst, int       ydst, int       width, int      height, register XRASTER        *xr);
37 > extern void unmap_rcolors(XRASTER *xr);
38 > extern void free_rpixmap(XRASTER *xr);
39 > extern void free_raster(XRASTER *xr);
40  
27 – extern Pixmap   make_rpixmap();
28 –
29 – extern XRASTER  *make_raster();
30 –
41   #define put_raster(d,xdst,ydst,xr) patch_raster(d,0,0,xdst,ydst, \
42                                  (xr)->image->width,(xr)->image->height,xr)
43 +
44 + #ifdef __cplusplus
45 + }
46 + #endif
47 + #endif /* _RAD_X11RASTER_H_ */
48 +

Diff Legend

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