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

Diff Legend

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