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.383 by root, Fri Jul 20 16:32:04 2007 UTC vs.
Revision 1.437 by root, Wed Aug 22 22:36:26 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;
… …
113 } 109 }
114 110
115 if ($GRAB) { 111 if ($GRAB) {
116 if ($ev->{button} == 4 || $ev->{button} == 5) { 112 if ($ev->{button} == 4 || $ev->{button} == 5) {
117 # mousewheel 113 # mousewheel
118 $ev->{dx} = 0;
119 $ev->{dy} = $ev->{button} * 2 - 9; 114 my $delta = $ev->{button} * 2 - 9;
115 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
116
117 $ev->{dx} = $shift ? $delta : 0;
118 $ev->{dy} = $shift ? 0 : $delta;
119
120 $GRAB->emit (mouse_wheel => $ev); 120 $GRAB->emit (mouse_wheel => $ev);
121 } else { 121 } else {
122 $GRAB->emit (button_down => $ev) 122 $GRAB->emit (button_down => $ev)
123 } 123 }
124 } 124 }
… …
269 $self->emit ("destroy"); 269 $self->emit ("destroy");
270 %$self = (); 270 %$self = ();
271} 271}
272 272
273sub TO_JSON { 273sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} } 274 { __w_ => $_[0]{s_id} }
275} 275}
276 276
277sub show { 277sub show {
278 my ($self) = @_; 278 my ($self) = @_;
279 279
… …
547 547
548 # parent 548 # parent
549 $self->{parent} && $self->{parent}->emit ($signal, @args) 549 $self->{parent} && $self->{parent}->emit ($signal, @args)
550} 550}
551 551
552sub find_widget { 552#sub find_widget {
553 my ($self, $x, $y) = @_; 553# in .xs
554
555 return () unless $self->{can_events};
556
557 return $self
558 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
559 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
560
561 ()
562}
563 554
564sub set_parent { 555sub set_parent {
565 my ($self, $parent) = @_; 556 my ($self, $parent) = @_;
566 557
567 CFPlus::weaken ($self->{parent} = $parent); 558 CFPlus::weaken ($self->{parent} = $parent);
… …
598 589
599# 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
600# functions seems pointless. 591# functions seems pointless.
601our ($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
602 593
603sub draw { 594#sub draw {
604 my ($self) = @_; 595#CFPlus.xs
605
606 return unless $self->{h} && $self->{w};
607
608 # update screen rectangle
609 local $draw_x = $draw_x + $self->{x};
610 local $draw_y = $draw_y + $self->{y};
611
612 # skip widgets that are entirely outside the drawing area
613 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
614 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
615
616 glPushMatrix;
617 glTranslate $self->{x}, $self->{y}, 0;
618
619 if ($self == $HOVER && $self->{can_hover}) {
620 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
621 glEnable GL_BLEND;
622 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
623 glBegin GL_QUADS;
624 glVertex 0 , 0;
625 glVertex $self->{w}, 0;
626 glVertex $self->{w}, $self->{h};
627 glVertex 0 , $self->{h};
628 glEnd;
629 glDisable GL_BLEND;
630 }
631
632 if ($ENV{CFPLUS_DEBUG} & 1) {
633 glPushMatrix;
634 glColor 1, 1, 0, 1;
635 glTranslate 0.375, 0.375;
636 glBegin GL_LINE_LOOP;
637 glVertex 0 , 0;
638 glVertex $self->{w} - 1, 0;
639 glVertex $self->{w} - 1, $self->{h} - 1;
640 glVertex 0 , $self->{h} - 1;
641 glEnd;
642 glPopMatrix;
643 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
644 }
645
646 $self->_draw;
647 glPopMatrix;
648}
649 596
650sub _draw { 597sub _draw {
651 my ($self) = @_; 598 my ($self) = @_;
652 599
653 warn "no draw defined for $self\n"; 600 warn "no draw defined for $self\n";
654} 601}
655 602
656my $cntx;#d#
657sub DESTROY { 603sub DESTROY {
658 my ($self) = @_; 604 my ($self) = @_;
659 605
660 return if CFPlus::in_destruct; 606 return if CFPlus::in_destruct;
661 607
608 local $@;
662 eval { $self->destroy }; 609 eval { $self->destroy };
663 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 610 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
664 611
665 delete $WIDGET{$self+0}; 612 delete $WIDGET{$self+0};
666} 613}
… …
674use strict; 621use strict;
675use CFPlus::OpenGL; 622use CFPlus::OpenGL;
676 623
677sub new { 624sub new {
678 my $class = shift; 625 my $class = shift;
679
680 # range [value, low, high, page]
681 626
682 $class->SUPER::new ( 627 $class->SUPER::new (
683 #bg => [0, 0, 0, 0.2], 628 #bg => [0, 0, 0, 0.2],
684 #active_bg => [1, 1, 1, 0.5], 629 #active_bg => [1, 1, 1, 0.5],
685 @_ 630 @_
… …
697 my ($w, $h) = @$self{qw(w h)}; 642 my ($w, $h) = @$self{qw(w h)};
698 643
699 glEnable GL_BLEND; 644 glEnable GL_BLEND;
700 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 645 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
701 glColor_premultiply @$color; 646 glColor_premultiply @$color;
702
703 glBegin GL_QUADS;
704 glVertex 0 , 0;
705 glVertex 0 , $h;
706 glVertex $w, $h; 647 glRect 0, 0, $w, $h;
707 glVertex $w, 0;
708 glEnd;
709
710 glDisable GL_BLEND; 648 glDisable GL_BLEND;
711 } 649 }
712} 650}
713 651
714############################################################################# 652#############################################################################
… …
746 can_events => 0, 684 can_events => 0,
747 %arg, 685 %arg,
748 ); 686 );
749 687
750 $self->add (@$children) 688 $self->add (@$children)
751 if $children; 689 if $children && @$children;
752 690
753 $self 691 $self
754} 692}
755 693
756sub realloc { 694sub realloc {
… …
765 my ($self, @widgets) = @_; 703 my ($self, @widgets) = @_;
766 704
767 $_->set_parent ($self) 705 $_->set_parent ($self)
768 for @widgets; 706 for @widgets;
769 707
708 # TODO: only do this in widgets that need it, e.g. root, fixed
770 use sort 'stable'; 709 use sort 'stable';
771 710
772 $self->{children} = [ 711 $self->{children} = [
773 sort { $a->{z} <=> $b->{z} } 712 sort { $a->{z} <=> $b->{z} }
774 @{$self->{children}}, @widgets 713 @{$self->{children}}, @widgets
775 ]; 714 ];
776 715
777 $self->realloc; 716 $self->realloc;
717
718 $self->emit (c_add => \@widgets);
719
720 map $_+0, @widgets
778} 721}
779 722
780sub children { 723sub children {
781 @{ $_[0]{children} } 724 @{ $_[0]{children} }
782} 725}
783 726
784sub remove { 727sub remove {
785 my ($self, $child) = @_; 728 my ($self, @widgets) = @_;
786 729
730 $self->emit (c_remove => \@widgets);
731
732 for my $child (@widgets) {
787 delete $child->{parent}; 733 delete $child->{parent};
788 $child->hide; 734 $child->hide;
789
790 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 735 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
736 }
791 737
792 $self->realloc; 738 $self->realloc;
793} 739}
794 740
795sub clear { 741sub clear {
796 my ($self) = @_; 742 my ($self) = @_;
797 743
798 my $children = delete $self->{children}; 744 my $children = $self->{children};
799 $self->{children} = []; 745 $self->{children} = [];
800 746
801 for (@$children) { 747 for (@$children) {
802 delete $_->{parent}; 748 delete $_->{parent};
803 $_->hide; 749 $_->hide;
… …
823} 769}
824 770
825sub _draw { 771sub _draw {
826 my ($self) = @_; 772 my ($self) = @_;
827 773
828 $_->draw for @{$self->{children}}; 774 $_->draw for $self->visible_children;
829} 775}
830 776
831############################################################################# 777#############################################################################
832 778
833package CFPlus::UI::Bin; 779package CFPlus::UI::Bin;
… …
843} 789}
844 790
845sub add { 791sub add {
846 my ($self, $child) = @_; 792 my ($self, $child) = @_;
847 793
848 $self->SUPER::remove ($_) for @{ $self->{children} }; 794 $self->clear;
849 $self->SUPER::add ($child); 795 $self->SUPER::add ($child);
850} 796}
851 797
852sub remove { 798sub remove {
853 my ($self, $widget) = @_; 799 my ($self, $widget) = @_;
… …
963sub size_request { 909sub size_request {
964 my ($self) = @_; 910 my ($self) = @_;
965 911
966 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 912 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
967 913
968 $w = 10 if $self->{scroll_x}; 914 $w = 1 if $self->{scroll_x};
969 $h = 10 if $self->{scroll_y}; 915 $h = 1 if $self->{scroll_y};
970 916
971 ($w, $h) 917 ($w, $h)
972} 918}
973 919
974sub invoke_size_allocate { 920sub invoke_size_allocate {
… …
998 $self->emit (changed => $x, $y); 944 $self->emit (changed => $x, $y);
999 $self->update; 945 $self->update;
1000 } 946 }
1001} 947}
1002 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);
964 }
965}
966
1003# 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
1004sub coord2local { 968sub coord2local {
1005 my ($self, $x, $y) = @_; 969 my ($self, $x, $y) = @_;
1006 970
1007 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y}) 971 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
… …
1020 my ($self, $x, $y) = @_; 984 my ($self, $x, $y) = @_;
1021 985
1022 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 986 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1023 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 987 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1024 ) { 988 ) {
1025 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 989 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1026 } else { 990 } else {
1027 $self->CFPlus::UI::Base::find_widget ($x, $y) 991 $self->CFPlus::UI::Base::find_widget ($x, $y)
1028 } 992 }
1029} 993}
1030 994
… …
1051 my $child = delete $arg{child}; 1015 my $child = delete $arg{child};
1052 1016
1053 my $self; 1017 my $self;
1054 1018
1055 my $hslider = new CFPlus::UI::Slider 1019 my $hslider = new CFPlus::UI::Slider
1020 c_col => 0,
1021 c_row => 1,
1056 vertical => 0, 1022 vertical => 0,
1057 range => [0, 0, 1, 0.01], # HACK fix 1023 range => [0, 0, 1, 0.01], # HACK fix
1058 on_changed => sub { 1024 on_changed => sub {
1059 $self->{hpos} = $_[1]; 1025 $self->{hpos} = $_[1];
1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1026 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1061 }, 1027 },
1062 ; 1028 ;
1063 1029
1064 my $vslider = new CFPlus::UI::Slider 1030 my $vslider = new CFPlus::UI::Slider
1031 c_col => 1,
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
1053 c_col => 0,
1054 c_row => 0,
1085 expand => 1, 1055 expand => 1,
1086 scroll_x => $self->{scroll_x}, 1056 scroll_x => $self->{scroll_x},
1087 scroll_y => $self->{scroll_y}, 1057 scroll_y => $self->{scroll_y},
1088 on_changed => sub { 1058 on_changed => sub {
1089 my ($vp, $x, $y) = @_; 1059 my ($vp, $x, $y) = @_;
… …
1091 $vp->{parent}{hslider}->set_value ($x); 1061 $vp->{parent}{hslider}->set_value ($x);
1092 $vp->{parent}{vslider}->set_value ($y); 1062 $vp->{parent}{vslider}->set_value ($y);
1093 1063
1094 0 1064 0
1095 }, 1065 },
1066 on_size_allocate => sub {
1067 my ($vp, $w, $h) = @_;
1068 $vp->{parent}->update_slider;
1069 0
1070 },
1096 ; 1071 ;
1097 1072
1098 $self->SUPER::add_at (0, 0, $self->{vp}); 1073 $self->SUPER::add ($self->{vp});
1099 1074
1100 $self->add ($child) if $child; 1075 $self->add ($child) if $child;
1101 1076
1102 $self 1077 $self
1103} 1078}
1104
1105#TODO# update range on size_allocate depending on child
1106 1079
1107sub add { 1080sub add {
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}) {
1101 $self->{hslider_visible} = $visible;
1123 $visible ? $self->SUPER::add_at (0, 1, $self->{hslider}) 1102 $visible ? $self->SUPER::add ($self->{hslider})
1124 : $self->{hslider}->hide; 1103 : $self->SUPER::remove ($self->{hslider});
1104 }
1125 } 1105 }
1126 1106
1107 if ($self->{scroll_y}) {
1127 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1108 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1128 $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]);
1129 1110
1130 my $visible = $h1 > $h2; 1111 my $visible = $h1 > $h2;
1131 if ($visible != $self->{vslider}{visible}) { 1112 if ($visible != $self->{vslider_visible}) {
1113 $self->{vslider_visible} = $visible;
1132 $visible ? $self->SUPER::add_at (1, 0, $self->{vslider}) 1114 $visible ? $self->SUPER::add ($self->{vslider})
1133 : $self->{vslider}->hide; 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);
1134 } 1135 };
1135}
1136
1137sub update {
1138 my ($self) = @_;
1139
1140 $self->SUPER::update;
1141 $self->update_slider;
1142} 1136}
1143 1137
1144sub invoke_mouse_wheel { 1138sub invoke_mouse_wheel {
1145 my ($self, $ev) = @_; 1139 my ($self, $ev) = @_;
1146 1140
1147 return 0 unless $ev->{dy}; # only vertical movements for now
1148
1149 $self->{vslider}->emit (mouse_wheel => $ev); 1141 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1142 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1150 1143
1151 1 1144 1
1152} 1145}
1153 1146
1154sub invoke_button_down { 1147sub invoke_button_down {
1155 my ($self, $ev, $x, $y) = @_; 1148 my ($self, $ev, $x, $y) = @_;
1156 1149
1157 if ($ev->{button} == 2) { 1150 if ($ev->{button} == 2) {
1158 $self->grab_focus; 1151 $self->start_dragging ($ev);
1159
1160 my $ox = $self->{vp}{view_x} + $ev->{x};
1161 my $oy = $self->{vp}{view_y} + $ev->{y};
1162
1163 $self->{motion} = sub {
1164 my ($ev, $x, $y) = @_;
1165
1166 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1167 $self->update;
1168 };
1169
1170 return 1; 1152 return 1;
1171 } 1153 }
1172 1154
1173 0 1155 0
1174} 1156}
… …
1225 my ($w, $h) = @$self{qw(w h)}; 1207 my ($w, $h) = @$self{qw(w h)};
1226 1208
1227 glEnable GL_BLEND; 1209 glEnable GL_BLEND;
1228 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1210 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1229 glColor_premultiply @{ $self->{bg} }; 1211 glColor_premultiply @{ $self->{bg} };
1230
1231 glBegin GL_QUADS;
1232 glVertex 0 , 0;
1233 glVertex 0 , $h;
1234 glVertex $w, $h; 1212 glRect 0, 0, $w, $h;
1235 glVertex $w, 0;
1236 glEnd;
1237
1238 glDisable GL_BLEND; 1213 glDisable GL_BLEND;
1239 } 1214 }
1240 1215
1241 $self->SUPER::_draw; 1216 $self->SUPER::_draw;
1242} 1217}
… …
1584 1559
1585############################################################################# 1560#############################################################################
1586 1561
1587package CFPlus::UI::Table; 1562package CFPlus::UI::Table;
1588 1563
1589our @ISA = CFPlus::UI::Base::; 1564our @ISA = CFPlus::UI::Container::;
1590 1565
1591use List::Util qw(max sum); 1566use List::Util qw(max sum);
1592 1567
1593use CFPlus::OpenGL; 1568use CFPlus::OpenGL;
1594 1569
1595sub new { 1570sub new {
1596 my $class = shift; 1571 my $class = shift;
1597 1572
1598 $class->SUPER::new ( 1573 $class->SUPER::new (
1599 children => [],
1600 col_expand => [], 1574 col_expand => [],
1601 row_expand => [], 1575 row_expand => [],
1602 @_, 1576 @_,
1603 ) 1577 )
1604} 1578}
1605 1579
1606sub children {
1607 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1608}
1609
1610# TODO: store row/col info in child widget and use standard add/del
1611sub add { 1580sub add {
1612 my $self = shift; 1581 my ($self, @widgets) = @_;
1613 1582
1614 Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d# 1583 for my $child (@widgets) {
1615 $self->add_at (@_); 1584 $child->{c_rowspan} ||= 1;
1585 $child->{c_colspan} ||= 1;
1586 }
1587
1588 $self->SUPER::add (@widgets);
1616} 1589}
1617 1590
1618sub add_at { 1591sub add_at {
1619 my $self = shift; 1592 my $self = shift;
1620 1593
1594 my @widgets;
1595
1621 while (@_) { 1596 while (@_) {
1622 my ($col, $row, $child) = splice @_, 0, 3, (); 1597 my ($col, $row, $child) = splice @_, 0, 3, ();
1623 1598
1624 $child->set_parent ($self); 1599 $child->{c_row} = $row;
1625 $self->{children}[$row][$col] = $child; 1600 $child->{c_col} = $col;
1626 }
1627 1601
1628 $self->{force_realloc} = 1; 1602 push @widgets, $child;
1629 $self->{force_size_alloc} = 1; 1603 }
1630 $self->realloc;
1631}
1632 1604
1633sub remove { 1605 $self->add (@widgets);
1606}
1607
1608sub get_wh {
1634 my ($self, $child) = @_; 1609 my ($self) = @_;
1635 1610
1636 for (@{ $self->{children} }) { 1611 my (@w, @h);
1637 for (@{ $_ || [] }) { 1612
1638 $_ = undef if $_ == $child; 1613 my @children = $self->children;
1614
1615 # first pass, columns
1616 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1617 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1618
1619 my $sw = sum @w[$c .. $c + $cs - 1];
1620
1621 if ($w > $sw) {
1622 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1639 } 1623 }
1640 } 1624 }
1641}
1642 1625
1643# TODO: move to container class maybe? send children a signal on removal? 1626 # second pass, rows
1644sub clear { 1627 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1645 my ($self) = @_;
1646
1647 my @children = $self->children;
1648 delete $self->{children};
1649
1650 for (@children) {
1651 delete $_->{parent};
1652 $_->hide;
1653 }
1654
1655 $self->realloc;
1656}
1657
1658sub get_wh {
1659 my ($self) = @_;
1660
1661 my (@w, @h);
1662
1663 for my $y (0 .. $#{$self->{children}}) {
1664 my $row = $self->{children}[$y]
1665 or next;
1666
1667 for my $x (0 .. $#$row) {
1668 my $widget = $row->[$x]
1669 or next;
1670 my ($w, $h) = @$widget{qw(req_w req_h)}; 1628 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1671 1629
1672 $w[$x] = max $w[$x], $w; 1630 my $sh = sum @h[$r .. $r + $rs - 1];
1673 $h[$y] = max $h[$y], $h; 1631
1632 if ($h > $sh) {
1633 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1674 } 1634 }
1675 } 1635 }
1676 1636
1677 (\@w, \@h) 1637 (\@w, \@h)
1678} 1638}
… …
1694 my ($ws, $hs) = $self->get_wh; 1654 my ($ws, $hs) = $self->get_wh;
1695 1655
1696 my $req_w = (sum @$ws) || 1; 1656 my $req_w = (sum @$ws) || 1;
1697 my $req_h = (sum @$hs) || 1; 1657 my $req_h = (sum @$hs) || 1;
1698 1658
1699 # TODO: nicer code 1659 # now linearly scale the rows/columns to the allocated size
1700 my @col_expand = @{$self->{col_expand}}; 1660 my @col_expand = @{$self->{col_expand}};
1701 @col_expand = (1) x @$ws unless @col_expand; 1661 @col_expand = (1) x @$ws unless @col_expand;
1702 my $col_expand = (sum @col_expand) || 1; 1662 my $col_expand = (sum @col_expand) || 1;
1703 1663
1704 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1664 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
… …
1711 1671
1712 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1672 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1713 1673
1714 CFPlus::UI::harmonize $hs; 1674 CFPlus::UI::harmonize $hs;
1715 1675
1716 my $y; 1676 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1677 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1717 1678
1718 for my $r (0 .. $#{$self->{children}}) { 1679 for my $widget ($self->children) {
1719 my $row = $self->{children}[$r] 1680 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1720 or next;
1721 1681
1722 my $x = 0; 1682 $widget->configure (
1723 my $row_h = $hs->[$r]; 1683 $x[$c], $y[$r],
1684 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1724 1685 );
1725 for my $c (0 .. $#$row) {
1726 my $col_w = $ws->[$c];
1727
1728 if (my $widget = $row->[$c]) {
1729 $widget->configure ($x, $y, $col_w, $row_h);
1730 }
1731
1732 $x += $col_w;
1733 }
1734
1735 $y += $row_h;
1736 } 1686 }
1737 1687
1738 1 1688 1
1739} 1689}
1740 1690
1741sub find_widget {
1742 my ($self, $x, $y) = @_;
1743
1744 $x -= $self->{x};
1745 $y -= $self->{y};
1746
1747 my $res;
1748
1749 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1750 $res = $_->find_widget ($x, $y)
1751 and return $res;
1752 }
1753
1754 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1755}
1756
1757sub _draw {
1758 my ($self) = @_;
1759
1760 for (grep $_, @{$self->{children}}) {
1761 $_->draw for grep $_, @$_;
1762 }
1763}
1764
1765############################################################################# 1691#############################################################################
1766 1692
1767package CFPlus::UI::Fixed; 1693package CFPlus::UI::Fixed;
1768 1694
1769use List::Util qw(min max); 1695use List::Util qw(min max);
1770 1696
1771our @ISA = CFPlus::UI::Container::; 1697our @ISA = CFPlus::UI::Container::;
1772 1698
1773sub add {
1774 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1775
1776 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1777 $self->SUPER::add ($child);
1778}
1779
1780sub _scale($$$) { 1699sub _scale($$$) {
1781 my ($mode, $val, $max) = @_; 1700 my ($rel, $val, $max) = @_;
1782 1701
1783 $mode eq "abs" ? $val 1702 $rel ? $val * $max : $val
1784 : $mode eq "rel" ? $val * $max
1785 : 0
1786} 1703}
1787 1704
1788sub size_request { 1705sub size_request {
1789 my ($self) = @_; 1706 my ($self) = @_;
1790 1707
1791 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1708 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1792 1709
1793 # determine overall size by querying abs widgets 1710 # determine overall size by querying abs widgets
1794 for my $child ($self->visible_children) { 1711 for my $child ($self->visible_children) {
1795 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};
1796 1715
1797 if ($pos eq "abs") {
1798 $w = _scale $size, $w, $child->{req_w};
1799 $h = _scale $size, $h, $child->{req_h};
1800
1801 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1716 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1802 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1717 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1803 } 1718 }
1804 } 1719 }
1805 1720
1806 my $W = $x2 - $x1; 1721 my $W = $x2 - $x1;
1807 my $H = $y2 - $y1; 1722 my $H = $y2 - $y1;
1808 1723
1809 # now layout remaining widgets 1724 # now layout remaining widgets
1810 for my $child ($self->visible_children) { 1725 for my $child ($self->visible_children) {
1811 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;
1812 1729
1813 if ($pos ne "abs") {
1814 $x = _scale $pos, $x, $W;
1815 $y = _scale $pos, $x, $H;
1816 $w = _scale $size, $w, $child->{req_w};
1817 $h = _scale $size, $h, $child->{req_h};
1818
1819 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1730 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1820 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1731 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1821 } 1732 }
1822 } 1733 }
1823 1734
1824 my $W = $x2 - $x1; 1735 my $W = $x2 - $x1;
1825 my $H = $y2 - $y1; 1736 my $H = $y2 - $y1;
… …
1829 1740
1830sub invoke_size_allocate { 1741sub invoke_size_allocate {
1831 my ($self, $W, $H) = @_; 1742 my ($self, $W, $H) = @_;
1832 1743
1833 for my $child ($self->visible_children) { 1744 for my $child ($self->visible_children) {
1834 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;
1835 1747
1836 $x = _scale $pos, $x, $W; 1748 $x += $child->{c_halign} * $child->{req_w};
1837 $y = _scale $pos, $x, $H; 1749 $y += $child->{c_valign} * $child->{req_h};
1838 $w = _scale $size, $w, $child->{req_w};
1839 $h = _scale $size, $h, $child->{req_h};
1840 1750
1841 $child->configure ($x, $y, $w, $h); 1751 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1842 } 1752 }
1843 1753
1844 1 1754 1
1845} 1755}
1846 1756
… …
1850 1760
1851our @ISA = CFPlus::UI::Container::; 1761our @ISA = CFPlus::UI::Container::;
1852 1762
1853sub size_request { 1763sub size_request {
1854 my ($self) = @_; 1764 my ($self) = @_;
1765
1766 my @children = $self->visible_children;
1855 1767
1856 $self->{vertical} 1768 $self->{vertical}
1857 ? ( 1769 ? (
1858 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1770 (List::Util::max map $_->{req_w}, @children),
1859 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1771 (List::Util::sum map $_->{req_h}, @children),
1860 ) 1772 )
1861 : ( 1773 : (
1862 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1774 (List::Util::sum map $_->{req_w}, @children),
1863 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1775 (List::Util::max map $_->{req_h}, @children),
1864 ) 1776 )
1865} 1777}
1866 1778
1867sub invoke_size_allocate { 1779sub invoke_size_allocate {
1868 my ($self, $w, $h) = @_; 1780 my ($self, $w, $h) = @_;
… …
1992 1904
1993 delete $self->{ox}; 1905 delete $self->{ox};
1994 $self->SUPER::realloc; 1906 $self->SUPER::realloc;
1995} 1907}
1996 1908
1909sub clear {
1910 my ($self) = @_;
1911
1912 $self->set_text ("");
1913}
1914
1997sub set_text { 1915sub set_text {
1998 my ($self, $text) = @_; 1916 my ($self, $text) = @_;
1999 1917
2000 return if $self->{text} eq "T$text"; 1918 return if $self->{text} eq "T$text";
2001 $self->{text} = "T$text"; 1919 $self->{text} = "T$text";
… …
2107 : ($self->{w} - $size->[0]) * 0.5); 2025 : ($self->{w} - $size->[0]) * 0.5);
2108 2026
2109 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2027 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2110 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2028 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2111 : ($self->{h} - $size->[1]) * 0.5); 2029 : ($self->{h} - $size->[1]) * 0.5);
2030
2031 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2112 }; 2032 };
2113 2033
2114 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2034# unless ($self->{list}) {
2115 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2035# $self->{list} = CFPlus::OpenGL::glGenList;
2116 2036# CFPlus::OpenGL::glNewList $self->{list};
2117 $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;
2118} 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#}
2119 2053
2120############################################################################# 2054#############################################################################
2121 2055
2122package CFPlus::UI::EntryBase; 2056package CFPlus::UI::EntryBase;
2123 2057
… …
2129 my $class = shift; 2063 my $class = shift;
2130 2064
2131 $class->SUPER::new ( 2065 $class->SUPER::new (
2132 fg => [1, 1, 1], 2066 fg => [1, 1, 1],
2133 bg => [0, 0, 0, 0.2], 2067 bg => [0, 0, 0, 0.2],
2068 outline => [0.6, 0.3, 0.1],
2134 active_bg => [1, 1, 1, 0.5], 2069 active_bg => [0, 0, 1, .2],
2135 active_fg => [0, 0, 0], 2070 active_fg => [1, 1, 1],
2071 active_outline => [1, 1, 0],
2136 can_hover => 1, 2072 can_hover => 1,
2137 can_focus => 1, 2073 can_focus => 1,
2138 valign => 0, 2074 valign => 0,
2139 can_events => 1, 2075 can_events => 1,
2140 ellipsise => 0, 2076 ellipsise => 0,
… …
2280 glColor_premultiply @{$self->{bg}}; 2216 glColor_premultiply @{$self->{bg}};
2281 } 2217 }
2282 2218
2283 glEnable GL_BLEND; 2219 glEnable GL_BLEND;
2284 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2220 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2285 glBegin GL_QUADS;
2286 glVertex 0 , 0;
2287 glVertex 0 , $self->{h};
2288 glVertex $self->{w}, $self->{h}; 2221 glRect 0, 0, $self->{w}, $self->{h};
2289 glVertex $self->{w}, 0;
2290 glEnd;
2291 glDisable GL_BLEND; 2222 glDisable GL_BLEND;
2292 2223
2293 $self->SUPER::_draw; 2224 $self->SUPER::_draw;
2294 2225
2295 #TODO: force update every cursor change :( 2226 #TODO: force update every cursor change :(
… …
2297 2228
2298 unless (exists $self->{cur_h}) { 2229 unless (exists $self->{cur_h}) {
2299 my $text = substr $self->{text}, 0, $self->{cursor}; 2230 my $text = substr $self->{text}, 0, $self->{cursor};
2300 utf8::encode $text; 2231 utf8::encode $text;
2301 2232
2302 @$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);
2303 } 2234 }
2304 2235
2236 glColor_premultiply @{$self->{active_fg}};
2305 glBegin GL_LINES; 2237 glBegin GL_LINES;
2306 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2238 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2307 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2239 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2240 glEnd;
2241
2242 glLineWidth 3;
2243 glColor @{$self->{active_outline}};
2244 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2245 glLineWidth 1;
2246
2247 } else {
2248 glColor @{$self->{outline}};
2249 glBegin GL_LINE_STRIP;
2250 glVertex .5, $self->{h} * .5;
2251 glVertex .5, $self->{h} - 2.5;
2252 glVertex $self->{w} - .5, $self->{h} - 2.5;
2253 glVertex $self->{w} - .5, $self->{h} * .5;
2308 glEnd; 2254 glEnd;
2309 } 2255 }
2310} 2256}
2311 2257
2312############################################################################# 2258#############################################################################
… …
2399 1 2345 1
2400} 2346}
2401 2347
2402############################################################################# 2348#############################################################################
2403 2349
2350package CFPlus::UI::ButtonBin;
2351
2352our @ISA = CFPlus::UI::Bin::;
2353
2354use CFPlus::OpenGL;
2355
2356my @tex =
2357 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2358 qw(b1_button_inactive.png b1_button_active.png);
2359
2360sub new {
2361 my $class = shift;
2362
2363 $class->SUPER::new (
2364 can_hover => 1,
2365 align => 0,
2366 valign => 0,
2367 can_events => 1,
2368 @_
2369 )
2370}
2371
2372sub invoke_button_up {
2373 my ($self, $ev, $x, $y) = @_;
2374
2375 $self->emit ("activate")
2376 if $x >= 0 && $x < $self->{w}
2377 && $y >= 0 && $y < $self->{h};
2378
2379 1
2380}
2381
2382sub _draw {
2383 my ($self) = @_;
2384
2385 glEnable GL_TEXTURE_2D;
2386 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2387 glColor 0, 0, 0, 1;
2388
2389 my $tex = $tex[$GRAB == $self];
2390 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2391
2392 glDisable GL_TEXTURE_2D;
2393
2394 $self->SUPER::_draw;
2395}
2396
2397#############################################################################
2398
2404package CFPlus::UI::Button; 2399package CFPlus::UI::Button;
2405 2400
2406our @ISA = CFPlus::UI::Label::; 2401our @ISA = CFPlus::UI::Label::;
2407 2402
2408use CFPlus::OpenGL; 2403use CFPlus::OpenGL;
… …
2512sub _draw { 2507sub _draw {
2513 my ($self) = @_; 2508 my ($self) = @_;
2514 2509
2515 $self->SUPER::_draw; 2510 $self->SUPER::_draw;
2516 2511
2517 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2512 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2518 2513
2519 my ($w, $h) = @$self{qw(w h)}; 2514 my ($w, $h) = @$self{qw(w h)};
2520 2515
2521 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2516 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2522 2517
… …
2542sub new { 2537sub new {
2543 my $class = shift; 2538 my $class = shift;
2544 2539
2545 my $self = $class->SUPER::new ( 2540 my $self = $class->SUPER::new (
2546 can_events => 0, 2541 can_events => 0,
2542 scale => 1,
2547 @_, 2543 @_,
2548 ); 2544 );
2549 2545
2550 $self->{path} || $self->{tex} 2546 $self->{path} || $self->{tex}
2551 or Carp::croak "'path' or 'tex' attributes required"; 2547 or Carp::croak "'path' or 'tex' attributes required";
… …
2576} 2572}
2577 2573
2578sub size_request { 2574sub size_request {
2579 my ($self) = @_; 2575 my ($self) = @_;
2580 2576
2581 ($self->{tex}{w}, $self->{tex}{h}) 2577 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2582} 2578}
2583 2579
2584sub _draw { 2580sub _draw {
2585 my ($self) = @_; 2581 my ($self) = @_;
2586 2582
… …
2596 } 2592 }
2597 2593
2598 glEnable GL_TEXTURE_2D; 2594 glEnable GL_TEXTURE_2D;
2599 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2595 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2600 2596
2601 $tex->draw_quad (0, 0, $w, $h); 2597 $tex->draw_quad_alpha (0, 0, $w, $h);
2602 2598
2603 glDisable GL_TEXTURE_2D; 2599 glDisable GL_TEXTURE_2D;
2604} 2600}
2605 2601
2606############################################################################# 2602#############################################################################
… …
2625 align => 0, 2621 align => 0,
2626 valign => 0, 2622 valign => 0,
2627 can_events => 1, 2623 can_events => 1,
2628 @_ 2624 @_
2629 ); 2625 );
2626}
2627
2628sub invoke_button_down {
2629 my ($self, $ev, $x, $y) = @_;
2630
2631 1
2630} 2632}
2631 2633
2632sub invoke_button_up { 2634sub invoke_button_up {
2633 my ($self, $ev, $x, $y) = @_; 2635 my ($self, $ev, $x, $y) = @_;
2634 2636
… …
2774 glDisable GL_TEXTURE_2D; 2776 glDisable GL_TEXTURE_2D;
2775} 2777}
2776 2778
2777############################################################################# 2779#############################################################################
2778 2780
2781package CFPlus::UI::Progress;
2782
2783our @ISA = CFPlus::UI::Label::;
2784
2785use CFPlus::OpenGL;
2786
2787sub new {
2788 my ($class, %arg) = @_;
2789
2790 my $self = $class->SUPER::new (
2791 fg => [1, 1, 1],
2792 bg => [0, 0, 1, 0.2],
2793 bar => [0.7, 0.5, 0.1, 0.8],
2794 outline => [0.4, 0.3, 0],
2795 fontsize => 0.9,
2796 valign => 0,
2797 align => 0,
2798 can_events => 1,
2799 ellipsise => 1,
2800 label => "%d%%",
2801 %arg,
2802 );
2803
2804 $self->set_value ($arg{value} || -1);
2805
2806 $self
2807}
2808
2809sub set_label {
2810 my ($self, $label) = @_;
2811
2812 return if $self->{label} eq $label;
2813 $self->{label} = $label;
2814
2815 $self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
2816}
2817
2818sub set_value {
2819 my ($self, $value) = @_;
2820
2821 if ($self->{value} ne $value) {
2822 $self->{value} = $value;
2823
2824 if ($value < 0) {
2825 $self->set_text ("-");
2826 } else {
2827 $self->set_text (sprintf $self->{label}, $value * 100);
2828 }
2829
2830 $self->update;
2831 }
2832}
2833
2834sub _draw {
2835 my ($self) = @_;
2836
2837 glEnable GL_BLEND;
2838 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2839
2840 if ($self->{value} >= 0) {
2841 my $s = int 2 + ($self->{w} - 4) * $self->{value};
2842
2843 glColor_premultiply @{$self->{bar}};
2844 glRect 2, 2, $s, $self->{h} - 2;
2845 glColor_premultiply @{$self->{bg}};
2846 glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
2847 }
2848
2849 glColor_premultiply @{$self->{outline}};
2850 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2851
2852 glDisable GL_BLEND;
2853
2854 {
2855 local $self->{bg}; # do not draw background
2856 $self->SUPER::_draw;
2857 }
2858}
2859
2860#############################################################################
2861
2862package CFPlus::UI::ExperienceProgress;
2863
2864our @ISA = CFPlus::UI::Progress::;
2865
2866sub new {
2867 my ($class, %arg) = @_;
2868
2869 my $self = $class->SUPER::new (
2870 tooltip => sub {
2871 my ($self) = @_;
2872
2873 sprintf "level %d\n%s points\n%s next level\n%s to go",
2874 $self->{lvl},
2875 ::formsep ($self->{exp}),
2876 ::formsep ($self->{nxt}),
2877 ::formsep ($self->{nxt} - $self->{exp}),
2878 },
2879 %arg
2880 );
2881
2882 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2883 if $::CONN;
2884
2885 $self
2886}
2887
2888sub DESTROY {
2889 my ($self) = @_;
2890
2891 delete $::CONN->{on_exp_update}{$self+0}
2892 if $::CONN;
2893
2894 $self->SUPER::DESTROY;
2895}
2896
2897sub set_value {
2898 my ($self, $lvl, $exp) = @_;
2899
2900 $self->{lvl} = $lvl;
2901 $self->{exp} = $exp;
2902
2903 my $v = -1;
2904
2905 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2906 my $l0 = $table->[$lvl - 1];
2907 my $l1 = $table->[$lvl];
2908
2909 $self->{nxt} = $l1;
2910
2911 $v = ($exp - $l0) / ($l1 - $l0);
2912 }
2913
2914 $self->SUPER::set_value ($v);
2915}
2916
2917#############################################################################
2918
2779package CFPlus::UI::Gauge; 2919package CFPlus::UI::Gauge;
2780 2920
2781our @ISA = CFPlus::UI::VBox::; 2921our @ISA = CFPlus::UI::VBox::;
2782 2922
2783sub new { 2923sub new {
… …
2908 3048
2909 $self->SUPER::invoke_button_down ($ev, $x, $y); 3049 $self->SUPER::invoke_button_down ($ev, $x, $y);
2910 3050
2911 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3051 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2912 3052
2913 $self->invoke_mouse_motion ($ev, $x, $y) 3053 $self->invoke_mouse_motion ($ev, $x, $y);
3054
3055 1
2914} 3056}
2915 3057
2916sub invoke_mouse_motion { 3058sub invoke_mouse_motion {
2917 my ($self, $ev, $x, $y) = @_; 3059 my ($self, $ev, $x, $y) = @_;
2918 3060
… …
2938 3080
2939 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3081 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2940 3082
2941 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3083 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2942 3084
2943 ! ! $delta 3085 1
2944} 3086}
2945 3087
2946sub update { 3088sub update {
2947 my ($self) = @_; 3089 my ($self) = @_;
2948 3090
… …
3079} 3221}
3080 3222
3081sub size_request { 3223sub size_request {
3082 my ($self) = @_; 3224 my ($self) = @_;
3083 3225
3084 my ($empty, $slider) = @{ $self->{children} }; 3226 my ($empty, $slider) = $self->visible_children;
3085 3227
3086 local $self->{children} = [$empty, $slider]; 3228 local $self->{children} = [$empty, $slider];
3087 $self->SUPER::size_request 3229 $self->SUPER::size_request
3088} 3230}
3089 3231
… …
3278 3420
3279 if ($y0 < $y + $h && $y < $y1) { 3421 if ($y0 < $y + $h && $y < $y1) {
3280 my $layout = $self->get_layout ($para); 3422 my $layout = $self->get_layout ($para);
3281 3423
3282 $layout->render ($para->{indent}, $y - $y0); 3424 $layout->render ($para->{indent}, $y - $y0);
3425 $layout->draw;
3283 3426
3284 if (my @w = @{ $para->{widget} }) { 3427 if (my @w = @{ $para->{widget} }) {
3285 my @s = $layout->get_shapes; 3428 my @s = $layout->get_shapes;
3286 3429
3287 for (@w) { 3430 for (@w) {
… …
3409} 3552}
3410 3553
3411sub set_tooltip_from { 3554sub set_tooltip_from {
3412 my ($self, $widget) = @_; 3555 my ($self, $widget) = @_;
3413 3556
3414 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3415 if $widget->{tooltip} =~ /^#(.*)$/;
3416
3417 my $tooltip = $widget->{tooltip}; 3557 my $tip = $widget->{tooltip};
3558 $tip = $tip->($widget) if "CODE" eq ref $tip;
3559
3560 $tip = CFPlus::Pod::section_label tooltip => $1
3561 if $tip =~ /^#(.*)$/;
3418 3562
3419 if ($ENV{CFPLUS_DEBUG} & 2) { 3563 if ($ENV{CFPLUS_DEBUG} & 2) {
3420 $tooltip .= "\n\n" . (ref $widget) . "\n" 3564 $tip .= "\n\n" . (ref $widget) . "\n"
3421 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3565 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3422 . "req $widget->{req_w} $widget->{req_h}\n" 3566 . "req $widget->{req_w} $widget->{req_h}\n"
3423 . "visible $widget->{visible}"; 3567 . "visible $widget->{visible}";
3424 } 3568 }
3425 3569
3426 $tooltip =~ s/^\n+//; 3570 $tip =~ s/^\n+//;
3427 $tooltip =~ s/\n+$//; 3571 $tip =~ s/\n+$//;
3428 3572
3429 $self->add (new CFPlus::UI::Label 3573 $self->add (new CFPlus::UI::Label
3430 markup => $tooltip, 3574 markup => $tip,
3431 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3575 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3432 fontsize => 0.8, 3576 fontsize => 0.8,
3433 style => 1, # FLAG_INVERSE 3577 style => 1, # FLAG_INVERSE
3434 ellipsise => 0, 3578 ellipsise => 0,
3435 font => ($widget->{tooltip_font} || $::FONT_PROP), 3579 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
3473} 3617}
3474 3618
3475sub _draw { 3619sub _draw {
3476 my ($self) = @_; 3620 my ($self) = @_;
3477 3621
3478 glTranslate 0.375, 0.375;
3479
3480 my ($w, $h) = @$self{qw(w h)}; 3622 my ($w, $h) = @$self{qw(w h)};
3481 3623
3482 glColor 1, 0.8, 0.4; 3624 glColor 1, 0.8, 0.4;
3483 glBegin GL_QUADS; 3625 glRect 0, 0, $w, $h;
3484 glVertex 0 , 0;
3485 glVertex 0 , $h;
3486 glVertex $w, $h;
3487 glVertex $w, 0;
3488 glEnd;
3489 3626
3490 glColor 0, 0, 0; 3627 glColor 0, 0, 0;
3491 glBegin GL_LINE_LOOP; 3628 glRect_lineloop .5, .5, $w + .5, $h + .5;
3492 glVertex 0 , 0;
3493 glVertex 0 , $h;
3494 glVertex $w, $h;
3495 glVertex $w, 0;
3496 glEnd;
3497 3629
3498 glTranslate 2 - 0.375, 2 - 0.375; 3630 glTranslate 2, 2;
3499 3631
3500 $self->SUPER::_draw; 3632 $self->SUPER::_draw;
3501} 3633}
3502 3634
3503############################################################################# 3635#############################################################################
… …
3521 3653
3522 if ($self->{anim} && $self->{animspeed}) { 3654 if ($self->{anim} && $self->{animspeed}) {
3523 CFPlus::weaken (my $widget = $self); 3655 CFPlus::weaken (my $widget = $self);
3524 3656
3525 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3657 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3526 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed}; 3658 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3527 $self->{timer} = Event->timer ( 3659 $self->{timer} = Event->timer (
3528 parked => 1, 3660 parked => 1,
3529 cb => sub { 3661 cb => sub {
3530 return unless $::CONN && $widget; 3662 return unless $::CONN;
3531 3663
3664 my $w = $widget
3665 or return;
3666
3532 ++$widget->{frame}; 3667 ++$w->{frame};
3533 $widget->update_face; 3668 $w->update_face;
3669
3670 # somehow, $widget can go away
3534 $widget->update; 3671 $w->update;
3535
3536 $widget->update_timer; 3672 $w->update_timer;
3537 }, 3673 },
3538 ); 3674 );
3539 3675
3540 $self->update_face; 3676 $self->update_face;
3541 $self->update_timer; 3677 $self->update_timer;
… …
3562} 3698}
3563 3699
3564sub update_face { 3700sub update_face {
3565 my ($self) = @_; 3701 my ($self) = @_;
3566 3702
3567 return unless $::CONN;
3568
3569 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3570 if ($anim && @$anim) {
3571 delete $self->{wait_face};
3572 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3573 }
3574 }
3575}
3576
3577sub size_request {
3578 my ($self) = @_;
3579
3580 if ($::CONN) { 3703 if ($::CONN) {
3581 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3704 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3582 if (my $tex = $::CONN->{texture}[$faceid]) { 3705 if ($anim && @$anim) {
3583 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3706 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3584 } else { 3707 delete $self->{face_change_cb};
3585 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3708
3586 $self->realloc; 3709 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3710 unless ($tex->{name} || $tex->{loading}) {
3711 $tex->upload (sub { $self->reconfigure });
3712 }
3587 }); 3713 }
3588 } 3714 }
3589 } 3715 }
3590 } 3716 }
3717}
3718
3719sub size_request {
3720 my ($self) = @_;
3721
3722 if ($::CONN) {
3723 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3724 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3725 if ($tex->{name}) {
3726 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3727 } elsif (!$tex->{loading}) {
3728 $tex->upload (sub { $self->reconfigure });
3729 }
3730 }
3731
3732 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3733 }
3734 }
3591 3735
3592 ($self->{size_w} || 8, $self->{size_h} || 8) 3736 ($self->{size_w} || 8, $self->{size_h} || 8)
3593} 3737}
3594 3738
3595sub update { 3739sub update {
… …
3609} 3753}
3610 3754
3611sub _draw { 3755sub _draw {
3612 my ($self) = @_; 3756 my ($self) = @_;
3613 3757
3614 return unless $::CONN;
3615
3616 $self->SUPER::_draw; 3758 $self->SUPER::_draw;
3617 3759
3618 my $faceid = $::CONN->{faceid}[$self->{face}] 3760 if (my $tex = $self->{tex}) {
3619 or return;
3620
3621 my $tex = $::CONN->{texture}[$faceid];
3622
3623 if ($tex) {
3624 glEnable GL_TEXTURE_2D; 3761 glEnable GL_TEXTURE_2D;
3625 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3762 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3626 glColor 0, 0, 0, 1; 3763 glColor 0, 0, 0, 1;
3627 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3764 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3628 glDisable GL_TEXTURE_2D; 3765 glDisable GL_TEXTURE_2D;
… …
3680 children => [ 3817 children => [
3681 (new CFPlus::UI::Label markup => $left, expand => 1), 3818 (new CFPlus::UI::Label markup => $left, expand => 1),
3682 (new CFPlus::UI::Label markup => $right, align => +1), 3819 (new CFPlus::UI::Label markup => $right, align => +1),
3683 ], 3820 ],
3684 ; 3821 ;
3685 3822
3686 } else { 3823 } else {
3687 $widget = new CFPlus::UI::Label 3824 $widget = new CFPlus::UI::Label
3688 can_hover => 1, 3825 can_hover => 1,
3689 can_events => 1, 3826 can_events => 1,
3690 markup => $widget, 3827 markup => $widget,
… …
3815 3952
3816############################################################################# 3953#############################################################################
3817 3954
3818package CFPlus::UI::Notebook; 3955package CFPlus::UI::Notebook;
3819 3956
3957use CFPlus::OpenGL;
3958
3820our @ISA = CFPlus::UI::VBox::; 3959our @ISA = CFPlus::UI::VBox::;
3821 3960
3822sub new { 3961sub new {
3823 my $class = shift; 3962 my $class = shift;
3824 3963
3825 my $self = $class->SUPER::new ( 3964 my $self = $class->SUPER::new (
3826 buttonbar => (new CFPlus::UI::Buttonbar), 3965 buttonbar => (new CFPlus::UI::Buttonbar),
3827 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3966 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3967 active_outline => [.7, .7, 0.2],
3828 # filter => # will be put between multiplexer and $self 3968 # filter => # will be put between multiplexer and $self
3829 @_, 3969 @_,
3830 ); 3970 );
3831 3971
3832 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3972 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3833 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3973 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3834 3974
3975 {
3976 Scalar::Util::weaken (my $wself = $self);
3977
3978 $self->{multiplexer}->connect (c_add => sub {
3979 my ($mplex, $widgets) = @_;
3980
3981 for my $child (@$widgets) {
3982 Scalar::Util::weaken $child;
3983 $child->{c_tab_} ||= do {
3984 my $tab =
3985 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3986 ? $child->{c_tab}
3987 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3988
3989 $tab->connect (activate => sub {
3990 $wself->set_current_page ($child);
3991 });
3992
3993 $tab
3994 };
3995
3996 $self->{buttonbar}->add ($child->{c_tab_});
3997 }
3998 });
3999
4000 $self->{multiplexer}->connect (c_remove => sub {
4001 my ($mplex, $widgets) = @_;
4002
4003 for my $child (@$widgets) {
4004 $wself->{buttonbar}->remove ($child->{c_tab_});
4005 }
4006 });
4007 }
4008
3835 $self 4009 $self
3836} 4010}
3837 4011
3838sub add { 4012sub add {
4013 my ($self, @widgets) = @_;
4014
4015 $self->{multiplexer}->add (@widgets)
4016}
4017
4018sub remove {
4019 my ($self, @widgets) = @_;
4020
4021 $self->{multiplexer}->remove (@widgets)
4022}
4023
4024sub pages {
4025 my ($self) = @_;
4026 $self->{multiplexer}->children
4027}
4028
4029sub add_tab {
3839 my ($self, $title, $widget, $tooltip) = @_; 4030 my ($self, $title, $widget, $tooltip) = @_;
3840 4031
3841 CFPlus::weaken $self; 4032 $title = [$title, $tooltip] unless ref $title;
4033 $widget->{c_tab} = $title;
3842 4034
3843 $self->{buttonbar}->add (new CFPlus::UI::Button
3844 markup => $title,
3845 tooltip => $tooltip,
3846 on_activate => sub { $self->set_current_page ($widget) },
3847 );
3848
3849 $self->{multiplexer}->add ($widget); 4035 $self->add ($widget);
3850} 4036}
3851 4037
3852sub get_current_page { 4038sub get_current_page {
3853 my ($self) = @_; 4039 my ($self) = @_;
3854 4040
… …
3858sub set_current_page { 4044sub set_current_page {
3859 my ($self, $page) = @_; 4045 my ($self, $page) = @_;
3860 4046
3861 $self->{multiplexer}->set_current_page ($page); 4047 $self->{multiplexer}->set_current_page ($page);
3862 $self->emit (page_changed => $self->{multiplexer}{current}); 4048 $self->emit (page_changed => $self->{multiplexer}{current});
4049}
4050
4051sub _draw {
4052 my ($self) = @_;
4053
4054 $self->SUPER::_draw ();
4055
4056 if (my $cur = $self->{multiplexer}{current}) {
4057 if ($cur = $cur->{c_tab_}) {
4058 glTranslate $self->{buttonbar}{x} + $cur->{x},
4059 $self->{buttonbar}{y} + $cur->{y};
4060 glLineWidth 3;
4061 #glEnable GL_BLEND;
4062 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4063 glColor @{$self->{active_outline}};
4064 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4065 glLineWidth 1;
4066 #glDisable GL_BLEND;
4067 }
4068 }
3863} 4069}
3864 4070
3865############################################################################# 4071#############################################################################
3866 4072
3867package CFPlus::UI::Selector; 4073package CFPlus::UI::Selector;
… …
4137} 4343}
4138 4344
4139sub update { 4345sub update {
4140 my ($self) = @_; 4346 my ($self) = @_;
4141 4347
4142 $::WANT_REFRESH++; 4348 $::WANT_REFRESH->start;
4143} 4349}
4144 4350
4145sub add { 4351sub add {
4146 my ($self, @children) = @_; 4352 my ($self, @children) = @_;
4147 4353
… …
4184 while ($self->{refresh_hook}) { 4390 while ($self->{refresh_hook}) {
4185 $_->() 4391 $_->()
4186 for values %{delete $self->{refresh_hook}}; 4392 for values %{delete $self->{refresh_hook}};
4187 } 4393 }
4188 4394
4189 if ($self->{realloc}) { 4395 while ($self->{realloc}) {
4190 my %queue; 4396 my %queue;
4191 my @queue; 4397 my @queue;
4192 my $widget; 4398 my $widget;
4193 4399
4194 outer: 4400 outer:
… …
4241 } 4447 }
4242 } 4448 }
4243 4449
4244 delete $self->{realloc}{$widget+0}; 4450 delete $self->{realloc}{$widget+0};
4245 } 4451 }
4246 }
4247 4452
4248 while (my $size_alloc = delete $self->{size_alloc}) { 4453 while (my $size_alloc = delete $self->{size_alloc}) {
4249 my @queue = sort { $b->{visible} <=> $a->{visible} } 4454 my @queue = sort { $a->{visible} <=> $b->{visible} }
4250 values %$size_alloc; 4455 values %$size_alloc;
4251 4456
4252 while () { 4457 while () {
4253 my $widget = pop @queue || last; 4458 my $widget = pop @queue || last;
4254 4459
4255 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4460 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4256 4461
4257 $w = 0 if $w < 0;
4258 $h = 0 if $h < 0;
4259
4260 $w = max $widget->{min_w}, $w; 4462 $w = max $widget->{min_w}, $w;
4261 $h = max $widget->{min_h}, $h; 4463 $h = max $widget->{min_h}, $h;
4262 4464
4263# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4465# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4264# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4466# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4265 4467
4266 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4468 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4267 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4469 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4268 4470
4269 $w = int $w + 0.5; 4471 $w = int $w + 0.5;
4270 $h = int $h + 0.5; 4472 $h = int $h + 0.5;
4271 4473
4272 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4474 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4273 $widget->{old_w} = $widget->{w}; 4475 $widget->{old_w} = $widget->{w};
4274 $widget->{old_h} = $widget->{h}; 4476 $widget->{old_h} = $widget->{h};
4275 4477
4276 $widget->{w} = $w; 4478 $widget->{w} = $w;
4277 $widget->{h} = $h; 4479 $widget->{h} = $h;
4278 4480
4279 $widget->emit (size_allocate => $w, $h); 4481 $widget->emit (size_allocate => $w, $h);
4482 }
4280 } 4483 }
4281 } 4484 }
4282 } 4485 }
4283 4486
4284 while ($self->{post_alloc_hook}) { 4487 while ($self->{post_alloc_hook}) {

Diff Legend

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