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.18 by root, Thu Jun 7 08:12:55 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 && 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) ((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 17
19public: 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
20 rxvt_screen *s; 31 rxvt_screen *s;
21 Pixmap pm; 32 Pixmap pm;
22 int *refcnt; // shared refcnt 33 pixref *ref; // shared refcnt
23 int x, y, w, h, repeat; 34 int x, y, w, h, repeat;
24 XRenderPictFormat *format; 35 XRenderPictFormat *format;
25 36
26 rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int x, int y, int width, int height); 37 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); 38 rxvt_img (const rxvt_img &img);
39 void alloc ();
28 40
29 //rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap); 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
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 {
… …
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 rgba &c);
57 void brightness (unsigned short r, unsigned short g, unsigned short b, unsigned short a); 69 void add_alpha ();
58 void contrast (unsigned short r, unsigned short g, unsigned short b, unsigned short a); 70 //void linear_gradient (const XLinearGradient *gradient, const XFixed *stops, const XRenderColor *colors, int nstops);
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);
59 75
60 void brightness (double r, double g, double b, double a = 1.) 76 void brightness (nv r, nv g, nv b, nv a = 1.)
61 { 77 {
62 brightness (float_to_component (r), 78 brightness (float_to_component (r),
63 float_to_component (g), 79 float_to_component (g),
64 float_to_component (b), 80 float_to_component (b),
65 float_to_component (a)); 81 float_to_component (a));
66 } 82 }
67 83
68 void contrast (double r, double g, double b, double a = 1.) 84 void contrast (nv r, nv g, nv b, nv a = 1.)
69 { 85 {
70 contrast (float_to_component (r), 86 contrast (float_to_component (r),
71 float_to_component (g), 87 float_to_component (g),
72 float_to_component (b), 88 float_to_component (b),
73 float_to_component (a)); 89 float_to_component (a));
74 } 90 }
75 91
76 bool render_pixbuf (GdkPixbuf *pixbuf, int src_x, int src_y, int width, int height, int dst_x, int dst_y); 92 void draw (rxvt_img *img, int op = PictOpOver, nv mask = 1.);
77 93
78 // copy 94 // copy
79 rxvt_img *reify (); // make x, y 0, make real width/height 95 rxvt_img *reify (); // make x, y 0, make real width/height
80 rxvt_img *blur (int rh, int rv); 96 rxvt_img *blur (int rh, int rv);
81 rxvt_img *clone (); 97 rxvt_img *clone ();
82 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);
83 rxvt_img *transform (int new_width, int new_height, double matrix[9]); 99 rxvt_img *transform (const nv matrix[3][3]);
84 rxvt_img *scale (int new_width, int new_height); 100 rxvt_img *scale (int new_width, int new_height);
85 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);
86 rxvt_img *convert_to (XRenderPictFormat *format, const rxvt_color &bg); 102 rxvt_img *convert_format (XRenderPictFormat *format, const rgba &bg);
87 rxvt_img *blend (rxvt_img *img, double factor); 103 rxvt_img *blend (rxvt_img *img, nv factor = 1.);
104
105 // egregiuous helper category
106 rxvt_img *replace (rxvt_img *&p)
107 {
108 delete p;
109 p = this;
110 return this;
111 }
112
113private:
114
115 void destroy ();
116 Picture picture ();
117 rxvt_img *transform (const nv *matrix);
88}; 118};
89 119
90#endif 120#endif
91 121
92#endif 122#endif

Diff Legend

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