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

Diff Legend

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