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.317 by root, Sun Jul 2 18:52:05 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;
… …
2068 my ($self) = @_; 2057 my ($self) = @_;
2069 2058
2070 (6) x 2 2059 (6) x 2
2071} 2060}
2072 2061
2062sub toggle {
2063 my ($self) = @_;
2064
2065 $self->{state} = !$self->{state};
2066 $self->emit (changed => $self->{state});
2067 $self->update;
2068}
2069
2073sub invoke_button_down { 2070sub invoke_button_down {
2074 my ($self, $ev, $x, $y) = @_; 2071 my ($self, $ev, $x, $y) = @_;
2075 2072
2076 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2073 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2077 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2074 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2078 $self->{state} = !$self->{state}; 2075 $self->toggle;
2079 $self->emit (changed => $self->{state});
2080 } else { 2076 } else {
2081 return 0 2077 return 0
2082 } 2078 }
2083 2079
2084 1 2080 1
… …
2566 can_events => 0, 2562 can_events => 0,
2567 indent => 0, 2563 indent => 0,
2568 #font => default_font 2564 #font => default_font
2569 @_, 2565 @_,
2570 2566
2571 layout => (new CFClient::Layout 1), 2567 layout => (new CFClient::Layout),
2572 par => [], 2568 par => [],
2573 height => 0, 2569 height => 0,
2574 children => [ 2570 children => [
2575 (new CFClient::UI::Empty expand => 1), 2571 (new CFClient::UI::Empty expand => 1),
2576 (new CFClient::UI::Slider vertical => 1), 2572 (new CFClient::UI::Slider vertical => 1),
… …
2737 my $y0 = $top; 2733 my $y0 = $top;
2738 my $y1 = $top + $H; 2734 my $y1 = $top + $H;
2739 2735
2740 my $y = 0; 2736 my $y = 0;
2741 2737
2742 glEnable GL_BLEND;
2743 #TODO# not correct in windows where rgba is forced off
2744 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2745
2746 for my $para (@{$self->{par}}) { 2738 for my $para (@{$self->{par}}) {
2747 my $h = $para->{h}; 2739 my $h = $para->{h};
2748 2740
2749 if ($y0 < $y + $h && $y < $y1) { 2741 if ($y0 < $y + $h && $y < $y1) {
2750 2742
2751 my $layout = $self->get_layout ($para); 2743 my $layout = $self->get_layout ($para);
2752 2744
2753 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2754
2755 glRasterPos $para->{indent}, $y - $y0; 2745 $layout->render ($para->{indent}, $y - $y0);
2756 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2757 2746
2758 if (my @w = @{ $para->{widget} }) { 2747 if (my @w = @{ $para->{widget} }) {
2759 my @s = $layout->get_shapes; 2748 my @s = $layout->get_shapes;
2760 2749
2761 glDisable GL_BLEND;
2762 for (@w) { 2750 for (@w) {
2763 my ($dx, $dy) = splice @s, 0, 2, (); 2751 my ($dx, $dy) = splice @s, 0, 2, ();
2764 2752
2765 $_->{x} = $dx + $para->{indent}; 2753 $_->{x} = $dx + $para->{indent};
2766 $_->{y} = $dy + $y - $y0; 2754 $_->{y} = $dy + $y - $y0;
2767 2755
2768 $_->draw; 2756 $_->draw;
2769 } 2757 }
2770 glEnable GL_BLEND;
2771 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2772 } 2758 }
2773 } 2759 }
2774 2760
2775 $y += $h; 2761 $y += $h;
2776 } 2762 }
2777
2778 glDisable GL_BLEND;
2779 }; 2763 };
2780 }); 2764 });
2781} 2765}
2782 2766
2783sub reconfigure { 2767sub reconfigure {
… …
3079 for my $item (@{ $self->{items} }) { 3063 for my $item (@{ $self->{items} }) {
3080 my ($widget, $cb, $tooltip) = @$item; 3064 my ($widget, $cb, $tooltip) = @$item;
3081 3065
3082 # handle various types of items, only text for now 3066 # handle various types of items, only text for now
3083 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 {
3084 $widget = new CFClient::UI::Label 3082 $widget = new CFClient::UI::Label
3085 can_hover => 1, 3083 can_hover => 1,
3086 can_events => 1, 3084 can_events => 1,
3087 markup => $widget, 3085 markup => $widget,
3088 tooltip => $tooltip 3086 tooltip => $tooltip;
3087 }
3089 } 3088 }
3090 3089
3091 $self->{item}{$widget} = $item; 3090 $self->{item}{$widget} = $item;
3092 3091
3093 $self->{vbox}->add ($widget); 3092 $self->{vbox}->add ($widget);
… …
3160 3159
3161 $self->SUPER::add (@widgets); 3160 $self->SUPER::add (@widgets);
3162 3161
3163 $self->{current} = $self->{children}[0] 3162 $self->{current} = $self->{children}[0]
3164 if @{ $self->{children} }; 3163 if @{ $self->{children} };
3164}
3165
3166sub get_current_page {
3167 my ($self) = @_;
3168
3169 $self->{current}
3165} 3170}
3166 3171
3167sub set_current_page { 3172sub set_current_page {
3168 my ($self, $page_or_widget) = @_; 3173 my ($self, $page_or_widget) = @_;
3169 3174
… …
3235 tooltip => $tooltip, 3240 tooltip => $tooltip,
3236 on_activate => sub { $self->set_current_page ($widget) }, 3241 on_activate => sub { $self->set_current_page ($widget) },
3237 ); 3242 );
3238 3243
3239 $self->{multiplexer}->add ($widget); 3244 $self->{multiplexer}->add ($widget);
3245}
3246
3247sub get_current_page {
3248 my ($self) = @_;
3249
3250 $self->{multiplexer}->get_current_page
3240} 3251}
3241 3252
3242sub set_current_page { 3253sub set_current_page {
3243 my ($self, $page) = @_; 3254 my ($self, $page) = @_;
3244 3255
… …
3449 3460
3450############################################################################# 3461#############################################################################
3451 3462
3452package CFClient::UI::Inventory; 3463package CFClient::UI::Inventory;
3453 3464
3454our @ISA = CFClient::UI::ScrolledWindow::; 3465our @ISA = CFClient::UI::Table::;
3455 3466
3456sub new { 3467sub new {
3457 my $class = shift; 3468 my $class = shift;
3458 3469
3459 my $self = $class->SUPER::new ( 3470 my $self = $class->SUPER::new (
3460 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3471 col_expand => [0, 1, 0],
3461 @_, 3472 @_,
3462 ); 3473 );
3463 3474
3464 $self 3475 $self
3465} 3476}
3466 3477
3467sub set_items { 3478sub set_items {
3468 my ($self, $items) = @_; 3479 my ($self, $items) = @_;
3469 3480
3470 $self->{child}->clear; 3481 $self->clear;
3471 return unless $items; 3482 return unless $items;
3472 3483
3473 my @items = sort { 3484 my @items = sort {
3474 ($a->{type} <=> $b->{type}) 3485 ($a->{type} <=> $b->{type})
3475 or ($a->{name} cmp $b->{name}) 3486 or ($a->{name} cmp $b->{name})
… …
3479 3490
3480 my $row = 0; 3491 my $row = 0;
3481 for my $item (@items) { 3492 for my $item (@items) {
3482 CFClient::Item::update_widgets $item; 3493 CFClient::Item::update_widgets $item;
3483 3494
3484 $self->{child}->add (0, $row, $item->{face_widget}); 3495 $self->add (0, $row, $item->{face_widget});
3485 $self->{child}->add (1, $row, $item->{desc_widget}); 3496 $self->add (1, $row, $item->{desc_widget});
3486 $self->{child}->add (2, $row, $item->{weight_widget}); 3497 $self->add (2, $row, $item->{weight_widget});
3487 3498
3488 $row++; 3499 $row++;
3489 } 3500 }
3490} 3501}
3491 3502

Diff Legend

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