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.371 by root, Sun Jul 15 22:07:48 2007 UTC vs.
Revision 1.435 by root, Wed Aug 22 21:40:43 2007 UTC

… …
30 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner}; 31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32 32
33 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
34 34
35 my $tip = $widget->{tooltip};
36
37 $tip = $tip->($widget) if CODE:: eq ref $tip;
38
39 $TOOLTIP->set_tooltip_from ($widget); 35 $TOOLTIP->set_tooltip_from ($widget);
40 $TOOLTIP->show; 36 $TOOLTIP->show;
41 } 37 }
42 38
43 return; 39 return;
… …
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) = @_;
… …
943} 889}
944 890
945############################################################################# 891#############################################################################
946 892
947package CFPlus::UI::ViewPort; 893package CFPlus::UI::ViewPort;
894
895use List::Util qw(min max);
948 896
949our @ISA = CFPlus::UI::Window::; 897our @ISA = CFPlus::UI::Window::;
950 898
951sub new { 899sub new {
952 my $class = shift; 900 my $class = shift;
… …
961sub size_request { 909sub size_request {
962 my ($self) = @_; 910 my ($self) = @_;
963 911
964 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 912 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
965 913
966 $w = 10 if $self->{scroll_x}; 914 $w = 1 if $self->{scroll_x};
967 $h = 10 if $self->{scroll_y}; 915 $h = 1 if $self->{scroll_y};
968 916
969 ($w, $h) 917 ($w, $h)
970} 918}
971 919
972sub invoke_size_allocate { 920sub invoke_size_allocate {
… …
984} 932}
985 933
986sub set_offset { 934sub set_offset {
987 my ($self, $x, $y) = @_; 935 my ($self, $x, $y) = @_;
988 936
937 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
938 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
939
940 if ($x != $self->{view_x} or $y != $self->{view_y}) {
989 $self->{view_x} = int $x; 941 $self->{view_x} = $x;
990 $self->{view_y} = int $y; 942 $self->{view_y} = $y;
991 943
944 $self->emit (changed => $x, $y);
992 $self->update; 945 $self->update;
946 }
947}
948
949sub set_center {
950 my ($self, $x, $y) = @_;
951
952 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
953}
954
955sub make_visible {
956 my ($self, $x, $y, $border) = @_;
957
958 if ( $x < $self->{view_x} + $self->{w} * $border
959 || $x > $self->{view_x} + $self->{w} * (1 - $border)
960 || $y < $self->{view_y} + $self->{h} * $border
961 || $y > $self->{view_y} + $self->{h} * (1 - $border)
962 ) {
963 $self->set_center ($x, $y);
964 }
993} 965}
994 966
995# 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
996sub coord2local { 968sub coord2local {
997 my ($self, $x, $y) = @_; 969 my ($self, $x, $y) = @_;
… …
1012 my ($self, $x, $y) = @_; 984 my ($self, $x, $y) = @_;
1013 985
1014 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 986 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1015 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 987 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1016 ) { 988 ) {
1017 $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})
1018 } else { 990 } else {
1019 $self->CFPlus::UI::Base::find_widget ($x, $y) 991 $self->CFPlus::UI::Base::find_widget ($x, $y)
1020 } 992 }
1021} 993}
1022 994
… …
1043 my $child = delete $arg{child}; 1015 my $child = delete $arg{child};
1044 1016
1045 my $self; 1017 my $self;
1046 1018
1047 my $hslider = new CFPlus::UI::Slider 1019 my $hslider = new CFPlus::UI::Slider
1020 c_col => 0,
1021 c_row => 1,
1048 vertical => 0, 1022 vertical => 0,
1049 range => [0, 0, 1, 0.01], # HACK fix 1023 range => [0, 0, 1, 0.01], # HACK fix
1050 on_changed => sub { 1024 on_changed => sub {
1051 $self->{hpos} = $_[1]; 1025 $self->{hpos} = $_[1];
1052 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1026 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1053 }, 1027 },
1054 ; 1028 ;
1055 1029
1056 my $vslider = new CFPlus::UI::Slider 1030 my $vslider = new CFPlus::UI::Slider
1031 c_col => 1,
1032 c_row => 0,
1057 vertical => 1, 1033 vertical => 1,
1058 range => [0, 0, 1, 0.01], # HACK fix 1034 range => [0, 0, 1, 0.01], # HACK fix
1059 on_changed => sub { 1035 on_changed => sub {
1060 $self->{vpos} = $_[1]; 1036 $self->{vpos} = $_[1];
1061 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1037 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1062 }, 1038 },
1063 ; 1039 ;
1064 1040
1065 $self = $class->SUPER::new ( 1041 $self = $class->SUPER::new (
1066 vp => (new CFPlus::UI::ViewPort expand => 1), 1042 scroll_x => 0,
1043 scroll_y => 1,
1067 can_events => 1, 1044 can_events => 1,
1068 hslider => $hslider, 1045 hslider => $hslider,
1069 vslider => $vslider, 1046 vslider => $vslider,
1070 col_expand => [1, 0], 1047 col_expand => [1, 0],
1071 row_expand => [1, 0], 1048 row_expand => [1, 0],
1072 %arg, 1049 %arg,
1073 ); 1050 );
1074 1051
1052 $self->{vp} = new CFPlus::UI::ViewPort
1053 c_col => 0,
1054 c_row => 0,
1055 expand => 1,
1056 scroll_x => $self->{scroll_x},
1057 scroll_y => $self->{scroll_y},
1058 on_changed => sub {
1059 my ($vp, $x, $y) = @_;
1060
1061 $vp->{parent}{hslider}->set_value ($x);
1062 $vp->{parent}{vslider}->set_value ($y);
1063
1064 0
1065 },
1066 on_size_allocate => sub {
1067 my ($vp, $w, $h) = @_;
1068 $vp->{parent}->update_slider;
1069 0
1070 },
1071 ;
1072
1075 $self->SUPER::add (0, 0, $self->{vp}); 1073 $self->SUPER::add ($self->{vp});
1076 $self->SUPER::add (1, 0, $self->{vslider});
1077 $self->SUPER::add (0, 1, $self->{hslider});
1078 1074
1079 $self->add ($child) if $child; 1075 $self->add ($child) if $child;
1080 1076
1081 $self 1077 $self
1082} 1078}
1083
1084#TODO# update range on size_allocate depending on child
1085 1079
1086sub add { 1080sub add {
1087 my ($self, $widget) = @_; 1081 my ($self, $widget) = @_;
1088 1082
1089 $self->{vp}->add ($self->{child} = $widget); 1083 $self->{vp}->add ($self->{child} = $widget);
1090} 1084}
1091 1085
1086sub set_offset { shift->{vp}->set_offset (@_) }
1087sub set_center { shift->{vp}->set_center (@_) }
1088sub make_visible { shift->{vp}->make_visible (@_) }
1089
1090sub update_slider {
1091 my ($self) = @_;
1092
1093 my $child = ($self->{vp} or return)->child;
1094
1095 if ($self->{scroll_x}) {
1096 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1097 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1098
1099 my $visible = $w1 > $w2;
1100 if ($visible != $self->{hslider_visible}) {
1101 $self->{hslider_visible} = $visible;
1102 $visible ? $self->SUPER::add ($self->{hslider})
1103 : $self->SUPER::remove ($self->{hslider});
1104 }
1105 }
1106
1107 if ($self->{scroll_y}) {
1108 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1109 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1110
1111 my $visible = $h1 > $h2;
1112 if ($visible != $self->{vslider_visible}) {
1113 $self->{vslider_visible} = $visible;
1114 $visible ? $self->SUPER::add ($self->{vslider})
1115 : $self->SUPER::remove ($self->{vslider});
1116 }
1117 }
1118}
1119
1120sub start_dragging {
1121 my ($self, $ev) = @_;
1122
1123 $self->grab_focus;
1124
1125 my $ox = $self->{vp}{view_x};
1126 my $oy = $self->{vp}{view_y};
1127
1128 $self->{motion} = sub {
1129 my ($ev, $x, $y) = @_;
1130
1131 $ox -= $ev->{xrel};
1132 $oy -= $ev->{yrel};
1133
1134 $self->{vp}->set_offset ($ox, $oy);
1135 };
1136}
1137
1092sub invoke_mouse_wheel { 1138sub invoke_mouse_wheel {
1093 my ($self, $ev) = @_; 1139 my ($self, $ev) = @_;
1094 1140
1095 return 0 unless $ev->{dy}; # only vertical movements
1096
1097 $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};
1098 1143
1099 1 1144 1
1100} 1145}
1101 1146
1102sub update_slider { 1147sub invoke_button_down {
1103 my ($self) = @_; 1148 my ($self, $ev, $x, $y) = @_;
1104 1149
1105 my $child = ($self->{vp} or return)->child; 1150 if ($ev->{button} == 2) {
1151 $self->start_dragging ($ev);
1152 return 1;
1153 }
1106 1154
1107 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1155 0
1108 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1109 #$self->{hslider}->set_visibility ($w1 != $w2);
1110
1111 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1112 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1113 #$self->{vslider}->set_visibility ($h1 != $h2);
1114} 1156}
1115 1157
1116sub update { 1158sub invoke_button_up {
1117 my ($self) = @_; 1159 my ($self, $ev, $x, $y) = @_;
1118 1160
1119 $self->SUPER::update; 1161 if (delete $self->{motion}) {
1120 $self->update_slider; 1162 return 1;
1163 }
1164
1165 0
1166}
1167
1168sub invoke_mouse_motion {
1169 my ($self, $ev, $x, $y) = @_;
1170
1171 if ($self->{motion}) {
1172 $self->{motion}->($ev, $x, $y);
1173 return 1;
1174 }
1175
1176 0
1121} 1177}
1122 1178
1123sub invoke_size_allocate { 1179sub invoke_size_allocate {
1124 my ($self, $w, $h) = @_; 1180 my ($self, $w, $h) = @_;
1125 1181
… …
1151 my ($w, $h) = @$self{qw(w h)}; 1207 my ($w, $h) = @$self{qw(w h)};
1152 1208
1153 glEnable GL_BLEND; 1209 glEnable GL_BLEND;
1154 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1210 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1155 glColor_premultiply @{ $self->{bg} }; 1211 glColor_premultiply @{ $self->{bg} };
1156
1157 glBegin GL_QUADS;
1158 glVertex 0 , 0;
1159 glVertex 0 , $h;
1160 glVertex $w, $h; 1212 glRect 0, 0, $w, $h;
1161 glVertex $w, 0;
1162 glEnd;
1163
1164 glDisable GL_BLEND; 1213 glDisable GL_BLEND;
1165 } 1214 }
1166 1215
1167 $self->SUPER::_draw; 1216 $self->SUPER::_draw;
1168} 1217}
… …
1281 1330
1282my @border = 1331my @border =
1283 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1332 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1284 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1333 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1285 1334
1335my @icon =
1336 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1337 qw(x1_move.png x1_resize.png);
1338
1286sub new { 1339sub new {
1287 my ($class, %arg) = @_; 1340 my ($class, %arg) = @_;
1288 1341
1289 my $self = $class->SUPER::new ( 1342 my $self = $class->SUPER::new (
1290 bg => [1, 1, 1, 1], 1343 bg => [1, 1, 1, 1],
… …
1458 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1511 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1459 1512
1460 my $border = $self->border; 1513 my $border = $self->border;
1461 1514
1462 glColor @{ $self->{border_bg} }; 1515 glColor @{ $self->{border_bg} };
1463 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1516 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1464 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1517 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1465 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1518 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1466 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1519 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1520
1521 # move
1522 my $w2 = ($w - $border) * .5;
1523 my $h2 = ($h - $border) * .5;
1524 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1525 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1526 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1527
1528 # resize
1529 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1530 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1531 unless $self->{has_close_button};
1532 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1533 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1467 1534
1468 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1535 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1469 glColor @{ $self->{bg} }; 1536 glColor @{ $self->{bg} };
1470 1537
1471 # TODO: repeat texture not scale 1538 # TODO: repeat texture not scale
… …
1492 1559
1493############################################################################# 1560#############################################################################
1494 1561
1495package CFPlus::UI::Table; 1562package CFPlus::UI::Table;
1496 1563
1497our @ISA = CFPlus::UI::Base::; 1564our @ISA = CFPlus::UI::Container::;
1498 1565
1499use List::Util qw(max sum); 1566use List::Util qw(max sum);
1500 1567
1501use CFPlus::OpenGL; 1568use CFPlus::OpenGL;
1502 1569
… …
1508 row_expand => [], 1575 row_expand => [],
1509 @_, 1576 @_,
1510 ) 1577 )
1511} 1578}
1512 1579
1513sub children {
1514 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1515}
1516
1517sub add { 1580sub add {
1581 my ($self, @widgets) = @_;
1582
1583 for my $child (@widgets) {
1584 $child->{c_rowspan} ||= 1;
1585 $child->{c_colspan} ||= 1;
1586 }
1587
1588 $self->SUPER::add (@widgets);
1589}
1590
1591sub add_at {
1518 my ($self) = shift; 1592 my $self = shift;
1593
1594 my @widgets;
1519 1595
1520 while (@_) { 1596 while (@_) {
1521 my ($x, $y, $child) = splice @_, 0, 3, (); 1597 my ($col, $row, $child) = splice @_, 0, 3, ();
1522 $child->set_parent ($self);
1523 $self->{children}[$y][$x] = $child;
1524 }
1525 1598
1526 $self->{force_realloc} = 1; 1599 $child->{c_row} = $row;
1527 $self->{force_size_alloc} = 1; 1600 $child->{c_col} = $col;
1528 $self->realloc;
1529}
1530 1601
1531sub remove { 1602 push @widgets, $child;
1603 }
1604
1605 $self->add (@widgets);
1606}
1607
1608sub get_wh {
1532 my ($self, $child) = @_; 1609 my ($self) = @_;
1533 1610
1534 # TODO: not yet implemented 1611 my (@w, @h);
1535}
1536
1537# TODO: move to container class maybe? send children a signal on removal?
1538sub clear {
1539 my ($self) = @_;
1540 1612
1541 my @children = $self->children; 1613 my @children = $self->children;
1542 delete $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];
1623 }
1543 1624 }
1544 for (@children) {
1545 delete $_->{parent};
1546 $_->hide;
1547 }
1548 1625
1549 $self->realloc; 1626 # second pass, rows
1550} 1627 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1551
1552sub get_wh {
1553 my ($self) = @_;
1554
1555 my (@w, @h);
1556
1557 for my $y (0 .. $#{$self->{children}}) {
1558 my $row = $self->{children}[$y]
1559 or next;
1560
1561 for my $x (0 .. $#$row) {
1562 my $widget = $row->[$x]
1563 or next;
1564 my ($w, $h) = @$widget{qw(req_w req_h)}; 1628 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1565 1629
1566 $w[$x] = max $w[$x], $w; 1630 my $sh = sum @h[$r .. $r + $rs - 1];
1567 $h[$y] = max $h[$y], $h; 1631
1632 if ($h > $sh) {
1633 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1568 } 1634 }
1569 } 1635 }
1570 1636
1571 (\@w, \@h) 1637 (\@w, \@h)
1572} 1638}
… …
1588 my ($ws, $hs) = $self->get_wh; 1654 my ($ws, $hs) = $self->get_wh;
1589 1655
1590 my $req_w = (sum @$ws) || 1; 1656 my $req_w = (sum @$ws) || 1;
1591 my $req_h = (sum @$hs) || 1; 1657 my $req_h = (sum @$hs) || 1;
1592 1658
1593 # TODO: nicer code 1659 # now linearly scale the rows/columns to the allocated size
1594 my @col_expand = @{$self->{col_expand}}; 1660 my @col_expand = @{$self->{col_expand}};
1595 @col_expand = (1) x @$ws unless @col_expand; 1661 @col_expand = (1) x @$ws unless @col_expand;
1596 my $col_expand = (sum @col_expand) || 1; 1662 my $col_expand = (sum @col_expand) || 1;
1597 1663
1598 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1664 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
… …
1605 1671
1606 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1672 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1607 1673
1608 CFPlus::UI::harmonize $hs; 1674 CFPlus::UI::harmonize $hs;
1609 1675
1610 my $y; 1676 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1677 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1611 1678
1612 for my $r (0 .. $#{$self->{children}}) { 1679 for my $widget ($self->children) {
1613 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)};
1614 or next;
1615 1681
1616 my $x = 0; 1682 $widget->configure (
1617 my $row_h = $hs->[$r]; 1683 $x[$c], $y[$r],
1684 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1618 1685 );
1619 for my $c (0 .. $#$row) { 1686 }
1620 my $col_w = $ws->[$c];
1621 1687
1622 if (my $widget = $row->[$c]) { 1688 1
1623 $widget->configure ($x, $y, $col_w, $row_h); 1689}
1624 }
1625 1690
1626 $x += $col_w; 1691#############################################################################
1692
1693package CFPlus::UI::Fixed;
1694
1695use List::Util qw(min max);
1696
1697our @ISA = CFPlus::UI::Container::;
1698
1699sub _scale($$$) {
1700 my ($rel, $val, $max) = @_;
1701
1702 $rel ? $val * $max : $val
1703}
1704
1705sub size_request {
1706 my ($self) = @_;
1707
1708 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1709
1710 # determine overall size by querying abs widgets
1711 for my $child ($self->visible_children) {
1712 unless ($child->{c_rel}) {
1713 my $x = $child->{c_x};
1714 my $y = $child->{c_y};
1715
1716 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1717 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1627 } 1718 }
1719 }
1628 1720
1629 $y += $row_h; 1721 my $W = $x2 - $x1;
1722 my $H = $y2 - $y1;
1723
1724 # now layout remaining widgets
1725 for my $child ($self->visible_children) {
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;
1729
1730 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1731 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1732 }
1733 }
1734
1735 my $W = $x2 - $x1;
1736 my $H = $y2 - $y1;
1737
1738 ($W, $H)
1739}
1740
1741sub invoke_size_allocate {
1742 my ($self, $W, $H) = @_;
1743
1744 for my $child ($self->visible_children) {
1745 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1746 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1747
1748 $x += $child->{c_halign} * $child->{req_w};
1749 $y += $child->{c_valign} * $child->{req_h};
1750
1751 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1630 } 1752 }
1631 1753
1632 1 1754 1
1633} 1755}
1634 1756
1635sub find_widget {
1636 my ($self, $x, $y) = @_;
1637
1638 $x -= $self->{x};
1639 $y -= $self->{y};
1640
1641 my $res;
1642
1643 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1644 $res = $_->find_widget ($x, $y)
1645 and return $res;
1646 }
1647
1648 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1649}
1650
1651sub _draw {
1652 my ($self) = @_;
1653
1654 for (grep $_, @{$self->{children}}) {
1655 $_->draw for grep $_, @$_;
1656 }
1657}
1658
1659############################################################################# 1757#############################################################################
1660 1758
1661package CFPlus::UI::Box; 1759package CFPlus::UI::Box;
1662 1760
1663our @ISA = CFPlus::UI::Container::; 1761our @ISA = CFPlus::UI::Container::;
1664 1762
1665sub size_request { 1763sub size_request {
1666 my ($self) = @_; 1764 my ($self) = @_;
1765
1766 my @children = $self->visible_children;
1667 1767
1668 $self->{vertical} 1768 $self->{vertical}
1669 ? ( 1769 ? (
1670 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1770 (List::Util::max map $_->{req_w}, @children),
1671 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1771 (List::Util::sum map $_->{req_h}, @children),
1672 ) 1772 )
1673 : ( 1773 : (
1674 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1774 (List::Util::sum map $_->{req_w}, @children),
1675 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1775 (List::Util::max map $_->{req_h}, @children),
1676 ) 1776 )
1677} 1777}
1678 1778
1679sub invoke_size_allocate { 1779sub invoke_size_allocate {
1680 my ($self, $w, $h) = @_; 1780 my ($self, $w, $h) = @_;
… …
1804 1904
1805 delete $self->{ox}; 1905 delete $self->{ox};
1806 $self->SUPER::realloc; 1906 $self->SUPER::realloc;
1807} 1907}
1808 1908
1909sub clear {
1910 my ($self) = @_;
1911
1912 $self->set_text ("");
1913}
1914
1809sub set_text { 1915sub set_text {
1810 my ($self, $text) = @_; 1916 my ($self, $text) = @_;
1811 1917
1812 return if $self->{text} eq "T$text"; 1918 return if $self->{text} eq "T$text";
1813 $self->{text} = "T$text"; 1919 $self->{text} = "T$text";
… …
1919 : ($self->{w} - $size->[0]) * 0.5); 2025 : ($self->{w} - $size->[0]) * 0.5);
1920 2026
1921 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2027 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1922 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2028 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1923 : ($self->{h} - $size->[1]) * 0.5); 2029 : ($self->{h} - $size->[1]) * 0.5);
2030
2031 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1924 }; 2032 };
1925 2033
1926 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2034# unless ($self->{list}) {
1927 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2035# $self->{list} = CFPlus::OpenGL::glGenList;
1928 2036# CFPlus::OpenGL::glNewList $self->{list};
1929 $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;
1930} 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#}
1931 2053
1932############################################################################# 2054#############################################################################
1933 2055
1934package CFPlus::UI::EntryBase; 2056package CFPlus::UI::EntryBase;
1935 2057
… …
1941 my $class = shift; 2063 my $class = shift;
1942 2064
1943 $class->SUPER::new ( 2065 $class->SUPER::new (
1944 fg => [1, 1, 1], 2066 fg => [1, 1, 1],
1945 bg => [0, 0, 0, 0.2], 2067 bg => [0, 0, 0, 0.2],
2068 outline => [0.6, 0.3, 0.1],
1946 active_bg => [1, 1, 1, 0.5], 2069 active_bg => [0, 0, 1, .2],
1947 active_fg => [0, 0, 0], 2070 active_fg => [1, 1, 1],
2071 active_outline => [1, 1, 0],
1948 can_hover => 1, 2072 can_hover => 1,
1949 can_focus => 1, 2073 can_focus => 1,
1950 valign => 0, 2074 valign => 0,
1951 can_events => 1, 2075 can_events => 1,
1952 ellipsise => 0, 2076 ellipsise => 0,
… …
2092 glColor_premultiply @{$self->{bg}}; 2216 glColor_premultiply @{$self->{bg}};
2093 } 2217 }
2094 2218
2095 glEnable GL_BLEND; 2219 glEnable GL_BLEND;
2096 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2220 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2097 glBegin GL_QUADS;
2098 glVertex 0 , 0;
2099 glVertex 0 , $self->{h};
2100 glVertex $self->{w}, $self->{h}; 2221 glRect 0, 0, $self->{w}, $self->{h};
2101 glVertex $self->{w}, 0;
2102 glEnd;
2103 glDisable GL_BLEND; 2222 glDisable GL_BLEND;
2104 2223
2105 $self->SUPER::_draw; 2224 $self->SUPER::_draw;
2106 2225
2107 #TODO: force update every cursor change :( 2226 #TODO: force update every cursor change :(
… …
2109 2228
2110 unless (exists $self->{cur_h}) { 2229 unless (exists $self->{cur_h}) {
2111 my $text = substr $self->{text}, 0, $self->{cursor}; 2230 my $text = substr $self->{text}, 0, $self->{cursor};
2112 utf8::encode $text; 2231 utf8::encode $text;
2113 2232
2114 @$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);
2115 } 2234 }
2116 2235
2236 glColor_premultiply @{$self->{active_fg}};
2117 glBegin GL_LINES; 2237 glBegin GL_LINES;
2118 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2238 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
2119 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2239 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2240 glEnd;
2241
2242 glLineWidth 3;
2243 glColor @{$self->{active_outline}};
2244 glRect_lineloop 0, 0, $self->{w} - 1, $self->{h} - 1;
2245 glLineWidth 1;
2246
2247 } else {
2248 glColor @{$self->{outline}};
2249 glTranslate .375, .375;
2250 glBegin GL_LINE_STRIP;
2251 glVertex 0, $self->{h} * .5;
2252 glVertex 0, $self->{h} - 3;
2253 glVertex $self->{w} - 1, $self->{h} - 3;
2254 glVertex $self->{w} - 1, $self->{h} * .5;
2120 glEnd; 2255 glEnd;
2121 } 2256 }
2122} 2257}
2123 2258
2124############################################################################# 2259#############################################################################
… …
2211 1 2346 1
2212} 2347}
2213 2348
2214############################################################################# 2349#############################################################################
2215 2350
2216package CFPlus::UI::Button; 2351package CFPlus::UI::ButtonBin;
2217 2352
2218our @ISA = CFPlus::UI::Label::; 2353our @ISA = CFPlus::UI::Bin::;
2219 2354
2220use CFPlus::OpenGL; 2355use CFPlus::OpenGL;
2221 2356
2222my @tex = 2357my @tex =
2223 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2358 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2224 qw(b1_button_active.png); 2359 qw(b1_button_inactive.png b1_button_active.png);
2225 2360
2226sub new { 2361sub new {
2227 my $class = shift; 2362 my $class = shift;
2228 2363
2229 $class->SUPER::new ( 2364 $class->SUPER::new (
2230 padding_x => 4,
2231 padding_y => 4,
2232 fg => [1, 1, 1],
2233 active_fg => [0, 0, 1],
2234 can_hover => 1, 2365 can_hover => 1,
2235 align => 0, 2366 align => 0,
2236 valign => 0, 2367 valign => 0,
2237 can_events => 1, 2368 can_events => 1,
2238 @_ 2369 @_
… …
2250} 2381}
2251 2382
2252sub _draw { 2383sub _draw {
2253 my ($self) = @_; 2384 my ($self) = @_;
2254 2385
2255 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2256
2257 glEnable GL_TEXTURE_2D; 2386 glEnable GL_TEXTURE_2D;
2258 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2387 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2259 glColor 0, 0, 0, 1; 2388 glColor 0, 0, 0, 1;
2260 2389
2390 my $tex = $tex[$GRAB == $self];
2261 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2391 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2392
2393 glDisable GL_TEXTURE_2D;
2394
2395 $self->SUPER::_draw;
2396}
2397
2398#############################################################################
2399
2400package CFPlus::UI::Button;
2401
2402our @ISA = CFPlus::UI::Label::;
2403
2404use CFPlus::OpenGL;
2405
2406my @tex =
2407 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2408 qw(b1_button_inactive.png b1_button_active.png);
2409
2410sub new {
2411 my $class = shift;
2412
2413 $class->SUPER::new (
2414 padding_x => 4,
2415 padding_y => 4,
2416 fg => [1.0, 1.0, 1.0],
2417 active_fg => [0.8, 0.8, 0.8],
2418 can_hover => 1,
2419 align => 0,
2420 valign => 0,
2421 can_events => 1,
2422 @_
2423 )
2424}
2425
2426sub invoke_button_up {
2427 my ($self, $ev, $x, $y) = @_;
2428
2429 $self->emit ("activate")
2430 if $x >= 0 && $x < $self->{w}
2431 && $y >= 0 && $y < $self->{h};
2432
2433 1
2434}
2435
2436sub _draw {
2437 my ($self) = @_;
2438
2439 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2440
2441 glEnable GL_TEXTURE_2D;
2442 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2443 glColor 0, 0, 0, 1;
2444
2445 my $tex = $tex[$GRAB == $self];
2446 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2262 2447
2263 glDisable GL_TEXTURE_2D; 2448 glDisable GL_TEXTURE_2D;
2264 2449
2265 $self->SUPER::_draw; 2450 $self->SUPER::_draw;
2266} 2451}
… …
2353sub new { 2538sub new {
2354 my $class = shift; 2539 my $class = shift;
2355 2540
2356 my $self = $class->SUPER::new ( 2541 my $self = $class->SUPER::new (
2357 can_events => 0, 2542 can_events => 0,
2543 scale => 1,
2358 @_, 2544 @_,
2359 ); 2545 );
2360 2546
2361 $self->{path} || $self->{tex} 2547 $self->{path} || $self->{tex}
2362 or Carp::croak "'path' or 'tex' attributes required"; 2548 or Carp::croak "'path' or 'tex' attributes required";
… …
2387} 2573}
2388 2574
2389sub size_request { 2575sub size_request {
2390 my ($self) = @_; 2576 my ($self) = @_;
2391 2577
2392 ($self->{tex}{w}, $self->{tex}{h}) 2578 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2393} 2579}
2394 2580
2395sub _draw { 2581sub _draw {
2396 my ($self) = @_; 2582 my ($self) = @_;
2397 2583
… …
2407 } 2593 }
2408 2594
2409 glEnable GL_TEXTURE_2D; 2595 glEnable GL_TEXTURE_2D;
2410 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2596 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2411 2597
2412 $tex->draw_quad (0, 0, $w, $h); 2598 $tex->draw_quad_alpha (0, 0, $w, $h);
2413 2599
2414 glDisable GL_TEXTURE_2D; 2600 glDisable GL_TEXTURE_2D;
2415} 2601}
2416 2602
2417############################################################################# 2603#############################################################################
… …
2436 align => 0, 2622 align => 0,
2437 valign => 0, 2623 valign => 0,
2438 can_events => 1, 2624 can_events => 1,
2439 @_ 2625 @_
2440 ); 2626 );
2627}
2628
2629sub invoke_button_down {
2630 my ($self, $ev, $x, $y) = @_;
2631
2632 1
2441} 2633}
2442 2634
2443sub invoke_button_up { 2635sub invoke_button_up {
2444 my ($self, $ev, $x, $y) = @_; 2636 my ($self, $ev, $x, $y) = @_;
2445 2637
… …
2585 glDisable GL_TEXTURE_2D; 2777 glDisable GL_TEXTURE_2D;
2586} 2778}
2587 2779
2588############################################################################# 2780#############################################################################
2589 2781
2782package CFPlus::UI::Progress;
2783
2784our @ISA = CFPlus::UI::Label::;
2785
2786use CFPlus::OpenGL;
2787
2788sub new {
2789 my ($class, %arg) = @_;
2790
2791 my $self = $class->SUPER::new (
2792 fg => [1, 1, 1],
2793 bg => [0, 0, 1, 0.2],
2794 bar => [0.7, 0.5, 0.1, 0.8],
2795 outline => [0.4, 0.3, 0],
2796 fontsize => 0.9,
2797 valign => 0,
2798 align => 0,
2799 can_events => 1,
2800 ellipsise => 1,
2801 label => "%d%%",
2802 %arg,
2803 );
2804
2805 $self->set_value ($arg{value} || -1);
2806
2807 $self
2808}
2809
2810sub set_label {
2811 my ($self, $label) = @_;
2812
2813 return if $self->{label} eq $label;
2814 $self->{label} = $label;
2815
2816 $self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
2817}
2818
2819sub set_value {
2820 my ($self, $value) = @_;
2821
2822 if ($self->{value} ne $value) {
2823 $self->{value} = $value;
2824
2825 if ($value < 0) {
2826 $self->set_text ("-");
2827 } else {
2828 $self->set_text (sprintf $self->{label}, $value * 100);
2829 }
2830
2831 $self->update;
2832 }
2833}
2834
2835sub _draw {
2836 my ($self) = @_;
2837
2838 glEnable GL_BLEND;
2839 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2840
2841 if ($self->{value} >= 0) {
2842 my $s = 3 + ($self->{w} - 6) * $self->{value};
2843
2844 glColor_premultiply @{$self->{bar}};
2845 glRect 2, 2, $s, $self->{h} - 2;
2846 glColor_premultiply @{$self->{bg}};
2847 glRect $s + 1, 0, $self->{w} - 2, $self->{h} - 2;
2848 }
2849
2850 glColor_premultiply @{$self->{outline}};
2851 glRect_lineloop 1, 1, $self->{w} - 2, $self->{h} - 2;
2852
2853 glDisable GL_BLEND;
2854
2855 {
2856 local $self->{bg}; # do not draw background
2857 $self->SUPER::_draw;
2858 }
2859}
2860
2861#############################################################################
2862
2863package CFPlus::UI::ExperienceProgress;
2864
2865our @ISA = CFPlus::UI::Progress::;
2866
2867sub new {
2868 my ($class, %arg) = @_;
2869
2870 my $self = $class->SUPER::new (
2871 tooltip => sub {
2872 my ($self) = @_;
2873
2874 sprintf "level %d\n%s points\n%s next level\n%s to go",
2875 $self->{lvl},
2876 ::formsep ($self->{exp}),
2877 ::formsep ($self->{nxt}),
2878 ::formsep ($self->{nxt} - $self->{exp}),
2879 },
2880 %arg
2881 );
2882
2883 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2884 if $::CONN;
2885
2886 $self
2887}
2888
2889sub DESTROY {
2890 my ($self) = @_;
2891
2892 delete $::CONN->{on_exp_update}{$self+0}
2893 if $::CONN;
2894
2895 $self->SUPER::DESTROY;
2896}
2897
2898sub set_value {
2899 my ($self, $lvl, $exp) = @_;
2900
2901<<<<<<< UI.pm
2902 $self->{lvl} = $lvl;
2903 $self->{exp} = $exp;
2904
2905=======
2906 $self->{lvl} = $exp;
2907 $self->{exp} = $exp;
2908
2909>>>>>>> 1.434
2910 my $v = -1;
2911
2912 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2913 my $l0 = $table->[$lvl - 1];
2914 my $l1 = $table->[$lvl];
2915
2916 $self->{nxt} = $l1;
2917
2918 $v = ($exp - $l0) / ($l1 - $l0);
2919 }
2920
2921 $self->SUPER::set_value ($v);
2922}
2923
2924#############################################################################
2925
2590package CFPlus::UI::Gauge; 2926package CFPlus::UI::Gauge;
2591 2927
2592our @ISA = CFPlus::UI::VBox::; 2928our @ISA = CFPlus::UI::VBox::;
2593 2929
2594sub new { 2930sub new {
… …
2719 3055
2720 $self->SUPER::invoke_button_down ($ev, $x, $y); 3056 $self->SUPER::invoke_button_down ($ev, $x, $y);
2721 3057
2722 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3058 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2723 3059
2724 $self->invoke_mouse_motion ($ev, $x, $y) 3060 $self->invoke_mouse_motion ($ev, $x, $y);
3061
3062 1
2725} 3063}
2726 3064
2727sub invoke_mouse_motion { 3065sub invoke_mouse_motion {
2728 my ($self, $ev, $x, $y) = @_; 3066 my ($self, $ev, $x, $y) = @_;
2729 3067
… …
2749 3087
2750 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3088 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2751 3089
2752 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3090 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2753 3091
2754 ! ! $delta 3092 1
2755} 3093}
2756 3094
2757sub update { 3095sub update {
2758 my ($self) = @_; 3096 my ($self) = @_;
2759 3097
… …
2890} 3228}
2891 3229
2892sub size_request { 3230sub size_request {
2893 my ($self) = @_; 3231 my ($self) = @_;
2894 3232
2895 my ($empty, $slider) = @{ $self->{children} }; 3233 my ($empty, $slider) = $self->visible_children;
2896 3234
2897 local $self->{children} = [$empty, $slider]; 3235 local $self->{children} = [$empty, $slider];
2898 $self->SUPER::size_request 3236 $self->SUPER::size_request
2899} 3237}
2900 3238
… …
3089 3427
3090 if ($y0 < $y + $h && $y < $y1) { 3428 if ($y0 < $y + $h && $y < $y1) {
3091 my $layout = $self->get_layout ($para); 3429 my $layout = $self->get_layout ($para);
3092 3430
3093 $layout->render ($para->{indent}, $y - $y0); 3431 $layout->render ($para->{indent}, $y - $y0);
3432 $layout->draw;
3094 3433
3095 if (my @w = @{ $para->{widget} }) { 3434 if (my @w = @{ $para->{widget} }) {
3096 my @s = $layout->get_shapes; 3435 my @s = $layout->get_shapes;
3097 3436
3098 for (@w) { 3437 for (@w) {
… …
3220} 3559}
3221 3560
3222sub set_tooltip_from { 3561sub set_tooltip_from {
3223 my ($self, $widget) = @_; 3562 my ($self, $widget) = @_;
3224 3563
3225 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3226 if $widget->{tooltip} =~ /^#(.*)$/;
3227
3228 my $tooltip = $widget->{tooltip}; 3564 my $tip = $widget->{tooltip};
3565 $tip = $tip->($widget) if "CODE" eq ref $tip;
3566
3567 $tip = CFPlus::Pod::section_label tooltip => $1
3568 if $tip =~ /^#(.*)$/;
3229 3569
3230 if ($ENV{CFPLUS_DEBUG} & 2) { 3570 if ($ENV{CFPLUS_DEBUG} & 2) {
3231 $tooltip .= "\n\n" . (ref $widget) . "\n" 3571 $tip .= "\n\n" . (ref $widget) . "\n"
3232 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3572 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3233 . "req $widget->{req_w} $widget->{req_h}\n" 3573 . "req $widget->{req_w} $widget->{req_h}\n"
3234 . "visible $widget->{visible}"; 3574 . "visible $widget->{visible}";
3235 } 3575 }
3236 3576
3237 $tooltip =~ s/^\n+//; 3577 $tip =~ s/^\n+//;
3238 $tooltip =~ s/\n+$//; 3578 $tip =~ s/\n+$//;
3239 3579
3240 $self->add (new CFPlus::UI::Label 3580 $self->add (new CFPlus::UI::Label
3241 markup => $tooltip, 3581 markup => $tip,
3242 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3582 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3243 fontsize => 0.8, 3583 fontsize => 0.8,
3244 style => 1, # FLAG_INVERSE 3584 style => 1, # FLAG_INVERSE
3245 ellipsise => 0, 3585 ellipsise => 0,
3246 font => ($widget->{tooltip_font} || $::FONT_PROP), 3586 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
3289 glTranslate 0.375, 0.375; 3629 glTranslate 0.375, 0.375;
3290 3630
3291 my ($w, $h) = @$self{qw(w h)}; 3631 my ($w, $h) = @$self{qw(w h)};
3292 3632
3293 glColor 1, 0.8, 0.4; 3633 glColor 1, 0.8, 0.4;
3294 glBegin GL_QUADS; 3634 glRect 0, 0, $w, $h;
3295 glVertex 0 , 0;
3296 glVertex 0 , $h;
3297 glVertex $w, $h;
3298 glVertex $w, 0;
3299 glEnd;
3300 3635
3301 glColor 0, 0, 0; 3636 glColor 0, 0, 0;
3302 glBegin GL_LINE_LOOP; 3637 glRect_lineloop 0, 0, $w, $h;
3303 glVertex 0 , 0;
3304 glVertex 0 , $h;
3305 glVertex $w, $h;
3306 glVertex $w, 0;
3307 glEnd;
3308 3638
3309 glTranslate 2 - 0.375, 2 - 0.375; 3639 glTranslate 2 - 0.375, 2 - 0.375;
3310 3640
3311 $self->SUPER::_draw; 3641 $self->SUPER::_draw;
3312} 3642}
… …
3321 3651
3322sub new { 3652sub new {
3323 my $class = shift; 3653 my $class = shift;
3324 3654
3325 my $self = $class->SUPER::new ( 3655 my $self = $class->SUPER::new (
3656 size_w => 32,
3657 size_h => 8,
3326 aspect => 1, 3658 aspect => 1,
3327 can_events => 0, 3659 can_events => 0,
3328 @_, 3660 @_,
3329 ); 3661 );
3330 3662
3331 if ($self->{anim} && $self->{animspeed}) { 3663 if ($self->{anim} && $self->{animspeed}) {
3332 CFPlus::weaken (my $widget = $self); 3664 CFPlus::weaken (my $widget = $self);
3333 3665
3666 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3667 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3334 $self->{timer} = Event->timer ( 3668 $self->{timer} = Event->timer (
3335 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3336 hard => 1, 3669 parked => 1,
3337 interval => $self->{animspeed},
3338 cb => sub { 3670 cb => sub {
3339 delete $self->{wait_face}; 3671 return unless $::CONN;
3672
3673 my $w = $widget
3674 or return;
3675
3340 ++$widget->{frame}; 3676 ++$w->{frame};
3677 $w->update_face;
3678
3679 # somehow, $widget can go away
3341 $widget->update; 3680 $w->update;
3681 $w->update_timer;
3342 }, 3682 },
3343 ); 3683 );
3684
3685 $self->update_face;
3686 $self->update_timer;
3344 } 3687 }
3345 3688
3346 $self 3689 $self
3347} 3690}
3348 3691
3692sub update_timer {
3693 my ($self) = @_;
3694
3695 return unless $self->{timer};
3696
3697 if ($self->{visible}) {
3698 $self->{timer}->at (
3699 $self->{anim_start}
3700 + $self->{animspeed}
3701 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3702 );
3703 $self->{timer}->start;
3704 } else {
3705 $self->{timer}->stop;
3706 }
3707}
3708
3709sub update_face {
3710 my ($self) = @_;
3711
3712 if ($::CONN) {
3713 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3714 if ($anim && @$anim) {
3715 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3716 delete $self->{face_change_cb};
3717
3718 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3719 unless ($tex->{name} || $tex->{loading}) {
3720 $tex->upload (sub { $self->reconfigure });
3721 }
3722 }
3723 }
3724 }
3725 }
3726}
3727
3349sub size_request { 3728sub size_request {
3350 (32, 8) 3729 my ($self) = @_;
3730
3731 if ($::CONN) {
3732 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3733 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3734 if ($tex->{name}) {
3735 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3736 } elsif (!$tex->{loading}) {
3737 $tex->upload (sub { $self->reconfigure });
3738 }
3739 }
3740
3741 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3742 }
3743 }
3744
3745 ($self->{size_w} || 8, $self->{size_h} || 8)
3351} 3746}
3352 3747
3353sub update { 3748sub update {
3354 my ($self) = @_; 3749 my ($self) = @_;
3355 3750
3356 return unless $self->{visible}; 3751 return unless $self->{visible};
3357 3752
3358 $self->SUPER::update; 3753 $self->SUPER::update;
3359} 3754}
3360 3755
3756sub invoke_visibility_change {
3757 my ($self) = @_;
3758
3759 $self->update_timer;
3760
3761 0
3762}
3763
3361sub _draw { 3764sub _draw {
3362 my ($self) = @_; 3765 my ($self) = @_;
3363 3766
3364 return unless $::CONN;
3365
3366 $self->SUPER::_draw; 3767 $self->SUPER::_draw;
3367 3768
3368 my $face; 3769 if (my $tex = $self->{tex}) {
3369
3370 if ($self->{frame}) {
3371 my $anim = $::CONN->{anim}[$self->{anim}];
3372
3373 $face = $anim->[ $self->{frame} % @$anim ]
3374 if $anim && @$anim;
3375 }
3376
3377 my $faceid = $::CONN->{faceid}[$face || $self->{face}]
3378 or return;
3379
3380 my $tex = $::CONN->{texture}[$faceid];
3381
3382 if ($tex) {
3383 glEnable GL_TEXTURE_2D; 3770 glEnable GL_TEXTURE_2D;
3384 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3771 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3385 glColor 0, 0, 0, 1; 3772 glColor 0, 0, 0, 1;
3386 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3773 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3387 glDisable GL_TEXTURE_2D; 3774 glDisable GL_TEXTURE_2D;
3388 } else {
3389 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3390 $self->update;
3391 });
3392 } 3775 }
3393} 3776}
3394 3777
3395sub destroy { 3778sub destroy {
3396 my ($self) = @_; 3779 my ($self) = @_;
3397 3780
3398 $self->{timer}->cancel 3781 (delete $self->{timer})->cancel
3399 if $self->{timer}; 3782 if $self->{timer};
3400 3783
3401 $self->SUPER::destroy; 3784 $self->SUPER::destroy;
3402} 3785}
3403 3786
… …
3443 children => [ 3826 children => [
3444 (new CFPlus::UI::Label markup => $left, expand => 1), 3827 (new CFPlus::UI::Label markup => $left, expand => 1),
3445 (new CFPlus::UI::Label markup => $right, align => +1), 3828 (new CFPlus::UI::Label markup => $right, align => +1),
3446 ], 3829 ],
3447 ; 3830 ;
3448 3831
3449 } else { 3832 } else {
3450 $widget = new CFPlus::UI::Label 3833 $widget = new CFPlus::UI::Label
3451 can_hover => 1, 3834 can_hover => 1,
3452 can_events => 1, 3835 can_events => 1,
3453 markup => $widget, 3836 markup => $widget,
… …
3578 3961
3579############################################################################# 3962#############################################################################
3580 3963
3581package CFPlus::UI::Notebook; 3964package CFPlus::UI::Notebook;
3582 3965
3966use CFPlus::OpenGL;
3967
3583our @ISA = CFPlus::UI::VBox::; 3968our @ISA = CFPlus::UI::VBox::;
3584 3969
3585sub new { 3970sub new {
3586 my $class = shift; 3971 my $class = shift;
3587 3972
3588 my $self = $class->SUPER::new ( 3973 my $self = $class->SUPER::new (
3589 buttonbar => (new CFPlus::UI::Buttonbar), 3974 buttonbar => (new CFPlus::UI::Buttonbar),
3590 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3975 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3976 active_outline => [1, 1, 0],
3591 # filter => # will be put between multiplexer and $self 3977 # filter => # will be put between multiplexer and $self
3592 @_, 3978 @_,
3593 ); 3979 );
3594 3980
3595 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3981 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3596 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3982 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3597 3983
3984 {
3985 Scalar::Util::weaken (my $wself = $self);
3986
3987 $self->{multiplexer}->connect (c_add => sub {
3988 my ($mplex, $widgets) = @_;
3989
3990 for my $child (@$widgets) {
3991 Scalar::Util::weaken $child;
3992 $child->{c_tab_} ||= do {
3993 my $tab =
3994 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3995 ? $child->{c_tab}
3996 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3997
3998 $tab->connect (activate => sub {
3999 $wself->set_current_page ($child);
4000 });
4001
4002 $tab
4003 };
4004
4005 $self->{buttonbar}->add ($child->{c_tab_});
4006 }
4007 });
4008
4009 $self->{multiplexer}->connect (c_remove => sub {
4010 my ($mplex, $widgets) = @_;
4011
4012 for my $child (@$widgets) {
4013 $wself->{buttonbar}->remove ($child->{c_tab_});
4014 }
4015 });
4016 }
4017
3598 $self 4018 $self
3599} 4019}
3600 4020
3601sub add { 4021sub add {
4022 my ($self, @widgets) = @_;
4023
4024 $self->{multiplexer}->add (@widgets)
4025}
4026
4027sub remove {
4028 my ($self, @widgets) = @_;
4029
4030 $self->{multiplexer}->remove (@widgets)
4031}
4032
4033sub pages {
4034 my ($self) = @_;
4035 $self->{multiplexer}->children
4036}
4037
4038sub add_tab {
3602 my ($self, $title, $widget, $tooltip) = @_; 4039 my ($self, $title, $widget, $tooltip) = @_;
3603 4040
3604 CFPlus::weaken $self; 4041 $title = [$title, $tooltip] unless ref $title;
4042 $widget->{c_tab} = $title;
3605 4043
3606 $self->{buttonbar}->add (new CFPlus::UI::Button
3607 markup => $title,
3608 tooltip => $tooltip,
3609 on_activate => sub { $self->set_current_page ($widget) },
3610 );
3611
3612 $self->{multiplexer}->add ($widget); 4044 $self->add ($widget);
3613} 4045}
3614 4046
3615sub get_current_page { 4047sub get_current_page {
3616 my ($self) = @_; 4048 my ($self) = @_;
3617 4049
… …
3621sub set_current_page { 4053sub set_current_page {
3622 my ($self, $page) = @_; 4054 my ($self, $page) = @_;
3623 4055
3624 $self->{multiplexer}->set_current_page ($page); 4056 $self->{multiplexer}->set_current_page ($page);
3625 $self->emit (page_changed => $self->{multiplexer}{current}); 4057 $self->emit (page_changed => $self->{multiplexer}{current});
4058}
4059
4060sub _draw {
4061 my ($self) = @_;
4062
4063 $self->SUPER::_draw ();
4064
4065 if (my $cur = $self->{multiplexer}{current}) {
4066 if ($cur = $cur->{c_tab_}) {
4067 glTranslate $cur->{x}, $cur->{y};
4068 glLineWidth 3;
4069 glColor @{$self->{active_outline}};
4070 glRect_lineloop 1, 1, $cur->{w} - 2, $cur->{h} - 2;
4071 glLineWidth 1;
4072 }
4073 }
3626} 4074}
3627 4075
3628############################################################################# 4076#############################################################################
3629 4077
3630package CFPlus::UI::Selector; 4078package CFPlus::UI::Selector;
… …
3900} 4348}
3901 4349
3902sub update { 4350sub update {
3903 my ($self) = @_; 4351 my ($self) = @_;
3904 4352
3905 $::WANT_REFRESH++; 4353 $::WANT_REFRESH->start;
3906} 4354}
3907 4355
3908sub add { 4356sub add {
3909 my ($self, @children) = @_; 4357 my ($self, @children) = @_;
3910 4358
… …
3947 while ($self->{refresh_hook}) { 4395 while ($self->{refresh_hook}) {
3948 $_->() 4396 $_->()
3949 for values %{delete $self->{refresh_hook}}; 4397 for values %{delete $self->{refresh_hook}};
3950 } 4398 }
3951 4399
3952 if ($self->{realloc}) { 4400 while ($self->{realloc}) {
3953 my %queue; 4401 my %queue;
3954 my @queue; 4402 my @queue;
3955 my $widget; 4403 my $widget;
3956 4404
3957 outer: 4405 outer:
… …
4004 } 4452 }
4005 } 4453 }
4006 4454
4007 delete $self->{realloc}{$widget+0}; 4455 delete $self->{realloc}{$widget+0};
4008 } 4456 }
4009 }
4010 4457
4011 while (my $size_alloc = delete $self->{size_alloc}) { 4458 while (my $size_alloc = delete $self->{size_alloc}) {
4012 my @queue = sort { $b->{visible} <=> $a->{visible} } 4459 my @queue = sort { $a->{visible} <=> $b->{visible} }
4013 values %$size_alloc; 4460 values %$size_alloc;
4014 4461
4015 while () { 4462 while () {
4016 my $widget = pop @queue || last; 4463 my $widget = pop @queue || last;
4017 4464
4018 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4465 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4019 4466
4020 $w = 0 if $w < 0;
4021 $h = 0 if $h < 0;
4022
4023 $w = max $widget->{min_w}, $w; 4467 $w = max $widget->{min_w}, $w;
4024 $h = max $widget->{min_h}, $h; 4468 $h = max $widget->{min_h}, $h;
4025 4469
4026# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4470# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4027# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4471# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4028 4472
4029 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4473 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4030 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4474 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4031 4475
4032 $w = int $w + 0.5; 4476 $w = int $w + 0.5;
4033 $h = int $h + 0.5; 4477 $h = int $h + 0.5;
4034 4478
4035 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4479 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4036 $widget->{old_w} = $widget->{w}; 4480 $widget->{old_w} = $widget->{w};
4037 $widget->{old_h} = $widget->{h}; 4481 $widget->{old_h} = $widget->{h};
4038 4482
4039 $widget->{w} = $w; 4483 $widget->{w} = $w;
4040 $widget->{h} = $h; 4484 $widget->{h} = $h;
4041 4485
4042 $widget->emit (size_allocate => $w, $h); 4486 $widget->emit (size_allocate => $w, $h);
4487 }
4043 } 4488 }
4044 } 4489 }
4045 } 4490 }
4046 4491
4047 while ($self->{post_alloc_hook}) { 4492 while ($self->{post_alloc_hook}) {
4048 $_->() 4493 $_->()
4049 for values %{delete $self->{post_alloc_hook}}; 4494 for values %{delete $self->{post_alloc_hook}};
4050 } 4495 }
4051
4052 4496
4053 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4497 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4054 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4498 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4055 glClear GL_COLOR_BUFFER_BIT; 4499 glClear GL_COLOR_BUFFER_BIT;
4056 4500

Diff Legend

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