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.373 by root, Sun Jul 15 22:39:30 2007 UTC vs.
Revision 1.436 by root, Wed Aug 22 21:40:57 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});
… …
1072 row_expand => [1, 0], 1048 row_expand => [1, 0],
1073 %arg, 1049 %arg,
1074 ); 1050 );
1075 1051
1076 $self->{vp} = new CFPlus::UI::ViewPort 1052 $self->{vp} = new CFPlus::UI::ViewPort
1053 c_col => 0,
1054 c_row => 0,
1077 expand => 1, 1055 expand => 1,
1078 scroll_x => $self->{scroll_x}, 1056 scroll_x => $self->{scroll_x},
1079 scroll_y => $self->{scroll_y}, 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 },
1080 ; 1071 ;
1081 1072
1082 $self->SUPER::add (0, 0, $self->{vp}); 1073 $self->SUPER::add ($self->{vp});
1083 $self->SUPER::add (1, 0, $self->{vslider}) if $self->{scroll_y};
1084 $self->SUPER::add (0, 1, $self->{hslider}) if $self->{scroll_x};
1085 1074
1086 $self->add ($child) if $child; 1075 $self->add ($child) if $child;
1087 1076
1088 $self 1077 $self
1089} 1078}
1090
1091#TODO# update range on size_allocate depending on child
1092 1079
1093sub add { 1080sub add {
1094 my ($self, $widget) = @_; 1081 my ($self, $widget) = @_;
1095 1082
1096 $self->{vp}->add ($self->{child} = $widget); 1083 $self->{vp}->add ($self->{child} = $widget);
1097} 1084}
1098 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
1099sub invoke_mouse_wheel { 1138sub invoke_mouse_wheel {
1100 my ($self, $ev) = @_; 1139 my ($self, $ev) = @_;
1101 1140
1102 return 0 unless $ev->{dy}; # only vertical movements
1103
1104 $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};
1105 1143
1106 1 1144 1
1107} 1145}
1108 1146
1109sub update_slider { 1147sub invoke_button_down {
1110 my ($self) = @_; 1148 my ($self, $ev, $x, $y) = @_;
1111 1149
1112 my $child = ($self->{vp} or return)->child; 1150 if ($ev->{button} == 2) {
1151 $self->start_dragging ($ev);
1152 return 1;
1153 }
1113 1154
1114 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1155 0
1115 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1116 #$self->{hslider}->set_visibility ($w1 != $w2);
1117
1118 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1119 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1120 #$self->{vslider}->set_visibility ($h1 != $h2);
1121} 1156}
1122 1157
1123sub update { 1158sub invoke_button_up {
1124 my ($self) = @_; 1159 my ($self, $ev, $x, $y) = @_;
1125 1160
1126 $self->SUPER::update; 1161 if (delete $self->{motion}) {
1127 $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
1128} 1177}
1129 1178
1130sub invoke_size_allocate { 1179sub invoke_size_allocate {
1131 my ($self, $w, $h) = @_; 1180 my ($self, $w, $h) = @_;
1132 1181
… …
1158 my ($w, $h) = @$self{qw(w h)}; 1207 my ($w, $h) = @$self{qw(w h)};
1159 1208
1160 glEnable GL_BLEND; 1209 glEnable GL_BLEND;
1161 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1210 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1162 glColor_premultiply @{ $self->{bg} }; 1211 glColor_premultiply @{ $self->{bg} };
1163
1164 glBegin GL_QUADS;
1165 glVertex 0 , 0;
1166 glVertex 0 , $h;
1167 glVertex $w, $h; 1212 glRect 0, 0, $w, $h;
1168 glVertex $w, 0;
1169 glEnd;
1170
1171 glDisable GL_BLEND; 1213 glDisable GL_BLEND;
1172 } 1214 }
1173 1215
1174 $self->SUPER::_draw; 1216 $self->SUPER::_draw;
1175} 1217}
… …
1288 1330
1289my @border = 1331my @border =
1290 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1332 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1291 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);
1292 1334
1335my @icon =
1336 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1337 qw(x1_move.png x1_resize.png);
1338
1293sub new { 1339sub new {
1294 my ($class, %arg) = @_; 1340 my ($class, %arg) = @_;
1295 1341
1296 my $self = $class->SUPER::new ( 1342 my $self = $class->SUPER::new (
1297 bg => [1, 1, 1, 1], 1343 bg => [1, 1, 1, 1],
… …
1465 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1511 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1466 1512
1467 my $border = $self->border; 1513 my $border = $self->border;
1468 1514
1469 glColor @{ $self->{border_bg} }; 1515 glColor @{ $self->{border_bg} };
1470 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1516 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1471 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1517 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1472 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1518 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1473 $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);
1474 1534
1475 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1535 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1476 glColor @{ $self->{bg} }; 1536 glColor @{ $self->{bg} };
1477 1537
1478 # TODO: repeat texture not scale 1538 # TODO: repeat texture not scale
… …
1499 1559
1500############################################################################# 1560#############################################################################
1501 1561
1502package CFPlus::UI::Table; 1562package CFPlus::UI::Table;
1503 1563
1504our @ISA = CFPlus::UI::Base::; 1564our @ISA = CFPlus::UI::Container::;
1505 1565
1506use List::Util qw(max sum); 1566use List::Util qw(max sum);
1507 1567
1508use CFPlus::OpenGL; 1568use CFPlus::OpenGL;
1509 1569
… …
1515 row_expand => [], 1575 row_expand => [],
1516 @_, 1576 @_,
1517 ) 1577 )
1518} 1578}
1519 1579
1520sub children {
1521 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1522}
1523
1524sub 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 {
1525 my ($self) = shift; 1592 my $self = shift;
1593
1594 my @widgets;
1526 1595
1527 while (@_) { 1596 while (@_) {
1528 my ($x, $y, $child) = splice @_, 0, 3, (); 1597 my ($col, $row, $child) = splice @_, 0, 3, ();
1529 $child->set_parent ($self);
1530 $self->{children}[$y][$x] = $child;
1531 }
1532 1598
1533 $self->{force_realloc} = 1; 1599 $child->{c_row} = $row;
1534 $self->{force_size_alloc} = 1; 1600 $child->{c_col} = $col;
1535 $self->realloc;
1536}
1537 1601
1538sub remove { 1602 push @widgets, $child;
1603 }
1604
1605 $self->add (@widgets);
1606}
1607
1608sub get_wh {
1539 my ($self, $child) = @_; 1609 my ($self) = @_;
1540 1610
1541 # TODO: not yet implemented 1611 my (@w, @h);
1542}
1543
1544# TODO: move to container class maybe? send children a signal on removal?
1545sub clear {
1546 my ($self) = @_;
1547 1612
1548 my @children = $self->children; 1613 my @children = $self->children;
1549 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 }
1550 1624 }
1551 for (@children) {
1552 delete $_->{parent};
1553 $_->hide;
1554 }
1555 1625
1556 $self->realloc; 1626 # second pass, rows
1557} 1627 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1558
1559sub get_wh {
1560 my ($self) = @_;
1561
1562 my (@w, @h);
1563
1564 for my $y (0 .. $#{$self->{children}}) {
1565 my $row = $self->{children}[$y]
1566 or next;
1567
1568 for my $x (0 .. $#$row) {
1569 my $widget = $row->[$x]
1570 or next;
1571 my ($w, $h) = @$widget{qw(req_w req_h)}; 1628 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1572 1629
1573 $w[$x] = max $w[$x], $w; 1630 my $sh = sum @h[$r .. $r + $rs - 1];
1574 $h[$y] = max $h[$y], $h; 1631
1632 if ($h > $sh) {
1633 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1575 } 1634 }
1576 } 1635 }
1577 1636
1578 (\@w, \@h) 1637 (\@w, \@h)
1579} 1638}
… …
1595 my ($ws, $hs) = $self->get_wh; 1654 my ($ws, $hs) = $self->get_wh;
1596 1655
1597 my $req_w = (sum @$ws) || 1; 1656 my $req_w = (sum @$ws) || 1;
1598 my $req_h = (sum @$hs) || 1; 1657 my $req_h = (sum @$hs) || 1;
1599 1658
1600 # TODO: nicer code 1659 # now linearly scale the rows/columns to the allocated size
1601 my @col_expand = @{$self->{col_expand}}; 1660 my @col_expand = @{$self->{col_expand}};
1602 @col_expand = (1) x @$ws unless @col_expand; 1661 @col_expand = (1) x @$ws unless @col_expand;
1603 my $col_expand = (sum @col_expand) || 1; 1662 my $col_expand = (sum @col_expand) || 1;
1604 1663
1605 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1664 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
… …
1612 1671
1613 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1672 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1614 1673
1615 CFPlus::UI::harmonize $hs; 1674 CFPlus::UI::harmonize $hs;
1616 1675
1617 my $y; 1676 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1677 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1618 1678
1619 for my $r (0 .. $#{$self->{children}}) { 1679 for my $widget ($self->children) {
1620 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)};
1621 or next;
1622 1681
1623 my $x = 0; 1682 $widget->configure (
1624 my $row_h = $hs->[$r]; 1683 $x[$c], $y[$r],
1684 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1625 1685 );
1626 for my $c (0 .. $#$row) { 1686 }
1627 my $col_w = $ws->[$c];
1628 1687
1629 if (my $widget = $row->[$c]) { 1688 1
1630 $widget->configure ($x, $y, $col_w, $row_h); 1689}
1631 }
1632 1690
1633 $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};
1634 } 1718 }
1719 }
1635 1720
1636 $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});
1637 } 1752 }
1638 1753
1639 1 1754 1
1640} 1755}
1641 1756
1642sub find_widget {
1643 my ($self, $x, $y) = @_;
1644
1645 $x -= $self->{x};
1646 $y -= $self->{y};
1647
1648 my $res;
1649
1650 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1651 $res = $_->find_widget ($x, $y)
1652 and return $res;
1653 }
1654
1655 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1656}
1657
1658sub _draw {
1659 my ($self) = @_;
1660
1661 for (grep $_, @{$self->{children}}) {
1662 $_->draw for grep $_, @$_;
1663 }
1664}
1665
1666############################################################################# 1757#############################################################################
1667 1758
1668package CFPlus::UI::Box; 1759package CFPlus::UI::Box;
1669 1760
1670our @ISA = CFPlus::UI::Container::; 1761our @ISA = CFPlus::UI::Container::;
1671 1762
1672sub size_request { 1763sub size_request {
1673 my ($self) = @_; 1764 my ($self) = @_;
1765
1766 my @children = $self->visible_children;
1674 1767
1675 $self->{vertical} 1768 $self->{vertical}
1676 ? ( 1769 ? (
1677 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1770 (List::Util::max map $_->{req_w}, @children),
1678 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1771 (List::Util::sum map $_->{req_h}, @children),
1679 ) 1772 )
1680 : ( 1773 : (
1681 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1774 (List::Util::sum map $_->{req_w}, @children),
1682 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1775 (List::Util::max map $_->{req_h}, @children),
1683 ) 1776 )
1684} 1777}
1685 1778
1686sub invoke_size_allocate { 1779sub invoke_size_allocate {
1687 my ($self, $w, $h) = @_; 1780 my ($self, $w, $h) = @_;
… …
1811 1904
1812 delete $self->{ox}; 1905 delete $self->{ox};
1813 $self->SUPER::realloc; 1906 $self->SUPER::realloc;
1814} 1907}
1815 1908
1909sub clear {
1910 my ($self) = @_;
1911
1912 $self->set_text ("");
1913}
1914
1816sub set_text { 1915sub set_text {
1817 my ($self, $text) = @_; 1916 my ($self, $text) = @_;
1818 1917
1819 return if $self->{text} eq "T$text"; 1918 return if $self->{text} eq "T$text";
1820 $self->{text} = "T$text"; 1919 $self->{text} = "T$text";
… …
1926 : ($self->{w} - $size->[0]) * 0.5); 2025 : ($self->{w} - $size->[0]) * 0.5);
1927 2026
1928 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2027 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1929 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2028 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1930 : ($self->{h} - $size->[1]) * 0.5); 2029 : ($self->{h} - $size->[1]) * 0.5);
2030
2031 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1931 }; 2032 };
1932 2033
1933 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2034# unless ($self->{list}) {
1934 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2035# $self->{list} = CFPlus::OpenGL::glGenList;
1935 2036# CFPlus::OpenGL::glNewList $self->{list};
1936 $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;
1937} 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#}
1938 2053
1939############################################################################# 2054#############################################################################
1940 2055
1941package CFPlus::UI::EntryBase; 2056package CFPlus::UI::EntryBase;
1942 2057
… …
1948 my $class = shift; 2063 my $class = shift;
1949 2064
1950 $class->SUPER::new ( 2065 $class->SUPER::new (
1951 fg => [1, 1, 1], 2066 fg => [1, 1, 1],
1952 bg => [0, 0, 0, 0.2], 2067 bg => [0, 0, 0, 0.2],
2068 outline => [0.6, 0.3, 0.1],
1953 active_bg => [1, 1, 1, 0.5], 2069 active_bg => [0, 0, 1, .2],
1954 active_fg => [0, 0, 0], 2070 active_fg => [1, 1, 1],
2071 active_outline => [1, 1, 0],
1955 can_hover => 1, 2072 can_hover => 1,
1956 can_focus => 1, 2073 can_focus => 1,
1957 valign => 0, 2074 valign => 0,
1958 can_events => 1, 2075 can_events => 1,
1959 ellipsise => 0, 2076 ellipsise => 0,
… …
2099 glColor_premultiply @{$self->{bg}}; 2216 glColor_premultiply @{$self->{bg}};
2100 } 2217 }
2101 2218
2102 glEnable GL_BLEND; 2219 glEnable GL_BLEND;
2103 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2220 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2104 glBegin GL_QUADS;
2105 glVertex 0 , 0;
2106 glVertex 0 , $self->{h};
2107 glVertex $self->{w}, $self->{h}; 2221 glRect 0, 0, $self->{w}, $self->{h};
2108 glVertex $self->{w}, 0;
2109 glEnd;
2110 glDisable GL_BLEND; 2222 glDisable GL_BLEND;
2111 2223
2112 $self->SUPER::_draw; 2224 $self->SUPER::_draw;
2113 2225
2114 #TODO: force update every cursor change :( 2226 #TODO: force update every cursor change :(
… …
2116 2228
2117 unless (exists $self->{cur_h}) { 2229 unless (exists $self->{cur_h}) {
2118 my $text = substr $self->{text}, 0, $self->{cursor}; 2230 my $text = substr $self->{text}, 0, $self->{cursor};
2119 utf8::encode $text; 2231 utf8::encode $text;
2120 2232
2121 @$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);
2122 } 2234 }
2123 2235
2236 glColor_premultiply @{$self->{active_fg}};
2124 glBegin GL_LINES; 2237 glBegin GL_LINES;
2125 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};
2126 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;
2127 glEnd; 2255 glEnd;
2128 } 2256 }
2129} 2257}
2130 2258
2131############################################################################# 2259#############################################################################
… …
2218 1 2346 1
2219} 2347}
2220 2348
2221############################################################################# 2349#############################################################################
2222 2350
2223package CFPlus::UI::Button; 2351package CFPlus::UI::ButtonBin;
2224 2352
2225our @ISA = CFPlus::UI::Label::; 2353our @ISA = CFPlus::UI::Bin::;
2226 2354
2227use CFPlus::OpenGL; 2355use CFPlus::OpenGL;
2228 2356
2229my @tex = 2357my @tex =
2230 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2358 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2231 qw(b1_button_active.png); 2359 qw(b1_button_inactive.png b1_button_active.png);
2232 2360
2233sub new { 2361sub new {
2234 my $class = shift; 2362 my $class = shift;
2235 2363
2236 $class->SUPER::new ( 2364 $class->SUPER::new (
2237 padding_x => 4,
2238 padding_y => 4,
2239 fg => [1, 1, 1],
2240 active_fg => [0, 0, 1],
2241 can_hover => 1, 2365 can_hover => 1,
2242 align => 0, 2366 align => 0,
2243 valign => 0, 2367 valign => 0,
2244 can_events => 1, 2368 can_events => 1,
2245 @_ 2369 @_
… …
2257} 2381}
2258 2382
2259sub _draw { 2383sub _draw {
2260 my ($self) = @_; 2384 my ($self) = @_;
2261 2385
2262 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2263
2264 glEnable GL_TEXTURE_2D; 2386 glEnable GL_TEXTURE_2D;
2265 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2387 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2266 glColor 0, 0, 0, 1; 2388 glColor 0, 0, 0, 1;
2267 2389
2390 my $tex = $tex[$GRAB == $self];
2268 $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});
2269 2447
2270 glDisable GL_TEXTURE_2D; 2448 glDisable GL_TEXTURE_2D;
2271 2449
2272 $self->SUPER::_draw; 2450 $self->SUPER::_draw;
2273} 2451}
… …
2360sub new { 2538sub new {
2361 my $class = shift; 2539 my $class = shift;
2362 2540
2363 my $self = $class->SUPER::new ( 2541 my $self = $class->SUPER::new (
2364 can_events => 0, 2542 can_events => 0,
2543 scale => 1,
2365 @_, 2544 @_,
2366 ); 2545 );
2367 2546
2368 $self->{path} || $self->{tex} 2547 $self->{path} || $self->{tex}
2369 or Carp::croak "'path' or 'tex' attributes required"; 2548 or Carp::croak "'path' or 'tex' attributes required";
… …
2394} 2573}
2395 2574
2396sub size_request { 2575sub size_request {
2397 my ($self) = @_; 2576 my ($self) = @_;
2398 2577
2399 ($self->{tex}{w}, $self->{tex}{h}) 2578 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2400} 2579}
2401 2580
2402sub _draw { 2581sub _draw {
2403 my ($self) = @_; 2582 my ($self) = @_;
2404 2583
… …
2414 } 2593 }
2415 2594
2416 glEnable GL_TEXTURE_2D; 2595 glEnable GL_TEXTURE_2D;
2417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2596 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2418 2597
2419 $tex->draw_quad (0, 0, $w, $h); 2598 $tex->draw_quad_alpha (0, 0, $w, $h);
2420 2599
2421 glDisable GL_TEXTURE_2D; 2600 glDisable GL_TEXTURE_2D;
2422} 2601}
2423 2602
2424############################################################################# 2603#############################################################################
… …
2443 align => 0, 2622 align => 0,
2444 valign => 0, 2623 valign => 0,
2445 can_events => 1, 2624 can_events => 1,
2446 @_ 2625 @_
2447 ); 2626 );
2627}
2628
2629sub invoke_button_down {
2630 my ($self, $ev, $x, $y) = @_;
2631
2632 1
2448} 2633}
2449 2634
2450sub invoke_button_up { 2635sub invoke_button_up {
2451 my ($self, $ev, $x, $y) = @_; 2636 my ($self, $ev, $x, $y) = @_;
2452 2637
… …
2592 glDisable GL_TEXTURE_2D; 2777 glDisable GL_TEXTURE_2D;
2593} 2778}
2594 2779
2595############################################################################# 2780#############################################################################
2596 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 $self->{lvl} = $lvl;
2902 $self->{exp} = $exp;
2903
2904 my $v = -1;
2905
2906 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2907 my $l0 = $table->[$lvl - 1];
2908 my $l1 = $table->[$lvl];
2909
2910 $self->{nxt} = $l1;
2911
2912 $v = ($exp - $l0) / ($l1 - $l0);
2913 }
2914
2915 $self->SUPER::set_value ($v);
2916}
2917
2918#############################################################################
2919
2597package CFPlus::UI::Gauge; 2920package CFPlus::UI::Gauge;
2598 2921
2599our @ISA = CFPlus::UI::VBox::; 2922our @ISA = CFPlus::UI::VBox::;
2600 2923
2601sub new { 2924sub new {
… …
2726 3049
2727 $self->SUPER::invoke_button_down ($ev, $x, $y); 3050 $self->SUPER::invoke_button_down ($ev, $x, $y);
2728 3051
2729 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3052 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2730 3053
2731 $self->invoke_mouse_motion ($ev, $x, $y) 3054 $self->invoke_mouse_motion ($ev, $x, $y);
3055
3056 1
2732} 3057}
2733 3058
2734sub invoke_mouse_motion { 3059sub invoke_mouse_motion {
2735 my ($self, $ev, $x, $y) = @_; 3060 my ($self, $ev, $x, $y) = @_;
2736 3061
… …
2756 3081
2757 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3082 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2758 3083
2759 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3084 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2760 3085
2761 ! ! $delta 3086 1
2762} 3087}
2763 3088
2764sub update { 3089sub update {
2765 my ($self) = @_; 3090 my ($self) = @_;
2766 3091
… …
2897} 3222}
2898 3223
2899sub size_request { 3224sub size_request {
2900 my ($self) = @_; 3225 my ($self) = @_;
2901 3226
2902 my ($empty, $slider) = @{ $self->{children} }; 3227 my ($empty, $slider) = $self->visible_children;
2903 3228
2904 local $self->{children} = [$empty, $slider]; 3229 local $self->{children} = [$empty, $slider];
2905 $self->SUPER::size_request 3230 $self->SUPER::size_request
2906} 3231}
2907 3232
… …
3096 3421
3097 if ($y0 < $y + $h && $y < $y1) { 3422 if ($y0 < $y + $h && $y < $y1) {
3098 my $layout = $self->get_layout ($para); 3423 my $layout = $self->get_layout ($para);
3099 3424
3100 $layout->render ($para->{indent}, $y - $y0); 3425 $layout->render ($para->{indent}, $y - $y0);
3426 $layout->draw;
3101 3427
3102 if (my @w = @{ $para->{widget} }) { 3428 if (my @w = @{ $para->{widget} }) {
3103 my @s = $layout->get_shapes; 3429 my @s = $layout->get_shapes;
3104 3430
3105 for (@w) { 3431 for (@w) {
… …
3227} 3553}
3228 3554
3229sub set_tooltip_from { 3555sub set_tooltip_from {
3230 my ($self, $widget) = @_; 3556 my ($self, $widget) = @_;
3231 3557
3232 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3233 if $widget->{tooltip} =~ /^#(.*)$/;
3234
3235 my $tooltip = $widget->{tooltip}; 3558 my $tip = $widget->{tooltip};
3559 $tip = $tip->($widget) if "CODE" eq ref $tip;
3560
3561 $tip = CFPlus::Pod::section_label tooltip => $1
3562 if $tip =~ /^#(.*)$/;
3236 3563
3237 if ($ENV{CFPLUS_DEBUG} & 2) { 3564 if ($ENV{CFPLUS_DEBUG} & 2) {
3238 $tooltip .= "\n\n" . (ref $widget) . "\n" 3565 $tip .= "\n\n" . (ref $widget) . "\n"
3239 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3566 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3240 . "req $widget->{req_w} $widget->{req_h}\n" 3567 . "req $widget->{req_w} $widget->{req_h}\n"
3241 . "visible $widget->{visible}"; 3568 . "visible $widget->{visible}";
3242 } 3569 }
3243 3570
3244 $tooltip =~ s/^\n+//; 3571 $tip =~ s/^\n+//;
3245 $tooltip =~ s/\n+$//; 3572 $tip =~ s/\n+$//;
3246 3573
3247 $self->add (new CFPlus::UI::Label 3574 $self->add (new CFPlus::UI::Label
3248 markup => $tooltip, 3575 markup => $tip,
3249 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3576 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3250 fontsize => 0.8, 3577 fontsize => 0.8,
3251 style => 1, # FLAG_INVERSE 3578 style => 1, # FLAG_INVERSE
3252 ellipsise => 0, 3579 ellipsise => 0,
3253 font => ($widget->{tooltip_font} || $::FONT_PROP), 3580 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
3296 glTranslate 0.375, 0.375; 3623 glTranslate 0.375, 0.375;
3297 3624
3298 my ($w, $h) = @$self{qw(w h)}; 3625 my ($w, $h) = @$self{qw(w h)};
3299 3626
3300 glColor 1, 0.8, 0.4; 3627 glColor 1, 0.8, 0.4;
3301 glBegin GL_QUADS; 3628 glRect 0, 0, $w, $h;
3302 glVertex 0 , 0;
3303 glVertex 0 , $h;
3304 glVertex $w, $h;
3305 glVertex $w, 0;
3306 glEnd;
3307 3629
3308 glColor 0, 0, 0; 3630 glColor 0, 0, 0;
3309 glBegin GL_LINE_LOOP; 3631 glRect_lineloop 0, 0, $w, $h;
3310 glVertex 0 , 0;
3311 glVertex 0 , $h;
3312 glVertex $w, $h;
3313 glVertex $w, 0;
3314 glEnd;
3315 3632
3316 glTranslate 2 - 0.375, 2 - 0.375; 3633 glTranslate 2 - 0.375, 2 - 0.375;
3317 3634
3318 $self->SUPER::_draw; 3635 $self->SUPER::_draw;
3319} 3636}
… …
3338 ); 3655 );
3339 3656
3340 if ($self->{anim} && $self->{animspeed}) { 3657 if ($self->{anim} && $self->{animspeed}) {
3341 CFPlus::weaken (my $widget = $self); 3658 CFPlus::weaken (my $widget = $self);
3342 3659
3660 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3661 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3343 $self->{timer} = Event->timer ( 3662 $self->{timer} = Event->timer (
3344 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3345 hard => 1, 3663 parked => 1,
3346 interval => $self->{animspeed},
3347 cb => sub { 3664 cb => sub {
3348 return unless $::CONN; 3665 return unless $::CONN;
3349 3666
3667 my $w = $widget
3668 or return;
3669
3350 ++$widget->{frame}; 3670 ++$w->{frame};
3351 $self->update_face; 3671 $w->update_face;
3672
3673 # somehow, $widget can go away
3352 $self->update; 3674 $w->update;
3675 $w->update_timer;
3353 }, 3676 },
3354 ); 3677 );
3355 3678
3356 $self->update_face; 3679 $self->update_face;
3680 $self->update_timer;
3357 } 3681 }
3358 3682
3359 $self 3683 $self
3360} 3684}
3361 3685
3686sub update_timer {
3687 my ($self) = @_;
3688
3689 return unless $self->{timer};
3690
3691 if ($self->{visible}) {
3692 $self->{timer}->at (
3693 $self->{anim_start}
3694 + $self->{animspeed}
3695 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3696 );
3697 $self->{timer}->start;
3698 } else {
3699 $self->{timer}->stop;
3700 }
3701}
3702
3362sub update_face { 3703sub update_face {
3363 my ($self) = @_; 3704 my ($self) = @_;
3364 3705
3365 return unless $::CONN;
3366
3367 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3368 if ($anim && @$anim) {
3369 delete $self->{wait_face};
3370 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3371 }
3372 }
3373}
3374
3375sub size_request {
3376 my ($self) = @_;
3377
3378 if ($::CONN) { 3706 if ($::CONN) {
3379 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3707 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3380 if (my $tex = $::CONN->{texture}[$faceid]) { 3708 if ($anim && @$anim) {
3381 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3709 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3382 } else { 3710 delete $self->{face_change_cb};
3383 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3711
3384 $self->realloc; 3712 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3713 unless ($tex->{name} || $tex->{loading}) {
3714 $tex->upload (sub { $self->reconfigure });
3715 }
3385 }); 3716 }
3386 } 3717 }
3387 } 3718 }
3388 } 3719 }
3720}
3721
3722sub size_request {
3723 my ($self) = @_;
3724
3725 if ($::CONN) {
3726 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3727 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3728 if ($tex->{name}) {
3729 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3730 } elsif (!$tex->{loading}) {
3731 $tex->upload (sub { $self->reconfigure });
3732 }
3733 }
3734
3735 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3736 }
3737 }
3389 3738
3390 ($self->{size_w} || 8, $self->{size_h} || 8) 3739 ($self->{size_w} || 8, $self->{size_h} || 8)
3391} 3740}
3392 3741
3393sub update { 3742sub update {
… …
3396 return unless $self->{visible}; 3745 return unless $self->{visible};
3397 3746
3398 $self->SUPER::update; 3747 $self->SUPER::update;
3399} 3748}
3400 3749
3750sub invoke_visibility_change {
3751 my ($self) = @_;
3752
3753 $self->update_timer;
3754
3755 0
3756}
3757
3401sub _draw { 3758sub _draw {
3402 my ($self) = @_; 3759 my ($self) = @_;
3403 3760
3404 return unless $::CONN;
3405
3406 $self->SUPER::_draw; 3761 $self->SUPER::_draw;
3407 3762
3408 my $faceid = $::CONN->{faceid}[$self->{face}] 3763 if (my $tex = $self->{tex}) {
3409 or return;
3410
3411 my $tex = $::CONN->{texture}[$faceid];
3412
3413 if ($tex) {
3414 glEnable GL_TEXTURE_2D; 3764 glEnable GL_TEXTURE_2D;
3415 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3765 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3416 glColor 0, 0, 0, 1; 3766 glColor 0, 0, 0, 1;
3417 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3767 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3418 glDisable GL_TEXTURE_2D; 3768 glDisable GL_TEXTURE_2D;
… …
3420} 3770}
3421 3771
3422sub destroy { 3772sub destroy {
3423 my ($self) = @_; 3773 my ($self) = @_;
3424 3774
3425 $self->{timer}->cancel 3775 (delete $self->{timer})->cancel
3426 if $self->{timer}; 3776 if $self->{timer};
3427 3777
3428 $self->SUPER::destroy; 3778 $self->SUPER::destroy;
3429} 3779}
3430 3780
… …
3470 children => [ 3820 children => [
3471 (new CFPlus::UI::Label markup => $left, expand => 1), 3821 (new CFPlus::UI::Label markup => $left, expand => 1),
3472 (new CFPlus::UI::Label markup => $right, align => +1), 3822 (new CFPlus::UI::Label markup => $right, align => +1),
3473 ], 3823 ],
3474 ; 3824 ;
3475 3825
3476 } else { 3826 } else {
3477 $widget = new CFPlus::UI::Label 3827 $widget = new CFPlus::UI::Label
3478 can_hover => 1, 3828 can_hover => 1,
3479 can_events => 1, 3829 can_events => 1,
3480 markup => $widget, 3830 markup => $widget,
… …
3605 3955
3606############################################################################# 3956#############################################################################
3607 3957
3608package CFPlus::UI::Notebook; 3958package CFPlus::UI::Notebook;
3609 3959
3960use CFPlus::OpenGL;
3961
3610our @ISA = CFPlus::UI::VBox::; 3962our @ISA = CFPlus::UI::VBox::;
3611 3963
3612sub new { 3964sub new {
3613 my $class = shift; 3965 my $class = shift;
3614 3966
3615 my $self = $class->SUPER::new ( 3967 my $self = $class->SUPER::new (
3616 buttonbar => (new CFPlus::UI::Buttonbar), 3968 buttonbar => (new CFPlus::UI::Buttonbar),
3617 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3969 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3970 active_outline => [1, 1, 0],
3618 # filter => # will be put between multiplexer and $self 3971 # filter => # will be put between multiplexer and $self
3619 @_, 3972 @_,
3620 ); 3973 );
3621 3974
3622 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3975 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3623 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3976 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3624 3977
3978 {
3979 Scalar::Util::weaken (my $wself = $self);
3980
3981 $self->{multiplexer}->connect (c_add => sub {
3982 my ($mplex, $widgets) = @_;
3983
3984 for my $child (@$widgets) {
3985 Scalar::Util::weaken $child;
3986 $child->{c_tab_} ||= do {
3987 my $tab =
3988 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3989 ? $child->{c_tab}
3990 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3991
3992 $tab->connect (activate => sub {
3993 $wself->set_current_page ($child);
3994 });
3995
3996 $tab
3997 };
3998
3999 $self->{buttonbar}->add ($child->{c_tab_});
4000 }
4001 });
4002
4003 $self->{multiplexer}->connect (c_remove => sub {
4004 my ($mplex, $widgets) = @_;
4005
4006 for my $child (@$widgets) {
4007 $wself->{buttonbar}->remove ($child->{c_tab_});
4008 }
4009 });
4010 }
4011
3625 $self 4012 $self
3626} 4013}
3627 4014
3628sub add { 4015sub add {
4016 my ($self, @widgets) = @_;
4017
4018 $self->{multiplexer}->add (@widgets)
4019}
4020
4021sub remove {
4022 my ($self, @widgets) = @_;
4023
4024 $self->{multiplexer}->remove (@widgets)
4025}
4026
4027sub pages {
4028 my ($self) = @_;
4029 $self->{multiplexer}->children
4030}
4031
4032sub add_tab {
3629 my ($self, $title, $widget, $tooltip) = @_; 4033 my ($self, $title, $widget, $tooltip) = @_;
3630 4034
3631 CFPlus::weaken $self; 4035 $title = [$title, $tooltip] unless ref $title;
4036 $widget->{c_tab} = $title;
3632 4037
3633 $self->{buttonbar}->add (new CFPlus::UI::Button
3634 markup => $title,
3635 tooltip => $tooltip,
3636 on_activate => sub { $self->set_current_page ($widget) },
3637 );
3638
3639 $self->{multiplexer}->add ($widget); 4038 $self->add ($widget);
3640} 4039}
3641 4040
3642sub get_current_page { 4041sub get_current_page {
3643 my ($self) = @_; 4042 my ($self) = @_;
3644 4043
… …
3648sub set_current_page { 4047sub set_current_page {
3649 my ($self, $page) = @_; 4048 my ($self, $page) = @_;
3650 4049
3651 $self->{multiplexer}->set_current_page ($page); 4050 $self->{multiplexer}->set_current_page ($page);
3652 $self->emit (page_changed => $self->{multiplexer}{current}); 4051 $self->emit (page_changed => $self->{multiplexer}{current});
4052}
4053
4054sub _draw {
4055 my ($self) = @_;
4056
4057 $self->SUPER::_draw ();
4058
4059 if (my $cur = $self->{multiplexer}{current}) {
4060 if ($cur = $cur->{c_tab_}) {
4061 glTranslate $cur->{x}, $cur->{y};
4062 glLineWidth 3;
4063 glColor @{$self->{active_outline}};
4064 glRect_lineloop 1, 1, $cur->{w} - 2, $cur->{h} - 2;
4065 glLineWidth 1;
4066 }
4067 }
3653} 4068}
3654 4069
3655############################################################################# 4070#############################################################################
3656 4071
3657package CFPlus::UI::Selector; 4072package CFPlus::UI::Selector;
… …
3927} 4342}
3928 4343
3929sub update { 4344sub update {
3930 my ($self) = @_; 4345 my ($self) = @_;
3931 4346
3932 $::WANT_REFRESH++; 4347 $::WANT_REFRESH->start;
3933} 4348}
3934 4349
3935sub add { 4350sub add {
3936 my ($self, @children) = @_; 4351 my ($self, @children) = @_;
3937 4352
… …
3974 while ($self->{refresh_hook}) { 4389 while ($self->{refresh_hook}) {
3975 $_->() 4390 $_->()
3976 for values %{delete $self->{refresh_hook}}; 4391 for values %{delete $self->{refresh_hook}};
3977 } 4392 }
3978 4393
3979 if ($self->{realloc}) { 4394 while ($self->{realloc}) {
3980 my %queue; 4395 my %queue;
3981 my @queue; 4396 my @queue;
3982 my $widget; 4397 my $widget;
3983 4398
3984 outer: 4399 outer:
… …
4031 } 4446 }
4032 } 4447 }
4033 4448
4034 delete $self->{realloc}{$widget+0}; 4449 delete $self->{realloc}{$widget+0};
4035 } 4450 }
4036 }
4037 4451
4038 while (my $size_alloc = delete $self->{size_alloc}) { 4452 while (my $size_alloc = delete $self->{size_alloc}) {
4039 my @queue = sort { $b->{visible} <=> $a->{visible} } 4453 my @queue = sort { $a->{visible} <=> $b->{visible} }
4040 values %$size_alloc; 4454 values %$size_alloc;
4041 4455
4042 while () { 4456 while () {
4043 my $widget = pop @queue || last; 4457 my $widget = pop @queue || last;
4044 4458
4045 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4459 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4046 4460
4047 $w = 0 if $w < 0;
4048 $h = 0 if $h < 0;
4049
4050 $w = max $widget->{min_w}, $w; 4461 $w = max $widget->{min_w}, $w;
4051 $h = max $widget->{min_h}, $h; 4462 $h = max $widget->{min_h}, $h;
4052 4463
4053# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4464# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4054# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4465# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4055 4466
4056 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4467 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4057 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4468 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4058 4469
4059 $w = int $w + 0.5; 4470 $w = int $w + 0.5;
4060 $h = int $h + 0.5; 4471 $h = int $h + 0.5;
4061 4472
4062 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4473 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4063 $widget->{old_w} = $widget->{w}; 4474 $widget->{old_w} = $widget->{w};
4064 $widget->{old_h} = $widget->{h}; 4475 $widget->{old_h} = $widget->{h};
4065 4476
4066 $widget->{w} = $w; 4477 $widget->{w} = $w;
4067 $widget->{h} = $h; 4478 $widget->{h} = $h;
4068 4479
4069 $widget->emit (size_allocate => $w, $h); 4480 $widget->emit (size_allocate => $w, $h);
4481 }
4070 } 4482 }
4071 } 4483 }
4072 } 4484 }
4073 4485
4074 while ($self->{post_alloc_hook}) { 4486 while ($self->{post_alloc_hook}) {
4075 $_->() 4487 $_->()
4076 for values %{delete $self->{post_alloc_hook}}; 4488 for values %{delete $self->{post_alloc_hook}};
4077 } 4489 }
4078
4079 4490
4080 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4491 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4081 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4492 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4082 glClear GL_COLOR_BUFFER_BIT; 4493 glClear GL_COLOR_BUFFER_BIT;
4083 4494

Diff Legend

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