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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines