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.403 by root, Sat Jul 21 21:25:23 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
… …
593 589
594# using global variables seems a bit hacky, but passing through all drawing 590# using global variables seems a bit hacky, but passing through all drawing
595# functions seems pointless. 591# functions seems pointless.
596our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 592our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
597 593
598sub draw { 594#sub draw {
599 my ($self) = @_; 595#CFPlus.xs
600
601 return unless $self->{h} && $self->{w};
602
603 # update screen rectangle
604 local $draw_x = $draw_x + $self->{x};
605 local $draw_y = $draw_y + $self->{y};
606
607 # skip widgets that are entirely outside the drawing area
608 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
609 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
610
611 glPushMatrix;
612 glTranslate $self->{x}, $self->{y}, 0;
613
614 if ($self == $HOVER && $self->{can_hover}) {
615 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
616 glEnable GL_BLEND;
617 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
618 glBegin GL_QUADS;
619 glVertex 0 , 0;
620 glVertex $self->{w}, 0;
621 glVertex $self->{w}, $self->{h};
622 glVertex 0 , $self->{h};
623 glEnd;
624 glDisable GL_BLEND;
625 }
626
627 if ($ENV{CFPLUS_DEBUG} & 1) {
628 glPushMatrix;
629 glColor 1, 1, 0, 1;
630 glTranslate 0.375, 0.375;
631 glBegin GL_LINE_LOOP;
632 glVertex 0 , 0;
633 glVertex $self->{w} - 1, 0;
634 glVertex $self->{w} - 1, $self->{h} - 1;
635 glVertex 0 , $self->{h} - 1;
636 glEnd;
637 glPopMatrix;
638 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
639 }
640
641 $self->_draw;
642 glPopMatrix;
643}
644 596
645sub _draw { 597sub _draw {
646 my ($self) = @_; 598 my ($self) = @_;
647 599
648 warn "no draw defined for $self\n"; 600 warn "no draw defined for $self\n";
… …
651sub DESTROY { 603sub DESTROY {
652 my ($self) = @_; 604 my ($self) = @_;
653 605
654 return if CFPlus::in_destruct; 606 return if CFPlus::in_destruct;
655 607
608 local $@;
656 eval { $self->destroy }; 609 eval { $self->destroy };
657 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 610 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
658 611
659 delete $WIDGET{$self+0}; 612 delete $WIDGET{$self+0};
660} 613}
… …
668use strict; 621use strict;
669use CFPlus::OpenGL; 622use CFPlus::OpenGL;
670 623
671sub new { 624sub new {
672 my $class = shift; 625 my $class = shift;
673
674 # range [value, low, high, page]
675 626
676 $class->SUPER::new ( 627 $class->SUPER::new (
677 #bg => [0, 0, 0, 0.2], 628 #bg => [0, 0, 0, 0.2],
678 #active_bg => [1, 1, 1, 0.5], 629 #active_bg => [1, 1, 1, 0.5],
679 @_ 630 @_
… …
691 my ($w, $h) = @$self{qw(w h)}; 642 my ($w, $h) = @$self{qw(w h)};
692 643
693 glEnable GL_BLEND; 644 glEnable GL_BLEND;
694 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 645 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
695 glColor_premultiply @$color; 646 glColor_premultiply @$color;
696
697 glBegin GL_QUADS;
698 glVertex 0 , 0;
699 glVertex 0 , $h;
700 glVertex $w, $h; 647 glRect 0, 0, $w, $h;
701 glVertex $w, 0;
702 glEnd;
703
704 glDisable GL_BLEND; 648 glDisable GL_BLEND;
705 } 649 }
706} 650}
707 651
708############################################################################# 652#############################################################################
… …
769 @{$self->{children}}, @widgets 713 @{$self->{children}}, @widgets
770 ]; 714 ];
771 715
772 $self->realloc; 716 $self->realloc;
773 717
718 $self->emit (c_add => \@widgets);
719
774 map $_+0, @widgets 720 map $_+0, @widgets
775} 721}
776 722
777sub children { 723sub children {
778 @{ $_[0]{children} } 724 @{ $_[0]{children} }
779} 725}
780 726
781sub remove { 727sub remove {
782 my ($self, $child) = @_; 728 my ($self, @widgets) = @_;
783 729
730 $self->emit (c_remove => \@widgets);
731
732 for my $child (@widgets) {
784 delete $child->{parent}; 733 delete $child->{parent};
785 $child->hide; 734 $child->hide;
786
787 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 735 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
736 }
788 737
789 $self->realloc; 738 $self->realloc;
790} 739}
791 740
792sub clear { 741sub clear {
… …
820} 769}
821 770
822sub _draw { 771sub _draw {
823 my ($self) = @_; 772 my ($self) = @_;
824 773
825 $_->draw for @{$self->{children}}; 774 $_->draw for $self->visible_children;
826} 775}
827 776
828############################################################################# 777#############################################################################
829 778
830package CFPlus::UI::Bin; 779package CFPlus::UI::Bin;
… …
840} 789}
841 790
842sub add { 791sub add {
843 my ($self, $child) = @_; 792 my ($self, $child) = @_;
844 793
845 $self->SUPER::remove ($_) for @{ $self->{children} }; 794 $self->clear;
846 $self->SUPER::add ($child); 795 $self->SUPER::add ($child);
847} 796}
848 797
849sub remove { 798sub remove {
850 my ($self, $widget) = @_; 799 my ($self, $widget) = @_;
… …
992 $self->{view_x} = $x; 941 $self->{view_x} = $x;
993 $self->{view_y} = $y; 942 $self->{view_y} = $y;
994 943
995 $self->emit (changed => $x, $y); 944 $self->emit (changed => $x, $y);
996 $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);
997 } 964 }
998} 965}
999 966
1000# 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
1001sub coord2local { 968sub coord2local {
… …
1048 my $child = delete $arg{child}; 1015 my $child = delete $arg{child};
1049 1016
1050 my $self; 1017 my $self;
1051 1018
1052 my $hslider = new CFPlus::UI::Slider 1019 my $hslider = new CFPlus::UI::Slider
1053 col => 0, 1020 c_col => 0,
1054 row => 1, 1021 c_row => 1,
1055 vertical => 0, 1022 vertical => 0,
1056 range => [0, 0, 1, 0.01], # HACK fix 1023 range => [0, 0, 1, 0.01], # HACK fix
1057 on_changed => sub { 1024 on_changed => sub {
1058 $self->{hpos} = $_[1]; 1025 $self->{hpos} = $_[1];
1059 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1026 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1060 }, 1027 },
1061 ; 1028 ;
1062 1029
1063 my $vslider = new CFPlus::UI::Slider 1030 my $vslider = new CFPlus::UI::Slider
1064 col => 1, 1031 c_col => 1,
1065 row => 0, 1032 c_row => 0,
1066 vertical => 1, 1033 vertical => 1,
1067 range => [0, 0, 1, 0.01], # HACK fix 1034 range => [0, 0, 1, 0.01], # HACK fix
1068 on_changed => sub { 1035 on_changed => sub {
1069 $self->{vpos} = $_[1]; 1036 $self->{vpos} = $_[1];
1070 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1037 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1081 row_expand => [1, 0], 1048 row_expand => [1, 0],
1082 %arg, 1049 %arg,
1083 ); 1050 );
1084 1051
1085 $self->{vp} = new CFPlus::UI::ViewPort 1052 $self->{vp} = new CFPlus::UI::ViewPort
1086 col => 0, 1053 c_col => 0,
1087 row => 0, 1054 c_row => 0,
1088 expand => 1, 1055 expand => 1,
1089 scroll_x => $self->{scroll_x}, 1056 scroll_x => $self->{scroll_x},
1090 scroll_y => $self->{scroll_y}, 1057 scroll_y => $self->{scroll_y},
1091 on_changed => sub { 1058 on_changed => sub {
1092 my ($vp, $x, $y) = @_; 1059 my ($vp, $x, $y) = @_;
… …
1114 my ($self, $widget) = @_; 1081 my ($self, $widget) = @_;
1115 1082
1116 $self->{vp}->add ($self->{child} = $widget); 1083 $self->{vp}->add ($self->{child} = $widget);
1117} 1084}
1118 1085
1086sub set_offset { shift->{vp}->set_offset (@_) }
1087sub set_center { shift->{vp}->set_center (@_) }
1088sub make_visible { shift->{vp}->make_visible (@_) }
1089
1119sub update_slider { 1090sub update_slider {
1120 my ($self) = @_; 1091 my ($self) = @_;
1121 1092
1122 my $child = ($self->{vp} or return)->child; 1093 my $child = ($self->{vp} or return)->child;
1123 1094
… …
1236 my ($w, $h) = @$self{qw(w h)}; 1207 my ($w, $h) = @$self{qw(w h)};
1237 1208
1238 glEnable GL_BLEND; 1209 glEnable GL_BLEND;
1239 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1210 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1240 glColor_premultiply @{ $self->{bg} }; 1211 glColor_premultiply @{ $self->{bg} };
1241
1242 glBegin GL_QUADS;
1243 glVertex 0 , 0;
1244 glVertex 0 , $h;
1245 glVertex $w, $h; 1212 glRect 0, 0, $w, $h;
1246 glVertex $w, 0;
1247 glEnd;
1248
1249 glDisable GL_BLEND; 1213 glDisable GL_BLEND;
1250 } 1214 }
1251 1215
1252 $self->SUPER::_draw; 1216 $self->SUPER::_draw;
1253} 1217}
… …
1615 1579
1616sub add { 1580sub add {
1617 my ($self, @widgets) = @_; 1581 my ($self, @widgets) = @_;
1618 1582
1619 for my $child (@widgets) { 1583 for my $child (@widgets) {
1620 $child->{rowspan} ||= 1; 1584 $child->{c_rowspan} ||= 1;
1621 $child->{colspan} ||= 1; 1585 $child->{c_colspan} ||= 1;
1622 } 1586 }
1623 1587
1624 $self->SUPER::add (@widgets); 1588 $self->SUPER::add (@widgets);
1625} 1589}
1626 1590
… …
1630 my @widgets; 1594 my @widgets;
1631 1595
1632 while (@_) { 1596 while (@_) {
1633 my ($col, $row, $child) = splice @_, 0, 3, (); 1597 my ($col, $row, $child) = splice @_, 0, 3, ();
1634 1598
1635 $child->{row} = $row; 1599 $child->{c_row} = $row;
1636 $child->{col} = $col; 1600 $child->{c_col} = $col;
1637 1601
1638 push @widgets, $child; 1602 push @widgets, $child;
1639 } 1603 }
1640 1604
1641 $self->add (@widgets); 1605 $self->add (@widgets);
… …
1647 my (@w, @h); 1611 my (@w, @h);
1648 1612
1649 my @children = $self->children; 1613 my @children = $self->children;
1650 1614
1651 # first pass, columns 1615 # first pass, columns
1652 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) { 1616 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1653 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; 1617 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1654 1618
1655 my $sw = sum @w[$c .. $c + $cs - 1]; 1619 my $sw = sum @w[$c .. $c + $cs - 1];
1656 1620
1657 if ($w > $sw) { 1621 if ($w > $sw) {
1658 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; 1622 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1659 } 1623 }
1660 } 1624 }
1661 1625
1662 # second pass, rows 1626 # second pass, rows
1663 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { 1627 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1664 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; 1628 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1665 1629
1666 my $sh = sum @h[$r .. $r + $rs - 1]; 1630 my $sh = sum @h[$r .. $r + $rs - 1];
1667 1631
1668 if ($h > $sh) { 1632 if ($h > $sh) {
1669 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; 1633 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
… …
1711 1675
1712 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } 1676 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1713 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } 1677 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1714 1678
1715 for my $widget ($self->children) { 1679 for my $widget ($self->children) {
1716 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)};
1717 1681
1718 $widget->configure ( 1682 $widget->configure (
1719 $x[$c], $y[$r], 1683 $x[$c], $y[$r],
1720 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r], 1684 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1721 ); 1685 );
… …
1730 1694
1731use List::Util qw(min max); 1695use List::Util qw(min max);
1732 1696
1733our @ISA = CFPlus::UI::Container::; 1697our @ISA = CFPlus::UI::Container::;
1734 1698
1735sub add_fixed {
1736 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1737
1738 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1739 $self->SUPER::add ($child);
1740}
1741
1742sub _scale($$$) { 1699sub _scale($$$) {
1743 my ($mode, $val, $max) = @_; 1700 my ($rel, $val, $max) = @_;
1744 1701
1745 $mode eq "abs" ? $val 1702 $rel ? $val * $max : $val
1746 : $mode eq "rel" ? $val * $max
1747 : 0
1748} 1703}
1749 1704
1750sub size_request { 1705sub size_request {
1751 my ($self) = @_; 1706 my ($self) = @_;
1752 1707
1753 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1708 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1754 1709
1755 # determine overall size by querying abs widgets 1710 # determine overall size by querying abs widgets
1756 for my $child ($self->visible_children) { 1711 for my $child ($self->visible_children) {
1757 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};
1758 1715
1759 if ($pos eq "abs") {
1760 $w = _scale $size, $w, $child->{req_w};
1761 $h = _scale $size, $h, $child->{req_h};
1762
1763 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1716 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1764 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1717 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1765 } 1718 }
1766 } 1719 }
1767 1720
1768 my $W = $x2 - $x1; 1721 my $W = $x2 - $x1;
1769 my $H = $y2 - $y1; 1722 my $H = $y2 - $y1;
1770 1723
1771 # now layout remaining widgets 1724 # now layout remaining widgets
1772 for my $child ($self->visible_children) { 1725 for my $child ($self->visible_children) {
1773 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;
1774 1729
1775 if ($pos ne "abs") {
1776 $x = _scale $pos, $x, $W;
1777 $y = _scale $pos, $x, $H;
1778 $w = _scale $size, $w, $child->{req_w};
1779 $h = _scale $size, $h, $child->{req_h};
1780
1781 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1730 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1782 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1731 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1783 } 1732 }
1784 } 1733 }
1785 1734
1786 my $W = $x2 - $x1; 1735 my $W = $x2 - $x1;
1787 my $H = $y2 - $y1; 1736 my $H = $y2 - $y1;
… …
1791 1740
1792sub invoke_size_allocate { 1741sub invoke_size_allocate {
1793 my ($self, $W, $H) = @_; 1742 my ($self, $W, $H) = @_;
1794 1743
1795 for my $child ($self->visible_children) { 1744 for my $child ($self->visible_children) {
1796 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;
1797 1747
1798 $x = _scale $pos, $x, $W; 1748 $x += $child->{c_halign} * $child->{req_w};
1799 $y = _scale $pos, $x, $H; 1749 $y += $child->{c_valign} * $child->{req_h};
1800 $w = _scale $size, $w, $W;
1801 $h = _scale $size, $h, $H;
1802 1750
1803 $child->configure ($x, $y, $w, $h); 1751 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1804 } 1752 }
1805 1753
1806 1 1754 1
1807} 1755}
1808 1756
… …
1812 1760
1813our @ISA = CFPlus::UI::Container::; 1761our @ISA = CFPlus::UI::Container::;
1814 1762
1815sub size_request { 1763sub size_request {
1816 my ($self) = @_; 1764 my ($self) = @_;
1765
1766 my @children = $self->visible_children;
1817 1767
1818 $self->{vertical} 1768 $self->{vertical}
1819 ? ( 1769 ? (
1820 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1770 (List::Util::max map $_->{req_w}, @children),
1821 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1771 (List::Util::sum map $_->{req_h}, @children),
1822 ) 1772 )
1823 : ( 1773 : (
1824 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1774 (List::Util::sum map $_->{req_w}, @children),
1825 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1775 (List::Util::max map $_->{req_h}, @children),
1826 ) 1776 )
1827} 1777}
1828 1778
1829sub invoke_size_allocate { 1779sub invoke_size_allocate {
1830 my ($self, $w, $h) = @_; 1780 my ($self, $w, $h) = @_;
… …
1954 1904
1955 delete $self->{ox}; 1905 delete $self->{ox};
1956 $self->SUPER::realloc; 1906 $self->SUPER::realloc;
1957} 1907}
1958 1908
1909sub clear {
1910 my ($self) = @_;
1911
1912 $self->set_text ("");
1913}
1914
1959sub set_text { 1915sub set_text {
1960 my ($self, $text) = @_; 1916 my ($self, $text) = @_;
1961 1917
1962 return if $self->{text} eq "T$text"; 1918 return if $self->{text} eq "T$text";
1963 $self->{text} = "T$text"; 1919 $self->{text} = "T$text";
… …
2069 : ($self->{w} - $size->[0]) * 0.5); 2025 : ($self->{w} - $size->[0]) * 0.5);
2070 2026
2071 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2027 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2072 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2028 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2073 : ($self->{h} - $size->[1]) * 0.5); 2029 : ($self->{h} - $size->[1]) * 0.5);
2030
2031 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2074 }; 2032 };
2075 2033
2076 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2034# unless ($self->{list}) {
2077 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2035# $self->{list} = CFPlus::OpenGL::glGenList;
2078 2036# CFPlus::OpenGL::glNewList $self->{list};
2079 $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;
2080} 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#}
2081 2053
2082############################################################################# 2054#############################################################################
2083 2055
2084package CFPlus::UI::EntryBase; 2056package CFPlus::UI::EntryBase;
2085 2057
… …
2091 my $class = shift; 2063 my $class = shift;
2092 2064
2093 $class->SUPER::new ( 2065 $class->SUPER::new (
2094 fg => [1, 1, 1], 2066 fg => [1, 1, 1],
2095 bg => [0, 0, 0, 0.2], 2067 bg => [0, 0, 0, 0.2],
2068 outline => [0.6, 0.3, 0.1],
2096 active_bg => [1, 1, 1, 0.5], 2069 active_bg => [0, 0, 1, .2],
2097 active_fg => [0, 0, 0], 2070 active_fg => [1, 1, 1],
2071 active_outline => [1, 1, 0],
2098 can_hover => 1, 2072 can_hover => 1,
2099 can_focus => 1, 2073 can_focus => 1,
2100 valign => 0, 2074 valign => 0,
2101 can_events => 1, 2075 can_events => 1,
2102 ellipsise => 0, 2076 ellipsise => 0,
… …
2242 glColor_premultiply @{$self->{bg}}; 2216 glColor_premultiply @{$self->{bg}};
2243 } 2217 }
2244 2218
2245 glEnable GL_BLEND; 2219 glEnable GL_BLEND;
2246 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2220 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2247 glBegin GL_QUADS;
2248 glVertex 0 , 0;
2249 glVertex 0 , $self->{h};
2250 glVertex $self->{w}, $self->{h}; 2221 glRect 0, 0, $self->{w}, $self->{h};
2251 glVertex $self->{w}, 0;
2252 glEnd;
2253 glDisable GL_BLEND; 2222 glDisable GL_BLEND;
2254 2223
2255 $self->SUPER::_draw; 2224 $self->SUPER::_draw;
2256 2225
2257 #TODO: force update every cursor change :( 2226 #TODO: force update every cursor change :(
… …
2259 2228
2260 unless (exists $self->{cur_h}) { 2229 unless (exists $self->{cur_h}) {
2261 my $text = substr $self->{text}, 0, $self->{cursor}; 2230 my $text = substr $self->{text}, 0, $self->{cursor};
2262 utf8::encode $text; 2231 utf8::encode $text;
2263 2232
2264 @$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);
2265 } 2234 }
2266 2235
2236 glColor_premultiply @{$self->{active_fg}};
2267 glBegin GL_LINES; 2237 glBegin GL_LINES;
2268 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};
2269 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;
2270 glEnd; 2254 glEnd;
2271 } 2255 }
2272} 2256}
2273 2257
2274############################################################################# 2258#############################################################################
… …
2361 1 2345 1
2362} 2346}
2363 2347
2364############################################################################# 2348#############################################################################
2365 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
2366package CFPlus::UI::Button; 2399package CFPlus::UI::Button;
2367 2400
2368our @ISA = CFPlus::UI::Label::; 2401our @ISA = CFPlus::UI::Label::;
2369 2402
2370use CFPlus::OpenGL; 2403use CFPlus::OpenGL;
… …
2474sub _draw { 2507sub _draw {
2475 my ($self) = @_; 2508 my ($self) = @_;
2476 2509
2477 $self->SUPER::_draw; 2510 $self->SUPER::_draw;
2478 2511
2479 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2512 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2480 2513
2481 my ($w, $h) = @$self{qw(w h)}; 2514 my ($w, $h) = @$self{qw(w h)};
2482 2515
2483 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;
2484 2517
… …
2504sub new { 2537sub new {
2505 my $class = shift; 2538 my $class = shift;
2506 2539
2507 my $self = $class->SUPER::new ( 2540 my $self = $class->SUPER::new (
2508 can_events => 0, 2541 can_events => 0,
2542 scale => 1,
2509 @_, 2543 @_,
2510 ); 2544 );
2511 2545
2512 $self->{path} || $self->{tex} 2546 $self->{path} || $self->{tex}
2513 or Carp::croak "'path' or 'tex' attributes required"; 2547 or Carp::croak "'path' or 'tex' attributes required";
… …
2538} 2572}
2539 2573
2540sub size_request { 2574sub size_request {
2541 my ($self) = @_; 2575 my ($self) = @_;
2542 2576
2543 ($self->{tex}{w}, $self->{tex}{h}) 2577 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2544} 2578}
2545 2579
2546sub _draw { 2580sub _draw {
2547 my ($self) = @_; 2581 my ($self) = @_;
2548 2582
… …
2558 } 2592 }
2559 2593
2560 glEnable GL_TEXTURE_2D; 2594 glEnable GL_TEXTURE_2D;
2561 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2595 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2562 2596
2563 $tex->draw_quad (0, 0, $w, $h); 2597 $tex->draw_quad_alpha (0, 0, $w, $h);
2564 2598
2565 glDisable GL_TEXTURE_2D; 2599 glDisable GL_TEXTURE_2D;
2566} 2600}
2567 2601
2568############################################################################# 2602#############################################################################
… …
2587 align => 0, 2621 align => 0,
2588 valign => 0, 2622 valign => 0,
2589 can_events => 1, 2623 can_events => 1,
2590 @_ 2624 @_
2591 ); 2625 );
2626}
2627
2628sub invoke_button_down {
2629 my ($self, $ev, $x, $y) = @_;
2630
2631 1
2592} 2632}
2593 2633
2594sub invoke_button_up { 2634sub invoke_button_up {
2595 my ($self, $ev, $x, $y) = @_; 2635 my ($self, $ev, $x, $y) = @_;
2596 2636
… …
2736 glDisable GL_TEXTURE_2D; 2776 glDisable GL_TEXTURE_2D;
2737} 2777}
2738 2778
2739############################################################################# 2779#############################################################################
2740 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
2741package CFPlus::UI::Gauge; 2919package CFPlus::UI::Gauge;
2742 2920
2743our @ISA = CFPlus::UI::VBox::; 2921our @ISA = CFPlus::UI::VBox::;
2744 2922
2745sub new { 2923sub new {
… …
2870 3048
2871 $self->SUPER::invoke_button_down ($ev, $x, $y); 3049 $self->SUPER::invoke_button_down ($ev, $x, $y);
2872 3050
2873 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3051 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2874 3052
2875 $self->invoke_mouse_motion ($ev, $x, $y) 3053 $self->invoke_mouse_motion ($ev, $x, $y);
3054
3055 1
2876} 3056}
2877 3057
2878sub invoke_mouse_motion { 3058sub invoke_mouse_motion {
2879 my ($self, $ev, $x, $y) = @_; 3059 my ($self, $ev, $x, $y) = @_;
2880 3060
… …
2900 3080
2901 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3081 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2902 3082
2903 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3083 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2904 3084
2905 ! ! $delta 3085 1
2906} 3086}
2907 3087
2908sub update { 3088sub update {
2909 my ($self) = @_; 3089 my ($self) = @_;
2910 3090
… …
3041} 3221}
3042 3222
3043sub size_request { 3223sub size_request {
3044 my ($self) = @_; 3224 my ($self) = @_;
3045 3225
3046 my ($empty, $slider) = @{ $self->{children} }; 3226 my ($empty, $slider) = $self->visible_children;
3047 3227
3048 local $self->{children} = [$empty, $slider]; 3228 local $self->{children} = [$empty, $slider];
3049 $self->SUPER::size_request 3229 $self->SUPER::size_request
3050} 3230}
3051 3231
… …
3240 3420
3241 if ($y0 < $y + $h && $y < $y1) { 3421 if ($y0 < $y + $h && $y < $y1) {
3242 my $layout = $self->get_layout ($para); 3422 my $layout = $self->get_layout ($para);
3243 3423
3244 $layout->render ($para->{indent}, $y - $y0); 3424 $layout->render ($para->{indent}, $y - $y0);
3425 $layout->draw;
3245 3426
3246 if (my @w = @{ $para->{widget} }) { 3427 if (my @w = @{ $para->{widget} }) {
3247 my @s = $layout->get_shapes; 3428 my @s = $layout->get_shapes;
3248 3429
3249 for (@w) { 3430 for (@w) {
… …
3371} 3552}
3372 3553
3373sub set_tooltip_from { 3554sub set_tooltip_from {
3374 my ($self, $widget) = @_; 3555 my ($self, $widget) = @_;
3375 3556
3376 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3377 if $widget->{tooltip} =~ /^#(.*)$/;
3378
3379 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 =~ /^#(.*)$/;
3380 3562
3381 if ($ENV{CFPLUS_DEBUG} & 2) { 3563 if ($ENV{CFPLUS_DEBUG} & 2) {
3382 $tooltip .= "\n\n" . (ref $widget) . "\n" 3564 $tip .= "\n\n" . (ref $widget) . "\n"
3383 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3565 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3384 . "req $widget->{req_w} $widget->{req_h}\n" 3566 . "req $widget->{req_w} $widget->{req_h}\n"
3385 . "visible $widget->{visible}"; 3567 . "visible $widget->{visible}";
3386 } 3568 }
3387 3569
3388 $tooltip =~ s/^\n+//; 3570 $tip =~ s/^\n+//;
3389 $tooltip =~ s/\n+$//; 3571 $tip =~ s/\n+$//;
3390 3572
3391 $self->add (new CFPlus::UI::Label 3573 $self->add (new CFPlus::UI::Label
3392 markup => $tooltip, 3574 markup => $tip,
3393 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3575 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3394 fontsize => 0.8, 3576 fontsize => 0.8,
3395 style => 1, # FLAG_INVERSE 3577 style => 1, # FLAG_INVERSE
3396 ellipsise => 0, 3578 ellipsise => 0,
3397 font => ($widget->{tooltip_font} || $::FONT_PROP), 3579 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
3435} 3617}
3436 3618
3437sub _draw { 3619sub _draw {
3438 my ($self) = @_; 3620 my ($self) = @_;
3439 3621
3440 glTranslate 0.375, 0.375;
3441
3442 my ($w, $h) = @$self{qw(w h)}; 3622 my ($w, $h) = @$self{qw(w h)};
3443 3623
3444 glColor 1, 0.8, 0.4; 3624 glColor 1, 0.8, 0.4;
3445 glBegin GL_QUADS; 3625 glRect 0, 0, $w, $h;
3446 glVertex 0 , 0;
3447 glVertex 0 , $h;
3448 glVertex $w, $h;
3449 glVertex $w, 0;
3450 glEnd;
3451 3626
3452 glColor 0, 0, 0; 3627 glColor 0, 0, 0;
3453 glBegin GL_LINE_LOOP; 3628 glRect_lineloop .5, .5, $w + .5, $h + .5;
3454 glVertex 0 , 0;
3455 glVertex 0 , $h;
3456 glVertex $w, $h;
3457 glVertex $w, 0;
3458 glEnd;
3459 3629
3460 glTranslate 2 - 0.375, 2 - 0.375; 3630 glTranslate 2, 2;
3461 3631
3462 $self->SUPER::_draw; 3632 $self->SUPER::_draw;
3463} 3633}
3464 3634
3465############################################################################# 3635#############################################################################
… …
3483 3653
3484 if ($self->{anim} && $self->{animspeed}) { 3654 if ($self->{anim} && $self->{animspeed}) {
3485 CFPlus::weaken (my $widget = $self); 3655 CFPlus::weaken (my $widget = $self);
3486 3656
3487 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3657 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3488 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed}; 3658 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3489 $self->{timer} = Event->timer ( 3659 $self->{timer} = Event->timer (
3490 parked => 1, 3660 parked => 1,
3491 cb => sub { 3661 cb => sub {
3492 return unless $::CONN && $widget; 3662 return unless $::CONN;
3493 3663
3664 my $w = $widget
3665 or return;
3666
3494 ++$widget->{frame}; 3667 ++$w->{frame};
3495 $widget->update_face; 3668 $w->update_face;
3669
3670 # somehow, $widget can go away
3496 $widget->update; 3671 $w->update;
3497
3498 $widget->update_timer; 3672 $w->update_timer;
3499 }, 3673 },
3500 ); 3674 );
3501 3675
3502 $self->update_face; 3676 $self->update_face;
3503 $self->update_timer; 3677 $self->update_timer;
… …
3524} 3698}
3525 3699
3526sub update_face { 3700sub update_face {
3527 my ($self) = @_; 3701 my ($self) = @_;
3528 3702
3529 return unless $::CONN; 3703 if ($::CONN) {
3530
3531 if (my $anim = $::CONN->{anim}[$self->{anim}]) { 3704 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3532 if ($anim && @$anim) { 3705 if ($anim && @$anim) {
3533 delete $self->{wait_face};
3534 $self->{face} = $anim->[ $self->{frame} % @$anim ]; 3706 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3707 delete $self->{face_change_cb};
3708
3535 $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 }
3536 } 3715 }
3537 } 3716 }
3538} 3717}
3539 3718
3540sub size_request { 3719sub size_request {
3541 my ($self) = @_; 3720 my ($self) = @_;
3542 3721
3543 if ($::CONN) { 3722 if ($::CONN) {
3544 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3723 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3545 if (my $tex = $::CONN->{texture}[$faceid]) { 3724 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3546 $self->{tex} = $tex; 3725 if ($tex->{name}) {
3547 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3726 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3548 } else { 3727 } elsif (!$tex->{loading}) {
3549 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3728 $tex->upload (sub { $self->reconfigure });
3550 $self->realloc;
3551 }); 3729 }
3552 } 3730 }
3731
3732 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3553 } 3733 }
3554 } 3734 }
3555 3735
3556 ($self->{size_w} || 8, $self->{size_h} || 8) 3736 ($self->{size_w} || 8, $self->{size_h} || 8)
3557} 3737}
… …
3637 children => [ 3817 children => [
3638 (new CFPlus::UI::Label markup => $left, expand => 1), 3818 (new CFPlus::UI::Label markup => $left, expand => 1),
3639 (new CFPlus::UI::Label markup => $right, align => +1), 3819 (new CFPlus::UI::Label markup => $right, align => +1),
3640 ], 3820 ],
3641 ; 3821 ;
3642 3822
3643 } else { 3823 } else {
3644 $widget = new CFPlus::UI::Label 3824 $widget = new CFPlus::UI::Label
3645 can_hover => 1, 3825 can_hover => 1,
3646 can_events => 1, 3826 can_events => 1,
3647 markup => $widget, 3827 markup => $widget,
… …
3772 3952
3773############################################################################# 3953#############################################################################
3774 3954
3775package CFPlus::UI::Notebook; 3955package CFPlus::UI::Notebook;
3776 3956
3957use CFPlus::OpenGL;
3958
3777our @ISA = CFPlus::UI::VBox::; 3959our @ISA = CFPlus::UI::VBox::;
3778 3960
3779sub new { 3961sub new {
3780 my $class = shift; 3962 my $class = shift;
3781 3963
3782 my $self = $class->SUPER::new ( 3964 my $self = $class->SUPER::new (
3783 buttonbar => (new CFPlus::UI::Buttonbar), 3965 buttonbar => (new CFPlus::UI::Buttonbar),
3784 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3966 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3967 active_outline => [.7, .7, 0.2],
3785 # filter => # will be put between multiplexer and $self 3968 # filter => # will be put between multiplexer and $self
3786 @_, 3969 @_,
3787 ); 3970 );
3788 3971
3789 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3972 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3790 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3973 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3791 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
3792 $self 4009 $self
3793} 4010}
3794 4011
3795sub 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 {
3796 my ($self, $title, $widget, $tooltip) = @_; 4030 my ($self, $title, $widget, $tooltip) = @_;
3797 4031
3798 CFPlus::weaken $self; 4032 $title = [$title, $tooltip] unless ref $title;
4033 $widget->{c_tab} = $title;
3799 4034
3800 $self->{buttonbar}->add (new CFPlus::UI::Button
3801 markup => $title,
3802 tooltip => $tooltip,
3803 on_activate => sub { $self->set_current_page ($widget) },
3804 );
3805
3806 $self->{multiplexer}->add ($widget); 4035 $self->add ($widget);
3807} 4036}
3808 4037
3809sub get_current_page { 4038sub get_current_page {
3810 my ($self) = @_; 4039 my ($self) = @_;
3811 4040
… …
3815sub set_current_page { 4044sub set_current_page {
3816 my ($self, $page) = @_; 4045 my ($self, $page) = @_;
3817 4046
3818 $self->{multiplexer}->set_current_page ($page); 4047 $self->{multiplexer}->set_current_page ($page);
3819 $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 }
3820} 4069}
3821 4070
3822############################################################################# 4071#############################################################################
3823 4072
3824package CFPlus::UI::Selector; 4073package CFPlus::UI::Selector;
… …
4094} 4343}
4095 4344
4096sub update { 4345sub update {
4097 my ($self) = @_; 4346 my ($self) = @_;
4098 4347
4099 $::WANT_REFRESH++; 4348 $::WANT_REFRESH->start;
4100} 4349}
4101 4350
4102sub add { 4351sub add {
4103 my ($self, @children) = @_; 4352 my ($self, @children) = @_;
4104 4353

Diff Legend

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