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.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 && BG_IMAGE_FROM_FILE && ENABLE_TRANSPARENCY && HAVE_PIXBUF 4#if HAVE_BG_PIXMAP
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) (int32_t)((d) * 65535.99)
11
10#include <X11/extensions/Xrender.h> 12#include <X11/extensions/Xrender.h>
11 13
12struct rxvt_img 14struct rxvt_img
13{ 15{
16 typedef double nv;
17
18 // *could* also hold the Pixmap itself
19 struct pixref
20 {
21 int cnt;
22 int w, h;
23 bool ours; // false if we don't own the pixmap at all
24
25 pixref (int w, int h)
26 : cnt(1), w(w), h(h), ours(true)
27 {
28 }
29 };
30
14 rxvt_screen *s; 31 rxvt_screen *s;
15 Pixmap pm; 32 Pixmap pm;
33 pixref *ref; // shared refcnt
16 int x, y, w, h, repeat; 34 int x, y, w, h, repeat;
17 XRenderPictFormat *format; 35 XRenderPictFormat *format;
18 bool shared; // true if we don't own it
19 36
20 rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height); 37 rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int x, int y, int width, int height, int repeat = RepeatNormal);
21 rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap); 38 rxvt_img (const rxvt_img &img);
39 void alloc ();
40
41# if HAVE_PIXBUF
42 static rxvt_img *new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb); // from pixbuf
43 static rxvt_img *new_from_file (rxvt_screen *s, const char *filename); // via pixbuf
44# endif
22 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
23 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)
… …
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 rgba &c);
47 void brightness (double r, double g, double b, double a = 1.); 69 void add_alpha ();
48 void contrast (double r, double g, double b, double a = 1.); 70 //void linear_gradient (const XLinearGradient *gradient, const XFixed *stops, const XRenderColor *colors, int nstops);
49 bool render_pixbuf (GdkPixbuf *pixbuf, int src_x, int src_y, int width, int height, int dst_x, int dst_y); 71 //void radial_gradient (const XRadialGradient *gradient, const XFixed *stops, const XRenderColor *colors, int nstops);
72 //void conical_gradient (const XConicalGradient *gradient, const XFixed *stops, const XRenderColor *colors, int nstops);
73 void brightness (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);
75
76 void brightness (nv r, nv g, nv b, nv a = 1.)
77 {
78 brightness (float_to_component (r),
79 float_to_component (g),
80 float_to_component (b),
81 float_to_component (a));
82 }
83
84 void contrast (nv r, nv g, nv b, nv a = 1.)
85 {
86 contrast (float_to_component (r),
87 float_to_component (g),
88 float_to_component (b),
89 float_to_component (a));
90 }
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
50 97
51 // copy 98 // copy
99 rxvt_img *reify (); // make x, y 0, make real width/height
52 rxvt_img *blur (int rh, int rv); 100 rxvt_img *blur (int rh, int rv);
53 rxvt_img *clone (); 101 rxvt_img *clone ();
54 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);
55 rxvt_img *transform (int new_width, int new_height, double matrix[9]); 103 rxvt_img *transform (const nv matrix[3][3]);
56 rxvt_img *scale (int new_width, int new_height); 104 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); 105 rxvt_img *rotate (int cx, int cy, nv phi);
58 rxvt_img *convert_to (XRenderPictFormat *format, const rxvt_color &bg); 106 rxvt_img *convert_format (XRenderPictFormat *format, const rgba &bg);
59 rxvt_img *blend (rxvt_img *img, double factor); 107 rxvt_img *blend (rxvt_img *img, nv factor = 1.);
108
109 // egregiuous helper category
110 rxvt_img *replace (rxvt_img *&p)
111 {
112 delete p;
113 p = this;
114 return this;
115 }
116
117private:
118
119 void destroy ();
120 Picture picture ();
121 rxvt_img *transform (const nv *matrix);
60}; 122};
61 123
62#endif 124#endif
63 125
64#endif 126#endif

Diff Legend

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