ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.319 by root, Sun Jul 2 21:07:26 2006 UTC vs.
Revision 1.323 by root, Wed Jul 5 03:01:01 2006 UTC

… …
1591 my ($self, $text) = @_; 1591 my ($self, $text) = @_;
1592 1592
1593 return if $self->{text} eq "T$text"; 1593 return if $self->{text} eq "T$text";
1594 $self->{text} = "T$text"; 1594 $self->{text} = "T$text";
1595 1595
1596 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1597 $self->{layout}->set_text ($text); 1596 $self->{layout}->set_text ($text);
1598 1597
1599 delete $self->{size_req}; 1598 delete $self->{size_req};
1600 $self->realloc; 1599 $self->realloc;
1601 $self->update; 1600 $self->update;
… …
1607 return if $self->{text} eq "M$markup"; 1606 return if $self->{text} eq "M$markup";
1608 $self->{text} = "M$markup"; 1607 $self->{text} = "M$markup";
1609 1608
1610 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1609 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1611 1610
1612 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1613 $self->{layout}->set_markup ($markup); 1611 $self->{layout}->set_markup ($markup);
1614 1612
1615 delete $self->{size_req}; 1613 delete $self->{size_req};
1616 $self->realloc; 1614 $self->realloc;
1617 $self->update; 1615 $self->update;
… …
1629 1627
1630 my ($w, $h) = $self->{layout}->size; 1628 my ($w, $h) = $self->{layout}->size;
1631 1629
1632 if (exists $self->{template}) { 1630 if (exists $self->{template}) {
1633 $self->{template}->set_font ($self->{font}) if $self->{font}; 1631 $self->{template}->set_font ($self->{font}) if $self->{font};
1632 $self->{template}->set_width ($self->{max_w} || -1);
1634 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1633 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1635 1634
1636 my ($w2, $h2) = $self->{template}->size; 1635 my ($w2, $h2) = $self->{template}->size;
1637 1636
1638 $w = List::Util::max $w, $w2; 1637 $w = List::Util::max $w, $w2;
… …
1672 1671
1673sub reconfigure { 1672sub reconfigure {
1674 my ($self) = @_; 1673 my ($self) = @_;
1675 1674
1676 delete $self->{size_req}; 1675 delete $self->{size_req};
1676 delete $self->{texture};
1677 1677
1678 $self->SUPER::reconfigure; 1678 $self->SUPER::reconfigure;
1679} 1679}
1680 1680
1681sub _draw { 1681sub _draw {
1682 my ($self) = @_; 1682 my ($self) = @_;
1683 1683
1684 $self->SUPER::_draw; # draw background, if applicable 1684 $self->SUPER::_draw; # draw background, if applicable
1685 1685
1686 my $tex = $self->{texture} ||= do { 1686 my $size = $self->{texture} ||= do {
1687 $self->{layout}->set_foreground (@{$self->{fg}}); 1687 $self->{layout}->set_foreground (@{$self->{fg}});
1688 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1688 $self->{layout}->set_font ($self->{font}) if $self->{font};
1689 $self->{layout}->set_width ($self->{w}); 1689 $self->{layout}->set_width ($self->{w});
1690 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1690 $self->{layout}->set_ellipsise ($self->{ellipsise});
1691 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1691 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1692 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1692 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1693 1693
1694 new_from_layout CFClient::Texture $self->{layout} 1694 [$self->{layout}->size]
1695 }; 1695 };
1696 1696
1697 unless (exists $self->{ox}) { 1697 unless (exists $self->{ox}) {
1698 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1698 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1699 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1699 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1700 : ($self->{w} - $tex->{w}) * 0.5); 1700 : ($self->{w} - $size->[0]) * 0.5);
1701 1701
1702 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1702 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1703 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1703 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1704 : ($self->{h} - $tex->{h}) * 0.5); 1704 : ($self->{h} - $size->[1]) * 0.5);
1705 }; 1705 };
1706 1706
1707 glEnable GL_TEXTURE_2D;
1708
1709 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1707 my $w = List::Util::min $self->{w} + 4, $size->[0];
1710 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1708 my $h = List::Util::min $self->{h} + 2, $size->[1];
1711 1709
1712 if ($tex->{format} == GL_ALPHA) { 1710 $self->{layout}->render ($self->{ox}, $self->{oy});
1713 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1714 glColor @{$self->{fg}};
1715 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1716 } else {
1717 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1718 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1719 }
1720
1721 glDisable GL_TEXTURE_2D;
1722} 1711}
1723 1712
1724############################################################################# 1713#############################################################################
1725 1714
1726package CFClient::UI::EntryBase; 1715package CFClient::UI::EntryBase;
… …
2573 can_events => 0, 2562 can_events => 0,
2574 indent => 0, 2563 indent => 0,
2575 #font => default_font 2564 #font => default_font
2576 @_, 2565 @_,
2577 2566
2578 layout => (new CFClient::Layout 1), 2567 layout => (new CFClient::Layout),
2579 par => [], 2568 par => [],
2580 height => 0, 2569 height => 0,
2581 children => [ 2570 children => [
2582 (new CFClient::UI::Empty expand => 1), 2571 (new CFClient::UI::Empty expand => 1),
2583 (new CFClient::UI::Slider vertical => 1), 2572 (new CFClient::UI::Slider vertical => 1),
… …
2744 my $y0 = $top; 2733 my $y0 = $top;
2745 my $y1 = $top + $H; 2734 my $y1 = $top + $H;
2746 2735
2747 my $y = 0; 2736 my $y = 0;
2748 2737
2749 glEnable GL_BLEND;
2750 #TODO# not correct in windows where rgba is forced off
2751 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2752
2753 for my $para (@{$self->{par}}) { 2738 for my $para (@{$self->{par}}) {
2754 my $h = $para->{h}; 2739 my $h = $para->{h};
2755 2740
2756 if ($y0 < $y + $h && $y < $y1) { 2741 if ($y0 < $y + $h && $y < $y1) {
2757 2742
2758 my $layout = $self->get_layout ($para); 2743 my $layout = $self->get_layout ($para);
2759 2744
2760 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2761
2762 glRasterPos $para->{indent}, $y - $y0; 2745 $layout->render ($para->{indent}, $y - $y0);
2763 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2764 2746
2765 if (my @w = @{ $para->{widget} }) { 2747 if (my @w = @{ $para->{widget} }) {
2766 my @s = $layout->get_shapes; 2748 my @s = $layout->get_shapes;
2767 2749
2768 glDisable GL_BLEND;
2769 for (@w) { 2750 for (@w) {
2770 my ($dx, $dy) = splice @s, 0, 2, (); 2751 my ($dx, $dy) = splice @s, 0, 2, ();
2771 2752
2772 $_->{x} = $dx + $para->{indent}; 2753 $_->{x} = $dx + $para->{indent};
2773 $_->{y} = $dy + $y - $y0; 2754 $_->{y} = $dy + $y - $y0;
2774 2755
2775 $_->draw; 2756 $_->draw;
2776 } 2757 }
2777 glEnable GL_BLEND;
2778 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2779 } 2758 }
2780 } 2759 }
2781 2760
2782 $y += $h; 2761 $y += $h;
2783 } 2762 }
2784
2785 glDisable GL_BLEND;
2786 }; 2763 };
2787 }); 2764 });
2788} 2765}
2789 2766
2790sub reconfigure { 2767sub reconfigure {
… …
3086 for my $item (@{ $self->{items} }) { 3063 for my $item (@{ $self->{items} }) {
3087 my ($widget, $cb, $tooltip) = @$item; 3064 my ($widget, $cb, $tooltip) = @$item;
3088 3065
3089 # handle various types of items, only text for now 3066 # handle various types of items, only text for now
3090 if (!ref $widget) { 3067 if (!ref $widget) {
3068 if ($widget =~ /\t/) {
3069 my ($left, $right) = split /\t/, $widget, 2;
3070
3071 $widget = new CFClient::UI::HBox
3072 can_hover => 1,
3073 can_events => 1,
3074 tooltip => $tooltip,
3075 children => [
3076 (new CFClient::UI::Label markup => $left, expand => 1),
3077 (new CFClient::UI::Label markup => $right, align => +1),
3078 ],
3079 ;
3080
3081 } else {
3091 $widget = new CFClient::UI::Label 3082 $widget = new CFClient::UI::Label
3092 can_hover => 1, 3083 can_hover => 1,
3093 can_events => 1, 3084 can_events => 1,
3094 markup => $widget, 3085 markup => $widget,
3095 tooltip => $tooltip 3086 tooltip => $tooltip;
3087 }
3096 } 3088 }
3097 3089
3098 $self->{item}{$widget} = $item; 3090 $self->{item}{$widget} = $item;
3099 3091
3100 $self->{vbox}->add ($widget); 3092 $self->{vbox}->add ($widget);

Diff Legend

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