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.411 by root, Sun Jul 22 19:34:59 2007 UTC vs.
Revision 1.436 by root, Wed Aug 22 21:40:57 2007 UTC

… …
30 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner}; 31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32 32
33 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
34 34
35 my $tip = $widget->{tooltip};
36
37 $tip = $tip->($widget) if CODE:: eq ref $tip;
38
39 $TOOLTIP->set_tooltip_from ($widget); 35 $TOOLTIP->set_tooltip_from ($widget);
40 $TOOLTIP->show; 36 $TOOLTIP->show;
41 } 37 }
42 38
43 return; 39 return;
… …
273 $self->emit ("destroy"); 269 $self->emit ("destroy");
274 %$self = (); 270 %$self = ();
275} 271}
276 272
277sub TO_JSON { 273sub TO_JSON {
278 { __widget_ref__ => $_[0]{s_id} } 274 { __w_ => $_[0]{s_id} }
279} 275}
280 276
281sub show { 277sub show {
282 my ($self) = @_; 278 my ($self) = @_;
283 279
… …
607sub DESTROY { 603sub DESTROY {
608 my ($self) = @_; 604 my ($self) = @_;
609 605
610 return if CFPlus::in_destruct; 606 return if CFPlus::in_destruct;
611 607
608 local $@;
612 eval { $self->destroy }; 609 eval { $self->destroy };
613 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 610 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
614 611
615 delete $WIDGET{$self+0}; 612 delete $WIDGET{$self+0};
616} 613}
… …
624use strict; 621use strict;
625use CFPlus::OpenGL; 622use CFPlus::OpenGL;
626 623
627sub new { 624sub new {
628 my $class = shift; 625 my $class = shift;
629
630 # range [value, low, high, page]
631 626
632 $class->SUPER::new ( 627 $class->SUPER::new (
633 #bg => [0, 0, 0, 0.2], 628 #bg => [0, 0, 0, 0.2],
634 #active_bg => [1, 1, 1, 0.5], 629 #active_bg => [1, 1, 1, 0.5],
635 @_ 630 @_
… …
647 my ($w, $h) = @$self{qw(w h)}; 642 my ($w, $h) = @$self{qw(w h)};
648 643
649 glEnable GL_BLEND; 644 glEnable GL_BLEND;
650 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 645 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
651 glColor_premultiply @$color; 646 glColor_premultiply @$color;
652
653 glBegin GL_QUADS;
654 glVertex 0 , 0;
655 glVertex 0 , $h;
656 glVertex $w, $h; 647 glRect 0, 0, $w, $h;
657 glVertex $w, 0;
658 glEnd;
659
660 glDisable GL_BLEND; 648 glDisable GL_BLEND;
661 } 649 }
662} 650}
663 651
664############################################################################# 652#############################################################################
… …
725 @{$self->{children}}, @widgets 713 @{$self->{children}}, @widgets
726 ]; 714 ];
727 715
728 $self->realloc; 716 $self->realloc;
729 717
718 $self->emit (c_add => \@widgets);
719
730 map $_+0, @widgets 720 map $_+0, @widgets
731} 721}
732 722
733sub children { 723sub children {
734 @{ $_[0]{children} } 724 @{ $_[0]{children} }
735} 725}
736 726
737sub remove { 727sub remove {
738 my ($self, $child) = @_; 728 my ($self, @widgets) = @_;
739 729
730 $self->emit (c_remove => \@widgets);
731
732 for my $child (@widgets) {
740 delete $child->{parent}; 733 delete $child->{parent};
741 $child->hide; 734 $child->hide;
742
743 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 735 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
736 }
744 737
745 $self->realloc; 738 $self->realloc;
746} 739}
747 740
748sub clear { 741sub clear {
… …
776} 769}
777 770
778sub _draw { 771sub _draw {
779 my ($self) = @_; 772 my ($self) = @_;
780 773
781 $_->draw for @{$self->{children}}; 774 $_->draw for $self->visible_children;
782} 775}
783 776
784############################################################################# 777#############################################################################
785 778
786package CFPlus::UI::Bin; 779package CFPlus::UI::Bin;
… …
796} 789}
797 790
798sub add { 791sub add {
799 my ($self, $child) = @_; 792 my ($self, $child) = @_;
800 793
801 $self->SUPER::remove ($_) for @{ $self->{children} }; 794 $self->clear;
802 $self->SUPER::add ($child); 795 $self->SUPER::add ($child);
803} 796}
804 797
805sub remove { 798sub remove {
806 my ($self, $widget) = @_; 799 my ($self, $widget) = @_;
… …
948 $self->{view_x} = $x; 941 $self->{view_x} = $x;
949 $self->{view_y} = $y; 942 $self->{view_y} = $y;
950 943
951 $self->emit (changed => $x, $y); 944 $self->emit (changed => $x, $y);
952 $self->update; 945 $self->update;
946 }
947}
948
949sub set_center {
950 my ($self, $x, $y) = @_;
951
952 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
953}
954
955sub make_visible {
956 my ($self, $x, $y, $border) = @_;
957
958 if ( $x < $self->{view_x} + $self->{w} * $border
959 || $x > $self->{view_x} + $self->{w} * (1 - $border)
960 || $y < $self->{view_y} + $self->{h} * $border
961 || $y > $self->{view_y} + $self->{h} * (1 - $border)
962 ) {
963 $self->set_center ($x, $y);
953 } 964 }
954} 965}
955 966
956# hmm, this does not work for topleft of $self... but we should not ask for that 967# hmm, this does not work for topleft of $self... but we should not ask for that
957sub coord2local { 968sub coord2local {
… …
1004 my $child = delete $arg{child}; 1015 my $child = delete $arg{child};
1005 1016
1006 my $self; 1017 my $self;
1007 1018
1008 my $hslider = new CFPlus::UI::Slider 1019 my $hslider = new CFPlus::UI::Slider
1009 col => 0, 1020 c_col => 0,
1010 row => 1, 1021 c_row => 1,
1011 vertical => 0, 1022 vertical => 0,
1012 range => [0, 0, 1, 0.01], # HACK fix 1023 range => [0, 0, 1, 0.01], # HACK fix
1013 on_changed => sub { 1024 on_changed => sub {
1014 $self->{hpos} = $_[1]; 1025 $self->{hpos} = $_[1];
1015 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1026 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1016 }, 1027 },
1017 ; 1028 ;
1018 1029
1019 my $vslider = new CFPlus::UI::Slider 1030 my $vslider = new CFPlus::UI::Slider
1020 col => 1, 1031 c_col => 1,
1021 row => 0, 1032 c_row => 0,
1022 vertical => 1, 1033 vertical => 1,
1023 range => [0, 0, 1, 0.01], # HACK fix 1034 range => [0, 0, 1, 0.01], # HACK fix
1024 on_changed => sub { 1035 on_changed => sub {
1025 $self->{vpos} = $_[1]; 1036 $self->{vpos} = $_[1];
1026 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1037 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1037 row_expand => [1, 0], 1048 row_expand => [1, 0],
1038 %arg, 1049 %arg,
1039 ); 1050 );
1040 1051
1041 $self->{vp} = new CFPlus::UI::ViewPort 1052 $self->{vp} = new CFPlus::UI::ViewPort
1042 col => 0, 1053 c_col => 0,
1043 row => 0, 1054 c_row => 0,
1044 expand => 1, 1055 expand => 1,
1045 scroll_x => $self->{scroll_x}, 1056 scroll_x => $self->{scroll_x},
1046 scroll_y => $self->{scroll_y}, 1057 scroll_y => $self->{scroll_y},
1047 on_changed => sub { 1058 on_changed => sub {
1048 my ($vp, $x, $y) = @_; 1059 my ($vp, $x, $y) = @_;
… …
1070 my ($self, $widget) = @_; 1081 my ($self, $widget) = @_;
1071 1082
1072 $self->{vp}->add ($self->{child} = $widget); 1083 $self->{vp}->add ($self->{child} = $widget);
1073} 1084}
1074 1085
1086sub set_offset { shift->{vp}->set_offset (@_) }
1087sub set_center { shift->{vp}->set_center (@_) }
1088sub make_visible { shift->{vp}->make_visible (@_) }
1089
1075sub update_slider { 1090sub update_slider {
1076 my ($self) = @_; 1091 my ($self) = @_;
1077 1092
1078 my $child = ($self->{vp} or return)->child; 1093 my $child = ($self->{vp} or return)->child;
1079 1094
… …
1192 my ($w, $h) = @$self{qw(w h)}; 1207 my ($w, $h) = @$self{qw(w h)};
1193 1208
1194 glEnable GL_BLEND; 1209 glEnable GL_BLEND;
1195 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1210 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1196 glColor_premultiply @{ $self->{bg} }; 1211 glColor_premultiply @{ $self->{bg} };
1197
1198 glBegin GL_QUADS;
1199 glVertex 0 , 0;
1200 glVertex 0 , $h;
1201 glVertex $w, $h; 1212 glRect 0, 0, $w, $h;
1202 glVertex $w, 0;
1203 glEnd;
1204
1205 glDisable GL_BLEND; 1213 glDisable GL_BLEND;
1206 } 1214 }
1207 1215
1208 $self->SUPER::_draw; 1216 $self->SUPER::_draw;
1209} 1217}
… …
1571 1579
1572sub add { 1580sub add {
1573 my ($self, @widgets) = @_; 1581 my ($self, @widgets) = @_;
1574 1582
1575 for my $child (@widgets) { 1583 for my $child (@widgets) {
1576 $child->{rowspan} ||= 1; 1584 $child->{c_rowspan} ||= 1;
1577 $child->{colspan} ||= 1; 1585 $child->{c_colspan} ||= 1;
1578 } 1586 }
1579 1587
1580 $self->SUPER::add (@widgets); 1588 $self->SUPER::add (@widgets);
1581} 1589}
1582 1590
… …
1586 my @widgets; 1594 my @widgets;
1587 1595
1588 while (@_) { 1596 while (@_) {
1589 my ($col, $row, $child) = splice @_, 0, 3, (); 1597 my ($col, $row, $child) = splice @_, 0, 3, ();
1590 1598
1591 $child->{row} = $row; 1599 $child->{c_row} = $row;
1592 $child->{col} = $col; 1600 $child->{c_col} = $col;
1593 1601
1594 push @widgets, $child; 1602 push @widgets, $child;
1595 } 1603 }
1596 1604
1597 $self->add (@widgets); 1605 $self->add (@widgets);
… …
1603 my (@w, @h); 1611 my (@w, @h);
1604 1612
1605 my @children = $self->children; 1613 my @children = $self->children;
1606 1614
1607 # first pass, columns 1615 # first pass, columns
1608 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) { 1616 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1609 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; 1617 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1610 1618
1611 my $sw = sum @w[$c .. $c + $cs - 1]; 1619 my $sw = sum @w[$c .. $c + $cs - 1];
1612 1620
1613 if ($w > $sw) { 1621 if ($w > $sw) {
1614 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; 1622 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1615 } 1623 }
1616 } 1624 }
1617 1625
1618 # second pass, rows 1626 # second pass, rows
1619 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { 1627 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1620 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; 1628 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1621 1629
1622 my $sh = sum @h[$r .. $r + $rs - 1]; 1630 my $sh = sum @h[$r .. $r + $rs - 1];
1623 1631
1624 if ($h > $sh) { 1632 if ($h > $sh) {
1625 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; 1633 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
… …
1667 1675
1668 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } 1676 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1669 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } 1677 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1670 1678
1671 for my $widget ($self->children) { 1679 for my $widget ($self->children) {
1672 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)}; 1680 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1673 1681
1674 $widget->configure ( 1682 $widget->configure (
1675 $x[$c], $y[$r], 1683 $x[$c], $y[$r],
1676 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r], 1684 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1677 ); 1685 );
… …
1738 my $y = _scale $child->{c_rel}, $child->{c_y}, $H; 1746 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1739 1747
1740 $x += $child->{c_halign} * $child->{req_w}; 1748 $x += $child->{c_halign} * $child->{req_w};
1741 $y += $child->{c_valign} * $child->{req_h}; 1749 $y += $child->{c_valign} * $child->{req_h};
1742 1750
1743 $child->configure ($x, $y, $child->{req_w}, $child->{req_h}); 1751 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1744 } 1752 }
1745 1753
1746 1 1754 1
1747} 1755}
1748 1756
… …
1752 1760
1753our @ISA = CFPlus::UI::Container::; 1761our @ISA = CFPlus::UI::Container::;
1754 1762
1755sub size_request { 1763sub size_request {
1756 my ($self) = @_; 1764 my ($self) = @_;
1765
1766 my @children = $self->visible_children;
1757 1767
1758 $self->{vertical} 1768 $self->{vertical}
1759 ? ( 1769 ? (
1760 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1770 (List::Util::max map $_->{req_w}, @children),
1761 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1771 (List::Util::sum map $_->{req_h}, @children),
1762 ) 1772 )
1763 : ( 1773 : (
1764 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1774 (List::Util::sum map $_->{req_w}, @children),
1765 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1775 (List::Util::max map $_->{req_h}, @children),
1766 ) 1776 )
1767} 1777}
1768 1778
1769sub invoke_size_allocate { 1779sub invoke_size_allocate {
1770 my ($self, $w, $h) = @_; 1780 my ($self, $w, $h) = @_;
… …
1894 1904
1895 delete $self->{ox}; 1905 delete $self->{ox};
1896 $self->SUPER::realloc; 1906 $self->SUPER::realloc;
1897} 1907}
1898 1908
1909sub clear {
1910 my ($self) = @_;
1911
1912 $self->set_text ("");
1913}
1914
1899sub set_text { 1915sub set_text {
1900 my ($self, $text) = @_; 1916 my ($self, $text) = @_;
1901 1917
1902 return if $self->{text} eq "T$text"; 1918 return if $self->{text} eq "T$text";
1903 $self->{text} = "T$text"; 1919 $self->{text} = "T$text";
… …
2009 : ($self->{w} - $size->[0]) * 0.5); 2025 : ($self->{w} - $size->[0]) * 0.5);
2010 2026
2011 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2027 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2012 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2028 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2013 : ($self->{h} - $size->[1]) * 0.5); 2029 : ($self->{h} - $size->[1]) * 0.5);
2030
2031 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2014 }; 2032 };
2015 2033
2016# unless ($self->{list}) { 2034# unless ($self->{list}) {
2017# $self->{list} = CFPlus::OpenGL::glGenList; 2035# $self->{list} = CFPlus::OpenGL::glGenList;
2018# CFPlus::OpenGL::glNewList $self->{list}; 2036# CFPlus::OpenGL::glNewList $self->{list};
… …
2020# CFPlus::OpenGL::glEndList; 2038# CFPlus::OpenGL::glEndList;
2021# } 2039# }
2022# 2040#
2023# CFPlus::OpenGL::glCallList $self->{list}; 2041# CFPlus::OpenGL::glCallList $self->{list};
2024 2042
2025 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2043 $self->{layout}->draw;
2026} 2044}
2027 2045
2028#sub destroy { 2046#sub destroy {
2029# my ($self) = @_; 2047# my ($self) = @_;
2030# 2048#
… …
2045 my $class = shift; 2063 my $class = shift;
2046 2064
2047 $class->SUPER::new ( 2065 $class->SUPER::new (
2048 fg => [1, 1, 1], 2066 fg => [1, 1, 1],
2049 bg => [0, 0, 0, 0.2], 2067 bg => [0, 0, 0, 0.2],
2068 outline => [0.6, 0.3, 0.1],
2050 active_bg => [1, 1, 1, 0.5], 2069 active_bg => [0, 0, 1, .2],
2051 active_fg => [0, 0, 0], 2070 active_fg => [1, 1, 1],
2071 active_outline => [1, 1, 0],
2052 can_hover => 1, 2072 can_hover => 1,
2053 can_focus => 1, 2073 can_focus => 1,
2054 valign => 0, 2074 valign => 0,
2055 can_events => 1, 2075 can_events => 1,
2056 ellipsise => 0, 2076 ellipsise => 0,
… …
2196 glColor_premultiply @{$self->{bg}}; 2216 glColor_premultiply @{$self->{bg}};
2197 } 2217 }
2198 2218
2199 glEnable GL_BLEND; 2219 glEnable GL_BLEND;
2200 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2220 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2201 glBegin GL_QUADS;
2202 glVertex 0 , 0;
2203 glVertex 0 , $self->{h};
2204 glVertex $self->{w}, $self->{h}; 2221 glRect 0, 0, $self->{w}, $self->{h};
2205 glVertex $self->{w}, 0;
2206 glEnd;
2207 glDisable GL_BLEND; 2222 glDisable GL_BLEND;
2208 2223
2209 $self->SUPER::_draw; 2224 $self->SUPER::_draw;
2210 2225
2211 #TODO: force update every cursor change :( 2226 #TODO: force update every cursor change :(
… …
2213 2228
2214 unless (exists $self->{cur_h}) { 2229 unless (exists $self->{cur_h}) {
2215 my $text = substr $self->{text}, 0, $self->{cursor}; 2230 my $text = substr $self->{text}, 0, $self->{cursor};
2216 utf8::encode $text; 2231 utf8::encode $text;
2217 2232
2218 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2233 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2219 } 2234 }
2220 2235
2236 glColor_premultiply @{$self->{active_fg}};
2221 glBegin GL_LINES; 2237 glBegin GL_LINES;
2222 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2238 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
2223 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2239 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2240 glEnd;
2241
2242 glLineWidth 3;
2243 glColor @{$self->{active_outline}};
2244 glRect_lineloop 0, 0, $self->{w} - 1, $self->{h} - 1;
2245 glLineWidth 1;
2246
2247 } else {
2248 glColor @{$self->{outline}};
2249 glTranslate .375, .375;
2250 glBegin GL_LINE_STRIP;
2251 glVertex 0, $self->{h} * .5;
2252 glVertex 0, $self->{h} - 3;
2253 glVertex $self->{w} - 1, $self->{h} - 3;
2254 glVertex $self->{w} - 1, $self->{h} * .5;
2224 glEnd; 2255 glEnd;
2225 } 2256 }
2226} 2257}
2227 2258
2228############################################################################# 2259#############################################################################
… …
2315 1 2346 1
2316} 2347}
2317 2348
2318############################################################################# 2349#############################################################################
2319 2350
2351package CFPlus::UI::ButtonBin;
2352
2353our @ISA = CFPlus::UI::Bin::;
2354
2355use CFPlus::OpenGL;
2356
2357my @tex =
2358 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2359 qw(b1_button_inactive.png b1_button_active.png);
2360
2361sub new {
2362 my $class = shift;
2363
2364 $class->SUPER::new (
2365 can_hover => 1,
2366 align => 0,
2367 valign => 0,
2368 can_events => 1,
2369 @_
2370 )
2371}
2372
2373sub invoke_button_up {
2374 my ($self, $ev, $x, $y) = @_;
2375
2376 $self->emit ("activate")
2377 if $x >= 0 && $x < $self->{w}
2378 && $y >= 0 && $y < $self->{h};
2379
2380 1
2381}
2382
2383sub _draw {
2384 my ($self) = @_;
2385
2386 glEnable GL_TEXTURE_2D;
2387 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2388 glColor 0, 0, 0, 1;
2389
2390 my $tex = $tex[$GRAB == $self];
2391 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2392
2393 glDisable GL_TEXTURE_2D;
2394
2395 $self->SUPER::_draw;
2396}
2397
2398#############################################################################
2399
2320package CFPlus::UI::Button; 2400package CFPlus::UI::Button;
2321 2401
2322our @ISA = CFPlus::UI::Label::; 2402our @ISA = CFPlus::UI::Label::;
2323 2403
2324use CFPlus::OpenGL; 2404use CFPlus::OpenGL;
… …
2458sub new { 2538sub new {
2459 my $class = shift; 2539 my $class = shift;
2460 2540
2461 my $self = $class->SUPER::new ( 2541 my $self = $class->SUPER::new (
2462 can_events => 0, 2542 can_events => 0,
2543 scale => 1,
2463 @_, 2544 @_,
2464 ); 2545 );
2465 2546
2466 $self->{path} || $self->{tex} 2547 $self->{path} || $self->{tex}
2467 or Carp::croak "'path' or 'tex' attributes required"; 2548 or Carp::croak "'path' or 'tex' attributes required";
… …
2492} 2573}
2493 2574
2494sub size_request { 2575sub size_request {
2495 my ($self) = @_; 2576 my ($self) = @_;
2496 2577
2497 ($self->{tex}{w}, $self->{tex}{h}) 2578 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2498} 2579}
2499 2580
2500sub _draw { 2581sub _draw {
2501 my ($self) = @_; 2582 my ($self) = @_;
2502 2583
… …
2512 } 2593 }
2513 2594
2514 glEnable GL_TEXTURE_2D; 2595 glEnable GL_TEXTURE_2D;
2515 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2596 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2516 2597
2517 $tex->draw_quad (0, 0, $w, $h); 2598 $tex->draw_quad_alpha (0, 0, $w, $h);
2518 2599
2519 glDisable GL_TEXTURE_2D; 2600 glDisable GL_TEXTURE_2D;
2520} 2601}
2521 2602
2522############################################################################# 2603#############################################################################
… …
2541 align => 0, 2622 align => 0,
2542 valign => 0, 2623 valign => 0,
2543 can_events => 1, 2624 can_events => 1,
2544 @_ 2625 @_
2545 ); 2626 );
2627}
2628
2629sub invoke_button_down {
2630 my ($self, $ev, $x, $y) = @_;
2631
2632 1
2546} 2633}
2547 2634
2548sub invoke_button_up { 2635sub invoke_button_up {
2549 my ($self, $ev, $x, $y) = @_; 2636 my ($self, $ev, $x, $y) = @_;
2550 2637
… …
2690 glDisable GL_TEXTURE_2D; 2777 glDisable GL_TEXTURE_2D;
2691} 2778}
2692 2779
2693############################################################################# 2780#############################################################################
2694 2781
2782package CFPlus::UI::Progress;
2783
2784our @ISA = CFPlus::UI::Label::;
2785
2786use CFPlus::OpenGL;
2787
2788sub new {
2789 my ($class, %arg) = @_;
2790
2791 my $self = $class->SUPER::new (
2792 fg => [1, 1, 1],
2793 bg => [0, 0, 1, 0.2],
2794 bar => [0.7, 0.5, 0.1, 0.8],
2795 outline => [0.4, 0.3, 0],
2796 fontsize => 0.9,
2797 valign => 0,
2798 align => 0,
2799 can_events => 1,
2800 ellipsise => 1,
2801 label => "%d%%",
2802 %arg,
2803 );
2804
2805 $self->set_value ($arg{value} || -1);
2806
2807 $self
2808}
2809
2810sub set_label {
2811 my ($self, $label) = @_;
2812
2813 return if $self->{label} eq $label;
2814 $self->{label} = $label;
2815
2816 $self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
2817}
2818
2819sub set_value {
2820 my ($self, $value) = @_;
2821
2822 if ($self->{value} ne $value) {
2823 $self->{value} = $value;
2824
2825 if ($value < 0) {
2826 $self->set_text ("-");
2827 } else {
2828 $self->set_text (sprintf $self->{label}, $value * 100);
2829 }
2830
2831 $self->update;
2832 }
2833}
2834
2835sub _draw {
2836 my ($self) = @_;
2837
2838 glEnable GL_BLEND;
2839 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2840
2841 if ($self->{value} >= 0) {
2842 my $s = 3 + ($self->{w} - 6) * $self->{value};
2843
2844 glColor_premultiply @{$self->{bar}};
2845 glRect 2, 2, $s, $self->{h} - 2;
2846 glColor_premultiply @{$self->{bg}};
2847 glRect $s + 1, 0, $self->{w} - 2, $self->{h} - 2;
2848 }
2849
2850 glColor_premultiply @{$self->{outline}};
2851 glRect_lineloop 1, 1, $self->{w} - 2, $self->{h} - 2;
2852
2853 glDisable GL_BLEND;
2854
2855 {
2856 local $self->{bg}; # do not draw background
2857 $self->SUPER::_draw;
2858 }
2859}
2860
2861#############################################################################
2862
2863package CFPlus::UI::ExperienceProgress;
2864
2865our @ISA = CFPlus::UI::Progress::;
2866
2867sub new {
2868 my ($class, %arg) = @_;
2869
2870 my $self = $class->SUPER::new (
2871 tooltip => sub {
2872 my ($self) = @_;
2873
2874 sprintf "level %d\n%s points\n%s next level\n%s to go",
2875 $self->{lvl},
2876 ::formsep ($self->{exp}),
2877 ::formsep ($self->{nxt}),
2878 ::formsep ($self->{nxt} - $self->{exp}),
2879 },
2880 %arg
2881 );
2882
2883 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2884 if $::CONN;
2885
2886 $self
2887}
2888
2889sub DESTROY {
2890 my ($self) = @_;
2891
2892 delete $::CONN->{on_exp_update}{$self+0}
2893 if $::CONN;
2894
2895 $self->SUPER::DESTROY;
2896}
2897
2898sub set_value {
2899 my ($self, $lvl, $exp) = @_;
2900
2901 $self->{lvl} = $lvl;
2902 $self->{exp} = $exp;
2903
2904 my $v = -1;
2905
2906 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2907 my $l0 = $table->[$lvl - 1];
2908 my $l1 = $table->[$lvl];
2909
2910 $self->{nxt} = $l1;
2911
2912 $v = ($exp - $l0) / ($l1 - $l0);
2913 }
2914
2915 $self->SUPER::set_value ($v);
2916}
2917
2918#############################################################################
2919
2695package CFPlus::UI::Gauge; 2920package CFPlus::UI::Gauge;
2696 2921
2697our @ISA = CFPlus::UI::VBox::; 2922our @ISA = CFPlus::UI::VBox::;
2698 2923
2699sub new { 2924sub new {
… …
2997} 3222}
2998 3223
2999sub size_request { 3224sub size_request {
3000 my ($self) = @_; 3225 my ($self) = @_;
3001 3226
3002 my ($empty, $slider) = @{ $self->{children} }; 3227 my ($empty, $slider) = $self->visible_children;
3003 3228
3004 local $self->{children} = [$empty, $slider]; 3229 local $self->{children} = [$empty, $slider];
3005 $self->SUPER::size_request 3230 $self->SUPER::size_request
3006} 3231}
3007 3232
… …
3196 3421
3197 if ($y0 < $y + $h && $y < $y1) { 3422 if ($y0 < $y + $h && $y < $y1) {
3198 my $layout = $self->get_layout ($para); 3423 my $layout = $self->get_layout ($para);
3199 3424
3200 $layout->render ($para->{indent}, $y - $y0); 3425 $layout->render ($para->{indent}, $y - $y0);
3426 $layout->draw;
3201 3427
3202 if (my @w = @{ $para->{widget} }) { 3428 if (my @w = @{ $para->{widget} }) {
3203 my @s = $layout->get_shapes; 3429 my @s = $layout->get_shapes;
3204 3430
3205 for (@w) { 3431 for (@w) {
… …
3327} 3553}
3328 3554
3329sub set_tooltip_from { 3555sub set_tooltip_from {
3330 my ($self, $widget) = @_; 3556 my ($self, $widget) = @_;
3331 3557
3332 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3333 if $widget->{tooltip} =~ /^#(.*)$/;
3334
3335 my $tooltip = $widget->{tooltip}; 3558 my $tip = $widget->{tooltip};
3559 $tip = $tip->($widget) if "CODE" eq ref $tip;
3560
3561 $tip = CFPlus::Pod::section_label tooltip => $1
3562 if $tip =~ /^#(.*)$/;
3336 3563
3337 if ($ENV{CFPLUS_DEBUG} & 2) { 3564 if ($ENV{CFPLUS_DEBUG} & 2) {
3338 $tooltip .= "\n\n" . (ref $widget) . "\n" 3565 $tip .= "\n\n" . (ref $widget) . "\n"
3339 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3566 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3340 . "req $widget->{req_w} $widget->{req_h}\n" 3567 . "req $widget->{req_w} $widget->{req_h}\n"
3341 . "visible $widget->{visible}"; 3568 . "visible $widget->{visible}";
3342 } 3569 }
3343 3570
3344 $tooltip =~ s/^\n+//; 3571 $tip =~ s/^\n+//;
3345 $tooltip =~ s/\n+$//; 3572 $tip =~ s/\n+$//;
3346 3573
3347 $self->add (new CFPlus::UI::Label 3574 $self->add (new CFPlus::UI::Label
3348 markup => $tooltip, 3575 markup => $tip,
3349 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3576 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3350 fontsize => 0.8, 3577 fontsize => 0.8,
3351 style => 1, # FLAG_INVERSE 3578 style => 1, # FLAG_INVERSE
3352 ellipsise => 0, 3579 ellipsise => 0,
3353 font => ($widget->{tooltip_font} || $::FONT_PROP), 3580 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
3396 glTranslate 0.375, 0.375; 3623 glTranslate 0.375, 0.375;
3397 3624
3398 my ($w, $h) = @$self{qw(w h)}; 3625 my ($w, $h) = @$self{qw(w h)};
3399 3626
3400 glColor 1, 0.8, 0.4; 3627 glColor 1, 0.8, 0.4;
3401 glBegin GL_QUADS; 3628 glRect 0, 0, $w, $h;
3402 glVertex 0 , 0;
3403 glVertex 0 , $h;
3404 glVertex $w, $h;
3405 glVertex $w, 0;
3406 glEnd;
3407 3629
3408 glColor 0, 0, 0; 3630 glColor 0, 0, 0;
3409 glBegin GL_LINE_LOOP; 3631 glRect_lineloop 0, 0, $w, $h;
3410 glVertex 0 , 0;
3411 glVertex 0 , $h;
3412 glVertex $w, $h;
3413 glVertex $w, 0;
3414 glEnd;
3415 3632
3416 glTranslate 2 - 0.375, 2 - 0.375; 3633 glTranslate 2 - 0.375, 2 - 0.375;
3417 3634
3418 $self->SUPER::_draw; 3635 $self->SUPER::_draw;
3419} 3636}
… …
3443 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3660 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3444 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed}; 3661 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3445 $self->{timer} = Event->timer ( 3662 $self->{timer} = Event->timer (
3446 parked => 1, 3663 parked => 1,
3447 cb => sub { 3664 cb => sub {
3448 return unless $::CONN && $widget; 3665 return unless $::CONN;
3449 3666
3667 my $w = $widget
3668 or return;
3669
3450 ++$widget->{frame}; 3670 ++$w->{frame};
3451 $widget->update_face; 3671 $w->update_face;
3672
3673 # somehow, $widget can go away
3452 $widget->update; 3674 $w->update;
3453
3454 $widget->update_timer; 3675 $w->update_timer;
3455 }, 3676 },
3456 ); 3677 );
3457 3678
3458 $self->update_face; 3679 $self->update_face;
3459 $self->update_timer; 3680 $self->update_timer;
… …
3480} 3701}
3481 3702
3482sub update_face { 3703sub update_face {
3483 my ($self) = @_; 3704 my ($self) = @_;
3484 3705
3485 return unless $::CONN; 3706 if ($::CONN) {
3486
3487 if (my $anim = $::CONN->{anim}[$self->{anim}]) { 3707 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3488 if ($anim && @$anim) { 3708 if ($anim && @$anim) {
3489 delete $self->{wait_face};
3490 $self->{face} = $anim->[ $self->{frame} % @$anim ]; 3709 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3710 delete $self->{face_change_cb};
3711
3491 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ]; 3712 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3713 unless ($tex->{name} || $tex->{loading}) {
3714 $tex->upload (sub { $self->reconfigure });
3715 }
3716 }
3717 }
3492 } 3718 }
3493 } 3719 }
3494} 3720}
3495 3721
3496sub size_request { 3722sub size_request {
3497 my ($self) = @_; 3723 my ($self) = @_;
3498 3724
3499 if ($::CONN) { 3725 if ($::CONN) {
3500 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3726 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3501 if (my $tex = $::CONN->{texture}[$faceid]) { 3727 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3502 $self->{tex} = $tex; 3728 if ($tex->{name}) {
3503 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3729 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3504 } else { 3730 } elsif (!$tex->{loading}) {
3505 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3731 $tex->upload (sub { $self->reconfigure });
3506 $self->realloc;
3507 }); 3732 }
3508 } 3733 }
3734
3735 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3509 } 3736 }
3510 } 3737 }
3511 3738
3512 ($self->{size_w} || 8, $self->{size_h} || 8) 3739 ($self->{size_w} || 8, $self->{size_h} || 8)
3513} 3740}
… …
3593 children => [ 3820 children => [
3594 (new CFPlus::UI::Label markup => $left, expand => 1), 3821 (new CFPlus::UI::Label markup => $left, expand => 1),
3595 (new CFPlus::UI::Label markup => $right, align => +1), 3822 (new CFPlus::UI::Label markup => $right, align => +1),
3596 ], 3823 ],
3597 ; 3824 ;
3598 3825
3599 } else { 3826 } else {
3600 $widget = new CFPlus::UI::Label 3827 $widget = new CFPlus::UI::Label
3601 can_hover => 1, 3828 can_hover => 1,
3602 can_events => 1, 3829 can_events => 1,
3603 markup => $widget, 3830 markup => $widget,
… …
3728 3955
3729############################################################################# 3956#############################################################################
3730 3957
3731package CFPlus::UI::Notebook; 3958package CFPlus::UI::Notebook;
3732 3959
3960use CFPlus::OpenGL;
3961
3733our @ISA = CFPlus::UI::VBox::; 3962our @ISA = CFPlus::UI::VBox::;
3734 3963
3735sub new { 3964sub new {
3736 my $class = shift; 3965 my $class = shift;
3737 3966
3738 my $self = $class->SUPER::new ( 3967 my $self = $class->SUPER::new (
3739 buttonbar => (new CFPlus::UI::Buttonbar), 3968 buttonbar => (new CFPlus::UI::Buttonbar),
3740 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3969 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3970 active_outline => [1, 1, 0],
3741 # filter => # will be put between multiplexer and $self 3971 # filter => # will be put between multiplexer and $self
3742 @_, 3972 @_,
3743 ); 3973 );
3744 3974
3745 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3975 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3746 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3976 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3747 3977
3978 {
3979 Scalar::Util::weaken (my $wself = $self);
3980
3981 $self->{multiplexer}->connect (c_add => sub {
3982 my ($mplex, $widgets) = @_;
3983
3984 for my $child (@$widgets) {
3985 Scalar::Util::weaken $child;
3986 $child->{c_tab_} ||= do {
3987 my $tab =
3988 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3989 ? $child->{c_tab}
3990 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3991
3992 $tab->connect (activate => sub {
3993 $wself->set_current_page ($child);
3994 });
3995
3996 $tab
3997 };
3998
3999 $self->{buttonbar}->add ($child->{c_tab_});
4000 }
4001 });
4002
4003 $self->{multiplexer}->connect (c_remove => sub {
4004 my ($mplex, $widgets) = @_;
4005
4006 for my $child (@$widgets) {
4007 $wself->{buttonbar}->remove ($child->{c_tab_});
4008 }
4009 });
4010 }
4011
3748 $self 4012 $self
3749} 4013}
3750 4014
3751sub add { 4015sub add {
4016 my ($self, @widgets) = @_;
4017
4018 $self->{multiplexer}->add (@widgets)
4019}
4020
4021sub remove {
4022 my ($self, @widgets) = @_;
4023
4024 $self->{multiplexer}->remove (@widgets)
4025}
4026
4027sub pages {
4028 my ($self) = @_;
4029 $self->{multiplexer}->children
4030}
4031
4032sub add_tab {
3752 my ($self, $title, $widget, $tooltip) = @_; 4033 my ($self, $title, $widget, $tooltip) = @_;
3753 4034
3754 CFPlus::weaken $self; 4035 $title = [$title, $tooltip] unless ref $title;
4036 $widget->{c_tab} = $title;
3755 4037
3756 unless (ref $title) {
3757 $title = new CFPlus::UI::Button
3758 markup => $title,
3759 tooltip => $tooltip,
3760 ;
3761 }
3762
3763 $title->connect (activate => sub { $self->set_current_page ($widget) });
3764 $self->{buttonbar}->add ($title);
3765
3766 $self->{multiplexer}->add ($widget); 4038 $self->add ($widget);
3767} 4039}
3768 4040
3769sub get_current_page { 4041sub get_current_page {
3770 my ($self) = @_; 4042 my ($self) = @_;
3771 4043
… …
3775sub set_current_page { 4047sub set_current_page {
3776 my ($self, $page) = @_; 4048 my ($self, $page) = @_;
3777 4049
3778 $self->{multiplexer}->set_current_page ($page); 4050 $self->{multiplexer}->set_current_page ($page);
3779 $self->emit (page_changed => $self->{multiplexer}{current}); 4051 $self->emit (page_changed => $self->{multiplexer}{current});
4052}
4053
4054sub _draw {
4055 my ($self) = @_;
4056
4057 $self->SUPER::_draw ();
4058
4059 if (my $cur = $self->{multiplexer}{current}) {
4060 if ($cur = $cur->{c_tab_}) {
4061 glTranslate $cur->{x}, $cur->{y};
4062 glLineWidth 3;
4063 glColor @{$self->{active_outline}};
4064 glRect_lineloop 1, 1, $cur->{w} - 2, $cur->{h} - 2;
4065 glLineWidth 1;
4066 }
4067 }
3780} 4068}
3781 4069
3782############################################################################# 4070#############################################################################
3783 4071
3784package CFPlus::UI::Selector; 4072package CFPlus::UI::Selector;
… …
4054} 4342}
4055 4343
4056sub update { 4344sub update {
4057 my ($self) = @_; 4345 my ($self) = @_;
4058 4346
4059 $::WANT_REFRESH++; 4347 $::WANT_REFRESH->start;
4060} 4348}
4061 4349
4062sub add { 4350sub add {
4063 my ($self, @children) = @_; 4351 my ($self, @children) = @_;
4064 4352

Diff Legend

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