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.48 by root, Sun Jun 10 15:01:14 2012 UTC vs.
Revision 1.63 by root, Tue Jun 19 18:17:56 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#:META:X_RESOURCE:%.interval:seconds:minimum time between updates 5#:META:X_RESOURCE:%.interval:seconds:minimum time between updates
6
7#TODO: once, rootalign
8 6
9=head1 NAME 7=head1 NAME
10 8
11 background - manage terminal background 9 background - manage terminal background
12 10
59 57
60For 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
61image 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
62be 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
63example. That ensures that the picture always fills the terminal, even 61example. That ensures that the picture always fills the terminal, even
64after it's size changes. 62after its size changes.
65 63
66=head2 EXPRESSIONS 64=head2 EXPRESSIONS
67 65
68Expressions are normal Perl expressions, in fact, they are Perl blocks - 66Expressions are normal Perl expressions, in fact, they are Perl blocks -
69which means you could use multiple lines and statements: 67which means you could use multiple lines and statements:
73 return scale load "$HOME/weekday.png"; 71 return scale load "$HOME/weekday.png";
74 } else { 72 } else {
75 return scale load "$HOME/sunday.png"; 73 return scale load "$HOME/sunday.png";
76 } 74 }
77 75
78This 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
79background on Sundays, and F<weekday.png> on all other days. 77background on Sundays, and F<weekday.png> on all other days.
80 78
81Fortunately, we expect that most expressions will be much simpler, with 79Fortunately, we expect that most expressions will be much simpler, with
82little Perl knowledge needed. 80little Perl knowledge needed.
83 81
117horizontal and vertical dimensions. For example, this halves the image 115horizontal and vertical dimensions. For example, this halves the image
118width and doubles the image height: 116width and doubles the image height:
119 117
120 scale 0.5, 2, load "$HOME/mypic.png" 118 scale 0.5, 2, load "$HOME/mypic.png"
121 119
122Other effects than scalign are also readily available, for exmaple, you can 120Other effects than scaling are also readily available, for example, you can
123tile the image to fill the whole window, instead of resizing it: 121tile the image to fill the whole window, instead of resizing it:
124 122
125 tile load "$HOME/mypic.png" 123 tile load "$HOME/mypic.png"
126 124
127In 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
140pseudo-transparency, as the image seems to be static while the window is 138pseudo-transparency, as the image seems to be static while the window is
141moved around. 139moved around.
142 140
143=head2 CYCLES AND CACHING 141=head2 CYCLES AND CACHING
144 142
143=head3 C<load> et al.
144
145As has been mentioned before, the expression might be evaluated multiple 145As has been mentioned before, the expression might be evaluated multiple
146times. Each time the expression is reevaluated, a new cycle is said to 146times. Each time the expression is reevaluated, a new cycle is said to
147have begun. Many operators cache their results till the next cycle. 147have begun. Many operators cache their results till the next cycle.
148 148
149For example, the C<load> operator keeps a copy of the image. If it is 149For example, the C<load> operator keeps a copy of the image. If it is
153This only works for one cycle though, so as long as you load the same 153This only works for one cycle though, so as long as you load the same
154image every time, it will always be cached, but when you load a different 154image every time, it will always be cached, but when you load a different
155image, it will forget about the first one. 155image, it will forget about the first one.
156 156
157This allows you to either speed things up by keeping multiple images in 157This allows you to either speed things up by keeping multiple images in
158memory, or comserve memory by loading images more often. 158memory, or conserve memory by loading images more often.
159 159
160For example, you can keep two images in memory and use a random one like 160For example, you can keep two images in memory and use a random one like
161this: 161this:
162 162
163 my $img1 = load "img1.png"; 163 my $img1 = load "img1.png";
173 173
174Here, a path is selected randomly, and load is only called for one image, 174Here, a path is selected randomly, and load is only called for one image,
175so keeps only one image in memory. If, on the next evaluation, luck 175so keeps only one image in memory. If, on the next evaluation, luck
176decides to use the other path, then it will have to load that image again. 176decides to use the other path, then it will have to load that image again.
177 177
178=head3 C<once { ... }>
179
180Another way to cache expensive operations is to use C<once { ... }>. The
181C<once> operator takes a block of multiple statements enclosed by C<{}>
182and evaluates it only.. once, returning any images the last statement
183returned. Further calls simply produce the values from the cache.
184
185This is most useful for expensive operations, such as C<blur>:
186
187 rootalign once { blur 20, root }
188
189This makes a blurred copy of the root background once, and on subsequent
190calls, just root-aligns it. Since C<blur> is usually quite slow and
191C<rootalign> is quite fast, this trades extra memory (For the cached
192blurred pixmap) with speed (blur only needs to be redone when root
193changes).
194
178=head1 REFERENCE 195=head1 REFERENCE
179 196
180=head2 COMMAND LINE SWITCHES 197=head2 COMMAND LINE SWITCHES
181 198
182=over 4 199=over 4
193Specifying this flag changes the behaviour, so that the image only 210Specifying this flag changes the behaviour, so that the image only
194replaces the background of the character area. 211replaces the background of the character area.
195 212
196=item --background-interval seconds 213=item --background-interval seconds
197 214
198Since some operations in the underlying XRender extension can effetively 215Since some operations in the underlying XRender extension can effectively
199freeze your X-server for prolonged time, this extension enforces a minimum 216freeze your X-server for prolonged time, this extension enforces a minimum
200time between updates, which is normally about 0.1 seconds. 217time between updates, which is normally about 0.1 seconds.
201 218
202If you want to do updates more often, you can decrease this safety 219If you want to do updates more often, you can decrease this safety
203interval with this switch. 220interval with this switch.
204 221
205=back 222=back
206 223
207=cut 224=cut
208 225
226our %_IMG_CACHE;
209our $HOME; 227our $HOME;
210our ($self, $old, $new); 228our ($self, $frame);
211our ($x, $y, $w, $h); 229our ($x, $y, $w, $h);
212 230
213# enforce at least this interval between updates 231# enforce at least this interval between updates
214our $MIN_INTERVAL = 6/59.951; 232our $MIN_INTERVAL = 6/59.951;
215 233
216{ 234{
217 package urxvt::bgdsl; # background language 235 package urxvt::bgdsl; # background language
236
237 sub FR_PARENT() { 0 } # parent frame, if any - must be #0
238 sub FR_CACHE () { 1 } # cached values
239 sub FR_AGAIN () { 2 } # what this expr is sensitive to
240 sub FR_STATE () { 3 } # watchers etc.
218 241
219 use List::Util qw(min max sum shuffle); 242 use List::Util qw(min max sum shuffle);
220 243
221=head2 PROVIDERS/GENERATORS 244=head2 PROVIDERS/GENERATORS
222 245
229=item load $path 252=item load $path
230 253
231Loads the image at the given C<$path>. The image is set to plane tiling 254Loads the image at the given C<$path>. The image is set to plane tiling
232mode. 255mode.
233 256
234Loaded images will be cached for one cycle. 257Loaded images will be cached for one cycle, and shared between temrinals
258running in the same process (e.g. in C<urxvtd>).
259
260#=item load_uc $path
261#
262#Load uncached - same as load, but does not cache the image. This function
263#is most useufl if you want to optimise a background expression in some
264#way.
235 265
236=cut 266=cut
237 267
238 sub load($) { 268 sub load($) {
239 my ($path) = @_; 269 my ($path) = @_;
240 270
241 $new->{load}{$path} = $old->{load}{$path} || $self->new_img_from_file ($path); 271 $_IMG_CACHE{$path} || do {
272 my $img = $self->new_img_from_file ($path);
273 Scalar::Util::weaken ($_IMG_CACHE{$path} = $img);
274 $img
275 }
242 } 276 }
243 277
244=item root 278=item root
245 279
246Returns the root window pixmap, that is, hopefully, the background image 280Returns the root window pixmap, that is, hopefully, the background image
247of your screen. The image is set to extend mode. 281of your screen.
248 282
249This function makes your expression root sensitive, that means it will be 283This function makes your expression root sensitive, that means it will be
250reevaluated when the bg image changes. 284reevaluated when the bg image changes.
251 285
252=cut 286=cut
253 287
254 sub root() { 288 sub root() {
255 $new->{rootpmap_sensitive} = 1; 289 $frame->[FR_AGAIN]{rootpmap} = 1;
256 die "root op not supported, exg, we need you"; 290 $self->new_img_from_root
257 } 291 }
258 292
259=item solid $colour 293=item solid $colour
260 294
261=item solid $width, $height, $colour 295=item solid $width, $height, $colour
269=cut 303=cut
270 304
271 sub solid($;$$) { 305 sub solid($;$$) {
272 my $colour = pop; 306 my $colour = pop;
273 307
274 my $img = $self->new_img (urxvt::PictStandardARGB32, $_[0] || 1, $_[1] || 1); 308 my $img = $self->new_img (urxvt::PictStandardARGB32, 0, 0, $_[0] || 1, $_[1] || 1);
275 $img->fill ($colour); 309 $img->fill ($colour);
276 $img 310 $img
277 } 311 }
278 312
279=item clone $img 313=item clone $img
285 319
286 sub clone($) { 320 sub clone($) {
287 $_[0]->clone 321 $_[0]->clone
288 } 322 }
289 323
290=back 324=item merge $img ...
325
326Takes any number of images and merges them together, creating a single
327image containing them all. The tiling mode of the first image is used as
328the tiling mdoe of the resulting image.
329
330This function is called automatically when an expression returns multiple
331images.
332
333=cut
334
335 sub merge(@) {
336 return $_[0] unless $#_;
337
338 # rather annoyingly clumsy, but optimisation is for another time
339
340 my $x0 = +1e9;
341 my $y0 = +1e9;
342 my $x1 = -1e9;
343 my $y1 = -1e9;
344
345 for (@_) {
346 my ($x, $y, $w, $h) = $_->geometry;
347
348 $x0 = $x if $x0 > $x;
349 $y0 = $y if $y0 > $y;
350
351 $x += $w;
352 $y += $h;
353
354 $x1 = $x if $x1 < $x;
355 $y1 = $y if $y1 < $y;
356 }
357
358 my $base = $self->new_img (urxvt::PictStandardARGB32, $x0, $y0, $x1 - $x0, $y1 - $y0);
359 $base->repeat_mode ($_[0]->repeat_mode);
360 $base->fill ([0, 0, 0, 0]);
361
362 $base->draw ($_)
363 for @_;
364
365 $base
366 }
291 367
292=head2 TILING MODES 368=head2 TILING MODES
293 369
294The following operators modify the tiling mode of an image, that is, the 370The following operators modify the tiling mode of an image, that is, the
295way that pixels outside the image area are painted when the image is used. 371way that pixels outside the image area are painted when the image is used.
325become transparent. This mode is most useful when you want to place an 401become transparent. This mode is most useful when you want to place an
326image over another image or the background colour while leaving all 402image over another image or the background colour while leaving all
327background pixels outside the image unchanged. 403background pixels outside the image unchanged.
328 404
329Example: load an image and display it in the upper left corner. The rest 405Example: load an image and display it in the upper left corner. The rest
330of the space is left "empty" (transparent or wahtever your compisotr does 406of the space is left "empty" (transparent or whatever your compositor does
331in alpha mode, else background colour). 407in alpha mode, else background colour).
332 408
333 pad load "mybg.png" 409 pad load "mybg.png"
334 410
335=item extend $img 411=item extend $img
336 412
337Extends the image over the whole plane, using the closest pixel in the 413Extends the image over the whole plane, using the closest pixel in the
338area outside the image. This mode is mostly useful when you more complex 414area outside the image. This mode is mostly useful when you use more complex
339filtering operations and want the pixels outside the image to have the 415filtering operations and want the pixels outside the image to have the
340same values as the pixels near the edge. 416same values as the pixels near the edge.
341 417
342Example: just for curiosity, how does this pixel extension stuff work? 418Example: just for curiosity, how does this pixel extension stuff work?
343 419
410the window size to conserve memory. 486the window size to conserve memory.
411 487
412Example: take the screen background, clip it to the window size, blur it a 488Example: take the screen background, clip it to the window size, blur it a
413bit, align it to the window position and use it as background. 489bit, align it to the window position and use it as background.
414 490
415 clip move -TX, -TY, blur 5, root 491 clip move -TX, -TY, once { blur 5, root }
416 492
417=cut 493=cut
418 494
419 sub TX() { $new->{position_sensitive} = 1; $x } 495 sub TX() { $frame->[FR_AGAIN]{position} = 1; $x }
420 sub TY() { $new->{position_sensitive} = 1; $y } 496 sub TY() { $frame->[FR_AGAIN]{position} = 1; $y }
421 sub TW() { $new->{size_sensitive} = 1; $w } 497 sub TW() { $frame->[FR_AGAIN]{size} = 1; $w }
422 sub TH() { $new->{size_sensitive} = 1; $h } 498 sub TH() { $frame->[FR_AGAIN]{size} = 1; $h }
423 499
424=item now 500=item now
425 501
426Returns the current time as (fractional) seconds since the epoch. 502Returns the current time as (fractional) seconds since the epoch.
427 503
434C<$seconds> seconds. 510C<$seconds> seconds.
435 511
436Example: load some image and rotate it according to the time of day (as if it were 512Example: load some image and rotate it according to the time of day (as if it were
437the hour pointer of a clock). Update this image every minute. 513the hour pointer of a clock). Update this image every minute.
438 514
439 again 60; rotate TW, TH, 50, 50, (now % 86400) * -720 / 86400, scale load "myclock.png" 515 again 60; rotate 50, 50, (now % 86400) * -720 / 86400, scale load "myclock.png"
440 516
441=item counter $seconds 517=item counter $seconds
442 518
443Like C<again>, but also returns an increasing counter value, starting at 519Like C<again>, but also returns an increasing counter value, starting at
4440, which might be useful for some simple animation effects. 5200, which might be useful for some simple animation effects.
446=cut 522=cut
447 523
448 sub now() { urxvt::NOW } 524 sub now() { urxvt::NOW }
449 525
450 sub again($) { 526 sub again($) {
451 $new->{again} = $_[0]; 527 $frame->[FR_AGAIN]{time} = $_[0];
452 } 528 }
453 529
454 sub counter($) { 530 sub counter($) {
455 $new->{again} = $_[0]; 531 $frame->[FR_AGAIN]{time} = $_[0];
456 $self->{counter} + 0 532 $frame->[FR_STATE]{counter} + 0
457 } 533 }
458 534
459=back 535=back
460 536
461=head2 SHAPE CHANGING OPERATORS 537=head2 SHAPE CHANGING OPERATORS
631 707
632 sub rootalign($) { 708 sub rootalign($) {
633 move -TX, -TY, $_[0] 709 move -TX, -TY, $_[0]
634 } 710 }
635 711
712=item rotate $center_x, $center_y, $degrees
713
714Rotates the image by C<$degrees> degrees, counter-clockwise, around the
715pointer at C<$center_x> and C<$center_y> (specified as factor of image
716width/height).
717
718#TODO# new width, height, maybe more operators?
719
720Example: rotate the image by 90 degrees
721
722=cut
723
724 sub rotate($$$$) {
725 my $img = pop;
726 $img->rotate (
727 $_[0] * ($img->w + $img->x),
728 $_[1] * ($img->h + $img->y),
729 $_[2] * (3.14159265 / 180),
730 )
731 }
732
636=back 733=back
637 734
638=head2 COLOUR MODIFICATIONS 735=head2 COLOUR MODIFICATIONS
639 736
640The following operators change the pixels of the image. 737The following operators change the pixels of the image.
674 771
675Values less than 0 reduce brightness, while values larger than 0 increase 772Values less than 0 reduce brightness, while values larger than 0 increase
676it. Useful range is from -1 to 1 - the former results in a black, the 773it. Useful range is from -1 to 1 - the former results in a black, the
677latter in a white picture. 774latter in a white picture.
678 775
679Due to idiosynchrasies in the underlying XRender extension, biases less 776Due to idiosyncrasies in the underlying XRender extension, biases less
680than zero can be I<very> slow. 777than zero can be I<very> slow.
681 778
682=cut 779=cut
683 780
684 sub contrast($$;$$;$) { 781 sub contrast($$;$$;$) {
685 my $img = pop; 782 my $img = pop;
686 my ($r, $g, $b, $a) = @_; 783 my ($r, $g, $b, $a) = @_;
687 784
688 ($g, $b) = ($r, $r) if @_ < 4; 785 ($g, $b) = ($r, $r) if @_ < 3;
689 $a = 1 if @_ < 5; 786 $a = 1 if @_ < 4;
690 787
691 $img = $img->clone; 788 $img = $img->clone;
692 $img->contrast ($r, $g, $b, $a); 789 $img->contrast ($r, $g, $b, $a);
693 $img 790 $img
694 } 791 }
695 792
696 sub brightness($$;$$;$) { 793 sub brightness($$;$$;$) {
697 my $img = pop; 794 my $img = pop;
698 my ($r, $g, $b, $a) = @_; 795 my ($r, $g, $b, $a) = @_;
699 796
700 ($g, $b) = ($r, $r) if @_ < 4; 797 ($g, $b) = ($r, $r) if @_ < 3;
701 $a = 1 if @_ < 5; 798 $a = 1 if @_ < 4;
702 799
703 $img = $img->clone; 800 $img = $img->clone;
704 $img->brightness ($r, $g, $b, $a); 801 $img->brightness ($r, $g, $b, $a);
705 $img 802 $img
706 } 803 }
722 sub blur($$;$) { 819 sub blur($$;$) {
723 my $img = pop; 820 my $img = pop;
724 $img->blur ($_[0], @_ >= 2 ? $_[1] : $_[0]) 821 $img->blur ($_[0], @_ >= 2 ? $_[1] : $_[0])
725 } 822 }
726 823
727=item rotate $new_width, $new_height, $center_x, $center_y, $degrees
728
729Rotates the image by C<$degrees> degrees, counter-clockwise, around the
730pointer at C<$center_x> and C<$center_y> (specified as factor of image
731width/height), generating a new image with width C<$new_width> and height
732C<$new_height>.
733
734#TODO# new width, height, maybe more operators?
735
736Example: rotate the image by 90 degrees
737
738=cut
739
740 sub rotate($$$$$$) {
741 my $img = pop;
742 $img->rotate (
743 $_[0],
744 $_[1],
745 $_[2] * $img->w,
746 $_[3] * $img->h,
747 $_[4] * (3.14159265 / 180),
748 )
749 }
750
751=back 824=back
752 825
826=head2 OTHER STUFF
827
828Anything that didn't fit any of the other categories, even after applying
829force and closing our eyes.
830
831=over 4
832
833=item once { ... }
834
835This function takes a code block as argument, that is, one or more
836statements enclosed by braces.
837
838The trick is that this code block is only evaluated once - future calls
839will simply return the original image (yes, it should only be used with
840images).
841
842This can be extremely useful to avoid redoing the same slow operations
843again and again- for example, if your background expression takes the root
844background, blurs it and then root-aligns it it would have to blur the
845root background on every window move or resize.
846
847In fact, urxvt itself encloses the whole expression in some kind of
848C<once> block so it only is reevaluated as required.
849
850Putting the blur into a C<once> block will make sure the blur is only done
851once:
852
853 rootlign once { blur 10, root }
854
855This leaves the question of how to force reevaluation of the block,
856in case the root background changes: If expression inside the block
857is sensitive to some event (root background changes, window geometry
858changes), then it will be reevaluated automatically as needed.
859
860=item once_again
861
862Resets all C<once> block as if they had never been called, i.e. on the
863next call they will be reevaluated again.
864
865=cut
866
867 sub once(&) {
868 my $id = $_[0]+0;
869
870 local $frame = $self->{frame_cache}{$id} ||= [$frame];
871
872 unless ($frame->[FR_CACHE]) {
873 $frame->[FR_CACHE] = [ $_[0]() ];
874
875 my $self = $self;
876 my $frame = $frame;
877 Scalar::Util::weaken $frame;
878 $self->compile_frame ($frame, sub {
879 # clear this frame cache, also for all parents
880 for (my $frame = $frame; $frame; $frame = $frame->[0]) {
881 undef $frame->[FR_CACHE];
882 }
883
884 unless ($self->{term}) {
885 use Data::Dump;
886 ddx $frame;
887 exit;
888 }
889
890 $self->recalculate;
891 });
892 };
893
894 # in scalar context we always return the first original result, which
895 # is not quite how perl works.
896 wantarray
897 ? @{ $frame->[FR_CACHE] }
898 : $frame->[FR_CACHE][0]
899 }
900
901 sub once_again() {
902 delete $self->{frame_cache};
903 }
904
905=back
906
753=cut 907=cut
754 908
755} 909}
756 910
757sub parse_expr { 911sub parse_expr {
758 my $expr = eval "sub {\npackage urxvt::bgdsl;\n#line 0 'background expression'\n$_[0]\n}"; 912 my $expr = eval
913 "sub {\n"
914 . "package urxvt::bgdsl;\n"
915 . "#line 0 'background expression'\n"
916 . "$_[0]\n"
917 . "}";
759 die if $@; 918 die if $@;
760 $expr 919 $expr
761} 920}
762 921
763# compiles a parsed expression 922# compiles a parsed expression
764sub set_expr { 923sub set_expr {
765 my ($self, $expr) = @_; 924 my ($self, $expr) = @_;
766 925
926 $self->{root} = [];
767 $self->{expr} = $expr; 927 $self->{expr} = $expr;
768 $self->recalculate; 928 $self->recalculate;
929}
930
931# takes a hash of sensitivity indicators and installs watchers
932sub compile_frame {
933 my ($self, $frame, $cb) = @_;
934
935 my $state = $frame->[urxvt::bgdsl::FR_STATE] ||= {};
936 my $again = $frame->[urxvt::bgdsl::FR_AGAIN];
937
938 # don't keep stuff alive
939 Scalar::Util::weaken $state;
940
941 if ($again->{nested}) {
942 $state->{nested} = 1;
943 } else {
944 delete $state->{nested};
945 }
946
947 if (my $interval = $again->{time}) {
948 $state->{time} = [$interval, urxvt::timer->new->after ($interval)->interval ($interval)]
949 if $state->{time}[0] != $interval;
950
951 # callback *might* have changed, although we could just rule that out
952 $state->{time}[1]->cb (sub {
953 ++$state->{counter};
954 $cb->();
955 });
956 } else {
957 delete $state->{time};
958 }
959
960 if ($again->{position}) {
961 $state->{position} = $self->on (position_change => $cb);
962 } else {
963 delete $state->{position};
964 }
965
966 if ($again->{size}) {
967 $state->{size} = $self->on (size_change => $cb);
968 } else {
969 delete $state->{size};
970 }
971
972 if ($again->{rootpmap}) {
973 $state->{rootpmap} = $self->on (rootpmap_change => $cb);
974 } else {
975 delete $state->{rootpmap};
976 }
769} 977}
770 978
771# evaluate the current bg expression 979# evaluate the current bg expression
772sub recalculate { 980sub recalculate {
773 my ($arg_self) = @_; 981 my ($arg_self) = @_;
783 991
784 $arg_self->{next_refresh} = urxvt::NOW + $MIN_INTERVAL; 992 $arg_self->{next_refresh} = urxvt::NOW + $MIN_INTERVAL;
785 993
786 # set environment to evaluate user expression 994 # set environment to evaluate user expression
787 995
788 local $self = $arg_self; 996 local $self = $arg_self;
789
790 local $HOME = $ENV{HOME}; 997 local $HOME = $ENV{HOME};
791 local $old = $self->{state}; 998 local $frame = [];
792 local $new = my $state = $self->{state} = {};
793 999
794 ($x, $y, $w, $h) =
795 $self->background_geometry ($self->{border}); 1000 ($x, $y, $w, $h) = $self->background_geometry ($self->{border});
796 1001
797 # evaluate user expression 1002 # evaluate user expression
798 1003
799 my $img = eval { $self->{expr}->() }; 1004 my @img = eval { $self->{expr}->() };
800 warn $@ if $@;#d# 1005 die $@ if $@;
801 die "background-expr did not return an image.\n" if !UNIVERSAL::isa $img, "urxvt::img"; 1006 die "background-expr did not return anything.\n" unless @img;
1007 die "background-expr: expected image(s), got something else.\n"
1008 if grep { !UNIVERSAL::isa $_, "urxvt::img" } @img;
802 1009
803 $state->{size_sensitive} = 1 1010 my $img = urxvt::bgdsl::merge @img;
1011
1012 $frame->[FR_AGAIN]{size} = 1
804 if $img->repeat_mode != urxvt::RepeatNormal; 1013 if $img->repeat_mode != urxvt::RepeatNormal;
805 1014
806 # if the expression is sensitive to external events, prepare reevaluation then 1015 # if the expression is sensitive to external events, prepare reevaluation then
807 1016 $self->compile_frame ($frame, sub { $arg_self->recalculate });
808 my $repeat;
809
810 if (my $again = $state->{again}) {
811 $repeat = 1;
812 my $self = $self;
813 $state->{timer} = $again == $old->{again}
814 ? $old->{timer}
815 : urxvt::timer->new->after ($again)->interval ($again)->cb (sub {
816 ++$self->{counter};
817 $self->recalculate
818 });
819 }
820
821 if (delete $state->{position_sensitive}) {
822 $repeat = 1;
823 $self->enable (position_change => sub { $_[0]->recalculate });
824 } else {
825 $self->disable ("position_change");
826 }
827
828 if (delete $state->{size_sensitive}) {
829 $repeat = 1;
830 $self->enable (size_change => sub { $_[0]->recalculate });
831 } else {
832 $self->disable ("size_change");
833 }
834
835 if (delete $state->{rootpmap_sensitive}) {
836 $repeat = 1;
837 $self->enable (rootpmap_change => sub { $_[0]->recalculate });
838 } else {
839 $self->disable ("rootpmap_change");
840 }
841 1017
842 # clear stuff we no longer need 1018 # clear stuff we no longer need
843 1019
844 %$old = (); 1020# unless (%{ $frame->[FR_STATE] }) {
845
846 unless ($repeat) {
847 delete $self->{state}; 1021# delete $self->{state};
848 delete $self->{expr}; 1022# delete $self->{expr};
849 } 1023# }
850 1024
851 # set background pixmap 1025 # set background pixmap
852 1026
853 $self->set_background ($img, $self->{border}); 1027 $self->set_background ($img, $self->{border});
854 $self->scr_recolour (0); 1028 $self->scr_recolour (0);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines