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.31 by root, Tue Jun 12 10:45:53 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 27#if HAVE_BG_PIXMAP
5 #define HAVE_IMG 1 28 #define HAVE_IMG 1
… …
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 destroy (); 39 typedef double nv;
17 Picture src_picture ();
18 40
19public:
20 // *could* also hold the Pixmap itself 41 // *could* also hold the Pixmap itself
21 struct pixref 42 struct pixref
22 { 43 {
23 int cnt; 44 int cnt;
24 int w, h; 45 int w, h;
… …
55 } 76 }
56 77
57 // inplace 78 // inplace
58 void move (int dx, int dy) 79 void move (int dx, int dy)
59 { 80 {
60 x -= dx; 81 x += dx;
61 y -= dy; 82 y += dy;
62 } 83 }
63 84
64 void repeat_mode (int repeat) 85 void repeat_mode (int repeat)
65 { 86 {
66 this->repeat = repeat; 87 this->repeat = repeat;
67 } 88 }
68 89
69 void unshare (); // prepare for write 90 void unshare (); // prepare for write
70 void fill (const rxvt_color &c); 91 void fill (const rgba &c);
92 void fill (const rgba &c, int x, int y, int w, int h);
93 void add_alpha ();
71 //void linear_gradient (const XLinearGradient *gradient, const XFixed *stops, const XRenderColor *colors, int nstops); 94 //void linear_gradient (const XLinearGradient *gradient, const XFixed *stops, const XRenderColor *colors, int nstops);
72 //void radial_gradient (const XRadialGradient *gradient, const XFixed *stops, const XRenderColor *colors, int nstops); 95 //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); 96 //void conical_gradient (const XConicalGradient *gradient, const XFixed *stops, const XRenderColor *colors, int nstops);
97
74 void brightness (int32_t r, int32_t g, int32_t b, int32_t a); 98 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); 99 void contrast (int32_t r, int32_t g, int32_t b, int32_t a);
76 100
77 void brightness (double r, double g, double b, double a = 1.) 101 void brightness (nv r, nv g, nv b, nv a = 1.)
78 { 102 {
79 brightness (float_to_component (r), 103 brightness (float_to_component (r),
80 float_to_component (g), 104 float_to_component (g),
81 float_to_component (b), 105 float_to_component (b),
82 float_to_component (a)); 106 float_to_component (a));
83 } 107 }
84 108
85 void contrast (double r, double g, double b, double a = 1.) 109 void contrast (nv r, nv g, nv b, nv a = 1.)
86 { 110 {
87 contrast (float_to_component (r), 111 contrast (float_to_component (r),
88 float_to_component (g), 112 float_to_component (g),
89 float_to_component (b), 113 float_to_component (b),
90 float_to_component (a)); 114 float_to_component (a));
91 } 115 }
92 116
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
122
93 // copy 123 // copy
94 rxvt_img *reify (); // make x, y 0, make real width/height 124 rxvt_img *reify (); // make x, y 0, make real width/height
95 rxvt_img *blur (int rh, int rv); 125 rxvt_img *blur (int rh, int rv);
96 rxvt_img *clone (); 126 rxvt_img *clone ();
97 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);
98 rxvt_img *transform (double matrix[9], int new_width = 0, int new_height = 0); 128 rxvt_img *transform (const nv matrix[3][3]);
99 rxvt_img *scale (int new_width, int new_height); 129 rxvt_img *scale (int new_width, int new_height);
100 rxvt_img *rotate (int x, int y, double phi, int new_width = 0, int new_height = 0); 130 rxvt_img *rotate (int cx, int cy, nv phi);
101 rxvt_img *convert_format (XRenderPictFormat *format, const rxvt_color &bg); 131 rxvt_img *convert_format (XRenderPictFormat *format, const rgba &bg);
102 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 :/
103 136
104 // egregiuous helper category 137 // egregious helper category
105 rxvt_img *replace (rxvt_img *&p) 138 rxvt_img *replace (rxvt_img *&p)
106 { 139 {
107 delete p; 140 delete p;
108 p = this; 141 p = this;
109 return this; 142 return this;
110 } 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);
111}; 150};
112 151
113#endif 152#endif
114 153
115#endif 154#endif

Diff Legend

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