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.392 by root, Sat Jul 21 13:37:09 2007 UTC vs.
Revision 1.442 by root, Mon Oct 8 17:01:03 2007 UTC

… …
30 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner}; 31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32 32
33 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
34 34
35 my $tip = $widget->{tooltip};
36
37 $tip = $tip->($widget) if CODE:: eq ref $tip;
38
39 $TOOLTIP->set_tooltip_from ($widget); 35 $TOOLTIP->set_tooltip_from ($widget);
40 $TOOLTIP->show; 36 $TOOLTIP->show;
41 } 37 }
42 38
43 return; 39 return;
… …
273 $self->emit ("destroy"); 269 $self->emit ("destroy");
274 %$self = (); 270 %$self = ();
275} 271}
276 272
277sub TO_JSON { 273sub TO_JSON {
278 { __widget_ref__ => $_[0]{s_id} } 274 { "\fw" => $_[0]{s_id} }
279} 275}
280 276
281sub show { 277sub show {
282 my ($self) = @_; 278 my ($self) = @_;
283 279
… …
362 358
363 $self->{force_w} = $w; 359 $self->{force_w} = $w;
364 $self->{force_h} = $h; 360 $self->{force_h} = $h;
365 361
366 $self->realloc; 362 $self->realloc;
363}
364
365# traverse the widget chain up to find the maximum "physical" size constraints
366sub get_max_wh {
367 my ($self) = @_;
368
369 return $self->{parent}->get_max_wh
370 if $self->{parent};
371
372 ($::WIDTH, $::HEIGHT)
367} 373}
368 374
369sub size_request { 375sub size_request {
370 require Carp; 376 require Carp;
371 Carp::confess "size_request is abstract"; 377 Carp::confess "size_request is abstract";
… …
593 599
594# using global variables seems a bit hacky, but passing through all drawing 600# using global variables seems a bit hacky, but passing through all drawing
595# functions seems pointless. 601# functions seems pointless.
596our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 602our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
597 603
598sub draw { 604#sub draw {
599 my ($self) = @_; 605#CFPlus.xs
600
601 return unless $self->{h} && $self->{w};
602
603 # update screen rectangle
604 local $draw_x = $draw_x + $self->{x};
605 local $draw_y = $draw_y + $self->{y};
606
607 # skip widgets that are entirely outside the drawing area
608 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
609 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
610
611 glPushMatrix;
612 glTranslate $self->{x}, $self->{y}, 0;
613
614 if ($self == $HOVER && $self->{can_hover}) {
615 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
616 glEnable GL_BLEND;
617 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
618 glBegin GL_QUADS;
619 glVertex 0 , 0;
620 glVertex $self->{w}, 0;
621 glVertex $self->{w}, $self->{h};
622 glVertex 0 , $self->{h};
623 glEnd;
624 glDisable GL_BLEND;
625 }
626
627 if ($ENV{CFPLUS_DEBUG} & 1) {
628 glPushMatrix;
629 glColor 1, 1, 0, 1;
630 glTranslate 0.375, 0.375;
631 glBegin GL_LINE_LOOP;
632 glVertex 0 , 0;
633 glVertex $self->{w} - 1, 0;
634 glVertex $self->{w} - 1, $self->{h} - 1;
635 glVertex 0 , $self->{h} - 1;
636 glEnd;
637 glPopMatrix;
638 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
639 }
640
641 $self->_draw;
642 glPopMatrix;
643}
644 606
645sub _draw { 607sub _draw {
646 my ($self) = @_; 608 my ($self) = @_;
647 609
648 warn "no draw defined for $self\n"; 610 warn "no draw defined for $self\n";
649} 611}
650 612
651my $cntx;#d#
652sub DESTROY { 613sub DESTROY {
653 my ($self) = @_; 614 my ($self) = @_;
654 615
655 return if CFPlus::in_destruct; 616 return if CFPlus::in_destruct;
656 617
618 local $@;
657 eval { $self->destroy }; 619 eval { $self->destroy };
658 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 620 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
659 621
660 delete $WIDGET{$self+0}; 622 delete $WIDGET{$self+0};
661} 623}
… …
669use strict; 631use strict;
670use CFPlus::OpenGL; 632use CFPlus::OpenGL;
671 633
672sub new { 634sub new {
673 my $class = shift; 635 my $class = shift;
674
675 # range [value, low, high, page]
676 636
677 $class->SUPER::new ( 637 $class->SUPER::new (
678 #bg => [0, 0, 0, 0.2], 638 #bg => [0, 0, 0, 0.2],
679 #active_bg => [1, 1, 1, 0.5], 639 #active_bg => [1, 1, 1, 0.5],
680 @_ 640 @_
… …
692 my ($w, $h) = @$self{qw(w h)}; 652 my ($w, $h) = @$self{qw(w h)};
693 653
694 glEnable GL_BLEND; 654 glEnable GL_BLEND;
695 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 655 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
696 glColor_premultiply @$color; 656 glColor_premultiply @$color;
697
698 glBegin GL_QUADS;
699 glVertex 0 , 0;
700 glVertex 0 , $h;
701 glVertex $w, $h; 657 glRect 0, 0, $w, $h;
702 glVertex $w, 0;
703 glEnd;
704
705 glDisable GL_BLEND; 658 glDisable GL_BLEND;
706 } 659 }
707} 660}
708 661
709############################################################################# 662#############################################################################
… …
769 sort { $a->{z} <=> $b->{z} } 722 sort { $a->{z} <=> $b->{z} }
770 @{$self->{children}}, @widgets 723 @{$self->{children}}, @widgets
771 ]; 724 ];
772 725
773 $self->realloc; 726 $self->realloc;
727
728 $self->emit (c_add => \@widgets);
729
730 map $_+0, @widgets
774} 731}
775 732
776sub children { 733sub children {
777 @{ $_[0]{children} } 734 @{ $_[0]{children} }
778} 735}
779 736
780sub remove { 737sub remove {
781 my ($self, $child) = @_; 738 my ($self, @widgets) = @_;
782 739
740 $self->emit (c_remove => \@widgets);
741
742 for my $child (@widgets) {
783 delete $child->{parent}; 743 delete $child->{parent};
784 $child->hide; 744 $child->hide;
785
786 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 745 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
746 }
787 747
788 $self->realloc; 748 $self->realloc;
789} 749}
790 750
791sub clear { 751sub clear {
792 my ($self) = @_; 752 my ($self) = @_;
793 753
794 my $children = delete $self->{children}; 754 my $children = $self->{children};
795 $self->{children} = []; 755 $self->{children} = [];
796 756
797 for (@$children) { 757 for (@$children) {
798 delete $_->{parent}; 758 delete $_->{parent};
799 $_->hide; 759 $_->hide;
… …
819} 779}
820 780
821sub _draw { 781sub _draw {
822 my ($self) = @_; 782 my ($self) = @_;
823 783
824 $_->draw for @{$self->{children}}; 784 $_->draw for $self->visible_children;
825} 785}
826 786
827############################################################################# 787#############################################################################
828 788
829package CFPlus::UI::Bin; 789package CFPlus::UI::Bin;
… …
839} 799}
840 800
841sub add { 801sub add {
842 my ($self, $child) = @_; 802 my ($self, $child) = @_;
843 803
844 $self->SUPER::remove ($_) for @{ $self->{children} }; 804 $self->clear;
845 $self->SUPER::add ($child); 805 $self->SUPER::add ($child);
846} 806}
847 807
848sub remove { 808sub remove {
849 my ($self, $widget) = @_; 809 my ($self, $widget) = @_;
… …
867 827
868 1 828 1
869} 829}
870 830
871############################################################################# 831#############################################################################
872
873# back-buffered drawing area 832# back-buffered drawing area
874 833
875package CFPlus::UI::Window; 834package CFPlus::UI::Window;
876 835
877our @ISA = CFPlus::UI::Bin::; 836our @ISA = CFPlus::UI::Bin::;
… …
991 $self->{view_x} = $x; 950 $self->{view_x} = $x;
992 $self->{view_y} = $y; 951 $self->{view_y} = $y;
993 952
994 $self->emit (changed => $x, $y); 953 $self->emit (changed => $x, $y);
995 $self->update; 954 $self->update;
955 }
956}
957
958sub set_center {
959 my ($self, $x, $y) = @_;
960
961 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
962}
963
964sub make_visible {
965 my ($self, $x, $y, $border) = @_;
966
967 if ( $x < $self->{view_x} + $self->{w} * $border
968 || $x > $self->{view_x} + $self->{w} * (1 - $border)
969 || $y < $self->{view_y} + $self->{h} * $border
970 || $y > $self->{view_y} + $self->{h} * (1 - $border)
971 ) {
972 $self->set_center ($x, $y);
996 } 973 }
997} 974}
998 975
999# hmm, this does not work for topleft of $self... but we should not ask for that 976# hmm, this does not work for topleft of $self... but we should not ask for that
1000sub coord2local { 977sub coord2local {
… …
1047 my $child = delete $arg{child}; 1024 my $child = delete $arg{child};
1048 1025
1049 my $self; 1026 my $self;
1050 1027
1051 my $hslider = new CFPlus::UI::Slider 1028 my $hslider = new CFPlus::UI::Slider
1052 col => 0, 1029 c_col => 0,
1053 row => 1, 1030 c_row => 1,
1054 vertical => 0, 1031 vertical => 0,
1055 range => [0, 0, 1, 0.01], # HACK fix 1032 range => [0, 0, 1, 0.01], # HACK fix
1056 on_changed => sub { 1033 on_changed => sub {
1057 $self->{hpos} = $_[1]; 1034 $self->{hpos} = $_[1];
1058 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1035 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1059 }, 1036 },
1060 ; 1037 ;
1061 1038
1062 my $vslider = new CFPlus::UI::Slider 1039 my $vslider = new CFPlus::UI::Slider
1063 col => 1, 1040 c_col => 1,
1064 row => 0, 1041 c_row => 0,
1065 vertical => 1, 1042 vertical => 1,
1066 range => [0, 0, 1, 0.01], # HACK fix 1043 range => [0, 0, 1, 0.01], # HACK fix
1067 on_changed => sub { 1044 on_changed => sub {
1068 $self->{vpos} = $_[1]; 1045 $self->{vpos} = $_[1];
1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1046 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1080 row_expand => [1, 0], 1057 row_expand => [1, 0],
1081 %arg, 1058 %arg,
1082 ); 1059 );
1083 1060
1084 $self->{vp} = new CFPlus::UI::ViewPort 1061 $self->{vp} = new CFPlus::UI::ViewPort
1085 col => 0, 1062 c_col => 0,
1086 row => 0, 1063 c_row => 0,
1087 expand => 1, 1064 expand => 1,
1088 scroll_x => $self->{scroll_x}, 1065 scroll_x => $self->{scroll_x},
1089 scroll_y => $self->{scroll_y}, 1066 scroll_y => $self->{scroll_y},
1090 on_changed => sub { 1067 on_changed => sub {
1091 my ($vp, $x, $y) = @_; 1068 my ($vp, $x, $y) = @_;
… …
1093 $vp->{parent}{hslider}->set_value ($x); 1070 $vp->{parent}{hslider}->set_value ($x);
1094 $vp->{parent}{vslider}->set_value ($y); 1071 $vp->{parent}{vslider}->set_value ($y);
1095 1072
1096 0 1073 0
1097 }, 1074 },
1075 on_size_allocate => sub {
1076 my ($vp, $w, $h) = @_;
1077 $vp->{parent}->update_slider;
1078 0
1079 },
1098 ; 1080 ;
1099 1081
1100 $self->SUPER::add ($self->{vp}); 1082 $self->SUPER::add ($self->{vp});
1101 1083
1102 $self->add ($child) if $child; 1084 $self->add ($child) if $child;
1103 1085
1104 $self 1086 $self
1105} 1087}
1106
1107#TODO# update range on size_allocate depending on child?
1108 1088
1109sub add { 1089sub add {
1110 my ($self, $widget) = @_; 1090 my ($self, $widget) = @_;
1111 1091
1112 $self->{vp}->add ($self->{child} = $widget); 1092 $self->{vp}->add ($self->{child} = $widget);
1113} 1093}
1114 1094
1095sub set_offset { shift->{vp}->set_offset (@_) }
1096sub set_center { shift->{vp}->set_center (@_) }
1097sub make_visible { shift->{vp}->make_visible (@_) }
1098
1115sub update_slider { 1099sub update_slider {
1116 my ($self) = @_; 1100 my ($self) = @_;
1117 1101
1118 my $child = ($self->{vp} or return)->child; 1102 my $child = ($self->{vp} or return)->child;
1119 1103
1104 if ($self->{scroll_x}) {
1120 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1105 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1121 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); 1106 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1122 1107
1123 my $visible = $w1 > $w2; 1108 my $visible = $w1 > $w2;
1124 if ($visible != $self->{hslider}{visible}) { 1109 if ($visible != $self->{hslider_visible}) {
1110 $self->{hslider_visible} = $visible;
1125 $visible ? $self->SUPER::add ($self->{hslider}) 1111 $visible ? $self->SUPER::add ($self->{hslider})
1126 : $self->SUPER::remove ($self->{hslider}); 1112 : $self->SUPER::remove ($self->{hslider});
1113 }
1127 } 1114 }
1128 1115
1116 if ($self->{scroll_y}) {
1129 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1117 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1130 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); 1118 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1131 1119
1132 my $visible = $h1 > $h2; 1120 my $visible = $h1 > $h2;
1133 if ($visible != $self->{vslider}{visible}) { 1121 if ($visible != $self->{vslider_visible}) {
1122 $self->{vslider_visible} = $visible;
1134 $visible ? $self->SUPER::add ($self->{vslider}) 1123 $visible ? $self->SUPER::add ($self->{vslider})
1135 : $self->SUPER::remove ($self->{vslider}); 1124 : $self->SUPER::remove ($self->{vslider});
1125 }
1126 }
1127}
1128
1129sub start_dragging {
1130 my ($self, $ev) = @_;
1131
1132 $self->grab_focus;
1133
1134 my $ox = $self->{vp}{view_x};
1135 my $oy = $self->{vp}{view_y};
1136
1137 $self->{motion} = sub {
1138 my ($ev, $x, $y) = @_;
1139
1140 $ox -= $ev->{xrel};
1141 $oy -= $ev->{yrel};
1142
1143 $self->{vp}->set_offset ($ox, $oy);
1136 } 1144 };
1137}
1138
1139sub update {
1140 my ($self) = @_;
1141
1142 $self->update_slider;
1143 $self->SUPER::update;
1144} 1145}
1145 1146
1146sub invoke_mouse_wheel { 1147sub invoke_mouse_wheel {
1147 my ($self, $ev) = @_; 1148 my ($self, $ev) = @_;
1148 1149
1149 $self->{vslider}->emit (mouse_wheel => $ev) 1150 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1150 if $ev->{dy};
1151
1152 $self->{hslider}->emit (mouse_wheel => $ev) 1151 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1153 if $ev->{dx};
1154 1152
1155 1 1153 1
1156} 1154}
1157 1155
1158sub invoke_button_down { 1156sub invoke_button_down {
1159 my ($self, $ev, $x, $y) = @_; 1157 my ($self, $ev, $x, $y) = @_;
1160 1158
1161 if ($ev->{button} == 2) { 1159 if ($ev->{button} == 2) {
1162 $self->grab_focus; 1160 $self->start_dragging ($ev);
1163
1164 my $ox = $self->{vp}{view_x} + $ev->{x};
1165 my $oy = $self->{vp}{view_y} + $ev->{y};
1166
1167 $self->{motion} = sub {
1168 my ($ev, $x, $y) = @_;
1169
1170 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1171 $self->update;
1172 };
1173
1174 return 1; 1161 return 1;
1175 } 1162 }
1176 1163
1177 0 1164 0
1178} 1165}
… …
1229 my ($w, $h) = @$self{qw(w h)}; 1216 my ($w, $h) = @$self{qw(w h)};
1230 1217
1231 glEnable GL_BLEND; 1218 glEnable GL_BLEND;
1232 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1219 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1233 glColor_premultiply @{ $self->{bg} }; 1220 glColor_premultiply @{ $self->{bg} };
1234
1235 glBegin GL_QUADS;
1236 glVertex 0 , 0;
1237 glVertex 0 , $h;
1238 glVertex $w, $h; 1221 glRect 0, 0, $w, $h;
1239 glVertex $w, 0;
1240 glEnd;
1241
1242 glDisable GL_BLEND; 1222 glDisable GL_BLEND;
1243 } 1223 }
1244 1224
1245 $self->SUPER::_draw; 1225 $self->SUPER::_draw;
1246} 1226}
… …
1407 1387
1408sub border { 1388sub border {
1409 int $_[0]{border} * $::FONTSIZE 1389 int $_[0]{border} * $::FONTSIZE
1410} 1390}
1411 1391
1392sub get_max_wh {
1393 my ($self) = @_;
1394
1395 return ($self->{w}, $self->{h})
1396 if $self->{visible} && $self->{w};
1397
1398 $self->SUPER::get_max_wh
1399}
1400
1412sub size_request { 1401sub size_request {
1413 my ($self) = @_; 1402 my ($self) = @_;
1414 1403
1415 $self->{title_widget}->size_request 1404 $self->{title_widget}->size_request
1416 if $self->{title_widget}; 1405 if $self->{title_widget};
… …
1608 1597
1609sub add { 1598sub add {
1610 my ($self, @widgets) = @_; 1599 my ($self, @widgets) = @_;
1611 1600
1612 for my $child (@widgets) { 1601 for my $child (@widgets) {
1613 $child->{rowspan} ||= 1; 1602 $child->{c_rowspan} ||= 1;
1614 $child->{colspan} ||= 1; 1603 $child->{c_colspan} ||= 1;
1615 } 1604 }
1616 1605
1617 $self->SUPER::add (@widgets); 1606 $self->SUPER::add (@widgets);
1618} 1607}
1619 1608
… …
1623 my @widgets; 1612 my @widgets;
1624 1613
1625 while (@_) { 1614 while (@_) {
1626 my ($col, $row, $child) = splice @_, 0, 3, (); 1615 my ($col, $row, $child) = splice @_, 0, 3, ();
1627 1616
1628 $child->{row} = $row; 1617 $child->{c_row} = $row;
1629 $child->{col} = $col; 1618 $child->{c_col} = $col;
1630 1619
1631 push @widgets, $child; 1620 push @widgets, $child;
1632 } 1621 }
1633 1622
1634 $self->add (@widgets); 1623 $self->add (@widgets);
… …
1640 my (@w, @h); 1629 my (@w, @h);
1641 1630
1642 my @children = $self->children; 1631 my @children = $self->children;
1643 1632
1644 # first pass, columns 1633 # first pass, columns
1645 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) { 1634 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1646 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; 1635 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1647 1636
1648 my $sw = sum @w[$c .. $c + $cs - 1]; 1637 my $sw = sum @w[$c .. $c + $cs - 1];
1649 1638
1650 if ($w > $sw) { 1639 if ($w > $sw) {
1651 $_ += ($w - $sw) / $cs for @w[$c .. $c + $cs - 1]; 1640 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1652 } 1641 }
1653 } 1642 }
1654 1643
1655 # second pass, rows 1644 # second pass, rows
1656 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { 1645 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1657 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; 1646 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1658 1647
1659 my $sh = sum @h[$r .. $r + $rs - 1]; 1648 my $sh = sum @h[$r .. $r + $rs - 1];
1660 1649
1661 if ($h > $sh) { 1650 if ($h > $sh) {
1662 $_ += ($h - $sh) / $rs for @h[$r .. $r + $rs - 1]; 1651 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1663 } 1652 }
1664 } 1653 }
1665 1654
1666 (\@w, \@h) 1655 (\@w, \@h)
1667} 1656}
… …
1704 1693
1705 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } 1694 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1706 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } 1695 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1707 1696
1708 for my $widget ($self->children) { 1697 for my $widget ($self->children) {
1709 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)}; 1698 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1710 1699
1711 $widget->configure ( 1700 $widget->configure (
1712 $x[$c], $y[$r], 1701 $x[$c], $y[$r],
1713 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r], 1702 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1714 ); 1703 );
… …
1723 1712
1724use List::Util qw(min max); 1713use List::Util qw(min max);
1725 1714
1726our @ISA = CFPlus::UI::Container::; 1715our @ISA = CFPlus::UI::Container::;
1727 1716
1728sub add {
1729 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1730
1731 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1732 $self->SUPER::add ($child);
1733}
1734
1735sub _scale($$$) { 1717sub _scale($$$) {
1736 my ($mode, $val, $max) = @_; 1718 my ($rel, $val, $max) = @_;
1737 1719
1738 $mode eq "abs" ? $val 1720 $rel ? $val * $max : $val
1739 : $mode eq "rel" ? $val * $max
1740 : 0
1741} 1721}
1742 1722
1743sub size_request { 1723sub size_request {
1744 my ($self) = @_; 1724 my ($self) = @_;
1745 1725
1746 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1726 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1747 1727
1748 # determine overall size by querying abs widgets 1728 # determine overall size by querying abs widgets
1749 for my $child ($self->visible_children) { 1729 for my $child ($self->visible_children) {
1750 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1730 unless ($child->{c_rel}) {
1731 my $x = $child->{c_x};
1732 my $y = $child->{c_y};
1751 1733
1752 if ($pos eq "abs") {
1753 $w = _scale $size, $w, $child->{req_w};
1754 $h = _scale $size, $h, $child->{req_h};
1755
1756 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1734 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1757 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1735 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1758 } 1736 }
1759 } 1737 }
1760 1738
1761 my $W = $x2 - $x1; 1739 my $W = $x2 - $x1;
1762 my $H = $y2 - $y1; 1740 my $H = $y2 - $y1;
1763 1741
1764 # now layout remaining widgets 1742 # now layout remaining widgets
1765 for my $child ($self->visible_children) { 1743 for my $child ($self->visible_children) {
1766 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1744 if ($child->{c_rel}) {
1745 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1746 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1767 1747
1768 if ($pos ne "abs") {
1769 $x = _scale $pos, $x, $W;
1770 $y = _scale $pos, $x, $H;
1771 $w = _scale $size, $w, $child->{req_w};
1772 $h = _scale $size, $h, $child->{req_h};
1773
1774 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1748 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1775 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1749 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1776 } 1750 }
1777 } 1751 }
1778 1752
1779 my $W = $x2 - $x1; 1753 my $W = $x2 - $x1;
1780 my $H = $y2 - $y1; 1754 my $H = $y2 - $y1;
… …
1784 1758
1785sub invoke_size_allocate { 1759sub invoke_size_allocate {
1786 my ($self, $W, $H) = @_; 1760 my ($self, $W, $H) = @_;
1787 1761
1788 for my $child ($self->visible_children) { 1762 for my $child ($self->visible_children) {
1789 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1763 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1764 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1790 1765
1791 $x = _scale $pos, $x, $W; 1766 $x += $child->{c_halign} * $child->{req_w};
1792 $y = _scale $pos, $x, $H; 1767 $y += $child->{c_valign} * $child->{req_h};
1793 $w = _scale $size, $w, $child->{req_w};
1794 $h = _scale $size, $h, $child->{req_h};
1795 1768
1796 $child->configure ($x, $y, $w, $h); 1769 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1797 } 1770 }
1798 1771
1799 1 1772 1
1800} 1773}
1801 1774
… …
1805 1778
1806our @ISA = CFPlus::UI::Container::; 1779our @ISA = CFPlus::UI::Container::;
1807 1780
1808sub size_request { 1781sub size_request {
1809 my ($self) = @_; 1782 my ($self) = @_;
1783
1784 my @children = $self->visible_children;
1810 1785
1811 $self->{vertical} 1786 $self->{vertical}
1812 ? ( 1787 ? (
1813 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1788 (List::Util::max map $_->{req_w}, @children),
1814 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1789 (List::Util::sum map $_->{req_h}, @children),
1815 ) 1790 )
1816 : ( 1791 : (
1817 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1792 (List::Util::sum map $_->{req_w}, @children),
1818 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1793 (List::Util::max map $_->{req_h}, @children),
1819 ) 1794 )
1820} 1795}
1821 1796
1822sub invoke_size_allocate { 1797sub invoke_size_allocate {
1823 my ($self, $w, $h) = @_; 1798 my ($self, $w, $h) = @_;
… …
1947 1922
1948 delete $self->{ox}; 1923 delete $self->{ox};
1949 $self->SUPER::realloc; 1924 $self->SUPER::realloc;
1950} 1925}
1951 1926
1927sub clear {
1928 my ($self) = @_;
1929
1930 $self->set_text ("");
1931}
1932
1952sub set_text { 1933sub set_text {
1953 my ($self, $text) = @_; 1934 my ($self, $text) = @_;
1954 1935
1955 return if $self->{text} eq "T$text"; 1936 return if $self->{text} eq "T$text";
1956 $self->{text} = "T$text"; 1937 $self->{text} = "T$text";
… …
1979 1960
1980sub size_request { 1961sub size_request {
1981 my ($self) = @_; 1962 my ($self) = @_;
1982 1963
1983 $self->{size_req} ||= do { 1964 $self->{size_req} ||= do {
1965 my ($max_w, $max_h) = $self->get_max_wh;
1966
1984 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1967 $self->{layout}->set_font ($self->{font}) if $self->{font};
1985 $self->{layout}->set_width ($self->{max_w} || -1); 1968 $self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1986 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1969 $self->{layout}->set_ellipsise ($self->{ellipsise});
1987 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1970 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1988 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1971 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1989 1972
1990 my ($w, $h) = $self->{layout}->size; 1973 my ($w, $h) = $self->{layout}->size;
… …
2062 : ($self->{w} - $size->[0]) * 0.5); 2045 : ($self->{w} - $size->[0]) * 0.5);
2063 2046
2064 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2047 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2065 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2048 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2066 : ($self->{h} - $size->[1]) * 0.5); 2049 : ($self->{h} - $size->[1]) * 0.5);
2050
2051 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2067 }; 2052 };
2068 2053
2069 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2054# unless ($self->{list}) {
2070 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2055# $self->{list} = CFPlus::OpenGL::glGenList;
2071 2056# CFPlus::OpenGL::glNewList $self->{list};
2072 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2057# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2058# CFPlus::OpenGL::glEndList;
2059# }
2060#
2061# CFPlus::OpenGL::glCallList $self->{list};
2062
2063 $self->{layout}->draw;
2073} 2064}
2065
2066#sub destroy {
2067# my ($self) = @_;
2068#
2069# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2070#
2071# $self->SUPER::destroy;
2072#}
2074 2073
2075############################################################################# 2074#############################################################################
2076 2075
2077package CFPlus::UI::EntryBase; 2076package CFPlus::UI::EntryBase;
2078 2077
… …
2084 my $class = shift; 2083 my $class = shift;
2085 2084
2086 $class->SUPER::new ( 2085 $class->SUPER::new (
2087 fg => [1, 1, 1], 2086 fg => [1, 1, 1],
2088 bg => [0, 0, 0, 0.2], 2087 bg => [0, 0, 0, 0.2],
2088 outline => [0.6, 0.3, 0.1],
2089 active_bg => [1, 1, 1, 0.5], 2089 active_bg => [0, 0, 1, .2],
2090 active_fg => [0, 0, 0], 2090 active_fg => [1, 1, 1],
2091 active_outline => [1, 1, 0],
2091 can_hover => 1, 2092 can_hover => 1,
2092 can_focus => 1, 2093 can_focus => 1,
2093 valign => 0, 2094 valign => 0,
2094 can_events => 1, 2095 can_events => 1,
2095 ellipsise => 0, 2096 ellipsise => 0,
… …
2235 glColor_premultiply @{$self->{bg}}; 2236 glColor_premultiply @{$self->{bg}};
2236 } 2237 }
2237 2238
2238 glEnable GL_BLEND; 2239 glEnable GL_BLEND;
2239 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2240 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2240 glBegin GL_QUADS;
2241 glVertex 0 , 0;
2242 glVertex 0 , $self->{h};
2243 glVertex $self->{w}, $self->{h}; 2241 glRect 0, 0, $self->{w}, $self->{h};
2244 glVertex $self->{w}, 0;
2245 glEnd;
2246 glDisable GL_BLEND; 2242 glDisable GL_BLEND;
2247 2243
2248 $self->SUPER::_draw; 2244 $self->SUPER::_draw;
2249 2245
2250 #TODO: force update every cursor change :( 2246 #TODO: force update every cursor change :(
… …
2252 2248
2253 unless (exists $self->{cur_h}) { 2249 unless (exists $self->{cur_h}) {
2254 my $text = substr $self->{text}, 0, $self->{cursor}; 2250 my $text = substr $self->{text}, 0, $self->{cursor};
2255 utf8::encode $text; 2251 utf8::encode $text;
2256 2252
2257 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2253 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2258 } 2254 }
2259 2255
2256 glColor_premultiply @{$self->{active_fg}};
2260 glBegin GL_LINES; 2257 glBegin GL_LINES;
2261 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2258 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2262 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2259 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2260 glEnd;
2261
2262 glLineWidth 3;
2263 glColor @{$self->{active_outline}};
2264 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2265 glLineWidth 1;
2266
2267 } else {
2268 glColor @{$self->{outline}};
2269 glBegin GL_LINE_STRIP;
2270 glVertex .5, $self->{h} * .5;
2271 glVertex .5, $self->{h} - 2.5;
2272 glVertex $self->{w} - .5, $self->{h} - 2.5;
2273 glVertex $self->{w} - .5, $self->{h} * .5;
2263 glEnd; 2274 glEnd;
2264 } 2275 }
2265} 2276}
2266 2277
2267############################################################################# 2278#############################################################################
… …
2354 1 2365 1
2355} 2366}
2356 2367
2357############################################################################# 2368#############################################################################
2358 2369
2370package CFPlus::UI::ButtonBin;
2371
2372our @ISA = CFPlus::UI::Bin::;
2373
2374use CFPlus::OpenGL;
2375
2376my @tex =
2377 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2378 qw(b1_button_inactive.png b1_button_active.png);
2379
2380sub new {
2381 my $class = shift;
2382
2383 $class->SUPER::new (
2384 can_hover => 1,
2385 align => 0,
2386 valign => 0,
2387 can_events => 1,
2388 @_
2389 )
2390}
2391
2392sub invoke_button_up {
2393 my ($self, $ev, $x, $y) = @_;
2394
2395 $self->emit ("activate")
2396 if $x >= 0 && $x < $self->{w}
2397 && $y >= 0 && $y < $self->{h};
2398
2399 1
2400}
2401
2402sub _draw {
2403 my ($self) = @_;
2404
2405 glEnable GL_TEXTURE_2D;
2406 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2407 glColor 0, 0, 0, 1;
2408
2409 my $tex = $tex[$GRAB == $self];
2410 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2411
2412 glDisable GL_TEXTURE_2D;
2413
2414 $self->SUPER::_draw;
2415}
2416
2417#############################################################################
2418
2359package CFPlus::UI::Button; 2419package CFPlus::UI::Button;
2360 2420
2361our @ISA = CFPlus::UI::Label::; 2421our @ISA = CFPlus::UI::Label::;
2362 2422
2363use CFPlus::OpenGL; 2423use CFPlus::OpenGL;
… …
2467sub _draw { 2527sub _draw {
2468 my ($self) = @_; 2528 my ($self) = @_;
2469 2529
2470 $self->SUPER::_draw; 2530 $self->SUPER::_draw;
2471 2531
2472 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2532 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2473 2533
2474 my ($w, $h) = @$self{qw(w h)}; 2534 my ($w, $h) = @$self{qw(w h)};
2475 2535
2476 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2536 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2477 2537
… …
2497sub new { 2557sub new {
2498 my $class = shift; 2558 my $class = shift;
2499 2559
2500 my $self = $class->SUPER::new ( 2560 my $self = $class->SUPER::new (
2501 can_events => 0, 2561 can_events => 0,
2562 scale => 1,
2502 @_, 2563 @_,
2503 ); 2564 );
2504 2565
2505 $self->{path} || $self->{tex} 2566 $self->{path} || $self->{tex}
2506 or Carp::croak "'path' or 'tex' attributes required"; 2567 or Carp::croak "'path' or 'tex' attributes required";
… …
2531} 2592}
2532 2593
2533sub size_request { 2594sub size_request {
2534 my ($self) = @_; 2595 my ($self) = @_;
2535 2596
2536 ($self->{tex}{w}, $self->{tex}{h}) 2597 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2537} 2598}
2538 2599
2539sub _draw { 2600sub _draw {
2540 my ($self) = @_; 2601 my ($self) = @_;
2541 2602
… …
2551 } 2612 }
2552 2613
2553 glEnable GL_TEXTURE_2D; 2614 glEnable GL_TEXTURE_2D;
2554 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2615 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2555 2616
2556 $tex->draw_quad (0, 0, $w, $h); 2617 $tex->draw_quad_alpha (0, 0, $w, $h);
2557 2618
2558 glDisable GL_TEXTURE_2D; 2619 glDisable GL_TEXTURE_2D;
2559} 2620}
2560 2621
2561############################################################################# 2622#############################################################################
… …
2580 align => 0, 2641 align => 0,
2581 valign => 0, 2642 valign => 0,
2582 can_events => 1, 2643 can_events => 1,
2583 @_ 2644 @_
2584 ); 2645 );
2646}
2647
2648sub invoke_button_down {
2649 my ($self, $ev, $x, $y) = @_;
2650
2651 1
2585} 2652}
2586 2653
2587sub invoke_button_up { 2654sub invoke_button_up {
2588 my ($self, $ev, $x, $y) = @_; 2655 my ($self, $ev, $x, $y) = @_;
2589 2656
… …
2729 glDisable GL_TEXTURE_2D; 2796 glDisable GL_TEXTURE_2D;
2730} 2797}
2731 2798
2732############################################################################# 2799#############################################################################
2733 2800
2801package CFPlus::UI::Progress;
2802
2803our @ISA = CFPlus::UI::Label::;
2804
2805use CFPlus::OpenGL;
2806
2807sub new {
2808 my ($class, %arg) = @_;
2809
2810 my $self = $class->SUPER::new (
2811 fg => [1, 1, 1],
2812 bg => [0, 0, 1, 0.2],
2813 bar => [0.7, 0.5, 0.1, 0.8],
2814 outline => [0.4, 0.3, 0],
2815 fontsize => 0.9,
2816 valign => 0,
2817 align => 0,
2818 can_events => 1,
2819 ellipsise => 1,
2820 label => "%d%%",
2821 %arg,
2822 );
2823
2824 $self->set_value ($arg{value} || -1);
2825
2826 $self
2827}
2828
2829sub set_label {
2830 my ($self, $label) = @_;
2831
2832 return if $self->{label} eq $label;
2833 $self->{label} = $label;
2834
2835 $self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
2836}
2837
2838sub set_value {
2839 my ($self, $value) = @_;
2840
2841 if ($self->{value} ne $value) {
2842 $self->{value} = $value;
2843
2844 if ($value < 0) {
2845 $self->set_text ("-");
2846 } else {
2847 $self->set_text (sprintf $self->{label}, $value * 100);
2848 }
2849
2850 $self->update;
2851 }
2852}
2853
2854sub _draw {
2855 my ($self) = @_;
2856
2857 glEnable GL_BLEND;
2858 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2859
2860 if ($self->{value} >= 0) {
2861 my $s = int 2 + ($self->{w} - 4) * $self->{value};
2862
2863 glColor_premultiply @{$self->{bar}};
2864 glRect 2, 2, $s, $self->{h} - 2;
2865 glColor_premultiply @{$self->{bg}};
2866 glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
2867 }
2868
2869 glColor_premultiply @{$self->{outline}};
2870 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2871
2872 glDisable GL_BLEND;
2873
2874 {
2875 local $self->{bg}; # do not draw background
2876 $self->SUPER::_draw;
2877 }
2878}
2879
2880#############################################################################
2881
2882package CFPlus::UI::ExperienceProgress;
2883
2884our @ISA = CFPlus::UI::Progress::;
2885
2886sub new {
2887 my ($class, %arg) = @_;
2888
2889 my $self = $class->SUPER::new (
2890 tooltip => sub {
2891 my ($self) = @_;
2892
2893 sprintf "level %d\n%s points\n%s next level\n%s to go",
2894 $self->{lvl},
2895 ::formsep ($self->{exp}),
2896 ::formsep ($self->{nxt}),
2897 ::formsep ($self->{nxt} - $self->{exp}),
2898 },
2899 %arg
2900 );
2901
2902 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2903 if $::CONN;
2904
2905 $self
2906}
2907
2908sub DESTROY {
2909 my ($self) = @_;
2910
2911 delete $::CONN->{on_exp_update}{$self+0}
2912 if $::CONN;
2913
2914 $self->SUPER::DESTROY;
2915}
2916
2917sub set_value {
2918 my ($self, $lvl, $exp) = @_;
2919
2920 $self->{lvl} = $lvl;
2921 $self->{exp} = $exp;
2922
2923 my $v = -1;
2924
2925 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2926 my $l0 = $table->[$lvl - 1];
2927 my $l1 = $table->[$lvl];
2928
2929 $self->{nxt} = $l1;
2930
2931 $v = ($exp - $l0) / ($l1 - $l0);
2932 }
2933
2934 $self->SUPER::set_value ($v);
2935}
2936
2937#############################################################################
2938
2734package CFPlus::UI::Gauge; 2939package CFPlus::UI::Gauge;
2735 2940
2736our @ISA = CFPlus::UI::VBox::; 2941our @ISA = CFPlus::UI::VBox::;
2737 2942
2738sub new { 2943sub new {
… …
2863 3068
2864 $self->SUPER::invoke_button_down ($ev, $x, $y); 3069 $self->SUPER::invoke_button_down ($ev, $x, $y);
2865 3070
2866 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3071 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2867 3072
2868 $self->invoke_mouse_motion ($ev, $x, $y) 3073 $self->invoke_mouse_motion ($ev, $x, $y);
3074
3075 1
2869} 3076}
2870 3077
2871sub invoke_mouse_motion { 3078sub invoke_mouse_motion {
2872 my ($self, $ev, $x, $y) = @_; 3079 my ($self, $ev, $x, $y) = @_;
2873 3080
… …
2893 3100
2894 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3101 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2895 3102
2896 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3103 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2897 3104
2898 ! ! $delta 3105 1
2899} 3106}
2900 3107
2901sub update { 3108sub update {
2902 my ($self) = @_; 3109 my ($self) = @_;
2903 3110
… …
3034} 3241}
3035 3242
3036sub size_request { 3243sub size_request {
3037 my ($self) = @_; 3244 my ($self) = @_;
3038 3245
3039 my ($empty, $slider) = @{ $self->{children} }; 3246 my ($empty, $slider) = $self->visible_children;
3040 3247
3041 local $self->{children} = [$empty, $slider]; 3248 local $self->{children} = [$empty, $slider];
3042 $self->SUPER::size_request 3249 $self->SUPER::size_request
3043} 3250}
3044 3251
… …
3233 3440
3234 if ($y0 < $y + $h && $y < $y1) { 3441 if ($y0 < $y + $h && $y < $y1) {
3235 my $layout = $self->get_layout ($para); 3442 my $layout = $self->get_layout ($para);
3236 3443
3237 $layout->render ($para->{indent}, $y - $y0); 3444 $layout->render ($para->{indent}, $y - $y0);
3445 $layout->draw;
3238 3446
3239 if (my @w = @{ $para->{widget} }) { 3447 if (my @w = @{ $para->{widget} }) {
3240 my @s = $layout->get_shapes; 3448 my @s = $layout->get_shapes;
3241 3449
3242 for (@w) { 3450 for (@w) {
… …
3364} 3572}
3365 3573
3366sub set_tooltip_from { 3574sub set_tooltip_from {
3367 my ($self, $widget) = @_; 3575 my ($self, $widget) = @_;
3368 3576
3369 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3370 if $widget->{tooltip} =~ /^#(.*)$/;
3371
3372 my $tooltip = $widget->{tooltip}; 3577 my $tip = $widget->{tooltip};
3578 $tip = $tip->($widget) if "CODE" eq ref $tip;
3579
3580 $tip = CFPlus::Pod::section_label tooltip => $1
3581 if $tip =~ /^#(.*)$/;
3373 3582
3374 if ($ENV{CFPLUS_DEBUG} & 2) { 3583 if ($ENV{CFPLUS_DEBUG} & 2) {
3375 $tooltip .= "\n\n" . (ref $widget) . "\n" 3584 $tip .= "\n\n" . (ref $widget) . "\n"
3376 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3585 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3377 . "req $widget->{req_w} $widget->{req_h}\n" 3586 . "req $widget->{req_w} $widget->{req_h}\n"
3378 . "visible $widget->{visible}"; 3587 . "visible $widget->{visible}";
3379 } 3588 }
3380 3589
3381 $tooltip =~ s/^\n+//; 3590 $tip =~ s/^\n+//;
3382 $tooltip =~ s/\n+$//; 3591 $tip =~ s/\n+$//;
3383 3592
3384 $self->add (new CFPlus::UI::Label 3593 $self->add (new CFPlus::UI::Label
3385 markup => $tooltip, 3594 markup => $tip,
3386 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3595 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3387 fontsize => 0.8, 3596 fontsize => 0.8,
3388 style => 1, # FLAG_INVERSE 3597 style => 1, # FLAG_INVERSE
3389 ellipsise => 0, 3598 ellipsise => 0,
3390 font => ($widget->{tooltip_font} || $::FONT_PROP), 3599 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
3428} 3637}
3429 3638
3430sub _draw { 3639sub _draw {
3431 my ($self) = @_; 3640 my ($self) = @_;
3432 3641
3433 glTranslate 0.375, 0.375;
3434
3435 my ($w, $h) = @$self{qw(w h)}; 3642 my ($w, $h) = @$self{qw(w h)};
3436 3643
3437 glColor 1, 0.8, 0.4; 3644 glColor 1, 0.8, 0.4;
3438 glBegin GL_QUADS; 3645 glRect 0, 0, $w, $h;
3439 glVertex 0 , 0;
3440 glVertex 0 , $h;
3441 glVertex $w, $h;
3442 glVertex $w, 0;
3443 glEnd;
3444 3646
3445 glColor 0, 0, 0; 3647 glColor 0, 0, 0;
3446 glBegin GL_LINE_LOOP; 3648 glRect_lineloop .5, .5, $w + .5, $h + .5;
3447 glVertex 0 , 0;
3448 glVertex 0 , $h;
3449 glVertex $w, $h;
3450 glVertex $w, 0;
3451 glEnd;
3452 3649
3453 glTranslate 2 - 0.375, 2 - 0.375; 3650 glTranslate 2, 2;
3454 3651
3455 $self->SUPER::_draw; 3652 $self->SUPER::_draw;
3456} 3653}
3457 3654
3458############################################################################# 3655#############################################################################
… …
3476 3673
3477 if ($self->{anim} && $self->{animspeed}) { 3674 if ($self->{anim} && $self->{animspeed}) {
3478 CFPlus::weaken (my $widget = $self); 3675 CFPlus::weaken (my $widget = $self);
3479 3676
3480 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3677 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3481 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed}; 3678 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3482 $self->{timer} = Event->timer ( 3679 $self->{timer} = Event->timer (
3483 parked => 1, 3680 parked => 1,
3484 cb => sub { 3681 cb => sub {
3485 return unless $::CONN && $widget; 3682 return unless $::CONN;
3486 3683
3684 my $w = $widget
3685 or return;
3686
3487 ++$widget->{frame}; 3687 ++$w->{frame};
3488 $widget->update_face; 3688 $w->update_face;
3689
3690 # somehow, $widget can go away
3489 $widget->update; 3691 $w->update;
3490
3491 $widget->update_timer; 3692 $w->update_timer;
3492 }, 3693 },
3493 ); 3694 );
3494 3695
3495 $self->update_face; 3696 $self->update_face;
3496 $self->update_timer; 3697 $self->update_timer;
… …
3517} 3718}
3518 3719
3519sub update_face { 3720sub update_face {
3520 my ($self) = @_; 3721 my ($self) = @_;
3521 3722
3522 return unless $::CONN;
3523
3524 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3525 if ($anim && @$anim) {
3526 delete $self->{wait_face};
3527 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3528 }
3529 }
3530}
3531
3532sub size_request {
3533 my ($self) = @_;
3534
3535 if ($::CONN) { 3723 if ($::CONN) {
3536 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3724 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3537 if (my $tex = $::CONN->{texture}[$faceid]) { 3725 if ($anim && @$anim) {
3538 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3726 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3539 } else { 3727 delete $self->{face_change_cb};
3540 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3728
3541 $self->realloc; 3729 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3730 unless ($tex->{name} || $tex->{loading}) {
3731 $tex->upload (sub { $self->reconfigure });
3732 }
3542 }); 3733 }
3543 } 3734 }
3544 } 3735 }
3545 } 3736 }
3737}
3738
3739sub size_request {
3740 my ($self) = @_;
3741
3742 if ($::CONN) {
3743 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3744 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3745 if ($tex->{name}) {
3746 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3747 } elsif (!$tex->{loading}) {
3748 $tex->upload (sub { $self->reconfigure });
3749 }
3750 }
3751
3752 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3753 }
3754 }
3546 3755
3547 ($self->{size_w} || 8, $self->{size_h} || 8) 3756 ($self->{size_w} || 8, $self->{size_h} || 8)
3548} 3757}
3549 3758
3550sub update { 3759sub update {
… …
3564} 3773}
3565 3774
3566sub _draw { 3775sub _draw {
3567 my ($self) = @_; 3776 my ($self) = @_;
3568 3777
3569 return unless $::CONN;
3570
3571 $self->SUPER::_draw; 3778 $self->SUPER::_draw;
3572 3779
3573 my $faceid = $::CONN->{faceid}[$self->{face}] 3780 if (my $tex = $self->{tex}) {
3574 or return;
3575
3576 my $tex = $::CONN->{texture}[$faceid];
3577
3578 if ($tex) {
3579 glEnable GL_TEXTURE_2D; 3781 glEnable GL_TEXTURE_2D;
3580 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3782 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3581 glColor 0, 0, 0, 1; 3783 glColor 0, 0, 0, 1;
3582 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3784 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3583 glDisable GL_TEXTURE_2D; 3785 glDisable GL_TEXTURE_2D;
… …
3635 children => [ 3837 children => [
3636 (new CFPlus::UI::Label markup => $left, expand => 1), 3838 (new CFPlus::UI::Label markup => $left, expand => 1),
3637 (new CFPlus::UI::Label markup => $right, align => +1), 3839 (new CFPlus::UI::Label markup => $right, align => +1),
3638 ], 3840 ],
3639 ; 3841 ;
3640 3842
3641 } else { 3843 } else {
3642 $widget = new CFPlus::UI::Label 3844 $widget = new CFPlus::UI::Label
3643 can_hover => 1, 3845 can_hover => 1,
3644 can_events => 1, 3846 can_events => 1,
3645 markup => $widget, 3847 markup => $widget,
… …
3770 3972
3771############################################################################# 3973#############################################################################
3772 3974
3773package CFPlus::UI::Notebook; 3975package CFPlus::UI::Notebook;
3774 3976
3977use CFPlus::OpenGL;
3978
3775our @ISA = CFPlus::UI::VBox::; 3979our @ISA = CFPlus::UI::VBox::;
3776 3980
3777sub new { 3981sub new {
3778 my $class = shift; 3982 my $class = shift;
3779 3983
3780 my $self = $class->SUPER::new ( 3984 my $self = $class->SUPER::new (
3781 buttonbar => (new CFPlus::UI::Buttonbar), 3985 buttonbar => (new CFPlus::UI::Buttonbar),
3782 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3986 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3987 active_outline => [.7, .7, 0.2],
3783 # filter => # will be put between multiplexer and $self 3988 # filter => # will be put between multiplexer and $self
3784 @_, 3989 @_,
3785 ); 3990 );
3786 3991
3787 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3992 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3788 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3993 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3789 3994
3995 {
3996 Scalar::Util::weaken (my $wself = $self);
3997
3998 $self->{multiplexer}->connect (c_add => sub {
3999 my ($mplex, $widgets) = @_;
4000
4001 for my $child (@$widgets) {
4002 Scalar::Util::weaken $child;
4003 $child->{c_tab_} ||= do {
4004 my $tab =
4005 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
4006 ? $child->{c_tab}
4007 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4008
4009 $tab->connect (activate => sub {
4010 $wself->set_current_page ($child);
4011 });
4012
4013 $tab
4014 };
4015
4016 $self->{buttonbar}->add ($child->{c_tab_});
4017 }
4018 });
4019
4020 $self->{multiplexer}->connect (c_remove => sub {
4021 my ($mplex, $widgets) = @_;
4022
4023 for my $child (@$widgets) {
4024 $wself->{buttonbar}->remove ($child->{c_tab_});
4025 }
4026 });
4027 }
4028
3790 $self 4029 $self
3791} 4030}
3792 4031
3793sub add { 4032sub add {
4033 my ($self, @widgets) = @_;
4034
4035 $self->{multiplexer}->add (@widgets)
4036}
4037
4038sub remove {
4039 my ($self, @widgets) = @_;
4040
4041 $self->{multiplexer}->remove (@widgets)
4042}
4043
4044sub pages {
4045 my ($self) = @_;
4046 $self->{multiplexer}->children
4047}
4048
4049sub add_tab {
3794 my ($self, $title, $widget, $tooltip) = @_; 4050 my ($self, $title, $widget, $tooltip) = @_;
3795 4051
3796 CFPlus::weaken $self; 4052 $title = [$title, $tooltip] unless ref $title;
4053 $widget->{c_tab} = $title;
3797 4054
3798 $self->{buttonbar}->add (new CFPlus::UI::Button
3799 markup => $title,
3800 tooltip => $tooltip,
3801 on_activate => sub { $self->set_current_page ($widget) },
3802 );
3803
3804 $self->{multiplexer}->add ($widget); 4055 $self->add ($widget);
3805} 4056}
3806 4057
3807sub get_current_page { 4058sub get_current_page {
3808 my ($self) = @_; 4059 my ($self) = @_;
3809 4060
… …
3813sub set_current_page { 4064sub set_current_page {
3814 my ($self, $page) = @_; 4065 my ($self, $page) = @_;
3815 4066
3816 $self->{multiplexer}->set_current_page ($page); 4067 $self->{multiplexer}->set_current_page ($page);
3817 $self->emit (page_changed => $self->{multiplexer}{current}); 4068 $self->emit (page_changed => $self->{multiplexer}{current});
4069}
4070
4071sub _draw {
4072 my ($self) = @_;
4073
4074 $self->SUPER::_draw ();
4075
4076 if (my $cur = $self->{multiplexer}{current}) {
4077 if ($cur = $cur->{c_tab_}) {
4078 glTranslate $self->{buttonbar}{x} + $cur->{x},
4079 $self->{buttonbar}{y} + $cur->{y};
4080 glLineWidth 3;
4081 #glEnable GL_BLEND;
4082 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4083 glColor @{$self->{active_outline}};
4084 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4085 glLineWidth 1;
4086 #glDisable GL_BLEND;
4087 }
4088 }
3818} 4089}
3819 4090
3820############################################################################# 4091#############################################################################
3821 4092
3822package CFPlus::UI::Selector; 4093package CFPlus::UI::Selector;
… …
3854} 4125}
3855 4126
3856sub _set_value { 4127sub _set_value {
3857 my ($self, $value) = @_; 4128 my ($self, $value) = @_;
3858 4129
3859 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4130 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4131 $item ||= $self->{options}[0]
3860 or return; 4132 or return;
3861 4133
3862 $self->{value} = $item->[0]; 4134 $self->{value} = $item->[0];
3863 $self->set_markup ("$item->[1] ⇓"); 4135 $self->set_markup ("$item->[1] ⇓");
3864 $self->set_tooltip ($item->[2]); 4136# $self->set_tooltip ($item->[2]);
3865} 4137}
3866 4138
3867sub set_value { 4139sub set_value {
3868 my ($self, $value) = @_; 4140 my ($self, $value) = @_;
3869 4141
3870 return unless $self->{value} ne $value; 4142 return unless $self->{value} ne $value;
3871 4143
3872 $self->_set_value ($value); 4144 $self->_set_value ($value);
3873 $self->emit (changed => $value); 4145 $self->emit (changed => $value);
4146}
4147
4148sub set_options {
4149 my ($self, $options) = @_;
4150
4151 $self->{options} = $options;
4152 $self->_set_value ($self->{value});
3874} 4153}
3875 4154
3876############################################################################# 4155#############################################################################
3877 4156
3878package CFPlus::UI::Statusbox; 4157package CFPlus::UI::Statusbox;
… …
4092} 4371}
4093 4372
4094sub update { 4373sub update {
4095 my ($self) = @_; 4374 my ($self) = @_;
4096 4375
4097 $::WANT_REFRESH++; 4376 $::WANT_REFRESH->start;
4098} 4377}
4099 4378
4100sub add { 4379sub add {
4101 my ($self, @children) = @_; 4380 my ($self, @children) = @_;
4102 4381
… …
4139 while ($self->{refresh_hook}) { 4418 while ($self->{refresh_hook}) {
4140 $_->() 4419 $_->()
4141 for values %{delete $self->{refresh_hook}}; 4420 for values %{delete $self->{refresh_hook}};
4142 } 4421 }
4143 4422
4144 if ($self->{realloc}) { 4423 while ($self->{realloc}) {
4145 my %queue; 4424 my %queue;
4146 my @queue; 4425 my @queue;
4147 my $widget; 4426 my $widget;
4148 4427
4149 outer: 4428 outer:
… …
4196 } 4475 }
4197 } 4476 }
4198 4477
4199 delete $self->{realloc}{$widget+0}; 4478 delete $self->{realloc}{$widget+0};
4200 } 4479 }
4201 }
4202 4480
4203 while (my $size_alloc = delete $self->{size_alloc}) { 4481 while (my $size_alloc = delete $self->{size_alloc}) {
4204 my @queue = sort { $b->{visible} <=> $a->{visible} } 4482 my @queue = sort { $a->{visible} <=> $b->{visible} }
4205 values %$size_alloc; 4483 values %$size_alloc;
4206 4484
4207 while () { 4485 while () {
4208 my $widget = pop @queue || last; 4486 my $widget = pop @queue || last;
4209 4487
4210 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4488 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4211 4489
4212 $w = 0 if $w < 0;
4213 $h = 0 if $h < 0;
4214
4215 $w = max $widget->{min_w}, $w; 4490 $w = max $widget->{min_w}, $w;
4216 $h = max $widget->{min_h}, $h; 4491 $h = max $widget->{min_h}, $h;
4217 4492
4218# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4493# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4219# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4494# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4220 4495
4221 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4496 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4222 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4497 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4223 4498
4224 $w = int $w + 0.5; 4499 $w = int $w + 0.5;
4225 $h = int $h + 0.5; 4500 $h = int $h + 0.5;
4226 4501
4227 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4502 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4228 $widget->{old_w} = $widget->{w}; 4503 $widget->{old_w} = $widget->{w};
4229 $widget->{old_h} = $widget->{h}; 4504 $widget->{old_h} = $widget->{h};
4230 4505
4231 $widget->{w} = $w; 4506 $widget->{w} = $w;
4232 $widget->{h} = $h; 4507 $widget->{h} = $h;
4233 4508
4234 $widget->emit (size_allocate => $w, $h); 4509 $widget->emit (size_allocate => $w, $h);
4510 }
4235 } 4511 }
4236 } 4512 }
4237 } 4513 }
4238 4514
4239 while ($self->{post_alloc_hook}) { 4515 while ($self->{post_alloc_hook}) {

Diff Legend

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