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.402 by root, Sat Jul 21 20:49:44 2007 UTC vs.
Revision 1.429 by root, Tue Aug 21 00:59:34 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";
… …
769 @{$self->{children}}, @widgets 725 @{$self->{children}}, @widgets
770 ]; 726 ];
771 727
772 $self->realloc; 728 $self->realloc;
773 729
730 $self->emit (c_add => \@widgets);
731
774 map $_+0, @widgets 732 map $_+0, @widgets
775} 733}
776 734
777sub children { 735sub children {
778 @{ $_[0]{children} } 736 @{ $_[0]{children} }
779} 737}
780 738
781sub remove { 739sub remove {
782 my ($self, $child) = @_; 740 my ($self, @widgets) = @_;
783 741
742 $self->emit (c_remove => \@widgets);
743
744 for my $child (@widgets) {
784 delete $child->{parent}; 745 delete $child->{parent};
785 $child->hide; 746 $child->hide;
786
787 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 747 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
748 }
788 749
789 $self->realloc; 750 $self->realloc;
790} 751}
791 752
792sub clear { 753sub clear {
… …
820} 781}
821 782
822sub _draw { 783sub _draw {
823 my ($self) = @_; 784 my ($self) = @_;
824 785
825 $_->draw for @{$self->{children}}; 786 $_->draw for $self->visible_children;
826} 787}
827 788
828############################################################################# 789#############################################################################
829 790
830package CFPlus::UI::Bin; 791package CFPlus::UI::Bin;
… …
840} 801}
841 802
842sub add { 803sub add {
843 my ($self, $child) = @_; 804 my ($self, $child) = @_;
844 805
845 $self->SUPER::remove ($_) for @{ $self->{children} }; 806 $self->clear;
846 $self->SUPER::add ($child); 807 $self->SUPER::add ($child);
847} 808}
848 809
849sub remove { 810sub remove {
850 my ($self, $widget) = @_; 811 my ($self, $widget) = @_;
… …
992 $self->{view_x} = $x; 953 $self->{view_x} = $x;
993 $self->{view_y} = $y; 954 $self->{view_y} = $y;
994 955
995 $self->emit (changed => $x, $y); 956 $self->emit (changed => $x, $y);
996 $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);
997 } 976 }
998} 977}
999 978
1000# 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
1001sub coord2local { 980sub coord2local {
… …
1048 my $child = delete $arg{child}; 1027 my $child = delete $arg{child};
1049 1028
1050 my $self; 1029 my $self;
1051 1030
1052 my $hslider = new CFPlus::UI::Slider 1031 my $hslider = new CFPlus::UI::Slider
1053 col => 0, 1032 c_col => 0,
1054 row => 1, 1033 c_row => 1,
1055 vertical => 0, 1034 vertical => 0,
1056 range => [0, 0, 1, 0.01], # HACK fix 1035 range => [0, 0, 1, 0.01], # HACK fix
1057 on_changed => sub { 1036 on_changed => sub {
1058 $self->{hpos} = $_[1]; 1037 $self->{hpos} = $_[1];
1059 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1038 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1060 }, 1039 },
1061 ; 1040 ;
1062 1041
1063 my $vslider = new CFPlus::UI::Slider 1042 my $vslider = new CFPlus::UI::Slider
1064 col => 1, 1043 c_col => 1,
1065 row => 0, 1044 c_row => 0,
1066 vertical => 1, 1045 vertical => 1,
1067 range => [0, 0, 1, 0.01], # HACK fix 1046 range => [0, 0, 1, 0.01], # HACK fix
1068 on_changed => sub { 1047 on_changed => sub {
1069 $self->{vpos} = $_[1]; 1048 $self->{vpos} = $_[1];
1070 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1049 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1081 row_expand => [1, 0], 1060 row_expand => [1, 0],
1082 %arg, 1061 %arg,
1083 ); 1062 );
1084 1063
1085 $self->{vp} = new CFPlus::UI::ViewPort 1064 $self->{vp} = new CFPlus::UI::ViewPort
1086 col => 0, 1065 c_col => 0,
1087 row => 0, 1066 c_row => 0,
1088 expand => 1, 1067 expand => 1,
1089 scroll_x => $self->{scroll_x}, 1068 scroll_x => $self->{scroll_x},
1090 scroll_y => $self->{scroll_y}, 1069 scroll_y => $self->{scroll_y},
1091 on_changed => sub { 1070 on_changed => sub {
1092 my ($vp, $x, $y) = @_; 1071 my ($vp, $x, $y) = @_;
… …
1113sub add { 1092sub add {
1114 my ($self, $widget) = @_; 1093 my ($self, $widget) = @_;
1115 1094
1116 $self->{vp}->add ($self->{child} = $widget); 1095 $self->{vp}->add ($self->{child} = $widget);
1117} 1096}
1097
1098sub set_offset { shift->{vp}->set_offset (@_) }
1099sub set_center { shift->{vp}->set_center (@_) }
1100sub make_visible { shift->{vp}->make_visible (@_) }
1118 1101
1119sub update_slider { 1102sub update_slider {
1120 my ($self) = @_; 1103 my ($self) = @_;
1121 1104
1122 my $child = ($self->{vp} or return)->child; 1105 my $child = ($self->{vp} or return)->child;
… …
1615 1598
1616sub add { 1599sub add {
1617 my ($self, @widgets) = @_; 1600 my ($self, @widgets) = @_;
1618 1601
1619 for my $child (@widgets) { 1602 for my $child (@widgets) {
1620 $child->{rowspan} ||= 1; 1603 $child->{c_rowspan} ||= 1;
1621 $child->{colspan} ||= 1; 1604 $child->{c_colspan} ||= 1;
1622 } 1605 }
1623 1606
1624 $self->SUPER::add (@widgets); 1607 $self->SUPER::add (@widgets);
1625} 1608}
1626 1609
… …
1630 my @widgets; 1613 my @widgets;
1631 1614
1632 while (@_) { 1615 while (@_) {
1633 my ($col, $row, $child) = splice @_, 0, 3, (); 1616 my ($col, $row, $child) = splice @_, 0, 3, ();
1634 1617
1635 $child->{row} = $row; 1618 $child->{c_row} = $row;
1636 $child->{col} = $col; 1619 $child->{c_col} = $col;
1637 1620
1638 push @widgets, $child; 1621 push @widgets, $child;
1639 } 1622 }
1640 1623
1641 $self->add (@widgets); 1624 $self->add (@widgets);
… …
1647 my (@w, @h); 1630 my (@w, @h);
1648 1631
1649 my @children = $self->children; 1632 my @children = $self->children;
1650 1633
1651 # first pass, columns 1634 # first pass, columns
1652 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) { 1635 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1653 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; 1636 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1654 1637
1655 my $sw = sum @w[$c .. $c + $cs - 1]; 1638 my $sw = sum @w[$c .. $c + $cs - 1];
1656 1639
1657 if ($w > $sw) { 1640 if ($w > $sw) {
1658 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; 1641 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1659 } 1642 }
1660 } 1643 }
1661 1644
1662 # second pass, rows 1645 # second pass, rows
1663 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { 1646 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1664 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; 1647 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1665 1648
1666 my $sh = sum @h[$r .. $r + $rs - 1]; 1649 my $sh = sum @h[$r .. $r + $rs - 1];
1667 1650
1668 if ($h > $sh) { 1651 if ($h > $sh) {
1669 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; 1652 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
… …
1711 1694
1712 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } 1695 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1713 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } 1696 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1714 1697
1715 for my $widget ($self->children) { 1698 for my $widget ($self->children) {
1716 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)};
1717 1700
1718 $widget->configure ( 1701 $widget->configure (
1719 $x[$c], $y[$r], 1702 $x[$c], $y[$r],
1720 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r], 1703 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1721 ); 1704 );
… …
1730 1713
1731use List::Util qw(min max); 1714use List::Util qw(min max);
1732 1715
1733our @ISA = CFPlus::UI::Container::; 1716our @ISA = CFPlus::UI::Container::;
1734 1717
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($$$) { 1718sub _scale($$$) {
1743 my ($mode, $val, $max) = @_; 1719 my ($rel, $val, $max) = @_;
1744 1720
1745 $mode eq "abs" ? $val 1721 $rel ? $val * $max : $val
1746 : $mode eq "rel" ? $val * $max
1747 : 0
1748} 1722}
1749 1723
1750sub size_request { 1724sub size_request {
1751 my ($self) = @_; 1725 my ($self) = @_;
1752 1726
1753 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1727 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1754 1728
1755 # determine overall size by querying abs widgets 1729 # determine overall size by querying abs widgets
1756 for my $child ($self->visible_children) { 1730 for my $child ($self->visible_children) {
1757 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};
1758 1734
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; 1735 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1764 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1736 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1765 } 1737 }
1766 } 1738 }
1767 1739
1768 my $W = $x2 - $x1; 1740 my $W = $x2 - $x1;
1769 my $H = $y2 - $y1; 1741 my $H = $y2 - $y1;
1770 1742
1771 # now layout remaining widgets 1743 # now layout remaining widgets
1772 for my $child ($self->visible_children) { 1744 for my $child ($self->visible_children) {
1773 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;
1774 1748
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; 1749 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1782 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1750 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1783 } 1751 }
1784 } 1752 }
1785 1753
1786 my $W = $x2 - $x1; 1754 my $W = $x2 - $x1;
1787 my $H = $y2 - $y1; 1755 my $H = $y2 - $y1;
… …
1791 1759
1792sub invoke_size_allocate { 1760sub invoke_size_allocate {
1793 my ($self, $W, $H) = @_; 1761 my ($self, $W, $H) = @_;
1794 1762
1795 for my $child ($self->visible_children) { 1763 for my $child ($self->visible_children) {
1796 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;
1797 1766
1798 $x = _scale $pos, $x, $W; 1767 $x += $child->{c_halign} * $child->{req_w};
1799 $y = _scale $pos, $x, $H; 1768 $y += $child->{c_valign} * $child->{req_h};
1800 $w = _scale $size, $w, $W;
1801 $h = _scale $size, $h, $H;
1802 1769
1803 $child->configure ($x, $y, $w, $h); 1770 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1804 } 1771 }
1805 1772
1806 1 1773 1
1807} 1774}
1808 1775
… …
1812 1779
1813our @ISA = CFPlus::UI::Container::; 1780our @ISA = CFPlus::UI::Container::;
1814 1781
1815sub size_request { 1782sub size_request {
1816 my ($self) = @_; 1783 my ($self) = @_;
1784
1785 my @children = $self->visible_children;
1817 1786
1818 $self->{vertical} 1787 $self->{vertical}
1819 ? ( 1788 ? (
1820 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1789 (List::Util::max map $_->{req_w}, @children),
1821 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1790 (List::Util::sum map $_->{req_h}, @children),
1822 ) 1791 )
1823 : ( 1792 : (
1824 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1793 (List::Util::sum map $_->{req_w}, @children),
1825 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1794 (List::Util::max map $_->{req_h}, @children),
1826 ) 1795 )
1827} 1796}
1828 1797
1829sub invoke_size_allocate { 1798sub invoke_size_allocate {
1830 my ($self, $w, $h) = @_; 1799 my ($self, $w, $h) = @_;
… …
1954 1923
1955 delete $self->{ox}; 1924 delete $self->{ox};
1956 $self->SUPER::realloc; 1925 $self->SUPER::realloc;
1957} 1926}
1958 1927
1928sub clear {
1929 my ($self) = @_;
1930
1931 $self->set_text ("");
1932}
1933
1959sub set_text { 1934sub set_text {
1960 my ($self, $text) = @_; 1935 my ($self, $text) = @_;
1961 1936
1962 return if $self->{text} eq "T$text"; 1937 return if $self->{text} eq "T$text";
1963 $self->{text} = "T$text"; 1938 $self->{text} = "T$text";
… …
2069 : ($self->{w} - $size->[0]) * 0.5); 2044 : ($self->{w} - $size->[0]) * 0.5);
2070 2045
2071 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2046 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2072 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2047 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2073 : ($self->{h} - $size->[1]) * 0.5); 2048 : ($self->{h} - $size->[1]) * 0.5);
2049
2050 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2074 }; 2051 };
2075 2052
2076 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2053# unless ($self->{list}) {
2077 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2054# $self->{list} = CFPlus::OpenGL::glGenList;
2078 2055# CFPlus::OpenGL::glNewList $self->{list};
2079 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2056# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2057# CFPlus::OpenGL::glEndList;
2058# }
2059#
2060# CFPlus::OpenGL::glCallList $self->{list};
2061
2062 $self->{layout}->draw;
2080} 2063}
2064
2065#sub destroy {
2066# my ($self) = @_;
2067#
2068# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2069#
2070# $self->SUPER::destroy;
2071#}
2081 2072
2082############################################################################# 2073#############################################################################
2083 2074
2084package CFPlus::UI::EntryBase; 2075package CFPlus::UI::EntryBase;
2085 2076
… …
2091 my $class = shift; 2082 my $class = shift;
2092 2083
2093 $class->SUPER::new ( 2084 $class->SUPER::new (
2094 fg => [1, 1, 1], 2085 fg => [1, 1, 1],
2095 bg => [0, 0, 0, 0.2], 2086 bg => [0, 0, 0, 0.2],
2087 outline => [0.6, 0.3, 0.1],
2096 active_bg => [1, 1, 1, 0.5], 2088 active_bg => [0, 0, 1, .2],
2097 active_fg => [0, 0, 0], 2089 active_fg => [1, 1, 1],
2090 active_outline => [1, 1, 0],
2098 can_hover => 1, 2091 can_hover => 1,
2099 can_focus => 1, 2092 can_focus => 1,
2100 valign => 0, 2093 valign => 0,
2101 can_events => 1, 2094 can_events => 1,
2102 ellipsise => 0, 2095 ellipsise => 0,
… …
2259 2252
2260 unless (exists $self->{cur_h}) { 2253 unless (exists $self->{cur_h}) {
2261 my $text = substr $self->{text}, 0, $self->{cursor}; 2254 my $text = substr $self->{text}, 0, $self->{cursor};
2262 utf8::encode $text; 2255 utf8::encode $text;
2263 2256
2264 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2257 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2265 } 2258 }
2266 2259
2260 glColor_premultiply @{$self->{active_fg}};
2267 glBegin GL_LINES; 2261 glBegin GL_LINES;
2268 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2262 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
2269 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2263 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2264 glEnd;
2265
2266 glLineWidth 3;
2267 glColor @{$self->{active_outline}};
2268 glBegin GL_LINE_LOOP;
2269 glVertex 0, 0;
2270 glVertex $self->{w} - 1, 0;
2271 glVertex $self->{w} - 1, $self->{h} - 1;
2272 glVertex 0, $self->{h} - 1;
2273 glEnd;
2274 glLineWidth 1;
2275
2276 } else {
2277 glColor @{$self->{outline}};
2278 glTranslate .375, .375;
2279 glBegin GL_LINE_STRIP;
2280 glVertex 0, $self->{h} * .5;
2281 glVertex 0, $self->{h} - 3;
2282 glVertex $self->{w} - 1, $self->{h} - 3;
2283 glVertex $self->{w} - 1, $self->{h} * .5;
2270 glEnd; 2284 glEnd;
2271 } 2285 }
2272} 2286}
2273 2287
2274############################################################################# 2288#############################################################################
… …
2361 1 2375 1
2362} 2376}
2363 2377
2364############################################################################# 2378#############################################################################
2365 2379
2380package CFPlus::UI::ButtonBin;
2381
2382our @ISA = CFPlus::UI::Bin::;
2383
2384use CFPlus::OpenGL;
2385
2386my @tex =
2387 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2388 qw(b1_button_inactive.png b1_button_active.png);
2389
2390sub new {
2391 my $class = shift;
2392
2393 $class->SUPER::new (
2394 can_hover => 1,
2395 align => 0,
2396 valign => 0,
2397 can_events => 1,
2398 @_
2399 )
2400}
2401
2402sub invoke_button_up {
2403 my ($self, $ev, $x, $y) = @_;
2404
2405 $self->emit ("activate")
2406 if $x >= 0 && $x < $self->{w}
2407 && $y >= 0 && $y < $self->{h};
2408
2409 1
2410}
2411
2412sub _draw {
2413 my ($self) = @_;
2414
2415 glEnable GL_TEXTURE_2D;
2416 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2417 glColor 0, 0, 0, 1;
2418
2419 my $tex = $tex[$GRAB == $self];
2420 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2421
2422 glDisable GL_TEXTURE_2D;
2423
2424 $self->SUPER::_draw;
2425}
2426
2427#############################################################################
2428
2366package CFPlus::UI::Button; 2429package CFPlus::UI::Button;
2367 2430
2368our @ISA = CFPlus::UI::Label::; 2431our @ISA = CFPlus::UI::Label::;
2369 2432
2370use CFPlus::OpenGL; 2433use CFPlus::OpenGL;
… …
2504sub new { 2567sub new {
2505 my $class = shift; 2568 my $class = shift;
2506 2569
2507 my $self = $class->SUPER::new ( 2570 my $self = $class->SUPER::new (
2508 can_events => 0, 2571 can_events => 0,
2572 scale => 1,
2509 @_, 2573 @_,
2510 ); 2574 );
2511 2575
2512 $self->{path} || $self->{tex} 2576 $self->{path} || $self->{tex}
2513 or Carp::croak "'path' or 'tex' attributes required"; 2577 or Carp::croak "'path' or 'tex' attributes required";
… …
2538} 2602}
2539 2603
2540sub size_request { 2604sub size_request {
2541 my ($self) = @_; 2605 my ($self) = @_;
2542 2606
2543 ($self->{tex}{w}, $self->{tex}{h}) 2607 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2544} 2608}
2545 2609
2546sub _draw { 2610sub _draw {
2547 my ($self) = @_; 2611 my ($self) = @_;
2548 2612
… …
2558 } 2622 }
2559 2623
2560 glEnable GL_TEXTURE_2D; 2624 glEnable GL_TEXTURE_2D;
2561 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2625 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2562 2626
2563 $tex->draw_quad (0, 0, $w, $h); 2627 $tex->draw_quad_alpha (0, 0, $w, $h);
2564 2628
2565 glDisable GL_TEXTURE_2D; 2629 glDisable GL_TEXTURE_2D;
2566} 2630}
2567 2631
2568############################################################################# 2632#############################################################################
… …
2587 align => 0, 2651 align => 0,
2588 valign => 0, 2652 valign => 0,
2589 can_events => 1, 2653 can_events => 1,
2590 @_ 2654 @_
2591 ); 2655 );
2656}
2657
2658sub invoke_button_down {
2659 my ($self, $ev, $x, $y) = @_;
2660
2661 1
2592} 2662}
2593 2663
2594sub invoke_button_up { 2664sub invoke_button_up {
2595 my ($self, $ev, $x, $y) = @_; 2665 my ($self, $ev, $x, $y) = @_;
2596 2666
… …
2870 2940
2871 $self->SUPER::invoke_button_down ($ev, $x, $y); 2941 $self->SUPER::invoke_button_down ($ev, $x, $y);
2872 2942
2873 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2943 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2874 2944
2875 $self->invoke_mouse_motion ($ev, $x, $y) 2945 $self->invoke_mouse_motion ($ev, $x, $y);
2946
2947 1
2876} 2948}
2877 2949
2878sub invoke_mouse_motion { 2950sub invoke_mouse_motion {
2879 my ($self, $ev, $x, $y) = @_; 2951 my ($self, $ev, $x, $y) = @_;
2880 2952
… …
2900 2972
2901 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 2973 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2902 2974
2903 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 2975 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2904 2976
2905 ! ! $delta 2977 1
2906} 2978}
2907 2979
2908sub update { 2980sub update {
2909 my ($self) = @_; 2981 my ($self) = @_;
2910 2982
… …
3041} 3113}
3042 3114
3043sub size_request { 3115sub size_request {
3044 my ($self) = @_; 3116 my ($self) = @_;
3045 3117
3046 my ($empty, $slider) = @{ $self->{children} }; 3118 my ($empty, $slider) = $self->visible_children;
3047 3119
3048 local $self->{children} = [$empty, $slider]; 3120 local $self->{children} = [$empty, $slider];
3049 $self->SUPER::size_request 3121 $self->SUPER::size_request
3050} 3122}
3051 3123
… …
3240 3312
3241 if ($y0 < $y + $h && $y < $y1) { 3313 if ($y0 < $y + $h && $y < $y1) {
3242 my $layout = $self->get_layout ($para); 3314 my $layout = $self->get_layout ($para);
3243 3315
3244 $layout->render ($para->{indent}, $y - $y0); 3316 $layout->render ($para->{indent}, $y - $y0);
3317 $layout->draw;
3245 3318
3246 if (my @w = @{ $para->{widget} }) { 3319 if (my @w = @{ $para->{widget} }) {
3247 my @s = $layout->get_shapes; 3320 my @s = $layout->get_shapes;
3248 3321
3249 for (@w) { 3322 for (@w) {
… …
3440 glTranslate 0.375, 0.375; 3513 glTranslate 0.375, 0.375;
3441 3514
3442 my ($w, $h) = @$self{qw(w h)}; 3515 my ($w, $h) = @$self{qw(w h)};
3443 3516
3444 glColor 1, 0.8, 0.4; 3517 glColor 1, 0.8, 0.4;
3445 glBegin GL_QUADS; 3518 glRect 0, 0, $w, $h;
3446 glVertex 0 , 0;
3447 glVertex 0 , $h;
3448 glVertex $w, $h;
3449 glVertex $w, 0;
3450 glEnd;
3451 3519
3452 glColor 0, 0, 0; 3520 glColor 0, 0, 0;
3453 glBegin GL_LINE_LOOP; 3521 glBegin GL_LINE_LOOP;
3454 glVertex 0 , 0; 3522 glVertex 0 , 0;
3455 glVertex 0 , $h; 3523 glVertex 0 , $h;
… …
3483 3551
3484 if ($self->{anim} && $self->{animspeed}) { 3552 if ($self->{anim} && $self->{animspeed}) {
3485 CFPlus::weaken (my $widget = $self); 3553 CFPlus::weaken (my $widget = $self);
3486 3554
3487 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3555 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3488 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed}; 3556 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3489 $self->{timer} = Event->timer ( 3557 $self->{timer} = Event->timer (
3490 parked => 1, 3558 parked => 1,
3491 cb => sub { 3559 cb => sub {
3492 return unless $::CONN && $widget; 3560 return unless $::CONN;
3493 3561
3562 my $w = $widget
3563 or return;
3564
3494 ++$widget->{frame}; 3565 ++$w->{frame};
3495 $widget->update_face; 3566 $w->update_face;
3567
3568 # somehow, $widget can go away
3496 $widget->update; 3569 $w->update;
3497
3498 $widget->update_timer; 3570 $w->update_timer;
3499 }, 3571 },
3500 ); 3572 );
3501 3573
3502 $self->update_face; 3574 $self->update_face;
3503 $self->update_timer; 3575 $self->update_timer;
… …
3524} 3596}
3525 3597
3526sub update_face { 3598sub update_face {
3527 my ($self) = @_; 3599 my ($self) = @_;
3528 3600
3529 return unless $::CONN; 3601 if ($::CONN) {
3530
3531 if (my $anim = $::CONN->{anim}[$self->{anim}]) { 3602 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3532 if ($anim && @$anim) { 3603 if ($anim && @$anim) {
3533 delete $self->{wait_face};
3534 $self->{face} = $anim->[ $self->{frame} % @$anim ]; 3604 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3605 delete $self->{face_change_cb};
3606
3607 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3608 unless ($tex->{name} || $tex->{loading}) {
3609 $tex->upload (sub { $self->reconfigure });
3610 }
3611 }
3612 }
3535 } 3613 }
3536 } 3614 }
3537} 3615}
3538 3616
3539sub size_request { 3617sub size_request {
3540 my ($self) = @_; 3618 my ($self) = @_;
3541 3619
3542 if ($::CONN) { 3620 if ($::CONN) {
3543 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3621 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3544 if (my $tex = $::CONN->{texture}[$faceid]) { 3622 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3545 $self->{tex} = $tex; 3623 if ($tex->{name}) {
3546 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3624 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3547 } else { 3625 } elsif (!$tex->{loading}) {
3548 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3626 $tex->upload (sub { $self->reconfigure });
3549 $self->realloc;
3550 }); 3627 }
3551 } 3628 }
3629
3630 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3552 } 3631 }
3553 } 3632 }
3554 3633
3555 ($self->{size_w} || 8, $self->{size_h} || 8) 3634 ($self->{size_w} || 8, $self->{size_h} || 8)
3556} 3635}
… …
3636 children => [ 3715 children => [
3637 (new CFPlus::UI::Label markup => $left, expand => 1), 3716 (new CFPlus::UI::Label markup => $left, expand => 1),
3638 (new CFPlus::UI::Label markup => $right, align => +1), 3717 (new CFPlus::UI::Label markup => $right, align => +1),
3639 ], 3718 ],
3640 ; 3719 ;
3641 3720
3642 } else { 3721 } else {
3643 $widget = new CFPlus::UI::Label 3722 $widget = new CFPlus::UI::Label
3644 can_hover => 1, 3723 can_hover => 1,
3645 can_events => 1, 3724 can_events => 1,
3646 markup => $widget, 3725 markup => $widget,
… …
3782 buttonbar => (new CFPlus::UI::Buttonbar), 3861 buttonbar => (new CFPlus::UI::Buttonbar),
3783 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3862 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3784 # filter => # will be put between multiplexer and $self 3863 # filter => # will be put between multiplexer and $self
3785 @_, 3864 @_,
3786 ); 3865 );
3787 3866
3788 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3867 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3789 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3868 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3790 3869
3870 {
3871 Scalar::Util::weaken (my $wself = $self);
3872
3873 $self->{multiplexer}->connect (c_add => sub {
3874 my ($mplex, $widgets) = @_;
3875
3876 for my $child (@$widgets) {
3877 Scalar::Util::weaken $child;
3878 $child->{c_tab_} ||= do {
3879 my $tab =
3880 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3881 ? $child->{c_tab}
3882 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3883
3884 $tab->connect (activate => sub {
3885 $wself->set_current_page ($child);
3886 });
3887
3888 $tab
3889 };
3890
3891 $self->{buttonbar}->add ($child->{c_tab_});
3892 }
3893 });
3894
3895 $self->{multiplexer}->connect (c_remove => sub {
3896 my ($mplex, $widgets) = @_;
3897
3898 for my $child (@$widgets) {
3899 $wself->{buttonbar}->remove ($child->{c_tab_});
3900 }
3901 });
3902 }
3903
3791 $self 3904 $self
3792} 3905}
3793 3906
3794sub add { 3907sub add {
3908 my ($self, @widgets) = @_;
3909
3910 $self->{multiplexer}->add (@widgets)
3911}
3912
3913sub remove {
3914 my ($self, @widgets) = @_;
3915
3916 $self->{multiplexer}->remove (@widgets)
3917}
3918
3919sub pages {
3920 my ($self) = @_;
3921 $self->{multiplexer}->children
3922}
3923
3924sub add_tab {
3795 my ($self, $title, $widget, $tooltip) = @_; 3925 my ($self, $title, $widget, $tooltip) = @_;
3796 3926
3797 CFPlus::weaken $self; 3927 $title = [$title, $tooltip] unless ref $title;
3928 $widget->{c_tab} = $title;
3798 3929
3799 $self->{buttonbar}->add (new CFPlus::UI::Button
3800 markup => $title,
3801 tooltip => $tooltip,
3802 on_activate => sub { $self->set_current_page ($widget) },
3803 );
3804
3805 $self->{multiplexer}->add ($widget); 3930 $self->add ($widget);
3806} 3931}
3807 3932
3808sub get_current_page { 3933sub get_current_page {
3809 my ($self) = @_; 3934 my ($self) = @_;
3810 3935
… …
4093} 4218}
4094 4219
4095sub update { 4220sub update {
4096 my ($self) = @_; 4221 my ($self) = @_;
4097 4222
4098 $::WANT_REFRESH++; 4223 $::WANT_REFRESH->start;
4099} 4224}
4100 4225
4101sub add { 4226sub add {
4102 my ($self, @children) = @_; 4227 my ($self, @children) = @_;
4103 4228

Diff Legend

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