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.405 by root, Sat Jul 21 23:07:57 2007 UTC vs.
Revision 1.439 by root, Sun Sep 16 13:04:36 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 { "\fw" => $_[0]{s_id} }
279} 275}
280 276
281sub show { 277sub show {
282 my ($self) = @_; 278 my ($self) = @_;
283 279
… …
362 358
363 $self->{force_w} = $w; 359 $self->{force_w} = $w;
364 $self->{force_h} = $h; 360 $self->{force_h} = $h;
365 361
366 $self->realloc; 362 $self->realloc;
363}
364
365# travsle the widget chain up to find the maximum "physical" size constraints
366sub get_max_wh {
367 my ($self) = @_;
368
369 return ($self->{alloc_w}, $self->{alloc_h})
370 if $self->{alloc_w} && !$self->{root}{realloc}{$self+0};
371
372 return $self->{parent}->get_max_wh
373 if $self->{parent};
374
375 ($::WIDTH, $::HEIGHT)
367} 376}
368 377
369sub size_request { 378sub size_request {
370 require Carp; 379 require Carp;
371 Carp::confess "size_request is abstract"; 380 Carp::confess "size_request is abstract";
… …
607sub DESTROY { 616sub DESTROY {
608 my ($self) = @_; 617 my ($self) = @_;
609 618
610 return if CFPlus::in_destruct; 619 return if CFPlus::in_destruct;
611 620
621 local $@;
612 eval { $self->destroy }; 622 eval { $self->destroy };
613 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 623 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
614 624
615 delete $WIDGET{$self+0}; 625 delete $WIDGET{$self+0};
616} 626}
… …
624use strict; 634use strict;
625use CFPlus::OpenGL; 635use CFPlus::OpenGL;
626 636
627sub new { 637sub new {
628 my $class = shift; 638 my $class = shift;
629
630 # range [value, low, high, page]
631 639
632 $class->SUPER::new ( 640 $class->SUPER::new (
633 #bg => [0, 0, 0, 0.2], 641 #bg => [0, 0, 0, 0.2],
634 #active_bg => [1, 1, 1, 0.5], 642 #active_bg => [1, 1, 1, 0.5],
635 @_ 643 @_
… …
647 my ($w, $h) = @$self{qw(w h)}; 655 my ($w, $h) = @$self{qw(w h)};
648 656
649 glEnable GL_BLEND; 657 glEnable GL_BLEND;
650 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 658 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
651 glColor_premultiply @$color; 659 glColor_premultiply @$color;
652
653 glBegin GL_QUADS;
654 glVertex 0 , 0;
655 glVertex 0 , $h;
656 glVertex $w, $h; 660 glRect 0, 0, $w, $h;
657 glVertex $w, 0;
658 glEnd;
659
660 glDisable GL_BLEND; 661 glDisable GL_BLEND;
661 } 662 }
662} 663}
663 664
664############################################################################# 665#############################################################################
… …
725 @{$self->{children}}, @widgets 726 @{$self->{children}}, @widgets
726 ]; 727 ];
727 728
728 $self->realloc; 729 $self->realloc;
729 730
731 $self->emit (c_add => \@widgets);
732
730 map $_+0, @widgets 733 map $_+0, @widgets
731} 734}
732 735
733sub children { 736sub children {
734 @{ $_[0]{children} } 737 @{ $_[0]{children} }
735} 738}
736 739
737sub remove { 740sub remove {
738 my ($self, $child) = @_; 741 my ($self, @widgets) = @_;
739 742
743 $self->emit (c_remove => \@widgets);
744
745 for my $child (@widgets) {
740 delete $child->{parent}; 746 delete $child->{parent};
741 $child->hide; 747 $child->hide;
742
743 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 748 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
749 }
744 750
745 $self->realloc; 751 $self->realloc;
746} 752}
747 753
748sub clear { 754sub clear {
… …
776} 782}
777 783
778sub _draw { 784sub _draw {
779 my ($self) = @_; 785 my ($self) = @_;
780 786
781 $_->draw for @{$self->{children}}; 787 $_->draw for $self->visible_children;
782} 788}
783 789
784############################################################################# 790#############################################################################
785 791
786package CFPlus::UI::Bin; 792package CFPlus::UI::Bin;
… …
796} 802}
797 803
798sub add { 804sub add {
799 my ($self, $child) = @_; 805 my ($self, $child) = @_;
800 806
801 $self->SUPER::remove ($_) for @{ $self->{children} }; 807 $self->clear;
802 $self->SUPER::add ($child); 808 $self->SUPER::add ($child);
803} 809}
804 810
805sub remove { 811sub remove {
806 my ($self, $widget) = @_; 812 my ($self, $widget) = @_;
… …
824 830
825 1 831 1
826} 832}
827 833
828############################################################################# 834#############################################################################
829
830# back-buffered drawing area 835# back-buffered drawing area
831 836
832package CFPlus::UI::Window; 837package CFPlus::UI::Window;
833 838
834our @ISA = CFPlus::UI::Bin::; 839our @ISA = CFPlus::UI::Bin::;
… …
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) = @_;
… …
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}
1074 1097
1098sub set_offset { shift->{vp}->set_offset (@_) }
1099sub set_center { shift->{vp}->set_center (@_) }
1100sub make_visible { shift->{vp}->make_visible (@_) }
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;
1079 1106
… …
1192 my ($w, $h) = @$self{qw(w h)}; 1219 my ($w, $h) = @$self{qw(w h)};
1193 1220
1194 glEnable GL_BLEND; 1221 glEnable GL_BLEND;
1195 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1222 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1196 glColor_premultiply @{ $self->{bg} }; 1223 glColor_premultiply @{ $self->{bg} };
1197
1198 glBegin GL_QUADS;
1199 glVertex 0 , 0;
1200 glVertex 0 , $h;
1201 glVertex $w, $h; 1224 glRect 0, 0, $w, $h;
1202 glVertex $w, 0;
1203 glEnd;
1204
1205 glDisable GL_BLEND; 1225 glDisable GL_BLEND;
1206 } 1226 }
1207 1227
1208 $self->SUPER::_draw; 1228 $self->SUPER::_draw;
1209} 1229}
… …
1571 1591
1572sub add { 1592sub add {
1573 my ($self, @widgets) = @_; 1593 my ($self, @widgets) = @_;
1574 1594
1575 for my $child (@widgets) { 1595 for my $child (@widgets) {
1576 $child->{rowspan} ||= 1; 1596 $child->{c_rowspan} ||= 1;
1577 $child->{colspan} ||= 1; 1597 $child->{c_colspan} ||= 1;
1578 } 1598 }
1579 1599
1580 $self->SUPER::add (@widgets); 1600 $self->SUPER::add (@widgets);
1581} 1601}
1582 1602
… …
1586 my @widgets; 1606 my @widgets;
1587 1607
1588 while (@_) { 1608 while (@_) {
1589 my ($col, $row, $child) = splice @_, 0, 3, (); 1609 my ($col, $row, $child) = splice @_, 0, 3, ();
1590 1610
1591 $child->{row} = $row; 1611 $child->{c_row} = $row;
1592 $child->{col} = $col; 1612 $child->{c_col} = $col;
1593 1613
1594 push @widgets, $child; 1614 push @widgets, $child;
1595 } 1615 }
1596 1616
1597 $self->add (@widgets); 1617 $self->add (@widgets);
… …
1603 my (@w, @h); 1623 my (@w, @h);
1604 1624
1605 my @children = $self->children; 1625 my @children = $self->children;
1606 1626
1607 # first pass, columns 1627 # first pass, columns
1608 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) { 1628 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1609 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; 1629 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1610 1630
1611 my $sw = sum @w[$c .. $c + $cs - 1]; 1631 my $sw = sum @w[$c .. $c + $cs - 1];
1612 1632
1613 if ($w > $sw) { 1633 if ($w > $sw) {
1614 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; 1634 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1615 } 1635 }
1616 } 1636 }
1617 1637
1618 # second pass, rows 1638 # second pass, rows
1619 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { 1639 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1620 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; 1640 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1621 1641
1622 my $sh = sum @h[$r .. $r + $rs - 1]; 1642 my $sh = sum @h[$r .. $r + $rs - 1];
1623 1643
1624 if ($h > $sh) { 1644 if ($h > $sh) {
1625 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; 1645 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
… …
1667 1687
1668 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } 1688 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1669 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } 1689 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1670 1690
1671 for my $widget ($self->children) { 1691 for my $widget ($self->children) {
1672 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)}; 1692 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1673 1693
1674 $widget->configure ( 1694 $widget->configure (
1675 $x[$c], $y[$r], 1695 $x[$c], $y[$r],
1676 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r], 1696 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1677 ); 1697 );
… …
1686 1706
1687use List::Util qw(min max); 1707use List::Util qw(min max);
1688 1708
1689our @ISA = CFPlus::UI::Container::; 1709our @ISA = CFPlus::UI::Container::;
1690 1710
1691sub add_fixed {
1692 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1693
1694 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1695 $self->SUPER::add ($child);
1696}
1697
1698sub _scale($$$) { 1711sub _scale($$$) {
1699 my ($mode, $val, $max) = @_; 1712 my ($rel, $val, $max) = @_;
1700 1713
1701 $mode eq "abs" ? $val 1714 $rel ? $val * $max : $val
1702 : $mode eq "rel" ? $val * $max
1703 : 0
1704} 1715}
1705 1716
1706sub size_request { 1717sub size_request {
1707 my ($self) = @_; 1718 my ($self) = @_;
1708 1719
1709 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1720 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1710 1721
1711 # determine overall size by querying abs widgets 1722 # determine overall size by querying abs widgets
1712 for my $child ($self->visible_children) { 1723 for my $child ($self->visible_children) {
1713 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1724 unless ($child->{c_rel}) {
1725 my $x = $child->{c_x};
1726 my $y = $child->{c_y};
1714 1727
1715 if ($pos eq "abs") {
1716 $w = _scale $size, $w, $child->{req_w};
1717 $h = _scale $size, $h, $child->{req_h};
1718
1719 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1728 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1720 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1729 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1721 } 1730 }
1722 } 1731 }
1723 1732
1724 my $W = $x2 - $x1; 1733 my $W = $x2 - $x1;
1725 my $H = $y2 - $y1; 1734 my $H = $y2 - $y1;
1726 1735
1727 # now layout remaining widgets 1736 # now layout remaining widgets
1728 for my $child ($self->visible_children) { 1737 for my $child ($self->visible_children) {
1729 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1738 if ($child->{c_rel}) {
1739 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1740 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1730 1741
1731 if ($pos ne "abs") {
1732 $x = _scale $pos, $x, $W;
1733 $y = _scale $pos, $x, $H;
1734 $w = _scale $size, $w, $child->{req_w};
1735 $h = _scale $size, $h, $child->{req_h};
1736
1737 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1742 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1738 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1743 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1739 } 1744 }
1740 } 1745 }
1741 1746
1742 my $W = $x2 - $x1; 1747 my $W = $x2 - $x1;
1743 my $H = $y2 - $y1; 1748 my $H = $y2 - $y1;
… …
1747 1752
1748sub invoke_size_allocate { 1753sub invoke_size_allocate {
1749 my ($self, $W, $H) = @_; 1754 my ($self, $W, $H) = @_;
1750 1755
1751 for my $child ($self->visible_children) { 1756 for my $child ($self->visible_children) {
1752 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1757 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1758 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1753 1759
1754 $x = _scale $pos, $x, $W; 1760 $x += $child->{c_halign} * $child->{req_w};
1755 $y = _scale $pos, $x, $H; 1761 $y += $child->{c_valign} * $child->{req_h};
1756 $w = _scale $size, $w, $W;
1757 $h = _scale $size, $h, $H;
1758 1762
1759 $child->configure ($x, $y, $w, $h); 1763 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1760 } 1764 }
1761 1765
1762 1 1766 1
1763} 1767}
1764 1768
… …
1768 1772
1769our @ISA = CFPlus::UI::Container::; 1773our @ISA = CFPlus::UI::Container::;
1770 1774
1771sub size_request { 1775sub size_request {
1772 my ($self) = @_; 1776 my ($self) = @_;
1777
1778 my @children = $self->visible_children;
1773 1779
1774 $self->{vertical} 1780 $self->{vertical}
1775 ? ( 1781 ? (
1776 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1782 (List::Util::max map $_->{req_w}, @children),
1777 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1783 (List::Util::sum map $_->{req_h}, @children),
1778 ) 1784 )
1779 : ( 1785 : (
1780 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1786 (List::Util::sum map $_->{req_w}, @children),
1781 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1787 (List::Util::max map $_->{req_h}, @children),
1782 ) 1788 )
1783} 1789}
1784 1790
1785sub invoke_size_allocate { 1791sub invoke_size_allocate {
1786 my ($self, $w, $h) = @_; 1792 my ($self, $w, $h) = @_;
… …
1910 1916
1911 delete $self->{ox}; 1917 delete $self->{ox};
1912 $self->SUPER::realloc; 1918 $self->SUPER::realloc;
1913} 1919}
1914 1920
1921sub clear {
1922 my ($self) = @_;
1923
1924 $self->set_text ("");
1925}
1926
1915sub set_text { 1927sub set_text {
1916 my ($self, $text) = @_; 1928 my ($self, $text) = @_;
1917 1929
1918 return if $self->{text} eq "T$text"; 1930 return if $self->{text} eq "T$text";
1919 $self->{text} = "T$text"; 1931 $self->{text} = "T$text";
… …
1942 1954
1943sub size_request { 1955sub size_request {
1944 my ($self) = @_; 1956 my ($self) = @_;
1945 1957
1946 $self->{size_req} ||= do { 1958 $self->{size_req} ||= do {
1959 my ($max_w, $max_h) = $self->get_max_wh;
1960
1947 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1961 $self->{layout}->set_font ($self->{font}) if $self->{font};
1948 $self->{layout}->set_width ($self->{max_w} || -1); 1962 $self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1949 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1963 $self->{layout}->set_ellipsise ($self->{ellipsise});
1950 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1964 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1951 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1965 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1952 1966
1953 my ($w, $h) = $self->{layout}->size; 1967 my ($w, $h) = $self->{layout}->size;
… …
2025 : ($self->{w} - $size->[0]) * 0.5); 2039 : ($self->{w} - $size->[0]) * 0.5);
2026 2040
2027 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2041 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2028 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2042 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2029 : ($self->{h} - $size->[1]) * 0.5); 2043 : ($self->{h} - $size->[1]) * 0.5);
2044
2045 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2030 }; 2046 };
2031 2047
2032 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2048# unless ($self->{list}) {
2033 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2049# $self->{list} = CFPlus::OpenGL::glGenList;
2034 2050# CFPlus::OpenGL::glNewList $self->{list};
2035 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2051# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2052# CFPlus::OpenGL::glEndList;
2053# }
2054#
2055# CFPlus::OpenGL::glCallList $self->{list};
2056
2057 $self->{layout}->draw;
2036} 2058}
2059
2060#sub destroy {
2061# my ($self) = @_;
2062#
2063# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2064#
2065# $self->SUPER::destroy;
2066#}
2037 2067
2038############################################################################# 2068#############################################################################
2039 2069
2040package CFPlus::UI::EntryBase; 2070package CFPlus::UI::EntryBase;
2041 2071
… …
2047 my $class = shift; 2077 my $class = shift;
2048 2078
2049 $class->SUPER::new ( 2079 $class->SUPER::new (
2050 fg => [1, 1, 1], 2080 fg => [1, 1, 1],
2051 bg => [0, 0, 0, 0.2], 2081 bg => [0, 0, 0, 0.2],
2082 outline => [0.6, 0.3, 0.1],
2052 active_bg => [1, 1, 1, 0.5], 2083 active_bg => [0, 0, 1, .2],
2053 active_fg => [0, 0, 0], 2084 active_fg => [1, 1, 1],
2085 active_outline => [1, 1, 0],
2054 can_hover => 1, 2086 can_hover => 1,
2055 can_focus => 1, 2087 can_focus => 1,
2056 valign => 0, 2088 valign => 0,
2057 can_events => 1, 2089 can_events => 1,
2058 ellipsise => 0, 2090 ellipsise => 0,
… …
2198 glColor_premultiply @{$self->{bg}}; 2230 glColor_premultiply @{$self->{bg}};
2199 } 2231 }
2200 2232
2201 glEnable GL_BLEND; 2233 glEnable GL_BLEND;
2202 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2234 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2203 glBegin GL_QUADS;
2204 glVertex 0 , 0;
2205 glVertex 0 , $self->{h};
2206 glVertex $self->{w}, $self->{h}; 2235 glRect 0, 0, $self->{w}, $self->{h};
2207 glVertex $self->{w}, 0;
2208 glEnd;
2209 glDisable GL_BLEND; 2236 glDisable GL_BLEND;
2210 2237
2211 $self->SUPER::_draw; 2238 $self->SUPER::_draw;
2212 2239
2213 #TODO: force update every cursor change :( 2240 #TODO: force update every cursor change :(
… …
2215 2242
2216 unless (exists $self->{cur_h}) { 2243 unless (exists $self->{cur_h}) {
2217 my $text = substr $self->{text}, 0, $self->{cursor}; 2244 my $text = substr $self->{text}, 0, $self->{cursor};
2218 utf8::encode $text; 2245 utf8::encode $text;
2219 2246
2220 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2247 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2221 } 2248 }
2222 2249
2250 glColor_premultiply @{$self->{active_fg}};
2223 glBegin GL_LINES; 2251 glBegin GL_LINES;
2224 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2252 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2225 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2253 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2254 glEnd;
2255
2256 glLineWidth 3;
2257 glColor @{$self->{active_outline}};
2258 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2259 glLineWidth 1;
2260
2261 } else {
2262 glColor @{$self->{outline}};
2263 glBegin GL_LINE_STRIP;
2264 glVertex .5, $self->{h} * .5;
2265 glVertex .5, $self->{h} - 2.5;
2266 glVertex $self->{w} - .5, $self->{h} - 2.5;
2267 glVertex $self->{w} - .5, $self->{h} * .5;
2226 glEnd; 2268 glEnd;
2227 } 2269 }
2228} 2270}
2229 2271
2230############################################################################# 2272#############################################################################
… …
2317 1 2359 1
2318} 2360}
2319 2361
2320############################################################################# 2362#############################################################################
2321 2363
2364package CFPlus::UI::ButtonBin;
2365
2366our @ISA = CFPlus::UI::Bin::;
2367
2368use CFPlus::OpenGL;
2369
2370my @tex =
2371 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2372 qw(b1_button_inactive.png b1_button_active.png);
2373
2374sub new {
2375 my $class = shift;
2376
2377 $class->SUPER::new (
2378 can_hover => 1,
2379 align => 0,
2380 valign => 0,
2381 can_events => 1,
2382 @_
2383 )
2384}
2385
2386sub invoke_button_up {
2387 my ($self, $ev, $x, $y) = @_;
2388
2389 $self->emit ("activate")
2390 if $x >= 0 && $x < $self->{w}
2391 && $y >= 0 && $y < $self->{h};
2392
2393 1
2394}
2395
2396sub _draw {
2397 my ($self) = @_;
2398
2399 glEnable GL_TEXTURE_2D;
2400 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2401 glColor 0, 0, 0, 1;
2402
2403 my $tex = $tex[$GRAB == $self];
2404 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2405
2406 glDisable GL_TEXTURE_2D;
2407
2408 $self->SUPER::_draw;
2409}
2410
2411#############################################################################
2412
2322package CFPlus::UI::Button; 2413package CFPlus::UI::Button;
2323 2414
2324our @ISA = CFPlus::UI::Label::; 2415our @ISA = CFPlus::UI::Label::;
2325 2416
2326use CFPlus::OpenGL; 2417use CFPlus::OpenGL;
… …
2430sub _draw { 2521sub _draw {
2431 my ($self) = @_; 2522 my ($self) = @_;
2432 2523
2433 $self->SUPER::_draw; 2524 $self->SUPER::_draw;
2434 2525
2435 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2526 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2436 2527
2437 my ($w, $h) = @$self{qw(w h)}; 2528 my ($w, $h) = @$self{qw(w h)};
2438 2529
2439 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2530 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2440 2531
… …
2460sub new { 2551sub new {
2461 my $class = shift; 2552 my $class = shift;
2462 2553
2463 my $self = $class->SUPER::new ( 2554 my $self = $class->SUPER::new (
2464 can_events => 0, 2555 can_events => 0,
2556 scale => 1,
2465 @_, 2557 @_,
2466 ); 2558 );
2467 2559
2468 $self->{path} || $self->{tex} 2560 $self->{path} || $self->{tex}
2469 or Carp::croak "'path' or 'tex' attributes required"; 2561 or Carp::croak "'path' or 'tex' attributes required";
… …
2494} 2586}
2495 2587
2496sub size_request { 2588sub size_request {
2497 my ($self) = @_; 2589 my ($self) = @_;
2498 2590
2499 ($self->{tex}{w}, $self->{tex}{h}) 2591 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2500} 2592}
2501 2593
2502sub _draw { 2594sub _draw {
2503 my ($self) = @_; 2595 my ($self) = @_;
2504 2596
… …
2514 } 2606 }
2515 2607
2516 glEnable GL_TEXTURE_2D; 2608 glEnable GL_TEXTURE_2D;
2517 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2609 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2518 2610
2519 $tex->draw_quad (0, 0, $w, $h); 2611 $tex->draw_quad_alpha (0, 0, $w, $h);
2520 2612
2521 glDisable GL_TEXTURE_2D; 2613 glDisable GL_TEXTURE_2D;
2522} 2614}
2523 2615
2524############################################################################# 2616#############################################################################
… …
2543 align => 0, 2635 align => 0,
2544 valign => 0, 2636 valign => 0,
2545 can_events => 1, 2637 can_events => 1,
2546 @_ 2638 @_
2547 ); 2639 );
2640}
2641
2642sub invoke_button_down {
2643 my ($self, $ev, $x, $y) = @_;
2644
2645 1
2548} 2646}
2549 2647
2550sub invoke_button_up { 2648sub invoke_button_up {
2551 my ($self, $ev, $x, $y) = @_; 2649 my ($self, $ev, $x, $y) = @_;
2552 2650
… …
2692 glDisable GL_TEXTURE_2D; 2790 glDisable GL_TEXTURE_2D;
2693} 2791}
2694 2792
2695############################################################################# 2793#############################################################################
2696 2794
2795package CFPlus::UI::Progress;
2796
2797our @ISA = CFPlus::UI::Label::;
2798
2799use CFPlus::OpenGL;
2800
2801sub new {
2802 my ($class, %arg) = @_;
2803
2804 my $self = $class->SUPER::new (
2805 fg => [1, 1, 1],
2806 bg => [0, 0, 1, 0.2],
2807 bar => [0.7, 0.5, 0.1, 0.8],
2808 outline => [0.4, 0.3, 0],
2809 fontsize => 0.9,
2810 valign => 0,
2811 align => 0,
2812 can_events => 1,
2813 ellipsise => 1,
2814 label => "%d%%",
2815 %arg,
2816 );
2817
2818 $self->set_value ($arg{value} || -1);
2819
2820 $self
2821}
2822
2823sub set_label {
2824 my ($self, $label) = @_;
2825
2826 return if $self->{label} eq $label;
2827 $self->{label} = $label;
2828
2829 $self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
2830}
2831
2832sub set_value {
2833 my ($self, $value) = @_;
2834
2835 if ($self->{value} ne $value) {
2836 $self->{value} = $value;
2837
2838 if ($value < 0) {
2839 $self->set_text ("-");
2840 } else {
2841 $self->set_text (sprintf $self->{label}, $value * 100);
2842 }
2843
2844 $self->update;
2845 }
2846}
2847
2848sub _draw {
2849 my ($self) = @_;
2850
2851 glEnable GL_BLEND;
2852 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2853
2854 if ($self->{value} >= 0) {
2855 my $s = int 2 + ($self->{w} - 4) * $self->{value};
2856
2857 glColor_premultiply @{$self->{bar}};
2858 glRect 2, 2, $s, $self->{h} - 2;
2859 glColor_premultiply @{$self->{bg}};
2860 glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
2861 }
2862
2863 glColor_premultiply @{$self->{outline}};
2864 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2865
2866 glDisable GL_BLEND;
2867
2868 {
2869 local $self->{bg}; # do not draw background
2870 $self->SUPER::_draw;
2871 }
2872}
2873
2874#############################################################################
2875
2876package CFPlus::UI::ExperienceProgress;
2877
2878our @ISA = CFPlus::UI::Progress::;
2879
2880sub new {
2881 my ($class, %arg) = @_;
2882
2883 my $self = $class->SUPER::new (
2884 tooltip => sub {
2885 my ($self) = @_;
2886
2887 sprintf "level %d\n%s points\n%s next level\n%s to go",
2888 $self->{lvl},
2889 ::formsep ($self->{exp}),
2890 ::formsep ($self->{nxt}),
2891 ::formsep ($self->{nxt} - $self->{exp}),
2892 },
2893 %arg
2894 );
2895
2896 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2897 if $::CONN;
2898
2899 $self
2900}
2901
2902sub DESTROY {
2903 my ($self) = @_;
2904
2905 delete $::CONN->{on_exp_update}{$self+0}
2906 if $::CONN;
2907
2908 $self->SUPER::DESTROY;
2909}
2910
2911sub set_value {
2912 my ($self, $lvl, $exp) = @_;
2913
2914 $self->{lvl} = $lvl;
2915 $self->{exp} = $exp;
2916
2917 my $v = -1;
2918
2919 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2920 my $l0 = $table->[$lvl - 1];
2921 my $l1 = $table->[$lvl];
2922
2923 $self->{nxt} = $l1;
2924
2925 $v = ($exp - $l0) / ($l1 - $l0);
2926 }
2927
2928 $self->SUPER::set_value ($v);
2929}
2930
2931#############################################################################
2932
2697package CFPlus::UI::Gauge; 2933package CFPlus::UI::Gauge;
2698 2934
2699our @ISA = CFPlus::UI::VBox::; 2935our @ISA = CFPlus::UI::VBox::;
2700 2936
2701sub new { 2937sub new {
… …
2826 3062
2827 $self->SUPER::invoke_button_down ($ev, $x, $y); 3063 $self->SUPER::invoke_button_down ($ev, $x, $y);
2828 3064
2829 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3065 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2830 3066
2831 $self->invoke_mouse_motion ($ev, $x, $y) 3067 $self->invoke_mouse_motion ($ev, $x, $y);
3068
3069 1
2832} 3070}
2833 3071
2834sub invoke_mouse_motion { 3072sub invoke_mouse_motion {
2835 my ($self, $ev, $x, $y) = @_; 3073 my ($self, $ev, $x, $y) = @_;
2836 3074
… …
2856 3094
2857 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3095 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2858 3096
2859 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3097 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2860 3098
2861 ! ! $delta 3099 1
2862} 3100}
2863 3101
2864sub update { 3102sub update {
2865 my ($self) = @_; 3103 my ($self) = @_;
2866 3104
… …
2997} 3235}
2998 3236
2999sub size_request { 3237sub size_request {
3000 my ($self) = @_; 3238 my ($self) = @_;
3001 3239
3002 my ($empty, $slider) = @{ $self->{children} }; 3240 my ($empty, $slider) = $self->visible_children;
3003 3241
3004 local $self->{children} = [$empty, $slider]; 3242 local $self->{children} = [$empty, $slider];
3005 $self->SUPER::size_request 3243 $self->SUPER::size_request
3006} 3244}
3007 3245
… …
3196 3434
3197 if ($y0 < $y + $h && $y < $y1) { 3435 if ($y0 < $y + $h && $y < $y1) {
3198 my $layout = $self->get_layout ($para); 3436 my $layout = $self->get_layout ($para);
3199 3437
3200 $layout->render ($para->{indent}, $y - $y0); 3438 $layout->render ($para->{indent}, $y - $y0);
3439 $layout->draw;
3201 3440
3202 if (my @w = @{ $para->{widget} }) { 3441 if (my @w = @{ $para->{widget} }) {
3203 my @s = $layout->get_shapes; 3442 my @s = $layout->get_shapes;
3204 3443
3205 for (@w) { 3444 for (@w) {
… …
3327} 3566}
3328 3567
3329sub set_tooltip_from { 3568sub set_tooltip_from {
3330 my ($self, $widget) = @_; 3569 my ($self, $widget) = @_;
3331 3570
3332 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3333 if $widget->{tooltip} =~ /^#(.*)$/;
3334
3335 my $tooltip = $widget->{tooltip}; 3571 my $tip = $widget->{tooltip};
3572 $tip = $tip->($widget) if "CODE" eq ref $tip;
3573
3574 $tip = CFPlus::Pod::section_label tooltip => $1
3575 if $tip =~ /^#(.*)$/;
3336 3576
3337 if ($ENV{CFPLUS_DEBUG} & 2) { 3577 if ($ENV{CFPLUS_DEBUG} & 2) {
3338 $tooltip .= "\n\n" . (ref $widget) . "\n" 3578 $tip .= "\n\n" . (ref $widget) . "\n"
3339 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3579 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3340 . "req $widget->{req_w} $widget->{req_h}\n" 3580 . "req $widget->{req_w} $widget->{req_h}\n"
3341 . "visible $widget->{visible}"; 3581 . "visible $widget->{visible}";
3342 } 3582 }
3343 3583
3344 $tooltip =~ s/^\n+//; 3584 $tip =~ s/^\n+//;
3345 $tooltip =~ s/\n+$//; 3585 $tip =~ s/\n+$//;
3346 3586
3347 $self->add (new CFPlus::UI::Label 3587 $self->add (new CFPlus::UI::Label
3348 markup => $tooltip, 3588 markup => $tip,
3349 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3589 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3350 fontsize => 0.8, 3590 fontsize => 0.8,
3351 style => 1, # FLAG_INVERSE 3591 style => 1, # FLAG_INVERSE
3352 ellipsise => 0, 3592 ellipsise => 0,
3353 font => ($widget->{tooltip_font} || $::FONT_PROP), 3593 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
3391} 3631}
3392 3632
3393sub _draw { 3633sub _draw {
3394 my ($self) = @_; 3634 my ($self) = @_;
3395 3635
3396 glTranslate 0.375, 0.375;
3397
3398 my ($w, $h) = @$self{qw(w h)}; 3636 my ($w, $h) = @$self{qw(w h)};
3399 3637
3400 glColor 1, 0.8, 0.4; 3638 glColor 1, 0.8, 0.4;
3401 glBegin GL_QUADS; 3639 glRect 0, 0, $w, $h;
3402 glVertex 0 , 0;
3403 glVertex 0 , $h;
3404 glVertex $w, $h;
3405 glVertex $w, 0;
3406 glEnd;
3407 3640
3408 glColor 0, 0, 0; 3641 glColor 0, 0, 0;
3409 glBegin GL_LINE_LOOP; 3642 glRect_lineloop .5, .5, $w + .5, $h + .5;
3410 glVertex 0 , 0;
3411 glVertex 0 , $h;
3412 glVertex $w, $h;
3413 glVertex $w, 0;
3414 glEnd;
3415 3643
3416 glTranslate 2 - 0.375, 2 - 0.375; 3644 glTranslate 2, 2;
3417 3645
3418 $self->SUPER::_draw; 3646 $self->SUPER::_draw;
3419} 3647}
3420 3648
3421############################################################################# 3649#############################################################################
… …
3443 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3671 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3444 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed}; 3672 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3445 $self->{timer} = Event->timer ( 3673 $self->{timer} = Event->timer (
3446 parked => 1, 3674 parked => 1,
3447 cb => sub { 3675 cb => sub {
3448 return unless $::CONN && $widget; 3676 return unless $::CONN;
3449 3677
3678 my $w = $widget
3679 or return;
3680
3450 ++$widget->{frame}; 3681 ++$w->{frame};
3451 $widget->update_face; 3682 $w->update_face;
3683
3684 # somehow, $widget can go away
3452 $widget->update; 3685 $w->update;
3453
3454 $widget->update_timer; 3686 $w->update_timer;
3455 }, 3687 },
3456 ); 3688 );
3457 3689
3458 $self->update_face; 3690 $self->update_face;
3459 $self->update_timer; 3691 $self->update_timer;
… …
3480} 3712}
3481 3713
3482sub update_face { 3714sub update_face {
3483 my ($self) = @_; 3715 my ($self) = @_;
3484 3716
3485 return unless $::CONN; 3717 if ($::CONN) {
3486
3487 if (my $anim = $::CONN->{anim}[$self->{anim}]) { 3718 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3488 if ($anim && @$anim) { 3719 if ($anim && @$anim) {
3489 delete $self->{wait_face};
3490 $self->{face} = $anim->[ $self->{frame} % @$anim ]; 3720 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3721 delete $self->{face_change_cb};
3722
3491 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ]; 3723 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3724 unless ($tex->{name} || $tex->{loading}) {
3725 $tex->upload (sub { $self->reconfigure });
3726 }
3727 }
3728 }
3492 } 3729 }
3493 } 3730 }
3494} 3731}
3495 3732
3496sub size_request { 3733sub size_request {
3497 my ($self) = @_; 3734 my ($self) = @_;
3498 3735
3499 if ($::CONN) { 3736 if ($::CONN) {
3500 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3737 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3501 if (my $tex = $::CONN->{texture}[$faceid]) { 3738 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3502 $self->{tex} = $tex; 3739 if ($tex->{name}) {
3503 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3740 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3504 } else { 3741 } elsif (!$tex->{loading}) {
3505 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3742 $tex->upload (sub { $self->reconfigure });
3506 $self->realloc;
3507 }); 3743 }
3508 } 3744 }
3745
3746 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3509 } 3747 }
3510 } 3748 }
3511 3749
3512 ($self->{size_w} || 8, $self->{size_h} || 8) 3750 ($self->{size_w} || 8, $self->{size_h} || 8)
3513} 3751}
… …
3593 children => [ 3831 children => [
3594 (new CFPlus::UI::Label markup => $left, expand => 1), 3832 (new CFPlus::UI::Label markup => $left, expand => 1),
3595 (new CFPlus::UI::Label markup => $right, align => +1), 3833 (new CFPlus::UI::Label markup => $right, align => +1),
3596 ], 3834 ],
3597 ; 3835 ;
3598 3836
3599 } else { 3837 } else {
3600 $widget = new CFPlus::UI::Label 3838 $widget = new CFPlus::UI::Label
3601 can_hover => 1, 3839 can_hover => 1,
3602 can_events => 1, 3840 can_events => 1,
3603 markup => $widget, 3841 markup => $widget,
… …
3728 3966
3729############################################################################# 3967#############################################################################
3730 3968
3731package CFPlus::UI::Notebook; 3969package CFPlus::UI::Notebook;
3732 3970
3971use CFPlus::OpenGL;
3972
3733our @ISA = CFPlus::UI::VBox::; 3973our @ISA = CFPlus::UI::VBox::;
3734 3974
3735sub new { 3975sub new {
3736 my $class = shift; 3976 my $class = shift;
3737 3977
3738 my $self = $class->SUPER::new ( 3978 my $self = $class->SUPER::new (
3739 buttonbar => (new CFPlus::UI::Buttonbar), 3979 buttonbar => (new CFPlus::UI::Buttonbar),
3740 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3980 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3981 active_outline => [.7, .7, 0.2],
3741 # filter => # will be put between multiplexer and $self 3982 # filter => # will be put between multiplexer and $self
3742 @_, 3983 @_,
3743 ); 3984 );
3744 3985
3745 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3986 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3746 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3987 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3747 3988
3989 {
3990 Scalar::Util::weaken (my $wself = $self);
3991
3992 $self->{multiplexer}->connect (c_add => sub {
3993 my ($mplex, $widgets) = @_;
3994
3995 for my $child (@$widgets) {
3996 Scalar::Util::weaken $child;
3997 $child->{c_tab_} ||= do {
3998 my $tab =
3999 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
4000 ? $child->{c_tab}
4001 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4002
4003 $tab->connect (activate => sub {
4004 $wself->set_current_page ($child);
4005 });
4006
4007 $tab
4008 };
4009
4010 $self->{buttonbar}->add ($child->{c_tab_});
4011 }
4012 });
4013
4014 $self->{multiplexer}->connect (c_remove => sub {
4015 my ($mplex, $widgets) = @_;
4016
4017 for my $child (@$widgets) {
4018 $wself->{buttonbar}->remove ($child->{c_tab_});
4019 }
4020 });
4021 }
4022
3748 $self 4023 $self
3749} 4024}
3750 4025
3751sub add { 4026sub add {
4027 my ($self, @widgets) = @_;
4028
4029 $self->{multiplexer}->add (@widgets)
4030}
4031
4032sub remove {
4033 my ($self, @widgets) = @_;
4034
4035 $self->{multiplexer}->remove (@widgets)
4036}
4037
4038sub pages {
4039 my ($self) = @_;
4040 $self->{multiplexer}->children
4041}
4042
4043sub add_tab {
3752 my ($self, $title, $widget, $tooltip) = @_; 4044 my ($self, $title, $widget, $tooltip) = @_;
3753 4045
3754 CFPlus::weaken $self; 4046 $title = [$title, $tooltip] unless ref $title;
4047 $widget->{c_tab} = $title;
3755 4048
3756 $self->{buttonbar}->add (new CFPlus::UI::Button
3757 markup => $title,
3758 tooltip => $tooltip,
3759 on_activate => sub { $self->set_current_page ($widget) },
3760 );
3761
3762 $self->{multiplexer}->add ($widget); 4049 $self->add ($widget);
3763} 4050}
3764 4051
3765sub get_current_page { 4052sub get_current_page {
3766 my ($self) = @_; 4053 my ($self) = @_;
3767 4054
… …
3771sub set_current_page { 4058sub set_current_page {
3772 my ($self, $page) = @_; 4059 my ($self, $page) = @_;
3773 4060
3774 $self->{multiplexer}->set_current_page ($page); 4061 $self->{multiplexer}->set_current_page ($page);
3775 $self->emit (page_changed => $self->{multiplexer}{current}); 4062 $self->emit (page_changed => $self->{multiplexer}{current});
4063}
4064
4065sub _draw {
4066 my ($self) = @_;
4067
4068 $self->SUPER::_draw ();
4069
4070 if (my $cur = $self->{multiplexer}{current}) {
4071 if ($cur = $cur->{c_tab_}) {
4072 glTranslate $self->{buttonbar}{x} + $cur->{x},
4073 $self->{buttonbar}{y} + $cur->{y};
4074 glLineWidth 3;
4075 #glEnable GL_BLEND;
4076 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4077 glColor @{$self->{active_outline}};
4078 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4079 glLineWidth 1;
4080 #glDisable GL_BLEND;
4081 }
4082 }
3776} 4083}
3777 4084
3778############################################################################# 4085#############################################################################
3779 4086
3780package CFPlus::UI::Selector; 4087package CFPlus::UI::Selector;
… …
4050} 4357}
4051 4358
4052sub update { 4359sub update {
4053 my ($self) = @_; 4360 my ($self) = @_;
4054 4361
4055 $::WANT_REFRESH++; 4362 $::WANT_REFRESH->start;
4056} 4363}
4057 4364
4058sub add { 4365sub add {
4059 my ($self, @children) = @_; 4366 my ($self, @children) = @_;
4060 4367

Diff Legend

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