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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.398 by root, Sat Jul 21 14:32:10 2007 UTC vs.
Revision 1.439 by root, Sun Sep 16 13:04:36 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# travsle the widget chain up to find the maximum "physical" size constraints
366sub get_max_wh {
367 my ($self) = @_;
368
369 return ($self->{alloc_w}, $self->{alloc_h})
370 if $self->{alloc_w} && !$self->{root}{realloc}{$self+0};
371
372 return $self->{parent}->get_max_wh
373 if $self->{parent};
374
375 ($::WIDTH, $::HEIGHT)
367} 376}
368 377
369sub size_request { 378sub size_request {
370 require Carp; 379 require Carp;
371 Carp::confess "size_request is abstract"; 380 Carp::confess "size_request is abstract";
… …
593 602
594# using global variables seems a bit hacky, but passing through all drawing 603# using global variables seems a bit hacky, but passing through all drawing
595# functions seems pointless. 604# functions seems pointless.
596our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 605our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
597 606
598sub draw { 607#sub draw {
599 my ($self) = @_; 608#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 609
645sub _draw { 610sub _draw {
646 my ($self) = @_; 611 my ($self) = @_;
647 612
648 warn "no draw defined for $self\n"; 613 warn "no draw defined for $self\n";
649} 614}
650 615
651my $cntx;#d#
652sub DESTROY { 616sub DESTROY {
653 my ($self) = @_; 617 my ($self) = @_;
654 618
655 return if CFPlus::in_destruct; 619 return if CFPlus::in_destruct;
656 620
621 local $@;
657 eval { $self->destroy }; 622 eval { $self->destroy };
658 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 623 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
659 624
660 delete $WIDGET{$self+0}; 625 delete $WIDGET{$self+0};
661} 626}
… …
669use strict; 634use strict;
670use CFPlus::OpenGL; 635use CFPlus::OpenGL;
671 636
672sub new { 637sub new {
673 my $class = shift; 638 my $class = shift;
674
675 # range [value, low, high, page]
676 639
677 $class->SUPER::new ( 640 $class->SUPER::new (
678 #bg => [0, 0, 0, 0.2], 641 #bg => [0, 0, 0, 0.2],
679 #active_bg => [1, 1, 1, 0.5], 642 #active_bg => [1, 1, 1, 0.5],
680 @_ 643 @_
… …
692 my ($w, $h) = @$self{qw(w h)}; 655 my ($w, $h) = @$self{qw(w h)};
693 656
694 glEnable GL_BLEND; 657 glEnable GL_BLEND;
695 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 658 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
696 glColor_premultiply @$color; 659 glColor_premultiply @$color;
697
698 glBegin GL_QUADS;
699 glVertex 0 , 0;
700 glVertex 0 , $h;
701 glVertex $w, $h; 660 glRect 0, 0, $w, $h;
702 glVertex $w, 0;
703 glEnd;
704
705 glDisable GL_BLEND; 661 glDisable GL_BLEND;
706 } 662 }
707} 663}
708 664
709############################################################################# 665#############################################################################
… …
769 sort { $a->{z} <=> $b->{z} } 725 sort { $a->{z} <=> $b->{z} }
770 @{$self->{children}}, @widgets 726 @{$self->{children}}, @widgets
771 ]; 727 ];
772 728
773 $self->realloc; 729 $self->realloc;
730
731 $self->emit (c_add => \@widgets);
732
733 map $_+0, @widgets
774} 734}
775 735
776sub children { 736sub children {
777 @{ $_[0]{children} } 737 @{ $_[0]{children} }
778} 738}
779 739
780sub remove { 740sub remove {
781 my ($self, $child) = @_; 741 my ($self, @widgets) = @_;
782 742
743 $self->emit (c_remove => \@widgets);
744
745 for my $child (@widgets) {
783 delete $child->{parent}; 746 delete $child->{parent};
784 $child->hide; 747 $child->hide;
785
786 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 748 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
749 }
787 750
788 $self->realloc; 751 $self->realloc;
789} 752}
790 753
791sub clear { 754sub clear {
… …
819} 782}
820 783
821sub _draw { 784sub _draw {
822 my ($self) = @_; 785 my ($self) = @_;
823 786
824 $_->draw for @{$self->{children}}; 787 $_->draw for $self->visible_children;
825} 788}
826 789
827############################################################################# 790#############################################################################
828 791
829package CFPlus::UI::Bin; 792package CFPlus::UI::Bin;
… …
839} 802}
840 803
841sub add { 804sub add {
842 my ($self, $child) = @_; 805 my ($self, $child) = @_;
843 806
844 $self->SUPER::remove ($_) for @{ $self->{children} }; 807 $self->clear;
845 $self->SUPER::add ($child); 808 $self->SUPER::add ($child);
846} 809}
847 810
848sub remove { 811sub remove {
849 my ($self, $widget) = @_; 812 my ($self, $widget) = @_;
… …
867 830
868 1 831 1
869} 832}
870 833
871############################################################################# 834#############################################################################
872
873# back-buffered drawing area 835# back-buffered drawing area
874 836
875package CFPlus::UI::Window; 837package CFPlus::UI::Window;
876 838
877our @ISA = CFPlus::UI::Bin::; 839our @ISA = CFPlus::UI::Bin::;
… …
991 $self->{view_x} = $x; 953 $self->{view_x} = $x;
992 $self->{view_y} = $y; 954 $self->{view_y} = $y;
993 955
994 $self->emit (changed => $x, $y); 956 $self->emit (changed => $x, $y);
995 $self->update; 957 $self->update;
958 }
959}
960
961sub set_center {
962 my ($self, $x, $y) = @_;
963
964 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
965}
966
967sub make_visible {
968 my ($self, $x, $y, $border) = @_;
969
970 if ( $x < $self->{view_x} + $self->{w} * $border
971 || $x > $self->{view_x} + $self->{w} * (1 - $border)
972 || $y < $self->{view_y} + $self->{h} * $border
973 || $y > $self->{view_y} + $self->{h} * (1 - $border)
974 ) {
975 $self->set_center ($x, $y);
996 } 976 }
997} 977}
998 978
999# hmm, this does not work for topleft of $self... but we should not ask for that 979# hmm, this does not work for topleft of $self... but we should not ask for that
1000sub coord2local { 980sub coord2local {
… …
1047 my $child = delete $arg{child}; 1027 my $child = delete $arg{child};
1048 1028
1049 my $self; 1029 my $self;
1050 1030
1051 my $hslider = new CFPlus::UI::Slider 1031 my $hslider = new CFPlus::UI::Slider
1052 col => 0, 1032 c_col => 0,
1053 row => 1, 1033 c_row => 1,
1054 vertical => 0, 1034 vertical => 0,
1055 range => [0, 0, 1, 0.01], # HACK fix 1035 range => [0, 0, 1, 0.01], # HACK fix
1056 on_changed => sub { 1036 on_changed => sub {
1057 $self->{hpos} = $_[1]; 1037 $self->{hpos} = $_[1];
1058 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1038 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1059 }, 1039 },
1060 ; 1040 ;
1061 1041
1062 my $vslider = new CFPlus::UI::Slider 1042 my $vslider = new CFPlus::UI::Slider
1063 col => 1, 1043 c_col => 1,
1064 row => 0, 1044 c_row => 0,
1065 vertical => 1, 1045 vertical => 1,
1066 range => [0, 0, 1, 0.01], # HACK fix 1046 range => [0, 0, 1, 0.01], # HACK fix
1067 on_changed => sub { 1047 on_changed => sub {
1068 $self->{vpos} = $_[1]; 1048 $self->{vpos} = $_[1];
1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1049 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1080 row_expand => [1, 0], 1060 row_expand => [1, 0],
1081 %arg, 1061 %arg,
1082 ); 1062 );
1083 1063
1084 $self->{vp} = new CFPlus::UI::ViewPort 1064 $self->{vp} = new CFPlus::UI::ViewPort
1085 col => 0, 1065 c_col => 0,
1086 row => 0, 1066 c_row => 0,
1087 expand => 1, 1067 expand => 1,
1088 scroll_x => $self->{scroll_x}, 1068 scroll_x => $self->{scroll_x},
1089 scroll_y => $self->{scroll_y}, 1069 scroll_y => $self->{scroll_y},
1090 on_changed => sub { 1070 on_changed => sub {
1091 my ($vp, $x, $y) = @_; 1071 my ($vp, $x, $y) = @_;
… …
1093 $vp->{parent}{hslider}->set_value ($x); 1073 $vp->{parent}{hslider}->set_value ($x);
1094 $vp->{parent}{vslider}->set_value ($y); 1074 $vp->{parent}{vslider}->set_value ($y);
1095 1075
1096 0 1076 0
1097 }, 1077 },
1078 on_size_allocate => sub {
1079 my ($vp, $w, $h) = @_;
1080 $vp->{parent}->update_slider;
1081 0
1082 },
1098 ; 1083 ;
1099 1084
1100 $self->SUPER::add ($self->{vp}); 1085 $self->SUPER::add ($self->{vp});
1101 1086
1102 $self->add ($child) if $child; 1087 $self->add ($child) if $child;
… …
1108 my ($self, $widget) = @_; 1093 my ($self, $widget) = @_;
1109 1094
1110 $self->{vp}->add ($self->{child} = $widget); 1095 $self->{vp}->add ($self->{child} = $widget);
1111} 1096}
1112 1097
1098sub set_offset { shift->{vp}->set_offset (@_) }
1099sub set_center { shift->{vp}->set_center (@_) }
1100sub make_visible { shift->{vp}->make_visible (@_) }
1101
1113sub update_slider { 1102sub update_slider {
1114 my ($self) = @_; 1103 my ($self) = @_;
1115 1104
1116 my $child = ($self->{vp} or return)->child; 1105 my $child = ($self->{vp} or return)->child;
1117 1106
1107 if ($self->{scroll_x}) {
1118 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1108 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1119 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); 1109 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1120 1110
1121 my $visible = $w1 > $w2; 1111 my $visible = $w1 > $w2;
1122 if ($visible != $self->{hslider_visible}) { 1112 if ($visible != $self->{hslider_visible}) {
1123 $self->{hslider_visible} = $visible; 1113 $self->{hslider_visible} = $visible;
1124 $visible ? $self->SUPER::add ($self->{hslider}) 1114 $visible ? $self->SUPER::add ($self->{hslider})
1125 : $self->SUPER::remove ($self->{hslider}); 1115 : $self->SUPER::remove ($self->{hslider});
1116 }
1126 } 1117 }
1127 1118
1119 if ($self->{scroll_y}) {
1128 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1120 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1129 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); 1121 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1130 1122
1131 my $visible = $h1 > $h2; 1123 my $visible = $h1 > $h2;
1132 if ($visible != $self->{vslider_visible}) { 1124 if ($visible != $self->{vslider_visible}) {
1133 $self->{vslider_visible} = $visible; 1125 $self->{vslider_visible} = $visible;
1134 $visible ? $self->SUPER::add ($self->{vslider}) 1126 $visible ? $self->SUPER::add ($self->{vslider})
1135 : $self->SUPER::remove ($self->{vslider}); 1127 : $self->SUPER::remove ($self->{vslider});
1128 }
1136 } 1129 }
1137} 1130}
1138 1131
1139sub start_dragging { 1132sub start_dragging {
1140 my ($self, $ev) = @_; 1133 my ($self, $ev) = @_;
… …
1226 my ($w, $h) = @$self{qw(w h)}; 1219 my ($w, $h) = @$self{qw(w h)};
1227 1220
1228 glEnable GL_BLEND; 1221 glEnable GL_BLEND;
1229 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1222 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1230 glColor_premultiply @{ $self->{bg} }; 1223 glColor_premultiply @{ $self->{bg} };
1231
1232 glBegin GL_QUADS;
1233 glVertex 0 , 0;
1234 glVertex 0 , $h;
1235 glVertex $w, $h; 1224 glRect 0, 0, $w, $h;
1236 glVertex $w, 0;
1237 glEnd;
1238
1239 glDisable GL_BLEND; 1225 glDisable GL_BLEND;
1240 } 1226 }
1241 1227
1242 $self->SUPER::_draw; 1228 $self->SUPER::_draw;
1243} 1229}
… …
1605 1591
1606sub add { 1592sub add {
1607 my ($self, @widgets) = @_; 1593 my ($self, @widgets) = @_;
1608 1594
1609 for my $child (@widgets) { 1595 for my $child (@widgets) {
1610 $child->{rowspan} ||= 1; 1596 $child->{c_rowspan} ||= 1;
1611 $child->{colspan} ||= 1; 1597 $child->{c_colspan} ||= 1;
1612 } 1598 }
1613 1599
1614 $self->SUPER::add (@widgets); 1600 $self->SUPER::add (@widgets);
1615} 1601}
1616 1602
… …
1620 my @widgets; 1606 my @widgets;
1621 1607
1622 while (@_) { 1608 while (@_) {
1623 my ($col, $row, $child) = splice @_, 0, 3, (); 1609 my ($col, $row, $child) = splice @_, 0, 3, ();
1624 1610
1625 $child->{row} = $row; 1611 $child->{c_row} = $row;
1626 $child->{col} = $col; 1612 $child->{c_col} = $col;
1627 1613
1628 push @widgets, $child; 1614 push @widgets, $child;
1629 } 1615 }
1630 1616
1631 $self->add (@widgets); 1617 $self->add (@widgets);
… …
1637 my (@w, @h); 1623 my (@w, @h);
1638 1624
1639 my @children = $self->children; 1625 my @children = $self->children;
1640 1626
1641 # first pass, columns 1627 # first pass, columns
1642 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) { 1628 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1643 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; 1629 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1644 1630
1645 my $sw = sum @w[$c .. $c + $cs - 1]; 1631 my $sw = sum @w[$c .. $c + $cs - 1];
1646 1632
1647 if ($w > $sw) { 1633 if ($w > $sw) {
1648 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; 1634 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1649 } 1635 }
1650 } 1636 }
1651 1637
1652 # second pass, rows 1638 # second pass, rows
1653 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { 1639 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1654 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; 1640 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1655 1641
1656 my $sh = sum @h[$r .. $r + $rs - 1]; 1642 my $sh = sum @h[$r .. $r + $rs - 1];
1657 1643
1658 if ($h > $sh) { 1644 if ($h > $sh) {
1659 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; 1645 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
… …
1701 1687
1702 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } 1688 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1703 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } 1689 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1704 1690
1705 for my $widget ($self->children) { 1691 for my $widget ($self->children) {
1706 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)}; 1692 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1707 1693
1708 $widget->configure ( 1694 $widget->configure (
1709 $x[$c], $y[$r], 1695 $x[$c], $y[$r],
1710 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r], 1696 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1711 ); 1697 );
… …
1720 1706
1721use List::Util qw(min max); 1707use List::Util qw(min max);
1722 1708
1723our @ISA = CFPlus::UI::Container::; 1709our @ISA = CFPlus::UI::Container::;
1724 1710
1725sub add {
1726 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1727
1728 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1729 $self->SUPER::add ($child);
1730}
1731
1732sub _scale($$$) { 1711sub _scale($$$) {
1733 my ($mode, $val, $max) = @_; 1712 my ($rel, $val, $max) = @_;
1734 1713
1735 $mode eq "abs" ? $val 1714 $rel ? $val * $max : $val
1736 : $mode eq "rel" ? $val * $max
1737 : 0
1738} 1715}
1739 1716
1740sub size_request { 1717sub size_request {
1741 my ($self) = @_; 1718 my ($self) = @_;
1742 1719
1743 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1720 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1744 1721
1745 # determine overall size by querying abs widgets 1722 # determine overall size by querying abs widgets
1746 for my $child ($self->visible_children) { 1723 for my $child ($self->visible_children) {
1747 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1724 unless ($child->{c_rel}) {
1725 my $x = $child->{c_x};
1726 my $y = $child->{c_y};
1748 1727
1749 if ($pos eq "abs") {
1750 $w = _scale $size, $w, $child->{req_w};
1751 $h = _scale $size, $h, $child->{req_h};
1752
1753 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1728 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1754 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1729 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1755 } 1730 }
1756 } 1731 }
1757 1732
1758 my $W = $x2 - $x1; 1733 my $W = $x2 - $x1;
1759 my $H = $y2 - $y1; 1734 my $H = $y2 - $y1;
1760 1735
1761 # now layout remaining widgets 1736 # now layout remaining widgets
1762 for my $child ($self->visible_children) { 1737 for my $child ($self->visible_children) {
1763 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1738 if ($child->{c_rel}) {
1739 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1740 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1764 1741
1765 if ($pos ne "abs") {
1766 $x = _scale $pos, $x, $W;
1767 $y = _scale $pos, $x, $H;
1768 $w = _scale $size, $w, $child->{req_w};
1769 $h = _scale $size, $h, $child->{req_h};
1770
1771 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1742 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1772 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1743 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1773 } 1744 }
1774 } 1745 }
1775 1746
1776 my $W = $x2 - $x1; 1747 my $W = $x2 - $x1;
1777 my $H = $y2 - $y1; 1748 my $H = $y2 - $y1;
… …
1781 1752
1782sub invoke_size_allocate { 1753sub invoke_size_allocate {
1783 my ($self, $W, $H) = @_; 1754 my ($self, $W, $H) = @_;
1784 1755
1785 for my $child ($self->visible_children) { 1756 for my $child ($self->visible_children) {
1786 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1757 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1758 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1787 1759
1788 $x = _scale $pos, $x, $W; 1760 $x += $child->{c_halign} * $child->{req_w};
1789 $y = _scale $pos, $x, $H; 1761 $y += $child->{c_valign} * $child->{req_h};
1790 $w = _scale $size, $w, $child->{req_w};
1791 $h = _scale $size, $h, $child->{req_h};
1792 1762
1793 $child->configure ($x, $y, $w, $h); 1763 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1794 } 1764 }
1795 1765
1796 1 1766 1
1797} 1767}
1798 1768
… …
1802 1772
1803our @ISA = CFPlus::UI::Container::; 1773our @ISA = CFPlus::UI::Container::;
1804 1774
1805sub size_request { 1775sub size_request {
1806 my ($self) = @_; 1776 my ($self) = @_;
1777
1778 my @children = $self->visible_children;
1807 1779
1808 $self->{vertical} 1780 $self->{vertical}
1809 ? ( 1781 ? (
1810 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1782 (List::Util::max map $_->{req_w}, @children),
1811 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1783 (List::Util::sum map $_->{req_h}, @children),
1812 ) 1784 )
1813 : ( 1785 : (
1814 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1786 (List::Util::sum map $_->{req_w}, @children),
1815 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1787 (List::Util::max map $_->{req_h}, @children),
1816 ) 1788 )
1817} 1789}
1818 1790
1819sub invoke_size_allocate { 1791sub invoke_size_allocate {
1820 my ($self, $w, $h) = @_; 1792 my ($self, $w, $h) = @_;
… …
1944 1916
1945 delete $self->{ox}; 1917 delete $self->{ox};
1946 $self->SUPER::realloc; 1918 $self->SUPER::realloc;
1947} 1919}
1948 1920
1921sub clear {
1922 my ($self) = @_;
1923
1924 $self->set_text ("");
1925}
1926
1949sub set_text { 1927sub set_text {
1950 my ($self, $text) = @_; 1928 my ($self, $text) = @_;
1951 1929
1952 return if $self->{text} eq "T$text"; 1930 return if $self->{text} eq "T$text";
1953 $self->{text} = "T$text"; 1931 $self->{text} = "T$text";
… …
1976 1954
1977sub size_request { 1955sub size_request {
1978 my ($self) = @_; 1956 my ($self) = @_;
1979 1957
1980 $self->{size_req} ||= do { 1958 $self->{size_req} ||= do {
1959 my ($max_w, $max_h) = $self->get_max_wh;
1960
1981 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1961 $self->{layout}->set_font ($self->{font}) if $self->{font};
1982 $self->{layout}->set_width ($self->{max_w} || -1); 1962 $self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1983 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1963 $self->{layout}->set_ellipsise ($self->{ellipsise});
1984 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1964 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1985 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1965 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1986 1966
1987 my ($w, $h) = $self->{layout}->size; 1967 my ($w, $h) = $self->{layout}->size;
… …
2059 : ($self->{w} - $size->[0]) * 0.5); 2039 : ($self->{w} - $size->[0]) * 0.5);
2060 2040
2061 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2041 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2062 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2042 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2063 : ($self->{h} - $size->[1]) * 0.5); 2043 : ($self->{h} - $size->[1]) * 0.5);
2044
2045 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2064 }; 2046 };
2065 2047
2066 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2048# unless ($self->{list}) {
2067 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2049# $self->{list} = CFPlus::OpenGL::glGenList;
2068 2050# CFPlus::OpenGL::glNewList $self->{list};
2069 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2051# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2052# CFPlus::OpenGL::glEndList;
2053# }
2054#
2055# CFPlus::OpenGL::glCallList $self->{list};
2056
2057 $self->{layout}->draw;
2070} 2058}
2059
2060#sub destroy {
2061# my ($self) = @_;
2062#
2063# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2064#
2065# $self->SUPER::destroy;
2066#}
2071 2067
2072############################################################################# 2068#############################################################################
2073 2069
2074package CFPlus::UI::EntryBase; 2070package CFPlus::UI::EntryBase;
2075 2071
… …
2081 my $class = shift; 2077 my $class = shift;
2082 2078
2083 $class->SUPER::new ( 2079 $class->SUPER::new (
2084 fg => [1, 1, 1], 2080 fg => [1, 1, 1],
2085 bg => [0, 0, 0, 0.2], 2081 bg => [0, 0, 0, 0.2],
2082 outline => [0.6, 0.3, 0.1],
2086 active_bg => [1, 1, 1, 0.5], 2083 active_bg => [0, 0, 1, .2],
2087 active_fg => [0, 0, 0], 2084 active_fg => [1, 1, 1],
2085 active_outline => [1, 1, 0],
2088 can_hover => 1, 2086 can_hover => 1,
2089 can_focus => 1, 2087 can_focus => 1,
2090 valign => 0, 2088 valign => 0,
2091 can_events => 1, 2089 can_events => 1,
2092 ellipsise => 0, 2090 ellipsise => 0,
… …
2232 glColor_premultiply @{$self->{bg}}; 2230 glColor_premultiply @{$self->{bg}};
2233 } 2231 }
2234 2232
2235 glEnable GL_BLEND; 2233 glEnable GL_BLEND;
2236 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2234 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2237 glBegin GL_QUADS;
2238 glVertex 0 , 0;
2239 glVertex 0 , $self->{h};
2240 glVertex $self->{w}, $self->{h}; 2235 glRect 0, 0, $self->{w}, $self->{h};
2241 glVertex $self->{w}, 0;
2242 glEnd;
2243 glDisable GL_BLEND; 2236 glDisable GL_BLEND;
2244 2237
2245 $self->SUPER::_draw; 2238 $self->SUPER::_draw;
2246 2239
2247 #TODO: force update every cursor change :( 2240 #TODO: force update every cursor change :(
… …
2249 2242
2250 unless (exists $self->{cur_h}) { 2243 unless (exists $self->{cur_h}) {
2251 my $text = substr $self->{text}, 0, $self->{cursor}; 2244 my $text = substr $self->{text}, 0, $self->{cursor};
2252 utf8::encode $text; 2245 utf8::encode $text;
2253 2246
2254 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2247 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2255 } 2248 }
2256 2249
2250 glColor_premultiply @{$self->{active_fg}};
2257 glBegin GL_LINES; 2251 glBegin GL_LINES;
2258 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2252 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2259 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2253 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2254 glEnd;
2255
2256 glLineWidth 3;
2257 glColor @{$self->{active_outline}};
2258 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2259 glLineWidth 1;
2260
2261 } else {
2262 glColor @{$self->{outline}};
2263 glBegin GL_LINE_STRIP;
2264 glVertex .5, $self->{h} * .5;
2265 glVertex .5, $self->{h} - 2.5;
2266 glVertex $self->{w} - .5, $self->{h} - 2.5;
2267 glVertex $self->{w} - .5, $self->{h} * .5;
2260 glEnd; 2268 glEnd;
2261 } 2269 }
2262} 2270}
2263 2271
2264############################################################################# 2272#############################################################################
… …
2351 1 2359 1
2352} 2360}
2353 2361
2354############################################################################# 2362#############################################################################
2355 2363
2364package CFPlus::UI::ButtonBin;
2365
2366our @ISA = CFPlus::UI::Bin::;
2367
2368use CFPlus::OpenGL;
2369
2370my @tex =
2371 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2372 qw(b1_button_inactive.png b1_button_active.png);
2373
2374sub new {
2375 my $class = shift;
2376
2377 $class->SUPER::new (
2378 can_hover => 1,
2379 align => 0,
2380 valign => 0,
2381 can_events => 1,
2382 @_
2383 )
2384}
2385
2386sub invoke_button_up {
2387 my ($self, $ev, $x, $y) = @_;
2388
2389 $self->emit ("activate")
2390 if $x >= 0 && $x < $self->{w}
2391 && $y >= 0 && $y < $self->{h};
2392
2393 1
2394}
2395
2396sub _draw {
2397 my ($self) = @_;
2398
2399 glEnable GL_TEXTURE_2D;
2400 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2401 glColor 0, 0, 0, 1;
2402
2403 my $tex = $tex[$GRAB == $self];
2404 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2405
2406 glDisable GL_TEXTURE_2D;
2407
2408 $self->SUPER::_draw;
2409}
2410
2411#############################################################################
2412
2356package CFPlus::UI::Button; 2413package CFPlus::UI::Button;
2357 2414
2358our @ISA = CFPlus::UI::Label::; 2415our @ISA = CFPlus::UI::Label::;
2359 2416
2360use CFPlus::OpenGL; 2417use CFPlus::OpenGL;
… …
2464sub _draw { 2521sub _draw {
2465 my ($self) = @_; 2522 my ($self) = @_;
2466 2523
2467 $self->SUPER::_draw; 2524 $self->SUPER::_draw;
2468 2525
2469 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2526 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2470 2527
2471 my ($w, $h) = @$self{qw(w h)}; 2528 my ($w, $h) = @$self{qw(w h)};
2472 2529
2473 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2530 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2474 2531
… …
2494sub new { 2551sub new {
2495 my $class = shift; 2552 my $class = shift;
2496 2553
2497 my $self = $class->SUPER::new ( 2554 my $self = $class->SUPER::new (
2498 can_events => 0, 2555 can_events => 0,
2556 scale => 1,
2499 @_, 2557 @_,
2500 ); 2558 );
2501 2559
2502 $self->{path} || $self->{tex} 2560 $self->{path} || $self->{tex}
2503 or Carp::croak "'path' or 'tex' attributes required"; 2561 or Carp::croak "'path' or 'tex' attributes required";
… …
2528} 2586}
2529 2587
2530sub size_request { 2588sub size_request {
2531 my ($self) = @_; 2589 my ($self) = @_;
2532 2590
2533 ($self->{tex}{w}, $self->{tex}{h}) 2591 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2534} 2592}
2535 2593
2536sub _draw { 2594sub _draw {
2537 my ($self) = @_; 2595 my ($self) = @_;
2538 2596
… …
2548 } 2606 }
2549 2607
2550 glEnable GL_TEXTURE_2D; 2608 glEnable GL_TEXTURE_2D;
2551 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2609 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2552 2610
2553 $tex->draw_quad (0, 0, $w, $h); 2611 $tex->draw_quad_alpha (0, 0, $w, $h);
2554 2612
2555 glDisable GL_TEXTURE_2D; 2613 glDisable GL_TEXTURE_2D;
2556} 2614}
2557 2615
2558############################################################################# 2616#############################################################################
… …
2577 align => 0, 2635 align => 0,
2578 valign => 0, 2636 valign => 0,
2579 can_events => 1, 2637 can_events => 1,
2580 @_ 2638 @_
2581 ); 2639 );
2640}
2641
2642sub invoke_button_down {
2643 my ($self, $ev, $x, $y) = @_;
2644
2645 1
2582} 2646}
2583 2647
2584sub invoke_button_up { 2648sub invoke_button_up {
2585 my ($self, $ev, $x, $y) = @_; 2649 my ($self, $ev, $x, $y) = @_;
2586 2650
… …
2726 glDisable GL_TEXTURE_2D; 2790 glDisable GL_TEXTURE_2D;
2727} 2791}
2728 2792
2729############################################################################# 2793#############################################################################
2730 2794
2795package CFPlus::UI::Progress;
2796
2797our @ISA = CFPlus::UI::Label::;
2798
2799use CFPlus::OpenGL;
2800
2801sub new {
2802 my ($class, %arg) = @_;
2803
2804 my $self = $class->SUPER::new (
2805 fg => [1, 1, 1],
2806 bg => [0, 0, 1, 0.2],
2807 bar => [0.7, 0.5, 0.1, 0.8],
2808 outline => [0.4, 0.3, 0],
2809 fontsize => 0.9,
2810 valign => 0,
2811 align => 0,
2812 can_events => 1,
2813 ellipsise => 1,
2814 label => "%d%%",
2815 %arg,
2816 );
2817
2818 $self->set_value ($arg{value} || -1);
2819
2820 $self
2821}
2822
2823sub set_label {
2824 my ($self, $label) = @_;
2825
2826 return if $self->{label} eq $label;
2827 $self->{label} = $label;
2828
2829 $self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
2830}
2831
2832sub set_value {
2833 my ($self, $value) = @_;
2834
2835 if ($self->{value} ne $value) {
2836 $self->{value} = $value;
2837
2838 if ($value < 0) {
2839 $self->set_text ("-");
2840 } else {
2841 $self->set_text (sprintf $self->{label}, $value * 100);
2842 }
2843
2844 $self->update;
2845 }
2846}
2847
2848sub _draw {
2849 my ($self) = @_;
2850
2851 glEnable GL_BLEND;
2852 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2853
2854 if ($self->{value} >= 0) {
2855 my $s = int 2 + ($self->{w} - 4) * $self->{value};
2856
2857 glColor_premultiply @{$self->{bar}};
2858 glRect 2, 2, $s, $self->{h} - 2;
2859 glColor_premultiply @{$self->{bg}};
2860 glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
2861 }
2862
2863 glColor_premultiply @{$self->{outline}};
2864 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2865
2866 glDisable GL_BLEND;
2867
2868 {
2869 local $self->{bg}; # do not draw background
2870 $self->SUPER::_draw;
2871 }
2872}
2873
2874#############################################################################
2875
2876package CFPlus::UI::ExperienceProgress;
2877
2878our @ISA = CFPlus::UI::Progress::;
2879
2880sub new {
2881 my ($class, %arg) = @_;
2882
2883 my $self = $class->SUPER::new (
2884 tooltip => sub {
2885 my ($self) = @_;
2886
2887 sprintf "level %d\n%s points\n%s next level\n%s to go",
2888 $self->{lvl},
2889 ::formsep ($self->{exp}),
2890 ::formsep ($self->{nxt}),
2891 ::formsep ($self->{nxt} - $self->{exp}),
2892 },
2893 %arg
2894 );
2895
2896 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2897 if $::CONN;
2898
2899 $self
2900}
2901
2902sub DESTROY {
2903 my ($self) = @_;
2904
2905 delete $::CONN->{on_exp_update}{$self+0}
2906 if $::CONN;
2907
2908 $self->SUPER::DESTROY;
2909}
2910
2911sub set_value {
2912 my ($self, $lvl, $exp) = @_;
2913
2914 $self->{lvl} = $lvl;
2915 $self->{exp} = $exp;
2916
2917 my $v = -1;
2918
2919 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2920 my $l0 = $table->[$lvl - 1];
2921 my $l1 = $table->[$lvl];
2922
2923 $self->{nxt} = $l1;
2924
2925 $v = ($exp - $l0) / ($l1 - $l0);
2926 }
2927
2928 $self->SUPER::set_value ($v);
2929}
2930
2931#############################################################################
2932
2731package CFPlus::UI::Gauge; 2933package CFPlus::UI::Gauge;
2732 2934
2733our @ISA = CFPlus::UI::VBox::; 2935our @ISA = CFPlus::UI::VBox::;
2734 2936
2735sub new { 2937sub new {
… …
2860 3062
2861 $self->SUPER::invoke_button_down ($ev, $x, $y); 3063 $self->SUPER::invoke_button_down ($ev, $x, $y);
2862 3064
2863 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3065 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2864 3066
2865 $self->invoke_mouse_motion ($ev, $x, $y) 3067 $self->invoke_mouse_motion ($ev, $x, $y);
3068
3069 1
2866} 3070}
2867 3071
2868sub invoke_mouse_motion { 3072sub invoke_mouse_motion {
2869 my ($self, $ev, $x, $y) = @_; 3073 my ($self, $ev, $x, $y) = @_;
2870 3074
… …
2890 3094
2891 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3095 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2892 3096
2893 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3097 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2894 3098
2895 ! ! $delta 3099 1
2896} 3100}
2897 3101
2898sub update { 3102sub update {
2899 my ($self) = @_; 3103 my ($self) = @_;
2900 3104
… …
3031} 3235}
3032 3236
3033sub size_request { 3237sub size_request {
3034 my ($self) = @_; 3238 my ($self) = @_;
3035 3239
3036 my ($empty, $slider) = @{ $self->{children} }; 3240 my ($empty, $slider) = $self->visible_children;
3037 3241
3038 local $self->{children} = [$empty, $slider]; 3242 local $self->{children} = [$empty, $slider];
3039 $self->SUPER::size_request 3243 $self->SUPER::size_request
3040} 3244}
3041 3245
… …
3230 3434
3231 if ($y0 < $y + $h && $y < $y1) { 3435 if ($y0 < $y + $h && $y < $y1) {
3232 my $layout = $self->get_layout ($para); 3436 my $layout = $self->get_layout ($para);
3233 3437
3234 $layout->render ($para->{indent}, $y - $y0); 3438 $layout->render ($para->{indent}, $y - $y0);
3439 $layout->draw;
3235 3440
3236 if (my @w = @{ $para->{widget} }) { 3441 if (my @w = @{ $para->{widget} }) {
3237 my @s = $layout->get_shapes; 3442 my @s = $layout->get_shapes;
3238 3443
3239 for (@w) { 3444 for (@w) {
… …
3361} 3566}
3362 3567
3363sub set_tooltip_from { 3568sub set_tooltip_from {
3364 my ($self, $widget) = @_; 3569 my ($self, $widget) = @_;
3365 3570
3366 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3367 if $widget->{tooltip} =~ /^#(.*)$/;
3368
3369 my $tooltip = $widget->{tooltip}; 3571 my $tip = $widget->{tooltip};
3572 $tip = $tip->($widget) if "CODE" eq ref $tip;
3573
3574 $tip = CFPlus::Pod::section_label tooltip => $1
3575 if $tip =~ /^#(.*)$/;
3370 3576
3371 if ($ENV{CFPLUS_DEBUG} & 2) { 3577 if ($ENV{CFPLUS_DEBUG} & 2) {
3372 $tooltip .= "\n\n" . (ref $widget) . "\n" 3578 $tip .= "\n\n" . (ref $widget) . "\n"
3373 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3579 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3374 . "req $widget->{req_w} $widget->{req_h}\n" 3580 . "req $widget->{req_w} $widget->{req_h}\n"
3375 . "visible $widget->{visible}"; 3581 . "visible $widget->{visible}";
3376 } 3582 }
3377 3583
3378 $tooltip =~ s/^\n+//; 3584 $tip =~ s/^\n+//;
3379 $tooltip =~ s/\n+$//; 3585 $tip =~ s/\n+$//;
3380 3586
3381 $self->add (new CFPlus::UI::Label 3587 $self->add (new CFPlus::UI::Label
3382 markup => $tooltip, 3588 markup => $tip,
3383 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3589 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3384 fontsize => 0.8, 3590 fontsize => 0.8,
3385 style => 1, # FLAG_INVERSE 3591 style => 1, # FLAG_INVERSE
3386 ellipsise => 0, 3592 ellipsise => 0,
3387 font => ($widget->{tooltip_font} || $::FONT_PROP), 3593 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
3425} 3631}
3426 3632
3427sub _draw { 3633sub _draw {
3428 my ($self) = @_; 3634 my ($self) = @_;
3429 3635
3430 glTranslate 0.375, 0.375;
3431
3432 my ($w, $h) = @$self{qw(w h)}; 3636 my ($w, $h) = @$self{qw(w h)};
3433 3637
3434 glColor 1, 0.8, 0.4; 3638 glColor 1, 0.8, 0.4;
3435 glBegin GL_QUADS; 3639 glRect 0, 0, $w, $h;
3436 glVertex 0 , 0;
3437 glVertex 0 , $h;
3438 glVertex $w, $h;
3439 glVertex $w, 0;
3440 glEnd;
3441 3640
3442 glColor 0, 0, 0; 3641 glColor 0, 0, 0;
3443 glBegin GL_LINE_LOOP; 3642 glRect_lineloop .5, .5, $w + .5, $h + .5;
3444 glVertex 0 , 0;
3445 glVertex 0 , $h;
3446 glVertex $w, $h;
3447 glVertex $w, 0;
3448 glEnd;
3449 3643
3450 glTranslate 2 - 0.375, 2 - 0.375; 3644 glTranslate 2, 2;
3451 3645
3452 $self->SUPER::_draw; 3646 $self->SUPER::_draw;
3453} 3647}
3454 3648
3455############################################################################# 3649#############################################################################
… …
3473 3667
3474 if ($self->{anim} && $self->{animspeed}) { 3668 if ($self->{anim} && $self->{animspeed}) {
3475 CFPlus::weaken (my $widget = $self); 3669 CFPlus::weaken (my $widget = $self);
3476 3670
3477 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3671 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3478 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed}; 3672 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3479 $self->{timer} = Event->timer ( 3673 $self->{timer} = Event->timer (
3480 parked => 1, 3674 parked => 1,
3481 cb => sub { 3675 cb => sub {
3482 return unless $::CONN && $widget; 3676 return unless $::CONN;
3483 3677
3678 my $w = $widget
3679 or return;
3680
3484 ++$widget->{frame}; 3681 ++$w->{frame};
3485 $widget->update_face; 3682 $w->update_face;
3683
3684 # somehow, $widget can go away
3486 $widget->update; 3685 $w->update;
3487
3488 $widget->update_timer; 3686 $w->update_timer;
3489 }, 3687 },
3490 ); 3688 );
3491 3689
3492 $self->update_face; 3690 $self->update_face;
3493 $self->update_timer; 3691 $self->update_timer;
… …
3514} 3712}
3515 3713
3516sub update_face { 3714sub update_face {
3517 my ($self) = @_; 3715 my ($self) = @_;
3518 3716
3519 return unless $::CONN;
3520
3521 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3522 if ($anim && @$anim) {
3523 delete $self->{wait_face};
3524 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3525 }
3526 }
3527}
3528
3529sub size_request {
3530 my ($self) = @_;
3531
3532 if ($::CONN) { 3717 if ($::CONN) {
3533 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3718 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3534 if (my $tex = $::CONN->{texture}[$faceid]) { 3719 if ($anim && @$anim) {
3535 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3720 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3536 } else { 3721 delete $self->{face_change_cb};
3537 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3722
3538 $self->realloc; 3723 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3724 unless ($tex->{name} || $tex->{loading}) {
3725 $tex->upload (sub { $self->reconfigure });
3726 }
3539 }); 3727 }
3540 } 3728 }
3541 } 3729 }
3542 } 3730 }
3731}
3732
3733sub size_request {
3734 my ($self) = @_;
3735
3736 if ($::CONN) {
3737 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3738 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3739 if ($tex->{name}) {
3740 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3741 } elsif (!$tex->{loading}) {
3742 $tex->upload (sub { $self->reconfigure });
3743 }
3744 }
3745
3746 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3747 }
3748 }
3543 3749
3544 ($self->{size_w} || 8, $self->{size_h} || 8) 3750 ($self->{size_w} || 8, $self->{size_h} || 8)
3545} 3751}
3546 3752
3547sub update { 3753sub update {
… …
3561} 3767}
3562 3768
3563sub _draw { 3769sub _draw {
3564 my ($self) = @_; 3770 my ($self) = @_;
3565 3771
3566 return unless $::CONN;
3567
3568 $self->SUPER::_draw; 3772 $self->SUPER::_draw;
3569 3773
3570 my $faceid = $::CONN->{faceid}[$self->{face}] 3774 if (my $tex = $self->{tex}) {
3571 or return;
3572
3573 my $tex = $::CONN->{texture}[$faceid];
3574
3575 if ($tex) {
3576 glEnable GL_TEXTURE_2D; 3775 glEnable GL_TEXTURE_2D;
3577 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3776 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3578 glColor 0, 0, 0, 1; 3777 glColor 0, 0, 0, 1;
3579 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3778 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3580 glDisable GL_TEXTURE_2D; 3779 glDisable GL_TEXTURE_2D;
… …
3632 children => [ 3831 children => [
3633 (new CFPlus::UI::Label markup => $left, expand => 1), 3832 (new CFPlus::UI::Label markup => $left, expand => 1),
3634 (new CFPlus::UI::Label markup => $right, align => +1), 3833 (new CFPlus::UI::Label markup => $right, align => +1),
3635 ], 3834 ],
3636 ; 3835 ;
3637 3836
3638 } else { 3837 } else {
3639 $widget = new CFPlus::UI::Label 3838 $widget = new CFPlus::UI::Label
3640 can_hover => 1, 3839 can_hover => 1,
3641 can_events => 1, 3840 can_events => 1,
3642 markup => $widget, 3841 markup => $widget,
… …
3767 3966
3768############################################################################# 3967#############################################################################
3769 3968
3770package CFPlus::UI::Notebook; 3969package CFPlus::UI::Notebook;
3771 3970
3971use CFPlus::OpenGL;
3972
3772our @ISA = CFPlus::UI::VBox::; 3973our @ISA = CFPlus::UI::VBox::;
3773 3974
3774sub new { 3975sub new {
3775 my $class = shift; 3976 my $class = shift;
3776 3977
3777 my $self = $class->SUPER::new ( 3978 my $self = $class->SUPER::new (
3778 buttonbar => (new CFPlus::UI::Buttonbar), 3979 buttonbar => (new CFPlus::UI::Buttonbar),
3779 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3980 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3981 active_outline => [.7, .7, 0.2],
3780 # filter => # will be put between multiplexer and $self 3982 # filter => # will be put between multiplexer and $self
3781 @_, 3983 @_,
3782 ); 3984 );
3783 3985
3784 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3986 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3785 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3987 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3786 3988
3989 {
3990 Scalar::Util::weaken (my $wself = $self);
3991
3992 $self->{multiplexer}->connect (c_add => sub {
3993 my ($mplex, $widgets) = @_;
3994
3995 for my $child (@$widgets) {
3996 Scalar::Util::weaken $child;
3997 $child->{c_tab_} ||= do {
3998 my $tab =
3999 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
4000 ? $child->{c_tab}
4001 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4002
4003 $tab->connect (activate => sub {
4004 $wself->set_current_page ($child);
4005 });
4006
4007 $tab
4008 };
4009
4010 $self->{buttonbar}->add ($child->{c_tab_});
4011 }
4012 });
4013
4014 $self->{multiplexer}->connect (c_remove => sub {
4015 my ($mplex, $widgets) = @_;
4016
4017 for my $child (@$widgets) {
4018 $wself->{buttonbar}->remove ($child->{c_tab_});
4019 }
4020 });
4021 }
4022
3787 $self 4023 $self
3788} 4024}
3789 4025
3790sub add { 4026sub add {
4027 my ($self, @widgets) = @_;
4028
4029 $self->{multiplexer}->add (@widgets)
4030}
4031
4032sub remove {
4033 my ($self, @widgets) = @_;
4034
4035 $self->{multiplexer}->remove (@widgets)
4036}
4037
4038sub pages {
4039 my ($self) = @_;
4040 $self->{multiplexer}->children
4041}
4042
4043sub add_tab {
3791 my ($self, $title, $widget, $tooltip) = @_; 4044 my ($self, $title, $widget, $tooltip) = @_;
3792 4045
3793 CFPlus::weaken $self; 4046 $title = [$title, $tooltip] unless ref $title;
4047 $widget->{c_tab} = $title;
3794 4048
3795 $self->{buttonbar}->add (new CFPlus::UI::Button
3796 markup => $title,
3797 tooltip => $tooltip,
3798 on_activate => sub { $self->set_current_page ($widget) },
3799 );
3800
3801 $self->{multiplexer}->add ($widget); 4049 $self->add ($widget);
3802} 4050}
3803 4051
3804sub get_current_page { 4052sub get_current_page {
3805 my ($self) = @_; 4053 my ($self) = @_;
3806 4054
… …
3810sub set_current_page { 4058sub set_current_page {
3811 my ($self, $page) = @_; 4059 my ($self, $page) = @_;
3812 4060
3813 $self->{multiplexer}->set_current_page ($page); 4061 $self->{multiplexer}->set_current_page ($page);
3814 $self->emit (page_changed => $self->{multiplexer}{current}); 4062 $self->emit (page_changed => $self->{multiplexer}{current});
4063}
4064
4065sub _draw {
4066 my ($self) = @_;
4067
4068 $self->SUPER::_draw ();
4069
4070 if (my $cur = $self->{multiplexer}{current}) {
4071 if ($cur = $cur->{c_tab_}) {
4072 glTranslate $self->{buttonbar}{x} + $cur->{x},
4073 $self->{buttonbar}{y} + $cur->{y};
4074 glLineWidth 3;
4075 #glEnable GL_BLEND;
4076 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4077 glColor @{$self->{active_outline}};
4078 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4079 glLineWidth 1;
4080 #glDisable GL_BLEND;
4081 }
4082 }
3815} 4083}
3816 4084
3817############################################################################# 4085#############################################################################
3818 4086
3819package CFPlus::UI::Selector; 4087package CFPlus::UI::Selector;
… …
4089} 4357}
4090 4358
4091sub update { 4359sub update {
4092 my ($self) = @_; 4360 my ($self) = @_;
4093 4361
4094 $::WANT_REFRESH++; 4362 $::WANT_REFRESH->start;
4095} 4363}
4096 4364
4097sub add { 4365sub add {
4098 my ($self, @children) = @_; 4366 my ($self, @children) = @_;
4099 4367
… …
4136 while ($self->{refresh_hook}) { 4404 while ($self->{refresh_hook}) {
4137 $_->() 4405 $_->()
4138 for values %{delete $self->{refresh_hook}}; 4406 for values %{delete $self->{refresh_hook}};
4139 } 4407 }
4140 4408
4141 if ($self->{realloc}) { 4409 while ($self->{realloc}) {
4142 my %queue; 4410 my %queue;
4143 my @queue; 4411 my @queue;
4144 my $widget; 4412 my $widget;
4145 4413
4146 outer: 4414 outer:
… …
4193 } 4461 }
4194 } 4462 }
4195 4463
4196 delete $self->{realloc}{$widget+0}; 4464 delete $self->{realloc}{$widget+0};
4197 } 4465 }
4198 }
4199 4466
4200 while (my $size_alloc = delete $self->{size_alloc}) { 4467 while (my $size_alloc = delete $self->{size_alloc}) {
4201 my @queue = sort { $b->{visible} <=> $a->{visible} } 4468 my @queue = sort { $a->{visible} <=> $b->{visible} }
4202 values %$size_alloc; 4469 values %$size_alloc;
4203 4470
4204 while () { 4471 while () {
4205 my $widget = pop @queue || last; 4472 my $widget = pop @queue || last;
4206 4473
4207 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4474 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4208 4475
4209 $w = 0 if $w < 0;
4210 $h = 0 if $h < 0;
4211
4212 $w = max $widget->{min_w}, $w; 4476 $w = max $widget->{min_w}, $w;
4213 $h = max $widget->{min_h}, $h; 4477 $h = max $widget->{min_h}, $h;
4214 4478
4215# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4479# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4216# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4480# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4217 4481
4218 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4482 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4219 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4483 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4220 4484
4221 $w = int $w + 0.5; 4485 $w = int $w + 0.5;
4222 $h = int $h + 0.5; 4486 $h = int $h + 0.5;
4223 4487
4224 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4488 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4225 $widget->{old_w} = $widget->{w}; 4489 $widget->{old_w} = $widget->{w};
4226 $widget->{old_h} = $widget->{h}; 4490 $widget->{old_h} = $widget->{h};
4227 4491
4228 $widget->{w} = $w; 4492 $widget->{w} = $w;
4229 $widget->{h} = $h; 4493 $widget->{h} = $h;
4230 4494
4231 $widget->emit (size_allocate => $w, $h); 4495 $widget->emit (size_allocate => $w, $h);
4496 }
4232 } 4497 }
4233 } 4498 }
4234 } 4499 }
4235 4500
4236 while ($self->{post_alloc_hook}) { 4501 while ($self->{post_alloc_hook}) {

Diff Legend

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