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

Comparing rxvt-unicode/src/perl/background (file contents):
Revision 1.26 by root, Thu Jun 7 11:34:09 2012 UTC vs.
Revision 1.30 by root, Thu Jun 7 13:22:06 2012 UTC

…		…
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:%.enable:boolean:some boolean
5	#:META:X_RESOURCE:%.extra.:value:extra config	5	#:META:X_RESOURCE:%.extra.:value:extra config
6		6
		7	our $EXPR;
7	our $EXPR = 'move W * 0.1, -H * 0.1, resize W * 0.5, H * 0.5, repeat_none load "MagnoliaAlpha.png"';	8	#$EXPR = 'move W * 0.1, -H * 0.1, resize W * 0.5, H * 0.5, repeat_none load "opensource.png"';
		9	$EXPR = 'move -TX, -TY, load "argb.png"';
8	#$EXPR = '	10	#$EXPR = '
9	# rotate W, H, 50, 50, counter 1/59.95, repeat_mirror,	11	# rotate W, H, 50, 50, counter 1/59.95, repeat_mirror,
10	# clip X, Y, W, H, repeat_mirror,	12	# clip X, Y, W, H, repeat_mirror,
11	# load "/root/pix/das_fette_schwein.jpg"	13	# load "/root/pix/das_fette_schwein.jpg"
12	#';	14	#';
…		…
16	#resize load "/root/pix/das_fette_schwein.jpg", w, h	18	#resize load "/root/pix/das_fette_schwein.jpg", w, h
17		19
18	use Safe;	20	use Safe;
19		21
20	our ($bgdsl_self, $old, $new);	22	our ($bgdsl_self, $old, $new);
21	our ($l, $t, $w, $h);	23	our ($x, $y, $w, $h);
22		24
23	# enforce at least this interval between updates	25	# enforce at least this interval between updates
24	our $MIN_INTERVAL = 1/100;	26	our $MIN_INTERVAL = 1/100;
25		27
26	{	28	{
27	package urxvt::bgdsl; # background language	29	package urxvt::bgdsl; # background language
28		30
29	# *repeat_empty = \&urxvt::RepeatNone;
30	# *repeat_tile = \&urxvt::RepeatNormal;
31	# *repeat_pad = \&urxvt::RepeatPad;
32	# *repeat_mirror = \&urxvt::RepeatReflect;
33
34	=head2 PROVIDERS/GENERATORS	31	=head2 PROVIDERS/GENERATORS
35		32
36	=over 4	33	=over 4
37		34
38	=item load $path	35	=item load $path
		36
		37	Loads the image at the given C<$path>. The image is set to plane tiling
		38	mode.
		39
		40
39		41
40	=cut	42	=cut
41		43
42	sub load($) {	44	sub load($) {
43	my ($path) = @_;	45	my ($path) = @_;
…		…
62		64
63	=over 4	65	=over 4
64		66
65	=cut	67	=cut
66		68
67	sub X() { $new->{position_sensitive} = 1; $l }	69	sub TX() { $new->{position_sensitive} = 1; $x }
68	sub Y() { $new->{position_sensitive} = 1; $t }	70	sub TY() { $new->{position_sensitive} = 1; $y }
69	sub W() { $new->{size_sensitive} = 1; $w }	71	sub TW() { $new->{size_sensitive} = 1; $w }
70	sub H() { $new->{size_sensitive} = 1; $h }	72	sub TH() { $new->{size_sensitive} = 1; $h }
71		73
72	sub now() { urxvt::NOW }	74	sub now() { urxvt::NOW }
73		75
74	sub again($) {	76	sub again($) {
75	$new->{again} = $_[0];	77	$new->{again} = $_[0];
…		…
80	$bgdsl_self->{counter} + 0	82	$bgdsl_self->{counter} + 0
81	}	83	}
82		84
83	=back	85	=back
84		86
85	=head2 OPERATORS	87	=head2 TILING MODES
		88
		89	The following operators modify the tiling mode of an image, that is, the
		90	way that pixels outside the image area are painted when the image is used.
86		91
87	=over 4	92	=over 4
88		93
89	=cut	94	=item tile $img
90		95
91	# sub clone($) {	96	Tiles the whole plane with the image and returns this new image - or in
92	# $_[0]->clone	97	other words, it returns a copy of the image in plane tiling mode.
93	# }
94		98
95	sub repeat_none($) {	99	=item mirror $img
		100
		101	Similar to tile, but reflects the image each time it uses a new copy, so
		102	that top edges always touch top edges, right edges always touch right
		103	edges and so on (with normal tiling, left edges always touch right edges
		104	and top always touch bottom edges).
		105
		106	=item pad $img
		107
		108	Takes an image and modifies it so that all pixels outside the image area
		109	become transparent. This mode is most useful when you want to place an
		110	image over another image or the background colour while leaving all
		111	background pixels outside the image unchanged.
		112
		113	=item extend $img
		114
		115	Extends the image over the whole plane, using the closest pixel in the
		116	area outside the image. This mode is mostly useful when you more complex
		117	filtering operations and want the pixels outside the image to have the
		118	same values as the pixels near the edge.
		119
		120	=cut
		121
		122	sub pad($) {
96	my $img = $_[0]->clone;	123	my $img = $_[0]->clone;
97	$img->repeat_mode (urxvt::RepeatNone);	124	$img->repeat_mode (urxvt::RepeatNone);
98	$img	125	$img
99	}	126	}
100		127
		128	sub tile($) {
		129	my $img = $_[0]->clone;
		130	$img->repeat_mode (urxvt::RepeatNormal);
		131	$img
		132	}
		133
		134	sub mirror($) {
		135	my $img = $_[0]->clone;
		136	$img->repeat_mode (urxvt::RepeatReflect);
		137	$img
		138	}
		139
		140	sub extend($) {
		141	my $img = $_[0]->clone;
		142	$img->repeat_mode (urxvt::RepeatPad);
		143	$img
		144	}
		145
		146	=back
		147
		148	=head2 PIXEL OPERATORS
		149
		150	The following operators modify the image pixels in various ways.
		151
		152	=over 4
		153
		154	=item clone $img
		155
		156	Returns an exact copy of the image.
		157
		158	=cut
		159
		160	sub clone($) {
		161	$_[0]->clone
		162	}
		163
		164	=item clip $img
		165
		166	=item clip $width, $height, $img
		167
		168	=item clip $x, $y, $width, $height, $img
		169
		170	Clips an image to the given rectangle. If the rectangle is outside the
		171	image area (e.g. when C<$x> or C<$y> are negative) or the rectangle is
		172	larger than the image, then the tiling mode defines how the extra pixels
		173	will be filled.
		174
		175	If C<$x> an C<$y> are missing, then C<0> is assumed for both.
		176
		177	If C<$width> and C<$height> are missing, then the window size will be
		178	assumed.
		179
		180	Example: load an image, blur it, and clip it to the window size to save
		181	memory.
		182
		183	clip blur 10, load "mybg.png"
		184
		185	=cut
		186
101	sub clip($;$$;$$) {	187	sub clip($;$$;$$) {
102	my $img = pop;	188	my $img = pop;
103	my $h = pop \|\| H;	189	my $h = pop \|\| TH;
104	my $w = pop \|\| W;	190	my $w = pop \|\| TW;
105	$img->sub_rect ($_[0], $_[1], $w, $h)	191	$img->sub_rect ($_[0], $_[1], $w, $h)
106	}	192	}
107		193
		194	=item scale $img
		195
		196	=item scale $size_percent, $img
		197
		198	=item scale $width_percent, $height_percent, $img
		199
		200	Scales the image by the given percentages in horizontal
		201	(C<$width_percent>) and vertical (C<$height_percent>) direction.
		202
		203	If only one percentage is give, it is used for both directions.
		204
		205	If no percentages are given, scales the image to the window size without
		206	keeping aspect.
		207
		208	=item resize $width, $height, $img
		209
		210	Resizes the image to exactly C<$width> times C<$height> pixels.
		211
		212	=cut
		213
		214	#TODO: maximise, maximise_fill?
		215
		216	sub scale($$$) {
		217	my $img = pop;
		218
		219	@_ == 2 ? $img->scale ($_[0] * $img->w * 0.01, $_[1] * $img->h * 0.01)
		220	: @_ ? $img->scale ($_[0] * $img->w * 0.01, $_[0] * $img->h * 0.01)
		221	: $img->scale (TW, TH)
		222	}
		223
108	sub resize($$$) {	224	sub resize($$$) {
109	my $img = pop;	225	my $img = pop;
110	$img->scale ($_[0], $_[1])	226	$img->scale ($_[0], $_[1])
111	}	227	}
112		228
113	# TODO: ugly
114	sub move($$;$) {	229	sub move($$;$) {
115	my $img = pop->clone;	230	my $img = pop->clone;
116	$img->move ($_[0], $_[1]);	231	$img->move ($_[0], $_[1]);
117	$img	232	$img
118	# my $img = pop;
119	# $img->sub_rect (
120	# $_[0], $_[1],
121	# $img->w, $img->h,
122	# $_[2],
123	# )
124	}	233	}
125		234
126	sub rotate($$$$$$) {	235	sub rotate($$$$$$) {
127	my $img = pop;	236	my $img = pop;
128	$img->rotate (	237	$img->rotate (
…		…
132	$_[3] * $img->h * .01,	241	$_[3] * $img->h * .01,
133	$_[4] * (3.14159265 / 180),	242	$_[4] * (3.14159265 / 180),
134	)	243	)
135	}	244	}
136		245
137	sub blur($$$) {	246	sub blur($$;$) {
138	my ($rh, $rv, $img) = @_;	247	my $img = pop;
139		248	$img->blur ($_[0], @_ >= 2 ? $_[1] : $_[0])
140	$img->blur ($rh, $rv);
141	}	249	}
142		250
143	sub contrast($$;$$;$) {	251	sub contrast($$;$$;$) {
144	my $img = pop;	252	my $img = pop;
145	my ($r, $g, $b, $a) = @_;	253	my ($r, $g, $b, $a) = @_;
…		…
204	local $bgdsl_self = $self;	312	local $bgdsl_self = $self;
205		313
206	local $old = $self->{state};	314	local $old = $self->{state};
207	local $new = my $state = $self->{state} = {};	315	local $new = my $state = $self->{state} = {};
208		316
		317	my $border = 0; #d#
		318
209	($l, $t, $w, $h) =	319	($x, $y, $w, $h) =
210	$self->get_geometry;	320	$self->background_geometry ($border);
211
212	warn "$l,$t,$w,$h\n";#d#
213		321
214	# evaluate user expression	322	# evaluate user expression
215		323
216	my $img = eval { $self->{expr}->() };	324	my $img = eval { $self->{expr}->() };
217	warn $@ if $@;#d#	325	warn $@ if $@;#d#
…		…
264	# prepare and set background pixmap	372	# prepare and set background pixmap
265		373
266	$img = $img->sub_rect (0, 0, $w, $h)	374	$img = $img->sub_rect (0, 0, $w, $h)
267	if $img->w != $w \|\| $img->h != $h;	375	if $img->w != $w \|\| $img->h != $h;
268		376
269	$self->set_background ($img);	377	$self->set_background ($img, $border);
270	$self->scr_recolour (0);	378	$self->scr_recolour (0);
271	$self->want_refresh;	379	$self->want_refresh;
272	}	380	}
273		381
274	sub on_start {	382	sub on_start {

Diff Legend

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

Comparing rxvt-unicode/src/perl/background (file contents): Revision 1.26 by root, Thu Jun 7 11:34:09 2012 UTC vs. Revision 1.30 by root, Thu Jun 7 13:22:06 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/perl/background (file contents):
Revision 1.26 by root, Thu Jun 7 11:34:09 2012 UTC vs.
Revision 1.30 by root, Thu Jun 7 13:22:06 2012 UTC