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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines