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.16 by sf-exg, Thu Jun 7 06:08:10 2012 UTC vs.
Revision 1.27 by root, Sat Jun 9 10:21:19 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) (uint16_t)((d) * 65535.99)
11 11
12#include <X11/extensions/Xrender.h> 12#include <X11/extensions/Xrender.h>
13 13
14struct rxvt_img 14class rxvt_img
15{ 15{
16 void alloc ();
17 void destroy ();
18 Picture src_picture ();
19
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
16 rxvt_screen *s; 34 rxvt_screen *s;
17 Pixmap pm; 35 Pixmap pm;
36 pixref *ref; // shared refcnt
18 int x, y, w, h, repeat; 37 int x, y, w, h, repeat;
19 XRenderPictFormat *format; 38 XRenderPictFormat *format;
20 bool shared; // true if we don't own it
21 39
22 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);
23 rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap); 41 rxvt_img (const rxvt_img &img);
42
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
24 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
25 static rxvt_img *new_from_file (rxvt_screen *s, const char *filename); // from pixbuf
26 46
27 ~rxvt_img (); 47 ~rxvt_img ();
28 48
29 Pixmap steal () 49 Pixmap steal ()
30 { 50 {
31 shared = true; 51 ref->ours = false;
32 return pm; 52 return pm;
33 } 53 }
34 54
35 // inplace 55 // inplace
36 void move (int dx, int dy) 56 void move (int dx, int dy)
37 { 57 {
38 x += dx; 58 x -= dx;
39 y += dy; 59 y -= dy;
40 } 60 }
41 61
42 void repeat_mode (int repeat) 62 void repeat_mode (int repeat)
43 { 63 {
44 this->repeat = repeat; 64 this->repeat = repeat;
45 } 65 }
46 66
47 void unshare (); // create a copy of the pixmap if !shared 67 void unshare (); // prepare for write
48 void fill (const rxvt_color &c); 68 void fill (const rxvt_color &c);
49 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);
50 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 (uint16_t r, uint16_t g, uint16_t b, uint16_t a);
73 void contrast (uint16_t r, uint16_t g, uint16_t b, uint16_t a);
51 74
52 void brightness (double r, double g, double b, double a = 1.) 75 void brightness (double r, double g, double b, double a = 1.)
53 { 76 {
54 brightness (float_to_component (r), 77 brightness (float_to_component (r),
55 float_to_component (g), 78 float_to_component (g),
… …
63 float_to_component (g), 86 float_to_component (g),
64 float_to_component (b), 87 float_to_component (b),
65 float_to_component (a)); 88 float_to_component (a));
66 } 89 }
67 90
68 bool render_pixbuf (GdkPixbuf *pixbuf, int src_x, int src_y, int width, int height, int dst_x, int dst_y);
69
70 // copy 91 // copy
92 rxvt_img *reify (); // make x, y 0, make real width/height
71 rxvt_img *blur (int rh, int rv); 93 rxvt_img *blur (int rh, int rv);
72 rxvt_img *clone (); 94 rxvt_img *clone ();
73 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);
74 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]);
75 rxvt_img *scale (int new_width, int new_height); 97 rxvt_img *scale (int new_width, int new_height);
76 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);
77 rxvt_img *convert_to (XRenderPictFormat *format, const rxvt_color &bg); 99 rxvt_img *convert_format (XRenderPictFormat *format, const rxvt_color &bg);
78 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 }
79}; 109};
80 110
81#endif 111#endif
82 112
83#endif 113#endif

Diff Legend

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