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.29 by sf-exg, Sat Jun 9 17:28:03 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 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 x, int y, 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# if HAVE_PIXBUF
44 static rxvt_img *new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb); // from pixbuf
45 static rxvt_img *new_from_file (rxvt_screen *s, const char *filename); // via pixbuf
46# endif
30 static rxvt_img *new_from_root (rxvt_screen *s); // get root pixmap 47 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 48
33 ~rxvt_img (); 49 ~rxvt_img ();
34 50
35 // TODO: steal should not do what it does, and this todo should be more specific
36 Pixmap steal () 51 Pixmap steal ()
37 { 52 {
38 Pixmap retval = pm; 53 ref->ours = false;
39 pm = None;
40 return retval; 54 return pm;
41 } 55 }
42 56
43 // inplace 57 // inplace
44 void move (int dx, int dy) 58 void move (int dx, int dy)
45 { 59 {
46 x += dx; 60 x -= dx;
47 y += dy; 61 y -= dy;
48 } 62 }
49 63
50 void repeat_mode (int repeat) 64 void repeat_mode (int repeat)
51 { 65 {
52 this->repeat = repeat; 66 this->repeat = repeat;
53 } 67 }
54 68
55 void unshare (); // prepare for write 69 void unshare (); // prepare for write
56 void fill (const rxvt_color &c); 70 void fill (const rxvt_color &c);
57 void brightness (unsigned short r, unsigned short g, unsigned short b, unsigned short a); 71 //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); 72 //void radial_gradient (const XRadialGradient *gradient, const XFixed *stops, const XRenderColor *colors, int nstops);
73 //void conical_gradient (const XConicalGradient *gradient, const XFixed *stops, const XRenderColor *colors, int nstops);
74 void brightness (int32_t r, int32_t g, int32_t b, int32_t a);
75 void contrast (int32_t r, int32_t g, int32_t b, int32_t a);
59 76
60 void brightness (double r, double g, double b, double a = 1.) 77 void brightness (double r, double g, double b, double a = 1.)
61 { 78 {
62 brightness (float_to_component (r), 79 brightness (float_to_component (r),
63 float_to_component (g), 80 float_to_component (g),
… …
71 float_to_component (g), 88 float_to_component (g),
72 float_to_component (b), 89 float_to_component (b),
73 float_to_component (a)); 90 float_to_component (a));
74 } 91 }
75 92
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 93 // copy
79 rxvt_img *reify (); // make x, y 0, make real width/height 94 rxvt_img *reify (); // make x, y 0, make real width/height
80 rxvt_img *blur (int rh, int rv); 95 rxvt_img *blur (int rh, int rv);
81 rxvt_img *clone (); 96 rxvt_img *clone ();
82 rxvt_img *sub_rect (int x, int y, int width, int height); 97 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]); 98 rxvt_img *transform (int new_width, int new_height, double matrix[9]);
84 rxvt_img *scale (int new_width, int new_height); 99 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); 100 rxvt_img *rotate (int new_width, int new_height, int x, int y, double phi);
86 rxvt_img *convert_to (XRenderPictFormat *format, const rxvt_color &bg); 101 rxvt_img *convert_format (XRenderPictFormat *format, const rxvt_color &bg);
87 rxvt_img *blend (rxvt_img *img, double factor); 102 rxvt_img *blend (rxvt_img *img, double factor);
103
104 // egregiuous helper category
105 rxvt_img *replace (rxvt_img *&p)
106 {
107 delete p;
108 p = this;
109 return this;
110 }
88}; 111};
89 112
90#endif 113#endif
91 114
92#endif 115#endif

Diff Legend

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