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

Comparing rxvt-unicode/src/perl/background (file contents):
Revision 1.45 by root, Sun Jun 10 11:53:32 2012 UTC vs.
Revision 1.60 by root, Fri Jun 15 13:21:59 2012 UTC

1#! perl 1#! perl
2 2
3#:META:X_RESOURCE:%.expr:string:background expression 3#:META:X_RESOURCE:%.expr:string:background expression
4#:META:X_RESOURCE:%.border.:boolean:respect the terminal border 4#:META:X_RESOURCE:%.border:boolean:respect the terminal border
5 5#:META:X_RESOURCE:%.interval:seconds:minimum time between updates
6#TODO: once, rootalign
7 6
8=head1 NAME 7=head1 NAME
9 8
10 background - manage terminal background 9 background - manage terminal background
11 10
12=head1 SYNOPSIS 11=head1 SYNOPSIS
13 12
14 urxvt --background-expr 'background expression' 13 urxvt --background-expr 'background expression'
15 --background-border 14 --background-border
15 --background-interval seconds
16 16
17=head1 DESCRIPTION 17=head1 DESCRIPTION
18 18
19This extension manages the terminal background by creating a picture that 19This extension manages the terminal background by creating a picture that
20is behind the text, replacing the normal background colour. 20is behind the text, replacing the normal background colour.
57 57
58For example, an expression such as C<scale load "$HOME/mybg.png"> scales the 58For example, an expression such as C<scale load "$HOME/mybg.png"> scales the
59image to the window size, so it relies on the window size and will 59image to the window size, so it relies on the window size and will
60be reevaluated each time it is changed, but not when it moves for 60be reevaluated each time it is changed, but not when it moves for
61example. That ensures that the picture always fills the terminal, even 61example. That ensures that the picture always fills the terminal, even
62after it's size changes. 62after its size changes.
63 63
64=head2 EXPRESSIONS 64=head2 EXPRESSIONS
65 65
66Expressions are normal Perl expressions, in fact, they are Perl blocks - 66Expressions are normal Perl expressions, in fact, they are Perl blocks -
67which means you could use multiple lines and statements: 67which means you could use multiple lines and statements:
71 return scale load "$HOME/weekday.png"; 71 return scale load "$HOME/weekday.png";
72 } else { 72 } else {
73 return scale load "$HOME/sunday.png"; 73 return scale load "$HOME/sunday.png";
74 } 74 }
75 75
76This expression gets evaluated once per hour. It will set F<sunday.png> as 76This expression is evaluated once per hour. It will set F<sunday.png> as
77background on Sundays, and F<weekday.png> on all other days. 77background on Sundays, and F<weekday.png> on all other days.
78 78
79Fortunately, we expect that most expressions will be much simpler, with 79Fortunately, we expect that most expressions will be much simpler, with
80little Perl knowledge needed. 80little Perl knowledge needed.
81 81
115horizontal and vertical dimensions. For example, this halves the image 115horizontal and vertical dimensions. For example, this halves the image
116width and doubles the image height: 116width and doubles the image height:
117 117
118 scale 0.5, 2, load "$HOME/mypic.png" 118 scale 0.5, 2, load "$HOME/mypic.png"
119 119
120Other effects than scalign are also readily available, for exmaple, you can 120Other effects than scaling are also readily available, for example, you can
121tile the image to fill the whole window, instead of resizing it: 121tile the image to fill the whole window, instead of resizing it:
122 122
123 tile load "$HOME/mypic.png" 123 tile load "$HOME/mypic.png"
124 124
125In fact, images returned by C<load> are in C<tile> mode by default, so the C<tile> operator 125In fact, images returned by C<load> are in C<tile> mode by default, so the C<tile> operator
151This only works for one cycle though, so as long as you load the same 151This only works for one cycle though, so as long as you load the same
152image every time, it will always be cached, but when you load a different 152image every time, it will always be cached, but when you load a different
153image, it will forget about the first one. 153image, it will forget about the first one.
154 154
155This allows you to either speed things up by keeping multiple images in 155This allows you to either speed things up by keeping multiple images in
156memory, or comserve memory by loading images more often. 156memory, or conserve memory by loading images more often.
157 157
158For example, you can keep two images in memory and use a random one like 158For example, you can keep two images in memory and use a random one like
159this: 159this:
160 160
161 my $img1 = load "img1.png"; 161 my $img1 = load "img1.png";
189overwriting borders and any other areas, such as the scrollbar. 189overwriting borders and any other areas, such as the scrollbar.
190 190
191Specifying this flag changes the behaviour, so that the image only 191Specifying this flag changes the behaviour, so that the image only
192replaces the background of the character area. 192replaces the background of the character area.
193 193
194=item --background-interval seconds
195
196Since some operations in the underlying XRender extension can effectively
197freeze your X-server for prolonged time, this extension enforces a minimum
198time between updates, which is normally about 0.1 seconds.
199
200If you want to do updates more often, you can decrease this safety
201interval with this switch.
202
194=back 203=back
195 204
196=cut 205=cut
197 206
207our %_IMG_CACHE;
198our $HOME; 208our $HOME;
199our ($self, $old, $new); 209our ($self, $old, $new);
200our ($x, $y, $w, $h); 210our ($x, $y, $w, $h);
201 211
202# enforce at least this interval between updates 212# enforce at least this interval between updates
203our $MIN_INTERVAL = 1/100; 213our $MIN_INTERVAL = 6/59.951;
204 214
205{ 215{
206 package urxvt::bgdsl; # background language 216 package urxvt::bgdsl; # background language
207 217
208 use List::Util qw(min max sum shuffle); 218 use List::Util qw(min max sum shuffle);
218=item load $path 228=item load $path
219 229
220Loads the image at the given C<$path>. The image is set to plane tiling 230Loads the image at the given C<$path>. The image is set to plane tiling
221mode. 231mode.
222 232
223Loaded images will be cached for one cycle. 233Loaded images will be cached for one cycle, and shared between temrinals
234running in the same process (e.g. in C<urxvtd>).
224 235
236=item load_uc $path
237
238Load uncached - same as load, but does not cache the image. This function
239is most useufl if you want to optimise a background expression in some
240way.
241
225=cut 242=cut
243
244 sub load_uc($) {
245 my ($path) = @_;
246
247 $_IMG_CACHE{$path} || do {
248 my $img = $self->new_img_from_file ($path);
249 Scalar::Util::weaken ($_IMG_CACHE{$path} = $img);
250 $img
251 }
252 }
226 253
227 sub load($) { 254 sub load($) {
228 my ($path) = @_; 255 my ($path) = @_;
229 256
230 $new->{load}{$path} = $old->{load}{$path} || $self->new_img_from_file ($path); 257 $new->{load}{$path} = $old->{load}{$path} || load_uc $path;
231 } 258 }
232 259
233=item root 260=item root
234 261
235Returns the root window pixmap, that is, hopefully, the background image 262Returns the root window pixmap, that is, hopefully, the background image
239reevaluated when the bg image changes. 266reevaluated when the bg image changes.
240 267
241=cut 268=cut
242 269
243 sub root() { 270 sub root() {
244 $new->{rootpmap_sensitive} = 1; 271 $new->{again}{rootpmap} = 1;
245 die "root op not supported, exg, we need you"; 272 $self->new_img_from_root
246 } 273 }
247 274
248=item solid $colour 275=item solid $colour
249 276
250=item solid $width, $height, $colour 277=item solid $width, $height, $colour
258=cut 285=cut
259 286
260 sub solid($;$$) { 287 sub solid($;$$) {
261 my $colour = pop; 288 my $colour = pop;
262 289
263 my $img = $self->new_img (urxvt::PictStandardARGB32, $_[0] || 1, $_[1] || 1); 290 my $img = $self->new_img (urxvt::PictStandardARGB32, 0, 0, $_[0] || 1, $_[1] || 1);
264 $img->fill ($colour); 291 $img->fill ($colour);
265 $img 292 $img
266 } 293 }
267 294
268=item clone $img 295=item clone $img
274 301
275 sub clone($) { 302 sub clone($) {
276 $_[0]->clone 303 $_[0]->clone
277 } 304 }
278 305
279=back 306=item merge $img ...
307
308Takes any number of images and merges them together, creating a single
309image containing them all.
310
311=cut
312
313 sub merge(@) {
314 # rather annoyingly clumsy, but optimisation is for another time
315
316 my $x0 = +1e9;
317 my $y0 = +1e9;
318 my $x1 = -1e9;
319 my $y1 = -1e9;
320
321 for (@_) {
322 my ($x, $y, $w, $h) = $_->geometry;
323
324 $x0 = $x if $x0 > $x;
325 $y0 = $y if $y0 > $y;
326
327 $x += $w;
328 $y += $h;
329
330 $x1 = $x if $x1 < $x;
331 $y1 = $y if $y1 < $y;
332 }
333
334 my $base = $self->new_img (urxvt::PictStandardARGB32, $x0, $y0, $x1 - $x0, $y1 - $y0);
335 $base->fill ([0, 0, 0, 0]);
336
337 $base->draw ($_)
338 for @_;
339
340 $base
341 }
280 342
281=head2 TILING MODES 343=head2 TILING MODES
282 344
283The following operators modify the tiling mode of an image, that is, the 345The following operators modify the tiling mode of an image, that is, the
284way that pixels outside the image area are painted when the image is used. 346way that pixels outside the image area are painted when the image is used.
314become transparent. This mode is most useful when you want to place an 376become transparent. This mode is most useful when you want to place an
315image over another image or the background colour while leaving all 377image over another image or the background colour while leaving all
316background pixels outside the image unchanged. 378background pixels outside the image unchanged.
317 379
318Example: load an image and display it in the upper left corner. The rest 380Example: load an image and display it in the upper left corner. The rest
319of the space is left "empty" (transparent or wahtever your compisotr does 381of the space is left "empty" (transparent or whatever your compositor does
320in alpha mode, else background colour). 382in alpha mode, else background colour).
321 383
322 pad load "mybg.png" 384 pad load "mybg.png"
323 385
324=item extend $img 386=item extend $img
325 387
326Extends the image over the whole plane, using the closest pixel in the 388Extends the image over the whole plane, using the closest pixel in the
327area outside the image. This mode is mostly useful when you more complex 389area outside the image. This mode is mostly useful when you use more complex
328filtering operations and want the pixels outside the image to have the 390filtering operations and want the pixels outside the image to have the
329same values as the pixels near the edge. 391same values as the pixels near the edge.
330 392
331Example: just for curiosity, how does this pixel extension stuff work? 393Example: just for curiosity, how does this pixel extension stuff work?
332 394
399the window size to conserve memory. 461the window size to conserve memory.
400 462
401Example: take the screen background, clip it to the window size, blur it a 463Example: take the screen background, clip it to the window size, blur it a
402bit, align it to the window position and use it as background. 464bit, align it to the window position and use it as background.
403 465
404 clip move -TX, -TY, blur 5, root 466 clip move -TX, -TY, once { blur 5, root }
405 467
406=cut 468=cut
407 469
408 sub TX() { $new->{position_sensitive} = 1; $x } 470 sub TX() { $new->{again}{position} = 1; $x }
409 sub TY() { $new->{position_sensitive} = 1; $y } 471 sub TY() { $new->{again}{position} = 1; $y }
410 sub TW() { $new->{size_sensitive} = 1; $w } 472 sub TW() { $new->{again}{size} = 1; $w }
411 sub TH() { $new->{size_sensitive} = 1; $h } 473 sub TH() { $new->{again}{size} = 1; $h }
412 474
413=item now 475=item now
414 476
415Returns the current time as (fractional) seconds since the epoch. 477Returns the current time as (fractional) seconds since the epoch.
416 478
423C<$seconds> seconds. 485C<$seconds> seconds.
424 486
425Example: load some image and rotate it according to the time of day (as if it were 487Example: load some image and rotate it according to the time of day (as if it were
426the hour pointer of a clock). Update this image every minute. 488the hour pointer of a clock). Update this image every minute.
427 489
428 again 60; rotate TW, TH, 50, 50, (now % 86400) * -720 / 86400, scale load "myclock.png" 490 again 60; rotate 50, 50, (now % 86400) * -720 / 86400, scale load "myclock.png"
429 491
430=item counter $seconds 492=item counter $seconds
431 493
432Like C<again>, but also returns an increasing counter value, starting at 494Like C<again>, but also returns an increasing counter value, starting at
4330, which might be useful for some simple animation effects. 4950, which might be useful for some simple animation effects.
435=cut 497=cut
436 498
437 sub now() { urxvt::NOW } 499 sub now() { urxvt::NOW }
438 500
439 sub again($) { 501 sub again($) {
440 $new->{again} = $_[0]; 502 $new->{again}{time} = $_[0];
441 } 503 }
442 504
443 sub counter($) { 505 sub counter($) {
444 $new->{again} = $_[0]; 506 $new->{again}{time} = $_[0];
445 $self->{counter} + 0 507 $self->{counter} + 0
446 } 508 }
447 509
448=back 510=back
449 511
553 615
554Example: move the image right by 20 pixels and down by 30. 616Example: move the image right by 20 pixels and down by 30.
555 617
556 move 20, 30, ... 618 move 20, 30, ...
557 619
620=item align $xalign, $yalign, $img
621
622Aligns the image according to a factor - C<0> means the image is moved to
623the left or top edge (for C<$xalign> or C<$yalign>), C<0.5> means it is
624exactly centered and C<1> means it touches the right or bottom edge.
625
626Example: remove any visible border around an image, center it vertically but move
627it to the right hand side.
628
629 align 1, 0.5, pad $img
630
558=item center $img 631=item center $img
559 632
560=item center $width, $height, $img 633=item center $width, $height, $img
561 634
562Centers the image, i.e. the center of the image is moved to the center of 635Centers the image, i.e. the center of the image is moved to the center of
563the terminal window (or the box specified by C<$width> and C<$height> if 636the terminal window (or the box specified by C<$width> and C<$height> if
564given). 637given).
638
639Example: load an image and center it.
640
641 center pad load "mybg.png"
565 642
566=item rootalign $img 643=item rootalign $img
567 644
568Moves the image so that it appears glued to the screen as opposed to the 645Moves the image so that it appears glued to the screen as opposed to the
569window. This gives the illusion of a larger area behind the window. It is 646window. This gives the illusion of a larger area behind the window. It is
575 rootalign mirror load "mybg.png" 652 rootalign mirror load "mybg.png"
576 653
577Example: take the screen background and align it, giving the illusion of 654Example: take the screen background and align it, giving the illusion of
578transparency as long as the window isn't in front of other windows. 655transparency as long as the window isn't in front of other windows.
579 656
580 rootalign root 657 rootalign root
581 658
582=cut 659=cut
583 660
584 sub move($$;$) { 661 sub move($$;$) {
585 my $img = pop->clone; 662 my $img = pop->clone;
586 $img->move ($_[0], $_[1]); 663 $img->move ($_[0], $_[1]);
587 $img 664 $img
588 } 665 }
589 666
667 sub align($;$$) {
668 my $img = pop;
669
670 move $_[0] * (TW - $img->w),
671 $_[1] * (TH - $img->h),
672 $img
673 }
674
590 sub center($;$$) { 675 sub center($;$$) {
591 my $img = pop; 676 my $img = pop;
592 my $w = $_[0] || TW; 677 my $w = $_[0] || TW;
593 my $h = $_[0] || TH; 678 my $h = $_[1] || TH;
594 679
595 move 0.5 * ($w - $img->w), 0.5 * ($h - $img->h), $img 680 move 0.5 * ($w - $img->w), 0.5 * ($h - $img->h), $img
596 } 681 }
597 682
598 sub rootalign($) { 683 sub rootalign($) {
599 move -TX, -TY, $_[0] 684 move -TX, -TY, $_[0]
685 }
686
687=item rotate $center_x, $center_y, $degrees
688
689Rotates the image by C<$degrees> degrees, counter-clockwise, around the
690pointer at C<$center_x> and C<$center_y> (specified as factor of image
691width/height).
692
693#TODO# new width, height, maybe more operators?
694
695Example: rotate the image by 90 degrees
696
697=cut
698
699 sub rotate($$$$) {
700 my $img = pop;
701 $img->rotate (
702 $_[0] * ($img->w + $img->x),
703 $_[1] * ($img->h + $img->y),
704 $_[2] * (3.14159265 / 180),
705 )
600 } 706 }
601 707
602=back 708=back
603 709
604=head2 COLOUR MODIFICATIONS 710=head2 COLOUR MODIFICATIONS
640 746
641Values less than 0 reduce brightness, while values larger than 0 increase 747Values less than 0 reduce brightness, while values larger than 0 increase
642it. Useful range is from -1 to 1 - the former results in a black, the 748it. Useful range is from -1 to 1 - the former results in a black, the
643latter in a white picture. 749latter in a white picture.
644 750
645Due to idiosynchrasies in the underlying XRender extension, biases less 751Due to idiosyncrasies in the underlying XRender extension, biases less
646than zero can be I<very> slow. 752than zero can be I<very> slow.
647 753
648=cut 754=cut
649 755
650 sub contrast($$;$$;$) { 756 sub contrast($$;$$;$) {
651 my $img = pop; 757 my $img = pop;
652 my ($r, $g, $b, $a) = @_; 758 my ($r, $g, $b, $a) = @_;
653 759
654 ($g, $b) = ($r, $r) if @_ < 4; 760 ($g, $b) = ($r, $r) if @_ < 3;
655 $a = 1 if @_ < 5; 761 $a = 1 if @_ < 4;
656 762
657 $img = $img->clone; 763 $img = $img->clone;
658 $img->contrast ($r, $g, $b, $a); 764 $img->contrast ($r, $g, $b, $a);
659 $img 765 $img
660 } 766 }
661 767
662 sub brightness($$;$$;$) { 768 sub brightness($$;$$;$) {
663 my $img = pop; 769 my $img = pop;
664 my ($r, $g, $b, $a) = @_; 770 my ($r, $g, $b, $a) = @_;
665 771
666 ($g, $b) = ($r, $r) if @_ < 4; 772 ($g, $b) = ($r, $r) if @_ < 3;
667 $a = 1 if @_ < 5; 773 $a = 1 if @_ < 4;
668 774
669 $img = $img->clone; 775 $img = $img->clone;
670 $img->brightness ($r, $g, $b, $a); 776 $img->brightness ($r, $g, $b, $a);
671 $img 777 $img
672 } 778 }
688 sub blur($$;$) { 794 sub blur($$;$) {
689 my $img = pop; 795 my $img = pop;
690 $img->blur ($_[0], @_ >= 2 ? $_[1] : $_[0]) 796 $img->blur ($_[0], @_ >= 2 ? $_[1] : $_[0])
691 } 797 }
692 798
693=item rotate $new_width, $new_height, $center_x, $center_y, $degrees 799=back
694 800
695Rotates the image by C<$degrees> degrees, counter-clockwise, around the 801=head2 OTHER STUFF
696pointer at C<$center_x> and C<$center_y> (specified as factor of image
697width/height), generating a new image with width C<$new_width> and height
698C<$new_height>.
699 802
700#TODO# new width, height, maybe more operators? 803Anything that didn't fit any of the other categories, even after applying
804force and closing our eyes.
701 805
702Example: rotate the image by 90 degrees 806=over 4
703 807
704=cut 808=item once { ... }
705 809
706 sub rotate($$$$$$) { 810This function takes a code block as argument, that is, one or more
707 my $img = pop; 811statements enclosed by braces.
708 $img->rotate ( 812
709 $_[0], 813The trick is that this code block is only evaluated once - future calls
710 $_[1], 814will simply return the original image (yes, it should only be used with
711 $_[2] * $img->w, 815images).
712 $_[3] * $img->h, 816
713 $_[4] * (3.14159265 / 180), 817This can be extremely useful to avoid redoign the same slow operations
818again and again- for example, if your background expression takes the root
819background, blurs it and then root-aligns it it would have to blur the
820root background on every window move or resize.
821
822Putting the blur into a C<once> block will make sure the blur is only done
823once:
824
825 rootlign once { blur 10, root }
826
827This leaves the question of how to force reevaluation of the block, in
828case the root background changes: Right now, all once blocks forget that
829they ahve been executed before each time the root background changes (if
830the expression is sensitive to that) or when C<once_again> is called.
831
832=item once_again
833
834Resets all C<once> block as if they had never been called, i.e. on the
835next call they will be reevaluated again.
836
837=cut
838
839 sub once(&) {
840 my $once = $self->{once_cache}{$_[0]+0} ||= do {
841 local $new->{again};
842 my @res = $_[0]();
843 [$new->{again}, \@res]
714 ) 844 };
845
846 $new->{again} = {
847 %{ $new->{again} },
848 %{ $once->[0] }
849 };
850
851 # in scalar context we always return the first original result, which
852 # is not quite how perl works.
853 wantarray
854 ? @{ $once->[1] }
855 : $once->[1][0]
856 }
857
858 sub once_again() {
859 delete $self->{once_cache};
715 } 860 }
716 861
717=back 862=back
718 863
719=cut 864=cut
762 907
763 # evaluate user expression 908 # evaluate user expression
764 909
765 my $img = eval { $self->{expr}->() }; 910 my $img = eval { $self->{expr}->() };
766 warn $@ if $@;#d# 911 warn $@ if $@;#d#
767 die if !UNIVERSAL::isa $img, "urxvt::img"; 912 die "background-expr did not return an image.\n" if !UNIVERSAL::isa $img, "urxvt::img";
768 913
769 $state->{size_sensitive} = 1 914 # if the expression is sensitive to external events, prepare reevaluation then
915
916 my $again = delete $state->{again};
917
918 $again->{size} = 1
770 if $img->repeat_mode != urxvt::RepeatNormal; 919 if $img->repeat_mode != urxvt::RepeatNormal;
771 920
772 # if the expression is sensitive to external events, prepare reevaluation then
773
774 my $repeat;
775
776 if (my $again = $state->{again}) { 921 if (my $again = $again->{time}) {
777 $repeat = 1;
778 my $self = $self; 922 my $self = $self;
779 $state->{timer} = $again == $old->{again} 923 $state->{timer} = $again == $old->{again}
780 ? $old->{timer} 924 ? $old->{timer}
781 : urxvt::timer->new->after ($again)->interval ($again)->cb (sub { 925 : urxvt::timer->new->after ($again)->interval ($again)->cb (sub {
782 ++$self->{counter}; 926 ++$self->{counter};
783 $self->recalculate 927 $self->recalculate
784 }); 928 });
785 } 929 }
786 930
787 if (delete $state->{position_sensitive}) { 931 if ($again->{position}) {
788 $repeat = 1;
789 $self->enable (position_change => sub { $_[0]->recalculate }); 932 $self->enable (position_change => sub { $_[0]->recalculate });
790 } else { 933 } else {
791 $self->disable ("position_change"); 934 $self->disable ("position_change");
792 } 935 }
793 936
794 if (delete $state->{size_sensitive}) { 937 if ($again->{size}) {
795 $repeat = 1;
796 $self->enable (size_change => sub { $_[0]->recalculate }); 938 $self->enable (size_change => sub { $_[0]->recalculate });
797 } else { 939 } else {
798 $self->disable ("size_change"); 940 $self->disable ("size_change");
799 } 941 }
800 942
801 if (delete $state->{rootpmap_sensitive}) { 943 if ($again->{rootpmap}) {
802 $repeat = 1;
803 $self->enable (rootpmap_change => sub { $_[0]->recalculate }); 944 $self->enable (rootpmap_change => sub {
945 delete $_[0]{once_cache}; # this will override once-block values from
946 $_[0]->recalculate;
947 });
804 } else { 948 } else {
805 $self->disable ("rootpmap_change"); 949 $self->disable ("rootpmap_change");
806 } 950 }
807 951
808 # clear stuff we no longer need 952 # clear stuff we no longer need
809 953
810 %$old = (); 954 %$old = ();
811 955
812 unless ($repeat) { 956 unless (%$again) {
813 delete $self->{state}; 957 delete $self->{state};
814 delete $self->{expr}; 958 delete $self->{expr};
815 } 959 }
816 960
817 # set background pixmap 961 # set background pixmap
822} 966}
823 967
824sub on_start { 968sub on_start {
825 my ($self) = @_; 969 my ($self) = @_;
826 970
827 my $expr = $self->x_resource ("background.expr") 971 my $expr = $self->x_resource ("%.expr")
828 or return; 972 or return;
829 973
974 $self->has_render
975 or die "background extension needs RENDER extension 0.10 or higher, ignoring background-expr.\n";
976
830 $self->set_expr (parse_expr $expr); 977 $self->set_expr (parse_expr $expr);
831 $self->{border} = $self->x_resource_boolean ("background.border"); 978 $self->{border} = $self->x_resource_boolean ("%.border");
979
980 $MIN_INTERVAL = $self->x_resource ("%.interval");
832 981
833 () 982 ()
834} 983}
835 984

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines