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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines