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.428 by root, Mon Aug 20 19:24:22 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
… …
725 @{$self->{children}}, @widgets 725 @{$self->{children}}, @widgets
726 ]; 726 ];
727 727
728 $self->realloc; 728 $self->realloc;
729 729
730 $self->emit (c_add => \@widgets);
731
730 map $_+0, @widgets 732 map $_+0, @widgets
731} 733}
732 734
733sub children { 735sub children {
734 @{ $_[0]{children} } 736 @{ $_[0]{children} }
735} 737}
736 738
737sub remove { 739sub remove {
738 my ($self, $child) = @_; 740 my ($self, @widgets) = @_;
739 741
742 $self->emit (c_remove => \@widgets);
743
744 for my $child (@widgets) {
740 delete $child->{parent}; 745 delete $child->{parent};
741 $child->hide; 746 $child->hide;
742
743 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 747 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
748 }
744 749
745 $self->realloc; 750 $self->realloc;
746} 751}
747 752
748sub clear { 753sub clear {
… …
776} 781}
777 782
778sub _draw { 783sub _draw {
779 my ($self) = @_; 784 my ($self) = @_;
780 785
781 $_->draw for @{$self->{children}}; 786 $_->draw for $self->visible_children;
782} 787}
783 788
784############################################################################# 789#############################################################################
785 790
786package CFPlus::UI::Bin; 791package CFPlus::UI::Bin;
… …
796} 801}
797 802
798sub add { 803sub add {
799 my ($self, $child) = @_; 804 my ($self, $child) = @_;
800 805
801 $self->SUPER::remove ($_) for @{ $self->{children} }; 806 $self->clear;
802 $self->SUPER::add ($child); 807 $self->SUPER::add ($child);
803} 808}
804 809
805sub remove { 810sub remove {
806 my ($self, $widget) = @_; 811 my ($self, $widget) = @_;
… …
948 $self->{view_x} = $x; 953 $self->{view_x} = $x;
949 $self->{view_y} = $y; 954 $self->{view_y} = $y;
950 955
951 $self->emit (changed => $x, $y); 956 $self->emit (changed => $x, $y);
952 $self->update; 957 $self->update;
958 }
959}
960
961sub set_center {
962 my ($self, $x, $y) = @_;
963
964 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
965}
966
967sub make_visible {
968 my ($self, $x, $y, $border) = @_;
969
970 if ( $x < $self->{view_x} + $self->{w} * $border
971 || $x > $self->{view_x} + $self->{w} * (1 - $border)
972 || $y < $self->{view_y} + $self->{h} * $border
973 || $y > $self->{view_y} + $self->{h} * (1 - $border)
974 ) {
975 $self->set_center ($x, $y);
953 } 976 }
954} 977}
955 978
956# hmm, this does not work for topleft of $self... but we should not ask for that 979# hmm, this does not work for topleft of $self... but we should not ask for that
957sub coord2local { 980sub coord2local {
… …
1004 my $child = delete $arg{child}; 1027 my $child = delete $arg{child};
1005 1028
1006 my $self; 1029 my $self;
1007 1030
1008 my $hslider = new CFPlus::UI::Slider 1031 my $hslider = new CFPlus::UI::Slider
1009 col => 0, 1032 c_col => 0,
1010 row => 1, 1033 c_row => 1,
1011 vertical => 0, 1034 vertical => 0,
1012 range => [0, 0, 1, 0.01], # HACK fix 1035 range => [0, 0, 1, 0.01], # HACK fix
1013 on_changed => sub { 1036 on_changed => sub {
1014 $self->{hpos} = $_[1]; 1037 $self->{hpos} = $_[1];
1015 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1038 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1016 }, 1039 },
1017 ; 1040 ;
1018 1041
1019 my $vslider = new CFPlus::UI::Slider 1042 my $vslider = new CFPlus::UI::Slider
1020 col => 1, 1043 c_col => 1,
1021 row => 0, 1044 c_row => 0,
1022 vertical => 1, 1045 vertical => 1,
1023 range => [0, 0, 1, 0.01], # HACK fix 1046 range => [0, 0, 1, 0.01], # HACK fix
1024 on_changed => sub { 1047 on_changed => sub {
1025 $self->{vpos} = $_[1]; 1048 $self->{vpos} = $_[1];
1026 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1049 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1037 row_expand => [1, 0], 1060 row_expand => [1, 0],
1038 %arg, 1061 %arg,
1039 ); 1062 );
1040 1063
1041 $self->{vp} = new CFPlus::UI::ViewPort 1064 $self->{vp} = new CFPlus::UI::ViewPort
1042 col => 0, 1065 c_col => 0,
1043 row => 0, 1066 c_row => 0,
1044 expand => 1, 1067 expand => 1,
1045 scroll_x => $self->{scroll_x}, 1068 scroll_x => $self->{scroll_x},
1046 scroll_y => $self->{scroll_y}, 1069 scroll_y => $self->{scroll_y},
1047 on_changed => sub { 1070 on_changed => sub {
1048 my ($vp, $x, $y) = @_; 1071 my ($vp, $x, $y) = @_;
… …
1069sub add { 1092sub add {
1070 my ($self, $widget) = @_; 1093 my ($self, $widget) = @_;
1071 1094
1072 $self->{vp}->add ($self->{child} = $widget); 1095 $self->{vp}->add ($self->{child} = $widget);
1073} 1096}
1097
1098sub set_offset { shift->{vp}->set_offset (@_) }
1099sub set_center { shift->{vp}->set_center (@_) }
1100sub make_visible { shift->{vp}->make_visible (@_) }
1074 1101
1075sub update_slider { 1102sub update_slider {
1076 my ($self) = @_; 1103 my ($self) = @_;
1077 1104
1078 my $child = ($self->{vp} or return)->child; 1105 my $child = ($self->{vp} or return)->child;
… …
1571 1598
1572sub add { 1599sub add {
1573 my ($self, @widgets) = @_; 1600 my ($self, @widgets) = @_;
1574 1601
1575 for my $child (@widgets) { 1602 for my $child (@widgets) {
1576 $child->{rowspan} ||= 1; 1603 $child->{c_rowspan} ||= 1;
1577 $child->{colspan} ||= 1; 1604 $child->{c_colspan} ||= 1;
1578 } 1605 }
1579 1606
1580 $self->SUPER::add (@widgets); 1607 $self->SUPER::add (@widgets);
1581} 1608}
1582 1609
… …
1586 my @widgets; 1613 my @widgets;
1587 1614
1588 while (@_) { 1615 while (@_) {
1589 my ($col, $row, $child) = splice @_, 0, 3, (); 1616 my ($col, $row, $child) = splice @_, 0, 3, ();
1590 1617
1591 $child->{row} = $row; 1618 $child->{c_row} = $row;
1592 $child->{col} = $col; 1619 $child->{c_col} = $col;
1593 1620
1594 push @widgets, $child; 1621 push @widgets, $child;
1595 } 1622 }
1596 1623
1597 $self->add (@widgets); 1624 $self->add (@widgets);
… …
1603 my (@w, @h); 1630 my (@w, @h);
1604 1631
1605 my @children = $self->children; 1632 my @children = $self->children;
1606 1633
1607 # first pass, columns 1634 # first pass, columns
1608 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) { 1635 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1609 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; 1636 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1610 1637
1611 my $sw = sum @w[$c .. $c + $cs - 1]; 1638 my $sw = sum @w[$c .. $c + $cs - 1];
1612 1639
1613 if ($w > $sw) { 1640 if ($w > $sw) {
1614 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; 1641 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1615 } 1642 }
1616 } 1643 }
1617 1644
1618 # second pass, rows 1645 # second pass, rows
1619 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { 1646 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1620 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; 1647 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1621 1648
1622 my $sh = sum @h[$r .. $r + $rs - 1]; 1649 my $sh = sum @h[$r .. $r + $rs - 1];
1623 1650
1624 if ($h > $sh) { 1651 if ($h > $sh) {
1625 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; 1652 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
… …
1667 1694
1668 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } 1695 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1669 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } 1696 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1670 1697
1671 for my $widget ($self->children) { 1698 for my $widget ($self->children) {
1672 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)}; 1699 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1673 1700
1674 $widget->configure ( 1701 $widget->configure (
1675 $x[$c], $y[$r], 1702 $x[$c], $y[$r],
1676 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r], 1703 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1677 ); 1704 );
… …
1738 my $y = _scale $child->{c_rel}, $child->{c_y}, $H; 1765 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1739 1766
1740 $x += $child->{c_halign} * $child->{req_w}; 1767 $x += $child->{c_halign} * $child->{req_w};
1741 $y += $child->{c_valign} * $child->{req_h}; 1768 $y += $child->{c_valign} * $child->{req_h};
1742 1769
1743 $child->configure ($x, $y, $child->{req_w}, $child->{req_h}); 1770 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1744 } 1771 }
1745 1772
1746 1 1773 1
1747} 1774}
1748 1775
… …
1752 1779
1753our @ISA = CFPlus::UI::Container::; 1780our @ISA = CFPlus::UI::Container::;
1754 1781
1755sub size_request { 1782sub size_request {
1756 my ($self) = @_; 1783 my ($self) = @_;
1784
1785 my @children = $self->visible_children;
1757 1786
1758 $self->{vertical} 1787 $self->{vertical}
1759 ? ( 1788 ? (
1760 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1789 (List::Util::max map $_->{req_w}, @children),
1761 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1790 (List::Util::sum map $_->{req_h}, @children),
1762 ) 1791 )
1763 : ( 1792 : (
1764 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1793 (List::Util::sum map $_->{req_w}, @children),
1765 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1794 (List::Util::max map $_->{req_h}, @children),
1766 ) 1795 )
1767} 1796}
1768 1797
1769sub invoke_size_allocate { 1798sub invoke_size_allocate {
1770 my ($self, $w, $h) = @_; 1799 my ($self, $w, $h) = @_;
… …
1894 1923
1895 delete $self->{ox}; 1924 delete $self->{ox};
1896 $self->SUPER::realloc; 1925 $self->SUPER::realloc;
1897} 1926}
1898 1927
1928sub clear {
1929 my ($self) = @_;
1930
1931 $self->set_text ("");
1932}
1933
1899sub set_text { 1934sub set_text {
1900 my ($self, $text) = @_; 1935 my ($self, $text) = @_;
1901 1936
1902 return if $self->{text} eq "T$text"; 1937 return if $self->{text} eq "T$text";
1903 $self->{text} = "T$text"; 1938 $self->{text} = "T$text";
… …
2009 : ($self->{w} - $size->[0]) * 0.5); 2044 : ($self->{w} - $size->[0]) * 0.5);
2010 2045
2011 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2046 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2012 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2047 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2013 : ($self->{h} - $size->[1]) * 0.5); 2048 : ($self->{h} - $size->[1]) * 0.5);
2049
2050 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2014 }; 2051 };
2015 2052
2016# unless ($self->{list}) { 2053# unless ($self->{list}) {
2017# $self->{list} = CFPlus::OpenGL::glGenList; 2054# $self->{list} = CFPlus::OpenGL::glGenList;
2018# CFPlus::OpenGL::glNewList $self->{list}; 2055# CFPlus::OpenGL::glNewList $self->{list};
… …
2020# CFPlus::OpenGL::glEndList; 2057# CFPlus::OpenGL::glEndList;
2021# } 2058# }
2022# 2059#
2023# CFPlus::OpenGL::glCallList $self->{list}; 2060# CFPlus::OpenGL::glCallList $self->{list};
2024 2061
2025 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2062 $self->{layout}->draw;
2026} 2063}
2027 2064
2028#sub destroy { 2065#sub destroy {
2029# my ($self) = @_; 2066# my ($self) = @_;
2030# 2067#
… …
2045 my $class = shift; 2082 my $class = shift;
2046 2083
2047 $class->SUPER::new ( 2084 $class->SUPER::new (
2048 fg => [1, 1, 1], 2085 fg => [1, 1, 1],
2049 bg => [0, 0, 0, 0.2], 2086 bg => [0, 0, 0, 0.2],
2087 outline => [0.6, 0.3, 0.1],
2050 active_bg => [1, 1, 1, 0.5], 2088 active_bg => [0, 0, 1, .2],
2051 active_fg => [0, 0, 0], 2089 active_fg => [1, 1, 1],
2090 active_outline => [1, 1, 0],
2052 can_hover => 1, 2091 can_hover => 1,
2053 can_focus => 1, 2092 can_focus => 1,
2054 valign => 0, 2093 valign => 0,
2055 can_events => 1, 2094 can_events => 1,
2056 ellipsise => 0, 2095 ellipsise => 0,
… …
2213 2252
2214 unless (exists $self->{cur_h}) { 2253 unless (exists $self->{cur_h}) {
2215 my $text = substr $self->{text}, 0, $self->{cursor}; 2254 my $text = substr $self->{text}, 0, $self->{cursor};
2216 utf8::encode $text; 2255 utf8::encode $text;
2217 2256
2218 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2257 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2219 } 2258 }
2220 2259
2260 glColor_premultiply @{$self->{active_fg}};
2221 glBegin GL_LINES; 2261 glBegin GL_LINES;
2222 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2262 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}; 2263 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2264 glEnd;
2265
2266 glLineWidth 3;
2267 glColor @{$self->{active_outline}};
2268 glBegin GL_LINE_LOOP;
2269 glVertex 0, 0;
2270 glVertex $self->{w} - 1, 0;
2271 glVertex $self->{w} - 1, $self->{h} - 1;
2272 glVertex 0, $self->{h} - 1;
2273 glEnd;
2274 glLineWidth 1;
2275
2276 } else {
2277 glColor @{$self->{outline}};
2278 glTranslate .375, .375;
2279 glBegin GL_LINE_STRIP;
2280 glVertex 0, $self->{h} * .5;
2281 glVertex 0, $self->{h} - 3;
2282 glVertex $self->{w} - 1, $self->{h} - 3;
2283 glVertex $self->{w} - 1, $self->{h} * .5;
2224 glEnd; 2284 glEnd;
2225 } 2285 }
2226} 2286}
2227 2287
2228############################################################################# 2288#############################################################################
… …
2315 1 2375 1
2316} 2376}
2317 2377
2318############################################################################# 2378#############################################################################
2319 2379
2380package CFPlus::UI::ButtonBin;
2381
2382our @ISA = CFPlus::UI::Bin::;
2383
2384use CFPlus::OpenGL;
2385
2386my @tex =
2387 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2388 qw(b1_button_inactive.png b1_button_active.png);
2389
2390sub new {
2391 my $class = shift;
2392
2393 $class->SUPER::new (
2394 can_hover => 1,
2395 align => 0,
2396 valign => 0,
2397 can_events => 1,
2398 @_
2399 )
2400}
2401
2402sub invoke_button_up {
2403 my ($self, $ev, $x, $y) = @_;
2404
2405 $self->emit ("activate")
2406 if $x >= 0 && $x < $self->{w}
2407 && $y >= 0 && $y < $self->{h};
2408
2409 1
2410}
2411
2412sub _draw {
2413 my ($self) = @_;
2414
2415 glEnable GL_TEXTURE_2D;
2416 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2417 glColor 0, 0, 0, 1;
2418
2419 my $tex = $tex[$GRAB == $self];
2420 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2421
2422 glDisable GL_TEXTURE_2D;
2423
2424 $self->SUPER::_draw;
2425}
2426
2427#############################################################################
2428
2320package CFPlus::UI::Button; 2429package CFPlus::UI::Button;
2321 2430
2322our @ISA = CFPlus::UI::Label::; 2431our @ISA = CFPlus::UI::Label::;
2323 2432
2324use CFPlus::OpenGL; 2433use CFPlus::OpenGL;
… …
2458sub new { 2567sub new {
2459 my $class = shift; 2568 my $class = shift;
2460 2569
2461 my $self = $class->SUPER::new ( 2570 my $self = $class->SUPER::new (
2462 can_events => 0, 2571 can_events => 0,
2572 scale => 1,
2463 @_, 2573 @_,
2464 ); 2574 );
2465 2575
2466 $self->{path} || $self->{tex} 2576 $self->{path} || $self->{tex}
2467 or Carp::croak "'path' or 'tex' attributes required"; 2577 or Carp::croak "'path' or 'tex' attributes required";
… …
2492} 2602}
2493 2603
2494sub size_request { 2604sub size_request {
2495 my ($self) = @_; 2605 my ($self) = @_;
2496 2606
2497 ($self->{tex}{w}, $self->{tex}{h}) 2607 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2498} 2608}
2499 2609
2500sub _draw { 2610sub _draw {
2501 my ($self) = @_; 2611 my ($self) = @_;
2502 2612
… …
2512 } 2622 }
2513 2623
2514 glEnable GL_TEXTURE_2D; 2624 glEnable GL_TEXTURE_2D;
2515 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2625 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2516 2626
2517 $tex->draw_quad (0, 0, $w, $h); 2627 $tex->draw_quad_alpha (0, 0, $w, $h);
2518 2628
2519 glDisable GL_TEXTURE_2D; 2629 glDisable GL_TEXTURE_2D;
2520} 2630}
2521 2631
2522############################################################################# 2632#############################################################################
… …
2541 align => 0, 2651 align => 0,
2542 valign => 0, 2652 valign => 0,
2543 can_events => 1, 2653 can_events => 1,
2544 @_ 2654 @_
2545 ); 2655 );
2656}
2657
2658sub invoke_button_down {
2659 my ($self, $ev, $x, $y) = @_;
2660
2661 1
2546} 2662}
2547 2663
2548sub invoke_button_up { 2664sub invoke_button_up {
2549 my ($self, $ev, $x, $y) = @_; 2665 my ($self, $ev, $x, $y) = @_;
2550 2666
… …
2997} 3113}
2998 3114
2999sub size_request { 3115sub size_request {
3000 my ($self) = @_; 3116 my ($self) = @_;
3001 3117
3002 my ($empty, $slider) = @{ $self->{children} }; 3118 my ($empty, $slider) = $self->visible_children;
3003 3119
3004 local $self->{children} = [$empty, $slider]; 3120 local $self->{children} = [$empty, $slider];
3005 $self->SUPER::size_request 3121 $self->SUPER::size_request
3006} 3122}
3007 3123
… …
3196 3312
3197 if ($y0 < $y + $h && $y < $y1) { 3313 if ($y0 < $y + $h && $y < $y1) {
3198 my $layout = $self->get_layout ($para); 3314 my $layout = $self->get_layout ($para);
3199 3315
3200 $layout->render ($para->{indent}, $y - $y0); 3316 $layout->render ($para->{indent}, $y - $y0);
3317 $layout->draw;
3201 3318
3202 if (my @w = @{ $para->{widget} }) { 3319 if (my @w = @{ $para->{widget} }) {
3203 my @s = $layout->get_shapes; 3320 my @s = $layout->get_shapes;
3204 3321
3205 for (@w) { 3322 for (@w) {
… …
3396 glTranslate 0.375, 0.375; 3513 glTranslate 0.375, 0.375;
3397 3514
3398 my ($w, $h) = @$self{qw(w h)}; 3515 my ($w, $h) = @$self{qw(w h)};
3399 3516
3400 glColor 1, 0.8, 0.4; 3517 glColor 1, 0.8, 0.4;
3401 glBegin GL_QUADS; 3518 glRect 0, 0, $w, $h;
3402 glVertex 0 , 0;
3403 glVertex 0 , $h;
3404 glVertex $w, $h;
3405 glVertex $w, 0;
3406 glEnd;
3407 3519
3408 glColor 0, 0, 0; 3520 glColor 0, 0, 0;
3409 glBegin GL_LINE_LOOP; 3521 glBegin GL_LINE_LOOP;
3410 glVertex 0 , 0; 3522 glVertex 0 , 0;
3411 glVertex 0 , $h; 3523 glVertex 0 , $h;
… …
3443 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3555 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3444 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed}; 3556 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3445 $self->{timer} = Event->timer ( 3557 $self->{timer} = Event->timer (
3446 parked => 1, 3558 parked => 1,
3447 cb => sub { 3559 cb => sub {
3448 return unless $::CONN && $widget; 3560 return unless $::CONN;
3449 3561
3562 my $w = $widget
3563 or return;
3564
3450 ++$widget->{frame}; 3565 ++$w->{frame};
3451 $widget->update_face; 3566 $w->update_face;
3567
3568 # somehow, $widget can go away
3452 $widget->update; 3569 $w->update;
3453
3454 $widget->update_timer; 3570 $w->update_timer;
3455 }, 3571 },
3456 ); 3572 );
3457 3573
3458 $self->update_face; 3574 $self->update_face;
3459 $self->update_timer; 3575 $self->update_timer;
… …
3486 3602
3487 if (my $anim = $::CONN->{anim}[$self->{anim}]) { 3603 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3488 if ($anim && @$anim) { 3604 if ($anim && @$anim) {
3489 delete $self->{wait_face}; 3605 delete $self->{wait_face};
3490 $self->{face} = $anim->[ $self->{frame} % @$anim ]; 3606 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3491 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ]; 3607 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ]) {
3608 unless ($tex->{name} || $tex->{loading}) {
3609 $tex->upload (sub { $self->reconfigure });
3610 }
3611 }
3492 } 3612 }
3493 } 3613 }
3494} 3614}
3495 3615
3496sub size_request { 3616sub size_request {
3497 my ($self) = @_; 3617 my ($self) = @_;
3498 3618
3499 if ($::CONN) { 3619 if ($::CONN) {
3500 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3620 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3501 if (my $tex = $::CONN->{texture}[$faceid]) { 3621 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3502 $self->{tex} = $tex; 3622 if ($tex->{name}) {
3503 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3623 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3624 } elsif (!$tex->{loading}) {
3625 $tex->upload (sub { $self->reconfigure });
3626 }
3504 } else { 3627 } else {
3505 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3628 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3506 $self->realloc; 3629 $self->reconfigure;
3507 }); 3630 });
3508 } 3631 }
3509 } 3632 }
3510 } 3633 }
3511 3634
… …
3593 children => [ 3716 children => [
3594 (new CFPlus::UI::Label markup => $left, expand => 1), 3717 (new CFPlus::UI::Label markup => $left, expand => 1),
3595 (new CFPlus::UI::Label markup => $right, align => +1), 3718 (new CFPlus::UI::Label markup => $right, align => +1),
3596 ], 3719 ],
3597 ; 3720 ;
3598 3721
3599 } else { 3722 } else {
3600 $widget = new CFPlus::UI::Label 3723 $widget = new CFPlus::UI::Label
3601 can_hover => 1, 3724 can_hover => 1,
3602 can_events => 1, 3725 can_events => 1,
3603 markup => $widget, 3726 markup => $widget,
… …
3739 buttonbar => (new CFPlus::UI::Buttonbar), 3862 buttonbar => (new CFPlus::UI::Buttonbar),
3740 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3863 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3741 # filter => # will be put between multiplexer and $self 3864 # filter => # will be put between multiplexer and $self
3742 @_, 3865 @_,
3743 ); 3866 );
3744 3867
3745 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3868 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3746 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3869 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3747 3870
3871 {
3872 Scalar::Util::weaken (my $wself = $self);
3873
3874 $self->{multiplexer}->connect (c_add => sub {
3875 my ($mplex, $widgets) = @_;
3876
3877 for my $child (@$widgets) {
3878 Scalar::Util::weaken $child;
3879 $child->{c_tab_} ||= do {
3880 my $tab =
3881 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3882 ? $child->{c_tab}
3883 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3884
3885 $tab->connect (activate => sub {
3886 $wself->set_current_page ($child);
3887 });
3888
3889 $tab
3890 };
3891
3892 $self->{buttonbar}->add ($child->{c_tab_});
3893 }
3894 });
3895
3896 $self->{multiplexer}->connect (c_remove => sub {
3897 my ($mplex, $widgets) = @_;
3898
3899 for my $child (@$widgets) {
3900 $wself->{buttonbar}->remove ($child->{c_tab_});
3901 }
3902 });
3903 }
3904
3748 $self 3905 $self
3749} 3906}
3750 3907
3751sub add { 3908sub add {
3909 my ($self, @widgets) = @_;
3910
3911 $self->{multiplexer}->add (@widgets)
3912}
3913
3914sub remove {
3915 my ($self, @widgets) = @_;
3916
3917 $self->{multiplexer}->remove (@widgets)
3918}
3919
3920sub pages {
3921 my ($self) = @_;
3922 $self->{multiplexer}->children
3923}
3924
3925sub add_tab {
3752 my ($self, $title, $widget, $tooltip) = @_; 3926 my ($self, $title, $widget, $tooltip) = @_;
3753 3927
3754 CFPlus::weaken $self; 3928 $title = [$title, $tooltip] unless ref $title;
3929 $widget->{c_tab} = $title;
3755 3930
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); 3931 $self->add ($widget);
3767} 3932}
3768 3933
3769sub get_current_page { 3934sub get_current_page {
3770 my ($self) = @_; 3935 my ($self) = @_;
3771 3936
… …
4054} 4219}
4055 4220
4056sub update { 4221sub update {
4057 my ($self) = @_; 4222 my ($self) = @_;
4058 4223
4059 $::WANT_REFRESH++; 4224 $::WANT_REFRESH->start;
4060} 4225}
4061 4226
4062sub add { 4227sub add {
4063 my ($self, @children) = @_; 4228 my ($self, @children) = @_;
4064 4229

Diff Legend

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