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.368 by root, Mon Jun 25 05:43:37 2007 UTC vs.
Revision 1.414 by root, Mon Jul 23 17:54:14 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 }
… …
320sub set_visibility { 324sub set_visibility {
321 my ($self, $visible) = @_; 325 my ($self, $visible) = @_;
322 326
323 return if $self->{visible} == $visible; 327 return if $self->{visible} == $visible;
324 328
325 $visible ? $self->hide 329 $visible ? $self->show
326 : $self->show; 330 : $self->hide;
327} 331}
328 332
329sub toggle_visibility { 333sub toggle_visibility {
330 my ($self) = @_; 334 my ($self) = @_;
331 335
… …
547 551
548 # parent 552 # parent
549 $self->{parent} && $self->{parent}->emit ($signal, @args) 553 $self->{parent} && $self->{parent}->emit ($signal, @args)
550} 554}
551 555
552sub find_widget { 556#sub find_widget {
553 my ($self, $x, $y) = @_; 557# 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 558
564sub set_parent { 559sub set_parent {
565 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
566 561
567 CFPlus::weaken ($self->{parent} = $parent); 562 CFPlus::weaken ($self->{parent} = $parent);
… …
598 593
599# 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
600# functions seems pointless. 595# functions seems pointless.
601our ($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
602 597
603sub draw { 598#sub draw {
604 my ($self) = @_; 599#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 600
650sub _draw { 601sub _draw {
651 my ($self) = @_; 602 my ($self) = @_;
652 603
653 warn "no draw defined for $self\n"; 604 warn "no draw defined for $self\n";
654} 605}
655 606
656my $cntx;#d#
657sub DESTROY { 607sub DESTROY {
658 my ($self) = @_; 608 my ($self) = @_;
659 609
660 return if CFPlus::in_destruct; 610 return if CFPlus::in_destruct;
661 611
… …
746 can_events => 0, 696 can_events => 0,
747 %arg, 697 %arg,
748 ); 698 );
749 699
750 $self->add (@$children) 700 $self->add (@$children)
751 if $children; 701 if $children && @$children;
752 702
753 $self 703 $self
754} 704}
755 705
756sub realloc { 706sub realloc {
… …
765 my ($self, @widgets) = @_; 715 my ($self, @widgets) = @_;
766 716
767 $_->set_parent ($self) 717 $_->set_parent ($self)
768 for @widgets; 718 for @widgets;
769 719
720 # TODO: only do this in widgets that need it, e.g. root, fixed
770 use sort 'stable'; 721 use sort 'stable';
771 722
772 $self->{children} = [ 723 $self->{children} = [
773 sort { $a->{z} <=> $b->{z} } 724 sort { $a->{z} <=> $b->{z} }
774 @{$self->{children}}, @widgets 725 @{$self->{children}}, @widgets
775 ]; 726 ];
776 727
777 $self->realloc; 728 $self->realloc;
729
730 $self->emit (c_add => \@widgets);
731
732 map $_+0, @widgets
778} 733}
779 734
780sub children { 735sub children {
781 @{ $_[0]{children} } 736 @{ $_[0]{children} }
782} 737}
783 738
784sub remove { 739sub remove {
785 my ($self, $child) = @_; 740 my ($self, @widgets) = @_;
786 741
742 $self->emit (c_remove => \@widgets);
743
744 for my $child (@widgets) {
787 delete $child->{parent}; 745 delete $child->{parent};
788 $child->hide; 746 $child->hide;
789
790 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 747 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
748 }
791 749
792 $self->realloc; 750 $self->realloc;
793} 751}
794 752
795sub clear { 753sub clear {
796 my ($self) = @_; 754 my ($self) = @_;
797 755
798 my $children = delete $self->{children}; 756 my $children = $self->{children};
799 $self->{children} = []; 757 $self->{children} = [];
800 758
801 for (@$children) { 759 for (@$children) {
802 delete $_->{parent}; 760 delete $_->{parent};
803 $_->hide; 761 $_->hide;
… …
823} 781}
824 782
825sub _draw { 783sub _draw {
826 my ($self) = @_; 784 my ($self) = @_;
827 785
828 $_->draw for @{$self->{children}}; 786 $_->draw for $self->visible_children;
829} 787}
830 788
831############################################################################# 789#############################################################################
832 790
833package CFPlus::UI::Bin; 791package CFPlus::UI::Bin;
… …
843} 801}
844 802
845sub add { 803sub add {
846 my ($self, $child) = @_; 804 my ($self, $child) = @_;
847 805
848 $self->SUPER::remove ($_) for @{ $self->{children} }; 806 $self->clear;
849 $self->SUPER::add ($child); 807 $self->SUPER::add ($child);
850} 808}
851 809
852sub remove { 810sub remove {
853 my ($self, $widget) = @_; 811 my ($self, $widget) = @_;
… …
943} 901}
944 902
945############################################################################# 903#############################################################################
946 904
947package CFPlus::UI::ViewPort; 905package CFPlus::UI::ViewPort;
906
907use List::Util qw(min max);
948 908
949our @ISA = CFPlus::UI::Window::; 909our @ISA = CFPlus::UI::Window::;
950 910
951sub new { 911sub new {
952 my $class = shift; 912 my $class = shift;
… …
961sub size_request { 921sub size_request {
962 my ($self) = @_; 922 my ($self) = @_;
963 923
964 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 924 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
965 925
966 $w = 10 if $self->{scroll_x}; 926 $w = 1 if $self->{scroll_x};
967 $h = 10 if $self->{scroll_y}; 927 $h = 1 if $self->{scroll_y};
968 928
969 ($w, $h) 929 ($w, $h)
970} 930}
971 931
972sub invoke_size_allocate { 932sub invoke_size_allocate {
… …
984} 944}
985 945
986sub set_offset { 946sub set_offset {
987 my ($self, $x, $y) = @_; 947 my ($self, $x, $y) = @_;
988 948
949 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
950 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
951
952 if ($x != $self->{view_x} or $y != $self->{view_y}) {
989 $self->{view_x} = int $x; 953 $self->{view_x} = $x;
990 $self->{view_y} = int $y; 954 $self->{view_y} = $y;
991 955
956 $self->emit (changed => $x, $y);
992 $self->update; 957 $self->update;
958 }
959}
960
961sub set_center {
962 my ($self, $x, $y) = @_;
963
964 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
965}
966
967sub make_visible {
968 my ($self, $x, $y, $border) = @_;
969
970 if ( $x < $self->{view_x} + $self->{w} * $border
971 || $x > $self->{view_x} + $self->{w} * (1 - $border)
972 || $y < $self->{view_y} + $self->{h} * $border
973 || $y > $self->{view_y} + $self->{h} * (1 - $border)
974 ) {
975 $self->set_center ($x, $y);
976 }
993} 977}
994 978
995# hmm, this does not work for topleft of $self... but we should not ask for that 979# hmm, this does not work for topleft of $self... but we should not ask for that
996sub coord2local { 980sub coord2local {
997 my ($self, $x, $y) = @_; 981 my ($self, $x, $y) = @_;
… …
1012 my ($self, $x, $y) = @_; 996 my ($self, $x, $y) = @_;
1013 997
1014 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 998 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1015 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 999 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1016 ) { 1000 ) {
1017 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1001 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1018 } else { 1002 } else {
1019 $self->CFPlus::UI::Base::find_widget ($x, $y) 1003 $self->CFPlus::UI::Base::find_widget ($x, $y)
1020 } 1004 }
1021} 1005}
1022 1006
… …
1033 1017
1034############################################################################# 1018#############################################################################
1035 1019
1036package CFPlus::UI::ScrolledWindow; 1020package CFPlus::UI::ScrolledWindow;
1037 1021
1038our @ISA = CFPlus::UI::HBox::; 1022our @ISA = CFPlus::UI::Table::;
1039 1023
1040sub new { 1024sub new {
1041 my ($class, %arg) = @_; 1025 my ($class, %arg) = @_;
1042 1026
1043 my $child = delete $arg{child}; 1027 my $child = delete $arg{child};
1044 1028
1045 my $self; 1029 my $self;
1046 1030
1047 my $slider = new CFPlus::UI::Slider 1031 my $hslider = new CFPlus::UI::Slider
1032 col => 0,
1033 row => 1,
1034 vertical => 0,
1035 range => [0, 0, 1, 0.01], # HACK fix
1036 on_changed => sub {
1037 $self->{hpos} = $_[1];
1038 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1039 },
1040 ;
1041
1042 my $vslider = new CFPlus::UI::Slider
1043 col => 1,
1044 row => 0,
1048 vertical => 1, 1045 vertical => 1,
1049 range => [0, 0, 1, 0.01], # HACK fix 1046 range => [0, 0, 1, 0.01], # HACK fix
1050 on_changed => sub { 1047 on_changed => sub {
1051 $self->{vp}->set_offset (0, $_[1]); 1048 $self->{vpos} = $_[1];
1049 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1052 }, 1050 },
1053 ; 1051 ;
1054 1052
1055 $self = $class->SUPER::new ( 1053 $self = $class->SUPER::new (
1056 vp => (new CFPlus::UI::ViewPort expand => 1), 1054 scroll_x => 0,
1055 scroll_y => 1,
1057 can_events => 1, 1056 can_events => 1,
1058 slider => $slider, 1057 hslider => $hslider,
1058 vslider => $vslider,
1059 col_expand => [1, 0],
1060 row_expand => [1, 0],
1059 %arg, 1061 %arg,
1060 ); 1062 );
1061 1063
1064 $self->{vp} = new CFPlus::UI::ViewPort
1065 col => 0,
1066 row => 0,
1067 expand => 1,
1068 scroll_x => $self->{scroll_x},
1069 scroll_y => $self->{scroll_y},
1070 on_changed => sub {
1071 my ($vp, $x, $y) = @_;
1072
1073 $vp->{parent}{hslider}->set_value ($x);
1074 $vp->{parent}{vslider}->set_value ($y);
1075
1076 0
1077 },
1078 on_size_allocate => sub {
1079 my ($vp, $w, $h) = @_;
1080 $vp->{parent}->update_slider;
1081 0
1082 },
1083 ;
1084
1062 $self->SUPER::add ($self->{vp}, $self->{slider}); 1085 $self->SUPER::add ($self->{vp});
1086
1063 $self->add ($child) if $child; 1087 $self->add ($child) if $child;
1064 1088
1065 $self 1089 $self
1066} 1090}
1067
1068#TODO# update range on size_allocate depending on child
1069 1091
1070sub add { 1092sub add {
1071 my ($self, $widget) = @_; 1093 my ($self, $widget) = @_;
1072 1094
1073 $self->{vp}->add ($self->{child} = $widget); 1095 $self->{vp}->add ($self->{child} = $widget);
1074} 1096}
1075 1097
1098sub set_offset { shift->{vp}->set_offset (@_) }
1099sub set_center { shift->{vp}->set_center (@_) }
1100sub make_visible { shift->{vp}->make_visible (@_) }
1101
1102sub update_slider {
1103 my ($self) = @_;
1104
1105 my $child = ($self->{vp} or return)->child;
1106
1107 if ($self->{scroll_x}) {
1108 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1109 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1110
1111 my $visible = $w1 > $w2;
1112 if ($visible != $self->{hslider_visible}) {
1113 $self->{hslider_visible} = $visible;
1114 $visible ? $self->SUPER::add ($self->{hslider})
1115 : $self->SUPER::remove ($self->{hslider});
1116 }
1117 }
1118
1119 if ($self->{scroll_y}) {
1120 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1121 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1122
1123 my $visible = $h1 > $h2;
1124 if ($visible != $self->{vslider_visible}) {
1125 $self->{vslider_visible} = $visible;
1126 $visible ? $self->SUPER::add ($self->{vslider})
1127 : $self->SUPER::remove ($self->{vslider});
1128 }
1129 }
1130}
1131
1132sub start_dragging {
1133 my ($self, $ev) = @_;
1134
1135 $self->grab_focus;
1136
1137 my $ox = $self->{vp}{view_x};
1138 my $oy = $self->{vp}{view_y};
1139
1140 $self->{motion} = sub {
1141 my ($ev, $x, $y) = @_;
1142
1143 $ox -= $ev->{xrel};
1144 $oy -= $ev->{yrel};
1145
1146 $self->{vp}->set_offset ($ox, $oy);
1147 };
1148}
1149
1076sub invoke_mouse_wheel { 1150sub invoke_mouse_wheel {
1077 my ($self, $ev) = @_; 1151 my ($self, $ev) = @_;
1078 1152
1079 return 0 unless $ev->{dy}; # only vertical movements
1080
1081 $self->{slider}->emit (mouse_wheel => $ev); 1153 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1154 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1082 1155
1083 1 1156 1
1084} 1157}
1085 1158
1086sub update_slider { 1159sub invoke_button_down {
1087 my ($self) = @_; 1160 my ($self, $ev, $x, $y) = @_;
1088 1161
1089 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1162 if ($ev->{button} == 2) {
1090} 1163 $self->start_dragging ($ev);
1164 return 1;
1165 }
1091 1166
1092sub update { 1167 0
1093 my ($self) = @_; 1168}
1094 1169
1095 $self->SUPER::update; 1170sub invoke_button_up {
1171 my ($self, $ev, $x, $y) = @_;
1096 1172
1097 $self->update_slider; 1173 if (delete $self->{motion}) {
1174 return 1;
1175 }
1176
1177 0
1178}
1179
1180sub invoke_mouse_motion {
1181 my ($self, $ev, $x, $y) = @_;
1182
1183 if ($self->{motion}) {
1184 $self->{motion}->($ev, $x, $y);
1185 return 1;
1186 }
1187
1188 0
1098} 1189}
1099 1190
1100sub invoke_size_allocate { 1191sub invoke_size_allocate {
1101 my ($self, $w, $h) = @_; 1192 my ($self, $w, $h) = @_;
1102 1193
1103 $self->update_slider; 1194 $self->update_slider;
1104
1105 $self->SUPER::invoke_size_allocate ($w, $h) 1195 $self->SUPER::invoke_size_allocate ($w, $h)
1106} 1196}
1107 1197
1108############################################################################# 1198#############################################################################
1109 1199
… …
1259 1349
1260my @border = 1350my @border =
1261 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1351 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1262 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1352 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1263 1353
1354my @icon =
1355 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1356 qw(x1_move.png x1_resize.png);
1357
1264sub new { 1358sub new {
1265 my ($class, %arg) = @_; 1359 my ($class, %arg) = @_;
1266 1360
1267 my $self = $class->SUPER::new ( 1361 my $self = $class->SUPER::new (
1268 bg => [1, 1, 1, 1], 1362 bg => [1, 1, 1, 1],
… …
1436 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1530 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1437 1531
1438 my $border = $self->border; 1532 my $border = $self->border;
1439 1533
1440 glColor @{ $self->{border_bg} }; 1534 glColor @{ $self->{border_bg} };
1441 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1535 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1442 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1536 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1443 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1537 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1444 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1538 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1539
1540 # move
1541 my $w2 = ($w - $border) * .5;
1542 my $h2 = ($h - $border) * .5;
1543 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1544 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1545 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1546
1547 # resize
1548 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1549 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1550 unless $self->{has_close_button};
1551 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1552 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1445 1553
1446 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1554 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1447 glColor @{ $self->{bg} }; 1555 glColor @{ $self->{bg} };
1448 1556
1449 # TODO: repeat texture not scale 1557 # TODO: repeat texture not scale
… …
1470 1578
1471############################################################################# 1579#############################################################################
1472 1580
1473package CFPlus::UI::Table; 1581package CFPlus::UI::Table;
1474 1582
1475our @ISA = CFPlus::UI::Base::; 1583our @ISA = CFPlus::UI::Container::;
1476 1584
1477use List::Util qw(max sum); 1585use List::Util qw(max sum);
1478 1586
1479use CFPlus::OpenGL; 1587use CFPlus::OpenGL;
1480 1588
1481sub new { 1589sub new {
1482 my $class = shift; 1590 my $class = shift;
1483 1591
1484 $class->SUPER::new ( 1592 $class->SUPER::new (
1485 col_expand => [], 1593 col_expand => [],
1594 row_expand => [],
1486 @_, 1595 @_,
1487 ) 1596 )
1488} 1597}
1489 1598
1490sub children {
1491 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1492}
1493
1494sub add { 1599sub add {
1600 my ($self, @widgets) = @_;
1601
1602 for my $child (@widgets) {
1603 $child->{rowspan} ||= 1;
1604 $child->{colspan} ||= 1;
1605 }
1606
1607 $self->SUPER::add (@widgets);
1608}
1609
1610sub add_at {
1495 my ($self) = shift; 1611 my $self = shift;
1612
1613 my @widgets;
1496 1614
1497 while (@_) { 1615 while (@_) {
1498 my ($x, $y, $child) = splice @_, 0, 3, (); 1616 my ($col, $row, $child) = splice @_, 0, 3, ();
1499 $child->set_parent ($self);
1500 $self->{children}[$y][$x] = $child;
1501 }
1502 1617
1503 $self->{force_realloc} = 1; 1618 $child->{row} = $row;
1504 $self->{force_size_alloc} = 1; 1619 $child->{col} = $col;
1505 $self->realloc;
1506}
1507 1620
1508sub remove { 1621 push @widgets, $child;
1622 }
1623
1624 $self->add (@widgets);
1625}
1626
1627sub get_wh {
1509 my ($self, $child) = @_; 1628 my ($self) = @_;
1510 1629
1511 # TODO: not yet implemented 1630 my (@w, @h);
1512}
1513
1514# TODO: move to container class maybe? send children a signal on removal?
1515sub clear {
1516 my ($self) = @_;
1517 1631
1518 my @children = $self->children; 1632 my @children = $self->children;
1519 delete $self->{children}; 1633
1634 # first pass, columns
1635 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1636 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1637
1638 my $sw = sum @w[$c .. $c + $cs - 1];
1639
1640 if ($w > $sw) {
1641 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1642 }
1520 1643 }
1521 for (@children) {
1522 delete $_->{parent};
1523 $_->hide;
1524 }
1525 1644
1526 $self->realloc; 1645 # second pass, rows
1527} 1646 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1528
1529sub get_wh {
1530 my ($self) = @_;
1531
1532 my (@w, @h);
1533
1534 for my $y (0 .. $#{$self->{children}}) {
1535 my $row = $self->{children}[$y]
1536 or next;
1537
1538 for my $x (0 .. $#$row) {
1539 my $widget = $row->[$x]
1540 or next;
1541 my ($w, $h) = @$widget{qw(req_w req_h)}; 1647 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1542 1648
1543 $w[$x] = max $w[$x], $w; 1649 my $sh = sum @h[$r .. $r + $rs - 1];
1544 $h[$y] = max $h[$y], $h; 1650
1651 if ($h > $sh) {
1652 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1545 } 1653 }
1546 } 1654 }
1547 1655
1548 (\@w, \@h) 1656 (\@w, \@h)
1549} 1657}
… …
1565 my ($ws, $hs) = $self->get_wh; 1673 my ($ws, $hs) = $self->get_wh;
1566 1674
1567 my $req_w = (sum @$ws) || 1; 1675 my $req_w = (sum @$ws) || 1;
1568 my $req_h = (sum @$hs) || 1; 1676 my $req_h = (sum @$hs) || 1;
1569 1677
1570 # TODO: nicer code && do row_expand 1678 # now linearly scale the rows/columns to the allocated size
1571 my @col_expand = @{$self->{col_expand}}; 1679 my @col_expand = @{$self->{col_expand}};
1572 @col_expand = (1) x @$ws unless @col_expand; 1680 @col_expand = (1) x @$ws unless @col_expand;
1573 my $col_expand = (sum @col_expand) || 1; 1681 my $col_expand = (sum @col_expand) || 1;
1574 1682
1575 # linearly scale sizes
1576 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1683 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1577 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1578 1684
1579 CFPlus::UI::harmonize $ws; 1685 CFPlus::UI::harmonize $ws;
1686
1687 my @row_expand = @{$self->{row_expand}};
1688 @row_expand = (1) x @$ws unless @row_expand;
1689 my $row_expand = (sum @row_expand) || 1;
1690
1691 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1692
1580 CFPlus::UI::harmonize $hs; 1693 CFPlus::UI::harmonize $hs;
1581 1694
1582 my $y; 1695 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1696 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1583 1697
1584 for my $r (0 .. $#{$self->{children}}) { 1698 for my $widget ($self->children) {
1585 my $row = $self->{children}[$r] 1699 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1586 or next;
1587 1700
1588 my $x = 0; 1701 $widget->configure (
1589 my $row_h = $hs->[$r]; 1702 $x[$c], $y[$r],
1703 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1590 1704 );
1591 for my $c (0 .. $#$row) { 1705 }
1592 my $col_w = $ws->[$c];
1593 1706
1594 if (my $widget = $row->[$c]) { 1707 1
1595 $widget->configure ($x, $y, $col_w, $row_h); 1708}
1596 }
1597 1709
1598 $x += $col_w; 1710#############################################################################
1711
1712package CFPlus::UI::Fixed;
1713
1714use List::Util qw(min max);
1715
1716our @ISA = CFPlus::UI::Container::;
1717
1718sub _scale($$$) {
1719 my ($rel, $val, $max) = @_;
1720
1721 $rel ? $val * $max : $val
1722}
1723
1724sub size_request {
1725 my ($self) = @_;
1726
1727 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1728
1729 # determine overall size by querying abs widgets
1730 for my $child ($self->visible_children) {
1731 unless ($child->{c_rel}) {
1732 my $x = $child->{c_x};
1733 my $y = $child->{c_y};
1734
1735 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1736 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1599 } 1737 }
1738 }
1600 1739
1601 $y += $row_h; 1740 my $W = $x2 - $x1;
1741 my $H = $y2 - $y1;
1742
1743 # now layout remaining widgets
1744 for my $child ($self->visible_children) {
1745 if ($child->{c_rel}) {
1746 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1747 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1748
1749 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1750 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1751 }
1752 }
1753
1754 my $W = $x2 - $x1;
1755 my $H = $y2 - $y1;
1756
1757 ($W, $H)
1758}
1759
1760sub invoke_size_allocate {
1761 my ($self, $W, $H) = @_;
1762
1763 for my $child ($self->visible_children) {
1764 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1765 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1766
1767 $x += $child->{c_halign} * $child->{req_w};
1768 $y += $child->{c_valign} * $child->{req_h};
1769
1770 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1602 } 1771 }
1603 1772
1604 1 1773 1
1605} 1774}
1606 1775
1607sub find_widget {
1608 my ($self, $x, $y) = @_;
1609
1610 $x -= $self->{x};
1611 $y -= $self->{y};
1612
1613 my $res;
1614
1615 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1616 $res = $_->find_widget ($x, $y)
1617 and return $res;
1618 }
1619
1620 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1621}
1622
1623sub _draw {
1624 my ($self) = @_;
1625
1626 for (grep $_, @{$self->{children}}) {
1627 $_->draw for grep $_, @$_;
1628 }
1629}
1630
1631############################################################################# 1776#############################################################################
1632 1777
1633package CFPlus::UI::Box; 1778package CFPlus::UI::Box;
1634 1779
1635our @ISA = CFPlus::UI::Container::; 1780our @ISA = CFPlus::UI::Container::;
1636 1781
1637sub size_request { 1782sub size_request {
1638 my ($self) = @_; 1783 my ($self) = @_;
1784
1785 my @children = $self->visible_children;
1639 1786
1640 $self->{vertical} 1787 $self->{vertical}
1641 ? ( 1788 ? (
1642 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1789 (List::Util::max map $_->{req_w}, @children),
1643 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1790 (List::Util::sum map $_->{req_h}, @children),
1644 ) 1791 )
1645 : ( 1792 : (
1646 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1793 (List::Util::sum map $_->{req_w}, @children),
1647 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1794 (List::Util::max map $_->{req_h}, @children),
1648 ) 1795 )
1649} 1796}
1650 1797
1651sub invoke_size_allocate { 1798sub invoke_size_allocate {
1652 my ($self, $w, $h) = @_; 1799 my ($self, $w, $h) = @_;
… …
1893 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2040 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1894 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2041 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1895 : ($self->{h} - $size->[1]) * 0.5); 2042 : ($self->{h} - $size->[1]) * 0.5);
1896 }; 2043 };
1897 2044
1898 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2045# unless ($self->{list}) {
1899 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2046# $self->{list} = CFPlus::OpenGL::glGenList;
2047# CFPlus::OpenGL::glNewList $self->{list};
2048# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2049# CFPlus::OpenGL::glEndList;
2050# }
2051#
2052# CFPlus::OpenGL::glCallList $self->{list};
1900 2053
1901 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2054 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1902} 2055}
2056
2057#sub destroy {
2058# my ($self) = @_;
2059#
2060# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2061#
2062# $self->SUPER::destroy;
2063#}
1903 2064
1904############################################################################# 2065#############################################################################
1905 2066
1906package CFPlus::UI::EntryBase; 2067package CFPlus::UI::EntryBase;
1907 2068
… …
2191 2352
2192use CFPlus::OpenGL; 2353use CFPlus::OpenGL;
2193 2354
2194my @tex = 2355my @tex =
2195 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2356 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2196 qw(b1_button_active.png); 2357 qw(b1_button_inactive.png b1_button_active.png);
2197 2358
2198sub new { 2359sub new {
2199 my $class = shift; 2360 my $class = shift;
2200 2361
2201 $class->SUPER::new ( 2362 $class->SUPER::new (
2202 padding_x => 4, 2363 padding_x => 4,
2203 padding_y => 4, 2364 padding_y => 4,
2204 fg => [1, 1, 1], 2365 fg => [1.0, 1.0, 1.0],
2205 active_fg => [0, 0, 1], 2366 active_fg => [0.8, 0.8, 0.8],
2206 can_hover => 1, 2367 can_hover => 1,
2207 align => 0, 2368 align => 0,
2208 valign => 0, 2369 valign => 0,
2209 can_events => 1, 2370 can_events => 1,
2210 @_ 2371 @_
… …
2228 2389
2229 glEnable GL_TEXTURE_2D; 2390 glEnable GL_TEXTURE_2D;
2230 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2391 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2231 glColor 0, 0, 0, 1; 2392 glColor 0, 0, 0, 1;
2232 2393
2394 my $tex = $tex[$GRAB == $self];
2233 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2395 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2234 2396
2235 glDisable GL_TEXTURE_2D; 2397 glDisable GL_TEXTURE_2D;
2236 2398
2237 $self->SUPER::_draw; 2399 $self->SUPER::_draw;
2238} 2400}
… …
2691 2853
2692 $self->SUPER::invoke_button_down ($ev, $x, $y); 2854 $self->SUPER::invoke_button_down ($ev, $x, $y);
2693 2855
2694 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2856 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2695 2857
2696 $self->invoke_mouse_motion ($ev, $x, $y) 2858 $self->invoke_mouse_motion ($ev, $x, $y);
2859
2860 1
2697} 2861}
2698 2862
2699sub invoke_mouse_motion { 2863sub invoke_mouse_motion {
2700 my ($self, $ev, $x, $y) = @_; 2864 my ($self, $ev, $x, $y) = @_;
2701 2865
… …
2721 2885
2722 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 2886 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2723 2887
2724 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 2888 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2725 2889
2726 ! ! $delta 2890 1
2727} 2891}
2728 2892
2729sub update { 2893sub update {
2730 my ($self) = @_; 2894 my ($self) = @_;
2731 2895
… …
2862} 3026}
2863 3027
2864sub size_request { 3028sub size_request {
2865 my ($self) = @_; 3029 my ($self) = @_;
2866 3030
2867 my ($empty, $slider) = @{ $self->{children} }; 3031 my ($empty, $slider) = $self->visible_children;
2868 3032
2869 local $self->{children} = [$empty, $slider]; 3033 local $self->{children} = [$empty, $slider];
2870 $self->SUPER::size_request 3034 $self->SUPER::size_request
2871} 3035}
2872 3036
… …
3293 3457
3294sub new { 3458sub new {
3295 my $class = shift; 3459 my $class = shift;
3296 3460
3297 my $self = $class->SUPER::new ( 3461 my $self = $class->SUPER::new (
3462 size_w => 32,
3463 size_h => 8,
3298 aspect => 1, 3464 aspect => 1,
3299 can_events => 0, 3465 can_events => 0,
3300 @_, 3466 @_,
3301 ); 3467 );
3302 3468
3303 if ($self->{anim} && $self->{animspeed}) { 3469 if ($self->{anim} && $self->{animspeed}) {
3304 CFPlus::weaken (my $widget = $self); 3470 CFPlus::weaken (my $widget = $self);
3305 3471
3472 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3473 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3306 $self->{timer} = Event->timer ( 3474 $self->{timer} = Event->timer (
3307 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3308 hard => 1, 3475 parked => 1,
3309 interval => $self->{animspeed},
3310 cb => sub { 3476 cb => sub {
3477 return unless $::CONN && $widget;
3478
3311 ++$widget->{frame}; 3479 ++$widget->{frame};
3480 $widget->update_face;
3312 $widget->update; 3481 $widget->update;
3482
3483 $widget->update_timer;
3313 }, 3484 },
3314 ); 3485 );
3486
3487 $self->update_face;
3488 $self->update_timer;
3315 } 3489 }
3316 3490
3317 $self 3491 $self
3318} 3492}
3319 3493
3494sub update_timer {
3495 my ($self) = @_;
3496
3497 return unless $self->{timer};
3498
3499 if ($self->{visible}) {
3500 $self->{timer}->at (
3501 $self->{anim_start}
3502 + $self->{animspeed}
3503 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3504 );
3505 $self->{timer}->start;
3506 } else {
3507 $self->{timer}->stop;
3508 }
3509}
3510
3511sub update_face {
3512 my ($self) = @_;
3513
3514 return unless $::CONN;
3515
3516 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3517 if ($anim && @$anim) {
3518 delete $self->{wait_face};
3519 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3520 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3521 }
3522 }
3523}
3524
3320sub size_request { 3525sub size_request {
3321 (32, 8) 3526 my ($self) = @_;
3527
3528 if ($::CONN) {
3529 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3530 if (my $tex = $::CONN->{texture}[$faceid]) {
3531 $self->{tex} = $tex;
3532 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3533 } else {
3534 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3535 $self->realloc;
3536 });
3537 }
3538 }
3539 }
3540
3541 ($self->{size_w} || 8, $self->{size_h} || 8)
3322} 3542}
3323 3543
3324sub update { 3544sub update {
3325 my ($self) = @_; 3545 my ($self) = @_;
3326 3546
3327 return unless $self->{visible}; 3547 return unless $self->{visible};
3328 3548
3329 $self->SUPER::update; 3549 $self->SUPER::update;
3330} 3550}
3331 3551
3552sub invoke_visibility_change {
3553 my ($self) = @_;
3554
3555 $self->update_timer;
3556
3557 0
3558}
3559
3332sub _draw { 3560sub _draw {
3333 my ($self) = @_; 3561 my ($self) = @_;
3334 3562
3335 return unless $::CONN;
3336
3337 $self->SUPER::_draw; 3563 $self->SUPER::_draw;
3338 3564
3339 my $face; 3565 if (my $tex = $self->{tex}) {
3340
3341 if ($self->{frame}) {
3342 my $anim = $::CONN->{anim}[$self->{anim}];
3343
3344 $face = $anim->[ $self->{frame} % @$anim ]
3345 if $anim && @$anim;
3346 }
3347
3348 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3349
3350 if ($tex) {
3351 glEnable GL_TEXTURE_2D; 3566 glEnable GL_TEXTURE_2D;
3352 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3567 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3353 glColor 0, 0, 0, 1; 3568 glColor 0, 0, 0, 1;
3354 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3569 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3355 glDisable GL_TEXTURE_2D; 3570 glDisable GL_TEXTURE_2D;
… …
3357} 3572}
3358 3573
3359sub destroy { 3574sub destroy {
3360 my ($self) = @_; 3575 my ($self) = @_;
3361 3576
3362 $self->{timer}->cancel 3577 (delete $self->{timer})->cancel
3363 if $self->{timer}; 3578 if $self->{timer};
3364 3579
3365 $self->SUPER::destroy; 3580 $self->SUPER::destroy;
3366} 3581}
3367 3582
… …
3557 ); 3772 );
3558 3773
3559 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3774 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3560 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3775 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3561 3776
3777 {
3778 Scalar::Util::weaken (my $wself = $self);
3779
3780 $self->{multiplexer}->connect (c_add => sub {
3781 my ($mplex, $widgets) = @_;
3782
3783 for my $child (@$widgets) {
3784 Scalar::Util::weaken $child;
3785 $child->{c_tab_} ||= do {
3786 my $tab =
3787 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3788 ? $child->{c_tab}
3789 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3790
3791 $tab->connect (activate => sub {
3792 $wself->set_current_page ($child);
3793 });
3794
3795 $tab
3796 };
3797
3798 $self->{buttonbar}->add ($child->{c_tab_});
3799 }
3800 });
3801
3802 $self->{multiplexer}->connect (c_remove => sub {
3803 my ($mplex, $widgets) = @_;
3804
3805 for my $child (@$widgets) {
3806 $wself->{buttonbar}->remove ($child->{c_tab_});
3807 }
3808 });
3809 }
3810
3562 $self 3811 $self
3563} 3812}
3564 3813
3565sub add { 3814sub add {
3815 my ($self, @widgets) = @_;
3816
3817 $self->{multiplexer}->add (@widgets)
3818}
3819
3820sub remove {
3821 my ($self, @widgets) = @_;
3822
3823 $self->{multiplexer}->remove (@widgets)
3824}
3825
3826sub add_tab {
3566 my ($self, $title, $widget, $tooltip) = @_; 3827 my ($self, $title, $widget, $tooltip) = @_;
3567 3828
3568 CFPlus::weaken $self; 3829 $title = [$title, $tooltip] unless ref $title;
3830 $widget->{c_tab} = $title;
3569 3831
3570 $self->{buttonbar}->add (new CFPlus::UI::Button
3571 markup => $title,
3572 tooltip => $tooltip,
3573 on_activate => sub { $self->set_current_page ($widget) },
3574 );
3575
3576 $self->{multiplexer}->add ($widget); 3832 $self->add ($widget);
3577} 3833}
3578 3834
3579sub get_current_page { 3835sub get_current_page {
3580 my ($self) = @_; 3836 my ($self) = @_;
3581 3837
… …
3911 while ($self->{refresh_hook}) { 4167 while ($self->{refresh_hook}) {
3912 $_->() 4168 $_->()
3913 for values %{delete $self->{refresh_hook}}; 4169 for values %{delete $self->{refresh_hook}};
3914 } 4170 }
3915 4171
3916 if ($self->{realloc}) { 4172 while ($self->{realloc}) {
3917 my %queue; 4173 my %queue;
3918 my @queue; 4174 my @queue;
3919 my $widget; 4175 my $widget;
3920 4176
3921 outer: 4177 outer:
… …
3968 } 4224 }
3969 } 4225 }
3970 4226
3971 delete $self->{realloc}{$widget+0}; 4227 delete $self->{realloc}{$widget+0};
3972 } 4228 }
3973 }
3974 4229
3975 while (my $size_alloc = delete $self->{size_alloc}) { 4230 while (my $size_alloc = delete $self->{size_alloc}) {
3976 my @queue = sort { $b->{visible} <=> $a->{visible} } 4231 my @queue = sort { $a->{visible} <=> $b->{visible} }
3977 values %$size_alloc; 4232 values %$size_alloc;
3978 4233
3979 while () { 4234 while () {
3980 my $widget = pop @queue || last; 4235 my $widget = pop @queue || last;
3981 4236
3982 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4237 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3983 4238
3984 $w = 0 if $w < 0;
3985 $h = 0 if $h < 0;
3986
3987 $w = max $widget->{min_w}, $w; 4239 $w = max $widget->{min_w}, $w;
3988 $h = max $widget->{min_h}, $h; 4240 $h = max $widget->{min_h}, $h;
3989 4241
3990# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4242# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3991# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4243# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3992 4244
3993 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4245 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3994 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4246 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3995 4247
3996 $w = int $w + 0.5; 4248 $w = int $w + 0.5;
3997 $h = int $h + 0.5; 4249 $h = int $h + 0.5;
3998 4250
3999 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4251 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4000 $widget->{old_w} = $widget->{w}; 4252 $widget->{old_w} = $widget->{w};
4001 $widget->{old_h} = $widget->{h}; 4253 $widget->{old_h} = $widget->{h};
4002 4254
4003 $widget->{w} = $w; 4255 $widget->{w} = $w;
4004 $widget->{h} = $h; 4256 $widget->{h} = $h;
4005 4257
4006 $widget->emit (size_allocate => $w, $h); 4258 $widget->emit (size_allocate => $w, $h);
4259 }
4007 } 4260 }
4008 } 4261 }
4009 } 4262 }
4010 4263
4011 while ($self->{post_alloc_hook}) { 4264 while ($self->{post_alloc_hook}) {
4012 $_->() 4265 $_->()
4013 for values %{delete $self->{post_alloc_hook}}; 4266 for values %{delete $self->{post_alloc_hook}};
4014 } 4267 }
4015
4016 4268
4017 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4269 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4018 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4270 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4019 glClear GL_COLOR_BUFFER_BIT; 4271 glClear GL_COLOR_BUFFER_BIT;
4020 4272

Diff Legend

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