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.430 by root, Tue Aug 21 02:39:17 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";
… …
651sub DESTROY { 607sub DESTROY {
652 my ($self) = @_; 608 my ($self) = @_;
653 609
654 return if CFPlus::in_destruct; 610 return if CFPlus::in_destruct;
655 611
612 local $@;
656 eval { $self->destroy }; 613 eval { $self->destroy };
657 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 614 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
658 615
659 delete $WIDGET{$self+0}; 616 delete $WIDGET{$self+0};
660} 617}
… …
668use strict; 625use strict;
669use CFPlus::OpenGL; 626use CFPlus::OpenGL;
670 627
671sub new { 628sub new {
672 my $class = shift; 629 my $class = shift;
673
674 # range [value, low, high, page]
675 630
676 $class->SUPER::new ( 631 $class->SUPER::new (
677 #bg => [0, 0, 0, 0.2], 632 #bg => [0, 0, 0, 0.2],
678 #active_bg => [1, 1, 1, 0.5], 633 #active_bg => [1, 1, 1, 0.5],
679 @_ 634 @_
… …
691 my ($w, $h) = @$self{qw(w h)}; 646 my ($w, $h) = @$self{qw(w h)};
692 647
693 glEnable GL_BLEND; 648 glEnable GL_BLEND;
694 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 649 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
695 glColor_premultiply @$color; 650 glColor_premultiply @$color;
696
697 glBegin GL_QUADS;
698 glVertex 0 , 0;
699 glVertex 0 , $h;
700 glVertex $w, $h; 651 glRect 0, 0, $w, $h;
701 glVertex $w, 0;
702 glEnd;
703
704 glDisable GL_BLEND; 652 glDisable GL_BLEND;
705 } 653 }
706} 654}
707 655
708############################################################################# 656#############################################################################
… …
769 @{$self->{children}}, @widgets 717 @{$self->{children}}, @widgets
770 ]; 718 ];
771 719
772 $self->realloc; 720 $self->realloc;
773 721
722 $self->emit (c_add => \@widgets);
723
774 map $_+0, @widgets 724 map $_+0, @widgets
775} 725}
776 726
777sub children { 727sub children {
778 @{ $_[0]{children} } 728 @{ $_[0]{children} }
779} 729}
780 730
781sub remove { 731sub remove {
782 my ($self, $child) = @_; 732 my ($self, @widgets) = @_;
783 733
734 $self->emit (c_remove => \@widgets);
735
736 for my $child (@widgets) {
784 delete $child->{parent}; 737 delete $child->{parent};
785 $child->hide; 738 $child->hide;
786
787 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 739 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
740 }
788 741
789 $self->realloc; 742 $self->realloc;
790} 743}
791 744
792sub clear { 745sub clear {
… …
820} 773}
821 774
822sub _draw { 775sub _draw {
823 my ($self) = @_; 776 my ($self) = @_;
824 777
825 $_->draw for @{$self->{children}}; 778 $_->draw for $self->visible_children;
826} 779}
827 780
828############################################################################# 781#############################################################################
829 782
830package CFPlus::UI::Bin; 783package CFPlus::UI::Bin;
… …
840} 793}
841 794
842sub add { 795sub add {
843 my ($self, $child) = @_; 796 my ($self, $child) = @_;
844 797
845 $self->SUPER::remove ($_) for @{ $self->{children} }; 798 $self->clear;
846 $self->SUPER::add ($child); 799 $self->SUPER::add ($child);
847} 800}
848 801
849sub remove { 802sub remove {
850 my ($self, $widget) = @_; 803 my ($self, $widget) = @_;
… …
992 $self->{view_x} = $x; 945 $self->{view_x} = $x;
993 $self->{view_y} = $y; 946 $self->{view_y} = $y;
994 947
995 $self->emit (changed => $x, $y); 948 $self->emit (changed => $x, $y);
996 $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);
997 } 968 }
998} 969}
999 970
1000# 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
1001sub coord2local { 972sub coord2local {
… …
1048 my $child = delete $arg{child}; 1019 my $child = delete $arg{child};
1049 1020
1050 my $self; 1021 my $self;
1051 1022
1052 my $hslider = new CFPlus::UI::Slider 1023 my $hslider = new CFPlus::UI::Slider
1053 col => 0, 1024 c_col => 0,
1054 row => 1, 1025 c_row => 1,
1055 vertical => 0, 1026 vertical => 0,
1056 range => [0, 0, 1, 0.01], # HACK fix 1027 range => [0, 0, 1, 0.01], # HACK fix
1057 on_changed => sub { 1028 on_changed => sub {
1058 $self->{hpos} = $_[1]; 1029 $self->{hpos} = $_[1];
1059 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1030 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1060 }, 1031 },
1061 ; 1032 ;
1062 1033
1063 my $vslider = new CFPlus::UI::Slider 1034 my $vslider = new CFPlus::UI::Slider
1064 col => 1, 1035 c_col => 1,
1065 row => 0, 1036 c_row => 0,
1066 vertical => 1, 1037 vertical => 1,
1067 range => [0, 0, 1, 0.01], # HACK fix 1038 range => [0, 0, 1, 0.01], # HACK fix
1068 on_changed => sub { 1039 on_changed => sub {
1069 $self->{vpos} = $_[1]; 1040 $self->{vpos} = $_[1];
1070 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1041 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1081 row_expand => [1, 0], 1052 row_expand => [1, 0],
1082 %arg, 1053 %arg,
1083 ); 1054 );
1084 1055
1085 $self->{vp} = new CFPlus::UI::ViewPort 1056 $self->{vp} = new CFPlus::UI::ViewPort
1086 col => 0, 1057 c_col => 0,
1087 row => 0, 1058 c_row => 0,
1088 expand => 1, 1059 expand => 1,
1089 scroll_x => $self->{scroll_x}, 1060 scroll_x => $self->{scroll_x},
1090 scroll_y => $self->{scroll_y}, 1061 scroll_y => $self->{scroll_y},
1091 on_changed => sub { 1062 on_changed => sub {
1092 my ($vp, $x, $y) = @_; 1063 my ($vp, $x, $y) = @_;
… …
1114 my ($self, $widget) = @_; 1085 my ($self, $widget) = @_;
1115 1086
1116 $self->{vp}->add ($self->{child} = $widget); 1087 $self->{vp}->add ($self->{child} = $widget);
1117} 1088}
1118 1089
1090sub set_offset { shift->{vp}->set_offset (@_) }
1091sub set_center { shift->{vp}->set_center (@_) }
1092sub make_visible { shift->{vp}->make_visible (@_) }
1093
1119sub update_slider { 1094sub update_slider {
1120 my ($self) = @_; 1095 my ($self) = @_;
1121 1096
1122 my $child = ($self->{vp} or return)->child; 1097 my $child = ($self->{vp} or return)->child;
1123 1098
… …
1236 my ($w, $h) = @$self{qw(w h)}; 1211 my ($w, $h) = @$self{qw(w h)};
1237 1212
1238 glEnable GL_BLEND; 1213 glEnable GL_BLEND;
1239 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1214 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1240 glColor_premultiply @{ $self->{bg} }; 1215 glColor_premultiply @{ $self->{bg} };
1241
1242 glBegin GL_QUADS;
1243 glVertex 0 , 0;
1244 glVertex 0 , $h;
1245 glVertex $w, $h; 1216 glRect 0, 0, $w, $h;
1246 glVertex $w, 0;
1247 glEnd;
1248
1249 glDisable GL_BLEND; 1217 glDisable GL_BLEND;
1250 } 1218 }
1251 1219
1252 $self->SUPER::_draw; 1220 $self->SUPER::_draw;
1253} 1221}
… …
1615 1583
1616sub add { 1584sub add {
1617 my ($self, @widgets) = @_; 1585 my ($self, @widgets) = @_;
1618 1586
1619 for my $child (@widgets) { 1587 for my $child (@widgets) {
1620 $child->{rowspan} ||= 1; 1588 $child->{c_rowspan} ||= 1;
1621 $child->{colspan} ||= 1; 1589 $child->{c_colspan} ||= 1;
1622 } 1590 }
1623 1591
1624 $self->SUPER::add (@widgets); 1592 $self->SUPER::add (@widgets);
1625} 1593}
1626 1594
… …
1630 my @widgets; 1598 my @widgets;
1631 1599
1632 while (@_) { 1600 while (@_) {
1633 my ($col, $row, $child) = splice @_, 0, 3, (); 1601 my ($col, $row, $child) = splice @_, 0, 3, ();
1634 1602
1635 $child->{row} = $row; 1603 $child->{c_row} = $row;
1636 $child->{col} = $col; 1604 $child->{c_col} = $col;
1637 1605
1638 push @widgets, $child; 1606 push @widgets, $child;
1639 } 1607 }
1640 1608
1641 $self->add (@widgets); 1609 $self->add (@widgets);
… …
1647 my (@w, @h); 1615 my (@w, @h);
1648 1616
1649 my @children = $self->children; 1617 my @children = $self->children;
1650 1618
1651 # first pass, columns 1619 # first pass, columns
1652 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) { 1620 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1653 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; 1621 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1654 1622
1655 my $sw = sum @w[$c .. $c + $cs - 1]; 1623 my $sw = sum @w[$c .. $c + $cs - 1];
1656 1624
1657 if ($w > $sw) { 1625 if ($w > $sw) {
1658 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; 1626 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1659 } 1627 }
1660 } 1628 }
1661 1629
1662 # second pass, rows 1630 # second pass, rows
1663 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { 1631 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1664 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; 1632 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1665 1633
1666 my $sh = sum @h[$r .. $r + $rs - 1]; 1634 my $sh = sum @h[$r .. $r + $rs - 1];
1667 1635
1668 if ($h > $sh) { 1636 if ($h > $sh) {
1669 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; 1637 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
… …
1711 1679
1712 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } 1680 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1713 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } 1681 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1714 1682
1715 for my $widget ($self->children) { 1683 for my $widget ($self->children) {
1716 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)};
1717 1685
1718 $widget->configure ( 1686 $widget->configure (
1719 $x[$c], $y[$r], 1687 $x[$c], $y[$r],
1720 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r], 1688 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1721 ); 1689 );
… …
1730 1698
1731use List::Util qw(min max); 1699use List::Util qw(min max);
1732 1700
1733our @ISA = CFPlus::UI::Container::; 1701our @ISA = CFPlus::UI::Container::;
1734 1702
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($$$) { 1703sub _scale($$$) {
1743 my ($mode, $val, $max) = @_; 1704 my ($rel, $val, $max) = @_;
1744 1705
1745 $mode eq "abs" ? $val 1706 $rel ? $val * $max : $val
1746 : $mode eq "rel" ? $val * $max
1747 : 0
1748} 1707}
1749 1708
1750sub size_request { 1709sub size_request {
1751 my ($self) = @_; 1710 my ($self) = @_;
1752 1711
1753 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1712 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1754 1713
1755 # determine overall size by querying abs widgets 1714 # determine overall size by querying abs widgets
1756 for my $child ($self->visible_children) { 1715 for my $child ($self->visible_children) {
1757 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};
1758 1719
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; 1720 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1764 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1721 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1765 } 1722 }
1766 } 1723 }
1767 1724
1768 my $W = $x2 - $x1; 1725 my $W = $x2 - $x1;
1769 my $H = $y2 - $y1; 1726 my $H = $y2 - $y1;
1770 1727
1771 # now layout remaining widgets 1728 # now layout remaining widgets
1772 for my $child ($self->visible_children) { 1729 for my $child ($self->visible_children) {
1773 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;
1774 1733
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; 1734 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1782 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1735 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1783 } 1736 }
1784 } 1737 }
1785 1738
1786 my $W = $x2 - $x1; 1739 my $W = $x2 - $x1;
1787 my $H = $y2 - $y1; 1740 my $H = $y2 - $y1;
… …
1791 1744
1792sub invoke_size_allocate { 1745sub invoke_size_allocate {
1793 my ($self, $W, $H) = @_; 1746 my ($self, $W, $H) = @_;
1794 1747
1795 for my $child ($self->visible_children) { 1748 for my $child ($self->visible_children) {
1796 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;
1797 1751
1798 $x = _scale $pos, $x, $W; 1752 $x += $child->{c_halign} * $child->{req_w};
1799 $y = _scale $pos, $x, $H; 1753 $y += $child->{c_valign} * $child->{req_h};
1800 $w = _scale $size, $w, $W;
1801 $h = _scale $size, $h, $H;
1802 1754
1803 $child->configure ($x, $y, $w, $h); 1755 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1804 } 1756 }
1805 1757
1806 1 1758 1
1807} 1759}
1808 1760
… …
1812 1764
1813our @ISA = CFPlus::UI::Container::; 1765our @ISA = CFPlus::UI::Container::;
1814 1766
1815sub size_request { 1767sub size_request {
1816 my ($self) = @_; 1768 my ($self) = @_;
1769
1770 my @children = $self->visible_children;
1817 1771
1818 $self->{vertical} 1772 $self->{vertical}
1819 ? ( 1773 ? (
1820 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1774 (List::Util::max map $_->{req_w}, @children),
1821 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1775 (List::Util::sum map $_->{req_h}, @children),
1822 ) 1776 )
1823 : ( 1777 : (
1824 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1778 (List::Util::sum map $_->{req_w}, @children),
1825 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1779 (List::Util::max map $_->{req_h}, @children),
1826 ) 1780 )
1827} 1781}
1828 1782
1829sub invoke_size_allocate { 1783sub invoke_size_allocate {
1830 my ($self, $w, $h) = @_; 1784 my ($self, $w, $h) = @_;
… …
1954 1908
1955 delete $self->{ox}; 1909 delete $self->{ox};
1956 $self->SUPER::realloc; 1910 $self->SUPER::realloc;
1957} 1911}
1958 1912
1913sub clear {
1914 my ($self) = @_;
1915
1916 $self->set_text ("");
1917}
1918
1959sub set_text { 1919sub set_text {
1960 my ($self, $text) = @_; 1920 my ($self, $text) = @_;
1961 1921
1962 return if $self->{text} eq "T$text"; 1922 return if $self->{text} eq "T$text";
1963 $self->{text} = "T$text"; 1923 $self->{text} = "T$text";
… …
2069 : ($self->{w} - $size->[0]) * 0.5); 2029 : ($self->{w} - $size->[0]) * 0.5);
2070 2030
2071 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2031 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2072 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2032 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2073 : ($self->{h} - $size->[1]) * 0.5); 2033 : ($self->{h} - $size->[1]) * 0.5);
2034
2035 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2074 }; 2036 };
2075 2037
2076 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2038# unless ($self->{list}) {
2077 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2039# $self->{list} = CFPlus::OpenGL::glGenList;
2078 2040# CFPlus::OpenGL::glNewList $self->{list};
2079 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2041# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2042# CFPlus::OpenGL::glEndList;
2043# }
2044#
2045# CFPlus::OpenGL::glCallList $self->{list};
2046
2047 $self->{layout}->draw;
2080} 2048}
2049
2050#sub destroy {
2051# my ($self) = @_;
2052#
2053# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2054#
2055# $self->SUPER::destroy;
2056#}
2081 2057
2082############################################################################# 2058#############################################################################
2083 2059
2084package CFPlus::UI::EntryBase; 2060package CFPlus::UI::EntryBase;
2085 2061
… …
2091 my $class = shift; 2067 my $class = shift;
2092 2068
2093 $class->SUPER::new ( 2069 $class->SUPER::new (
2094 fg => [1, 1, 1], 2070 fg => [1, 1, 1],
2095 bg => [0, 0, 0, 0.2], 2071 bg => [0, 0, 0, 0.2],
2072 outline => [0.6, 0.3, 0.1],
2096 active_bg => [1, 1, 1, 0.5], 2073 active_bg => [0, 0, 1, .2],
2097 active_fg => [0, 0, 0], 2074 active_fg => [1, 1, 1],
2075 active_outline => [1, 1, 0],
2098 can_hover => 1, 2076 can_hover => 1,
2099 can_focus => 1, 2077 can_focus => 1,
2100 valign => 0, 2078 valign => 0,
2101 can_events => 1, 2079 can_events => 1,
2102 ellipsise => 0, 2080 ellipsise => 0,
… …
2242 glColor_premultiply @{$self->{bg}}; 2220 glColor_premultiply @{$self->{bg}};
2243 } 2221 }
2244 2222
2245 glEnable GL_BLEND; 2223 glEnable GL_BLEND;
2246 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2224 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2247 glBegin GL_QUADS;
2248 glVertex 0 , 0;
2249 glVertex 0 , $self->{h};
2250 glVertex $self->{w}, $self->{h}; 2225 glRect 0, 0, $self->{w}, $self->{h};
2251 glVertex $self->{w}, 0;
2252 glEnd;
2253 glDisable GL_BLEND; 2226 glDisable GL_BLEND;
2254 2227
2255 $self->SUPER::_draw; 2228 $self->SUPER::_draw;
2256 2229
2257 #TODO: force update every cursor change :( 2230 #TODO: force update every cursor change :(
… …
2259 2232
2260 unless (exists $self->{cur_h}) { 2233 unless (exists $self->{cur_h}) {
2261 my $text = substr $self->{text}, 0, $self->{cursor}; 2234 my $text = substr $self->{text}, 0, $self->{cursor};
2262 utf8::encode $text; 2235 utf8::encode $text;
2263 2236
2264 @$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);
2265 } 2238 }
2266 2239
2240 glColor_premultiply @{$self->{active_fg}};
2267 glBegin GL_LINES; 2241 glBegin GL_LINES;
2268 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};
2269 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;
2270 glEnd; 2259 glEnd;
2271 } 2260 }
2272} 2261}
2273 2262
2274############################################################################# 2263#############################################################################
… …
2361 1 2350 1
2362} 2351}
2363 2352
2364############################################################################# 2353#############################################################################
2365 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
2366package CFPlus::UI::Button; 2404package CFPlus::UI::Button;
2367 2405
2368our @ISA = CFPlus::UI::Label::; 2406our @ISA = CFPlus::UI::Label::;
2369 2407
2370use CFPlus::OpenGL; 2408use CFPlus::OpenGL;
… …
2504sub new { 2542sub new {
2505 my $class = shift; 2543 my $class = shift;
2506 2544
2507 my $self = $class->SUPER::new ( 2545 my $self = $class->SUPER::new (
2508 can_events => 0, 2546 can_events => 0,
2547 scale => 1,
2509 @_, 2548 @_,
2510 ); 2549 );
2511 2550
2512 $self->{path} || $self->{tex} 2551 $self->{path} || $self->{tex}
2513 or Carp::croak "'path' or 'tex' attributes required"; 2552 or Carp::croak "'path' or 'tex' attributes required";
… …
2538} 2577}
2539 2578
2540sub size_request { 2579sub size_request {
2541 my ($self) = @_; 2580 my ($self) = @_;
2542 2581
2543 ($self->{tex}{w}, $self->{tex}{h}) 2582 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2544} 2583}
2545 2584
2546sub _draw { 2585sub _draw {
2547 my ($self) = @_; 2586 my ($self) = @_;
2548 2587
… …
2558 } 2597 }
2559 2598
2560 glEnable GL_TEXTURE_2D; 2599 glEnable GL_TEXTURE_2D;
2561 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2600 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2562 2601
2563 $tex->draw_quad (0, 0, $w, $h); 2602 $tex->draw_quad_alpha (0, 0, $w, $h);
2564 2603
2565 glDisable GL_TEXTURE_2D; 2604 glDisable GL_TEXTURE_2D;
2566} 2605}
2567 2606
2568############################################################################# 2607#############################################################################
… …
2587 align => 0, 2626 align => 0,
2588 valign => 0, 2627 valign => 0,
2589 can_events => 1, 2628 can_events => 1,
2590 @_ 2629 @_
2591 ); 2630 );
2631}
2632
2633sub invoke_button_down {
2634 my ($self, $ev, $x, $y) = @_;
2635
2636 1
2592} 2637}
2593 2638
2594sub invoke_button_up { 2639sub invoke_button_up {
2595 my ($self, $ev, $x, $y) = @_; 2640 my ($self, $ev, $x, $y) = @_;
2596 2641
… …
2736 glDisable GL_TEXTURE_2D; 2781 glDisable GL_TEXTURE_2D;
2737} 2782}
2738 2783
2739############################################################################# 2784#############################################################################
2740 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 %arg,
2806 text => "-",
2807 value => -1,
2808 );
2809
2810 $self->set_value ($arg{value}) if exists $arg{value};
2811
2812 $self
2813}
2814
2815sub set_value {
2816 my ($self, $value) = @_;
2817
2818 if ($self->{value} != $value) {
2819 $self->{value} = $value;
2820 $self->set_text (sprintf "%d%%", $value * 100);
2821 $self->update;
2822 }
2823}
2824
2825sub _draw {
2826 my ($self) = @_;
2827
2828 glEnable GL_BLEND;
2829 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2830
2831 if ($self->{value} >= 0) {
2832 my $s = 3 + ($self->{w} - 6) * $self->{value};
2833
2834 glColor_premultiply @{$self->{bar}};
2835 glRect 2, 2, $s, $self->{h} - 2;
2836 glColor_premultiply @{$self->{bg}};
2837 glRect $s + 1, 0, $self->{w} - 2, $self->{h} - 2;
2838 }
2839
2840 glColor_premultiply @{$self->{outline}};
2841 glRect_lineloop 1, 1, $self->{w} - 2, $self->{h} - 2;
2842
2843 glDisable GL_BLEND;
2844
2845 {
2846 local $self->{bg}; # do not draw background
2847 $self->SUPER::_draw;
2848 }
2849}
2850
2851#############################################################################
2852
2853package CFPlus::UI::ExperienceProgress;
2854
2855our @ISA = CFPlus::UI::Progress::;
2856
2857sub new {
2858 my ($class, %arg) = @_;
2859
2860 my $self = $class->SUPER::new (
2861 %arg
2862 );
2863
2864 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2865 if $::CONN;
2866
2867 $self
2868}
2869
2870sub DESTROY {
2871 my ($self) = @_;
2872
2873 delete $::CONN->{on_exp_update}{$self+0}
2874 if $::CONN;
2875
2876 $self->SUPER::DESTROY;
2877}
2878
2879sub set_value {
2880 my ($self, $lvl, $exp) = @_;
2881
2882 my $v = 0;
2883
2884 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2885 my $l0 = $table->[$lvl - 1];
2886 my $l1 = $table->[$lvl];
2887
2888 $v = ($exp - $l0) / ($l1 - $l0);
2889 }
2890
2891 $self->SUPER::set_value ($v);
2892}
2893
2894#############################################################################
2895
2741package CFPlus::UI::Gauge; 2896package CFPlus::UI::Gauge;
2742 2897
2743our @ISA = CFPlus::UI::VBox::; 2898our @ISA = CFPlus::UI::VBox::;
2744 2899
2745sub new { 2900sub new {
… …
2870 3025
2871 $self->SUPER::invoke_button_down ($ev, $x, $y); 3026 $self->SUPER::invoke_button_down ($ev, $x, $y);
2872 3027
2873 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3028 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2874 3029
2875 $self->invoke_mouse_motion ($ev, $x, $y) 3030 $self->invoke_mouse_motion ($ev, $x, $y);
3031
3032 1
2876} 3033}
2877 3034
2878sub invoke_mouse_motion { 3035sub invoke_mouse_motion {
2879 my ($self, $ev, $x, $y) = @_; 3036 my ($self, $ev, $x, $y) = @_;
2880 3037
… …
2900 3057
2901 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3058 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2902 3059
2903 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3060 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2904 3061
2905 ! ! $delta 3062 1
2906} 3063}
2907 3064
2908sub update { 3065sub update {
2909 my ($self) = @_; 3066 my ($self) = @_;
2910 3067
… …
3041} 3198}
3042 3199
3043sub size_request { 3200sub size_request {
3044 my ($self) = @_; 3201 my ($self) = @_;
3045 3202
3046 my ($empty, $slider) = @{ $self->{children} }; 3203 my ($empty, $slider) = $self->visible_children;
3047 3204
3048 local $self->{children} = [$empty, $slider]; 3205 local $self->{children} = [$empty, $slider];
3049 $self->SUPER::size_request 3206 $self->SUPER::size_request
3050} 3207}
3051 3208
… …
3240 3397
3241 if ($y0 < $y + $h && $y < $y1) { 3398 if ($y0 < $y + $h && $y < $y1) {
3242 my $layout = $self->get_layout ($para); 3399 my $layout = $self->get_layout ($para);
3243 3400
3244 $layout->render ($para->{indent}, $y - $y0); 3401 $layout->render ($para->{indent}, $y - $y0);
3402 $layout->draw;
3245 3403
3246 if (my @w = @{ $para->{widget} }) { 3404 if (my @w = @{ $para->{widget} }) {
3247 my @s = $layout->get_shapes; 3405 my @s = $layout->get_shapes;
3248 3406
3249 for (@w) { 3407 for (@w) {
… …
3440 glTranslate 0.375, 0.375; 3598 glTranslate 0.375, 0.375;
3441 3599
3442 my ($w, $h) = @$self{qw(w h)}; 3600 my ($w, $h) = @$self{qw(w h)};
3443 3601
3444 glColor 1, 0.8, 0.4; 3602 glColor 1, 0.8, 0.4;
3445 glBegin GL_QUADS; 3603 glRect 0, 0, $w, $h;
3446 glVertex 0 , 0;
3447 glVertex 0 , $h;
3448 glVertex $w, $h;
3449 glVertex $w, 0;
3450 glEnd;
3451 3604
3452 glColor 0, 0, 0; 3605 glColor 0, 0, 0;
3453 glBegin GL_LINE_LOOP; 3606 glRect_lineloop 0, 0, $w, $h;
3454 glVertex 0 , 0;
3455 glVertex 0 , $h;
3456 glVertex $w, $h;
3457 glVertex $w, 0;
3458 glEnd;
3459 3607
3460 glTranslate 2 - 0.375, 2 - 0.375; 3608 glTranslate 2 - 0.375, 2 - 0.375;
3461 3609
3462 $self->SUPER::_draw; 3610 $self->SUPER::_draw;
3463} 3611}
… …
3483 3631
3484 if ($self->{anim} && $self->{animspeed}) { 3632 if ($self->{anim} && $self->{animspeed}) {
3485 CFPlus::weaken (my $widget = $self); 3633 CFPlus::weaken (my $widget = $self);
3486 3634
3487 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3635 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3488 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed}; 3636 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3489 $self->{timer} = Event->timer ( 3637 $self->{timer} = Event->timer (
3490 parked => 1, 3638 parked => 1,
3491 cb => sub { 3639 cb => sub {
3492 return unless $::CONN && $widget; 3640 return unless $::CONN;
3493 3641
3642 my $w = $widget
3643 or return;
3644
3494 ++$widget->{frame}; 3645 ++$w->{frame};
3495 $widget->update_face; 3646 $w->update_face;
3647
3648 # somehow, $widget can go away
3496 $widget->update; 3649 $w->update;
3497
3498 $widget->update_timer; 3650 $w->update_timer;
3499 }, 3651 },
3500 ); 3652 );
3501 3653
3502 $self->update_face; 3654 $self->update_face;
3503 $self->update_timer; 3655 $self->update_timer;
… …
3524} 3676}
3525 3677
3526sub update_face { 3678sub update_face {
3527 my ($self) = @_; 3679 my ($self) = @_;
3528 3680
3529 return unless $::CONN; 3681 if ($::CONN) {
3530
3531 if (my $anim = $::CONN->{anim}[$self->{anim}]) { 3682 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3532 if ($anim && @$anim) { 3683 if ($anim && @$anim) {
3533 delete $self->{wait_face};
3534 $self->{face} = $anim->[ $self->{frame} % @$anim ]; 3684 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3685 delete $self->{face_change_cb};
3686
3687 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3688 unless ($tex->{name} || $tex->{loading}) {
3689 $tex->upload (sub { $self->reconfigure });
3690 }
3691 }
3692 }
3535 } 3693 }
3536 } 3694 }
3537} 3695}
3538 3696
3539sub size_request { 3697sub size_request {
3540 my ($self) = @_; 3698 my ($self) = @_;
3541 3699
3542 if ($::CONN) { 3700 if ($::CONN) {
3543 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3701 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3544 if (my $tex = $::CONN->{texture}[$faceid]) { 3702 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3545 $self->{tex} = $tex; 3703 if ($tex->{name}) {
3546 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3704 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3547 } else { 3705 } elsif (!$tex->{loading}) {
3548 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3706 $tex->upload (sub { $self->reconfigure });
3549 $self->realloc;
3550 }); 3707 }
3551 } 3708 }
3709
3710 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3552 } 3711 }
3553 } 3712 }
3554 3713
3555 ($self->{size_w} || 8, $self->{size_h} || 8) 3714 ($self->{size_w} || 8, $self->{size_h} || 8)
3556} 3715}
… …
3636 children => [ 3795 children => [
3637 (new CFPlus::UI::Label markup => $left, expand => 1), 3796 (new CFPlus::UI::Label markup => $left, expand => 1),
3638 (new CFPlus::UI::Label markup => $right, align => +1), 3797 (new CFPlus::UI::Label markup => $right, align => +1),
3639 ], 3798 ],
3640 ; 3799 ;
3641 3800
3642 } else { 3801 } else {
3643 $widget = new CFPlus::UI::Label 3802 $widget = new CFPlus::UI::Label
3644 can_hover => 1, 3803 can_hover => 1,
3645 can_events => 1, 3804 can_events => 1,
3646 markup => $widget, 3805 markup => $widget,
… …
3782 buttonbar => (new CFPlus::UI::Buttonbar), 3941 buttonbar => (new CFPlus::UI::Buttonbar),
3783 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3942 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3784 # filter => # will be put between multiplexer and $self 3943 # filter => # will be put between multiplexer and $self
3785 @_, 3944 @_,
3786 ); 3945 );
3787 3946
3788 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3947 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3789 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3948 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3790 3949
3950 {
3951 Scalar::Util::weaken (my $wself = $self);
3952
3953 $self->{multiplexer}->connect (c_add => sub {
3954 my ($mplex, $widgets) = @_;
3955
3956 for my $child (@$widgets) {
3957 Scalar::Util::weaken $child;
3958 $child->{c_tab_} ||= do {
3959 my $tab =
3960 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3961 ? $child->{c_tab}
3962 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3963
3964 $tab->connect (activate => sub {
3965 $wself->set_current_page ($child);
3966 });
3967
3968 $tab
3969 };
3970
3971 $self->{buttonbar}->add ($child->{c_tab_});
3972 }
3973 });
3974
3975 $self->{multiplexer}->connect (c_remove => sub {
3976 my ($mplex, $widgets) = @_;
3977
3978 for my $child (@$widgets) {
3979 $wself->{buttonbar}->remove ($child->{c_tab_});
3980 }
3981 });
3982 }
3983
3791 $self 3984 $self
3792} 3985}
3793 3986
3794sub add { 3987sub add {
3988 my ($self, @widgets) = @_;
3989
3990 $self->{multiplexer}->add (@widgets)
3991}
3992
3993sub remove {
3994 my ($self, @widgets) = @_;
3995
3996 $self->{multiplexer}->remove (@widgets)
3997}
3998
3999sub pages {
4000 my ($self) = @_;
4001 $self->{multiplexer}->children
4002}
4003
4004sub add_tab {
3795 my ($self, $title, $widget, $tooltip) = @_; 4005 my ($self, $title, $widget, $tooltip) = @_;
3796 4006
3797 CFPlus::weaken $self; 4007 $title = [$title, $tooltip] unless ref $title;
4008 $widget->{c_tab} = $title;
3798 4009
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); 4010 $self->add ($widget);
3806} 4011}
3807 4012
3808sub get_current_page { 4013sub get_current_page {
3809 my ($self) = @_; 4014 my ($self) = @_;
3810 4015
… …
4093} 4298}
4094 4299
4095sub update { 4300sub update {
4096 my ($self) = @_; 4301 my ($self) = @_;
4097 4302
4098 $::WANT_REFRESH++; 4303 $::WANT_REFRESH->start;
4099} 4304}
4100 4305
4101sub add { 4306sub add {
4102 my ($self, @children) = @_; 4307 my ($self, @children) = @_;
4103 4308

Diff Legend

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