ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.399 by root, Sat Jul 21 16:07:53 2007 UTC vs.
Revision 1.437 by root, Wed Aug 22 22:36:26 2007 UTC

… …
30 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner}; 31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32 32
33 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
34 34
35 my $tip = $widget->{tooltip};
36
37 $tip = $tip->($widget) if CODE:: eq ref $tip;
38
39 $TOOLTIP->set_tooltip_from ($widget); 35 $TOOLTIP->set_tooltip_from ($widget);
40 $TOOLTIP->show; 36 $TOOLTIP->show;
41 } 37 }
42 38
43 return; 39 return;
… …
273 $self->emit ("destroy"); 269 $self->emit ("destroy");
274 %$self = (); 270 %$self = ();
275} 271}
276 272
277sub TO_JSON { 273sub TO_JSON {
278 { __widget_ref__ => $_[0]{s_id} } 274 { __w_ => $_[0]{s_id} }
279} 275}
280 276
281sub show { 277sub show {
282 my ($self) = @_; 278 my ($self) = @_;
283 279
… …
593 589
594# using global variables seems a bit hacky, but passing through all drawing 590# using global variables seems a bit hacky, but passing through all drawing
595# functions seems pointless. 591# functions seems pointless.
596our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 592our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
597 593
598sub draw { 594#sub draw {
599 my ($self) = @_; 595#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 596
645sub _draw { 597sub _draw {
646 my ($self) = @_; 598 my ($self) = @_;
647 599
648 warn "no draw defined for $self\n"; 600 warn "no draw defined for $self\n";
649} 601}
650 602
651my $cntx;#d#
652sub DESTROY { 603sub DESTROY {
653 my ($self) = @_; 604 my ($self) = @_;
654 605
655 return if CFPlus::in_destruct; 606 return if CFPlus::in_destruct;
656 607
608 local $@;
657 eval { $self->destroy }; 609 eval { $self->destroy };
658 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 610 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
659 611
660 delete $WIDGET{$self+0}; 612 delete $WIDGET{$self+0};
661} 613}
… …
669use strict; 621use strict;
670use CFPlus::OpenGL; 622use CFPlus::OpenGL;
671 623
672sub new { 624sub new {
673 my $class = shift; 625 my $class = shift;
674
675 # range [value, low, high, page]
676 626
677 $class->SUPER::new ( 627 $class->SUPER::new (
678 #bg => [0, 0, 0, 0.2], 628 #bg => [0, 0, 0, 0.2],
679 #active_bg => [1, 1, 1, 0.5], 629 #active_bg => [1, 1, 1, 0.5],
680 @_ 630 @_
… …
692 my ($w, $h) = @$self{qw(w h)}; 642 my ($w, $h) = @$self{qw(w h)};
693 643
694 glEnable GL_BLEND; 644 glEnable GL_BLEND;
695 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 645 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
696 glColor_premultiply @$color; 646 glColor_premultiply @$color;
697
698 glBegin GL_QUADS;
699 glVertex 0 , 0;
700 glVertex 0 , $h;
701 glVertex $w, $h; 647 glRect 0, 0, $w, $h;
702 glVertex $w, 0;
703 glEnd;
704
705 glDisable GL_BLEND; 648 glDisable GL_BLEND;
706 } 649 }
707} 650}
708 651
709############################################################################# 652#############################################################################
… …
770 @{$self->{children}}, @widgets 713 @{$self->{children}}, @widgets
771 ]; 714 ];
772 715
773 $self->realloc; 716 $self->realloc;
774 717
718 $self->emit (c_add => \@widgets);
719
775 map $_+0, @widgets 720 map $_+0, @widgets
776} 721}
777 722
778sub children { 723sub children {
779 @{ $_[0]{children} } 724 @{ $_[0]{children} }
780} 725}
781 726
782sub remove { 727sub remove {
783 my ($self, $child) = @_; 728 my ($self, @widgets) = @_;
784 729
730 $self->emit (c_remove => \@widgets);
731
732 for my $child (@widgets) {
785 delete $child->{parent}; 733 delete $child->{parent};
786 $child->hide; 734 $child->hide;
787
788 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 735 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
736 }
789 737
790 $self->realloc; 738 $self->realloc;
791} 739}
792 740
793sub clear { 741sub clear {
… …
821} 769}
822 770
823sub _draw { 771sub _draw {
824 my ($self) = @_; 772 my ($self) = @_;
825 773
826 $_->draw for @{$self->{children}}; 774 $_->draw for $self->visible_children;
827} 775}
828 776
829############################################################################# 777#############################################################################
830 778
831package CFPlus::UI::Bin; 779package CFPlus::UI::Bin;
… …
841} 789}
842 790
843sub add { 791sub add {
844 my ($self, $child) = @_; 792 my ($self, $child) = @_;
845 793
846 $self->SUPER::remove ($_) for @{ $self->{children} }; 794 $self->clear;
847 $self->SUPER::add ($child); 795 $self->SUPER::add ($child);
848} 796}
849 797
850sub remove { 798sub remove {
851 my ($self, $widget) = @_; 799 my ($self, $widget) = @_;
… …
993 $self->{view_x} = $x; 941 $self->{view_x} = $x;
994 $self->{view_y} = $y; 942 $self->{view_y} = $y;
995 943
996 $self->emit (changed => $x, $y); 944 $self->emit (changed => $x, $y);
997 $self->update; 945 $self->update;
946 }
947}
948
949sub set_center {
950 my ($self, $x, $y) = @_;
951
952 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
953}
954
955sub make_visible {
956 my ($self, $x, $y, $border) = @_;
957
958 if ( $x < $self->{view_x} + $self->{w} * $border
959 || $x > $self->{view_x} + $self->{w} * (1 - $border)
960 || $y < $self->{view_y} + $self->{h} * $border
961 || $y > $self->{view_y} + $self->{h} * (1 - $border)
962 ) {
963 $self->set_center ($x, $y);
998 } 964 }
999} 965}
1000 966
1001# hmm, this does not work for topleft of $self... but we should not ask for that 967# hmm, this does not work for topleft of $self... but we should not ask for that
1002sub coord2local { 968sub coord2local {
… …
1049 my $child = delete $arg{child}; 1015 my $child = delete $arg{child};
1050 1016
1051 my $self; 1017 my $self;
1052 1018
1053 my $hslider = new CFPlus::UI::Slider 1019 my $hslider = new CFPlus::UI::Slider
1054 col => 0, 1020 c_col => 0,
1055 row => 1, 1021 c_row => 1,
1056 vertical => 0, 1022 vertical => 0,
1057 range => [0, 0, 1, 0.01], # HACK fix 1023 range => [0, 0, 1, 0.01], # HACK fix
1058 on_changed => sub { 1024 on_changed => sub {
1059 $self->{hpos} = $_[1]; 1025 $self->{hpos} = $_[1];
1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1026 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1061 }, 1027 },
1062 ; 1028 ;
1063 1029
1064 my $vslider = new CFPlus::UI::Slider 1030 my $vslider = new CFPlus::UI::Slider
1065 col => 1, 1031 c_col => 1,
1066 row => 0, 1032 c_row => 0,
1067 vertical => 1, 1033 vertical => 1,
1068 range => [0, 0, 1, 0.01], # HACK fix 1034 range => [0, 0, 1, 0.01], # HACK fix
1069 on_changed => sub { 1035 on_changed => sub {
1070 $self->{vpos} = $_[1]; 1036 $self->{vpos} = $_[1];
1071 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1037 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1082 row_expand => [1, 0], 1048 row_expand => [1, 0],
1083 %arg, 1049 %arg,
1084 ); 1050 );
1085 1051
1086 $self->{vp} = new CFPlus::UI::ViewPort 1052 $self->{vp} = new CFPlus::UI::ViewPort
1087 col => 0, 1053 c_col => 0,
1088 row => 0, 1054 c_row => 0,
1089 expand => 1, 1055 expand => 1,
1090 scroll_x => $self->{scroll_x}, 1056 scroll_x => $self->{scroll_x},
1091 scroll_y => $self->{scroll_y}, 1057 scroll_y => $self->{scroll_y},
1092 on_changed => sub { 1058 on_changed => sub {
1093 my ($vp, $x, $y) = @_; 1059 my ($vp, $x, $y) = @_;
… …
1095 $vp->{parent}{hslider}->set_value ($x); 1061 $vp->{parent}{hslider}->set_value ($x);
1096 $vp->{parent}{vslider}->set_value ($y); 1062 $vp->{parent}{vslider}->set_value ($y);
1097 1063
1098 0 1064 0
1099 }, 1065 },
1066 on_size_allocate => sub {
1067 my ($vp, $w, $h) = @_;
1068 $vp->{parent}->update_slider;
1069 0
1070 },
1100 ; 1071 ;
1101 1072
1102 $self->SUPER::add ($self->{vp}); 1073 $self->SUPER::add ($self->{vp});
1103 1074
1104 $self->add ($child) if $child; 1075 $self->add ($child) if $child;
… …
1110 my ($self, $widget) = @_; 1081 my ($self, $widget) = @_;
1111 1082
1112 $self->{vp}->add ($self->{child} = $widget); 1083 $self->{vp}->add ($self->{child} = $widget);
1113} 1084}
1114 1085
1086sub set_offset { shift->{vp}->set_offset (@_) }
1087sub set_center { shift->{vp}->set_center (@_) }
1088sub make_visible { shift->{vp}->make_visible (@_) }
1089
1115sub update_slider { 1090sub update_slider {
1116 my ($self) = @_; 1091 my ($self) = @_;
1117 1092
1118 my $child = ($self->{vp} or return)->child; 1093 my $child = ($self->{vp} or return)->child;
1119 1094
1095 if ($self->{scroll_x}) {
1120 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1096 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1121 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); 1097 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1122 1098
1123 my $visible = $w1 > $w2; 1099 my $visible = $w1 > $w2;
1124 if ($visible != $self->{hslider_visible}) { 1100 if ($visible != $self->{hslider_visible}) {
1125 $self->{hslider_visible} = $visible; 1101 $self->{hslider_visible} = $visible;
1126 $visible ? $self->SUPER::add ($self->{hslider}) 1102 $visible ? $self->SUPER::add ($self->{hslider})
1127 : $self->SUPER::remove ($self->{hslider}); 1103 : $self->SUPER::remove ($self->{hslider});
1104 }
1128 } 1105 }
1129 1106
1107 if ($self->{scroll_y}) {
1130 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1108 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1131 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); 1109 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1132 1110
1133 my $visible = $h1 > $h2; 1111 my $visible = $h1 > $h2;
1134 if ($visible != $self->{vslider_visible}) { 1112 if ($visible != $self->{vslider_visible}) {
1135 $self->{vslider_visible} = $visible; 1113 $self->{vslider_visible} = $visible;
1136 $visible ? $self->SUPER::add ($self->{vslider}) 1114 $visible ? $self->SUPER::add ($self->{vslider})
1137 : $self->SUPER::remove ($self->{vslider}); 1115 : $self->SUPER::remove ($self->{vslider});
1116 }
1138 } 1117 }
1139} 1118}
1140 1119
1141sub start_dragging { 1120sub start_dragging {
1142 my ($self, $ev) = @_; 1121 my ($self, $ev) = @_;
… …
1228 my ($w, $h) = @$self{qw(w h)}; 1207 my ($w, $h) = @$self{qw(w h)};
1229 1208
1230 glEnable GL_BLEND; 1209 glEnable GL_BLEND;
1231 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1210 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1232 glColor_premultiply @{ $self->{bg} }; 1211 glColor_premultiply @{ $self->{bg} };
1233
1234 glBegin GL_QUADS;
1235 glVertex 0 , 0;
1236 glVertex 0 , $h;
1237 glVertex $w, $h; 1212 glRect 0, 0, $w, $h;
1238 glVertex $w, 0;
1239 glEnd;
1240
1241 glDisable GL_BLEND; 1213 glDisable GL_BLEND;
1242 } 1214 }
1243 1215
1244 $self->SUPER::_draw; 1216 $self->SUPER::_draw;
1245} 1217}
… …
1607 1579
1608sub add { 1580sub add {
1609 my ($self, @widgets) = @_; 1581 my ($self, @widgets) = @_;
1610 1582
1611 for my $child (@widgets) { 1583 for my $child (@widgets) {
1612 $child->{rowspan} ||= 1; 1584 $child->{c_rowspan} ||= 1;
1613 $child->{colspan} ||= 1; 1585 $child->{c_colspan} ||= 1;
1614 } 1586 }
1615 1587
1616 $self->SUPER::add (@widgets); 1588 $self->SUPER::add (@widgets);
1617} 1589}
1618 1590
… …
1622 my @widgets; 1594 my @widgets;
1623 1595
1624 while (@_) { 1596 while (@_) {
1625 my ($col, $row, $child) = splice @_, 0, 3, (); 1597 my ($col, $row, $child) = splice @_, 0, 3, ();
1626 1598
1627 $child->{row} = $row; 1599 $child->{c_row} = $row;
1628 $child->{col} = $col; 1600 $child->{c_col} = $col;
1629 1601
1630 push @widgets, $child; 1602 push @widgets, $child;
1631 } 1603 }
1632 1604
1633 $self->add (@widgets); 1605 $self->add (@widgets);
… …
1639 my (@w, @h); 1611 my (@w, @h);
1640 1612
1641 my @children = $self->children; 1613 my @children = $self->children;
1642 1614
1643 # first pass, columns 1615 # first pass, columns
1644 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) { 1616 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1645 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; 1617 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1646 1618
1647 my $sw = sum @w[$c .. $c + $cs - 1]; 1619 my $sw = sum @w[$c .. $c + $cs - 1];
1648 1620
1649 if ($w > $sw) { 1621 if ($w > $sw) {
1650 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; 1622 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1651 } 1623 }
1652 } 1624 }
1653 1625
1654 # second pass, rows 1626 # second pass, rows
1655 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { 1627 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1656 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; 1628 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1657 1629
1658 my $sh = sum @h[$r .. $r + $rs - 1]; 1630 my $sh = sum @h[$r .. $r + $rs - 1];
1659 1631
1660 if ($h > $sh) { 1632 if ($h > $sh) {
1661 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; 1633 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
… …
1703 1675
1704 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } 1676 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1705 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } 1677 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1706 1678
1707 for my $widget ($self->children) { 1679 for my $widget ($self->children) {
1708 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)}; 1680 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1709 1681
1710 $widget->configure ( 1682 $widget->configure (
1711 $x[$c], $y[$r], 1683 $x[$c], $y[$r],
1712 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r], 1684 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1713 ); 1685 );
… …
1722 1694
1723use List::Util qw(min max); 1695use List::Util qw(min max);
1724 1696
1725our @ISA = CFPlus::UI::Container::; 1697our @ISA = CFPlus::UI::Container::;
1726 1698
1727sub add {
1728 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1729
1730 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1731 $self->SUPER::add ($child);
1732}
1733
1734sub _scale($$$) { 1699sub _scale($$$) {
1735 my ($mode, $val, $max) = @_; 1700 my ($rel, $val, $max) = @_;
1736 1701
1737 $mode eq "abs" ? $val 1702 $rel ? $val * $max : $val
1738 : $mode eq "rel" ? $val * $max
1739 : 0
1740} 1703}
1741 1704
1742sub size_request { 1705sub size_request {
1743 my ($self) = @_; 1706 my ($self) = @_;
1744 1707
1745 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1708 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1746 1709
1747 # determine overall size by querying abs widgets 1710 # determine overall size by querying abs widgets
1748 for my $child ($self->visible_children) { 1711 for my $child ($self->visible_children) {
1749 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1712 unless ($child->{c_rel}) {
1713 my $x = $child->{c_x};
1714 my $y = $child->{c_y};
1750 1715
1751 if ($pos eq "abs") {
1752 $w = _scale $size, $w, $child->{req_w};
1753 $h = _scale $size, $h, $child->{req_h};
1754
1755 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1716 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1756 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1717 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1757 } 1718 }
1758 } 1719 }
1759 1720
1760 my $W = $x2 - $x1; 1721 my $W = $x2 - $x1;
1761 my $H = $y2 - $y1; 1722 my $H = $y2 - $y1;
1762 1723
1763 # now layout remaining widgets 1724 # now layout remaining widgets
1764 for my $child ($self->visible_children) { 1725 for my $child ($self->visible_children) {
1765 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1726 if ($child->{c_rel}) {
1727 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1728 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1766 1729
1767 if ($pos ne "abs") {
1768 $x = _scale $pos, $x, $W;
1769 $y = _scale $pos, $x, $H;
1770 $w = _scale $size, $w, $child->{req_w};
1771 $h = _scale $size, $h, $child->{req_h};
1772
1773 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1730 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1774 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1731 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1775 } 1732 }
1776 } 1733 }
1777 1734
1778 my $W = $x2 - $x1; 1735 my $W = $x2 - $x1;
1779 my $H = $y2 - $y1; 1736 my $H = $y2 - $y1;
… …
1783 1740
1784sub invoke_size_allocate { 1741sub invoke_size_allocate {
1785 my ($self, $W, $H) = @_; 1742 my ($self, $W, $H) = @_;
1786 1743
1787 for my $child ($self->visible_children) { 1744 for my $child ($self->visible_children) {
1788 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1745 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1746 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1789 1747
1790 $x = _scale $pos, $x, $W; 1748 $x += $child->{c_halign} * $child->{req_w};
1791 $y = _scale $pos, $x, $H; 1749 $y += $child->{c_valign} * $child->{req_h};
1792 $w = _scale $size, $w, $child->{req_w};
1793 $h = _scale $size, $h, $child->{req_h};
1794 1750
1795 $child->configure ($x, $y, $w, $h); 1751 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1796 } 1752 }
1797 1753
1798 1 1754 1
1799} 1755}
1800 1756
… …
1804 1760
1805our @ISA = CFPlus::UI::Container::; 1761our @ISA = CFPlus::UI::Container::;
1806 1762
1807sub size_request { 1763sub size_request {
1808 my ($self) = @_; 1764 my ($self) = @_;
1765
1766 my @children = $self->visible_children;
1809 1767
1810 $self->{vertical} 1768 $self->{vertical}
1811 ? ( 1769 ? (
1812 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1770 (List::Util::max map $_->{req_w}, @children),
1813 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1771 (List::Util::sum map $_->{req_h}, @children),
1814 ) 1772 )
1815 : ( 1773 : (
1816 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1774 (List::Util::sum map $_->{req_w}, @children),
1817 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1775 (List::Util::max map $_->{req_h}, @children),
1818 ) 1776 )
1819} 1777}
1820 1778
1821sub invoke_size_allocate { 1779sub invoke_size_allocate {
1822 my ($self, $w, $h) = @_; 1780 my ($self, $w, $h) = @_;
… …
1946 1904
1947 delete $self->{ox}; 1905 delete $self->{ox};
1948 $self->SUPER::realloc; 1906 $self->SUPER::realloc;
1949} 1907}
1950 1908
1909sub clear {
1910 my ($self) = @_;
1911
1912 $self->set_text ("");
1913}
1914
1951sub set_text { 1915sub set_text {
1952 my ($self, $text) = @_; 1916 my ($self, $text) = @_;
1953 1917
1954 return if $self->{text} eq "T$text"; 1918 return if $self->{text} eq "T$text";
1955 $self->{text} = "T$text"; 1919 $self->{text} = "T$text";
… …
2061 : ($self->{w} - $size->[0]) * 0.5); 2025 : ($self->{w} - $size->[0]) * 0.5);
2062 2026
2063 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2027 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2064 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2028 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2065 : ($self->{h} - $size->[1]) * 0.5); 2029 : ($self->{h} - $size->[1]) * 0.5);
2030
2031 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2066 }; 2032 };
2067 2033
2068 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2034# unless ($self->{list}) {
2069 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2035# $self->{list} = CFPlus::OpenGL::glGenList;
2070 2036# CFPlus::OpenGL::glNewList $self->{list};
2071 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2037# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2038# CFPlus::OpenGL::glEndList;
2039# }
2040#
2041# CFPlus::OpenGL::glCallList $self->{list};
2042
2043 $self->{layout}->draw;
2072} 2044}
2045
2046#sub destroy {
2047# my ($self) = @_;
2048#
2049# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2050#
2051# $self->SUPER::destroy;
2052#}
2073 2053
2074############################################################################# 2054#############################################################################
2075 2055
2076package CFPlus::UI::EntryBase; 2056package CFPlus::UI::EntryBase;
2077 2057
… …
2083 my $class = shift; 2063 my $class = shift;
2084 2064
2085 $class->SUPER::new ( 2065 $class->SUPER::new (
2086 fg => [1, 1, 1], 2066 fg => [1, 1, 1],
2087 bg => [0, 0, 0, 0.2], 2067 bg => [0, 0, 0, 0.2],
2068 outline => [0.6, 0.3, 0.1],
2088 active_bg => [1, 1, 1, 0.5], 2069 active_bg => [0, 0, 1, .2],
2089 active_fg => [0, 0, 0], 2070 active_fg => [1, 1, 1],
2071 active_outline => [1, 1, 0],
2090 can_hover => 1, 2072 can_hover => 1,
2091 can_focus => 1, 2073 can_focus => 1,
2092 valign => 0, 2074 valign => 0,
2093 can_events => 1, 2075 can_events => 1,
2094 ellipsise => 0, 2076 ellipsise => 0,
… …
2234 glColor_premultiply @{$self->{bg}}; 2216 glColor_premultiply @{$self->{bg}};
2235 } 2217 }
2236 2218
2237 glEnable GL_BLEND; 2219 glEnable GL_BLEND;
2238 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2220 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2239 glBegin GL_QUADS;
2240 glVertex 0 , 0;
2241 glVertex 0 , $self->{h};
2242 glVertex $self->{w}, $self->{h}; 2221 glRect 0, 0, $self->{w}, $self->{h};
2243 glVertex $self->{w}, 0;
2244 glEnd;
2245 glDisable GL_BLEND; 2222 glDisable GL_BLEND;
2246 2223
2247 $self->SUPER::_draw; 2224 $self->SUPER::_draw;
2248 2225
2249 #TODO: force update every cursor change :( 2226 #TODO: force update every cursor change :(
… …
2251 2228
2252 unless (exists $self->{cur_h}) { 2229 unless (exists $self->{cur_h}) {
2253 my $text = substr $self->{text}, 0, $self->{cursor}; 2230 my $text = substr $self->{text}, 0, $self->{cursor};
2254 utf8::encode $text; 2231 utf8::encode $text;
2255 2232
2256 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2233 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2257 } 2234 }
2258 2235
2236 glColor_premultiply @{$self->{active_fg}};
2259 glBegin GL_LINES; 2237 glBegin GL_LINES;
2260 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2238 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2261 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2239 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2240 glEnd;
2241
2242 glLineWidth 3;
2243 glColor @{$self->{active_outline}};
2244 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2245 glLineWidth 1;
2246
2247 } else {
2248 glColor @{$self->{outline}};
2249 glBegin GL_LINE_STRIP;
2250 glVertex .5, $self->{h} * .5;
2251 glVertex .5, $self->{h} - 2.5;
2252 glVertex $self->{w} - .5, $self->{h} - 2.5;
2253 glVertex $self->{w} - .5, $self->{h} * .5;
2262 glEnd; 2254 glEnd;
2263 } 2255 }
2264} 2256}
2265 2257
2266############################################################################# 2258#############################################################################
… …
2353 1 2345 1
2354} 2346}
2355 2347
2356############################################################################# 2348#############################################################################
2357 2349
2350package CFPlus::UI::ButtonBin;
2351
2352our @ISA = CFPlus::UI::Bin::;
2353
2354use CFPlus::OpenGL;
2355
2356my @tex =
2357 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2358 qw(b1_button_inactive.png b1_button_active.png);
2359
2360sub new {
2361 my $class = shift;
2362
2363 $class->SUPER::new (
2364 can_hover => 1,
2365 align => 0,
2366 valign => 0,
2367 can_events => 1,
2368 @_
2369 )
2370}
2371
2372sub invoke_button_up {
2373 my ($self, $ev, $x, $y) = @_;
2374
2375 $self->emit ("activate")
2376 if $x >= 0 && $x < $self->{w}
2377 && $y >= 0 && $y < $self->{h};
2378
2379 1
2380}
2381
2382sub _draw {
2383 my ($self) = @_;
2384
2385 glEnable GL_TEXTURE_2D;
2386 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2387 glColor 0, 0, 0, 1;
2388
2389 my $tex = $tex[$GRAB == $self];
2390 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2391
2392 glDisable GL_TEXTURE_2D;
2393
2394 $self->SUPER::_draw;
2395}
2396
2397#############################################################################
2398
2358package CFPlus::UI::Button; 2399package CFPlus::UI::Button;
2359 2400
2360our @ISA = CFPlus::UI::Label::; 2401our @ISA = CFPlus::UI::Label::;
2361 2402
2362use CFPlus::OpenGL; 2403use CFPlus::OpenGL;
… …
2466sub _draw { 2507sub _draw {
2467 my ($self) = @_; 2508 my ($self) = @_;
2468 2509
2469 $self->SUPER::_draw; 2510 $self->SUPER::_draw;
2470 2511
2471 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2512 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2472 2513
2473 my ($w, $h) = @$self{qw(w h)}; 2514 my ($w, $h) = @$self{qw(w h)};
2474 2515
2475 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2516 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2476 2517
… …
2496sub new { 2537sub new {
2497 my $class = shift; 2538 my $class = shift;
2498 2539
2499 my $self = $class->SUPER::new ( 2540 my $self = $class->SUPER::new (
2500 can_events => 0, 2541 can_events => 0,
2542 scale => 1,
2501 @_, 2543 @_,
2502 ); 2544 );
2503 2545
2504 $self->{path} || $self->{tex} 2546 $self->{path} || $self->{tex}
2505 or Carp::croak "'path' or 'tex' attributes required"; 2547 or Carp::croak "'path' or 'tex' attributes required";
… …
2530} 2572}
2531 2573
2532sub size_request { 2574sub size_request {
2533 my ($self) = @_; 2575 my ($self) = @_;
2534 2576
2535 ($self->{tex}{w}, $self->{tex}{h}) 2577 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2536} 2578}
2537 2579
2538sub _draw { 2580sub _draw {
2539 my ($self) = @_; 2581 my ($self) = @_;
2540 2582
… …
2550 } 2592 }
2551 2593
2552 glEnable GL_TEXTURE_2D; 2594 glEnable GL_TEXTURE_2D;
2553 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2595 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2554 2596
2555 $tex->draw_quad (0, 0, $w, $h); 2597 $tex->draw_quad_alpha (0, 0, $w, $h);
2556 2598
2557 glDisable GL_TEXTURE_2D; 2599 glDisable GL_TEXTURE_2D;
2558} 2600}
2559 2601
2560############################################################################# 2602#############################################################################
… …
2579 align => 0, 2621 align => 0,
2580 valign => 0, 2622 valign => 0,
2581 can_events => 1, 2623 can_events => 1,
2582 @_ 2624 @_
2583 ); 2625 );
2626}
2627
2628sub invoke_button_down {
2629 my ($self, $ev, $x, $y) = @_;
2630
2631 1
2584} 2632}
2585 2633
2586sub invoke_button_up { 2634sub invoke_button_up {
2587 my ($self, $ev, $x, $y) = @_; 2635 my ($self, $ev, $x, $y) = @_;
2588 2636
… …
2728 glDisable GL_TEXTURE_2D; 2776 glDisable GL_TEXTURE_2D;
2729} 2777}
2730 2778
2731############################################################################# 2779#############################################################################
2732 2780
2781package CFPlus::UI::Progress;
2782
2783our @ISA = CFPlus::UI::Label::;
2784
2785use CFPlus::OpenGL;
2786
2787sub new {
2788 my ($class, %arg) = @_;
2789
2790 my $self = $class->SUPER::new (
2791 fg => [1, 1, 1],
2792 bg => [0, 0, 1, 0.2],
2793 bar => [0.7, 0.5, 0.1, 0.8],
2794 outline => [0.4, 0.3, 0],
2795 fontsize => 0.9,
2796 valign => 0,
2797 align => 0,
2798 can_events => 1,
2799 ellipsise => 1,
2800 label => "%d%%",
2801 %arg,
2802 );
2803
2804 $self->set_value ($arg{value} || -1);
2805
2806 $self
2807}
2808
2809sub set_label {
2810 my ($self, $label) = @_;
2811
2812 return if $self->{label} eq $label;
2813 $self->{label} = $label;
2814
2815 $self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
2816}
2817
2818sub set_value {
2819 my ($self, $value) = @_;
2820
2821 if ($self->{value} ne $value) {
2822 $self->{value} = $value;
2823
2824 if ($value < 0) {
2825 $self->set_text ("-");
2826 } else {
2827 $self->set_text (sprintf $self->{label}, $value * 100);
2828 }
2829
2830 $self->update;
2831 }
2832}
2833
2834sub _draw {
2835 my ($self) = @_;
2836
2837 glEnable GL_BLEND;
2838 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2839
2840 if ($self->{value} >= 0) {
2841 my $s = int 2 + ($self->{w} - 4) * $self->{value};
2842
2843 glColor_premultiply @{$self->{bar}};
2844 glRect 2, 2, $s, $self->{h} - 2;
2845 glColor_premultiply @{$self->{bg}};
2846 glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
2847 }
2848
2849 glColor_premultiply @{$self->{outline}};
2850 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2851
2852 glDisable GL_BLEND;
2853
2854 {
2855 local $self->{bg}; # do not draw background
2856 $self->SUPER::_draw;
2857 }
2858}
2859
2860#############################################################################
2861
2862package CFPlus::UI::ExperienceProgress;
2863
2864our @ISA = CFPlus::UI::Progress::;
2865
2866sub new {
2867 my ($class, %arg) = @_;
2868
2869 my $self = $class->SUPER::new (
2870 tooltip => sub {
2871 my ($self) = @_;
2872
2873 sprintf "level %d\n%s points\n%s next level\n%s to go",
2874 $self->{lvl},
2875 ::formsep ($self->{exp}),
2876 ::formsep ($self->{nxt}),
2877 ::formsep ($self->{nxt} - $self->{exp}),
2878 },
2879 %arg
2880 );
2881
2882 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2883 if $::CONN;
2884
2885 $self
2886}
2887
2888sub DESTROY {
2889 my ($self) = @_;
2890
2891 delete $::CONN->{on_exp_update}{$self+0}
2892 if $::CONN;
2893
2894 $self->SUPER::DESTROY;
2895}
2896
2897sub set_value {
2898 my ($self, $lvl, $exp) = @_;
2899
2900 $self->{lvl} = $lvl;
2901 $self->{exp} = $exp;
2902
2903 my $v = -1;
2904
2905 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2906 my $l0 = $table->[$lvl - 1];
2907 my $l1 = $table->[$lvl];
2908
2909 $self->{nxt} = $l1;
2910
2911 $v = ($exp - $l0) / ($l1 - $l0);
2912 }
2913
2914 $self->SUPER::set_value ($v);
2915}
2916
2917#############################################################################
2918
2733package CFPlus::UI::Gauge; 2919package CFPlus::UI::Gauge;
2734 2920
2735our @ISA = CFPlus::UI::VBox::; 2921our @ISA = CFPlus::UI::VBox::;
2736 2922
2737sub new { 2923sub new {
… …
2862 3048
2863 $self->SUPER::invoke_button_down ($ev, $x, $y); 3049 $self->SUPER::invoke_button_down ($ev, $x, $y);
2864 3050
2865 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3051 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2866 3052
2867 $self->invoke_mouse_motion ($ev, $x, $y) 3053 $self->invoke_mouse_motion ($ev, $x, $y);
3054
3055 1
2868} 3056}
2869 3057
2870sub invoke_mouse_motion { 3058sub invoke_mouse_motion {
2871 my ($self, $ev, $x, $y) = @_; 3059 my ($self, $ev, $x, $y) = @_;
2872 3060
… …
2892 3080
2893 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3081 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2894 3082
2895 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3083 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2896 3084
2897 ! ! $delta 3085 1
2898} 3086}
2899 3087
2900sub update { 3088sub update {
2901 my ($self) = @_; 3089 my ($self) = @_;
2902 3090
… …
3033} 3221}
3034 3222
3035sub size_request { 3223sub size_request {
3036 my ($self) = @_; 3224 my ($self) = @_;
3037 3225
3038 my ($empty, $slider) = @{ $self->{children} }; 3226 my ($empty, $slider) = $self->visible_children;
3039 3227
3040 local $self->{children} = [$empty, $slider]; 3228 local $self->{children} = [$empty, $slider];
3041 $self->SUPER::size_request 3229 $self->SUPER::size_request
3042} 3230}
3043 3231
… …
3232 3420
3233 if ($y0 < $y + $h && $y < $y1) { 3421 if ($y0 < $y + $h && $y < $y1) {
3234 my $layout = $self->get_layout ($para); 3422 my $layout = $self->get_layout ($para);
3235 3423
3236 $layout->render ($para->{indent}, $y - $y0); 3424 $layout->render ($para->{indent}, $y - $y0);
3425 $layout->draw;
3237 3426
3238 if (my @w = @{ $para->{widget} }) { 3427 if (my @w = @{ $para->{widget} }) {
3239 my @s = $layout->get_shapes; 3428 my @s = $layout->get_shapes;
3240 3429
3241 for (@w) { 3430 for (@w) {
… …
3363} 3552}
3364 3553
3365sub set_tooltip_from { 3554sub set_tooltip_from {
3366 my ($self, $widget) = @_; 3555 my ($self, $widget) = @_;
3367 3556
3368 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3369 if $widget->{tooltip} =~ /^#(.*)$/;
3370
3371 my $tooltip = $widget->{tooltip}; 3557 my $tip = $widget->{tooltip};
3558 $tip = $tip->($widget) if "CODE" eq ref $tip;
3559
3560 $tip = CFPlus::Pod::section_label tooltip => $1
3561 if $tip =~ /^#(.*)$/;
3372 3562
3373 if ($ENV{CFPLUS_DEBUG} & 2) { 3563 if ($ENV{CFPLUS_DEBUG} & 2) {
3374 $tooltip .= "\n\n" . (ref $widget) . "\n" 3564 $tip .= "\n\n" . (ref $widget) . "\n"
3375 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3565 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3376 . "req $widget->{req_w} $widget->{req_h}\n" 3566 . "req $widget->{req_w} $widget->{req_h}\n"
3377 . "visible $widget->{visible}"; 3567 . "visible $widget->{visible}";
3378 } 3568 }
3379 3569
3380 $tooltip =~ s/^\n+//; 3570 $tip =~ s/^\n+//;
3381 $tooltip =~ s/\n+$//; 3571 $tip =~ s/\n+$//;
3382 3572
3383 $self->add (new CFPlus::UI::Label 3573 $self->add (new CFPlus::UI::Label
3384 markup => $tooltip, 3574 markup => $tip,
3385 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3575 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3386 fontsize => 0.8, 3576 fontsize => 0.8,
3387 style => 1, # FLAG_INVERSE 3577 style => 1, # FLAG_INVERSE
3388 ellipsise => 0, 3578 ellipsise => 0,
3389 font => ($widget->{tooltip_font} || $::FONT_PROP), 3579 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
3427} 3617}
3428 3618
3429sub _draw { 3619sub _draw {
3430 my ($self) = @_; 3620 my ($self) = @_;
3431 3621
3432 glTranslate 0.375, 0.375;
3433
3434 my ($w, $h) = @$self{qw(w h)}; 3622 my ($w, $h) = @$self{qw(w h)};
3435 3623
3436 glColor 1, 0.8, 0.4; 3624 glColor 1, 0.8, 0.4;
3437 glBegin GL_QUADS; 3625 glRect 0, 0, $w, $h;
3438 glVertex 0 , 0;
3439 glVertex 0 , $h;
3440 glVertex $w, $h;
3441 glVertex $w, 0;
3442 glEnd;
3443 3626
3444 glColor 0, 0, 0; 3627 glColor 0, 0, 0;
3445 glBegin GL_LINE_LOOP; 3628 glRect_lineloop .5, .5, $w + .5, $h + .5;
3446 glVertex 0 , 0;
3447 glVertex 0 , $h;
3448 glVertex $w, $h;
3449 glVertex $w, 0;
3450 glEnd;
3451 3629
3452 glTranslate 2 - 0.375, 2 - 0.375; 3630 glTranslate 2, 2;
3453 3631
3454 $self->SUPER::_draw; 3632 $self->SUPER::_draw;
3455} 3633}
3456 3634
3457############################################################################# 3635#############################################################################
… …
3475 3653
3476 if ($self->{anim} && $self->{animspeed}) { 3654 if ($self->{anim} && $self->{animspeed}) {
3477 CFPlus::weaken (my $widget = $self); 3655 CFPlus::weaken (my $widget = $self);
3478 3656
3479 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3657 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3480 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed}; 3658 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3481 $self->{timer} = Event->timer ( 3659 $self->{timer} = Event->timer (
3482 parked => 1, 3660 parked => 1,
3483 cb => sub { 3661 cb => sub {
3484 return unless $::CONN && $widget; 3662 return unless $::CONN;
3485 3663
3664 my $w = $widget
3665 or return;
3666
3486 ++$widget->{frame}; 3667 ++$w->{frame};
3487 $widget->update_face; 3668 $w->update_face;
3669
3670 # somehow, $widget can go away
3488 $widget->update; 3671 $w->update;
3489
3490 $widget->update_timer; 3672 $w->update_timer;
3491 }, 3673 },
3492 ); 3674 );
3493 3675
3494 $self->update_face; 3676 $self->update_face;
3495 $self->update_timer; 3677 $self->update_timer;
… …
3516} 3698}
3517 3699
3518sub update_face { 3700sub update_face {
3519 my ($self) = @_; 3701 my ($self) = @_;
3520 3702
3521 return unless $::CONN;
3522
3523 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3524 if ($anim && @$anim) {
3525 delete $self->{wait_face};
3526 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3527 }
3528 }
3529}
3530
3531sub size_request {
3532 my ($self) = @_;
3533
3534 if ($::CONN) { 3703 if ($::CONN) {
3535 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3704 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3536 if (my $tex = $::CONN->{texture}[$faceid]) { 3705 if ($anim && @$anim) {
3537 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3706 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3538 } else { 3707 delete $self->{face_change_cb};
3539 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3708
3540 $self->realloc; 3709 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3710 unless ($tex->{name} || $tex->{loading}) {
3711 $tex->upload (sub { $self->reconfigure });
3712 }
3541 }); 3713 }
3542 } 3714 }
3543 } 3715 }
3544 } 3716 }
3717}
3718
3719sub size_request {
3720 my ($self) = @_;
3721
3722 if ($::CONN) {
3723 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3724 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3725 if ($tex->{name}) {
3726 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3727 } elsif (!$tex->{loading}) {
3728 $tex->upload (sub { $self->reconfigure });
3729 }
3730 }
3731
3732 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3733 }
3734 }
3545 3735
3546 ($self->{size_w} || 8, $self->{size_h} || 8) 3736 ($self->{size_w} || 8, $self->{size_h} || 8)
3547} 3737}
3548 3738
3549sub update { 3739sub update {
… …
3563} 3753}
3564 3754
3565sub _draw { 3755sub _draw {
3566 my ($self) = @_; 3756 my ($self) = @_;
3567 3757
3568 return unless $::CONN;
3569
3570 $self->SUPER::_draw; 3758 $self->SUPER::_draw;
3571 3759
3572 my $faceid = $::CONN->{faceid}[$self->{face}] 3760 if (my $tex = $self->{tex}) {
3573 or return;
3574
3575 my $tex = $::CONN->{texture}[$faceid];
3576
3577 if ($tex) {
3578 glEnable GL_TEXTURE_2D; 3761 glEnable GL_TEXTURE_2D;
3579 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3762 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3580 glColor 0, 0, 0, 1; 3763 glColor 0, 0, 0, 1;
3581 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3764 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3582 glDisable GL_TEXTURE_2D; 3765 glDisable GL_TEXTURE_2D;
… …
3634 children => [ 3817 children => [
3635 (new CFPlus::UI::Label markup => $left, expand => 1), 3818 (new CFPlus::UI::Label markup => $left, expand => 1),
3636 (new CFPlus::UI::Label markup => $right, align => +1), 3819 (new CFPlus::UI::Label markup => $right, align => +1),
3637 ], 3820 ],
3638 ; 3821 ;
3639 3822
3640 } else { 3823 } else {
3641 $widget = new CFPlus::UI::Label 3824 $widget = new CFPlus::UI::Label
3642 can_hover => 1, 3825 can_hover => 1,
3643 can_events => 1, 3826 can_events => 1,
3644 markup => $widget, 3827 markup => $widget,
… …
3769 3952
3770############################################################################# 3953#############################################################################
3771 3954
3772package CFPlus::UI::Notebook; 3955package CFPlus::UI::Notebook;
3773 3956
3957use CFPlus::OpenGL;
3958
3774our @ISA = CFPlus::UI::VBox::; 3959our @ISA = CFPlus::UI::VBox::;
3775 3960
3776sub new { 3961sub new {
3777 my $class = shift; 3962 my $class = shift;
3778 3963
3779 my $self = $class->SUPER::new ( 3964 my $self = $class->SUPER::new (
3780 buttonbar => (new CFPlus::UI::Buttonbar), 3965 buttonbar => (new CFPlus::UI::Buttonbar),
3781 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3966 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3967 active_outline => [.7, .7, 0.2],
3782 # filter => # will be put between multiplexer and $self 3968 # filter => # will be put between multiplexer and $self
3783 @_, 3969 @_,
3784 ); 3970 );
3785 3971
3786 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3972 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3787 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3973 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3788 3974
3975 {
3976 Scalar::Util::weaken (my $wself = $self);
3977
3978 $self->{multiplexer}->connect (c_add => sub {
3979 my ($mplex, $widgets) = @_;
3980
3981 for my $child (@$widgets) {
3982 Scalar::Util::weaken $child;
3983 $child->{c_tab_} ||= do {
3984 my $tab =
3985 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3986 ? $child->{c_tab}
3987 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3988
3989 $tab->connect (activate => sub {
3990 $wself->set_current_page ($child);
3991 });
3992
3993 $tab
3994 };
3995
3996 $self->{buttonbar}->add ($child->{c_tab_});
3997 }
3998 });
3999
4000 $self->{multiplexer}->connect (c_remove => sub {
4001 my ($mplex, $widgets) = @_;
4002
4003 for my $child (@$widgets) {
4004 $wself->{buttonbar}->remove ($child->{c_tab_});
4005 }
4006 });
4007 }
4008
3789 $self 4009 $self
3790} 4010}
3791 4011
3792sub add { 4012sub add {
4013 my ($self, @widgets) = @_;
4014
4015 $self->{multiplexer}->add (@widgets)
4016}
4017
4018sub remove {
4019 my ($self, @widgets) = @_;
4020
4021 $self->{multiplexer}->remove (@widgets)
4022}
4023
4024sub pages {
4025 my ($self) = @_;
4026 $self->{multiplexer}->children
4027}
4028
4029sub add_tab {
3793 my ($self, $title, $widget, $tooltip) = @_; 4030 my ($self, $title, $widget, $tooltip) = @_;
3794 4031
3795 CFPlus::weaken $self; 4032 $title = [$title, $tooltip] unless ref $title;
4033 $widget->{c_tab} = $title;
3796 4034
3797 $self->{buttonbar}->add (new CFPlus::UI::Button
3798 markup => $title,
3799 tooltip => $tooltip,
3800 on_activate => sub { $self->set_current_page ($widget) },
3801 );
3802
3803 $self->{multiplexer}->add ($widget); 4035 $self->add ($widget);
3804} 4036}
3805 4037
3806sub get_current_page { 4038sub get_current_page {
3807 my ($self) = @_; 4039 my ($self) = @_;
3808 4040
… …
3812sub set_current_page { 4044sub set_current_page {
3813 my ($self, $page) = @_; 4045 my ($self, $page) = @_;
3814 4046
3815 $self->{multiplexer}->set_current_page ($page); 4047 $self->{multiplexer}->set_current_page ($page);
3816 $self->emit (page_changed => $self->{multiplexer}{current}); 4048 $self->emit (page_changed => $self->{multiplexer}{current});
4049}
4050
4051sub _draw {
4052 my ($self) = @_;
4053
4054 $self->SUPER::_draw ();
4055
4056 if (my $cur = $self->{multiplexer}{current}) {
4057 if ($cur = $cur->{c_tab_}) {
4058 glTranslate $self->{buttonbar}{x} + $cur->{x},
4059 $self->{buttonbar}{y} + $cur->{y};
4060 glLineWidth 3;
4061 #glEnable GL_BLEND;
4062 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4063 glColor @{$self->{active_outline}};
4064 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4065 glLineWidth 1;
4066 #glDisable GL_BLEND;
4067 }
4068 }
3817} 4069}
3818 4070
3819############################################################################# 4071#############################################################################
3820 4072
3821package CFPlus::UI::Selector; 4073package CFPlus::UI::Selector;
… …
4091} 4343}
4092 4344
4093sub update { 4345sub update {
4094 my ($self) = @_; 4346 my ($self) = @_;
4095 4347
4096 $::WANT_REFRESH++; 4348 $::WANT_REFRESH->start;
4097} 4349}
4098 4350
4099sub add { 4351sub add {
4100 my ($self, @children) = @_; 4352 my ($self, @children) = @_;
4101 4353
… …
4138 while ($self->{refresh_hook}) { 4390 while ($self->{refresh_hook}) {
4139 $_->() 4391 $_->()
4140 for values %{delete $self->{refresh_hook}}; 4392 for values %{delete $self->{refresh_hook}};
4141 } 4393 }
4142 4394
4143 if ($self->{realloc}) { 4395 while ($self->{realloc}) {
4144 my %queue; 4396 my %queue;
4145 my @queue; 4397 my @queue;
4146 my $widget; 4398 my $widget;
4147 4399
4148 outer: 4400 outer:
… …
4195 } 4447 }
4196 } 4448 }
4197 4449
4198 delete $self->{realloc}{$widget+0}; 4450 delete $self->{realloc}{$widget+0};
4199 } 4451 }
4200 }
4201 4452
4202 while (my $size_alloc = delete $self->{size_alloc}) { 4453 while (my $size_alloc = delete $self->{size_alloc}) {
4203 my @queue = sort { $b->{visible} <=> $a->{visible} } 4454 my @queue = sort { $a->{visible} <=> $b->{visible} }
4204 values %$size_alloc; 4455 values %$size_alloc;
4205 4456
4206 while () { 4457 while () {
4207 my $widget = pop @queue || last; 4458 my $widget = pop @queue || last;
4208 4459
4209 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4460 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4210 4461
4211 $w = 0 if $w < 0;
4212 $h = 0 if $h < 0;
4213
4214 $w = max $widget->{min_w}, $w; 4462 $w = max $widget->{min_w}, $w;
4215 $h = max $widget->{min_h}, $h; 4463 $h = max $widget->{min_h}, $h;
4216 4464
4217# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4465# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4218# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4466# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4219 4467
4220 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4468 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4221 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4469 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4222 4470
4223 $w = int $w + 0.5; 4471 $w = int $w + 0.5;
4224 $h = int $h + 0.5; 4472 $h = int $h + 0.5;
4225 4473
4226 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4474 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4227 $widget->{old_w} = $widget->{w}; 4475 $widget->{old_w} = $widget->{w};
4228 $widget->{old_h} = $widget->{h}; 4476 $widget->{old_h} = $widget->{h};
4229 4477
4230 $widget->{w} = $w; 4478 $widget->{w} = $w;
4231 $widget->{h} = $h; 4479 $widget->{h} = $h;
4232 4480
4233 $widget->emit (size_allocate => $w, $h); 4481 $widget->emit (size_allocate => $w, $h);
4482 }
4234 } 4483 }
4235 } 4484 }
4236 } 4485 }
4237 4486
4238 while ($self->{post_alloc_hook}) { 4487 while ($self->{post_alloc_hook}) {

Diff Legend

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