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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines