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.155 by sf-exg, Mon May 30 18:39:02 2011 UTC vs.
Revision 1.210 by sf-exg, Sat May 12 09:43:06 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 = ecb_popcount32 (visual->red_mask);
626 width_g = ecb_popcount32 (visual->green_mask);
627 width_b = ecb_popcount32 (visual->blue_mask);
628
629 if (width_r > 8 || width_g > 8 || width_b > 8)
630 return false;
631
632 sh_r = ecb_ctz32 (visual->red_mask);
633 sh_g = ecb_ctz32 (visual->green_mask);
634 sh_b = ecb_ctz32 (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 = ecb_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 }
735 Pixmap root_pmap; 509 Pixmap root_pmap;
736 510
737 image_width = gdk_pixbuf_get_width (result); 511 image_width = gdk_pixbuf_get_width (result);
738 image_height = gdk_pixbuf_get_height (result); 512 image_height = gdk_pixbuf_get_height (result);
739 513
740 if (tr_flags) 514 if (transparent)
741 { 515 {
742 root_pmap = bg_pixmap; 516 root_pmap = bg_pixmap;
743 bg_pixmap = None; 517 bg_pixmap = None;
744 } 518 }
745 else 519 else
746 { 520 {
747 if (h_scale == 0 || v_scale == 0) 521 if (bg_flags & BG_TILE)
748 { 522 {
749 new_pmap_width = min (image_width, target_width); 523 new_pmap_width = min (image_width, target_width);
750 new_pmap_height = min (image_height, target_height); 524 new_pmap_height = min (image_height, target_height);
751 } 525 }
752 } 526 }
765 gcv.foreground = pix_colors[Color_bg]; 539 gcv.foreground = pix_colors[Color_bg];
766 gc = XCreateGC (dpy, vt, GCForeground, &gcv); 540 gc = XCreateGC (dpy, vt, GCForeground, &gcv);
767 541
768 if (gc) 542 if (gc)
769 { 543 {
770 if (h_scale == 0 || v_scale == 0) 544 if (bg_flags & BG_TILE)
771 { 545 {
772 Pixmap tile = XCreatePixmap (dpy, vt, image_width, image_height, depth); 546 Pixmap tile = XCreatePixmap (dpy, vt, image_width, image_height, depth);
773 pixbuf_to_pixmap (result, tile, gc, 547 pixbuf_to_pixmap (result, tile, gc,
774 0, 0, 548 0, 0,
775 0, 0, 549 0, 0,
803 dst_x, dst_y, 577 dst_x, dst_y,
804 dst_width, dst_height); 578 dst_width, dst_height);
805 } 579 }
806 580
807#if XRENDER 581#if XRENDER
808 if (tr_flags) 582 if (transparent)
809 { 583 {
810 XRenderPictureAttributes pa;
811
812 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, visual); 584 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
585
813 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa); 586 Picture src = XRenderCreatePicture (dpy, root_pmap, format, 0, 0);
814 587
815 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
816 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, dst_format, 0, &pa); 588 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, format, 0, 0);
817 589
818 pa.repeat = True; 590 Picture mask = create_xrender_mask (dpy, vt, False, False);
819 Pixmap mask_pmap = XCreatePixmap (dpy, vt, 1, 1, 8);
820 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8);
821 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa);
822 XFreePixmap (dpy, mask_pmap);
823 591
824 XRenderColor mask_c; 592 XRenderColor mask_c;
825 593
826 mask_c.alpha = 0x8000; 594 mask_c.alpha = 0x8000;
827 mask_c.red = 0; 595 mask_c.red =
828 mask_c.green = 0; 596 mask_c.green =
829 mask_c.blue = 0; 597 mask_c.blue = 0;
830 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1); 598 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
599
831 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);
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);
842 } 611 }
843 612
844 if (result != pixbuf) 613 if (result != pixbuf)
845 g_object_unref (result); 614 g_object_unref (result);
846 615
847 if (tr_flags) 616 if (transparent)
848 XFreePixmap (dpy, root_pmap); 617 XFreePixmap (dpy, root_pmap);
849 618
850 return ret; 619 return ret;
851} 620}
852# endif /* HAVE_PIXBUF */ 621# endif /* HAVE_PIXBUF */
855rxvt_term::bg_set_file (const char *file) 624rxvt_term::bg_set_file (const char *file)
856{ 625{
857 if (!file || !*file) 626 if (!file || !*file)
858 return false; 627 return false;
859 628
629 bool ret = false;
860 if (const char *p = strchr (file, ';')) 630 const char *p = strchr (file, ';');
631
632 if (p)
861 { 633 {
862 size_t len = p - file; 634 size_t len = p - file;
863 char *f = rxvt_temp_buf<char> (len + 1); 635 char *f = rxvt_temp_buf<char> (len + 1);
864 memcpy (f, file, len); 636 memcpy (f, file, len);
865 f[len] = '\0'; 637 f[len] = '\0';
866 file = f; 638 file = f;
867 } 639 }
868 640
869# ifdef HAVE_AFTERIMAGE
870 if (!asimman)
871 asimman = create_generic_imageman (rs[Rs_path]);
872 ASImage *image = get_asimage (asimman, file, 0xFFFFFFFF, 100);
873 if (image)
874 {
875 if (original_asim)
876 safe_asimage_destroy (original_asim);
877 original_asim = image;
878 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER;
879 return true;
880 }
881# endif
882
883# ifdef HAVE_PIXBUF 641# ifdef HAVE_PIXBUF
884 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 642 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
885 if (image) 643 if (image)
886 { 644 {
887 if (pixbuf) 645 if (pixbuf)
888 g_object_unref (pixbuf); 646 g_object_unref (pixbuf);
889 pixbuf = image; 647 pixbuf = image;
890 bg_flags |= BG_IS_FROM_FILE; 648 bg_flags |= BG_IS_FROM_FILE;
891 return true; 649 ret = true;
892 } 650 }
893# endif 651# endif
894 652
653 if (ret)
654 {
655 if (p)
656 bg_set_geometry (p + 1);
657 else
658 bg_set_default_geometry ();
659 }
660
895 return false; 661 return ret;
896} 662}
897 663
898# endif /* BG_IMAGE_FROM_FILE */ 664# endif /* BG_IMAGE_FROM_FILE */
899 665
900# ifdef ENABLE_TRANSPARENCY 666# ifdef ENABLE_TRANSPARENCY
936 { 702 {
937 changed = true; 703 changed = true;
938 v_blurRadius = vr; 704 v_blurRadius = vr;
939 } 705 }
940 706
941 if (v_blurRadius == 0 && h_blurRadius == 0) 707 if (h_blurRadius && v_blurRadius)
708 bg_flags |= BG_NEEDS_BLUR;
709 else
942 bg_flags &= ~BG_NEEDS_BLUR; 710 bg_flags &= ~BG_NEEDS_BLUR;
943 else
944 bg_flags |= BG_NEEDS_BLUR;
945 711
946 return changed; 712 return changed;
947} 713}
948 714
949void 715void
950rxvt_term::set_tint_shade_flags () 716rxvt_term::set_tint_shade_flags ()
951{ 717{
952 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 718 if (shade != 100 || (bg_flags & BG_TINT_SET))
953 bool has_shade = shade != 100; 719 bg_flags |= BG_NEEDS_TINT;
720 else
721 bg_flags &= ~BG_NEEDS_TINT;
722}
954 723
724bool
725rxvt_term::bg_set_tint (rxvt_color &new_tint)
726{
727 if (!(bg_flags & BG_TINT_SET) || tint != new_tint)
728 {
729 tint = new_tint;
955 bg_flags &= ~BG_TINT_FLAGS; 730 bg_flags |= BG_TINT_SET;
956 731
957 if (bg_flags & BG_TINT_SET) 732 rgba c;
958 {
959 tint.get (c); 733 tint.get (c);
960 if (!has_shade
961 && (c.r <= 0x00ff || c.r >= 0xff00) 734 if ((c.r <= 0x00ff || c.r >= 0xff00)
962 && (c.g <= 0x00ff || c.g >= 0xff00) 735 && (c.g <= 0x00ff || c.g >= 0xff00)
963 && (c.b <= 0x00ff || c.b >= 0xff00)) 736 && (c.b <= 0x00ff || c.b >= 0xff00))
964 bg_flags |= BG_TINT_BITAND; 737 bg_flags |= BG_TINT_BITAND;
965 } 738 else
966
967 if (has_shade || (bg_flags & BG_TINT_SET))
968 bg_flags |= BG_NEEDS_TINT;
969}
970
971bool
972rxvt_term::bg_set_tint (rxvt_color &new_tint)
973{
974 if (!(bg_flags & BG_TINT_SET) || tint != new_tint)
975 {
976 tint = new_tint;
977 bg_flags |= BG_TINT_SET; 739 bg_flags &= ~BG_TINT_BITAND;
740
978 set_tint_shade_flags (); 741 set_tint_shade_flags ();
979 return true; 742 return true;
980 } 743 }
981 744
982 return false; 745 return false;
983} 746}
984 747
985bool 748bool
986rxvt_term::bg_set_shade (const char *shade_str) 749rxvt_term::bg_set_shade (const char *shade_str)
987{ 750{
988 int new_shade = (shade_str) ? atoi (shade_str) : 100; 751 int new_shade = atoi (shade_str);
989 752
990 clamp_it (new_shade, -100, 200); 753 clamp_it (new_shade, -100, 200);
991 if (new_shade < 0) 754 if (new_shade < 0)
992 new_shade = 200 - (100 + new_shade); 755 new_shade = 200 - (100 + new_shade);
993 756
1023 params[i+2] = XDoubleToFixed (kernel[i] / sum); 786 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1024} 787}
1025#endif 788#endif
1026 789
1027bool 790bool
1028rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 791rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height, int depth)
1029{ 792{
1030 bool ret = false; 793 bool ret = false;
1031#if XRENDER 794#if XRENDER
795 if (!(bg_flags & BG_HAS_RENDER_CONV))
796 return false;
797
1032 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 798 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1033 double *kernel = (double *)malloc (size * sizeof (double)); 799 double *kernel = (double *)malloc (size * sizeof (double));
1034 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 800 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1035 801
1036 XRenderPictureAttributes pa; 802 XRenderPictureAttributes pa;
1037 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 803 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1038 804
805 pa.repeat = RepeatPad;
1039 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 806 Picture src = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);
807 Pixmap tmp = XCreatePixmap (dpy, pixmap, width, height, depth);
1040 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 808 Picture dst = XRenderCreatePicture (dpy, tmp, format, CPRepeat, &pa);
809 XFreePixmap (dpy, tmp);
1041 810
1042 if (kernel && params) 811 if (kernel && params)
1043 { 812 {
1044 if (h_blurRadius)
1045 {
1046 size = h_blurRadius * 2 + 1; 813 size = h_blurRadius * 2 + 1;
1047 get_gaussian_kernel (h_blurRadius, size, kernel, params); 814 get_gaussian_kernel (h_blurRadius, size, kernel, params);
1048 815
1049 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 816 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1050 XRenderComposite (dpy, 817 XRenderComposite (dpy,
1051 PictOpSrc, 818 PictOpSrc,
1052 src, 819 src,
1053 None, 820 None,
1054 dst, 821 dst,
1055 0, 0, 822 0, 0,
1056 0, 0, 823 0, 0,
1057 0, 0, 824 0, 0,
1058 width, height); 825 width, height);
1059 }
1060 826
1061 if (v_blurRadius) 827 ::swap (src, dst);
1062 { 828
1063 size = v_blurRadius * 2 + 1; 829 size = v_blurRadius * 2 + 1;
1064 get_gaussian_kernel (v_blurRadius, size, kernel, params); 830 get_gaussian_kernel (v_blurRadius, size, kernel, params);
1065 ::swap (params[0], params[1]); 831 ::swap (params[0], params[1]);
1066 832
1067 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 833 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1068 XRenderComposite (dpy, 834 XRenderComposite (dpy,
1069 PictOpSrc, 835 PictOpSrc,
1070 src, 836 src,
1071 None, 837 None,
1072 dst, 838 dst,
1073 0, 0, 839 0, 0,
1074 0, 0, 840 0, 0,
1075 0, 0, 841 0, 0,
1076 width, height); 842 width, height);
1077 }
1078 843
1079 ret = true; 844 ret = true;
1080 } 845 }
1081 846
1082 free (kernel); 847 free (kernel);
1090bool 855bool
1091rxvt_term::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 856rxvt_term::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1092{ 857{
1093 bool ret = false; 858 bool ret = false;
1094 859
1095 if (bg_flags & BG_TINT_BITAND) 860 if (shade == 100 && (bg_flags & BG_TINT_BITAND))
1096 { 861 {
1097 XGCValues gcv; 862 XGCValues gcv;
1098 GC gc; 863 GC gc;
1099 864
1100 /* In this case we can tint image server-side getting significant 865 /* In this case we can tint image server-side getting significant
1109 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height); 874 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1110 ret = true; 875 ret = true;
1111 XFreeGC (dpy, gc); 876 XFreeGC (dpy, gc);
1112 } 877 }
1113 } 878 }
1114 else
1115 {
1116# if XRENDER 879# if XRENDER
880 else if (bg_flags & BG_HAS_RENDER)
881 {
1117 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC); 882 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1118 883
1119 if (bg_flags & BG_TINT_SET) 884 if (bg_flags & BG_TINT_SET)
1120 tint.get (c); 885 tint.get (c);
1121 886
1130 c.r = c.r * (200 - shade) / 100; 895 c.r = c.r * (200 - shade) / 100;
1131 c.g = c.g * (200 - shade) / 100; 896 c.g = c.g * (200 - shade) / 100;
1132 c.b = c.b * (200 - shade) / 100; 897 c.b = c.b * (200 - shade) / 100;
1133 } 898 }
1134 899
1135 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1136 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 900 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1137 XRenderPictureAttributes pa;
1138 901
1139 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 902 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, 0);
1140 903
1141 pa.repeat = True; 904 Picture overlay_pic = create_xrender_mask (dpy, pixmap, True, False);
1142 905
1143 Pixmap overlay_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32); 906 Picture mask_pic = create_xrender_mask (dpy, pixmap, True, True);
1144 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1145 XFreePixmap (dpy, overlay_pmap);
1146
1147 pa.component_alpha = True;
1148 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1149 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat | CPComponentAlpha, &pa);
1150 XFreePixmap (dpy, mask_pmap);
1151 907
1152 XRenderColor mask_c; 908 XRenderColor mask_c;
1153 909
1154 mask_c.alpha = 0xffff; 910 mask_c.alpha = 0xffff;
1155 mask_c.red = 911 mask_c.red =
1160 mask_c.alpha = 0; 916 mask_c.alpha = 0;
1161 mask_c.red = 0xffff - c.r; 917 mask_c.red = 0xffff - c.r;
1162 mask_c.green = 0xffff - c.g; 918 mask_c.green = 0xffff - c.g;
1163 mask_c.blue = 0xffff - c.b; 919 mask_c.blue = 0xffff - c.b;
1164 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 920 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
921
1165 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height); 922 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1166 923
1167 if (shade > 100) 924 if (shade > 100)
1168 { 925 {
1169 mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
1170 mask_c.alpha = 0; 926 mask_c.alpha = 0;
927 mask_c.red =
928 mask_c.green =
929 mask_c.blue = 0xffff * (shade - 100) / 100;
1171 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 930 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1172 931
1173 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height); 932 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1174 } 933 }
1175 934
1176 ret = true; 935 ret = true;
1177 936
1178 XRenderFreePicture (dpy, mask_pic); 937 XRenderFreePicture (dpy, mask_pic);
1179 XRenderFreePicture (dpy, overlay_pic); 938 XRenderFreePicture (dpy, overlay_pic);
1180 XRenderFreePicture (dpy, back_pic); 939 XRenderFreePicture (dpy, back_pic);
940 }
1181# endif 941# endif
1182 }
1183 942
1184 return ret; 943 return ret;
1185} 944}
1186 945
1187/* 946/*
1188 * Builds a pixmap of the same size as the terminal window that contains 947 * Builds a pixmap of the same size as the terminal window that contains
1189 * the tiled portion of the root pixmap that is supposed to be covered by 948 * the tiled portion of the root pixmap that is supposed to be covered by
1190 * our window. 949 * our window.
1191 */ 950 */
1192unsigned long 951bool
1193rxvt_term::make_transparency_pixmap () 952rxvt_term::make_transparency_pixmap ()
1194{ 953{
1195 unsigned long result = 0; 954 bool ret = false;
1196 955
1197 /* root dimensions may change from call to call - but Display structure should 956 /* root dimensions may change from call to call - but Display structure should
1198 * be always up-to-date, so let's use it : 957 * be always up-to-date, so let's use it :
1199 */ 958 */
1200 int screen = display->screen; 959 int screen = display->screen;
1238#if XRENDER 997#if XRENDER
1239 if (bg_flags & BG_HAS_RENDER) 998 if (bg_flags & BG_HAS_RENDER)
1240 { 999 {
1241 recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth); 1000 recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth);
1242 1001
1243 XRenderPictureAttributes pa;
1244
1245 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen)); 1002 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1246 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa); 1003 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, 0);
1247 1004
1248 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual); 1005 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
1249 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa); 1006 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, 0);
1250 1007
1251 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height); 1008 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1252 1009
1253 XRenderFreePicture (dpy, src); 1010 XRenderFreePicture (dpy, src);
1254 XRenderFreePicture (dpy, dst); 1011 XRenderFreePicture (dpy, dst);
1271 bg_pmap_width = window_width; 1028 bg_pmap_width = window_width;
1272 bg_pmap_height = window_height; 1029 bg_pmap_height = window_height;
1273 } 1030 }
1274 1031
1275 /* straightforward pixmap copy */ 1032 /* straightforward pixmap copy */
1276 while (sx < 0) sx += root_width; 1033 while (sx < 0) sx += root_pmap_width;
1277 while (sy < 0) sy += root_height; 1034 while (sy < 0) sy += root_pmap_height;
1278 1035
1279 gcv.tile = recoded_root_pmap; 1036 gcv.tile = recoded_root_pmap;
1280 gcv.fill_style = FillTiled; 1037 gcv.fill_style = FillTiled;
1281 gcv.ts_x_origin = -sx; 1038 gcv.ts_x_origin = -sx;
1282 gcv.ts_y_origin = -sy; 1039 gcv.ts_y_origin = -sy;
1283 gc = XCreateGC (dpy, vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1040 gc = XCreateGC (dpy, vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1284 1041
1285 if (gc) 1042 if (gc)
1286 { 1043 {
1287 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height); 1044 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height);
1288 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS); 1045 ret = true;
1046 unsigned long tr_flags = bg_flags & BG_EFFECTS_FLAGS;
1047
1048 if (!(bg_flags & BG_CLIENT_RENDER))
1049 {
1050 if (bg_flags & BG_NEEDS_BLUR)
1051 {
1052 if (blur_pixmap (bg_pixmap, visual, window_width, window_height, depth))
1053 tr_flags &= ~BG_NEEDS_BLUR;
1054 }
1055 if (bg_flags & BG_NEEDS_TINT)
1056 {
1057 if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
1058 tr_flags &= ~BG_NEEDS_TINT;
1059 }
1060 if (tr_flags & BG_NEEDS_TINT)
1061 {
1062 XImage *ximage = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1063 if (ximage)
1064 {
1065 /* our own client-side tinting */
1066 tint_ximage (DefaultVisual (dpy, display->screen), ximage);
1067
1068 XPutImage (dpy, bg_pixmap, gc, ximage, 0, 0, 0, 0, ximage->width, ximage->height);
1069 XDestroyImage (ximage);
1070 }
1071 }
1072 } /* server side rendering completed */
1073
1289 XFreeGC (dpy, gc); 1074 XFreeGC (dpy, gc);
1290
1291 if (!(bg_flags & BG_CLIENT_RENDER))
1292 {
1293 if ((bg_flags & BG_NEEDS_BLUR)
1294 && (bg_flags & BG_HAS_RENDER_CONV))
1295 {
1296 if (blur_pixmap (bg_pixmap, visual, window_width, window_height))
1297 result &= ~BG_NEEDS_BLUR;
1298 }
1299 if ((bg_flags & BG_NEEDS_TINT)
1300 && (bg_flags & (BG_TINT_BITAND | BG_HAS_RENDER)))
1301 {
1302 if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
1303 result &= ~BG_NEEDS_TINT;
1304 }
1305 } /* server side rendering completed */
1306 } 1075 }
1307 1076
1308 if (recoded_root_pmap != root_pixmap) 1077 if (recoded_root_pmap != root_pixmap)
1309 XFreePixmap (dpy, recoded_root_pmap); 1078 XFreePixmap (dpy, recoded_root_pmap);
1310 1079
1311 return result; 1080 return ret;
1312} 1081}
1313 1082
1314void 1083void
1315rxvt_term::bg_set_root_pixmap () 1084rxvt_term::bg_set_root_pixmap ()
1316{ 1085{
1320 1089
1321 root_pixmap = new_root_pixmap; 1090 root_pixmap = new_root_pixmap;
1322} 1091}
1323# endif /* ENABLE_TRANSPARENCY */ 1092# endif /* ENABLE_TRANSPARENCY */
1324 1093
1325#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1326static void shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c);
1327# endif
1328
1329bool 1094bool
1330rxvt_term::bg_render () 1095rxvt_term::bg_render ()
1331{ 1096{
1332 unsigned long tr_flags = 0; 1097 bool transparent = false;
1333 1098
1334 bg_invalidate (); 1099 bg_invalidate ();
1335# ifdef ENABLE_TRANSPARENCY 1100# ifdef ENABLE_TRANSPARENCY
1336 if (bg_flags & BG_IS_TRANSPARENT) 1101 if (bg_flags & BG_IS_TRANSPARENT)
1337 { 1102 {
1338 /* we need to re-generate transparency pixmap in that case ! */ 1103 /* we need to re-generate transparency pixmap in that case ! */
1339 tr_flags = make_transparency_pixmap (); 1104 transparent = make_transparency_pixmap ();
1340 if (tr_flags == 0) 1105 if (transparent)
1341 return false;
1342 else if (!(tr_flags & BG_EFFECTS_FLAGS))
1343 bg_flags |= BG_IS_VALID; 1106 bg_flags |= BG_IS_VALID;
1344 } 1107 }
1345# endif 1108# endif
1346 1109
1347# ifdef BG_IMAGE_FROM_FILE 1110# ifdef BG_IMAGE_FROM_FILE
1348 if ((bg_flags & BG_IS_FROM_FILE) 1111 if (bg_flags & BG_IS_FROM_FILE)
1349 || (tr_flags & BG_EFFECTS_FLAGS))
1350 { 1112 {
1351 if (render_image (tr_flags)) 1113 if (render_image (transparent))
1352 bg_flags |= BG_IS_VALID; 1114 bg_flags |= BG_IS_VALID;
1353 }
1354# endif
1355
1356# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1357 XImage *result = NULL;
1358
1359 if (tr_flags && !(bg_flags & BG_IS_VALID))
1360 {
1361 result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1362 }
1363
1364 if (result)
1365 {
1366 /* our own client-side tinting */
1367 if (tr_flags & BG_NEEDS_TINT)
1368 {
1369 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1370 if (bg_flags & BG_TINT_SET)
1371 tint.get (c);
1372 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c);
1373 }
1374
1375 GC gc = XCreateGC (dpy, vt, 0UL, NULL);
1376
1377 if (gc)
1378 {
1379 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1380
1381 XFreeGC (dpy, gc);
1382 bg_flags |= BG_IS_VALID;
1383 }
1384
1385 XDestroyImage (result);
1386 } 1115 }
1387# endif 1116# endif
1388 1117
1389 if (!(bg_flags & BG_IS_VALID)) 1118 if (!(bg_flags & BG_IS_VALID))
1390 { 1119 {
1427#endif 1156#endif
1428} 1157}
1429 1158
1430#endif /* HAVE_BG_PIXMAP */ 1159#endif /* HAVE_BG_PIXMAP */
1431 1160
1432#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1161#ifdef ENABLE_TRANSPARENCY
1433/* taken from aterm-0.4.2 */ 1162/* based on code from aterm-0.4.2 */
1434 1163
1435static void 1164static inline void
1436shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c) 1165fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high)
1437{ 1166{
1167 for (int i = 0; i <= mask >> sh; i++)
1168 {
1169 uint32_t tmp;
1170 tmp = i * high;
1171 tmp += (mask >> sh) * low;
1172 lookup[i] = (tmp / 0xffff) << sh;
1173 }
1174}
1175
1176void
1177rxvt_term::tint_ximage (Visual *visual, XImage *ximage)
1178{
1179 unsigned int size_r, size_g, size_b;
1438 int sh_r, sh_g, sh_b; 1180 int sh_r, sh_g, sh_b;
1439 uint32_t mask_r, mask_g, mask_b; 1181 uint32_t mask_r, mask_g, mask_b;
1440 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1182 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1441 rgba low; 1183 unsigned short low;
1442 rgba high;
1443 int i;
1444 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; 1184 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
1445 1185
1446 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return; 1186 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1447 1187
1448 /* for convenience */ 1188 /* for convenience */
1449 mask_r = visual->red_mask; 1189 mask_r = visual->red_mask;
1450 mask_g = visual->green_mask; 1190 mask_g = visual->green_mask;
1451 mask_b = visual->blue_mask; 1191 mask_b = visual->blue_mask;
1452 1192
1453 /* boring lookup table pre-initialization */ 1193 /* boring lookup table pre-initialization */
1454 switch (ximage->depth) 1194 sh_r = ecb_ctz32 (mask_r);
1455 { 1195 sh_g = ecb_ctz32 (mask_g);
1456 case 15: 1196 sh_b = ecb_ctz32 (mask_b);
1457 if ((mask_r != 0x7c00) || 1197
1458 (mask_g != 0x03e0) || 1198 size_r = mask_r >> sh_r;
1459 (mask_b != 0x001f)) 1199 size_g = mask_g >> sh_g;
1200 size_b = mask_b >> sh_b;
1201
1202 if (size_r++ > 255 || size_g++ > 255 || size_b++ > 255)
1460 return; 1203 return;
1461 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+32+32)); 1204
1205 lookup = (uint32_t *)malloc (sizeof (uint32_t) * (size_r + size_g + size_b));
1462 lookup_r = lookup; 1206 lookup_r = lookup;
1463 lookup_g = lookup+32; 1207 lookup_g = lookup + size_r;
1464 lookup_b = lookup+32+32; 1208 lookup_b = lookup + size_r + size_g;
1465 sh_r = 10; 1209
1466 sh_g = 5; 1210 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1467 sh_b = 0; 1211
1468 break; 1212 if (bg_flags & BG_TINT_SET)
1469 case 16: 1213 tint.get (c);
1470 if ((mask_r != 0xf800) ||
1471 (mask_g != 0x07e0) ||
1472 (mask_b != 0x001f))
1473 return;
1474 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+64+32));
1475 lookup_r = lookup;
1476 lookup_g = lookup+32;
1477 lookup_b = lookup+32+64;
1478 sh_r = 11;
1479 sh_g = 5;
1480 sh_b = 0;
1481 break;
1482 case 24:
1483 if ((mask_r != 0xff0000) ||
1484 (mask_g != 0x00ff00) ||
1485 (mask_b != 0x0000ff))
1486 return;
1487 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1488 lookup_r = lookup;
1489 lookup_g = lookup+256;
1490 lookup_b = lookup+256+256;
1491 sh_r = 16;
1492 sh_g = 8;
1493 sh_b = 0;
1494 break;
1495 case 32:
1496 if ((mask_r != 0xff0000) ||
1497 (mask_g != 0x00ff00) ||
1498 (mask_b != 0x0000ff))
1499 return;
1500 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1501 lookup_r = lookup;
1502 lookup_g = lookup+256;
1503 lookup_b = lookup+256+256;
1504 sh_r = 16;
1505 sh_g = 8;
1506 sh_b = 0;
1507 break;
1508 default:
1509 return; /* we do not support this color depth */
1510 }
1511 1214
1512 /* prepare limits for color transformation (each channel is handled separately) */ 1215 /* prepare limits for color transformation (each channel is handled separately) */
1513 if (shade > 100) 1216 if (shade > 100)
1514 { 1217 {
1515 shade = 200 - shade;
1516
1517 high.r = c.r * shade / 100;
1518 high.g = c.g * shade / 100;
1519 high.b = c.b * shade / 100;
1520
1521 low.r = 65535 * (100 - shade) / 100; 1218 c.r = c.r * (200 - shade) / 100;
1522 low.g = 65535 * (100 - shade) / 100; 1219 c.g = c.g * (200 - shade) / 100;
1523 low.b = 65535 * (100 - shade) / 100; 1220 c.b = c.b * (200 - shade) / 100;
1221
1222 low = 0xffff * (shade - 100) / 100;
1524 } 1223 }
1525 else 1224 else
1526 { 1225 {
1527 high.r = c.r * shade / 100; 1226 c.r = c.r * shade / 100;
1528 high.g = c.g * shade / 100; 1227 c.g = c.g * shade / 100;
1529 high.b = c.b * shade / 100; 1228 c.b = c.b * shade / 100;
1530 1229
1531 low.r = low.g = low.b = 0; 1230 low = 0;
1532 } 1231 }
1533 1232
1534 /* fill our lookup tables */ 1233 /* fill our lookup tables */
1535 for (i = 0; i <= mask_r>>sh_r; i++) 1234 fill_lut (lookup_r, mask_r, sh_r, low, c.r);
1536 { 1235 fill_lut (lookup_g, mask_g, sh_g, low, c.g);
1537 uint32_t tmp; 1236 fill_lut (lookup_b, mask_b, sh_b, low, c.b);
1538 tmp = i * high.r;
1539 tmp += (mask_r>>sh_r) * low.r;
1540 lookup_r[i] = (tmp/65535)<<sh_r;
1541 }
1542 for (i = 0; i <= mask_g>>sh_g; i++)
1543 {
1544 uint32_t tmp;
1545 tmp = i * high.g;
1546 tmp += (mask_g>>sh_g) * low.g;
1547 lookup_g[i] = (tmp/65535)<<sh_g;
1548 }
1549 for (i = 0; i <= mask_b>>sh_b; i++)
1550 {
1551 uint32_t tmp;
1552 tmp = i * high.b;
1553 tmp += (mask_b>>sh_b) * low.b;
1554 lookup_b[i] = (tmp/65535)<<sh_b;
1555 }
1556 1237
1557 /* apply table to input image (replacing colors by newly calculated ones) */ 1238 /* apply table to input image (replacing colors by newly calculated ones) */
1558 if (ximage->bits_per_pixel == 32 1239 if (ximage->bits_per_pixel == 32
1559 && (ximage->depth == 24 || ximage->depth == 32)
1560 && ximage->byte_order == host_byte_order) 1240 && ximage->byte_order == host_byte_order)
1561 { 1241 {
1562 uint32_t *p1, *pf, *p, *pl; 1242 char *line = ximage->data;
1563 p1 = (uint32_t *) ximage->data;
1564 pf = (uint32_t *) (ximage->data + ximage->height * ximage->bytes_per_line);
1565 1243
1566 while (p1 < pf) 1244 for (int y = 0; y < ximage->height; y++)
1567 {
1568 p = p1;
1569 pl = p1 + ximage->width;
1570 for (; p < pl; p++)
1571 { 1245 {
1572 *p = lookup_r[(*p & 0xff0000) >> 16] | 1246 uint32_t *p = (uint32_t *)line;
1573 lookup_g[(*p & 0x00ff00) >> 8] | 1247 for (int x = 0; x < ximage->width; x++)
1574 lookup_b[(*p & 0x0000ff)] |
1575 (*p & 0xff000000);
1576 } 1248 {
1577 p1 = (uint32_t *) ((char *) p1 + ximage->bytes_per_line); 1249 *p = lookup_r[(*p & mask_r) >> sh_r] |
1250 lookup_g[(*p & mask_g) >> sh_g] |
1251 lookup_b[(*p & mask_b) >> sh_b];
1252 p++;
1253 }
1254 line += ximage->bytes_per_line;
1578 } 1255 }
1579 } 1256 }
1580 else 1257 else
1581 { 1258 {
1582 for (int y = 0; y < ximage->height; y++) 1259 for (int y = 0; y < ximage->height; y++)
1590 } 1267 }
1591 } 1268 }
1592 1269
1593 free (lookup); 1270 free (lookup);
1594} 1271}
1595#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ 1272#endif /* ENABLE_TRANSPARENCY */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines