ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvtimg.h
(Generate patch)

Comparing rxvt-unicode/src/rxvtimg.h (file contents):
Revision 1.27 by root, Sat Jun 9 10:21:19 2012 UTC vs.
Revision 1.40 by root, Fri Jun 15 19:50:56 2012 UTC

1#ifndef IMG_H 1#ifndef IMG_H),
2#define IMG_H 2#define IMG_H
3 3
4#if HAVE_BG_PIXMAP && BG_IMAGE_FROM_FILE && ENABLE_TRANSPARENCY && HAVE_PIXBUF 4#if HAVE_BG_PIXMAP
5 #define HAVE_IMG 1 5 #define HAVE_IMG 1
6#endif 6#endif
7 7
8#if HAVE_IMG 8#if HAVE_IMG
9 9
10#define float_to_component(d) (uint16_t)((d) * 65535.99) 10#define float_to_component(d) (int32_t)((d) * 65535.99)
11 11
12#include <X11/extensions/Xrender.h> 12#include <X11/extensions/Xrender.h>
13 13
14class rxvt_img 14struct rxvt_img
15{ 15{
16 void alloc (); 16 typedef double nv;
17 void destroy ();
18 Picture src_picture ();
19 17
20public:
21 // *could* also hold the Pixmap itself 18 // *could* also hold the Pixmap itself
22 struct pixref 19 struct pixref
23 { 20 {
24 int cnt; 21 int cnt;
25 int w, h; 22 int w, h;
… …
37 int x, y, w, h, repeat; 34 int x, y, w, h, repeat;
38 XRenderPictFormat *format; 35 XRenderPictFormat *format;
39 36
40 rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int x, int y, int width, int height, int repeat = RepeatNormal); 37 rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int x, int y, int width, int height, int repeat = RepeatNormal);
41 rxvt_img (const rxvt_img &img); 38 rxvt_img (const rxvt_img &img);
39 void alloc ();
42 40
41# if HAVE_PIXBUF
43 static rxvt_img *new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb); // from pixbuf 42 static rxvt_img *new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb); // from pixbuf
44 static rxvt_img *new_from_file (rxvt_screen *s, const char *filename); // via pixbuf 43 static rxvt_img *new_from_file (rxvt_screen *s, const char *filename); // via pixbuf
44# endif
45 static rxvt_img *new_from_root (rxvt_screen *s); // get root pixmap 45 static rxvt_img *new_from_root (rxvt_screen *s); // get root pixmap
46 46
47 ~rxvt_img (); 47 ~rxvt_img ();
48 48
49 Pixmap steal () 49 Pixmap steal ()
… …
53 } 53 }
54 54
55 // inplace 55 // inplace
56 void move (int dx, int dy) 56 void move (int dx, int dy)
57 { 57 {
58 x -= dx; 58 x += dx;
59 y -= dy; 59 y += dy;
60 } 60 }
61 61
62 void repeat_mode (int repeat) 62 void repeat_mode (int repeat)
63 { 63 {
64 this->repeat = repeat; 64 this->repeat = repeat;
65 } 65 }
66 66
67 void unshare (); // prepare for write 67 void unshare (); // prepare for write
68 void fill (const rxvt_color &c); 68 void fill (const rgba &c);
69 void add_alpha ();
69 //void linear_gradient (const XLinearGradient *gradient, const XFixed *stops, const XRenderColor *colors, int nstops); 70 //void linear_gradient (const XLinearGradient *gradient, const XFixed *stops, const XRenderColor *colors, int nstops);
70 //void radial_gradient (const XRadialGradient *gradient, const XFixed *stops, const XRenderColor *colors, int nstops); 71 //void radial_gradient (const XRadialGradient *gradient, const XFixed *stops, const XRenderColor *colors, int nstops);
71 //void conical_gradient (const XConicalGradient *gradient, const XFixed *stops, const XRenderColor *colors, int nstops); 72 //void conical_gradient (const XConicalGradient *gradient, const XFixed *stops, const XRenderColor *colors, int nstops);
72 void brightness (uint16_t r, uint16_t g, uint16_t b, uint16_t a); 73 void brightness (int32_t r, int32_t g, int32_t b, int32_t a);
73 void contrast (uint16_t r, uint16_t g, uint16_t b, uint16_t a); 74 void contrast (int32_t r, int32_t g, int32_t b, int32_t a);
74 75
75 void brightness (double r, double g, double b, double a = 1.) 76 void brightness (nv r, nv g, nv b, nv a = 1.)
76 { 77 {
77 brightness (float_to_component (r), 78 brightness (float_to_component (r),
78 float_to_component (g), 79 float_to_component (g),
79 float_to_component (b), 80 float_to_component (b),
80 float_to_component (a)); 81 float_to_component (a));
81 } 82 }
82 83
83 void contrast (double r, double g, double b, double a = 1.) 84 void contrast (nv r, nv g, nv b, nv a = 1.)
84 { 85 {
85 contrast (float_to_component (r), 86 contrast (float_to_component (r),
86 float_to_component (g), 87 float_to_component (g),
87 float_to_component (b), 88 float_to_component (b),
88 float_to_component (a)); 89 float_to_component (a));
89 } 90 }
90 91
92 void draw (rxvt_img *img, int op = PictOpOver, nv mask = 1.);
93#if 0
94 void draw (rxvt_img *img, int op = PictOpOver, nv mask = 1.,
95 nv px, nv py, nv qx, nv qy, nv rx, nv ry, nv sx, nv sy);
96#endif
97
91 // copy 98 // copy
92 rxvt_img *reify (); // make x, y 0, make real width/height 99 rxvt_img *reify (); // make x, y 0, make real width/height
93 rxvt_img *blur (int rh, int rv); 100 rxvt_img *blur (int rh, int rv);
94 rxvt_img *clone (); 101 rxvt_img *clone ();
95 rxvt_img *sub_rect (int x, int y, int width, int height); 102 rxvt_img *sub_rect (int x, int y, int width, int height);
96 rxvt_img *transform (int new_width, int new_height, double matrix[9]); 103 rxvt_img *transform (const nv matrix[3][3]);
97 rxvt_img *scale (int new_width, int new_height); 104 rxvt_img *scale (int new_width, int new_height);
98 rxvt_img *rotate (int new_width, int new_height, int x, int y, double phi); 105 rxvt_img *rotate (int cx, int cy, nv phi);
99 rxvt_img *convert_format (XRenderPictFormat *format, const rxvt_color &bg); 106 rxvt_img *convert_format (XRenderPictFormat *format, const rgba &bg);
100 rxvt_img *blend (rxvt_img *img, double factor); 107 rxvt_img *blend (rxvt_img *img, nv factor = 1.);
101 108
102 // egregiuous helper category 109 // egregiuous helper category
103 rxvt_img *replace (rxvt_img *&p) 110 rxvt_img *replace (rxvt_img *&p)
104 { 111 {
105 delete p; 112 delete p;
106 p = this; 113 p = this;
107 return this; 114 return this;
108 } 115 }
116
117private:
118
119 void destroy ();
120 Picture picture ();
121 rxvt_img *transform (const nv *matrix);
109}; 122};
110 123
111#endif 124#endif
112 125
113#endif 126#endif

Diff Legend

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