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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines