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.408 by root, Sun Jul 22 15:26:01 2007 UTC vs.
Revision 1.434 by root, Wed Aug 22 21:32:09 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
… …
607sub DESTROY { 607sub DESTROY {
608 my ($self) = @_; 608 my ($self) = @_;
609 609
610 return if CFPlus::in_destruct; 610 return if CFPlus::in_destruct;
611 611
612 local $@;
612 eval { $self->destroy }; 613 eval { $self->destroy };
613 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 614 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
614 615
615 delete $WIDGET{$self+0}; 616 delete $WIDGET{$self+0};
616} 617}
… …
624use strict; 625use strict;
625use CFPlus::OpenGL; 626use CFPlus::OpenGL;
626 627
627sub new { 628sub new {
628 my $class = shift; 629 my $class = shift;
629
630 # range [value, low, high, page]
631 630
632 $class->SUPER::new ( 631 $class->SUPER::new (
633 #bg => [0, 0, 0, 0.2], 632 #bg => [0, 0, 0, 0.2],
634 #active_bg => [1, 1, 1, 0.5], 633 #active_bg => [1, 1, 1, 0.5],
635 @_ 634 @_
… …
647 my ($w, $h) = @$self{qw(w h)}; 646 my ($w, $h) = @$self{qw(w h)};
648 647
649 glEnable GL_BLEND; 648 glEnable GL_BLEND;
650 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 649 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
651 glColor_premultiply @$color; 650 glColor_premultiply @$color;
652
653 glBegin GL_QUADS;
654 glVertex 0 , 0;
655 glVertex 0 , $h;
656 glVertex $w, $h; 651 glRect 0, 0, $w, $h;
657 glVertex $w, 0;
658 glEnd;
659
660 glDisable GL_BLEND; 652 glDisable GL_BLEND;
661 } 653 }
662} 654}
663 655
664############################################################################# 656#############################################################################
… …
725 @{$self->{children}}, @widgets 717 @{$self->{children}}, @widgets
726 ]; 718 ];
727 719
728 $self->realloc; 720 $self->realloc;
729 721
722 $self->emit (c_add => \@widgets);
723
730 map $_+0, @widgets 724 map $_+0, @widgets
731} 725}
732 726
733sub children { 727sub children {
734 @{ $_[0]{children} } 728 @{ $_[0]{children} }
735} 729}
736 730
737sub remove { 731sub remove {
738 my ($self, $child) = @_; 732 my ($self, @widgets) = @_;
739 733
734 $self->emit (c_remove => \@widgets);
735
736 for my $child (@widgets) {
740 delete $child->{parent}; 737 delete $child->{parent};
741 $child->hide; 738 $child->hide;
742
743 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 739 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
740 }
744 741
745 $self->realloc; 742 $self->realloc;
746} 743}
747 744
748sub clear { 745sub clear {
… …
776} 773}
777 774
778sub _draw { 775sub _draw {
779 my ($self) = @_; 776 my ($self) = @_;
780 777
781 $_->draw for @{$self->{children}}; 778 $_->draw for $self->visible_children;
782} 779}
783 780
784############################################################################# 781#############################################################################
785 782
786package CFPlus::UI::Bin; 783package CFPlus::UI::Bin;
… …
796} 793}
797 794
798sub add { 795sub add {
799 my ($self, $child) = @_; 796 my ($self, $child) = @_;
800 797
801 $self->SUPER::remove ($_) for @{ $self->{children} }; 798 $self->clear;
802 $self->SUPER::add ($child); 799 $self->SUPER::add ($child);
803} 800}
804 801
805sub remove { 802sub remove {
806 my ($self, $widget) = @_; 803 my ($self, $widget) = @_;
… …
948 $self->{view_x} = $x; 945 $self->{view_x} = $x;
949 $self->{view_y} = $y; 946 $self->{view_y} = $y;
950 947
951 $self->emit (changed => $x, $y); 948 $self->emit (changed => $x, $y);
952 $self->update; 949 $self->update;
950 }
951}
952
953sub set_center {
954 my ($self, $x, $y) = @_;
955
956 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
957}
958
959sub make_visible {
960 my ($self, $x, $y, $border) = @_;
961
962 if ( $x < $self->{view_x} + $self->{w} * $border
963 || $x > $self->{view_x} + $self->{w} * (1 - $border)
964 || $y < $self->{view_y} + $self->{h} * $border
965 || $y > $self->{view_y} + $self->{h} * (1 - $border)
966 ) {
967 $self->set_center ($x, $y);
953 } 968 }
954} 969}
955 970
956# hmm, this does not work for topleft of $self... but we should not ask for that 971# hmm, this does not work for topleft of $self... but we should not ask for that
957sub coord2local { 972sub coord2local {
… …
1004 my $child = delete $arg{child}; 1019 my $child = delete $arg{child};
1005 1020
1006 my $self; 1021 my $self;
1007 1022
1008 my $hslider = new CFPlus::UI::Slider 1023 my $hslider = new CFPlus::UI::Slider
1009 col => 0, 1024 c_col => 0,
1010 row => 1, 1025 c_row => 1,
1011 vertical => 0, 1026 vertical => 0,
1012 range => [0, 0, 1, 0.01], # HACK fix 1027 range => [0, 0, 1, 0.01], # HACK fix
1013 on_changed => sub { 1028 on_changed => sub {
1014 $self->{hpos} = $_[1]; 1029 $self->{hpos} = $_[1];
1015 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1030 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1016 }, 1031 },
1017 ; 1032 ;
1018 1033
1019 my $vslider = new CFPlus::UI::Slider 1034 my $vslider = new CFPlus::UI::Slider
1020 col => 1, 1035 c_col => 1,
1021 row => 0, 1036 c_row => 0,
1022 vertical => 1, 1037 vertical => 1,
1023 range => [0, 0, 1, 0.01], # HACK fix 1038 range => [0, 0, 1, 0.01], # HACK fix
1024 on_changed => sub { 1039 on_changed => sub {
1025 $self->{vpos} = $_[1]; 1040 $self->{vpos} = $_[1];
1026 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1041 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1037 row_expand => [1, 0], 1052 row_expand => [1, 0],
1038 %arg, 1053 %arg,
1039 ); 1054 );
1040 1055
1041 $self->{vp} = new CFPlus::UI::ViewPort 1056 $self->{vp} = new CFPlus::UI::ViewPort
1042 col => 0, 1057 c_col => 0,
1043 row => 0, 1058 c_row => 0,
1044 expand => 1, 1059 expand => 1,
1045 scroll_x => $self->{scroll_x}, 1060 scroll_x => $self->{scroll_x},
1046 scroll_y => $self->{scroll_y}, 1061 scroll_y => $self->{scroll_y},
1047 on_changed => sub { 1062 on_changed => sub {
1048 my ($vp, $x, $y) = @_; 1063 my ($vp, $x, $y) = @_;
… …
1070 my ($self, $widget) = @_; 1085 my ($self, $widget) = @_;
1071 1086
1072 $self->{vp}->add ($self->{child} = $widget); 1087 $self->{vp}->add ($self->{child} = $widget);
1073} 1088}
1074 1089
1090sub set_offset { shift->{vp}->set_offset (@_) }
1091sub set_center { shift->{vp}->set_center (@_) }
1092sub make_visible { shift->{vp}->make_visible (@_) }
1093
1075sub update_slider { 1094sub update_slider {
1076 my ($self) = @_; 1095 my ($self) = @_;
1077 1096
1078 my $child = ($self->{vp} or return)->child; 1097 my $child = ($self->{vp} or return)->child;
1079 1098
… …
1192 my ($w, $h) = @$self{qw(w h)}; 1211 my ($w, $h) = @$self{qw(w h)};
1193 1212
1194 glEnable GL_BLEND; 1213 glEnable GL_BLEND;
1195 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1214 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1196 glColor_premultiply @{ $self->{bg} }; 1215 glColor_premultiply @{ $self->{bg} };
1197
1198 glBegin GL_QUADS;
1199 glVertex 0 , 0;
1200 glVertex 0 , $h;
1201 glVertex $w, $h; 1216 glRect 0, 0, $w, $h;
1202 glVertex $w, 0;
1203 glEnd;
1204
1205 glDisable GL_BLEND; 1217 glDisable GL_BLEND;
1206 } 1218 }
1207 1219
1208 $self->SUPER::_draw; 1220 $self->SUPER::_draw;
1209} 1221}
… …
1571 1583
1572sub add { 1584sub add {
1573 my ($self, @widgets) = @_; 1585 my ($self, @widgets) = @_;
1574 1586
1575 for my $child (@widgets) { 1587 for my $child (@widgets) {
1576 $child->{rowspan} ||= 1; 1588 $child->{c_rowspan} ||= 1;
1577 $child->{colspan} ||= 1; 1589 $child->{c_colspan} ||= 1;
1578 } 1590 }
1579 1591
1580 $self->SUPER::add (@widgets); 1592 $self->SUPER::add (@widgets);
1581} 1593}
1582 1594
… …
1586 my @widgets; 1598 my @widgets;
1587 1599
1588 while (@_) { 1600 while (@_) {
1589 my ($col, $row, $child) = splice @_, 0, 3, (); 1601 my ($col, $row, $child) = splice @_, 0, 3, ();
1590 1602
1591 $child->{row} = $row; 1603 $child->{c_row} = $row;
1592 $child->{col} = $col; 1604 $child->{c_col} = $col;
1593 1605
1594 push @widgets, $child; 1606 push @widgets, $child;
1595 } 1607 }
1596 1608
1597 $self->add (@widgets); 1609 $self->add (@widgets);
… …
1603 my (@w, @h); 1615 my (@w, @h);
1604 1616
1605 my @children = $self->children; 1617 my @children = $self->children;
1606 1618
1607 # first pass, columns 1619 # first pass, columns
1608 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) { 1620 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1609 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; 1621 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1610 1622
1611 my $sw = sum @w[$c .. $c + $cs - 1]; 1623 my $sw = sum @w[$c .. $c + $cs - 1];
1612 1624
1613 if ($w > $sw) { 1625 if ($w > $sw) {
1614 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; 1626 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1615 } 1627 }
1616 } 1628 }
1617 1629
1618 # second pass, rows 1630 # second pass, rows
1619 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { 1631 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1620 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; 1632 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1621 1633
1622 my $sh = sum @h[$r .. $r + $rs - 1]; 1634 my $sh = sum @h[$r .. $r + $rs - 1];
1623 1635
1624 if ($h > $sh) { 1636 if ($h > $sh) {
1625 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; 1637 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
… …
1667 1679
1668 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } 1680 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1669 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } 1681 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1670 1682
1671 for my $widget ($self->children) { 1683 for my $widget ($self->children) {
1672 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)}; 1684 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1673 1685
1674 $widget->configure ( 1686 $widget->configure (
1675 $x[$c], $y[$r], 1687 $x[$c], $y[$r],
1676 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r], 1688 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1677 ); 1689 );
… …
1686 1698
1687use List::Util qw(min max); 1699use List::Util qw(min max);
1688 1700
1689our @ISA = CFPlus::UI::Container::; 1701our @ISA = CFPlus::UI::Container::;
1690 1702
1691sub add_fixed {
1692 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1693
1694 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1695 $self->SUPER::add ($child);
1696}
1697
1698sub _scale($$$) { 1703sub _scale($$$) {
1699 my ($mode, $val, $max) = @_; 1704 my ($rel, $val, $max) = @_;
1700 1705
1701 $mode eq "abs" ? $val 1706 $rel ? $val * $max : $val
1702 : $mode eq "rel" ? $val * $max
1703 : 0
1704} 1707}
1705 1708
1706sub size_request { 1709sub size_request {
1707 my ($self) = @_; 1710 my ($self) = @_;
1708 1711
1709 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1712 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1710 1713
1711 # determine overall size by querying abs widgets 1714 # determine overall size by querying abs widgets
1712 for my $child ($self->visible_children) { 1715 for my $child ($self->visible_children) {
1713 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1716 unless ($child->{c_rel}) {
1717 my $x = $child->{c_x};
1718 my $y = $child->{c_y};
1714 1719
1715 if ($pos eq "abs") {
1716 $w = _scale $size, $w, $child->{req_w};
1717 $h = _scale $size, $h, $child->{req_h};
1718
1719 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1720 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1720 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1721 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1721 } 1722 }
1722 } 1723 }
1723 1724
1724 my $W = $x2 - $x1; 1725 my $W = $x2 - $x1;
1725 my $H = $y2 - $y1; 1726 my $H = $y2 - $y1;
1726 1727
1727 # now layout remaining widgets 1728 # now layout remaining widgets
1728 for my $child ($self->visible_children) { 1729 for my $child ($self->visible_children) {
1729 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1730 if ($child->{c_rel}) {
1731 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1732 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1730 1733
1731 if ($pos ne "abs") {
1732 $x = _scale $pos, $x, $W;
1733 $y = _scale $pos, $x, $H;
1734 $w = _scale $size, $w, $child->{req_w};
1735 $h = _scale $size, $h, $child->{req_h};
1736
1737 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1734 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1738 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1735 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1739 } 1736 }
1740 } 1737 }
1741 1738
1742 my $W = $x2 - $x1; 1739 my $W = $x2 - $x1;
1743 my $H = $y2 - $y1; 1740 my $H = $y2 - $y1;
… …
1747 1744
1748sub invoke_size_allocate { 1745sub invoke_size_allocate {
1749 my ($self, $W, $H) = @_; 1746 my ($self, $W, $H) = @_;
1750 1747
1751 for my $child ($self->visible_children) { 1748 for my $child ($self->visible_children) {
1752 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1749 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1750 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1753 1751
1754 $x = _scale $pos, $x, $W; 1752 $x += $child->{c_halign} * $child->{req_w};
1755 $y = _scale $pos, $x, $H; 1753 $y += $child->{c_valign} * $child->{req_h};
1756 $w = _scale $size, $w, $W;
1757 $h = _scale $size, $h, $H;
1758 1754
1759 $child->configure ($x, $y, $w, $h); 1755 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1760 } 1756 }
1761 1757
1762 1 1758 1
1763} 1759}
1764 1760
… …
1768 1764
1769our @ISA = CFPlus::UI::Container::; 1765our @ISA = CFPlus::UI::Container::;
1770 1766
1771sub size_request { 1767sub size_request {
1772 my ($self) = @_; 1768 my ($self) = @_;
1769
1770 my @children = $self->visible_children;
1773 1771
1774 $self->{vertical} 1772 $self->{vertical}
1775 ? ( 1773 ? (
1776 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1774 (List::Util::max map $_->{req_w}, @children),
1777 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1775 (List::Util::sum map $_->{req_h}, @children),
1778 ) 1776 )
1779 : ( 1777 : (
1780 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1778 (List::Util::sum map $_->{req_w}, @children),
1781 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1779 (List::Util::max map $_->{req_h}, @children),
1782 ) 1780 )
1783} 1781}
1784 1782
1785sub invoke_size_allocate { 1783sub invoke_size_allocate {
1786 my ($self, $w, $h) = @_; 1784 my ($self, $w, $h) = @_;
… …
1910 1908
1911 delete $self->{ox}; 1909 delete $self->{ox};
1912 $self->SUPER::realloc; 1910 $self->SUPER::realloc;
1913} 1911}
1914 1912
1913sub clear {
1914 my ($self) = @_;
1915
1916 $self->set_text ("");
1917}
1918
1915sub set_text { 1919sub set_text {
1916 my ($self, $text) = @_; 1920 my ($self, $text) = @_;
1917 1921
1918 return if $self->{text} eq "T$text"; 1922 return if $self->{text} eq "T$text";
1919 $self->{text} = "T$text"; 1923 $self->{text} = "T$text";
… …
2025 : ($self->{w} - $size->[0]) * 0.5); 2029 : ($self->{w} - $size->[0]) * 0.5);
2026 2030
2027 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2031 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2028 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2032 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2029 : ($self->{h} - $size->[1]) * 0.5); 2033 : ($self->{h} - $size->[1]) * 0.5);
2034
2035 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2030 }; 2036 };
2031 2037
2032# unless ($self->{list}) { 2038# unless ($self->{list}) {
2033# $self->{list} = CFPlus::OpenGL::glGenList; 2039# $self->{list} = CFPlus::OpenGL::glGenList;
2034# CFPlus::OpenGL::glNewList $self->{list}; 2040# CFPlus::OpenGL::glNewList $self->{list};
… …
2036# CFPlus::OpenGL::glEndList; 2042# CFPlus::OpenGL::glEndList;
2037# } 2043# }
2038# 2044#
2039# CFPlus::OpenGL::glCallList $self->{list}; 2045# CFPlus::OpenGL::glCallList $self->{list};
2040 2046
2041 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2047 $self->{layout}->draw;
2042} 2048}
2043 2049
2044#sub destroy { 2050#sub destroy {
2045# my ($self) = @_; 2051# my ($self) = @_;
2046# 2052#
… …
2061 my $class = shift; 2067 my $class = shift;
2062 2068
2063 $class->SUPER::new ( 2069 $class->SUPER::new (
2064 fg => [1, 1, 1], 2070 fg => [1, 1, 1],
2065 bg => [0, 0, 0, 0.2], 2071 bg => [0, 0, 0, 0.2],
2072 outline => [0.6, 0.3, 0.1],
2066 active_bg => [1, 1, 1, 0.5], 2073 active_bg => [0, 0, 1, .2],
2067 active_fg => [0, 0, 0], 2074 active_fg => [1, 1, 1],
2075 active_outline => [1, 1, 0],
2068 can_hover => 1, 2076 can_hover => 1,
2069 can_focus => 1, 2077 can_focus => 1,
2070 valign => 0, 2078 valign => 0,
2071 can_events => 1, 2079 can_events => 1,
2072 ellipsise => 0, 2080 ellipsise => 0,
… …
2212 glColor_premultiply @{$self->{bg}}; 2220 glColor_premultiply @{$self->{bg}};
2213 } 2221 }
2214 2222
2215 glEnable GL_BLEND; 2223 glEnable GL_BLEND;
2216 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2224 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2217 glBegin GL_QUADS;
2218 glVertex 0 , 0;
2219 glVertex 0 , $self->{h};
2220 glVertex $self->{w}, $self->{h}; 2225 glRect 0, 0, $self->{w}, $self->{h};
2221 glVertex $self->{w}, 0;
2222 glEnd;
2223 glDisable GL_BLEND; 2226 glDisable GL_BLEND;
2224 2227
2225 $self->SUPER::_draw; 2228 $self->SUPER::_draw;
2226 2229
2227 #TODO: force update every cursor change :( 2230 #TODO: force update every cursor change :(
… …
2229 2232
2230 unless (exists $self->{cur_h}) { 2233 unless (exists $self->{cur_h}) {
2231 my $text = substr $self->{text}, 0, $self->{cursor}; 2234 my $text = substr $self->{text}, 0, $self->{cursor};
2232 utf8::encode $text; 2235 utf8::encode $text;
2233 2236
2234 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2237 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2235 } 2238 }
2236 2239
2240 glColor_premultiply @{$self->{active_fg}};
2237 glBegin GL_LINES; 2241 glBegin GL_LINES;
2238 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2242 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
2239 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2243 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2244 glEnd;
2245
2246 glLineWidth 3;
2247 glColor @{$self->{active_outline}};
2248 glRect_lineloop 0, 0, $self->{w} - 1, $self->{h} - 1;
2249 glLineWidth 1;
2250
2251 } else {
2252 glColor @{$self->{outline}};
2253 glTranslate .375, .375;
2254 glBegin GL_LINE_STRIP;
2255 glVertex 0, $self->{h} * .5;
2256 glVertex 0, $self->{h} - 3;
2257 glVertex $self->{w} - 1, $self->{h} - 3;
2258 glVertex $self->{w} - 1, $self->{h} * .5;
2240 glEnd; 2259 glEnd;
2241 } 2260 }
2242} 2261}
2243 2262
2244############################################################################# 2263#############################################################################
… …
2331 1 2350 1
2332} 2351}
2333 2352
2334############################################################################# 2353#############################################################################
2335 2354
2355package CFPlus::UI::ButtonBin;
2356
2357our @ISA = CFPlus::UI::Bin::;
2358
2359use CFPlus::OpenGL;
2360
2361my @tex =
2362 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2363 qw(b1_button_inactive.png b1_button_active.png);
2364
2365sub new {
2366 my $class = shift;
2367
2368 $class->SUPER::new (
2369 can_hover => 1,
2370 align => 0,
2371 valign => 0,
2372 can_events => 1,
2373 @_
2374 )
2375}
2376
2377sub invoke_button_up {
2378 my ($self, $ev, $x, $y) = @_;
2379
2380 $self->emit ("activate")
2381 if $x >= 0 && $x < $self->{w}
2382 && $y >= 0 && $y < $self->{h};
2383
2384 1
2385}
2386
2387sub _draw {
2388 my ($self) = @_;
2389
2390 glEnable GL_TEXTURE_2D;
2391 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2392 glColor 0, 0, 0, 1;
2393
2394 my $tex = $tex[$GRAB == $self];
2395 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2396
2397 glDisable GL_TEXTURE_2D;
2398
2399 $self->SUPER::_draw;
2400}
2401
2402#############################################################################
2403
2336package CFPlus::UI::Button; 2404package CFPlus::UI::Button;
2337 2405
2338our @ISA = CFPlus::UI::Label::; 2406our @ISA = CFPlus::UI::Label::;
2339 2407
2340use CFPlus::OpenGL; 2408use CFPlus::OpenGL;
… …
2474sub new { 2542sub new {
2475 my $class = shift; 2543 my $class = shift;
2476 2544
2477 my $self = $class->SUPER::new ( 2545 my $self = $class->SUPER::new (
2478 can_events => 0, 2546 can_events => 0,
2547 scale => 1,
2479 @_, 2548 @_,
2480 ); 2549 );
2481 2550
2482 $self->{path} || $self->{tex} 2551 $self->{path} || $self->{tex}
2483 or Carp::croak "'path' or 'tex' attributes required"; 2552 or Carp::croak "'path' or 'tex' attributes required";
… …
2508} 2577}
2509 2578
2510sub size_request { 2579sub size_request {
2511 my ($self) = @_; 2580 my ($self) = @_;
2512 2581
2513 ($self->{tex}{w}, $self->{tex}{h}) 2582 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2514} 2583}
2515 2584
2516sub _draw { 2585sub _draw {
2517 my ($self) = @_; 2586 my ($self) = @_;
2518 2587
… …
2528 } 2597 }
2529 2598
2530 glEnable GL_TEXTURE_2D; 2599 glEnable GL_TEXTURE_2D;
2531 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2600 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2532 2601
2533 $tex->draw_quad (0, 0, $w, $h); 2602 $tex->draw_quad_alpha (0, 0, $w, $h);
2534 2603
2535 glDisable GL_TEXTURE_2D; 2604 glDisable GL_TEXTURE_2D;
2536} 2605}
2537 2606
2538############################################################################# 2607#############################################################################
… …
2557 align => 0, 2626 align => 0,
2558 valign => 0, 2627 valign => 0,
2559 can_events => 1, 2628 can_events => 1,
2560 @_ 2629 @_
2561 ); 2630 );
2631}
2632
2633sub invoke_button_down {
2634 my ($self, $ev, $x, $y) = @_;
2635
2636 1
2562} 2637}
2563 2638
2564sub invoke_button_up { 2639sub invoke_button_up {
2565 my ($self, $ev, $x, $y) = @_; 2640 my ($self, $ev, $x, $y) = @_;
2566 2641
… …
2706 glDisable GL_TEXTURE_2D; 2781 glDisable GL_TEXTURE_2D;
2707} 2782}
2708 2783
2709############################################################################# 2784#############################################################################
2710 2785
2786package CFPlus::UI::Progress;
2787
2788our @ISA = CFPlus::UI::Label::;
2789
2790use CFPlus::OpenGL;
2791
2792sub new {
2793 my ($class, %arg) = @_;
2794
2795 my $self = $class->SUPER::new (
2796 fg => [1, 1, 1],
2797 bg => [0, 0, 1, 0.2],
2798 bar => [0.7, 0.5, 0.1, 0.8],
2799 outline => [0.4, 0.3, 0],
2800 fontsize => 0.9,
2801 valign => 0,
2802 align => 0,
2803 can_events => 1,
2804 ellipsise => 1,
2805 label => "%d%%",
2806 %arg,
2807 );
2808
2809 $self->set_value ($arg{value} || -1);
2810
2811 $self
2812}
2813
2814sub set_label {
2815 my ($self, $label) = @_;
2816
2817 return if $self->{label} eq $label;
2818 $self->{label} = $label;
2819
2820 $self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
2821}
2822
2823sub set_value {
2824 my ($self, $value) = @_;
2825
2826 if ($self->{value} ne $value) {
2827 $self->{value} = $value;
2828
2829 if ($value < 0) {
2830 $self->set_text ("-");
2831 } else {
2832 $self->set_text (sprintf $self->{label}, $value * 100);
2833 }
2834
2835 $self->update;
2836 }
2837}
2838
2839sub _draw {
2840 my ($self) = @_;
2841
2842 glEnable GL_BLEND;
2843 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2844
2845 if ($self->{value} >= 0) {
2846 my $s = 3 + ($self->{w} - 6) * $self->{value};
2847
2848 glColor_premultiply @{$self->{bar}};
2849 glRect 2, 2, $s, $self->{h} - 2;
2850 glColor_premultiply @{$self->{bg}};
2851 glRect $s + 1, 0, $self->{w} - 2, $self->{h} - 2;
2852 }
2853
2854 glColor_premultiply @{$self->{outline}};
2855 glRect_lineloop 1, 1, $self->{w} - 2, $self->{h} - 2;
2856
2857 glDisable GL_BLEND;
2858
2859 {
2860 local $self->{bg}; # do not draw background
2861 $self->SUPER::_draw;
2862 }
2863}
2864
2865#############################################################################
2866
2867package CFPlus::UI::ExperienceProgress;
2868
2869our @ISA = CFPlus::UI::Progress::;
2870
2871sub new {
2872 my ($class, %arg) = @_;
2873
2874 my $self = $class->SUPER::new (
2875 tooltip => sub {
2876 my ($self) = @_;
2877
2878 sprintf "%s points experience (level %d).\n%s points to next level %s.",
2879 ::formsep $self->{exp},
2880 $self->{lvl},
2881 ::formsep $self->{nxt}
2882 },
2883 %arg
2884 );
2885
2886 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2887 if $::CONN;
2888
2889 $self
2890}
2891
2892sub DESTROY {
2893 my ($self) = @_;
2894
2895 delete $::CONN->{on_exp_update}{$self+0}
2896 if $::CONN;
2897
2898 $self->SUPER::DESTROY;
2899}
2900
2901sub set_value {
2902 my ($self, $lvl, $exp) = @_;
2903
2904 $self->{lvl} = $exp;
2905 $self->{exp} = $exp;
2906
2907 my $v = -1;
2908
2909 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2910 my $l0 = $table->[$lvl - 1];
2911 my $l1 = $table->[$lvl];
2912
2913 $self->{nxt} = $l1;
2914
2915 $v = ($exp - $l0) / ($l1 - $l0);
2916 }
2917
2918 $self->SUPER::set_value ($v);
2919}
2920
2921#############################################################################
2922
2711package CFPlus::UI::Gauge; 2923package CFPlus::UI::Gauge;
2712 2924
2713our @ISA = CFPlus::UI::VBox::; 2925our @ISA = CFPlus::UI::VBox::;
2714 2926
2715sub new { 2927sub new {
… …
2840 3052
2841 $self->SUPER::invoke_button_down ($ev, $x, $y); 3053 $self->SUPER::invoke_button_down ($ev, $x, $y);
2842 3054
2843 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3055 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2844 3056
2845 $self->invoke_mouse_motion ($ev, $x, $y) 3057 $self->invoke_mouse_motion ($ev, $x, $y);
3058
3059 1
2846} 3060}
2847 3061
2848sub invoke_mouse_motion { 3062sub invoke_mouse_motion {
2849 my ($self, $ev, $x, $y) = @_; 3063 my ($self, $ev, $x, $y) = @_;
2850 3064
… …
2870 3084
2871 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3085 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2872 3086
2873 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3087 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2874 3088
2875 ! ! $delta 3089 1
2876} 3090}
2877 3091
2878sub update { 3092sub update {
2879 my ($self) = @_; 3093 my ($self) = @_;
2880 3094
… …
3011} 3225}
3012 3226
3013sub size_request { 3227sub size_request {
3014 my ($self) = @_; 3228 my ($self) = @_;
3015 3229
3016 my ($empty, $slider) = @{ $self->{children} }; 3230 my ($empty, $slider) = $self->visible_children;
3017 3231
3018 local $self->{children} = [$empty, $slider]; 3232 local $self->{children} = [$empty, $slider];
3019 $self->SUPER::size_request 3233 $self->SUPER::size_request
3020} 3234}
3021 3235
… …
3210 3424
3211 if ($y0 < $y + $h && $y < $y1) { 3425 if ($y0 < $y + $h && $y < $y1) {
3212 my $layout = $self->get_layout ($para); 3426 my $layout = $self->get_layout ($para);
3213 3427
3214 $layout->render ($para->{indent}, $y - $y0); 3428 $layout->render ($para->{indent}, $y - $y0);
3429 $layout->draw;
3215 3430
3216 if (my @w = @{ $para->{widget} }) { 3431 if (my @w = @{ $para->{widget} }) {
3217 my @s = $layout->get_shapes; 3432 my @s = $layout->get_shapes;
3218 3433
3219 for (@w) { 3434 for (@w) {
… …
3410 glTranslate 0.375, 0.375; 3625 glTranslate 0.375, 0.375;
3411 3626
3412 my ($w, $h) = @$self{qw(w h)}; 3627 my ($w, $h) = @$self{qw(w h)};
3413 3628
3414 glColor 1, 0.8, 0.4; 3629 glColor 1, 0.8, 0.4;
3415 glBegin GL_QUADS; 3630 glRect 0, 0, $w, $h;
3416 glVertex 0 , 0;
3417 glVertex 0 , $h;
3418 glVertex $w, $h;
3419 glVertex $w, 0;
3420 glEnd;
3421 3631
3422 glColor 0, 0, 0; 3632 glColor 0, 0, 0;
3423 glBegin GL_LINE_LOOP; 3633 glRect_lineloop 0, 0, $w, $h;
3424 glVertex 0 , 0;
3425 glVertex 0 , $h;
3426 glVertex $w, $h;
3427 glVertex $w, 0;
3428 glEnd;
3429 3634
3430 glTranslate 2 - 0.375, 2 - 0.375; 3635 glTranslate 2 - 0.375, 2 - 0.375;
3431 3636
3432 $self->SUPER::_draw; 3637 $self->SUPER::_draw;
3433} 3638}
… …
3457 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3662 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3458 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed}; 3663 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3459 $self->{timer} = Event->timer ( 3664 $self->{timer} = Event->timer (
3460 parked => 1, 3665 parked => 1,
3461 cb => sub { 3666 cb => sub {
3462 return unless $::CONN && $widget; 3667 return unless $::CONN;
3463 3668
3669 my $w = $widget
3670 or return;
3671
3464 ++$widget->{frame}; 3672 ++$w->{frame};
3465 $widget->update_face; 3673 $w->update_face;
3674
3675 # somehow, $widget can go away
3466 $widget->update; 3676 $w->update;
3467
3468 $widget->update_timer; 3677 $w->update_timer;
3469 }, 3678 },
3470 ); 3679 );
3471 3680
3472 $self->update_face; 3681 $self->update_face;
3473 $self->update_timer; 3682 $self->update_timer;
… …
3494} 3703}
3495 3704
3496sub update_face { 3705sub update_face {
3497 my ($self) = @_; 3706 my ($self) = @_;
3498 3707
3499 return unless $::CONN; 3708 if ($::CONN) {
3500
3501 if (my $anim = $::CONN->{anim}[$self->{anim}]) { 3709 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3502 if ($anim && @$anim) { 3710 if ($anim && @$anim) {
3503 delete $self->{wait_face};
3504 $self->{face} = $anim->[ $self->{frame} % @$anim ]; 3711 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3712 delete $self->{face_change_cb};
3713
3505 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ]; 3714 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3715 unless ($tex->{name} || $tex->{loading}) {
3716 $tex->upload (sub { $self->reconfigure });
3717 }
3718 }
3719 }
3506 } 3720 }
3507 } 3721 }
3508} 3722}
3509 3723
3510sub size_request { 3724sub size_request {
3511 my ($self) = @_; 3725 my ($self) = @_;
3512 3726
3513 if ($::CONN) { 3727 if ($::CONN) {
3514 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3728 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3515 if (my $tex = $::CONN->{texture}[$faceid]) { 3729 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3516 $self->{tex} = $tex; 3730 if ($tex->{name}) {
3517 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3731 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3518 } else { 3732 } elsif (!$tex->{loading}) {
3519 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3733 $tex->upload (sub { $self->reconfigure });
3520 $self->realloc;
3521 }); 3734 }
3522 } 3735 }
3736
3737 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3523 } 3738 }
3524 } 3739 }
3525 3740
3526 ($self->{size_w} || 8, $self->{size_h} || 8) 3741 ($self->{size_w} || 8, $self->{size_h} || 8)
3527} 3742}
… …
3607 children => [ 3822 children => [
3608 (new CFPlus::UI::Label markup => $left, expand => 1), 3823 (new CFPlus::UI::Label markup => $left, expand => 1),
3609 (new CFPlus::UI::Label markup => $right, align => +1), 3824 (new CFPlus::UI::Label markup => $right, align => +1),
3610 ], 3825 ],
3611 ; 3826 ;
3612 3827
3613 } else { 3828 } else {
3614 $widget = new CFPlus::UI::Label 3829 $widget = new CFPlus::UI::Label
3615 can_hover => 1, 3830 can_hover => 1,
3616 can_events => 1, 3831 can_events => 1,
3617 markup => $widget, 3832 markup => $widget,
… …
3742 3957
3743############################################################################# 3958#############################################################################
3744 3959
3745package CFPlus::UI::Notebook; 3960package CFPlus::UI::Notebook;
3746 3961
3962use CFPlus::OpenGL;
3963
3747our @ISA = CFPlus::UI::VBox::; 3964our @ISA = CFPlus::UI::VBox::;
3748 3965
3749sub new { 3966sub new {
3750 my $class = shift; 3967 my $class = shift;
3751 3968
3752 my $self = $class->SUPER::new ( 3969 my $self = $class->SUPER::new (
3753 buttonbar => (new CFPlus::UI::Buttonbar), 3970 buttonbar => (new CFPlus::UI::Buttonbar),
3754 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3971 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3972 active_outline => [1, 1, 0],
3755 # filter => # will be put between multiplexer and $self 3973 # filter => # will be put between multiplexer and $self
3756 @_, 3974 @_,
3757 ); 3975 );
3758 3976
3759 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3977 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3760 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3978 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3761 3979
3980 {
3981 Scalar::Util::weaken (my $wself = $self);
3982
3983 $self->{multiplexer}->connect (c_add => sub {
3984 my ($mplex, $widgets) = @_;
3985
3986 for my $child (@$widgets) {
3987 Scalar::Util::weaken $child;
3988 $child->{c_tab_} ||= do {
3989 my $tab =
3990 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3991 ? $child->{c_tab}
3992 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3993
3994 $tab->connect (activate => sub {
3995 $wself->set_current_page ($child);
3996 });
3997
3998 $tab
3999 };
4000
4001 $self->{buttonbar}->add ($child->{c_tab_});
4002 }
4003 });
4004
4005 $self->{multiplexer}->connect (c_remove => sub {
4006 my ($mplex, $widgets) = @_;
4007
4008 for my $child (@$widgets) {
4009 $wself->{buttonbar}->remove ($child->{c_tab_});
4010 }
4011 });
4012 }
4013
3762 $self 4014 $self
3763} 4015}
3764 4016
3765sub add { 4017sub add {
4018 my ($self, @widgets) = @_;
4019
4020 $self->{multiplexer}->add (@widgets)
4021}
4022
4023sub remove {
4024 my ($self, @widgets) = @_;
4025
4026 $self->{multiplexer}->remove (@widgets)
4027}
4028
4029sub pages {
4030 my ($self) = @_;
4031 $self->{multiplexer}->children
4032}
4033
4034sub add_tab {
3766 my ($self, $title, $widget, $tooltip) = @_; 4035 my ($self, $title, $widget, $tooltip) = @_;
3767 4036
3768 CFPlus::weaken $self; 4037 $title = [$title, $tooltip] unless ref $title;
4038 $widget->{c_tab} = $title;
3769 4039
3770 unless (ref $title) {
3771 $title = new CFPlus::UI::Button
3772 markup => $title,
3773 tooltip => $tooltip,
3774 );
3775 }
3776
3777 $title->connect (activate => sub { $self->set_current_page ($widget) });
3778 $self->{buttonbar}->add ($title);
3779
3780 $self->{multiplexer}->add ($widget); 4040 $self->add ($widget);
3781} 4041}
3782 4042
3783sub get_current_page { 4043sub get_current_page {
3784 my ($self) = @_; 4044 my ($self) = @_;
3785 4045
… …
3789sub set_current_page { 4049sub set_current_page {
3790 my ($self, $page) = @_; 4050 my ($self, $page) = @_;
3791 4051
3792 $self->{multiplexer}->set_current_page ($page); 4052 $self->{multiplexer}->set_current_page ($page);
3793 $self->emit (page_changed => $self->{multiplexer}{current}); 4053 $self->emit (page_changed => $self->{multiplexer}{current});
4054}
4055
4056sub _draw {
4057 my ($self) = @_;
4058
4059 $self->SUPER::_draw ();
4060
4061 if (my $cur = $self->{multiplexer}{current}) {
4062 if ($cur = $cur->{c_tab_}) {
4063 glTranslate $cur->{x}, $cur->{y};
4064 glLineWidth 3;
4065 glColor @{$self->{active_outline}};
4066 glRect_lineloop 1, 1, $cur->{w} - 2, $cur->{h} - 2;
4067 glLineWidth 1;
4068 }
4069 }
3794} 4070}
3795 4071
3796############################################################################# 4072#############################################################################
3797 4073
3798package CFPlus::UI::Selector; 4074package CFPlus::UI::Selector;
… …
4068} 4344}
4069 4345
4070sub update { 4346sub update {
4071 my ($self) = @_; 4347 my ($self) = @_;
4072 4348
4073 $::WANT_REFRESH++; 4349 $::WANT_REFRESH->start;
4074} 4350}
4075 4351
4076sub add { 4352sub add {
4077 my ($self, @children) = @_; 4353 my ($self, @children) = @_;
4078 4354

Diff Legend

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