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.366 by root, Mon Apr 23 19:17:41 2007 UTC vs.
Revision 1.434 by root, Wed Aug 22 21:32:09 2007 UTC

… …
113 } 113 }
114 114
115 if ($GRAB) { 115 if ($GRAB) {
116 if ($ev->{button} == 4 || $ev->{button} == 5) { 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
117 # mousewheel 117 # mousewheel
118 $ev->{dx} = 0;
119 $ev->{dy} = $ev->{button} * 2 - 9; 118 my $delta = $ev->{button} * 2 - 9;
119 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
120
121 $ev->{dx} = $shift ? $delta : 0;
122 $ev->{dy} = $shift ? 0 : $delta;
123
120 $GRAB->emit (mouse_wheel => $ev); 124 $GRAB->emit (mouse_wheel => $ev);
121 } else { 125 } else {
122 $GRAB->emit (button_down => $ev) 126 $GRAB->emit (button_down => $ev)
123 } 127 }
124 } 128 }
… …
268 $self->hide; 272 $self->hide;
269 $self->emit ("destroy"); 273 $self->emit ("destroy");
270 %$self = (); 274 %$self = ();
271} 275}
272 276
277sub TO_JSON {
278 { __w_ => $_[0]{s_id} }
279}
280
273sub show { 281sub show {
274 my ($self) = @_; 282 my ($self) = @_;
275 283
276 return if $self->{parent}; 284 return if $self->{parent};
277 285
… …
316sub set_visibility { 324sub set_visibility {
317 my ($self, $visible) = @_; 325 my ($self, $visible) = @_;
318 326
319 return if $self->{visible} == $visible; 327 return if $self->{visible} == $visible;
320 328
321 $visible ? $self->hide 329 $visible ? $self->show
322 : $self->show; 330 : $self->hide;
323} 331}
324 332
325sub toggle_visibility { 333sub toggle_visibility {
326 my ($self) = @_; 334 my ($self) = @_;
327 335
… …
543 551
544 # parent 552 # parent
545 $self->{parent} && $self->{parent}->emit ($signal, @args) 553 $self->{parent} && $self->{parent}->emit ($signal, @args)
546} 554}
547 555
548sub find_widget { 556#sub find_widget {
549 my ($self, $x, $y) = @_; 557# in .xs
550
551 return () unless $self->{can_events};
552
553 return $self
554 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
555 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
556
557 ()
558}
559 558
560sub set_parent { 559sub set_parent {
561 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
562 561
563 CFPlus::weaken ($self->{parent} = $parent); 562 CFPlus::weaken ($self->{parent} = $parent);
… …
594 593
595# using global variables seems a bit hacky, but passing through all drawing 594# using global variables seems a bit hacky, but passing through all drawing
596# functions seems pointless. 595# functions seems pointless.
597our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 596our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
598 597
599sub draw { 598#sub draw {
600 my ($self) = @_; 599#CFPlus.xs
601
602 return unless $self->{h} && $self->{w};
603
604 # update screen rectangle
605 local $draw_x = $draw_x + $self->{x};
606 local $draw_y = $draw_y + $self->{y};
607
608 # skip widgets that are entirely outside the drawing area
609 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
610 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
611
612 glPushMatrix;
613 glTranslate $self->{x}, $self->{y}, 0;
614
615 if ($self == $HOVER && $self->{can_hover}) {
616 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
617 glEnable GL_BLEND;
618 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
619 glBegin GL_QUADS;
620 glVertex 0 , 0;
621 glVertex $self->{w}, 0;
622 glVertex $self->{w}, $self->{h};
623 glVertex 0 , $self->{h};
624 glEnd;
625 glDisable GL_BLEND;
626 }
627
628 if ($ENV{CFPLUS_DEBUG} & 1) {
629 glPushMatrix;
630 glColor 1, 1, 0, 1;
631 glTranslate 0.375, 0.375;
632 glBegin GL_LINE_LOOP;
633 glVertex 0 , 0;
634 glVertex $self->{w} - 1, 0;
635 glVertex $self->{w} - 1, $self->{h} - 1;
636 glVertex 0 , $self->{h} - 1;
637 glEnd;
638 glPopMatrix;
639 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
640 }
641
642 $self->_draw;
643 glPopMatrix;
644}
645 600
646sub _draw { 601sub _draw {
647 my ($self) = @_; 602 my ($self) = @_;
648 603
649 warn "no draw defined for $self\n"; 604 warn "no draw defined for $self\n";
650} 605}
651 606
652my $cntx;#d#
653sub DESTROY { 607sub DESTROY {
654 my ($self) = @_; 608 my ($self) = @_;
655 609
656 return if CFPlus::in_destruct; 610 return if CFPlus::in_destruct;
657 611
612 local $@;
658 eval { $self->destroy }; 613 eval { $self->destroy };
659 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 614 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
660 615
661 delete $WIDGET{$self+0}; 616 delete $WIDGET{$self+0};
662} 617}
… …
670use strict; 625use strict;
671use CFPlus::OpenGL; 626use CFPlus::OpenGL;
672 627
673sub new { 628sub new {
674 my $class = shift; 629 my $class = shift;
675
676 # range [value, low, high, page]
677 630
678 $class->SUPER::new ( 631 $class->SUPER::new (
679 #bg => [0, 0, 0, 0.2], 632 #bg => [0, 0, 0, 0.2],
680 #active_bg => [1, 1, 1, 0.5], 633 #active_bg => [1, 1, 1, 0.5],
681 @_ 634 @_
… …
693 my ($w, $h) = @$self{qw(w h)}; 646 my ($w, $h) = @$self{qw(w h)};
694 647
695 glEnable GL_BLEND; 648 glEnable GL_BLEND;
696 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 649 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
697 glColor_premultiply @$color; 650 glColor_premultiply @$color;
698
699 glBegin GL_QUADS;
700 glVertex 0 , 0;
701 glVertex 0 , $h;
702 glVertex $w, $h; 651 glRect 0, 0, $w, $h;
703 glVertex $w, 0;
704 glEnd;
705
706 glDisable GL_BLEND; 652 glDisable GL_BLEND;
707 } 653 }
708} 654}
709 655
710############################################################################# 656#############################################################################
… …
742 can_events => 0, 688 can_events => 0,
743 %arg, 689 %arg,
744 ); 690 );
745 691
746 $self->add (@$children) 692 $self->add (@$children)
747 if $children; 693 if $children && @$children;
748 694
749 $self 695 $self
750} 696}
751 697
752sub realloc { 698sub realloc {
… …
761 my ($self, @widgets) = @_; 707 my ($self, @widgets) = @_;
762 708
763 $_->set_parent ($self) 709 $_->set_parent ($self)
764 for @widgets; 710 for @widgets;
765 711
712 # TODO: only do this in widgets that need it, e.g. root, fixed
766 use sort 'stable'; 713 use sort 'stable';
767 714
768 $self->{children} = [ 715 $self->{children} = [
769 sort { $a->{z} <=> $b->{z} } 716 sort { $a->{z} <=> $b->{z} }
770 @{$self->{children}}, @widgets 717 @{$self->{children}}, @widgets
771 ]; 718 ];
772 719
773 $self->realloc; 720 $self->realloc;
721
722 $self->emit (c_add => \@widgets);
723
724 map $_+0, @widgets
774} 725}
775 726
776sub children { 727sub children {
777 @{ $_[0]{children} } 728 @{ $_[0]{children} }
778} 729}
779 730
780sub remove { 731sub remove {
781 my ($self, $child) = @_; 732 my ($self, @widgets) = @_;
782 733
734 $self->emit (c_remove => \@widgets);
735
736 for my $child (@widgets) {
783 delete $child->{parent}; 737 delete $child->{parent};
784 $child->hide; 738 $child->hide;
785
786 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 739 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
740 }
787 741
788 $self->realloc; 742 $self->realloc;
789} 743}
790 744
791sub clear { 745sub clear {
792 my ($self) = @_; 746 my ($self) = @_;
793 747
794 my $children = delete $self->{children}; 748 my $children = $self->{children};
795 $self->{children} = []; 749 $self->{children} = [];
796 750
797 for (@$children) { 751 for (@$children) {
798 delete $_->{parent}; 752 delete $_->{parent};
799 $_->hide; 753 $_->hide;
… …
819} 773}
820 774
821sub _draw { 775sub _draw {
822 my ($self) = @_; 776 my ($self) = @_;
823 777
824 $_->draw for @{$self->{children}}; 778 $_->draw for $self->visible_children;
825} 779}
826 780
827############################################################################# 781#############################################################################
828 782
829package CFPlus::UI::Bin; 783package CFPlus::UI::Bin;
… …
839} 793}
840 794
841sub add { 795sub add {
842 my ($self, $child) = @_; 796 my ($self, $child) = @_;
843 797
844 $self->SUPER::remove ($_) for @{ $self->{children} }; 798 $self->clear;
845 $self->SUPER::add ($child); 799 $self->SUPER::add ($child);
846} 800}
847 801
848sub remove { 802sub remove {
849 my ($self, $widget) = @_; 803 my ($self, $widget) = @_;
… …
939} 893}
940 894
941############################################################################# 895#############################################################################
942 896
943package CFPlus::UI::ViewPort; 897package CFPlus::UI::ViewPort;
898
899use List::Util qw(min max);
944 900
945our @ISA = CFPlus::UI::Window::; 901our @ISA = CFPlus::UI::Window::;
946 902
947sub new { 903sub new {
948 my $class = shift; 904 my $class = shift;
… …
957sub size_request { 913sub size_request {
958 my ($self) = @_; 914 my ($self) = @_;
959 915
960 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 916 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
961 917
962 $w = 10 if $self->{scroll_x}; 918 $w = 1 if $self->{scroll_x};
963 $h = 10 if $self->{scroll_y}; 919 $h = 1 if $self->{scroll_y};
964 920
965 ($w, $h) 921 ($w, $h)
966} 922}
967 923
968sub invoke_size_allocate { 924sub invoke_size_allocate {
… …
980} 936}
981 937
982sub set_offset { 938sub set_offset {
983 my ($self, $x, $y) = @_; 939 my ($self, $x, $y) = @_;
984 940
941 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
942 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
943
944 if ($x != $self->{view_x} or $y != $self->{view_y}) {
985 $self->{view_x} = int $x; 945 $self->{view_x} = $x;
986 $self->{view_y} = int $y; 946 $self->{view_y} = $y;
987 947
948 $self->emit (changed => $x, $y);
988 $self->update; 949 $self->update;
950 }
951}
952
953sub set_center {
954 my ($self, $x, $y) = @_;
955
956 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
957}
958
959sub make_visible {
960 my ($self, $x, $y, $border) = @_;
961
962 if ( $x < $self->{view_x} + $self->{w} * $border
963 || $x > $self->{view_x} + $self->{w} * (1 - $border)
964 || $y < $self->{view_y} + $self->{h} * $border
965 || $y > $self->{view_y} + $self->{h} * (1 - $border)
966 ) {
967 $self->set_center ($x, $y);
968 }
989} 969}
990 970
991# hmm, this does not work for topleft of $self... but we should not ask for that 971# hmm, this does not work for topleft of $self... but we should not ask for that
992sub coord2local { 972sub coord2local {
993 my ($self, $x, $y) = @_; 973 my ($self, $x, $y) = @_;
… …
1008 my ($self, $x, $y) = @_; 988 my ($self, $x, $y) = @_;
1009 989
1010 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 990 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1011 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 991 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1012 ) { 992 ) {
1013 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 993 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1014 } else { 994 } else {
1015 $self->CFPlus::UI::Base::find_widget ($x, $y) 995 $self->CFPlus::UI::Base::find_widget ($x, $y)
1016 } 996 }
1017} 997}
1018 998
… …
1029 1009
1030############################################################################# 1010#############################################################################
1031 1011
1032package CFPlus::UI::ScrolledWindow; 1012package CFPlus::UI::ScrolledWindow;
1033 1013
1034our @ISA = CFPlus::UI::HBox::; 1014our @ISA = CFPlus::UI::Table::;
1035 1015
1036sub new { 1016sub new {
1037 my ($class, %arg) = @_; 1017 my ($class, %arg) = @_;
1038 1018
1039 my $child = delete $arg{child}; 1019 my $child = delete $arg{child};
1040 1020
1041 my $self; 1021 my $self;
1042 1022
1043 my $slider = new CFPlus::UI::Slider 1023 my $hslider = new CFPlus::UI::Slider
1024 c_col => 0,
1025 c_row => 1,
1026 vertical => 0,
1027 range => [0, 0, 1, 0.01], # HACK fix
1028 on_changed => sub {
1029 $self->{hpos} = $_[1];
1030 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1031 },
1032 ;
1033
1034 my $vslider = new CFPlus::UI::Slider
1035 c_col => 1,
1036 c_row => 0,
1044 vertical => 1, 1037 vertical => 1,
1045 range => [0, 0, 1, 0.01], # HACK fix 1038 range => [0, 0, 1, 0.01], # HACK fix
1046 on_changed => sub { 1039 on_changed => sub {
1047 $self->{vp}->set_offset (0, $_[1]); 1040 $self->{vpos} = $_[1];
1041 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1048 }, 1042 },
1049 ; 1043 ;
1050 1044
1051 $self = $class->SUPER::new ( 1045 $self = $class->SUPER::new (
1052 vp => (new CFPlus::UI::ViewPort expand => 1), 1046 scroll_x => 0,
1047 scroll_y => 1,
1053 can_events => 1, 1048 can_events => 1,
1054 slider => $slider, 1049 hslider => $hslider,
1050 vslider => $vslider,
1051 col_expand => [1, 0],
1052 row_expand => [1, 0],
1055 %arg, 1053 %arg,
1056 ); 1054 );
1057 1055
1056 $self->{vp} = new CFPlus::UI::ViewPort
1057 c_col => 0,
1058 c_row => 0,
1059 expand => 1,
1060 scroll_x => $self->{scroll_x},
1061 scroll_y => $self->{scroll_y},
1062 on_changed => sub {
1063 my ($vp, $x, $y) = @_;
1064
1065 $vp->{parent}{hslider}->set_value ($x);
1066 $vp->{parent}{vslider}->set_value ($y);
1067
1068 0
1069 },
1070 on_size_allocate => sub {
1071 my ($vp, $w, $h) = @_;
1072 $vp->{parent}->update_slider;
1073 0
1074 },
1075 ;
1076
1058 $self->SUPER::add ($self->{vp}, $self->{slider}); 1077 $self->SUPER::add ($self->{vp});
1078
1059 $self->add ($child) if $child; 1079 $self->add ($child) if $child;
1060 1080
1061 $self 1081 $self
1062} 1082}
1063
1064#TODO# update range on size_allocate depending on child
1065 1083
1066sub add { 1084sub add {
1067 my ($self, $widget) = @_; 1085 my ($self, $widget) = @_;
1068 1086
1069 $self->{vp}->add ($self->{child} = $widget); 1087 $self->{vp}->add ($self->{child} = $widget);
1070} 1088}
1071 1089
1090sub set_offset { shift->{vp}->set_offset (@_) }
1091sub set_center { shift->{vp}->set_center (@_) }
1092sub make_visible { shift->{vp}->make_visible (@_) }
1093
1094sub update_slider {
1095 my ($self) = @_;
1096
1097 my $child = ($self->{vp} or return)->child;
1098
1099 if ($self->{scroll_x}) {
1100 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1101 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1102
1103 my $visible = $w1 > $w2;
1104 if ($visible != $self->{hslider_visible}) {
1105 $self->{hslider_visible} = $visible;
1106 $visible ? $self->SUPER::add ($self->{hslider})
1107 : $self->SUPER::remove ($self->{hslider});
1108 }
1109 }
1110
1111 if ($self->{scroll_y}) {
1112 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1113 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1114
1115 my $visible = $h1 > $h2;
1116 if ($visible != $self->{vslider_visible}) {
1117 $self->{vslider_visible} = $visible;
1118 $visible ? $self->SUPER::add ($self->{vslider})
1119 : $self->SUPER::remove ($self->{vslider});
1120 }
1121 }
1122}
1123
1124sub start_dragging {
1125 my ($self, $ev) = @_;
1126
1127 $self->grab_focus;
1128
1129 my $ox = $self->{vp}{view_x};
1130 my $oy = $self->{vp}{view_y};
1131
1132 $self->{motion} = sub {
1133 my ($ev, $x, $y) = @_;
1134
1135 $ox -= $ev->{xrel};
1136 $oy -= $ev->{yrel};
1137
1138 $self->{vp}->set_offset ($ox, $oy);
1139 };
1140}
1141
1072sub invoke_mouse_wheel { 1142sub invoke_mouse_wheel {
1073 my ($self, $ev) = @_; 1143 my ($self, $ev) = @_;
1074 1144
1075 return 0 unless $ev->{dy}; # only vertical movements
1076
1077 $self->{slider}->emit (mouse_wheel => $ev); 1145 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1146 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1078 1147
1079 1 1148 1
1080} 1149}
1081 1150
1082sub update_slider { 1151sub invoke_button_down {
1083 my ($self) = @_; 1152 my ($self, $ev, $x, $y) = @_;
1084 1153
1085 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1154 if ($ev->{button} == 2) {
1086} 1155 $self->start_dragging ($ev);
1156 return 1;
1157 }
1087 1158
1088sub update { 1159 0
1089 my ($self) = @_; 1160}
1090 1161
1091 $self->SUPER::update; 1162sub invoke_button_up {
1163 my ($self, $ev, $x, $y) = @_;
1092 1164
1093 $self->update_slider; 1165 if (delete $self->{motion}) {
1166 return 1;
1167 }
1168
1169 0
1170}
1171
1172sub invoke_mouse_motion {
1173 my ($self, $ev, $x, $y) = @_;
1174
1175 if ($self->{motion}) {
1176 $self->{motion}->($ev, $x, $y);
1177 return 1;
1178 }
1179
1180 0
1094} 1181}
1095 1182
1096sub invoke_size_allocate { 1183sub invoke_size_allocate {
1097 my ($self, $w, $h) = @_; 1184 my ($self, $w, $h) = @_;
1098 1185
1099 $self->update_slider; 1186 $self->update_slider;
1100
1101 $self->SUPER::invoke_size_allocate ($w, $h) 1187 $self->SUPER::invoke_size_allocate ($w, $h)
1102} 1188}
1103 1189
1104############################################################################# 1190#############################################################################
1105 1191
… …
1125 my ($w, $h) = @$self{qw(w h)}; 1211 my ($w, $h) = @$self{qw(w h)};
1126 1212
1127 glEnable GL_BLEND; 1213 glEnable GL_BLEND;
1128 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1214 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1129 glColor_premultiply @{ $self->{bg} }; 1215 glColor_premultiply @{ $self->{bg} };
1130
1131 glBegin GL_QUADS;
1132 glVertex 0 , 0;
1133 glVertex 0 , $h;
1134 glVertex $w, $h; 1216 glRect 0, 0, $w, $h;
1135 glVertex $w, 0;
1136 glEnd;
1137
1138 glDisable GL_BLEND; 1217 glDisable GL_BLEND;
1139 } 1218 }
1140 1219
1141 $self->SUPER::_draw; 1220 $self->SUPER::_draw;
1142} 1221}
… …
1255 1334
1256my @border = 1335my @border =
1257 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1336 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1258 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1337 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1259 1338
1339my @icon =
1340 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1341 qw(x1_move.png x1_resize.png);
1342
1260sub new { 1343sub new {
1261 my ($class, %arg) = @_; 1344 my ($class, %arg) = @_;
1262 1345
1263 my $self = $class->SUPER::new ( 1346 my $self = $class->SUPER::new (
1264 bg => [1, 1, 1, 1], 1347 bg => [1, 1, 1, 1],
… …
1432 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1515 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1433 1516
1434 my $border = $self->border; 1517 my $border = $self->border;
1435 1518
1436 glColor @{ $self->{border_bg} }; 1519 glColor @{ $self->{border_bg} };
1437 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1520 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1438 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1521 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1439 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1522 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1440 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1523 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1524
1525 # move
1526 my $w2 = ($w - $border) * .5;
1527 my $h2 = ($h - $border) * .5;
1528 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1529 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1530 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1531
1532 # resize
1533 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1534 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1535 unless $self->{has_close_button};
1536 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1537 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1441 1538
1442 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1539 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1443 glColor @{ $self->{bg} }; 1540 glColor @{ $self->{bg} };
1444 1541
1445 # TODO: repeat texture not scale 1542 # TODO: repeat texture not scale
… …
1466 1563
1467############################################################################# 1564#############################################################################
1468 1565
1469package CFPlus::UI::Table; 1566package CFPlus::UI::Table;
1470 1567
1471our @ISA = CFPlus::UI::Base::; 1568our @ISA = CFPlus::UI::Container::;
1472 1569
1473use List::Util qw(max sum); 1570use List::Util qw(max sum);
1474 1571
1475use CFPlus::OpenGL; 1572use CFPlus::OpenGL;
1476 1573
1477sub new { 1574sub new {
1478 my $class = shift; 1575 my $class = shift;
1479 1576
1480 $class->SUPER::new ( 1577 $class->SUPER::new (
1481 col_expand => [], 1578 col_expand => [],
1579 row_expand => [],
1482 @_, 1580 @_,
1483 ) 1581 )
1484} 1582}
1485 1583
1486sub children {
1487 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1488}
1489
1490sub add { 1584sub add {
1585 my ($self, @widgets) = @_;
1586
1587 for my $child (@widgets) {
1588 $child->{c_rowspan} ||= 1;
1589 $child->{c_colspan} ||= 1;
1590 }
1591
1592 $self->SUPER::add (@widgets);
1593}
1594
1595sub add_at {
1491 my ($self) = shift; 1596 my $self = shift;
1597
1598 my @widgets;
1492 1599
1493 while (@_) { 1600 while (@_) {
1494 my ($x, $y, $child) = splice @_, 0, 3, (); 1601 my ($col, $row, $child) = splice @_, 0, 3, ();
1495 $child->set_parent ($self);
1496 $self->{children}[$y][$x] = $child;
1497 }
1498 1602
1499 $self->{force_realloc} = 1; 1603 $child->{c_row} = $row;
1500 $self->{force_size_alloc} = 1; 1604 $child->{c_col} = $col;
1501 $self->realloc;
1502}
1503 1605
1504sub remove { 1606 push @widgets, $child;
1607 }
1608
1609 $self->add (@widgets);
1610}
1611
1612sub get_wh {
1505 my ($self, $child) = @_; 1613 my ($self) = @_;
1506 1614
1507 # TODO: not yet implemented 1615 my (@w, @h);
1508}
1509
1510# TODO: move to container class maybe? send children a signal on removal?
1511sub clear {
1512 my ($self) = @_;
1513 1616
1514 my @children = $self->children; 1617 my @children = $self->children;
1515 delete $self->{children}; 1618
1619 # first pass, columns
1620 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1621 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1622
1623 my $sw = sum @w[$c .. $c + $cs - 1];
1624
1625 if ($w > $sw) {
1626 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1627 }
1516 1628 }
1517 for (@children) {
1518 delete $_->{parent};
1519 $_->hide;
1520 }
1521 1629
1522 $self->realloc; 1630 # second pass, rows
1523} 1631 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1524
1525sub get_wh {
1526 my ($self) = @_;
1527
1528 my (@w, @h);
1529
1530 for my $y (0 .. $#{$self->{children}}) {
1531 my $row = $self->{children}[$y]
1532 or next;
1533
1534 for my $x (0 .. $#$row) {
1535 my $widget = $row->[$x]
1536 or next;
1537 my ($w, $h) = @$widget{qw(req_w req_h)}; 1632 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1538 1633
1539 $w[$x] = max $w[$x], $w; 1634 my $sh = sum @h[$r .. $r + $rs - 1];
1540 $h[$y] = max $h[$y], $h; 1635
1636 if ($h > $sh) {
1637 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1541 } 1638 }
1542 } 1639 }
1543 1640
1544 (\@w, \@h) 1641 (\@w, \@h)
1545} 1642}
… …
1561 my ($ws, $hs) = $self->get_wh; 1658 my ($ws, $hs) = $self->get_wh;
1562 1659
1563 my $req_w = (sum @$ws) || 1; 1660 my $req_w = (sum @$ws) || 1;
1564 my $req_h = (sum @$hs) || 1; 1661 my $req_h = (sum @$hs) || 1;
1565 1662
1566 # TODO: nicer code && do row_expand 1663 # now linearly scale the rows/columns to the allocated size
1567 my @col_expand = @{$self->{col_expand}}; 1664 my @col_expand = @{$self->{col_expand}};
1568 @col_expand = (1) x @$ws unless @col_expand; 1665 @col_expand = (1) x @$ws unless @col_expand;
1569 my $col_expand = (sum @col_expand) || 1; 1666 my $col_expand = (sum @col_expand) || 1;
1570 1667
1571 # linearly scale sizes
1572 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1668 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1573 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1574 1669
1575 CFPlus::UI::harmonize $ws; 1670 CFPlus::UI::harmonize $ws;
1671
1672 my @row_expand = @{$self->{row_expand}};
1673 @row_expand = (1) x @$ws unless @row_expand;
1674 my $row_expand = (sum @row_expand) || 1;
1675
1676 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1677
1576 CFPlus::UI::harmonize $hs; 1678 CFPlus::UI::harmonize $hs;
1577 1679
1578 my $y; 1680 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1681 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1579 1682
1580 for my $r (0 .. $#{$self->{children}}) { 1683 for my $widget ($self->children) {
1581 my $row = $self->{children}[$r] 1684 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1582 or next;
1583 1685
1584 my $x = 0; 1686 $widget->configure (
1585 my $row_h = $hs->[$r]; 1687 $x[$c], $y[$r],
1688 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1586 1689 );
1587 for my $c (0 .. $#$row) { 1690 }
1588 my $col_w = $ws->[$c];
1589 1691
1590 if (my $widget = $row->[$c]) { 1692 1
1591 $widget->configure ($x, $y, $col_w, $row_h); 1693}
1592 }
1593 1694
1594 $x += $col_w; 1695#############################################################################
1696
1697package CFPlus::UI::Fixed;
1698
1699use List::Util qw(min max);
1700
1701our @ISA = CFPlus::UI::Container::;
1702
1703sub _scale($$$) {
1704 my ($rel, $val, $max) = @_;
1705
1706 $rel ? $val * $max : $val
1707}
1708
1709sub size_request {
1710 my ($self) = @_;
1711
1712 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1713
1714 # determine overall size by querying abs widgets
1715 for my $child ($self->visible_children) {
1716 unless ($child->{c_rel}) {
1717 my $x = $child->{c_x};
1718 my $y = $child->{c_y};
1719
1720 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1721 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1595 } 1722 }
1723 }
1596 1724
1597 $y += $row_h; 1725 my $W = $x2 - $x1;
1726 my $H = $y2 - $y1;
1727
1728 # now layout remaining widgets
1729 for my $child ($self->visible_children) {
1730 if ($child->{c_rel}) {
1731 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1732 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1733
1734 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1735 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1736 }
1737 }
1738
1739 my $W = $x2 - $x1;
1740 my $H = $y2 - $y1;
1741
1742 ($W, $H)
1743}
1744
1745sub invoke_size_allocate {
1746 my ($self, $W, $H) = @_;
1747
1748 for my $child ($self->visible_children) {
1749 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1750 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1751
1752 $x += $child->{c_halign} * $child->{req_w};
1753 $y += $child->{c_valign} * $child->{req_h};
1754
1755 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1598 } 1756 }
1599 1757
1600 1 1758 1
1601} 1759}
1602 1760
1603sub find_widget {
1604 my ($self, $x, $y) = @_;
1605
1606 $x -= $self->{x};
1607 $y -= $self->{y};
1608
1609 my $res;
1610
1611 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1612 $res = $_->find_widget ($x, $y)
1613 and return $res;
1614 }
1615
1616 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1617}
1618
1619sub _draw {
1620 my ($self) = @_;
1621
1622 for (grep $_, @{$self->{children}}) {
1623 $_->draw for grep $_, @$_;
1624 }
1625}
1626
1627############################################################################# 1761#############################################################################
1628 1762
1629package CFPlus::UI::Box; 1763package CFPlus::UI::Box;
1630 1764
1631our @ISA = CFPlus::UI::Container::; 1765our @ISA = CFPlus::UI::Container::;
1632 1766
1633sub size_request { 1767sub size_request {
1634 my ($self) = @_; 1768 my ($self) = @_;
1769
1770 my @children = $self->visible_children;
1635 1771
1636 $self->{vertical} 1772 $self->{vertical}
1637 ? ( 1773 ? (
1638 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1774 (List::Util::max map $_->{req_w}, @children),
1639 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1775 (List::Util::sum map $_->{req_h}, @children),
1640 ) 1776 )
1641 : ( 1777 : (
1642 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1778 (List::Util::sum map $_->{req_w}, @children),
1643 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1779 (List::Util::max map $_->{req_h}, @children),
1644 ) 1780 )
1645} 1781}
1646 1782
1647sub invoke_size_allocate { 1783sub invoke_size_allocate {
1648 my ($self, $w, $h) = @_; 1784 my ($self, $w, $h) = @_;
… …
1772 1908
1773 delete $self->{ox}; 1909 delete $self->{ox};
1774 $self->SUPER::realloc; 1910 $self->SUPER::realloc;
1775} 1911}
1776 1912
1913sub clear {
1914 my ($self) = @_;
1915
1916 $self->set_text ("");
1917}
1918
1777sub set_text { 1919sub set_text {
1778 my ($self, $text) = @_; 1920 my ($self, $text) = @_;
1779 1921
1780 return if $self->{text} eq "T$text"; 1922 return if $self->{text} eq "T$text";
1781 $self->{text} = "T$text"; 1923 $self->{text} = "T$text";
… …
1887 : ($self->{w} - $size->[0]) * 0.5); 2029 : ($self->{w} - $size->[0]) * 0.5);
1888 2030
1889 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2031 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1890 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2032 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1891 : ($self->{h} - $size->[1]) * 0.5); 2033 : ($self->{h} - $size->[1]) * 0.5);
2034
2035 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1892 }; 2036 };
1893 2037
1894 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2038# unless ($self->{list}) {
1895 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2039# $self->{list} = CFPlus::OpenGL::glGenList;
1896 2040# CFPlus::OpenGL::glNewList $self->{list};
1897 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2041# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2042# CFPlus::OpenGL::glEndList;
2043# }
2044#
2045# CFPlus::OpenGL::glCallList $self->{list};
2046
2047 $self->{layout}->draw;
1898} 2048}
2049
2050#sub destroy {
2051# my ($self) = @_;
2052#
2053# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2054#
2055# $self->SUPER::destroy;
2056#}
1899 2057
1900############################################################################# 2058#############################################################################
1901 2059
1902package CFPlus::UI::EntryBase; 2060package CFPlus::UI::EntryBase;
1903 2061
… …
1909 my $class = shift; 2067 my $class = shift;
1910 2068
1911 $class->SUPER::new ( 2069 $class->SUPER::new (
1912 fg => [1, 1, 1], 2070 fg => [1, 1, 1],
1913 bg => [0, 0, 0, 0.2], 2071 bg => [0, 0, 0, 0.2],
2072 outline => [0.6, 0.3, 0.1],
1914 active_bg => [1, 1, 1, 0.5], 2073 active_bg => [0, 0, 1, .2],
1915 active_fg => [0, 0, 0], 2074 active_fg => [1, 1, 1],
2075 active_outline => [1, 1, 0],
1916 can_hover => 1, 2076 can_hover => 1,
1917 can_focus => 1, 2077 can_focus => 1,
1918 valign => 0, 2078 valign => 0,
1919 can_events => 1, 2079 can_events => 1,
1920 ellipsise => 0, 2080 ellipsise => 0,
… …
1969 my $mod = $ev->{mod}; 2129 my $mod = $ev->{mod};
1970 my $sym = $ev->{sym}; 2130 my $sym = $ev->{sym};
1971 my $uni = $ev->{unicode}; 2131 my $uni = $ev->{unicode};
1972 2132
1973 my $text = $self->get_text; 2133 my $text = $self->get_text;
2134
2135 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1974 2136
1975 if ($uni == 8) { 2137 if ($uni == 8) {
1976 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2138 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1977 } elsif ($uni == 127) { 2139 } elsif ($uni == 127) {
1978 substr $text, $self->{cursor}, 1, ""; 2140 substr $text, $self->{cursor}, 1, "";
… …
2058 glColor_premultiply @{$self->{bg}}; 2220 glColor_premultiply @{$self->{bg}};
2059 } 2221 }
2060 2222
2061 glEnable GL_BLEND; 2223 glEnable GL_BLEND;
2062 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2224 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2063 glBegin GL_QUADS;
2064 glVertex 0 , 0;
2065 glVertex 0 , $self->{h};
2066 glVertex $self->{w}, $self->{h}; 2225 glRect 0, 0, $self->{w}, $self->{h};
2067 glVertex $self->{w}, 0;
2068 glEnd;
2069 glDisable GL_BLEND; 2226 glDisable GL_BLEND;
2070 2227
2071 $self->SUPER::_draw; 2228 $self->SUPER::_draw;
2072 2229
2073 #TODO: force update every cursor change :( 2230 #TODO: force update every cursor change :(
… …
2075 2232
2076 unless (exists $self->{cur_h}) { 2233 unless (exists $self->{cur_h}) {
2077 my $text = substr $self->{text}, 0, $self->{cursor}; 2234 my $text = substr $self->{text}, 0, $self->{cursor};
2078 utf8::encode $text; 2235 utf8::encode $text;
2079 2236
2080 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2237 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2081 } 2238 }
2082 2239
2240 glColor_premultiply @{$self->{active_fg}};
2083 glBegin GL_LINES; 2241 glBegin GL_LINES;
2084 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2242 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
2085 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2243 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2244 glEnd;
2245
2246 glLineWidth 3;
2247 glColor @{$self->{active_outline}};
2248 glRect_lineloop 0, 0, $self->{w} - 1, $self->{h} - 1;
2249 glLineWidth 1;
2250
2251 } else {
2252 glColor @{$self->{outline}};
2253 glTranslate .375, .375;
2254 glBegin GL_LINE_STRIP;
2255 glVertex 0, $self->{h} * .5;
2256 glVertex 0, $self->{h} - 3;
2257 glVertex $self->{w} - 1, $self->{h} - 3;
2258 glVertex $self->{w} - 1, $self->{h} * .5;
2086 glEnd; 2259 glEnd;
2087 } 2260 }
2088} 2261}
2089 2262
2090############################################################################# 2263#############################################################################
… …
2177 1 2350 1
2178} 2351}
2179 2352
2180############################################################################# 2353#############################################################################
2181 2354
2182package CFPlus::UI::Button; 2355package CFPlus::UI::ButtonBin;
2183 2356
2184our @ISA = CFPlus::UI::Label::; 2357our @ISA = CFPlus::UI::Bin::;
2185 2358
2186use CFPlus::OpenGL; 2359use CFPlus::OpenGL;
2187 2360
2188my @tex = 2361my @tex =
2189 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2362 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2190 qw(b1_button_active.png); 2363 qw(b1_button_inactive.png b1_button_active.png);
2191 2364
2192sub new { 2365sub new {
2193 my $class = shift; 2366 my $class = shift;
2194 2367
2195 $class->SUPER::new ( 2368 $class->SUPER::new (
2196 padding_x => 4,
2197 padding_y => 4,
2198 fg => [1, 1, 1],
2199 active_fg => [0, 0, 1],
2200 can_hover => 1, 2369 can_hover => 1,
2201 align => 0, 2370 align => 0,
2202 valign => 0, 2371 valign => 0,
2203 can_events => 1, 2372 can_events => 1,
2204 @_ 2373 @_
… …
2216} 2385}
2217 2386
2218sub _draw { 2387sub _draw {
2219 my ($self) = @_; 2388 my ($self) = @_;
2220 2389
2221 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2222
2223 glEnable GL_TEXTURE_2D; 2390 glEnable GL_TEXTURE_2D;
2224 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2391 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2225 glColor 0, 0, 0, 1; 2392 glColor 0, 0, 0, 1;
2226 2393
2394 my $tex = $tex[$GRAB == $self];
2227 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2395 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2396
2397 glDisable GL_TEXTURE_2D;
2398
2399 $self->SUPER::_draw;
2400}
2401
2402#############################################################################
2403
2404package CFPlus::UI::Button;
2405
2406our @ISA = CFPlus::UI::Label::;
2407
2408use CFPlus::OpenGL;
2409
2410my @tex =
2411 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2412 qw(b1_button_inactive.png b1_button_active.png);
2413
2414sub new {
2415 my $class = shift;
2416
2417 $class->SUPER::new (
2418 padding_x => 4,
2419 padding_y => 4,
2420 fg => [1.0, 1.0, 1.0],
2421 active_fg => [0.8, 0.8, 0.8],
2422 can_hover => 1,
2423 align => 0,
2424 valign => 0,
2425 can_events => 1,
2426 @_
2427 )
2428}
2429
2430sub invoke_button_up {
2431 my ($self, $ev, $x, $y) = @_;
2432
2433 $self->emit ("activate")
2434 if $x >= 0 && $x < $self->{w}
2435 && $y >= 0 && $y < $self->{h};
2436
2437 1
2438}
2439
2440sub _draw {
2441 my ($self) = @_;
2442
2443 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2444
2445 glEnable GL_TEXTURE_2D;
2446 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2447 glColor 0, 0, 0, 1;
2448
2449 my $tex = $tex[$GRAB == $self];
2450 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2228 2451
2229 glDisable GL_TEXTURE_2D; 2452 glDisable GL_TEXTURE_2D;
2230 2453
2231 $self->SUPER::_draw; 2454 $self->SUPER::_draw;
2232} 2455}
… …
2319sub new { 2542sub new {
2320 my $class = shift; 2543 my $class = shift;
2321 2544
2322 my $self = $class->SUPER::new ( 2545 my $self = $class->SUPER::new (
2323 can_events => 0, 2546 can_events => 0,
2547 scale => 1,
2324 @_, 2548 @_,
2325 ); 2549 );
2326 2550
2327 $self->{path} || $self->{tex} 2551 $self->{path} || $self->{tex}
2328 or Carp::croak "'path' or 'tex' attributes required"; 2552 or Carp::croak "'path' or 'tex' attributes required";
… …
2353} 2577}
2354 2578
2355sub size_request { 2579sub size_request {
2356 my ($self) = @_; 2580 my ($self) = @_;
2357 2581
2358 ($self->{tex}{w}, $self->{tex}{h}) 2582 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2359} 2583}
2360 2584
2361sub _draw { 2585sub _draw {
2362 my ($self) = @_; 2586 my ($self) = @_;
2363 2587
… …
2373 } 2597 }
2374 2598
2375 glEnable GL_TEXTURE_2D; 2599 glEnable GL_TEXTURE_2D;
2376 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2600 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2377 2601
2378 $tex->draw_quad (0, 0, $w, $h); 2602 $tex->draw_quad_alpha (0, 0, $w, $h);
2379 2603
2380 glDisable GL_TEXTURE_2D; 2604 glDisable GL_TEXTURE_2D;
2381} 2605}
2382 2606
2383############################################################################# 2607#############################################################################
… …
2402 align => 0, 2626 align => 0,
2403 valign => 0, 2627 valign => 0,
2404 can_events => 1, 2628 can_events => 1,
2405 @_ 2629 @_
2406 ); 2630 );
2631}
2632
2633sub invoke_button_down {
2634 my ($self, $ev, $x, $y) = @_;
2635
2636 1
2407} 2637}
2408 2638
2409sub invoke_button_up { 2639sub invoke_button_up {
2410 my ($self, $ev, $x, $y) = @_; 2640 my ($self, $ev, $x, $y) = @_;
2411 2641
… …
2551 glDisable GL_TEXTURE_2D; 2781 glDisable GL_TEXTURE_2D;
2552} 2782}
2553 2783
2554############################################################################# 2784#############################################################################
2555 2785
2786package CFPlus::UI::Progress;
2787
2788our @ISA = CFPlus::UI::Label::;
2789
2790use CFPlus::OpenGL;
2791
2792sub new {
2793 my ($class, %arg) = @_;
2794
2795 my $self = $class->SUPER::new (
2796 fg => [1, 1, 1],
2797 bg => [0, 0, 1, 0.2],
2798 bar => [0.7, 0.5, 0.1, 0.8],
2799 outline => [0.4, 0.3, 0],
2800 fontsize => 0.9,
2801 valign => 0,
2802 align => 0,
2803 can_events => 1,
2804 ellipsise => 1,
2805 label => "%d%%",
2806 %arg,
2807 );
2808
2809 $self->set_value ($arg{value} || -1);
2810
2811 $self
2812}
2813
2814sub set_label {
2815 my ($self, $label) = @_;
2816
2817 return if $self->{label} eq $label;
2818 $self->{label} = $label;
2819
2820 $self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
2821}
2822
2823sub set_value {
2824 my ($self, $value) = @_;
2825
2826 if ($self->{value} ne $value) {
2827 $self->{value} = $value;
2828
2829 if ($value < 0) {
2830 $self->set_text ("-");
2831 } else {
2832 $self->set_text (sprintf $self->{label}, $value * 100);
2833 }
2834
2835 $self->update;
2836 }
2837}
2838
2839sub _draw {
2840 my ($self) = @_;
2841
2842 glEnable GL_BLEND;
2843 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2844
2845 if ($self->{value} >= 0) {
2846 my $s = 3 + ($self->{w} - 6) * $self->{value};
2847
2848 glColor_premultiply @{$self->{bar}};
2849 glRect 2, 2, $s, $self->{h} - 2;
2850 glColor_premultiply @{$self->{bg}};
2851 glRect $s + 1, 0, $self->{w} - 2, $self->{h} - 2;
2852 }
2853
2854 glColor_premultiply @{$self->{outline}};
2855 glRect_lineloop 1, 1, $self->{w} - 2, $self->{h} - 2;
2856
2857 glDisable GL_BLEND;
2858
2859 {
2860 local $self->{bg}; # do not draw background
2861 $self->SUPER::_draw;
2862 }
2863}
2864
2865#############################################################################
2866
2867package CFPlus::UI::ExperienceProgress;
2868
2869our @ISA = CFPlus::UI::Progress::;
2870
2871sub new {
2872 my ($class, %arg) = @_;
2873
2874 my $self = $class->SUPER::new (
2875 tooltip => sub {
2876 my ($self) = @_;
2877
2878 sprintf "%s points experience (level %d).\n%s points to next level %s.",
2879 ::formsep $self->{exp},
2880 $self->{lvl},
2881 ::formsep $self->{nxt}
2882 },
2883 %arg
2884 );
2885
2886 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2887 if $::CONN;
2888
2889 $self
2890}
2891
2892sub DESTROY {
2893 my ($self) = @_;
2894
2895 delete $::CONN->{on_exp_update}{$self+0}
2896 if $::CONN;
2897
2898 $self->SUPER::DESTROY;
2899}
2900
2901sub set_value {
2902 my ($self, $lvl, $exp) = @_;
2903
2904 $self->{lvl} = $exp;
2905 $self->{exp} = $exp;
2906
2907 my $v = -1;
2908
2909 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2910 my $l0 = $table->[$lvl - 1];
2911 my $l1 = $table->[$lvl];
2912
2913 $self->{nxt} = $l1;
2914
2915 $v = ($exp - $l0) / ($l1 - $l0);
2916 }
2917
2918 $self->SUPER::set_value ($v);
2919}
2920
2921#############################################################################
2922
2556package CFPlus::UI::Gauge; 2923package CFPlus::UI::Gauge;
2557 2924
2558our @ISA = CFPlus::UI::VBox::; 2925our @ISA = CFPlus::UI::VBox::;
2559 2926
2560sub new { 2927sub new {
… …
2685 3052
2686 $self->SUPER::invoke_button_down ($ev, $x, $y); 3053 $self->SUPER::invoke_button_down ($ev, $x, $y);
2687 3054
2688 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3055 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2689 3056
2690 $self->invoke_mouse_motion ($ev, $x, $y) 3057 $self->invoke_mouse_motion ($ev, $x, $y);
3058
3059 1
2691} 3060}
2692 3061
2693sub invoke_mouse_motion { 3062sub invoke_mouse_motion {
2694 my ($self, $ev, $x, $y) = @_; 3063 my ($self, $ev, $x, $y) = @_;
2695 3064
… …
2715 3084
2716 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3085 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2717 3086
2718 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3087 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2719 3088
2720 ! ! $delta 3089 1
2721} 3090}
2722 3091
2723sub update { 3092sub update {
2724 my ($self) = @_; 3093 my ($self) = @_;
2725 3094
… …
2856} 3225}
2857 3226
2858sub size_request { 3227sub size_request {
2859 my ($self) = @_; 3228 my ($self) = @_;
2860 3229
2861 my ($empty, $slider) = @{ $self->{children} }; 3230 my ($empty, $slider) = $self->visible_children;
2862 3231
2863 local $self->{children} = [$empty, $slider]; 3232 local $self->{children} = [$empty, $slider];
2864 $self->SUPER::size_request 3233 $self->SUPER::size_request
2865} 3234}
2866 3235
… …
3055 3424
3056 if ($y0 < $y + $h && $y < $y1) { 3425 if ($y0 < $y + $h && $y < $y1) {
3057 my $layout = $self->get_layout ($para); 3426 my $layout = $self->get_layout ($para);
3058 3427
3059 $layout->render ($para->{indent}, $y - $y0); 3428 $layout->render ($para->{indent}, $y - $y0);
3429 $layout->draw;
3060 3430
3061 if (my @w = @{ $para->{widget} }) { 3431 if (my @w = @{ $para->{widget} }) {
3062 my @s = $layout->get_shapes; 3432 my @s = $layout->get_shapes;
3063 3433
3064 for (@w) { 3434 for (@w) {
… …
3255 glTranslate 0.375, 0.375; 3625 glTranslate 0.375, 0.375;
3256 3626
3257 my ($w, $h) = @$self{qw(w h)}; 3627 my ($w, $h) = @$self{qw(w h)};
3258 3628
3259 glColor 1, 0.8, 0.4; 3629 glColor 1, 0.8, 0.4;
3260 glBegin GL_QUADS; 3630 glRect 0, 0, $w, $h;
3261 glVertex 0 , 0;
3262 glVertex 0 , $h;
3263 glVertex $w, $h;
3264 glVertex $w, 0;
3265 glEnd;
3266 3631
3267 glColor 0, 0, 0; 3632 glColor 0, 0, 0;
3268 glBegin GL_LINE_LOOP; 3633 glRect_lineloop 0, 0, $w, $h;
3269 glVertex 0 , 0;
3270 glVertex 0 , $h;
3271 glVertex $w, $h;
3272 glVertex $w, 0;
3273 glEnd;
3274 3634
3275 glTranslate 2 - 0.375, 2 - 0.375; 3635 glTranslate 2 - 0.375, 2 - 0.375;
3276 3636
3277 $self->SUPER::_draw; 3637 $self->SUPER::_draw;
3278} 3638}
… …
3287 3647
3288sub new { 3648sub new {
3289 my $class = shift; 3649 my $class = shift;
3290 3650
3291 my $self = $class->SUPER::new ( 3651 my $self = $class->SUPER::new (
3652 size_w => 32,
3653 size_h => 8,
3292 aspect => 1, 3654 aspect => 1,
3293 can_events => 0, 3655 can_events => 0,
3294 @_, 3656 @_,
3295 ); 3657 );
3296 3658
3297 if ($self->{anim} && $self->{animspeed}) { 3659 if ($self->{anim} && $self->{animspeed}) {
3298 CFPlus::weaken (my $widget = $self); 3660 CFPlus::weaken (my $widget = $self);
3299 3661
3662 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3663 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3300 $self->{timer} = Event->timer ( 3664 $self->{timer} = Event->timer (
3301 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3302 hard => 1, 3665 parked => 1,
3303 interval => $self->{animspeed},
3304 cb => sub { 3666 cb => sub {
3667 return unless $::CONN;
3668
3669 my $w = $widget
3670 or return;
3671
3305 ++$widget->{frame}; 3672 ++$w->{frame};
3673 $w->update_face;
3674
3675 # somehow, $widget can go away
3306 $widget->update; 3676 $w->update;
3677 $w->update_timer;
3307 }, 3678 },
3308 ); 3679 );
3680
3681 $self->update_face;
3682 $self->update_timer;
3309 } 3683 }
3310 3684
3311 $self 3685 $self
3312} 3686}
3313 3687
3688sub update_timer {
3689 my ($self) = @_;
3690
3691 return unless $self->{timer};
3692
3693 if ($self->{visible}) {
3694 $self->{timer}->at (
3695 $self->{anim_start}
3696 + $self->{animspeed}
3697 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3698 );
3699 $self->{timer}->start;
3700 } else {
3701 $self->{timer}->stop;
3702 }
3703}
3704
3705sub update_face {
3706 my ($self) = @_;
3707
3708 if ($::CONN) {
3709 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3710 if ($anim && @$anim) {
3711 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3712 delete $self->{face_change_cb};
3713
3714 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3715 unless ($tex->{name} || $tex->{loading}) {
3716 $tex->upload (sub { $self->reconfigure });
3717 }
3718 }
3719 }
3720 }
3721 }
3722}
3723
3314sub size_request { 3724sub size_request {
3315 (32, 8) 3725 my ($self) = @_;
3726
3727 if ($::CONN) {
3728 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3729 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3730 if ($tex->{name}) {
3731 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3732 } elsif (!$tex->{loading}) {
3733 $tex->upload (sub { $self->reconfigure });
3734 }
3735 }
3736
3737 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3738 }
3739 }
3740
3741 ($self->{size_w} || 8, $self->{size_h} || 8)
3316} 3742}
3317 3743
3318sub update { 3744sub update {
3319 my ($self) = @_; 3745 my ($self) = @_;
3320 3746
3321 return unless $self->{visible}; 3747 return unless $self->{visible};
3322 3748
3323 $self->SUPER::update; 3749 $self->SUPER::update;
3324} 3750}
3325 3751
3752sub invoke_visibility_change {
3753 my ($self) = @_;
3754
3755 $self->update_timer;
3756
3757 0
3758}
3759
3326sub _draw { 3760sub _draw {
3327 my ($self) = @_; 3761 my ($self) = @_;
3328 3762
3329 return unless $::CONN;
3330
3331 $self->SUPER::_draw; 3763 $self->SUPER::_draw;
3332 3764
3333 my $face; 3765 if (my $tex = $self->{tex}) {
3334
3335 if ($self->{frame}) {
3336 my $anim = $::CONN->{anim}[$self->{anim}];
3337
3338 $face = $anim->[ $self->{frame} % @$anim ]
3339 if $anim && @$anim;
3340 }
3341
3342 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3343
3344 if ($tex) {
3345 glEnable GL_TEXTURE_2D; 3766 glEnable GL_TEXTURE_2D;
3346 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3767 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3347 glColor 0, 0, 0, 1; 3768 glColor 0, 0, 0, 1;
3348 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3769 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3349 glDisable GL_TEXTURE_2D; 3770 glDisable GL_TEXTURE_2D;
… …
3351} 3772}
3352 3773
3353sub destroy { 3774sub destroy {
3354 my ($self) = @_; 3775 my ($self) = @_;
3355 3776
3356 $self->{timer}->cancel 3777 (delete $self->{timer})->cancel
3357 if $self->{timer}; 3778 if $self->{timer};
3358 3779
3359 $self->SUPER::destroy; 3780 $self->SUPER::destroy;
3360} 3781}
3361 3782
… …
3401 children => [ 3822 children => [
3402 (new CFPlus::UI::Label markup => $left, expand => 1), 3823 (new CFPlus::UI::Label markup => $left, expand => 1),
3403 (new CFPlus::UI::Label markup => $right, align => +1), 3824 (new CFPlus::UI::Label markup => $right, align => +1),
3404 ], 3825 ],
3405 ; 3826 ;
3406 3827
3407 } else { 3828 } else {
3408 $widget = new CFPlus::UI::Label 3829 $widget = new CFPlus::UI::Label
3409 can_hover => 1, 3830 can_hover => 1,
3410 can_events => 1, 3831 can_events => 1,
3411 markup => $widget, 3832 markup => $widget,
… …
3536 3957
3537############################################################################# 3958#############################################################################
3538 3959
3539package CFPlus::UI::Notebook; 3960package CFPlus::UI::Notebook;
3540 3961
3962use CFPlus::OpenGL;
3963
3541our @ISA = CFPlus::UI::VBox::; 3964our @ISA = CFPlus::UI::VBox::;
3542 3965
3543sub new { 3966sub new {
3544 my $class = shift; 3967 my $class = shift;
3545 3968
3546 my $self = $class->SUPER::new ( 3969 my $self = $class->SUPER::new (
3547 buttonbar => (new CFPlus::UI::Buttonbar), 3970 buttonbar => (new CFPlus::UI::Buttonbar),
3548 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3971 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3972 active_outline => [1, 1, 0],
3549 # filter => # will be put between multiplexer and $self 3973 # filter => # will be put between multiplexer and $self
3550 @_, 3974 @_,
3551 ); 3975 );
3552 3976
3553 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3977 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3554 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3978 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3555 3979
3980 {
3981 Scalar::Util::weaken (my $wself = $self);
3982
3983 $self->{multiplexer}->connect (c_add => sub {
3984 my ($mplex, $widgets) = @_;
3985
3986 for my $child (@$widgets) {
3987 Scalar::Util::weaken $child;
3988 $child->{c_tab_} ||= do {
3989 my $tab =
3990 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3991 ? $child->{c_tab}
3992 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3993
3994 $tab->connect (activate => sub {
3995 $wself->set_current_page ($child);
3996 });
3997
3998 $tab
3999 };
4000
4001 $self->{buttonbar}->add ($child->{c_tab_});
4002 }
4003 });
4004
4005 $self->{multiplexer}->connect (c_remove => sub {
4006 my ($mplex, $widgets) = @_;
4007
4008 for my $child (@$widgets) {
4009 $wself->{buttonbar}->remove ($child->{c_tab_});
4010 }
4011 });
4012 }
4013
3556 $self 4014 $self
3557} 4015}
3558 4016
3559sub add { 4017sub add {
4018 my ($self, @widgets) = @_;
4019
4020 $self->{multiplexer}->add (@widgets)
4021}
4022
4023sub remove {
4024 my ($self, @widgets) = @_;
4025
4026 $self->{multiplexer}->remove (@widgets)
4027}
4028
4029sub pages {
4030 my ($self) = @_;
4031 $self->{multiplexer}->children
4032}
4033
4034sub add_tab {
3560 my ($self, $title, $widget, $tooltip) = @_; 4035 my ($self, $title, $widget, $tooltip) = @_;
3561 4036
3562 CFPlus::weaken $self; 4037 $title = [$title, $tooltip] unless ref $title;
4038 $widget->{c_tab} = $title;
3563 4039
3564 $self->{buttonbar}->add (new CFPlus::UI::Button
3565 markup => $title,
3566 tooltip => $tooltip,
3567 on_activate => sub { $self->set_current_page ($widget) },
3568 );
3569
3570 $self->{multiplexer}->add ($widget); 4040 $self->add ($widget);
3571} 4041}
3572 4042
3573sub get_current_page { 4043sub get_current_page {
3574 my ($self) = @_; 4044 my ($self) = @_;
3575 4045
… …
3579sub set_current_page { 4049sub set_current_page {
3580 my ($self, $page) = @_; 4050 my ($self, $page) = @_;
3581 4051
3582 $self->{multiplexer}->set_current_page ($page); 4052 $self->{multiplexer}->set_current_page ($page);
3583 $self->emit (page_changed => $self->{multiplexer}{current}); 4053 $self->emit (page_changed => $self->{multiplexer}{current});
4054}
4055
4056sub _draw {
4057 my ($self) = @_;
4058
4059 $self->SUPER::_draw ();
4060
4061 if (my $cur = $self->{multiplexer}{current}) {
4062 if ($cur = $cur->{c_tab_}) {
4063 glTranslate $cur->{x}, $cur->{y};
4064 glLineWidth 3;
4065 glColor @{$self->{active_outline}};
4066 glRect_lineloop 1, 1, $cur->{w} - 2, $cur->{h} - 2;
4067 glLineWidth 1;
4068 }
4069 }
3584} 4070}
3585 4071
3586############################################################################# 4072#############################################################################
3587 4073
3588package CFPlus::UI::Selector; 4074package CFPlus::UI::Selector;
… …
3858} 4344}
3859 4345
3860sub update { 4346sub update {
3861 my ($self) = @_; 4347 my ($self) = @_;
3862 4348
3863 $::WANT_REFRESH++; 4349 $::WANT_REFRESH->start;
3864} 4350}
3865 4351
3866sub add { 4352sub add {
3867 my ($self, @children) = @_; 4353 my ($self, @children) = @_;
3868 4354
… …
3905 while ($self->{refresh_hook}) { 4391 while ($self->{refresh_hook}) {
3906 $_->() 4392 $_->()
3907 for values %{delete $self->{refresh_hook}}; 4393 for values %{delete $self->{refresh_hook}};
3908 } 4394 }
3909 4395
3910 if ($self->{realloc}) { 4396 while ($self->{realloc}) {
3911 my %queue; 4397 my %queue;
3912 my @queue; 4398 my @queue;
3913 my $widget; 4399 my $widget;
3914 4400
3915 outer: 4401 outer:
… …
3962 } 4448 }
3963 } 4449 }
3964 4450
3965 delete $self->{realloc}{$widget+0}; 4451 delete $self->{realloc}{$widget+0};
3966 } 4452 }
3967 }
3968 4453
3969 while (my $size_alloc = delete $self->{size_alloc}) { 4454 while (my $size_alloc = delete $self->{size_alloc}) {
3970 my @queue = sort { $b->{visible} <=> $a->{visible} } 4455 my @queue = sort { $a->{visible} <=> $b->{visible} }
3971 values %$size_alloc; 4456 values %$size_alloc;
3972 4457
3973 while () { 4458 while () {
3974 my $widget = pop @queue || last; 4459 my $widget = pop @queue || last;
3975 4460
3976 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4461 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3977 4462
3978 $w = 0 if $w < 0;
3979 $h = 0 if $h < 0;
3980
3981 $w = max $widget->{min_w}, $w; 4463 $w = max $widget->{min_w}, $w;
3982 $h = max $widget->{min_h}, $h; 4464 $h = max $widget->{min_h}, $h;
3983 4465
3984# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4466# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3985# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4467# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3986 4468
3987 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4469 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3988 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4470 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3989 4471
3990 $w = int $w + 0.5; 4472 $w = int $w + 0.5;
3991 $h = int $h + 0.5; 4473 $h = int $h + 0.5;
3992 4474
3993 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4475 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3994 $widget->{old_w} = $widget->{w}; 4476 $widget->{old_w} = $widget->{w};
3995 $widget->{old_h} = $widget->{h}; 4477 $widget->{old_h} = $widget->{h};
3996 4478
3997 $widget->{w} = $w; 4479 $widget->{w} = $w;
3998 $widget->{h} = $h; 4480 $widget->{h} = $h;
3999 4481
4000 $widget->emit (size_allocate => $w, $h); 4482 $widget->emit (size_allocate => $w, $h);
4483 }
4001 } 4484 }
4002 } 4485 }
4003 } 4486 }
4004 4487
4005 while ($self->{post_alloc_hook}) { 4488 while ($self->{post_alloc_hook}) {
4006 $_->() 4489 $_->()
4007 for values %{delete $self->{post_alloc_hook}}; 4490 for values %{delete $self->{post_alloc_hook}};
4008 } 4491 }
4009
4010 4492
4011 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4493 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4012 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4494 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4013 glClear GL_COLOR_BUFFER_BIT; 4495 glClear GL_COLOR_BUFFER_BIT;
4014 4496

Diff Legend

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