ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvtimg.h
Revision: 1.51
Committed: Sat Jul 15 08:16:31 2017 UTC (6 years, 10 months ago) by sf-exg
Content type: text/plain
Branch: MAIN
CVS Tags: rxvt-unicode-rel-9_29, rxvt-unicode-rel-9_26, rxvt-unicode-rel-9_25, rxvt-unicode-rel-9_30, HEAD
Changes since 1.50: +2 -1 lines
Log Message:
Fix urxvtd crash when using a background expression.

A rxvt_img object contains a pointer to the associated rxvt_screen,
which in practice corresponds to the terminal object that created the
image. This causes a use-after-free when there are two or more terminal
objects sharing a rxvt_img and the one that created it is destroyed.
This patch fixes the issue by replacing the rxvt_screen pointer with a
pointer to the associated rxvt_display.

File Contents

# User Rev Content
1 root 1.41 /*----------------------------------------------------------------------*
2 sf-exg 1.42 * File: rxvtimg.h
3 root 1.41 *----------------------------------------------------------------------*
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 root 1.50 * the Free Software Foundation; either version 3 of the License, or
12 root 1.41 * (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    
24     #ifndef IMG_H
25 root 1.1 #define IMG_H
26    
27     #if HAVE_IMG
28    
29 root 1.28 #define float_to_component(d) (int32_t)((d) * 65535.99)
30 sf-exg 1.16
31 root 1.1 #include <X11/extensions/Xrender.h>
32    
33 root 1.39 struct rxvt_img
34 root 1.1 {
35 root 1.36 typedef double nv;
36    
37 root 1.19 // *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    
50 sf-exg 1.51 rxvt_display *d;
51 root 1.1 Pixmap pm;
52 root 1.19 pixref *ref; // shared refcnt
53 root 1.15 int x, y, w, h, repeat;
54 root 1.1 XRenderPictFormat *format;
55    
56 root 1.21 rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int x, int y, int width, int height, int repeat = RepeatNormal);
57 sf-exg 1.51 rxvt_img (rxvt_display *display, XRenderPictFormat *format, int x, int y, int width, int height, int repeat = RepeatNormal);
58 root 1.17 rxvt_img (const rxvt_img &img);
59 root 1.30 void alloc ();
60 root 1.17
61 sf-exg 1.29 # if HAVE_PIXBUF
62 root 1.23 static rxvt_img *new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb); // from pixbuf
63     static rxvt_img *new_from_file (rxvt_screen *s, const char *filename); // via pixbuf
64 sf-exg 1.29 # endif
65 root 1.5 static rxvt_img *new_from_root (rxvt_screen *s); // get root pixmap
66 root 1.4
67 root 1.1 ~rxvt_img ();
68    
69     Pixmap steal ()
70     {
71 root 1.19 ref->ours = false;
72     return pm;
73 root 1.1 }
74    
75     // inplace
76 root 1.15 void move (int dx, int dy)
77     {
78 root 1.38 x += dx;
79     y += dy;
80 root 1.15 }
81    
82     void repeat_mode (int repeat)
83     {
84     this->repeat = repeat;
85     }
86    
87 root 1.17 void unshare (); // prepare for write
88 root 1.33 void fill (const rgba &c);
89 root 1.44 void fill (const rgba &c, int x, int y, int w, int h);
90 root 1.34 void add_alpha ();
91 root 1.26 //void linear_gradient (const XLinearGradient *gradient, const XFixed *stops, const XRenderColor *colors, int nstops);
92     //void radial_gradient (const XRadialGradient *gradient, const XFixed *stops, const XRenderColor *colors, int nstops);
93     //void conical_gradient (const XConicalGradient *gradient, const XFixed *stops, const XRenderColor *colors, int nstops);
94 root 1.45
95 root 1.28 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 sf-exg 1.16
98 root 1.36 void brightness (nv r, nv g, nv b, nv a = 1.)
99 sf-exg 1.16 {
100     brightness (float_to_component (r),
101     float_to_component (g),
102     float_to_component (b),
103     float_to_component (a));
104     }
105    
106 root 1.36 void contrast (nv r, nv g, nv b, nv a = 1.)
107 sf-exg 1.16 {
108     contrast (float_to_component (r),
109     float_to_component (g),
110     float_to_component (b),
111     float_to_component (a));
112     }
113    
114 root 1.38 void draw (rxvt_img *img, int op = PictOpOver, nv mask = 1.);
115 root 1.40 #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 root 1.37
120 root 1.1 // copy
121 root 1.18 rxvt_img *reify (); // make x, y 0, make real width/height
122 sf-exg 1.12 rxvt_img *blur (int rh, int rv);
123 root 1.8 rxvt_img *clone ();
124 root 1.15 rxvt_img *sub_rect (int x, int y, int width, int height);
125 root 1.39 rxvt_img *transform (const nv matrix[3][3]);
126 root 1.1 rxvt_img *scale (int new_width, int new_height);
127 root 1.36 rxvt_img *rotate (int cx, int cy, nv phi);
128 root 1.33 rxvt_img *convert_format (XRenderPictFormat *format, const rgba &bg);
129 root 1.43 rxvt_img *tint (const rgba &c);
130 sf-exg 1.48 rxvt_img *shade (nv factor, rgba c = rgba (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC));
131 root 1.43 rxvt_img *filter (const char *name, int nparams = 0, nv *params = 0);
132 root 1.46 rxvt_img *muladd (nv mul, nv add); // general multiply and add, implemented as the biggest hack ever :/
133 root 1.27
134 sf-exg 1.47 // egregious helper category
135 root 1.27 rxvt_img *replace (rxvt_img *&p)
136     {
137     delete p;
138     p = this;
139     return this;
140     }
141 root 1.39
142 root 1.43 /* these are considered private */
143 root 1.39 void destroy ();
144 root 1.43 rxvt_img *new_empty ();
145 root 1.39 Picture picture ();
146     rxvt_img *transform (const nv *matrix);
147 root 1.1 };
148    
149     #endif
150    
151     #endif
152