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.361 by root, Sat Dec 9 02:21:25 2006 UTC vs.
Revision 1.403 by root, Sat Jul 21 21:25:23 2007 UTC

1package CFPlus::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event; 7use Event;
9 8
10use CFPlus; 9use CFPlus;
11use CFPlus::Pod; 10use CFPlus::Pod;
… …
23our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
24 if (!$GRAB) { 23 if (!$GRAB) {
25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
26 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
27 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
28 $TOOLTIP->hide; 28 $TOOLTIP->hide;
29 29
30 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
31 32
32 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
33 34
34 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
35 36
… …
43 } 44 }
44 } 45 }
45 } 46 }
46 47
47 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
48 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
49}); 51});
50 52
51sub get_layout { 53sub get_layout {
52 my $layout; 54 my $layout;
… …
111 } 113 }
112 114
113 if ($GRAB) { 115 if ($GRAB) {
114 if ($ev->{button} == 4 || $ev->{button} == 5) { 116 if ($ev->{button} == 4 || $ev->{button} == 5) {
115 # mousewheel 117 # mousewheel
116 $ev->{dx} = 0;
117 $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
118 $GRAB->emit (mouse_wheel => $ev); 124 $GRAB->emit (mouse_wheel => $ev);
119 } else { 125 } else {
120 $GRAB->emit (button_down => $ev) 126 $GRAB->emit (button_down => $ev)
121 } 127 }
122 } 128 }
… …
235 h => undef, 241 h => undef,
236 can_events => 1, 242 can_events => 1,
237 @_ 243 @_
238 }, $class; 244 }, $class;
239 245
240 Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); 246 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
241 247
242 for (keys %$self) { 248 for (keys %$self) {
243 if (/^on_(.*)$/) { 249 if (/^on_(.*)$/) {
244 $self->connect ($1 => delete $self->{$_}); 250 $self->connect ($1 => delete $self->{$_});
245 } 251 }
… …
266 $self->hide; 272 $self->hide;
267 $self->emit ("destroy"); 273 $self->emit ("destroy");
268 %$self = (); 274 %$self = ();
269} 275}
270 276
277sub TO_JSON {
278 { __widget_ref__ => $_[0]{s_id} }
279}
280
271sub show { 281sub show {
272 my ($self) = @_; 282 my ($self) = @_;
273 283
274 return if $self->{parent}; 284 return if $self->{parent};
275 285
… …
314sub set_visibility { 324sub set_visibility {
315 my ($self, $visible) = @_; 325 my ($self, $visible) = @_;
316 326
317 return if $self->{visible} == $visible; 327 return if $self->{visible} == $visible;
318 328
319 $visible ? $self->hide 329 $visible ? $self->show
320 : $self->show; 330 : $self->hide;
321} 331}
322 332
323sub toggle_visibility { 333sub toggle_visibility {
324 my ($self) = @_; 334 my ($self) = @_;
325 335
… …
530 ? $args[0]->xy ($self) 540 ? $args[0]->xy ($self)
531 : (); 541 : ();
532 542
533 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d# 543 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
534 544
535 #d##TODO# stop propagating at first true, do not use sum 545 for my $cb (
536 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before 546 @{$self->{signal_cb}{$signal} || []}, # before
537 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure 547 ($self->can ("invoke_$signal") || sub { 1 }), # closure
548 ) {
549 return $cb->($self, @args, @append) || next;
550 }
551
552 # parent
538 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 553 $self->{parent} && $self->{parent}->emit ($signal, @args)
539} 554}
540 555
541sub find_widget { 556#sub find_widget {
542 my ($self, $x, $y) = @_; 557# in .xs
543
544 return () unless $self->{can_events};
545
546 return $self
547 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
548 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
549
550 ()
551}
552 558
553sub set_parent { 559sub set_parent {
554 my ($self, $parent) = @_; 560 my ($self, $parent) = @_;
555 561
556 Scalar::Util::weaken ($self->{parent} = $parent); 562 CFPlus::weaken ($self->{parent} = $parent);
557 $self->set_visible if $parent->{visible}; 563 $self->set_visible if $parent->{visible};
558} 564}
559 565
560sub realloc { 566sub realloc {
561 my ($self) = @_; 567 my ($self) = @_;
… …
734 can_events => 0, 740 can_events => 0,
735 %arg, 741 %arg,
736 ); 742 );
737 743
738 $self->add (@$children) 744 $self->add (@$children)
739 if $children; 745 if $children && @$children;
740 746
741 $self 747 $self
742} 748}
743 749
744sub realloc { 750sub realloc {
… …
753 my ($self, @widgets) = @_; 759 my ($self, @widgets) = @_;
754 760
755 $_->set_parent ($self) 761 $_->set_parent ($self)
756 for @widgets; 762 for @widgets;
757 763
764 # TODO: only do this in widgets that need it, e.g. root, fixed
758 use sort 'stable'; 765 use sort 'stable';
759 766
760 $self->{children} = [ 767 $self->{children} = [
761 sort { $a->{z} <=> $b->{z} } 768 sort { $a->{z} <=> $b->{z} }
762 @{$self->{children}}, @widgets 769 @{$self->{children}}, @widgets
763 ]; 770 ];
764 771
765 $self->realloc; 772 $self->realloc;
773
774 map $_+0, @widgets
766} 775}
767 776
768sub children { 777sub children {
769 @{ $_[0]{children} } 778 @{ $_[0]{children} }
770} 779}
… …
781} 790}
782 791
783sub clear { 792sub clear {
784 my ($self) = @_; 793 my ($self) = @_;
785 794
786 my $children = delete $self->{children}; 795 my $children = $self->{children};
787 $self->{children} = []; 796 $self->{children} = [];
788 797
789 for (@$children) { 798 for (@$children) {
790 delete $_->{parent}; 799 delete $_->{parent};
791 $_->hide; 800 $_->hide;
… …
931} 940}
932 941
933############################################################################# 942#############################################################################
934 943
935package CFPlus::UI::ViewPort; 944package CFPlus::UI::ViewPort;
945
946use List::Util qw(min max);
936 947
937our @ISA = CFPlus::UI::Window::; 948our @ISA = CFPlus::UI::Window::;
938 949
939sub new { 950sub new {
940 my $class = shift; 951 my $class = shift;
… …
949sub size_request { 960sub size_request {
950 my ($self) = @_; 961 my ($self) = @_;
951 962
952 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 963 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
953 964
954 $w = 10 if $self->{scroll_x}; 965 $w = 1 if $self->{scroll_x};
955 $h = 10 if $self->{scroll_y}; 966 $h = 1 if $self->{scroll_y};
956 967
957 ($w, $h) 968 ($w, $h)
958} 969}
959 970
960sub invoke_size_allocate { 971sub invoke_size_allocate {
… …
972} 983}
973 984
974sub set_offset { 985sub set_offset {
975 my ($self, $x, $y) = @_; 986 my ($self, $x, $y) = @_;
976 987
988 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
989 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
990
991 if ($x != $self->{view_x} or $y != $self->{view_y}) {
977 $self->{view_x} = int $x; 992 $self->{view_x} = $x;
978 $self->{view_y} = int $y; 993 $self->{view_y} = $y;
979 994
995 $self->emit (changed => $x, $y);
980 $self->update; 996 $self->update;
997 }
981} 998}
982 999
983# hmm, this does not work for topleft of $self... but we should not ask for that 1000# hmm, this does not work for topleft of $self... but we should not ask for that
984sub coord2local { 1001sub coord2local {
985 my ($self, $x, $y) = @_; 1002 my ($self, $x, $y) = @_;
… …
1000 my ($self, $x, $y) = @_; 1017 my ($self, $x, $y) = @_;
1001 1018
1002 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1019 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1003 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1020 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1004 ) { 1021 ) {
1005 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1022 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1006 } else { 1023 } else {
1007 $self->CFPlus::UI::Base::find_widget ($x, $y) 1024 $self->CFPlus::UI::Base::find_widget ($x, $y)
1008 } 1025 }
1009} 1026}
1010 1027
… …
1021 1038
1022############################################################################# 1039#############################################################################
1023 1040
1024package CFPlus::UI::ScrolledWindow; 1041package CFPlus::UI::ScrolledWindow;
1025 1042
1026our @ISA = CFPlus::UI::HBox::; 1043our @ISA = CFPlus::UI::Table::;
1027 1044
1028sub new { 1045sub new {
1029 my ($class, %arg) = @_; 1046 my ($class, %arg) = @_;
1030 1047
1031 my $child = delete $arg{child}; 1048 my $child = delete $arg{child};
1032 1049
1033 my $self; 1050 my $self;
1034 1051
1035 my $slider = new CFPlus::UI::Slider 1052 my $hslider = new CFPlus::UI::Slider
1053 col => 0,
1054 row => 1,
1055 vertical => 0,
1056 range => [0, 0, 1, 0.01], # HACK fix
1057 on_changed => sub {
1058 $self->{hpos} = $_[1];
1059 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1060 },
1061 ;
1062
1063 my $vslider = new CFPlus::UI::Slider
1064 col => 1,
1065 row => 0,
1036 vertical => 1, 1066 vertical => 1,
1037 range => [0, 0, 1, 0.01], # HACK fix 1067 range => [0, 0, 1, 0.01], # HACK fix
1038 on_changed => sub { 1068 on_changed => sub {
1039 $self->{vp}->set_offset (0, $_[1]); 1069 $self->{vpos} = $_[1];
1070 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1040 }, 1071 },
1041 ; 1072 ;
1042 1073
1043 $self = $class->SUPER::new ( 1074 $self = $class->SUPER::new (
1044 vp => (new CFPlus::UI::ViewPort expand => 1), 1075 scroll_x => 0,
1076 scroll_y => 1,
1045 can_events => 1, 1077 can_events => 1,
1046 slider => $slider, 1078 hslider => $hslider,
1079 vslider => $vslider,
1080 col_expand => [1, 0],
1081 row_expand => [1, 0],
1047 %arg, 1082 %arg,
1048 ); 1083 );
1049 1084
1085 $self->{vp} = new CFPlus::UI::ViewPort
1086 col => 0,
1087 row => 0,
1088 expand => 1,
1089 scroll_x => $self->{scroll_x},
1090 scroll_y => $self->{scroll_y},
1091 on_changed => sub {
1092 my ($vp, $x, $y) = @_;
1093
1094 $vp->{parent}{hslider}->set_value ($x);
1095 $vp->{parent}{vslider}->set_value ($y);
1096
1097 0
1098 },
1099 on_size_allocate => sub {
1100 my ($vp, $w, $h) = @_;
1101 $vp->{parent}->update_slider;
1102 0
1103 },
1104 ;
1105
1050 $self->SUPER::add ($self->{vp}, $self->{slider}); 1106 $self->SUPER::add ($self->{vp});
1107
1051 $self->add ($child) if $child; 1108 $self->add ($child) if $child;
1052 1109
1053 $self 1110 $self
1054} 1111}
1055
1056#TODO# update range on size_allocate depending on child
1057 1112
1058sub add { 1113sub add {
1059 my ($self, $widget) = @_; 1114 my ($self, $widget) = @_;
1060 1115
1061 $self->{vp}->add ($self->{child} = $widget); 1116 $self->{vp}->add ($self->{child} = $widget);
1062} 1117}
1063 1118
1119sub update_slider {
1120 my ($self) = @_;
1121
1122 my $child = ($self->{vp} or return)->child;
1123
1124 if ($self->{scroll_x}) {
1125 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1126 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1127
1128 my $visible = $w1 > $w2;
1129 if ($visible != $self->{hslider_visible}) {
1130 $self->{hslider_visible} = $visible;
1131 $visible ? $self->SUPER::add ($self->{hslider})
1132 : $self->SUPER::remove ($self->{hslider});
1133 }
1134 }
1135
1136 if ($self->{scroll_y}) {
1137 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1138 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1139
1140 my $visible = $h1 > $h2;
1141 if ($visible != $self->{vslider_visible}) {
1142 $self->{vslider_visible} = $visible;
1143 $visible ? $self->SUPER::add ($self->{vslider})
1144 : $self->SUPER::remove ($self->{vslider});
1145 }
1146 }
1147}
1148
1149sub start_dragging {
1150 my ($self, $ev) = @_;
1151
1152 $self->grab_focus;
1153
1154 my $ox = $self->{vp}{view_x};
1155 my $oy = $self->{vp}{view_y};
1156
1157 $self->{motion} = sub {
1158 my ($ev, $x, $y) = @_;
1159
1160 $ox -= $ev->{xrel};
1161 $oy -= $ev->{yrel};
1162
1163 $self->{vp}->set_offset ($ox, $oy);
1164 };
1165}
1166
1064sub invoke_mouse_wheel { 1167sub invoke_mouse_wheel {
1065 my ($self, $ev) = @_; 1168 my ($self, $ev) = @_;
1066 1169
1067 return 0 unless $ev->{dy}; # only vertical movements
1068
1069 $self->{slider}->emit (mouse_wheel => $ev); 1170 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1171 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1070 1172
1071 1 1173 1
1072} 1174}
1073 1175
1074sub update_slider { 1176sub invoke_button_down {
1075 my ($self) = @_; 1177 my ($self, $ev, $x, $y) = @_;
1076 1178
1077 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1179 if ($ev->{button} == 2) {
1078} 1180 $self->start_dragging ($ev);
1181 return 1;
1182 }
1079 1183
1080sub update { 1184 0
1081 my ($self) = @_; 1185}
1082 1186
1083 $self->SUPER::update; 1187sub invoke_button_up {
1188 my ($self, $ev, $x, $y) = @_;
1084 1189
1085 $self->update_slider; 1190 if (delete $self->{motion}) {
1191 return 1;
1192 }
1193
1194 0
1195}
1196
1197sub invoke_mouse_motion {
1198 my ($self, $ev, $x, $y) = @_;
1199
1200 if ($self->{motion}) {
1201 $self->{motion}->($ev, $x, $y);
1202 return 1;
1203 }
1204
1205 0
1086} 1206}
1087 1207
1088sub invoke_size_allocate { 1208sub invoke_size_allocate {
1089 my ($self, $w, $h) = @_; 1209 my ($self, $w, $h) = @_;
1090 1210
1091 $self->update_slider; 1211 $self->update_slider;
1092
1093 $self->SUPER::invoke_size_allocate ($w, $h) 1212 $self->SUPER::invoke_size_allocate ($w, $h)
1094} 1213}
1095 1214
1096############################################################################# 1215#############################################################################
1097 1216
… …
1247 1366
1248my @border = 1367my @border =
1249 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1368 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1250 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1369 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1251 1370
1371my @icon =
1372 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1373 qw(x1_move.png x1_resize.png);
1374
1252sub new { 1375sub new {
1253 my ($class, %arg) = @_; 1376 my ($class, %arg) = @_;
1254 1377
1255 my $self = $class->SUPER::new ( 1378 my $self = $class->SUPER::new (
1256 bg => [1, 1, 1, 1], 1379 bg => [1, 1, 1, 1],
… …
1424 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1547 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1425 1548
1426 my $border = $self->border; 1549 my $border = $self->border;
1427 1550
1428 glColor @{ $self->{border_bg} }; 1551 glColor @{ $self->{border_bg} };
1429 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1552 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1430 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1553 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1431 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1554 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1432 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1555 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1556
1557 # move
1558 my $w2 = ($w - $border) * .5;
1559 my $h2 = ($h - $border) * .5;
1560 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1561 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1562 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1563
1564 # resize
1565 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1566 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1567 unless $self->{has_close_button};
1568 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1569 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1433 1570
1434 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1571 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1435 glColor @{ $self->{bg} }; 1572 glColor @{ $self->{bg} };
1436 1573
1437 # TODO: repeat texture not scale 1574 # TODO: repeat texture not scale
… …
1458 1595
1459############################################################################# 1596#############################################################################
1460 1597
1461package CFPlus::UI::Table; 1598package CFPlus::UI::Table;
1462 1599
1463our @ISA = CFPlus::UI::Base::; 1600our @ISA = CFPlus::UI::Container::;
1464 1601
1465use List::Util qw(max sum); 1602use List::Util qw(max sum);
1466 1603
1467use CFPlus::OpenGL; 1604use CFPlus::OpenGL;
1468 1605
1469sub new { 1606sub new {
1470 my $class = shift; 1607 my $class = shift;
1471 1608
1472 $class->SUPER::new ( 1609 $class->SUPER::new (
1473 col_expand => [], 1610 col_expand => [],
1611 row_expand => [],
1474 @_, 1612 @_,
1475 ) 1613 )
1476} 1614}
1477 1615
1478sub children {
1479 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1480}
1481
1482sub add { 1616sub add {
1617 my ($self, @widgets) = @_;
1618
1619 for my $child (@widgets) {
1620 $child->{rowspan} ||= 1;
1621 $child->{colspan} ||= 1;
1622 }
1623
1624 $self->SUPER::add (@widgets);
1625}
1626
1627sub add_at {
1483 my ($self) = shift; 1628 my $self = shift;
1629
1630 my @widgets;
1484 1631
1485 while (@_) { 1632 while (@_) {
1486 my ($x, $y, $child) = splice @_, 0, 3, (); 1633 my ($col, $row, $child) = splice @_, 0, 3, ();
1487 $child->set_parent ($self);
1488 $self->{children}[$y][$x] = $child;
1489 }
1490 1634
1491 $self->{force_realloc} = 1; 1635 $child->{row} = $row;
1492 $self->{force_size_alloc} = 1; 1636 $child->{col} = $col;
1493 $self->realloc;
1494}
1495 1637
1496sub remove { 1638 push @widgets, $child;
1639 }
1640
1641 $self->add (@widgets);
1642}
1643
1644sub get_wh {
1497 my ($self, $child) = @_; 1645 my ($self) = @_;
1498 1646
1499 # TODO: not yet implemented 1647 my (@w, @h);
1500}
1501
1502# TODO: move to container class maybe? send children a signal on removal?
1503sub clear {
1504 my ($self) = @_;
1505 1648
1506 my @children = $self->children; 1649 my @children = $self->children;
1507 delete $self->{children}; 1650
1651 # first pass, columns
1652 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1653 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1654
1655 my $sw = sum @w[$c .. $c + $cs - 1];
1656
1657 if ($w > $sw) {
1658 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1659 }
1508 1660 }
1509 for (@children) {
1510 delete $_->{parent};
1511 $_->hide;
1512 }
1513 1661
1514 $self->realloc; 1662 # second pass, rows
1515} 1663 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1516
1517sub get_wh {
1518 my ($self) = @_;
1519
1520 my (@w, @h);
1521
1522 for my $y (0 .. $#{$self->{children}}) {
1523 my $row = $self->{children}[$y]
1524 or next;
1525
1526 for my $x (0 .. $#$row) {
1527 my $widget = $row->[$x]
1528 or next;
1529 my ($w, $h) = @$widget{qw(req_w req_h)}; 1664 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1530 1665
1531 $w[$x] = max $w[$x], $w; 1666 my $sh = sum @h[$r .. $r + $rs - 1];
1532 $h[$y] = max $h[$y], $h; 1667
1668 if ($h > $sh) {
1669 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1533 } 1670 }
1534 } 1671 }
1535 1672
1536 (\@w, \@h) 1673 (\@w, \@h)
1537} 1674}
… …
1553 my ($ws, $hs) = $self->get_wh; 1690 my ($ws, $hs) = $self->get_wh;
1554 1691
1555 my $req_w = (sum @$ws) || 1; 1692 my $req_w = (sum @$ws) || 1;
1556 my $req_h = (sum @$hs) || 1; 1693 my $req_h = (sum @$hs) || 1;
1557 1694
1558 # TODO: nicer code && do row_expand 1695 # now linearly scale the rows/columns to the allocated size
1559 my @col_expand = @{$self->{col_expand}}; 1696 my @col_expand = @{$self->{col_expand}};
1560 @col_expand = (1) x @$ws unless @col_expand; 1697 @col_expand = (1) x @$ws unless @col_expand;
1561 my $col_expand = (sum @col_expand) || 1; 1698 my $col_expand = (sum @col_expand) || 1;
1562 1699
1563 # linearly scale sizes
1564 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1700 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1565 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1566 1701
1567 CFPlus::UI::harmonize $ws; 1702 CFPlus::UI::harmonize $ws;
1703
1704 my @row_expand = @{$self->{row_expand}};
1705 @row_expand = (1) x @$ws unless @row_expand;
1706 my $row_expand = (sum @row_expand) || 1;
1707
1708 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1709
1568 CFPlus::UI::harmonize $hs; 1710 CFPlus::UI::harmonize $hs;
1569 1711
1570 my $y; 1712 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1713 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1571 1714
1572 for my $r (0 .. $#{$self->{children}}) { 1715 for my $widget ($self->children) {
1573 my $row = $self->{children}[$r] 1716 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1574 or next;
1575 1717
1576 my $x = 0; 1718 $widget->configure (
1577 my $row_h = $hs->[$r]; 1719 $x[$c], $y[$r],
1720 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1578 1721 );
1579 for my $c (0 .. $#$row) { 1722 }
1580 my $col_w = $ws->[$c];
1581 1723
1582 if (my $widget = $row->[$c]) { 1724 1
1583 $widget->configure ($x, $y, $col_w, $row_h); 1725}
1584 }
1585 1726
1586 $x += $col_w; 1727#############################################################################
1728
1729package CFPlus::UI::Fixed;
1730
1731use List::Util qw(min max);
1732
1733our @ISA = CFPlus::UI::Container::;
1734
1735sub add_fixed {
1736 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1737
1738 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1739 $self->SUPER::add ($child);
1740}
1741
1742sub _scale($$$) {
1743 my ($mode, $val, $max) = @_;
1744
1745 $mode eq "abs" ? $val
1746 : $mode eq "rel" ? $val * $max
1747 : 0
1748}
1749
1750sub size_request {
1751 my ($self) = @_;
1752
1753 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1754
1755 # determine overall size by querying abs widgets
1756 for my $child ($self->visible_children) {
1757 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1758
1759 if ($pos eq "abs") {
1760 $w = _scale $size, $w, $child->{req_w};
1761 $h = _scale $size, $h, $child->{req_h};
1762
1763 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1764 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1587 } 1765 }
1766 }
1588 1767
1589 $y += $row_h; 1768 my $W = $x2 - $x1;
1769 my $H = $y2 - $y1;
1770
1771 # now layout remaining widgets
1772 for my $child ($self->visible_children) {
1773 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1774
1775 if ($pos ne "abs") {
1776 $x = _scale $pos, $x, $W;
1777 $y = _scale $pos, $x, $H;
1778 $w = _scale $size, $w, $child->{req_w};
1779 $h = _scale $size, $h, $child->{req_h};
1780
1781 $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
1782 $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1783 }
1784 }
1785
1786 my $W = $x2 - $x1;
1787 my $H = $y2 - $y1;
1788
1789 ($W, $H)
1790}
1791
1792sub invoke_size_allocate {
1793 my ($self, $W, $H) = @_;
1794
1795 for my $child ($self->visible_children) {
1796 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
1797
1798 $x = _scale $pos, $x, $W;
1799 $y = _scale $pos, $x, $H;
1800 $w = _scale $size, $w, $W;
1801 $h = _scale $size, $h, $H;
1802
1803 $child->configure ($x, $y, $w, $h);
1590 } 1804 }
1591 1805
1592 1 1806 1
1593}
1594
1595sub find_widget {
1596 my ($self, $x, $y) = @_;
1597
1598 $x -= $self->{x};
1599 $y -= $self->{y};
1600
1601 my $res;
1602
1603 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1604 $res = $_->find_widget ($x, $y)
1605 and return $res;
1606 }
1607
1608 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1609}
1610
1611sub _draw {
1612 my ($self) = @_;
1613
1614 for (grep $_, @{$self->{children}}) {
1615 $_->draw for grep $_, @$_;
1616 }
1617} 1807}
1618 1808
1619############################################################################# 1809#############################################################################
1620 1810
1621package CFPlus::UI::Box; 1811package CFPlus::UI::Box;
… …
1962 my $sym = $ev->{sym}; 2152 my $sym = $ev->{sym};
1963 my $uni = $ev->{unicode}; 2153 my $uni = $ev->{unicode};
1964 2154
1965 my $text = $self->get_text; 2155 my $text = $self->get_text;
1966 2156
2157 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2158
1967 if ($uni == 8) { 2159 if ($uni == 8) {
1968 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2160 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1969 } elsif ($uni == 127) { 2161 } elsif ($uni == 127) {
1970 substr $text, $self->{cursor}, 1, ""; 2162 substr $text, $self->{cursor}, 1, "";
1971 } elsif ($sym == CFPlus::SDLK_LEFT) { 2163 } elsif ($sym == CFPlus::SDLK_LEFT) {
1972 --$self->{cursor} if $self->{cursor}; 2164 --$self->{cursor} if $self->{cursor};
1973 } elsif ($sym == CFPlus::SDLK_RIGHT) { 2165 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1974 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2166 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1975 } elsif ($sym == CFPlus::SDLK_HOME) { 2167 } elsif ($sym == CFPlus::SDLK_HOME) {
2168 # what a hack
1976 $self->{cursor} = 0; 2169 $self->{cursor} =
2170 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2171 ? length $1
2172 : 0;
1977 } elsif ($sym == CFPlus::SDLK_END) { 2173 } elsif ($sym == CFPlus::SDLK_END) {
2174 # uh, again
2175 $self->{cursor} =
2176 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1978 $self->{cursor} = length $text; 2177 ? $self->{cursor} + length $1
2178 : length $self->{text};
1979 } elsif ($uni == 21) { # ctrl-u 2179 } elsif ($uni == 21) { # ctrl-u
1980 $text = ""; 2180 $text = "";
1981 $self->{cursor} = 0; 2181 $self->{cursor} = 0;
1982 } elsif ($uni == 27) { 2182 } elsif ($uni == 27) {
1983 $self->emit ('escape'); 2183 $self->emit ('escape');
1984 } elsif ($uni >= 0x20 || $uni == 0x0d) { 2184 } elsif ($uni == 0x0d) {
2185 substr $text, $self->{cursor}++, 0, "\012";
2186 } elsif ($uni >= 0x20) {
1985 substr $text, $self->{cursor}++, 0, chr $uni; 2187 substr $text, $self->{cursor}++, 0, chr $uni;
1986 } else { 2188 } else {
1987 return 0; 2189 return 0;
1988 } 2190 }
1989 2191
… …
2167 2369
2168use CFPlus::OpenGL; 2370use CFPlus::OpenGL;
2169 2371
2170my @tex = 2372my @tex =
2171 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2373 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2172 qw(b1_button_active.png); 2374 qw(b1_button_inactive.png b1_button_active.png);
2173 2375
2174sub new { 2376sub new {
2175 my $class = shift; 2377 my $class = shift;
2176 2378
2177 $class->SUPER::new ( 2379 $class->SUPER::new (
2178 padding_x => 4, 2380 padding_x => 4,
2179 padding_y => 4, 2381 padding_y => 4,
2180 fg => [1, 1, 1], 2382 fg => [1.0, 1.0, 1.0],
2181 active_fg => [0, 0, 1], 2383 active_fg => [0.8, 0.8, 0.8],
2182 can_hover => 1, 2384 can_hover => 1,
2183 align => 0, 2385 align => 0,
2184 valign => 0, 2386 valign => 0,
2185 can_events => 1, 2387 can_events => 1,
2186 @_ 2388 @_
… …
2204 2406
2205 glEnable GL_TEXTURE_2D; 2407 glEnable GL_TEXTURE_2D;
2206 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2408 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2207 glColor 0, 0, 0, 1; 2409 glColor 0, 0, 0, 1;
2208 2410
2411 my $tex = $tex[$GRAB == $self];
2209 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2412 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2210 2413
2211 glDisable GL_TEXTURE_2D; 2414 glDisable GL_TEXTURE_2D;
2212 2415
2213 $self->SUPER::_draw; 2416 $self->SUPER::_draw;
2214} 2417}
… …
2310 or Carp::croak "'path' or 'tex' attributes required"; 2513 or Carp::croak "'path' or 'tex' attributes required";
2311 2514
2312 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2515 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2313 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2516 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2314 2517
2315 Scalar::Util::weaken $texture_cache{$self->{path}}; 2518 CFPlus::weaken $texture_cache{$self->{path}};
2316 2519
2317 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2520 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2318 2521
2319 $self 2522 $self
2320} 2523}
… …
2693sub invoke_mouse_wheel { 2896sub invoke_mouse_wheel {
2694 my ($self, $ev) = @_; 2897 my ($self, $ev) = @_;
2695 2898
2696 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2899 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2697 2900
2901 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2902
2698 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2903 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2699 2904
2700 ! ! $delta 2905 ! ! $delta
2701} 2906}
2702 2907
2703sub update { 2908sub update {
… …
2813 #font => default_font 3018 #font => default_font
2814 @_, 3019 @_,
2815 3020
2816 layout => (new CFPlus::Layout), 3021 layout => (new CFPlus::Layout),
2817 par => [], 3022 par => [],
3023 max_par => 0,
2818 height => 0, 3024 height => 0,
2819 children => [ 3025 children => [
2820 (new CFPlus::UI::Empty expand => 1), 3026 (new CFPlus::UI::Empty expand => 1),
2821 (new CFPlus::UI::Slider vertical => 1), 3027 (new CFPlus::UI::Slider vertical => 1),
2822 ], 3028 ],
… …
2945 wrapped => 1, 3151 wrapped => 1,
2946 }; 3152 };
2947 3153
2948 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 3154 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2949 push @{$self->{par}}, $para; 3155 push @{$self->{par}}, $para;
3156 }
3157
3158 if (my $max = $self->{max_par}) {
3159 shift @{$self->{par}} while @{$self->{par}} > $max;
2950 } 3160 }
2951 3161
2952 $self->{need_reflow}++; 3162 $self->{need_reflow}++;
2953 $self->update; 3163 $self->update;
2954} 3164}
… …
3262 3472
3263sub new { 3473sub new {
3264 my $class = shift; 3474 my $class = shift;
3265 3475
3266 my $self = $class->SUPER::new ( 3476 my $self = $class->SUPER::new (
3477 size_w => 32,
3478 size_h => 8,
3267 aspect => 1, 3479 aspect => 1,
3268 can_events => 0, 3480 can_events => 0,
3269 @_, 3481 @_,
3270 ); 3482 );
3271 3483
3272 if ($self->{anim} && $self->{animspeed}) { 3484 if ($self->{anim} && $self->{animspeed}) {
3273 Scalar::Util::weaken (my $widget = $self); 3485 CFPlus::weaken (my $widget = $self);
3274 3486
3487 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3488 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3275 $self->{timer} = Event->timer ( 3489 $self->{timer} = Event->timer (
3276 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3277 hard => 1, 3490 parked => 1,
3278 interval => $self->{animspeed},
3279 cb => sub { 3491 cb => sub {
3492 return unless $::CONN && $widget;
3493
3280 ++$widget->{frame}; 3494 ++$widget->{frame};
3495 $widget->update_face;
3281 $widget->update; 3496 $widget->update;
3497
3498 $widget->update_timer;
3282 }, 3499 },
3283 ); 3500 );
3501
3502 $self->update_face;
3503 $self->update_timer;
3284 } 3504 }
3285 3505
3286 $self 3506 $self
3287} 3507}
3288 3508
3509sub update_timer {
3510 my ($self) = @_;
3511
3512 return unless $self->{timer};
3513
3514 if ($self->{visible}) {
3515 $self->{timer}->at (
3516 $self->{anim_start}
3517 + $self->{animspeed}
3518 * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3519 );
3520 $self->{timer}->start;
3521 } else {
3522 $self->{timer}->stop;
3523 }
3524}
3525
3526sub update_face {
3527 my ($self) = @_;
3528
3529 return unless $::CONN;
3530
3531 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3532 if ($anim && @$anim) {
3533 delete $self->{wait_face};
3534 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3535 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3536 }
3537 }
3538}
3539
3289sub size_request { 3540sub size_request {
3290 (32, 8) 3541 my ($self) = @_;
3542
3543 if ($::CONN) {
3544 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3545 if (my $tex = $::CONN->{texture}[$faceid]) {
3546 $self->{tex} = $tex;
3547 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3548 } else {
3549 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3550 $self->realloc;
3551 });
3552 }
3553 }
3554 }
3555
3556 ($self->{size_w} || 8, $self->{size_h} || 8)
3291} 3557}
3292 3558
3293sub update { 3559sub update {
3294 my ($self) = @_; 3560 my ($self) = @_;
3295 3561
3296 return unless $self->{visible}; 3562 return unless $self->{visible};
3297 3563
3298 $self->SUPER::update; 3564 $self->SUPER::update;
3299} 3565}
3300 3566
3567sub invoke_visibility_change {
3568 my ($self) = @_;
3569
3570 $self->update_timer;
3571
3572 0
3573}
3574
3301sub _draw { 3575sub _draw {
3302 my ($self) = @_; 3576 my ($self) = @_;
3303 3577
3304 return unless $::CONN;
3305
3306 $self->SUPER::_draw; 3578 $self->SUPER::_draw;
3307 3579
3308 my $face; 3580 if (my $tex = $self->{tex}) {
3309
3310 if ($self->{frame}) {
3311 my $anim = $::CONN->{anim}[$self->{anim}];
3312
3313 $face = $anim->[ $self->{frame} % @$anim ]
3314 if $anim && @$anim;
3315 }
3316
3317 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3318
3319 if ($tex) {
3320 glEnable GL_TEXTURE_2D; 3581 glEnable GL_TEXTURE_2D;
3321 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3582 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3322 glColor 0, 0, 0, 1; 3583 glColor 0, 0, 0, 1;
3323 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3584 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3324 glDisable GL_TEXTURE_2D; 3585 glDisable GL_TEXTURE_2D;
… …
3326} 3587}
3327 3588
3328sub destroy { 3589sub destroy {
3329 my ($self) = @_; 3590 my ($self) = @_;
3330 3591
3331 $self->{timer}->cancel 3592 (delete $self->{timer})->cancel
3332 if $self->{timer}; 3593 if $self->{timer};
3333 3594
3334 $self->SUPER::destroy; 3595 $self->SUPER::destroy;
3335} 3596}
3336 3597
… …
3532} 3793}
3533 3794
3534sub add { 3795sub add {
3535 my ($self, $title, $widget, $tooltip) = @_; 3796 my ($self, $title, $widget, $tooltip) = @_;
3536 3797
3537 Scalar::Util::weaken $self; 3798 CFPlus::weaken $self;
3538 3799
3539 $self->{buttonbar}->add (new CFPlus::UI::Button 3800 $self->{buttonbar}->add (new CFPlus::UI::Button
3540 markup => $title, 3801 markup => $title,
3541 tooltip => $tooltip, 3802 tooltip => $tooltip,
3542 on_activate => sub { $self->set_current_page ($widget) }, 3803 on_activate => sub { $self->set_current_page ($widget) },
… …
3626 my $self = $class->SUPER::new ( 3887 my $self = $class->SUPER::new (
3627 fontsize => 0.8, 3888 fontsize => 0.8,
3628 @_, 3889 @_,
3629 ); 3890 );
3630 3891
3631 Scalar::Util::weaken (my $this = $self); 3892 CFPlus::weaken (my $this = $self);
3632 3893
3633 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3894 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3634 3895
3635 $self 3896 $self
3636} 3897}
… …
3775 my $self = $class->SUPER::new ( 4036 my $self = $class->SUPER::new (
3776 visible => 1, 4037 visible => 1,
3777 @_, 4038 @_,
3778 ); 4039 );
3779 4040
3780 Scalar::Util::weaken ($self->{root} = $self); 4041 CFPlus::weaken ($self->{root} = $self);
3781 4042
3782 $self 4043 $self
3783} 4044}
3784 4045
3785sub size_request { 4046sub size_request {
… …
3880 while ($self->{refresh_hook}) { 4141 while ($self->{refresh_hook}) {
3881 $_->() 4142 $_->()
3882 for values %{delete $self->{refresh_hook}}; 4143 for values %{delete $self->{refresh_hook}};
3883 } 4144 }
3884 4145
3885 if ($self->{realloc}) { 4146 while ($self->{realloc}) {
3886 my %queue; 4147 my %queue;
3887 my @queue; 4148 my @queue;
3888 my $widget; 4149 my $widget;
3889 4150
3890 outer: 4151 outer:
… …
3937 } 4198 }
3938 } 4199 }
3939 4200
3940 delete $self->{realloc}{$widget+0}; 4201 delete $self->{realloc}{$widget+0};
3941 } 4202 }
3942 }
3943 4203
3944 while (my $size_alloc = delete $self->{size_alloc}) { 4204 while (my $size_alloc = delete $self->{size_alloc}) {
3945 my @queue = sort { $b->{visible} <=> $a->{visible} } 4205 my @queue = sort { $a->{visible} <=> $b->{visible} }
3946 values %$size_alloc; 4206 values %$size_alloc;
3947 4207
3948 while () { 4208 while () {
3949 my $widget = pop @queue || last; 4209 my $widget = pop @queue || last;
3950 4210
3951 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4211 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3952 4212
3953 $w = 0 if $w < 0;
3954 $h = 0 if $h < 0;
3955
3956 $w = max $widget->{min_w}, $w; 4213 $w = max $widget->{min_w}, $w;
3957 $h = max $widget->{min_h}, $h; 4214 $h = max $widget->{min_h}, $h;
3958 4215
3959# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4216# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3960# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4217# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3961 4218
3962 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4219 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3963 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4220 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3964 4221
3965 $w = int $w + 0.5; 4222 $w = int $w + 0.5;
3966 $h = int $h + 0.5; 4223 $h = int $h + 0.5;
3967 4224
3968 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4225 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3969 $widget->{old_w} = $widget->{w}; 4226 $widget->{old_w} = $widget->{w};
3970 $widget->{old_h} = $widget->{h}; 4227 $widget->{old_h} = $widget->{h};
3971 4228
3972 $widget->{w} = $w; 4229 $widget->{w} = $w;
3973 $widget->{h} = $h; 4230 $widget->{h} = $h;
3974 4231
3975 $widget->emit (size_allocate => $w, $h); 4232 $widget->emit (size_allocate => $w, $h);
4233 }
3976 } 4234 }
3977 } 4235 }
3978 } 4236 }
3979 4237
3980 while ($self->{post_alloc_hook}) { 4238 while ($self->{post_alloc_hook}) {
3981 $_->() 4239 $_->()
3982 for values %{delete $self->{post_alloc_hook}}; 4240 for values %{delete $self->{post_alloc_hook}};
3983 } 4241 }
3984
3985 4242
3986 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4243 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3987 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4244 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3988 glClear GL_COLOR_BUFFER_BIT; 4245 glClear GL_COLOR_BUFFER_BIT;
3989 4246

Diff Legend

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