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.184 by sf-exg, Sun Dec 25 17:07:00 2011 UTC vs.
Revision 1.222 by sf-exg, Sat May 26 08:10:25 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines