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.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;
… …
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 { "\fw" => $_[0]{s_id} }
275} 275}
276 276
277sub show { 277sub show {
278 my ($self) = @_; 278 my ($self) = @_;
279 279
… …
358 358
359 $self->{force_w} = $w; 359 $self->{force_w} = $w;
360 $self->{force_h} = $h; 360 $self->{force_h} = $h;
361 361
362 $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)
363} 373}
364 374
365sub size_request { 375sub size_request {
366 require Carp; 376 require Carp;
367 Carp::confess "size_request is abstract"; 377 Carp::confess "size_request is abstract";
… …
547 557
548 # parent 558 # parent
549 $self->{parent} && $self->{parent}->emit ($signal, @args) 559 $self->{parent} && $self->{parent}->emit ($signal, @args)
550} 560}
551 561
552sub find_widget { 562#sub find_widget {
553 my ($self, $x, $y) = @_; 563# 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 564
564sub set_parent { 565sub set_parent {
565 my ($self, $parent) = @_; 566 my ($self, $parent) = @_;
566 567
567 CFPlus::weaken ($self->{parent} = $parent); 568 CFPlus::weaken ($self->{parent} = $parent);
… …
598 599
599# 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
600# functions seems pointless. 601# functions seems pointless.
601our ($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
602 603
603sub draw { 604#sub draw {
604 my ($self) = @_; 605#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 606
650sub _draw { 607sub _draw {
651 my ($self) = @_; 608 my ($self) = @_;
652 609
653 warn "no draw defined for $self\n"; 610 warn "no draw defined for $self\n";
654} 611}
655 612
656my $cntx;#d#
657sub DESTROY { 613sub DESTROY {
658 my ($self) = @_; 614 my ($self) = @_;
659 615
660 return if CFPlus::in_destruct; 616 return if CFPlus::in_destruct;
661 617
618 local $@;
662 eval { $self->destroy }; 619 eval { $self->destroy };
663 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 620 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
664 621
665 delete $WIDGET{$self+0}; 622 delete $WIDGET{$self+0};
666} 623}
… …
674use strict; 631use strict;
675use CFPlus::OpenGL; 632use CFPlus::OpenGL;
676 633
677sub new { 634sub new {
678 my $class = shift; 635 my $class = shift;
679
680 # range [value, low, high, page]
681 636
682 $class->SUPER::new ( 637 $class->SUPER::new (
683 #bg => [0, 0, 0, 0.2], 638 #bg => [0, 0, 0, 0.2],
684 #active_bg => [1, 1, 1, 0.5], 639 #active_bg => [1, 1, 1, 0.5],
685 @_ 640 @_
… …
697 my ($w, $h) = @$self{qw(w h)}; 652 my ($w, $h) = @$self{qw(w h)};
698 653
699 glEnable GL_BLEND; 654 glEnable GL_BLEND;
700 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 655 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
701 glColor_premultiply @$color; 656 glColor_premultiply @$color;
702
703 glBegin GL_QUADS;
704 glVertex 0 , 0;
705 glVertex 0 , $h;
706 glVertex $w, $h; 657 glRect 0, 0, $w, $h;
707 glVertex $w, 0;
708 glEnd;
709
710 glDisable GL_BLEND; 658 glDisable GL_BLEND;
711 } 659 }
712} 660}
713 661
714############################################################################# 662#############################################################################
… …
746 can_events => 0, 694 can_events => 0,
747 %arg, 695 %arg,
748 ); 696 );
749 697
750 $self->add (@$children) 698 $self->add (@$children)
751 if $children; 699 if $children && @$children;
752 700
753 $self 701 $self
754} 702}
755 703
756sub realloc { 704sub realloc {
… …
765 my ($self, @widgets) = @_; 713 my ($self, @widgets) = @_;
766 714
767 $_->set_parent ($self) 715 $_->set_parent ($self)
768 for @widgets; 716 for @widgets;
769 717
718 # TODO: only do this in widgets that need it, e.g. root, fixed
770 use sort 'stable'; 719 use sort 'stable';
771 720
772 $self->{children} = [ 721 $self->{children} = [
773 sort { $a->{z} <=> $b->{z} } 722 sort { $a->{z} <=> $b->{z} }
774 @{$self->{children}}, @widgets 723 @{$self->{children}}, @widgets
775 ]; 724 ];
776 725
777 $self->realloc; 726 $self->realloc;
727
728 $self->emit (c_add => \@widgets);
729
730 map $_+0, @widgets
778} 731}
779 732
780sub children { 733sub children {
781 @{ $_[0]{children} } 734 @{ $_[0]{children} }
782} 735}
783 736
784sub remove { 737sub remove {
785 my ($self, $child) = @_; 738 my ($self, @widgets) = @_;
786 739
740 $self->emit (c_remove => \@widgets);
741
742 for my $child (@widgets) {
787 delete $child->{parent}; 743 delete $child->{parent};
788 $child->hide; 744 $child->hide;
789
790 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 745 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
746 }
791 747
792 $self->realloc; 748 $self->realloc;
793} 749}
794 750
795sub clear { 751sub clear {
796 my ($self) = @_; 752 my ($self) = @_;
797 753
798 my $children = delete $self->{children}; 754 my $children = $self->{children};
799 $self->{children} = []; 755 $self->{children} = [];
800 756
801 for (@$children) { 757 for (@$children) {
802 delete $_->{parent}; 758 delete $_->{parent};
803 $_->hide; 759 $_->hide;
… …
823} 779}
824 780
825sub _draw { 781sub _draw {
826 my ($self) = @_; 782 my ($self) = @_;
827 783
828 $_->draw for @{$self->{children}}; 784 $_->draw for $self->visible_children;
829} 785}
830 786
831############################################################################# 787#############################################################################
832 788
833package CFPlus::UI::Bin; 789package CFPlus::UI::Bin;
… …
843} 799}
844 800
845sub add { 801sub add {
846 my ($self, $child) = @_; 802 my ($self, $child) = @_;
847 803
848 $self->SUPER::remove ($_) for @{ $self->{children} }; 804 $self->clear;
849 $self->SUPER::add ($child); 805 $self->SUPER::add ($child);
850} 806}
851 807
852sub remove { 808sub remove {
853 my ($self, $widget) = @_; 809 my ($self, $widget) = @_;
… …
871 827
872 1 828 1
873} 829}
874 830
875############################################################################# 831#############################################################################
876
877# back-buffered drawing area 832# back-buffered drawing area
878 833
879package CFPlus::UI::Window; 834package CFPlus::UI::Window;
880 835
881our @ISA = CFPlus::UI::Bin::; 836our @ISA = CFPlus::UI::Bin::;
… …
963sub size_request { 918sub size_request {
964 my ($self) = @_; 919 my ($self) = @_;
965 920
966 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 921 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
967 922
968 $w = 10 if $self->{scroll_x}; 923 $w = 1 if $self->{scroll_x};
969 $h = 10 if $self->{scroll_y}; 924 $h = 1 if $self->{scroll_y};
970 925
971 ($w, $h) 926 ($w, $h)
972} 927}
973 928
974sub invoke_size_allocate { 929sub invoke_size_allocate {
… …
998 $self->emit (changed => $x, $y); 953 $self->emit (changed => $x, $y);
999 $self->update; 954 $self->update;
1000 } 955 }
1001} 956}
1002 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);
973 }
974}
975
1003# 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
1004sub coord2local { 977sub coord2local {
1005 my ($self, $x, $y) = @_; 978 my ($self, $x, $y) = @_;
1006 979
1007 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y}) 980 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
… …
1020 my ($self, $x, $y) = @_; 993 my ($self, $x, $y) = @_;
1021 994
1022 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 995 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1023 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 996 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1024 ) { 997 ) {
1025 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 998 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1026 } else { 999 } else {
1027 $self->CFPlus::UI::Base::find_widget ($x, $y) 1000 $self->CFPlus::UI::Base::find_widget ($x, $y)
1028 } 1001 }
1029} 1002}
1030 1003
… …
1051 my $child = delete $arg{child}; 1024 my $child = delete $arg{child};
1052 1025
1053 my $self; 1026 my $self;
1054 1027
1055 my $hslider = new CFPlus::UI::Slider 1028 my $hslider = new CFPlus::UI::Slider
1029 c_col => 0,
1030 c_row => 1,
1056 vertical => 0, 1031 vertical => 0,
1057 range => [0, 0, 1, 0.01], # HACK fix 1032 range => [0, 0, 1, 0.01], # HACK fix
1058 on_changed => sub { 1033 on_changed => sub {
1059 $self->{hpos} = $_[1]; 1034 $self->{hpos} = $_[1];
1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1035 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1061 }, 1036 },
1062 ; 1037 ;
1063 1038
1064 my $vslider = new CFPlus::UI::Slider 1039 my $vslider = new CFPlus::UI::Slider
1040 c_col => 1,
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
1062 c_col => 0,
1063 c_row => 0,
1085 expand => 1, 1064 expand => 1,
1086 scroll_x => $self->{scroll_x}, 1065 scroll_x => $self->{scroll_x},
1087 scroll_y => $self->{scroll_y}, 1066 scroll_y => $self->{scroll_y},
1088 on_changed => sub { 1067 on_changed => sub {
1089 my ($vp, $x, $y) = @_; 1068 my ($vp, $x, $y) = @_;
… …
1091 $vp->{parent}{hslider}->set_value ($x); 1070 $vp->{parent}{hslider}->set_value ($x);
1092 $vp->{parent}{vslider}->set_value ($y); 1071 $vp->{parent}{vslider}->set_value ($y);
1093 1072
1094 0 1073 0
1095 }, 1074 },
1075 on_size_allocate => sub {
1076 my ($vp, $w, $h) = @_;
1077 $vp->{parent}->update_slider;
1078 0
1079 },
1096 ; 1080 ;
1097 1081
1098 $self->SUPER::add_at (0, 0, $self->{vp}); 1082 $self->SUPER::add ($self->{vp});
1099 1083
1100 $self->add ($child) if $child; 1084 $self->add ($child) if $child;
1101 1085
1102 $self 1086 $self
1103} 1087}
1104
1105#TODO# update range on size_allocate depending on child
1106 1088
1107sub add { 1089sub add {
1108 my ($self, $widget) = @_; 1090 my ($self, $widget) = @_;
1109 1091
1110 $self->{vp}->add ($self->{child} = $widget); 1092 $self->{vp}->add ($self->{child} = $widget);
1111} 1093}
1112 1094
1095sub set_offset { shift->{vp}->set_offset (@_) }
1096sub set_center { shift->{vp}->set_center (@_) }
1097sub make_visible { shift->{vp}->make_visible (@_) }
1098
1113sub update_slider { 1099sub update_slider {
1114 my ($self) = @_; 1100 my ($self) = @_;
1115 1101
1116 my $child = ($self->{vp} or return)->child; 1102 my $child = ($self->{vp} or return)->child;
1117 1103
1104 if ($self->{scroll_x}) {
1118 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1105 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1119 $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]);
1120 1107
1121 my $visible = $w1 > $w2; 1108 my $visible = $w1 > $w2;
1122 if ($visible != $self->{hslider}{visible}) { 1109 if ($visible != $self->{hslider_visible}) {
1110 $self->{hslider_visible} = $visible;
1123 $visible ? $self->SUPER::add_at (0, 1, $self->{hslider}) 1111 $visible ? $self->SUPER::add ($self->{hslider})
1124 : $self->{hslider}->hide; 1112 : $self->SUPER::remove ($self->{hslider});
1113 }
1125 } 1114 }
1126 1115
1116 if ($self->{scroll_y}) {
1127 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1117 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1128 $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]);
1129 1119
1130 my $visible = $h1 > $h2; 1120 my $visible = $h1 > $h2;
1131 if ($visible != $self->{vslider}{visible}) { 1121 if ($visible != $self->{vslider_visible}) {
1122 $self->{vslider_visible} = $visible;
1132 $visible ? $self->SUPER::add_at (1, 0, $self->{vslider}) 1123 $visible ? $self->SUPER::add ($self->{vslider})
1133 : $self->{vslider}->hide; 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);
1134 } 1144 };
1135}
1136
1137sub update {
1138 my ($self) = @_;
1139
1140 $self->SUPER::update;
1141 $self->update_slider;
1142} 1145}
1143 1146
1144sub invoke_mouse_wheel { 1147sub invoke_mouse_wheel {
1145 my ($self, $ev) = @_; 1148 my ($self, $ev) = @_;
1146 1149
1147 return 0 unless $ev->{dy}; # only vertical movements for now
1148
1149 $self->{vslider}->emit (mouse_wheel => $ev); 1150 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1151 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1150 1152
1151 1 1153 1
1152} 1154}
1153 1155
1154sub invoke_button_down { 1156sub invoke_button_down {
1155 my ($self, $ev, $x, $y) = @_; 1157 my ($self, $ev, $x, $y) = @_;
1156 1158
1157 if ($ev->{button} == 2) { 1159 if ($ev->{button} == 2) {
1158 $self->grab_focus; 1160 $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; 1161 return 1;
1171 } 1162 }
1172 1163
1173 0 1164 0
1174} 1165}
… …
1225 my ($w, $h) = @$self{qw(w h)}; 1216 my ($w, $h) = @$self{qw(w h)};
1226 1217
1227 glEnable GL_BLEND; 1218 glEnable GL_BLEND;
1228 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1219 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1229 glColor_premultiply @{ $self->{bg} }; 1220 glColor_premultiply @{ $self->{bg} };
1230
1231 glBegin GL_QUADS;
1232 glVertex 0 , 0;
1233 glVertex 0 , $h;
1234 glVertex $w, $h; 1221 glRect 0, 0, $w, $h;
1235 glVertex $w, 0;
1236 glEnd;
1237
1238 glDisable GL_BLEND; 1222 glDisable GL_BLEND;
1239 } 1223 }
1240 1224
1241 $self->SUPER::_draw; 1225 $self->SUPER::_draw;
1242} 1226}
… …
1403 1387
1404sub border { 1388sub border {
1405 int $_[0]{border} * $::FONTSIZE 1389 int $_[0]{border} * $::FONTSIZE
1406} 1390}
1407 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
1408sub size_request { 1401sub size_request {
1409 my ($self) = @_; 1402 my ($self) = @_;
1410 1403
1411 $self->{title_widget}->size_request 1404 $self->{title_widget}->size_request
1412 if $self->{title_widget}; 1405 if $self->{title_widget};
… …
1584 1577
1585############################################################################# 1578#############################################################################
1586 1579
1587package CFPlus::UI::Table; 1580package CFPlus::UI::Table;
1588 1581
1589our @ISA = CFPlus::UI::Base::; 1582our @ISA = CFPlus::UI::Container::;
1590 1583
1591use List::Util qw(max sum); 1584use List::Util qw(max sum);
1592 1585
1593use CFPlus::OpenGL; 1586use CFPlus::OpenGL;
1594 1587
1595sub new { 1588sub new {
1596 my $class = shift; 1589 my $class = shift;
1597 1590
1598 $class->SUPER::new ( 1591 $class->SUPER::new (
1599 children => [],
1600 col_expand => [], 1592 col_expand => [],
1601 row_expand => [], 1593 row_expand => [],
1602 @_, 1594 @_,
1603 ) 1595 )
1604} 1596}
1605 1597
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 { 1598sub add {
1612 my $self = shift; 1599 my ($self, @widgets) = @_;
1613 1600
1614 Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d# 1601 for my $child (@widgets) {
1615 $self->add_at (@_); 1602 $child->{c_rowspan} ||= 1;
1603 $child->{c_colspan} ||= 1;
1604 }
1605
1606 $self->SUPER::add (@widgets);
1616} 1607}
1617 1608
1618sub add_at { 1609sub add_at {
1619 my $self = shift; 1610 my $self = shift;
1620 1611
1612 my @widgets;
1613
1621 while (@_) { 1614 while (@_) {
1622 my ($col, $row, $child) = splice @_, 0, 3, (); 1615 my ($col, $row, $child) = splice @_, 0, 3, ();
1623 1616
1624 $child->set_parent ($self); 1617 $child->{c_row} = $row;
1625 $self->{children}[$row][$col] = $child; 1618 $child->{c_col} = $col;
1626 }
1627 1619
1628 $self->{force_realloc} = 1; 1620 push @widgets, $child;
1629 $self->{force_size_alloc} = 1; 1621 }
1630 $self->realloc;
1631}
1632 1622
1633sub remove { 1623 $self->add (@widgets);
1624}
1625
1626sub get_wh {
1634 my ($self, $child) = @_; 1627 my ($self) = @_;
1635 1628
1636 for (@{ $self->{children} }) { 1629 my (@w, @h);
1637 for (@{ $_ || [] }) { 1630
1638 $_ = undef if $_ == $child; 1631 my @children = $self->children;
1632
1633 # first pass, columns
1634 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1635 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1636
1637 my $sw = sum @w[$c .. $c + $cs - 1];
1638
1639 if ($w > $sw) {
1640 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1639 } 1641 }
1640 } 1642 }
1641}
1642 1643
1643# TODO: move to container class maybe? send children a signal on removal? 1644 # second pass, rows
1644sub clear { 1645 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)}; 1646 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1671 1647
1672 $w[$x] = max $w[$x], $w; 1648 my $sh = sum @h[$r .. $r + $rs - 1];
1673 $h[$y] = max $h[$y], $h; 1649
1650 if ($h > $sh) {
1651 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1674 } 1652 }
1675 } 1653 }
1676 1654
1677 (\@w, \@h) 1655 (\@w, \@h)
1678} 1656}
… …
1694 my ($ws, $hs) = $self->get_wh; 1672 my ($ws, $hs) = $self->get_wh;
1695 1673
1696 my $req_w = (sum @$ws) || 1; 1674 my $req_w = (sum @$ws) || 1;
1697 my $req_h = (sum @$hs) || 1; 1675 my $req_h = (sum @$hs) || 1;
1698 1676
1699 # TODO: nicer code 1677 # now linearly scale the rows/columns to the allocated size
1700 my @col_expand = @{$self->{col_expand}}; 1678 my @col_expand = @{$self->{col_expand}};
1701 @col_expand = (1) x @$ws unless @col_expand; 1679 @col_expand = (1) x @$ws unless @col_expand;
1702 my $col_expand = (sum @col_expand) || 1; 1680 my $col_expand = (sum @col_expand) || 1;
1703 1681
1704 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1682 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
… …
1711 1689
1712 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1690 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1713 1691
1714 CFPlus::UI::harmonize $hs; 1692 CFPlus::UI::harmonize $hs;
1715 1693
1716 my $y; 1694 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1695 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1717 1696
1718 for my $r (0 .. $#{$self->{children}}) { 1697 for my $widget ($self->children) {
1719 my $row = $self->{children}[$r] 1698 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 1699
1722 my $x = 0; 1700 $widget->configure (
1723 my $row_h = $hs->[$r]; 1701 $x[$c], $y[$r],
1702 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1724 1703 );
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 } 1704 }
1737 1705
1738 1 1706 1
1739} 1707}
1740 1708
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############################################################################# 1709#############################################################################
1766 1710
1767package CFPlus::UI::Fixed; 1711package CFPlus::UI::Fixed;
1768 1712
1769use List::Util qw(min max); 1713use List::Util qw(min max);
1770 1714
1771our @ISA = CFPlus::UI::Container::; 1715our @ISA = CFPlus::UI::Container::;
1772 1716
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($$$) { 1717sub _scale($$$) {
1781 my ($mode, $val, $max) = @_; 1718 my ($rel, $val, $max) = @_;
1782 1719
1783 $mode eq "abs" ? $val 1720 $rel ? $val * $max : $val
1784 : $mode eq "rel" ? $val * $max
1785 : 0
1786} 1721}
1787 1722
1788sub size_request { 1723sub size_request {
1789 my ($self) = @_; 1724 my ($self) = @_;
1790 1725
1791 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1726 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1792 1727
1793 # determine overall size by querying abs widgets 1728 # determine overall size by querying abs widgets
1794 for my $child ($self->visible_children) { 1729 for my $child ($self->visible_children) {
1795 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};
1796 1733
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; 1734 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1802 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1735 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1803 } 1736 }
1804 } 1737 }
1805 1738
1806 my $W = $x2 - $x1; 1739 my $W = $x2 - $x1;
1807 my $H = $y2 - $y1; 1740 my $H = $y2 - $y1;
1808 1741
1809 # now layout remaining widgets 1742 # now layout remaining widgets
1810 for my $child ($self->visible_children) { 1743 for my $child ($self->visible_children) {
1811 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;
1812 1747
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; 1748 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1820 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1749 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1821 } 1750 }
1822 } 1751 }
1823 1752
1824 my $W = $x2 - $x1; 1753 my $W = $x2 - $x1;
1825 my $H = $y2 - $y1; 1754 my $H = $y2 - $y1;
… …
1829 1758
1830sub invoke_size_allocate { 1759sub invoke_size_allocate {
1831 my ($self, $W, $H) = @_; 1760 my ($self, $W, $H) = @_;
1832 1761
1833 for my $child ($self->visible_children) { 1762 for my $child ($self->visible_children) {
1834 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;
1835 1765
1836 $x = _scale $pos, $x, $W; 1766 $x += $child->{c_halign} * $child->{req_w};
1837 $y = _scale $pos, $x, $H; 1767 $y += $child->{c_valign} * $child->{req_h};
1838 $w = _scale $size, $w, $child->{req_w};
1839 $h = _scale $size, $h, $child->{req_h};
1840 1768
1841 $child->configure ($x, $y, $w, $h); 1769 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1842 } 1770 }
1843 1771
1844 1 1772 1
1845} 1773}
1846 1774
… …
1850 1778
1851our @ISA = CFPlus::UI::Container::; 1779our @ISA = CFPlus::UI::Container::;
1852 1780
1853sub size_request { 1781sub size_request {
1854 my ($self) = @_; 1782 my ($self) = @_;
1783
1784 my @children = $self->visible_children;
1855 1785
1856 $self->{vertical} 1786 $self->{vertical}
1857 ? ( 1787 ? (
1858 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1788 (List::Util::max map $_->{req_w}, @children),
1859 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1789 (List::Util::sum map $_->{req_h}, @children),
1860 ) 1790 )
1861 : ( 1791 : (
1862 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1792 (List::Util::sum map $_->{req_w}, @children),
1863 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1793 (List::Util::max map $_->{req_h}, @children),
1864 ) 1794 )
1865} 1795}
1866 1796
1867sub invoke_size_allocate { 1797sub invoke_size_allocate {
1868 my ($self, $w, $h) = @_; 1798 my ($self, $w, $h) = @_;
… …
1992 1922
1993 delete $self->{ox}; 1923 delete $self->{ox};
1994 $self->SUPER::realloc; 1924 $self->SUPER::realloc;
1995} 1925}
1996 1926
1927sub clear {
1928 my ($self) = @_;
1929
1930 $self->set_text ("");
1931}
1932
1997sub set_text { 1933sub set_text {
1998 my ($self, $text) = @_; 1934 my ($self, $text) = @_;
1999 1935
2000 return if $self->{text} eq "T$text"; 1936 return if $self->{text} eq "T$text";
2001 $self->{text} = "T$text"; 1937 $self->{text} = "T$text";
… …
2024 1960
2025sub size_request { 1961sub size_request {
2026 my ($self) = @_; 1962 my ($self) = @_;
2027 1963
2028 $self->{size_req} ||= do { 1964 $self->{size_req} ||= do {
1965 my ($max_w, $max_h) = $self->get_max_wh;
1966
2029 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1967 $self->{layout}->set_font ($self->{font}) if $self->{font};
2030 $self->{layout}->set_width ($self->{max_w} || -1); 1968 $self->{layout}->set_width ($self->{max_w} || $max_w || -1);
2031 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1969 $self->{layout}->set_ellipsise ($self->{ellipsise});
2032 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1970 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
2033 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1971 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2034 1972
2035 my ($w, $h) = $self->{layout}->size; 1973 my ($w, $h) = $self->{layout}->size;
… …
2107 : ($self->{w} - $size->[0]) * 0.5); 2045 : ($self->{w} - $size->[0]) * 0.5);
2108 2046
2109 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2047 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2110 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2048 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2111 : ($self->{h} - $size->[1]) * 0.5); 2049 : ($self->{h} - $size->[1]) * 0.5);
2050
2051 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2112 }; 2052 };
2113 2053
2114 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2054# unless ($self->{list}) {
2115 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2055# $self->{list} = CFPlus::OpenGL::glGenList;
2116 2056# CFPlus::OpenGL::glNewList $self->{list};
2117 $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;
2118} 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#}
2119 2073
2120############################################################################# 2074#############################################################################
2121 2075
2122package CFPlus::UI::EntryBase; 2076package CFPlus::UI::EntryBase;
2123 2077
… …
2129 my $class = shift; 2083 my $class = shift;
2130 2084
2131 $class->SUPER::new ( 2085 $class->SUPER::new (
2132 fg => [1, 1, 1], 2086 fg => [1, 1, 1],
2133 bg => [0, 0, 0, 0.2], 2087 bg => [0, 0, 0, 0.2],
2088 outline => [0.6, 0.3, 0.1],
2134 active_bg => [1, 1, 1, 0.5], 2089 active_bg => [0, 0, 1, .2],
2135 active_fg => [0, 0, 0], 2090 active_fg => [1, 1, 1],
2091 active_outline => [1, 1, 0],
2136 can_hover => 1, 2092 can_hover => 1,
2137 can_focus => 1, 2093 can_focus => 1,
2138 valign => 0, 2094 valign => 0,
2139 can_events => 1, 2095 can_events => 1,
2140 ellipsise => 0, 2096 ellipsise => 0,
… …
2280 glColor_premultiply @{$self->{bg}}; 2236 glColor_premultiply @{$self->{bg}};
2281 } 2237 }
2282 2238
2283 glEnable GL_BLEND; 2239 glEnable GL_BLEND;
2284 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2240 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}; 2241 glRect 0, 0, $self->{w}, $self->{h};
2289 glVertex $self->{w}, 0;
2290 glEnd;
2291 glDisable GL_BLEND; 2242 glDisable GL_BLEND;
2292 2243
2293 $self->SUPER::_draw; 2244 $self->SUPER::_draw;
2294 2245
2295 #TODO: force update every cursor change :( 2246 #TODO: force update every cursor change :(
… …
2297 2248
2298 unless (exists $self->{cur_h}) { 2249 unless (exists $self->{cur_h}) {
2299 my $text = substr $self->{text}, 0, $self->{cursor}; 2250 my $text = substr $self->{text}, 0, $self->{cursor};
2300 utf8::encode $text; 2251 utf8::encode $text;
2301 2252
2302 @$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);
2303 } 2254 }
2304 2255
2256 glColor_premultiply @{$self->{active_fg}};
2305 glBegin GL_LINES; 2257 glBegin GL_LINES;
2306 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};
2307 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;
2308 glEnd; 2274 glEnd;
2309 } 2275 }
2310} 2276}
2311 2277
2312############################################################################# 2278#############################################################################
… …
2399 1 2365 1
2400} 2366}
2401 2367
2402############################################################################# 2368#############################################################################
2403 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
2404package CFPlus::UI::Button; 2419package CFPlus::UI::Button;
2405 2420
2406our @ISA = CFPlus::UI::Label::; 2421our @ISA = CFPlus::UI::Label::;
2407 2422
2408use CFPlus::OpenGL; 2423use CFPlus::OpenGL;
… …
2512sub _draw { 2527sub _draw {
2513 my ($self) = @_; 2528 my ($self) = @_;
2514 2529
2515 $self->SUPER::_draw; 2530 $self->SUPER::_draw;
2516 2531
2517 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2532 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2518 2533
2519 my ($w, $h) = @$self{qw(w h)}; 2534 my ($w, $h) = @$self{qw(w h)};
2520 2535
2521 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;
2522 2537
… …
2542sub new { 2557sub new {
2543 my $class = shift; 2558 my $class = shift;
2544 2559
2545 my $self = $class->SUPER::new ( 2560 my $self = $class->SUPER::new (
2546 can_events => 0, 2561 can_events => 0,
2562 scale => 1,
2547 @_, 2563 @_,
2548 ); 2564 );
2549 2565
2550 $self->{path} || $self->{tex} 2566 $self->{path} || $self->{tex}
2551 or Carp::croak "'path' or 'tex' attributes required"; 2567 or Carp::croak "'path' or 'tex' attributes required";
… …
2576} 2592}
2577 2593
2578sub size_request { 2594sub size_request {
2579 my ($self) = @_; 2595 my ($self) = @_;
2580 2596
2581 ($self->{tex}{w}, $self->{tex}{h}) 2597 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2582} 2598}
2583 2599
2584sub _draw { 2600sub _draw {
2585 my ($self) = @_; 2601 my ($self) = @_;
2586 2602
… …
2596 } 2612 }
2597 2613
2598 glEnable GL_TEXTURE_2D; 2614 glEnable GL_TEXTURE_2D;
2599 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2615 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2600 2616
2601 $tex->draw_quad (0, 0, $w, $h); 2617 $tex->draw_quad_alpha (0, 0, $w, $h);
2602 2618
2603 glDisable GL_TEXTURE_2D; 2619 glDisable GL_TEXTURE_2D;
2604} 2620}
2605 2621
2606############################################################################# 2622#############################################################################
… …
2625 align => 0, 2641 align => 0,
2626 valign => 0, 2642 valign => 0,
2627 can_events => 1, 2643 can_events => 1,
2628 @_ 2644 @_
2629 ); 2645 );
2646}
2647
2648sub invoke_button_down {
2649 my ($self, $ev, $x, $y) = @_;
2650
2651 1
2630} 2652}
2631 2653
2632sub invoke_button_up { 2654sub invoke_button_up {
2633 my ($self, $ev, $x, $y) = @_; 2655 my ($self, $ev, $x, $y) = @_;
2634 2656
… …
2774 glDisable GL_TEXTURE_2D; 2796 glDisable GL_TEXTURE_2D;
2775} 2797}
2776 2798
2777############################################################################# 2799#############################################################################
2778 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
2779package CFPlus::UI::Gauge; 2939package CFPlus::UI::Gauge;
2780 2940
2781our @ISA = CFPlus::UI::VBox::; 2941our @ISA = CFPlus::UI::VBox::;
2782 2942
2783sub new { 2943sub new {
… …
2908 3068
2909 $self->SUPER::invoke_button_down ($ev, $x, $y); 3069 $self->SUPER::invoke_button_down ($ev, $x, $y);
2910 3070
2911 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3071 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2912 3072
2913 $self->invoke_mouse_motion ($ev, $x, $y) 3073 $self->invoke_mouse_motion ($ev, $x, $y);
3074
3075 1
2914} 3076}
2915 3077
2916sub invoke_mouse_motion { 3078sub invoke_mouse_motion {
2917 my ($self, $ev, $x, $y) = @_; 3079 my ($self, $ev, $x, $y) = @_;
2918 3080
… …
2938 3100
2939 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3101 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2940 3102
2941 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3103 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2942 3104
2943 ! ! $delta 3105 1
2944} 3106}
2945 3107
2946sub update { 3108sub update {
2947 my ($self) = @_; 3109 my ($self) = @_;
2948 3110
… …
3079} 3241}
3080 3242
3081sub size_request { 3243sub size_request {
3082 my ($self) = @_; 3244 my ($self) = @_;
3083 3245
3084 my ($empty, $slider) = @{ $self->{children} }; 3246 my ($empty, $slider) = $self->visible_children;
3085 3247
3086 local $self->{children} = [$empty, $slider]; 3248 local $self->{children} = [$empty, $slider];
3087 $self->SUPER::size_request 3249 $self->SUPER::size_request
3088} 3250}
3089 3251
… …
3278 3440
3279 if ($y0 < $y + $h && $y < $y1) { 3441 if ($y0 < $y + $h && $y < $y1) {
3280 my $layout = $self->get_layout ($para); 3442 my $layout = $self->get_layout ($para);
3281 3443
3282 $layout->render ($para->{indent}, $y - $y0); 3444 $layout->render ($para->{indent}, $y - $y0);
3445 $layout->draw;
3283 3446
3284 if (my @w = @{ $para->{widget} }) { 3447 if (my @w = @{ $para->{widget} }) {
3285 my @s = $layout->get_shapes; 3448 my @s = $layout->get_shapes;
3286 3449
3287 for (@w) { 3450 for (@w) {
… …
3409} 3572}
3410 3573
3411sub set_tooltip_from { 3574sub set_tooltip_from {
3412 my ($self, $widget) = @_; 3575 my ($self, $widget) = @_;
3413 3576
3414 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3415 if $widget->{tooltip} =~ /^#(.*)$/;
3416
3417 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 =~ /^#(.*)$/;
3418 3582
3419 if ($ENV{CFPLUS_DEBUG} & 2) { 3583 if ($ENV{CFPLUS_DEBUG} & 2) {
3420 $tooltip .= "\n\n" . (ref $widget) . "\n" 3584 $tip .= "\n\n" . (ref $widget) . "\n"
3421 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3585 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3422 . "req $widget->{req_w} $widget->{req_h}\n" 3586 . "req $widget->{req_w} $widget->{req_h}\n"
3423 . "visible $widget->{visible}"; 3587 . "visible $widget->{visible}";
3424 } 3588 }
3425 3589
3426 $tooltip =~ s/^\n+//; 3590 $tip =~ s/^\n+//;
3427 $tooltip =~ s/\n+$//; 3591 $tip =~ s/\n+$//;
3428 3592
3429 $self->add (new CFPlus::UI::Label 3593 $self->add (new CFPlus::UI::Label
3430 markup => $tooltip, 3594 markup => $tip,
3431 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3595 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3432 fontsize => 0.8, 3596 fontsize => 0.8,
3433 style => 1, # FLAG_INVERSE 3597 style => 1, # FLAG_INVERSE
3434 ellipsise => 0, 3598 ellipsise => 0,
3435 font => ($widget->{tooltip_font} || $::FONT_PROP), 3599 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
3473} 3637}
3474 3638
3475sub _draw { 3639sub _draw {
3476 my ($self) = @_; 3640 my ($self) = @_;
3477 3641
3478 glTranslate 0.375, 0.375;
3479
3480 my ($w, $h) = @$self{qw(w h)}; 3642 my ($w, $h) = @$self{qw(w h)};
3481 3643
3482 glColor 1, 0.8, 0.4; 3644 glColor 1, 0.8, 0.4;
3483 glBegin GL_QUADS; 3645 glRect 0, 0, $w, $h;
3484 glVertex 0 , 0;
3485 glVertex 0 , $h;
3486 glVertex $w, $h;
3487 glVertex $w, 0;
3488 glEnd;
3489 3646
3490 glColor 0, 0, 0; 3647 glColor 0, 0, 0;
3491 glBegin GL_LINE_LOOP; 3648 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 3649
3498 glTranslate 2 - 0.375, 2 - 0.375; 3650 glTranslate 2, 2;
3499 3651
3500 $self->SUPER::_draw; 3652 $self->SUPER::_draw;
3501} 3653}
3502 3654
3503############################################################################# 3655#############################################################################
… …
3521 3673
3522 if ($self->{anim} && $self->{animspeed}) { 3674 if ($self->{anim} && $self->{animspeed}) {
3523 CFPlus::weaken (my $widget = $self); 3675 CFPlus::weaken (my $widget = $self);
3524 3676
3525 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3677 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3526 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed}; 3678 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3527 $self->{timer} = Event->timer ( 3679 $self->{timer} = Event->timer (
3528 parked => 1, 3680 parked => 1,
3529 cb => sub { 3681 cb => sub {
3530 return unless $::CONN && $widget; 3682 return unless $::CONN;
3531 3683
3684 my $w = $widget
3685 or return;
3686
3532 ++$widget->{frame}; 3687 ++$w->{frame};
3533 $widget->update_face; 3688 $w->update_face;
3689
3690 # somehow, $widget can go away
3534 $widget->update; 3691 $w->update;
3535
3536 $widget->update_timer; 3692 $w->update_timer;
3537 }, 3693 },
3538 ); 3694 );
3539 3695
3540 $self->update_face; 3696 $self->update_face;
3541 $self->update_timer; 3697 $self->update_timer;
… …
3562} 3718}
3563 3719
3564sub update_face { 3720sub update_face {
3565 my ($self) = @_; 3721 my ($self) = @_;
3566 3722
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) { 3723 if ($::CONN) {
3581 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3724 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3582 if (my $tex = $::CONN->{texture}[$faceid]) { 3725 if ($anim && @$anim) {
3583 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3726 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3584 } else { 3727 delete $self->{face_change_cb};
3585 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3728
3586 $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 }
3587 }); 3733 }
3588 } 3734 }
3589 } 3735 }
3590 } 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 }
3591 3755
3592 ($self->{size_w} || 8, $self->{size_h} || 8) 3756 ($self->{size_w} || 8, $self->{size_h} || 8)
3593} 3757}
3594 3758
3595sub update { 3759sub update {
… …
3609} 3773}
3610 3774
3611sub _draw { 3775sub _draw {
3612 my ($self) = @_; 3776 my ($self) = @_;
3613 3777
3614 return unless $::CONN;
3615
3616 $self->SUPER::_draw; 3778 $self->SUPER::_draw;
3617 3779
3618 my $faceid = $::CONN->{faceid}[$self->{face}] 3780 if (my $tex = $self->{tex}) {
3619 or return;
3620
3621 my $tex = $::CONN->{texture}[$faceid];
3622
3623 if ($tex) {
3624 glEnable GL_TEXTURE_2D; 3781 glEnable GL_TEXTURE_2D;
3625 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3782 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3626 glColor 0, 0, 0, 1; 3783 glColor 0, 0, 0, 1;
3627 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3784 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3628 glDisable GL_TEXTURE_2D; 3785 glDisable GL_TEXTURE_2D;
… …
3680 children => [ 3837 children => [
3681 (new CFPlus::UI::Label markup => $left, expand => 1), 3838 (new CFPlus::UI::Label markup => $left, expand => 1),
3682 (new CFPlus::UI::Label markup => $right, align => +1), 3839 (new CFPlus::UI::Label markup => $right, align => +1),
3683 ], 3840 ],
3684 ; 3841 ;
3685 3842
3686 } else { 3843 } else {
3687 $widget = new CFPlus::UI::Label 3844 $widget = new CFPlus::UI::Label
3688 can_hover => 1, 3845 can_hover => 1,
3689 can_events => 1, 3846 can_events => 1,
3690 markup => $widget, 3847 markup => $widget,
… …
3815 3972
3816############################################################################# 3973#############################################################################
3817 3974
3818package CFPlus::UI::Notebook; 3975package CFPlus::UI::Notebook;
3819 3976
3977use CFPlus::OpenGL;
3978
3820our @ISA = CFPlus::UI::VBox::; 3979our @ISA = CFPlus::UI::VBox::;
3821 3980
3822sub new { 3981sub new {
3823 my $class = shift; 3982 my $class = shift;
3824 3983
3825 my $self = $class->SUPER::new ( 3984 my $self = $class->SUPER::new (
3826 buttonbar => (new CFPlus::UI::Buttonbar), 3985 buttonbar => (new CFPlus::UI::Buttonbar),
3827 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3986 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3987 active_outline => [.7, .7, 0.2],
3828 # filter => # will be put between multiplexer and $self 3988 # filter => # will be put between multiplexer and $self
3829 @_, 3989 @_,
3830 ); 3990 );
3831 3991
3832 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3992 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3833 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3993 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3834 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
3835 $self 4029 $self
3836} 4030}
3837 4031
3838sub 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 {
3839 my ($self, $title, $widget, $tooltip) = @_; 4050 my ($self, $title, $widget, $tooltip) = @_;
3840 4051
3841 CFPlus::weaken $self; 4052 $title = [$title, $tooltip] unless ref $title;
4053 $widget->{c_tab} = $title;
3842 4054
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); 4055 $self->add ($widget);
3850} 4056}
3851 4057
3852sub get_current_page { 4058sub get_current_page {
3853 my ($self) = @_; 4059 my ($self) = @_;
3854 4060
… …
3858sub set_current_page { 4064sub set_current_page {
3859 my ($self, $page) = @_; 4065 my ($self, $page) = @_;
3860 4066
3861 $self->{multiplexer}->set_current_page ($page); 4067 $self->{multiplexer}->set_current_page ($page);
3862 $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 }
3863} 4089}
3864 4090
3865############################################################################# 4091#############################################################################
3866 4092
3867package CFPlus::UI::Selector; 4093package CFPlus::UI::Selector;
… …
3899} 4125}
3900 4126
3901sub _set_value { 4127sub _set_value {
3902 my ($self, $value) = @_; 4128 my ($self, $value) = @_;
3903 4129
3904 my ($item) = grep $_->[0] eq $value, @{ $self->{options} } 4130 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4131 $item ||= $self->{options}[0]
3905 or return; 4132 or return;
3906 4133
3907 $self->{value} = $item->[0]; 4134 $self->{value} = $item->[0];
3908 $self->set_markup ("$item->[1] ⇓"); 4135 $self->set_markup ("$item->[1] ⇓");
3909 $self->set_tooltip ($item->[2]); 4136# $self->set_tooltip ($item->[2]);
3910} 4137}
3911 4138
3912sub set_value { 4139sub set_value {
3913 my ($self, $value) = @_; 4140 my ($self, $value) = @_;
3914 4141
3915 return unless $self->{value} ne $value; 4142 return unless $self->{value} ne $value;
3916 4143
3917 $self->_set_value ($value); 4144 $self->_set_value ($value);
3918 $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});
3919} 4153}
3920 4154
3921############################################################################# 4155#############################################################################
3922 4156
3923package CFPlus::UI::Statusbox; 4157package CFPlus::UI::Statusbox;
… …
4137} 4371}
4138 4372
4139sub update { 4373sub update {
4140 my ($self) = @_; 4374 my ($self) = @_;
4141 4375
4142 $::WANT_REFRESH++; 4376 $::WANT_REFRESH->start;
4143} 4377}
4144 4378
4145sub add { 4379sub add {
4146 my ($self, @children) = @_; 4380 my ($self, @children) = @_;
4147 4381
… …
4184 while ($self->{refresh_hook}) { 4418 while ($self->{refresh_hook}) {
4185 $_->() 4419 $_->()
4186 for values %{delete $self->{refresh_hook}}; 4420 for values %{delete $self->{refresh_hook}};
4187 } 4421 }
4188 4422
4189 if ($self->{realloc}) { 4423 while ($self->{realloc}) {
4190 my %queue; 4424 my %queue;
4191 my @queue; 4425 my @queue;
4192 my $widget; 4426 my $widget;
4193 4427
4194 outer: 4428 outer:
… …
4241 } 4475 }
4242 } 4476 }
4243 4477
4244 delete $self->{realloc}{$widget+0}; 4478 delete $self->{realloc}{$widget+0};
4245 } 4479 }
4246 }
4247 4480
4248 while (my $size_alloc = delete $self->{size_alloc}) { 4481 while (my $size_alloc = delete $self->{size_alloc}) {
4249 my @queue = sort { $b->{visible} <=> $a->{visible} } 4482 my @queue = sort { $a->{visible} <=> $b->{visible} }
4250 values %$size_alloc; 4483 values %$size_alloc;
4251 4484
4252 while () { 4485 while () {
4253 my $widget = pop @queue || last; 4486 my $widget = pop @queue || last;
4254 4487
4255 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4488 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4256 4489
4257 $w = 0 if $w < 0;
4258 $h = 0 if $h < 0;
4259
4260 $w = max $widget->{min_w}, $w; 4490 $w = max $widget->{min_w}, $w;
4261 $h = max $widget->{min_h}, $h; 4491 $h = max $widget->{min_h}, $h;
4262 4492
4263# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4493# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4264# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4494# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4265 4495
4266 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4496 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4267 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4497 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4268 4498
4269 $w = int $w + 0.5; 4499 $w = int $w + 0.5;
4270 $h = int $h + 0.5; 4500 $h = int $h + 0.5;
4271 4501
4272 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}) {
4273 $widget->{old_w} = $widget->{w}; 4503 $widget->{old_w} = $widget->{w};
4274 $widget->{old_h} = $widget->{h}; 4504 $widget->{old_h} = $widget->{h};
4275 4505
4276 $widget->{w} = $w; 4506 $widget->{w} = $w;
4277 $widget->{h} = $h; 4507 $widget->{h} = $h;
4278 4508
4279 $widget->emit (size_allocate => $w, $h); 4509 $widget->emit (size_allocate => $w, $h);
4510 }
4280 } 4511 }
4281 } 4512 }
4282 } 4513 }
4283 4514
4284 while ($self->{post_alloc_hook}) { 4515 while ($self->{post_alloc_hook}) {

Diff Legend

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