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.395 by root, Sat Jul 21 13:56:00 2007 UTC vs.
Revision 1.435 by root, Wed Aug 22 21:40:43 2007 UTC

… …
30 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner}; 31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32 32
33 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
34 34
35 my $tip = $widget->{tooltip};
36
37 $tip = $tip->($widget) if CODE:: eq ref $tip;
38
39 $TOOLTIP->set_tooltip_from ($widget); 35 $TOOLTIP->set_tooltip_from ($widget);
40 $TOOLTIP->show; 36 $TOOLTIP->show;
41 } 37 }
42 38
43 return; 39 return;
… …
273 $self->emit ("destroy"); 269 $self->emit ("destroy");
274 %$self = (); 270 %$self = ();
275} 271}
276 272
277sub TO_JSON { 273sub TO_JSON {
278 { __widget_ref__ => $_[0]{s_id} } 274 { __w_ => $_[0]{s_id} }
279} 275}
280 276
281sub show { 277sub show {
282 my ($self) = @_; 278 my ($self) = @_;
283 279
… …
593 589
594# using global variables seems a bit hacky, but passing through all drawing 590# using global variables seems a bit hacky, but passing through all drawing
595# functions seems pointless. 591# functions seems pointless.
596our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 592our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
597 593
598sub draw { 594#sub draw {
599 my ($self) = @_; 595#CFPlus.xs
600
601 return unless $self->{h} && $self->{w};
602
603 # update screen rectangle
604 local $draw_x = $draw_x + $self->{x};
605 local $draw_y = $draw_y + $self->{y};
606
607 # skip widgets that are entirely outside the drawing area
608 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
609 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
610
611 glPushMatrix;
612 glTranslate $self->{x}, $self->{y}, 0;
613
614 if ($self == $HOVER && $self->{can_hover}) {
615 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
616 glEnable GL_BLEND;
617 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
618 glBegin GL_QUADS;
619 glVertex 0 , 0;
620 glVertex $self->{w}, 0;
621 glVertex $self->{w}, $self->{h};
622 glVertex 0 , $self->{h};
623 glEnd;
624 glDisable GL_BLEND;
625 }
626
627 if ($ENV{CFPLUS_DEBUG} & 1) {
628 glPushMatrix;
629 glColor 1, 1, 0, 1;
630 glTranslate 0.375, 0.375;
631 glBegin GL_LINE_LOOP;
632 glVertex 0 , 0;
633 glVertex $self->{w} - 1, 0;
634 glVertex $self->{w} - 1, $self->{h} - 1;
635 glVertex 0 , $self->{h} - 1;
636 glEnd;
637 glPopMatrix;
638 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
639 }
640
641 $self->_draw;
642 glPopMatrix;
643}
644 596
645sub _draw { 597sub _draw {
646 my ($self) = @_; 598 my ($self) = @_;
647 599
648 warn "no draw defined for $self\n"; 600 warn "no draw defined for $self\n";
649} 601}
650 602
651my $cntx;#d#
652sub DESTROY { 603sub DESTROY {
653 my ($self) = @_; 604 my ($self) = @_;
654 605
655 return if CFPlus::in_destruct; 606 return if CFPlus::in_destruct;
656 607
608 local $@;
657 eval { $self->destroy }; 609 eval { $self->destroy };
658 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 610 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
659 611
660 delete $WIDGET{$self+0}; 612 delete $WIDGET{$self+0};
661} 613}
… …
669use strict; 621use strict;
670use CFPlus::OpenGL; 622use CFPlus::OpenGL;
671 623
672sub new { 624sub new {
673 my $class = shift; 625 my $class = shift;
674
675 # range [value, low, high, page]
676 626
677 $class->SUPER::new ( 627 $class->SUPER::new (
678 #bg => [0, 0, 0, 0.2], 628 #bg => [0, 0, 0, 0.2],
679 #active_bg => [1, 1, 1, 0.5], 629 #active_bg => [1, 1, 1, 0.5],
680 @_ 630 @_
… …
692 my ($w, $h) = @$self{qw(w h)}; 642 my ($w, $h) = @$self{qw(w h)};
693 643
694 glEnable GL_BLEND; 644 glEnable GL_BLEND;
695 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 645 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
696 glColor_premultiply @$color; 646 glColor_premultiply @$color;
697
698 glBegin GL_QUADS;
699 glVertex 0 , 0;
700 glVertex 0 , $h;
701 glVertex $w, $h; 647 glRect 0, 0, $w, $h;
702 glVertex $w, 0;
703 glEnd;
704
705 glDisable GL_BLEND; 648 glDisable GL_BLEND;
706 } 649 }
707} 650}
708 651
709############################################################################# 652#############################################################################
… …
769 sort { $a->{z} <=> $b->{z} } 712 sort { $a->{z} <=> $b->{z} }
770 @{$self->{children}}, @widgets 713 @{$self->{children}}, @widgets
771 ]; 714 ];
772 715
773 $self->realloc; 716 $self->realloc;
717
718 $self->emit (c_add => \@widgets);
719
720 map $_+0, @widgets
774} 721}
775 722
776sub children { 723sub children {
777 @{ $_[0]{children} } 724 @{ $_[0]{children} }
778} 725}
779 726
780sub remove { 727sub remove {
781 my ($self, $child) = @_; 728 my ($self, @widgets) = @_;
782 729
730 $self->emit (c_remove => \@widgets);
731
732 for my $child (@widgets) {
783 delete $child->{parent}; 733 delete $child->{parent};
784 $child->hide; 734 $child->hide;
785
786 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 735 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
736 }
787 737
788 $self->realloc; 738 $self->realloc;
789} 739}
790 740
791sub clear { 741sub clear {
… …
819} 769}
820 770
821sub _draw { 771sub _draw {
822 my ($self) = @_; 772 my ($self) = @_;
823 773
824 $_->draw for @{$self->{children}}; 774 $_->draw for $self->visible_children;
825} 775}
826 776
827############################################################################# 777#############################################################################
828 778
829package CFPlus::UI::Bin; 779package CFPlus::UI::Bin;
… …
839} 789}
840 790
841sub add { 791sub add {
842 my ($self, $child) = @_; 792 my ($self, $child) = @_;
843 793
844 $self->SUPER::remove ($_) for @{ $self->{children} }; 794 $self->clear;
845 $self->SUPER::add ($child); 795 $self->SUPER::add ($child);
846} 796}
847 797
848sub remove { 798sub remove {
849 my ($self, $widget) = @_; 799 my ($self, $widget) = @_;
… …
991 $self->{view_x} = $x; 941 $self->{view_x} = $x;
992 $self->{view_y} = $y; 942 $self->{view_y} = $y;
993 943
994 $self->emit (changed => $x, $y); 944 $self->emit (changed => $x, $y);
995 $self->update; 945 $self->update;
946 }
947}
948
949sub set_center {
950 my ($self, $x, $y) = @_;
951
952 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
953}
954
955sub make_visible {
956 my ($self, $x, $y, $border) = @_;
957
958 if ( $x < $self->{view_x} + $self->{w} * $border
959 || $x > $self->{view_x} + $self->{w} * (1 - $border)
960 || $y < $self->{view_y} + $self->{h} * $border
961 || $y > $self->{view_y} + $self->{h} * (1 - $border)
962 ) {
963 $self->set_center ($x, $y);
996 } 964 }
997} 965}
998 966
999# hmm, this does not work for topleft of $self... but we should not ask for that 967# hmm, this does not work for topleft of $self... but we should not ask for that
1000sub coord2local { 968sub coord2local {
… …
1047 my $child = delete $arg{child}; 1015 my $child = delete $arg{child};
1048 1016
1049 my $self; 1017 my $self;
1050 1018
1051 my $hslider = new CFPlus::UI::Slider 1019 my $hslider = new CFPlus::UI::Slider
1052 col => 0, 1020 c_col => 0,
1053 row => 1, 1021 c_row => 1,
1054 vertical => 0, 1022 vertical => 0,
1055 range => [0, 0, 1, 0.01], # HACK fix 1023 range => [0, 0, 1, 0.01], # HACK fix
1056 on_changed => sub { 1024 on_changed => sub {
1057 $self->{hpos} = $_[1]; 1025 $self->{hpos} = $_[1];
1058 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1026 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1059 }, 1027 },
1060 ; 1028 ;
1061 1029
1062 my $vslider = new CFPlus::UI::Slider 1030 my $vslider = new CFPlus::UI::Slider
1063 col => 1, 1031 c_col => 1,
1064 row => 0, 1032 c_row => 0,
1065 vertical => 1, 1033 vertical => 1,
1066 range => [0, 0, 1, 0.01], # HACK fix 1034 range => [0, 0, 1, 0.01], # HACK fix
1067 on_changed => sub { 1035 on_changed => sub {
1068 $self->{vpos} = $_[1]; 1036 $self->{vpos} = $_[1];
1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1037 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1080 row_expand => [1, 0], 1048 row_expand => [1, 0],
1081 %arg, 1049 %arg,
1082 ); 1050 );
1083 1051
1084 $self->{vp} = new CFPlus::UI::ViewPort 1052 $self->{vp} = new CFPlus::UI::ViewPort
1085 col => 0, 1053 c_col => 0,
1086 row => 0, 1054 c_row => 0,
1087 expand => 1, 1055 expand => 1,
1088 scroll_x => $self->{scroll_x}, 1056 scroll_x => $self->{scroll_x},
1089 scroll_y => $self->{scroll_y}, 1057 scroll_y => $self->{scroll_y},
1090 on_changed => sub { 1058 on_changed => sub {
1091 my ($vp, $x, $y) = @_; 1059 my ($vp, $x, $y) = @_;
… …
1093 $vp->{parent}{hslider}->set_value ($x); 1061 $vp->{parent}{hslider}->set_value ($x);
1094 $vp->{parent}{vslider}->set_value ($y); 1062 $vp->{parent}{vslider}->set_value ($y);
1095 1063
1096 0 1064 0
1097 }, 1065 },
1066 on_size_allocate => sub {
1067 my ($vp, $w, $h) = @_;
1068 $vp->{parent}->update_slider;
1069 0
1070 },
1098 ; 1071 ;
1099 1072
1100 $self->SUPER::add ($self->{vp}); 1073 $self->SUPER::add ($self->{vp});
1101 1074
1102 $self->add ($child) if $child; 1075 $self->add ($child) if $child;
… …
1108 my ($self, $widget) = @_; 1081 my ($self, $widget) = @_;
1109 1082
1110 $self->{vp}->add ($self->{child} = $widget); 1083 $self->{vp}->add ($self->{child} = $widget);
1111} 1084}
1112 1085
1086sub set_offset { shift->{vp}->set_offset (@_) }
1087sub set_center { shift->{vp}->set_center (@_) }
1088sub make_visible { shift->{vp}->make_visible (@_) }
1089
1113sub update_slider { 1090sub update_slider {
1114 my ($self) = @_; 1091 my ($self) = @_;
1115 1092
1116 my $child = ($self->{vp} or return)->child; 1093 my $child = ($self->{vp} or return)->child;
1117 1094
1095 if ($self->{scroll_x}) {
1118 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1096 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1119 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); 1097 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1120 1098
1121 my $visible = $w1 > $w2; 1099 my $visible = $w1 > $w2;
1122 if ($visible != $self->{hslider_visible}) { 1100 if ($visible != $self->{hslider_visible}) {
1123 $self->{hslider_visible} = $visible; 1101 $self->{hslider_visible} = $visible;
1124 $visible ? $self->SUPER::add ($self->{hslider}) 1102 $visible ? $self->SUPER::add ($self->{hslider})
1125 : $self->SUPER::remove ($self->{hslider}); 1103 : $self->SUPER::remove ($self->{hslider});
1104 }
1126 } 1105 }
1127 1106
1107 if ($self->{scroll_y}) {
1128 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1108 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1129 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); 1109 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1130 1110
1131 my $visible = $h1 > $h2; 1111 my $visible = $h1 > $h2;
1132 if ($visible != $self->{vslider_visible}) { 1112 if ($visible != $self->{vslider_visible}) {
1133 $self->{vslider_visible} = $visible; 1113 $self->{vslider_visible} = $visible;
1134 $visible ? $self->SUPER::add ($self->{vslider}) 1114 $visible ? $self->SUPER::add ($self->{vslider})
1135 : $self->SUPER::remove ($self->{vslider}); 1115 : $self->SUPER::remove ($self->{vslider});
1116 }
1117 }
1118}
1119
1120sub start_dragging {
1121 my ($self, $ev) = @_;
1122
1123 $self->grab_focus;
1124
1125 my $ox = $self->{vp}{view_x};
1126 my $oy = $self->{vp}{view_y};
1127
1128 $self->{motion} = sub {
1129 my ($ev, $x, $y) = @_;
1130
1131 $ox -= $ev->{xrel};
1132 $oy -= $ev->{yrel};
1133
1134 $self->{vp}->set_offset ($ox, $oy);
1136 } 1135 };
1137} 1136}
1138 1137
1139sub invoke_mouse_wheel { 1138sub invoke_mouse_wheel {
1140 my ($self, $ev) = @_; 1139 my ($self, $ev) = @_;
1141 1140
1142 $self->{vslider}->emit (mouse_wheel => $ev) 1141 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1143 if $ev->{dy};
1144
1145 $self->{hslider}->emit (mouse_wheel => $ev) 1142 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1146 if $ev->{dx};
1147 1143
1148 1 1144 1
1149} 1145}
1150 1146
1151sub invoke_button_down { 1147sub invoke_button_down {
1152 my ($self, $ev, $x, $y) = @_; 1148 my ($self, $ev, $x, $y) = @_;
1153 1149
1154 if ($ev->{button} == 2) { 1150 if ($ev->{button} == 2) {
1155 $self->grab_focus; 1151 $self->start_dragging ($ev);
1156
1157 my $ox = $self->{vp}{view_x} + $ev->{x};
1158 my $oy = $self->{vp}{view_y} + $ev->{y};
1159
1160 $self->{motion} = sub {
1161 my ($ev, $x, $y) = @_;
1162
1163 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1164 $self->update;
1165 };
1166
1167 return 1; 1152 return 1;
1168 } 1153 }
1169 1154
1170 0 1155 0
1171} 1156}
… …
1222 my ($w, $h) = @$self{qw(w h)}; 1207 my ($w, $h) = @$self{qw(w h)};
1223 1208
1224 glEnable GL_BLEND; 1209 glEnable GL_BLEND;
1225 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1210 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1226 glColor_premultiply @{ $self->{bg} }; 1211 glColor_premultiply @{ $self->{bg} };
1227
1228 glBegin GL_QUADS;
1229 glVertex 0 , 0;
1230 glVertex 0 , $h;
1231 glVertex $w, $h; 1212 glRect 0, 0, $w, $h;
1232 glVertex $w, 0;
1233 glEnd;
1234
1235 glDisable GL_BLEND; 1213 glDisable GL_BLEND;
1236 } 1214 }
1237 1215
1238 $self->SUPER::_draw; 1216 $self->SUPER::_draw;
1239} 1217}
… …
1601 1579
1602sub add { 1580sub add {
1603 my ($self, @widgets) = @_; 1581 my ($self, @widgets) = @_;
1604 1582
1605 for my $child (@widgets) { 1583 for my $child (@widgets) {
1606 $child->{rowspan} ||= 1; 1584 $child->{c_rowspan} ||= 1;
1607 $child->{colspan} ||= 1; 1585 $child->{c_colspan} ||= 1;
1608 } 1586 }
1609 1587
1610 $self->SUPER::add (@widgets); 1588 $self->SUPER::add (@widgets);
1611} 1589}
1612 1590
… …
1616 my @widgets; 1594 my @widgets;
1617 1595
1618 while (@_) { 1596 while (@_) {
1619 my ($col, $row, $child) = splice @_, 0, 3, (); 1597 my ($col, $row, $child) = splice @_, 0, 3, ();
1620 1598
1621 $child->{row} = $row; 1599 $child->{c_row} = $row;
1622 $child->{col} = $col; 1600 $child->{c_col} = $col;
1623 1601
1624 push @widgets, $child; 1602 push @widgets, $child;
1625 } 1603 }
1626 1604
1627 $self->add (@widgets); 1605 $self->add (@widgets);
… …
1633 my (@w, @h); 1611 my (@w, @h);
1634 1612
1635 my @children = $self->children; 1613 my @children = $self->children;
1636 1614
1637 # first pass, columns 1615 # first pass, columns
1638 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) { 1616 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1639 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; 1617 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1640 1618
1641 my $sw = sum @w[$c .. $c + $cs - 1]; 1619 my $sw = sum @w[$c .. $c + $cs - 1];
1642 1620
1643 if ($w > $sw) { 1621 if ($w > $sw) {
1644 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; 1622 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1645 } 1623 }
1646 } 1624 }
1647 1625
1648 # second pass, rows 1626 # second pass, rows
1649 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { 1627 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1650 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; 1628 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1651 1629
1652 my $sh = sum @h[$r .. $r + $rs - 1]; 1630 my $sh = sum @h[$r .. $r + $rs - 1];
1653 1631
1654 if ($h > $sh) { 1632 if ($h > $sh) {
1655 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; 1633 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
… …
1697 1675
1698 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } 1676 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1699 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } 1677 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1700 1678
1701 for my $widget ($self->children) { 1679 for my $widget ($self->children) {
1702 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)}; 1680 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1703 1681
1704 $widget->configure ( 1682 $widget->configure (
1705 $x[$c], $y[$r], 1683 $x[$c], $y[$r],
1706 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r], 1684 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1707 ); 1685 );
… …
1716 1694
1717use List::Util qw(min max); 1695use List::Util qw(min max);
1718 1696
1719our @ISA = CFPlus::UI::Container::; 1697our @ISA = CFPlus::UI::Container::;
1720 1698
1721sub add {
1722 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1723
1724 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1725 $self->SUPER::add ($child);
1726}
1727
1728sub _scale($$$) { 1699sub _scale($$$) {
1729 my ($mode, $val, $max) = @_; 1700 my ($rel, $val, $max) = @_;
1730 1701
1731 $mode eq "abs" ? $val 1702 $rel ? $val * $max : $val
1732 : $mode eq "rel" ? $val * $max
1733 : 0
1734} 1703}
1735 1704
1736sub size_request { 1705sub size_request {
1737 my ($self) = @_; 1706 my ($self) = @_;
1738 1707
1739 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1708 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1740 1709
1741 # determine overall size by querying abs widgets 1710 # determine overall size by querying abs widgets
1742 for my $child ($self->visible_children) { 1711 for my $child ($self->visible_children) {
1743 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1712 unless ($child->{c_rel}) {
1713 my $x = $child->{c_x};
1714 my $y = $child->{c_y};
1744 1715
1745 if ($pos eq "abs") {
1746 $w = _scale $size, $w, $child->{req_w};
1747 $h = _scale $size, $h, $child->{req_h};
1748
1749 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1716 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1750 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1717 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1751 } 1718 }
1752 } 1719 }
1753 1720
1754 my $W = $x2 - $x1; 1721 my $W = $x2 - $x1;
1755 my $H = $y2 - $y1; 1722 my $H = $y2 - $y1;
1756 1723
1757 # now layout remaining widgets 1724 # now layout remaining widgets
1758 for my $child ($self->visible_children) { 1725 for my $child ($self->visible_children) {
1759 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1726 if ($child->{c_rel}) {
1727 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1728 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1760 1729
1761 if ($pos ne "abs") {
1762 $x = _scale $pos, $x, $W;
1763 $y = _scale $pos, $x, $H;
1764 $w = _scale $size, $w, $child->{req_w};
1765 $h = _scale $size, $h, $child->{req_h};
1766
1767 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1730 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1768 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1731 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1769 } 1732 }
1770 } 1733 }
1771 1734
1772 my $W = $x2 - $x1; 1735 my $W = $x2 - $x1;
1773 my $H = $y2 - $y1; 1736 my $H = $y2 - $y1;
… …
1777 1740
1778sub invoke_size_allocate { 1741sub invoke_size_allocate {
1779 my ($self, $W, $H) = @_; 1742 my ($self, $W, $H) = @_;
1780 1743
1781 for my $child ($self->visible_children) { 1744 for my $child ($self->visible_children) {
1782 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1745 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1746 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1783 1747
1784 $x = _scale $pos, $x, $W; 1748 $x += $child->{c_halign} * $child->{req_w};
1785 $y = _scale $pos, $x, $H; 1749 $y += $child->{c_valign} * $child->{req_h};
1786 $w = _scale $size, $w, $child->{req_w};
1787 $h = _scale $size, $h, $child->{req_h};
1788 1750
1789 $child->configure ($x, $y, $w, $h); 1751 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1790 } 1752 }
1791 1753
1792 1 1754 1
1793} 1755}
1794 1756
… …
1798 1760
1799our @ISA = CFPlus::UI::Container::; 1761our @ISA = CFPlus::UI::Container::;
1800 1762
1801sub size_request { 1763sub size_request {
1802 my ($self) = @_; 1764 my ($self) = @_;
1765
1766 my @children = $self->visible_children;
1803 1767
1804 $self->{vertical} 1768 $self->{vertical}
1805 ? ( 1769 ? (
1806 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1770 (List::Util::max map $_->{req_w}, @children),
1807 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1771 (List::Util::sum map $_->{req_h}, @children),
1808 ) 1772 )
1809 : ( 1773 : (
1810 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1774 (List::Util::sum map $_->{req_w}, @children),
1811 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1775 (List::Util::max map $_->{req_h}, @children),
1812 ) 1776 )
1813} 1777}
1814 1778
1815sub invoke_size_allocate { 1779sub invoke_size_allocate {
1816 my ($self, $w, $h) = @_; 1780 my ($self, $w, $h) = @_;
… …
1940 1904
1941 delete $self->{ox}; 1905 delete $self->{ox};
1942 $self->SUPER::realloc; 1906 $self->SUPER::realloc;
1943} 1907}
1944 1908
1909sub clear {
1910 my ($self) = @_;
1911
1912 $self->set_text ("");
1913}
1914
1945sub set_text { 1915sub set_text {
1946 my ($self, $text) = @_; 1916 my ($self, $text) = @_;
1947 1917
1948 return if $self->{text} eq "T$text"; 1918 return if $self->{text} eq "T$text";
1949 $self->{text} = "T$text"; 1919 $self->{text} = "T$text";
… …
2055 : ($self->{w} - $size->[0]) * 0.5); 2025 : ($self->{w} - $size->[0]) * 0.5);
2056 2026
2057 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2027 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2058 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2028 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2059 : ($self->{h} - $size->[1]) * 0.5); 2029 : ($self->{h} - $size->[1]) * 0.5);
2030
2031 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2060 }; 2032 };
2061 2033
2062 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2034# unless ($self->{list}) {
2063 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2035# $self->{list} = CFPlus::OpenGL::glGenList;
2064 2036# CFPlus::OpenGL::glNewList $self->{list};
2065 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2037# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2038# CFPlus::OpenGL::glEndList;
2039# }
2040#
2041# CFPlus::OpenGL::glCallList $self->{list};
2042
2043 $self->{layout}->draw;
2066} 2044}
2045
2046#sub destroy {
2047# my ($self) = @_;
2048#
2049# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2050#
2051# $self->SUPER::destroy;
2052#}
2067 2053
2068############################################################################# 2054#############################################################################
2069 2055
2070package CFPlus::UI::EntryBase; 2056package CFPlus::UI::EntryBase;
2071 2057
… …
2077 my $class = shift; 2063 my $class = shift;
2078 2064
2079 $class->SUPER::new ( 2065 $class->SUPER::new (
2080 fg => [1, 1, 1], 2066 fg => [1, 1, 1],
2081 bg => [0, 0, 0, 0.2], 2067 bg => [0, 0, 0, 0.2],
2068 outline => [0.6, 0.3, 0.1],
2082 active_bg => [1, 1, 1, 0.5], 2069 active_bg => [0, 0, 1, .2],
2083 active_fg => [0, 0, 0], 2070 active_fg => [1, 1, 1],
2071 active_outline => [1, 1, 0],
2084 can_hover => 1, 2072 can_hover => 1,
2085 can_focus => 1, 2073 can_focus => 1,
2086 valign => 0, 2074 valign => 0,
2087 can_events => 1, 2075 can_events => 1,
2088 ellipsise => 0, 2076 ellipsise => 0,
… …
2228 glColor_premultiply @{$self->{bg}}; 2216 glColor_premultiply @{$self->{bg}};
2229 } 2217 }
2230 2218
2231 glEnable GL_BLEND; 2219 glEnable GL_BLEND;
2232 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2220 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2233 glBegin GL_QUADS;
2234 glVertex 0 , 0;
2235 glVertex 0 , $self->{h};
2236 glVertex $self->{w}, $self->{h}; 2221 glRect 0, 0, $self->{w}, $self->{h};
2237 glVertex $self->{w}, 0;
2238 glEnd;
2239 glDisable GL_BLEND; 2222 glDisable GL_BLEND;
2240 2223
2241 $self->SUPER::_draw; 2224 $self->SUPER::_draw;
2242 2225
2243 #TODO: force update every cursor change :( 2226 #TODO: force update every cursor change :(
… …
2245 2228
2246 unless (exists $self->{cur_h}) { 2229 unless (exists $self->{cur_h}) {
2247 my $text = substr $self->{text}, 0, $self->{cursor}; 2230 my $text = substr $self->{text}, 0, $self->{cursor};
2248 utf8::encode $text; 2231 utf8::encode $text;
2249 2232
2250 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2233 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2251 } 2234 }
2252 2235
2236 glColor_premultiply @{$self->{active_fg}};
2253 glBegin GL_LINES; 2237 glBegin GL_LINES;
2254 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2238 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
2255 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2239 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2240 glEnd;
2241
2242 glLineWidth 3;
2243 glColor @{$self->{active_outline}};
2244 glRect_lineloop 0, 0, $self->{w} - 1, $self->{h} - 1;
2245 glLineWidth 1;
2246
2247 } else {
2248 glColor @{$self->{outline}};
2249 glTranslate .375, .375;
2250 glBegin GL_LINE_STRIP;
2251 glVertex 0, $self->{h} * .5;
2252 glVertex 0, $self->{h} - 3;
2253 glVertex $self->{w} - 1, $self->{h} - 3;
2254 glVertex $self->{w} - 1, $self->{h} * .5;
2256 glEnd; 2255 glEnd;
2257 } 2256 }
2258} 2257}
2259 2258
2260############################################################################# 2259#############################################################################
… …
2347 1 2346 1
2348} 2347}
2349 2348
2350############################################################################# 2349#############################################################################
2351 2350
2351package CFPlus::UI::ButtonBin;
2352
2353our @ISA = CFPlus::UI::Bin::;
2354
2355use CFPlus::OpenGL;
2356
2357my @tex =
2358 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2359 qw(b1_button_inactive.png b1_button_active.png);
2360
2361sub new {
2362 my $class = shift;
2363
2364 $class->SUPER::new (
2365 can_hover => 1,
2366 align => 0,
2367 valign => 0,
2368 can_events => 1,
2369 @_
2370 )
2371}
2372
2373sub invoke_button_up {
2374 my ($self, $ev, $x, $y) = @_;
2375
2376 $self->emit ("activate")
2377 if $x >= 0 && $x < $self->{w}
2378 && $y >= 0 && $y < $self->{h};
2379
2380 1
2381}
2382
2383sub _draw {
2384 my ($self) = @_;
2385
2386 glEnable GL_TEXTURE_2D;
2387 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2388 glColor 0, 0, 0, 1;
2389
2390 my $tex = $tex[$GRAB == $self];
2391 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2392
2393 glDisable GL_TEXTURE_2D;
2394
2395 $self->SUPER::_draw;
2396}
2397
2398#############################################################################
2399
2352package CFPlus::UI::Button; 2400package CFPlus::UI::Button;
2353 2401
2354our @ISA = CFPlus::UI::Label::; 2402our @ISA = CFPlus::UI::Label::;
2355 2403
2356use CFPlus::OpenGL; 2404use CFPlus::OpenGL;
… …
2490sub new { 2538sub new {
2491 my $class = shift; 2539 my $class = shift;
2492 2540
2493 my $self = $class->SUPER::new ( 2541 my $self = $class->SUPER::new (
2494 can_events => 0, 2542 can_events => 0,
2543 scale => 1,
2495 @_, 2544 @_,
2496 ); 2545 );
2497 2546
2498 $self->{path} || $self->{tex} 2547 $self->{path} || $self->{tex}
2499 or Carp::croak "'path' or 'tex' attributes required"; 2548 or Carp::croak "'path' or 'tex' attributes required";
… …
2524} 2573}
2525 2574
2526sub size_request { 2575sub size_request {
2527 my ($self) = @_; 2576 my ($self) = @_;
2528 2577
2529 ($self->{tex}{w}, $self->{tex}{h}) 2578 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2530} 2579}
2531 2580
2532sub _draw { 2581sub _draw {
2533 my ($self) = @_; 2582 my ($self) = @_;
2534 2583
… …
2544 } 2593 }
2545 2594
2546 glEnable GL_TEXTURE_2D; 2595 glEnable GL_TEXTURE_2D;
2547 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2596 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2548 2597
2549 $tex->draw_quad (0, 0, $w, $h); 2598 $tex->draw_quad_alpha (0, 0, $w, $h);
2550 2599
2551 glDisable GL_TEXTURE_2D; 2600 glDisable GL_TEXTURE_2D;
2552} 2601}
2553 2602
2554############################################################################# 2603#############################################################################
… …
2573 align => 0, 2622 align => 0,
2574 valign => 0, 2623 valign => 0,
2575 can_events => 1, 2624 can_events => 1,
2576 @_ 2625 @_
2577 ); 2626 );
2627}
2628
2629sub invoke_button_down {
2630 my ($self, $ev, $x, $y) = @_;
2631
2632 1
2578} 2633}
2579 2634
2580sub invoke_button_up { 2635sub invoke_button_up {
2581 my ($self, $ev, $x, $y) = @_; 2636 my ($self, $ev, $x, $y) = @_;
2582 2637
… …
2722 glDisable GL_TEXTURE_2D; 2777 glDisable GL_TEXTURE_2D;
2723} 2778}
2724 2779
2725############################################################################# 2780#############################################################################
2726 2781
2782package CFPlus::UI::Progress;
2783
2784our @ISA = CFPlus::UI::Label::;
2785
2786use CFPlus::OpenGL;
2787
2788sub new {
2789 my ($class, %arg) = @_;
2790
2791 my $self = $class->SUPER::new (
2792 fg => [1, 1, 1],
2793 bg => [0, 0, 1, 0.2],
2794 bar => [0.7, 0.5, 0.1, 0.8],
2795 outline => [0.4, 0.3, 0],
2796 fontsize => 0.9,
2797 valign => 0,
2798 align => 0,
2799 can_events => 1,
2800 ellipsise => 1,
2801 label => "%d%%",
2802 %arg,
2803 );
2804
2805 $self->set_value ($arg{value} || -1);
2806
2807 $self
2808}
2809
2810sub set_label {
2811 my ($self, $label) = @_;
2812
2813 return if $self->{label} eq $label;
2814 $self->{label} = $label;
2815
2816 $self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
2817}
2818
2819sub set_value {
2820 my ($self, $value) = @_;
2821
2822 if ($self->{value} ne $value) {
2823 $self->{value} = $value;
2824
2825 if ($value < 0) {
2826 $self->set_text ("-");
2827 } else {
2828 $self->set_text (sprintf $self->{label}, $value * 100);
2829 }
2830
2831 $self->update;
2832 }
2833}
2834
2835sub _draw {
2836 my ($self) = @_;
2837
2838 glEnable GL_BLEND;
2839 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2840
2841 if ($self->{value} >= 0) {
2842 my $s = 3 + ($self->{w} - 6) * $self->{value};
2843
2844 glColor_premultiply @{$self->{bar}};
2845 glRect 2, 2, $s, $self->{h} - 2;
2846 glColor_premultiply @{$self->{bg}};
2847 glRect $s + 1, 0, $self->{w} - 2, $self->{h} - 2;
2848 }
2849
2850 glColor_premultiply @{$self->{outline}};
2851 glRect_lineloop 1, 1, $self->{w} - 2, $self->{h} - 2;
2852
2853 glDisable GL_BLEND;
2854
2855 {
2856 local $self->{bg}; # do not draw background
2857 $self->SUPER::_draw;
2858 }
2859}
2860
2861#############################################################################
2862
2863package CFPlus::UI::ExperienceProgress;
2864
2865our @ISA = CFPlus::UI::Progress::;
2866
2867sub new {
2868 my ($class, %arg) = @_;
2869
2870 my $self = $class->SUPER::new (
2871 tooltip => sub {
2872 my ($self) = @_;
2873
2874 sprintf "level %d\n%s points\n%s next level\n%s to go",
2875 $self->{lvl},
2876 ::formsep ($self->{exp}),
2877 ::formsep ($self->{nxt}),
2878 ::formsep ($self->{nxt} - $self->{exp}),
2879 },
2880 %arg
2881 );
2882
2883 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2884 if $::CONN;
2885
2886 $self
2887}
2888
2889sub DESTROY {
2890 my ($self) = @_;
2891
2892 delete $::CONN->{on_exp_update}{$self+0}
2893 if $::CONN;
2894
2895 $self->SUPER::DESTROY;
2896}
2897
2898sub set_value {
2899 my ($self, $lvl, $exp) = @_;
2900
2901<<<<<<< UI.pm
2902 $self->{lvl} = $lvl;
2903 $self->{exp} = $exp;
2904
2905=======
2906 $self->{lvl} = $exp;
2907 $self->{exp} = $exp;
2908
2909>>>>>>> 1.434
2910 my $v = -1;
2911
2912 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2913 my $l0 = $table->[$lvl - 1];
2914 my $l1 = $table->[$lvl];
2915
2916 $self->{nxt} = $l1;
2917
2918 $v = ($exp - $l0) / ($l1 - $l0);
2919 }
2920
2921 $self->SUPER::set_value ($v);
2922}
2923
2924#############################################################################
2925
2727package CFPlus::UI::Gauge; 2926package CFPlus::UI::Gauge;
2728 2927
2729our @ISA = CFPlus::UI::VBox::; 2928our @ISA = CFPlus::UI::VBox::;
2730 2929
2731sub new { 2930sub new {
… …
2856 3055
2857 $self->SUPER::invoke_button_down ($ev, $x, $y); 3056 $self->SUPER::invoke_button_down ($ev, $x, $y);
2858 3057
2859 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3058 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2860 3059
2861 $self->invoke_mouse_motion ($ev, $x, $y) 3060 $self->invoke_mouse_motion ($ev, $x, $y);
3061
3062 1
2862} 3063}
2863 3064
2864sub invoke_mouse_motion { 3065sub invoke_mouse_motion {
2865 my ($self, $ev, $x, $y) = @_; 3066 my ($self, $ev, $x, $y) = @_;
2866 3067
… …
2886 3087
2887 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3088 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2888 3089
2889 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3090 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2890 3091
2891 ! ! $delta 3092 1
2892} 3093}
2893 3094
2894sub update { 3095sub update {
2895 my ($self) = @_; 3096 my ($self) = @_;
2896 3097
… …
3027} 3228}
3028 3229
3029sub size_request { 3230sub size_request {
3030 my ($self) = @_; 3231 my ($self) = @_;
3031 3232
3032 my ($empty, $slider) = @{ $self->{children} }; 3233 my ($empty, $slider) = $self->visible_children;
3033 3234
3034 local $self->{children} = [$empty, $slider]; 3235 local $self->{children} = [$empty, $slider];
3035 $self->SUPER::size_request 3236 $self->SUPER::size_request
3036} 3237}
3037 3238
… …
3226 3427
3227 if ($y0 < $y + $h && $y < $y1) { 3428 if ($y0 < $y + $h && $y < $y1) {
3228 my $layout = $self->get_layout ($para); 3429 my $layout = $self->get_layout ($para);
3229 3430
3230 $layout->render ($para->{indent}, $y - $y0); 3431 $layout->render ($para->{indent}, $y - $y0);
3432 $layout->draw;
3231 3433
3232 if (my @w = @{ $para->{widget} }) { 3434 if (my @w = @{ $para->{widget} }) {
3233 my @s = $layout->get_shapes; 3435 my @s = $layout->get_shapes;
3234 3436
3235 for (@w) { 3437 for (@w) {
… …
3357} 3559}
3358 3560
3359sub set_tooltip_from { 3561sub set_tooltip_from {
3360 my ($self, $widget) = @_; 3562 my ($self, $widget) = @_;
3361 3563
3362 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3363 if $widget->{tooltip} =~ /^#(.*)$/;
3364
3365 my $tooltip = $widget->{tooltip}; 3564 my $tip = $widget->{tooltip};
3565 $tip = $tip->($widget) if "CODE" eq ref $tip;
3566
3567 $tip = CFPlus::Pod::section_label tooltip => $1
3568 if $tip =~ /^#(.*)$/;
3366 3569
3367 if ($ENV{CFPLUS_DEBUG} & 2) { 3570 if ($ENV{CFPLUS_DEBUG} & 2) {
3368 $tooltip .= "\n\n" . (ref $widget) . "\n" 3571 $tip .= "\n\n" . (ref $widget) . "\n"
3369 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3572 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3370 . "req $widget->{req_w} $widget->{req_h}\n" 3573 . "req $widget->{req_w} $widget->{req_h}\n"
3371 . "visible $widget->{visible}"; 3574 . "visible $widget->{visible}";
3372 } 3575 }
3373 3576
3374 $tooltip =~ s/^\n+//; 3577 $tip =~ s/^\n+//;
3375 $tooltip =~ s/\n+$//; 3578 $tip =~ s/\n+$//;
3376 3579
3377 $self->add (new CFPlus::UI::Label 3580 $self->add (new CFPlus::UI::Label
3378 markup => $tooltip, 3581 markup => $tip,
3379 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3582 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3380 fontsize => 0.8, 3583 fontsize => 0.8,
3381 style => 1, # FLAG_INVERSE 3584 style => 1, # FLAG_INVERSE
3382 ellipsise => 0, 3585 ellipsise => 0,
3383 font => ($widget->{tooltip_font} || $::FONT_PROP), 3586 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
3426 glTranslate 0.375, 0.375; 3629 glTranslate 0.375, 0.375;
3427 3630
3428 my ($w, $h) = @$self{qw(w h)}; 3631 my ($w, $h) = @$self{qw(w h)};
3429 3632
3430 glColor 1, 0.8, 0.4; 3633 glColor 1, 0.8, 0.4;
3431 glBegin GL_QUADS; 3634 glRect 0, 0, $w, $h;
3432 glVertex 0 , 0;
3433 glVertex 0 , $h;
3434 glVertex $w, $h;
3435 glVertex $w, 0;
3436 glEnd;
3437 3635
3438 glColor 0, 0, 0; 3636 glColor 0, 0, 0;
3439 glBegin GL_LINE_LOOP; 3637 glRect_lineloop 0, 0, $w, $h;
3440 glVertex 0 , 0;
3441 glVertex 0 , $h;
3442 glVertex $w, $h;
3443 glVertex $w, 0;
3444 glEnd;
3445 3638
3446 glTranslate 2 - 0.375, 2 - 0.375; 3639 glTranslate 2 - 0.375, 2 - 0.375;
3447 3640
3448 $self->SUPER::_draw; 3641 $self->SUPER::_draw;
3449} 3642}
… …
3469 3662
3470 if ($self->{anim} && $self->{animspeed}) { 3663 if ($self->{anim} && $self->{animspeed}) {
3471 CFPlus::weaken (my $widget = $self); 3664 CFPlus::weaken (my $widget = $self);
3472 3665
3473 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3666 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3474 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed}; 3667 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3475 $self->{timer} = Event->timer ( 3668 $self->{timer} = Event->timer (
3476 parked => 1, 3669 parked => 1,
3477 cb => sub { 3670 cb => sub {
3478 return unless $::CONN && $widget; 3671 return unless $::CONN;
3479 3672
3673 my $w = $widget
3674 or return;
3675
3480 ++$widget->{frame}; 3676 ++$w->{frame};
3481 $widget->update_face; 3677 $w->update_face;
3678
3679 # somehow, $widget can go away
3482 $widget->update; 3680 $w->update;
3483
3484 $widget->update_timer; 3681 $w->update_timer;
3485 }, 3682 },
3486 ); 3683 );
3487 3684
3488 $self->update_face; 3685 $self->update_face;
3489 $self->update_timer; 3686 $self->update_timer;
… …
3510} 3707}
3511 3708
3512sub update_face { 3709sub update_face {
3513 my ($self) = @_; 3710 my ($self) = @_;
3514 3711
3515 return unless $::CONN;
3516
3517 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3518 if ($anim && @$anim) {
3519 delete $self->{wait_face};
3520 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3521 }
3522 }
3523}
3524
3525sub size_request {
3526 my ($self) = @_;
3527
3528 if ($::CONN) { 3712 if ($::CONN) {
3529 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3713 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3530 if (my $tex = $::CONN->{texture}[$faceid]) { 3714 if ($anim && @$anim) {
3531 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3715 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3532 } else { 3716 delete $self->{face_change_cb};
3533 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3717
3534 $self->realloc; 3718 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3719 unless ($tex->{name} || $tex->{loading}) {
3720 $tex->upload (sub { $self->reconfigure });
3721 }
3535 }); 3722 }
3536 } 3723 }
3537 } 3724 }
3538 } 3725 }
3726}
3727
3728sub size_request {
3729 my ($self) = @_;
3730
3731 if ($::CONN) {
3732 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3733 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3734 if ($tex->{name}) {
3735 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3736 } elsif (!$tex->{loading}) {
3737 $tex->upload (sub { $self->reconfigure });
3738 }
3739 }
3740
3741 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3742 }
3743 }
3539 3744
3540 ($self->{size_w} || 8, $self->{size_h} || 8) 3745 ($self->{size_w} || 8, $self->{size_h} || 8)
3541} 3746}
3542 3747
3543sub update { 3748sub update {
… …
3557} 3762}
3558 3763
3559sub _draw { 3764sub _draw {
3560 my ($self) = @_; 3765 my ($self) = @_;
3561 3766
3562 return unless $::CONN;
3563
3564 $self->SUPER::_draw; 3767 $self->SUPER::_draw;
3565 3768
3566 my $faceid = $::CONN->{faceid}[$self->{face}] 3769 if (my $tex = $self->{tex}) {
3567 or return;
3568
3569 my $tex = $::CONN->{texture}[$faceid];
3570
3571 if ($tex) {
3572 glEnable GL_TEXTURE_2D; 3770 glEnable GL_TEXTURE_2D;
3573 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3771 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3574 glColor 0, 0, 0, 1; 3772 glColor 0, 0, 0, 1;
3575 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3773 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3576 glDisable GL_TEXTURE_2D; 3774 glDisable GL_TEXTURE_2D;
… …
3628 children => [ 3826 children => [
3629 (new CFPlus::UI::Label markup => $left, expand => 1), 3827 (new CFPlus::UI::Label markup => $left, expand => 1),
3630 (new CFPlus::UI::Label markup => $right, align => +1), 3828 (new CFPlus::UI::Label markup => $right, align => +1),
3631 ], 3829 ],
3632 ; 3830 ;
3633 3831
3634 } else { 3832 } else {
3635 $widget = new CFPlus::UI::Label 3833 $widget = new CFPlus::UI::Label
3636 can_hover => 1, 3834 can_hover => 1,
3637 can_events => 1, 3835 can_events => 1,
3638 markup => $widget, 3836 markup => $widget,
… …
3763 3961
3764############################################################################# 3962#############################################################################
3765 3963
3766package CFPlus::UI::Notebook; 3964package CFPlus::UI::Notebook;
3767 3965
3966use CFPlus::OpenGL;
3967
3768our @ISA = CFPlus::UI::VBox::; 3968our @ISA = CFPlus::UI::VBox::;
3769 3969
3770sub new { 3970sub new {
3771 my $class = shift; 3971 my $class = shift;
3772 3972
3773 my $self = $class->SUPER::new ( 3973 my $self = $class->SUPER::new (
3774 buttonbar => (new CFPlus::UI::Buttonbar), 3974 buttonbar => (new CFPlus::UI::Buttonbar),
3775 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3975 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3976 active_outline => [1, 1, 0],
3776 # filter => # will be put between multiplexer and $self 3977 # filter => # will be put between multiplexer and $self
3777 @_, 3978 @_,
3778 ); 3979 );
3779 3980
3780 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3981 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3781 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3982 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3782 3983
3984 {
3985 Scalar::Util::weaken (my $wself = $self);
3986
3987 $self->{multiplexer}->connect (c_add => sub {
3988 my ($mplex, $widgets) = @_;
3989
3990 for my $child (@$widgets) {
3991 Scalar::Util::weaken $child;
3992 $child->{c_tab_} ||= do {
3993 my $tab =
3994 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3995 ? $child->{c_tab}
3996 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3997
3998 $tab->connect (activate => sub {
3999 $wself->set_current_page ($child);
4000 });
4001
4002 $tab
4003 };
4004
4005 $self->{buttonbar}->add ($child->{c_tab_});
4006 }
4007 });
4008
4009 $self->{multiplexer}->connect (c_remove => sub {
4010 my ($mplex, $widgets) = @_;
4011
4012 for my $child (@$widgets) {
4013 $wself->{buttonbar}->remove ($child->{c_tab_});
4014 }
4015 });
4016 }
4017
3783 $self 4018 $self
3784} 4019}
3785 4020
3786sub add { 4021sub add {
4022 my ($self, @widgets) = @_;
4023
4024 $self->{multiplexer}->add (@widgets)
4025}
4026
4027sub remove {
4028 my ($self, @widgets) = @_;
4029
4030 $self->{multiplexer}->remove (@widgets)
4031}
4032
4033sub pages {
4034 my ($self) = @_;
4035 $self->{multiplexer}->children
4036}
4037
4038sub add_tab {
3787 my ($self, $title, $widget, $tooltip) = @_; 4039 my ($self, $title, $widget, $tooltip) = @_;
3788 4040
3789 CFPlus::weaken $self; 4041 $title = [$title, $tooltip] unless ref $title;
4042 $widget->{c_tab} = $title;
3790 4043
3791 $self->{buttonbar}->add (new CFPlus::UI::Button
3792 markup => $title,
3793 tooltip => $tooltip,
3794 on_activate => sub { $self->set_current_page ($widget) },
3795 );
3796
3797 $self->{multiplexer}->add ($widget); 4044 $self->add ($widget);
3798} 4045}
3799 4046
3800sub get_current_page { 4047sub get_current_page {
3801 my ($self) = @_; 4048 my ($self) = @_;
3802 4049
… …
3806sub set_current_page { 4053sub set_current_page {
3807 my ($self, $page) = @_; 4054 my ($self, $page) = @_;
3808 4055
3809 $self->{multiplexer}->set_current_page ($page); 4056 $self->{multiplexer}->set_current_page ($page);
3810 $self->emit (page_changed => $self->{multiplexer}{current}); 4057 $self->emit (page_changed => $self->{multiplexer}{current});
4058}
4059
4060sub _draw {
4061 my ($self) = @_;
4062
4063 $self->SUPER::_draw ();
4064
4065 if (my $cur = $self->{multiplexer}{current}) {
4066 if ($cur = $cur->{c_tab_}) {
4067 glTranslate $cur->{x}, $cur->{y};
4068 glLineWidth 3;
4069 glColor @{$self->{active_outline}};
4070 glRect_lineloop 1, 1, $cur->{w} - 2, $cur->{h} - 2;
4071 glLineWidth 1;
4072 }
4073 }
3811} 4074}
3812 4075
3813############################################################################# 4076#############################################################################
3814 4077
3815package CFPlus::UI::Selector; 4078package CFPlus::UI::Selector;
… …
4085} 4348}
4086 4349
4087sub update { 4350sub update {
4088 my ($self) = @_; 4351 my ($self) = @_;
4089 4352
4090 $::WANT_REFRESH++; 4353 $::WANT_REFRESH->start;
4091} 4354}
4092 4355
4093sub add { 4356sub add {
4094 my ($self, @children) = @_; 4357 my ($self, @children) = @_;
4095 4358
… …
4132 while ($self->{refresh_hook}) { 4395 while ($self->{refresh_hook}) {
4133 $_->() 4396 $_->()
4134 for values %{delete $self->{refresh_hook}}; 4397 for values %{delete $self->{refresh_hook}};
4135 } 4398 }
4136 4399
4137 if ($self->{realloc}) { 4400 while ($self->{realloc}) {
4138 my %queue; 4401 my %queue;
4139 my @queue; 4402 my @queue;
4140 my $widget; 4403 my $widget;
4141 4404
4142 outer: 4405 outer:
… …
4189 } 4452 }
4190 } 4453 }
4191 4454
4192 delete $self->{realloc}{$widget+0}; 4455 delete $self->{realloc}{$widget+0};
4193 } 4456 }
4194 }
4195 4457
4196 while (my $size_alloc = delete $self->{size_alloc}) { 4458 while (my $size_alloc = delete $self->{size_alloc}) {
4197 my @queue = sort { $b->{visible} <=> $a->{visible} } 4459 my @queue = sort { $a->{visible} <=> $b->{visible} }
4198 values %$size_alloc; 4460 values %$size_alloc;
4199 4461
4200 while () { 4462 while () {
4201 my $widget = pop @queue || last; 4463 my $widget = pop @queue || last;
4202 4464
4203 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4465 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4204 4466
4205 $w = 0 if $w < 0;
4206 $h = 0 if $h < 0;
4207
4208 $w = max $widget->{min_w}, $w; 4467 $w = max $widget->{min_w}, $w;
4209 $h = max $widget->{min_h}, $h; 4468 $h = max $widget->{min_h}, $h;
4210 4469
4211# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4470# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4212# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4471# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4213 4472
4214 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4473 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4215 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4474 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4216 4475
4217 $w = int $w + 0.5; 4476 $w = int $w + 0.5;
4218 $h = int $h + 0.5; 4477 $h = int $h + 0.5;
4219 4478
4220 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4479 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4221 $widget->{old_w} = $widget->{w}; 4480 $widget->{old_w} = $widget->{w};
4222 $widget->{old_h} = $widget->{h}; 4481 $widget->{old_h} = $widget->{h};
4223 4482
4224 $widget->{w} = $w; 4483 $widget->{w} = $w;
4225 $widget->{h} = $h; 4484 $widget->{h} = $h;
4226 4485
4227 $widget->emit (size_allocate => $w, $h); 4486 $widget->emit (size_allocate => $w, $h);
4487 }
4228 } 4488 }
4229 } 4489 }
4230 } 4490 }
4231 4491
4232 while ($self->{post_alloc_hook}) { 4492 while ($self->{post_alloc_hook}) {

Diff Legend

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