ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/xpm.C
(Generate patch)

Comparing rxvt-unicode/src/xpm.C (file contents):
Revision 1.24 by root, Sun Dec 18 00:59:42 2005 UTC vs.
Revision 1.72 by sasha, Thu Aug 23 20:53:36 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: xpm.C 2 * File: 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) 1997 Carsten Haitzler <raster@zip.com.au> 6 * Copyright (c) 1997 Carsten Haitzler <raster@zip.com.au>
7 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 7 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
8 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 8 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
9 * Copyright (c) 2005-2006 Marc Lehmann <pcg@goof.com>
9 * 10 *
10 * This program is free software; you can redistribute it and/or modify 11 * 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 12 * it under the terms of the GNU General Public License as published by
12 * the Free Software Foundation; either version 2 of the License, or 13 * the Free Software Foundation; either version 2 of the License, or
13 * (at your option) any later version. 14 * (at your option) any later version.
… …
23 *---------------------------------------------------------------------*/ 24 *---------------------------------------------------------------------*/
24 25
25#include "../config.h" /* NECESSARY */ 26#include "../config.h" /* NECESSARY */
26#include "rxvt.h" /* NECESSARY */ 27#include "rxvt.h" /* NECESSARY */
27 28
28#ifdef XPM_BACKGROUND 29#define DO_TIMING_TEST 0
29 30
30static void rxvt_pixmap_incr (unsigned int *wh, unsigned int *xy, float *incr, float *p, unsigned int widthheight, unsigned int xpmwidthheight); 31#if DO_TIMING_TEST
32#define TIMING_TEST_START(id) \
33 struct timeval timing_test_##id##_stv;\
34 gettimeofday (&timing_test_##id##_stv, NULL);
35
36#define TIMING_TEST_PRINT_RESULT(id) \
37 do{ struct timeval tv;gettimeofday (&tv, NULL); tv.tv_sec -= (timing_test_##id##_stv).tv_sec;\
38 fprintf (stderr, "%s: %s: %d: elapsed %ld usec\n", #id, __FILE__, __LINE__,\
39 tv.tv_sec * 1000000 + tv.tv_usec - (timing_test_##id##_stv).tv_usec);}while (0)
40
41#else
42#define TIMING_TEST_START(id) do{}while (0)
43#define TIMING_TEST_PRINT_RESULT(id) do{}while (0)
44#endif
31 45
32/* 46/*
33 * These GEOM strings indicate absolute size/position: 47 * Pixmap geometry string interpretation :
34 * @ `WxH+X+Y' 48 * Each geometry string contains zero or one scale/position
35 * @ `WxH+X' -> Y = X 49 * adjustment and may optionally be followed by a colon and one or more
36 * @ `WxH' -> Y = X = 50 50 * colon-delimited pixmap operations.
37 * @ `W+X+Y' -> H = W 51 * The following table shows the valid geometry strings and their
38 * @ `W+X' -> H = W, Y = X 52 * affects on the background image :
39 * @ `W' -> H = W, X = Y = 50
40 * @ `0xH' -> H *= H/100, X = Y = 50 (W unchanged)
41 * @ `Wx0' -> W *= W/100, X = Y = 50 (H unchanged)
42 * @ `=+X+Y' -> (H, W unchanged)
43 * @ `=+X' -> Y = X (H, W unchanged)
44 * 53 *
45 * These GEOM strings adjust position relative to current position: 54 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%.
46 * @ `+X+Y' 55 * W and H are percentages of the terminal window size.
47 * @ `+X' -> Y = X 56 * X and Y are also percentages; e.g., +50+50 centers
57 * the image in the window.
58 * WxH+X Assumes Y == X
59 * WxH Assumes Y == X == 50 (centers the image)
60 * W+X+Y Assumes H == W
61 * W+X Assumes H == W and Y == X
62 * W Assumes H == W and Y == X == 50
48 * 63 *
49 * And this GEOM string is for querying current scale/position: 64 * Adjusting position only :
50 * @ `?' 65 * =+X+Y Set position to X% by Y% (absolute).
66 * =+X Set position to X% by X%.
67 * +X+Y Adjust position horizontally X% and vertically Y%
68 * from current position (relative).
69 * +X Adjust position horizontally X% and vertically X%
70 * from current position.
71 *
72 * Adjusting scale only :
73 * Wx0 Multiply horizontal scaling factor by W%
74 * 0xH Multiply vertical scaling factor by H%
75 * 0x0 No scaling (show image at normal size).
76 *
77 * Pixmap Operations : (should be prepended by a colon)
78 * tile Tile image. Scaling/position modifiers above will affect
79 * the tile size and origin.
80 * propscale When scaling, scale proportionally. That is, maintain the
81 * proper aspect ratio for the image. Any portion of the
82 * background not covered by the image is filled with the
83 * current background color.
84 * hscale Scale horizontally, tile vertically ?
85 * vscale Tile horizontally, scale vertically ?
86 * scale Scale both up and down
87 * auto Same as 100x100+50+50
88 */
89
90#ifdef HAVE_BG_PIXMAP
91bool
92bgPixmap_t::window_size_sensitive ()
93{
94# ifdef XPM_BACKGROUND
95# ifdef HAVE_AFTERIMAGE
96 if (original_asim != NULL)
97# endif
98 {
99 if (h_scale != 0 || v_scale != 0)
100 return true;
101 }
102# endif
103# ifdef ENABLE_TRANSPARENCY
104 if (flags & isTransparent)
105 return true;
106# endif
107 return false;
108}
109
110bool bgPixmap_t::need_client_side_rendering ()
111{
112# ifdef HAVE_AFTERIMAGE
113 if (original_asim != NULL)
114 return true;
115# endif
116# ifdef ENABLE_TRANSPARENCY
117 if (flags & isTransparent)
118 {
119 if ((flags & blurNeeded)
120 || ((flags & tintNeeded) && !(flags & tintServerSide)))
121 return true;
122 }
123# endif
124 return false;
125}
126
127# ifdef XPM_BACKGROUND
128static inline bool
129check_set_scale_value (int geom_flags, int flag, unsigned int &scale, unsigned int new_value)
130{
131 if (geom_flags & flag)
132 {
133 if (new_value > 1000)
134 new_value = 1000;
135 if (new_value != scale)
136 {
137 scale = new_value;
138 return true;
139 }
140 }
141 return false;
142}
143
144static inline bool
145check_set_align_value (int geom_flags, int flag, int &align, int new_value)
146{
147 if (geom_flags & flag)
148 {
149 if (new_value < -100)
150 new_value = -100;
151 else if (new_value > 200)
152 new_value = 200;
153 if (new_value != align)
154 {
155 align = new_value;
156 return true;
157 }
158 }
159 return false;
160}
161
162static inline int
163make_align_position (int align, int window_size, int image_size)
164{
165 int diff = window_size - image_size;
166 int smaller = MIN (image_size,window_size);
167
168 if (align >= 0 && align <= 50)
169 return diff * align / 100;
170 else if (align > 50 && align <= 100)
171 return window_size - image_size - diff * (100 - align) / 100;
172 else if (align > 100 && align <= 200 )
173 return ((align - 100) * smaller / 100) + window_size - smaller;
174 else if (align > -100 && align < 0)
175 return ((align + 100) * smaller / 100) - image_size;
176 return 0;
177}
178
179static inline int
180make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
181{
182 int src_pos = 0;
183 dst_pos = 0;
184 dst_size = size;
185 if (pos < 0 && size > target_size)
186 {
187 src_pos = -pos;
188 dst_size += pos;
189 }
190 else if (pos > 0)
191 dst_pos = pos;
192
193 if (dst_pos + dst_size > target_size)
194 dst_size = target_size - dst_pos;
195 return src_pos;
196}
197
198bool
199bgPixmap_t::set_geometry (const char *geom)
200{
201 int geom_flags = 0, changed = 0;
202 int x = 0, y = 0;
203 unsigned int w = 0, h = 0;
204 unsigned int n;
205 unsigned long new_flags = (flags & (~geometryFlags));
206 char *p;
207# define MAXLEN_GEOM 256 /* could be longer then regular geometry string */
208
209 if (geom == NULL)
210 return false;
211
212 char str[MAXLEN_GEOM];
213
214 while (isspace(*geom)) ++geom;
215 if ((p = strchr (geom, ';')) == NULL)
216 p = strchr (geom, '\0');
217
218 n = (p - geom);
219 if (n < MAXLEN_GEOM)
220 {
221 char *ops;
222 new_flags |= geometrySet;
223
224 strncpy (str, geom, n);
225 str[n] = '\0';
226 if (str[0] == ':')
227 ops = &str[0];
228 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0]))
229 ops = &str[0];
230 else
231 {
232 char *tmp;
233 ops = strchr (str, ':');
234 if (ops != NULL)
235 {
236 for (tmp = ops-1; tmp >= str && isspace(*tmp); --tmp);
237 *(++tmp) = '\0';
238 if (ops == tmp) ++ops;
239 }
240 }
241
242 if (ops > str || ops == NULL)
243 {
244 /* we have geometry string - let's handle it prior to applying ops */
245 geom_flags = XParseGeometry (str, &x, &y, &w, &h);
246
247 if ((geom_flags & XValue) && !(geom_flags & YValue))
248 {
249 y = x;
250 geom_flags |= YValue;
251 }
252
253 if (flags & geometrySet)
254 {/* new geometry is an adjustment to the old one ! */
255 if ((geom_flags & WidthValue) && (geom_flags & HeightValue))
256 {
257 if (w == 0 && h != 0)
258 {
259 w = h_scale;
260 h = (v_scale * h) / 100;
261 }
262 else if (h == 0 && w != 0)
263 {
264 w = (h_scale * w) / 100;
265 h = v_scale;
266 }
267 }
268 if (geom_flags & XValue)
269 {
270 if (str[0] != '=')
271 {
272 y += v_align;
273 x += h_align;
274 }
275 }
276 }
277 else /* setting up geometry from scratch */
278 {
279 if (!(geom_flags & XValue))
280 {/* use default geometry - centered */
281 x = y = defaultAlign;
282 }
283 else if (!(geom_flags & YValue))
284 y = x;
285
286 if ((geom_flags & (WidthValue|HeightValue)) == 0)
287 {/* use default geometry - scaled */
288 w = h = defaultScale;
289 }
290 else if (geom_flags & WidthValue)
291 {
292 if (!(geom_flags & HeightValue))
293 h = w;
294 }
295 else
296 w = h;
297 }
298 } /* done parsing geometry string */
299 else if (!(flags & geometrySet))
300 { /* default geometry - scaled and centered */
301 x = y = defaultAlign;
302 w = h = defaultScale;
303 }
304
305 if (!(flags & geometrySet))
306 geom_flags |= WidthValue|HeightValue|XValue|YValue;
307
308 if (ops)
309 {
310 while (*ops)
311 {
312 while (*ops == ':' || isspace(*ops)) ++ops;
313# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof(op_str)-1) == 0)
314 if (CHECK_GEOM_OPS("tile"))
315 {
316 w = h = 0;
317 geom_flags |= WidthValue|HeightValue;
318 }
319 else if (CHECK_GEOM_OPS("propscale"))
320 {
321 if (w == 0 && h == 0)
322 {
323 w = 100;
324 geom_flags |= WidthValue;
325 }
326 new_flags |= propScale;
327 }
328 else if (CHECK_GEOM_OPS("hscale"))
329 {
330 if (w == 0)
331 w = 100;
332 h = 0;
333 geom_flags |= WidthValue|HeightValue;
334 }
335 else if (CHECK_GEOM_OPS("vscale"))
336 {
337 if (h == 0)
338 h = 100;
339 w = 0;
340 geom_flags |= WidthValue|HeightValue;
341 }
342 else if (CHECK_GEOM_OPS("scale"))
343 {
344 if (h == 0)
345 h = 100;
346 if (w == 0)
347 w = 100;
348 geom_flags |= WidthValue|HeightValue;
349 }
350 else if (CHECK_GEOM_OPS("auto"))
351 {
352 w = h = 100;
353 x = y = 50;
354 geom_flags |= WidthValue|HeightValue|XValue|YValue;
355 }
356# undef CHECK_GEOM_OPS
357 while (*ops != ':' && *ops != '\0') ++ops;
358 } /* done parsing ops */
359 }
360
361 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w))
362 ++changed;
363 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h))
364 ++changed;
365 if (check_set_align_value (geom_flags, XValue, h_align, x))
366 ++changed;
367 if (check_set_align_value (geom_flags, YValue, v_align, y))
368 ++changed;
369 }
370
371 if (new_flags != flags)
372 {
373 flags = new_flags;
374 changed++;
375 }
376//fprintf( stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
377// flags, h_scale, v_scale, h_align, v_align);
378 return (changed > 0);
379}
380
381# ifdef HAVE_AFTERIMAGE
382bool
383bgPixmap_t::render_asim (ASImage *background, ARGB32 background_tint)
384{
385 if (target == NULL)
386 return false;
387
388 int target_width = (int)target->szHint.width;
389 int target_height = (int)target->szHint.height;
390 int new_pmap_width = target_width, new_pmap_height = target_height;
391 ASImage *result = NULL;
392
393 int x = 0;
394 int y = 0;
395 int w = h_scale * target_width / 100;
396 int h = v_scale * target_height / 100;
397
398 TIMING_TEST_START (asim);
399
400 if (original_asim)
401 {
402 x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width);
403 y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height);
404 }
405
406 if (original_asim == NULL
407 || x >= target_width
408 || y >= target_height
409 || (w > 0 && x + w <= 0)
410 || (h > 0 && y + h <= 0))
411 {
412 if (background)
413 {
414 new_pmap_width = background->width;
415 new_pmap_height = background->height;
416 result = background;
417 if (background_tint != TINT_LEAVE_SAME)
418 {
419 ASImage* tmp = tile_asimage (target->asv, background, 0, 0,
420 target_width, target_height, background_tint,
421 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
422 if (tmp)
423 result = tmp;
424 }
425 }
426 else
427 new_pmap_width = new_pmap_height = 0;
428 }
429 else
430 {
431 result = original_asim;
432 if ((w > 0 && w != original_asim->width)
433 || (h > 0 && h != original_asim->height))
434 {
435 result = scale_asimage (target->asv, original_asim,
436 w > 0 ? w : original_asim->width,
437 h > 0 ? h : original_asim->height,
438 background ? ASA_ASImage : ASA_XImage,
439 100, ASIMAGE_QUALITY_DEFAULT);
440 }
441 if (background == NULL)
442 {/* if tiling - pixmap has to be sized exactly as the image */
443 if (h_scale == 0)
444 new_pmap_width = result->width;
445 if (v_scale == 0)
446 new_pmap_height = result->height;
447 /* we also need to tile our image in one or both directions */
448 if (h_scale == 0 || v_scale == 0)
449 {
450 ASImage *tmp = tile_asimage (target->asv, result,
451 (h_scale > 0) ? 0 : (int)result->width - x,
452 (v_scale > 0) ? 0 : (int)result->height - y,
453 result->width, result->height,
454 TINT_LEAVE_SAME, ASA_XImage,
455 100, ASIMAGE_QUALITY_DEFAULT);
456 if (tmp)
457 {
458 if (result != original_asim)
459 destroy_asimage (&result);
460 result = tmp;
461 }
462 }
463 }
464 else
465 {/* if blending background and image - pixmap has to be sized same as target window */
466 ASImageLayer *layers = create_image_layers (2);
467 ASImage *merged_im = NULL;
468
469 layers[0].im = background;
470 layers[0].clip_width = target_width;
471 layers[0].clip_height = target_height;
472 layers[0].tint = background_tint;
473 layers[1].im = result;
474 if (w <= 0)
475 {/* tile horizontally */
476 while (x > 0) x -= (int)result->width;
477 layers[1].dst_x = x;
478 layers[1].clip_width = result->width+target_width;
479 }
480 else
481 {/* clip horizontally */
482 layers[1].dst_x = x;
483 layers[1].clip_width = result->width;
484 }
485 if (h <= 0)
486 {
487 while (y > 0) y -= (int)result->height;
488 layers[1].dst_y = y;
489 layers[1].clip_height = result->height + target_height;
490 }
491 else
492 {
493 layers[1].dst_y = y;
494 layers[1].clip_height = result->height;
495 }
496 if (target->rs[Rs_blendtype])
497 {
498 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]);
499 if (layers[1].merge_scanlines == NULL)
500 layers[1].merge_scanlines = alphablend_scanlines;
501 }
502 ASImage *tmp = merge_layers (target->asv, layers, 2, target_width, target_height,
503 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
504 if (tmp)
505 {
506 if (result != original_asim)
507 destroy_asimage (&result);
508 result = tmp;
509 }
510 free (layers);
511 }
512 }
513 TIMING_TEST_PRINT_RESULT (asim);
514
515 if (pixmap)
516 {
517 if (result == NULL
518 || pmap_width != new_pmap_width
519 || pmap_height != new_pmap_height
520 || pmap_depth != target->depth)
521 {
522 XFreePixmap (target->dpy, pixmap);
523 pixmap = None;
524 }
525 }
526
527 if (result)
528 {
529 XGCValues gcv;
530 GC gc;
531
532 /* create Pixmap */
533 if (pixmap == None)
534 {
535 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
536 pmap_width = new_pmap_width;
537 pmap_height = new_pmap_height;
538 pmap_depth = target->depth;
539 }
540 /* fill with background color ( if result's not completely overlapping it)*/
541 gcv.foreground = target->pix_colors[Color_bg];
542 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
543
544 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
545 int dst_width = result->width, dst_height = result->height;
546 if (background == NULL)
547 {
548 if (h_scale > 0)
549 src_x = make_clip_rectangle (x, result->width, new_pmap_width, dst_x, dst_width);
550 if (v_scale > 0)
551 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
552
553 if (dst_x > 0 || dst_y > 0
554 || dst_x + dst_width < new_pmap_width
555 || dst_y + dst_height < new_pmap_height)
556 {
557 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
558 }
559 }
560
561 /* put result on pixmap */
562 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
563 asimage2drawable (target->asv, pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True);
564
565 if (result != background && result != original_asim)
566 destroy_asimage (&result);
567
568 XFreeGC (target->dpy, gc);
569 TIMING_TEST_PRINT_RESULT (asim);
570 }
571
572 return true;
573}
574# endif /* HAVE_AFTERIMAGE */
575
576bool
577bgPixmap_t::set_file (const char *file)
578{
579 char *f;
580
581 assert (file != NULL);
582
583 if (*file != '\0')
584 {
585# ifdef HAVE_AFTERIMAGE
586 if (target->asimman == NULL)
587 target->asimman = create_generic_imageman(target->rs[Rs_path]);
588 if ((f = strchr (file, ';')) == NULL)
589 original_asim = get_asimage( target->asimman, file, 0xFFFFFFFF, 100 );
590 else
591 {
592 size_t len = f - file;
593 f = (char *)malloc (len + 1);
594 strncpy (f, file, len);
595 f[len] = '\0';
596 original_asim = get_asimage( target->asimman, f, 0xFFFFFFFF, 100 );
597 free( f );
598 }
599 return (original_asim != NULL);
600# endif
601 }
602 return false;
603}
604
605# endif /* XPM_BACKGROUND */
606
607# ifdef ENABLE_TRANSPARENCY
608bool
609bgPixmap_t::set_transparent ()
610{
611 if (!(flags & isTransparent))
612 {
613 flags |= isTransparent;
614 return true;
615 }
616}
617
618bool
619bgPixmap_t::set_blur_radius (const char *geom)
620{
621 int changed = 0;
622 unsigned int hr, vr;
623 int junk;
624 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
625 if (!(geom_flags&WidthValue))
626 hr = 1;
627 if (!(geom_flags&HeightValue))
628 vr = hr;
629
630 if (h_blurRadius != hr)
631 {
632 ++changed;
633 h_blurRadius = hr;
634 }
635 if (v_blurRadius != vr)
636 {
637 ++changed;
638 v_blurRadius = vr;
639 }
640 if (v_blurRadius == 0 && h_blurRadius == 0)
641 flags &= ~blurNeeded;
642 else
643 flags |= blurNeeded;
644 return (changed>0);
645}
646
647static inline unsigned long
648compute_tint_shade_flags (rxvt_color *tint, int shade)
649{
650 unsigned long flags = 0;
651 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
652
653 if (tint)
654 {
655 tint->get (c);
656# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700)
657 if (IS_COMPONENT_WHOLESOME (c.r)
658 && IS_COMPONENT_WHOLESOME (c.g)
659 && IS_COMPONENT_WHOLESOME (c.b))
660 flags |= bgPixmap_t::tintWholesome;
661# undef IS_COMPONENT_WHOLESOME
662 }
663
664 if ((shade > 0 && shade < 100) || (shade > 100 && shade < 200))
665 flags |= bgPixmap_t::tintNeeded;
666 else if (tint)
667 {
668 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
669 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
670 {
671 flags |= bgPixmap_t::tintNeeded;
672 }
673 }
674
675 if (flags & bgPixmap_t::tintNeeded)
676 {
677 if (flags & bgPixmap_t::tintWholesome)
678 flags |= bgPixmap_t::tintServerSide;
679#if XFT
680 /* TODO: add logic for XRENDER tinting */
681 flags |= bgPixmap_t::tintServerSide;
682#endif
683 }
684
685 return flags;
686}
687
688bool
689bgPixmap_t::set_tint (rxvt_color &new_tint)
690{
691 if (tint != new_tint)
692 {
693 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
694 tint = new_tint;
695 flags = (flags & ~tintFlags) | new_flags | tintSet;
696 return true;
697 }
698 return false;
699}
700
701bool
702bgPixmap_t::unset_tint ()
703{
704 unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
705
706 if (new_flags != (flags & tintFlags))
707 {
708 flags = (flags&~tintFlags)|new_flags;
709 return true;
710 }
711 return false;
712}
713
714bool
715bgPixmap_t::set_shade (const char *shade_str)
716{
717 int new_shade = (shade_str) ? atoi (shade_str) : 0;
718
719 if (new_shade == 100)
720 new_shade = 0;
721
722 if (new_shade != shade)
723 {
724 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);
725 shade = new_shade;
726 flags = (flags & ~tintFlags) | new_flags;
727 return true;
728 }
729 return false;
730}
731
732
733/* make_transparency_pixmap()
734 * Builds a pixmap sized the same as terminal window, with depth same as the root window
735 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by
736 * our window.
737 */
738unsigned long
739bgPixmap_t::make_transparency_pixmap ()
740{
741 unsigned long result = 0;
742
743 if (target == NULL)
744 return 0;
745
746 /* root dimentions may change from call to call - but Display structure should
747 * be always up-to-date, so let's use it :
748 */
749 Window root = target->display->root;
750 int screen = target->display->screen;
751 Display *dpy = target->dpy;
752 int root_width = DisplayWidth (dpy, screen);
753 int root_height = DisplayHeight (dpy, screen);
754 unsigned int root_pmap_width, root_pmap_height;
755 int window_width = target->szHint.width;
756 int window_height = target->szHint.height;
757 int sx, sy;
758 XGCValues gcv;
759
760 TIMING_TEST_START (tp);
761 target->get_window_origin (sx, sy);
762
763 /* check if we are outside of the visible part of the virtual screen : */
764 if (sx + window_width <= 0 || sy + window_height <= 0
765 || sx >= root_width || sy >= root_height)
766 return 0;
767
768 if (root_pixmap != None)
769 {/* we want to validate the pixmap and get it's size at the same time : */
770 int junk;
771 unsigned int ujunk;
772 /* root pixmap may be bad - allow a error */
773 target->allowedxerror = -1;
774 if (!XGetGeometry (dpy, root_pixmap, &root, &junk, &junk, &root_pmap_width, &root_pmap_height, &ujunk, &ujunk))
775 root_pixmap = None;
776 target->allowedxerror = 0;
777 }
778
779 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth);
780 GC gc = NULL;
781
782 if (tiled_root_pmap == None) /* something really bad happened - abort */
783 return 0;
784
785 if (root_pixmap == None)
786 { /* use tricks to obtain the root background image :*/
787 /* we want to create Overrideredirect window overlapping out window
788 with background type of Parent Relative and then grab it */
789 XSetWindowAttributes attr;
790 Window src;
791 bool success = false;
792
793 attr.background_pixmap = ParentRelative;
794 attr.backing_store = Always;
795 attr.event_mask = ExposureMask;
796 attr.override_redirect = True;
797 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
798 CopyFromParent, CopyFromParent, CopyFromParent,
799 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask,
800 &attr);
801
802 if (src != None)
803 {
804 XEvent event;
805 int ev_count = 0;
806 XGrabServer (dpy);
807 XMapRaised (dpy, src);
808 XSync (dpy, False);
809 /* XSync should get window where it's properly exposed,
810 * but to be on the safe side - let's check for the actuall event to arrive : */
811 while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
812 ++ev_count;
813 if (ev_count > 0);
814 { /* hooray! - we can grab the image! */
815 gc = XCreateGC (dpy, root, 0, NULL);
816 if (gc)
817 {
818 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0);
819 success = true;
820 }
821 }
822 XDestroyWindow (dpy, src);
823 XUngrabServer (dpy);
824 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
825 }
826 if (!success)
827 {
828 XFreePixmap (dpy, tiled_root_pmap);
829 tiled_root_pmap = None;
830 }
831 else
832 result |= transpPmapTiled;
833 }
834 else
835 {/* strightforward pixmap copy */
836 gcv.tile = root_pixmap;
837 gcv.fill_style = FillTiled;
838 while (sx < 0) sx += (int)window_width;
839 while (sy < 0) sy += (int)window_height;
840 gcv.ts_x_origin = -sx;
841 gcv.ts_y_origin = -sy;
842 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
843 if (gc)
844 {
845 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
846 result |= transpPmapTiled;
847 }
848 }
849 TIMING_TEST_PRINT_RESULT (tp);
850
851 if (tiled_root_pmap != None)
852 {
853 if ((flags & tintNeeded) && !need_client_side_rendering ())
854 {
855 if (flags & tintWholesome)
856 {
857 /* In this case we can tint image server-side getting significant
858 * performance improvements, as we eliminate XImage transfer
859 */
860 gcv.foreground = Pixel (tint);
861 gcv.function = GXand;
862 gcv.fill_style = FillSolid;
863 if (gc)
864 XChangeGC (dpy, gc, GCFillStyle | GCForeground | GCFunction, &gcv);
865 else
866 gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv);
867 if (gc)
868 {
869 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
870 result |= transpPmapTinted;
871 }
872 }
873 else
874 {
875#if XFT /* TODO : implement proper detection of XRENDER, as XFT may be present without XRENDER ! */
876 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
877 if (flags & tintSet)
878 tint.get (c);
879 if (shade > 0 && shade < 100)
880 {
881 c.r = (c.r * shade) / 100;
882 c.g = (c.g * shade) / 100;
883 c.b = (c.b * shade) / 100;
884 }
885 else if( shade > 100 && shade < 200)
886 {
887 c.r = (c.r * (200 - shade)) / 100;
888 c.g = (c.g * (200 - shade)) / 100;
889 c.b = (c.b * (200 - shade)) / 100;
890 }
891
892 XRenderPictFormat pf;
893 pf.type = PictTypeDirect;
894 pf.depth = 32;
895 pf.direct.redMask = 0xff;
896 pf.direct.greenMask = 0xff;
897 pf.direct.blueMask = 0xff;
898 pf.direct.alphaMask = 0xff;
899
900 XRenderPictFormat *solid_format = XRenderFindFormat (dpy,
901 (PictFormatType|
902 PictFormatDepth|
903 PictFormatRedMask|
904 PictFormatGreenMask|
905 PictFormatBlueMask|
906 PictFormatAlphaMask),
907 &pf,
908 0);
909 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen)));
910 XRenderPictureAttributes pa ;
911
912 Picture back_pic = XRenderCreatePicture (dpy, tiled_root_pmap, root_format, 0, &pa);
913
914 pa.repeat = True;
915
916 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
917 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
918 XFreePixmap (dpy, overlay_pmap);
919
920 pa.component_alpha = True;
921 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
922 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
923 XFreePixmap (dpy, mask_pmap);
924
925 if (mask_pic && overlay_pic && back_pic)
926 {
927 XRenderColor mask_c;
928
929 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof(mask_c));
930 mask_c.alpha = 0xffff;
931 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
932 memset (&mask_c, 0x0, sizeof(mask_c));
933 mask_c.alpha = 0;
934 if (c.r == c.b && c.b == c.g) /* pure shading */
935 {
936 mask_c.red = mask_c.green = mask_c.blue = 0xffff-c.r;
937 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
938 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
939 }
940 else
941 {
942 mask_c.red = 0xffff-c.r;
943 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
944 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
945 mask_c.red = 0;
946 mask_c.green = 0xffff-c.g;
947 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
948 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
949 mask_c.green = 0;
950 mask_c.blue = 0xffff-c.b;
951 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
952 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
953 }
954 result |= transpPmapTinted;
955 }
956 XRenderFreePicture (dpy, mask_pic);
957 XRenderFreePicture (dpy, overlay_pic);
958 XRenderFreePicture (dpy, back_pic);
959#endif
960 }
961 }
962 if (pixmap)
963 XFreePixmap (dpy, pixmap);
964 pixmap = tiled_root_pmap;
965 pmap_width = window_width;
966 pmap_height = window_height;
967 pmap_depth = root_depth;
968 }
969
970 if (gc)
971 XFreeGC (dpy, gc);
972
973 TIMING_TEST_PRINT_RESULT (tp);
974
975 return result;
976}
977
978bool
979bgPixmap_t::set_root_pixmap ()
980{
981 Pixmap new_root_pixmap = None;
982
983 new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
984 if (new_root_pixmap == None)
985 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
986
987 if (new_root_pixmap != root_pixmap)
988 {
989 root_pixmap = new_root_pixmap;
990 return true;
991 }
992 return false;
993}
994# endif /* ENABLE_TRANSPARENCY */
995
996# ifndef HAVE_AFTERIMAGE
997static void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm);
998# endif
999
1000
1001bool
1002bgPixmap_t::render ()
1003{
1004 unsigned long background_flags = 0;
1005
1006 if (target == NULL)
1007 return false;
1008
1009 invalidate();
1010# ifdef ENABLE_TRANSPARENCY
1011 if (flags & isTransparent)
1012 {
1013 /* we need to re-generate transparency pixmap in that case ! */
1014 background_flags = make_transparency_pixmap ();
1015 if (background_flags == 0)
1016 return false;
1017 else if ((background_flags & transpTransformations) == (flags & transpTransformations)
1018 && pmap_depth == target->depth)
1019 flags = flags & ~isInvalid;
1020 }
1021# endif
1022
1023 XImage *result = NULL;
1024# ifdef HAVE_AFTERIMAGE
1025 if (original_asim
1026 || (background_flags & transpTransformations) != (flags & transpTransformations))
1027 {
1028 ASImage *background = NULL;
1029 ARGB32 as_tint = TINT_LEAVE_SAME;
1030 if (background_flags)
1031 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
1032
1033# ifdef ENABLE_TRANSPARENCY
1034 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1035 {
1036 ShadingInfo as_shade;
1037 as_shade.shading = (shade == 0) ? 100 : shade;
1038
1039 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1040 if (flags & tintSet)
1041 tint.get (c);
1042 as_shade.tintColor.red = c.r;
1043 as_shade.tintColor.green = c.g;
1044 as_shade.tintColor.blue = c.b;
1045
1046 as_tint = shading2tint32 (&as_shade);
1047 }
1048 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
1049 {
1050 ASImage* tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
1051 (original_asim == NULL || tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage,
1052 100, ASIMAGE_QUALITY_DEFAULT);
1053 if (tmp)
1054 {
1055 destroy_asimage (&background);
1056 background = tmp;
1057 }
1058 }
1059# endif
1060
1061 if (render_asim (background, as_tint))
1062 flags = flags & ~isInvalid;
1063 if (background)
1064 destroy_asimage (&background);
1065 }
1066 else if (background_flags && pmap_depth != target->depth)
1067 {
1068 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1069 }
1070# else /* our own client-side tinting */
1071 if (background_flags && (flags & isInvalid))
1072 {
1073 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1074 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded))
1075 {
1076 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1077 if (flags & tintSet)
1078 tint.get (c);
1079 ShadeXImage (target, result, shade, c.r, c.g, c.b);
1080 }
1081 }
1082# endif /* HAVE_AFTERIMAGE */
1083 if (result != NULL)
1084 {
1085 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1086 if (gc)
1087 {
1088 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1089 {
1090 XFreePixmap (target->dpy, pixmap);
1091 pixmap = None;
1092 }
1093 if (pixmap == None)
1094 {
1095 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth);
1096 pmap_width = result->width;
1097 pmap_height = result->height;
1098 pmap_depth = target->depth;
1099 }
1100 if (pmap_depth != result->depth)
1101 { /* Bad Match error will ensue ! stupid X !!!! */
1102 if( result->depth == 24 && pmap_depth == 32)
1103 result->depth = 32;
1104 else if( result->depth == 32 && pmap_depth == 24)
1105 result->depth = 24;
1106 else
1107 {
1108 /* TODO: implement image recoding */
1109 }
1110 }
1111 if (pmap_depth == result->depth)
1112 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1113 XFreeGC (target->dpy, gc);
1114 flags = flags & ~isInvalid;
1115 }
1116 XDestroyImage (result);
1117 }
1118
1119 if (flags & isInvalid)
1120 {
1121 if (pixmap != None)
1122 {
1123 XFreePixmap (target->dpy, pixmap);
1124 pixmap = None;
1125 }
1126 }
1127
1128 apply ();
1129
1130 return true;
1131}
1132
1133bool
1134bgPixmap_t::set_target (rxvt_term *new_target)
1135{
1136 if (new_target)
1137 if (target != new_target)
1138 {
1139 target = new_target;
1140# ifdef ENABLE_TRANSPARENCY
1141 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen));
1142# endif
1143 return true;
1144 }
1145 return false;
1146}
1147
1148void
1149bgPixmap_t::apply()
1150{
1151 if (target)
1152 {
1153 if (pixmap != None)
1154 { /* set target's background to pixmap */
1155# ifdef ENABLE_TRANSPARENCY
1156 if (flags & isTransparent)
1157 {
1158 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1159 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1160# if HAVE_SCROLLBARS
1161 if (target->scrollBar.win)
1162 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1163# endif
1164 }
1165 else
1166# endif
1167 {
1168 /* force old pixmap dereference in case it was transparent before :*/
1169 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1170 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1171 /* do we also need to set scrollbar's background here ? */
1172# if HAVE_SCROLLBARS
1173 if (target->scrollBar.win)
1174 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1175# endif
1176 }
1177 }
1178 else
1179 { /* set target background to a pixel */
1180 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1181 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1182 /* do we also need to set scrollbar's background here ? */
1183# if HAVE_SCROLLBARS
1184 if (target->scrollBar.win)
1185 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1186# endif
1187 }
1188 /* don't want Expose on the parent */
1189 XClearArea (target->dpy, target->parent[0], 0, 0, 0, 0, False);
1190 /* do want Expose on the vt */
1191 XClearArea (target->dpy, target->parent[0], 0, 0, 0, 0, True);
1192# if HAVE_SCROLLBARS
1193 if (target->scrollBar.win)
1194 {
1195 target->scrollBar.setIdle ();
1196 target->scrollbar_show (0);
1197 }
1198# endif
1199 /* Is that really neccessary? we did a XClearArea to generate Expose events alreday ! */
1200 target->want_refresh = 1;
1201# ifdef ENABLE_TRANSPARENCY
1202 target->want_full_refresh = 1;
1203# endif
1204 /* TODO: why do we need a flush here ??? It causes segfault on resize ! */
1205// target->flush ();
1206 }
1207}
1208
1209void
1210rxvt_term::get_window_origin (int &x, int &y)
1211{
1212 Window cr;
1213 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1214/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1215}
1216
1217Pixmap
1218rxvt_term::get_pixmap_property (int prop_id)
1219{
1220 if (prop_id > 0 && prop_id < NUM_XA)
1221 if (xa[prop_id])
1222 {
1223 int aformat, rootdepth;
1224 unsigned long nitems, bytes_after;
1225 Atom atype;
1226 unsigned char *prop = NULL;
1227 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1228 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1229 &nitems, &bytes_after, &prop);
1230 if (result == Success && prop && atype == XA_PIXMAP)
1231 {
1232 return *(Pixmap *)prop;
1233 }
1234 }
1235 return None;
1236}
1237
1238/*
1239 * Check our parents are still who we think they are.
1240 * Do transparency updates if required
51 */ 1241 */
52int 1242int
53rxvt_term::scale_pixmap (const char *geom) 1243rxvt_term::update_background ()
54{ 1244{
55 int flags, changed = 0; 1245 bgPixmap.invalidate();
56 int x = 0, y = 0; 1246 /* no chance of real time refresh if we are blurring ! */
57 unsigned int w = 0, h = 0; 1247 if (bgPixmap.invalid_since + 0.5 < NOW && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
58 unsigned int n; 1248 bgPixmap.render();
59 char *p, *str; 1249 else
60 bgPixmap_t *bgpixmap = & (bgPixmap);
61
62#define MAXLEN_GEOM sizeof("[1000x1000+1000+1000]")
63
64 if (geom == NULL)
65 return 0;
66 str = (char *)rxvt_malloc (MAXLEN_GEOM + 1);
67 if (!strcmp (geom, "?"))
68 {
69 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
70 min (bgpixmap->w, 9999), min (bgpixmap->h, 9999),
71 min (bgpixmap->x, 9999), min (bgpixmap->y, 9999));
72 process_xterm_seq (XTerm_title, str, CHAR_ST);
73 free (str);
74 return 0;
75 } 1250 {
76 1251 update_background_ev.stop ();
77 if ((p = strchr (geom, ';')) == NULL) 1252 if (!bgPixmap.need_client_side_rendering())
78 p = strchr (geom, '\0'); 1253 update_background_ev.start (NOW + .05);
79 n = (p - geom); 1254 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
80 if (n <= MAXLEN_GEOM) 1255 update_background_ev.start (NOW + .2); /* very slow !!! */
81 {
82 strncpy (str, geom, n);
83 str[n] = '\0';
84
85 flags = XParseGeometry (str, &x, &y, &w, &h);
86 if (!flags)
87 {
88 flags |= WidthValue;
89 w = 0;
90 } /* default is tile */
91 if (flags & WidthValue)
92 {
93 if (! (flags & XValue))
94 x = 50;
95 if (! (flags & HeightValue))
96 h = w;
97 if (w && !h)
98 {
99 w = (bgpixmap->w * w) / 100;
100 h = bgpixmap->h;
101 }
102 else if (h && !w)
103 {
104 w = bgpixmap->w;
105 h = (bgpixmap->h * h) / 100;
106 }
107 if (w > 1000)
108 w = 1000;
109 if (h > 1000)
110 h = 1000;
111 if (bgpixmap->w != (short)w)
112 {
113 bgpixmap->w = (short)w;
114 changed++;
115 }
116 if (bgpixmap->h != (short)h)
117 {
118 bgpixmap->h = (short)h;
119 changed++;
120 }
121 }
122 if (! (flags & YValue))
123 {
124 if (flags & XNegative)
125 flags |= YNegative;
126 y = x;
127 }
128
129 if (! (flags & WidthValue) && geom[0] != '=')
130 {
131 x += bgpixmap->x;
132 y += bgpixmap->y;
133 }
134 else 1256 else
135 { 1257 update_background_ev.start (NOW + .07);
136 if (flags & XNegative)
137 x += 100;
138 if (flags & YNegative)
139 y += 100;
140 }
141 MIN_IT (x, 100);
142 MIN_IT (y, 100);
143 MAX_IT (x, 0);
144 MAX_IT (y, 0);
145 if (bgpixmap->x != x)
146 {
147 bgpixmap->x = x;
148 changed++;
149 }
150 if (bgpixmap->y != y)
151 {
152 bgpixmap->y = y;
153 changed++;
154 }
155 } 1258 }
156 free (str); 1259 return 0;
157 return changed;
158} 1260}
159 1261
160void 1262void
161rxvt_term::resize_pixmap () 1263rxvt_term::update_background_cb (time_watcher &w)
162{ 1264{
163 XGCValues gcvalue; 1265 bgPixmap.render ();
164 GC gc; 1266}
165 unsigned int width = TermWin_TotalWidth (); 1267#endif /* HAVE_BG_PIXMAP */
166 unsigned int height = TermWin_TotalHeight ();
167 dDisp;
168 1268
169 if (pixmap != None) 1269#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
170 XFreePixmap (disp, pixmap); 1270/* taken from aterm-0.4.2 */
171 1271
172 if (bgPixmap.pixmap == None) 1272typedef uint32_t RUINT32T;
173 { /* So be it: I'm not using pixmaps */
174 pixmap = None;
175 1273
176 if (!(options & Opt_transparent) || !am_transparent) 1274static void
177 XSetWindowBackground (disp, vt, 1275ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
178 pix_colors[Color_bg]); 1276{
1277 int sh_r, sh_g, sh_b;
1278 RUINT32T mask_r, mask_g, mask_b;
1279 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1280 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
1281 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
1282 int i;
179 1283
1284 Visual *visual = term->visual;
1285
1286 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ;
1287
1288 if (shade == 0)
1289 shade = 100;
1290
1291 /* for convenience */
1292 mask_r = visual->red_mask;
1293 mask_g = visual->green_mask;
1294 mask_b = visual->blue_mask;
1295
1296 /* boring lookup table pre-initialization */
1297 switch (srcImage->bits_per_pixel) {
1298 case 15:
1299 if ((mask_r != 0x7c00) ||
1300 (mask_g != 0x03e0) ||
1301 (mask_b != 0x001f))
180 return; 1302 return;
1303 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
1304 lookup_r = lookup;
1305 lookup_g = lookup+32;
1306 lookup_b = lookup+32+32;
1307 sh_r = 10;
1308 sh_g = 5;
1309 sh_b = 0;
1310 break;
1311 case 16:
1312 if ((mask_r != 0xf800) ||
1313 (mask_g != 0x07e0) ||
1314 (mask_b != 0x001f))
1315 return;
1316 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
1317 lookup_r = lookup;
1318 lookup_g = lookup+32;
1319 lookup_b = lookup+32+64;
1320 sh_r = 11;
1321 sh_g = 5;
1322 sh_b = 0;
1323 break;
1324 case 24:
1325 if ((mask_r != 0xff0000) ||
1326 (mask_g != 0x00ff00) ||
1327 (mask_b != 0x0000ff))
1328 return;
1329 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
1330 lookup_r = lookup;
1331 lookup_g = lookup+256;
1332 lookup_b = lookup+256+256;
1333 sh_r = 16;
1334 sh_g = 8;
1335 sh_b = 0;
1336 break;
1337 case 32:
1338 if ((mask_r != 0xff0000) ||
1339 (mask_g != 0x00ff00) ||
1340 (mask_b != 0x0000ff))
1341 return;
1342 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
1343 lookup_r = lookup;
1344 lookup_g = lookup+256;
1345 lookup_b = lookup+256+256;
1346 sh_r = 16;
1347 sh_g = 8;
1348 sh_b = 0;
1349 break;
1350 default:
1351 return; /* we do not support this color depth */
1352 }
1353
1354 /* prepare limits for color transformation (each channel is handled separately) */
1355 if (shade < 0) {
1356 shade = -shade;
1357 if (shade < 0) shade = 0;
1358 if (shade > 100) shade = 100;
1359
1360 lower_lim_r = 65535-rm;
1361 lower_lim_g = 65535-gm;
1362 lower_lim_b = 65535-bm;
1363
1364 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
1365 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
1366 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
1367
1368 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1369 } else {
1370 if (shade < 0) shade = 0;
1371 if (shade > 100) shade = 100;
1372
1373 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1374
1375 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1376 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1377 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1378 }
1379
1380 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1381 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1382 {
1383 unsigned int tmp;
1384
1385 tmp = lower_lim_r;
1386 lower_lim_r = lower_lim_b;
1387 lower_lim_b = tmp;
1388
1389 tmp = upper_lim_r;
1390 upper_lim_r = upper_lim_b;
1391 upper_lim_b = tmp;
1392 }
1393
1394 /* fill our lookup tables */
1395 for (i = 0; i <= mask_r>>sh_r; i++)
1396 {
1397 RUINT32T tmp;
1398 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
1399 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
1400 lookup_r[i] = (tmp/65535)<<sh_r;
1401 }
1402 for (i = 0; i <= mask_g>>sh_g; i++)
1403 {
1404 RUINT32T tmp;
1405 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
1406 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
1407 lookup_g[i] = (tmp/65535)<<sh_g;
1408 }
1409 for (i = 0; i <= mask_b>>sh_b; i++)
1410 {
1411 RUINT32T tmp;
1412 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
1413 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
1414 lookup_b[i] = (tmp/65535)<<sh_b;
1415 }
1416
1417 /* apply table to input image (replacing colors by newly calculated ones) */
1418 switch (srcImage->bits_per_pixel)
1419 {
1420 case 15:
181 } 1421 {
182 1422 unsigned short *p1, *pf, *p, *pl;
183 gcvalue.foreground = pix_colors[Color_bg]; 1423 p1 = (unsigned short *) srcImage->data;
184 gc = XCreateGC (disp, vt, GCForeground, &gcvalue); 1424 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
185 1425 while (p1 < pf)
186 if (bgPixmap.pixmap != None)
187 { /* we have a specified pixmap */
188 unsigned int w = bgPixmap.w, h = bgPixmap.h,
189 x = bgPixmap.x, y = bgPixmap.y;
190 unsigned int xpmh = xpmAttr.height,
191 xpmw = xpmAttr.width;
192
193 /* 1426 {
194 * don't zoom pixmap too much nor expand really small pixmaps
195 */
196 if (w > 1000 || h > 1000)
197 w = 1; 1427 p = p1;
198 else if (width > (10 * xpmw) 1428 pl = p1 + srcImage->width;
199 || height > (10 * xpmh)) 1429 for (; p < pl; p++)
200 w = 0; /* tile */
201
202 if (w == 0)
203 {
204 /* basic X tiling - let the X server do it */
205 pixmap = XCreatePixmap (disp, vt,
206 xpmw, xpmh,
207 (unsigned int)display->depth);
208 XCopyArea (disp, bgPixmap.pixmap, pixmap, gc,
209 0, 0, xpmw, xpmh, 0, 0);
210 } 1430 {
1431 *p = lookup_r[(*p & 0x7c00)>>10] |
1432 lookup_g[(*p & 0x03e0)>> 5] |
1433 lookup_b[(*p & 0x001f)];
1434 }
1435 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1436 }
1437 break;
1438 }
1439 case 16:
1440 {
1441 unsigned short *p1, *pf, *p, *pl;
1442 p1 = (unsigned short *) srcImage->data;
1443 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1444 while (p1 < pf)
1445 {
1446 p = p1;
1447 pl = p1 + srcImage->width;
1448 for (; p < pl; p++)
1449 {
1450 *p = lookup_r[(*p & 0xf800)>>11] |
1451 lookup_g[(*p & 0x07e0)>> 5] |
1452 lookup_b[(*p & 0x001f)];
1453 }
1454 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1455 }
1456 break;
1457 }
1458 case 24:
1459 {
1460 unsigned char *p1, *pf, *p, *pl;
1461 p1 = (unsigned char *) srcImage->data;
1462 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1463 while (p1 < pf)
1464 {
1465 p = p1;
1466 pl = p1 + srcImage->width * 3;
1467 for (; p < pl; p += 3)
1468 {
1469 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
1470 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
1471 p[2] = lookup_r[(p[2] & 0x0000ff)];
1472 }
1473 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1474 }
1475 break;
1476 }
1477 case 32:
1478 {
1479 RUINT32T *p1, *pf, *p, *pl;
1480 p1 = (RUINT32T *) srcImage->data;
1481 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1482
1483 while (p1 < pf)
1484 {
1485 p = p1;
1486 pl = p1 + srcImage->width;
1487 for (; p < pl; p++)
1488 {
1489 *p = lookup_r[(*p & 0xff0000)>>16] |
1490 lookup_g[(*p & 0x00ff00)>> 8] |
1491 lookup_b[(*p & 0x0000ff)] |
1492 (*p & ~0xffffff);
1493 }
1494 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1495 }
1496 break;
1497 }
1498 }
1499
1500 free (lookup);
1501}
1502#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */
1503
1504#if 0 /* replaced by a bgPixmap_t::render() - leve here temporarily for reference */
1505void
1506rxvt_term::check_our_parents_cb (time_watcher &w)
1507{
1508
1509 int i, aformat, rootdepth;
1510 unsigned long nitems, bytes_after;
1511 Atom atype;
1512 unsigned char *prop = NULL;
1513 Window root, oldp, *list;
1514 Pixmap rootpixmap = None;
1515 XWindowAttributes wattr, wrootattr;
1516 int sx, sy;
1517 Window cr;
1518 unsigned int rootpixmap_w = 0, rootpixmap_h = 0;
1519
1520 if (!option (Opt_transparent))
1521 return; /* Don't try any more */
1522
1523 XGetWindowAttributes (dpy, display->root, &wrootattr);
1524 rootdepth = wrootattr.depth;
1525
1526 XGetWindowAttributes (dpy, parent[0], &wattr);
1527
1528 if (rootdepth != wattr.depth)
1529 {
1530 if (am_transparent)
1531 {
1532 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
1533 am_transparent = am_pixmap_trans = 0;
1534 }
1535
1536 return; /* Don't try any more */
1537 }
1538
1539 /* Get all X ops out of the queue so that our information is up-to-date. */
1540 XSync (dpy, False);
1541
1542 XTranslateCoordinates (dpy, parent[0], display->root,
1543 0, 0, &sx, &sy, &cr);
1544 /* check if we are outside of the visible part of the virtual screen : */
1545 if( sx + (int)szHint.width <= 0 || sy + (int)szHint.height <= 0
1546 || sx >= wrootattr.width || sy >= wrootattr.height )
1547 return /* 0 */ ;
1548 /*
1549 * Make the frame window set by the window manager have
1550 * the root background. Some window managers put multiple nested frame
1551 * windows for each client, so we have to take care about that.
1552 */
1553 i = (xa[XA_XROOTPMAP_ID]
1554 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
1555 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1556 &nitems, &bytes_after, &prop) == Success);
1557
1558 if (!i || prop == NULL)
1559 i = (xa[XA_ESETROOT_PMAP_ID]
1560 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
1561 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1562 &nitems, &bytes_after, &prop) == Success);
1563
1564 if (!i || prop == NULL)
1565 rootpixmap = None;
1566 else
1567 {
1568 int junk;
1569 unsigned int ujunk;
1570 /* root pixmap may be bad - allow a error */
1571 allowedxerror = -1;
1572 if ((rootpixmap = *(Pixmap *)prop) != None)
1573 if (!XGetGeometry (dpy, rootpixmap, &root, &junk, &junk, &rootpixmap_w, &rootpixmap_h, &ujunk, &ujunk))
1574 rootpixmap = None;
1575 allowedxerror = 0;
1576 }
1577
1578 if (prop != NULL)
1579 XFree (prop);
1580
1581 if (rootpixmap != None)
1582 {
1583 Bool success = False;
1584 GC gc = NULL;
1585 XGCValues gcvalue;
1586 int shade = 100;
1587 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1588 Bool whole_tint = False, no_tint = True;
1589
1590 while (sx < 0) sx += (int)wrootattr.width;
1591 while (sy < 0) sy += (int)wrootattr.height;
1592
1593 if (rs[Rs_shade])
1594 shade = atoi (rs[Rs_shade]);
1595 if (ISSET_PIXCOLOR (Color_tint))
1596 pix_colors_focused [Color_tint].get (c);
1597#define IS_COMPONENT_WHOLESOME(c) ((c) <=0x000700 || (c)>=0x00f700)
1598 if (shade >= 100)
1599 whole_tint = (IS_COMPONENT_WHOLESOME(c.r)
1600 && IS_COMPONENT_WHOLESOME(c.g)
1601 && IS_COMPONENT_WHOLESOME(c.b));
1602 no_tint = (c.r >= 0x00f700 && c.g >= 0x00f700 && c.b >= 0x00f700);
1603#undef IS_COMPONENT_WHOLESOME
1604
1605 bgPixmap.make_transparency_pixmap();
1606
1607 if (whole_tint && !no_tint)
1608 {
1609 }
1610 success = True;
1611#ifdef HAVE_AFTERIMAGE
1612 if (rs[Rs_blurradius] || bgPixmap.original_asim != NULL || (!whole_tint && (!no_tint || shade !=100)))
1613 {
1614 ARGB32 tint = TINT_LEAVE_SAME;
1615 ASImage *back_im = NULL;
1616
1617 back_im = pixmap2ximage (asv, bgPixmap.pixmap, 0, 0, szHint.width, szHint.height, AllPlanes, 100);
1618 if (back_im != NULL)
1619 {
1620 if (!whole_tint && (!no_tint || shade !=100))
1621 {
1622 ShadingInfo as_shade;
1623 as_shade.shading = shade;
1624 as_shade.tintColor.red = c.r;
1625 as_shade.tintColor.green = c.g;
1626 as_shade.tintColor.blue = c.b;
1627 tint = shading2tint32 (&as_shade);
1628 }
1629
1630 if (rs[Rs_blurradius] && back_im)
1631 {
1632 ASImage* tmp;
1633 int junk;
1634 unsigned int hr = 1, vr = 1;
1635 int flags = XParseGeometry (rs[Rs_blurradius], &junk, &junk, &hr, &vr);
1636 if (!(flags&WidthValue))
1637 hr = 1;
1638 if (!(flags&HeightValue))
1639 vr = hr;
1640 tmp = blur_asimage_gauss (asv, back_im, hr, vr, 0xFFFFFFFF,
1641 (bgPixmap.original_asim == NULL || tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage,
1642 100, ASIMAGE_QUALITY_DEFAULT);
1643 if (tmp)
1644 {
1645 destroy_asimage (&back_im);
1646 back_im = tmp;
1647 }
1648 }
1649 /* TODO: temporary fix - redo the logic, so that same function can do both
1650 transparency and non-transparency */
1651 bgPixmap.render_asim (back_im, tint);
1652 destroy_asimage (&back_im);
1653
1654 } /* back_im != NULL */
1655 else
1656 success = False;
1657 }
1658#else /* HAVE_AFTERIMAGE */
1659 if (!whole_tint && (!no_tint || shade !=100))
1660 {
1661 XImage *image = XGetImage (dpy, bgPixmap.pixmap, 0, 0, szHint.width, szHint.height, AllPlanes, ZPixmap);
1662 success = False;
1663 if (image != NULL)
1664 {
1665 if (gc == NULL)
1666 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
1667 if (ISSET_PIXCOLOR (Color_tint) || shade != 100)
1668 ShadeXImage (this, image, shade, c.r, c.g, c.b);
1669 XPutImage (dpy, bgPixmap.pixmap, gc, image, 0, 0, 0, 0, image->width, image->height);
1670 XDestroyImage (image);
1671 success = True;
1672 }
1673 }
1674#endif /* HAVE_AFTERIMAGE */
1675
1676 if (gc != NULL)
1677 XFreeGC (dpy, gc);
1678
1679 bgPixmap.apply();
1680 if (!success)
1681 am_pixmap_trans = 0;
211 else 1682 else
212 { 1683 {
213 float incr, p; 1684 am_transparent = am_pixmap_trans = 1;
214 Pixmap tmp;
215
216 pixmap = XCreatePixmap (disp, vt,
217 width, height,
218 (unsigned int)display->depth);
219 /*
220 * horizontal scaling
221 */
222 rxvt_pixmap_incr (&w, &x, &incr, &p, width, xpmw);
223
224 tmp = XCreatePixmap (disp, vt,
225 width, xpmh, (unsigned int)display->depth);
226 XFillRectangle (disp, tmp, gc, 0, 0, width,
227 xpmh);
228
229 for ( /*nil */ ; x < w; x++, p += incr)
230 {
231 if (p >= xpmw)
232 p = 0;
233 /* copy one column from the original pixmap to the tmp pixmap */
234 XCopyArea (disp, bgPixmap.pixmap, tmp, gc,
235 (int)p, 0, 1, xpmh, (int)x, 0);
236 }
237
238 /*
239 * vertical scaling
240 */
241 rxvt_pixmap_incr (&h, &y, &incr, &p, height, xpmh);
242
243 if (y > 0)
244 XFillRectangle (disp, pixmap, gc, 0, 0, width, y);
245
246 if (h < height)
247 XFillRectangle (disp, pixmap, gc, 0, (int)h, width, height - h + 1);
248
249 for ( /*nil */ ; y < h; y++, p += incr)
250 {
251 if (p >= xpmh)
252 p = 0;
253
254 /* copy one row from the tmp pixmap to the main pixmap */
255 XCopyArea (disp, tmp, pixmap, gc,
256 0, (int)p, width, 1, 0, (int)y);
257 }
258
259 XFreePixmap (disp, tmp);
260 }
261 }
262
263 XSetWindowBackgroundPixmap (disp, vt, pixmap);
264 XFreeGC (disp, gc);
265 am_transparent = 0;
266}
267
268/*
269 * Calculate tiling sizes and increments
270 * At start, p == 0, incr == xpmwidthheight
271 */
272static void
273rxvt_pixmap_incr (unsigned int *wh, unsigned int *xy, float *incr, float *p, unsigned int widthheight, unsigned int xpmwidthheight)
274{
275 unsigned int cwh, cxy;
276 float cincr, cp;
277
278 cp = 0;
279 cincr = (float)xpmwidthheight;
280 cxy = *xy;
281 cwh = *wh;
282 if (cwh == 1)
283 { /* display one image, no horizontal/vertical scaling */
284 cincr = (float)widthheight;
285 if (xpmwidthheight <= widthheight)
286 { 1685 }
287 cwh = xpmwidthheight; 1686 } /* rootpixmap != None */
288 cxy = (cxy * (widthheight - cwh)) / 100; /* beware! order */ 1687
289 cwh += cxy; 1688 if (am_pixmap_trans)
1689 {
1690 if (scrollBar.win)
290 } 1691 {
291 else 1692 scrollBar.setIdle ();
1693 scrollbar_show (0);
292 { 1694 }
293 cxy = 0; 1695
294 cwh = widthheight; 1696 if (am_transparent)
295 } 1697 {
296 } 1698 want_refresh = want_full_refresh = 1;
297 else if (cwh < 10) 1699 if (am_pixmap_trans)
298 { /* fit WH images across/down screen */ 1700 flush ();
299 cincr *= cwh;
300 cxy = 0;
301 cwh = widthheight;
302 }
303 else
304 {
305 cincr *= 100.0 / cwh;
306 if (cwh < 100)
307 { /* contract */
308 float pos;
309
310 cwh = (cwh * widthheight) / 100;
311 pos = (float)cxy / 100 * widthheight - (cwh / 2);
312
313 cxy = (widthheight - cwh);
314 if (pos <= 0)
315 cxy = 0;
316 else if (pos < cxy)
317 cxy = (int) pos;
318 cwh += cxy;
319 }
320 else
321 { /* expand */
322 if (cxy > 0)
323 { /* position */
324 float pos;
325
326 pos = (float)cxy / 100 * xpmwidthheight - (cincr / 2);
327 cp = xpmwidthheight - cincr;
328 if (pos <= 0)
329 cp = 0;
330 else if (pos < cp)
331 cp = pos;
332 }
333 cxy = 0;
334 cwh = widthheight;
335 }
336 }
337 cincr /= widthheight;
338 *wh = cwh;
339 *xy = cxy;
340 *incr = cincr;
341 *p = cp;
342}
343
344Pixmap
345rxvt_term::set_bgPixmap (const char *file)
346{
347 char *f;
348
349 assert (file != NULL);
350
351 if (bgPixmap.pixmap != None)
352 {
353 XFreePixmap (display->display, bgPixmap.pixmap);
354 bgPixmap.pixmap = None;
355 }
356
357 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);
358
359 if (*file != '\0')
360 {
361 /* XWindowAttributes attr; */
362
363 /*
364 * we already have the required attributes
365 */
366 /* XGetWindowAttributes (display->display, vt, &attr); */
367
368 xpmAttr.closeness = 30000;
369 xpmAttr.colormap = display->cmap;
370 xpmAttr.visual = display->visual;
371 xpmAttr.depth = display->depth;
372 xpmAttr.valuemask = (XpmCloseness | XpmColormap | XpmVisual |
373 XpmDepth | XpmSize | XpmReturnPixels);
374
375 /* search environment variables here too */
376 f = (char *)rxvt_File_find (file, ".xpm", rs[Rs_path]);
377 if (f == NULL
378 || XpmReadFileToPixmap (display->display, display->root, f,
379 &bgPixmap.pixmap, NULL,
380 &xpmAttr))
381 { 1701 }
382 char *p;
383
384 /* semi-colon delimited */
385 if ((p = strchr (file, ';')) == NULL)
386 p = strchr (file, '\0');
387
388 rxvt_warn ("couldn't load XPM file \"%.*s\", ignoring.\n", (p - file), file);
389 }
390
391 free (f);
392 } 1702 }
393
394 resize_pixmap ();
395 return bgPixmap.pixmap;
396} 1703}
397 1704#endif
398#endif /* XPM_BACKGROUND */

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines