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

Diff Legend

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