… | |
… | |
1658 | : ($self->{h} - $tex->{h}) * 0.5); |
1658 | : ($self->{h} - $tex->{h}) * 0.5); |
1659 | }; |
1659 | }; |
1660 | |
1660 | |
1661 | glEnable GL_TEXTURE_2D; |
1661 | glEnable GL_TEXTURE_2D; |
1662 | |
1662 | |
|
|
1663 | my $w = List::Util::min $self->{w} + 4, $tex->{w}; |
|
|
1664 | my $h = List::Util::min $self->{h} + 2, $tex->{h}; |
|
|
1665 | |
1663 | if ($tex->{format} == GL_ALPHA) { |
1666 | if ($tex->{format} == GL_ALPHA) { |
1664 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
1667 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
1665 | glColor @{$self->{fg}}; |
1668 | glColor @{$self->{fg}}; |
1666 | $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); |
1669 | $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h); |
1667 | } else { |
1670 | } else { |
1668 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
1671 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
1669 | $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); |
1672 | $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h); |
1670 | } |
1673 | } |
1671 | |
1674 | |
1672 | glDisable GL_TEXTURE_2D; |
1675 | glDisable GL_TEXTURE_2D; |
1673 | } |
1676 | } |
1674 | |
1677 | |
… | |
… | |
2474 | my $class = shift; |
2477 | my $class = shift; |
2475 | |
2478 | |
2476 | my $self = $class->SUPER::new ( |
2479 | my $self = $class->SUPER::new ( |
2477 | fontsize => 1, |
2480 | fontsize => 1, |
2478 | can_events => 0, |
2481 | can_events => 0, |
|
|
2482 | indent => 0, |
2479 | #font => default_font |
2483 | #font => default_font |
2480 | @_, |
2484 | @_, |
2481 | |
2485 | |
2482 | layout => (new CFClient::Layout 1), |
2486 | layout => (new CFClient::Layout 1), |
2483 | par => [], |
2487 | par => [], |
… | |
… | |
2506 | $self->SUPER::size_allocate ($w, $h); |
2510 | $self->SUPER::size_allocate ($w, $h); |
2507 | |
2511 | |
2508 | $self->{layout}->set_font ($self->{font}) if $self->{font}; |
2512 | $self->{layout}->set_font ($self->{font}) if $self->{font}; |
2509 | $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); |
2513 | $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); |
2510 | $self->{layout}->set_width ($self->{children}[0]{w}); |
2514 | $self->{layout}->set_width ($self->{children}[0]{w}); |
2511 | $self->{layout}->set_indent (-$self->{fontsize} * $::FONTSIZE * 4); |
2515 | $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); |
2512 | |
2516 | |
2513 | $self->reflow; |
2517 | $self->reflow; |
2514 | } |
2518 | } |
2515 | |
2519 | |
2516 | sub text_size { |
2520 | sub text_size { |
… | |
… | |
2518 | |
2522 | |
2519 | my $layout = $self->{layout}; |
2523 | my $layout = $self->{layout}; |
2520 | |
2524 | |
2521 | $layout->set_height ($self->{fontsize} * $::FONTSIZE); |
2525 | $layout->set_height ($self->{fontsize} * $::FONTSIZE); |
2522 | $layout->set_width ($self->{children}[0]{w} - $indent); |
2526 | $layout->set_width ($self->{children}[0]{w} - $indent); |
2523 | $layout->set_indent (-$self->{fontsize} * $::FONTSIZE * 4); |
2527 | $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); |
2524 | $layout->set_markup ($text); |
2528 | $layout->set_markup ($text); |
2525 | |
2529 | |
2526 | $layout->size |
2530 | $layout->size |
2527 | } |
2531 | } |
2528 | |
2532 | |
… | |
… | |
2580 | $layout->set_height ($self->{fontsize} * $::FONTSIZE); |
2584 | $layout->set_height ($self->{fontsize} * $::FONTSIZE); |
2581 | |
2585 | |
2582 | for (@{$self->{par}}) { |
2586 | for (@{$self->{par}}) { |
2583 | if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support |
2587 | if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support |
2584 | $layout->set_width ($W - $_->[3]); |
2588 | $layout->set_width ($W - $_->[3]); |
2585 | $layout->set_indent (-$self->{fontsize} * $::FONTSIZE * 4); |
2589 | $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); |
2586 | $layout->set_markup ($_->[4]); |
2590 | $layout->set_markup ($_->[4]); |
2587 | my ($w, $h) = $layout->size; |
2591 | my ($w, $h) = $layout->size; |
2588 | $_->[0] = $w + $_->[3]; |
2592 | $_->[0] = $w + $_->[3]; |
2589 | $_->[1] = $h; |
2593 | $_->[1] = $h; |
2590 | } |
2594 | } |
… | |
… | |
2622 | my $h = $par->[1]; |
2626 | my $h = $par->[1]; |
2623 | |
2627 | |
2624 | if ($y0 < $y + $h && $y < $y1) { |
2628 | if ($y0 < $y + $h && $y < $y1) { |
2625 | $layout->set_foreground (@{ $par->[2] }); |
2629 | $layout->set_foreground (@{ $par->[2] }); |
2626 | $layout->set_width ($W - $par->[3]); |
2630 | $layout->set_width ($W - $par->[3]); |
2627 | $layout->set_indent (-$self->{fontsize} * $::FONTSIZE * 4); |
2631 | $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); |
2628 | $layout->set_markup ($par->[4]); |
2632 | $layout->set_markup ($par->[4]); |
2629 | |
2633 | |
2630 | my ($w, $h, $data, $format, $internalformat) = $layout->render; |
2634 | my ($w, $h, $data, $format, $internalformat) = $layout->render; |
2631 | |
2635 | |
2632 | glRasterPos $par->[3], $y - $y0; |
2636 | glRasterPos $par->[3], $y - $y0; |