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.20 by root, Thu Jun 7 10:22:55 2012 UTC vs.
Revision 1.48 by sf-exg, Sat Jan 19 10:04:34 2013 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 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;
… …
35 Pixmap pm; 55 Pixmap pm;
36 pixref *ref; // shared refcnt 56 pixref *ref; // shared refcnt
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); 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
43 //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
44 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
45 static rxvt_img *new_from_file (rxvt_screen *s, const char *filename); // from pixbuf
46 69
47 ~rxvt_img (); 70 ~rxvt_img ();
48 71
49 Pixmap steal () 72 Pixmap steal ()
50 { 73 {
… …
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);
69 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);
70 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);
71 97
72 void brightness (double r, double g, double b, double a = 1.) 98 void brightness (int32_t r, int32_t g, int32_t b, int32_t a);
99 void contrast (int32_t r, int32_t g, int32_t b, int32_t a);
100
101 void brightness (nv r, nv g, nv b, nv a = 1.)
73 { 102 {
74 brightness (float_to_component (r), 103 brightness (float_to_component (r),
75 float_to_component (g), 104 float_to_component (g),
76 float_to_component (b), 105 float_to_component (b),
77 float_to_component (a)); 106 float_to_component (a));
78 } 107 }
79 108
80 void contrast (double r, double g, double b, double a = 1.) 109 void contrast (nv r, nv g, nv b, nv a = 1.)
81 { 110 {
82 contrast (float_to_component (r), 111 contrast (float_to_component (r),
83 float_to_component (g), 112 float_to_component (g),
84 float_to_component (b), 113 float_to_component (b),
85 float_to_component (a)); 114 float_to_component (a));
86 } 115 }
87 116
88 bool render_pixbuf (GdkPixbuf *pixbuf, int src_x, int src_y, int width, int height, int dst_x, int dst_y); 117 void draw (rxvt_img *img, int op = PictOpOver, nv mask = 1.);
118#if 0
119 void draw (rxvt_img *img, int op = PictOpOver, nv mask = 1.,
120 nv px, nv py, nv qx, nv qy, nv rx, nv ry, nv sx, nv sy);
121#endif
89 122
90 // copy 123 // copy
91 rxvt_img *reify (); // make x, y 0, make real width/height 124 rxvt_img *reify (); // make x, y 0, make real width/height
92 rxvt_img *blur (int rh, int rv); 125 rxvt_img *blur (int rh, int rv);
93 rxvt_img *clone (); 126 rxvt_img *clone ();
94 rxvt_img *sub_rect (int x, int y, int width, int height); 127 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]); 128 rxvt_img *transform (const nv matrix[3][3]);
96 rxvt_img *scale (int new_width, int new_height); 129 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); 130 rxvt_img *rotate (int cx, int cy, nv phi);
98 rxvt_img *convert_to (XRenderPictFormat *format, const rxvt_color &bg); 131 rxvt_img *convert_format (XRenderPictFormat *format, const rgba &bg);
99 rxvt_img *blend (rxvt_img *img, double factor); 132 rxvt_img *tint (const rgba &c);
133 rxvt_img *shade (nv factor, rgba c = rgba (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC));
134 rxvt_img *filter (const char *name, int nparams = 0, nv *params = 0);
135 rxvt_img *muladd (nv mul, nv add); // general multiply and add, implemented as the biggest hack ever :/
136
137 // egregious helper category
138 rxvt_img *replace (rxvt_img *&p)
139 {
140 delete p;
141 p = this;
142 return this;
143 }
144
145 /* these are considered private */
146 void destroy ();
147 rxvt_img *new_empty ();
148 Picture picture ();
149 rxvt_img *transform (const nv *matrix);
100}; 150};
101 151
102#endif 152#endif
103 153
104#endif 154#endif

Diff Legend

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