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.392 by root, Sat Jul 21 13:37:09 2007 UTC vs.
Revision 1.413 by root, Mon Jul 23 15:30:45 2007 UTC

… …
593 593
594# using global variables seems a bit hacky, but passing through all drawing 594# using global variables seems a bit hacky, but passing through all drawing
595# functions seems pointless. 595# functions seems pointless.
596our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 596our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
597 597
598sub draw { 598#sub draw {
599 my ($self) = @_; 599#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 600
645sub _draw { 601sub _draw {
646 my ($self) = @_; 602 my ($self) = @_;
647 603
648 warn "no draw defined for $self\n"; 604 warn "no draw defined for $self\n";
649} 605}
650 606
651my $cntx;#d#
652sub DESTROY { 607sub DESTROY {
653 my ($self) = @_; 608 my ($self) = @_;
654 609
655 return if CFPlus::in_destruct; 610 return if CFPlus::in_destruct;
656 611
… …
769 sort { $a->{z} <=> $b->{z} } 724 sort { $a->{z} <=> $b->{z} }
770 @{$self->{children}}, @widgets 725 @{$self->{children}}, @widgets
771 ]; 726 ];
772 727
773 $self->realloc; 728 $self->realloc;
729
730 $self->emit (c_add => \@widgets);
731
732 map $_+0, @widgets
774} 733}
775 734
776sub children { 735sub children {
777 @{ $_[0]{children} } 736 @{ $_[0]{children} }
778} 737}
779 738
780sub remove { 739sub remove {
781 my ($self, $child) = @_; 740 my ($self, @widgets) = @_;
782 741
742 $self->emit (c_remove => \@widgets);
743
744 for my $child (@widgets) {
783 delete $child->{parent}; 745 delete $child->{parent};
784 $child->hide; 746 $child->hide;
785
786 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 747 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
748 }
787 749
788 $self->realloc; 750 $self->realloc;
789} 751}
790 752
791sub clear { 753sub clear {
792 my ($self) = @_; 754 my ($self) = @_;
793 755
794 my $children = delete $self->{children}; 756 my $children = $self->{children};
795 $self->{children} = []; 757 $self->{children} = [];
796 758
797 for (@$children) { 759 for (@$children) {
798 delete $_->{parent}; 760 delete $_->{parent};
799 $_->hide; 761 $_->hide;
… …
819} 781}
820 782
821sub _draw { 783sub _draw {
822 my ($self) = @_; 784 my ($self) = @_;
823 785
824 $_->draw for @{$self->{children}}; 786 $_->draw for $self->visible_children;
825} 787}
826 788
827############################################################################# 789#############################################################################
828 790
829package CFPlus::UI::Bin; 791package CFPlus::UI::Bin;
… …
839} 801}
840 802
841sub add { 803sub add {
842 my ($self, $child) = @_; 804 my ($self, $child) = @_;
843 805
844 $self->SUPER::remove ($_) for @{ $self->{children} }; 806 $self->clear;
845 $self->SUPER::add ($child); 807 $self->SUPER::add ($child);
846} 808}
847 809
848sub remove { 810sub remove {
849 my ($self, $widget) = @_; 811 my ($self, $widget) = @_;
… …
1093 $vp->{parent}{hslider}->set_value ($x); 1055 $vp->{parent}{hslider}->set_value ($x);
1094 $vp->{parent}{vslider}->set_value ($y); 1056 $vp->{parent}{vslider}->set_value ($y);
1095 1057
1096 0 1058 0
1097 }, 1059 },
1060 on_size_allocate => sub {
1061 my ($vp, $w, $h) = @_;
1062 $vp->{parent}->update_slider;
1063 0
1064 },
1098 ; 1065 ;
1099 1066
1100 $self->SUPER::add ($self->{vp}); 1067 $self->SUPER::add ($self->{vp});
1101 1068
1102 $self->add ($child) if $child; 1069 $self->add ($child) if $child;
1103 1070
1104 $self 1071 $self
1105} 1072}
1106
1107#TODO# update range on size_allocate depending on child?
1108 1073
1109sub add { 1074sub add {
1110 my ($self, $widget) = @_; 1075 my ($self, $widget) = @_;
1111 1076
1112 $self->{vp}->add ($self->{child} = $widget); 1077 $self->{vp}->add ($self->{child} = $widget);
… …
1115sub update_slider { 1080sub update_slider {
1116 my ($self) = @_; 1081 my ($self) = @_;
1117 1082
1118 my $child = ($self->{vp} or return)->child; 1083 my $child = ($self->{vp} or return)->child;
1119 1084
1085 if ($self->{scroll_x}) {
1120 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1086 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1121 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); 1087 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1122 1088
1123 my $visible = $w1 > $w2; 1089 my $visible = $w1 > $w2;
1124 if ($visible != $self->{hslider}{visible}) { 1090 if ($visible != $self->{hslider_visible}) {
1091 $self->{hslider_visible} = $visible;
1125 $visible ? $self->SUPER::add ($self->{hslider}) 1092 $visible ? $self->SUPER::add ($self->{hslider})
1126 : $self->SUPER::remove ($self->{hslider}); 1093 : $self->SUPER::remove ($self->{hslider});
1094 }
1127 } 1095 }
1128 1096
1097 if ($self->{scroll_y}) {
1129 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1098 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1130 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); 1099 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1131 1100
1132 my $visible = $h1 > $h2; 1101 my $visible = $h1 > $h2;
1133 if ($visible != $self->{vslider}{visible}) { 1102 if ($visible != $self->{vslider_visible}) {
1103 $self->{vslider_visible} = $visible;
1134 $visible ? $self->SUPER::add ($self->{vslider}) 1104 $visible ? $self->SUPER::add ($self->{vslider})
1135 : $self->SUPER::remove ($self->{vslider}); 1105 : $self->SUPER::remove ($self->{vslider});
1106 }
1107 }
1108}
1109
1110sub start_dragging {
1111 my ($self, $ev) = @_;
1112
1113 $self->grab_focus;
1114
1115 my $ox = $self->{vp}{view_x};
1116 my $oy = $self->{vp}{view_y};
1117
1118 $self->{motion} = sub {
1119 my ($ev, $x, $y) = @_;
1120
1121 $ox -= $ev->{xrel};
1122 $oy -= $ev->{yrel};
1123
1124 $self->{vp}->set_offset ($ox, $oy);
1136 } 1125 };
1137}
1138
1139sub update {
1140 my ($self) = @_;
1141
1142 $self->update_slider;
1143 $self->SUPER::update;
1144} 1126}
1145 1127
1146sub invoke_mouse_wheel { 1128sub invoke_mouse_wheel {
1147 my ($self, $ev) = @_; 1129 my ($self, $ev) = @_;
1148 1130
1149 $self->{vslider}->emit (mouse_wheel => $ev) 1131 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1150 if $ev->{dy};
1151
1152 $self->{hslider}->emit (mouse_wheel => $ev) 1132 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1153 if $ev->{dx};
1154 1133
1155 1 1134 1
1156} 1135}
1157 1136
1158sub invoke_button_down { 1137sub invoke_button_down {
1159 my ($self, $ev, $x, $y) = @_; 1138 my ($self, $ev, $x, $y) = @_;
1160 1139
1161 if ($ev->{button} == 2) { 1140 if ($ev->{button} == 2) {
1162 $self->grab_focus; 1141 $self->start_dragging ($ev);
1163
1164 my $ox = $self->{vp}{view_x} + $ev->{x};
1165 my $oy = $self->{vp}{view_y} + $ev->{y};
1166
1167 $self->{motion} = sub {
1168 my ($ev, $x, $y) = @_;
1169
1170 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1171 $self->update;
1172 };
1173
1174 return 1; 1142 return 1;
1175 } 1143 }
1176 1144
1177 0 1145 0
1178} 1146}
… …
1646 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; 1614 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1647 1615
1648 my $sw = sum @w[$c .. $c + $cs - 1]; 1616 my $sw = sum @w[$c .. $c + $cs - 1];
1649 1617
1650 if ($w > $sw) { 1618 if ($w > $sw) {
1651 $_ += ($w - $sw) / $cs for @w[$c .. $c + $cs - 1]; 1619 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1652 } 1620 }
1653 } 1621 }
1654 1622
1655 # second pass, rows 1623 # second pass, rows
1656 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { 1624 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1657 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; 1625 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1658 1626
1659 my $sh = sum @h[$r .. $r + $rs - 1]; 1627 my $sh = sum @h[$r .. $r + $rs - 1];
1660 1628
1661 if ($h > $sh) { 1629 if ($h > $sh) {
1662 $_ += ($h - $sh) / $rs for @h[$r .. $r + $rs - 1]; 1630 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1663 } 1631 }
1664 } 1632 }
1665 1633
1666 (\@w, \@h) 1634 (\@w, \@h)
1667} 1635}
… …
1723 1691
1724use List::Util qw(min max); 1692use List::Util qw(min max);
1725 1693
1726our @ISA = CFPlus::UI::Container::; 1694our @ISA = CFPlus::UI::Container::;
1727 1695
1728sub add {
1729 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1730
1731 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1732 $self->SUPER::add ($child);
1733}
1734
1735sub _scale($$$) { 1696sub _scale($$$) {
1736 my ($mode, $val, $max) = @_; 1697 my ($rel, $val, $max) = @_;
1737 1698
1738 $mode eq "abs" ? $val 1699 $rel ? $val * $max : $val
1739 : $mode eq "rel" ? $val * $max
1740 : 0
1741} 1700}
1742 1701
1743sub size_request { 1702sub size_request {
1744 my ($self) = @_; 1703 my ($self) = @_;
1745 1704
1746 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1705 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1747 1706
1748 # determine overall size by querying abs widgets 1707 # determine overall size by querying abs widgets
1749 for my $child ($self->visible_children) { 1708 for my $child ($self->visible_children) {
1750 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1709 unless ($child->{c_rel}) {
1710 my $x = $child->{c_x};
1711 my $y = $child->{c_y};
1751 1712
1752 if ($pos eq "abs") {
1753 $w = _scale $size, $w, $child->{req_w};
1754 $h = _scale $size, $h, $child->{req_h};
1755
1756 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1713 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1757 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1714 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1758 } 1715 }
1759 } 1716 }
1760 1717
1761 my $W = $x2 - $x1; 1718 my $W = $x2 - $x1;
1762 my $H = $y2 - $y1; 1719 my $H = $y2 - $y1;
1763 1720
1764 # now layout remaining widgets 1721 # now layout remaining widgets
1765 for my $child ($self->visible_children) { 1722 for my $child ($self->visible_children) {
1766 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1723 if ($child->{c_rel}) {
1724 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1725 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1767 1726
1768 if ($pos ne "abs") {
1769 $x = _scale $pos, $x, $W;
1770 $y = _scale $pos, $x, $H;
1771 $w = _scale $size, $w, $child->{req_w};
1772 $h = _scale $size, $h, $child->{req_h};
1773
1774 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1727 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1775 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1728 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1776 } 1729 }
1777 } 1730 }
1778 1731
1779 my $W = $x2 - $x1; 1732 my $W = $x2 - $x1;
1780 my $H = $y2 - $y1; 1733 my $H = $y2 - $y1;
… …
1784 1737
1785sub invoke_size_allocate { 1738sub invoke_size_allocate {
1786 my ($self, $W, $H) = @_; 1739 my ($self, $W, $H) = @_;
1787 1740
1788 for my $child ($self->visible_children) { 1741 for my $child ($self->visible_children) {
1789 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1742 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1743 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1790 1744
1791 $x = _scale $pos, $x, $W; 1745 $x += $child->{c_halign} * $child->{req_w};
1792 $y = _scale $pos, $x, $H; 1746 $y += $child->{c_valign} * $child->{req_h};
1793 $w = _scale $size, $w, $child->{req_w};
1794 $h = _scale $size, $h, $child->{req_h};
1795 1747
1796 $child->configure ($x, $y, $w, $h); 1748 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1797 } 1749 }
1798 1750
1799 1 1751 1
1800} 1752}
1801 1753
… …
1805 1757
1806our @ISA = CFPlus::UI::Container::; 1758our @ISA = CFPlus::UI::Container::;
1807 1759
1808sub size_request { 1760sub size_request {
1809 my ($self) = @_; 1761 my ($self) = @_;
1762
1763 my @children = $self->visible_children;
1810 1764
1811 $self->{vertical} 1765 $self->{vertical}
1812 ? ( 1766 ? (
1813 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1767 (List::Util::max map $_->{req_w}, @children),
1814 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1768 (List::Util::sum map $_->{req_h}, @children),
1815 ) 1769 )
1816 : ( 1770 : (
1817 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1771 (List::Util::sum map $_->{req_w}, @children),
1818 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1772 (List::Util::max map $_->{req_h}, @children),
1819 ) 1773 )
1820} 1774}
1821 1775
1822sub invoke_size_allocate { 1776sub invoke_size_allocate {
1823 my ($self, $w, $h) = @_; 1777 my ($self, $w, $h) = @_;
… …
2064 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2018 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2065 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2019 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2066 : ($self->{h} - $size->[1]) * 0.5); 2020 : ($self->{h} - $size->[1]) * 0.5);
2067 }; 2021 };
2068 2022
2069 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2023# unless ($self->{list}) {
2070 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2024# $self->{list} = CFPlus::OpenGL::glGenList;
2025# CFPlus::OpenGL::glNewList $self->{list};
2026# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2027# CFPlus::OpenGL::glEndList;
2028# }
2029#
2030# CFPlus::OpenGL::glCallList $self->{list};
2071 2031
2072 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2032 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2073} 2033}
2034
2035#sub destroy {
2036# my ($self) = @_;
2037#
2038# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2039#
2040# $self->SUPER::destroy;
2041#}
2074 2042
2075############################################################################# 2043#############################################################################
2076 2044
2077package CFPlus::UI::EntryBase; 2045package CFPlus::UI::EntryBase;
2078 2046
… …
2863 2831
2864 $self->SUPER::invoke_button_down ($ev, $x, $y); 2832 $self->SUPER::invoke_button_down ($ev, $x, $y);
2865 2833
2866 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2834 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2867 2835
2868 $self->invoke_mouse_motion ($ev, $x, $y) 2836 $self->invoke_mouse_motion ($ev, $x, $y);
2837
2838 1
2869} 2839}
2870 2840
2871sub invoke_mouse_motion { 2841sub invoke_mouse_motion {
2872 my ($self, $ev, $x, $y) = @_; 2842 my ($self, $ev, $x, $y) = @_;
2873 2843
… …
2893 2863
2894 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 2864 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2895 2865
2896 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 2866 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2897 2867
2898 ! ! $delta 2868 1
2899} 2869}
2900 2870
2901sub update { 2871sub update {
2902 my ($self) = @_; 2872 my ($self) = @_;
2903 2873
… …
3034} 3004}
3035 3005
3036sub size_request { 3006sub size_request {
3037 my ($self) = @_; 3007 my ($self) = @_;
3038 3008
3039 my ($empty, $slider) = @{ $self->{children} }; 3009 my ($empty, $slider) = $self->visible_children;
3040 3010
3041 local $self->{children} = [$empty, $slider]; 3011 local $self->{children} = [$empty, $slider];
3042 $self->SUPER::size_request 3012 $self->SUPER::size_request
3043} 3013}
3044 3014
… …
3476 3446
3477 if ($self->{anim} && $self->{animspeed}) { 3447 if ($self->{anim} && $self->{animspeed}) {
3478 CFPlus::weaken (my $widget = $self); 3448 CFPlus::weaken (my $widget = $self);
3479 3449
3480 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3450 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3481 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed}; 3451 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3482 $self->{timer} = Event->timer ( 3452 $self->{timer} = Event->timer (
3483 parked => 1, 3453 parked => 1,
3484 cb => sub { 3454 cb => sub {
3485 return unless $::CONN && $widget; 3455 return unless $::CONN && $widget;
3486 3456
… …
3523 3493
3524 if (my $anim = $::CONN->{anim}[$self->{anim}]) { 3494 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3525 if ($anim && @$anim) { 3495 if ($anim && @$anim) {
3526 delete $self->{wait_face}; 3496 delete $self->{wait_face};
3527 $self->{face} = $anim->[ $self->{frame} % @$anim ]; 3497 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3498 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3528 } 3499 }
3529 } 3500 }
3530} 3501}
3531 3502
3532sub size_request { 3503sub size_request {
3533 my ($self) = @_; 3504 my ($self) = @_;
3534 3505
3535 if ($::CONN) { 3506 if ($::CONN) {
3536 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3507 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3537 if (my $tex = $::CONN->{texture}[$faceid]) { 3508 if (my $tex = $::CONN->{texture}[$faceid]) {
3509 $self->{tex} = $tex;
3538 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3510 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3539 } else { 3511 } else {
3540 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3512 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3541 $self->realloc; 3513 $self->realloc;
3542 }); 3514 });
… …
3564} 3536}
3565 3537
3566sub _draw { 3538sub _draw {
3567 my ($self) = @_; 3539 my ($self) = @_;
3568 3540
3569 return unless $::CONN;
3570
3571 $self->SUPER::_draw; 3541 $self->SUPER::_draw;
3572 3542
3573 my $faceid = $::CONN->{faceid}[$self->{face}] 3543 if (my $tex = $self->{tex}) {
3574 or return;
3575
3576 my $tex = $::CONN->{texture}[$faceid];
3577
3578 if ($tex) {
3579 glEnable GL_TEXTURE_2D; 3544 glEnable GL_TEXTURE_2D;
3580 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3545 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3581 glColor 0, 0, 0, 1; 3546 glColor 0, 0, 0, 1;
3582 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3547 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3583 glDisable GL_TEXTURE_2D; 3548 glDisable GL_TEXTURE_2D;
… …
3785 ); 3750 );
3786 3751
3787 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3752 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3788 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3753 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3789 3754
3755 {
3756 Scalar::Util::weaken (my $wself = $self);
3757
3758 $self->{multiplexer}->connect (c_add => sub {
3759 my ($mplex, $widgets) = @_;
3760
3761 for my $child (@$widgets) {
3762 Scalar::Util::weaken $child;
3763 $child->{c_tab_} ||= do {
3764 my $tab =
3765 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3766 ? $child->{c_tab}
3767 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3768
3769 $tab->connect (activate => sub {
3770 $wself->set_current_page ($child);
3771 });
3772
3773 $tab
3774 };
3775
3776 $self->{buttonbar}->add ($child->{c_tab_});
3777 }
3778 });
3779
3780 $self->{multiplexer}->connect (c_remove => sub {
3781 my ($mplex, $widgets) = @_;
3782
3783 for my $child (@$widgets) {
3784 $wself->{buttonbar}->remove ($child->{c_tab_});
3785 }
3786 });
3787 }
3788
3790 $self 3789 $self
3791} 3790}
3792 3791
3793sub add { 3792sub add {
3793 my ($self, @widgets) = @_;
3794
3795 $self->{multiplexer}->add (@widgets)
3796}
3797
3798sub remove {
3799 my ($self, @widgets) = @_;
3800
3801 $self->{multiplexer}->remove (@widgets)
3802}
3803
3804sub add_tab {
3794 my ($self, $title, $widget, $tooltip) = @_; 3805 my ($self, $title, $widget, $tooltip) = @_;
3795 3806
3796 CFPlus::weaken $self; 3807 $title = [$title, $tooltip] unless ref $title;
3808 $widget->{c_tab} = $title;
3797 3809
3798 $self->{buttonbar}->add (new CFPlus::UI::Button
3799 markup => $title,
3800 tooltip => $tooltip,
3801 on_activate => sub { $self->set_current_page ($widget) },
3802 );
3803
3804 $self->{multiplexer}->add ($widget); 3810 $self->add ($widget);
3805} 3811}
3806 3812
3807sub get_current_page { 3813sub get_current_page {
3808 my ($self) = @_; 3814 my ($self) = @_;
3809 3815
… …
4139 while ($self->{refresh_hook}) { 4145 while ($self->{refresh_hook}) {
4140 $_->() 4146 $_->()
4141 for values %{delete $self->{refresh_hook}}; 4147 for values %{delete $self->{refresh_hook}};
4142 } 4148 }
4143 4149
4144 if ($self->{realloc}) { 4150 while ($self->{realloc}) {
4145 my %queue; 4151 my %queue;
4146 my @queue; 4152 my @queue;
4147 my $widget; 4153 my $widget;
4148 4154
4149 outer: 4155 outer:
… …
4196 } 4202 }
4197 } 4203 }
4198 4204
4199 delete $self->{realloc}{$widget+0}; 4205 delete $self->{realloc}{$widget+0};
4200 } 4206 }
4201 }
4202 4207
4203 while (my $size_alloc = delete $self->{size_alloc}) { 4208 while (my $size_alloc = delete $self->{size_alloc}) {
4204 my @queue = sort { $b->{visible} <=> $a->{visible} } 4209 my @queue = sort { $a->{visible} <=> $b->{visible} }
4205 values %$size_alloc; 4210 values %$size_alloc;
4206 4211
4207 while () { 4212 while () {
4208 my $widget = pop @queue || last; 4213 my $widget = pop @queue || last;
4209 4214
4210 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4215 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4211 4216
4212 $w = 0 if $w < 0;
4213 $h = 0 if $h < 0;
4214
4215 $w = max $widget->{min_w}, $w; 4217 $w = max $widget->{min_w}, $w;
4216 $h = max $widget->{min_h}, $h; 4218 $h = max $widget->{min_h}, $h;
4217 4219
4218# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4220# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4219# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4221# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4220 4222
4221 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4223 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4222 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4224 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4223 4225
4224 $w = int $w + 0.5; 4226 $w = int $w + 0.5;
4225 $h = int $h + 0.5; 4227 $h = int $h + 0.5;
4226 4228
4227 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4229 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4228 $widget->{old_w} = $widget->{w}; 4230 $widget->{old_w} = $widget->{w};
4229 $widget->{old_h} = $widget->{h}; 4231 $widget->{old_h} = $widget->{h};
4230 4232
4231 $widget->{w} = $w; 4233 $widget->{w} = $w;
4232 $widget->{h} = $h; 4234 $widget->{h} = $h;
4233 4235
4234 $widget->emit (size_allocate => $w, $h); 4236 $widget->emit (size_allocate => $w, $h);
4237 }
4235 } 4238 }
4236 } 4239 }
4237 } 4240 }
4238 4241
4239 while ($self->{post_alloc_hook}) { 4242 while ($self->{post_alloc_hook}) {

Diff Legend

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