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.28 by root, Sat Jun 9 11:13:14 2012 UTC vs.
Revision 1.41 by root, Sat Jun 16 15:55:19 2012 UTC

1/*----------------------------------------------------------------------*
2 * File: rxvtimg.C
3 *----------------------------------------------------------------------*
4 *
5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2012 Marc Lehmann <schmorp@schmorp.de>
7 * Copyright (c) 2012 Emanuele Giaquinta <e.giaquinta@glauco.it>
8 *
9 * This program is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License as published by
11 * the Free Software Foundation; either version 2 of the License, or
12 * (at your option) any later version.
13 *
14 * This program is distributed in the hope that it will be useful,
15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17 * GNU General Public License for more details.
18 *
19 * You should have received a copy of the GNU General Public License
20 * along with this program; if not, write to the Free Software
21 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
22 *---------------------------------------------------------------------*/
23
1#ifndef IMG_H 24#ifndef IMG_H
2#define IMG_H 25#define IMG_H
3 26
4#if HAVE_BG_PIXMAP && BG_IMAGE_FROM_FILE && ENABLE_TRANSPARENCY && HAVE_PIXBUF 27#if HAVE_BG_PIXMAP
5 #define HAVE_IMG 1 28 #define HAVE_IMG 1
6#endif 29#endif
7 30
8#if HAVE_IMG 31#if HAVE_IMG
9 32
10#define float_to_component(d) (int32_t)((d) * 65535.99) 33#define float_to_component(d) (int32_t)((d) * 65535.99)
11 34
12#include <X11/extensions/Xrender.h> 35#include <X11/extensions/Xrender.h>
13 36
14class rxvt_img 37struct rxvt_img
15{ 38{
16 void alloc (); 39 typedef double nv;
17 void destroy ();
18 Picture src_picture ();
19 40
20public:
21 // *could* also hold the Pixmap itself 41 // *could* also hold the Pixmap itself
22 struct pixref 42 struct pixref
23 { 43 {
24 int cnt; 44 int cnt;
25 int w, h; 45 int w, h;
… …
37 int x, y, w, h, repeat; 57 int x, y, w, h, repeat;
38 XRenderPictFormat *format; 58 XRenderPictFormat *format;
39 59
40 rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int x, int y, int width, int height, int repeat = RepeatNormal); 60 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); 61 rxvt_img (const rxvt_img &img);
62 void alloc ();
42 63
64# if HAVE_PIXBUF
43 static rxvt_img *new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb); // from pixbuf 65 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 66 static rxvt_img *new_from_file (rxvt_screen *s, const char *filename); // via pixbuf
67# endif
45 static rxvt_img *new_from_root (rxvt_screen *s); // get root pixmap 68 static rxvt_img *new_from_root (rxvt_screen *s); // get root pixmap
46 69
47 ~rxvt_img (); 70 ~rxvt_img ();
48 71
49 Pixmap steal () 72 Pixmap steal ()
… …
53 } 76 }
54 77
55 // inplace 78 // inplace
56 void move (int dx, int dy) 79 void move (int dx, int dy)
57 { 80 {
58 x -= dx; 81 x += dx;
59 y -= dy; 82 y += dy;
60 } 83 }
61 84
62 void repeat_mode (int repeat) 85 void repeat_mode (int repeat)
63 { 86 {
64 this->repeat = repeat; 87 this->repeat = repeat;
65 } 88 }
66 89
67 void unshare (); // prepare for write 90 void unshare (); // prepare for write
68 void fill (const rxvt_color &c); 91 void fill (const rgba &c);
92 void add_alpha ();
69 //void linear_gradient (const XLinearGradient *gradient, const XFixed *stops, const XRenderColor *colors, int nstops); 93 //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); 94 //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); 95 //void conical_gradient (const XConicalGradient *gradient, const XFixed *stops, const XRenderColor *colors, int nstops);
72 void brightness (int32_t r, int32_t g, int32_t b, int32_t a); 96 void brightness (int32_t r, int32_t g, int32_t b, int32_t a);
73 void contrast (int32_t r, int32_t g, int32_t b, int32_t a); 97 void contrast (int32_t r, int32_t g, int32_t b, int32_t a);
74 98
75 void brightness (double r, double g, double b, double a = 1.) 99 void brightness (nv r, nv g, nv b, nv a = 1.)
76 { 100 {
77 brightness (float_to_component (r), 101 brightness (float_to_component (r),
78 float_to_component (g), 102 float_to_component (g),
79 float_to_component (b), 103 float_to_component (b),
80 float_to_component (a)); 104 float_to_component (a));
81 } 105 }
82 106
83 void contrast (double r, double g, double b, double a = 1.) 107 void contrast (nv r, nv g, nv b, nv a = 1.)
84 { 108 {
85 contrast (float_to_component (r), 109 contrast (float_to_component (r),
86 float_to_component (g), 110 float_to_component (g),
87 float_to_component (b), 111 float_to_component (b),
88 float_to_component (a)); 112 float_to_component (a));
89 } 113 }
90 114
115 void draw (rxvt_img *img, int op = PictOpOver, nv mask = 1.);
116#if 0
117 void draw (rxvt_img *img, int op = PictOpOver, nv mask = 1.,
118 nv px, nv py, nv qx, nv qy, nv rx, nv ry, nv sx, nv sy);
119#endif
120
91 // copy 121 // copy
92 rxvt_img *reify (); // make x, y 0, make real width/height 122 rxvt_img *reify (); // make x, y 0, make real width/height
93 rxvt_img *blur (int rh, int rv); 123 rxvt_img *blur (int rh, int rv);
94 rxvt_img *clone (); 124 rxvt_img *clone ();
95 rxvt_img *sub_rect (int x, int y, int width, int height); 125 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]); 126 rxvt_img *transform (const nv matrix[3][3]);
97 rxvt_img *scale (int new_width, int new_height); 127 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); 128 rxvt_img *rotate (int cx, int cy, nv phi);
99 rxvt_img *convert_format (XRenderPictFormat *format, const rxvt_color &bg); 129 rxvt_img *convert_format (XRenderPictFormat *format, const rgba &bg);
100 rxvt_img *blend (rxvt_img *img, double factor); 130 rxvt_img *blend (rxvt_img *img, nv factor = 1.);
101 131
102 // egregiuous helper category 132 // egregiuous helper category
103 rxvt_img *replace (rxvt_img *&p) 133 rxvt_img *replace (rxvt_img *&p)
104 { 134 {
105 delete p; 135 delete p;
106 p = this; 136 p = this;
107 return this; 137 return this;
108 } 138 }
139
140private:
141
142 void destroy ();
143 Picture picture ();
144 rxvt_img *transform (const nv *matrix);
109}; 145};
110 146
111#endif 147#endif
112 148
113#endif 149#endif

Diff Legend

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