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.94 by sf-exg, Wed Oct 20 09:04:55 2010 UTC vs.
Revision 1.192 by sf-exg, Fri Dec 30 12:45:56 2011 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: background.C - former xpm.C 2 * File: background.C - former xpm.C
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 <pcg@goof.com> 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 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
24 24
25#include <cmath> 25#include <cmath>
26#include "../config.h" /* NECESSARY */ 26#include "../config.h" /* NECESSARY */
27#include "rxvt.h" /* NECESSARY */ 27#include "rxvt.h" /* NECESSARY */
28 28
29#define DO_TIMING_TEST 0 29#if XRENDER
30 30# include <X11/extensions/Xrender.h>
31#if DO_TIMING_TEST
32# include <sys/time.h>
33#define TIMING_TEST_START(id) \
34 struct timeval timing_test_##id##_stv; \
35 gettimeofday (&timing_test_##id##_stv, NULL);
36
37#define TIMING_TEST_PRINT_RESULT(id) \
38 do { \
39 struct timeval tv; \
40 gettimeofday (&tv, NULL); \
41 tv.tv_sec -= (timing_test_##id##_stv).tv_sec; \
42 fprintf (stderr, "%s: %s: %d: elapsed %ld usec\n", #id, __FILE__, __LINE__, \
43 tv.tv_sec * 1000000 + tv.tv_usec - (timing_test_##id##_stv).tv_usec); \
44 } while (0)
45
46#else
47#define TIMING_TEST_START(id) do {} while (0)
48#define TIMING_TEST_PRINT_RESULT(id) do {} while (0)
49#endif 31#endif
50 32
51/* 33#ifndef FilterConvolution
52 * Pixmap geometry string interpretation : 34#define FilterConvolution "convolution"
53 * Each geometry string contains zero or one scale/position 35#endif
54 * adjustment and may optionally be followed by a colon and one or more
55 * colon-delimited pixmap operations.
56 * The following table shows the valid geometry strings and their
57 * effects on the background image :
58 *
59 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%.
60 * W and H are percentages of the terminal window size.
61 * X and Y are also percentages; e.g., +50+50 centers
62 * the image in the window.
63 * WxH+X Assumes Y == X
64 * WxH Assumes Y == X == 50 (centers the image)
65 * W+X+Y Assumes H == W
66 * W+X Assumes H == W and Y == X
67 * W Assumes H == W and Y == X == 50
68 *
69 * Adjusting position only :
70 * =+X+Y Set position to X% by Y% (absolute).
71 * =+X Set position to X% by X%.
72 * +X+Y Adjust position horizontally X% and vertically Y%
73 * from current position (relative).
74 * +X Adjust position horizontally X% and vertically X%
75 * from current position.
76 *
77 * Adjusting scale only :
78 * Wx0 Multiply horizontal scaling factor by W%
79 * 0xH Multiply vertical scaling factor by H%
80 * 0x0 No scaling (show image at normal size).
81 *
82 * Pixmap Operations : (should be prepended by a colon)
83 * tile Tile image. Scaling/position modifiers above will affect
84 * the tile size and origin.
85 * propscale When scaling, scale proportionally. That is, maintain the
86 * proper aspect ratio for the image. Any portion of the
87 * background not covered by the image is filled with the
88 * current background color.
89 * hscale Scale horizontally, tile vertically ?
90 * vscale Tile horizontally, scale vertically ?
91 * scale Scale both up and down
92 * auto Same as 100x100+50+50
93 */
94 36
95#ifdef HAVE_BG_PIXMAP 37#ifdef HAVE_BG_PIXMAP
96bgPixmap_t::bgPixmap_t () 38# if XRENDER
39static Picture
40create_xrender_mask (Display *dpy, Drawable drawable, Bool argb, Bool component_alpha)
97{ 41{
98 // this is basically redundant as bgPixmap_t is only used in 42 Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);
99 // zero_initialised-derived structs 43
100#ifdef HAVE_AFTERIMAGE 44 XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);
101 original_asim = NULL; 45 XRenderPictureAttributes pa;
46 pa.repeat = True;
47 pa.component_alpha = component_alpha;
48 Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat | CPComponentAlpha, &pa);
49
50 XFreePixmap (dpy, pixmap);
51
52 return mask;
53}
102#endif 54# endif
103#ifdef HAVE_PIXBUF
104 pixbuf = NULL;
105#endif
106#ifdef BG_IMAGE_FROM_FILE
107 have_image = false;
108 h_scale = v_scale = 0;
109 h_align = v_align = 0;
110#endif
111#ifdef ENABLE_TRANSPARENCY
112 shade = 100;
113#endif
114 flags = 0;
115 pixmap = None;
116 valid_since = invalid_since = 0;
117 target = 0;
118}
119 55
120void 56void
121bgPixmap_t::destroy () 57rxvt_term::bg_destroy ()
122{ 58{
123#ifdef HAVE_AFTERIMAGE 59#ifdef HAVE_AFTERIMAGE
124 if (original_asim) 60 if (original_asim)
125 safe_asimage_destroy (original_asim); 61 safe_asimage_destroy (original_asim);
62 if (asv)
63 destroy_asvisual (asv, 0);
64 if (asimman)
65 destroy_image_manager (asimman, 0);
126#endif 66#endif
127 67
128#ifdef HAVE_PIXBUF 68#ifdef HAVE_PIXBUF
129 if (pixbuf) 69 if (pixbuf)
130 g_object_unref (pixbuf); 70 g_object_unref (pixbuf);
131#endif 71#endif
132 72
133 if (pixmap && target) 73 if (bg_pixmap)
134 XFreePixmap (target->dpy, pixmap); 74 XFreePixmap (dpy, bg_pixmap);
135} 75}
136 76
137bool 77bool
138bgPixmap_t::window_size_sensitive () 78rxvt_term::bg_set_position (int x, int y)
79{
80
81 if (target_x != x
82 || target_y != y)
83 {
84 target_x = x;
85 target_y = y;
86 return true;
87 }
88 return false;
89}
90
91bool
92rxvt_term::bg_window_size_sensitive ()
139{ 93{
140# ifdef ENABLE_TRANSPARENCY 94# ifdef ENABLE_TRANSPARENCY
141 if (flags & isTransparent) 95 if (bg_flags & BG_IS_TRANSPARENT)
142 return true; 96 return true;
143# endif 97# endif
144 98
145# ifdef BG_IMAGE_FROM_FILE 99# ifdef BG_IMAGE_FROM_FILE
146 if (have_image) 100 if (bg_flags & BG_IS_FROM_FILE)
147 { 101 {
148 if (flags & sizeSensitive) 102 if (bg_flags & BG_IS_SIZE_SENSITIVE)
149 return true; 103 return true;
150 } 104 }
151# endif 105# endif
152 106
153 return false; 107 return false;
154} 108}
155 109
156bool 110bool
157bgPixmap_t::window_position_sensitive () 111rxvt_term::bg_window_position_sensitive ()
158{ 112{
159# ifdef ENABLE_TRANSPARENCY 113# ifdef ENABLE_TRANSPARENCY
160 if (flags & isTransparent) 114 if (bg_flags & BG_IS_TRANSPARENT)
161 return true; 115 return true;
162# endif 116# endif
163 117
164# ifdef BG_IMAGE_FROM_FILE 118# ifdef BG_IMAGE_FROM_FILE
165 if (have_image) 119 if (bg_flags & BG_IS_FROM_FILE)
166 { 120 {
167 if (flags & rootAlign) 121 if (bg_flags & BG_ROOT_ALIGN)
168 return true; 122 return true;
169 } 123 }
170# endif 124# endif
171 125
172 return false;
173};
174
175bool bgPixmap_t::need_client_side_rendering ()
176{
177# ifdef HAVE_AFTERIMAGE
178 if (original_asim)
179 return true;
180# endif
181 return false; 126 return false;
182} 127}
183 128
184# ifdef BG_IMAGE_FROM_FILE 129# ifdef BG_IMAGE_FROM_FILE
185static inline bool 130static inline bool
223 int smaller = min (image_size, window_size); 168 int smaller = min (image_size, window_size);
224 169
225 if (align >= 0 && align <= 100) 170 if (align >= 0 && align <= 100)
226 return diff * align / 100; 171 return diff * align / 100;
227 else if (align > 100 && align <= 200) 172 else if (align > 100 && align <= 200)
228 return ((align - 100) * smaller / 100) + window_size - smaller; 173 return (align - 100) * smaller / 100 + window_size - smaller;
229 else if (align >= -100 && align < 0) 174 else if (align >= -100 && align < 0)
230 return ((align + 100) * smaller / 100) - image_size; 175 return (align + 100) * smaller / 100 - image_size;
231 return 0; 176 return 0;
232} 177}
233 178
234static inline int 179static inline int
235make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size) 180make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
248 dst_size = target_size - dst_pos; 193 dst_size = target_size - dst_pos;
249 return src_pos; 194 return src_pos;
250} 195}
251 196
252bool 197bool
253bgPixmap_t::set_geometry (const char *geom) 198rxvt_term::bg_set_geometry (const char *geom, bool update)
254{ 199{
200 bool changed = false;
255 int geom_flags = 0, changed = 0; 201 int geom_flags = 0;
256 int x = 0, y = 0; 202 int x = 0, y = 0;
257 unsigned int w = 0, h = 0; 203 unsigned int w = 0, h = 0;
258 unsigned int n; 204 unsigned long new_flags = 0;
259 unsigned long new_flags = (flags & (~geometryFlags));
260 const char *p;
261# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
262 205
263 if (geom == NULL) 206 if (geom == NULL)
264 return false; 207 return false;
265 208
266 char str[MAXLEN_GEOM]; 209 if (geom[0])
267
268 while (isspace(*geom)) ++geom;
269 if ((p = strchr (geom, ';')) == NULL)
270 p = strchr (geom, '\0');
271
272 n = (p - geom);
273 if (n < MAXLEN_GEOM)
274 { 210 {
275 char *ops; 211 char **arr = rxvt_strsplit (':', geom);
276 new_flags |= geometrySet;
277 212
278 memcpy (str, geom, n); 213 for (int i = 0; arr[i]; i++)
279 str[n] = '\0';
280 if (str[0] == ':')
281 ops = &str[0];
282 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0]))
283 ops = &str[0];
284 else
285 {
286 char *tmp;
287 ops = strchr (str, ':');
288 if (ops != NULL)
289 { 214 {
290 for (tmp = ops-1; tmp >= str && isspace(*tmp); --tmp); 215 if (!strcasecmp (arr[i], "style=tiled"))
291 *(++tmp) = '\0';
292 if (ops == tmp) ++ops;
293 } 216 {
294 } 217 new_flags = BG_TILE;
295 218 w = h = noScale;
296 if (ops > str || ops == NULL) 219 x = y = 0;
297 { 220 geom_flags = WidthValue|HeightValue|XValue|YValue;
298 /* we have geometry string - let's handle it prior to applying ops */
299 geom_flags = XParseGeometry (str, &x, &y, &w, &h);
300
301 if ((geom_flags & XValue) && !(geom_flags & YValue))
302 { 221 }
303 y = x; 222 else if (!strcasecmp (arr[i], "style=aspect-stretched"))
304 geom_flags |= YValue;
305 } 223 {
306 224 new_flags = BG_KEEP_ASPECT;
307 if (flags & geometrySet) 225 w = h = windowScale;
226 x = y = centerAlign;
227 geom_flags = WidthValue|HeightValue|XValue|YValue;
308 { 228 }
309 /* new geometry is an adjustment to the old one ! */ 229 else if (!strcasecmp (arr[i], "style=stretched"))
310 if ((geom_flags & WidthValue) && (geom_flags & HeightValue))
311 {
312 if (w == 0 && h != 0)
313 {
314 w = h_scale;
315 h = (v_scale * h) / 100;
316 }
317 else if (h == 0 && w != 0)
318 {
319 w = (h_scale * w) / 100;
320 h = v_scale;
321 }
322 }
323 if (geom_flags & XValue)
324 {
325 if (str[0] != '=')
326 {
327 y += v_align;
328 x += h_align;
329 }
330 }
331 } 230 {
332 else /* setting up geometry from scratch */ 231 new_flags = 0;
232 w = h = windowScale;
233 geom_flags = WidthValue|HeightValue;
333 { 234 }
334 if (!(geom_flags & XValue)) 235 else if (!strcasecmp (arr[i], "style=centered"))
335 {
336 /* use default geometry - centered */
337 x = y = defaultAlign;
338 }
339 else if (!(geom_flags & YValue))
340 y = x;
341
342 if ((geom_flags & (WidthValue|HeightValue)) == 0)
343 {
344 /* use default geometry - scaled */
345 w = h = defaultScale;
346 }
347 else if (geom_flags & WidthValue)
348 {
349 if (!(geom_flags & HeightValue))
350 h = w;
351 }
352 else
353 w = h;
354 } 236 {
355 } /* done parsing geometry string */ 237 new_flags = 0;
356 else if (!(flags & geometrySet)) 238 w = h = noScale;
239 x = y = centerAlign;
240 geom_flags = WidthValue|HeightValue|XValue|YValue;
241 }
242 else if (!strcasecmp (arr[i], "style=root-tiled"))
357 { 243 {
358 /* default geometry - scaled and centered */ 244 new_flags = BG_TILE|BG_ROOT_ALIGN;
245 w = h = noScale;
246 geom_flags = WidthValue|HeightValue;
247 }
248 else if (!strcasecmp (arr[i], "op=tile"))
249 new_flags |= BG_TILE;
250 else if (!strcasecmp (arr[i], "op=keep-aspect"))
251 new_flags |= BG_KEEP_ASPECT;
252 else if (!strcasecmp (arr[i], "op=root-align"))
253 new_flags |= BG_ROOT_ALIGN;
254
255 // deprecated
256 else if (!strcasecmp (arr[i], "tile"))
257 {
258 new_flags |= BG_TILE;
259 w = h = noScale;
260 geom_flags |= WidthValue|HeightValue;
261 }
262 else if (!strcasecmp (arr[i], "propscale"))
263 {
264 new_flags |= BG_KEEP_ASPECT;
265 w = h = windowScale;
266 geom_flags |= WidthValue|HeightValue;
267 }
268 else if (!strcasecmp (arr[i], "hscale"))
269 {
270 new_flags |= BG_TILE;
271 w = windowScale;
272 h = noScale;
273 geom_flags |= WidthValue|HeightValue;
274 }
275 else if (!strcasecmp (arr[i], "vscale"))
276 {
277 new_flags |= BG_TILE;
278 h = windowScale;
279 w = noScale;
280 geom_flags |= WidthValue|HeightValue;
281 }
282 else if (!strcasecmp (arr[i], "scale"))
283 {
284 w = h = windowScale;
285 geom_flags |= WidthValue|HeightValue;
286 }
287 else if (!strcasecmp (arr[i], "auto"))
288 {
289 w = h = windowScale;
290 x = y = centerAlign;
291 geom_flags |= WidthValue|HeightValue|XValue|YValue;
292 }
293 else if (!strcasecmp (arr[i], "root"))
294 {
295 new_flags |= BG_TILE|BG_ROOT_ALIGN;
296 w = h = noScale;
297 geom_flags |= WidthValue|HeightValue;
298 }
299
300 else
301 geom_flags |= XParseGeometry (arr[i], &x, &y, &w, &h);
302 } /* done parsing ops */
303
304 rxvt_free_strsplit (arr);
305 }
306
307 new_flags |= bg_flags & ~BG_GEOMETRY_FLAGS;
308
309 if (!update)
310 {
311 if (!(geom_flags & XValue))
359 x = y = defaultAlign; 312 x = y = defaultAlign;
313 else if (!(geom_flags & YValue))
314 y = x;
315
316 if (!(geom_flags & (WidthValue|HeightValue)))
360 w = h = defaultScale; 317 w = h = defaultScale;
361 } 318 else if (!(geom_flags & HeightValue))
319 h = w;
320 else if (!(geom_flags & WidthValue))
321 w = h;
362 322
363 if (!(flags & geometrySet))
364 geom_flags |= WidthValue|HeightValue|XValue|YValue; 323 geom_flags |= WidthValue|HeightValue|XValue|YValue;
324 }
365 325
366 if (ops)
367 {
368 while (*ops)
369 {
370 while (*ops == ':' || isspace(*ops)) ++ops;
371
372# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof (op_str) - 1) == 0)
373 if (CHECK_GEOM_OPS ("tile"))
374 {
375 w = h = noScale;
376 geom_flags |= WidthValue|HeightValue;
377 }
378 else if (CHECK_GEOM_OPS ("propscale"))
379 {
380 new_flags |= propScale;
381 }
382 else if (CHECK_GEOM_OPS ("hscale"))
383 {
384 if (w == 0) w = windowScale;
385
386 h = noScale;
387 geom_flags |= WidthValue|HeightValue;
388 }
389 else if (CHECK_GEOM_OPS ("vscale"))
390 {
391 if (h == 0) h = windowScale;
392
393 w = noScale;
394 geom_flags |= WidthValue|HeightValue;
395 }
396 else if (CHECK_GEOM_OPS ("scale"))
397 {
398 if (h == 0) h = windowScale;
399 if (w == 0) w = windowScale;
400
401 geom_flags |= WidthValue|HeightValue;
402 }
403 else if (CHECK_GEOM_OPS ("auto"))
404 {
405 w = h = windowScale;
406 x = y = centerAlign;
407 geom_flags |= WidthValue|HeightValue|XValue|YValue;
408 }
409 else if (CHECK_GEOM_OPS ("root"))
410 {
411 new_flags |= rootAlign;
412 w = h = noScale;
413 geom_flags |= WidthValue|HeightValue;
414 }
415# undef CHECK_GEOM_OPS
416
417 while (*ops != ':' && *ops != '\0') ++ops;
418 } /* done parsing ops */
419 }
420
421 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) ++changed; 326 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true;
422 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) ++changed; 327 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true;
423 if (check_set_align_value (geom_flags, XValue, h_align, x)) ++changed; 328 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true;
424 if (check_set_align_value (geom_flags, YValue, v_align, y)) ++changed; 329 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
425 }
426 330
427 if (new_flags != flags) 331 if (new_flags != bg_flags)
428 { 332 {
429 flags = new_flags; 333 bg_flags = new_flags;
430 changed++; 334 changed = true;
431 } 335 }
432 336
433 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
434 // flags, h_scale, v_scale, h_align, v_align);
435 return (changed > 0); 337 return changed;
436} 338}
437 339
438void 340void
439bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) 341rxvt_term::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
440{ 342{
441 int target_width = target->szHint.width; 343 int target_width = szHint.width;
442 int target_height = target->szHint.height; 344 int target_height = szHint.height;
443 345
444 if (flags & propScale) 346 w = h_scale * target_width / 100;
347 h = v_scale * target_height / 100;
348
349 if (bg_flags & BG_KEEP_ASPECT)
445 { 350 {
446 float scale = (float)target_width / image_width; 351 float scale = (float)w / image_width;
447 min_it (scale, (float)target_height / image_height); 352 min_it (scale, (float)h / image_height);
448 w = image_width * scale + 0.5; 353 w = image_width * scale + 0.5;
449 h = image_height * scale + 0.5; 354 h = image_height * scale + 0.5;
450 } 355 }
451 else
452 {
453 w = h_scale * target_width / 100;
454 h = v_scale * target_height / 100;
455 }
456 356
457 if (!w) w = image_width; 357 if (!w) w = image_width;
458 if (!h) h = image_height; 358 if (!h) h = image_height;
459 359
460 if (flags & rootAlign) 360 if (bg_flags & BG_ROOT_ALIGN)
461 { 361 {
462 target->get_window_origin (x, y);
463 x = -x; 362 x = -target_x;
464 y = -y; 363 y = -target_y;
465 } 364 }
466 else 365 else
467 { 366 {
468 x = make_align_position (h_align, target_width, w); 367 x = make_align_position (h_align, target_width, w);
469 y = make_align_position (v_align, target_height, h); 368 y = make_align_position (v_align, target_height, h);
470 } 369 }
471 370
472 flags &= ~sizeSensitive; 371 bg_flags &= ~BG_IS_SIZE_SENSITIVE;
473 if ((flags & propScale) || h_scale || v_scale 372 if (!(bg_flags & BG_TILE)
373 || h_scale || v_scale
474 || (!(flags & rootAlign) && (h_align || v_align)) 374 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align))
475 || w > target_width || h > target_height) 375 || w > target_width || h > target_height)
476 flags |= sizeSensitive; 376 bg_flags |= BG_IS_SIZE_SENSITIVE;
477} 377}
478 378
479# ifdef HAVE_AFTERIMAGE 379# ifdef HAVE_AFTERIMAGE
480bool 380bool
481bgPixmap_t::render_image (unsigned long background_flags) 381rxvt_term::render_image (unsigned long tr_flags)
482{ 382{
483 if (target == NULL)
484 return false;
485
486 target->init_asv (); 383 init_asv ();
487 384
488 ASImage *background = NULL; 385 ASImage *background = NULL;
489 ARGB32 background_tint = TINT_LEAVE_SAME; 386 ARGB32 background_tint = TINT_LEAVE_SAME;
490 387
491# ifdef ENABLE_TRANSPARENCY 388# ifdef ENABLE_TRANSPARENCY
492 if (background_flags) 389 if (tr_flags)
493 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100); 390 background = pixmap2ximage (asv, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, 100);
494 391
495 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 392 if (tr_flags & BG_NEEDS_TINT)
496 { 393 {
497 ShadingInfo as_shade; 394 ShadingInfo as_shade;
498 as_shade.shading = shade; 395 as_shade.shading = shade;
499 396
500 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 397 rgba c;
501 if (flags & tintSet)
502 tint.get (c); 398 tint.get (c);
503 as_shade.tintColor.red = c.r; 399 as_shade.tintColor.red = c.r;
504 as_shade.tintColor.green = c.g; 400 as_shade.tintColor.green = c.g;
505 as_shade.tintColor.blue = c.b; 401 as_shade.tintColor.blue = c.b;
506 402
507 background_tint = shading2tint32 (&as_shade); 403 background_tint = shading2tint32 (&as_shade);
508 } 404 }
509 405
510 if (!(background_flags & transpPmapBlurred) && (flags & blurNeeded) && background != NULL) 406 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL)
511 { 407 {
512 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 408 ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
513 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 409 ASA_XImage,
514 100, ASIMAGE_QUALITY_DEFAULT); 410 100, ASIMAGE_QUALITY_DEFAULT);
515 if (tmp) 411 if (tmp)
516 { 412 {
517 destroy_asimage (&background); 413 destroy_asimage (&background);
518 background = tmp; 414 background = tmp;
520 } 416 }
521# endif 417# endif
522 418
523 ASImage *result = 0; 419 ASImage *result = 0;
524 420
525 int target_width = target->szHint.width; 421 int target_width = szHint.width;
526 int target_height = target->szHint.height; 422 int target_height = szHint.height;
527 int new_pmap_width = target_width; 423 int new_pmap_width = target_width;
528 int new_pmap_height = target_height; 424 int new_pmap_height = target_height;
529 425
530 int x = 0; 426 int x = 0;
531 int y = 0; 427 int y = 0;
532 int w = 0; 428 int w = 0;
533 int h = 0; 429 int h = 0;
534 430
535 TIMING_TEST_START (asim);
536
537 if (original_asim) 431 if (original_asim)
538 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y); 432 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
539 433
540 if (!original_asim 434 if (!original_asim
541 || (!(flags & rootAlign) 435 || (!(bg_flags & BG_ROOT_ALIGN)
542 && (x >= target_width 436 && (x >= target_width
543 || y >= target_height 437 || y >= target_height
544 || (x + w <= 0) 438 || x + w <= 0
545 || (y + h <= 0)))) 439 || y + h <= 0)))
546 { 440 {
547 if (background) 441 if (background)
548 { 442 {
549 new_pmap_width = background->width; 443 new_pmap_width = background->width;
550 new_pmap_height = background->height; 444 new_pmap_height = background->height;
551 result = background; 445 result = background;
552 446
553 if (background_tint != TINT_LEAVE_SAME) 447 if (background_tint != TINT_LEAVE_SAME)
554 { 448 {
555 ASImage *tmp = tile_asimage (target->asv, background, 0, 0, 449 ASImage *tmp = tile_asimage (asv, background, 0, 0,
556 target_width, target_height, background_tint, 450 target_width, target_height, background_tint,
557 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT); 451 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
558 if (tmp) 452 if (tmp)
559 result = tmp; 453 result = tmp;
560 } 454 }
564 } 458 }
565 else 459 else
566 { 460 {
567 result = original_asim; 461 result = original_asim;
568 462
569 if ((w != original_asim->width) 463 if (w != original_asim->width
570 || (h != original_asim->height)) 464 || h != original_asim->height)
571 { 465 {
572 result = scale_asimage (target->asv, original_asim, 466 result = scale_asimage (asv, original_asim,
573 w, h, 467 w, h,
574 background ? ASA_ASImage : ASA_XImage, 468 ASA_XImage,
575 100, ASIMAGE_QUALITY_DEFAULT); 469 100, ASIMAGE_QUALITY_DEFAULT);
576 } 470 }
577 471
578 if (background == NULL) 472 if (background == NULL)
579 { 473 {
580 if (h_scale == 0 || v_scale == 0) 474 if (bg_flags & BG_TILE)
581 { 475 {
582 /* if tiling - pixmap has to be sized exactly as the image, 476 /* if tiling - pixmap has to be sized exactly as the image,
583 but there is no need to make it bigger than the window! */ 477 but there is no need to make it bigger than the window! */
584 new_pmap_width = min (result->width, target_width); 478 new_pmap_width = min (result->width, target_width);
585 new_pmap_height = min (result->height, target_height); 479 new_pmap_height = min (result->height, target_height);
586 480
587 /* we also need to tile our image in both directions */ 481 /* we also need to tile our image in both directions */
588 ASImage *tmp = tile_asimage (target->asv, result, 482 ASImage *tmp = tile_asimage (asv, result,
589 (int)result->width - x, 483 (int)result->width - x,
590 (int)result->height - y, 484 (int)result->height - y,
591 new_pmap_width, 485 new_pmap_width,
592 new_pmap_height, 486 new_pmap_height,
593 TINT_LEAVE_SAME, ASA_XImage, 487 TINT_LEAVE_SAME, ASA_XImage,
610 layers[0].clip_width = target_width; 504 layers[0].clip_width = target_width;
611 layers[0].clip_height = target_height; 505 layers[0].clip_height = target_height;
612 layers[0].tint = background_tint; 506 layers[0].tint = background_tint;
613 layers[1].im = result; 507 layers[1].im = result;
614 508
615 if (h_scale == 0 || v_scale == 0) 509 if (bg_flags & BG_TILE)
616 { 510 {
617 /* tile horizontally */ 511 /* tile horizontally */
618 while (x > 0) x -= (int)result->width; 512 while (x > 0) x -= (int)result->width;
619 layers[1].dst_x = x; 513 layers[1].dst_x = x;
620 layers[1].clip_width = result->width+target_width; 514 layers[1].clip_width = result->width+target_width;
624 /* clip horizontally */ 518 /* clip horizontally */
625 layers[1].dst_x = x; 519 layers[1].dst_x = x;
626 layers[1].clip_width = result->width; 520 layers[1].clip_width = result->width;
627 } 521 }
628 522
629 if (h_scale == 0 || v_scale == 0) 523 if (bg_flags & BG_TILE)
630 { 524 {
631 while (y > 0) y -= (int)result->height; 525 while (y > 0) y -= (int)result->height;
632 layers[1].dst_y = y; 526 layers[1].dst_y = y;
633 layers[1].clip_height = result->height + target_height; 527 layers[1].clip_height = result->height + target_height;
634 } 528 }
636 { 530 {
637 layers[1].dst_y = y; 531 layers[1].dst_y = y;
638 layers[1].clip_height = result->height; 532 layers[1].clip_height = result->height;
639 } 533 }
640 534
641 if (target->rs[Rs_blendtype]) 535 if (rs[Rs_blendtype])
642 { 536 {
643 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]); 537 layers[1].merge_scanlines = blend_scanlines_name2func (rs[Rs_blendtype]);
644 if (layers[1].merge_scanlines == NULL) 538 if (layers[1].merge_scanlines == NULL)
645 layers[1].merge_scanlines = alphablend_scanlines; 539 layers[1].merge_scanlines = alphablend_scanlines;
646 } 540 }
647 541
648 ASImage *tmp = merge_layers (target->asv, layers, 2, target_width, target_height, 542 ASImage *tmp = merge_layers (asv, layers, 2, target_width, target_height,
649 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT); 543 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
650 544
651 if (tmp) 545 if (tmp)
652 { 546 {
653 if (result != original_asim) 547 if (result != original_asim)
657 } 551 }
658 552
659 free (layers); 553 free (layers);
660 } 554 }
661 } 555 }
662 TIMING_TEST_PRINT_RESULT (asim);
663 556
664 bool ret = false; 557 bool ret = false;
665 558
666 if (result) 559 if (result)
667 { 560 {
668 XGCValues gcv; 561 XGCValues gcv;
669 GC gc; 562 GC gc;
670 563
671 if (pixmap)
672 {
673 if (pmap_width != new_pmap_width
674 || pmap_height != new_pmap_height
675 || pmap_depth != target->depth)
676 {
677 XFreePixmap (target->dpy, pixmap);
678 pixmap = None;
679 }
680 }
681
682 /* create Pixmap */ 564 /* create Pixmap */
683 if (pixmap == None) 565 if (bg_pixmap == None
566 || bg_pmap_width != new_pmap_width
567 || bg_pmap_height != new_pmap_height)
684 { 568 {
569 if (bg_pixmap)
570 XFreePixmap (dpy, bg_pixmap);
685 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 571 bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth);
686 pmap_width = new_pmap_width; 572 bg_pmap_width = new_pmap_width;
687 pmap_height = new_pmap_height; 573 bg_pmap_height = new_pmap_height;
688 pmap_depth = target->depth;
689 } 574 }
690 /* fill with background color (if result's not completely overlapping it) */ 575 /* fill with background color (if result's not completely overlapping it) */
691 gcv.foreground = target->pix_colors[Color_bg]; 576 gcv.foreground = pix_colors[Color_bg];
692 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 577 gc = XCreateGC (dpy, vt, GCForeground, &gcv);
693 578
694 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0; 579 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
695 int dst_width = result->width, dst_height = result->height; 580 int dst_width = result->width, dst_height = result->height;
696 if (background == NULL) 581 if (background == NULL)
697 { 582 {
698 if (!(h_scale == 0 || v_scale == 0)) 583 if (!(bg_flags & BG_TILE))
699 { 584 {
700 src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width ); 585 src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width );
701 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height); 586 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
702 } 587 }
703 588
704 if (dst_x > 0 || dst_y > 0 589 if (dst_x > 0 || dst_y > 0
705 || dst_x + dst_width < new_pmap_width 590 || dst_x + dst_width < new_pmap_width
706 || dst_y + dst_height < new_pmap_height) 591 || dst_y + dst_height < new_pmap_height)
707 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 592 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
708 } 593 }
709 594
710 /* put result on pixmap */ 595 /* put result on pixmap */
711 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 596 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
712 asimage2drawable (target->asv, pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True); 597 asimage2drawable (asv, bg_pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True);
713 598
714 if (result != background && result != original_asim) 599 if (result != background && result != original_asim)
715 destroy_asimage (&result); 600 destroy_asimage (&result);
716 601
717 XFreeGC (target->dpy, gc); 602 XFreeGC (dpy, gc);
718 TIMING_TEST_PRINT_RESULT (asim);
719 603
720 ret = true; 604 ret = true;
721 } 605 }
722 606
723 if (background) 607 if (background)
727} 611}
728# endif /* HAVE_AFTERIMAGE */ 612# endif /* HAVE_AFTERIMAGE */
729 613
730# ifdef HAVE_PIXBUF 614# ifdef HAVE_PIXBUF
731bool 615bool
732bgPixmap_t::render_image (unsigned long background_flags) 616rxvt_term::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
617 int src_x, int src_y, int dst_x, int dst_y,
618 unsigned int width, unsigned int height)
733{ 619{
734 if (target == NULL) 620 XImage *ximage;
621 char *data, *line;
622 int bytes_per_pixel;
623 int width_r, width_g, width_b;
624 int sh_r, sh_g, sh_b;
625 int rowstride;
626 int channels;
627 unsigned char *row;
628
629 if (visual->c_class != TrueColor)
735 return false; 630 return false;
736 631
632 if (depth == 24 || depth == 32)
633 bytes_per_pixel = 4;
634 else if (depth == 15 || depth == 16)
635 bytes_per_pixel = 2;
636 else
637 return false;
638
639 width_r = ecb_popcount32 (visual->red_mask);
640 width_g = ecb_popcount32 (visual->green_mask);
641 width_b = ecb_popcount32 (visual->blue_mask);
642
643 if (width_r > 8 || width_g > 8 || width_b > 8)
644 return false;
645
646 sh_r = ecb_ctz32 (visual->red_mask);
647 sh_g = ecb_ctz32 (visual->green_mask);
648 sh_b = ecb_ctz32 (visual->blue_mask);
649
650 if (width > INT_MAX / height / bytes_per_pixel)
651 return false;
652
653 data = (char *)malloc (width * height * bytes_per_pixel);
654 if (!data)
655 return false;
656
657 ximage = XCreateImage (dpy, visual, depth, ZPixmap, 0, data,
658 width, height, bytes_per_pixel * 8, 0);
659 if (!ximage)
660 {
661 free (data);
662 return false;
663 }
664
665 ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
666
667 rowstride = gdk_pixbuf_get_rowstride (pixbuf);
668 channels = gdk_pixbuf_get_n_channels (pixbuf);
669 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
670 line = data;
671
672 for (int y = 0; y < height; y++)
673 {
674 for (int x = 0; x < width; x++)
675 {
676 unsigned char *pixel = row + x * channels;
677 uint32_t value;
678
679 value = ((pixel[0] >> (8 - width_r)) << sh_r)
680 | ((pixel[1] >> (8 - width_g)) << sh_g)
681 | ((pixel[2] >> (8 - width_b)) << sh_b);
682
683 if (bytes_per_pixel == 4)
684 ((uint32_t *)line)[x] = value;
685 else
686 ((uint16_t *)line)[x] = value;
687 }
688
689 row += rowstride;
690 line += ximage->bytes_per_line;
691 }
692
693 XPutImage (dpy, pixmap, gc, ximage, 0, 0, dst_x, dst_y, width, height);
694 XDestroyImage (ximage);
695 return true;
696}
697
698bool
699rxvt_term::render_image (unsigned long tr_flags)
700{
737 if (!pixbuf) 701 if (!pixbuf)
738 return false; 702 return false;
739 703
740#if !XFT 704 if (tr_flags
741 if (background_flags) 705 && !(bg_flags & BG_HAS_RENDER))
742 return false; 706 return false;
743#endif
744 707
745 GdkPixbuf *result; 708 GdkPixbuf *result;
746 709
747 int image_width = gdk_pixbuf_get_width (pixbuf); 710 int image_width = gdk_pixbuf_get_width (pixbuf);
748 int image_height = gdk_pixbuf_get_height (pixbuf); 711 int image_height = gdk_pixbuf_get_height (pixbuf);
749 712
750 int target_width = target->szHint.width; 713 int target_width = szHint.width;
751 int target_height = target->szHint.height; 714 int target_height = szHint.height;
752 int new_pmap_width = target_width; 715 int new_pmap_width = target_width;
753 int new_pmap_height = target_height; 716 int new_pmap_height = target_height;
754 717
755 int x = 0; 718 int x = 0;
756 int y = 0; 719 int y = 0;
757 int w = 0; 720 int w = 0;
758 int h = 0; 721 int h = 0;
759 722
760 get_image_geometry (image_width, image_height, w, h, x, y); 723 get_image_geometry (image_width, image_height, w, h, x, y);
761 724
762 if (!(flags & rootAlign) 725 if (!(bg_flags & BG_ROOT_ALIGN)
763 && (x >= target_width 726 && (x >= target_width
764 || y >= target_height 727 || y >= target_height
765 || (x + w <= 0) 728 || x + w <= 0
766 || (y + h <= 0))) 729 || y + h <= 0))
767 return false; 730 return false;
768 731
769 result = pixbuf; 732 result = pixbuf;
770 733
771 if ((w != image_width) 734 if (w != image_width
772 || (h != image_height)) 735 || h != image_height)
773 { 736 {
774 result = gdk_pixbuf_scale_simple (pixbuf, 737 result = gdk_pixbuf_scale_simple (pixbuf,
775 w, h, 738 w, h,
776 GDK_INTERP_BILINEAR); 739 GDK_INTERP_BILINEAR);
777 } 740 }
778 741
742 if (!result)
743 return false;
744
779 bool ret = false; 745 bool ret = false;
780 746
781 if (result)
782 {
783 XGCValues gcv; 747 XGCValues gcv;
784 GC gc; 748 GC gc;
785 Pixmap root_pmap; 749 Pixmap root_pmap;
786 750
787 image_width = gdk_pixbuf_get_width (result); 751 image_width = gdk_pixbuf_get_width (result);
788 image_height = gdk_pixbuf_get_height (result); 752 image_height = gdk_pixbuf_get_height (result);
789 753
790 if (background_flags) 754 if (tr_flags)
791 { 755 {
792 root_pmap = pixmap; 756 root_pmap = bg_pixmap;
793 pixmap = None; 757 bg_pixmap = None;
758 }
759 else
760 {
761 if (bg_flags & BG_TILE)
794 } 762 {
795 else
796 {
797 if (h_scale == 0 || v_scale == 0)
798 {
799 new_pmap_width = min (image_width, target_width); 763 new_pmap_width = min (image_width, target_width);
800 new_pmap_height = min (image_height, target_height); 764 new_pmap_height = min (image_height, target_height);
801 } 765 }
802 } 766 }
803 767
768 if (bg_pixmap == None
769 || bg_pmap_width != new_pmap_width
770 || bg_pmap_height != new_pmap_height)
771 {
804 if (pixmap) 772 if (bg_pixmap)
805 {
806 if (pmap_width != new_pmap_width
807 || pmap_height != new_pmap_height
808 || pmap_depth != target->depth)
809 {
810 XFreePixmap (target->dpy, pixmap); 773 XFreePixmap (dpy, bg_pixmap);
811 pixmap = None;
812 }
813 }
814
815 if (pixmap == None)
816 {
817 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 774 bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth);
818 pmap_width = new_pmap_width; 775 bg_pmap_width = new_pmap_width;
819 pmap_height = new_pmap_height; 776 bg_pmap_height = new_pmap_height;
820 pmap_depth = target->depth; 777 }
778
779 gcv.foreground = pix_colors[Color_bg];
780 gc = XCreateGC (dpy, vt, GCForeground, &gcv);
781
782 if (gc)
783 {
784 if (bg_flags & BG_TILE)
821 } 785 {
822
823 gcv.foreground = target->pix_colors[Color_bg];
824 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
825
826 if (h_scale == 0 || v_scale == 0)
827 {
828 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth); 786 Pixmap tile = XCreatePixmap (dpy, vt, image_width, image_height, depth);
829 gdk_pixbuf_xlib_render_to_drawable (result, tile, gc, 787 pixbuf_to_pixmap (result, tile, gc,
830 0, 0, 788 0, 0,
831 0, 0, 789 0, 0,
832 image_width, image_height, 790 image_width, image_height);
833 XLIB_RGB_DITHER_NONE,
834 0, 0);
835 791
836 gcv.tile = tile; 792 gcv.tile = tile;
837 gcv.fill_style = FillTiled; 793 gcv.fill_style = FillTiled;
838 gcv.ts_x_origin = x; 794 gcv.ts_x_origin = x;
839 gcv.ts_y_origin = y; 795 gcv.ts_y_origin = y;
840 XChangeGC (target->dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 796 XChangeGC (dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
841 797
842 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 798 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
843 XFreePixmap (target->dpy, tile); 799 XFreePixmap (dpy, tile);
844 } 800 }
845 else 801 else
846 { 802 {
847 int src_x, src_y, dst_x, dst_y; 803 int src_x, src_y, dst_x, dst_y;
848 int dst_width, dst_height; 804 int dst_width, dst_height;
851 src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height); 807 src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height);
852 808
853 if (dst_x > 0 || dst_y > 0 809 if (dst_x > 0 || dst_y > 0
854 || dst_x + dst_width < new_pmap_width 810 || dst_x + dst_width < new_pmap_width
855 || dst_y + dst_height < new_pmap_height) 811 || dst_y + dst_height < new_pmap_height)
856 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 812 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
857 813
858 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 814 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
859 gdk_pixbuf_xlib_render_to_drawable (result, pixmap, gc, 815 pixbuf_to_pixmap (result, bg_pixmap, gc,
860 src_x, src_y, 816 src_x, src_y,
861 dst_x, dst_y, 817 dst_x, dst_y,
862 dst_width, dst_height, 818 dst_width, dst_height);
863 XLIB_RGB_DITHER_NONE,
864 0, 0);
865 }
866
867#if XFT
868 if (background_flags)
869 { 819 }
870 Display *dpy = target->dpy;
871 XRenderPictureAttributes pa;
872 820
821#if XRENDER
822 if (tr_flags)
823 {
873 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, target->display->screen)); 824 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
825
874 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa); 826 Picture src = XRenderCreatePicture (dpy, root_pmap, format, 0, 0);
875 827
876 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
877 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa); 828 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, format, 0, 0);
878 829
879 pa.repeat = True; 830 Picture mask = create_xrender_mask (dpy, vt, False, False);
880 Pixmap mask_pmap = XCreatePixmap (dpy, target->vt, 1, 1, 8);
881 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8);
882 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa);
883 XFreePixmap (dpy, mask_pmap);
884 831
885 if (src && dst && mask)
886 {
887 XRenderColor mask_c; 832 XRenderColor mask_c;
888 833
889 mask_c.alpha = 0x8000; 834 mask_c.alpha = 0x8000;
890 mask_c.red = 0; 835 mask_c.red =
891 mask_c.green = 0; 836 mask_c.green =
892 mask_c.blue = 0; 837 mask_c.blue = 0;
893 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1); 838 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
839
894 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height); 840 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);
895 }
896 841
897 XRenderFreePicture (dpy, src); 842 XRenderFreePicture (dpy, src);
898 XRenderFreePicture (dpy, dst); 843 XRenderFreePicture (dpy, dst);
899 XRenderFreePicture (dpy, mask); 844 XRenderFreePicture (dpy, mask);
900
901 XFreePixmap (dpy, root_pmap);
902 } 845 }
903#endif 846#endif
904 847
905 if (result != pixbuf)
906 g_object_unref (result);
907
908 XFreeGC (target->dpy, gc); 848 XFreeGC (dpy, gc);
909 849
910 ret = true; 850 ret = true;
911 } 851 }
912 852
853 if (result != pixbuf)
854 g_object_unref (result);
855
856 if (tr_flags)
857 XFreePixmap (dpy, root_pmap);
858
913 return ret; 859 return ret;
914} 860}
915# endif /* HAVE_PIXBUF */ 861# endif /* HAVE_PIXBUF */
916 862
917bool 863bool
918bgPixmap_t::set_file (const char *file) 864rxvt_term::bg_set_file (const char *file)
919{ 865{
920 assert (file); 866 if (!file || !*file)
867 return false;
921 868
922 if (*file) 869 bool ret = false;
923 {
924 if (const char *p = strchr (file, ';')) 870 const char *p = strchr (file, ';');
925 { 871
872 if (p)
873 {
926 size_t len = p - file; 874 size_t len = p - file;
927 char *f = rxvt_temp_buf<char> (len + 1); 875 char *f = rxvt_temp_buf<char> (len + 1);
928 memcpy (f, file, len); 876 memcpy (f, file, len);
929 f[len] = '\0'; 877 f[len] = '\0';
930 file = f; 878 file = f;
931 } 879 }
932 880
933# ifdef HAVE_AFTERIMAGE 881# ifdef HAVE_AFTERIMAGE
934 if (!target->asimman) 882 if (!asimman)
935 target->asimman = create_generic_imageman (target->rs[Rs_path]); 883 asimman = create_generic_imageman (rs[Rs_path]);
936 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 884 ASImage *image = get_asimage (asimman, file, 0xFFFFFFFF, 100);
937 if (image) 885 if (image)
938 { 886 {
939 if (original_asim) 887 if (original_asim)
940 safe_asimage_destroy (original_asim); 888 safe_asimage_destroy (original_asim);
941 original_asim = image; 889 original_asim = image;
942 have_image = true; 890 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER;
943 return true; 891 ret = true;
944 } 892 }
945# endif 893# endif
946 894
947# ifdef HAVE_PIXBUF 895# ifdef HAVE_PIXBUF
948 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 896 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
949 if (image) 897 if (image)
950 { 898 {
951 if (pixbuf) 899 if (pixbuf)
952 g_object_unref (pixbuf); 900 g_object_unref (pixbuf);
953 pixbuf = image; 901 pixbuf = image;
954 have_image = true; 902 bg_flags |= BG_IS_FROM_FILE;
955 return true; 903 ret = true;
956 } 904 }
957# endif 905# endif
906
907 if (ret)
958 } 908 {
909 if (p)
910 bg_set_geometry (p + 1);
911 else
912 bg_set_default_geometry ();
913 }
959 914
960 return false; 915 return ret;
961} 916}
962 917
963# endif /* BG_IMAGE_FROM_FILE */ 918# endif /* BG_IMAGE_FROM_FILE */
964 919
965# ifdef ENABLE_TRANSPARENCY 920# ifdef ENABLE_TRANSPARENCY
966bool 921bool
967bgPixmap_t::set_transparent () 922rxvt_term::bg_set_transparent ()
968{ 923{
969 if (!(flags & isTransparent)) 924 if (!(bg_flags & BG_IS_TRANSPARENT))
970 { 925 {
971 flags |= isTransparent; 926 bg_flags |= BG_IS_TRANSPARENT;
972 return true; 927 return true;
973 } 928 }
974 929
975 return false; 930 return false;
976} 931}
977 932
978bool 933bool
979bgPixmap_t::set_blur_radius (const char *geom) 934rxvt_term::bg_set_blur (const char *geom)
980{ 935{
981 int changed = 0; 936 bool changed = false;
982 unsigned int hr, vr; 937 unsigned int hr, vr;
983 int junk; 938 int junk;
984 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 939 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
985 940
986 if (!(geom_flags & WidthValue)) 941 if (!(geom_flags & WidthValue))
991 min_it (hr, 128); 946 min_it (hr, 128);
992 min_it (vr, 128); 947 min_it (vr, 128);
993 948
994 if (h_blurRadius != hr) 949 if (h_blurRadius != hr)
995 { 950 {
996 ++changed; 951 changed = true;
997 h_blurRadius = hr; 952 h_blurRadius = hr;
998 } 953 }
999 954
1000 if (v_blurRadius != vr) 955 if (v_blurRadius != vr)
1001 { 956 {
1002 ++changed; 957 changed = true;
1003 v_blurRadius = vr; 958 v_blurRadius = vr;
1004 } 959 }
1005 960
1006 if (v_blurRadius == 0 && h_blurRadius == 0) 961 if (v_blurRadius == 0 && h_blurRadius == 0)
1007 flags &= ~blurNeeded; 962 bg_flags &= ~BG_NEEDS_BLUR;
1008 else 963 else
1009 flags |= blurNeeded; 964 bg_flags |= BG_NEEDS_BLUR;
1010 965
1011#if XFT
1012 XFilters *filters = XRenderQueryFilters (target->dpy, target->display->root);
1013 if (filters)
1014 {
1015 for (int i = 0; i < filters->nfilter; i++)
1016 if (!strcmp (filters->filter[i], FilterConvolution))
1017 flags |= bgPixmap_t::blurServerSide;
1018
1019 XFree (filters);
1020 }
1021#endif
1022
1023 return (changed > 0); 966 return changed;
1024} 967}
1025 968
1026static inline unsigned long 969void
1027compute_tint_shade_flags (rxvt_color *tint, int shade) 970rxvt_term::set_tint_shade_flags ()
1028{ 971{
1029 unsigned long flags = 0; 972 rgba c;
1030 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1031 bool has_shade = shade != 100; 973 bool has_shade = shade != 100;
1032 974
1033 if (tint) 975 bg_flags &= ~BG_TINT_FLAGS;
1034 { 976
1035 tint->get (c); 977 tint.get (c);
1036# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700)
1037 if (!has_shade && IS_COMPONENT_WHOLESOME (c.r)
1038 && IS_COMPONENT_WHOLESOME (c.g)
1039 && IS_COMPONENT_WHOLESOME (c.b))
1040 flags |= bgPixmap_t::tintWholesome;
1041# undef IS_COMPONENT_WHOLESOME
1042 }
1043 978
979 if (!has_shade
980 && (c.r <= 0x00ff || c.r >= 0xff00)
981 && (c.g <= 0x00ff || c.g >= 0xff00)
982 && (c.b <= 0x00ff || c.b >= 0xff00))
983 bg_flags |= BG_TINT_BITAND;
984
1044 if (has_shade) 985 if (has_shade
1045 flags |= bgPixmap_t::tintNeeded; 986 || c.r < 0xff00
1046 else if (tint) 987 || c.g < 0xff00
1047 { 988 || c.b < 0xff00)
1048 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700) 989 bg_flags |= BG_NEEDS_TINT;
1049 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
1050 {
1051 flags |= bgPixmap_t::tintNeeded;
1052 }
1053 }
1054
1055 if (flags & bgPixmap_t::tintNeeded)
1056 {
1057 if (flags & bgPixmap_t::tintWholesome)
1058 flags |= bgPixmap_t::tintServerSide;
1059 else
1060 {
1061#if XFT
1062 flags |= bgPixmap_t::tintServerSide;
1063#endif
1064 }
1065 }
1066
1067 return flags;
1068} 990}
1069 991
1070bool 992bool
1071bgPixmap_t::set_tint (rxvt_color &new_tint) 993rxvt_term::bg_set_tint (rxvt_color &new_tint)
1072{ 994{
1073 if (!(flags & tintSet) || tint != new_tint) 995 if (tint != new_tint)
1074 { 996 {
1075 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
1076 tint = new_tint; 997 tint = new_tint;
1077 flags = (flags & ~tintFlags) | new_flags | tintSet; 998 set_tint_shade_flags ();
1078 return true; 999 return true;
1079 } 1000 }
1080 1001
1081 return false; 1002 return false;
1082} 1003}
1083 1004
1084bool 1005bool
1085bgPixmap_t::unset_tint ()
1086{
1087 unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
1088
1089 if (new_flags != (flags & tintFlags))
1090 {
1091 flags = (flags & ~tintFlags) | new_flags;
1092 return true;
1093 }
1094
1095 return false;
1096}
1097
1098bool
1099bgPixmap_t::set_shade (const char *shade_str) 1006rxvt_term::bg_set_shade (const char *shade_str)
1100{ 1007{
1101 int new_shade = (shade_str) ? atoi (shade_str) : 100; 1008 int new_shade = atoi (shade_str);
1102 1009
1103 clamp_it (new_shade, -100, 200); 1010 clamp_it (new_shade, -100, 200);
1104 if (new_shade < 0) 1011 if (new_shade < 0)
1105 new_shade = 200 - (100 + new_shade); 1012 new_shade = 200 - (100 + new_shade);
1106 1013
1107 if (new_shade != shade) 1014 if (new_shade != shade)
1108 { 1015 {
1109 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);
1110 shade = new_shade; 1016 shade = new_shade;
1111 flags = (flags & (~tintFlags | tintSet)) | new_flags; 1017 set_tint_shade_flags ();
1112 return true; 1018 return true;
1113 } 1019 }
1114 1020
1115 return false; 1021 return false;
1116} 1022}
1117 1023
1118#if XFT 1024#if XRENDER
1119static void 1025static void
1120get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) 1026get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
1121{ 1027{
1122 double sigma = radius / 2.0; 1028 double sigma = radius / 2.0;
1123 double scale = sqrt (2.0 * M_PI) * sigma; 1029 double scale = sqrt (2.0 * M_PI) * sigma;
1137 params[i+2] = XDoubleToFixed (kernel[i] / sum); 1043 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1138} 1044}
1139#endif 1045#endif
1140 1046
1141bool 1047bool
1142bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1048rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1143{ 1049{
1144 bool ret = false; 1050 bool ret = false;
1145#if XFT 1051#if XRENDER
1052 if (!(bg_flags & BG_HAS_RENDER_CONV))
1053 return false;
1054
1146 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 1055 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1147 double *kernel = (double *)malloc (size * sizeof (double)); 1056 double *kernel = (double *)malloc (size * sizeof (double));
1148 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1057 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1149 1058
1150 Display *dpy = target->dpy;
1151 XRenderPictureAttributes pa;
1152 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 1059 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1153 1060
1154 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1061 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, 0);
1155 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1062 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, 0);
1156 1063
1157 if (kernel && params && src && dst) 1064 if (kernel && params)
1158 { 1065 {
1159 if (h_blurRadius) 1066 if (h_blurRadius)
1160 { 1067 {
1161 size = h_blurRadius * 2 + 1; 1068 size = h_blurRadius * 2 + 1;
1162 get_gaussian_kernel (h_blurRadius, size, kernel, params); 1069 get_gaussian_kernel (h_blurRadius, size, kernel, params);
1175 1082
1176 if (v_blurRadius) 1083 if (v_blurRadius)
1177 { 1084 {
1178 size = v_blurRadius * 2 + 1; 1085 size = v_blurRadius * 2 + 1;
1179 get_gaussian_kernel (v_blurRadius, size, kernel, params); 1086 get_gaussian_kernel (v_blurRadius, size, kernel, params);
1180 swap (params[0], params[1]); 1087 ::swap (params[0], params[1]);
1181 1088
1182 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 1089 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1183 XRenderComposite (dpy, 1090 XRenderComposite (dpy,
1184 PictOpSrc, 1091 PictOpSrc,
1185 src, 1092 src,
1201#endif 1108#endif
1202 return ret; 1109 return ret;
1203} 1110}
1204 1111
1205bool 1112bool
1206bgPixmap_t::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1113rxvt_term::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1207{ 1114{
1208 Display *dpy = target->dpy;
1209 bool ret = false; 1115 bool ret = false;
1210 1116
1211 if (flags & tintWholesome) 1117 if (bg_flags & BG_TINT_BITAND)
1212 { 1118 {
1213 XGCValues gcv; 1119 XGCValues gcv;
1214 GC gc; 1120 GC gc;
1215 1121
1216 /* In this case we can tint image server-side getting significant 1122 /* In this case we can tint image server-side getting significant
1225 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height); 1131 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1226 ret = true; 1132 ret = true;
1227 XFreeGC (dpy, gc); 1133 XFreeGC (dpy, gc);
1228 } 1134 }
1229 } 1135 }
1230 else 1136# if XRENDER
1137 else if (bg_flags & BG_HAS_RENDER)
1231 { 1138 {
1232# if XFT 1139 rgba c;
1233 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1234 1140
1235 if (flags & tintSet)
1236 tint.get (c); 1141 tint.get (c);
1237 1142
1238 if (shade <= 100) 1143 if (shade <= 100)
1239 { 1144 {
1240 c.r = (c.r * shade) / 100; 1145 c.r = c.r * shade / 100;
1241 c.g = (c.g * shade) / 100; 1146 c.g = c.g * shade / 100;
1242 c.b = (c.b * shade) / 100; 1147 c.b = c.b * shade / 100;
1243 } 1148 }
1244 else 1149 else
1245 { 1150 {
1246 c.r = ((0xffff - c.r) * (200 - shade)) / 100; 1151 c.r = c.r * (200 - shade) / 100;
1247 c.g = ((0xffff - c.g) * (200 - shade)) / 100; 1152 c.g = c.g * (200 - shade) / 100;
1248 c.b = ((0xffff - c.b) * (200 - shade)) / 100; 1153 c.b = c.b * (200 - shade) / 100;
1249 } 1154 }
1250 1155
1251 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1252 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 1156 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1253 XRenderPictureAttributes pa;
1254 1157
1255 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1158 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, 0);
1256 1159
1257 pa.repeat = True; 1160 Picture overlay_pic = create_xrender_mask (dpy, pixmap, True, False);
1258 1161
1259 Pixmap overlay_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32); 1162 Picture mask_pic = create_xrender_mask (dpy, pixmap, True, True);
1260 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1261 XFreePixmap (dpy, overlay_pmap);
1262 1163
1263 pa.component_alpha = True;
1264 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1265 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1266 XFreePixmap (dpy, mask_pmap);
1267
1268 if (mask_pic && overlay_pic && back_pic)
1269 {
1270 XRenderColor mask_c; 1164 XRenderColor mask_c;
1271 1165
1272 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
1273 mask_c.alpha = 0xffff; 1166 mask_c.alpha = 0xffff;
1167 mask_c.red =
1168 mask_c.green =
1169 mask_c.blue = 0;
1170 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1171
1172 mask_c.alpha = 0;
1173 mask_c.red = 0xffff - c.r;
1174 mask_c.green = 0xffff - c.g;
1175 mask_c.blue = 0xffff - c.b;
1176 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1177
1178 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1179
1180 if (shade > 100)
1181 {
1182 mask_c.alpha = 0;
1183 mask_c.red =
1184 mask_c.green =
1185 mask_c.blue = 0xffff * (shade - 100) / 100;
1274 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1186 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1275 1187
1276 mask_c.alpha = 0;
1277 mask_c.red = 0xffff - c.r;
1278 mask_c.green = 0xffff - c.g;
1279 mask_c.blue = 0xffff - c.b;
1280 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1281 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height); 1188 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1189 }
1190
1282 ret = true; 1191 ret = true;
1283 }
1284 1192
1285 XRenderFreePicture (dpy, mask_pic); 1193 XRenderFreePicture (dpy, mask_pic);
1286 XRenderFreePicture (dpy, overlay_pic); 1194 XRenderFreePicture (dpy, overlay_pic);
1287 XRenderFreePicture (dpy, back_pic); 1195 XRenderFreePicture (dpy, back_pic);
1288# if DO_TIMING_TEST 1196 }
1289 XSync (dpy, False);
1290# endif
1291# endif 1197# endif
1292 }
1293 1198
1294 return ret; 1199 return ret;
1295} 1200}
1296 1201
1297/* make_transparency_pixmap() 1202/*
1298 * Builds a pixmap sized the same as terminal window, with depth same as the root window 1203 * Builds a pixmap of the same size as the terminal window that contains
1299 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by 1204 * the tiled portion of the root pixmap that is supposed to be covered by
1300 * our window. 1205 * our window.
1301 */ 1206 */
1302unsigned long 1207unsigned long
1303bgPixmap_t::make_transparency_pixmap () 1208rxvt_term::make_transparency_pixmap ()
1304{ 1209{
1305 unsigned long result = 0; 1210 unsigned long result = 0;
1306
1307 if (target == NULL)
1308 return 0;
1309 1211
1310 /* root dimensions may change from call to call - but Display structure should 1212 /* root dimensions may change from call to call - but Display structure should
1311 * be always up-to-date, so let's use it : 1213 * be always up-to-date, so let's use it :
1312 */ 1214 */
1313 Window root = target->display->root;
1314 int screen = target->display->screen; 1215 int screen = display->screen;
1315 Display *dpy = target->dpy; 1216 int root_depth = DefaultDepth (dpy, screen);
1316 int root_width = DisplayWidth (dpy, screen); 1217 int root_width = DisplayWidth (dpy, screen);
1317 int root_height = DisplayHeight (dpy, screen); 1218 int root_height = DisplayHeight (dpy, screen);
1318 unsigned int root_pmap_width, root_pmap_height; 1219 unsigned int root_pmap_width, root_pmap_height;
1319 int window_width = target->szHint.width; 1220 int window_width = szHint.width;
1320 int window_height = target->szHint.height; 1221 int window_height = szHint.height;
1321 int sx, sy; 1222 int sx, sy;
1322 XGCValues gcv; 1223 XGCValues gcv;
1323 GC gc; 1224 GC gc;
1324 1225
1325 TIMING_TEST_START (tp); 1226 sx = target_x;
1326 target->get_window_origin (sx, sy); 1227 sy = target_y;
1327 1228
1328 /* check if we are outside of the visible part of the virtual screen : */ 1229 /* check if we are outside of the visible part of the virtual screen : */
1329 if (sx + window_width <= 0 || sy + window_height <= 0 1230 if (sx + window_width <= 0 || sy + window_height <= 0
1330 || sx >= root_width || sy >= root_height) 1231 || sx >= root_width || sy >= root_height)
1331 return 0; 1232 return 0;
1332 1233
1234 // validate root pixmap and get its size
1333 if (root_pixmap != None) 1235 if (root_pixmap != None)
1334 { 1236 {
1335 /* we want to validate the pixmap and get its size at the same time : */ 1237 Window wdummy;
1336 int junk; 1238 int idummy;
1337 unsigned int ujunk; 1239 unsigned int udummy;
1338 /* root pixmap may be bad - allow a error */ 1240
1339 target->allowedxerror = -1; 1241 allowedxerror = -1;
1340 1242
1341 if (!XGetGeometry (dpy, root_pixmap, &root, &junk, &junk, &root_pmap_width, &root_pmap_height, &ujunk, &ujunk)) 1243 if (!XGetGeometry (dpy, root_pixmap, &wdummy, &idummy, &idummy, &root_pmap_width, &root_pmap_height, &udummy, &udummy))
1342 root_pixmap = None; 1244 root_pixmap = None;
1343 1245
1344 target->allowedxerror = 0; 1246 allowedxerror = 0;
1247 }
1248
1249 Pixmap recoded_root_pmap = root_pixmap;
1250
1251 if (root_pixmap != None && root_depth != depth)
1345 } 1252 {
1253#if XRENDER
1254 if (bg_flags & BG_HAS_RENDER)
1255 {
1256 recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth);
1346 1257
1258 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1259 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, 0);
1260
1261 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
1262 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, 0);
1263
1264 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1265
1266 XRenderFreePicture (dpy, src);
1267 XRenderFreePicture (dpy, dst);
1268 }
1269 else
1270#endif
1271 recoded_root_pmap = None;
1272 }
1273
1347 if (root_pixmap == None) 1274 if (recoded_root_pmap == None)
1348 return 0; 1275 return 0;
1349 1276
1277 if (bg_pixmap == None
1278 || bg_pmap_width != window_width
1279 || bg_pmap_height != window_height)
1280 {
1281 if (bg_pixmap)
1282 XFreePixmap (dpy, bg_pixmap);
1350 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth); 1283 bg_pixmap = XCreatePixmap (dpy, vt, window_width, window_height, depth);
1351 1284 bg_pmap_width = window_width;
1352 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1285 bg_pmap_height = window_height;
1353 return 0; 1286 }
1354 1287
1355 /* straightforward pixmap copy */ 1288 /* straightforward pixmap copy */
1289 while (sx < 0) sx += root_pmap_width;
1290 while (sy < 0) sy += root_pmap_height;
1291
1356 gcv.tile = root_pixmap; 1292 gcv.tile = recoded_root_pmap;
1357 gcv.fill_style = FillTiled; 1293 gcv.fill_style = FillTiled;
1358
1359 while (sx < 0) sx += (int)root_width;
1360 while (sy < 0) sy += (int)root_height;
1361
1362 gcv.ts_x_origin = -sx; 1294 gcv.ts_x_origin = -sx;
1363 gcv.ts_y_origin = -sy; 1295 gcv.ts_y_origin = -sy;
1364 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1296 gc = XCreateGC (dpy, vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1365 1297
1366 if (gc) 1298 if (gc)
1367 { 1299 {
1368 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1300 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height);
1369 result |= transpPmapTiled; 1301 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS);
1302
1303 if (!(bg_flags & BG_CLIENT_RENDER))
1304 {
1305 if (bg_flags & BG_NEEDS_BLUR)
1306 {
1307 if (blur_pixmap (bg_pixmap, visual, window_width, window_height))
1308 result &= ~BG_NEEDS_BLUR;
1309 }
1310 if (bg_flags & BG_NEEDS_TINT)
1311 {
1312 if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
1313 result &= ~BG_NEEDS_TINT;
1314 }
1315# ifndef HAVE_AFTERIMAGE
1316 if (result & BG_NEEDS_TINT)
1317 {
1318 XImage *ximage = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1319 if (ximage)
1320 {
1321 /* our own client-side tinting */
1322 tint_ximage (DefaultVisual (dpy, display->screen), ximage);
1323
1324 XPutImage (dpy, bg_pixmap, gc, ximage, 0, 0, 0, 0, ximage->width, ximage->height);
1325 XDestroyImage (ximage);
1326 }
1327 }
1328# endif
1329 } /* server side rendering completed */
1330
1370 XFreeGC (dpy, gc); 1331 XFreeGC (dpy, gc);
1371 } 1332 }
1372 TIMING_TEST_PRINT_RESULT (tp);
1373 1333
1374 if (tiled_root_pmap != None) 1334 if (recoded_root_pmap != root_pixmap)
1375 { 1335 XFreePixmap (dpy, recoded_root_pmap);
1376 if (!need_client_side_rendering ())
1377 {
1378 if (flags & (blurNeeded | blurServerSide))
1379 {
1380 if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height))
1381 result |= transpPmapBlurred;
1382 }
1383 if (flags & (tintNeeded | tintServerSide))
1384 {
1385 if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, screen), window_width, window_height))
1386 result |= transpPmapTinted;
1387 }
1388 } /* server side rendering completed */
1389
1390 if (pixmap)
1391 XFreePixmap (dpy, pixmap);
1392
1393 pixmap = tiled_root_pmap;
1394 pmap_width = window_width;
1395 pmap_height = window_height;
1396 pmap_depth = root_depth;
1397 }
1398
1399 TIMING_TEST_PRINT_RESULT (tp);
1400 1336
1401 return result; 1337 return result;
1402} 1338}
1403 1339
1340void
1341rxvt_term::bg_set_root_pixmap ()
1342{
1343 Pixmap new_root_pixmap = get_pixmap_property (xa[XA_XROOTPMAP_ID]);
1344 if (new_root_pixmap == None)
1345 new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]);
1346
1347 root_pixmap = new_root_pixmap;
1348}
1349# endif /* ENABLE_TRANSPARENCY */
1350
1404bool 1351bool
1405bgPixmap_t::set_root_pixmap () 1352rxvt_term::bg_render ()
1406{ 1353{
1407 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1354 unsigned long tr_flags = 0;
1408 if (new_root_pixmap == None)
1409 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1410 1355
1411 if (new_root_pixmap != root_pixmap) 1356 bg_invalidate ();
1412 { 1357# ifdef ENABLE_TRANSPARENCY
1413 root_pixmap = new_root_pixmap; 1358 if (bg_flags & BG_IS_TRANSPARENT)
1414 return true;
1415 } 1359 {
1416 1360 /* we need to re-generate transparency pixmap in that case ! */
1361 tr_flags = make_transparency_pixmap ();
1362 if (tr_flags == 0)
1417 return false; 1363 return false;
1418} 1364 bg_flags |= BG_IS_VALID;
1419# endif /* ENABLE_TRANSPARENCY */ 1365 }
1420
1421# ifndef HAVE_AFTERIMAGE
1422static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm);
1423# endif 1366# endif
1424 1367
1425bool 1368# ifdef BG_IMAGE_FROM_FILE
1426bgPixmap_t::render () 1369 if ((bg_flags & BG_IS_FROM_FILE)
1427{ 1370 || (tr_flags & BG_EFFECTS_FLAGS))
1428 unsigned long background_flags = 0;
1429
1430 if (target == NULL)
1431 return false;
1432
1433 TIMING_TEST_START (tp);
1434
1435 invalidate ();
1436# ifdef ENABLE_TRANSPARENCY
1437 if (flags & isTransparent)
1438 { 1371 {
1439 /* we need to re-generate transparency pixmap in that case ! */ 1372 if (render_image (tr_flags))
1440 background_flags = make_transparency_pixmap (); 1373 bg_flags |= BG_IS_VALID;
1441 if (background_flags == 0)
1442 return false;
1443 else if ((background_flags & transpTransformations) == (flags & transpTransformations)
1444 && pmap_depth == target->depth)
1445 flags = flags & ~isInvalid;
1446 } 1374 }
1447# endif 1375# endif
1448 1376
1449# ifdef BG_IMAGE_FROM_FILE 1377 if (!(bg_flags & BG_IS_VALID))
1450 if (have_image
1451 || (background_flags & transpTransformations) != (flags & transpTransformations))
1452 {
1453 if (render_image (background_flags))
1454 flags = flags & ~isInvalid;
1455 } 1378 {
1456# endif
1457
1458 XImage *result = NULL;
1459
1460 if (background_flags && (flags & isInvalid))
1461 {
1462 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1463 }
1464
1465 if (result)
1466 {
1467# if !defined(HAVE_AFTERIMAGE) && !XFT
1468 /* our own client-side tinting */
1469 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1470 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1471 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1472 {
1473 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1474 if (flags & tintSet)
1475 tint.get (c);
1476 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c.r, c.g, c.b);
1477 }
1478# endif
1479
1480 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1481
1482 if (gc)
1483 {
1484 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1485 {
1486 XFreePixmap (target->dpy, pixmap);
1487 pixmap = None;
1488 }
1489
1490 if (pixmap == None)
1491 {
1492 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth);
1493 pmap_width = result->width;
1494 pmap_height = result->height;
1495 pmap_depth = target->depth;
1496 }
1497
1498 if (pmap_depth != result->depth)
1499 {
1500 /* Bad Match error will ensue ! stupid X !!!! */
1501 if (result->depth == 24 && pmap_depth == 32)
1502 result->depth = 32;
1503 else if (result->depth == 32 && pmap_depth == 24)
1504 result->depth = 24;
1505 else
1506 {
1507 /* TODO: implement image recoding */
1508 }
1509 }
1510
1511 if (pmap_depth == result->depth)
1512 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1513
1514 XFreeGC (target->dpy, gc);
1515 flags = flags & ~isInvalid;
1516 }
1517
1518 XDestroyImage (result);
1519 }
1520
1521 if (flags & isInvalid)
1522 {
1523 if (pixmap != None) 1379 if (bg_pixmap != None)
1524 { 1380 {
1525 XFreePixmap (target->dpy, pixmap); 1381 XFreePixmap (dpy, bg_pixmap);
1526 pixmap = None; 1382 bg_pixmap = None;
1527 } 1383 }
1528 } 1384 }
1529 1385
1530 apply (); 1386 scr_recolour (false);
1387 bg_flags |= BG_NEEDS_REFRESH;
1531 1388
1532 XSync (target->dpy, False);
1533 valid_since = ev::now (); 1389 bg_valid_since = ev::now ();
1534
1535 TIMING_TEST_PRINT_RESULT (tp);
1536 1390
1537 return true; 1391 return true;
1538} 1392}
1539 1393
1540bool
1541bgPixmap_t::set_target (rxvt_term *new_target)
1542{
1543 if (new_target)
1544 if (target != new_target)
1545 {
1546 target = new_target;
1547# ifdef ENABLE_TRANSPARENCY
1548 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen));
1549# endif
1550 return true;
1551 }
1552
1553 return false;
1554}
1555
1556void 1394void
1557bgPixmap_t::apply () 1395rxvt_term::bg_init ()
1558{ 1396{
1559 if (target)
1560 {
1561 flags &= ~isVtOrigin;
1562
1563 if (pixmap != None)
1564 {
1565 /* set target's background to pixmap */
1566# ifdef ENABLE_TRANSPARENCY 1397#ifdef ENABLE_TRANSPARENCY
1567 if (flags & isTransparent) 1398 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1568 { 1399 tint.set (this, c);
1569 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1400 shade = 100;
1570 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1571
1572 if (target->scrollBar.win)
1573 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1574 }
1575 else
1576# endif 1401#endif
1577 {
1578 flags |= isVtOrigin;
1579 /* force old pixmap dereference in case it was transparent before :*/
1580 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1581 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1582 /* do we also need to set scrollbar's background here ? */
1583 1402
1584 if (target->scrollBar.win) 1403 bg_flags &= ~(BG_HAS_RENDER | BG_HAS_RENDER_CONV);
1585 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1404#if XRENDER
1586 } 1405 int major, minor;
1587 } 1406 if (XRenderQueryVersion (dpy, &major, &minor))
1588 else 1407 bg_flags |= BG_HAS_RENDER;
1589 { 1408 XFilters *filters = XRenderQueryFilters (dpy, vt);
1590 /* set target background to a pixel */ 1409 if (filters)
1591 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1592 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1593 /* do we also need to set scrollbar's background here ? */
1594 if (target->scrollBar.win)
1595 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1596 }
1597
1598 /* don't want Expose on the parent or vt. It is better to use
1599 scr_touch or we get a great deal of flicker otherwise: */
1600 XClearWindow (target->dpy, target->parent[0]);
1601
1602 if (target->scrollBar.state && target->scrollBar.win)
1603 {
1604 target->scrollBar.state = STATE_IDLE;
1605 target->scrollBar.show (0);
1606 }
1607
1608 target->want_refresh = 1;
1609 flags |= hasChanged;
1610 } 1410 {
1411 for (int i = 0; i < filters->nfilter; i++)
1412 if (!strcmp (filters->filter[i], FilterConvolution))
1413 bg_flags |= BG_HAS_RENDER_CONV;
1414
1415 XFree (filters);
1416 }
1417#endif
1611} 1418}
1612 1419
1613#endif /* HAVE_BG_PIXMAP */ 1420#endif /* HAVE_BG_PIXMAP */
1614 1421
1615#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT 1422#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1616/* taken from aterm-0.4.2 */ 1423/* based on code from aterm-0.4.2 */
1617 1424
1618static void 1425static inline void
1619ShadeXImage(Visual *visual, XImage *srcImage, int shade, int rm, int gm, int bm) 1426fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high)
1427{
1428 for (int i = 0; i <= mask >> sh; i++)
1429 {
1430 uint32_t tmp;
1431 tmp = i * high;
1432 tmp += (mask >> sh) * low;
1433 lookup[i] = (tmp / 0xffff) << sh;
1434 }
1435}
1436
1437void
1438rxvt_term::tint_ximage (Visual *visual, XImage *ximage)
1620{ 1439{
1621 int sh_r, sh_g, sh_b; 1440 int sh_r, sh_g, sh_b;
1622 uint32_t mask_r, mask_g, mask_b; 1441 uint32_t mask_r, mask_g, mask_b;
1623 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1442 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1624 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1443 unsigned short low;
1625 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1626 int i;
1627 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst; 1444 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
1628 1445
1629 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return; 1446 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1630 1447
1631 /* for convenience */ 1448 /* for convenience */
1632 mask_r = visual->red_mask; 1449 mask_r = visual->red_mask;
1633 mask_g = visual->green_mask; 1450 mask_g = visual->green_mask;
1634 mask_b = visual->blue_mask; 1451 mask_b = visual->blue_mask;
1635 1452
1636 /* boring lookup table pre-initialization */ 1453 /* boring lookup table pre-initialization */
1637 switch (srcImage->depth) 1454 switch (ximage->depth)
1638 { 1455 {
1639 case 15: 1456 case 15:
1640 if ((mask_r != 0x7c00) || 1457 if ((mask_r != 0x7c00) ||
1641 (mask_g != 0x03e0) || 1458 (mask_g != 0x03e0) ||
1642 (mask_b != 0x001f)) 1459 (mask_b != 0x001f))
1690 break; 1507 break;
1691 default: 1508 default:
1692 return; /* we do not support this color depth */ 1509 return; /* we do not support this color depth */
1693 } 1510 }
1694 1511
1512 rgba c;
1513
1514 tint.get (c);
1515
1695 /* prepare limits for color transformation (each channel is handled separately) */ 1516 /* prepare limits for color transformation (each channel is handled separately) */
1696 if (shade > 100) 1517 if (shade > 100)
1697 { 1518 {
1698 shade = 200 - shade; 1519 c.r = c.r * (200 - shade) / 100;
1520 c.g = c.g * (200 - shade) / 100;
1521 c.b = c.b * (200 - shade) / 100;
1699 1522
1700 lower_lim_r = 65535-rm; 1523 low = 0xffff * (shade - 100) / 100;
1701 lower_lim_g = 65535-gm;
1702 lower_lim_b = 65535-bm;
1703
1704 lower_lim_r = 65535-(unsigned int)(((uint32_t)lower_lim_r)*((uint32_t)shade)/100);
1705 lower_lim_g = 65535-(unsigned int)(((uint32_t)lower_lim_g)*((uint32_t)shade)/100);
1706 lower_lim_b = 65535-(unsigned int)(((uint32_t)lower_lim_b)*((uint32_t)shade)/100);
1707
1708 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1709 } 1524 }
1710 else 1525 else
1711 { 1526 {
1527 c.r = c.r * shade / 100;
1528 c.g = c.g * shade / 100;
1529 c.b = c.b * shade / 100;
1712 1530
1713 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1531 low = 0;
1714
1715 upper_lim_r = (unsigned int)((((uint32_t)rm)*((uint32_t)shade))/100);
1716 upper_lim_g = (unsigned int)((((uint32_t)gm)*((uint32_t)shade))/100);
1717 upper_lim_b = (unsigned int)((((uint32_t)bm)*((uint32_t)shade))/100);
1718 } 1532 }
1719 1533
1720 /* fill our lookup tables */ 1534 /* fill our lookup tables */
1721 for (i = 0; i <= mask_r>>sh_r; i++) 1535 fill_lut (lookup_r, mask_r, sh_r, low, c.r);
1722 { 1536 fill_lut (lookup_g, mask_g, sh_g, low, c.g);
1723 uint32_t tmp; 1537 fill_lut (lookup_b, mask_b, sh_b, low, c.b);
1724 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_r-lower_lim_r));
1725 tmp += ((uint32_t)(mask_r>>sh_r))*((uint32_t)lower_lim_r);
1726 lookup_r[i] = (tmp/65535)<<sh_r;
1727 }
1728 for (i = 0; i <= mask_g>>sh_g; i++)
1729 {
1730 uint32_t tmp;
1731 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_g-lower_lim_g));
1732 tmp += ((uint32_t)(mask_g>>sh_g))*((uint32_t)lower_lim_g);
1733 lookup_g[i] = (tmp/65535)<<sh_g;
1734 }
1735 for (i = 0; i <= mask_b>>sh_b; i++)
1736 {
1737 uint32_t tmp;
1738 tmp = ((uint32_t)i)*((uint32_t)(upper_lim_b-lower_lim_b));
1739 tmp += ((uint32_t)(mask_b>>sh_b))*((uint32_t)lower_lim_b);
1740 lookup_b[i] = (tmp/65535)<<sh_b;
1741 }
1742 1538
1743 /* apply table to input image (replacing colors by newly calculated ones) */ 1539 /* apply table to input image (replacing colors by newly calculated ones) */
1744 if (srcImage->bits_per_pixel == 32 1540 if (ximage->bits_per_pixel == 32
1745 && (srcImage->depth == 24 || srcImage->depth == 32) 1541 && (ximage->depth == 24 || ximage->depth == 32)
1746 && srcImage->byte_order == host_byte_order) 1542 && ximage->byte_order == host_byte_order)
1747 { 1543 {
1748 uint32_t *p1, *pf, *p, *pl; 1544 uint32_t *p1, *pf, *p, *pl;
1749 p1 = (uint32_t *) srcImage->data; 1545 p1 = (uint32_t *) ximage->data;
1750 pf = (uint32_t *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1546 pf = (uint32_t *) (ximage->data + ximage->height * ximage->bytes_per_line);
1751 1547
1752 while (p1 < pf) 1548 while (p1 < pf)
1753 { 1549 {
1754 p = p1; 1550 p = p1;
1755 pl = p1 + srcImage->width; 1551 pl = p1 + ximage->width;
1756 for (; p < pl; p++) 1552 for (; p < pl; p++)
1757 { 1553 {
1758 *p = lookup_r[(*p & 0xff0000) >> 16] | 1554 *p = lookup_r[(*p & 0xff0000) >> 16] |
1759 lookup_g[(*p & 0x00ff00) >> 8] | 1555 lookup_g[(*p & 0x00ff00) >> 8] |
1760 lookup_b[(*p & 0x0000ff)] | 1556 lookup_b[(*p & 0x0000ff)] |
1761 (*p & 0xff000000); 1557 (*p & 0xff000000);
1762 } 1558 }
1763 p1 = (uint32_t *) ((char *) p1 + srcImage->bytes_per_line); 1559 p1 = (uint32_t *) ((char *) p1 + ximage->bytes_per_line);
1764 } 1560 }
1765 } 1561 }
1766 else 1562 else
1767 { 1563 {
1768 for (int y = 0; y < srcImage->height; y++) 1564 for (int y = 0; y < ximage->height; y++)
1769 for (int x = 0; x < srcImage->width; x++) 1565 for (int x = 0; x < ximage->width; x++)
1770 { 1566 {
1771 unsigned long pixel = XGetPixel (srcImage, x, y); 1567 unsigned long pixel = XGetPixel (ximage, x, y);
1772 pixel = lookup_r[(pixel & mask_r) >> sh_r] | 1568 pixel = lookup_r[(pixel & mask_r) >> sh_r] |
1773 lookup_g[(pixel & mask_g) >> sh_g] | 1569 lookup_g[(pixel & mask_g) >> sh_g] |
1774 lookup_b[(pixel & mask_b) >> sh_b]; 1570 lookup_b[(pixel & mask_b) >> sh_b];
1775 XPutPixel (srcImage, x, y, pixel); 1571 XPutPixel (ximage, x, y, pixel);
1776 } 1572 }
1777 } 1573 }
1778 1574
1779 free (lookup); 1575 free (lookup);
1780} 1576}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines