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.34 by root, Thu Jun 14 18:06:15 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 4#if HAVE_BG_PIXMAP
5 #define HAVE_IMG 1 5 #define HAVE_IMG 1
6#endif 6#endif
… …
9 9
10#define float_to_component(d) (int32_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 destroy (); 16 typedef double nv;
17 Picture src_picture ();
18 17
19public:
20 // *could* also hold the Pixmap itself 18 // *could* also hold the Pixmap itself
21 struct pixref 19 struct pixref
22 { 20 {
23 int cnt; 21 int cnt;
24 int w, h; 22 int w, h;
… …
55 } 53 }
56 54
57 // inplace 55 // inplace
58 void move (int dx, int dy) 56 void move (int dx, int dy)
59 { 57 {
60 x -= dx; 58 x += dx;
61 y -= dy; 59 y += dy;
62 } 60 }
63 61
64 void repeat_mode (int repeat) 62 void repeat_mode (int repeat)
65 { 63 {
66 this->repeat = repeat; 64 this->repeat = repeat;
… …
73 //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);
74 //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);
75 void brightness (int32_t r, int32_t g, int32_t b, int32_t a); 73 void brightness (int32_t r, int32_t g, int32_t b, int32_t a);
76 void contrast (int32_t r, int32_t g, int32_t b, int32_t a); 74 void contrast (int32_t r, int32_t g, int32_t b, int32_t a);
77 75
78 void brightness (double r, double g, double b, double a = 1.) 76 void brightness (nv r, nv g, nv b, nv a = 1.)
79 { 77 {
80 brightness (float_to_component (r), 78 brightness (float_to_component (r),
81 float_to_component (g), 79 float_to_component (g),
82 float_to_component (b), 80 float_to_component (b),
83 float_to_component (a)); 81 float_to_component (a));
84 } 82 }
85 83
86 void contrast (double r, double g, double b, double a = 1.) 84 void contrast (nv r, nv g, nv b, nv a = 1.)
87 { 85 {
88 contrast (float_to_component (r), 86 contrast (float_to_component (r),
89 float_to_component (g), 87 float_to_component (g),
90 float_to_component (b), 88 float_to_component (b),
91 float_to_component (a)); 89 float_to_component (a));
92 } 90 }
93 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
94 // copy 98 // copy
95 rxvt_img *reify (); // make x, y 0, make real width/height 99 rxvt_img *reify (); // make x, y 0, make real width/height
96 rxvt_img *blur (int rh, int rv); 100 rxvt_img *blur (int rh, int rv);
97 rxvt_img *clone (); 101 rxvt_img *clone ();
98 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);
99 rxvt_img *transform (double matrix[3][3]); 103 rxvt_img *transform (const nv matrix[3][3]);
100 rxvt_img *scale (int new_width, int new_height); 104 rxvt_img *scale (int new_width, int new_height);
101 rxvt_img *rotate (int cx, int cy, double phi); 105 rxvt_img *rotate (int cx, int cy, nv phi);
102 rxvt_img *convert_format (XRenderPictFormat *format, const rgba &bg); 106 rxvt_img *convert_format (XRenderPictFormat *format, const rgba &bg);
103 rxvt_img *blend (rxvt_img *img, double factor); 107 rxvt_img *blend (rxvt_img *img, nv factor = 1.);
104 108
105 // egregiuous helper category 109 // egregiuous helper category
106 rxvt_img *replace (rxvt_img *&p) 110 rxvt_img *replace (rxvt_img *&p)
107 { 111 {
108 delete p; 112 delete p;
109 p = this; 113 p = this;
110 return this; 114 return this;
111 } 115 }
116
117private:
118
119 void destroy ();
120 Picture picture ();
121 rxvt_img *transform (const nv *matrix);
112}; 122};
113 123
114#endif 124#endif
115 125
116#endif 126#endif

Diff Legend

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