ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/background.C
(Generate patch)

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.187 by sf-exg, Wed Dec 28 13:13:33 2011 UTC vs.
Revision 1.223 by sf-exg, Sat May 26 08:55:27 2012 UTC

3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2005-2008 Marc Lehmann <schmorp@schmorp.de> 6 * Copyright (c) 2005-2008 Marc Lehmann <schmorp@schmorp.de>
7 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net> 7 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net>
8 * Copyright (c) 2010 Emanuele Giaquinta <e.giaquinta@glauco.it> 8 * Copyright (c) 2010-2012 Emanuele Giaquinta <e.giaquinta@glauco.it>
9 * 9 *
10 * This program is free software; you can redistribute it and/or modify 10 * This program is free software; you can redistribute it and/or modify
11 * it under the terms of the GNU General Public License as published by 11 * it under the terms of the GNU General Public License as published by
12 * the Free Software Foundation; either version 2 of the License, or 12 * the Free Software Foundation; either version 2 of the License, or
13 * (at your option) any later version. 13 * (at your option) any later version.
20 * You should have received a copy of the GNU General Public License 20 * You should have received a copy of the GNU General Public License
21 * along with this program; if not, write to the Free Software 21 * along with this program; if not, write to the Free Software
22 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 22 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
23 *---------------------------------------------------------------------*/ 23 *---------------------------------------------------------------------*/
24 24
25#include <cmath> 25#include <math.h>
26#include "../config.h" /* NECESSARY */ 26#include "../config.h" /* NECESSARY */
27#include "rxvt.h" /* NECESSARY */ 27#include "rxvt.h" /* NECESSARY */
28 28
29#if XRENDER 29#if XRENDER
30# include <X11/extensions/Xrender.h> 30# include <X11/extensions/Xrender.h>
32 32
33#ifndef FilterConvolution 33#ifndef FilterConvolution
34#define FilterConvolution "convolution" 34#define FilterConvolution "convolution"
35#endif 35#endif
36 36
37#ifndef RepeatPad
38#define RepeatPad True
39#endif
40
37#ifdef HAVE_BG_PIXMAP 41#ifdef HAVE_BG_PIXMAP
42# if XRENDER
43static Picture
44create_xrender_mask (Display *dpy, Drawable drawable, Bool argb, Bool component_alpha)
45{
46 Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);
47
48 XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);
49 XRenderPictureAttributes pa;
50 pa.repeat = True;
51 pa.component_alpha = component_alpha;
52 Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat | CPComponentAlpha, &pa);
53
54 XFreePixmap (dpy, pixmap);
55
56 return mask;
57}
58# endif
59
38void 60void
39rxvt_term::bg_destroy () 61rxvt_term::bg_destroy ()
40{ 62{
41#ifdef HAVE_AFTERIMAGE 63# ifdef BG_IMAGE_FROM_FILE
42 if (original_asim) 64 for (vector<rxvt_image>::iterator bg_image = image_vec.begin (); bg_image < image_vec.end (); bg_image++)
43 safe_asimage_destroy (original_asim); 65 bg_image->destroy ();
44 if (asv)
45 destroy_asvisual (asv, 0);
46 if (asimman)
47 destroy_image_manager (asimman, 0);
48#endif 66# endif
49
50#ifdef HAVE_PIXBUF
51 if (pixbuf)
52 g_object_unref (pixbuf);
53#endif
54 67
55 if (bg_pixmap) 68 if (bg_pixmap)
56 XFreePixmap (dpy, bg_pixmap); 69 XFreePixmap (dpy, bg_pixmap);
57} 70}
58 71
77 if (bg_flags & BG_IS_TRANSPARENT) 90 if (bg_flags & BG_IS_TRANSPARENT)
78 return true; 91 return true;
79# endif 92# endif
80 93
81# ifdef BG_IMAGE_FROM_FILE 94# ifdef BG_IMAGE_FROM_FILE
82 if (bg_flags & BG_IS_FROM_FILE) 95 for (vector<rxvt_image>::iterator bg_image = image_vec.begin (); bg_image < image_vec.end (); bg_image++)
83 { 96 {
84 if (bg_flags & BG_IS_SIZE_SENSITIVE) 97 if ((bg_image->flags & IM_IS_SIZE_SENSITIVE)
98 || bg_image->width () > szHint.width
99 || bg_image->height () > szHint.height)
85 return true; 100 return true;
86 } 101 }
87# endif 102# endif
88 103
89 return false; 104 return false;
96 if (bg_flags & BG_IS_TRANSPARENT) 111 if (bg_flags & BG_IS_TRANSPARENT)
97 return true; 112 return true;
98# endif 113# endif
99 114
100# ifdef BG_IMAGE_FROM_FILE 115# ifdef BG_IMAGE_FROM_FILE
101 if (bg_flags & BG_IS_FROM_FILE) 116 for (vector<rxvt_image>::iterator bg_image = image_vec.begin (); bg_image < image_vec.end (); bg_image++)
102 { 117 {
103 if (bg_flags & BG_ROOT_ALIGN) 118 if (bg_image->flags & IM_ROOT_ALIGN)
104 return true; 119 return true;
105 } 120 }
106# endif 121# endif
107 122
108 return false; 123 return false;
109} 124}
110 125
111# ifdef BG_IMAGE_FROM_FILE 126# ifdef BG_IMAGE_FROM_FILE
112static inline bool
113check_set_scale_value (int geom_flags, int flag, unsigned int &scale, unsigned int new_value)
114{
115 if (geom_flags & flag)
116 {
117 if (new_value > 1000)
118 new_value = 1000;
119 if (new_value != scale)
120 {
121 scale = new_value;
122 return true;
123 }
124 }
125 return false;
126}
127
128static inline bool
129check_set_align_value (int geom_flags, int flag, int &align, int new_value)
130{
131 if (geom_flags & flag)
132 {
133 if (new_value < -100)
134 new_value = -100;
135 else if (new_value > 200)
136 new_value = 200;
137 if (new_value != align)
138 {
139 align = new_value;
140 return true;
141 }
142 }
143 return false;
144}
145
146static inline int 127static inline int
147make_align_position (int align, int window_size, int image_size) 128make_align_position (int align, int window_size, int image_size)
148{ 129{
149 int diff = window_size - image_size;
150 int smaller = min (image_size, window_size);
151
152 if (align >= 0 && align <= 100) 130 if (align >= 0 && align <= 100)
153 return diff * align / 100; 131 return lerp (0, window_size - image_size, align);
154 else if (align > 100 && align <= 200) 132 else if (align > 100)
155 return (align - 100) * smaller / 100 + window_size - smaller; 133 return lerp (window_size - image_size, window_size, align - 100);
156 else if (align >= -100 && align < 0) 134 else
157 return (align + 100) * smaller / 100 - image_size; 135 return lerp (-image_size, 0, align + 100);
158 return 0;
159} 136}
160 137
161static inline int 138static inline int
162make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size) 139make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
163{ 140{
169 src_pos = -pos; 146 src_pos = -pos;
170 dst_pos = 0; 147 dst_pos = 0;
171 dst_size += pos; 148 dst_size += pos;
172 } 149 }
173 150
174 if (dst_pos + dst_size > target_size)
175 dst_size = target_size - dst_pos; 151 min_it (dst_size, target_size - dst_pos);
176 return src_pos; 152 return src_pos;
177} 153}
178 154
155static void
156parse_style (const char *style, int &x, int &y, unsigned int &w, unsigned int &h, uint8_t &flags)
157{
158 if (!strcasecmp (style, "tiled"))
159 {
160 flags = IM_TILE;
161 w = h = noScale;
162 x = y = 0;
163 }
164 else if (!strcasecmp (style, "aspect-stretched"))
165 {
166 flags = IM_KEEP_ASPECT;
167 w = h = windowScale;
168 x = y = centerAlign;
169 }
170 else if (!strcasecmp (style, "stretched"))
171 {
172 flags = 0;
173 w = h = windowScale;
174 x = y = centerAlign;
175 }
176 else if (!strcasecmp (style, "centered"))
177 {
178 flags = 0;
179 w = h = noScale;
180 x = y = centerAlign;
181 }
182 else if (!strcasecmp (style, "root-tiled"))
183 {
184 flags = IM_TILE|IM_ROOT_ALIGN;
185 w = h = noScale;
186 x = y = 0;
187 }
188}
189
179bool 190bool
180rxvt_term::bg_set_geometry (const char *geom, bool update) 191rxvt_image::set_geometry (const char *geom, bool update)
181{ 192{
182 bool changed = false; 193 bool changed = false;
183 int geom_flags = 0; 194 int geom_flags = 0;
184 int x = 0, y = 0; 195 int x = h_align;
196 int y = v_align;
185 unsigned int w = 0, h = 0; 197 unsigned int w = h_scale;
186 unsigned long new_flags = 0; 198 unsigned int h = v_scale;
199 uint8_t new_flags = 0;
187 200
188 if (geom == NULL) 201 if (geom == NULL)
189 return false; 202 return false;
190 203
191 if (geom[0]) 204 if (geom[0])
192 { 205 {
193 char **arr = rxvt_strsplit (':', geom); 206 char **arr = rxvt_strsplit (':', geom);
194 207
195 for (int i = 0; arr[i]; i++) 208 for (int i = 0; arr[i]; i++)
196 { 209 {
197 if (!strcasecmp (arr[i], "style=tiled")) 210 if (!strncasecmp (arr[i], "style=", 6))
198 { 211 {
199 new_flags = BG_TILE; 212 parse_style (arr[i] + 6, x, y, w, h, new_flags);
200 w = h = noScale;
201 x = y = 0;
202 geom_flags = WidthValue|HeightValue|XValue|YValue; 213 geom_flags = WidthValue|HeightValue|XValue|YValue;
203 } 214 }
204 else if (!strcasecmp (arr[i], "style=aspect-stretched"))
205 {
206 new_flags = BG_KEEP_ASPECT;
207 w = h = windowScale;
208 x = y = centerAlign;
209 geom_flags = WidthValue|HeightValue|XValue|YValue;
210 }
211 else if (!strcasecmp (arr[i], "style=stretched"))
212 {
213 new_flags = 0;
214 w = h = windowScale;
215 geom_flags = WidthValue|HeightValue;
216 }
217 else if (!strcasecmp (arr[i], "style=centered"))
218 {
219 new_flags = 0;
220 w = h = noScale;
221 x = y = centerAlign;
222 geom_flags = WidthValue|HeightValue|XValue|YValue;
223 }
224 else if (!strcasecmp (arr[i], "style=root-tiled"))
225 {
226 new_flags = BG_TILE|BG_ROOT_ALIGN;
227 w = h = noScale;
228 geom_flags = WidthValue|HeightValue;
229 }
230 else if (!strcasecmp (arr[i], "op=tile")) 215 else if (!strcasecmp (arr[i], "op=tile"))
231 new_flags |= BG_TILE; 216 new_flags |= IM_TILE;
232 else if (!strcasecmp (arr[i], "op=keep-aspect")) 217 else if (!strcasecmp (arr[i], "op=keep-aspect"))
233 new_flags |= BG_KEEP_ASPECT; 218 new_flags |= IM_KEEP_ASPECT;
234 else if (!strcasecmp (arr[i], "op=root-align")) 219 else if (!strcasecmp (arr[i], "op=root-align"))
235 new_flags |= BG_ROOT_ALIGN; 220 new_flags |= IM_ROOT_ALIGN;
236 221
237 // deprecated 222 // deprecated
238 else if (!strcasecmp (arr[i], "tile")) 223 else if (!strcasecmp (arr[i], "tile"))
239 { 224 {
240 new_flags |= BG_TILE; 225 new_flags |= IM_TILE;
241 w = h = noScale; 226 w = h = noScale;
242 geom_flags |= WidthValue|HeightValue; 227 geom_flags |= WidthValue|HeightValue;
243 } 228 }
244 else if (!strcasecmp (arr[i], "propscale")) 229 else if (!strcasecmp (arr[i], "propscale"))
245 { 230 {
246 new_flags |= BG_KEEP_ASPECT; 231 new_flags |= IM_KEEP_ASPECT;
247 w = h = windowScale; 232 w = h = windowScale;
248 geom_flags |= WidthValue|HeightValue; 233 geom_flags |= WidthValue|HeightValue;
249 } 234 }
250 else if (!strcasecmp (arr[i], "hscale")) 235 else if (!strcasecmp (arr[i], "hscale"))
251 { 236 {
252 new_flags |= BG_TILE; 237 new_flags |= IM_TILE;
253 w = windowScale; 238 w = windowScale;
254 h = noScale; 239 h = noScale;
255 geom_flags |= WidthValue|HeightValue; 240 geom_flags |= WidthValue|HeightValue;
256 } 241 }
257 else if (!strcasecmp (arr[i], "vscale")) 242 else if (!strcasecmp (arr[i], "vscale"))
258 { 243 {
259 new_flags |= BG_TILE; 244 new_flags |= IM_TILE;
260 h = windowScale; 245 h = windowScale;
261 w = noScale; 246 w = noScale;
262 geom_flags |= WidthValue|HeightValue; 247 geom_flags |= WidthValue|HeightValue;
263 } 248 }
264 else if (!strcasecmp (arr[i], "scale")) 249 else if (!strcasecmp (arr[i], "scale"))
272 x = y = centerAlign; 257 x = y = centerAlign;
273 geom_flags |= WidthValue|HeightValue|XValue|YValue; 258 geom_flags |= WidthValue|HeightValue|XValue|YValue;
274 } 259 }
275 else if (!strcasecmp (arr[i], "root")) 260 else if (!strcasecmp (arr[i], "root"))
276 { 261 {
277 new_flags |= BG_TILE|BG_ROOT_ALIGN; 262 new_flags |= IM_TILE|IM_ROOT_ALIGN;
278 w = h = noScale; 263 w = h = noScale;
279 geom_flags |= WidthValue|HeightValue; 264 geom_flags |= WidthValue|HeightValue;
280 } 265 }
281 266
282 else 267 else
284 } /* done parsing ops */ 269 } /* done parsing ops */
285 270
286 rxvt_free_strsplit (arr); 271 rxvt_free_strsplit (arr);
287 } 272 }
288 273
289 new_flags |= bg_flags & ~BG_GEOMETRY_FLAGS; 274 new_flags |= flags & ~IM_GEOMETRY_FLAGS;
290 275
291 if (!update) 276 if (!update)
292 { 277 {
293 if (!(geom_flags & XValue)) 278 if (!(geom_flags & XValue))
294 x = y = defaultAlign; 279 x = y = defaultAlign;
299 w = h = defaultScale; 284 w = h = defaultScale;
300 else if (!(geom_flags & HeightValue)) 285 else if (!(geom_flags & HeightValue))
301 h = w; 286 h = w;
302 else if (!(geom_flags & WidthValue)) 287 else if (!(geom_flags & WidthValue))
303 w = h; 288 w = h;
304
305 geom_flags |= WidthValue|HeightValue|XValue|YValue;
306 }
307
308 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true;
309 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true;
310 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true;
311 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
312
313 if (new_flags != bg_flags)
314 { 289 }
290
291 clamp_it (x, -100, 200);
292 clamp_it (y, -100, 200);
293
294 if (flags != new_flags
295 || h_scale != w
296 || v_scale != h
297 || h_align != x
298 || v_align != y)
299 {
315 bg_flags = new_flags; 300 flags = new_flags;
301 h_scale = w;
302 v_scale = h;
303 h_align = x;
304 v_align = y;
316 changed = true; 305 changed = true;
317 } 306 }
318 307
308 if (!(flags & IM_TILE)
309 || h_scale || v_scale
310 || (!(flags & IM_ROOT_ALIGN) && (h_align || v_align)))
311 flags |= IM_IS_SIZE_SENSITIVE;
312 else
313 flags &= ~IM_IS_SIZE_SENSITIVE;
314
319 return changed; 315 return changed;
320} 316}
321 317
322void 318void
323rxvt_term::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) 319rxvt_term::get_image_geometry (rxvt_image &image, int &w, int &h, int &x, int &y)
324{ 320{
321 int image_width = image.width ();
322 int image_height = image.height ();
325 int target_width = szHint.width; 323 int target_width = szHint.width;
326 int target_height = szHint.height; 324 int target_height = szHint.height;
325 int h_scale = min (image.h_scale, 32767 * 100 / target_width);
326 int v_scale = min (image.v_scale, 32767 * 100 / target_height);
327 327
328 w = h_scale * target_width / 100; 328 w = h_scale * target_width / 100;
329 h = v_scale * target_height / 100; 329 h = v_scale * target_height / 100;
330 330
331 if (bg_flags & BG_KEEP_ASPECT) 331 if (image.flags & IM_KEEP_ASPECT)
332 { 332 {
333 float scale = (float)w / image_width; 333 float scale = (float)w / image_width;
334 min_it (scale, (float)h / image_height); 334 min_it (scale, (float)h / image_height);
335 w = image_width * scale + 0.5; 335 w = image_width * scale + 0.5;
336 h = image_height * scale + 0.5; 336 h = image_height * scale + 0.5;
337 } 337 }
338 338
339 if (!w) w = image_width; 339 if (!w) w = image_width;
340 if (!h) h = image_height; 340 if (!h) h = image_height;
341 341
342 if (bg_flags & BG_ROOT_ALIGN) 342 if (image.flags & IM_ROOT_ALIGN)
343 { 343 {
344 x = -target_x; 344 x = -target_x;
345 y = -target_y; 345 y = -target_y;
346 } 346 }
347 else 347 else
348 { 348 {
349 x = make_align_position (h_align, target_width, w); 349 x = make_align_position (image.h_align, target_width, w);
350 y = make_align_position (v_align, target_height, h); 350 y = make_align_position (image.v_align, target_height, h);
351 }
352
353 bg_flags &= ~BG_IS_SIZE_SENSITIVE;
354 if (!(bg_flags & BG_TILE)
355 || h_scale || v_scale
356 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align))
357 || w > target_width || h > target_height)
358 bg_flags |= BG_IS_SIZE_SENSITIVE;
359}
360
361# ifdef HAVE_AFTERIMAGE
362bool
363rxvt_term::render_image (unsigned long tr_flags)
364{
365 init_asv ();
366
367 ASImage *background = NULL;
368 ARGB32 background_tint = TINT_LEAVE_SAME;
369
370# ifdef ENABLE_TRANSPARENCY
371 if (tr_flags)
372 background = pixmap2ximage (asv, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, 100);
373
374 if (tr_flags & BG_NEEDS_TINT)
375 { 351 }
376 ShadingInfo as_shade; 352}
377 as_shade.shading = shade;
378 353
379 rgba c; 354# ifdef HAVE_PIXBUF
380 tint.get (c); 355bool
381 as_shade.tintColor.red = c.r; 356rxvt_term::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
382 as_shade.tintColor.green = c.g; 357 int src_x, int src_y, int dst_x, int dst_y,
383 as_shade.tintColor.blue = c.b; 358 unsigned int width, unsigned int height, bool argb)
359{
360 XImage *ximage;
361 char *line;
362 int width_r, width_g, width_b, width_a;
363 int sh_r, sh_g, sh_b, sh_a;
364 uint32_t red_mask, green_mask, blue_mask, alpha_mask;
365 int rowstride;
366 int channels;
367 unsigned char *row;
384 368
385 background_tint = shading2tint32 (&as_shade); 369 if (visual->c_class != TrueColor)
370 return false;
371
372 if (argb)
386 } 373 {
387 374 red_mask = 0xff << 16;
388 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL) 375 green_mask = 0xff << 8;
376 blue_mask = 0xff;
377 alpha_mask = 0xff << 24;
389 { 378 }
390 ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 379 else
391 ASA_XImage, 380 {
392 100, ASIMAGE_QUALITY_DEFAULT); 381 red_mask = visual->red_mask;
382 green_mask = visual->green_mask;
383 blue_mask = visual->blue_mask;
384#if XRENDER
385 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
393 if (tmp) 386 if (format)
387 alpha_mask = (uint32_t)format->direct.alphaMask << format->direct.alpha;
388 else
389#endif
390 alpha_mask = 0;
391 }
392
393 width_r = ecb_popcount32 (red_mask);
394 width_g = ecb_popcount32 (green_mask);
395 width_b = ecb_popcount32 (blue_mask);
396 width_a = ecb_popcount32 (alpha_mask);
397
398 if (width_r > 8 || width_g > 8 || width_b > 8 || width_a > 8)
399 return false;
400
401 sh_r = ecb_ctz32 (red_mask);
402 sh_g = ecb_ctz32 (green_mask);
403 sh_b = ecb_ctz32 (blue_mask);
404 sh_a = ecb_ctz32 (alpha_mask);
405
406 if (width > 32767 || height > 32767)
407 return false;
408
409 ximage = XCreateImage (dpy, visual, argb ? 32 : depth, ZPixmap, 0, 0,
410 width, height, 32, 0);
411 if (!ximage)
412 return false;
413
414 if (height > INT_MAX / ximage->bytes_per_line
415 || !(ximage->data = (char *)malloc (height * ximage->bytes_per_line)))
416 {
417 XDestroyImage (ximage);
418 return false;
419 }
420
421 ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
422
423 rowstride = gdk_pixbuf_get_rowstride (pixbuf);
424 channels = gdk_pixbuf_get_n_channels (pixbuf);
425 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
426 line = ximage->data;
427
428 rgba c (0, 0, 0);
429
430 if (channels == 4 && alpha_mask == 0)
431 {
432 pix_colors[Color_bg].get (c);
433 c.r >>= 8;
434 c.g >>= 8;
435 c.b >>= 8;
436 }
437
438 for (int y = 0; y < height; y++)
439 {
440 for (int x = 0; x < width; x++)
441 {
442 unsigned char *pixel = row + x * channels;
443 uint32_t value;
444 unsigned char r, g, b, a;
445
446 if (channels == 4)
394 { 447 {
395 destroy_asimage (&background); 448 a = pixel[3];
396 background = tmp; 449 r = (pixel[0] * a + c.r * (0xff - a)) / 0xff;
450 g = (pixel[1] * a + c.g * (0xff - a)) / 0xff;
451 b = (pixel[2] * a + c.b * (0xff - a)) / 0xff;
452 }
453 else
454 {
455 a = 0xff;
456 r = pixel[0];
457 g = pixel[1];
458 b = pixel[2];
459 }
460
461 value = ((r >> (8 - width_r)) << sh_r)
462 | ((g >> (8 - width_g)) << sh_g)
463 | ((b >> (8 - width_b)) << sh_b)
464 | ((a >> (8 - width_a)) << sh_a);
465
466 if (ximage->bits_per_pixel == 32)
467 ((uint32_t *)line)[x] = value;
468 else
469 XPutPixel (ximage, x, y, value);
397 } 470 }
398 }
399# endif
400 471
401 ASImage *result = 0; 472 row += rowstride;
473 line += ximage->bytes_per_line;
474 }
475
476 XPutImage (dpy, pixmap, gc, ximage, 0, 0, dst_x, dst_y, width, height);
477 XDestroyImage (ximage);
478 return true;
479}
480
481bool
482rxvt_term::render_image (rxvt_image &image)
483{
484 GdkPixbuf *pixbuf = image.pixbuf;
485 if (!pixbuf)
486 return false;
487
488 bool need_blend = bg_flags & BG_IS_VALID;
489
490 if (need_blend
491 && !(bg_flags & BG_HAS_RENDER))
492 return false;
493
494 GdkPixbuf *result;
495
496 int image_width = gdk_pixbuf_get_width (pixbuf);
497 int image_height = gdk_pixbuf_get_height (pixbuf);
402 498
403 int target_width = szHint.width; 499 int target_width = szHint.width;
404 int target_height = szHint.height; 500 int target_height = szHint.height;
405 int new_pmap_width = target_width; 501 int new_pmap_width = target_width;
406 int new_pmap_height = target_height; 502 int new_pmap_height = target_height;
408 int x = 0; 504 int x = 0;
409 int y = 0; 505 int y = 0;
410 int w = 0; 506 int w = 0;
411 int h = 0; 507 int h = 0;
412 508
413 if (original_asim) 509 get_image_geometry (image, w, h, x, y);
414 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
415 510
416 if (!original_asim 511 if (!(image.flags & IM_ROOT_ALIGN)
417 || (!(bg_flags & BG_ROOT_ALIGN)
418 && (x >= target_width 512 && (x >= target_width
419 || y >= target_height 513 || y >= target_height
420 || x + w <= 0 514 || x + w <= 0
421 || y + h <= 0))) 515 || y + h <= 0))
516 return false;
517
518 result = pixbuf;
519
520 if (w != image_width
521 || h != image_height)
522 {
523 result = gdk_pixbuf_scale_simple (pixbuf,
524 w, h,
525 GDK_INTERP_BILINEAR);
422 { 526 }
423 if (background)
424 {
425 new_pmap_width = background->width;
426 new_pmap_height = background->height;
427 result = background;
428 527
429 if (background_tint != TINT_LEAVE_SAME) 528 if (!result)
529 return false;
530
531 bool ret = false;
532
533 XGCValues gcv;
534 GC gc;
535 Pixmap tmp_pixmap;
536
537 image_width = gdk_pixbuf_get_width (result);
538 image_height = gdk_pixbuf_get_height (result);
539
540 if (need_blend)
541 tmp_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, 32);
542 else
543 {
544 // optimise bg pixmap size when tiling, but only if there are no
545 // other pixbufs to render. Otherwise, the bg pixmap size must
546 // be equal to the window size.
547 if ((image.flags & IM_TILE)
548 && image_vec.size () == 1)
430 { 549 {
431 ASImage *tmp = tile_asimage (asv, background, 0, 0, 550 new_pmap_width = min (image_width, target_width);
432 target_width, target_height, background_tint, 551 new_pmap_height = min (image_height, target_height);
433 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
434 if (tmp)
435 result = tmp;
436 }
437 } 552 }
438 else
439 new_pmap_width = new_pmap_height = 0;
440 }
441 else
442 {
443 result = original_asim;
444 553
445 if (w != original_asim->width
446 || h != original_asim->height)
447 {
448 result = scale_asimage (asv, original_asim,
449 w, h,
450 ASA_XImage,
451 100, ASIMAGE_QUALITY_DEFAULT);
452 }
453
454 if (background == NULL)
455 {
456 if (bg_flags & BG_TILE)
457 {
458 /* if tiling - pixmap has to be sized exactly as the image,
459 but there is no need to make it bigger than the window! */
460 new_pmap_width = min (result->width, target_width);
461 new_pmap_height = min (result->height, target_height);
462
463 /* we also need to tile our image in both directions */
464 ASImage *tmp = tile_asimage (asv, result,
465 (int)result->width - x,
466 (int)result->height - y,
467 new_pmap_width,
468 new_pmap_height,
469 TINT_LEAVE_SAME, ASA_XImage,
470 100, ASIMAGE_QUALITY_DEFAULT);
471 if (tmp)
472 {
473 if (result != original_asim)
474 destroy_asimage (&result);
475
476 result = tmp;
477 }
478 }
479 }
480 else
481 {
482 /* if blending background and image - pixmap has to be sized same as target window */
483 ASImageLayer *layers = create_image_layers (2);
484
485 layers[0].im = background;
486 layers[0].clip_width = target_width;
487 layers[0].clip_height = target_height;
488 layers[0].tint = background_tint;
489 layers[1].im = result;
490
491 if (bg_flags & BG_TILE)
492 {
493 /* tile horizontally */
494 while (x > 0) x -= (int)result->width;
495 layers[1].dst_x = x;
496 layers[1].clip_width = result->width+target_width;
497 }
498 else
499 {
500 /* clip horizontally */
501 layers[1].dst_x = x;
502 layers[1].clip_width = result->width;
503 }
504
505 if (bg_flags & BG_TILE)
506 {
507 while (y > 0) y -= (int)result->height;
508 layers[1].dst_y = y;
509 layers[1].clip_height = result->height + target_height;
510 }
511 else
512 {
513 layers[1].dst_y = y;
514 layers[1].clip_height = result->height;
515 }
516
517 if (rs[Rs_blendtype])
518 {
519 layers[1].merge_scanlines = blend_scanlines_name2func (rs[Rs_blendtype]);
520 if (layers[1].merge_scanlines == NULL)
521 layers[1].merge_scanlines = alphablend_scanlines;
522 }
523
524 ASImage *tmp = merge_layers (asv, layers, 2, target_width, target_height,
525 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
526
527 if (tmp)
528 {
529 if (result != original_asim)
530 destroy_asimage (&result);
531
532 result = tmp;
533 }
534
535 free (layers);
536 }
537 }
538
539 bool ret = false;
540
541 if (result)
542 {
543 XGCValues gcv;
544 GC gc;
545
546 /* create Pixmap */
547 if (bg_pixmap == None 554 if (bg_pixmap == None
548 || bg_pmap_width != new_pmap_width 555 || bg_pmap_width != new_pmap_width
549 || bg_pmap_height != new_pmap_height) 556 || bg_pmap_height != new_pmap_height)
550 { 557 {
551 if (bg_pixmap) 558 if (bg_pixmap)
552 XFreePixmap (dpy, bg_pixmap); 559 XFreePixmap (dpy, bg_pixmap);
553 bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth); 560 bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth);
554 bg_pmap_width = new_pmap_width; 561 bg_pmap_width = new_pmap_width;
555 bg_pmap_height = new_pmap_height; 562 bg_pmap_height = new_pmap_height;
556 } 563 }
557 /* fill with background color (if result's not completely overlapping it) */
558 gcv.foreground = pix_colors[Color_bg];
559 gc = XCreateGC (dpy, vt, GCForeground, &gcv);
560 564
561 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
562 int dst_width = result->width, dst_height = result->height;
563 if (background == NULL)
564 {
565 if (!(bg_flags & BG_TILE))
566 {
567 src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width );
568 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
569 }
570
571 if (dst_x > 0 || dst_y > 0
572 || dst_x + dst_width < new_pmap_width
573 || dst_y + dst_height < new_pmap_height)
574 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
575 }
576
577 /* put result on pixmap */
578 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
579 asimage2drawable (asv, bg_pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True);
580
581 if (result != background && result != original_asim)
582 destroy_asimage (&result);
583
584 XFreeGC (dpy, gc);
585
586 ret = true;
587 }
588
589 if (background)
590 destroy_asimage (&background);
591
592 return ret;
593}
594# endif /* HAVE_AFTERIMAGE */
595
596# ifdef HAVE_PIXBUF
597bool
598rxvt_term::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
599 int src_x, int src_y, int dst_x, int dst_y,
600 unsigned int width, unsigned int height)
601{
602 XImage *ximage;
603 char *data, *line;
604 int bytes_per_pixel;
605 int width_r, width_g, width_b;
606 int sh_r, sh_g, sh_b;
607 int rowstride;
608 int channels;
609 unsigned char *row;
610
611 if (visual->c_class != TrueColor)
612 return false;
613
614 if (depth == 24 || depth == 32)
615 bytes_per_pixel = 4;
616 else if (depth == 15 || depth == 16)
617 bytes_per_pixel = 2;
618 else
619 return false;
620
621 width_r = ecb_popcount32 (visual->red_mask);
622 width_g = ecb_popcount32 (visual->green_mask);
623 width_b = ecb_popcount32 (visual->blue_mask);
624
625 if (width_r > 8 || width_g > 8 || width_b > 8)
626 return false;
627
628 sh_r = ecb_ctz32 (visual->red_mask);
629 sh_g = ecb_ctz32 (visual->green_mask);
630 sh_b = ecb_ctz32 (visual->blue_mask);
631
632 if (width > INT_MAX / height / bytes_per_pixel)
633 return false;
634
635 data = (char *)malloc (width * height * bytes_per_pixel);
636 if (!data)
637 return false;
638
639 ximage = XCreateImage (dpy, visual, depth, ZPixmap, 0, data,
640 width, height, bytes_per_pixel * 8, 0);
641 if (!ximage)
642 {
643 free (data);
644 return false;
645 }
646
647 ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
648
649 rowstride = gdk_pixbuf_get_rowstride (pixbuf);
650 channels = gdk_pixbuf_get_n_channels (pixbuf);
651 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
652 line = data;
653
654 for (int y = 0; y < height; y++)
655 {
656 for (int x = 0; x < width; x++)
657 {
658 unsigned char *pixel = row + x * channels;
659 uint32_t value;
660
661 value = ((pixel[0] >> (8 - width_r)) << sh_r)
662 | ((pixel[1] >> (8 - width_g)) << sh_g)
663 | ((pixel[2] >> (8 - width_b)) << sh_b);
664
665 if (bytes_per_pixel == 4)
666 ((uint32_t *)line)[x] = value;
667 else
668 ((uint16_t *)line)[x] = value;
669 }
670
671 row += rowstride;
672 line += ximage->bytes_per_line;
673 }
674
675 XPutImage (dpy, pixmap, gc, ximage, 0, 0, dst_x, dst_y, width, height);
676 XDestroyImage (ximage);
677 return true;
678}
679
680bool
681rxvt_term::render_image (unsigned long tr_flags)
682{
683 if (!pixbuf)
684 return false;
685
686 if (tr_flags
687 && !(bg_flags & BG_HAS_RENDER))
688 return false;
689
690 GdkPixbuf *result;
691
692 int image_width = gdk_pixbuf_get_width (pixbuf);
693 int image_height = gdk_pixbuf_get_height (pixbuf);
694
695 int target_width = szHint.width;
696 int target_height = szHint.height;
697 int new_pmap_width = target_width;
698 int new_pmap_height = target_height;
699
700 int x = 0;
701 int y = 0;
702 int w = 0;
703 int h = 0;
704
705 get_image_geometry (image_width, image_height, w, h, x, y);
706
707 if (!(bg_flags & BG_ROOT_ALIGN)
708 && (x >= target_width
709 || y >= target_height
710 || x + w <= 0
711 || y + h <= 0))
712 return false;
713
714 result = pixbuf;
715
716 if (w != image_width
717 || h != image_height)
718 {
719 result = gdk_pixbuf_scale_simple (pixbuf,
720 w, h,
721 GDK_INTERP_BILINEAR);
722 }
723
724 if (!result)
725 return false;
726
727 bool ret = false;
728
729 XGCValues gcv;
730 GC gc;
731 Pixmap root_pmap;
732
733 image_width = gdk_pixbuf_get_width (result);
734 image_height = gdk_pixbuf_get_height (result);
735
736 if (tr_flags)
737 {
738 root_pmap = bg_pixmap; 565 tmp_pixmap = bg_pixmap;
739 bg_pixmap = None;
740 }
741 else
742 {
743 if (bg_flags & BG_TILE)
744 {
745 new_pmap_width = min (image_width, target_width);
746 new_pmap_height = min (image_height, target_height);
747 }
748 }
749
750 if (bg_pixmap == None
751 || bg_pmap_width != new_pmap_width
752 || bg_pmap_height != new_pmap_height)
753 {
754 if (bg_pixmap)
755 XFreePixmap (dpy, bg_pixmap);
756 bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth);
757 bg_pmap_width = new_pmap_width;
758 bg_pmap_height = new_pmap_height;
759 } 566 }
760 567
761 gcv.foreground = pix_colors[Color_bg]; 568 gcv.foreground = pix_colors[Color_bg];
762 gc = XCreateGC (dpy, vt, GCForeground, &gcv); 569 gc = XCreateGC (dpy, tmp_pixmap, GCForeground, &gcv);
763 570
764 if (gc) 571 if (gc)
765 { 572 {
766 if (bg_flags & BG_TILE) 573 if (image.flags & IM_TILE)
767 { 574 {
768 Pixmap tile = XCreatePixmap (dpy, vt, image_width, image_height, depth); 575 Pixmap tile = XCreatePixmap (dpy, vt, image_width, image_height, need_blend ? 32 : depth);
769 pixbuf_to_pixmap (result, tile, gc, 576 pixbuf_to_pixmap (result, tile, gc,
770 0, 0, 577 0, 0,
771 0, 0, 578 0, 0,
772 image_width, image_height); 579 image_width, image_height, need_blend);
773 580
774 gcv.tile = tile; 581 gcv.tile = tile;
775 gcv.fill_style = FillTiled; 582 gcv.fill_style = FillTiled;
776 gcv.ts_x_origin = x; 583 gcv.ts_x_origin = x;
777 gcv.ts_y_origin = y; 584 gcv.ts_y_origin = y;
778 XChangeGC (dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 585 XChangeGC (dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
779 586
780 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 587 XFillRectangle (dpy, tmp_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
781 XFreePixmap (dpy, tile); 588 XFreePixmap (dpy, tile);
782 } 589 }
783 else 590 else
784 { 591 {
785 int src_x, src_y, dst_x, dst_y; 592 int src_x, src_y, dst_x, dst_y;
789 src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height); 596 src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height);
790 597
791 if (dst_x > 0 || dst_y > 0 598 if (dst_x > 0 || dst_y > 0
792 || dst_x + dst_width < new_pmap_width 599 || dst_x + dst_width < new_pmap_width
793 || dst_y + dst_height < new_pmap_height) 600 || dst_y + dst_height < new_pmap_height)
794 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 601 XFillRectangle (dpy, tmp_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
795 602
796 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 603 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
797 pixbuf_to_pixmap (result, bg_pixmap, gc, 604 pixbuf_to_pixmap (result, tmp_pixmap, gc,
798 src_x, src_y, 605 src_x, src_y,
799 dst_x, dst_y, 606 dst_x, dst_y,
800 dst_width, dst_height); 607 dst_width, dst_height, need_blend);
801 } 608 }
802 609
803#if XRENDER 610#if XRENDER
804 if (tr_flags) 611 if (need_blend)
805 { 612 {
806 XRenderPictureAttributes pa; 613 XRenderPictFormat *argb_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
807
808 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, visual); 614 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
615
809 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa); 616 Picture src = XRenderCreatePicture (dpy, tmp_pixmap, argb_format, 0, 0);
810 617
811 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
812 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, dst_format, 0, &pa); 618 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, format, 0, 0);
813 619
814 pa.repeat = True; 620 Picture mask = create_xrender_mask (dpy, vt, False, False);
815 Pixmap mask_pmap = XCreatePixmap (dpy, vt, 1, 1, 8);
816 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8);
817 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa);
818 XFreePixmap (dpy, mask_pmap);
819 621
820 XRenderColor mask_c; 622 XRenderColor mask_c;
821 623
822 mask_c.alpha = 0x8000; 624 mask_c.alpha = image.alpha;
823 mask_c.red = 0; 625 mask_c.red =
824 mask_c.green = 0; 626 mask_c.green =
825 mask_c.blue = 0; 627 mask_c.blue = 0;
826 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1); 628 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
629
827 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height); 630 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);
828 631
829 XRenderFreePicture (dpy, src); 632 XRenderFreePicture (dpy, src);
830 XRenderFreePicture (dpy, dst); 633 XRenderFreePicture (dpy, dst);
831 XRenderFreePicture (dpy, mask); 634 XRenderFreePicture (dpy, mask);
838 } 641 }
839 642
840 if (result != pixbuf) 643 if (result != pixbuf)
841 g_object_unref (result); 644 g_object_unref (result);
842 645
843 if (tr_flags) 646 if (need_blend)
844 XFreePixmap (dpy, root_pmap); 647 XFreePixmap (dpy, tmp_pixmap);
845 648
846 return ret; 649 return ret;
847} 650}
848# endif /* HAVE_PIXBUF */ 651# endif /* HAVE_PIXBUF */
849 652
653# ifndef NO_RESOURCES
654static int
655rxvt_define_image (XrmDatabase *database ecb_unused,
656 XrmBindingList bindings ecb_unused,
657 XrmQuarkList quarks,
658 XrmRepresentation *type ecb_unused,
659 XrmValue *value,
660 XPointer closure ecb_unused)
661{
662 int size;
663
664 for (size = 0; quarks[size] != NULLQUARK; size++)
665 ;
666
667 if (size >= 2)
668 {
669 int id = strtol (XrmQuarkToString (quarks[size-2]), 0, 0);
670 if (id >= 1)
671 GET_R->parse_image (id, XrmQuarkToString (quarks[size-1]), (char *)value->addr);
672 }
673 return False;
674}
675
676void
677rxvt_term::parse_image (int id, const char *type, const char *arg)
678{
679 if (image_vec.size () < id + 1)
680 image_vec.resize (id + 1);
681
682 rxvt_image *image = &image_vec[id];
683}
684# endif
685
686rxvt_image::rxvt_image ()
687{
688 alpha =
689 flags =
690 h_scale =
691 v_scale =
692 h_align =
693 v_align = 0;
694
695# ifdef HAVE_PIXBUF
696 pixbuf = 0;
697# endif
698}
699
850bool 700bool
851rxvt_term::bg_set_file (const char *file) 701rxvt_image::set_file_geometry (const char *file)
852{ 702{
853 if (!file || !*file) 703 if (!file || !*file)
854 return false; 704 return false;
855 705
856 bool ret = false;
857 const char *p = strchr (file, ';'); 706 const char *p = strchr (file, ';');
858 707
859 if (p) 708 if (p)
860 { 709 {
861 size_t len = p - file; 710 size_t len = p - file;
863 memcpy (f, file, len); 712 memcpy (f, file, len);
864 f[len] = '\0'; 713 f[len] = '\0';
865 file = f; 714 file = f;
866 } 715 }
867 716
868# ifdef HAVE_AFTERIMAGE 717 bool ret = set_file (file);
869 if (!asimman) 718 alpha = 0x8000;
870 asimman = create_generic_imageman (rs[Rs_path]); 719 if (ret && p)
871 ASImage *image = get_asimage (asimman, file, 0xFFFFFFFF, 100); 720 set_geometry (p + 1);
872 if (image) 721 return ret;
873 { 722}
874 if (original_asim) 723
875 safe_asimage_destroy (original_asim); 724bool
876 original_asim = image; 725rxvt_image::set_file (const char *file)
877 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER; 726{
878 ret = true; 727 bool ret = false;
879 }
880# endif
881 728
882# ifdef HAVE_PIXBUF 729# ifdef HAVE_PIXBUF
883 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 730 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
884 if (image) 731 if (image)
885 { 732 {
886 if (pixbuf) 733 if (pixbuf)
887 g_object_unref (pixbuf); 734 g_object_unref (pixbuf);
888 pixbuf = image; 735 pixbuf = image;
889 bg_flags |= BG_IS_FROM_FILE;
890 ret = true; 736 ret = true;
891 } 737 }
892# endif 738# endif
893 739
894 if (ret) 740 if (ret)
895 { 741 {
896 if (p) 742 alpha = 0xffff;
897 bg_set_geometry (p + 1); 743 flags = IM_IS_SET | IM_IS_SIZE_SENSITIVE;
898 else 744 h_scale = v_scale = defaultScale;
899 bg_set_default_geometry (); 745 h_align = v_align = defaultAlign;
900 } 746 }
901 747
902 return ret; 748 return ret;
903} 749}
904 750
905# endif /* BG_IMAGE_FROM_FILE */ 751# endif /* BG_IMAGE_FROM_FILE */
906 752
907# ifdef ENABLE_TRANSPARENCY 753# ifdef ENABLE_TRANSPARENCY
908bool
909rxvt_term::bg_set_transparent ()
910{
911 if (!(bg_flags & BG_IS_TRANSPARENT))
912 {
913 bg_flags |= BG_IS_TRANSPARENT;
914 return true;
915 }
916
917 return false;
918}
919
920bool 754bool
921rxvt_term::bg_set_blur (const char *geom) 755rxvt_term::bg_set_blur (const char *geom)
922{ 756{
923 bool changed = false; 757 bool changed = false;
924 unsigned int hr, vr; 758 unsigned int hr, vr;
943 { 777 {
944 changed = true; 778 changed = true;
945 v_blurRadius = vr; 779 v_blurRadius = vr;
946 } 780 }
947 781
948 if (v_blurRadius == 0 && h_blurRadius == 0)
949 bg_flags &= ~BG_NEEDS_BLUR;
950 else
951 bg_flags |= BG_NEEDS_BLUR;
952
953 return changed; 782 return changed;
954} 783}
955 784
956void
957rxvt_term::set_tint_shade_flags ()
958{
959 rgba c;
960 bool has_shade = shade != 100;
961
962 bg_flags &= ~BG_TINT_FLAGS;
963
964 tint.get (c);
965
966 if (!has_shade
967 && (c.r <= 0x00ff || c.r >= 0xff00)
968 && (c.g <= 0x00ff || c.g >= 0xff00)
969 && (c.b <= 0x00ff || c.b >= 0xff00))
970 bg_flags |= BG_TINT_BITAND;
971
972 if (has_shade
973 || c.r < 0xff00
974 || c.g < 0xff00
975 || c.b < 0xff00)
976 bg_flags |= BG_NEEDS_TINT;
977}
978
979bool 785bool
980rxvt_term::bg_set_tint (rxvt_color &new_tint) 786rxvt_term::bg_set_tint (rxvt_color &new_tint)
981{ 787{
982 if (tint != new_tint) 788 if (!(bg_flags & BG_TINT_SET) || tint != new_tint)
983 { 789 {
984 tint = new_tint; 790 tint = new_tint;
985 set_tint_shade_flags (); 791 bg_flags |= BG_TINT_SET;
792
793 rgba c;
794 tint.get (c);
795 if ((c.r <= 0x00ff || c.r >= 0xff00)
796 && (c.g <= 0x00ff || c.g >= 0xff00)
797 && (c.b <= 0x00ff || c.b >= 0xff00))
798 bg_flags |= BG_TINT_BITAND;
799 else
800 bg_flags &= ~BG_TINT_BITAND;
801
986 return true; 802 return true;
987 } 803 }
988 804
989 return false; 805 return false;
990} 806}
999 new_shade = 200 - (100 + new_shade); 815 new_shade = 200 - (100 + new_shade);
1000 816
1001 if (new_shade != shade) 817 if (new_shade != shade)
1002 { 818 {
1003 shade = new_shade; 819 shade = new_shade;
1004 set_tint_shade_flags ();
1005 return true; 820 return true;
1006 } 821 }
1007 822
1008 return false; 823 return false;
1009} 824}
1030 params[i+2] = XDoubleToFixed (kernel[i] / sum); 845 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1031} 846}
1032#endif 847#endif
1033 848
1034bool 849bool
1035rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 850rxvt_term::blur_pixmap (Pixmap pixmap, int width, int height)
1036{ 851{
1037 bool ret = false; 852 bool ret = false;
1038#if XRENDER 853#if XRENDER
1039 if (!(bg_flags & BG_HAS_RENDER_CONV)) 854 if (!(bg_flags & BG_HAS_RENDER_CONV))
1040 return false; 855 return false;
1044 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 859 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1045 860
1046 XRenderPictureAttributes pa; 861 XRenderPictureAttributes pa;
1047 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 862 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1048 863
864 pa.repeat = RepeatPad;
1049 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 865 Picture src = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);
866 Pixmap tmp = XCreatePixmap (dpy, pixmap, width, height, depth);
1050 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 867 Picture dst = XRenderCreatePicture (dpy, tmp, format, CPRepeat, &pa);
868 XFreePixmap (dpy, tmp);
1051 869
1052 if (kernel && params) 870 if (kernel && params)
1053 { 871 {
1054 if (h_blurRadius)
1055 {
1056 size = h_blurRadius * 2 + 1; 872 size = h_blurRadius * 2 + 1;
1057 get_gaussian_kernel (h_blurRadius, size, kernel, params); 873 get_gaussian_kernel (h_blurRadius, size, kernel, params);
1058 874
1059 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 875 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1060 XRenderComposite (dpy, 876 XRenderComposite (dpy,
1061 PictOpSrc, 877 PictOpSrc,
1062 src, 878 src,
1063 None, 879 None,
1064 dst, 880 dst,
1065 0, 0, 881 0, 0,
1066 0, 0, 882 0, 0,
1067 0, 0, 883 0, 0,
1068 width, height); 884 width, height);
1069 }
1070 885
1071 if (v_blurRadius) 886 ::swap (src, dst);
1072 { 887
1073 size = v_blurRadius * 2 + 1; 888 size = v_blurRadius * 2 + 1;
1074 get_gaussian_kernel (v_blurRadius, size, kernel, params); 889 get_gaussian_kernel (v_blurRadius, size, kernel, params);
1075 ::swap (params[0], params[1]); 890 ::swap (params[0], params[1]);
1076 891
1077 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 892 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1078 XRenderComposite (dpy, 893 XRenderComposite (dpy,
1079 PictOpSrc, 894 PictOpSrc,
1080 src, 895 src,
1081 None, 896 None,
1082 dst, 897 dst,
1083 0, 0, 898 0, 0,
1084 0, 0, 899 0, 0,
1085 0, 0, 900 0, 0,
1086 width, height); 901 width, height);
1087 }
1088 902
1089 ret = true; 903 ret = true;
1090 } 904 }
1091 905
1092 free (kernel); 906 free (kernel);
1096#endif 910#endif
1097 return ret; 911 return ret;
1098} 912}
1099 913
1100bool 914bool
1101rxvt_term::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 915rxvt_term::tint_pixmap (Pixmap pixmap, int width, int height)
1102{ 916{
1103 bool ret = false; 917 bool ret = false;
1104 918
1105 if (bg_flags & BG_TINT_BITAND) 919 if (shade == 100 && (bg_flags & BG_TINT_BITAND))
1106 { 920 {
1107 XGCValues gcv; 921 XGCValues gcv;
1108 GC gc; 922 GC gc;
1109 923
1110 /* In this case we can tint image server-side getting significant 924 /* In this case we can tint image server-side getting significant
1122 } 936 }
1123 } 937 }
1124# if XRENDER 938# if XRENDER
1125 else if (bg_flags & BG_HAS_RENDER) 939 else if (bg_flags & BG_HAS_RENDER)
1126 { 940 {
1127 rgba c; 941 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1128 942
943 if (bg_flags & BG_TINT_SET)
1129 tint.get (c); 944 tint.get (c);
1130 945
1131 if (shade <= 100) 946 if (shade <= 100)
1132 { 947 {
1133 c.r = c.r * shade / 100; 948 c.r = c.r * shade / 100;
1134 c.g = c.g * shade / 100; 949 c.g = c.g * shade / 100;
1139 c.r = c.r * (200 - shade) / 100; 954 c.r = c.r * (200 - shade) / 100;
1140 c.g = c.g * (200 - shade) / 100; 955 c.g = c.g * (200 - shade) / 100;
1141 c.b = c.b * (200 - shade) / 100; 956 c.b = c.b * (200 - shade) / 100;
1142 } 957 }
1143 958
1144 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1145 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 959 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1146 XRenderPictureAttributes pa;
1147 960
1148 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 961 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, 0);
1149 962
1150 pa.repeat = True; 963 Picture overlay_pic = create_xrender_mask (dpy, pixmap, True, False);
1151 964
1152 Pixmap overlay_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32); 965 Picture mask_pic = create_xrender_mask (dpy, pixmap, True, True);
1153 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1154 XFreePixmap (dpy, overlay_pmap);
1155
1156 pa.component_alpha = True;
1157 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1158 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat | CPComponentAlpha, &pa);
1159 XFreePixmap (dpy, mask_pmap);
1160 966
1161 XRenderColor mask_c; 967 XRenderColor mask_c;
1162 968
1163 mask_c.alpha = 0xffff; 969 mask_c.alpha = 0xffff;
1164 mask_c.red = 970 mask_c.red =
1169 mask_c.alpha = 0; 975 mask_c.alpha = 0;
1170 mask_c.red = 0xffff - c.r; 976 mask_c.red = 0xffff - c.r;
1171 mask_c.green = 0xffff - c.g; 977 mask_c.green = 0xffff - c.g;
1172 mask_c.blue = 0xffff - c.b; 978 mask_c.blue = 0xffff - c.b;
1173 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 979 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
980
1174 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height); 981 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1175 982
1176 if (shade > 100) 983 if (shade > 100)
1177 { 984 {
1178 mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
1179 mask_c.alpha = 0; 985 mask_c.alpha = 0;
986 mask_c.red =
987 mask_c.green =
988 mask_c.blue = 0xffff * (shade - 100) / 100;
1180 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 989 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1181 990
1182 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height); 991 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1183 } 992 }
1184 993
1196/* 1005/*
1197 * Builds a pixmap of the same size as the terminal window that contains 1006 * Builds a pixmap of the same size as the terminal window that contains
1198 * the tiled portion of the root pixmap that is supposed to be covered by 1007 * the tiled portion of the root pixmap that is supposed to be covered by
1199 * our window. 1008 * our window.
1200 */ 1009 */
1201unsigned long 1010bool
1202rxvt_term::make_transparency_pixmap () 1011rxvt_term::make_transparency_pixmap ()
1203{ 1012{
1204 unsigned long result = 0; 1013 bool ret = false;
1205 1014
1206 /* root dimensions may change from call to call - but Display structure should 1015 /* root dimensions may change from call to call - but Display structure should
1207 * be always up-to-date, so let's use it : 1016 * be always up-to-date, so let's use it :
1208 */ 1017 */
1209 int screen = display->screen; 1018 int screen = display->screen;
1247#if XRENDER 1056#if XRENDER
1248 if (bg_flags & BG_HAS_RENDER) 1057 if (bg_flags & BG_HAS_RENDER)
1249 { 1058 {
1250 recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth); 1059 recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth);
1251 1060
1252 XRenderPictureAttributes pa;
1253
1254 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen)); 1061 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1255 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa); 1062 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, 0);
1256 1063
1257 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual); 1064 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
1258 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa); 1065 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, 0);
1259 1066
1260 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height); 1067 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1261 1068
1262 XRenderFreePicture (dpy, src); 1069 XRenderFreePicture (dpy, src);
1263 XRenderFreePicture (dpy, dst); 1070 XRenderFreePicture (dpy, dst);
1292 gc = XCreateGC (dpy, vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1099 gc = XCreateGC (dpy, vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1293 1100
1294 if (gc) 1101 if (gc)
1295 { 1102 {
1296 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height); 1103 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height);
1297 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS); 1104 ret = true;
1298 XFreeGC (dpy, gc); 1105 bool need_blur = h_blurRadius && v_blurRadius;
1106 bool need_tint = shade != 100 || (bg_flags & BG_TINT_SET);
1299 1107
1300 if (!(bg_flags & BG_CLIENT_RENDER)) 1108 if (!(bg_flags & BG_CLIENT_RENDER))
1301 { 1109 {
1302 if (bg_flags & BG_NEEDS_BLUR) 1110 if (need_blur)
1303 { 1111 {
1304 if (blur_pixmap (bg_pixmap, visual, window_width, window_height)) 1112 if (blur_pixmap (bg_pixmap, window_width, window_height))
1305 result &= ~BG_NEEDS_BLUR; 1113 need_blur = false;
1306 } 1114 }
1307 if (bg_flags & BG_NEEDS_TINT) 1115 if (need_tint)
1308 { 1116 {
1309 if (tint_pixmap (bg_pixmap, visual, window_width, window_height)) 1117 if (tint_pixmap (bg_pixmap, window_width, window_height))
1310 result &= ~BG_NEEDS_TINT; 1118 need_tint = false;
1119 }
1120 if (need_tint)
1121 {
1122 XImage *ximage = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1123 if (ximage)
1124 {
1125 /* our own client-side tinting */
1126 tint_ximage (ximage);
1127
1128 XPutImage (dpy, bg_pixmap, gc, ximage, 0, 0, 0, 0, ximage->width, ximage->height);
1129 XDestroyImage (ximage);
1130 }
1311 } 1131 }
1312 } /* server side rendering completed */ 1132 } /* server side rendering completed */
1133
1134 XFreeGC (dpy, gc);
1313 } 1135 }
1314 1136
1315 if (recoded_root_pmap != root_pixmap) 1137 if (recoded_root_pmap != root_pixmap)
1316 XFreePixmap (dpy, recoded_root_pmap); 1138 XFreePixmap (dpy, recoded_root_pmap);
1317 1139
1318 return result; 1140 return ret;
1319} 1141}
1320 1142
1321void 1143void
1322rxvt_term::bg_set_root_pixmap () 1144rxvt_term::bg_set_root_pixmap ()
1323{ 1145{
1330# endif /* ENABLE_TRANSPARENCY */ 1152# endif /* ENABLE_TRANSPARENCY */
1331 1153
1332bool 1154bool
1333rxvt_term::bg_render () 1155rxvt_term::bg_render ()
1334{ 1156{
1335 unsigned long tr_flags = 0;
1336
1337 bg_invalidate (); 1157 bg_invalidate ();
1338# ifdef ENABLE_TRANSPARENCY 1158# ifdef ENABLE_TRANSPARENCY
1339 if (bg_flags & BG_IS_TRANSPARENT) 1159 if (bg_flags & BG_IS_TRANSPARENT)
1340 { 1160 {
1341 /* we need to re-generate transparency pixmap in that case ! */ 1161 /* we need to re-generate transparency pixmap in that case ! */
1342 tr_flags = make_transparency_pixmap (); 1162 if (make_transparency_pixmap ())
1343 if (tr_flags == 0)
1344 return false;
1345 bg_flags |= BG_IS_VALID; 1163 bg_flags |= BG_IS_VALID;
1346 } 1164 }
1347# endif 1165# endif
1348 1166
1349# ifdef BG_IMAGE_FROM_FILE 1167# ifdef BG_IMAGE_FROM_FILE
1350 if ((bg_flags & BG_IS_FROM_FILE) 1168 for (vector<rxvt_image>::iterator bg_image = image_vec.begin (); bg_image < image_vec.end (); bg_image++)
1351 || (tr_flags & BG_EFFECTS_FLAGS))
1352 { 1169 {
1353 if (render_image (tr_flags)) 1170 if (render_image (*bg_image))
1354 bg_flags |= BG_IS_VALID; 1171 bg_flags |= BG_IS_VALID;
1355 }
1356# endif
1357
1358# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1359 XImage *result = NULL;
1360
1361 if (tr_flags & BG_NEEDS_TINT)
1362 {
1363 result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1364 }
1365
1366 if (result)
1367 {
1368 /* our own client-side tinting */
1369 //if (tr_flags & BG_NEEDS_TINT)
1370 if (1)
1371 tint_ximage (DefaultVisual (dpy, display->screen), result);
1372
1373 GC gc = XCreateGC (dpy, vt, 0UL, NULL);
1374
1375 if (gc)
1376 {
1377 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1378
1379 XFreeGC (dpy, gc);
1380 }
1381
1382 XDestroyImage (result);
1383 } 1172 }
1384# endif 1173# endif
1385 1174
1386 if (!(bg_flags & BG_IS_VALID)) 1175 if (!(bg_flags & BG_IS_VALID))
1387 { 1176 {
1402 1191
1403void 1192void
1404rxvt_term::bg_init () 1193rxvt_term::bg_init ()
1405{ 1194{
1406#ifdef ENABLE_TRANSPARENCY 1195#ifdef ENABLE_TRANSPARENCY
1407 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1408 tint.set (this, c);
1409 shade = 100; 1196 shade = 100;
1410#endif 1197#endif
1411 1198
1412 bg_flags &= ~(BG_HAS_RENDER | BG_HAS_RENDER_CONV); 1199 bg_flags &= ~(BG_HAS_RENDER | BG_HAS_RENDER_CONV);
1413#if XRENDER 1200#if XRENDER
1422 bg_flags |= BG_HAS_RENDER_CONV; 1209 bg_flags |= BG_HAS_RENDER_CONV;
1423 1210
1424 XFree (filters); 1211 XFree (filters);
1425 } 1212 }
1426#endif 1213#endif
1214
1215#ifdef BG_IMAGE_FROM_FILE
1216 if (rs[Rs_backgroundPixmap])
1217 {
1218 rxvt_image *image = new_image ();
1219 if (!image->set_file_geometry (rs[Rs_backgroundPixmap]))
1220 image_vec.pop_back ();
1221 }
1222
1223# ifndef NO_RESOURCES
1224 find_resources ("image", "Image", XrmEnumAllLevels, rxvt_define_image);
1225 vector<rxvt_image>::iterator bg_image = image_vec.begin ();
1226 while (bg_image != image_vec.end ())
1227 {
1228 if (!(bg_image->flags & IM_IS_SET))
1229 bg_image = image_vec.erase (bg_image);
1230 else
1231 bg_image++;
1232 }
1233# endif
1234
1235 if (image_vec.size () > 0
1236 && !bg_window_position_sensitive ())
1237 update_background ();
1238#endif
1427} 1239}
1428 1240
1429#endif /* HAVE_BG_PIXMAP */ 1241#endif /* HAVE_BG_PIXMAP */
1430 1242
1431#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1243#ifdef ENABLE_TRANSPARENCY
1432/* based on code from aterm-0.4.2 */ 1244/* based on code from aterm-0.4.2 */
1433 1245
1434static inline void 1246static inline void
1435fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high) 1247fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high)
1436{ 1248{
1442 lookup[i] = (tmp / 0xffff) << sh; 1254 lookup[i] = (tmp / 0xffff) << sh;
1443 } 1255 }
1444} 1256}
1445 1257
1446void 1258void
1447rxvt_term::tint_ximage (Visual *visual, XImage *ximage) 1259rxvt_term::tint_ximage (XImage *ximage)
1448{ 1260{
1261 unsigned int size_r, size_g, size_b;
1449 int sh_r, sh_g, sh_b; 1262 int sh_r, sh_g, sh_b;
1450 uint32_t mask_r, mask_g, mask_b; 1263 uint32_t mask_r, mask_g, mask_b;
1451 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1264 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1452 unsigned short low; 1265 unsigned short low;
1453 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; 1266 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
1458 mask_r = visual->red_mask; 1271 mask_r = visual->red_mask;
1459 mask_g = visual->green_mask; 1272 mask_g = visual->green_mask;
1460 mask_b = visual->blue_mask; 1273 mask_b = visual->blue_mask;
1461 1274
1462 /* boring lookup table pre-initialization */ 1275 /* boring lookup table pre-initialization */
1463 switch (ximage->depth) 1276 sh_r = ecb_ctz32 (mask_r);
1464 { 1277 sh_g = ecb_ctz32 (mask_g);
1465 case 15: 1278 sh_b = ecb_ctz32 (mask_b);
1466 if ((mask_r != 0x7c00) || 1279
1467 (mask_g != 0x03e0) || 1280 size_r = mask_r >> sh_r;
1468 (mask_b != 0x001f)) 1281 size_g = mask_g >> sh_g;
1282 size_b = mask_b >> sh_b;
1283
1284 if (size_r++ > 255 || size_g++ > 255 || size_b++ > 255)
1469 return; 1285 return;
1470 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+32+32)); 1286
1287 lookup = (uint32_t *)malloc (sizeof (uint32_t) * (size_r + size_g + size_b));
1471 lookup_r = lookup; 1288 lookup_r = lookup;
1472 lookup_g = lookup+32; 1289 lookup_g = lookup + size_r;
1473 lookup_b = lookup+32+32; 1290 lookup_b = lookup + size_r + size_g;
1474 sh_r = 10;
1475 sh_g = 5;
1476 sh_b = 0;
1477 break;
1478 case 16:
1479 if ((mask_r != 0xf800) ||
1480 (mask_g != 0x07e0) ||
1481 (mask_b != 0x001f))
1482 return;
1483 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+64+32));
1484 lookup_r = lookup;
1485 lookup_g = lookup+32;
1486 lookup_b = lookup+32+64;
1487 sh_r = 11;
1488 sh_g = 5;
1489 sh_b = 0;
1490 break;
1491 case 24:
1492 if ((mask_r != 0xff0000) ||
1493 (mask_g != 0x00ff00) ||
1494 (mask_b != 0x0000ff))
1495 return;
1496 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1497 lookup_r = lookup;
1498 lookup_g = lookup+256;
1499 lookup_b = lookup+256+256;
1500 sh_r = 16;
1501 sh_g = 8;
1502 sh_b = 0;
1503 break;
1504 case 32:
1505 if ((mask_r != 0xff0000) ||
1506 (mask_g != 0x00ff00) ||
1507 (mask_b != 0x0000ff))
1508 return;
1509 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1510 lookup_r = lookup;
1511 lookup_g = lookup+256;
1512 lookup_b = lookup+256+256;
1513 sh_r = 16;
1514 sh_g = 8;
1515 sh_b = 0;
1516 break;
1517 default:
1518 return; /* we do not support this color depth */
1519 }
1520 1291
1521 rgba c; 1292 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1522 1293
1294 if (bg_flags & BG_TINT_SET)
1523 tint.get (c); 1295 tint.get (c);
1524 1296
1525 /* prepare limits for color transformation (each channel is handled separately) */ 1297 /* prepare limits for color transformation (each channel is handled separately) */
1526 if (shade > 100) 1298 if (shade > 100)
1527 { 1299 {
1528 c.r = c.r * (200 - shade) / 100; 1300 c.r = c.r * (200 - shade) / 100;
1545 fill_lut (lookup_g, mask_g, sh_g, low, c.g); 1317 fill_lut (lookup_g, mask_g, sh_g, low, c.g);
1546 fill_lut (lookup_b, mask_b, sh_b, low, c.b); 1318 fill_lut (lookup_b, mask_b, sh_b, low, c.b);
1547 1319
1548 /* apply table to input image (replacing colors by newly calculated ones) */ 1320 /* apply table to input image (replacing colors by newly calculated ones) */
1549 if (ximage->bits_per_pixel == 32 1321 if (ximage->bits_per_pixel == 32
1550 && (ximage->depth == 24 || ximage->depth == 32)
1551 && ximage->byte_order == host_byte_order) 1322 && ximage->byte_order == host_byte_order)
1552 { 1323 {
1553 uint32_t *p1, *pf, *p, *pl; 1324 char *line = ximage->data;
1554 p1 = (uint32_t *) ximage->data;
1555 pf = (uint32_t *) (ximage->data + ximage->height * ximage->bytes_per_line);
1556 1325
1557 while (p1 < pf) 1326 for (int y = 0; y < ximage->height; y++)
1558 { 1327 {
1559 p = p1; 1328 uint32_t *p = (uint32_t *)line;
1560 pl = p1 + ximage->width; 1329 for (int x = 0; x < ximage->width; x++)
1561 for (; p < pl; p++)
1562 { 1330 {
1563 *p = lookup_r[(*p & 0xff0000) >> 16] | 1331 *p = lookup_r[(*p & mask_r) >> sh_r] |
1564 lookup_g[(*p & 0x00ff00) >> 8] | 1332 lookup_g[(*p & mask_g) >> sh_g] |
1565 lookup_b[(*p & 0x0000ff)] | 1333 lookup_b[(*p & mask_b) >> sh_b];
1566 (*p & 0xff000000); 1334 p++;
1567 } 1335 }
1568 p1 = (uint32_t *) ((char *) p1 + ximage->bytes_per_line); 1336 line += ximage->bytes_per_line;
1569 } 1337 }
1570 } 1338 }
1571 else 1339 else
1572 { 1340 {
1573 for (int y = 0; y < ximage->height; y++) 1341 for (int y = 0; y < ximage->height; y++)
1581 } 1349 }
1582 } 1350 }
1583 1351
1584 free (lookup); 1352 free (lookup);
1585} 1353}
1586#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ 1354#endif /* ENABLE_TRANSPARENCY */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines