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.27 by root, Sat Jun 9 10:21:19 2012 UTC vs.
Revision 1.33 by root, Thu Jun 14 17:06:57 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) (uint16_t)((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 ();
17 void destroy (); 16 void destroy ();
18 Picture src_picture (); 17 Picture src_picture ();
19 18
20public: 19public:
21 // *could* also hold the Pixmap itself 20 // *could* also hold the Pixmap itself
… …
37 int x, y, w, h, repeat; 36 int x, y, w, h, repeat;
38 XRenderPictFormat *format; 37 XRenderPictFormat *format;
39 38
40 rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int x, int y, int width, int height, int repeat = RepeatNormal); 39 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); 40 rxvt_img (const rxvt_img &img);
41 void alloc ();
42 42
43# if HAVE_PIXBUF
43 static rxvt_img *new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb); // from pixbuf 44 static rxvt_img *new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb); // from pixbuf
44 static rxvt_img *new_from_file (rxvt_screen *s, const char *filename); // via pixbuf 45 static rxvt_img *new_from_file (rxvt_screen *s, const char *filename); // via pixbuf
46# endif
45 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
46 48
47 ~rxvt_img (); 49 ~rxvt_img ();
48 50
49 Pixmap steal () 51 Pixmap steal ()
… …
63 { 65 {
64 this->repeat = repeat; 66 this->repeat = repeat;
65 } 67 }
66 68
67 void unshare (); // prepare for write 69 void unshare (); // prepare for write
68 void fill (const rxvt_color &c); 70 void fill (const rgba &c);
69 //void linear_gradient (const XLinearGradient *gradient, const XFixed *stops, const XRenderColor *colors, int nstops); 71 //void linear_gradient (const XLinearGradient *gradient, const XFixed *stops, const XRenderColor *colors, int nstops);
70 //void radial_gradient (const XRadialGradient *gradient, const XFixed *stops, const XRenderColor *colors, int nstops); 72 //void radial_gradient (const XRadialGradient *gradient, const XFixed *stops, const XRenderColor *colors, int nstops);
71 //void conical_gradient (const XConicalGradient *gradient, const XFixed *stops, const XRenderColor *colors, int nstops); 73 //void conical_gradient (const XConicalGradient *gradient, const XFixed *stops, const XRenderColor *colors, int nstops);
72 void brightness (uint16_t r, uint16_t g, uint16_t b, uint16_t a); 74 void brightness (int32_t r, int32_t g, int32_t b, int32_t a);
73 void contrast (uint16_t r, uint16_t g, uint16_t b, uint16_t a); 75 void contrast (int32_t r, int32_t g, int32_t b, int32_t a);
74 76
75 void brightness (double r, double g, double b, double a = 1.) 77 void brightness (double r, double g, double b, double a = 1.)
76 { 78 {
77 brightness (float_to_component (r), 79 brightness (float_to_component (r),
78 float_to_component (g), 80 float_to_component (g),
… …
91 // copy 93 // copy
92 rxvt_img *reify (); // make x, y 0, make real width/height 94 rxvt_img *reify (); // make x, y 0, make real width/height
93 rxvt_img *blur (int rh, int rv); 95 rxvt_img *blur (int rh, int rv);
94 rxvt_img *clone (); 96 rxvt_img *clone ();
95 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);
96 rxvt_img *transform (int new_width, int new_height, double matrix[9]); 98 rxvt_img *transform (double matrix[3][3]);
97 rxvt_img *scale (int new_width, int new_height); 99 rxvt_img *scale (int new_width, int new_height);
98 rxvt_img *rotate (int new_width, int new_height, int x, int y, double phi); 100 rxvt_img *rotate (int cx, int cy, double phi);
99 rxvt_img *convert_format (XRenderPictFormat *format, const rxvt_color &bg); 101 rxvt_img *convert_format (XRenderPictFormat *format, const rgba &bg);
100 rxvt_img *blend (rxvt_img *img, double factor); 102 rxvt_img *blend (rxvt_img *img, double factor);
101 103
102 // egregiuous helper category 104 // egregiuous helper category
103 rxvt_img *replace (rxvt_img *&p) 105 rxvt_img *replace (rxvt_img *&p)
104 { 106 {

Diff Legend

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