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.17 by root, Thu Jun 7 07:53:12 2012 UTC vs.
Revision 1.44 by root, Mon Jul 2 02:01:41 2012 UTC

1/*----------------------------------------------------------------------*
2 * File: rxvtimg.h
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) ((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 40
19public: 41 // *could* also hold the Pixmap itself
42 struct pixref
43 {
44 int cnt;
45 int w, h;
46 bool ours; // false if we don't own the pixmap at all
47
48 pixref (int w, int h)
49 : cnt(1), w(w), h(h), ours(true)
50 {
51 }
52 };
53
20 rxvt_screen *s; 54 rxvt_screen *s;
21 Pixmap pm; 55 Pixmap pm;
22 int *refcnt; // shared refcnt 56 pixref *ref; // shared refcnt
23 int x, y, w, h, repeat; 57 int x, y, w, h, repeat;
24 XRenderPictFormat *format; 58 XRenderPictFormat *format;
25 59
26 rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height); 60 rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int x, int y, int width, int height, int repeat = RepeatNormal);
27 rxvt_img (const rxvt_img &img); 61 rxvt_img (const rxvt_img &img);
62 void alloc ();
28 63
29 //rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap); 64# if HAVE_PIXBUF
65 static rxvt_img *new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb); // from pixbuf
66 static rxvt_img *new_from_file (rxvt_screen *s, const char *filename); // via pixbuf
67# endif
30 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
31 static rxvt_img *new_from_file (rxvt_screen *s, const char *filename); // from pixbuf
32 69
33 ~rxvt_img (); 70 ~rxvt_img ();
34 71
35 // TODO: steal should not do what it does, and this todo should be more specific
36 Pixmap steal () 72 Pixmap steal ()
37 { 73 {
38 Pixmap retval = pm; 74 ref->ours = false;
39 pm = None;
40 return retval; 75 return pm;
41 } 76 }
42 77
43 // inplace 78 // inplace
44 void move (int dx, int dy) 79 void move (int dx, int dy)
45 { 80 {
… …
51 { 86 {
52 this->repeat = repeat; 87 this->repeat = repeat;
53 } 88 }
54 89
55 void unshare (); // prepare for write 90 void unshare (); // prepare for write
56 void fill (const rxvt_color &c); 91 void fill (const rgba &c);
57 void brightness (unsigned short r, unsigned short g, unsigned short b, unsigned short a); 92 void fill (const rgba &c, int x, int y, int w, int h);
58 void contrast (unsigned short r, unsigned short g, unsigned short b, unsigned short a); 93 void add_alpha ();
94 //void linear_gradient (const XLinearGradient *gradient, const XFixed *stops, const XRenderColor *colors, int nstops);
95 //void radial_gradient (const XRadialGradient *gradient, const XFixed *stops, const XRenderColor *colors, int nstops);
96 //void conical_gradient (const XConicalGradient *gradient, const XFixed *stops, const XRenderColor *colors, int nstops);
97 void brightness (int32_t r, int32_t g, int32_t b, int32_t a);
98 void contrast (int32_t r, int32_t g, int32_t b, int32_t a);
59 99
60 void brightness (double r, double g, double b, double a = 1.) 100 void brightness (nv r, nv g, nv b, nv a = 1.)
61 { 101 {
62 brightness (float_to_component (r), 102 brightness (float_to_component (r),
63 float_to_component (g), 103 float_to_component (g),
64 float_to_component (b), 104 float_to_component (b),
65 float_to_component (a)); 105 float_to_component (a));
66 } 106 }
67 107
68 void contrast (double r, double g, double b, double a = 1.) 108 void contrast (nv r, nv g, nv b, nv a = 1.)
69 { 109 {
70 contrast (float_to_component (r), 110 contrast (float_to_component (r),
71 float_to_component (g), 111 float_to_component (g),
72 float_to_component (b), 112 float_to_component (b),
73 float_to_component (a)); 113 float_to_component (a));
74 } 114 }
75 115
76 bool render_pixbuf (GdkPixbuf *pixbuf, int src_x, int src_y, int width, int height, int dst_x, int dst_y); 116 void draw (rxvt_img *img, int op = PictOpOver, nv mask = 1.);
117#if 0
118 void draw (rxvt_img *img, int op = PictOpOver, nv mask = 1.,
119 nv px, nv py, nv qx, nv qy, nv rx, nv ry, nv sx, nv sy);
120#endif
77 121
78 // copy 122 // copy
123 rxvt_img *reify (); // make x, y 0, make real width/height
79 rxvt_img *blur (int rh, int rv); 124 rxvt_img *blur (int rh, int rv);
80 rxvt_img *clone (); 125 rxvt_img *clone ();
81 rxvt_img *sub_rect (int x, int y, int width, int height); 126 rxvt_img *sub_rect (int x, int y, int width, int height);
82 rxvt_img *transform (int new_width, int new_height, double matrix[9]); 127 rxvt_img *transform (const nv matrix[3][3]);
83 rxvt_img *scale (int new_width, int new_height); 128 rxvt_img *scale (int new_width, int new_height);
84 rxvt_img *rotate (int new_width, int new_height, int x, int y, double phi); 129 rxvt_img *rotate (int cx, int cy, nv phi);
85 rxvt_img *convert_to (XRenderPictFormat *format, const rxvt_color &bg); 130 rxvt_img *convert_format (XRenderPictFormat *format, const rgba &bg);
86 rxvt_img *blend (rxvt_img *img, double factor); 131 rxvt_img *tint (const rgba &c);
132 rxvt_img *filter (const char *name, int nparams = 0, nv *params = 0);
133
134 // egregiuous helper category
135 rxvt_img *replace (rxvt_img *&p)
136 {
137 delete p;
138 p = this;
139 return this;
140 }
141
142 /* these are considered private */
143 void destroy ();
144 rxvt_img *new_empty ();
145 Picture picture ();
146 rxvt_img *transform (const nv *matrix);
87}; 147};
88 148
89#endif 149#endif
90 150
91#endif 151#endif

Diff Legend

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