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.398 by root, Sat Jul 21 14:32:10 2007 UTC vs.
Revision 1.426 by root, Sat Aug 11 12:07:54 2007 UTC

… …
273 $self->emit ("destroy"); 273 $self->emit ("destroy");
274 %$self = (); 274 %$self = ();
275} 275}
276 276
277sub TO_JSON { 277sub TO_JSON {
278 { __widget_ref__ => $_[0]{s_id} } 278 { __w_ => $_[0]{s_id} }
279} 279}
280 280
281sub show { 281sub show {
282 my ($self) = @_; 282 my ($self) = @_;
283 283
… …
593 593
594# using global variables seems a bit hacky, but passing through all drawing 594# using global variables seems a bit hacky, but passing through all drawing
595# functions seems pointless. 595# functions seems pointless.
596our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 596our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
597 597
598sub draw { 598#sub draw {
599 my ($self) = @_; 599#CFPlus.xs
600
601 return unless $self->{h} && $self->{w};
602
603 # update screen rectangle
604 local $draw_x = $draw_x + $self->{x};
605 local $draw_y = $draw_y + $self->{y};
606
607 # skip widgets that are entirely outside the drawing area
608 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
609 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
610
611 glPushMatrix;
612 glTranslate $self->{x}, $self->{y}, 0;
613
614 if ($self == $HOVER && $self->{can_hover}) {
615 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
616 glEnable GL_BLEND;
617 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
618 glBegin GL_QUADS;
619 glVertex 0 , 0;
620 glVertex $self->{w}, 0;
621 glVertex $self->{w}, $self->{h};
622 glVertex 0 , $self->{h};
623 glEnd;
624 glDisable GL_BLEND;
625 }
626
627 if ($ENV{CFPLUS_DEBUG} & 1) {
628 glPushMatrix;
629 glColor 1, 1, 0, 1;
630 glTranslate 0.375, 0.375;
631 glBegin GL_LINE_LOOP;
632 glVertex 0 , 0;
633 glVertex $self->{w} - 1, 0;
634 glVertex $self->{w} - 1, $self->{h} - 1;
635 glVertex 0 , $self->{h} - 1;
636 glEnd;
637 glPopMatrix;
638 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
639 }
640
641 $self->_draw;
642 glPopMatrix;
643}
644 600
645sub _draw { 601sub _draw {
646 my ($self) = @_; 602 my ($self) = @_;
647 603
648 warn "no draw defined for $self\n"; 604 warn "no draw defined for $self\n";
649} 605}
650 606
651my $cntx;#d#
652sub DESTROY { 607sub DESTROY {
653 my ($self) = @_; 608 my ($self) = @_;
654 609
655 return if CFPlus::in_destruct; 610 return if CFPlus::in_destruct;
656 611
… …
769 sort { $a->{z} <=> $b->{z} } 724 sort { $a->{z} <=> $b->{z} }
770 @{$self->{children}}, @widgets 725 @{$self->{children}}, @widgets
771 ]; 726 ];
772 727
773 $self->realloc; 728 $self->realloc;
729
730 $self->emit (c_add => \@widgets);
731
732 map $_+0, @widgets
774} 733}
775 734
776sub children { 735sub children {
777 @{ $_[0]{children} } 736 @{ $_[0]{children} }
778} 737}
779 738
780sub remove { 739sub remove {
781 my ($self, $child) = @_; 740 my ($self, @widgets) = @_;
782 741
742 $self->emit (c_remove => \@widgets);
743
744 for my $child (@widgets) {
783 delete $child->{parent}; 745 delete $child->{parent};
784 $child->hide; 746 $child->hide;
785
786 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 747 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
748 }
787 749
788 $self->realloc; 750 $self->realloc;
789} 751}
790 752
791sub clear { 753sub clear {
… …
819} 781}
820 782
821sub _draw { 783sub _draw {
822 my ($self) = @_; 784 my ($self) = @_;
823 785
824 $_->draw for @{$self->{children}}; 786 $_->draw for $self->visible_children;
825} 787}
826 788
827############################################################################# 789#############################################################################
828 790
829package CFPlus::UI::Bin; 791package CFPlus::UI::Bin;
… …
839} 801}
840 802
841sub add { 803sub add {
842 my ($self, $child) = @_; 804 my ($self, $child) = @_;
843 805
844 $self->SUPER::remove ($_) for @{ $self->{children} }; 806 $self->clear;
845 $self->SUPER::add ($child); 807 $self->SUPER::add ($child);
846} 808}
847 809
848sub remove { 810sub remove {
849 my ($self, $widget) = @_; 811 my ($self, $widget) = @_;
… …
991 $self->{view_x} = $x; 953 $self->{view_x} = $x;
992 $self->{view_y} = $y; 954 $self->{view_y} = $y;
993 955
994 $self->emit (changed => $x, $y); 956 $self->emit (changed => $x, $y);
995 $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);
996 } 976 }
997} 977}
998 978
999# 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
1000sub coord2local { 980sub coord2local {
… …
1047 my $child = delete $arg{child}; 1027 my $child = delete $arg{child};
1048 1028
1049 my $self; 1029 my $self;
1050 1030
1051 my $hslider = new CFPlus::UI::Slider 1031 my $hslider = new CFPlus::UI::Slider
1052 col => 0, 1032 c_col => 0,
1053 row => 1, 1033 c_row => 1,
1054 vertical => 0, 1034 vertical => 0,
1055 range => [0, 0, 1, 0.01], # HACK fix 1035 range => [0, 0, 1, 0.01], # HACK fix
1056 on_changed => sub { 1036 on_changed => sub {
1057 $self->{hpos} = $_[1]; 1037 $self->{hpos} = $_[1];
1058 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1038 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1059 }, 1039 },
1060 ; 1040 ;
1061 1041
1062 my $vslider = new CFPlus::UI::Slider 1042 my $vslider = new CFPlus::UI::Slider
1063 col => 1, 1043 c_col => 1,
1064 row => 0, 1044 c_row => 0,
1065 vertical => 1, 1045 vertical => 1,
1066 range => [0, 0, 1, 0.01], # HACK fix 1046 range => [0, 0, 1, 0.01], # HACK fix
1067 on_changed => sub { 1047 on_changed => sub {
1068 $self->{vpos} = $_[1]; 1048 $self->{vpos} = $_[1];
1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1049 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1080 row_expand => [1, 0], 1060 row_expand => [1, 0],
1081 %arg, 1061 %arg,
1082 ); 1062 );
1083 1063
1084 $self->{vp} = new CFPlus::UI::ViewPort 1064 $self->{vp} = new CFPlus::UI::ViewPort
1085 col => 0, 1065 c_col => 0,
1086 row => 0, 1066 c_row => 0,
1087 expand => 1, 1067 expand => 1,
1088 scroll_x => $self->{scroll_x}, 1068 scroll_x => $self->{scroll_x},
1089 scroll_y => $self->{scroll_y}, 1069 scroll_y => $self->{scroll_y},
1090 on_changed => sub { 1070 on_changed => sub {
1091 my ($vp, $x, $y) = @_; 1071 my ($vp, $x, $y) = @_;
… …
1093 $vp->{parent}{hslider}->set_value ($x); 1073 $vp->{parent}{hslider}->set_value ($x);
1094 $vp->{parent}{vslider}->set_value ($y); 1074 $vp->{parent}{vslider}->set_value ($y);
1095 1075
1096 0 1076 0
1097 }, 1077 },
1078 on_size_allocate => sub {
1079 my ($vp, $w, $h) = @_;
1080 $vp->{parent}->update_slider;
1081 0
1082 },
1098 ; 1083 ;
1099 1084
1100 $self->SUPER::add ($self->{vp}); 1085 $self->SUPER::add ($self->{vp});
1101 1086
1102 $self->add ($child) if $child; 1087 $self->add ($child) if $child;
… …
1108 my ($self, $widget) = @_; 1093 my ($self, $widget) = @_;
1109 1094
1110 $self->{vp}->add ($self->{child} = $widget); 1095 $self->{vp}->add ($self->{child} = $widget);
1111} 1096}
1112 1097
1098sub set_offset { shift->{vp}->set_offset (@_) }
1099sub set_center { shift->{vp}->set_center (@_) }
1100sub make_visible { shift->{vp}->make_visible (@_) }
1101
1113sub update_slider { 1102sub update_slider {
1114 my ($self) = @_; 1103 my ($self) = @_;
1115 1104
1116 my $child = ($self->{vp} or return)->child; 1105 my $child = ($self->{vp} or return)->child;
1117 1106
1107 if ($self->{scroll_x}) {
1118 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1108 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1119 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); 1109 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1120 1110
1121 my $visible = $w1 > $w2; 1111 my $visible = $w1 > $w2;
1122 if ($visible != $self->{hslider_visible}) { 1112 if ($visible != $self->{hslider_visible}) {
1123 $self->{hslider_visible} = $visible; 1113 $self->{hslider_visible} = $visible;
1124 $visible ? $self->SUPER::add ($self->{hslider}) 1114 $visible ? $self->SUPER::add ($self->{hslider})
1125 : $self->SUPER::remove ($self->{hslider}); 1115 : $self->SUPER::remove ($self->{hslider});
1116 }
1126 } 1117 }
1127 1118
1119 if ($self->{scroll_y}) {
1128 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1120 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1129 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); 1121 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1130 1122
1131 my $visible = $h1 > $h2; 1123 my $visible = $h1 > $h2;
1132 if ($visible != $self->{vslider_visible}) { 1124 if ($visible != $self->{vslider_visible}) {
1133 $self->{vslider_visible} = $visible; 1125 $self->{vslider_visible} = $visible;
1134 $visible ? $self->SUPER::add ($self->{vslider}) 1126 $visible ? $self->SUPER::add ($self->{vslider})
1135 : $self->SUPER::remove ($self->{vslider}); 1127 : $self->SUPER::remove ($self->{vslider});
1128 }
1136 } 1129 }
1137} 1130}
1138 1131
1139sub start_dragging { 1132sub start_dragging {
1140 my ($self, $ev) = @_; 1133 my ($self, $ev) = @_;
… …
1605 1598
1606sub add { 1599sub add {
1607 my ($self, @widgets) = @_; 1600 my ($self, @widgets) = @_;
1608 1601
1609 for my $child (@widgets) { 1602 for my $child (@widgets) {
1610 $child->{rowspan} ||= 1; 1603 $child->{c_rowspan} ||= 1;
1611 $child->{colspan} ||= 1; 1604 $child->{c_colspan} ||= 1;
1612 } 1605 }
1613 1606
1614 $self->SUPER::add (@widgets); 1607 $self->SUPER::add (@widgets);
1615} 1608}
1616 1609
… …
1620 my @widgets; 1613 my @widgets;
1621 1614
1622 while (@_) { 1615 while (@_) {
1623 my ($col, $row, $child) = splice @_, 0, 3, (); 1616 my ($col, $row, $child) = splice @_, 0, 3, ();
1624 1617
1625 $child->{row} = $row; 1618 $child->{c_row} = $row;
1626 $child->{col} = $col; 1619 $child->{c_col} = $col;
1627 1620
1628 push @widgets, $child; 1621 push @widgets, $child;
1629 } 1622 }
1630 1623
1631 $self->add (@widgets); 1624 $self->add (@widgets);
… …
1637 my (@w, @h); 1630 my (@w, @h);
1638 1631
1639 my @children = $self->children; 1632 my @children = $self->children;
1640 1633
1641 # first pass, columns 1634 # first pass, columns
1642 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) { 1635 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1643 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; 1636 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1644 1637
1645 my $sw = sum @w[$c .. $c + $cs - 1]; 1638 my $sw = sum @w[$c .. $c + $cs - 1];
1646 1639
1647 if ($w > $sw) { 1640 if ($w > $sw) {
1648 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; 1641 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1649 } 1642 }
1650 } 1643 }
1651 1644
1652 # second pass, rows 1645 # second pass, rows
1653 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { 1646 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1654 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; 1647 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1655 1648
1656 my $sh = sum @h[$r .. $r + $rs - 1]; 1649 my $sh = sum @h[$r .. $r + $rs - 1];
1657 1650
1658 if ($h > $sh) { 1651 if ($h > $sh) {
1659 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; 1652 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
… …
1701 1694
1702 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } 1695 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1703 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } 1696 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1704 1697
1705 for my $widget ($self->children) { 1698 for my $widget ($self->children) {
1706 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)};
1707 1700
1708 $widget->configure ( 1701 $widget->configure (
1709 $x[$c], $y[$r], 1702 $x[$c], $y[$r],
1710 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r], 1703 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1711 ); 1704 );
… …
1720 1713
1721use List::Util qw(min max); 1714use List::Util qw(min max);
1722 1715
1723our @ISA = CFPlus::UI::Container::; 1716our @ISA = CFPlus::UI::Container::;
1724 1717
1725sub add {
1726 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1727
1728 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1729 $self->SUPER::add ($child);
1730}
1731
1732sub _scale($$$) { 1718sub _scale($$$) {
1733 my ($mode, $val, $max) = @_; 1719 my ($rel, $val, $max) = @_;
1734 1720
1735 $mode eq "abs" ? $val 1721 $rel ? $val * $max : $val
1736 : $mode eq "rel" ? $val * $max
1737 : 0
1738} 1722}
1739 1723
1740sub size_request { 1724sub size_request {
1741 my ($self) = @_; 1725 my ($self) = @_;
1742 1726
1743 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1727 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1744 1728
1745 # determine overall size by querying abs widgets 1729 # determine overall size by querying abs widgets
1746 for my $child ($self->visible_children) { 1730 for my $child ($self->visible_children) {
1747 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};
1748 1734
1749 if ($pos eq "abs") {
1750 $w = _scale $size, $w, $child->{req_w};
1751 $h = _scale $size, $h, $child->{req_h};
1752
1753 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1735 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1754 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1736 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1755 } 1737 }
1756 } 1738 }
1757 1739
1758 my $W = $x2 - $x1; 1740 my $W = $x2 - $x1;
1759 my $H = $y2 - $y1; 1741 my $H = $y2 - $y1;
1760 1742
1761 # now layout remaining widgets 1743 # now layout remaining widgets
1762 for my $child ($self->visible_children) { 1744 for my $child ($self->visible_children) {
1763 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;
1764 1748
1765 if ($pos ne "abs") {
1766 $x = _scale $pos, $x, $W;
1767 $y = _scale $pos, $x, $H;
1768 $w = _scale $size, $w, $child->{req_w};
1769 $h = _scale $size, $h, $child->{req_h};
1770
1771 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1749 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1772 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1750 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1773 } 1751 }
1774 } 1752 }
1775 1753
1776 my $W = $x2 - $x1; 1754 my $W = $x2 - $x1;
1777 my $H = $y2 - $y1; 1755 my $H = $y2 - $y1;
… …
1781 1759
1782sub invoke_size_allocate { 1760sub invoke_size_allocate {
1783 my ($self, $W, $H) = @_; 1761 my ($self, $W, $H) = @_;
1784 1762
1785 for my $child ($self->visible_children) { 1763 for my $child ($self->visible_children) {
1786 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;
1787 1766
1788 $x = _scale $pos, $x, $W; 1767 $x += $child->{c_halign} * $child->{req_w};
1789 $y = _scale $pos, $x, $H; 1768 $y += $child->{c_valign} * $child->{req_h};
1790 $w = _scale $size, $w, $child->{req_w};
1791 $h = _scale $size, $h, $child->{req_h};
1792 1769
1793 $child->configure ($x, $y, $w, $h); 1770 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1794 } 1771 }
1795 1772
1796 1 1773 1
1797} 1774}
1798 1775
… …
1802 1779
1803our @ISA = CFPlus::UI::Container::; 1780our @ISA = CFPlus::UI::Container::;
1804 1781
1805sub size_request { 1782sub size_request {
1806 my ($self) = @_; 1783 my ($self) = @_;
1784
1785 my @children = $self->visible_children;
1807 1786
1808 $self->{vertical} 1787 $self->{vertical}
1809 ? ( 1788 ? (
1810 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1789 (List::Util::max map $_->{req_w}, @children),
1811 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1790 (List::Util::sum map $_->{req_h}, @children),
1812 ) 1791 )
1813 : ( 1792 : (
1814 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1793 (List::Util::sum map $_->{req_w}, @children),
1815 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1794 (List::Util::max map $_->{req_h}, @children),
1816 ) 1795 )
1817} 1796}
1818 1797
1819sub invoke_size_allocate { 1798sub invoke_size_allocate {
1820 my ($self, $w, $h) = @_; 1799 my ($self, $w, $h) = @_;
… …
1944 1923
1945 delete $self->{ox}; 1924 delete $self->{ox};
1946 $self->SUPER::realloc; 1925 $self->SUPER::realloc;
1947} 1926}
1948 1927
1928sub clear {
1929 my ($self) = @_;
1930
1931 $self->set_text ("");
1932}
1933
1949sub set_text { 1934sub set_text {
1950 my ($self, $text) = @_; 1935 my ($self, $text) = @_;
1951 1936
1952 return if $self->{text} eq "T$text"; 1937 return if $self->{text} eq "T$text";
1953 $self->{text} = "T$text"; 1938 $self->{text} = "T$text";
… …
2059 : ($self->{w} - $size->[0]) * 0.5); 2044 : ($self->{w} - $size->[0]) * 0.5);
2060 2045
2061 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2046 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2062 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2047 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2063 : ($self->{h} - $size->[1]) * 0.5); 2048 : ($self->{h} - $size->[1]) * 0.5);
2049
2050 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2064 }; 2051 };
2065 2052
2066 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2053# unless ($self->{list}) {
2067 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2054# $self->{list} = CFPlus::OpenGL::glGenList;
2068 2055# CFPlus::OpenGL::glNewList $self->{list};
2069 $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;
2070} 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#}
2071 2072
2072############################################################################# 2073#############################################################################
2073 2074
2074package CFPlus::UI::EntryBase; 2075package CFPlus::UI::EntryBase;
2075 2076
… …
2081 my $class = shift; 2082 my $class = shift;
2082 2083
2083 $class->SUPER::new ( 2084 $class->SUPER::new (
2084 fg => [1, 1, 1], 2085 fg => [1, 1, 1],
2085 bg => [0, 0, 0, 0.2], 2086 bg => [0, 0, 0, 0.2],
2087 outline => [0.6, 0.3, 0.1],
2086 active_bg => [1, 1, 1, 0.5], 2088 active_bg => [0, 0, 1, .2],
2087 active_fg => [0, 0, 0], 2089 active_fg => [1, 1, 1],
2090 active_outline => [1, 1, 0],
2088 can_hover => 1, 2091 can_hover => 1,
2089 can_focus => 1, 2092 can_focus => 1,
2090 valign => 0, 2093 valign => 0,
2091 can_events => 1, 2094 can_events => 1,
2092 ellipsise => 0, 2095 ellipsise => 0,
… …
2249 2252
2250 unless (exists $self->{cur_h}) { 2253 unless (exists $self->{cur_h}) {
2251 my $text = substr $self->{text}, 0, $self->{cursor}; 2254 my $text = substr $self->{text}, 0, $self->{cursor};
2252 utf8::encode $text; 2255 utf8::encode $text;
2253 2256
2254 @$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);
2255 } 2258 }
2256 2259
2260 glColor_premultiply @{$self->{active_fg}};
2257 glBegin GL_LINES; 2261 glBegin GL_LINES;
2258 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};
2259 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;
2260 glEnd; 2284 glEnd;
2261 } 2285 }
2262} 2286}
2263 2287
2264############################################################################# 2288#############################################################################
… …
2351 1 2375 1
2352} 2376}
2353 2377
2354############################################################################# 2378#############################################################################
2355 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
2356package CFPlus::UI::Button; 2429package CFPlus::UI::Button;
2357 2430
2358our @ISA = CFPlus::UI::Label::; 2431our @ISA = CFPlus::UI::Label::;
2359 2432
2360use CFPlus::OpenGL; 2433use CFPlus::OpenGL;
… …
2494sub new { 2567sub new {
2495 my $class = shift; 2568 my $class = shift;
2496 2569
2497 my $self = $class->SUPER::new ( 2570 my $self = $class->SUPER::new (
2498 can_events => 0, 2571 can_events => 0,
2572 scale => 1,
2499 @_, 2573 @_,
2500 ); 2574 );
2501 2575
2502 $self->{path} || $self->{tex} 2576 $self->{path} || $self->{tex}
2503 or Carp::croak "'path' or 'tex' attributes required"; 2577 or Carp::croak "'path' or 'tex' attributes required";
… …
2528} 2602}
2529 2603
2530sub size_request { 2604sub size_request {
2531 my ($self) = @_; 2605 my ($self) = @_;
2532 2606
2533 ($self->{tex}{w}, $self->{tex}{h}) 2607 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2534} 2608}
2535 2609
2536sub _draw { 2610sub _draw {
2537 my ($self) = @_; 2611 my ($self) = @_;
2538 2612
… …
2548 } 2622 }
2549 2623
2550 glEnable GL_TEXTURE_2D; 2624 glEnable GL_TEXTURE_2D;
2551 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2625 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2552 2626
2553 $tex->draw_quad (0, 0, $w, $h); 2627 $tex->draw_quad_alpha (0, 0, $w, $h);
2554 2628
2555 glDisable GL_TEXTURE_2D; 2629 glDisable GL_TEXTURE_2D;
2556} 2630}
2557 2631
2558############################################################################# 2632#############################################################################
… …
2860 2934
2861 $self->SUPER::invoke_button_down ($ev, $x, $y); 2935 $self->SUPER::invoke_button_down ($ev, $x, $y);
2862 2936
2863 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2937 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2864 2938
2865 $self->invoke_mouse_motion ($ev, $x, $y) 2939 $self->invoke_mouse_motion ($ev, $x, $y);
2940
2941 1
2866} 2942}
2867 2943
2868sub invoke_mouse_motion { 2944sub invoke_mouse_motion {
2869 my ($self, $ev, $x, $y) = @_; 2945 my ($self, $ev, $x, $y) = @_;
2870 2946
… …
2890 2966
2891 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 2967 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2892 2968
2893 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 2969 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2894 2970
2895 ! ! $delta 2971 1
2896} 2972}
2897 2973
2898sub update { 2974sub update {
2899 my ($self) = @_; 2975 my ($self) = @_;
2900 2976
… …
3031} 3107}
3032 3108
3033sub size_request { 3109sub size_request {
3034 my ($self) = @_; 3110 my ($self) = @_;
3035 3111
3036 my ($empty, $slider) = @{ $self->{children} }; 3112 my ($empty, $slider) = $self->visible_children;
3037 3113
3038 local $self->{children} = [$empty, $slider]; 3114 local $self->{children} = [$empty, $slider];
3039 $self->SUPER::size_request 3115 $self->SUPER::size_request
3040} 3116}
3041 3117
… …
3230 3306
3231 if ($y0 < $y + $h && $y < $y1) { 3307 if ($y0 < $y + $h && $y < $y1) {
3232 my $layout = $self->get_layout ($para); 3308 my $layout = $self->get_layout ($para);
3233 3309
3234 $layout->render ($para->{indent}, $y - $y0); 3310 $layout->render ($para->{indent}, $y - $y0);
3311 $layout->draw;
3235 3312
3236 if (my @w = @{ $para->{widget} }) { 3313 if (my @w = @{ $para->{widget} }) {
3237 my @s = $layout->get_shapes; 3314 my @s = $layout->get_shapes;
3238 3315
3239 for (@w) { 3316 for (@w) {
… …
3430 glTranslate 0.375, 0.375; 3507 glTranslate 0.375, 0.375;
3431 3508
3432 my ($w, $h) = @$self{qw(w h)}; 3509 my ($w, $h) = @$self{qw(w h)};
3433 3510
3434 glColor 1, 0.8, 0.4; 3511 glColor 1, 0.8, 0.4;
3435 glBegin GL_QUADS; 3512 glRect 0, 0, $w, $h;
3436 glVertex 0 , 0;
3437 glVertex 0 , $h;
3438 glVertex $w, $h;
3439 glVertex $w, 0;
3440 glEnd;
3441 3513
3442 glColor 0, 0, 0; 3514 glColor 0, 0, 0;
3443 glBegin GL_LINE_LOOP; 3515 glBegin GL_LINE_LOOP;
3444 glVertex 0 , 0; 3516 glVertex 0 , 0;
3445 glVertex 0 , $h; 3517 glVertex 0 , $h;
… …
3473 3545
3474 if ($self->{anim} && $self->{animspeed}) { 3546 if ($self->{anim} && $self->{animspeed}) {
3475 CFPlus::weaken (my $widget = $self); 3547 CFPlus::weaken (my $widget = $self);
3476 3548
3477 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3549 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3478 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed}; 3550 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3479 $self->{timer} = Event->timer ( 3551 $self->{timer} = Event->timer (
3480 parked => 1, 3552 parked => 1,
3481 cb => sub { 3553 cb => sub {
3482 return unless $::CONN && $widget; 3554 return unless $::CONN && $widget;
3483 3555
… …
3520 3592
3521 if (my $anim = $::CONN->{anim}[$self->{anim}]) { 3593 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3522 if ($anim && @$anim) { 3594 if ($anim && @$anim) {
3523 delete $self->{wait_face}; 3595 delete $self->{wait_face};
3524 $self->{face} = $anim->[ $self->{frame} % @$anim ]; 3596 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3597 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ]) {
3598 unless ($tex->{name} || $tex->{loading}) {
3599 $tex->upload (sub { $self->reconfigure });
3600 }
3601 }
3525 } 3602 }
3526 } 3603 }
3527} 3604}
3528 3605
3529sub size_request { 3606sub size_request {
3530 my ($self) = @_; 3607 my ($self) = @_;
3531 3608
3532 if ($::CONN) { 3609 if ($::CONN) {
3533 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3610 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3534 if (my $tex = $::CONN->{texture}[$faceid]) { 3611 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3612 if ($tex->{name}) {
3535 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3613 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3614 } elsif (!$tex->{loading}) {
3615 $tex->upload (sub { $self->reconfigure });
3616 }
3536 } else { 3617 } else {
3537 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3618 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3538 $self->realloc; 3619 $self->reconfigure;
3539 }); 3620 });
3540 } 3621 }
3541 } 3622 }
3542 } 3623 }
3543 3624
… …
3561} 3642}
3562 3643
3563sub _draw { 3644sub _draw {
3564 my ($self) = @_; 3645 my ($self) = @_;
3565 3646
3566 return unless $::CONN;
3567
3568 $self->SUPER::_draw; 3647 $self->SUPER::_draw;
3569 3648
3570 my $faceid = $::CONN->{faceid}[$self->{face}] 3649 if (my $tex = $self->{tex}) {
3571 or return;
3572
3573 my $tex = $::CONN->{texture}[$faceid];
3574
3575 if ($tex) {
3576 glEnable GL_TEXTURE_2D; 3650 glEnable GL_TEXTURE_2D;
3577 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3651 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3578 glColor 0, 0, 0, 1; 3652 glColor 0, 0, 0, 1;
3579 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3653 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3580 glDisable GL_TEXTURE_2D; 3654 glDisable GL_TEXTURE_2D;
… …
3632 children => [ 3706 children => [
3633 (new CFPlus::UI::Label markup => $left, expand => 1), 3707 (new CFPlus::UI::Label markup => $left, expand => 1),
3634 (new CFPlus::UI::Label markup => $right, align => +1), 3708 (new CFPlus::UI::Label markup => $right, align => +1),
3635 ], 3709 ],
3636 ; 3710 ;
3637 3711
3638 } else { 3712 } else {
3639 $widget = new CFPlus::UI::Label 3713 $widget = new CFPlus::UI::Label
3640 can_hover => 1, 3714 can_hover => 1,
3641 can_events => 1, 3715 can_events => 1,
3642 markup => $widget, 3716 markup => $widget,
… …
3778 buttonbar => (new CFPlus::UI::Buttonbar), 3852 buttonbar => (new CFPlus::UI::Buttonbar),
3779 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3853 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3780 # filter => # will be put between multiplexer and $self 3854 # filter => # will be put between multiplexer and $self
3781 @_, 3855 @_,
3782 ); 3856 );
3783 3857
3784 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3858 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3785 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3859 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3786 3860
3861 {
3862 Scalar::Util::weaken (my $wself = $self);
3863
3864 $self->{multiplexer}->connect (c_add => sub {
3865 my ($mplex, $widgets) = @_;
3866
3867 for my $child (@$widgets) {
3868 Scalar::Util::weaken $child;
3869 $child->{c_tab_} ||= do {
3870 my $tab =
3871 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3872 ? $child->{c_tab}
3873 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3874
3875 $tab->connect (activate => sub {
3876 $wself->set_current_page ($child);
3877 });
3878
3879 $tab
3880 };
3881
3882 $self->{buttonbar}->add ($child->{c_tab_});
3883 }
3884 });
3885
3886 $self->{multiplexer}->connect (c_remove => sub {
3887 my ($mplex, $widgets) = @_;
3888
3889 for my $child (@$widgets) {
3890 $wself->{buttonbar}->remove ($child->{c_tab_});
3891 }
3892 });
3893 }
3894
3787 $self 3895 $self
3788} 3896}
3789 3897
3790sub add { 3898sub add {
3899 my ($self, @widgets) = @_;
3900
3901 $self->{multiplexer}->add (@widgets)
3902}
3903
3904sub remove {
3905 my ($self, @widgets) = @_;
3906
3907 $self->{multiplexer}->remove (@widgets)
3908}
3909
3910sub pages {
3911 my ($self) = @_;
3912 $self->{multiplexer}->children
3913}
3914
3915sub add_tab {
3791 my ($self, $title, $widget, $tooltip) = @_; 3916 my ($self, $title, $widget, $tooltip) = @_;
3792 3917
3793 CFPlus::weaken $self; 3918 $title = [$title, $tooltip] unless ref $title;
3919 $widget->{c_tab} = $title;
3794 3920
3795 $self->{buttonbar}->add (new CFPlus::UI::Button
3796 markup => $title,
3797 tooltip => $tooltip,
3798 on_activate => sub { $self->set_current_page ($widget) },
3799 );
3800
3801 $self->{multiplexer}->add ($widget); 3921 $self->add ($widget);
3802} 3922}
3803 3923
3804sub get_current_page { 3924sub get_current_page {
3805 my ($self) = @_; 3925 my ($self) = @_;
3806 3926
… …
4089} 4209}
4090 4210
4091sub update { 4211sub update {
4092 my ($self) = @_; 4212 my ($self) = @_;
4093 4213
4094 $::WANT_REFRESH++; 4214 $::WANT_REFRESH->start;
4095} 4215}
4096 4216
4097sub add { 4217sub add {
4098 my ($self, @children) = @_; 4218 my ($self, @children) = @_;
4099 4219
… …
4136 while ($self->{refresh_hook}) { 4256 while ($self->{refresh_hook}) {
4137 $_->() 4257 $_->()
4138 for values %{delete $self->{refresh_hook}}; 4258 for values %{delete $self->{refresh_hook}};
4139 } 4259 }
4140 4260
4141 if ($self->{realloc}) { 4261 while ($self->{realloc}) {
4142 my %queue; 4262 my %queue;
4143 my @queue; 4263 my @queue;
4144 my $widget; 4264 my $widget;
4145 4265
4146 outer: 4266 outer:
… …
4193 } 4313 }
4194 } 4314 }
4195 4315
4196 delete $self->{realloc}{$widget+0}; 4316 delete $self->{realloc}{$widget+0};
4197 } 4317 }
4198 }
4199 4318
4200 while (my $size_alloc = delete $self->{size_alloc}) { 4319 while (my $size_alloc = delete $self->{size_alloc}) {
4201 my @queue = sort { $b->{visible} <=> $a->{visible} } 4320 my @queue = sort { $a->{visible} <=> $b->{visible} }
4202 values %$size_alloc; 4321 values %$size_alloc;
4203 4322
4204 while () { 4323 while () {
4205 my $widget = pop @queue || last; 4324 my $widget = pop @queue || last;
4206 4325
4207 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4326 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4208 4327
4209 $w = 0 if $w < 0;
4210 $h = 0 if $h < 0;
4211
4212 $w = max $widget->{min_w}, $w; 4328 $w = max $widget->{min_w}, $w;
4213 $h = max $widget->{min_h}, $h; 4329 $h = max $widget->{min_h}, $h;
4214 4330
4215# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4331# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4216# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4332# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4217 4333
4218 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4334 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4219 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4335 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4220 4336
4221 $w = int $w + 0.5; 4337 $w = int $w + 0.5;
4222 $h = int $h + 0.5; 4338 $h = int $h + 0.5;
4223 4339
4224 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4340 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4225 $widget->{old_w} = $widget->{w}; 4341 $widget->{old_w} = $widget->{w};
4226 $widget->{old_h} = $widget->{h}; 4342 $widget->{old_h} = $widget->{h};
4227 4343
4228 $widget->{w} = $w; 4344 $widget->{w} = $w;
4229 $widget->{h} = $h; 4345 $widget->{h} = $h;
4230 4346
4231 $widget->emit (size_allocate => $w, $h); 4347 $widget->emit (size_allocate => $w, $h);
4348 }
4232 } 4349 }
4233 } 4350 }
4234 } 4351 }
4235 4352
4236 while ($self->{post_alloc_hook}) { 4353 while ($self->{post_alloc_hook}) {

Diff Legend

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