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.255 by root, Mon May 29 02:01:56 2006 UTC vs.
Revision 1.266 by root, Thu Jun 1 03:42:58 2006 UTC

… …
17our $BUTTON_STATE; 17our $BUTTON_STATE;
18 18
19our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
20 20
21sub get_layout { 21sub get_layout {
22 my $layout;
23
22 for (grep { $_->{name} } values %WIDGET) { 24 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = { 25 my $win = $layout->{$_->{name}} = { };
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 }; 26
29 } 27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
30 31
31 return $LAYOUT; 32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
32} 36}
33 37
34sub set_layout { 38sub set_layout {
35 my ($layout) = @_; 39 my ($layout) = @_;
40
36 $LAYOUT = $layout; 41 $LAYOUT = $layout;
37} 42}
38 43
39sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
40 if (!$GRAB) { 47 if (!$GRAB) {
41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
43
44 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
45 $TOOLTIP->hide; 51 $TOOLTIP->hide;
46 52
47 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
48 54
… …
165sub rescale_widgets { 171sub rescale_widgets {
166 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
167 173
168 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
169 if ($widget->{is_toplevel}) { 175 if ($widget->{is_toplevel}) {
176 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
170 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
171 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
172 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
173 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
174 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
175 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
185
186 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
176 } 189 }
177 } 190 }
178 191
179 reconfigure_widgets; 192 reconfigure_widgets;
180} 193}
… …
189 202
190sub new { 203sub new {
191 my $class = shift; 204 my $class = shift;
192 205
193 my $self = bless { 206 my $self = bless {
194 x => 0, 207 x => "center",
195 y => 0, 208 y => "center",
196 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
197 can_events => 1, 212 can_events => 1,
198 @_ 213 @_
199 }, $class; 214 }, $class;
215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
200 217
201 for (keys %$self) { 218 for (keys %$self) {
202 if (/^on_(.*)$/) { 219 if (/^on_(.*)$/) {
203 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
204 } 221 }
205 } 222 }
206 223
207 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
208
209 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
210 $self->{req_x} = $layout->{x} * $::WIDTH; 225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
211 $self->{req_y} = $layout->{y} * $::HEIGHT; 226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
212 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
213 $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT; 228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
229
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232
233 $self->show if $layout->{show};
214 } 234 }
215 235
216 $self 236 $self
217} 237}
218 238
… …
227 my ($self) = @_; 247 my ($self) = @_;
228 248
229 return if $self->{parent}; 249 return if $self->{parent};
230 250
231 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
232}
233
234sub center {
235 my ($self) = @_;
236
237 $CFClient::UI::ROOT->on_post_alloc (
238 "center_$self" => sub {
239 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
240 },
241 );
242
243 $self->update;
244} 252}
245 253
246sub set_visible { 254sub set_visible {
247 my ($self) = @_; 255 my ($self) = @_;
248 256
… …
303 311
304 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
305 if $self->{parent}; 313 if $self->{parent};
306} 314}
307 315
308sub move { 316sub move_abs {
309 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
310 318
311 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
312 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
313 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
314 322
315 $self->update; 323 $self->update;
316} 324}
317 325
318sub set_size { 326sub set_size {
319 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
320 328
321 $self->{def_w} = $w; 329 $self->{force_w} = $w;
322 $self->{def_h} = $h; 330 $self->{force_h} = $h;
323 331
324 $self->realloc; 332 $self->realloc;
325} 333}
326 334
327sub size_request { 335sub size_request {
… …
331 339
332sub configure { 340sub configure {
333 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
334 342
335 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
336 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
337 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
338 348
339 # use alignment to adjust x, y 349 # use alignment to adjust x, y
340 350
341 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
342 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
343
344 ($w, $h) = ($w2, $h2);
345 } 353 }
346 354
347 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
348 $self->{x} = $x; 356 $self->{x} = $x;
349 $self->{y} = $y; 357 $self->{y} = $y;
350 $self->update; 358 $self->update;
351 } 359 }
352 360
353 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
354 return unless $self->{visible}; 362 return unless $self->{visible};
355 363
364 $self->{alloc_w} = $w;
365 $self->{alloc_h} = $h;
366
356 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h]; 367 $self->{root}{size_alloc}{$self+0} = $self;
357 } 368 }
358} 369}
359 370
360sub size_allocate { 371sub size_allocate {
361 # nothing to be done 372 # nothing to be done
… …
461 472
462sub set_parent { 473sub set_parent {
463 my ($self, $parent) = @_; 474 my ($self, $parent) = @_;
464 475
465 Scalar::Util::weaken ($self->{parent} = $parent); 476 Scalar::Util::weaken ($self->{parent} = $parent);
466
467 $self->set_visible if $parent->{visible}; 477 $self->set_visible if $parent->{visible};
468} 478}
469 479
470sub connect { 480sub connect {
471 my ($self, $signal, $cb) = @_; 481 my ($self, $signal, $cb) = @_;
… …
492 502
493sub realloc { 503sub realloc {
494 my ($self) = @_; 504 my ($self) = @_;
495 505
496 if ($self->{visible}) { 506 if ($self->{visible}) {
497 return if $self->{root}{realloc}{$self}; 507 return if $self->{root}{realloc}{$self+0};
498 508
499 $self->{root}{realloc}{$self} = $self; 509 $self->{root}{realloc}{$self+0} = $self;
500 $self->{root}->update; 510 $self->{root}->update;
501 } else { 511 } else {
502 delete $self->{req_w}; 512 delete $self->{req_w};
513 delete $self->{req_h};
503 } 514 }
504} 515}
505 516
506sub update { 517sub update {
507 my ($self) = @_; 518 my ($self) = @_;
508 519
509 $self->{parent}->update 520 $self->{parent}->update
510 if $self->{parent}; 521 if $self->{parent};
522}
523
524sub reconfigure {
525 my ($self) = @_;
526
527 $self->realloc;
528 $self->update;
511} 529}
512 530
513sub draw { 531sub draw {
514 my ($self) = @_; 532 my ($self) = @_;
515 533
… …
533 glVertex $x , $y + $self->{h}; 551 glVertex $x , $y + $self->{h};
534 glEnd; 552 glEnd;
535 glDisable GL_BLEND; 553 glDisable GL_BLEND;
536 } 554 }
537 555
538 if ($ENV{PCLIENT_DEBUG}) { 556 if ($ENV{CFPLUS_DEBUG} & 1) {
539 glPushMatrix; 557 glPushMatrix;
540 glColor 1, 1, 0, 1; 558 glColor 1, 1, 0, 1;
541 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 559 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
542 glBegin GL_LINE_LOOP; 560 glBegin GL_LINE_LOOP;
543 glVertex 0 , 0; 561 glVertex 0 , 0;
… …
619 my ($class, %arg) = @_; 637 my ($class, %arg) = @_;
620 $class->SUPER::new (can_events => 0, %arg); 638 $class->SUPER::new (can_events => 0, %arg);
621} 639}
622 640
623sub size_request { 641sub size_request {
624 (0, 0) 642 my ($self) = @_;
643
644 ($self->{w} + 0, $self->{h} + 0)
625} 645}
626 646
627sub draw { } 647sub draw { }
628 648
629############################################################################# 649#############################################################################
… …
750sub size_request { 770sub size_request {
751 $_[0]{children}[0]->size_request 771 $_[0]{children}[0]->size_request
752} 772}
753 773
754sub size_allocate { 774sub size_allocate {
755 my ($self, $w, $h, $changed) = @_; 775 my ($self, $w, $h) = @_;
756 776
757 $self->{children}[0]->configure (0, 0, $w, $h); 777 $self->{children}[0]->configure (0, 0, $w, $h);
758} 778}
759 779
760############################################################################# 780#############################################################################
… …
777 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 797 $ROOT->on_post_alloc ($self => sub { $self->render_child });
778 $self->SUPER::update; 798 $self->SUPER::update;
779} 799}
780 800
781sub size_allocate { 801sub size_allocate {
782 my ($self, $w, $h, $changed) = @_; 802 my ($self, $w, $h) = @_;
783 803
784 $self->SUPER::size_allocate ($w, $h, $changed); 804 $self->SUPER::size_allocate ($w, $h);
785 $self->update 805 $self->update;
786 if $changed;
787} 806}
788 807
789sub _render { 808sub _render {
790 $_[0]{children}[0]->draw; 809 $_[0]{children}[0]->draw;
791} 810}
… …
835} 854}
836 855
837sub size_request { 856sub size_request {
838 my ($self) = @_; 857 my ($self) = @_;
839 858
840 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 859 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
841 860
842 $w = 10 if $self->{scroll_x}; 861 $w = 10 if $self->{scroll_x};
843 $h = 10 if $self->{scroll_y}; 862 $h = 10 if $self->{scroll_y};
844 863
845 ($w, $h) 864 ($w, $h)
846} 865}
847 866
848sub size_allocate { 867sub size_allocate {
849 my ($self, $w, $h, $changed) = @_; 868 my ($self, $w, $h) = @_;
850 869
870 my $child = $self->child;
871
851 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 872 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
852 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 873 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
853 874
854 $self->child->configure (0, 0, $w, $h); 875 $self->child->configure (0, 0, $w, $h);
855 $self->update; 876 $self->update;
856} 877}
857 878
… …
941 my $child = $self->{vp}->child; 962 my $child = $self->{vp}->child;
942 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 963 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
943} 964}
944 965
945sub size_allocate { 966sub size_allocate {
946 my ($self, $w, $h, $changed) = @_; 967 my ($self, $w, $h) = @_;
947 968
948 $self->SUPER::size_allocate ($w, $h, $changed); 969 $self->SUPER::size_allocate ($w, $h);
949 970
950 my $child = $self->{vp}->child; 971 my $child = $self->{vp}->child;
951 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 972 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
952} 973}
953 974
… …
1015 1036
1016 my $self = $class->SUPER::new ( 1037 my $self = $class->SUPER::new (
1017 bg => [1, 1, 1, 1], 1038 bg => [1, 1, 1, 1],
1018 border_bg => [1, 1, 1, 1], 1039 border_bg => [1, 1, 1, 1],
1019 border => 0.6, 1040 border => 0.6,
1020 is_toplevel => 1,
1021 can_events => 1, 1041 can_events => 1,
1042 min_w => 16,
1043 min_h => 16,
1022 @_ 1044 @_
1023 ); 1045 );
1024 1046
1025 $self->{title} &&= new CFClient::UI::Label 1047 $self->{title} &&= new CFClient::UI::Label
1026 align => 0, 1048 align => 0,
… …
1045 $h + $self->border * 2, 1067 $h + $self->border * 2,
1046 ) 1068 )
1047} 1069}
1048 1070
1049sub size_allocate { 1071sub size_allocate {
1050 my ($self, $w, $h, $changed) = @_; 1072 my ($self, $w, $h) = @_;
1051
1052 return unless $changed;
1053 1073
1054 $h -= List::Util::max 0, $self->border * 2; 1074 $h -= List::Util::max 0, $self->border * 2;
1055 $w -= List::Util::max 0, $self->border * 2; 1075 $w -= List::Util::max 0, $self->border * 2;
1056 1076
1057 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2) 1077 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
… …
1081 my ($ev, $x, $y) = @_; 1101 my ($ev, $x, $y) = @_;
1082 1102
1083 my $dx = $ev->{x} - $ox; 1103 my $dx = $ev->{x} - $ox;
1084 my $dy = $ev->{y} - $oy; 1104 my $dy = $ev->{y} - $oy;
1085 1105
1086 $self->{user_x} = $wx + $dx * $mx;
1087 $self->{user_y} = $wy + $dy * $my;
1088 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1106 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1089 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1107 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1090 $self->move ($self->{user_x}, $self->{user_y}); 1108
1091 $self->realloc; 1109 $self->realloc;
1110 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1092 }; 1111 };
1093 1112
1094 } elsif ($lr ^ $td) { 1113 } elsif ($lr ^ $td) {
1095 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1114 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1096 my ($bx, $by) = ($self->{x}, $self->{y}); 1115 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1098 $self->{motion} = sub { 1117 $self->{motion} = sub {
1099 my ($ev, $x, $y) = @_; 1118 my ($ev, $x, $y) = @_;
1100 1119
1101 ($x, $y) = ($ev->{x}, $ev->{y}); 1120 ($x, $y) = ($ev->{x}, $ev->{y});
1102 1121
1103 $self->{user_x} = $bx + $x - $ox; 1122 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1104 $self->{user_y} = $by + $y - $oy;
1105
1106 $self->move ($self->{user_x}, $self->{user_y});
1107 $self->realloc;
1108 }; 1123 };
1109 } 1124 }
1110} 1125}
1111 1126
1112sub button_up { 1127sub button_up {
… …
1234 (sum @$hs), 1249 (sum @$hs),
1235 ) 1250 )
1236} 1251}
1237 1252
1238sub size_allocate { 1253sub size_allocate {
1239 my ($self, $w, $h, $changed) = @_; 1254 my ($self, $w, $h) = @_;
1240 1255
1241 my ($ws, $hs) = $self->get_wh; 1256 my ($ws, $hs) = $self->get_wh;
1242 1257
1243 my $req_w = (sum @$ws) || 1; 1258 my $req_w = (sum @$ws) || 1;
1244 my $req_h = (sum @$hs) || 1; 1259 my $req_h = (sum @$hs) || 1;
… …
1322 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1337 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1323 ) 1338 )
1324} 1339}
1325 1340
1326sub size_allocate { 1341sub size_allocate {
1327 my ($self, $w, $h, $changed) = @_; 1342 my ($self, $w, $h) = @_;
1328 1343
1329 my $space = $self->{vertical} ? $h : $w; 1344 my $space = $self->{vertical} ? $h : $w;
1330 my $children = $self->{children}; 1345 my $children = $self->{children};
1331 1346
1332 my @req; 1347 my @req;
… …
1415 ellipsise => 3, # end 1430 ellipsise => 3, # end
1416 layout => (new CFClient::Layout), 1431 layout => (new CFClient::Layout),
1417 fontsize => 1, 1432 fontsize => 1,
1418 align => -1, 1433 align => -1,
1419 valign => -1, 1434 valign => -1,
1420 padding => 2, 1435 padding_x => 2,
1436 padding_y => 2,
1421 can_events => 0, 1437 can_events => 0,
1422 %arg 1438 %arg
1423 ); 1439 );
1424 1440
1425 if (exists $self->{template}) { 1441 if (exists $self->{template}) {
… …
1501 1517
1502 $w = List::Util::max $w, $w2; 1518 $w = List::Util::max $w, $w2;
1503 $h = List::Util::max $h, $h2; 1519 $h = List::Util::max $h, $h2;
1504 } 1520 }
1505 1521
1506 ( 1522 ($w, $h)
1507 $w + $self->{padding} * 2,
1508 $h + $self->{padding} * 2,
1509 )
1510} 1523}
1511 1524
1512sub size_allocate { 1525sub size_allocate {
1513 my ($self, $w, $h, $changed) = @_; 1526 my ($self, $w, $h) = @_;
1514 1527
1515 delete $self->{texture} 1528 delete $self->{texture}
1516 if $changed; 1529 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1517} 1530}
1518 1531
1519sub set_fontsize { 1532sub set_fontsize {
1520 my ($self, $fontsize) = @_; 1533 my ($self, $fontsize) = @_;
1521 1534
… …
1538 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1551 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1539 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1552 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1540 1553
1541 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1554 my $tex = new_from_layout CFClient::Texture $self->{layout};
1542 1555
1543 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1556 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1544 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1557 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1545 : ($self->{w} - $tex->{w}) * 0.5); 1558 : ($self->{w} - $tex->{w}) * 0.5);
1546 1559
1547 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1560 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1548 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1561 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1549 : ($self->{h} - $tex->{h}) * 0.5); 1562 : ($self->{h} - $tex->{h}) * 0.5);
1550 1563
1551 $tex 1564 $tex
1552 }; 1565 };
1553 1566
… …
1792 1805
1793sub new { 1806sub new {
1794 my $class = shift; 1807 my $class = shift;
1795 1808
1796 $class->SUPER::new ( 1809 $class->SUPER::new (
1797 padding => 4, 1810 padding_x => 4,
1811 padding_y => 4,
1798 fg => [1, 1, 1], 1812 fg => [1, 1, 1],
1799 active_fg => [0, 0, 1], 1813 active_fg => [0, 0, 1],
1800 can_hover => 1, 1814 can_hover => 1,
1801 align => 0, 1815 align => 0,
1802 valign => 0, 1816 valign => 0,
… …
1849 1863
1850sub new { 1864sub new {
1851 my $class = shift; 1865 my $class = shift;
1852 1866
1853 $class->SUPER::new ( 1867 $class->SUPER::new (
1854 padding => 2, 1868 padding_x => 2,
1869 padding_y => 2,
1855 fg => [1, 1, 1], 1870 fg => [1, 1, 1],
1856 active_fg => [1, 1, 0], 1871 active_fg => [1, 1, 0],
1857 bg => [0, 0, 0, 0.2], 1872 bg => [0, 0, 0, 0.2],
1858 active_bg => [1, 1, 1, 0.5], 1873 active_bg => [1, 1, 1, 0.5],
1859 state => 0, 1874 state => 0,
… …
1863} 1878}
1864 1879
1865sub size_request { 1880sub size_request {
1866 my ($self) = @_; 1881 my ($self) = @_;
1867 1882
1868 ($self->{padding} * 2 + 6) x 2 1883 (6) x 2
1869} 1884}
1870 1885
1871sub button_down { 1886sub button_down {
1872 my ($self, $ev, $x, $y) = @_; 1887 my ($self, $ev, $x, $y) = @_;
1873 1888
1874 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1889 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1875 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1890 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1876 $self->{state} = !$self->{state}; 1891 $self->{state} = !$self->{state};
1877 $self->_emit (changed => $self->{state}); 1892 $self->_emit (changed => $self->{state});
1878 } 1893 }
1879} 1894}
1880 1895
1881sub _draw { 1896sub _draw {
1882 my ($self) = @_; 1897 my ($self) = @_;
1883 1898
1884 $self->SUPER::_draw; 1899 $self->SUPER::_draw;
1885 1900
1886 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1901 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1887 1902
1888 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1903 my ($w, $h) = @$self{qw(w h)};
1904
1905 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1889 1906
1890 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1907 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1891 1908
1892 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1909 my $tex = $self->{state} ? $tex[1] : $tex[0];
1893 1910
… …
2158 fg => [1, 1, 1], 2175 fg => [1, 1, 1],
2159 active_fg => [0, 0, 0], 2176 active_fg => [0, 0, 0],
2160 bg => [0, 0, 0, 0.2], 2177 bg => [0, 0, 0, 0.2],
2161 active_bg => [1, 1, 1, 0.5], 2178 active_bg => [1, 1, 1, 0.5],
2162 range => [0, 0, 100, 10, 0], 2179 range => [0, 0, 100, 10, 0],
2163 req_w => $::WIDTH / 80, 2180 min_w => $::WIDTH / 80,
2164 req_h => $::WIDTH / 80, 2181 min_h => $::WIDTH / 80,
2165 vertical => 0, 2182 vertical => 0,
2166 can_hover => 1, 2183 can_hover => 1,
2167 inner_pad => 0.02, 2184 inner_pad => 0.02,
2168 @_ 2185 @_
2169 ); 2186 );
… …
2209} 2226}
2210 2227
2211sub size_request { 2228sub size_request {
2212 my ($self) = @_; 2229 my ($self) = @_;
2213 2230
2214 my $w = $self->{req_w}; 2231 ($self->{req_w}, $self->{req_h})
2215 my $h = $self->{req_h};
2216
2217 $self->{vertical} ? ($h, $w) : ($w, $h)
2218} 2232}
2219 2233
2220sub button_down { 2234sub button_down {
2221 my ($self, $ev, $x, $y) = @_; 2235 my ($self, $ev, $x, $y) = @_;
2222 2236
… …
2372 $self->{fontsize} = $fontsize; 2386 $self->{fontsize} = $fontsize;
2373 $self->reflow; 2387 $self->reflow;
2374} 2388}
2375 2389
2376sub size_allocate { 2390sub size_allocate {
2377 my ($self, $w, $h, $changed) = @_; 2391 my ($self, $w, $h) = @_;
2378 2392
2379 $self->SUPER::size_allocate ($w, $h, $changed); 2393 $self->SUPER::size_allocate ($w, $h);
2380
2381 return unless $changed;
2382 2394
2383 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2395 $self->{layout}->set_font ($self->{font}) if $self->{font};
2384 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2396 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2385 $self->{layout}->set_width ($self->{children}[0]{w}); 2397 $self->{layout}->set_width ($self->{children}[0]{w});
2386 2398
… …
2609} 2621}
2610 2622
2611sub set_tooltip_from { 2623sub set_tooltip_from {
2612 my ($self, $widget) = @_; 2624 my ($self, $widget) = @_;
2613 2625
2626 my $tooltip = $widget->{tooltip};
2627
2628 if ($ENV{CFPLUS_DEBUG} & 2) {
2629 $tooltip .= "\n\n" . (ref $widget) . "\n"
2630 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2631 . "req $widget->{req_w} $widget->{req_h}\n"
2632 . "visible $widget->{visible}";
2633 }
2634
2614 $self->add (new CFClient::UI::Label 2635 $self->add (new CFClient::UI::Label
2615 markup => $widget->{tooltip}, 2636 markup => $tooltip,
2616 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2637 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2617 fontsize => 0.8, 2638 fontsize => 0.8,
2618 fg => [0, 0, 0, 1], 2639 fg => [0, 0, 0, 1],
2619 ellipsise => 0, 2640 ellipsise => 0,
2620 font => ($widget->{tooltip_font} || $::FONT_PROP), 2641 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2628 2649
2629 ($w + 4, $h + 4) 2650 ($w + 4, $h + 4)
2630} 2651}
2631 2652
2632sub size_allocate { 2653sub size_allocate {
2633 my ($self, $w, $h, $changed) = @_; 2654 my ($self, $w, $h) = @_;
2634 2655
2635 return unless $changed;
2636
2637 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 2656 $self->SUPER::size_allocate ($w - 4, $h - 4);
2638} 2657}
2639 2658
2640sub visibility_change { 2659sub visibility_change {
2641 my ($self, $visible) = @_; 2660 my ($self, $visible) = @_;
2642 2661
… …
2649 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2668 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2650 2669
2651 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2670 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2652 if $x + $self->{w} > $::WIDTH; 2671 if $x + $self->{w} > $::WIDTH;
2653 2672
2654 $self->move ($x, $y); 2673 $self->move_abs ($x, $y);
2655 }); 2674 });
2656} 2675}
2657 2676
2658sub _draw { 2677sub _draw {
2659 my ($self) = @_; 2678 my ($self) = @_;
… …
2763 $self->SUPER::DESTROY; 2782 $self->SUPER::DESTROY;
2764} 2783}
2765 2784
2766############################################################################# 2785#############################################################################
2767 2786
2768package CFClient::UI::Inventory;
2769
2770our @ISA = CFClient::UI::ScrolledWindow::;
2771
2772sub new {
2773 my $class = shift;
2774
2775 my $self = $class->SUPER::new (
2776 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2777 @_,
2778 );
2779
2780 $self
2781}
2782
2783sub set_items {
2784 my ($self, $items) = @_;
2785
2786 $self->{scrolled}->clear;
2787 return unless $items;
2788
2789 my @items = sort {
2790 ($a->{type} <=> $b->{type})
2791 or ($a->{name} cmp $b->{name})
2792 } @$items;
2793
2794 $self->{real_items} = \@items;
2795
2796 my $row = 0;
2797 for my $item (@items) {
2798 CFClient::Item::update_widgets $item;
2799
2800 $self->{scrolled}->add (0, $row, $item->{face_widget});
2801 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2802 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2803
2804 $row++;
2805 }
2806}
2807
2808#############################################################################
2809
2810package CFClient::UI::Menu; 2787package CFClient::UI::Menu;
2811 2788
2812our @ISA = CFClient::UI::FancyFrame::; 2789our @ISA = CFClient::UI::FancyFrame::;
2813 2790
2814use CFClient::OpenGL; 2791use CFClient::OpenGL;
… …
2852 # maybe save $GRAB? must be careful about events... 2829 # maybe save $GRAB? must be careful about events...
2853 $GRAB = $self; 2830 $GRAB = $self;
2854 $self->{button} = $ev->{button}; 2831 $self->{button} = $ev->{button};
2855 2832
2856 $self->show; 2833 $self->show;
2857 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2834 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2858} 2835}
2859 2836
2860sub mouse_motion { 2837sub mouse_motion {
2861 my ($self, $ev, $x, $y) = @_; 2838 my ($self, $ev, $x, $y) = @_;
2862 2839
… …
2987 $self->SUPER::reconfigure; 2964 $self->SUPER::reconfigure;
2988} 2965}
2989 2966
2990############################################################################# 2967#############################################################################
2991 2968
2969package CFClient::UI::Inventory;
2970
2971our @ISA = CFClient::UI::ScrolledWindow::;
2972
2973sub new {
2974 my $class = shift;
2975
2976 my $self = $class->SUPER::new (
2977 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2978 @_,
2979 );
2980
2981 $self
2982}
2983
2984sub set_items {
2985 my ($self, $items) = @_;
2986
2987 $self->{scrolled}->clear;
2988 return unless $items;
2989
2990 my @items = sort {
2991 ($a->{type} <=> $b->{type})
2992 or ($a->{name} cmp $b->{name})
2993 } @$items;
2994
2995 $self->{real_items} = \@items;
2996
2997 my $row = 0;
2998 for my $item (@items) {
2999 CFClient::Item::update_widgets $item;
3000
3001 $self->{scrolled}->add (0, $row, $item->{face_widget});
3002 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3003 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3004
3005 $row++;
3006 }
3007}
3008
3009#############################################################################
3010
3011package CFClient::UI::BindEditor;
3012
3013our @ISA = CFClient::UI::FancyFrame::;
3014
3015sub new {
3016 my $class = shift;
3017
3018 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3019
3020 $self->add (my $vb = new CFClient::UI::VBox);
3021
3022
3023 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3024 text => "start recording",
3025 tooltip => "Start/Stops recording of actions."
3026 ."All subsequent actions after the recording started will be captured."
3027 ."The actions are displayed after the record was stopped."
3028 ."To bind the action you have to click on the 'Bind' button",
3029 on_activate => sub {
3030 unless ($self->{recording}) {
3031 $self->start;
3032 } else {
3033 $self->stop;
3034 }
3035 });
3036
3037 $vb->add (new CFClient::UI::Label text => "Actions:");
3038 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3039
3040 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3041 $vb->add (my $hb = new CFClient::UI::HBox);
3042 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3043 $hb->add (new CFClient::UI::Button
3044 text => "bind",
3045 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3046 on_activate => sub {
3047 $self->ask_for_bind;
3048 });
3049
3050 $vb->add (my $hb = new CFClient::UI::HBox);
3051 $hb->add (new CFClient::UI::Button
3052 text => "ok",
3053 expand => 1,
3054 tooltip => "This closes the binding editor and saves the binding",
3055 on_activate => sub {
3056 $self->hide;
3057 $self->commit;
3058 });
3059
3060 $hb->add (new CFClient::UI::Button
3061 text => "cancel",
3062 expand => 1,
3063 tooltip => "This closes the binding editor without saving",
3064 on_activate => sub {
3065 $self->hide;
3066 $self->{binding_cancel}->()
3067 if $self->{binding_cancel};
3068 });
3069
3070 $self->update_binding_widgets;
3071
3072 $self
3073}
3074
3075sub commit {
3076 my ($self) = @_;
3077 my ($mod, $sym, $cmds) = $self->get_binding;
3078 if ($sym != 0 && @$cmds > 0) {
3079 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3080 ."'. Don't forget 'Save Config'!");
3081 $self->{binding_change}->($mod, $sym, $cmds)
3082 if $self->{binding_change};
3083 } else {
3084 $::STATUSBOX->add ("No action bound, no key or action specified!");
3085 $self->{binding_cancel}->()
3086 if $self->{binding_cancel};
3087 }
3088}
3089
3090sub start {
3091 my ($self) = @_;
3092
3093 $self->{rec_btn}->set_text ("stop recording");
3094 $self->{recording} = 1;
3095 $self->clear_command_list;
3096 $::CONN->start_record if $::CONN;
3097}
3098
3099sub stop {
3100 my ($self) = @_;
3101
3102 $self->{rec_btn}->set_text ("start recording");
3103 $self->{recording} = 0;
3104
3105 my $rec;
3106 $rec = $::CONN->stop_record if $::CONN;
3107 return unless ref $rec eq 'ARRAY';
3108 $self->set_command_list ($rec);
3109}
3110
3111# if $commit is true, the binding will be set after the user entered a key combo
3112sub ask_for_bind {
3113 my ($self, $commit) = @_;
3114
3115 CFClient::Binder::open_binding_dialog (sub {
3116 my ($mod, $sym) = @_;
3117 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3118 $self->update_binding_widgets;
3119 $self->commit if $commit;
3120 });
3121}
3122
3123# $mod and $sym are the modifiers and key symbol
3124# $cmds is a array ref of strings (the commands)
3125# $cb is the callback that is executed on OK
3126# $ccb is the callback that is executed on CANCEL and
3127# when the binding was unsuccessful on OK
3128sub set_binding {
3129 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3130
3131 $self->clear_command_list;
3132 $self->{recording} = 0;
3133 $self->{rec_btn}->set_text ("start recording");
3134
3135 $self->{binding} = [$mod, $sym];
3136 $self->{commands} = $cmds;
3137
3138 $self->{binding_change} = $cb;
3139 $self->{binding_cancel} = $ccb;
3140
3141 $self->update_binding_widgets;
3142}
3143
3144# this is a shortcut method that asks for a binding
3145# and then just binds it.
3146sub do_quick_binding {
3147 my ($self, $cmds) = @_;
3148 $self->set_binding (undef, undef, $cmds, sub {
3149 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3150 });
3151 $self->ask_for_bind (1);
3152}
3153
3154sub update_binding_widgets {
3155 my ($self) = @_;
3156 my ($mod, $sym, $cmds) = $self->get_binding;
3157 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3158 $self->set_command_list ($cmds);
3159}
3160
3161sub get_binding {
3162 my ($self) = @_;
3163 return (
3164 $self->{binding}->[0],
3165 $self->{binding}->[1],
3166 [ grep { defined $_ } @{$self->{commands}} ]
3167 );
3168}
3169
3170sub clear_command_list {
3171 my ($self) = @_;
3172 $self->{cmdbox}->clear ();
3173}
3174
3175sub set_command_list {
3176 my ($self, $cmds) = @_;
3177
3178 $self->{cmdbox}->clear ();
3179 $self->{commands} = $cmds;
3180
3181 my $idx = 0;
3182
3183 for (@$cmds) {
3184 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3185
3186 my $i = $idx;
3187 $hb->add (new CFClient::UI::Label text => $_);
3188 $hb->add (new CFClient::UI::Button
3189 text => "delete",
3190 tooltip => "Deletes the action from the record",
3191 on_activate => sub {
3192 $self->{cmdbox}->remove ($hb);
3193 $cmds->[$i] = undef;
3194 });
3195
3196
3197 $idx++
3198 }
3199}
3200
3201#############################################################################
3202
3203package CFClient::UI::SpellList;
3204
3205our @ISA = CFClient::UI::FancyFrame::;
3206
3207sub new {
3208 my $class = shift;
3209
3210 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3211
3212 $self->add (new CFClient::UI::ScrolledWindow
3213 scrolled => $self->{spellbox} = new CFClient::UI::Table);
3214
3215 $self;
3216}
3217
3218# XXX: Do sorting? Argl...
3219sub add_spell {
3220 my ($self, $spell) = @_;
3221 $self->{spells}->{$spell->{name}} = $spell;
3222
3223 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3224 face => $spell->{face},
3225 can_hover => 1,
3226 can_events => 1,
3227 tooltip => $spell->{message});
3228
3229 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3230 text => $spell->{name},
3231 can_hover => 1,
3232 can_events => 1,
3233 tooltip => $spell->{message},
3234 expand => 1);
3235
3236 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3237 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3238 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3239 expand => 1);
3240
3241 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3242 text => "bind to key",
3243 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3244}
3245
3246sub rebuild_spell_list {
3247 my ($self) = @_;
3248 $self->{tbl_idx} = 0;
3249 $self->add_spell ($_) for values %{$self->{spells}};
3250}
3251
3252sub remove_spell {
3253 my ($self, $spell) = @_;
3254 delete $self->{spells}->{$spell->{name}};
3255 $self->rebuild_spell_list;
3256}
3257
3258#############################################################################
3259
2992package CFClient::UI::Root; 3260package CFClient::UI::Root;
2993 3261
2994our @ISA = CFClient::UI::Container::; 3262our @ISA = CFClient::UI::Container::;
2995 3263
2996use CFClient::OpenGL; 3264use CFClient::OpenGL;
… …
3006 Scalar::Util::weaken ($self->{root} = $self); 3274 Scalar::Util::weaken ($self->{root} = $self);
3007 3275
3008 $self 3276 $self
3009} 3277}
3010 3278
3011sub configure {
3012 my ($self, $x, $y, $w, $h) = @_;
3013
3014 $self->{w} = $w;
3015 $self->{h} = $h;
3016}
3017
3018sub reconfigure {
3019 my ($self) = @_;
3020
3021 $self->SUPER::reconfigure;
3022
3023 $self->size_allocate ($self->{w}, $self->{h}, 1)
3024 if $self->{w};
3025}
3026
3027sub size_request { 3279sub size_request {
3028 my ($self) = @_; 3280 my ($self) = @_;
3029 3281
3030 ($self->{w}, $self->{h}) 3282 ($self->{w}, $self->{h})
3031} 3283}
3032 3284
3285sub _to_pixel {
3286 my ($coord, $size, $max) = @_;
3287
3288 $coord =
3289 $coord eq "center" ? ($max - $size) * 0.5
3290 : $coord eq "max" ? $max
3291 : $coord;
3292
3293 $coord = 0 if $coord < 0;
3294 $coord = $max - $size if $coord > $max - $size;
3295
3296 int $coord + 0.5
3297}
3298
3033sub size_allocate { 3299sub size_allocate {
3034 my ($self, $w, $h, $changed) = @_; 3300 my ($self, $w, $h) = @_;
3035 3301
3036 for my $child ($self->children) { 3302 for my $child ($self->children) {
3037 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3303 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3038 3304
3039 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3305 $X = $child->{force_x} if exists $child->{force_x};
3040 if exists $child->{req_x}; 3306 $Y = $child->{force_y} if exists $child->{force_y};
3041 3307
3042 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3308 $X = _to_pixel $X, $W, $self->{w};
3043 if exists $child->{req_y}; 3309 $Y = _to_pixel $Y, $H, $self->{h};
3044
3045 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3046
3047 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3048 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3049 3310
3050 $child->configure ($X, $Y, $W, $H); 3311 $child->configure ($X, $Y, $W, $H);
3051 } 3312 }
3052} 3313}
3053 3314
… …
3070} 3331}
3071 3332
3072sub add { 3333sub add {
3073 my ($self, @children) = @_; 3334 my ($self, @children) = @_;
3074 3335
3075 for my $child (@children) {
3076 $child->{is_toplevel} = 1; 3336 $_->{is_toplevel} = 1
3077 3337 for @children;
3078 # integerise window positions
3079 $child->{x} = int $child->{x};
3080 $child->{y} = int $child->{y};
3081 }
3082 3338
3083 $self->SUPER::add (@children); 3339 $self->SUPER::add (@children);
3084} 3340}
3085 3341
3086sub remove { 3342sub remove {
3087 my ($self, @children) = @_; 3343 my ($self, @children) = @_;
3088 3344
3089 $self->SUPER::remove (@children); 3345 $self->SUPER::remove (@children);
3346
3347 delete $self->{is_toplevel}
3348 for @children;
3090 3349
3091 while (@children) { 3350 while (@children) {
3092 my $w = pop @children; 3351 my $w = pop @children;
3093 push @children, $w->children; 3352 push @children, $w->children;
3094 $w->set_invisible; 3353 $w->set_invisible;
… …
3114 $_->() 3373 $_->()
3115 for values %{delete $self->{refresh_hook}}; 3374 for values %{delete $self->{refresh_hook}};
3116 } 3375 }
3117 3376
3118 if ($self->{realloc}) { 3377 if ($self->{realloc}) {
3378 my %queue;
3119 my @queue; 3379 my @queue;
3380 my $widget;
3120 3381
3382 outer:
3121 while () { 3383 while () {
3122 if ($self->{realloc}) { 3384 if (my $realloc = delete $self->{realloc}) {
3123 #TODO use array-of-depth approach 3385 for $widget (values %$realloc) {
3386 $widget->{visible} or next; # do not resize invisible widgets
3124 3387
3125 @queue = sort { $a->{visible} <=> $b->{visible} } 3388 $queue{$widget+0}++ and next; # duplicates are common
3126 @queue, values %{delete $self->{realloc}}; 3389
3390 push @{ $queue[$widget->{visible}] }, $widget;
3391 }
3127 } 3392 }
3128 3393
3394 while () {
3395 @queue or last outer;
3396
3397 $widget = pop @{ $queue[-1] || [] }
3398 and last;
3399
3400 pop @queue;
3401 }
3402
3403 delete $queue{$widget+0};
3404
3405 my ($w, $h) = $widget->size_request;
3406
3407 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3408 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3409
3410 $w = $widget->{force_w} if exists $widget->{force_w};
3411 $h = $widget->{force_h} if exists $widget->{force_h};
3412
3413 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3414 || delete $widget->{force_realloc}) {
3415 $widget->{req_w} = $w;
3416 $widget->{req_h} = $h;
3417
3418 $self->{size_alloc}{$widget+0} = $widget;
3419
3420 if (my $parent = $widget->{parent}) {
3421 $self->{realloc}{$parent+0} = $parent
3422 unless $queue{$parent+0};
3423
3424 $parent->{force_size_alloc} = 1;
3425 $self->{size_alloc}{$parent+0} = $parent;
3426 }
3427 }
3428
3429 delete $self->{realloc}{$widget+0};
3430 }
3431 }
3432
3433 while (my $size_alloc = delete $self->{size_alloc}) {
3434 my @queue = sort { $b->{visible} <=> $a->{visible} }
3435 values %$size_alloc;
3436
3437 while () {
3129 my $widget = pop @queue || last; 3438 my $widget = pop @queue || last;
3130 3439
3131 $widget->{visible} or last; # do not resize invisible widgets 3440 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3132
3133 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3134 ? @$widget{qw(def_w def_h)}
3135 : $widget->size_request;
3136
3137 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3138
3139 $widget->{req_w} = $w;
3140 $widget->{req_h} = $h;
3141
3142 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3143
3144 push @queue, $widget->{parent}
3145 if $widget->{parent};
3146 }
3147 }
3148
3149 while (my $size_alloc = delete $self->{size_alloc}) {
3150 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3151 values %$size_alloc;
3152
3153 while () {
3154 my ($widget, $w, $h) = @{ pop @queue or last };
3155 3441
3156 $w = 0 if $w < 0; 3442 $w = 0 if $w < 0;
3157 $h = 0 if $h < 0; 3443 $h = 0 if $h < 0;
3158 3444
3159 my $changed = $widget->{w} != $w || $widget->{h} != $h; 3445 $w = int $w + 0.5;
3446 $h = int $h + 0.5;
3160 3447
3448 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3449 $widget->{old_w} = $widget->{w};
3450 $widget->{old_h} = $widget->{h};
3451
3161 $widget->{w} = $w; 3452 $widget->{w} = $w;
3162 $widget->{h} = $h; 3453 $widget->{h} = $h;
3163 3454
3164 $widget->emit (size_allocate => $w, $h, $changed); 3455 $widget->emit (size_allocate => $w, $h);
3456 }
3165 } 3457 }
3166 } 3458 }
3167 3459
3168 while ($self->{post_alloc_hook}) { 3460 while ($self->{post_alloc_hook}) {
3169 $_->() 3461 $_->()
3170 for values %{delete $self->{post_alloc_hook}}; 3462 for values %{delete $self->{post_alloc_hook}};
3171 } 3463 }
3464
3172 3465
3173 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3466 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3174 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3467 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3175 glClear GL_COLOR_BUFFER_BIT; 3468 glClear GL_COLOR_BUFFER_BIT;
3176 3469

Diff Legend

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