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.403 by root, Sat Jul 21 21:25:23 2007 UTC vs.
Revision 1.440 by root, Sun Sep 16 18:27:48 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 { "\fw" => $_[0]{s_id} }
279} 275}
280 276
281sub show { 277sub show {
282 my ($self) = @_; 278 my ($self) = @_;
283 279
… …
362 358
363 $self->{force_w} = $w; 359 $self->{force_w} = $w;
364 $self->{force_h} = $h; 360 $self->{force_h} = $h;
365 361
366 $self->realloc; 362 $self->realloc;
363}
364
365# traverse the widget chain up to find the maximum "physical" size constraints
366sub get_max_wh {
367 my ($self) = @_;
368
369 return $self->{parent}->get_max_wh
370 if $self->{parent};
371
372 ($::WIDTH, $::HEIGHT)
367} 373}
368 374
369sub size_request { 375sub size_request {
370 require Carp; 376 require Carp;
371 Carp::confess "size_request is abstract"; 377 Carp::confess "size_request is abstract";
… …
593 599
594# using global variables seems a bit hacky, but passing through all drawing 600# using global variables seems a bit hacky, but passing through all drawing
595# functions seems pointless. 601# functions seems pointless.
596our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 602our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
597 603
598sub draw { 604#sub draw {
599 my ($self) = @_; 605#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 606
645sub _draw { 607sub _draw {
646 my ($self) = @_; 608 my ($self) = @_;
647 609
648 warn "no draw defined for $self\n"; 610 warn "no draw defined for $self\n";
… …
651sub DESTROY { 613sub DESTROY {
652 my ($self) = @_; 614 my ($self) = @_;
653 615
654 return if CFPlus::in_destruct; 616 return if CFPlus::in_destruct;
655 617
618 local $@;
656 eval { $self->destroy }; 619 eval { $self->destroy };
657 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 620 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
658 621
659 delete $WIDGET{$self+0}; 622 delete $WIDGET{$self+0};
660} 623}
… …
668use strict; 631use strict;
669use CFPlus::OpenGL; 632use CFPlus::OpenGL;
670 633
671sub new { 634sub new {
672 my $class = shift; 635 my $class = shift;
673
674 # range [value, low, high, page]
675 636
676 $class->SUPER::new ( 637 $class->SUPER::new (
677 #bg => [0, 0, 0, 0.2], 638 #bg => [0, 0, 0, 0.2],
678 #active_bg => [1, 1, 1, 0.5], 639 #active_bg => [1, 1, 1, 0.5],
679 @_ 640 @_
… …
691 my ($w, $h) = @$self{qw(w h)}; 652 my ($w, $h) = @$self{qw(w h)};
692 653
693 glEnable GL_BLEND; 654 glEnable GL_BLEND;
694 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 655 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
695 glColor_premultiply @$color; 656 glColor_premultiply @$color;
696
697 glBegin GL_QUADS;
698 glVertex 0 , 0;
699 glVertex 0 , $h;
700 glVertex $w, $h; 657 glRect 0, 0, $w, $h;
701 glVertex $w, 0;
702 glEnd;
703
704 glDisable GL_BLEND; 658 glDisable GL_BLEND;
705 } 659 }
706} 660}
707 661
708############################################################################# 662#############################################################################
… …
769 @{$self->{children}}, @widgets 723 @{$self->{children}}, @widgets
770 ]; 724 ];
771 725
772 $self->realloc; 726 $self->realloc;
773 727
728 $self->emit (c_add => \@widgets);
729
774 map $_+0, @widgets 730 map $_+0, @widgets
775} 731}
776 732
777sub children { 733sub children {
778 @{ $_[0]{children} } 734 @{ $_[0]{children} }
779} 735}
780 736
781sub remove { 737sub remove {
782 my ($self, $child) = @_; 738 my ($self, @widgets) = @_;
783 739
740 $self->emit (c_remove => \@widgets);
741
742 for my $child (@widgets) {
784 delete $child->{parent}; 743 delete $child->{parent};
785 $child->hide; 744 $child->hide;
786
787 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 745 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
746 }
788 747
789 $self->realloc; 748 $self->realloc;
790} 749}
791 750
792sub clear { 751sub clear {
… …
820} 779}
821 780
822sub _draw { 781sub _draw {
823 my ($self) = @_; 782 my ($self) = @_;
824 783
825 $_->draw for @{$self->{children}}; 784 $_->draw for $self->visible_children;
826} 785}
827 786
828############################################################################# 787#############################################################################
829 788
830package CFPlus::UI::Bin; 789package CFPlus::UI::Bin;
… …
840} 799}
841 800
842sub add { 801sub add {
843 my ($self, $child) = @_; 802 my ($self, $child) = @_;
844 803
845 $self->SUPER::remove ($_) for @{ $self->{children} }; 804 $self->clear;
846 $self->SUPER::add ($child); 805 $self->SUPER::add ($child);
847} 806}
848 807
849sub remove { 808sub remove {
850 my ($self, $widget) = @_; 809 my ($self, $widget) = @_;
… …
868 827
869 1 828 1
870} 829}
871 830
872############################################################################# 831#############################################################################
873
874# back-buffered drawing area 832# back-buffered drawing area
875 833
876package CFPlus::UI::Window; 834package CFPlus::UI::Window;
877 835
878our @ISA = CFPlus::UI::Bin::; 836our @ISA = CFPlus::UI::Bin::;
… …
992 $self->{view_x} = $x; 950 $self->{view_x} = $x;
993 $self->{view_y} = $y; 951 $self->{view_y} = $y;
994 952
995 $self->emit (changed => $x, $y); 953 $self->emit (changed => $x, $y);
996 $self->update; 954 $self->update;
955 }
956}
957
958sub set_center {
959 my ($self, $x, $y) = @_;
960
961 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
962}
963
964sub make_visible {
965 my ($self, $x, $y, $border) = @_;
966
967 if ( $x < $self->{view_x} + $self->{w} * $border
968 || $x > $self->{view_x} + $self->{w} * (1 - $border)
969 || $y < $self->{view_y} + $self->{h} * $border
970 || $y > $self->{view_y} + $self->{h} * (1 - $border)
971 ) {
972 $self->set_center ($x, $y);
997 } 973 }
998} 974}
999 975
1000# hmm, this does not work for topleft of $self... but we should not ask for that 976# hmm, this does not work for topleft of $self... but we should not ask for that
1001sub coord2local { 977sub coord2local {
… …
1048 my $child = delete $arg{child}; 1024 my $child = delete $arg{child};
1049 1025
1050 my $self; 1026 my $self;
1051 1027
1052 my $hslider = new CFPlus::UI::Slider 1028 my $hslider = new CFPlus::UI::Slider
1053 col => 0, 1029 c_col => 0,
1054 row => 1, 1030 c_row => 1,
1055 vertical => 0, 1031 vertical => 0,
1056 range => [0, 0, 1, 0.01], # HACK fix 1032 range => [0, 0, 1, 0.01], # HACK fix
1057 on_changed => sub { 1033 on_changed => sub {
1058 $self->{hpos} = $_[1]; 1034 $self->{hpos} = $_[1];
1059 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1035 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1060 }, 1036 },
1061 ; 1037 ;
1062 1038
1063 my $vslider = new CFPlus::UI::Slider 1039 my $vslider = new CFPlus::UI::Slider
1064 col => 1, 1040 c_col => 1,
1065 row => 0, 1041 c_row => 0,
1066 vertical => 1, 1042 vertical => 1,
1067 range => [0, 0, 1, 0.01], # HACK fix 1043 range => [0, 0, 1, 0.01], # HACK fix
1068 on_changed => sub { 1044 on_changed => sub {
1069 $self->{vpos} = $_[1]; 1045 $self->{vpos} = $_[1];
1070 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1046 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1081 row_expand => [1, 0], 1057 row_expand => [1, 0],
1082 %arg, 1058 %arg,
1083 ); 1059 );
1084 1060
1085 $self->{vp} = new CFPlus::UI::ViewPort 1061 $self->{vp} = new CFPlus::UI::ViewPort
1086 col => 0, 1062 c_col => 0,
1087 row => 0, 1063 c_row => 0,
1088 expand => 1, 1064 expand => 1,
1089 scroll_x => $self->{scroll_x}, 1065 scroll_x => $self->{scroll_x},
1090 scroll_y => $self->{scroll_y}, 1066 scroll_y => $self->{scroll_y},
1091 on_changed => sub { 1067 on_changed => sub {
1092 my ($vp, $x, $y) = @_; 1068 my ($vp, $x, $y) = @_;
… …
1114 my ($self, $widget) = @_; 1090 my ($self, $widget) = @_;
1115 1091
1116 $self->{vp}->add ($self->{child} = $widget); 1092 $self->{vp}->add ($self->{child} = $widget);
1117} 1093}
1118 1094
1095sub set_offset { shift->{vp}->set_offset (@_) }
1096sub set_center { shift->{vp}->set_center (@_) }
1097sub make_visible { shift->{vp}->make_visible (@_) }
1098
1119sub update_slider { 1099sub update_slider {
1120 my ($self) = @_; 1100 my ($self) = @_;
1121 1101
1122 my $child = ($self->{vp} or return)->child; 1102 my $child = ($self->{vp} or return)->child;
1123 1103
… …
1236 my ($w, $h) = @$self{qw(w h)}; 1216 my ($w, $h) = @$self{qw(w h)};
1237 1217
1238 glEnable GL_BLEND; 1218 glEnable GL_BLEND;
1239 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1219 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1240 glColor_premultiply @{ $self->{bg} }; 1220 glColor_premultiply @{ $self->{bg} };
1241
1242 glBegin GL_QUADS;
1243 glVertex 0 , 0;
1244 glVertex 0 , $h;
1245 glVertex $w, $h; 1221 glRect 0, 0, $w, $h;
1246 glVertex $w, 0;
1247 glEnd;
1248
1249 glDisable GL_BLEND; 1222 glDisable GL_BLEND;
1250 } 1223 }
1251 1224
1252 $self->SUPER::_draw; 1225 $self->SUPER::_draw;
1253} 1226}
… …
1414 1387
1415sub border { 1388sub border {
1416 int $_[0]{border} * $::FONTSIZE 1389 int $_[0]{border} * $::FONTSIZE
1417} 1390}
1418 1391
1392sub get_max_wh {
1393 my ($self) = @_;
1394
1395 return ($self->{w}, $self->{h})
1396 if $self->{visible} && $self->{w};
1397
1398 $self->SUPER::get_max_wh
1399}
1400
1419sub size_request { 1401sub size_request {
1420 my ($self) = @_; 1402 my ($self) = @_;
1421 1403
1422 $self->{title_widget}->size_request 1404 $self->{title_widget}->size_request
1423 if $self->{title_widget}; 1405 if $self->{title_widget};
… …
1615 1597
1616sub add { 1598sub add {
1617 my ($self, @widgets) = @_; 1599 my ($self, @widgets) = @_;
1618 1600
1619 for my $child (@widgets) { 1601 for my $child (@widgets) {
1620 $child->{rowspan} ||= 1; 1602 $child->{c_rowspan} ||= 1;
1621 $child->{colspan} ||= 1; 1603 $child->{c_colspan} ||= 1;
1622 } 1604 }
1623 1605
1624 $self->SUPER::add (@widgets); 1606 $self->SUPER::add (@widgets);
1625} 1607}
1626 1608
… …
1630 my @widgets; 1612 my @widgets;
1631 1613
1632 while (@_) { 1614 while (@_) {
1633 my ($col, $row, $child) = splice @_, 0, 3, (); 1615 my ($col, $row, $child) = splice @_, 0, 3, ();
1634 1616
1635 $child->{row} = $row; 1617 $child->{c_row} = $row;
1636 $child->{col} = $col; 1618 $child->{c_col} = $col;
1637 1619
1638 push @widgets, $child; 1620 push @widgets, $child;
1639 } 1621 }
1640 1622
1641 $self->add (@widgets); 1623 $self->add (@widgets);
… …
1647 my (@w, @h); 1629 my (@w, @h);
1648 1630
1649 my @children = $self->children; 1631 my @children = $self->children;
1650 1632
1651 # first pass, columns 1633 # first pass, columns
1652 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) { 1634 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1653 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; 1635 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1654 1636
1655 my $sw = sum @w[$c .. $c + $cs - 1]; 1637 my $sw = sum @w[$c .. $c + $cs - 1];
1656 1638
1657 if ($w > $sw) { 1639 if ($w > $sw) {
1658 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; 1640 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1659 } 1641 }
1660 } 1642 }
1661 1643
1662 # second pass, rows 1644 # second pass, rows
1663 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { 1645 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1664 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; 1646 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1665 1647
1666 my $sh = sum @h[$r .. $r + $rs - 1]; 1648 my $sh = sum @h[$r .. $r + $rs - 1];
1667 1649
1668 if ($h > $sh) { 1650 if ($h > $sh) {
1669 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; 1651 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
… …
1711 1693
1712 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } 1694 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1713 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } 1695 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1714 1696
1715 for my $widget ($self->children) { 1697 for my $widget ($self->children) {
1716 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)}; 1698 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1717 1699
1718 $widget->configure ( 1700 $widget->configure (
1719 $x[$c], $y[$r], 1701 $x[$c], $y[$r],
1720 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r], 1702 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1721 ); 1703 );
… …
1730 1712
1731use List::Util qw(min max); 1713use List::Util qw(min max);
1732 1714
1733our @ISA = CFPlus::UI::Container::; 1715our @ISA = CFPlus::UI::Container::;
1734 1716
1735sub add_fixed {
1736 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1737
1738 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1739 $self->SUPER::add ($child);
1740}
1741
1742sub _scale($$$) { 1717sub _scale($$$) {
1743 my ($mode, $val, $max) = @_; 1718 my ($rel, $val, $max) = @_;
1744 1719
1745 $mode eq "abs" ? $val 1720 $rel ? $val * $max : $val
1746 : $mode eq "rel" ? $val * $max
1747 : 0
1748} 1721}
1749 1722
1750sub size_request { 1723sub size_request {
1751 my ($self) = @_; 1724 my ($self) = @_;
1752 1725
1753 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1726 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1754 1727
1755 # determine overall size by querying abs widgets 1728 # determine overall size by querying abs widgets
1756 for my $child ($self->visible_children) { 1729 for my $child ($self->visible_children) {
1757 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1730 unless ($child->{c_rel}) {
1731 my $x = $child->{c_x};
1732 my $y = $child->{c_y};
1758 1733
1759 if ($pos eq "abs") {
1760 $w = _scale $size, $w, $child->{req_w};
1761 $h = _scale $size, $h, $child->{req_h};
1762
1763 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1734 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1764 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1735 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1765 } 1736 }
1766 } 1737 }
1767 1738
1768 my $W = $x2 - $x1; 1739 my $W = $x2 - $x1;
1769 my $H = $y2 - $y1; 1740 my $H = $y2 - $y1;
1770 1741
1771 # now layout remaining widgets 1742 # now layout remaining widgets
1772 for my $child ($self->visible_children) { 1743 for my $child ($self->visible_children) {
1773 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1744 if ($child->{c_rel}) {
1745 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1746 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1774 1747
1775 if ($pos ne "abs") {
1776 $x = _scale $pos, $x, $W;
1777 $y = _scale $pos, $x, $H;
1778 $w = _scale $size, $w, $child->{req_w};
1779 $h = _scale $size, $h, $child->{req_h};
1780
1781 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1748 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1782 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1749 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1783 } 1750 }
1784 } 1751 }
1785 1752
1786 my $W = $x2 - $x1; 1753 my $W = $x2 - $x1;
1787 my $H = $y2 - $y1; 1754 my $H = $y2 - $y1;
… …
1791 1758
1792sub invoke_size_allocate { 1759sub invoke_size_allocate {
1793 my ($self, $W, $H) = @_; 1760 my ($self, $W, $H) = @_;
1794 1761
1795 for my $child ($self->visible_children) { 1762 for my $child ($self->visible_children) {
1796 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1763 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1764 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1797 1765
1798 $x = _scale $pos, $x, $W; 1766 $x += $child->{c_halign} * $child->{req_w};
1799 $y = _scale $pos, $x, $H; 1767 $y += $child->{c_valign} * $child->{req_h};
1800 $w = _scale $size, $w, $W;
1801 $h = _scale $size, $h, $H;
1802 1768
1803 $child->configure ($x, $y, $w, $h); 1769 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1804 } 1770 }
1805 1771
1806 1 1772 1
1807} 1773}
1808 1774
… …
1812 1778
1813our @ISA = CFPlus::UI::Container::; 1779our @ISA = CFPlus::UI::Container::;
1814 1780
1815sub size_request { 1781sub size_request {
1816 my ($self) = @_; 1782 my ($self) = @_;
1783
1784 my @children = $self->visible_children;
1817 1785
1818 $self->{vertical} 1786 $self->{vertical}
1819 ? ( 1787 ? (
1820 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1788 (List::Util::max map $_->{req_w}, @children),
1821 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1789 (List::Util::sum map $_->{req_h}, @children),
1822 ) 1790 )
1823 : ( 1791 : (
1824 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1792 (List::Util::sum map $_->{req_w}, @children),
1825 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1793 (List::Util::max map $_->{req_h}, @children),
1826 ) 1794 )
1827} 1795}
1828 1796
1829sub invoke_size_allocate { 1797sub invoke_size_allocate {
1830 my ($self, $w, $h) = @_; 1798 my ($self, $w, $h) = @_;
… …
1954 1922
1955 delete $self->{ox}; 1923 delete $self->{ox};
1956 $self->SUPER::realloc; 1924 $self->SUPER::realloc;
1957} 1925}
1958 1926
1927sub clear {
1928 my ($self) = @_;
1929
1930 $self->set_text ("");
1931}
1932
1959sub set_text { 1933sub set_text {
1960 my ($self, $text) = @_; 1934 my ($self, $text) = @_;
1961 1935
1962 return if $self->{text} eq "T$text"; 1936 return if $self->{text} eq "T$text";
1963 $self->{text} = "T$text"; 1937 $self->{text} = "T$text";
… …
1986 1960
1987sub size_request { 1961sub size_request {
1988 my ($self) = @_; 1962 my ($self) = @_;
1989 1963
1990 $self->{size_req} ||= do { 1964 $self->{size_req} ||= do {
1965 my ($max_w, $max_h) = $self->get_max_wh;
1966
1991 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1967 $self->{layout}->set_font ($self->{font}) if $self->{font};
1992 $self->{layout}->set_width ($self->{max_w} || -1); 1968 $self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1993 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1969 $self->{layout}->set_ellipsise ($self->{ellipsise});
1994 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1970 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1995 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1971 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1996 1972
1997 my ($w, $h) = $self->{layout}->size; 1973 my ($w, $h) = $self->{layout}->size;
… …
2069 : ($self->{w} - $size->[0]) * 0.5); 2045 : ($self->{w} - $size->[0]) * 0.5);
2070 2046
2071 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2047 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2072 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2048 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2073 : ($self->{h} - $size->[1]) * 0.5); 2049 : ($self->{h} - $size->[1]) * 0.5);
2050
2051 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2074 }; 2052 };
2075 2053
2076 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2054# unless ($self->{list}) {
2077 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2055# $self->{list} = CFPlus::OpenGL::glGenList;
2078 2056# CFPlus::OpenGL::glNewList $self->{list};
2079 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2057# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2058# CFPlus::OpenGL::glEndList;
2059# }
2060#
2061# CFPlus::OpenGL::glCallList $self->{list};
2062
2063 $self->{layout}->draw;
2080} 2064}
2065
2066#sub destroy {
2067# my ($self) = @_;
2068#
2069# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2070#
2071# $self->SUPER::destroy;
2072#}
2081 2073
2082############################################################################# 2074#############################################################################
2083 2075
2084package CFPlus::UI::EntryBase; 2076package CFPlus::UI::EntryBase;
2085 2077
… …
2091 my $class = shift; 2083 my $class = shift;
2092 2084
2093 $class->SUPER::new ( 2085 $class->SUPER::new (
2094 fg => [1, 1, 1], 2086 fg => [1, 1, 1],
2095 bg => [0, 0, 0, 0.2], 2087 bg => [0, 0, 0, 0.2],
2088 outline => [0.6, 0.3, 0.1],
2096 active_bg => [1, 1, 1, 0.5], 2089 active_bg => [0, 0, 1, .2],
2097 active_fg => [0, 0, 0], 2090 active_fg => [1, 1, 1],
2091 active_outline => [1, 1, 0],
2098 can_hover => 1, 2092 can_hover => 1,
2099 can_focus => 1, 2093 can_focus => 1,
2100 valign => 0, 2094 valign => 0,
2101 can_events => 1, 2095 can_events => 1,
2102 ellipsise => 0, 2096 ellipsise => 0,
… …
2242 glColor_premultiply @{$self->{bg}}; 2236 glColor_premultiply @{$self->{bg}};
2243 } 2237 }
2244 2238
2245 glEnable GL_BLEND; 2239 glEnable GL_BLEND;
2246 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2240 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2247 glBegin GL_QUADS;
2248 glVertex 0 , 0;
2249 glVertex 0 , $self->{h};
2250 glVertex $self->{w}, $self->{h}; 2241 glRect 0, 0, $self->{w}, $self->{h};
2251 glVertex $self->{w}, 0;
2252 glEnd;
2253 glDisable GL_BLEND; 2242 glDisable GL_BLEND;
2254 2243
2255 $self->SUPER::_draw; 2244 $self->SUPER::_draw;
2256 2245
2257 #TODO: force update every cursor change :( 2246 #TODO: force update every cursor change :(
… …
2259 2248
2260 unless (exists $self->{cur_h}) { 2249 unless (exists $self->{cur_h}) {
2261 my $text = substr $self->{text}, 0, $self->{cursor}; 2250 my $text = substr $self->{text}, 0, $self->{cursor};
2262 utf8::encode $text; 2251 utf8::encode $text;
2263 2252
2264 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2253 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2265 } 2254 }
2266 2255
2256 glColor_premultiply @{$self->{active_fg}};
2267 glBegin GL_LINES; 2257 glBegin GL_LINES;
2268 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2258 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2269 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2259 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2260 glEnd;
2261
2262 glLineWidth 3;
2263 glColor @{$self->{active_outline}};
2264 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2265 glLineWidth 1;
2266
2267 } else {
2268 glColor @{$self->{outline}};
2269 glBegin GL_LINE_STRIP;
2270 glVertex .5, $self->{h} * .5;
2271 glVertex .5, $self->{h} - 2.5;
2272 glVertex $self->{w} - .5, $self->{h} - 2.5;
2273 glVertex $self->{w} - .5, $self->{h} * .5;
2270 glEnd; 2274 glEnd;
2271 } 2275 }
2272} 2276}
2273 2277
2274############################################################################# 2278#############################################################################
… …
2361 1 2365 1
2362} 2366}
2363 2367
2364############################################################################# 2368#############################################################################
2365 2369
2370package CFPlus::UI::ButtonBin;
2371
2372our @ISA = CFPlus::UI::Bin::;
2373
2374use CFPlus::OpenGL;
2375
2376my @tex =
2377 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2378 qw(b1_button_inactive.png b1_button_active.png);
2379
2380sub new {
2381 my $class = shift;
2382
2383 $class->SUPER::new (
2384 can_hover => 1,
2385 align => 0,
2386 valign => 0,
2387 can_events => 1,
2388 @_
2389 )
2390}
2391
2392sub invoke_button_up {
2393 my ($self, $ev, $x, $y) = @_;
2394
2395 $self->emit ("activate")
2396 if $x >= 0 && $x < $self->{w}
2397 && $y >= 0 && $y < $self->{h};
2398
2399 1
2400}
2401
2402sub _draw {
2403 my ($self) = @_;
2404
2405 glEnable GL_TEXTURE_2D;
2406 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2407 glColor 0, 0, 0, 1;
2408
2409 my $tex = $tex[$GRAB == $self];
2410 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2411
2412 glDisable GL_TEXTURE_2D;
2413
2414 $self->SUPER::_draw;
2415}
2416
2417#############################################################################
2418
2366package CFPlus::UI::Button; 2419package CFPlus::UI::Button;
2367 2420
2368our @ISA = CFPlus::UI::Label::; 2421our @ISA = CFPlus::UI::Label::;
2369 2422
2370use CFPlus::OpenGL; 2423use CFPlus::OpenGL;
… …
2474sub _draw { 2527sub _draw {
2475 my ($self) = @_; 2528 my ($self) = @_;
2476 2529
2477 $self->SUPER::_draw; 2530 $self->SUPER::_draw;
2478 2531
2479 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2532 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2480 2533
2481 my ($w, $h) = @$self{qw(w h)}; 2534 my ($w, $h) = @$self{qw(w h)};
2482 2535
2483 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2536 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2484 2537
… …
2504sub new { 2557sub new {
2505 my $class = shift; 2558 my $class = shift;
2506 2559
2507 my $self = $class->SUPER::new ( 2560 my $self = $class->SUPER::new (
2508 can_events => 0, 2561 can_events => 0,
2562 scale => 1,
2509 @_, 2563 @_,
2510 ); 2564 );
2511 2565
2512 $self->{path} || $self->{tex} 2566 $self->{path} || $self->{tex}
2513 or Carp::croak "'path' or 'tex' attributes required"; 2567 or Carp::croak "'path' or 'tex' attributes required";
… …
2538} 2592}
2539 2593
2540sub size_request { 2594sub size_request {
2541 my ($self) = @_; 2595 my ($self) = @_;
2542 2596
2543 ($self->{tex}{w}, $self->{tex}{h}) 2597 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2544} 2598}
2545 2599
2546sub _draw { 2600sub _draw {
2547 my ($self) = @_; 2601 my ($self) = @_;
2548 2602
… …
2558 } 2612 }
2559 2613
2560 glEnable GL_TEXTURE_2D; 2614 glEnable GL_TEXTURE_2D;
2561 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2615 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2562 2616
2563 $tex->draw_quad (0, 0, $w, $h); 2617 $tex->draw_quad_alpha (0, 0, $w, $h);
2564 2618
2565 glDisable GL_TEXTURE_2D; 2619 glDisable GL_TEXTURE_2D;
2566} 2620}
2567 2621
2568############################################################################# 2622#############################################################################
… …
2587 align => 0, 2641 align => 0,
2588 valign => 0, 2642 valign => 0,
2589 can_events => 1, 2643 can_events => 1,
2590 @_ 2644 @_
2591 ); 2645 );
2646}
2647
2648sub invoke_button_down {
2649 my ($self, $ev, $x, $y) = @_;
2650
2651 1
2592} 2652}
2593 2653
2594sub invoke_button_up { 2654sub invoke_button_up {
2595 my ($self, $ev, $x, $y) = @_; 2655 my ($self, $ev, $x, $y) = @_;
2596 2656
… …
2736 glDisable GL_TEXTURE_2D; 2796 glDisable GL_TEXTURE_2D;
2737} 2797}
2738 2798
2739############################################################################# 2799#############################################################################
2740 2800
2801package CFPlus::UI::Progress;
2802
2803our @ISA = CFPlus::UI::Label::;
2804
2805use CFPlus::OpenGL;
2806
2807sub new {
2808 my ($class, %arg) = @_;
2809
2810 my $self = $class->SUPER::new (
2811 fg => [1, 1, 1],
2812 bg => [0, 0, 1, 0.2],
2813 bar => [0.7, 0.5, 0.1, 0.8],
2814 outline => [0.4, 0.3, 0],
2815 fontsize => 0.9,
2816 valign => 0,
2817 align => 0,
2818 can_events => 1,
2819 ellipsise => 1,
2820 label => "%d%%",
2821 %arg,
2822 );
2823
2824 $self->set_value ($arg{value} || -1);
2825
2826 $self
2827}
2828
2829sub set_label {
2830 my ($self, $label) = @_;
2831
2832 return if $self->{label} eq $label;
2833 $self->{label} = $label;
2834
2835 $self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
2836}
2837
2838sub set_value {
2839 my ($self, $value) = @_;
2840
2841 if ($self->{value} ne $value) {
2842 $self->{value} = $value;
2843
2844 if ($value < 0) {
2845 $self->set_text ("-");
2846 } else {
2847 $self->set_text (sprintf $self->{label}, $value * 100);
2848 }
2849
2850 $self->update;
2851 }
2852}
2853
2854sub _draw {
2855 my ($self) = @_;
2856
2857 glEnable GL_BLEND;
2858 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2859
2860 if ($self->{value} >= 0) {
2861 my $s = int 2 + ($self->{w} - 4) * $self->{value};
2862
2863 glColor_premultiply @{$self->{bar}};
2864 glRect 2, 2, $s, $self->{h} - 2;
2865 glColor_premultiply @{$self->{bg}};
2866 glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
2867 }
2868
2869 glColor_premultiply @{$self->{outline}};
2870 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2871
2872 glDisable GL_BLEND;
2873
2874 {
2875 local $self->{bg}; # do not draw background
2876 $self->SUPER::_draw;
2877 }
2878}
2879
2880#############################################################################
2881
2882package CFPlus::UI::ExperienceProgress;
2883
2884our @ISA = CFPlus::UI::Progress::;
2885
2886sub new {
2887 my ($class, %arg) = @_;
2888
2889 my $self = $class->SUPER::new (
2890 tooltip => sub {
2891 my ($self) = @_;
2892
2893 sprintf "level %d\n%s points\n%s next level\n%s to go",
2894 $self->{lvl},
2895 ::formsep ($self->{exp}),
2896 ::formsep ($self->{nxt}),
2897 ::formsep ($self->{nxt} - $self->{exp}),
2898 },
2899 %arg
2900 );
2901
2902 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2903 if $::CONN;
2904
2905 $self
2906}
2907
2908sub DESTROY {
2909 my ($self) = @_;
2910
2911 delete $::CONN->{on_exp_update}{$self+0}
2912 if $::CONN;
2913
2914 $self->SUPER::DESTROY;
2915}
2916
2917sub set_value {
2918 my ($self, $lvl, $exp) = @_;
2919
2920 $self->{lvl} = $lvl;
2921 $self->{exp} = $exp;
2922
2923 my $v = -1;
2924
2925 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2926 my $l0 = $table->[$lvl - 1];
2927 my $l1 = $table->[$lvl];
2928
2929 $self->{nxt} = $l1;
2930
2931 $v = ($exp - $l0) / ($l1 - $l0);
2932 }
2933
2934 $self->SUPER::set_value ($v);
2935}
2936
2937#############################################################################
2938
2741package CFPlus::UI::Gauge; 2939package CFPlus::UI::Gauge;
2742 2940
2743our @ISA = CFPlus::UI::VBox::; 2941our @ISA = CFPlus::UI::VBox::;
2744 2942
2745sub new { 2943sub new {
… …
2870 3068
2871 $self->SUPER::invoke_button_down ($ev, $x, $y); 3069 $self->SUPER::invoke_button_down ($ev, $x, $y);
2872 3070
2873 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3071 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2874 3072
2875 $self->invoke_mouse_motion ($ev, $x, $y) 3073 $self->invoke_mouse_motion ($ev, $x, $y);
3074
3075 1
2876} 3076}
2877 3077
2878sub invoke_mouse_motion { 3078sub invoke_mouse_motion {
2879 my ($self, $ev, $x, $y) = @_; 3079 my ($self, $ev, $x, $y) = @_;
2880 3080
… …
2900 3100
2901 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3101 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2902 3102
2903 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3103 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2904 3104
2905 ! ! $delta 3105 1
2906} 3106}
2907 3107
2908sub update { 3108sub update {
2909 my ($self) = @_; 3109 my ($self) = @_;
2910 3110
… …
3041} 3241}
3042 3242
3043sub size_request { 3243sub size_request {
3044 my ($self) = @_; 3244 my ($self) = @_;
3045 3245
3046 my ($empty, $slider) = @{ $self->{children} }; 3246 my ($empty, $slider) = $self->visible_children;
3047 3247
3048 local $self->{children} = [$empty, $slider]; 3248 local $self->{children} = [$empty, $slider];
3049 $self->SUPER::size_request 3249 $self->SUPER::size_request
3050} 3250}
3051 3251
… …
3240 3440
3241 if ($y0 < $y + $h && $y < $y1) { 3441 if ($y0 < $y + $h && $y < $y1) {
3242 my $layout = $self->get_layout ($para); 3442 my $layout = $self->get_layout ($para);
3243 3443
3244 $layout->render ($para->{indent}, $y - $y0); 3444 $layout->render ($para->{indent}, $y - $y0);
3445 $layout->draw;
3245 3446
3246 if (my @w = @{ $para->{widget} }) { 3447 if (my @w = @{ $para->{widget} }) {
3247 my @s = $layout->get_shapes; 3448 my @s = $layout->get_shapes;
3248 3449
3249 for (@w) { 3450 for (@w) {
… …
3371} 3572}
3372 3573
3373sub set_tooltip_from { 3574sub set_tooltip_from {
3374 my ($self, $widget) = @_; 3575 my ($self, $widget) = @_;
3375 3576
3376 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3377 if $widget->{tooltip} =~ /^#(.*)$/;
3378
3379 my $tooltip = $widget->{tooltip}; 3577 my $tip = $widget->{tooltip};
3578 $tip = $tip->($widget) if "CODE" eq ref $tip;
3579
3580 $tip = CFPlus::Pod::section_label tooltip => $1
3581 if $tip =~ /^#(.*)$/;
3380 3582
3381 if ($ENV{CFPLUS_DEBUG} & 2) { 3583 if ($ENV{CFPLUS_DEBUG} & 2) {
3382 $tooltip .= "\n\n" . (ref $widget) . "\n" 3584 $tip .= "\n\n" . (ref $widget) . "\n"
3383 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3585 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3384 . "req $widget->{req_w} $widget->{req_h}\n" 3586 . "req $widget->{req_w} $widget->{req_h}\n"
3385 . "visible $widget->{visible}"; 3587 . "visible $widget->{visible}";
3386 } 3588 }
3387 3589
3388 $tooltip =~ s/^\n+//; 3590 $tip =~ s/^\n+//;
3389 $tooltip =~ s/\n+$//; 3591 $tip =~ s/\n+$//;
3390 3592
3391 $self->add (new CFPlus::UI::Label 3593 $self->add (new CFPlus::UI::Label
3392 markup => $tooltip, 3594 markup => $tip,
3393 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3595 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3394 fontsize => 0.8, 3596 fontsize => 0.8,
3395 style => 1, # FLAG_INVERSE 3597 style => 1, # FLAG_INVERSE
3396 ellipsise => 0, 3598 ellipsise => 0,
3397 font => ($widget->{tooltip_font} || $::FONT_PROP), 3599 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
3435} 3637}
3436 3638
3437sub _draw { 3639sub _draw {
3438 my ($self) = @_; 3640 my ($self) = @_;
3439 3641
3440 glTranslate 0.375, 0.375;
3441
3442 my ($w, $h) = @$self{qw(w h)}; 3642 my ($w, $h) = @$self{qw(w h)};
3443 3643
3444 glColor 1, 0.8, 0.4; 3644 glColor 1, 0.8, 0.4;
3445 glBegin GL_QUADS; 3645 glRect 0, 0, $w, $h;
3446 glVertex 0 , 0;
3447 glVertex 0 , $h;
3448 glVertex $w, $h;
3449 glVertex $w, 0;
3450 glEnd;
3451 3646
3452 glColor 0, 0, 0; 3647 glColor 0, 0, 0;
3453 glBegin GL_LINE_LOOP; 3648 glRect_lineloop .5, .5, $w + .5, $h + .5;
3454 glVertex 0 , 0;
3455 glVertex 0 , $h;
3456 glVertex $w, $h;
3457 glVertex $w, 0;
3458 glEnd;
3459 3649
3460 glTranslate 2 - 0.375, 2 - 0.375; 3650 glTranslate 2, 2;
3461 3651
3462 $self->SUPER::_draw; 3652 $self->SUPER::_draw;
3463} 3653}
3464 3654
3465############################################################################# 3655#############################################################################
… …
3483 3673
3484 if ($self->{anim} && $self->{animspeed}) { 3674 if ($self->{anim} && $self->{animspeed}) {
3485 CFPlus::weaken (my $widget = $self); 3675 CFPlus::weaken (my $widget = $self);
3486 3676
3487 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3677 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3488 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed}; 3678 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3489 $self->{timer} = Event->timer ( 3679 $self->{timer} = Event->timer (
3490 parked => 1, 3680 parked => 1,
3491 cb => sub { 3681 cb => sub {
3492 return unless $::CONN && $widget; 3682 return unless $::CONN;
3493 3683
3684 my $w = $widget
3685 or return;
3686
3494 ++$widget->{frame}; 3687 ++$w->{frame};
3495 $widget->update_face; 3688 $w->update_face;
3689
3690 # somehow, $widget can go away
3496 $widget->update; 3691 $w->update;
3497
3498 $widget->update_timer; 3692 $w->update_timer;
3499 }, 3693 },
3500 ); 3694 );
3501 3695
3502 $self->update_face; 3696 $self->update_face;
3503 $self->update_timer; 3697 $self->update_timer;
… …
3524} 3718}
3525 3719
3526sub update_face { 3720sub update_face {
3527 my ($self) = @_; 3721 my ($self) = @_;
3528 3722
3529 return unless $::CONN; 3723 if ($::CONN) {
3530
3531 if (my $anim = $::CONN->{anim}[$self->{anim}]) { 3724 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3532 if ($anim && @$anim) { 3725 if ($anim && @$anim) {
3533 delete $self->{wait_face};
3534 $self->{face} = $anim->[ $self->{frame} % @$anim ]; 3726 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3727 delete $self->{face_change_cb};
3728
3535 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ]; 3729 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3730 unless ($tex->{name} || $tex->{loading}) {
3731 $tex->upload (sub { $self->reconfigure });
3732 }
3733 }
3734 }
3536 } 3735 }
3537 } 3736 }
3538} 3737}
3539 3738
3540sub size_request { 3739sub size_request {
3541 my ($self) = @_; 3740 my ($self) = @_;
3542 3741
3543 if ($::CONN) { 3742 if ($::CONN) {
3544 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3743 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3545 if (my $tex = $::CONN->{texture}[$faceid]) { 3744 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3546 $self->{tex} = $tex; 3745 if ($tex->{name}) {
3547 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3746 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3548 } else { 3747 } elsif (!$tex->{loading}) {
3549 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3748 $tex->upload (sub { $self->reconfigure });
3550 $self->realloc;
3551 }); 3749 }
3552 } 3750 }
3751
3752 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3553 } 3753 }
3554 } 3754 }
3555 3755
3556 ($self->{size_w} || 8, $self->{size_h} || 8) 3756 ($self->{size_w} || 8, $self->{size_h} || 8)
3557} 3757}
… …
3637 children => [ 3837 children => [
3638 (new CFPlus::UI::Label markup => $left, expand => 1), 3838 (new CFPlus::UI::Label markup => $left, expand => 1),
3639 (new CFPlus::UI::Label markup => $right, align => +1), 3839 (new CFPlus::UI::Label markup => $right, align => +1),
3640 ], 3840 ],
3641 ; 3841 ;
3642 3842
3643 } else { 3843 } else {
3644 $widget = new CFPlus::UI::Label 3844 $widget = new CFPlus::UI::Label
3645 can_hover => 1, 3845 can_hover => 1,
3646 can_events => 1, 3846 can_events => 1,
3647 markup => $widget, 3847 markup => $widget,
… …
3772 3972
3773############################################################################# 3973#############################################################################
3774 3974
3775package CFPlus::UI::Notebook; 3975package CFPlus::UI::Notebook;
3776 3976
3977use CFPlus::OpenGL;
3978
3777our @ISA = CFPlus::UI::VBox::; 3979our @ISA = CFPlus::UI::VBox::;
3778 3980
3779sub new { 3981sub new {
3780 my $class = shift; 3982 my $class = shift;
3781 3983
3782 my $self = $class->SUPER::new ( 3984 my $self = $class->SUPER::new (
3783 buttonbar => (new CFPlus::UI::Buttonbar), 3985 buttonbar => (new CFPlus::UI::Buttonbar),
3784 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3986 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3987 active_outline => [.7, .7, 0.2],
3785 # filter => # will be put between multiplexer and $self 3988 # filter => # will be put between multiplexer and $self
3786 @_, 3989 @_,
3787 ); 3990 );
3788 3991
3789 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3992 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3790 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3993 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3791 3994
3995 {
3996 Scalar::Util::weaken (my $wself = $self);
3997
3998 $self->{multiplexer}->connect (c_add => sub {
3999 my ($mplex, $widgets) = @_;
4000
4001 for my $child (@$widgets) {
4002 Scalar::Util::weaken $child;
4003 $child->{c_tab_} ||= do {
4004 my $tab =
4005 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
4006 ? $child->{c_tab}
4007 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4008
4009 $tab->connect (activate => sub {
4010 $wself->set_current_page ($child);
4011 });
4012
4013 $tab
4014 };
4015
4016 $self->{buttonbar}->add ($child->{c_tab_});
4017 }
4018 });
4019
4020 $self->{multiplexer}->connect (c_remove => sub {
4021 my ($mplex, $widgets) = @_;
4022
4023 for my $child (@$widgets) {
4024 $wself->{buttonbar}->remove ($child->{c_tab_});
4025 }
4026 });
4027 }
4028
3792 $self 4029 $self
3793} 4030}
3794 4031
3795sub add { 4032sub add {
4033 my ($self, @widgets) = @_;
4034
4035 $self->{multiplexer}->add (@widgets)
4036}
4037
4038sub remove {
4039 my ($self, @widgets) = @_;
4040
4041 $self->{multiplexer}->remove (@widgets)
4042}
4043
4044sub pages {
4045 my ($self) = @_;
4046 $self->{multiplexer}->children
4047}
4048
4049sub add_tab {
3796 my ($self, $title, $widget, $tooltip) = @_; 4050 my ($self, $title, $widget, $tooltip) = @_;
3797 4051
3798 CFPlus::weaken $self; 4052 $title = [$title, $tooltip] unless ref $title;
4053 $widget->{c_tab} = $title;
3799 4054
3800 $self->{buttonbar}->add (new CFPlus::UI::Button
3801 markup => $title,
3802 tooltip => $tooltip,
3803 on_activate => sub { $self->set_current_page ($widget) },
3804 );
3805
3806 $self->{multiplexer}->add ($widget); 4055 $self->add ($widget);
3807} 4056}
3808 4057
3809sub get_current_page { 4058sub get_current_page {
3810 my ($self) = @_; 4059 my ($self) = @_;
3811 4060
… …
3815sub set_current_page { 4064sub set_current_page {
3816 my ($self, $page) = @_; 4065 my ($self, $page) = @_;
3817 4066
3818 $self->{multiplexer}->set_current_page ($page); 4067 $self->{multiplexer}->set_current_page ($page);
3819 $self->emit (page_changed => $self->{multiplexer}{current}); 4068 $self->emit (page_changed => $self->{multiplexer}{current});
4069}
4070
4071sub _draw {
4072 my ($self) = @_;
4073
4074 $self->SUPER::_draw ();
4075
4076 if (my $cur = $self->{multiplexer}{current}) {
4077 if ($cur = $cur->{c_tab_}) {
4078 glTranslate $self->{buttonbar}{x} + $cur->{x},
4079 $self->{buttonbar}{y} + $cur->{y};
4080 glLineWidth 3;
4081 #glEnable GL_BLEND;
4082 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4083 glColor @{$self->{active_outline}};
4084 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4085 glLineWidth 1;
4086 #glDisable GL_BLEND;
4087 }
4088 }
3820} 4089}
3821 4090
3822############################################################################# 4091#############################################################################
3823 4092
3824package CFPlus::UI::Selector; 4093package CFPlus::UI::Selector;
… …
4094} 4363}
4095 4364
4096sub update { 4365sub update {
4097 my ($self) = @_; 4366 my ($self) = @_;
4098 4367
4099 $::WANT_REFRESH++; 4368 $::WANT_REFRESH->start;
4100} 4369}
4101 4370
4102sub add { 4371sub add {
4103 my ($self, @children) = @_; 4372 my ($self, @children) = @_;
4104 4373

Diff Legend

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