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.92 by sf-exg, Thu Jul 14 05:33:26 2016 UTC vs.
Revision 1.95 by root, Tue Sep 17 17:29:16 2019 UTC

1396 $bg_opts->{root_align} = 1; 1396 $bg_opts->{root_align} = 1;
1397 $bg_opts->{h_scale} = $bg_opts->{v_scale} = 0; 1397 $bg_opts->{h_scale} = $bg_opts->{v_scale} = 0;
1398 $bg_opts->{h_align} = $bg_opts->{v_align} = 0; 1398 $bg_opts->{h_align} = $bg_opts->{v_align} = 0;
1399 } elsif (/op=tile/i) { 1399 } elsif (/op=tile/i) {
1400 $bg_opts->{tile} = 1; 1400 $bg_opts->{tile} = 1;
1401 } elsif (/op=keep_aspect/i) { 1401 } elsif (/op=keep-aspect/i) {
1402 $bg_opts->{keep_aspect} = 1; 1402 $bg_opts->{keep_aspect} = 1;
1403 } elsif (/op=root_align/i) { 1403 } elsif (/op=root-align/i) {
1404 $bg_opts->{root_align} = 1; 1404 $bg_opts->{root_align} = 1;
1405 } elsif (/^ =? ([0-9]+)? (?:[xX] ([0-9]+))? ([+-][0-9]+)? ([+-][0-9]+)? $/x) { 1405 } elsif (/^ =? ([0-9]+)? (?:[xX] ([0-9]+))? ([+-][0-9]+)? ([+-][0-9]+)? $/x) {
1406 my ($w, $h, $x, $y) = ($1, $2, $3, $4); 1406 my ($w, $h, $x, $y) = ($1, $2, $3, $4);
1407 1407
1408 if ($str[0]) { 1408 if ($str[0]) {
1424 1424
1425 my $expr; 1425 my $expr;
1426 1426
1427 my $bg_opts = $self->{bg_opts}; 1427 my $bg_opts = $self->{bg_opts};
1428 1428
1429 if ($bg_opts->{root}) { 1429 if ($bg_opts->{root} =~ /^\s*(?:true|yes|on|1)\s*$/i) {
1430 $expr .= "tile ("; 1430 $expr .= "tile (";
1431 1431
1432 my $shade = $bg_opts->{shade}; 1432 my $shade = $bg_opts->{shade};
1433 1433
1434 if ($shade) { 1434 if ($shade) {
1499sub on_osc_seq { 1499sub on_osc_seq {
1500 my ($self, $op, $arg) = @_; 1500 my ($self, $op, $arg) = @_;
1501 1501
1502 $self->{bg_opts} or return; 1502 $self->{bg_opts} or return;
1503 1503
1504 $op =~ /^(20|705)$/ or return; 1504 $op =~ /^(?:20|705)$/ or return;
1505 1505
1506 if ($op eq "20") { 1506 if ($op eq "20") {
1507 if ($arg eq "?") { 1507 if ($arg eq "?") {
1508 my $h_scale = $self->{bg_opts}->{h_scale}; 1508 my $h_scale = $self->{bg_opts}->{h_scale};
1509 my $v_scale = $self->{bg_opts}->{v_scale}; 1509 my $v_scale = $self->{bg_opts}->{v_scale};
1523 1523
1524 1 1524 1
1525} 1525}
1526 1526
1527sub find_resource { 1527sub find_resource {
1528 my ($self, $a, $b) = @_; 1528 my ($self, $res, $opt) = @_;
1529 1529
1530 my $v = $self->x_resource ($a); 1530 my $v = $self->x_resource ($opt);
1531 $v = $self->x_resource ($b) unless defined $v; 1531 $v = $self->x_resource ($res) unless defined $v;
1532 1532
1533 $v 1533 $v
1534} 1534}
1535 1535
1536sub on_start { 1536sub on_start {
1543 h_align => 50, v_align => 50 }; 1543 h_align => 50, v_align => 50 };
1544 1544
1545 $self->{bg_opts}->{shade} = $self->find_resource ("shading", "sh"); 1545 $self->{bg_opts}->{shade} = $self->find_resource ("shading", "sh");
1546 $self->{bg_opts}->{tint} = $self->find_resource ("tintColor", "tint"); 1546 $self->{bg_opts}->{tint} = $self->find_resource ("tintColor", "tint");
1547 $self->{bg_opts}->{blur} = $self->find_resource ("blurRadius", "blr"); 1547 $self->{bg_opts}->{blur} = $self->find_resource ("blurRadius", "blr");
1548 if ($self->x_resource_boolean ("transparent") 1548 $self->{bg_opts}->{root} = $self->find_resource ("transparent", "tr");
1549 or $self->x_resource_boolean ("tr")) {
1550 $self->{bg_opts}->{root} = 1;
1551 }
1552 1549
1553 $self->old_bg_opts ($self->find_resource ("backgroundPixmap", "pixmap")); 1550 $self->old_bg_opts ($self->find_resource ("backgroundPixmap", "pixmap"));
1554 $expr = $self->old_bg_expr; 1551 $expr = $self->old_bg_expr;
1555 } 1552 }
1556 1553

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines