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.303 by elmex, Tue Jun 13 10:28:38 2006 UTC vs.
Revision 1.321 by root, Tue Jul 4 23:44:23 2006 UTC

… …
281 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
282 282
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
285 285
286 $self->focus_out; 286 $self->emit ("focus_out");
287
288 $self->emit (visibility_change => 0); 287 $self->emit (visibility_change => 0);
289} 288}
290 289
291sub set_visibility { 290sub set_visibility {
292 my ($self, $visible) = @_; 291 my ($self, $visible) = @_;
… …
334} 333}
335 334
336sub size_request { 335sub size_request {
337 require Carp; 336 require Carp;
338 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
338}
339
340sub baseline_shift {
341 0
339} 342}
340 343
341sub configure { 344sub configure {
342 my ($self, $x, $y, $w, $h) = @_; 345 my ($self, $x, $y, $w, $h) = @_;
343 346
… …
367 370
368 $self->{root}{size_alloc}{$self+0} = $self; 371 $self->{root}{size_alloc}{$self+0} = $self;
369 } 372 }
370} 373}
371 374
372sub size_allocate {
373 # nothing to be done
374}
375
376sub children { 375sub children {
377 # nop 376 # nop
378} 377}
379 378
380sub visible_children { 379sub visible_children {
… …
418 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
419 418
420 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
421} 420}
422 421
423sub focus_in { 422sub invoke_focus_in {
424 my ($self) = @_; 423 my ($self) = @_;
425 424
426 return if $FOCUS == $self; 425 return if $FOCUS == $self;
427 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
428 427
429 my $focus = $FOCUS; $FOCUS = $self; 428 $FOCUS = $self;
430 429
431 $self->_emit (focus_in => $focus); 430 $self->update;
432 431
433 $focus->update if $focus; 432 0
434 $FOCUS->update;
435} 433}
436 434
437sub focus_out { 435sub invoke_focus_out {
438 my ($self) = @_; 436 my ($self) = @_;
439 437
440 return unless $FOCUS == $self; 438 return unless $FOCUS == $self;
441 439
442 my $focus = $FOCUS; undef $FOCUS; 440 undef $FOCUS;
443 441
444 $self->_emit (focus_out => $focus); 442 $self->update;
445 443
446 $focus->update if $focus; #?
447
448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 444 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
449 unless $FOCUS; 445 unless $FOCUS;
450}
451 446
447 0
448}
449
450sub grab_focus {
451 my ($self) = @_;
452
453 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in");
455}
456
452sub mouse_motion { 0 } 457sub invoke_mouse_motion { 1 }
453sub button_up { 0 } 458sub invoke_button_up { 1 }
454sub key_down { 0 } 459sub invoke_key_down { 1 }
455sub key_up { 0 } 460sub invoke_key_up { 1 }
456 461
457sub button_down { 462sub invoke_button_down {
458 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
459 464
460 $self->focus_in; 465 $self->grab_focus;
461 466
462 0 467 1
468}
469
470sub connect {
471 my ($self, $signal, $cb) = @_;
472
473 push @{ $self->{signal_cb}{$signal} }, $cb;
474}
475
476sub emit {
477 my ($self, $signal, @args) = @_;
478
479 #d##TODO# stop propagating at first true, do not use sum
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
463} 483}
464 484
465sub find_widget { 485sub find_widget {
466 my ($self, $x, $y) = @_; 486 my ($self, $x, $y) = @_;
467 487
… …
477sub set_parent { 497sub set_parent {
478 my ($self, $parent) = @_; 498 my ($self, $parent) = @_;
479 499
480 Scalar::Util::weaken ($self->{parent} = $parent); 500 Scalar::Util::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible}; 501 $self->set_visible if $parent->{visible};
482}
483
484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501}
502
503sub visibility_change {
504 #my ($self, $visible) = @_;
505} 502}
506 503
507sub realloc { 504sub realloc {
508 my ($self) = @_; 505 my ($self) = @_;
509 506
… …
542 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
543 540
544 # update screen rectangle 541 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x}; 542 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y}; 543 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549 544
550 # skip widgets that are entirely outside the drawing area 545 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 546 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 547 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
553 548
… …
789 784
790sub size_request { 785sub size_request {
791 $_[0]{children}[0]->size_request 786 $_[0]{children}[0]->size_request
792} 787}
793 788
794sub size_allocate { 789sub invoke_size_allocate {
795 my ($self, $w, $h) = @_; 790 my ($self, $w, $h) = @_;
796 791
797 $self->{children}[0]->configure (0, 0, $w, $h); 792 $self->{children}[0]->configure (0, 0, $w, $h);
793
794 1
798} 795}
799 796
800############################################################################# 797#############################################################################
801 798
802# back-buffered drawing area 799# back-buffered drawing area
… …
818 815
819 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 816 $ROOT->on_post_alloc ($self => sub { $self->render_child });
820 $self->SUPER::update; 817 $self->SUPER::update;
821} 818}
822 819
823sub size_allocate { 820sub invoke_size_allocate {
824 my ($self, $w, $h) = @_; 821 my ($self, $w, $h) = @_;
825 822
826 $self->SUPER::size_allocate ($w, $h);
827 $self->update; 823 $self->update;
824
825 $self->SUPER::invoke_size_allocate ($w, $h)
828} 826}
829 827
830sub _render { 828sub _render {
831 my ($self) = @_; 829 my ($self) = @_;
832 830
… …
893 $h = 10 if $self->{scroll_y}; 891 $h = 10 if $self->{scroll_y};
894 892
895 ($w, $h) 893 ($w, $h)
896} 894}
897 895
898sub size_allocate { 896sub invoke_size_allocate {
899 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
900 898
901 my $child = $self->child; 899 my $child = $self->child;
902 900
903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
905 903
906 $self->child->configure (0, 0, $w, $h); 904 $self->child->configure (0, 0, $w, $h);
907 $self->update; 905 $self->update;
906
907 1
908} 908}
909 909
910sub set_offset { 910sub set_offset {
911 my ($self, $x, $y) = @_; 911 my ($self, $x, $y) = @_;
912 912
… …
986 $self->add ($child) if $child; 986 $self->add ($child) if $child;
987 987
988 $self 988 $self
989} 989}
990 990
991#TODO# update range on size_allocate depending on child
992
991sub add { 993sub add {
992 my ($self, $widget) = @_; 994 my ($self, $widget) = @_;
993 995
994 $self->{vp}->add ($self->{child} = $widget); 996 $self->{vp}->add ($self->{child} = $widget);
995} 997}
996 998
999sub update_slider {
1000 my ($self) = @_;
1001
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1003}
1004
997sub update { 1005sub update {
998 my ($self) = @_; 1006 my ($self) = @_;
999 1007
1000 $self->SUPER::update; 1008 $self->SUPER::update;
1001 1009
1002 # todo: overwrite size_allocate of child 1010 $self->update_slider;
1003 my $child = $self->{vp}->child;
1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1005} 1011}
1006 1012
1007sub size_allocate { 1013sub invoke_size_allocate {
1008 my ($self, $w, $h) = @_; 1014 my ($self, $w, $h) = @_;
1009 1015
1016 $self->update_slider;
1017
1010 $self->SUPER::size_allocate ($w, $h); 1018 $self->SUPER::invoke_size_allocate ($w, $h)
1011
1012 my $child = $self->{vp}->child;
1013 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1014} 1019}
1015
1016#TODO# update range on size_allocate depending on child
1017# update viewport offset on scroll
1018 1020
1019############################################################################# 1021#############################################################################
1020 1022
1021package CFClient::UI::Frame; 1023package CFClient::UI::Frame;
1022 1024
… …
1090 valign => 1, 1092 valign => 1,
1091 text => $self->{title}, 1093 text => $self->{title},
1092 fontsize => $self->{border}, 1094 fontsize => $self->{border},
1093 if exists $self->{title}; 1095 if exists $self->{title};
1094 1096
1095 unless ($self->{no_close_button}) { 1097 if ($self->{has_close_button}) {
1096 $self->{close_btn} = 1098 $self->{close_button} =
1097 new CFClient::UI::ImageButton 1099 new CFClient::UI::ImageButton
1098 image => 'x1_close.png', 1100 path => 'x1_close.png',
1099 on_activate => sub { $self->hide }; 1101 on_activate => sub { $self->emit ("delete") };
1100 1102
1101 $self->CFClient::UI::Container::add ($self->{close_btn}); 1103 $self->CFClient::UI::Container::add ($self->{close_button});
1102 } 1104 }
1103 1105
1104 $self 1106 $self
1105} 1107}
1106 1108
1107sub add { 1109sub add {
1108 my ($self, @widgets) = @_; 1110 my ($self, @widgets) = @_;
1109 1111
1110 $self->SUPER::add (@widgets); 1112 $self->SUPER::add (@widgets);
1111 $self->CFClient::UI::Container::add ($self->{close_btn}) if $self->{close_btn}; 1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1112 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1114 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1113} 1115}
1114 1116
1115sub border { 1117sub border {
1116 int $_[0]{border} * $::FONTSIZE 1118 int $_[0]{border} * $::FONTSIZE
… …
1120 my ($self) = @_; 1122 my ($self) = @_;
1121 1123
1122 $self->{title_widget}->size_request 1124 $self->{title_widget}->size_request
1123 if $self->{title_widget}; 1125 if $self->{title_widget};
1124 1126
1125 $self->{close_btn}->size_request 1127 $self->{close_button}->size_request
1126 if $self->{close_btn}; 1128 if $self->{close_button};
1127 1129
1128 my ($w, $h) = $self->SUPER::size_request; 1130 my ($w, $h) = $self->SUPER::size_request;
1129 1131
1130 ( 1132 (
1131 $w + $self->border * 2, 1133 $w + $self->border * 2,
1132 $h + $self->border * 2, 1134 $h + $self->border * 2,
1133 ) 1135 )
1134} 1136}
1135 1137
1136sub size_allocate { 1138sub invoke_size_allocate {
1137 my ($self, $w, $h) = @_; 1139 my ($self, $w, $h) = @_;
1138 1140
1139 if ($self->{title_widget}) { 1141 if ($self->{title_widget}) {
1140 $self->{title_widget}{w} = $w; 1142 $self->{title_widget}{w} = $w;
1141 $self->{title_widget}{h} = $h; 1143 $self->{title_widget}{h} = $h;
1142 $self->{title_widget}->size_allocate ($w, $h); 1144 $self->{title_widget}->invoke_size_allocate ($w, $h);
1143 } 1145 }
1144 1146
1145 my $border = $self->border; 1147 my $border = $self->border;
1146 1148
1147 $h -= List::Util::max 0, $border * 2; 1149 $h -= List::Util::max 0, $border * 2;
1148 $w -= List::Util::max 0, $border * 2; 1150 $w -= List::Util::max 0, $border * 2;
1149 1151
1150 $self->child->configure ($border, $border, $w, $h); 1152 $self->child->configure ($border, $border, $w, $h);
1151 1153
1152 $self->{close_btn}->configure ($self->{w} - (2 * $border), 0, $border, $border) 1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153 if $self->{close_btn}; 1155 if $self->{close_button};
1154}
1155 1156
1157 1
1158}
1159
1160sub invoke_delete {
1161 my ($self) = @_;
1162
1163 $self->hide;
1164
1165 1
1166}
1167
1156sub button_down { 1168sub invoke_button_down {
1157 my ($self, $ev, $x, $y) = @_; 1169 my ($self, $ev, $x, $y) = @_;
1158 1170
1159 my ($w, $h) = @$self{qw(w h)}; 1171 my ($w, $h) = @$self{qw(w h)};
1160 my $border = $self->border; 1172 my $border = $self->border;
1161 1173
… …
1192 1204
1193 ($x, $y) = ($ev->{x}, $ev->{y}); 1205 ($x, $y) = ($ev->{x}, $ev->{y});
1194 1206
1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1207 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1196 # HACK: the next line is required to enforce placement 1208 # HACK: the next line is required to enforce placement
1197 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1209 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1198 }; 1210 };
1199 } else { 1211 } else {
1200 return 0; 1212 return 0;
1201 } 1213 }
1202 1214
1203 1 1215 1
1204} 1216}
1205 1217
1206sub button_up { 1218sub invoke_button_up {
1207 my ($self, $ev, $x, $y) = @_; 1219 my ($self, $ev, $x, $y) = @_;
1208 1220
1209 $self->{close_btn}->button_up ($ev, $x, $y)
1210 if $self->{close_btn};
1211
1212 !!delete $self->{motion} 1221 ! ! delete $self->{motion}
1213} 1222}
1214 1223
1215sub mouse_motion { 1224sub invoke_mouse_motion {
1216 my ($self, $ev, $x, $y) = @_; 1225 my ($self, $ev, $x, $y) = @_;
1217 1226
1218 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1227 $self->{motion}->($ev, $x, $y) if $self->{motion};
1219 1228
1220 !!$self->{motion} 1229 ! ! $self->{motion}
1221} 1230}
1222 1231
1223sub _draw { 1232sub _draw {
1224 my ($self) = @_; 1233 my ($self) = @_;
1225 1234
… …
1258 $self->{title_widget}->_draw; 1267 $self->{title_widget}->_draw;
1259 1268
1260 glTranslate 0, - ($border - $self->{h}); 1269 glTranslate 0, - ($border - $self->{h});
1261 } 1270 }
1262 1271
1263 $self->{close_btn}->draw 1272 $self->{close_button}->draw
1264 if $self->{close_btn}; 1273 if $self->{close_button};
1265} 1274}
1266 1275
1267############################################################################# 1276#############################################################################
1268 1277
1269package CFClient::UI::Table; 1278package CFClient::UI::Table;
… …
1348 (sum @$ws), 1357 (sum @$ws),
1349 (sum @$hs), 1358 (sum @$hs),
1350 ) 1359 )
1351} 1360}
1352 1361
1353sub size_allocate { 1362sub invoke_size_allocate {
1354 my ($self, $w, $h) = @_; 1363 my ($self, $w, $h) = @_;
1355 1364
1356 my ($ws, $hs) = $self->get_wh; 1365 my ($ws, $hs) = $self->get_wh;
1357 1366
1358 my $req_w = (sum @$ws) || 1; 1367 my $req_w = (sum @$ws) || 1;
… …
1390 } 1399 }
1391 1400
1392 $y += $row_h; 1401 $y += $row_h;
1393 } 1402 }
1394 1403
1404 1
1395} 1405}
1396 1406
1397sub find_widget { 1407sub find_widget {
1398 my ($self, $x, $y) = @_; 1408 my ($self, $x, $y) = @_;
1399 1409
… …
1436 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1446 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1437 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1447 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1438 ) 1448 )
1439} 1449}
1440 1450
1441sub size_allocate { 1451sub invoke_size_allocate {
1442 my ($self, $w, $h) = @_; 1452 my ($self, $w, $h) = @_;
1443 1453
1444 my $space = $self->{vertical} ? $h : $w; 1454 my $space = $self->{vertical} ? $h : $w;
1445 my $children = $self->{children}; 1455 my @children = $self->visible_children;
1446 1456
1447 my @req; 1457 my @req;
1448 1458
1449 if ($self->{homogeneous}) { 1459 if ($self->{homogeneous}) {
1450 @req = ($space / (@$children || 1)) x @$children; 1460 @req = ($space / (@children || 1)) x @children;
1451 } else { 1461 } else {
1452 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1462 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1453 my $req = List::Util::sum @req; 1463 my $req = List::Util::sum @req;
1454 1464
1455 if ($req > $space) { 1465 if ($req > $space) {
1456 # ah well, not enough space 1466 # ah well, not enough space
1457 $_ *= $space / $req for @req; 1467 $_ *= $space / $req for @req;
1458 } else { 1468 } else {
1459 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1469 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1460 1470
1461 $space = ($space - $req) / $expand; # remaining space to give away 1471 $space = ($space - $req) / $expand; # remaining space to give away
1462 1472
1463 $req[$_] += $space * $children->[$_]{expand} 1473 $req[$_] += $space * $children[$_]{expand}
1464 for 0 .. $#$children; 1474 for 0 .. $#children;
1465 } 1475 }
1466 } 1476 }
1467 1477
1468 CFClient::UI::harmonize \@req; 1478 CFClient::UI::harmonize \@req;
1469 1479
1470 my $pos = 0; 1480 my $pos = 0;
1471 for (0 .. $#$children) { 1481 for (0 .. $#children) {
1472 my $alloc = $req[$_]; 1482 my $alloc = $req[$_];
1473 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1483 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1474 1484
1475 $pos += $alloc; 1485 $pos += $alloc;
1476 } 1486 }
1477 1487
1478 1 1488 1
… …
1526 #font => default_font 1536 #font => default_font
1527 #text => initial text 1537 #text => initial text
1528 #markup => initial narkup 1538 #markup => initial narkup
1529 #max_w => maximum pixel width 1539 #max_w => maximum pixel width
1530 ellipsise => 3, # end 1540 ellipsise => 3, # end
1531 layout => (new CFClient::Layout), 1541 layout => (new CFClient::Layout 2),
1532 fontsize => 1, 1542 fontsize => 1,
1533 align => -1, 1543 align => -1,
1534 valign => -1, 1544 valign => -1,
1535 padding_x => 2, 1545 padding_x => 2,
1536 padding_y => 2, 1546 padding_y => 2,
1537 can_events => 0, 1547 can_events => 0,
1538 %arg 1548 %arg
1539 ); 1549 );
1540 1550
1541 if (exists $self->{template}) { 1551 if (exists $self->{template}) {
1542 my $layout = new CFClient::Layout; 1552 my $layout = new CFClient::Layout 2;
1543 $layout->set_text (delete $self->{template}); 1553 $layout->set_text (delete $self->{template});
1544 $self->{template} = $layout; 1554 $self->{template} = $layout;
1545 } 1555 }
1546 1556
1547 if (exists $self->{markup}) { 1557 if (exists $self->{markup}) {
… …
1581 my ($self, $text) = @_; 1591 my ($self, $text) = @_;
1582 1592
1583 return if $self->{text} eq "T$text"; 1593 return if $self->{text} eq "T$text";
1584 $self->{text} = "T$text"; 1594 $self->{text} = "T$text";
1585 1595
1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1587 $self->{layout}->set_text ($text); 1596 $self->{layout}->set_text ($text);
1588 1597
1589 delete $self->{size_req}; 1598 delete $self->{size_req};
1590 $self->realloc; 1599 $self->realloc;
1591 $self->update; 1600 $self->update;
… …
1597 return if $self->{text} eq "M$markup"; 1606 return if $self->{text} eq "M$markup";
1598 $self->{text} = "M$markup"; 1607 $self->{text} = "M$markup";
1599 1608
1600 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1609 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1601 1610
1602 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1603 $self->{layout}->set_markup ($markup); 1611 $self->{layout}->set_markup ($markup);
1604 1612
1605 delete $self->{size_req}; 1613 delete $self->{size_req};
1606 $self->realloc; 1614 $self->realloc;
1607 $self->update; 1615 $self->update;
… …
1633 }; 1641 };
1634 1642
1635 @{ $self->{size_req} } 1643 @{ $self->{size_req} }
1636} 1644}
1637 1645
1646sub baseline_shift {
1647 $_[0]{layout}->descent
1648}
1649
1638sub size_allocate { 1650sub invoke_size_allocate {
1639 my ($self, $w, $h) = @_; 1651 my ($self, $w, $h) = @_;
1640 1652
1641 delete $self->{ox}; 1653 delete $self->{ox};
1642 1654
1643 delete $self->{texture} 1655 delete $self->{texture}
1644 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1656 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1657
1658 1
1645} 1659}
1646 1660
1647sub set_fontsize { 1661sub set_fontsize {
1648 my ($self, $fontsize) = @_; 1662 my ($self, $fontsize) = @_;
1649 1663
1650 $self->{fontsize} = $fontsize; 1664 $self->{fontsize} = $fontsize;
1665 delete $self->{size_req};
1651 delete $self->{texture}; 1666 delete $self->{texture};
1652 1667
1653 $self->realloc; 1668 $self->realloc;
1654} 1669}
1655 1670
1656sub reconfigure { 1671sub reconfigure {
1657 my ($self) = @_; 1672 my ($self) = @_;
1658 1673
1659 delete $self->{size_req}; 1674 delete $self->{size_req};
1675 delete $self->{texture};
1660 1676
1661 $self->SUPER::reconfigure; 1677 $self->SUPER::reconfigure;
1662} 1678}
1663 1679
1664sub _draw { 1680sub _draw {
1665 my ($self) = @_; 1681 my ($self) = @_;
1666 1682
1667 $self->SUPER::_draw; # draw background, if applicable 1683 $self->SUPER::_draw; # draw background, if applicable
1668 1684
1669 my $tex = $self->{texture} ||= do { 1685 my $size = $self->{texture} ||= do {
1670 $self->{layout}->set_foreground (@{$self->{fg}}); 1686 $self->{layout}->set_foreground (@{$self->{fg}});
1671 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1687 $self->{layout}->set_font ($self->{font}) if $self->{font};
1672 $self->{layout}->set_width ($self->{w}); 1688 $self->{layout}->set_width ($self->{w});
1673 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1689 $self->{layout}->set_ellipsise ($self->{ellipsise});
1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1690 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1691 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1676 1692
1677 new_from_layout CFClient::Texture $self->{layout} 1693 $self->{size_req}
1678 }; 1694 };
1679 1695
1680 unless (exists $self->{ox}) { 1696 unless (exists $self->{ox}) {
1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1697 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1698 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1683 : ($self->{w} - $tex->{w}) * 0.5); 1699 : ($self->{w} - $size->[0]) * 0.5);
1684 1700
1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1701 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1702 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1687 : ($self->{h} - $tex->{h}) * 0.5); 1703 : ($self->{h} - $size->[1]) * 0.5);
1688 }; 1704 };
1689 1705
1690 glEnable GL_TEXTURE_2D;
1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1706 my $w = List::Util::min $self->{w} + 4, $size->[0];
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1707 my $h = List::Util::min $self->{h} + 2, $size->[1];
1694 1708
1695 if ($tex->{format} == GL_ALPHA) { 1709 $self->{layout}->render ($self->{ox}, $self->{oy});
1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1697 glColor @{$self->{fg}};
1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1699 } else {
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1702 }
1703
1704 glDisable GL_TEXTURE_2D;
1705} 1710}
1706 1711
1707############################################################################# 1712#############################################################################
1708 1713
1709package CFClient::UI::EntryBase; 1714package CFClient::UI::EntryBase;
… …
1742 1747
1743 $text =~ s/./*/g if $self->{hidden}; 1748 $text =~ s/./*/g if $self->{hidden};
1744 $self->{layout}->set_text ("$text "); 1749 $self->{layout}->set_text ("$text ");
1745 delete $self->{size_req}; 1750 delete $self->{size_req};
1746 1751
1747 $self->_emit (changed => $self->{text}); 1752 $self->emit (changed => $self->{text});
1748 1753
1749 $self->realloc; 1754 $self->realloc;
1750 $self->update; 1755 $self->update;
1751} 1756}
1752 1757
… …
1767 my ($w, $h) = $self->SUPER::size_request; 1772 my ($w, $h) = $self->SUPER::size_request;
1768 1773
1769 ($w + 1, $h) # add 1 for cursor 1774 ($w + 1, $h) # add 1 for cursor
1770} 1775}
1771 1776
1772sub key_down { 1777sub invoke_key_down {
1773 my ($self, $ev) = @_; 1778 my ($self, $ev) = @_;
1774 1779
1775 my $mod = $ev->{mod}; 1780 my $mod = $ev->{mod};
1776 my $sym = $ev->{sym}; 1781 my $sym = $ev->{sym};
1777 my $uni = $ev->{unicode}; 1782 my $uni = $ev->{unicode};
… …
1789 } elsif ($sym == CFClient::SDLK_HOME) { 1794 } elsif ($sym == CFClient::SDLK_HOME) {
1790 $self->{cursor} = 0; 1795 $self->{cursor} = 0;
1791 } elsif ($sym == CFClient::SDLK_END) { 1796 } elsif ($sym == CFClient::SDLK_END) {
1792 $self->{cursor} = length $text; 1797 $self->{cursor} = length $text;
1793 } elsif ($uni == 27) { 1798 } elsif ($uni == 27) {
1794 $self->_emit ('escape'); 1799 $self->emit ('escape');
1795 } elsif ($uni) { 1800 } elsif ($uni) {
1796 substr $text, $self->{cursor}++, 0, chr $uni; 1801 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else { 1802 } else {
1798 return 0; 1803 return 0;
1799 } 1804 }
… …
1803 $self->realloc; 1808 $self->realloc;
1804 1809
1805 1 1810 1
1806} 1811}
1807 1812
1808sub focus_in { 1813sub invoke_focus_in {
1809 my ($self) = @_; 1814 my ($self) = @_;
1810 1815
1811 $self->{last_activity} = $::NOW; 1816 $self->{last_activity} = $::NOW;
1812 1817
1813 $self->SUPER::focus_in; 1818 $self->SUPER::invoke_focus_in
1814} 1819}
1815 1820
1816sub button_down { 1821sub invoke_button_down {
1817 my ($self, $ev, $x, $y) = @_; 1822 my ($self, $ev, $x, $y) = @_;
1818 1823
1819 $self->SUPER::button_down ($ev, $x, $y); 1824 $self->SUPER::invoke_button_down ($ev, $x, $y);
1820 1825
1821 my $idx = $self->{layout}->xy_to_index ($x, $y); 1826 my $idx = $self->{layout}->xy_to_index ($x, $y);
1822 1827
1823 # byte-index to char-index 1828 # byte-index to char-index
1824 my $text = $self->{text}; 1829 my $text = $self->{text};
… …
1829 $self->update; 1834 $self->update;
1830 1835
1831 1 1836 1
1832} 1837}
1833 1838
1834sub mouse_motion { 1839sub invoke_mouse_motion {
1835 my ($self, $ev, $x, $y) = @_; 1840 my ($self, $ev, $x, $y) = @_;
1836# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1841# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1837 1842
1838 0 1843 1
1839} 1844}
1840 1845
1841sub _draw { 1846sub _draw {
1842 my ($self) = @_; 1847 my ($self) = @_;
1843 1848
… …
1884 1889
1885our @ISA = CFClient::UI::EntryBase::; 1890our @ISA = CFClient::UI::EntryBase::;
1886 1891
1887use CFClient::OpenGL; 1892use CFClient::OpenGL;
1888 1893
1889sub key_down { 1894sub invoke_key_down {
1890 my ($self, $ev) = @_; 1895 my ($self, $ev) = @_;
1891 1896
1892 my $sym = $ev->{sym}; 1897 my $sym = $ev->{sym};
1893 1898
1894 if ($sym == 13) { 1899 if ($sym == 13) {
1895 unshift @{$self->{history}}, 1900 unshift @{$self->{history}},
1896 my $txt = $self->get_text; 1901 my $txt = $self->get_text;
1902
1897 $self->{history_pointer} = -1; 1903 $self->{history_pointer} = -1;
1898 $self->{history_saveback} = ''; 1904 $self->{history_saveback} = '';
1899 $self->_emit (activate => $txt); 1905 $self->emit (activate => $txt);
1900 $self->update; 1906 $self->update;
1901 1907
1902 } elsif ($sym == CFClient::SDLK_UP) { 1908 } elsif ($sym == CFClient::SDLK_UP) {
1903 if ($self->{history_pointer} < 0) { 1909 if ($self->{history_pointer} < 0) {
1904 $self->{history_saveback} = $self->get_text; 1910 $self->{history_saveback} = $self->get_text;
… …
1920 } else { 1926 } else {
1921 $self->set_text ($self->{history_saveback}); 1927 $self->set_text ($self->{history_saveback});
1922 } 1928 }
1923 1929
1924 } else { 1930 } else {
1925 return $self->SUPER::key_down ($ev) 1931 return $self->SUPER::invoke_key_down ($ev)
1926 } 1932 }
1927 1933
1928 1 1934 1
1929} 1935}
1930 1936
… …
1954 can_events => 1, 1960 can_events => 1,
1955 @_ 1961 @_
1956 ) 1962 )
1957} 1963}
1958 1964
1959sub activate { }
1960
1961sub button_up { 1965sub invoke_button_up {
1962 my ($self, $ev, $x, $y) = @_; 1966 my ($self, $ev, $x, $y) = @_;
1963 1967
1964 $self->emit ("activate") 1968 $self->emit ("activate")
1965 if $x >= 0 && $x < $self->{w} 1969 if $x >= 0 && $x < $self->{w}
1966 && $y >= 0 && $y < $self->{h}; 1970 && $y >= 0 && $y < $self->{h};
… …
2008 can_events => 1, 2012 can_events => 1,
2009 @_ 2013 @_
2010 ); 2014 );
2011} 2015}
2012 2016
2013sub activate { }
2014
2015sub button_up { 2017sub invoke_button_up {
2016 my ($self, $ev, $x, $y) = @_; 2018 my ($self, $ev, $x, $y) = @_;
2017 2019
2018 $self->emit ("activate") 2020 $self->emit ("activate")
2019 if $x >= 0 && $x < $self->{w} 2021 if $x >= 0 && $x < $self->{w}
2020 && $y >= 0 && $y < $self->{h}; 2022 && $y >= 0 && $y < $self->{h};
… …
2054 my ($self) = @_; 2056 my ($self) = @_;
2055 2057
2056 (6) x 2 2058 (6) x 2
2057} 2059}
2058 2060
2061sub toggle {
2062 my ($self) = @_;
2063
2064 $self->{state} = !$self->{state};
2065 $self->emit (changed => $self->{state});
2066 $self->update;
2067}
2068
2059sub button_down { 2069sub invoke_button_down {
2060 my ($self, $ev, $x, $y) = @_; 2070 my ($self, $ev, $x, $y) = @_;
2061 2071
2062 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2072 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2063 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2073 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2064 $self->{state} = !$self->{state}; 2074 $self->toggle;
2065 $self->_emit (changed => $self->{state});
2066 } else { 2075 } else {
2067 return 0 2076 return 0
2068 } 2077 }
2069 2078
2070 1 2079 1
… …
2095package CFClient::UI::Image; 2104package CFClient::UI::Image;
2096 2105
2097our @ISA = CFClient::UI::Base::; 2106our @ISA = CFClient::UI::Base::;
2098 2107
2099use CFClient::OpenGL; 2108use CFClient::OpenGL;
2100use Carp qw/confess/;
2101 2109
2102our %loaded_images; 2110our %texture_cache;
2103 2111
2104sub new { 2112sub new {
2105 my $class = shift; 2113 my $class = shift;
2106 2114
2107 my $self = $class->SUPER::new (can_events => 0, @_); 2115 my $self = $class->SUPER::new (
2116 can_events => 0,
2117 @_,
2118 );
2108 2119
2109 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2120 $self->{path}
2121 or Carp::croak "required attribute 'path' not set";
2110 2122
2111 $loaded_images{$self->{image}} ||= 2123 $self->{tex} = $texture_cache{$self->{path}} ||=
2112 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2124 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2113 2125
2114 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2126 Scalar::Util::weaken $texture_cache{$self->{path}};
2115 2127
2116 Scalar::Util::weaken $loaded_images{$self->{image}}; 2128 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2117
2118 $self->{aspect} = $tex->{w} / $tex->{h};
2119 2129
2120 $self 2130 $self
2121} 2131}
2122 2132
2123sub size_request { 2133sub size_request {
2124 my ($self) = @_; 2134 my ($self) = @_;
2125 2135
2126 ($self->{tex}->{w}, $self->{tex}->{h}) 2136 ($self->{tex}{w}, $self->{tex}{h})
2127} 2137}
2128 2138
2129sub _draw { 2139sub _draw {
2130 my ($self) = @_; 2140 my ($self) = @_;
2131 2141
… …
2240 my $ycut1 = max 0, min 1, $ycut; 2250 my $ycut1 = max 0, min 1, $ycut;
2241 my $ycut2 = max 0, min 1, $ycut - 1; 2251 my $ycut2 = max 0, min 1, $ycut - 1;
2242 2252
2243 my $h1 = $self->{h} * (1 - $ycut1); 2253 my $h1 = $self->{h} * (1 - $ycut1);
2244 my $h2 = $self->{h} * (1 - $ycut2); 2254 my $h2 = $self->{h} * (1 - $ycut2);
2255 my $h3 = $self->{h};
2256
2257 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2245 2258
2246 glEnable GL_BLEND; 2259 glEnable GL_BLEND;
2247 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2260 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2248 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2261 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2249 glEnable GL_TEXTURE_2D; 2262 glEnable GL_TEXTURE_2D;
… …
2268 2281
2269 if ($t3) { 2282 if ($t3) {
2270 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2283 glBindTexture GL_TEXTURE_2D, $t3->{name};
2271 glBegin GL_QUADS; 2284 glBegin GL_QUADS;
2272 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2285 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2273 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2286 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2274 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2287 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2275 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2288 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2276 glEnd; 2289 glEnd;
2277 } 2290 }
2278 2291
2279 glDisable GL_BLEND; 2292 glDisable GL_BLEND;
… …
2367 $self->update; 2380 $self->update;
2368 2381
2369 $self 2382 $self
2370} 2383}
2371 2384
2372sub changed { }
2373
2374sub set_range { 2385sub set_range {
2375 my ($self, $range) = @_; 2386 my ($self, $range) = @_;
2376 2387
2377 ($range, $self->{range}) = ($self->{range}, $range); 2388 ($range, $self->{range}) = ($self->{range}, $range);
2378 2389
… …
2398 if $unit; 2409 if $unit;
2399 2410
2400 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2411 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2401 2412
2402 if ($value != $old_value) { 2413 if ($value != $old_value) {
2403 $self->_emit (changed => $value); 2414 $self->emit (changed => $value);
2404 $self->update; 2415 $self->update;
2405 } 2416 }
2406} 2417}
2407 2418
2408sub size_request { 2419sub size_request {
2409 my ($self) = @_; 2420 my ($self) = @_;
2410 2421
2411 ($self->{req_w}, $self->{req_h}) 2422 ($self->{req_w}, $self->{req_h})
2412} 2423}
2413 2424
2414sub button_down { 2425sub invoke_button_down {
2415 my ($self, $ev, $x, $y) = @_; 2426 my ($self, $ev, $x, $y) = @_;
2416 2427
2417 $self->SUPER::button_down ($ev, $x, $y); 2428 $self->SUPER::invoke_button_down ($ev, $x, $y);
2418 2429
2419 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2430 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2420 2431
2421 $self->mouse_motion ($ev, $x, $y) 2432 $self->invoke_mouse_motion ($ev, $x, $y)
2422} 2433}
2423 2434
2424sub mouse_motion { 2435sub invoke_mouse_motion {
2425 my ($self, $ev, $x, $y) = @_; 2436 my ($self, $ev, $x, $y) = @_;
2426 2437
2427 if ($GRAB == $self) { 2438 if ($GRAB == $self) {
2428 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2439 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2429 2440
… …
2550 can_events => 0, 2561 can_events => 0,
2551 indent => 0, 2562 indent => 0,
2552 #font => default_font 2563 #font => default_font
2553 @_, 2564 @_,
2554 2565
2555 layout => (new CFClient::Layout 1), 2566 layout => (new CFClient::Layout 2),
2556 par => [], 2567 par => [],
2557 height => 0, 2568 height => 0,
2558 children => [ 2569 children => [
2559 (new CFClient::UI::Empty expand => 1), 2570 (new CFClient::UI::Empty expand => 1),
2560 (new CFClient::UI::Slider vertical => 1), 2571 (new CFClient::UI::Slider vertical => 1),
… …
2571 2582
2572 $self->{fontsize} = $fontsize; 2583 $self->{fontsize} = $fontsize;
2573 $self->reflow; 2584 $self->reflow;
2574} 2585}
2575 2586
2587sub size_request {
2588 my ($self) = @_;
2589
2590 my ($empty, $slider) = @{ $self->{children} };
2591
2592 local $self->{children} = [$empty, $slider];
2593 $self->SUPER::size_request
2594}
2595
2576sub size_allocate { 2596sub invoke_size_allocate {
2577 my ($self, $w, $h) = @_; 2597 my ($self, $w, $h) = @_;
2578 2598
2579 $self->SUPER::size_allocate ($w, $h); 2599 my ($empty, $slider, @other) = @{ $self->{children} };
2600 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2580 2601
2581 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2602 $self->{layout}->set_font ($self->{font}) if $self->{font};
2582 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2603 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2583 $self->{layout}->set_width ($self->{children}[0]{w}); 2604 $self->{layout}->set_width ($empty->{w});
2584 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2605 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2585 2606
2586 $self->reflow; 2607 $self->reflow;
2587}
2588 2608
2589sub text_size { 2609 local $self->{children} = [$empty, $slider];
2590 my ($self, $text, $indent) = @_; 2610 $self->SUPER::invoke_size_allocate ($w, $h)
2611}
2612
2613sub get_layout {
2614 my ($self, $para) = @_;
2591 2615
2592 my $layout = $self->{layout}; 2616 my $layout = $self->{layout};
2593 2617
2618 $layout->set_font ($self->{font}) if $self->{font};
2619 $layout->set_foreground (@{$para->{fg}});
2594 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2620 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2595 $layout->set_width ($self->{children}[0]{w} - $indent); 2621 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2622 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2597 $layout->set_markup ($text); 2623 $layout->set_markup ($para->{markup});
2624
2625 $layout->set_shapes (
2626 map
2627 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2628 @{$para->{widget}}
2598 2629 );
2630
2599 $layout->size 2631 $layout
2600} 2632}
2601 2633
2602sub reflow { 2634sub reflow {
2603 my ($self) = @_; 2635 my ($self) = @_;
2604 2636
… …
2613 $self->{children}[1]->set_value ($offset); 2645 $self->{children}[1]->set_value ($offset);
2614} 2646}
2615 2647
2616sub clear { 2648sub clear {
2617 my ($self) = @_; 2649 my ($self) = @_;
2650
2651 my (undef, undef, @other) = @{ $self->{children} };
2652 $self->remove ($_) for @other;
2618 2653
2619 $self->{par} = []; 2654 $self->{par} = [];
2620 $self->{height} = 0; 2655 $self->{height} = 0;
2621 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2656 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2622} 2657}
2623 2658
2624sub add_paragraph { 2659sub add_paragraph {
2625 my ($self, $color, $text, $indent) = @_; 2660 my ($self, $color, $para, $indent) = @_;
2626 2661
2627 for my $line (split /\n/, $text) { 2662 my ($text, @w) = ref $para ? @$para : $para;
2628 my ($w, $h) = $self->text_size ($line); 2663
2629 $self->{height} += $h; 2664 $para = {
2630 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2665 w => 1e10,
2666 wrapped => 1,
2667 fg => $color,
2668 indent => $indent,
2669 markup => $text,
2670 widget => \@w,
2631 } 2671 };
2632 2672
2633 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2673 $self->add (@w) if @w;
2674 push @{$self->{par}}, $para;
2675
2676 $self->{need_reflow}++;
2677 $self->update;
2678}
2679
2680sub scroll_to_bottom {
2681 my ($self) = @_;
2682
2683 $self->{scroll_to_bottom} = 1;
2684 $self->update;
2634} 2685}
2635 2686
2636sub update { 2687sub update {
2637 my ($self) = @_; 2688 my ($self) = @_;
2638 2689
… …
2646 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2697 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2647 2698
2648 if (delete $self->{need_reflow}) { 2699 if (delete $self->{need_reflow}) {
2649 my $height = 0; 2700 my $height = 0;
2650 2701
2651 my $layout = $self->{layout};
2652
2653 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2654
2655 for (@{$self->{par}}) { 2702 for my $para (@{$self->{par}}) {
2656 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2703 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2657 $layout->set_width ($W - $_->[3]); 2704 my $layout = $self->get_layout ($para);
2658 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2659 $layout->set_markup ($_->[4]);
2660 my ($w, $h) = $layout->size; 2705 my ($w, $h) = $layout->size;
2661 $_->[0] = $w + $_->[3]; 2706
2662 $_->[1] = $h; 2707 $para->{w} = $w + $para->{indent};
2708 $para->{h} = $h;
2709 $para->{wrapped} = $layout->has_wrapped;
2663 } 2710 }
2664 2711
2665 $height += $_->[1]; 2712 $height += $para->{h};
2666 } 2713 }
2667 2714
2668 $self->{height} = $height; 2715 $self->{height} = $height;
2669 2716
2670 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2717 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2671 2718
2672 delete $self->{texture}; 2719 delete $self->{texture};
2720 }
2721
2722 if (delete $self->{scroll_to_bottom}) {
2723 $self->{children}[1]->set_value (1e10);
2673 } 2724 }
2674 2725
2675 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2726 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2676 glClearColor 0, 0, 0, 0; 2727 glClearColor 0, 0, 0, 0;
2677 glClear GL_COLOR_BUFFER_BIT; 2728 glClear GL_COLOR_BUFFER_BIT;
… …
2681 my $y0 = $top; 2732 my $y0 = $top;
2682 my $y1 = $top + $H; 2733 my $y1 = $top + $H;
2683 2734
2684 my $y = 0; 2735 my $y = 0;
2685 2736
2686 my $layout = $self->{layout};
2687
2688 $layout->set_font ($self->{font}) if $self->{font};
2689
2690 glEnable GL_BLEND;
2691 #TODO# not correct in windows where rgba is forced off
2692 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2693
2694 for my $par (@{$self->{par}}) { 2737 for my $para (@{$self->{par}}) {
2695 my $h = $par->[1]; 2738 my $h = $para->{h};
2696 2739
2697 if ($y0 < $y + $h && $y < $y1) { 2740 if ($y0 < $y + $h && $y < $y1) {
2698 $layout->set_foreground (@{ $par->[2] });
2699 $layout->set_width ($W - $par->[3]);
2700 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2701 $layout->set_markup ($par->[4]);
2702 2741
2703 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2742 my $layout = $self->get_layout ($para);
2704 2743
2705 glRasterPos $par->[3], $y - $y0; 2744 $layout->render ($para->{indent}, $y - $y0);
2706 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2745
2746 if (my @w = @{ $para->{widget} }) {
2747 my @s = $layout->get_shapes;
2748
2749 for (@w) {
2750 my ($dx, $dy) = splice @s, 0, 2, ();
2751
2752 $_->{x} = $dx + $para->{indent};
2753 $_->{y} = $dy + $y - $y0;
2754
2755 $_->draw;
2756 }
2757 }
2707 } 2758 }
2708 2759
2709 $y += $h; 2760 $y += $h;
2710 } 2761 }
2711
2712 glDisable GL_BLEND;
2713 }; 2762 };
2714 }); 2763 });
2764}
2765
2766sub reconfigure {
2767 my ($self) = @_;
2768
2769 $self->SUPER::reconfigure;
2770
2771 $_->{w} = 1e10 for @{ $self->{par} };
2772 $self->reflow;
2715} 2773}
2716 2774
2717sub _draw { 2775sub _draw {
2718 my ($self) = @_; 2776 my ($self) = @_;
2719 2777
… …
2722 glColor 0, 0, 0, 1; 2780 glColor 0, 0, 0, 1;
2723 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2781 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2724 glDisable GL_TEXTURE_2D; 2782 glDisable GL_TEXTURE_2D;
2725 2783
2726 $self->{children}[1]->draw; 2784 $self->{children}[1]->draw;
2727
2728} 2785}
2729 2786
2730############################################################################# 2787#############################################################################
2731 2788
2732package CFClient::UI::Animator; 2789package CFClient::UI::Animator;
… …
2841 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2898 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2842 2899
2843 ($w + 4, $h + 4) 2900 ($w + 4, $h + 4)
2844} 2901}
2845 2902
2846sub size_allocate { 2903sub invoke_size_allocate {
2847 my ($self, $w, $h) = @_; 2904 my ($self, $w, $h) = @_;
2848 2905
2849 $self->SUPER::size_allocate ($w - 4, $h - 4); 2906 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2850} 2907}
2851 2908
2852sub visibility_change { 2909sub invoke_visibility_change {
2853 my ($self, $visible) = @_; 2910 my ($self, $visible) = @_;
2854 2911
2855 return unless $visible; 2912 return unless $visible;
2856 2913
2857 $self->{root}->on_post_alloc ("move_$self" => sub { 2914 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
3024 3081
3025# popup given the event (must be a mouse button down event currently) 3082# popup given the event (must be a mouse button down event currently)
3026sub popup { 3083sub popup {
3027 my ($self, $ev) = @_; 3084 my ($self, $ev) = @_;
3028 3085
3029 $self->_emit ("popdown"); 3086 $self->emit ("popdown");
3030 3087
3031 # maybe save $GRAB? must be careful about events... 3088 # maybe save $GRAB? must be careful about events...
3032 $GRAB = $self; 3089 $GRAB = $self;
3033 $self->{button} = $ev->{button}; 3090 $self->{button} = $ev->{button};
3034 3091
3035 $self->show; 3092 $self->show;
3036 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3093 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
3037} 3094}
3038 3095
3039sub mouse_motion { 3096sub invoke_mouse_motion {
3040 my ($self, $ev, $x, $y) = @_; 3097 my ($self, $ev, $x, $y) = @_;
3041 3098
3042 # TODO: should use vbox->find_widget or so 3099 # TODO: should use vbox->find_widget or so
3043 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3100 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
3044 $self->{hover} = $self->{item}{$HOVER}; 3101 $self->{hover} = $self->{item}{$HOVER};
3045 3102
3046 0 3103 0
3047} 3104}
3048 3105
3049sub button_up { 3106sub invoke_button_up {
3050 my ($self, $ev, $x, $y) = @_; 3107 my ($self, $ev, $x, $y) = @_;
3051 3108
3052 if ($ev->{button} == $self->{button}) { 3109 if ($ev->{button} == $self->{button}) {
3053 undef $GRAB; 3110 undef $GRAB;
3054 $self->hide; 3111 $self->hide;
3055 3112
3056 $self->_emit ("popdown"); 3113 $self->emit ("popdown");
3057 $self->{hover}[1]->() if $self->{hover}; 3114 $self->{hover}[1]->() if $self->{hover};
3058 } else { 3115 } else {
3059 return 0 3116 return 0
3060 } 3117 }
3061 3118
… …
3088 3145
3089 $self->{current} = $self->{children}[0] 3146 $self->{current} = $self->{children}[0]
3090 if @{ $self->{children} }; 3147 if @{ $self->{children} };
3091} 3148}
3092 3149
3150sub get_current_page {
3151 my ($self) = @_;
3152
3153 $self->{current}
3154}
3155
3093sub set_current_page { 3156sub set_current_page {
3094 my ($self, $page_or_widget) = @_; 3157 my ($self, $page_or_widget) = @_;
3095 3158
3096 my $widget = ref $page_or_widget 3159 my $widget = ref $page_or_widget
3097 ? $page_or_widget 3160 ? $page_or_widget
3098 : $self->{children}[$page_or_widget]; 3161 : $self->{children}[$page_or_widget];
3099 3162
3100 $self->{current} = $widget; 3163 $self->{current} = $widget;
3101 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3164 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3102 3165
3103 $self->_emit (page_changed => $self->{current}); 3166 $self->emit (page_changed => $self->{current});
3104 3167
3105 $self->realloc; 3168 $self->realloc;
3106} 3169}
3107 3170
3108sub visible_children { 3171sub visible_children {
… …
3113 my ($self) = @_; 3176 my ($self) = @_;
3114 3177
3115 $self->{current}->size_request 3178 $self->{current}->size_request
3116} 3179}
3117 3180
3118sub size_allocate { 3181sub invoke_size_allocate {
3119 my ($self, $w, $h) = @_; 3182 my ($self, $w, $h) = @_;
3120 3183
3121 $self->{current}->configure (0, 0, $w, $h); 3184 $self->{current}->configure (0, 0, $w, $h);
3185
3186 1
3122} 3187}
3123 3188
3124sub _draw { 3189sub _draw {
3125 my ($self) = @_; 3190 my ($self) = @_;
3126 3191
… …
3161 ); 3226 );
3162 3227
3163 $self->{multiplexer}->add ($widget); 3228 $self->{multiplexer}->add ($widget);
3164} 3229}
3165 3230
3231sub get_current_page {
3232 my ($self) = @_;
3233
3234 $self->{multiplexer}->get_current_page
3235}
3236
3166sub set_current_page { 3237sub set_current_page {
3167 my ($self, $page) = @_; 3238 my ($self, $page) = @_;
3168 3239
3169 $self->{multiplexer}->set_current_page ($page); 3240 $self->{multiplexer}->set_current_page ($page);
3170 $self->_emit (page_changed => $self->{multiplexer}{current}); 3241 $self->emit (page_changed => $self->{multiplexer}{current});
3171} 3242}
3172 3243
3173############################################################################# 3244#############################################################################
3174 3245
3175package CFClient::UI::Combobox; 3246package CFClient::UI::Combobox;
… …
3190 $self->_set_value ($self->{value}); 3261 $self->_set_value ($self->{value});
3191 3262
3192 $self 3263 $self
3193} 3264}
3194 3265
3195sub button_down { 3266sub invoke_button_down {
3196 my ($self, $ev) = @_; 3267 my ($self, $ev) = @_;
3197 3268
3198 my @menu_items; 3269 my @menu_items;
3199 3270
3200 for (@{ $self->{options} }) { 3271 for (@{ $self->{options} }) {
… …
3221 my ($self, $value) = @_; 3292 my ($self, $value) = @_;
3222 3293
3223 return unless $self->{value} ne $value; 3294 return unless $self->{value} ne $value;
3224 3295
3225 $self->_set_value ($value); 3296 $self->_set_value ($value);
3226 $self->_emit (changed => $value); 3297 $self->emit (changed => $value);
3227} 3298}
3228 3299
3229############################################################################# 3300#############################################################################
3230 3301
3231package CFClient::UI::Statusbox; 3302package CFClient::UI::Statusbox;
… …
3346 count => 1, 3417 count => 1,
3347 %arg, 3418 %arg,
3348 }; 3419 };
3349 } 3420 }
3350 3421
3422 $ROOT->on_refresh (reorder => sub {
3351 $self->reorder; 3423 $self->reorder;
3424 });
3352} 3425}
3353 3426
3354sub reconfigure { 3427sub reconfigure {
3355 my ($self) = @_; 3428 my ($self) = @_;
3356 3429
… …
3371 3444
3372############################################################################# 3445#############################################################################
3373 3446
3374package CFClient::UI::Inventory; 3447package CFClient::UI::Inventory;
3375 3448
3376our @ISA = CFClient::UI::ScrolledWindow::; 3449our @ISA = CFClient::UI::Table::;
3377 3450
3378sub new { 3451sub new {
3379 my $class = shift; 3452 my $class = shift;
3380 3453
3381 my $self = $class->SUPER::new ( 3454 my $self = $class->SUPER::new (
3382 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3455 col_expand => [0, 1, 0],
3383 @_, 3456 @_,
3384 ); 3457 );
3385 3458
3386 $self 3459 $self
3387} 3460}
3388 3461
3389sub set_items { 3462sub set_items {
3390 my ($self, $items) = @_; 3463 my ($self, $items) = @_;
3391 3464
3392 $self->{child}->clear; 3465 $self->clear;
3393 return unless $items; 3466 return unless $items;
3394 3467
3395 my @items = sort { 3468 my @items = sort {
3396 ($a->{type} <=> $b->{type}) 3469 ($a->{type} <=> $b->{type})
3397 or ($a->{name} cmp $b->{name}) 3470 or ($a->{name} cmp $b->{name})
3398 } @$items; 3471 } values %$items;
3399 3472
3400 $self->{real_items} = \@items; 3473 $self->{real_items} = \@items;
3401 3474
3402 my $row = 0; 3475 my $row = 0;
3403 for my $item (@items) { 3476 for my $item (@items) {
3404 CFClient::Item::update_widgets $item; 3477 CFClient::Item::update_widgets $item;
3405 3478
3406 $self->{child}->add (0, $row, $item->{face_widget}); 3479 $self->add (0, $row, $item->{face_widget});
3407 $self->{child}->add (1, $row, $item->{desc_widget}); 3480 $self->add (1, $row, $item->{desc_widget});
3408 $self->{child}->add (2, $row, $item->{weight_widget}); 3481 $self->add (2, $row, $item->{weight_widget});
3409 3482
3410 $row++; 3483 $row++;
3411 }
3412}
3413
3414#############################################################################
3415
3416package CFClient::UI::BindEditor;
3417
3418our @ISA = CFClient::UI::FancyFrame::;
3419
3420sub new {
3421 my $class = shift;
3422
3423 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3424
3425 $self->add (my $vb = new CFClient::UI::VBox);
3426
3427
3428 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3429 text => "start recording",
3430 tooltip => "Start/Stops recording of actions."
3431 ."All subsequent actions after the recording started will be captured."
3432 ."The actions are displayed after the record was stopped."
3433 ."To bind the action you have to click on the 'Bind' button",
3434 on_activate => sub {
3435 unless ($self->{recording}) {
3436 $self->start;
3437 } else {
3438 $self->stop;
3439 }
3440 });
3441
3442 $vb->add (new CFClient::UI::Label text => "Actions:");
3443 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3444
3445 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3446 $vb->add (my $hb = new CFClient::UI::HBox);
3447 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3448 $hb->add (new CFClient::UI::Button
3449 text => "bind",
3450 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3451 on_activate => sub {
3452 $self->ask_for_bind;
3453 });
3454
3455 $vb->add (my $hb = new CFClient::UI::HBox);
3456 $hb->add (new CFClient::UI::Button
3457 text => "ok",
3458 expand => 1,
3459 tooltip => "This closes the binding editor and saves the binding",
3460 on_activate => sub {
3461 $self->hide;
3462 $self->commit;
3463 });
3464
3465 $hb->add (new CFClient::UI::Button
3466 text => "cancel",
3467 expand => 1,
3468 tooltip => "This closes the binding editor without saving",
3469 on_activate => sub {
3470 $self->hide;
3471 $self->{binding_cancel}->()
3472 if $self->{binding_cancel};
3473 });
3474
3475 $self->update_binding_widgets;
3476
3477 $self
3478}
3479
3480sub commit {
3481 my ($self) = @_;
3482 my ($mod, $sym, $cmds) = $self->get_binding;
3483 if ($sym != 0 && @$cmds > 0) {
3484 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3485 ."'. Don't forget 'Save Config'!");
3486 $self->{binding_change}->($mod, $sym, $cmds)
3487 if $self->{binding_change};
3488 } else {
3489 $::STATUSBOX->add ("No action bound, no key or action specified!");
3490 $self->{binding_cancel}->()
3491 if $self->{binding_cancel};
3492 }
3493}
3494
3495sub start {
3496 my ($self) = @_;
3497
3498 $self->{rec_btn}->set_text ("stop recording");
3499 $self->{recording} = 1;
3500 $self->clear_command_list;
3501 $::CONN->start_record if $::CONN;
3502}
3503
3504sub stop {
3505 my ($self) = @_;
3506
3507 $self->{rec_btn}->set_text ("start recording");
3508 $self->{recording} = 0;
3509
3510 my $rec;
3511 $rec = $::CONN->stop_record if $::CONN;
3512 return unless ref $rec eq 'ARRAY';
3513 $self->set_command_list ($rec);
3514}
3515
3516
3517sub ask_for_bind_and_commit {
3518 my ($self) = @_;
3519 $self->ask_for_bind (1);
3520}
3521
3522sub ask_for_bind {
3523 my ($self, $commit) = @_;
3524
3525 CFClient::Binder::open_binding_dialog (sub {
3526 my ($mod, $sym) = @_;
3527 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3528 $self->update_binding_widgets;
3529 $self->commit if $commit;
3530 });
3531}
3532
3533# $mod and $sym are the modifiers and key symbol
3534# $cmds is a array ref of strings (the commands)
3535# $cb is the callback that is executed on OK
3536# $ccb is the callback that is executed on CANCEL and
3537# when the binding was unsuccessful on OK
3538sub set_binding {
3539 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3540
3541 $self->clear_command_list;
3542 $self->{recording} = 0;
3543 $self->{rec_btn}->set_text ("start recording");
3544
3545 $self->{binding} = [$mod, $sym];
3546 $self->{commands} = $cmds;
3547
3548 $self->{binding_change} = $cb;
3549 $self->{binding_cancel} = $ccb;
3550
3551 $self->update_binding_widgets;
3552}
3553
3554# this is a shortcut method that asks for a binding
3555# and then just binds it.
3556sub do_quick_binding {
3557 my ($self, $cmds) = @_;
3558 $self->set_binding (undef, undef, $cmds, sub {
3559 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3560 });
3561 $self->ask_for_bind (1);
3562}
3563
3564sub update_binding_widgets {
3565 my ($self) = @_;
3566 my ($mod, $sym, $cmds) = $self->get_binding;
3567 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3568 $self->set_command_list ($cmds);
3569}
3570
3571sub get_binding {
3572 my ($self) = @_;
3573 return (
3574 $self->{binding}->[0],
3575 $self->{binding}->[1],
3576 [ grep { defined $_ } @{$self->{commands}} ]
3577 );
3578}
3579
3580sub clear_command_list {
3581 my ($self) = @_;
3582 $self->{cmdbox}->clear ();
3583}
3584
3585sub set_command_list {
3586 my ($self, $cmds) = @_;
3587
3588 $self->{cmdbox}->clear ();
3589 $self->{commands} = $cmds;
3590
3591 my $idx = 0;
3592
3593 for (@$cmds) {
3594 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3595
3596 my $i = $idx;
3597 $hb->add (new CFClient::UI::Label text => $_);
3598 $hb->add (new CFClient::UI::Button
3599 text => "delete",
3600 tooltip => "Deletes the action from the record",
3601 on_activate => sub {
3602 $self->{cmdbox}->remove ($hb);
3603 $cmds->[$i] = undef;
3604 });
3605
3606
3607 $idx++
3608 } 3484 }
3609} 3485}
3610 3486
3611############################################################################# 3487#############################################################################
3612 3488
… …
3666 } elsif ($ev->{button} == 2) { 3542 } elsif ($ev->{button} == 2) {
3667 $::CONN->user_send ("invoke $spell->{name}"); 3543 $::CONN->user_send ("invoke $spell->{name}");
3668 } elsif ($ev->{button} == 3) { 3544 } elsif ($ev->{button} == 3) {
3669 (new CFClient::UI::Menu 3545 (new CFClient::UI::Menu
3670 items => [ 3546 items => [
3671 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }], 3547 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3672 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }], 3548 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3673 ], 3549 ],
3674 )->popup ($ev); 3550 )->popup ($ev);
3675 } else { 3551 } else {
3676 return 0; 3552 return 0;
… …
3771 $coord = $max - $size if $coord > $max - $size; 3647 $coord = $max - $size if $coord > $max - $size;
3772 3648
3773 int $coord + 0.5 3649 int $coord + 0.5
3774} 3650}
3775 3651
3776sub size_allocate { 3652sub invoke_size_allocate {
3777 my ($self, $w, $h) = @_; 3653 my ($self, $w, $h) = @_;
3778 3654
3779 for my $child ($self->children) { 3655 for my $child ($self->children) {
3780 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3656 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3781 3657
… …
3785 $X = _to_pixel $X, $W, $self->{w}; 3661 $X = _to_pixel $X, $W, $self->{w};
3786 $Y = _to_pixel $Y, $H, $self->{h}; 3662 $Y = _to_pixel $Y, $H, $self->{h};
3787 3663
3788 $child->configure ($X, $Y, $W, $H); 3664 $child->configure ($X, $Y, $W, $H);
3789 } 3665 }
3666
3667 1
3790} 3668}
3791 3669
3792sub coord2local { 3670sub coord2local {
3793 my ($self, $x, $y) = @_; 3671 my ($self, $x, $y) = @_;
3794 3672

Diff Legend

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