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.23 by root, Thu Jun 7 19:06:26 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{
… …
38 XRenderPictFormat *format; 38 XRenderPictFormat *format;
39 39
40 rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int x, int y, int width, int height, int repeat = RepeatNormal); 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# if HAVE_PIXBUF
44 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
45 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
46 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
47 48
48 ~rxvt_img (); 49 ~rxvt_img ();
49 50
50 Pixmap steal () 51 Pixmap steal ()
… …
65 this->repeat = repeat; 66 this->repeat = repeat;
66 } 67 }
67 68
68 void unshare (); // prepare for write 69 void unshare (); // prepare for write
69 void fill (const rxvt_color &c); 70 void fill (const rxvt_color &c);
70 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);
71 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);
72 76
73 void brightness (double r, double g, double b, double a = 1.) 77 void brightness (double r, double g, double b, double a = 1.)
74 { 78 {
75 brightness (float_to_component (r), 79 brightness (float_to_component (r),
76 float_to_component (g), 80 float_to_component (g),
… …
94 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]);
95 rxvt_img *scale (int new_width, int new_height); 99 rxvt_img *scale (int new_width, int new_height);
96 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);
97 rxvt_img *convert_format (XRenderPictFormat *format, const rxvt_color &bg); 101 rxvt_img *convert_format (XRenderPictFormat *format, const rxvt_color &bg);
98 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 }
99}; 111};
100 112
101#endif 113#endif
102 114
103#endif 115#endif

Diff Legend

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