[ViewVC] Diff of: cvs/rxvt-unicode/src/perl/background

Comparing rxvt-unicode/src/perl/background (file contents):
Revision 1.28 by root, Thu Jun 7 12:56:27 2012 UTC vs.
Revision 1.38 by root, Fri Jun 8 21:48:07 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:%.enable:boolean:some boolean	4	#:META:X_RESOURCE:%.border.:boolean:respect the terminal border
5	#:META:X_RESOURCE:%.extra.:value:extra config
6		5
		6	#TODO: once, rootalign
		7
		8	=head1 background - manage terminal background
		9
		10	=head2 SYNOPSIS
		11
		12	urxvt --background-expr 'background expression'
		13	--background-border
		14
		15	=head2 DESCRIPTION
		16
		17	This extension manages the terminal background by creating a picture that
		18	is behind the text, replacing the normal background colour.
		19
		20	It does so by evaluating a Perl expression that I<calculates> the image on
		21	the fly, for example, by grabbing the root background or loading a file.
		22
		23	While the full power of Perl is available, the operators have been design
		24	to be as simple as possible.
		25
		26	For example, to load an image and scale it to the window size, you would
		27	use:
		28
		29	urxvt --background-expr 'scale load "/path/to/mybg.png"'
		30
		31	Or specified as a X resource:
		32
		33	URxvt.background-expr: scale load "/path/to/mybg.png"
		34
		35	=head2 THEORY OF OPERATION
		36
		37	At startup, just before the window is mapped for the first time, the
		38	expression is evaluated and must yield an image. The image is then
		39	extended as necessary to cover the whole terminal window, and is set as a
		40	background pixmap.
		41
		42	If the image contains an alpha channel, then it will be used as-is in
		43	visuals that support alpha channels (for example, for a compositing
		44	manager). In other visuals, the terminal background colour will be used to
		45	replace any transparency.
		46
		47	When the expression relies, directly or indirectly, on the window size,
		48	position, the root pixmap, or a timer, then it will be remembered. If not,
		49	then it will be removed.
		50
		51	If any of the parameters that the expression relies on changes (when the
		52	window is moved or resized, its position or size changes; when the root
		53	pixmap is replaced by another one the root background changes; or when the
		54	timer elapses), then the expression will be evaluated again.
		55
		56	For example, an expression such as C<scale load "$HOME/mybg.png"> scales the
		57	image to the window size, so it relies on the window size and will
		58	be reevaluated each time it is changed, but not when it moves for
		59	example. That ensures that the picture always fills the terminal, even
		60	after it's size changes.
		61
		62	=head3 EXPRESSIONS
		63
		64	Expressions are normal Perl expressions, in fact, they are Perl blocks -
		65	which means you could use multiple lines and statements:
		66
		67	again 3600;
		68	if (localtime now)[6]) {
		69	return scale load "$HOME/weekday.png";
		70	} else {
		71	return scale load "$HOME/sunday.png";
		72	}
		73
		74	This expression gets evaluated once per hour. It will set F<sunday.png> as
		75	background on sundays, and F<weekday.png> on all other days.
		76
		77	Fortunately, we expect that most expressions will be much simpler, with
		78	little Perl knowledge needed.
		79
		80	Basically, you always start with a function that "generates" an image
		81	object, such as C<load>, which loads an image from disk, or C<root>, which
		82	returns the root window background image:
		83
		84	load "$HOME/mypic.png"
		85
		86	The path is usually specified as a quoted string (the exact rules can be
		87	found in the L<perlop> manpage). The F<$HOME> at the beginning of the
		88	string is expanded to the home directory.
		89
		90	Then you prepend one or more modifiers or filtering expressions, such as
		91	C<scale>:
		92
		93	scale load "$HOME/mypic.png"
		94
		95	Just like a mathematical expression with functions, you should read these
		96	expressions from right to left, as the C<load> is evaluated first, and
		97	its result becomes the argument to the C<scale> function.
		98
		99	Many operators also allow some parameters preceding the input image
		100	that modify its behaviour. For example, C<scale> without any additional
		101	arguments scales the image to size of the terminal window. If you specify
		102	an additional argument, it uses it as a percentage:
		103
		104	scale 200, load "$HOME/mypic.png"
		105
		106	This enlarges the image by a factor of 2 (200%). As you can see, C<scale>
		107	has now two arguments, the C<200> and the C<load> expression, while
		108	C<load> only has one argument. Arguments are separated from each other by
		109	commas.
		110
		111	Scale also accepts two arguments, which are then separate factors for both
		112	horizontal and vertical dimensions. For example, this halves the image
		113	width and doubles the image height:
		114
		115	scale 50, 200, load "$HOME/mypic.png"
		116
		117	TODO
		118
		119	=head3 CYCLES AND CACHING
		120
		121	TODO
		122
		123	Each time the expression is reevaluated, a new cycle is said to have begun. Many operators
		124	cache their results till the next cycle. For example
		125
		126	=head2 REFERENCE
		127
		128	=head3 COMMAND LINE SWITCHES
		129
		130	=over 4
		131
		132	=item --background-expr perl-expression
		133
		134	Specifies the Perl expression to evaluate.
		135
		136	=item --background-border
		137
		138	By default, the expression creates an image that fills the full window,
		139	overwriting borders and any other areas, such as the scrollbar.
		140
		141	Specifying this flag changes the behaviour, so that the image only
		142	replaces the background of the character area.
		143
		144	=back
		145
		146	=cut
		147
7	our $EXPR;	148	our $EXPR;#d#
8	#$EXPR = 'move W * 0.1, -H * 0.1, resize W * 0.5, H * 0.5, repeat_none load "opensource.png"';	149	#$EXPR = 'move W * 0.1, -H * 0.1, resize W * 0.5, H * 0.5, repeat_none load "opensource.png"';
9	$EXPR = 'border; move -X, -Y, load "argb.png"';	150	$EXPR = 'move -TX, -TY, load "argb.png"';
10	#$EXPR = '	151	#$EXPR = '
11	# rotate W, H, 50, 50, counter 1/59.95, repeat_mirror,	152	# rotate W, H, 50, 50, counter 1/59.95, repeat_mirror,
12	# clip X, Y, W, H, repeat_mirror,	153	# clip X, Y, W, H, repeat_mirror,
13	# load "/root/pix/das_fette_schwein.jpg"	154	# load "/root/pix/das_fette_schwein.jpg"
14	#';	155	#';
15	#$EXPR = 'solid "red"';	156	#$EXPR = 'solid "red"';
16	#$EXPR = 'blur root, 10, 10'	157	#$EXPR = 'blur root, 10, 10'
17	#$EXPR = 'blur move (root, -x, -y), 5, 5'	158	#$EXPR = 'blur move (root, -x, -y), 5, 5'
18	#resize load "/root/pix/das_fette_schwein.jpg", w, h	159	#resize load "/root/pix/das_fette_schwein.jpg", w, h
19		160
20	use Safe;	161	our $HOME;
21
22	our $border;
23	our ($bgdsl_self, $old, $new);	162	our ($self, $old, $new);
24	our ($l, $t, $w, $h);	163	our ($x, $y, $w, $h);
25		164
26	# enforce at least this interval between updates	165	# enforce at least this interval between updates
27	our $MIN_INTERVAL = 1/100;	166	our $MIN_INTERVAL = 1/100;
28		167
29	{	168	{
30	package urxvt::bgdsl; # background language	169	package urxvt::bgdsl; # background language
31		170
32	# *repeat_empty = \&urxvt::RepeatNone;
33	# *repeat_tile = \&urxvt::RepeatNormal;
34	# *repeat_pad = \&urxvt::RepeatPad;
35	# *repeat_mirror = \&urxvt::RepeatReflect;
36
37	=head2 PROVIDERS/GENERATORS	171	=head2 PROVIDERS/GENERATORS
38		172
		173	These functions provide an image, by loading it from disk, grabbing it
		174	from the root screen or by simply generating it. They are used as starting
		175	points to get an image you can play with.
		176
39	=over 4	177	=over 4
40		178
41	=item load $path	179	=item load $path
		180
		181	Loads the image at the given C<$path>. The image is set to plane tiling
		182	mode.
		183
		184	Loaded images will be cached for one cycle.
42		185
43	=cut	186	=cut
44		187
45	sub load($) {	188	sub load($) {
46	my ($path) = @_;	189	my ($path) = @_;
47		190
48	$new->{load}{$path} = $old->{load}{$path} \|\| $bgdsl_self->new_img_from_file ($path);	191	$new->{load}{$path} = $old->{load}{$path} \|\| $self->new_img_from_file ($path);
49	}	192	}
		193
		194	=item root
		195
		196	Returns the root window pixmap, that is, hopefully, the background image
		197	of your screen. The image is set to extend mode.
		198
		199	This function makes your expression root sensitive, that means it will be
		200	reevaluated when the bg image changes.
		201
		202	=cut
50		203
51	sub root() {	204	sub root() {
52	$new->{rootpmap_sensitive} = 1;	205	$new->{rootpmap_sensitive} = 1;
53	die "root op not supported, exg, we need you";	206	die "root op not supported, exg, we need you";
54	}	207	}
55		208
		209	=item solid $colour
		210
		211	=item solid $width, $height, $colour
		212
		213	Creates a new image and completely fills it with the given colour. The
		214	image is set to tiling mode.
		215
		216	If <$width> and C<$height> are omitted, it creates a 1x1 image, which is
		217	useful for solid backgrounds or for use in filtering effects.
		218
		219	=cut
		220
56	sub solid($;$$) {	221	sub solid($$;$) {
		222	my $colour = pop;
		223
57	my $img = $bgdsl_self->new_img (urxvt::PictStandardARGB32, $_[1] \|\| 1, $_[2] \|\| 1);	224	my $img = $self->new_img (urxvt::PictStandardARGB32, $_[0] \|\| 1, $_[1] \|\| 1);
58	$img->fill ($_[0]);	225	$img->fill ($colour);
59	$img	226	$img
60	}	227	}
61		228
62	=back	229	=back
63		230
64	=head2 VARIABLES	231	=head2 VARIABLES
65		232
		233	The following functions provide variable data such as the terminal
		234	window dimensions. Most of them make your expression sensitive to some
		235	events, for example using C<TW> (terminal width) means your expression is
		236	evaluated again when the terminal is resized.
		237
66	=over 4	238	=over 4
67		239
68	=cut	240	=item TX
69		241
		242	=item TY
		243
		244	Return the X and Y coordinates of the terminal window (the terminal
		245	window is the full window by default, and the character area only when in
		246	border-respect mode).
		247
		248	Using these functions make your expression sensitive to window moves.
		249
		250	These functions are mainly useful to align images to the root window.
		251
		252	Example: load an image and align it so it looks as if anchored to the
		253	background.
		254
		255	move -TX, -TY, load "mybg.png"
		256
		257	=item TW
		258
		259	Return the width (C<TW>) and height (C<TH>) of the terminal window (the
		260	terminal window is the full window by default, and the character area only
		261	when in border-respect mode).
		262
		263	Using these functions make your expression sensitive to window resizes.
		264
		265	These functions are mainly useful to scale images, or to clip images to
		266	the window size to conserve memory.
		267
		268	Example: take the screen background, clip it to the window size, blur it a
		269	bit, align it to the window position and use it as background.
		270
		271	clip move -TX, -TY, blur 5, root
		272
		273	=cut
		274
70	sub X() { $new->{position_sensitive} = 1; $l }	275	sub TX() { $new->{position_sensitive} = 1; $x }
71	sub Y() { $new->{position_sensitive} = 1; $t }	276	sub TY() { $new->{position_sensitive} = 1; $y }
72	sub W() { $new->{size_sensitive} = 1; $w }	277	sub TW() { $new->{size_sensitive} = 1; $w }
73	sub H() { $new->{size_sensitive} = 1; $h }	278	sub TH() { $new->{size_sensitive} = 1; $h }
		279
		280	=item now
		281
		282	Returns the current time as (fractional) seconds since the epoch.
		283
		284	Using this expression does I<not> make your expression sensitive to time,
		285	but the next two functions do.
		286
		287	=item again $seconds
		288
		289	When this function is used the expression will be reevaluated again in
		290	C<$seconds> seconds.
		291
		292	Example: load some image and rotate it according to the time of day (as if it were
		293	the hour pointer of a clock). Update this image every minute.
		294
		295	again 60; rotate TW, TH, 50, 50, (now % 86400) * -720 / 86400, scale load "myclock.png"
		296
		297	=item counter $seconds
		298
		299	Like C<again>, but also returns an increasing counter value, starting at
		300	0, which might be useful for some simple animation effects.
		301
		302	=cut
74		303
75	sub now() { urxvt::NOW }	304	sub now() { urxvt::NOW }
76		305
77	sub again($) {	306	sub again($) {
78	$new->{again} = $_[0];	307	$new->{again} = $_[0];
79	}	308	}
80		309
81	sub counter($) {	310	sub counter($) {
82	$new->{again} = $_[0];	311	$new->{again} = $_[0];
83	$bgdsl_self->{counter} + 0	312	$self->{counter} + 0
84	}	313	}
85		314
86	=back	315	=back
87		316
88	=head2 TILING MODES	317	=head2 TILING MODES
94		323
95	=item tile $img	324	=item tile $img
96		325
97	Tiles the whole plane with the image and returns this new image - or in	326	Tiles the whole plane with the image and returns this new image - or in
98	other words, it returns a copy of the image in plane tiling mode.	327	other words, it returns a copy of the image in plane tiling mode.
		328
		329	Example: load an image and tile it over the background, without
		330	resizing. The C<tile> call is superfluous because C<load> already defaults
		331	to tiling mode.
		332
		333	tile load "mybg.png"
99		334
100	=item mirror $img	335	=item mirror $img
101		336
102	Similar to tile, but reflects the image each time it uses a new copy, so	337	Similar to tile, but reflects the image each time it uses a new copy, so
103	that top edges always touch top edges, right edges always touch right	338	that top edges always touch top edges, right edges always touch right
104	edges and so on (with normal tiling, left edges always touch right edges	339	edges and so on (with normal tiling, left edges always touch right edges
105	and top always touch bottom edges).	340	and top always touch bottom edges).
106		341
		342	Example: load an image and mirror it over the background, avoiding sharp
		343	edges at the image borders at the expense of mirroring the image itself
		344
		345	mirror load "mybg.png"
		346
107	=item pad $img	347	=item pad $img
108		348
109	Takes an image and modifies it so that all pixels outside the image area	349	Takes an image and modifies it so that all pixels outside the image area
110	become transparent. This mode is most useful when you want to place an	350	become transparent. This mode is most useful when you want to place an
111	image over another image or the background colour while leaving all	351	image over another image or the background colour while leaving all
112	background pixels outside the image unchanged.	352	background pixels outside the image unchanged.
113		353
		354	Example: load an image and display it in the upper left corner. The rest
		355	of the space is left "empty" (transparent or wahtever your compisotr does
		356	in alpha mode, else background colour).
		357
		358	pad load "mybg.png"
		359
114	=item extend $img	360	=item extend $img
115		361
116	Extends the image over the whole plane, using the closest pixel in the	362	Extends the image over the whole plane, using the closest pixel in the
117	area outside the image. This mode is mostly useful when you more complex	363	area outside the image. This mode is mostly useful when you more complex
118	filtering operations and want the pixels outside the image to have the	364	filtering operations and want the pixels outside the image to have the
119	same values as the pixels near the edge.	365	same values as the pixels near the edge.
120		366
		367	Example: just for curiosity, how does this pixel extension stuff work?
		368
		369	extend move 50, 50, load "mybg.png"
		370
121	=cut	371	=cut
122		372
123	sub pad($) {	373	sub pad($) {
124	my $img = $_[0]->clone;	374	my $img = $_[0]->clone;
125	$img->repeat_mode (urxvt::RepeatNone);	375	$img->repeat_mode (urxvt::RepeatNone);
…		…
185		435
186	=cut	436	=cut
187		437
188	sub clip($;$$;$$) {	438	sub clip($;$$;$$) {
189	my $img = pop;	439	my $img = pop;
190	my $h = pop \|\| H;	440	my $h = pop \|\| TH;
191	my $w = pop \|\| W;	441	my $w = pop \|\| TW;
192	$img->sub_rect ($_[0], $_[1], $w, $h)	442	$img->sub_rect ($_[0], $_[1], $w, $h)
193	}	443	}
194		444
195	=item scale $img	445	=item scale $img
196		446
…		…
212		462
213	=cut	463	=cut
214		464
215	#TODO: maximise, maximise_fill?	465	#TODO: maximise, maximise_fill?
216		466
217	sub scale($$$) {	467	sub scale($;$;$) {
218	my $img = pop;	468	my $img = pop;
219		469
220	@_ == 2 ? $img->scale ($_[0] * $img->w * 0.01, $_[1] * $img->h * 0.01)	470	@_ == 2 ? $img->scale ($_[0] * $img->w * 0.01, $_[1] * $img->h * 0.01)
221	: @_ ? $img->scale ($_[0] * $img->w * 0.01, $_[0] * $img->h * 0.01)	471	: @_ ? $img->scale ($_[0] * $img->w * 0.01, $_[0] * $img->h * 0.01)
222	: $img->scale (W, H)	472	: $img->scale (TW, TH)
223	}	473	}
224		474
225	sub resize($$$) {	475	sub resize($$$) {
226	my $img = pop;	476	my $img = pop;
227	$img->scale ($_[0], $_[1])	477	$img->scale ($_[0], $_[1])
228	}	478	}
229		479
230	# TODO: ugly	480	=item move $dx, $dy, $img
		481
		482	Moves the image by C<$dx> pixels in the horizontal, and C<$dy> pixels in
		483	the vertical.
		484
		485	Example: move the image right by 20 pixels and down by 30.
		486
		487	move 20, 30, ...
		488
		489	=item rootalign $img
		490
		491	Moves the image so that it appears glued to the screen as opposed to the
		492	window. This gives the illusion of a larger area behind the window. It is
		493	exactly equivalent to C<move -TX, -TY>, that is, it moves the image to the
		494	top left of the screen.
		495
		496	Example: load a background image, put it in mirror mode and root align it.
		497
		498	rootalign mirror load "mybg.png"
		499
		500	Example: take the screen background and align it, giving the illusion of
		501	transparency as long as the window isn't in front of other windows.
		502
		503	rootalign root
		504
		505	=cut
		506
231	sub move($$;$) {	507	sub move($$;$) {
232	my $img = pop->clone;	508	my $img = pop->clone;
233	$img->move ($_[0], $_[1]);	509	$img->move ($_[0], $_[1]);
234	$img	510	$img
		511	}
		512
		513	sub rootalign($) {
		514	move -TX, -TY, $_[0]
		515	}
		516
		517	=item contrast $factor, $img
		518
		519	=item contrast $r, $g, $b, $img
		520
		521	=item contrast $r, $g, $b, $a, $img
		522
		523	Adjusts the I<contrast> of an image.
		524
		525	#TODO#
		526
		527	=item brightness $factor, $img
		528
		529	=item brightness $r, $g, $b, $img
		530
		531	=item brightness $r, $g, $b, $a, $img
		532
		533	Adjusts the brightness of an image.
		534
		535	=cut
		536
		537	sub contrast($$;$$;$) {
235	# my $img = pop;	538	my $img = pop;
236	# $img->sub_rect (	539	my ($r, $g, $b, $a) = @_;
237	# $_[0], $_[1],	540
238	# $img->w, $img->h,	541	($g, $b) = ($r, $r) if @_ < 4;
239	# $_[2],	542	$a = 1 if @_ < 5;
240	# )	543
		544	$img = $img->clone;
		545	$img->contrast ($r, $g, $b, $a);
		546	$img
241	}	547	}
		548
		549	sub brightness($$;$$;$) {
		550	my $img = pop;
		551	my ($r, $g, $b, $a) = @_;
		552
		553	($g, $b) = ($r, $r) if @_ < 4;
		554	$a = 1 if @_ < 5;
		555
		556	$img = $img->clone;
		557	$img->brightness ($r, $g, $b, $a);
		558	$img
		559	}
		560
		561	=item blur $radius, $img
		562
		563	=item blur $radius_horz, $radius_vert, $img
		564
		565	Gaussian-blurs the image with (roughly) C<$radius> pixel radius. The radii
		566	can also be specified separately.
		567
		568	=cut
		569
		570	sub blur($$;$) {
		571	my $img = pop;
		572	$img->blur ($_[0], @_ >= 2 ? $_[1] : $_[0])
		573	}
		574
		575	=item rotate $new_width, $new_height, $center_x, $center_y, $degrees
		576
		577	Rotates the image by C<$degrees> degrees, counter-clockwise, around the
		578	pointer at C<$center_x> and C<$center_y> (specified as percentage of image
		579	width/height), generating a new image with width C<$new_width> and height
		580	C<$new_height>.
		581
		582	#TODO# new width, height, maybe more operators?
		583
		584	Example: rotate the image by 90 degrees
		585
		586	=cut
242		587
243	sub rotate($$$$$$) {	588	sub rotate($$$$$$) {
244	my $img = pop;	589	my $img = pop;
245	$img->rotate (	590	$img->rotate (
246	$_[0],	591	$_[0],
…		…
249	$_[3] * $img->h * .01,	594	$_[3] * $img->h * .01,
250	$_[4] * (3.14159265 / 180),	595	$_[4] * (3.14159265 / 180),
251	)	596	)
252	}	597	}
253		598
254	sub blur($$;$) {
255	my $img = pop;
256
257	$img->blur ($_[0], @_ >= 2 ? $_[1] : $_[0]);
258	}
259
260	sub contrast($$;$$;$) {
261	my $img = pop;
262	my ($r, $g, $b, $a) = @_;
263
264	($g, $b) = ($r, $r) if @_ < 4;
265	$a = 1 if @_ < 5;
266
267	$img = $img->clone;
268	$img->contrast ($r, $g, $b, $a);
269	$img
270	}
271
272	sub brightness($$;$$;$) {
273	my $img = pop;
274	my ($r, $g, $b, $a) = @_;
275
276	($g, $b) = ($r, $r) if @_ < 4;
277	$a = 1 if @_ < 5;
278
279	$img = $img->clone;
280	$img->brightness ($r, $g, $b, $a);
281	$img
282	}
283
284	=back
285
286	=head2 SETTINGS
287
288	=over 4
289
290	=item border $respect_border=1
291
292	Sets whether the image should respect the terminal border (argument true
293	or missing), or whether it should fill the whole window (the default).
294
295	By default, the image will cover the whole toplevel window. If C<border>
296	is enabled, then it will only fill the character area and leave a normal
297	border in the background colour around it and behind the scrollbar.
298
299	=cut
300
301	sub border {
302	$border = @_ ? $_[0] : 1;
303	}
304
305	=back	599	=back
306		600
307	=cut	601	=cut
308		602
309	}	603	}
…		…
322	$self->recalculate;	616	$self->recalculate;
323	}	617	}
324		618
325	# evaluate the current bg expression	619	# evaluate the current bg expression
326	sub recalculate {	620	sub recalculate {
327	my ($self) = @_;	621	my ($arg_self) = @_;
328		622
329	# rate limit evaluation	623	# rate limit evaluation
330		624
331	if ($self->{next_refresh} > urxvt::NOW) {	625	if ($arg_self->{next_refresh} > urxvt::NOW) {
332	$self->{next_refresh_timer} = urxvt::timer->new->after ($self->{next_refresh} - urxvt::NOW)->cb (sub {	626	$arg_self->{next_refresh_timer} = urxvt::timer->new->after ($arg_self->{next_refresh} - urxvt::NOW)->cb (sub {
333	$self->recalculate;	627	$arg_self->recalculate;
334	});	628	});
335	return;	629	return;
336	}	630	}
337		631
338	$self->{next_refresh} = urxvt::NOW + $MIN_INTERVAL;	632	$arg_self->{next_refresh} = urxvt::NOW + $MIN_INTERVAL;
339		633
340	# set environment to evaluate user expression	634	# set environment to evaluate user expression
341		635
342	local $bgdsl_self = $self;	636	local $self = $arg_self;
343	local $border;
344		637
		638	local $HOME = $ENV{HOME};
345	local $old = $self->{state};	639	local $old = $self->{state};
346	local $new = my $state = $self->{state} = {};	640	local $new = my $state = $self->{state} = {};
347		641
348	($l, $t, $w, $h) =	642	($x, $y, $w, $h) =
349	$self->get_geometry;	643	$self->background_geometry ($self->{border});
350
351	warn "$l,$t,$w,$h\n";#d#
352		644
353	# evaluate user expression	645	# evaluate user expression
354		646
355	my $img = eval { $self->{expr}->() };	647	my $img = eval { $self->{expr}->() };
356	warn $@ if $@;#d#	648	warn $@ if $@;#d#
357	die if !UNIVERSAL::isa $img, "urxvt::img";	649	die if !UNIVERSAL::isa $img, "urxvt::img";
358		650
		651	$state->{size_sensitive} = 1
		652	if $img->repeat_mode != urxvt::RepeatNormal;
		653
359	# if the expression is sensitive to external events, prepare reevaluation then	654	# if the expression is sensitive to external events, prepare reevaluation then
360		655
361	my $repeat;	656	my $repeat;
362		657
363	if (my $again = $state->{again}) {	658	if (my $again = $state->{again}) {
364	$repeat = 1;	659	$repeat = 1;
		660	my $self = $self;
365	$state->{timer} = $again == $old->{again}	661	$state->{timer} = $again == $old->{again}
366	? $old->{timer}	662	? $old->{timer}
367	: urxvt::timer->new->after ($again)->interval ($again)->cb (sub {	663	: urxvt::timer->new->after ($again)->interval ($again)->cb (sub {
368	++$self->{counter};	664	++$self->{counter};
369	$self->recalculate	665	$self->recalculate
…		…
398	unless ($repeat) {	694	unless ($repeat) {
399	delete $self->{state};	695	delete $self->{state};
400	delete $self->{expr};	696	delete $self->{expr};
401	}	697	}
402		698
403	# prepare and set background pixmap	699	# set background pixmap
404		700
405	$img = $img->sub_rect (0, 0, $w, $h)
406	if $img->w != $w \|\| $img->h != $h;
407
408	$self->set_background ($img, $border);	701	$self->set_background ($img, $self->{border});
409	$self->scr_recolour (0);	702	$self->scr_recolour (0);
410	$self->want_refresh;	703	$self->want_refresh;
411	}	704	}
412		705
413	sub on_start {	706	sub on_start {
414	my ($self) = @_;	707	my ($self) = @_;
415		708
		709	my $expr = $self->x_resource ("background.expr")
		710	or return;
		711
416	$self->set_expr (parse_expr $EXPR);	712	$self->set_expr (parse_expr $expr);
		713	$self->{border} = $self->x_resource_boolean ("background.border");
417		714
418	()	715	()
419	}	716	}
420		717

Diff Legend

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

Comparing rxvt-unicode/src/perl/background (file contents): Revision 1.28 by root, Thu Jun 7 12:56:27 2012 UTC vs. Revision 1.38 by root, Fri Jun 8 21:48:07 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/perl/background (file contents):
Revision 1.28 by root, Thu Jun 7 12:56:27 2012 UTC vs.
Revision 1.38 by root, Fri Jun 8 21:48:07 2012 UTC