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.412 by root, Sun Jul 22 20:08:17 2007 UTC vs.
Revision 1.433 by root, Wed Aug 22 21:27:13 2007 UTC

… …
273 $self->emit ("destroy"); 273 $self->emit ("destroy");
274 %$self = (); 274 %$self = ();
275} 275}
276 276
277sub TO_JSON { 277sub TO_JSON {
278 { __widget_ref__ => $_[0]{s_id} } 278 { __w_ => $_[0]{s_id} }
279} 279}
280 280
281sub show { 281sub show {
282 my ($self) = @_; 282 my ($self) = @_;
283 283
… …
607sub DESTROY { 607sub DESTROY {
608 my ($self) = @_; 608 my ($self) = @_;
609 609
610 return if CFPlus::in_destruct; 610 return if CFPlus::in_destruct;
611 611
612 local $@;
612 eval { $self->destroy }; 613 eval { $self->destroy };
613 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 614 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
614 615
615 delete $WIDGET{$self+0}; 616 delete $WIDGET{$self+0};
616} 617}
… …
624use strict; 625use strict;
625use CFPlus::OpenGL; 626use CFPlus::OpenGL;
626 627
627sub new { 628sub new {
628 my $class = shift; 629 my $class = shift;
629
630 # range [value, low, high, page]
631 630
632 $class->SUPER::new ( 631 $class->SUPER::new (
633 #bg => [0, 0, 0, 0.2], 632 #bg => [0, 0, 0, 0.2],
634 #active_bg => [1, 1, 1, 0.5], 633 #active_bg => [1, 1, 1, 0.5],
635 @_ 634 @_
… …
647 my ($w, $h) = @$self{qw(w h)}; 646 my ($w, $h) = @$self{qw(w h)};
648 647
649 glEnable GL_BLEND; 648 glEnable GL_BLEND;
650 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 649 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
651 glColor_premultiply @$color; 650 glColor_premultiply @$color;
652
653 glBegin GL_QUADS;
654 glVertex 0 , 0;
655 glVertex 0 , $h;
656 glVertex $w, $h; 651 glRect 0, 0, $w, $h;
657 glVertex $w, 0;
658 glEnd;
659
660 glDisable GL_BLEND; 652 glDisable GL_BLEND;
661 } 653 }
662} 654}
663 655
664############################################################################# 656#############################################################################
… …
725 @{$self->{children}}, @widgets 717 @{$self->{children}}, @widgets
726 ]; 718 ];
727 719
728 $self->realloc; 720 $self->realloc;
729 721
722 $self->emit (c_add => \@widgets);
723
730 map $_+0, @widgets 724 map $_+0, @widgets
731} 725}
732 726
733sub children { 727sub children {
734 @{ $_[0]{children} } 728 @{ $_[0]{children} }
735} 729}
736 730
737sub remove { 731sub remove {
738 my ($self, $child) = @_; 732 my ($self, @widgets) = @_;
739 733
734 $self->emit (c_remove => \@widgets);
735
736 for my $child (@widgets) {
740 delete $child->{parent}; 737 delete $child->{parent};
741 $child->hide; 738 $child->hide;
742
743 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 739 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
740 }
744 741
745 $self->realloc; 742 $self->realloc;
746} 743}
747 744
748sub clear { 745sub clear {
… …
776} 773}
777 774
778sub _draw { 775sub _draw {
779 my ($self) = @_; 776 my ($self) = @_;
780 777
781 $_->draw for @{$self->{children}}; 778 $_->draw for $self->visible_children;
782} 779}
783 780
784############################################################################# 781#############################################################################
785 782
786package CFPlus::UI::Bin; 783package CFPlus::UI::Bin;
… …
796} 793}
797 794
798sub add { 795sub add {
799 my ($self, $child) = @_; 796 my ($self, $child) = @_;
800 797
801 $self->SUPER::remove ($_) for @{ $self->{children} }; 798 $self->clear;
802 $self->SUPER::add ($child); 799 $self->SUPER::add ($child);
803} 800}
804 801
805sub remove { 802sub remove {
806 my ($self, $widget) = @_; 803 my ($self, $widget) = @_;
… …
948 $self->{view_x} = $x; 945 $self->{view_x} = $x;
949 $self->{view_y} = $y; 946 $self->{view_y} = $y;
950 947
951 $self->emit (changed => $x, $y); 948 $self->emit (changed => $x, $y);
952 $self->update; 949 $self->update;
950 }
951}
952
953sub set_center {
954 my ($self, $x, $y) = @_;
955
956 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
957}
958
959sub make_visible {
960 my ($self, $x, $y, $border) = @_;
961
962 if ( $x < $self->{view_x} + $self->{w} * $border
963 || $x > $self->{view_x} + $self->{w} * (1 - $border)
964 || $y < $self->{view_y} + $self->{h} * $border
965 || $y > $self->{view_y} + $self->{h} * (1 - $border)
966 ) {
967 $self->set_center ($x, $y);
953 } 968 }
954} 969}
955 970
956# hmm, this does not work for topleft of $self... but we should not ask for that 971# hmm, this does not work for topleft of $self... but we should not ask for that
957sub coord2local { 972sub coord2local {
… …
1004 my $child = delete $arg{child}; 1019 my $child = delete $arg{child};
1005 1020
1006 my $self; 1021 my $self;
1007 1022
1008 my $hslider = new CFPlus::UI::Slider 1023 my $hslider = new CFPlus::UI::Slider
1009 col => 0, 1024 c_col => 0,
1010 row => 1, 1025 c_row => 1,
1011 vertical => 0, 1026 vertical => 0,
1012 range => [0, 0, 1, 0.01], # HACK fix 1027 range => [0, 0, 1, 0.01], # HACK fix
1013 on_changed => sub { 1028 on_changed => sub {
1014 $self->{hpos} = $_[1]; 1029 $self->{hpos} = $_[1];
1015 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1030 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1016 }, 1031 },
1017 ; 1032 ;
1018 1033
1019 my $vslider = new CFPlus::UI::Slider 1034 my $vslider = new CFPlus::UI::Slider
1020 col => 1, 1035 c_col => 1,
1021 row => 0, 1036 c_row => 0,
1022 vertical => 1, 1037 vertical => 1,
1023 range => [0, 0, 1, 0.01], # HACK fix 1038 range => [0, 0, 1, 0.01], # HACK fix
1024 on_changed => sub { 1039 on_changed => sub {
1025 $self->{vpos} = $_[1]; 1040 $self->{vpos} = $_[1];
1026 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1041 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1037 row_expand => [1, 0], 1052 row_expand => [1, 0],
1038 %arg, 1053 %arg,
1039 ); 1054 );
1040 1055
1041 $self->{vp} = new CFPlus::UI::ViewPort 1056 $self->{vp} = new CFPlus::UI::ViewPort
1042 col => 0, 1057 c_col => 0,
1043 row => 0, 1058 c_row => 0,
1044 expand => 1, 1059 expand => 1,
1045 scroll_x => $self->{scroll_x}, 1060 scroll_x => $self->{scroll_x},
1046 scroll_y => $self->{scroll_y}, 1061 scroll_y => $self->{scroll_y},
1047 on_changed => sub { 1062 on_changed => sub {
1048 my ($vp, $x, $y) = @_; 1063 my ($vp, $x, $y) = @_;
… …
1070 my ($self, $widget) = @_; 1085 my ($self, $widget) = @_;
1071 1086
1072 $self->{vp}->add ($self->{child} = $widget); 1087 $self->{vp}->add ($self->{child} = $widget);
1073} 1088}
1074 1089
1090sub set_offset { shift->{vp}->set_offset (@_) }
1091sub set_center { shift->{vp}->set_center (@_) }
1092sub make_visible { shift->{vp}->make_visible (@_) }
1093
1075sub update_slider { 1094sub update_slider {
1076 my ($self) = @_; 1095 my ($self) = @_;
1077 1096
1078 my $child = ($self->{vp} or return)->child; 1097 my $child = ($self->{vp} or return)->child;
1079 1098
… …
1192 my ($w, $h) = @$self{qw(w h)}; 1211 my ($w, $h) = @$self{qw(w h)};
1193 1212
1194 glEnable GL_BLEND; 1213 glEnable GL_BLEND;
1195 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1214 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1196 glColor_premultiply @{ $self->{bg} }; 1215 glColor_premultiply @{ $self->{bg} };
1197
1198 glBegin GL_QUADS;
1199 glVertex 0 , 0;
1200 glVertex 0 , $h;
1201 glVertex $w, $h; 1216 glRect 0, 0, $w, $h;
1202 glVertex $w, 0;
1203 glEnd;
1204
1205 glDisable GL_BLEND; 1217 glDisable GL_BLEND;
1206 } 1218 }
1207 1219
1208 $self->SUPER::_draw; 1220 $self->SUPER::_draw;
1209} 1221}
… …
1571 1583
1572sub add { 1584sub add {
1573 my ($self, @widgets) = @_; 1585 my ($self, @widgets) = @_;
1574 1586
1575 for my $child (@widgets) { 1587 for my $child (@widgets) {
1576 $child->{rowspan} ||= 1; 1588 $child->{c_rowspan} ||= 1;
1577 $child->{colspan} ||= 1; 1589 $child->{c_colspan} ||= 1;
1578 } 1590 }
1579 1591
1580 $self->SUPER::add (@widgets); 1592 $self->SUPER::add (@widgets);
1581} 1593}
1582 1594
… …
1586 my @widgets; 1598 my @widgets;
1587 1599
1588 while (@_) { 1600 while (@_) {
1589 my ($col, $row, $child) = splice @_, 0, 3, (); 1601 my ($col, $row, $child) = splice @_, 0, 3, ();
1590 1602
1591 $child->{row} = $row; 1603 $child->{c_row} = $row;
1592 $child->{col} = $col; 1604 $child->{c_col} = $col;
1593 1605
1594 push @widgets, $child; 1606 push @widgets, $child;
1595 } 1607 }
1596 1608
1597 $self->add (@widgets); 1609 $self->add (@widgets);
… …
1603 my (@w, @h); 1615 my (@w, @h);
1604 1616
1605 my @children = $self->children; 1617 my @children = $self->children;
1606 1618
1607 # first pass, columns 1619 # first pass, columns
1608 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) { 1620 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1609 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; 1621 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1610 1622
1611 my $sw = sum @w[$c .. $c + $cs - 1]; 1623 my $sw = sum @w[$c .. $c + $cs - 1];
1612 1624
1613 if ($w > $sw) { 1625 if ($w > $sw) {
1614 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; 1626 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1615 } 1627 }
1616 } 1628 }
1617 1629
1618 # second pass, rows 1630 # second pass, rows
1619 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { 1631 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1620 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; 1632 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1621 1633
1622 my $sh = sum @h[$r .. $r + $rs - 1]; 1634 my $sh = sum @h[$r .. $r + $rs - 1];
1623 1635
1624 if ($h > $sh) { 1636 if ($h > $sh) {
1625 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; 1637 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
… …
1667 1679
1668 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } 1680 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1669 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } 1681 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1670 1682
1671 for my $widget ($self->children) { 1683 for my $widget ($self->children) {
1672 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)}; 1684 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1673 1685
1674 $widget->configure ( 1686 $widget->configure (
1675 $x[$c], $y[$r], 1687 $x[$c], $y[$r],
1676 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r], 1688 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1677 ); 1689 );
… …
1753our @ISA = CFPlus::UI::Container::; 1765our @ISA = CFPlus::UI::Container::;
1754 1766
1755sub size_request { 1767sub size_request {
1756 my ($self) = @_; 1768 my ($self) = @_;
1757 1769
1770 my @children = $self->visible_children;
1771
1758 $self->{vertical} 1772 $self->{vertical}
1759 ? ( 1773 ? (
1760 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1774 (List::Util::max map $_->{req_w}, @children),
1761 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1775 (List::Util::sum map $_->{req_h}, @children),
1762 ) 1776 )
1763 : ( 1777 : (
1764 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1778 (List::Util::sum map $_->{req_w}, @children),
1765 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1779 (List::Util::max map $_->{req_h}, @children),
1766 ) 1780 )
1767} 1781}
1768 1782
1769sub invoke_size_allocate { 1783sub invoke_size_allocate {
1770 my ($self, $w, $h) = @_; 1784 my ($self, $w, $h) = @_;
… …
1894 1908
1895 delete $self->{ox}; 1909 delete $self->{ox};
1896 $self->SUPER::realloc; 1910 $self->SUPER::realloc;
1897} 1911}
1898 1912
1913sub clear {
1914 my ($self) = @_;
1915
1916 $self->set_text ("");
1917}
1918
1899sub set_text { 1919sub set_text {
1900 my ($self, $text) = @_; 1920 my ($self, $text) = @_;
1901 1921
1902 return if $self->{text} eq "T$text"; 1922 return if $self->{text} eq "T$text";
1903 $self->{text} = "T$text"; 1923 $self->{text} = "T$text";
… …
2009 : ($self->{w} - $size->[0]) * 0.5); 2029 : ($self->{w} - $size->[0]) * 0.5);
2010 2030
2011 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2031 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2012 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2032 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2013 : ($self->{h} - $size->[1]) * 0.5); 2033 : ($self->{h} - $size->[1]) * 0.5);
2034
2035 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2014 }; 2036 };
2015 2037
2016# unless ($self->{list}) { 2038# unless ($self->{list}) {
2017# $self->{list} = CFPlus::OpenGL::glGenList; 2039# $self->{list} = CFPlus::OpenGL::glGenList;
2018# CFPlus::OpenGL::glNewList $self->{list}; 2040# CFPlus::OpenGL::glNewList $self->{list};
… …
2020# CFPlus::OpenGL::glEndList; 2042# CFPlus::OpenGL::glEndList;
2021# } 2043# }
2022# 2044#
2023# CFPlus::OpenGL::glCallList $self->{list}; 2045# CFPlus::OpenGL::glCallList $self->{list};
2024 2046
2025 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2047 $self->{layout}->draw;
2026} 2048}
2027 2049
2028#sub destroy { 2050#sub destroy {
2029# my ($self) = @_; 2051# my ($self) = @_;
2030# 2052#
… …
2045 my $class = shift; 2067 my $class = shift;
2046 2068
2047 $class->SUPER::new ( 2069 $class->SUPER::new (
2048 fg => [1, 1, 1], 2070 fg => [1, 1, 1],
2049 bg => [0, 0, 0, 0.2], 2071 bg => [0, 0, 0, 0.2],
2072 outline => [0.6, 0.3, 0.1],
2050 active_bg => [1, 1, 1, 0.5], 2073 active_bg => [0, 0, 1, .2],
2051 active_fg => [0, 0, 0], 2074 active_fg => [1, 1, 1],
2075 active_outline => [1, 1, 0],
2052 can_hover => 1, 2076 can_hover => 1,
2053 can_focus => 1, 2077 can_focus => 1,
2054 valign => 0, 2078 valign => 0,
2055 can_events => 1, 2079 can_events => 1,
2056 ellipsise => 0, 2080 ellipsise => 0,
… …
2196 glColor_premultiply @{$self->{bg}}; 2220 glColor_premultiply @{$self->{bg}};
2197 } 2221 }
2198 2222
2199 glEnable GL_BLEND; 2223 glEnable GL_BLEND;
2200 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2224 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}; 2225 glRect 0, 0, $self->{w}, $self->{h};
2205 glVertex $self->{w}, 0;
2206 glEnd;
2207 glDisable GL_BLEND; 2226 glDisable GL_BLEND;
2208 2227
2209 $self->SUPER::_draw; 2228 $self->SUPER::_draw;
2210 2229
2211 #TODO: force update every cursor change :( 2230 #TODO: force update every cursor change :(
… …
2213 2232
2214 unless (exists $self->{cur_h}) { 2233 unless (exists $self->{cur_h}) {
2215 my $text = substr $self->{text}, 0, $self->{cursor}; 2234 my $text = substr $self->{text}, 0, $self->{cursor};
2216 utf8::encode $text; 2235 utf8::encode $text;
2217 2236
2218 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2237 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2219 } 2238 }
2220 2239
2240 glColor_premultiply @{$self->{active_fg}};
2221 glBegin GL_LINES; 2241 glBegin GL_LINES;
2222 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2242 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}; 2243 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2244 glEnd;
2245
2246 glLineWidth 3;
2247 glColor @{$self->{active_outline}};
2248 glRect_lineloop 0, 0, $self->{w} - 1, $self->{h} - 1;
2249 glLineWidth 1;
2250
2251 } else {
2252 glColor @{$self->{outline}};
2253 glTranslate .375, .375;
2254 glBegin GL_LINE_STRIP;
2255 glVertex 0, $self->{h} * .5;
2256 glVertex 0, $self->{h} - 3;
2257 glVertex $self->{w} - 1, $self->{h} - 3;
2258 glVertex $self->{w} - 1, $self->{h} * .5;
2224 glEnd; 2259 glEnd;
2225 } 2260 }
2226} 2261}
2227 2262
2228############################################################################# 2263#############################################################################
… …
2315 1 2350 1
2316} 2351}
2317 2352
2318############################################################################# 2353#############################################################################
2319 2354
2355package CFPlus::UI::ButtonBin;
2356
2357our @ISA = CFPlus::UI::Bin::;
2358
2359use CFPlus::OpenGL;
2360
2361my @tex =
2362 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2363 qw(b1_button_inactive.png b1_button_active.png);
2364
2365sub new {
2366 my $class = shift;
2367
2368 $class->SUPER::new (
2369 can_hover => 1,
2370 align => 0,
2371 valign => 0,
2372 can_events => 1,
2373 @_
2374 )
2375}
2376
2377sub invoke_button_up {
2378 my ($self, $ev, $x, $y) = @_;
2379
2380 $self->emit ("activate")
2381 if $x >= 0 && $x < $self->{w}
2382 && $y >= 0 && $y < $self->{h};
2383
2384 1
2385}
2386
2387sub _draw {
2388 my ($self) = @_;
2389
2390 glEnable GL_TEXTURE_2D;
2391 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2392 glColor 0, 0, 0, 1;
2393
2394 my $tex = $tex[$GRAB == $self];
2395 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2396
2397 glDisable GL_TEXTURE_2D;
2398
2399 $self->SUPER::_draw;
2400}
2401
2402#############################################################################
2403
2320package CFPlus::UI::Button; 2404package CFPlus::UI::Button;
2321 2405
2322our @ISA = CFPlus::UI::Label::; 2406our @ISA = CFPlus::UI::Label::;
2323 2407
2324use CFPlus::OpenGL; 2408use CFPlus::OpenGL;
… …
2458sub new { 2542sub new {
2459 my $class = shift; 2543 my $class = shift;
2460 2544
2461 my $self = $class->SUPER::new ( 2545 my $self = $class->SUPER::new (
2462 can_events => 0, 2546 can_events => 0,
2547 scale => 1,
2463 @_, 2548 @_,
2464 ); 2549 );
2465 2550
2466 $self->{path} || $self->{tex} 2551 $self->{path} || $self->{tex}
2467 or Carp::croak "'path' or 'tex' attributes required"; 2552 or Carp::croak "'path' or 'tex' attributes required";
… …
2492} 2577}
2493 2578
2494sub size_request { 2579sub size_request {
2495 my ($self) = @_; 2580 my ($self) = @_;
2496 2581
2497 ($self->{tex}{w}, $self->{tex}{h}) 2582 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2498} 2583}
2499 2584
2500sub _draw { 2585sub _draw {
2501 my ($self) = @_; 2586 my ($self) = @_;
2502 2587
… …
2512 } 2597 }
2513 2598
2514 glEnable GL_TEXTURE_2D; 2599 glEnable GL_TEXTURE_2D;
2515 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2600 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2516 2601
2517 $tex->draw_quad (0, 0, $w, $h); 2602 $tex->draw_quad_alpha (0, 0, $w, $h);
2518 2603
2519 glDisable GL_TEXTURE_2D; 2604 glDisable GL_TEXTURE_2D;
2520} 2605}
2521 2606
2522############################################################################# 2607#############################################################################
… …
2541 align => 0, 2626 align => 0,
2542 valign => 0, 2627 valign => 0,
2543 can_events => 1, 2628 can_events => 1,
2544 @_ 2629 @_
2545 ); 2630 );
2631}
2632
2633sub invoke_button_down {
2634 my ($self, $ev, $x, $y) = @_;
2635
2636 1
2546} 2637}
2547 2638
2548sub invoke_button_up { 2639sub invoke_button_up {
2549 my ($self, $ev, $x, $y) = @_; 2640 my ($self, $ev, $x, $y) = @_;
2550 2641
… …
2690 glDisable GL_TEXTURE_2D; 2781 glDisable GL_TEXTURE_2D;
2691} 2782}
2692 2783
2693############################################################################# 2784#############################################################################
2694 2785
2786package CFPlus::UI::Progress;
2787
2788our @ISA = CFPlus::UI::Label::;
2789
2790use CFPlus::OpenGL;
2791
2792sub new {
2793 my ($class, %arg) = @_;
2794
2795 my $self = $class->SUPER::new (
2796 fg => [1, 1, 1],
2797 bg => [0, 0, 1, 0.2],
2798 bar => [0.7, 0.5, 0.1, 0.8],
2799 outline => [0.4, 0.3, 0],
2800 fontsize => 0.9,
2801 valign => 0,
2802 align => 0,
2803 can_events => 1,
2804 ellipsise => 1,
2805 label => "%d%%",
2806 %arg,
2807 );
2808
2809 $self->set_value ($arg{value} || -1);
2810
2811 $self
2812}
2813
2814sub set_label {
2815 my ($self, $label) = @_;
2816
2817 return if $self->{label} eq $label;
2818 $self->{label} = $label;
2819
2820 $self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
2821}
2822
2823sub set_value {
2824 my ($self, $value) = @_;
2825
2826 if ($self->{value} ne $value) {
2827 $self->{value} = $value;
2828
2829 if ($value < 0) {
2830 $self->set_text ("-");
2831 } else {
2832 $self->set_text (sprintf $self->{label}, $value * 100);
2833 }
2834
2835 $self->update;
2836 }
2837}
2838
2839sub _draw {
2840 my ($self) = @_;
2841
2842 glEnable GL_BLEND;
2843 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2844
2845 if ($self->{value} >= 0) {
2846 my $s = 3 + ($self->{w} - 6) * $self->{value};
2847
2848 glColor_premultiply @{$self->{bar}};
2849 glRect 2, 2, $s, $self->{h} - 2;
2850 glColor_premultiply @{$self->{bg}};
2851 glRect $s + 1, 0, $self->{w} - 2, $self->{h} - 2;
2852 }
2853
2854 glColor_premultiply @{$self->{outline}};
2855 glRect_lineloop 1, 1, $self->{w} - 2, $self->{h} - 2;
2856
2857 glDisable GL_BLEND;
2858
2859 {
2860 local $self->{bg}; # do not draw background
2861 $self->SUPER::_draw;
2862 }
2863}
2864
2865#############################################################################
2866
2867package CFPlus::UI::ExperienceProgress;
2868
2869our @ISA = CFPlus::UI::Progress::;
2870
2871sub new {
2872 my ($class, %arg) = @_;
2873
2874 my $self = $class->SUPER::new (
2875 %arg
2876 );
2877
2878 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2879 if $::CONN;
2880
2881 $self
2882}
2883
2884sub DESTROY {
2885 my ($self) = @_;
2886
2887 delete $::CONN->{on_exp_update}{$self+0}
2888 if $::CONN;
2889
2890 $self->SUPER::DESTROY;
2891}
2892
2893sub set_value {
2894 my ($self, $lvl, $exp) = @_;
2895
2896 my $v = -1;
2897
2898 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2899 my $l0 = $table->[$lvl - 1];
2900 my $l1 = $table->[$lvl];
2901
2902 $v = ($exp - $l0) / ($l1 - $l0);
2903 }
2904
2905 $self->SUPER::set_value ($v);
2906}
2907
2908#############################################################################
2909
2695package CFPlus::UI::Gauge; 2910package CFPlus::UI::Gauge;
2696 2911
2697our @ISA = CFPlus::UI::VBox::; 2912our @ISA = CFPlus::UI::VBox::;
2698 2913
2699sub new { 2914sub new {
… …
2997} 3212}
2998 3213
2999sub size_request { 3214sub size_request {
3000 my ($self) = @_; 3215 my ($self) = @_;
3001 3216
3002 my ($empty, $slider) = @{ $self->{children} }; 3217 my ($empty, $slider) = $self->visible_children;
3003 3218
3004 local $self->{children} = [$empty, $slider]; 3219 local $self->{children} = [$empty, $slider];
3005 $self->SUPER::size_request 3220 $self->SUPER::size_request
3006} 3221}
3007 3222
… …
3196 3411
3197 if ($y0 < $y + $h && $y < $y1) { 3412 if ($y0 < $y + $h && $y < $y1) {
3198 my $layout = $self->get_layout ($para); 3413 my $layout = $self->get_layout ($para);
3199 3414
3200 $layout->render ($para->{indent}, $y - $y0); 3415 $layout->render ($para->{indent}, $y - $y0);
3416 $layout->draw;
3201 3417
3202 if (my @w = @{ $para->{widget} }) { 3418 if (my @w = @{ $para->{widget} }) {
3203 my @s = $layout->get_shapes; 3419 my @s = $layout->get_shapes;
3204 3420
3205 for (@w) { 3421 for (@w) {
… …
3396 glTranslate 0.375, 0.375; 3612 glTranslate 0.375, 0.375;
3397 3613
3398 my ($w, $h) = @$self{qw(w h)}; 3614 my ($w, $h) = @$self{qw(w h)};
3399 3615
3400 glColor 1, 0.8, 0.4; 3616 glColor 1, 0.8, 0.4;
3401 glBegin GL_QUADS; 3617 glRect 0, 0, $w, $h;
3402 glVertex 0 , 0;
3403 glVertex 0 , $h;
3404 glVertex $w, $h;
3405 glVertex $w, 0;
3406 glEnd;
3407 3618
3408 glColor 0, 0, 0; 3619 glColor 0, 0, 0;
3409 glBegin GL_LINE_LOOP; 3620 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 3621
3416 glTranslate 2 - 0.375, 2 - 0.375; 3622 glTranslate 2 - 0.375, 2 - 0.375;
3417 3623
3418 $self->SUPER::_draw; 3624 $self->SUPER::_draw;
3419} 3625}
… …
3443 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3649 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3444 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed}; 3650 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3445 $self->{timer} = Event->timer ( 3651 $self->{timer} = Event->timer (
3446 parked => 1, 3652 parked => 1,
3447 cb => sub { 3653 cb => sub {
3448 return unless $::CONN && $widget; 3654 return unless $::CONN;
3449 3655
3656 my $w = $widget
3657 or return;
3658
3450 ++$widget->{frame}; 3659 ++$w->{frame};
3451 $widget->update_face; 3660 $w->update_face;
3661
3662 # somehow, $widget can go away
3452 $widget->update; 3663 $w->update;
3453
3454 $widget->update_timer; 3664 $w->update_timer;
3455 }, 3665 },
3456 ); 3666 );
3457 3667
3458 $self->update_face; 3668 $self->update_face;
3459 $self->update_timer; 3669 $self->update_timer;
… …
3480} 3690}
3481 3691
3482sub update_face { 3692sub update_face {
3483 my ($self) = @_; 3693 my ($self) = @_;
3484 3694
3485 return unless $::CONN; 3695 if ($::CONN) {
3486
3487 if (my $anim = $::CONN->{anim}[$self->{anim}]) { 3696 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3488 if ($anim && @$anim) { 3697 if ($anim && @$anim) {
3489 delete $self->{wait_face};
3490 $self->{face} = $anim->[ $self->{frame} % @$anim ]; 3698 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3699 delete $self->{face_change_cb};
3700
3491 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ]; 3701 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3702 unless ($tex->{name} || $tex->{loading}) {
3703 $tex->upload (sub { $self->reconfigure });
3704 }
3705 }
3706 }
3492 } 3707 }
3493 } 3708 }
3494} 3709}
3495 3710
3496sub size_request { 3711sub size_request {
3497 my ($self) = @_; 3712 my ($self) = @_;
3498 3713
3499 if ($::CONN) { 3714 if ($::CONN) {
3500 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3715 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3501 if (my $tex = $::CONN->{texture}[$faceid]) { 3716 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3502 $self->{tex} = $tex; 3717 if ($tex->{name}) {
3503 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3718 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3504 } else { 3719 } elsif (!$tex->{loading}) {
3505 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3720 $tex->upload (sub { $self->reconfigure });
3506 $self->realloc;
3507 }); 3721 }
3508 } 3722 }
3723
3724 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3509 } 3725 }
3510 } 3726 }
3511 3727
3512 ($self->{size_w} || 8, $self->{size_h} || 8) 3728 ($self->{size_w} || 8, $self->{size_h} || 8)
3513} 3729}
… …
3593 children => [ 3809 children => [
3594 (new CFPlus::UI::Label markup => $left, expand => 1), 3810 (new CFPlus::UI::Label markup => $left, expand => 1),
3595 (new CFPlus::UI::Label markup => $right, align => +1), 3811 (new CFPlus::UI::Label markup => $right, align => +1),
3596 ], 3812 ],
3597 ; 3813 ;
3598 3814
3599 } else { 3815 } else {
3600 $widget = new CFPlus::UI::Label 3816 $widget = new CFPlus::UI::Label
3601 can_hover => 1, 3817 can_hover => 1,
3602 can_events => 1, 3818 can_events => 1,
3603 markup => $widget, 3819 markup => $widget,
… …
3728 3944
3729############################################################################# 3945#############################################################################
3730 3946
3731package CFPlus::UI::Notebook; 3947package CFPlus::UI::Notebook;
3732 3948
3949use CFPlus::OpenGL;
3950
3733our @ISA = CFPlus::UI::VBox::; 3951our @ISA = CFPlus::UI::VBox::;
3734 3952
3735sub new { 3953sub new {
3736 my $class = shift; 3954 my $class = shift;
3737 3955
3738 my $self = $class->SUPER::new ( 3956 my $self = $class->SUPER::new (
3739 buttonbar => (new CFPlus::UI::Buttonbar), 3957 buttonbar => (new CFPlus::UI::Buttonbar),
3740 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3958 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3959 active_outline => [1, 1, 0],
3741 # filter => # will be put between multiplexer and $self 3960 # filter => # will be put between multiplexer and $self
3742 @_, 3961 @_,
3743 ); 3962 );
3744 3963
3745 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3964 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3746 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3965 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3747 3966
3967 {
3968 Scalar::Util::weaken (my $wself = $self);
3969
3970 $self->{multiplexer}->connect (c_add => sub {
3971 my ($mplex, $widgets) = @_;
3972
3973 for my $child (@$widgets) {
3974 Scalar::Util::weaken $child;
3975 $child->{c_tab_} ||= do {
3976 my $tab =
3977 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3978 ? $child->{c_tab}
3979 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3980
3981 $tab->connect (activate => sub {
3982 $wself->set_current_page ($child);
3983 });
3984
3985 $tab
3986 };
3987
3988 $self->{buttonbar}->add ($child->{c_tab_});
3989 }
3990 });
3991
3992 $self->{multiplexer}->connect (c_remove => sub {
3993 my ($mplex, $widgets) = @_;
3994
3995 for my $child (@$widgets) {
3996 $wself->{buttonbar}->remove ($child->{c_tab_});
3997 }
3998 });
3999 }
4000
3748 $self 4001 $self
3749} 4002}
3750 4003
3751sub add { 4004sub add {
4005 my ($self, @widgets) = @_;
4006
4007 $self->{multiplexer}->add (@widgets)
4008}
4009
4010sub remove {
4011 my ($self, @widgets) = @_;
4012
4013 $self->{multiplexer}->remove (@widgets)
4014}
4015
4016sub pages {
4017 my ($self) = @_;
4018 $self->{multiplexer}->children
4019}
4020
4021sub add_tab {
3752 my ($self, $title, $widget, $tooltip) = @_; 4022 my ($self, $title, $widget, $tooltip) = @_;
3753 4023
3754 CFPlus::weaken $self; 4024 $title = [$title, $tooltip] unless ref $title;
4025 $widget->{c_tab} = $title;
3755 4026
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); 4027 $self->add ($widget);
3767} 4028}
3768 4029
3769sub get_current_page { 4030sub get_current_page {
3770 my ($self) = @_; 4031 my ($self) = @_;
3771 4032
… …
3775sub set_current_page { 4036sub set_current_page {
3776 my ($self, $page) = @_; 4037 my ($self, $page) = @_;
3777 4038
3778 $self->{multiplexer}->set_current_page ($page); 4039 $self->{multiplexer}->set_current_page ($page);
3779 $self->emit (page_changed => $self->{multiplexer}{current}); 4040 $self->emit (page_changed => $self->{multiplexer}{current});
4041}
4042
4043sub _draw {
4044 my ($self) = @_;
4045
4046 $self->SUPER::_draw ();
4047
4048 if (my $cur = $self->{multiplexer}{current}) {
4049 if ($cur = $cur->{c_tab_}) {
4050 glTranslate $cur->{x}, $cur->{y};
4051 glLineWidth 3;
4052 glColor @{$self->{active_outline}};
4053 glRect_lineloop 1, 1, $cur->{w} - 2, $cur->{h} - 2;
4054 glLineWidth 1;
4055 }
4056 }
3780} 4057}
3781 4058
3782############################################################################# 4059#############################################################################
3783 4060
3784package CFPlus::UI::Selector; 4061package CFPlus::UI::Selector;
… …
4054} 4331}
4055 4332
4056sub update { 4333sub update {
4057 my ($self) = @_; 4334 my ($self) = @_;
4058 4335
4059 $::WANT_REFRESH++; 4336 $::WANT_REFRESH->start;
4060} 4337}
4061 4338
4062sub add { 4339sub add {
4063 my ($self, @children) = @_; 4340 my ($self, @children) = @_;
4064 4341

Diff Legend

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