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.161 by sf-exg, Thu Aug 11 08:39:10 2011 UTC vs.
Revision 1.212 by sf-exg, Sun May 13 15:50:18 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], "hscale"))
304 {
305 w = windowScale;
306 h = noScale;
307 geom_flags |= WidthValue|HeightValue;
308 }
309 else if (!strcasecmp (arr[i], "vscale"))
310 {
311 h = windowScale;
312 w = noScale;
313 geom_flags |= WidthValue|HeightValue;
314 }
315 else if (!strcasecmp (arr[i], "scale"))
316 {
317 w = h = windowScale;
318 geom_flags |= WidthValue|HeightValue;
319 }
320 else if (!strcasecmp (arr[i], "auto"))
321 {
322 w = h = windowScale;
323 x = y = centerAlign;
324 geom_flags |= WidthValue|HeightValue|XValue|YValue;
325 }
326 else if (!strcasecmp (arr[i], "root"))
327 {
328 new_flags |= BG_TILE|BG_ROOT_ALIGN;
329 w = h = noScale;
330 geom_flags |= WidthValue|HeightValue;
331 }
332 } /* done parsing ops */
333
334 rxvt_free_strsplit (arr);
335 }
336
337 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true;
338 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true;
339 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true;
340 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
341
342 if (new_flags != bg_flags)
343 { 292 {
344 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;
345 changed = true; 298 changed = true;
346 } 299 }
347 300
348 return changed; 301 return changed;
349} 302}
352rxvt_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)
353{ 306{
354 int target_width = szHint.width; 307 int target_width = szHint.width;
355 int target_height = szHint.height; 308 int target_height = szHint.height;
356 309
310 w = h_scale * target_width / 100;
311 h = v_scale * target_height / 100;
312
357 if (bg_flags & BG_PROP_SCALE) 313 if (bg_flags & BG_KEEP_ASPECT)
358 { 314 {
359 float scale = (float)target_width / image_width; 315 float scale = (float)w / image_width;
360 min_it (scale, (float)target_height / image_height); 316 min_it (scale, (float)h / image_height);
361 w = image_width * scale + 0.5; 317 w = image_width * scale + 0.5;
362 h = image_height * scale + 0.5; 318 h = image_height * scale + 0.5;
363 } 319 }
364 else
365 {
366 w = h_scale * target_width / 100;
367 h = v_scale * target_height / 100;
368 }
369 320
370 if (!w) w = image_width; 321 if (!w) w = image_width;
371 if (!h) h = image_height; 322 if (!h) h = image_height;
372 323
373 if (bg_flags & BG_ROOT_ALIGN) 324 if (bg_flags & BG_ROOT_ALIGN)
379 { 330 {
380 x = make_align_position (h_align, target_width, w); 331 x = make_align_position (h_align, target_width, w);
381 y = make_align_position (v_align, target_height, h); 332 y = make_align_position (v_align, target_height, h);
382 } 333 }
383 334
384 bg_flags &= ~BG_IS_SIZE_SENSITIVE;
385 if (!(bg_flags & BG_TILE) 335 if (!(bg_flags & BG_TILE)
386 || (bg_flags & BG_PROP_SCALE) || h_scale || v_scale 336 || h_scale || v_scale
387 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align)) 337 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align))
388 || w > target_width || h > target_height) 338 || image_width > target_width || image_height > target_height)
389 bg_flags |= BG_IS_SIZE_SENSITIVE; 339 bg_flags |= BG_IS_SIZE_SENSITIVE;
340 else
341 bg_flags &= ~BG_IS_SIZE_SENSITIVE;
390} 342}
391 343
392# ifdef HAVE_AFTERIMAGE 344# ifdef HAVE_PIXBUF
393bool 345bool
394rxvt_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)
395{ 349{
396 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;
397 358
398 ASImage *background = NULL; 359 if (visual->c_class != TrueColor)
399 ARGB32 background_tint = TINT_LEAVE_SAME; 360 return false;
400 361
401# ifdef ENABLE_TRANSPARENCY 362#if XRENDER
402 if (tr_flags) 363 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
403 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;
404 369
405 if (tr_flags & BG_NEEDS_TINT) 370 width_r = ecb_popcount32 (visual->red_mask);
406 { 371 width_g = ecb_popcount32 (visual->green_mask);
407 ShadingInfo as_shade; 372 width_b = ecb_popcount32 (visual->blue_mask);
408 as_shade.shading = shade; 373 width_a = ecb_popcount32 (alpha_mask);
409 374
410 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)
411 if (bg_flags & BG_TINT_SET) 376 return false;
412 tint.get (c);
413 as_shade.tintColor.red = c.r;
414 as_shade.tintColor.green = c.g;
415 as_shade.tintColor.blue = c.b;
416 377
417 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)))
418 } 393 {
419 394 XDestroyImage (ximage);
420 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL) 395 return false;
421 { 396 }
422 ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 397
423 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 398 ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
424 100, ASIMAGE_QUALITY_DEFAULT); 399
425 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)
426 { 424 {
427 destroy_asimage (&background); 425 a = pixel[3];
428 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);
429 } 447 }
430 }
431# endif
432 448
433 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);
434 472
435 int target_width = szHint.width; 473 int target_width = szHint.width;
436 int target_height = szHint.height; 474 int target_height = szHint.height;
437 int new_pmap_width = target_width; 475 int new_pmap_width = target_width;
438 int new_pmap_height = target_height; 476 int new_pmap_height = target_height;
440 int x = 0; 478 int x = 0;
441 int y = 0; 479 int y = 0;
442 int w = 0; 480 int w = 0;
443 int h = 0; 481 int h = 0;
444 482
445 if (original_asim)
446 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
447
448 if (!original_asim
449 || (!(bg_flags & BG_ROOT_ALIGN)
450 && (x >= target_width
451 || y >= target_height
452 || (x + w <= 0)
453 || (y + h <= 0))))
454 {
455 if (background)
456 {
457 new_pmap_width = background->width;
458 new_pmap_height = background->height;
459 result = background;
460
461 if (background_tint != TINT_LEAVE_SAME)
462 {
463 ASImage *tmp = tile_asimage (asv, background, 0, 0,
464 target_width, target_height, background_tint,
465 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
466 if (tmp)
467 result = tmp;
468 }
469 }
470 else
471 new_pmap_width = new_pmap_height = 0;
472 }
473 else
474 {
475 result = original_asim;
476
477 if ((w != original_asim->width)
478 || (h != original_asim->height))
479 {
480 result = scale_asimage (asv, original_asim,
481 w, h,
482 background ? ASA_ASImage : ASA_XImage,
483 100, ASIMAGE_QUALITY_DEFAULT);
484 }
485
486 if (background == NULL)
487 {
488 if (bg_flags & BG_TILE)
489 {
490 /* if tiling - pixmap has to be sized exactly as the image,
491 but there is no need to make it bigger than the window! */
492 new_pmap_width = min (result->width, target_width);
493 new_pmap_height = min (result->height, target_height);
494
495 /* we also need to tile our image in both directions */
496 ASImage *tmp = tile_asimage (asv, result,
497 (int)result->width - x,
498 (int)result->height - y,
499 new_pmap_width,
500 new_pmap_height,
501 TINT_LEAVE_SAME, ASA_XImage,
502 100, ASIMAGE_QUALITY_DEFAULT);
503 if (tmp)
504 {
505 if (result != original_asim)
506 destroy_asimage (&result);
507
508 result = tmp;
509 }
510 }
511 }
512 else
513 {
514 /* if blending background and image - pixmap has to be sized same as target window */
515 ASImageLayer *layers = create_image_layers (2);
516
517 layers[0].im = background;
518 layers[0].clip_width = target_width;
519 layers[0].clip_height = target_height;
520 layers[0].tint = background_tint;
521 layers[1].im = result;
522
523 if (bg_flags & BG_TILE)
524 {
525 /* tile horizontally */
526 while (x > 0) x -= (int)result->width;
527 layers[1].dst_x = x;
528 layers[1].clip_width = result->width+target_width;
529 }
530 else
531 {
532 /* clip horizontally */
533 layers[1].dst_x = x;
534 layers[1].clip_width = result->width;
535 }
536
537 if (bg_flags & BG_TILE)
538 {
539 while (y > 0) y -= (int)result->height;
540 layers[1].dst_y = y;
541 layers[1].clip_height = result->height + target_height;
542 }
543 else
544 {
545 layers[1].dst_y = y;
546 layers[1].clip_height = result->height;
547 }
548
549 if (rs[Rs_blendtype])
550 {
551 layers[1].merge_scanlines = blend_scanlines_name2func (rs[Rs_blendtype]);
552 if (layers[1].merge_scanlines == NULL)
553 layers[1].merge_scanlines = alphablend_scanlines;
554 }
555
556 ASImage *tmp = merge_layers (asv, layers, 2, target_width, target_height,
557 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
558
559 if (tmp)
560 {
561 if (result != original_asim)
562 destroy_asimage (&result);
563
564 result = tmp;
565 }
566
567 free (layers);
568 }
569 }
570
571 bool ret = false;
572
573 if (result)
574 {
575 XGCValues gcv;
576 GC gc;
577
578 /* create Pixmap */
579 if (bg_pixmap == None
580 || bg_pmap_width != new_pmap_width
581 || bg_pmap_height != new_pmap_height)
582 {
583 if (bg_pixmap)
584 XFreePixmap (dpy, bg_pixmap);
585 bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth);
586 bg_pmap_width = new_pmap_width;
587 bg_pmap_height = new_pmap_height;
588 }
589 /* fill with background color (if result's not completely overlapping it) */
590 gcv.foreground = pix_colors[Color_bg];
591 gc = XCreateGC (dpy, vt, GCForeground, &gcv);
592
593 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
594 int dst_width = result->width, dst_height = result->height;
595 if (background == NULL)
596 {
597 if (!(bg_flags & BG_TILE))
598 {
599 src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width );
600 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
601 }
602
603 if (dst_x > 0 || dst_y > 0
604 || dst_x + dst_width < new_pmap_width
605 || dst_y + dst_height < new_pmap_height)
606 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
607 }
608
609 /* put result on pixmap */
610 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
611 asimage2drawable (asv, bg_pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True);
612
613 if (result != background && result != original_asim)
614 destroy_asimage (&result);
615
616 XFreeGC (dpy, gc);
617
618 ret = true;
619 }
620
621 if (background)
622 destroy_asimage (&background);
623
624 return ret;
625}
626# endif /* HAVE_AFTERIMAGE */
627
628# ifdef HAVE_PIXBUF
629bool
630rxvt_term::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
631 int src_x, int src_y, int dst_x, int dst_y,
632 unsigned int width, unsigned int height)
633{
634 XImage *ximage;
635 char *data, *line;
636 int bytes_per_pixel;
637 int width_r, width_g, width_b;
638 int sh_r, sh_g, sh_b;
639 int rowstride;
640 int channels;
641 unsigned char *row;
642
643 if (visual->c_class != TrueColor)
644 return false;
645
646 if (depth == 24 || depth == 32)
647 bytes_per_pixel = 4;
648 else if (depth == 15 || depth == 16)
649 bytes_per_pixel = 2;
650 else
651 return false;
652
653 width_r = ecb_popcount32 (visual->red_mask);
654 width_g = ecb_popcount32 (visual->green_mask);
655 width_b = ecb_popcount32 (visual->blue_mask);
656
657 if (width_r > 8 || width_g > 8 || width_b > 8)
658 return false;
659
660 sh_r = ecb_ctz32 (visual->red_mask);
661 sh_g = ecb_ctz32 (visual->green_mask);
662 sh_b = ecb_ctz32 (visual->blue_mask);
663
664 if (width > INT_MAX / height / bytes_per_pixel)
665 return false;
666
667 data = (char *)malloc (width * height * bytes_per_pixel);
668 if (!data)
669 return false;
670
671 ximage = XCreateImage (dpy, visual, depth, ZPixmap, 0, data,
672 width, height, bytes_per_pixel * 8, 0);
673 if (!ximage)
674 {
675 free (data);
676 return false;
677 }
678
679 ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
680
681 rowstride = gdk_pixbuf_get_rowstride (pixbuf);
682 channels = gdk_pixbuf_get_n_channels (pixbuf);
683 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
684 line = data;
685
686 for (int y = 0; y < height; y++)
687 {
688 for (int x = 0; x < width; x++)
689 {
690 unsigned char *pixel = row + x * channels;
691 uint32_t value;
692
693 value = ((pixel[0] >> (8 - width_r)) << sh_r)
694 | ((pixel[1] >> (8 - width_g)) << sh_g)
695 | ((pixel[2] >> (8 - width_b)) << sh_b);
696
697 if (bytes_per_pixel == 4)
698 ((uint32_t *)line)[x] = value;
699 else
700 ((uint16_t *)line)[x] = value;
701 }
702
703 row += rowstride;
704 line += ximage->bytes_per_line;
705 }
706
707 XPutImage (dpy, pixmap, gc, ximage, 0, 0, dst_x, dst_y, width, height);
708 XDestroyImage (ximage);
709 return true;
710}
711
712bool
713rxvt_term::render_image (unsigned long tr_flags)
714{
715 if (!pixbuf)
716 return false;
717
718 if (tr_flags
719 && !(bg_flags & BG_HAS_RENDER))
720 return false;
721
722 GdkPixbuf *result;
723
724 int image_width = gdk_pixbuf_get_width (pixbuf);
725 int image_height = gdk_pixbuf_get_height (pixbuf);
726
727 int target_width = szHint.width;
728 int target_height = szHint.height;
729 int new_pmap_width = target_width;
730 int new_pmap_height = target_height;
731
732 int x = 0;
733 int y = 0;
734 int w = 0;
735 int h = 0;
736
737 get_image_geometry (image_width, image_height, w, h, x, y); 483 get_image_geometry (image_width, image_height, w, h, x, y);
738 484
739 if (!(bg_flags & BG_ROOT_ALIGN) 485 if (!(bg_flags & BG_ROOT_ALIGN)
740 && (x >= target_width 486 && (x >= target_width
741 || y >= target_height 487 || y >= target_height
742 || (x + w <= 0) 488 || x + w <= 0
743 || (y + h <= 0))) 489 || y + h <= 0))
744 return false; 490 return false;
745 491
746 result = pixbuf; 492 result = pixbuf;
747 493
748 if ((w != image_width) 494 if (w != image_width
749 || (h != image_height)) 495 || h != image_height)
750 { 496 {
751 result = gdk_pixbuf_scale_simple (pixbuf, 497 result = gdk_pixbuf_scale_simple (pixbuf,
752 w, h, 498 w, h,
753 GDK_INTERP_BILINEAR); 499 GDK_INTERP_BILINEAR);
754 } 500 }
763 Pixmap root_pmap; 509 Pixmap root_pmap;
764 510
765 image_width = gdk_pixbuf_get_width (result); 511 image_width = gdk_pixbuf_get_width (result);
766 image_height = gdk_pixbuf_get_height (result); 512 image_height = gdk_pixbuf_get_height (result);
767 513
768 if (tr_flags) 514 if (transparent)
769 { 515 {
770 root_pmap = bg_pixmap; 516 root_pmap = bg_pixmap;
771 bg_pixmap = None; 517 bg_pixmap = None;
772 } 518 }
773 else 519 else
831 dst_x, dst_y, 577 dst_x, dst_y,
832 dst_width, dst_height); 578 dst_width, dst_height);
833 } 579 }
834 580
835#if XRENDER 581#if XRENDER
836 if (tr_flags) 582 if (transparent)
837 { 583 {
838 XRenderPictureAttributes pa;
839
840 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, visual); 584 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
585
841 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa); 586 Picture src = XRenderCreatePicture (dpy, root_pmap, format, 0, 0);
842 587
843 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
844 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, dst_format, 0, &pa); 588 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, format, 0, 0);
845 589
846 pa.repeat = True; 590 Picture mask = create_xrender_mask (dpy, vt, False, False);
847 Pixmap mask_pmap = XCreatePixmap (dpy, vt, 1, 1, 8);
848 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8);
849 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa);
850 XFreePixmap (dpy, mask_pmap);
851 591
852 XRenderColor mask_c; 592 XRenderColor mask_c;
853 593
854 mask_c.alpha = 0x8000; 594 mask_c.alpha = 0x8000;
855 mask_c.red = 0; 595 mask_c.red =
856 mask_c.green = 0; 596 mask_c.green =
857 mask_c.blue = 0; 597 mask_c.blue = 0;
858 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1); 598 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
599
859 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);
860 601
861 XRenderFreePicture (dpy, src); 602 XRenderFreePicture (dpy, src);
862 XRenderFreePicture (dpy, dst); 603 XRenderFreePicture (dpy, dst);
863 XRenderFreePicture (dpy, mask); 604 XRenderFreePicture (dpy, mask);
870 } 611 }
871 612
872 if (result != pixbuf) 613 if (result != pixbuf)
873 g_object_unref (result); 614 g_object_unref (result);
874 615
875 if (tr_flags) 616 if (transparent)
876 XFreePixmap (dpy, root_pmap); 617 XFreePixmap (dpy, root_pmap);
877 618
878 return ret; 619 return ret;
879} 620}
880# endif /* HAVE_PIXBUF */ 621# endif /* HAVE_PIXBUF */
883rxvt_term::bg_set_file (const char *file) 624rxvt_term::bg_set_file (const char *file)
884{ 625{
885 if (!file || !*file) 626 if (!file || !*file)
886 return false; 627 return false;
887 628
629 bool ret = false;
888 if (const char *p = strchr (file, ';')) 630 const char *p = strchr (file, ';');
631
632 if (p)
889 { 633 {
890 size_t len = p - file; 634 size_t len = p - file;
891 char *f = rxvt_temp_buf<char> (len + 1); 635 char *f = rxvt_temp_buf<char> (len + 1);
892 memcpy (f, file, len); 636 memcpy (f, file, len);
893 f[len] = '\0'; 637 f[len] = '\0';
894 file = f; 638 file = f;
895 } 639 }
896 640
897# ifdef HAVE_AFTERIMAGE
898 if (!asimman)
899 asimman = create_generic_imageman (rs[Rs_path]);
900 ASImage *image = get_asimage (asimman, file, 0xFFFFFFFF, 100);
901 if (image)
902 {
903 if (original_asim)
904 safe_asimage_destroy (original_asim);
905 original_asim = image;
906 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER;
907 return true;
908 }
909# endif
910
911# ifdef HAVE_PIXBUF 641# ifdef HAVE_PIXBUF
912 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 642 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
913 if (image) 643 if (image)
914 { 644 {
915 if (pixbuf) 645 if (pixbuf)
916 g_object_unref (pixbuf); 646 g_object_unref (pixbuf);
917 pixbuf = image; 647 pixbuf = image;
918 bg_flags |= BG_IS_FROM_FILE; 648 bg_flags |= BG_IS_FROM_FILE;
919 return true; 649 ret = true;
920 } 650 }
921# endif 651# endif
922 652
653 if (ret)
654 {
655 if (p)
656 bg_set_geometry (p + 1);
657 else
658 bg_set_default_geometry ();
659 }
660
923 return false; 661 return ret;
924} 662}
925 663
926# endif /* BG_IMAGE_FROM_FILE */ 664# endif /* BG_IMAGE_FROM_FILE */
927 665
928# ifdef ENABLE_TRANSPARENCY 666# ifdef ENABLE_TRANSPARENCY
929bool
930rxvt_term::bg_set_transparent ()
931{
932 if (!(bg_flags & BG_IS_TRANSPARENT))
933 {
934 bg_flags |= BG_IS_TRANSPARENT;
935 return true;
936 }
937
938 return false;
939}
940
941bool 667bool
942rxvt_term::bg_set_blur (const char *geom) 668rxvt_term::bg_set_blur (const char *geom)
943{ 669{
944 bool changed = false; 670 bool changed = false;
945 unsigned int hr, vr; 671 unsigned int hr, vr;
964 { 690 {
965 changed = true; 691 changed = true;
966 v_blurRadius = vr; 692 v_blurRadius = vr;
967 } 693 }
968 694
969 if (v_blurRadius == 0 && h_blurRadius == 0)
970 bg_flags &= ~BG_NEEDS_BLUR;
971 else
972 bg_flags |= BG_NEEDS_BLUR;
973
974 return changed; 695 return changed;
975} 696}
976 697
977void 698bool
978rxvt_term::set_tint_shade_flags () 699rxvt_term::bg_set_tint (rxvt_color &new_tint)
979{ 700{
980 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 701 if (!(bg_flags & BG_TINT_SET) || tint != new_tint)
981 bool has_shade = shade != 100; 702 {
982 703 tint = new_tint;
983 bg_flags &= ~BG_TINT_FLAGS; 704 bg_flags |= BG_TINT_SET;
984 705
985 if (bg_flags & BG_TINT_SET) 706 rgba c;
986 {
987 tint.get (c); 707 tint.get (c);
988 if (!has_shade
989 && (c.r <= 0x00ff || c.r >= 0xff00) 708 if ((c.r <= 0x00ff || c.r >= 0xff00)
990 && (c.g <= 0x00ff || c.g >= 0xff00) 709 && (c.g <= 0x00ff || c.g >= 0xff00)
991 && (c.b <= 0x00ff || c.b >= 0xff00)) 710 && (c.b <= 0x00ff || c.b >= 0xff00))
992 bg_flags |= BG_TINT_BITAND; 711 bg_flags |= BG_TINT_BITAND;
993 } 712 else
994
995 if (has_shade || (bg_flags & BG_TINT_SET))
996 bg_flags |= BG_NEEDS_TINT;
997}
998
999bool
1000rxvt_term::bg_set_tint (rxvt_color &new_tint)
1001{
1002 if (!(bg_flags & BG_TINT_SET) || tint != new_tint)
1003 {
1004 tint = new_tint;
1005 bg_flags |= BG_TINT_SET; 713 bg_flags &= ~BG_TINT_BITAND;
1006 set_tint_shade_flags (); 714
1007 return true; 715 return true;
1008 } 716 }
1009 717
1010 return false; 718 return false;
1011} 719}
1012 720
1013bool 721bool
1014rxvt_term::bg_set_shade (const char *shade_str) 722rxvt_term::bg_set_shade (const char *shade_str)
1015{ 723{
1016 int new_shade = (shade_str) ? atoi (shade_str) : 100; 724 int new_shade = atoi (shade_str);
1017 725
1018 clamp_it (new_shade, -100, 200); 726 clamp_it (new_shade, -100, 200);
1019 if (new_shade < 0) 727 if (new_shade < 0)
1020 new_shade = 200 - (100 + new_shade); 728 new_shade = 200 - (100 + new_shade);
1021 729
1022 if (new_shade != shade) 730 if (new_shade != shade)
1023 { 731 {
1024 shade = new_shade; 732 shade = new_shade;
1025 set_tint_shade_flags ();
1026 return true; 733 return true;
1027 } 734 }
1028 735
1029 return false; 736 return false;
1030} 737}
1051 params[i+2] = XDoubleToFixed (kernel[i] / sum); 758 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1052} 759}
1053#endif 760#endif
1054 761
1055bool 762bool
1056rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 763rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height, int depth)
1057{ 764{
1058 bool ret = false; 765 bool ret = false;
1059#if XRENDER 766#if XRENDER
767 if (!(bg_flags & BG_HAS_RENDER_CONV))
768 return false;
769
1060 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 770 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1061 double *kernel = (double *)malloc (size * sizeof (double)); 771 double *kernel = (double *)malloc (size * sizeof (double));
1062 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 772 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1063 773
1064 XRenderPictureAttributes pa; 774 XRenderPictureAttributes pa;
1065 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 775 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1066 776
777 pa.repeat = RepeatPad;
1067 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 778 Picture src = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);
779 Pixmap tmp = XCreatePixmap (dpy, pixmap, width, height, depth);
1068 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 780 Picture dst = XRenderCreatePicture (dpy, tmp, format, CPRepeat, &pa);
781 XFreePixmap (dpy, tmp);
1069 782
1070 if (kernel && params) 783 if (kernel && params)
1071 { 784 {
1072 if (h_blurRadius)
1073 {
1074 size = h_blurRadius * 2 + 1; 785 size = h_blurRadius * 2 + 1;
1075 get_gaussian_kernel (h_blurRadius, size, kernel, params); 786 get_gaussian_kernel (h_blurRadius, size, kernel, params);
1076 787
1077 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 788 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1078 XRenderComposite (dpy, 789 XRenderComposite (dpy,
1079 PictOpSrc, 790 PictOpSrc,
1080 src, 791 src,
1081 None, 792 None,
1082 dst, 793 dst,
1083 0, 0, 794 0, 0,
1084 0, 0, 795 0, 0,
1085 0, 0, 796 0, 0,
1086 width, height); 797 width, height);
1087 }
1088 798
1089 if (v_blurRadius) 799 ::swap (src, dst);
1090 { 800
1091 size = v_blurRadius * 2 + 1; 801 size = v_blurRadius * 2 + 1;
1092 get_gaussian_kernel (v_blurRadius, size, kernel, params); 802 get_gaussian_kernel (v_blurRadius, size, kernel, params);
1093 ::swap (params[0], params[1]); 803 ::swap (params[0], params[1]);
1094 804
1095 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 805 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1096 XRenderComposite (dpy, 806 XRenderComposite (dpy,
1097 PictOpSrc, 807 PictOpSrc,
1098 src, 808 src,
1099 None, 809 None,
1100 dst, 810 dst,
1101 0, 0, 811 0, 0,
1102 0, 0, 812 0, 0,
1103 0, 0, 813 0, 0,
1104 width, height); 814 width, height);
1105 }
1106 815
1107 ret = true; 816 ret = true;
1108 } 817 }
1109 818
1110 free (kernel); 819 free (kernel);
1118bool 827bool
1119rxvt_term::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 828rxvt_term::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1120{ 829{
1121 bool ret = false; 830 bool ret = false;
1122 831
1123 if (bg_flags & BG_TINT_BITAND) 832 if (shade == 100 && (bg_flags & BG_TINT_BITAND))
1124 { 833 {
1125 XGCValues gcv; 834 XGCValues gcv;
1126 GC gc; 835 GC gc;
1127 836
1128 /* In this case we can tint image server-side getting significant 837 /* In this case we can tint image server-side getting significant
1137 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height); 846 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1138 ret = true; 847 ret = true;
1139 XFreeGC (dpy, gc); 848 XFreeGC (dpy, gc);
1140 } 849 }
1141 } 850 }
1142 else
1143 {
1144# if XRENDER 851# if XRENDER
852 else if (bg_flags & BG_HAS_RENDER)
853 {
1145 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC); 854 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1146 855
1147 if (bg_flags & BG_TINT_SET) 856 if (bg_flags & BG_TINT_SET)
1148 tint.get (c); 857 tint.get (c);
1149 858
1158 c.r = c.r * (200 - shade) / 100; 867 c.r = c.r * (200 - shade) / 100;
1159 c.g = c.g * (200 - shade) / 100; 868 c.g = c.g * (200 - shade) / 100;
1160 c.b = c.b * (200 - shade) / 100; 869 c.b = c.b * (200 - shade) / 100;
1161 } 870 }
1162 871
1163 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1164 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 872 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1165 XRenderPictureAttributes pa;
1166 873
1167 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 874 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, 0);
1168 875
1169 pa.repeat = True; 876 Picture overlay_pic = create_xrender_mask (dpy, pixmap, True, False);
1170 877
1171 Pixmap overlay_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32); 878 Picture mask_pic = create_xrender_mask (dpy, pixmap, True, True);
1172 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1173 XFreePixmap (dpy, overlay_pmap);
1174
1175 pa.component_alpha = True;
1176 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1177 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat | CPComponentAlpha, &pa);
1178 XFreePixmap (dpy, mask_pmap);
1179 879
1180 XRenderColor mask_c; 880 XRenderColor mask_c;
1181 881
1182 mask_c.alpha = 0xffff; 882 mask_c.alpha = 0xffff;
1183 mask_c.red = 883 mask_c.red =
1188 mask_c.alpha = 0; 888 mask_c.alpha = 0;
1189 mask_c.red = 0xffff - c.r; 889 mask_c.red = 0xffff - c.r;
1190 mask_c.green = 0xffff - c.g; 890 mask_c.green = 0xffff - c.g;
1191 mask_c.blue = 0xffff - c.b; 891 mask_c.blue = 0xffff - c.b;
1192 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 892 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
893
1193 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height); 894 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1194 895
1195 if (shade > 100) 896 if (shade > 100)
1196 { 897 {
1197 mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
1198 mask_c.alpha = 0; 898 mask_c.alpha = 0;
899 mask_c.red =
900 mask_c.green =
901 mask_c.blue = 0xffff * (shade - 100) / 100;
1199 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 902 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1200 903
1201 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height); 904 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1202 } 905 }
1203 906
1204 ret = true; 907 ret = true;
1205 908
1206 XRenderFreePicture (dpy, mask_pic); 909 XRenderFreePicture (dpy, mask_pic);
1207 XRenderFreePicture (dpy, overlay_pic); 910 XRenderFreePicture (dpy, overlay_pic);
1208 XRenderFreePicture (dpy, back_pic); 911 XRenderFreePicture (dpy, back_pic);
912 }
1209# endif 913# endif
1210 }
1211 914
1212 return ret; 915 return ret;
1213} 916}
1214 917
1215/* 918/*
1216 * Builds a pixmap of the same size as the terminal window that contains 919 * Builds a pixmap of the same size as the terminal window that contains
1217 * the tiled portion of the root pixmap that is supposed to be covered by 920 * the tiled portion of the root pixmap that is supposed to be covered by
1218 * our window. 921 * our window.
1219 */ 922 */
1220unsigned long 923bool
1221rxvt_term::make_transparency_pixmap () 924rxvt_term::make_transparency_pixmap ()
1222{ 925{
1223 unsigned long result = 0; 926 bool ret = false;
1224 927
1225 /* root dimensions may change from call to call - but Display structure should 928 /* root dimensions may change from call to call - but Display structure should
1226 * be always up-to-date, so let's use it : 929 * be always up-to-date, so let's use it :
1227 */ 930 */
1228 int screen = display->screen; 931 int screen = display->screen;
1266#if XRENDER 969#if XRENDER
1267 if (bg_flags & BG_HAS_RENDER) 970 if (bg_flags & BG_HAS_RENDER)
1268 { 971 {
1269 recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth); 972 recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth);
1270 973
1271 XRenderPictureAttributes pa;
1272
1273 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen)); 974 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1274 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa); 975 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, 0);
1275 976
1276 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual); 977 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
1277 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa); 978 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, 0);
1278 979
1279 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height); 980 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1280 981
1281 XRenderFreePicture (dpy, src); 982 XRenderFreePicture (dpy, src);
1282 XRenderFreePicture (dpy, dst); 983 XRenderFreePicture (dpy, dst);
1299 bg_pmap_width = window_width; 1000 bg_pmap_width = window_width;
1300 bg_pmap_height = window_height; 1001 bg_pmap_height = window_height;
1301 } 1002 }
1302 1003
1303 /* straightforward pixmap copy */ 1004 /* straightforward pixmap copy */
1304 while (sx < 0) sx += root_width; 1005 while (sx < 0) sx += root_pmap_width;
1305 while (sy < 0) sy += root_height; 1006 while (sy < 0) sy += root_pmap_height;
1306 1007
1307 gcv.tile = recoded_root_pmap; 1008 gcv.tile = recoded_root_pmap;
1308 gcv.fill_style = FillTiled; 1009 gcv.fill_style = FillTiled;
1309 gcv.ts_x_origin = -sx; 1010 gcv.ts_x_origin = -sx;
1310 gcv.ts_y_origin = -sy; 1011 gcv.ts_y_origin = -sy;
1311 gc = XCreateGC (dpy, vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1012 gc = XCreateGC (dpy, vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1312 1013
1313 if (gc) 1014 if (gc)
1314 { 1015 {
1315 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height); 1016 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height);
1316 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS); 1017 ret = true;
1018 bool need_blur = h_blurRadius && v_blurRadius;
1019 bool need_tint = shade != 100 || (bg_flags & BG_TINT_SET);
1020
1021 if (!(bg_flags & BG_CLIENT_RENDER))
1022 {
1023 if (need_blur)
1024 {
1025 if (blur_pixmap (bg_pixmap, visual, window_width, window_height, depth))
1026 need_blur = false;
1027 }
1028 if (need_tint)
1029 {
1030 if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
1031 need_tint = false;
1032 }
1033 if (need_tint)
1034 {
1035 XImage *ximage = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1036 if (ximage)
1037 {
1038 /* our own client-side tinting */
1039 tint_ximage (DefaultVisual (dpy, display->screen), ximage);
1040
1041 XPutImage (dpy, bg_pixmap, gc, ximage, 0, 0, 0, 0, ximage->width, ximage->height);
1042 XDestroyImage (ximage);
1043 }
1044 }
1045 } /* server side rendering completed */
1046
1317 XFreeGC (dpy, gc); 1047 XFreeGC (dpy, gc);
1318
1319 if (!(bg_flags & BG_CLIENT_RENDER))
1320 {
1321 if ((bg_flags & BG_NEEDS_BLUR)
1322 && (bg_flags & BG_HAS_RENDER_CONV))
1323 {
1324 if (blur_pixmap (bg_pixmap, visual, window_width, window_height))
1325 result &= ~BG_NEEDS_BLUR;
1326 }
1327 if ((bg_flags & BG_NEEDS_TINT)
1328 && (bg_flags & (BG_TINT_BITAND | BG_HAS_RENDER)))
1329 {
1330 if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
1331 result &= ~BG_NEEDS_TINT;
1332 }
1333 } /* server side rendering completed */
1334 } 1048 }
1335 1049
1336 if (recoded_root_pmap != root_pixmap) 1050 if (recoded_root_pmap != root_pixmap)
1337 XFreePixmap (dpy, recoded_root_pmap); 1051 XFreePixmap (dpy, recoded_root_pmap);
1338 1052
1339 return result; 1053 return ret;
1340} 1054}
1341 1055
1342void 1056void
1343rxvt_term::bg_set_root_pixmap () 1057rxvt_term::bg_set_root_pixmap ()
1344{ 1058{
1348 1062
1349 root_pixmap = new_root_pixmap; 1063 root_pixmap = new_root_pixmap;
1350} 1064}
1351# endif /* ENABLE_TRANSPARENCY */ 1065# endif /* ENABLE_TRANSPARENCY */
1352 1066
1353#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1354static void shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c);
1355# endif
1356
1357bool 1067bool
1358rxvt_term::bg_render () 1068rxvt_term::bg_render ()
1359{ 1069{
1360 unsigned long tr_flags = 0; 1070 bool transparent = false;
1361 1071
1362 bg_invalidate (); 1072 bg_invalidate ();
1363# ifdef ENABLE_TRANSPARENCY 1073# ifdef ENABLE_TRANSPARENCY
1364 if (bg_flags & BG_IS_TRANSPARENT) 1074 if (bg_flags & BG_IS_TRANSPARENT)
1365 { 1075 {
1366 /* we need to re-generate transparency pixmap in that case ! */ 1076 /* we need to re-generate transparency pixmap in that case ! */
1367 tr_flags = make_transparency_pixmap (); 1077 transparent = make_transparency_pixmap ();
1368 if (tr_flags == 0) 1078 if (transparent)
1369 return false;
1370 else if (!(tr_flags & BG_EFFECTS_FLAGS))
1371 bg_flags |= BG_IS_VALID; 1079 bg_flags |= BG_IS_VALID;
1372 } 1080 }
1373# endif 1081# endif
1374 1082
1375# ifdef BG_IMAGE_FROM_FILE 1083# ifdef BG_IMAGE_FROM_FILE
1376 if ((bg_flags & BG_IS_FROM_FILE) 1084 if (bg_flags & BG_IS_FROM_FILE)
1377 || (tr_flags & BG_EFFECTS_FLAGS))
1378 { 1085 {
1379 if (render_image (tr_flags)) 1086 if (render_image (transparent))
1380 bg_flags |= BG_IS_VALID; 1087 bg_flags |= BG_IS_VALID;
1381 }
1382# endif
1383
1384# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1385 XImage *result = NULL;
1386
1387 if (tr_flags && !(bg_flags & BG_IS_VALID))
1388 {
1389 result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1390 }
1391
1392 if (result)
1393 {
1394 /* our own client-side tinting */
1395 if (tr_flags & BG_NEEDS_TINT)
1396 {
1397 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1398 if (bg_flags & BG_TINT_SET)
1399 tint.get (c);
1400 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c);
1401 }
1402
1403 GC gc = XCreateGC (dpy, vt, 0UL, NULL);
1404
1405 if (gc)
1406 {
1407 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1408
1409 XFreeGC (dpy, gc);
1410 bg_flags |= BG_IS_VALID;
1411 }
1412
1413 XDestroyImage (result);
1414 } 1088 }
1415# endif 1089# endif
1416 1090
1417 if (!(bg_flags & BG_IS_VALID)) 1091 if (!(bg_flags & BG_IS_VALID))
1418 { 1092 {
1455#endif 1129#endif
1456} 1130}
1457 1131
1458#endif /* HAVE_BG_PIXMAP */ 1132#endif /* HAVE_BG_PIXMAP */
1459 1133
1460#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1134#ifdef ENABLE_TRANSPARENCY
1461/* taken from aterm-0.4.2 */ 1135/* based on code from aterm-0.4.2 */
1462 1136
1463static void 1137static inline void
1464shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c) 1138fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high)
1465{ 1139{
1140 for (int i = 0; i <= mask >> sh; i++)
1141 {
1142 uint32_t tmp;
1143 tmp = i * high;
1144 tmp += (mask >> sh) * low;
1145 lookup[i] = (tmp / 0xffff) << sh;
1146 }
1147}
1148
1149void
1150rxvt_term::tint_ximage (Visual *visual, XImage *ximage)
1151{
1152 unsigned int size_r, size_g, size_b;
1466 int sh_r, sh_g, sh_b; 1153 int sh_r, sh_g, sh_b;
1467 uint32_t mask_r, mask_g, mask_b; 1154 uint32_t mask_r, mask_g, mask_b;
1468 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1155 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1469 rgba low; 1156 unsigned short low;
1470 rgba high;
1471 int i;
1472 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; 1157 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
1473 1158
1474 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return; 1159 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1475 1160
1476 /* for convenience */ 1161 /* for convenience */
1477 mask_r = visual->red_mask; 1162 mask_r = visual->red_mask;
1478 mask_g = visual->green_mask; 1163 mask_g = visual->green_mask;
1479 mask_b = visual->blue_mask; 1164 mask_b = visual->blue_mask;
1480 1165
1481 /* boring lookup table pre-initialization */ 1166 /* boring lookup table pre-initialization */
1482 switch (ximage->depth) 1167 sh_r = ecb_ctz32 (mask_r);
1483 { 1168 sh_g = ecb_ctz32 (mask_g);
1484 case 15: 1169 sh_b = ecb_ctz32 (mask_b);
1485 if ((mask_r != 0x7c00) || 1170
1486 (mask_g != 0x03e0) || 1171 size_r = mask_r >> sh_r;
1487 (mask_b != 0x001f)) 1172 size_g = mask_g >> sh_g;
1173 size_b = mask_b >> sh_b;
1174
1175 if (size_r++ > 255 || size_g++ > 255 || size_b++ > 255)
1488 return; 1176 return;
1489 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+32+32)); 1177
1178 lookup = (uint32_t *)malloc (sizeof (uint32_t) * (size_r + size_g + size_b));
1490 lookup_r = lookup; 1179 lookup_r = lookup;
1491 lookup_g = lookup+32; 1180 lookup_g = lookup + size_r;
1492 lookup_b = lookup+32+32; 1181 lookup_b = lookup + size_r + size_g;
1493 sh_r = 10; 1182
1494 sh_g = 5; 1183 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1495 sh_b = 0; 1184
1496 break; 1185 if (bg_flags & BG_TINT_SET)
1497 case 16: 1186 tint.get (c);
1498 if ((mask_r != 0xf800) ||
1499 (mask_g != 0x07e0) ||
1500 (mask_b != 0x001f))
1501 return;
1502 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+64+32));
1503 lookup_r = lookup;
1504 lookup_g = lookup+32;
1505 lookup_b = lookup+32+64;
1506 sh_r = 11;
1507 sh_g = 5;
1508 sh_b = 0;
1509 break;
1510 case 24:
1511 if ((mask_r != 0xff0000) ||
1512 (mask_g != 0x00ff00) ||
1513 (mask_b != 0x0000ff))
1514 return;
1515 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1516 lookup_r = lookup;
1517 lookup_g = lookup+256;
1518 lookup_b = lookup+256+256;
1519 sh_r = 16;
1520 sh_g = 8;
1521 sh_b = 0;
1522 break;
1523 case 32:
1524 if ((mask_r != 0xff0000) ||
1525 (mask_g != 0x00ff00) ||
1526 (mask_b != 0x0000ff))
1527 return;
1528 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1529 lookup_r = lookup;
1530 lookup_g = lookup+256;
1531 lookup_b = lookup+256+256;
1532 sh_r = 16;
1533 sh_g = 8;
1534 sh_b = 0;
1535 break;
1536 default:
1537 return; /* we do not support this color depth */
1538 }
1539 1187
1540 /* prepare limits for color transformation (each channel is handled separately) */ 1188 /* prepare limits for color transformation (each channel is handled separately) */
1541 if (shade > 100) 1189 if (shade > 100)
1542 { 1190 {
1543 shade = 200 - shade;
1544
1545 high.r = c.r * shade / 100;
1546 high.g = c.g * shade / 100;
1547 high.b = c.b * shade / 100;
1548
1549 low.r = 65535 * (100 - shade) / 100; 1191 c.r = c.r * (200 - shade) / 100;
1550 low.g = 65535 * (100 - shade) / 100; 1192 c.g = c.g * (200 - shade) / 100;
1551 low.b = 65535 * (100 - shade) / 100; 1193 c.b = c.b * (200 - shade) / 100;
1194
1195 low = 0xffff * (shade - 100) / 100;
1552 } 1196 }
1553 else 1197 else
1554 { 1198 {
1555 high.r = c.r * shade / 100; 1199 c.r = c.r * shade / 100;
1556 high.g = c.g * shade / 100; 1200 c.g = c.g * shade / 100;
1557 high.b = c.b * shade / 100; 1201 c.b = c.b * shade / 100;
1558 1202
1559 low.r = low.g = low.b = 0; 1203 low = 0;
1560 } 1204 }
1561 1205
1562 /* fill our lookup tables */ 1206 /* fill our lookup tables */
1563 for (i = 0; i <= mask_r>>sh_r; i++) 1207 fill_lut (lookup_r, mask_r, sh_r, low, c.r);
1564 { 1208 fill_lut (lookup_g, mask_g, sh_g, low, c.g);
1565 uint32_t tmp; 1209 fill_lut (lookup_b, mask_b, sh_b, low, c.b);
1566 tmp = i * high.r;
1567 tmp += (mask_r>>sh_r) * low.r;
1568 lookup_r[i] = (tmp/65535)<<sh_r;
1569 }
1570 for (i = 0; i <= mask_g>>sh_g; i++)
1571 {
1572 uint32_t tmp;
1573 tmp = i * high.g;
1574 tmp += (mask_g>>sh_g) * low.g;
1575 lookup_g[i] = (tmp/65535)<<sh_g;
1576 }
1577 for (i = 0; i <= mask_b>>sh_b; i++)
1578 {
1579 uint32_t tmp;
1580 tmp = i * high.b;
1581 tmp += (mask_b>>sh_b) * low.b;
1582 lookup_b[i] = (tmp/65535)<<sh_b;
1583 }
1584 1210
1585 /* apply table to input image (replacing colors by newly calculated ones) */ 1211 /* apply table to input image (replacing colors by newly calculated ones) */
1586 if (ximage->bits_per_pixel == 32 1212 if (ximage->bits_per_pixel == 32
1587 && (ximage->depth == 24 || ximage->depth == 32)
1588 && ximage->byte_order == host_byte_order) 1213 && ximage->byte_order == host_byte_order)
1589 { 1214 {
1590 uint32_t *p1, *pf, *p, *pl; 1215 char *line = ximage->data;
1591 p1 = (uint32_t *) ximage->data;
1592 pf = (uint32_t *) (ximage->data + ximage->height * ximage->bytes_per_line);
1593 1216
1594 while (p1 < pf) 1217 for (int y = 0; y < ximage->height; y++)
1595 {
1596 p = p1;
1597 pl = p1 + ximage->width;
1598 for (; p < pl; p++)
1599 { 1218 {
1600 *p = lookup_r[(*p & 0xff0000) >> 16] | 1219 uint32_t *p = (uint32_t *)line;
1601 lookup_g[(*p & 0x00ff00) >> 8] | 1220 for (int x = 0; x < ximage->width; x++)
1602 lookup_b[(*p & 0x0000ff)] |
1603 (*p & 0xff000000);
1604 } 1221 {
1605 p1 = (uint32_t *) ((char *) p1 + ximage->bytes_per_line); 1222 *p = lookup_r[(*p & mask_r) >> sh_r] |
1223 lookup_g[(*p & mask_g) >> sh_g] |
1224 lookup_b[(*p & mask_b) >> sh_b];
1225 p++;
1226 }
1227 line += ximage->bytes_per_line;
1606 } 1228 }
1607 } 1229 }
1608 else 1230 else
1609 { 1231 {
1610 for (int y = 0; y < ximage->height; y++) 1232 for (int y = 0; y < ximage->height; y++)
1618 } 1240 }
1619 } 1241 }
1620 1242
1621 free (lookup); 1243 free (lookup);
1622} 1244}
1623#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ 1245#endif /* ENABLE_TRANSPARENCY */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines