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

Diff Legend

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