--- rxvt-unicode/src/perl/background 2012/06/06 20:55:37 1.19 +++ rxvt-unicode/src/perl/background 2012/06/07 11:30:20 1.25 @@ -4,7 +4,7 @@ #:META:X_RESOURCE:%.enable:boolean:some boolean #:META:X_RESOURCE:%.extra.:value:extra config -our $EXPR = 'move X, Y, load "MagnoliaAlpha.png"'; +our $EXPR = 'repeat_none move W * 0.1, -H * 0.1, resize W * 0.5, H * 0.5, load "MagnoliaAlpha.png"'; #$EXPR = ' # rotate W, H, 50, 50, counter 1/59.95, repeat_mirror, # clip X, Y, W, H, repeat_mirror, @@ -26,10 +26,10 @@ { package urxvt::bgdsl; # background language - *repeat_empty = \&urxvt::RepeatNone; - *repeat_tile = \&urxvt::RepeatNormal; - *repeat_pad = \&urxvt::RepeatPad; - *repeat_mirror = \&urxvt::RepeatReflect; +# *repeat_empty = \&urxvt::RepeatNone; +# *repeat_tile = \&urxvt::RepeatNormal; +# *repeat_pad = \&urxvt::RepeatPad; +# *repeat_mirror = \&urxvt::RepeatReflect; =head2 PROVIDERS/GENERATORS @@ -58,6 +58,30 @@ =back +=head2 VARIABLES + +=over 4 + +=cut + + sub X() { $new->{position_sensitive} = 1; $l } + sub Y() { $new->{position_sensitive} = 1; $t } + sub W() { $new->{size_sensitive} = 1; $w } + sub H() { $new->{size_sensitive} = 1; $h } + + sub now() { urxvt::NOW } + + sub again($) { + $new->{again} = $_[0]; + } + + sub counter($) { + $new->{again} = $_[0]; + $bgdsl_self->{counter} + 0 + } + +=back + =head2 OPERATORS =over 4 @@ -68,9 +92,17 @@ # $_[0]->clone # } - sub clip($$$$$;$) { + sub repeat_none($) { + my $img = $_[0]->clone; + $img->repeat_mode (urxvt::RepeatNone); + $img + } + + sub clip($;$$;$$) { my $img = pop; - $img->sub_rect ($_[0], $_[1], $_[2], $_[3], $_[4]) + my $h = pop || H; + my $w = pop || W; + $img->sub_rect ($_[0], $_[1], $w, $h) } sub resize($$$) { @@ -80,15 +112,18 @@ # TODO: ugly sub move($$;$) { - my $img = pop; - $img->sub_rect ( - $_[0], $_[1], - $img->w, $img->h, - $_[2], - ) + my $img = pop->clone; + $img->move ($_[0], $_[1]); + $img +# my $img = pop; +# $img->sub_rect ( +# $_[0], $_[1], +# $img->w, $img->h, +# $_[2], +# ) } - sub rotate($$$$$$;$) { + sub rotate($$$$$$) { my $img = pop; $img->rotate ( $_[0], @@ -96,7 +131,6 @@ $_[2] * $img->w * .01, $_[3] * $img->h * .01, $_[4] * (3.14159265 / 180), - $_[5], ) } @@ -130,22 +164,6 @@ $img } - sub X() { $new->{position_sensitive} = 1; $l } - sub Y() { $new->{position_sensitive} = 1; $t } - sub W() { $new->{size_sensitive} = 1; $w } - sub H() { $new->{size_sensitive} = 1; $h } - - sub now() { urxvt::NOW } - - sub again($) { - $new->{again} = $_[0]; - } - - sub counter($) { - $new->{again} = $_[0]; - $bgdsl_self->{counter} + 0 - } - =back =cut @@ -191,6 +209,8 @@ ($l, $t, $w, $h) = $self->get_geometry; + warn "$l,$t,$w,$h\n";#d# + # evaluate user expression my $img = eval { $self->{expr}->() };