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.26 by root, Fri Jun 8 22:19:03 2012 UTC vs.
Revision 1.51 by sf-exg, Sat Jul 15 08:16:31 2017 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 3 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) (uint16_t)((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 Picture src_picture ();
19 36
20public:
21 // *could* also hold the Pixmap itself 37 // *could* also hold the Pixmap itself
22 struct pixref 38 struct pixref
23 { 39 {
24 int cnt; 40 int cnt;
25 int w, h; 41 int w, h;
… …
29 : cnt(1), w(w), h(h), ours(true) 45 : cnt(1), w(w), h(h), ours(true)
30 { 46 {
31 } 47 }
32 }; 48 };
33 49
34 rxvt_screen *s; 50 rxvt_display *d;
35 Pixmap pm; 51 Pixmap pm;
36 pixref *ref; // shared refcnt 52 pixref *ref; // shared refcnt
37 int x, y, w, h, repeat; 53 int x, y, w, h, repeat;
38 XRenderPictFormat *format; 54 XRenderPictFormat *format;
39 55
40 rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int x, int y, int width, int height, int repeat = RepeatNormal); 56 rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int x, int y, int width, int height, int repeat = RepeatNormal);
57 rxvt_img (rxvt_display *display, XRenderPictFormat *format, int x, int y, int width, int height, int repeat = RepeatNormal);
41 rxvt_img (const rxvt_img &img); 58 rxvt_img (const rxvt_img &img);
59 void alloc ();
42 60
61# if HAVE_PIXBUF
43 static rxvt_img *new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb); // from pixbuf 62 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 63 static rxvt_img *new_from_file (rxvt_screen *s, const char *filename); // via pixbuf
64# endif
45 static rxvt_img *new_from_root (rxvt_screen *s); // get root pixmap 65 static rxvt_img *new_from_root (rxvt_screen *s); // get root pixmap
46 66
47 ~rxvt_img (); 67 ~rxvt_img ();
48 68
49 Pixmap steal () 69 Pixmap steal ()
… …
53 } 73 }
54 74
55 // inplace 75 // inplace
56 void move (int dx, int dy) 76 void move (int dx, int dy)
57 { 77 {
58 x -= dx; 78 x += dx;
59 y -= dy; 79 y += dy;
60 } 80 }
61 81
62 void repeat_mode (int repeat) 82 void repeat_mode (int repeat)
63 { 83 {
64 this->repeat = repeat; 84 this->repeat = repeat;
65 } 85 }
66 86
67 void unshare (); // prepare for write 87 void unshare (); // prepare for write
68 void fill (const rxvt_color &c); 88 void fill (const rgba &c);
89 void fill (const rgba &c, int x, int y, int w, int h);
90 void add_alpha ();
69 //void linear_gradient (const XLinearGradient *gradient, const XFixed *stops, const XRenderColor *colors, int nstops); 91 //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); 92 //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); 93 //void conical_gradient (const XConicalGradient *gradient, const XFixed *stops, const XRenderColor *colors, int nstops);
72 void brightness (uint16_t r, uint16_t g, uint16_t b, uint16_t a);
73 void contrast (uint16_t r, uint16_t g, uint16_t b, uint16_t a);
74 94
75 void brightness (double r, double g, double b, double a = 1.) 95 void brightness (int32_t r, int32_t g, int32_t b, int32_t a);
96 void contrast (int32_t r, int32_t g, int32_t b, int32_t a);
97
98 void brightness (nv r, nv g, nv b, nv a = 1.)
76 { 99 {
77 brightness (float_to_component (r), 100 brightness (float_to_component (r),
78 float_to_component (g), 101 float_to_component (g),
79 float_to_component (b), 102 float_to_component (b),
80 float_to_component (a)); 103 float_to_component (a));
81 } 104 }
82 105
83 void contrast (double r, double g, double b, double a = 1.) 106 void contrast (nv r, nv g, nv b, nv a = 1.)
84 { 107 {
85 contrast (float_to_component (r), 108 contrast (float_to_component (r),
86 float_to_component (g), 109 float_to_component (g),
87 float_to_component (b), 110 float_to_component (b),
88 float_to_component (a)); 111 float_to_component (a));
89 } 112 }
90 113
114 void draw (rxvt_img *img, int op = PictOpOver, nv mask = 1.);
115#if 0
116 void draw (rxvt_img *img, int op = PictOpOver, nv mask = 1.,
117 nv px, nv py, nv qx, nv qy, nv rx, nv ry, nv sx, nv sy);
118#endif
119
91 // copy 120 // copy
92 rxvt_img *reify (); // make x, y 0, make real width/height 121 rxvt_img *reify (); // make x, y 0, make real width/height
93 rxvt_img *blur (int rh, int rv); 122 rxvt_img *blur (int rh, int rv);
94 rxvt_img *clone (); 123 rxvt_img *clone ();
95 rxvt_img *sub_rect (int x, int y, int width, int height); 124 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]); 125 rxvt_img *transform (const nv matrix[3][3]);
97 rxvt_img *scale (int new_width, int new_height); 126 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); 127 rxvt_img *rotate (int cx, int cy, nv phi);
99 rxvt_img *convert_format (XRenderPictFormat *format, const rxvt_color &bg); 128 rxvt_img *convert_format (XRenderPictFormat *format, const rgba &bg);
100 rxvt_img *blend (rxvt_img *img, double factor); 129 rxvt_img *tint (const rgba &c);
130 rxvt_img *shade (nv factor, rgba c = rgba (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC));
131 rxvt_img *filter (const char *name, int nparams = 0, nv *params = 0);
132 rxvt_img *muladd (nv mul, nv add); // general multiply and add, implemented as the biggest hack ever :/
133
134 // egregious 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);
101}; 147};
102 148
103#endif 149#endif
104 150
105#endif 151#endif

Diff Legend

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