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.13 by sf-exg, Tue Jun 5 18:52:48 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) (int32_t)((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;
16 int w, h; 36 pixref *ref; // shared refcnt
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);
21 rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap); 41 rxvt_img (const rxvt_img &img);
42
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
22 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
23 static rxvt_img *new_from_file (rxvt_screen *s, const char *filename); // from pixbuf
24 48
25 ~rxvt_img (); 49 ~rxvt_img ();
26 50
27 Pixmap steal () 51 Pixmap steal ()
28 { 52 {
29 shared = true; 53 ref->ours = false;
30 return pm; 54 return pm;
31 } 55 }
32 56
33 // inplace 57 // inplace
34 void unshare (); // create a copy of the pixmap if !shared 58 void move (int dx, int dy)
59 {
60 x -= dx;
61 y -= dy;
62 }
63
64 void repeat_mode (int repeat)
65 {
66 this->repeat = repeat;
67 }
68
69 void unshare (); // prepare for write
35 void fill (const rxvt_color &c); 70 void fill (const rxvt_color &c);
71 //void linear_gradient (const XLinearGradient *gradient, const XFixed *stops, const XRenderColor *colors, int nstops);
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);
76
36 void brightness (double r, double g, double b, double a = 1.); 77 void brightness (double r, double g, double b, double a = 1.)
78 {
79 brightness (float_to_component (r),
80 float_to_component (g),
81 float_to_component (b),
82 float_to_component (a));
83 }
84
37 void contrast (double r, double g, double b, double a = 1.); 85 void contrast (double r, double g, double b, double a = 1.)
38 bool render_pixbuf (GdkPixbuf *pixbuf, int src_x, int src_y, int width, int height, int dst_x, int dst_y); 86 {
87 contrast (float_to_component (r),
88 float_to_component (g),
89 float_to_component (b),
90 float_to_component (a));
91 }
39 92
40 // copy 93 // copy
94 rxvt_img *reify (); // make x, y 0, make real width/height
41 rxvt_img *blur (int rh, int rv); 95 rxvt_img *blur (int rh, int rv);
42 rxvt_img *clone (); 96 rxvt_img *clone ();
43 rxvt_img *sub_rect (int x, int y, int width, int height, int repeat = RepeatNormal); 97 rxvt_img *sub_rect (int x, int y, int width, int height);
44 rxvt_img *transform (int new_width, int new_height, double matrix[9], int repeat = RepeatNormal); 98 rxvt_img *transform (int new_width, int new_height, double matrix[9]);
45 rxvt_img *scale (int new_width, int new_height); 99 rxvt_img *scale (int new_width, int new_height);
46 rxvt_img *rotate (int new_width, int new_height, int x, int y, double phi, int repeat = RepeatNormal); 100 rxvt_img *rotate (int new_width, int new_height, int x, int y, double phi);
47 rxvt_img *convert_to (XRenderPictFormat *format); 101 rxvt_img *convert_format (XRenderPictFormat *format, const rxvt_color &bg);
48 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 }
49}; 111};
50 112
51#endif 113#endif
52 114
53#endif 115#endif

Diff Legend

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