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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines