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.29 by sf-exg, Sat Jun 9 17:28:03 2012 UTC vs.
Revision 1.39 by root, Fri Jun 15 18:36:26 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 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
43# if HAVE_PIXBUF 41# if HAVE_PIXBUF
44 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
45 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
46# endif 44# endif
… …
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;
67 } 65 }
68 66
69 void unshare (); // prepare for write 67 void unshare (); // prepare for write
70 void fill (const rxvt_color &c); 68 void fill (const rgba &c);
69 void add_alpha ();
71 //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);
72 //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);
73 //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);
74 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);
75 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);
76 75
77 void brightness (double r, double g, double b, double a = 1.) 76 void brightness (nv r, nv g, nv b, nv a = 1.)
78 { 77 {
79 brightness (float_to_component (r), 78 brightness (float_to_component (r),
80 float_to_component (g), 79 float_to_component (g),
81 float_to_component (b), 80 float_to_component (b),
82 float_to_component (a)); 81 float_to_component (a));
83 } 82 }
84 83
85 void contrast (double r, double g, double b, double a = 1.) 84 void contrast (nv r, nv g, nv b, nv a = 1.)
86 { 85 {
87 contrast (float_to_component (r), 86 contrast (float_to_component (r),
88 float_to_component (g), 87 float_to_component (g),
89 float_to_component (b), 88 float_to_component (b),
90 float_to_component (a)); 89 float_to_component (a));
91 } 90 }
92 91
92 void draw (rxvt_img *img, int op = PictOpOver, nv mask = 1.);
93
93 // copy 94 // copy
94 rxvt_img *reify (); // make x, y 0, make real width/height 95 rxvt_img *reify (); // make x, y 0, make real width/height
95 rxvt_img *blur (int rh, int rv); 96 rxvt_img *blur (int rh, int rv);
96 rxvt_img *clone (); 97 rxvt_img *clone ();
97 rxvt_img *sub_rect (int x, int y, int width, int height); 98 rxvt_img *sub_rect (int x, int y, int width, int height);
98 rxvt_img *transform (int new_width, int new_height, double matrix[9]); 99 rxvt_img *transform (const nv matrix[3][3]);
99 rxvt_img *scale (int new_width, int new_height); 100 rxvt_img *scale (int new_width, int new_height);
100 rxvt_img *rotate (int new_width, int new_height, int x, int y, double phi); 101 rxvt_img *rotate (int cx, int cy, nv phi);
101 rxvt_img *convert_format (XRenderPictFormat *format, const rxvt_color &bg); 102 rxvt_img *convert_format (XRenderPictFormat *format, const rgba &bg);
102 rxvt_img *blend (rxvt_img *img, double factor); 103 rxvt_img *blend (rxvt_img *img, nv factor = 1.);
103 104
104 // egregiuous helper category 105 // egregiuous helper category
105 rxvt_img *replace (rxvt_img *&p) 106 rxvt_img *replace (rxvt_img *&p)
106 { 107 {
107 delete p; 108 delete p;
108 p = this; 109 p = this;
109 return this; 110 return this;
110 } 111 }
112
113private:
114
115 void destroy ();
116 Picture picture ();
117 rxvt_img *transform (const nv *matrix);
111}; 118};
112 119
113#endif 120#endif
114 121
115#endif 122#endif

Diff Legend

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