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.17 by root, Thu Jun 7 07:53:12 2012 UTC vs.
Revision 1.28 by root, Sat Jun 9 11:13:14 2012 UTC

… …
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) ((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 14class rxvt_img
15{ 15{
16 void alloc (); 16 void alloc ();
17 void destroy (); 17 void destroy ();
18 Picture src_picture ();
18 19
19public: 20public:
21 // *could* also hold the Pixmap itself
22 struct pixref
23 {
24 int cnt;
25 int w, h;
26 bool ours; // false if we don't own the pixmap at all
27
28 pixref (int w, int h)
29 : cnt(1), w(w), h(h), ours(true)
30 {
31 }
32 };
33
20 rxvt_screen *s; 34 rxvt_screen *s;
21 Pixmap pm; 35 Pixmap pm;
22 int *refcnt; // shared refcnt 36 pixref *ref; // shared refcnt
23 int x, y, w, h, repeat; 37 int x, y, w, h, repeat;
24 XRenderPictFormat *format; 38 XRenderPictFormat *format;
25 39
26 rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height); 40 rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int x, int y, int width, int height, int repeat = RepeatNormal);
27 rxvt_img (const rxvt_img &img); 41 rxvt_img (const rxvt_img &img);
28 42
29 //rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap); 43 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
30 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
31 static rxvt_img *new_from_file (rxvt_screen *s, const char *filename); // from pixbuf
32 46
33 ~rxvt_img (); 47 ~rxvt_img ();
34 48
35 // TODO: steal should not do what it does, and this todo should be more specific
36 Pixmap steal () 49 Pixmap steal ()
37 { 50 {
38 Pixmap retval = pm; 51 ref->ours = false;
39 pm = None;
40 return retval; 52 return pm;
41 } 53 }
42 54
43 // inplace 55 // inplace
44 void move (int dx, int dy) 56 void move (int dx, int dy)
45 { 57 {
46 x += dx; 58 x -= dx;
47 y += dy; 59 y -= dy;
48 } 60 }
49 61
50 void repeat_mode (int repeat) 62 void repeat_mode (int repeat)
51 { 63 {
52 this->repeat = repeat; 64 this->repeat = repeat;
53 } 65 }
54 66
55 void unshare (); // prepare for write 67 void unshare (); // prepare for write
56 void fill (const rxvt_color &c); 68 void fill (const rxvt_color &c);
57 void brightness (unsigned short r, unsigned short g, unsigned short b, unsigned short a); 69 //void linear_gradient (const XLinearGradient *gradient, const XFixed *stops, const XRenderColor *colors, int nstops);
58 void contrast (unsigned short r, unsigned short g, unsigned short b, unsigned short a); 70 //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 brightness (int32_t r, int32_t g, int32_t b, int32_t a);
73 void contrast (int32_t r, int32_t g, int32_t b, int32_t a);
59 74
60 void brightness (double r, double g, double b, double a = 1.) 75 void brightness (double r, double g, double b, double a = 1.)
61 { 76 {
62 brightness (float_to_component (r), 77 brightness (float_to_component (r),
63 float_to_component (g), 78 float_to_component (g),
… …
71 float_to_component (g), 86 float_to_component (g),
72 float_to_component (b), 87 float_to_component (b),
73 float_to_component (a)); 88 float_to_component (a));
74 } 89 }
75 90
76 bool render_pixbuf (GdkPixbuf *pixbuf, int src_x, int src_y, int width, int height, int dst_x, int dst_y);
77
78 // copy 91 // copy
92 rxvt_img *reify (); // make x, y 0, make real width/height
79 rxvt_img *blur (int rh, int rv); 93 rxvt_img *blur (int rh, int rv);
80 rxvt_img *clone (); 94 rxvt_img *clone ();
81 rxvt_img *sub_rect (int x, int y, int width, int height); 95 rxvt_img *sub_rect (int x, int y, int width, int height);
82 rxvt_img *transform (int new_width, int new_height, double matrix[9]); 96 rxvt_img *transform (int new_width, int new_height, double matrix[9]);
83 rxvt_img *scale (int new_width, int new_height); 97 rxvt_img *scale (int new_width, int new_height);
84 rxvt_img *rotate (int new_width, int new_height, int x, int y, double phi); 98 rxvt_img *rotate (int new_width, int new_height, int x, int y, double phi);
85 rxvt_img *convert_to (XRenderPictFormat *format, const rxvt_color &bg); 99 rxvt_img *convert_format (XRenderPictFormat *format, const rxvt_color &bg);
86 rxvt_img *blend (rxvt_img *img, double factor); 100 rxvt_img *blend (rxvt_img *img, double factor);
101
102 // egregiuous helper category
103 rxvt_img *replace (rxvt_img *&p)
104 {
105 delete p;
106 p = this;
107 return this;
108 }
87}; 109};
88 110
89#endif 111#endif
90 112
91#endif 113#endif

Diff Legend

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