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.399 by root, Sat Jul 21 16:07:53 2007 UTC vs.
Revision 1.422 by root, Thu Aug 2 14:35:21 2007 UTC

… …
273 $self->emit ("destroy"); 273 $self->emit ("destroy");
274 %$self = (); 274 %$self = ();
275} 275}
276 276
277sub TO_JSON { 277sub TO_JSON {
278 { __widget_ref__ => $_[0]{s_id} } 278 { __w_ => $_[0]{s_id} }
279} 279}
280 280
281sub show { 281sub show {
282 my ($self) = @_; 282 my ($self) = @_;
283 283
… …
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
… …
770 @{$self->{children}}, @widgets 725 @{$self->{children}}, @widgets
771 ]; 726 ];
772 727
773 $self->realloc; 728 $self->realloc;
774 729
730 $self->emit (c_add => \@widgets);
731
775 map $_+0, @widgets 732 map $_+0, @widgets
776} 733}
777 734
778sub children { 735sub children {
779 @{ $_[0]{children} } 736 @{ $_[0]{children} }
780} 737}
781 738
782sub remove { 739sub remove {
783 my ($self, $child) = @_; 740 my ($self, @widgets) = @_;
784 741
742 $self->emit (c_remove => \@widgets);
743
744 for my $child (@widgets) {
785 delete $child->{parent}; 745 delete $child->{parent};
786 $child->hide; 746 $child->hide;
787
788 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 747 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
748 }
789 749
790 $self->realloc; 750 $self->realloc;
791} 751}
792 752
793sub clear { 753sub clear {
… …
821} 781}
822 782
823sub _draw { 783sub _draw {
824 my ($self) = @_; 784 my ($self) = @_;
825 785
826 $_->draw for @{$self->{children}}; 786 $_->draw for $self->visible_children;
827} 787}
828 788
829############################################################################# 789#############################################################################
830 790
831package CFPlus::UI::Bin; 791package CFPlus::UI::Bin;
… …
841} 801}
842 802
843sub add { 803sub add {
844 my ($self, $child) = @_; 804 my ($self, $child) = @_;
845 805
846 $self->SUPER::remove ($_) for @{ $self->{children} }; 806 $self->clear;
847 $self->SUPER::add ($child); 807 $self->SUPER::add ($child);
848} 808}
849 809
850sub remove { 810sub remove {
851 my ($self, $widget) = @_; 811 my ($self, $widget) = @_;
… …
993 $self->{view_x} = $x; 953 $self->{view_x} = $x;
994 $self->{view_y} = $y; 954 $self->{view_y} = $y;
995 955
996 $self->emit (changed => $x, $y); 956 $self->emit (changed => $x, $y);
997 $self->update; 957 $self->update;
958 }
959}
960
961sub set_center {
962 my ($self, $x, $y) = @_;
963
964 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
965}
966
967sub make_visible {
968 my ($self, $x, $y, $border) = @_;
969
970 if ( $x < $self->{view_x} + $self->{w} * $border
971 || $x > $self->{view_x} + $self->{w} * (1 - $border)
972 || $y < $self->{view_y} + $self->{h} * $border
973 || $y > $self->{view_y} + $self->{h} * (1 - $border)
974 ) {
975 $self->set_center ($x, $y);
998 } 976 }
999} 977}
1000 978
1001# hmm, this does not work for topleft of $self... but we should not ask for that 979# hmm, this does not work for topleft of $self... but we should not ask for that
1002sub coord2local { 980sub coord2local {
… …
1049 my $child = delete $arg{child}; 1027 my $child = delete $arg{child};
1050 1028
1051 my $self; 1029 my $self;
1052 1030
1053 my $hslider = new CFPlus::UI::Slider 1031 my $hslider = new CFPlus::UI::Slider
1054 col => 0, 1032 c_col => 0,
1055 row => 1, 1033 c_row => 1,
1056 vertical => 0, 1034 vertical => 0,
1057 range => [0, 0, 1, 0.01], # HACK fix 1035 range => [0, 0, 1, 0.01], # HACK fix
1058 on_changed => sub { 1036 on_changed => sub {
1059 $self->{hpos} = $_[1]; 1037 $self->{hpos} = $_[1];
1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1038 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1061 }, 1039 },
1062 ; 1040 ;
1063 1041
1064 my $vslider = new CFPlus::UI::Slider 1042 my $vslider = new CFPlus::UI::Slider
1065 col => 1, 1043 c_col => 1,
1066 row => 0, 1044 c_row => 0,
1067 vertical => 1, 1045 vertical => 1,
1068 range => [0, 0, 1, 0.01], # HACK fix 1046 range => [0, 0, 1, 0.01], # HACK fix
1069 on_changed => sub { 1047 on_changed => sub {
1070 $self->{vpos} = $_[1]; 1048 $self->{vpos} = $_[1];
1071 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1049 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1082 row_expand => [1, 0], 1060 row_expand => [1, 0],
1083 %arg, 1061 %arg,
1084 ); 1062 );
1085 1063
1086 $self->{vp} = new CFPlus::UI::ViewPort 1064 $self->{vp} = new CFPlus::UI::ViewPort
1087 col => 0, 1065 c_col => 0,
1088 row => 0, 1066 c_row => 0,
1089 expand => 1, 1067 expand => 1,
1090 scroll_x => $self->{scroll_x}, 1068 scroll_x => $self->{scroll_x},
1091 scroll_y => $self->{scroll_y}, 1069 scroll_y => $self->{scroll_y},
1092 on_changed => sub { 1070 on_changed => sub {
1093 my ($vp, $x, $y) = @_; 1071 my ($vp, $x, $y) = @_;
… …
1095 $vp->{parent}{hslider}->set_value ($x); 1073 $vp->{parent}{hslider}->set_value ($x);
1096 $vp->{parent}{vslider}->set_value ($y); 1074 $vp->{parent}{vslider}->set_value ($y);
1097 1075
1098 0 1076 0
1099 }, 1077 },
1078 on_size_allocate => sub {
1079 my ($vp, $w, $h) = @_;
1080 $vp->{parent}->update_slider;
1081 0
1082 },
1100 ; 1083 ;
1101 1084
1102 $self->SUPER::add ($self->{vp}); 1085 $self->SUPER::add ($self->{vp});
1103 1086
1104 $self->add ($child) if $child; 1087 $self->add ($child) if $child;
… …
1110 my ($self, $widget) = @_; 1093 my ($self, $widget) = @_;
1111 1094
1112 $self->{vp}->add ($self->{child} = $widget); 1095 $self->{vp}->add ($self->{child} = $widget);
1113} 1096}
1114 1097
1098sub set_offset { shift->{vp}->set_offset (@_) }
1099sub set_center { shift->{vp}->set_center (@_) }
1100sub make_visible { shift->{vp}->make_visible (@_) }
1101
1115sub update_slider { 1102sub update_slider {
1116 my ($self) = @_; 1103 my ($self) = @_;
1117 1104
1118 my $child = ($self->{vp} or return)->child; 1105 my $child = ($self->{vp} or return)->child;
1119 1106
1107 if ($self->{scroll_x}) {
1120 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1108 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1121 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); 1109 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1122 1110
1123 my $visible = $w1 > $w2; 1111 my $visible = $w1 > $w2;
1124 if ($visible != $self->{hslider_visible}) { 1112 if ($visible != $self->{hslider_visible}) {
1125 $self->{hslider_visible} = $visible; 1113 $self->{hslider_visible} = $visible;
1126 $visible ? $self->SUPER::add ($self->{hslider}) 1114 $visible ? $self->SUPER::add ($self->{hslider})
1127 : $self->SUPER::remove ($self->{hslider}); 1115 : $self->SUPER::remove ($self->{hslider});
1116 }
1128 } 1117 }
1129 1118
1119 if ($self->{scroll_y}) {
1130 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1120 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1131 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); 1121 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1132 1122
1133 my $visible = $h1 > $h2; 1123 my $visible = $h1 > $h2;
1134 if ($visible != $self->{vslider_visible}) { 1124 if ($visible != $self->{vslider_visible}) {
1135 $self->{vslider_visible} = $visible; 1125 $self->{vslider_visible} = $visible;
1136 $visible ? $self->SUPER::add ($self->{vslider}) 1126 $visible ? $self->SUPER::add ($self->{vslider})
1137 : $self->SUPER::remove ($self->{vslider}); 1127 : $self->SUPER::remove ($self->{vslider});
1128 }
1138 } 1129 }
1139} 1130}
1140 1131
1141sub start_dragging { 1132sub start_dragging {
1142 my ($self, $ev) = @_; 1133 my ($self, $ev) = @_;
… …
1607 1598
1608sub add { 1599sub add {
1609 my ($self, @widgets) = @_; 1600 my ($self, @widgets) = @_;
1610 1601
1611 for my $child (@widgets) { 1602 for my $child (@widgets) {
1612 $child->{rowspan} ||= 1; 1603 $child->{c_rowspan} ||= 1;
1613 $child->{colspan} ||= 1; 1604 $child->{c_colspan} ||= 1;
1614 } 1605 }
1615 1606
1616 $self->SUPER::add (@widgets); 1607 $self->SUPER::add (@widgets);
1617} 1608}
1618 1609
… …
1622 my @widgets; 1613 my @widgets;
1623 1614
1624 while (@_) { 1615 while (@_) {
1625 my ($col, $row, $child) = splice @_, 0, 3, (); 1616 my ($col, $row, $child) = splice @_, 0, 3, ();
1626 1617
1627 $child->{row} = $row; 1618 $child->{c_row} = $row;
1628 $child->{col} = $col; 1619 $child->{c_col} = $col;
1629 1620
1630 push @widgets, $child; 1621 push @widgets, $child;
1631 } 1622 }
1632 1623
1633 $self->add (@widgets); 1624 $self->add (@widgets);
… …
1639 my (@w, @h); 1630 my (@w, @h);
1640 1631
1641 my @children = $self->children; 1632 my @children = $self->children;
1642 1633
1643 # first pass, columns 1634 # first pass, columns
1644 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) { 1635 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1645 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; 1636 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1646 1637
1647 my $sw = sum @w[$c .. $c + $cs - 1]; 1638 my $sw = sum @w[$c .. $c + $cs - 1];
1648 1639
1649 if ($w > $sw) { 1640 if ($w > $sw) {
1650 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; 1641 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1651 } 1642 }
1652 } 1643 }
1653 1644
1654 # second pass, rows 1645 # second pass, rows
1655 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { 1646 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1656 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; 1647 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1657 1648
1658 my $sh = sum @h[$r .. $r + $rs - 1]; 1649 my $sh = sum @h[$r .. $r + $rs - 1];
1659 1650
1660 if ($h > $sh) { 1651 if ($h > $sh) {
1661 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; 1652 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
… …
1703 1694
1704 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } 1695 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1705 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } 1696 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1706 1697
1707 for my $widget ($self->children) { 1698 for my $widget ($self->children) {
1708 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)}; 1699 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1709 1700
1710 $widget->configure ( 1701 $widget->configure (
1711 $x[$c], $y[$r], 1702 $x[$c], $y[$r],
1712 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r], 1703 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1713 ); 1704 );
… …
1722 1713
1723use List::Util qw(min max); 1714use List::Util qw(min max);
1724 1715
1725our @ISA = CFPlus::UI::Container::; 1716our @ISA = CFPlus::UI::Container::;
1726 1717
1727sub add {
1728 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1729
1730 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1731 $self->SUPER::add ($child);
1732}
1733
1734sub _scale($$$) { 1718sub _scale($$$) {
1735 my ($mode, $val, $max) = @_; 1719 my ($rel, $val, $max) = @_;
1736 1720
1737 $mode eq "abs" ? $val 1721 $rel ? $val * $max : $val
1738 : $mode eq "rel" ? $val * $max
1739 : 0
1740} 1722}
1741 1723
1742sub size_request { 1724sub size_request {
1743 my ($self) = @_; 1725 my ($self) = @_;
1744 1726
1745 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1727 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1746 1728
1747 # determine overall size by querying abs widgets 1729 # determine overall size by querying abs widgets
1748 for my $child ($self->visible_children) { 1730 for my $child ($self->visible_children) {
1749 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1731 unless ($child->{c_rel}) {
1732 my $x = $child->{c_x};
1733 my $y = $child->{c_y};
1750 1734
1751 if ($pos eq "abs") {
1752 $w = _scale $size, $w, $child->{req_w};
1753 $h = _scale $size, $h, $child->{req_h};
1754
1755 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1735 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1756 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1736 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1757 } 1737 }
1758 } 1738 }
1759 1739
1760 my $W = $x2 - $x1; 1740 my $W = $x2 - $x1;
1761 my $H = $y2 - $y1; 1741 my $H = $y2 - $y1;
1762 1742
1763 # now layout remaining widgets 1743 # now layout remaining widgets
1764 for my $child ($self->visible_children) { 1744 for my $child ($self->visible_children) {
1765 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1745 if ($child->{c_rel}) {
1746 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1747 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1766 1748
1767 if ($pos ne "abs") {
1768 $x = _scale $pos, $x, $W;
1769 $y = _scale $pos, $x, $H;
1770 $w = _scale $size, $w, $child->{req_w};
1771 $h = _scale $size, $h, $child->{req_h};
1772
1773 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1749 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1774 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1750 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1775 } 1751 }
1776 } 1752 }
1777 1753
1778 my $W = $x2 - $x1; 1754 my $W = $x2 - $x1;
1779 my $H = $y2 - $y1; 1755 my $H = $y2 - $y1;
… …
1783 1759
1784sub invoke_size_allocate { 1760sub invoke_size_allocate {
1785 my ($self, $W, $H) = @_; 1761 my ($self, $W, $H) = @_;
1786 1762
1787 for my $child ($self->visible_children) { 1763 for my $child ($self->visible_children) {
1788 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1764 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1765 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1789 1766
1790 $x = _scale $pos, $x, $W; 1767 $x += $child->{c_halign} * $child->{req_w};
1791 $y = _scale $pos, $x, $H; 1768 $y += $child->{c_valign} * $child->{req_h};
1792 $w = _scale $size, $w, $child->{req_w};
1793 $h = _scale $size, $h, $child->{req_h};
1794 1769
1795 $child->configure ($x, $y, $w, $h); 1770 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1796 } 1771 }
1797 1772
1798 1 1773 1
1799} 1774}
1800 1775
… …
1804 1779
1805our @ISA = CFPlus::UI::Container::; 1780our @ISA = CFPlus::UI::Container::;
1806 1781
1807sub size_request { 1782sub size_request {
1808 my ($self) = @_; 1783 my ($self) = @_;
1784
1785 my @children = $self->visible_children;
1809 1786
1810 $self->{vertical} 1787 $self->{vertical}
1811 ? ( 1788 ? (
1812 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1789 (List::Util::max map $_->{req_w}, @children),
1813 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1790 (List::Util::sum map $_->{req_h}, @children),
1814 ) 1791 )
1815 : ( 1792 : (
1816 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1793 (List::Util::sum map $_->{req_w}, @children),
1817 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1794 (List::Util::max map $_->{req_h}, @children),
1818 ) 1795 )
1819} 1796}
1820 1797
1821sub invoke_size_allocate { 1798sub invoke_size_allocate {
1822 my ($self, $w, $h) = @_; 1799 my ($self, $w, $h) = @_;
… …
1946 1923
1947 delete $self->{ox}; 1924 delete $self->{ox};
1948 $self->SUPER::realloc; 1925 $self->SUPER::realloc;
1949} 1926}
1950 1927
1928sub clear {
1929 my ($self) = @_;
1930
1931 $self->set_text ("");
1932}
1933
1951sub set_text { 1934sub set_text {
1952 my ($self, $text) = @_; 1935 my ($self, $text) = @_;
1953 1936
1954 return if $self->{text} eq "T$text"; 1937 return if $self->{text} eq "T$text";
1955 $self->{text} = "T$text"; 1938 $self->{text} = "T$text";
… …
2063 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2046 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2064 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2047 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2065 : ($self->{h} - $size->[1]) * 0.5); 2048 : ($self->{h} - $size->[1]) * 0.5);
2066 }; 2049 };
2067 2050
2068 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2051# unless ($self->{list}) {
2069 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2052# $self->{list} = CFPlus::OpenGL::glGenList;
2053# CFPlus::OpenGL::glNewList $self->{list};
2054# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2055# CFPlus::OpenGL::glEndList;
2056# }
2057#
2058# CFPlus::OpenGL::glCallList $self->{list};
2070 2059
2071 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2060 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2072} 2061}
2062
2063#sub destroy {
2064# my ($self) = @_;
2065#
2066# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2067#
2068# $self->SUPER::destroy;
2069#}
2073 2070
2074############################################################################# 2071#############################################################################
2075 2072
2076package CFPlus::UI::EntryBase; 2073package CFPlus::UI::EntryBase;
2077 2074
… …
2083 my $class = shift; 2080 my $class = shift;
2084 2081
2085 $class->SUPER::new ( 2082 $class->SUPER::new (
2086 fg => [1, 1, 1], 2083 fg => [1, 1, 1],
2087 bg => [0, 0, 0, 0.2], 2084 bg => [0, 0, 0, 0.2],
2085 outline => [0.6, 0.3, 0.1],
2088 active_bg => [1, 1, 1, 0.5], 2086 active_bg => [0, 0, 1, .2],
2089 active_fg => [0, 0, 0], 2087 active_fg => [1, 1, 1],
2088 active_outline => [1, 1, 0],
2090 can_hover => 1, 2089 can_hover => 1,
2091 can_focus => 1, 2090 can_focus => 1,
2092 valign => 0, 2091 valign => 0,
2093 can_events => 1, 2092 can_events => 1,
2094 ellipsise => 0, 2093 ellipsise => 0,
… …
2251 2250
2252 unless (exists $self->{cur_h}) { 2251 unless (exists $self->{cur_h}) {
2253 my $text = substr $self->{text}, 0, $self->{cursor}; 2252 my $text = substr $self->{text}, 0, $self->{cursor};
2254 utf8::encode $text; 2253 utf8::encode $text;
2255 2254
2256 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2255 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2257 } 2256 }
2258 2257
2258 glColor_premultiply @{$self->{active_fg}};
2259 glBegin GL_LINES; 2259 glBegin GL_LINES;
2260 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2260 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
2261 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2261 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2262 glEnd;
2263
2264 glLineWidth 3;
2265 glColor @{$self->{active_outline}};
2266 glBegin GL_LINE_LOOP;
2267 glVertex 0, 0;
2268 glVertex $self->{w} - 1, 0;
2269 glVertex $self->{w} - 1, $self->{h} - 1;
2270 glVertex 0, $self->{h} - 1;
2271 glEnd;
2272 glLineWidth 1;
2273
2274 } else {
2275 glColor @{$self->{outline}};
2276 glTranslate .375, .375;
2277 glBegin GL_LINE_STRIP;
2278 glVertex 0, $self->{h} * .5;
2279 glVertex 0, $self->{h} - 3;
2280 glVertex $self->{w} - 1, $self->{h} - 3;
2281 glVertex $self->{w} - 1, $self->{h} * .5;
2262 glEnd; 2282 glEnd;
2263 } 2283 }
2264} 2284}
2265 2285
2266############################################################################# 2286#############################################################################
… …
2353 1 2373 1
2354} 2374}
2355 2375
2356############################################################################# 2376#############################################################################
2357 2377
2378package CFPlus::UI::ButtonBin;
2379
2380our @ISA = CFPlus::UI::Bin::;
2381
2382use CFPlus::OpenGL;
2383
2384my @tex =
2385 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2386 qw(b1_button_inactive.png b1_button_active.png);
2387
2388sub new {
2389 my $class = shift;
2390
2391 $class->SUPER::new (
2392 can_hover => 1,
2393 align => 0,
2394 valign => 0,
2395 can_events => 1,
2396 @_
2397 )
2398}
2399
2400sub invoke_button_up {
2401 my ($self, $ev, $x, $y) = @_;
2402
2403 $self->emit ("activate")
2404 if $x >= 0 && $x < $self->{w}
2405 && $y >= 0 && $y < $self->{h};
2406
2407 1
2408}
2409
2410sub _draw {
2411 my ($self) = @_;
2412
2413 glEnable GL_TEXTURE_2D;
2414 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2415 glColor 0, 0, 0, 1;
2416
2417 my $tex = $tex[$GRAB == $self];
2418 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2419
2420 glDisable GL_TEXTURE_2D;
2421
2422 $self->SUPER::_draw;
2423}
2424
2425#############################################################################
2426
2358package CFPlus::UI::Button; 2427package CFPlus::UI::Button;
2359 2428
2360our @ISA = CFPlus::UI::Label::; 2429our @ISA = CFPlus::UI::Label::;
2361 2430
2362use CFPlus::OpenGL; 2431use CFPlus::OpenGL;
… …
2496sub new { 2565sub new {
2497 my $class = shift; 2566 my $class = shift;
2498 2567
2499 my $self = $class->SUPER::new ( 2568 my $self = $class->SUPER::new (
2500 can_events => 0, 2569 can_events => 0,
2570 scale => 1,
2501 @_, 2571 @_,
2502 ); 2572 );
2503 2573
2504 $self->{path} || $self->{tex} 2574 $self->{path} || $self->{tex}
2505 or Carp::croak "'path' or 'tex' attributes required"; 2575 or Carp::croak "'path' or 'tex' attributes required";
… …
2530} 2600}
2531 2601
2532sub size_request { 2602sub size_request {
2533 my ($self) = @_; 2603 my ($self) = @_;
2534 2604
2535 ($self->{tex}{w}, $self->{tex}{h}) 2605 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2536} 2606}
2537 2607
2538sub _draw { 2608sub _draw {
2539 my ($self) = @_; 2609 my ($self) = @_;
2540 2610
… …
2550 } 2620 }
2551 2621
2552 glEnable GL_TEXTURE_2D; 2622 glEnable GL_TEXTURE_2D;
2553 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2623 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2554 2624
2555 $tex->draw_quad (0, 0, $w, $h); 2625 $tex->draw_quad_alpha (0, 0, $w, $h);
2556 2626
2557 glDisable GL_TEXTURE_2D; 2627 glDisable GL_TEXTURE_2D;
2558} 2628}
2559 2629
2560############################################################################# 2630#############################################################################
… …
2862 2932
2863 $self->SUPER::invoke_button_down ($ev, $x, $y); 2933 $self->SUPER::invoke_button_down ($ev, $x, $y);
2864 2934
2865 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2935 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2866 2936
2867 $self->invoke_mouse_motion ($ev, $x, $y) 2937 $self->invoke_mouse_motion ($ev, $x, $y);
2938
2939 1
2868} 2940}
2869 2941
2870sub invoke_mouse_motion { 2942sub invoke_mouse_motion {
2871 my ($self, $ev, $x, $y) = @_; 2943 my ($self, $ev, $x, $y) = @_;
2872 2944
… …
2892 2964
2893 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 2965 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2894 2966
2895 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 2967 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2896 2968
2897 ! ! $delta 2969 1
2898} 2970}
2899 2971
2900sub update { 2972sub update {
2901 my ($self) = @_; 2973 my ($self) = @_;
2902 2974
… …
3033} 3105}
3034 3106
3035sub size_request { 3107sub size_request {
3036 my ($self) = @_; 3108 my ($self) = @_;
3037 3109
3038 my ($empty, $slider) = @{ $self->{children} }; 3110 my ($empty, $slider) = $self->visible_children;
3039 3111
3040 local $self->{children} = [$empty, $slider]; 3112 local $self->{children} = [$empty, $slider];
3041 $self->SUPER::size_request 3113 $self->SUPER::size_request
3042} 3114}
3043 3115
… …
3432 glTranslate 0.375, 0.375; 3504 glTranslate 0.375, 0.375;
3433 3505
3434 my ($w, $h) = @$self{qw(w h)}; 3506 my ($w, $h) = @$self{qw(w h)};
3435 3507
3436 glColor 1, 0.8, 0.4; 3508 glColor 1, 0.8, 0.4;
3437 glBegin GL_QUADS; 3509 glRect 0, 0, $w, $h;
3438 glVertex 0 , 0;
3439 glVertex 0 , $h;
3440 glVertex $w, $h;
3441 glVertex $w, 0;
3442 glEnd;
3443 3510
3444 glColor 0, 0, 0; 3511 glColor 0, 0, 0;
3445 glBegin GL_LINE_LOOP; 3512 glBegin GL_LINE_LOOP;
3446 glVertex 0 , 0; 3513 glVertex 0 , 0;
3447 glVertex 0 , $h; 3514 glVertex 0 , $h;
… …
3475 3542
3476 if ($self->{anim} && $self->{animspeed}) { 3543 if ($self->{anim} && $self->{animspeed}) {
3477 CFPlus::weaken (my $widget = $self); 3544 CFPlus::weaken (my $widget = $self);
3478 3545
3479 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3546 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3480 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed}; 3547 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3481 $self->{timer} = Event->timer ( 3548 $self->{timer} = Event->timer (
3482 parked => 1, 3549 parked => 1,
3483 cb => sub { 3550 cb => sub {
3484 return unless $::CONN && $widget; 3551 return unless $::CONN && $widget;
3485 3552
… …
3522 3589
3523 if (my $anim = $::CONN->{anim}[$self->{anim}]) { 3590 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3524 if ($anim && @$anim) { 3591 if ($anim && @$anim) {
3525 delete $self->{wait_face}; 3592 delete $self->{wait_face};
3526 $self->{face} = $anim->[ $self->{frame} % @$anim ]; 3593 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3594 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3527 } 3595 }
3528 } 3596 }
3529} 3597}
3530 3598
3531sub size_request { 3599sub size_request {
3532 my ($self) = @_; 3600 my ($self) = @_;
3533 3601
3534 if ($::CONN) { 3602 if ($::CONN) {
3535 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3603 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3536 if (my $tex = $::CONN->{texture}[$faceid]) { 3604 if (my $tex = $::CONN->{texture}[$faceid]) {
3605 $self->{tex} = $tex;
3537 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3606 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3538 } else { 3607 } else {
3539 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3608 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3540 $self->realloc; 3609 $self->realloc;
3541 }); 3610 });
… …
3563} 3632}
3564 3633
3565sub _draw { 3634sub _draw {
3566 my ($self) = @_; 3635 my ($self) = @_;
3567 3636
3568 return unless $::CONN;
3569
3570 $self->SUPER::_draw; 3637 $self->SUPER::_draw;
3571 3638
3572 my $faceid = $::CONN->{faceid}[$self->{face}] 3639 if (my $tex = $self->{tex}) {
3573 or return;
3574
3575 my $tex = $::CONN->{texture}[$faceid];
3576
3577 if ($tex) {
3578 glEnable GL_TEXTURE_2D; 3640 glEnable GL_TEXTURE_2D;
3579 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3580 glColor 0, 0, 0, 1; 3642 glColor 0, 0, 0, 1;
3581 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3643 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3582 glDisable GL_TEXTURE_2D; 3644 glDisable GL_TEXTURE_2D;
… …
3634 children => [ 3696 children => [
3635 (new CFPlus::UI::Label markup => $left, expand => 1), 3697 (new CFPlus::UI::Label markup => $left, expand => 1),
3636 (new CFPlus::UI::Label markup => $right, align => +1), 3698 (new CFPlus::UI::Label markup => $right, align => +1),
3637 ], 3699 ],
3638 ; 3700 ;
3639 3701
3640 } else { 3702 } else {
3641 $widget = new CFPlus::UI::Label 3703 $widget = new CFPlus::UI::Label
3642 can_hover => 1, 3704 can_hover => 1,
3643 can_events => 1, 3705 can_events => 1,
3644 markup => $widget, 3706 markup => $widget,
… …
3780 buttonbar => (new CFPlus::UI::Buttonbar), 3842 buttonbar => (new CFPlus::UI::Buttonbar),
3781 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3843 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3782 # filter => # will be put between multiplexer and $self 3844 # filter => # will be put between multiplexer and $self
3783 @_, 3845 @_,
3784 ); 3846 );
3785 3847
3786 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3848 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3787 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3849 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3788 3850
3851 {
3852 Scalar::Util::weaken (my $wself = $self);
3853
3854 $self->{multiplexer}->connect (c_add => sub {
3855 my ($mplex, $widgets) = @_;
3856
3857 for my $child (@$widgets) {
3858 Scalar::Util::weaken $child;
3859 $child->{c_tab_} ||= do {
3860 my $tab =
3861 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3862 ? $child->{c_tab}
3863 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3864
3865 $tab->connect (activate => sub {
3866 $wself->set_current_page ($child);
3867 });
3868
3869 $tab
3870 };
3871
3872 $self->{buttonbar}->add ($child->{c_tab_});
3873 }
3874 });
3875
3876 $self->{multiplexer}->connect (c_remove => sub {
3877 my ($mplex, $widgets) = @_;
3878
3879 for my $child (@$widgets) {
3880 $wself->{buttonbar}->remove ($child->{c_tab_});
3881 }
3882 });
3883 }
3884
3789 $self 3885 $self
3790} 3886}
3791 3887
3792sub add { 3888sub add {
3889 my ($self, @widgets) = @_;
3890
3891 $self->{multiplexer}->add (@widgets)
3892}
3893
3894sub remove {
3895 my ($self, @widgets) = @_;
3896
3897 $self->{multiplexer}->remove (@widgets)
3898}
3899
3900sub pages {
3901 my ($self) = @_;
3902 $self->{multiplexer}->children
3903}
3904
3905sub add_tab {
3793 my ($self, $title, $widget, $tooltip) = @_; 3906 my ($self, $title, $widget, $tooltip) = @_;
3794 3907
3795 CFPlus::weaken $self; 3908 $title = [$title, $tooltip] unless ref $title;
3909 $widget->{c_tab} = $title;
3796 3910
3797 $self->{buttonbar}->add (new CFPlus::UI::Button
3798 markup => $title,
3799 tooltip => $tooltip,
3800 on_activate => sub { $self->set_current_page ($widget) },
3801 );
3802
3803 $self->{multiplexer}->add ($widget); 3911 $self->add ($widget);
3804} 3912}
3805 3913
3806sub get_current_page { 3914sub get_current_page {
3807 my ($self) = @_; 3915 my ($self) = @_;
3808 3916
… …
4138 while ($self->{refresh_hook}) { 4246 while ($self->{refresh_hook}) {
4139 $_->() 4247 $_->()
4140 for values %{delete $self->{refresh_hook}}; 4248 for values %{delete $self->{refresh_hook}};
4141 } 4249 }
4142 4250
4143 if ($self->{realloc}) { 4251 while ($self->{realloc}) {
4144 my %queue; 4252 my %queue;
4145 my @queue; 4253 my @queue;
4146 my $widget; 4254 my $widget;
4147 4255
4148 outer: 4256 outer:
… …
4195 } 4303 }
4196 } 4304 }
4197 4305
4198 delete $self->{realloc}{$widget+0}; 4306 delete $self->{realloc}{$widget+0};
4199 } 4307 }
4200 }
4201 4308
4202 while (my $size_alloc = delete $self->{size_alloc}) { 4309 while (my $size_alloc = delete $self->{size_alloc}) {
4203 my @queue = sort { $b->{visible} <=> $a->{visible} } 4310 my @queue = sort { $a->{visible} <=> $b->{visible} }
4204 values %$size_alloc; 4311 values %$size_alloc;
4205 4312
4206 while () { 4313 while () {
4207 my $widget = pop @queue || last; 4314 my $widget = pop @queue || last;
4208 4315
4209 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4316 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4210 4317
4211 $w = 0 if $w < 0;
4212 $h = 0 if $h < 0;
4213
4214 $w = max $widget->{min_w}, $w; 4318 $w = max $widget->{min_w}, $w;
4215 $h = max $widget->{min_h}, $h; 4319 $h = max $widget->{min_h}, $h;
4216 4320
4217# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4321# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4218# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4322# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4219 4323
4220 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4324 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4221 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4325 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4222 4326
4223 $w = int $w + 0.5; 4327 $w = int $w + 0.5;
4224 $h = int $h + 0.5; 4328 $h = int $h + 0.5;
4225 4329
4226 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4330 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4227 $widget->{old_w} = $widget->{w}; 4331 $widget->{old_w} = $widget->{w};
4228 $widget->{old_h} = $widget->{h}; 4332 $widget->{old_h} = $widget->{h};
4229 4333
4230 $widget->{w} = $w; 4334 $widget->{w} = $w;
4231 $widget->{h} = $h; 4335 $widget->{h} = $h;
4232 4336
4233 $widget->emit (size_allocate => $w, $h); 4337 $widget->emit (size_allocate => $w, $h);
4338 }
4234 } 4339 }
4235 } 4340 }
4236 } 4341 }
4237 4342
4238 while ($self->{post_alloc_hook}) { 4343 while ($self->{post_alloc_hook}) {

Diff Legend

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