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.19 by root, Thu Jun 7 08:36:09 2012 UTC vs.
Revision 1.26 by root, Fri Jun 8 22:19:03 2012 UTC

… …
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) (uint16_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{
… …
35 Pixmap pm; 35 Pixmap pm;
36 pixref *ref; // shared refcnt 36 pixref *ref; // shared refcnt
37 int x, y, w, h, repeat; 37 int x, y, w, h, repeat;
38 XRenderPictFormat *format; 38 XRenderPictFormat *format;
39 39
40 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);
41 rxvt_img (const rxvt_img &img); 41 rxvt_img (const rxvt_img &img);
42 42
43 //rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap); 43 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
44 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
45 static rxvt_img *new_from_file (rxvt_screen *s, const char *filename); // from pixbuf
46 46
47 ~rxvt_img (); 47 ~rxvt_img ();
48 48
49 Pixmap steal () 49 Pixmap steal ()
50 { 50 {
… …
53 } 53 }
54 54
55 // inplace 55 // inplace
56 void move (int dx, int dy) 56 void move (int dx, int dy)
57 { 57 {
58 x += dx; 58 x -= dx;
59 y += dy; 59 y -= dy;
60 } 60 }
61 61
62 void repeat_mode (int repeat) 62 void repeat_mode (int repeat)
63 { 63 {
64 this->repeat = repeat; 64 this->repeat = repeat;
65 } 65 }
66 66
67 void unshare (); // prepare for write 67 void unshare (); // prepare for write
68 void fill (const rxvt_color &c); 68 void fill (const rxvt_color &c);
69 void brightness (unsigned short r, unsigned short g, unsigned short b, unsigned short a); 69 //void linear_gradient (const XLinearGradient *gradient, const XFixed *stops, const XRenderColor *colors, int nstops);
70 void contrast (unsigned short r, unsigned short g, unsigned short b, unsigned short a); 70 //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);
72 void brightness (uint16_t r, uint16_t g, uint16_t b, uint16_t a);
73 void contrast (uint16_t r, uint16_t g, uint16_t b, uint16_t a);
71 74
72 void brightness (double r, double g, double b, double a = 1.) 75 void brightness (double r, double g, double b, double a = 1.)
73 { 76 {
74 brightness (float_to_component (r), 77 brightness (float_to_component (r),
75 float_to_component (g), 78 float_to_component (g),
… …
83 float_to_component (g), 86 float_to_component (g),
84 float_to_component (b), 87 float_to_component (b),
85 float_to_component (a)); 88 float_to_component (a));
86 } 89 }
87 90
88 bool render_pixbuf (GdkPixbuf *pixbuf, int src_x, int src_y, int width, int height, int dst_x, int dst_y);
89
90 // copy 91 // copy
91 rxvt_img *reify (); // make x, y 0, make real width/height 92 rxvt_img *reify (); // make x, y 0, make real width/height
92 rxvt_img *blur (int rh, int rv); 93 rxvt_img *blur (int rh, int rv);
93 rxvt_img *clone (); 94 rxvt_img *clone ();
94 rxvt_img *sub_rect (int x, int y, int width, int height); 95 rxvt_img *sub_rect (int x, int y, int width, int height);
95 rxvt_img *transform (int new_width, int new_height, double matrix[9]); 96 rxvt_img *transform (int new_width, int new_height, double matrix[9]);
96 rxvt_img *scale (int new_width, int new_height); 97 rxvt_img *scale (int new_width, int new_height);
97 rxvt_img *rotate (int new_width, int new_height, int x, int y, double phi); 98 rxvt_img *rotate (int new_width, int new_height, int x, int y, double phi);
98 rxvt_img *convert_to (XRenderPictFormat *format, const rxvt_color &bg); 99 rxvt_img *convert_format (XRenderPictFormat *format, const rxvt_color &bg);
99 rxvt_img *blend (rxvt_img *img, double factor); 100 rxvt_img *blend (rxvt_img *img, double factor);
100}; 101};
101 102
102#endif 103#endif
103 104

Diff Legend

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