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.304 by elmex, Tue Jun 13 11:01:04 2006 UTC vs.
Revision 1.323 by root, Wed Jul 5 03:01:01 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
… …
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;
… …
1619 1627
1620 my ($w, $h) = $self->{layout}->size; 1628 my ($w, $h) = $self->{layout}->size;
1621 1629
1622 if (exists $self->{template}) { 1630 if (exists $self->{template}) {
1623 $self->{template}->set_font ($self->{font}) if $self->{font}; 1631 $self->{template}->set_font ($self->{font}) if $self->{font};
1632 $self->{template}->set_width ($self->{max_w} || -1);
1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1633 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1625 1634
1626 my ($w2, $h2) = $self->{template}->size; 1635 my ($w2, $h2) = $self->{template}->size;
1627 1636
1628 $w = List::Util::max $w, $w2; 1637 $w = List::Util::max $w, $w2;
… …
1633 }; 1642 };
1634 1643
1635 @{ $self->{size_req} } 1644 @{ $self->{size_req} }
1636} 1645}
1637 1646
1647sub baseline_shift {
1648 $_[0]{layout}->descent
1649}
1650
1638sub size_allocate { 1651sub invoke_size_allocate {
1639 my ($self, $w, $h) = @_; 1652 my ($self, $w, $h) = @_;
1640 1653
1641 delete $self->{ox}; 1654 delete $self->{ox};
1642 1655
1643 delete $self->{texture} 1656 delete $self->{texture}
1644 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1657 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1658
1659 1
1645} 1660}
1646 1661
1647sub set_fontsize { 1662sub set_fontsize {
1648 my ($self, $fontsize) = @_; 1663 my ($self, $fontsize) = @_;
1649 1664
1650 $self->{fontsize} = $fontsize; 1665 $self->{fontsize} = $fontsize;
1666 delete $self->{size_req};
1651 delete $self->{texture}; 1667 delete $self->{texture};
1652 1668
1653 $self->realloc; 1669 $self->realloc;
1654} 1670}
1655 1671
1656sub reconfigure { 1672sub reconfigure {
1657 my ($self) = @_; 1673 my ($self) = @_;
1658 1674
1659 delete $self->{size_req}; 1675 delete $self->{size_req};
1676 delete $self->{texture};
1660 1677
1661 $self->SUPER::reconfigure; 1678 $self->SUPER::reconfigure;
1662} 1679}
1663 1680
1664sub _draw { 1681sub _draw {
1665 my ($self) = @_; 1682 my ($self) = @_;
1666 1683
1667 $self->SUPER::_draw; # draw background, if applicable 1684 $self->SUPER::_draw; # draw background, if applicable
1668 1685
1669 my $tex = $self->{texture} ||= do { 1686 my $size = $self->{texture} ||= do {
1670 $self->{layout}->set_foreground (@{$self->{fg}}); 1687 $self->{layout}->set_foreground (@{$self->{fg}});
1671 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1688 $self->{layout}->set_font ($self->{font}) if $self->{font};
1672 $self->{layout}->set_width ($self->{w}); 1689 $self->{layout}->set_width ($self->{w});
1673 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1690 $self->{layout}->set_ellipsise ($self->{ellipsise});
1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1691 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1692 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1676 1693
1677 new_from_layout CFClient::Texture $self->{layout} 1694 [$self->{layout}->size]
1678 }; 1695 };
1679 1696
1680 unless (exists $self->{ox}) { 1697 unless (exists $self->{ox}) {
1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1698 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1699 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1683 : ($self->{w} - $tex->{w}) * 0.5); 1700 : ($self->{w} - $size->[0]) * 0.5);
1684 1701
1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1702 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1703 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1687 : ($self->{h} - $tex->{h}) * 0.5); 1704 : ($self->{h} - $size->[1]) * 0.5);
1688 }; 1705 };
1689 1706
1690 glEnable GL_TEXTURE_2D;
1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1707 my $w = List::Util::min $self->{w} + 4, $size->[0];
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1708 my $h = List::Util::min $self->{h} + 2, $size->[1];
1694 1709
1695 if ($tex->{format} == GL_ALPHA) { 1710 $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} 1711}
1706 1712
1707############################################################################# 1713#############################################################################
1708 1714
1709package CFClient::UI::EntryBase; 1715package CFClient::UI::EntryBase;
… …
1742 1748
1743 $text =~ s/./*/g if $self->{hidden}; 1749 $text =~ s/./*/g if $self->{hidden};
1744 $self->{layout}->set_text ("$text "); 1750 $self->{layout}->set_text ("$text ");
1745 delete $self->{size_req}; 1751 delete $self->{size_req};
1746 1752
1747 $self->_emit (changed => $self->{text}); 1753 $self->emit (changed => $self->{text});
1748 1754
1749 $self->realloc; 1755 $self->realloc;
1750 $self->update; 1756 $self->update;
1751} 1757}
1752 1758
… …
1767 my ($w, $h) = $self->SUPER::size_request; 1773 my ($w, $h) = $self->SUPER::size_request;
1768 1774
1769 ($w + 1, $h) # add 1 for cursor 1775 ($w + 1, $h) # add 1 for cursor
1770} 1776}
1771 1777
1772sub key_down { 1778sub invoke_key_down {
1773 my ($self, $ev) = @_; 1779 my ($self, $ev) = @_;
1774 1780
1775 my $mod = $ev->{mod}; 1781 my $mod = $ev->{mod};
1776 my $sym = $ev->{sym}; 1782 my $sym = $ev->{sym};
1777 my $uni = $ev->{unicode}; 1783 my $uni = $ev->{unicode};
… …
1789 } elsif ($sym == CFClient::SDLK_HOME) { 1795 } elsif ($sym == CFClient::SDLK_HOME) {
1790 $self->{cursor} = 0; 1796 $self->{cursor} = 0;
1791 } elsif ($sym == CFClient::SDLK_END) { 1797 } elsif ($sym == CFClient::SDLK_END) {
1792 $self->{cursor} = length $text; 1798 $self->{cursor} = length $text;
1793 } elsif ($uni == 27) { 1799 } elsif ($uni == 27) {
1794 $self->_emit ('escape'); 1800 $self->emit ('escape');
1795 } elsif ($uni) { 1801 } elsif ($uni) {
1796 substr $text, $self->{cursor}++, 0, chr $uni; 1802 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else { 1803 } else {
1798 return 0; 1804 return 0;
1799 } 1805 }
… …
1803 $self->realloc; 1809 $self->realloc;
1804 1810
1805 1 1811 1
1806} 1812}
1807 1813
1808sub focus_in { 1814sub invoke_focus_in {
1809 my ($self) = @_; 1815 my ($self) = @_;
1810 1816
1811 $self->{last_activity} = $::NOW; 1817 $self->{last_activity} = $::NOW;
1812 1818
1813 $self->SUPER::focus_in; 1819 $self->SUPER::invoke_focus_in
1814} 1820}
1815 1821
1816sub button_down { 1822sub invoke_button_down {
1817 my ($self, $ev, $x, $y) = @_; 1823 my ($self, $ev, $x, $y) = @_;
1818 1824
1819 $self->SUPER::button_down ($ev, $x, $y); 1825 $self->SUPER::invoke_button_down ($ev, $x, $y);
1820 1826
1821 my $idx = $self->{layout}->xy_to_index ($x, $y); 1827 my $idx = $self->{layout}->xy_to_index ($x, $y);
1822 1828
1823 # byte-index to char-index 1829 # byte-index to char-index
1824 my $text = $self->{text}; 1830 my $text = $self->{text};
… …
1829 $self->update; 1835 $self->update;
1830 1836
1831 1 1837 1
1832} 1838}
1833 1839
1834sub mouse_motion { 1840sub invoke_mouse_motion {
1835 my ($self, $ev, $x, $y) = @_; 1841 my ($self, $ev, $x, $y) = @_;
1836# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1842# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1837 1843
1838 0 1844 1
1839} 1845}
1840 1846
1841sub _draw { 1847sub _draw {
1842 my ($self) = @_; 1848 my ($self) = @_;
1843 1849
… …
1884 1890
1885our @ISA = CFClient::UI::EntryBase::; 1891our @ISA = CFClient::UI::EntryBase::;
1886 1892
1887use CFClient::OpenGL; 1893use CFClient::OpenGL;
1888 1894
1889sub key_down { 1895sub invoke_key_down {
1890 my ($self, $ev) = @_; 1896 my ($self, $ev) = @_;
1891 1897
1892 my $sym = $ev->{sym}; 1898 my $sym = $ev->{sym};
1893 1899
1894 if ($sym == 13) { 1900 if ($sym == 13) {
1895 unshift @{$self->{history}}, 1901 unshift @{$self->{history}},
1896 my $txt = $self->get_text; 1902 my $txt = $self->get_text;
1903
1897 $self->{history_pointer} = -1; 1904 $self->{history_pointer} = -1;
1898 $self->{history_saveback} = ''; 1905 $self->{history_saveback} = '';
1899 $self->_emit (activate => $txt); 1906 $self->emit (activate => $txt);
1900 $self->update; 1907 $self->update;
1901 1908
1902 } elsif ($sym == CFClient::SDLK_UP) { 1909 } elsif ($sym == CFClient::SDLK_UP) {
1903 if ($self->{history_pointer} < 0) { 1910 if ($self->{history_pointer} < 0) {
1904 $self->{history_saveback} = $self->get_text; 1911 $self->{history_saveback} = $self->get_text;
… …
1920 } else { 1927 } else {
1921 $self->set_text ($self->{history_saveback}); 1928 $self->set_text ($self->{history_saveback});
1922 } 1929 }
1923 1930
1924 } else { 1931 } else {
1925 return $self->SUPER::key_down ($ev) 1932 return $self->SUPER::invoke_key_down ($ev)
1926 } 1933 }
1927 1934
1928 1 1935 1
1929} 1936}
1930 1937
… …
1954 can_events => 1, 1961 can_events => 1,
1955 @_ 1962 @_
1956 ) 1963 )
1957} 1964}
1958 1965
1959sub activate { }
1960
1961sub button_up { 1966sub invoke_button_up {
1962 my ($self, $ev, $x, $y) = @_; 1967 my ($self, $ev, $x, $y) = @_;
1963 1968
1964 $self->emit ("activate") 1969 $self->emit ("activate")
1965 if $x >= 0 && $x < $self->{w} 1970 if $x >= 0 && $x < $self->{w}
1966 && $y >= 0 && $y < $self->{h}; 1971 && $y >= 0 && $y < $self->{h};
… …
2008 can_events => 1, 2013 can_events => 1,
2009 @_ 2014 @_
2010 ); 2015 );
2011} 2016}
2012 2017
2013sub activate { }
2014
2015sub button_up { 2018sub invoke_button_up {
2016 my ($self, $ev, $x, $y) = @_; 2019 my ($self, $ev, $x, $y) = @_;
2017 2020
2018 $self->emit ("activate") 2021 $self->emit ("activate")
2019 if $x >= 0 && $x < $self->{w} 2022 if $x >= 0 && $x < $self->{w}
2020 && $y >= 0 && $y < $self->{h}; 2023 && $y >= 0 && $y < $self->{h};
… …
2054 my ($self) = @_; 2057 my ($self) = @_;
2055 2058
2056 (6) x 2 2059 (6) x 2
2057} 2060}
2058 2061
2062sub toggle {
2063 my ($self) = @_;
2064
2065 $self->{state} = !$self->{state};
2066 $self->emit (changed => $self->{state});
2067 $self->update;
2068}
2069
2059sub button_down { 2070sub invoke_button_down {
2060 my ($self, $ev, $x, $y) = @_; 2071 my ($self, $ev, $x, $y) = @_;
2061 2072
2062 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2073 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2063 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2074 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2064 $self->{state} = !$self->{state}; 2075 $self->toggle;
2065 $self->_emit (changed => $self->{state});
2066 } else { 2076 } else {
2067 return 0 2077 return 0
2068 } 2078 }
2069 2079
2070 1 2080 1
… …
2095package CFClient::UI::Image; 2105package CFClient::UI::Image;
2096 2106
2097our @ISA = CFClient::UI::Base::; 2107our @ISA = CFClient::UI::Base::;
2098 2108
2099use CFClient::OpenGL; 2109use CFClient::OpenGL;
2100use Carp qw/confess/;
2101 2110
2102our %loaded_images; 2111our %texture_cache;
2103 2112
2104sub new { 2113sub new {
2105 my $class = shift; 2114 my $class = shift;
2106 2115
2107 my $self = $class->SUPER::new (can_events => 0, @_); 2116 my $self = $class->SUPER::new (
2117 can_events => 0,
2118 @_,
2119 );
2108 2120
2109 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2121 $self->{path}
2122 or Carp::croak "required attribute 'path' not set";
2110 2123
2111 $loaded_images{$self->{image}} ||= 2124 $self->{tex} = $texture_cache{$self->{path}} ||=
2112 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2125 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2113 2126
2114 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2127 Scalar::Util::weaken $texture_cache{$self->{path}};
2115 2128
2116 Scalar::Util::weaken $loaded_images{$self->{image}}; 2129 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2117
2118 $self->{aspect} = $tex->{w} / $tex->{h};
2119 2130
2120 $self 2131 $self
2121} 2132}
2122 2133
2123sub size_request { 2134sub size_request {
2124 my ($self) = @_; 2135 my ($self) = @_;
2125 2136
2126 ($self->{tex}->{w}, $self->{tex}->{h}) 2137 ($self->{tex}{w}, $self->{tex}{h})
2127} 2138}
2128 2139
2129sub _draw { 2140sub _draw {
2130 my ($self) = @_; 2141 my ($self) = @_;
2131 2142
… …
2240 my $ycut1 = max 0, min 1, $ycut; 2251 my $ycut1 = max 0, min 1, $ycut;
2241 my $ycut2 = max 0, min 1, $ycut - 1; 2252 my $ycut2 = max 0, min 1, $ycut - 1;
2242 2253
2243 my $h1 = $self->{h} * (1 - $ycut1); 2254 my $h1 = $self->{h} * (1 - $ycut1);
2244 my $h2 = $self->{h} * (1 - $ycut2); 2255 my $h2 = $self->{h} * (1 - $ycut2);
2256 my $h3 = $self->{h};
2257
2258 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2245 2259
2246 glEnable GL_BLEND; 2260 glEnable GL_BLEND;
2247 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2261 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2248 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2262 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2249 glEnable GL_TEXTURE_2D; 2263 glEnable GL_TEXTURE_2D;
… …
2268 2282
2269 if ($t3) { 2283 if ($t3) {
2270 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2284 glBindTexture GL_TEXTURE_2D, $t3->{name};
2271 glBegin GL_QUADS; 2285 glBegin GL_QUADS;
2272 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2286 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2273 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2287 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2274 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2288 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2275 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2289 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2276 glEnd; 2290 glEnd;
2277 } 2291 }
2278 2292
2279 glDisable GL_BLEND; 2293 glDisable GL_BLEND;
… …
2367 $self->update; 2381 $self->update;
2368 2382
2369 $self 2383 $self
2370} 2384}
2371 2385
2372sub changed { }
2373
2374sub set_range { 2386sub set_range {
2375 my ($self, $range) = @_; 2387 my ($self, $range) = @_;
2376 2388
2377 ($range, $self->{range}) = ($self->{range}, $range); 2389 ($range, $self->{range}) = ($self->{range}, $range);
2378 2390
… …
2398 if $unit; 2410 if $unit;
2399 2411
2400 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2412 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2401 2413
2402 if ($value != $old_value) { 2414 if ($value != $old_value) {
2403 $self->_emit (changed => $value); 2415 $self->emit (changed => $value);
2404 $self->update; 2416 $self->update;
2405 } 2417 }
2406} 2418}
2407 2419
2408sub size_request { 2420sub size_request {
2409 my ($self) = @_; 2421 my ($self) = @_;
2410 2422
2411 ($self->{req_w}, $self->{req_h}) 2423 ($self->{req_w}, $self->{req_h})
2412} 2424}
2413 2425
2414sub button_down { 2426sub invoke_button_down {
2415 my ($self, $ev, $x, $y) = @_; 2427 my ($self, $ev, $x, $y) = @_;
2416 2428
2417 $self->SUPER::button_down ($ev, $x, $y); 2429 $self->SUPER::invoke_button_down ($ev, $x, $y);
2418 2430
2419 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2431 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2420 2432
2421 $self->mouse_motion ($ev, $x, $y) 2433 $self->invoke_mouse_motion ($ev, $x, $y)
2422} 2434}
2423 2435
2424sub mouse_motion { 2436sub invoke_mouse_motion {
2425 my ($self, $ev, $x, $y) = @_; 2437 my ($self, $ev, $x, $y) = @_;
2426 2438
2427 if ($GRAB == $self) { 2439 if ($GRAB == $self) {
2428 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2440 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2429 2441
… …
2550 can_events => 0, 2562 can_events => 0,
2551 indent => 0, 2563 indent => 0,
2552 #font => default_font 2564 #font => default_font
2553 @_, 2565 @_,
2554 2566
2555 layout => (new CFClient::Layout 1), 2567 layout => (new CFClient::Layout),
2556 par => [], 2568 par => [],
2557 height => 0, 2569 height => 0,
2558 children => [ 2570 children => [
2559 (new CFClient::UI::Empty expand => 1), 2571 (new CFClient::UI::Empty expand => 1),
2560 (new CFClient::UI::Slider vertical => 1), 2572 (new CFClient::UI::Slider vertical => 1),
… …
2571 2583
2572 $self->{fontsize} = $fontsize; 2584 $self->{fontsize} = $fontsize;
2573 $self->reflow; 2585 $self->reflow;
2574} 2586}
2575 2587
2588sub size_request {
2589 my ($self) = @_;
2590
2591 my ($empty, $slider) = @{ $self->{children} };
2592
2593 local $self->{children} = [$empty, $slider];
2594 $self->SUPER::size_request
2595}
2596
2576sub size_allocate { 2597sub invoke_size_allocate {
2577 my ($self, $w, $h) = @_; 2598 my ($self, $w, $h) = @_;
2578 2599
2579 $self->SUPER::size_allocate ($w, $h); 2600 my ($empty, $slider, @other) = @{ $self->{children} };
2601 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2580 2602
2581 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2603 $self->{layout}->set_font ($self->{font}) if $self->{font};
2582 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2604 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2583 $self->{layout}->set_width ($self->{children}[0]{w}); 2605 $self->{layout}->set_width ($empty->{w});
2584 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2606 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2585 2607
2586 $self->reflow; 2608 $self->reflow;
2587}
2588 2609
2589sub text_size { 2610 local $self->{children} = [$empty, $slider];
2590 my ($self, $text, $indent) = @_; 2611 $self->SUPER::invoke_size_allocate ($w, $h)
2612}
2613
2614sub get_layout {
2615 my ($self, $para) = @_;
2591 2616
2592 my $layout = $self->{layout}; 2617 my $layout = $self->{layout};
2593 2618
2619 $layout->set_font ($self->{font}) if $self->{font};
2620 $layout->set_foreground (@{$para->{fg}});
2594 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2621 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2595 $layout->set_width ($self->{children}[0]{w} - $indent); 2622 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2623 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2597 $layout->set_markup ($text); 2624 $layout->set_markup ($para->{markup});
2625
2626 $layout->set_shapes (
2627 map
2628 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2629 @{$para->{widget}}
2598 2630 );
2631
2599 $layout->size 2632 $layout
2600} 2633}
2601 2634
2602sub reflow { 2635sub reflow {
2603 my ($self) = @_; 2636 my ($self) = @_;
2604 2637
… …
2613 $self->{children}[1]->set_value ($offset); 2646 $self->{children}[1]->set_value ($offset);
2614} 2647}
2615 2648
2616sub clear { 2649sub clear {
2617 my ($self) = @_; 2650 my ($self) = @_;
2651
2652 my (undef, undef, @other) = @{ $self->{children} };
2653 $self->remove ($_) for @other;
2618 2654
2619 $self->{par} = []; 2655 $self->{par} = [];
2620 $self->{height} = 0; 2656 $self->{height} = 0;
2621 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2657 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2622} 2658}
2623 2659
2624sub add_paragraph { 2660sub add_paragraph {
2625 my ($self, $color, $text, $indent) = @_; 2661 my ($self, $color, $para, $indent) = @_;
2626 2662
2627 for my $line (split /\n/, $text) { 2663 my ($text, @w) = ref $para ? @$para : $para;
2628 my ($w, $h) = $self->text_size ($line); 2664
2629 $self->{height} += $h; 2665 $para = {
2630 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2666 w => 1e10,
2667 wrapped => 1,
2668 fg => $color,
2669 indent => $indent,
2670 markup => $text,
2671 widget => \@w,
2631 } 2672 };
2632 2673
2633 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2674 $self->add (@w) if @w;
2675 push @{$self->{par}}, $para;
2676
2677 $self->{need_reflow}++;
2678 $self->update;
2679}
2680
2681sub scroll_to_bottom {
2682 my ($self) = @_;
2683
2684 $self->{scroll_to_bottom} = 1;
2685 $self->update;
2634} 2686}
2635 2687
2636sub update { 2688sub update {
2637 my ($self) = @_; 2689 my ($self) = @_;
2638 2690
… …
2646 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2698 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2647 2699
2648 if (delete $self->{need_reflow}) { 2700 if (delete $self->{need_reflow}) {
2649 my $height = 0; 2701 my $height = 0;
2650 2702
2651 my $layout = $self->{layout};
2652
2653 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2654
2655 for (@{$self->{par}}) { 2703 for my $para (@{$self->{par}}) {
2656 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2704 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2657 $layout->set_width ($W - $_->[3]); 2705 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; 2706 my ($w, $h) = $layout->size;
2661 $_->[0] = $w + $_->[3]; 2707
2662 $_->[1] = $h; 2708 $para->{w} = $w + $para->{indent};
2709 $para->{h} = $h;
2710 $para->{wrapped} = $layout->has_wrapped;
2663 } 2711 }
2664 2712
2665 $height += $_->[1]; 2713 $height += $para->{h};
2666 } 2714 }
2667 2715
2668 $self->{height} = $height; 2716 $self->{height} = $height;
2669 2717
2670 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2718 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2671 2719
2672 delete $self->{texture}; 2720 delete $self->{texture};
2721 }
2722
2723 if (delete $self->{scroll_to_bottom}) {
2724 $self->{children}[1]->set_value (1e10);
2673 } 2725 }
2674 2726
2675 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2727 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2676 glClearColor 0, 0, 0, 0; 2728 glClearColor 0, 0, 0, 0;
2677 glClear GL_COLOR_BUFFER_BIT; 2729 glClear GL_COLOR_BUFFER_BIT;
… …
2681 my $y0 = $top; 2733 my $y0 = $top;
2682 my $y1 = $top + $H; 2734 my $y1 = $top + $H;
2683 2735
2684 my $y = 0; 2736 my $y = 0;
2685 2737
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}}) { 2738 for my $para (@{$self->{par}}) {
2695 my $h = $par->[1]; 2739 my $h = $para->{h};
2696 2740
2697 if ($y0 < $y + $h && $y < $y1) { 2741 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 2742
2703 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2743 my $layout = $self->get_layout ($para);
2704 2744
2705 glRasterPos $par->[3], $y - $y0; 2745 $layout->render ($para->{indent}, $y - $y0);
2706 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2746
2747 if (my @w = @{ $para->{widget} }) {
2748 my @s = $layout->get_shapes;
2749
2750 for (@w) {
2751 my ($dx, $dy) = splice @s, 0, 2, ();
2752
2753 $_->{x} = $dx + $para->{indent};
2754 $_->{y} = $dy + $y - $y0;
2755
2756 $_->draw;
2757 }
2758 }
2707 } 2759 }
2708 2760
2709 $y += $h; 2761 $y += $h;
2710 } 2762 }
2711
2712 glDisable GL_BLEND;
2713 }; 2763 };
2714 }); 2764 });
2765}
2766
2767sub reconfigure {
2768 my ($self) = @_;
2769
2770 $self->SUPER::reconfigure;
2771
2772 $_->{w} = 1e10 for @{ $self->{par} };
2773 $self->reflow;
2715} 2774}
2716 2775
2717sub _draw { 2776sub _draw {
2718 my ($self) = @_; 2777 my ($self) = @_;
2719 2778
… …
2722 glColor 0, 0, 0, 1; 2781 glColor 0, 0, 0, 1;
2723 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2782 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2724 glDisable GL_TEXTURE_2D; 2783 glDisable GL_TEXTURE_2D;
2725 2784
2726 $self->{children}[1]->draw; 2785 $self->{children}[1]->draw;
2727
2728} 2786}
2729 2787
2730############################################################################# 2788#############################################################################
2731 2789
2732package CFClient::UI::Animator; 2790package CFClient::UI::Animator;
… …
2841 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2899 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2842 2900
2843 ($w + 4, $h + 4) 2901 ($w + 4, $h + 4)
2844} 2902}
2845 2903
2846sub size_allocate { 2904sub invoke_size_allocate {
2847 my ($self, $w, $h) = @_; 2905 my ($self, $w, $h) = @_;
2848 2906
2849 $self->SUPER::size_allocate ($w - 4, $h - 4); 2907 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2850} 2908}
2851 2909
2852sub visibility_change { 2910sub invoke_visibility_change {
2853 my ($self, $visible) = @_; 2911 my ($self, $visible) = @_;
2854 2912
2855 return unless $visible; 2913 return unless $visible;
2856 2914
2857 $self->{root}->on_post_alloc ("move_$self" => sub { 2915 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
3005 for my $item (@{ $self->{items} }) { 3063 for my $item (@{ $self->{items} }) {
3006 my ($widget, $cb, $tooltip) = @$item; 3064 my ($widget, $cb, $tooltip) = @$item;
3007 3065
3008 # handle various types of items, only text for now 3066 # handle various types of items, only text for now
3009 if (!ref $widget) { 3067 if (!ref $widget) {
3068 if ($widget =~ /\t/) {
3069 my ($left, $right) = split /\t/, $widget, 2;
3070
3071 $widget = new CFClient::UI::HBox
3072 can_hover => 1,
3073 can_events => 1,
3074 tooltip => $tooltip,
3075 children => [
3076 (new CFClient::UI::Label markup => $left, expand => 1),
3077 (new CFClient::UI::Label markup => $right, align => +1),
3078 ],
3079 ;
3080
3081 } else {
3010 $widget = new CFClient::UI::Label 3082 $widget = new CFClient::UI::Label
3011 can_hover => 1, 3083 can_hover => 1,
3012 can_events => 1, 3084 can_events => 1,
3013 markup => $widget, 3085 markup => $widget,
3014 tooltip => $tooltip 3086 tooltip => $tooltip;
3087 }
3015 } 3088 }
3016 3089
3017 $self->{item}{$widget} = $item; 3090 $self->{item}{$widget} = $item;
3018 3091
3019 $self->{vbox}->add ($widget); 3092 $self->{vbox}->add ($widget);
… …
3024 3097
3025# popup given the event (must be a mouse button down event currently) 3098# popup given the event (must be a mouse button down event currently)
3026sub popup { 3099sub popup {
3027 my ($self, $ev) = @_; 3100 my ($self, $ev) = @_;
3028 3101
3029 $self->_emit ("popdown"); 3102 $self->emit ("popdown");
3030 3103
3031 # maybe save $GRAB? must be careful about events... 3104 # maybe save $GRAB? must be careful about events...
3032 $GRAB = $self; 3105 $GRAB = $self;
3033 $self->{button} = $ev->{button}; 3106 $self->{button} = $ev->{button};
3034 3107
3035 $self->show; 3108 $self->show;
3036 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3109 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
3037} 3110}
3038 3111
3039sub mouse_motion { 3112sub invoke_mouse_motion {
3040 my ($self, $ev, $x, $y) = @_; 3113 my ($self, $ev, $x, $y) = @_;
3041 3114
3042 # TODO: should use vbox->find_widget or so 3115 # TODO: should use vbox->find_widget or so
3043 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3116 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
3044 $self->{hover} = $self->{item}{$HOVER}; 3117 $self->{hover} = $self->{item}{$HOVER};
3045 3118
3046 0 3119 0
3047} 3120}
3048 3121
3049sub button_up { 3122sub invoke_button_up {
3050 my ($self, $ev, $x, $y) = @_; 3123 my ($self, $ev, $x, $y) = @_;
3051 3124
3052 if ($ev->{button} == $self->{button}) { 3125 if ($ev->{button} == $self->{button}) {
3053 undef $GRAB; 3126 undef $GRAB;
3054 $self->hide; 3127 $self->hide;
3055 3128
3056 $self->_emit ("popdown"); 3129 $self->emit ("popdown");
3057 $self->{hover}[1]->() if $self->{hover}; 3130 $self->{hover}[1]->() if $self->{hover};
3058 } else { 3131 } else {
3059 return 0 3132 return 0
3060 } 3133 }
3061 3134
… …
3088 3161
3089 $self->{current} = $self->{children}[0] 3162 $self->{current} = $self->{children}[0]
3090 if @{ $self->{children} }; 3163 if @{ $self->{children} };
3091} 3164}
3092 3165
3166sub get_current_page {
3167 my ($self) = @_;
3168
3169 $self->{current}
3170}
3171
3093sub set_current_page { 3172sub set_current_page {
3094 my ($self, $page_or_widget) = @_; 3173 my ($self, $page_or_widget) = @_;
3095 3174
3096 my $widget = ref $page_or_widget 3175 my $widget = ref $page_or_widget
3097 ? $page_or_widget 3176 ? $page_or_widget
3098 : $self->{children}[$page_or_widget]; 3177 : $self->{children}[$page_or_widget];
3099 3178
3100 $self->{current} = $widget; 3179 $self->{current} = $widget;
3101 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3180 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3102 3181
3103 $self->_emit (page_changed => $self->{current}); 3182 $self->emit (page_changed => $self->{current});
3104 3183
3105 $self->realloc; 3184 $self->realloc;
3106} 3185}
3107 3186
3108sub visible_children { 3187sub visible_children {
… …
3113 my ($self) = @_; 3192 my ($self) = @_;
3114 3193
3115 $self->{current}->size_request 3194 $self->{current}->size_request
3116} 3195}
3117 3196
3118sub size_allocate { 3197sub invoke_size_allocate {
3119 my ($self, $w, $h) = @_; 3198 my ($self, $w, $h) = @_;
3120 3199
3121 $self->{current}->configure (0, 0, $w, $h); 3200 $self->{current}->configure (0, 0, $w, $h);
3201
3202 1
3122} 3203}
3123 3204
3124sub _draw { 3205sub _draw {
3125 my ($self) = @_; 3206 my ($self) = @_;
3126 3207
… …
3161 ); 3242 );
3162 3243
3163 $self->{multiplexer}->add ($widget); 3244 $self->{multiplexer}->add ($widget);
3164} 3245}
3165 3246
3247sub get_current_page {
3248 my ($self) = @_;
3249
3250 $self->{multiplexer}->get_current_page
3251}
3252
3166sub set_current_page { 3253sub set_current_page {
3167 my ($self, $page) = @_; 3254 my ($self, $page) = @_;
3168 3255
3169 $self->{multiplexer}->set_current_page ($page); 3256 $self->{multiplexer}->set_current_page ($page);
3170 $self->_emit (page_changed => $self->{multiplexer}{current}); 3257 $self->emit (page_changed => $self->{multiplexer}{current});
3171} 3258}
3172 3259
3173############################################################################# 3260#############################################################################
3174 3261
3175package CFClient::UI::Combobox; 3262package CFClient::UI::Combobox;
… …
3190 $self->_set_value ($self->{value}); 3277 $self->_set_value ($self->{value});
3191 3278
3192 $self 3279 $self
3193} 3280}
3194 3281
3195sub button_down { 3282sub invoke_button_down {
3196 my ($self, $ev) = @_; 3283 my ($self, $ev) = @_;
3197 3284
3198 my @menu_items; 3285 my @menu_items;
3199 3286
3200 for (@{ $self->{options} }) { 3287 for (@{ $self->{options} }) {
… …
3221 my ($self, $value) = @_; 3308 my ($self, $value) = @_;
3222 3309
3223 return unless $self->{value} ne $value; 3310 return unless $self->{value} ne $value;
3224 3311
3225 $self->_set_value ($value); 3312 $self->_set_value ($value);
3226 $self->_emit (changed => $value); 3313 $self->emit (changed => $value);
3227} 3314}
3228 3315
3229############################################################################# 3316#############################################################################
3230 3317
3231package CFClient::UI::Statusbox; 3318package CFClient::UI::Statusbox;
… …
3346 count => 1, 3433 count => 1,
3347 %arg, 3434 %arg,
3348 }; 3435 };
3349 } 3436 }
3350 3437
3438 $ROOT->on_refresh (reorder => sub {
3351 $self->reorder; 3439 $self->reorder;
3440 });
3352} 3441}
3353 3442
3354sub reconfigure { 3443sub reconfigure {
3355 my ($self) = @_; 3444 my ($self) = @_;
3356 3445
… …
3371 3460
3372############################################################################# 3461#############################################################################
3373 3462
3374package CFClient::UI::Inventory; 3463package CFClient::UI::Inventory;
3375 3464
3376our @ISA = CFClient::UI::ScrolledWindow::; 3465our @ISA = CFClient::UI::Table::;
3377 3466
3378sub new { 3467sub new {
3379 my $class = shift; 3468 my $class = shift;
3380 3469
3381 my $self = $class->SUPER::new ( 3470 my $self = $class->SUPER::new (
3382 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3471 col_expand => [0, 1, 0],
3383 @_, 3472 @_,
3384 ); 3473 );
3385 3474
3386 $self 3475 $self
3387} 3476}
3388 3477
3389sub set_items { 3478sub set_items {
3390 my ($self, $items) = @_; 3479 my ($self, $items) = @_;
3391 3480
3392 $self->{child}->clear; 3481 $self->clear;
3393 return unless $items; 3482 return unless $items;
3394 3483
3395 my @items = sort { 3484 my @items = sort {
3396 ($a->{type} <=> $b->{type}) 3485 ($a->{type} <=> $b->{type})
3397 or ($a->{name} cmp $b->{name}) 3486 or ($a->{name} cmp $b->{name})
3398 } @$items; 3487 } values %$items;
3399 3488
3400 $self->{real_items} = \@items; 3489 $self->{real_items} = \@items;
3401 3490
3402 my $row = 0; 3491 my $row = 0;
3403 for my $item (@items) { 3492 for my $item (@items) {
3404 CFClient::Item::update_widgets $item; 3493 CFClient::Item::update_widgets $item;
3405 3494
3406 $self->{child}->add (0, $row, $item->{face_widget}); 3495 $self->add (0, $row, $item->{face_widget});
3407 $self->{child}->add (1, $row, $item->{desc_widget}); 3496 $self->add (1, $row, $item->{desc_widget});
3408 $self->{child}->add (2, $row, $item->{weight_widget}); 3497 $self->add (2, $row, $item->{weight_widget});
3409 3498
3410 $row++; 3499 $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, $end_cb) = @_;
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 $end_cb->() if $end_cb;
3531 });
3532}
3533
3534# $mod and $sym are the modifiers and key symbol
3535# $cmds is a array ref of strings (the commands)
3536# $cb is the callback that is executed on OK
3537# $ccb is the callback that is executed on CANCEL and
3538# when the binding was unsuccessful on OK
3539sub set_binding {
3540 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3541
3542 $self->clear_command_list;
3543 $self->{recording} = 0;
3544 $self->{rec_btn}->set_text ("start recording");
3545
3546 $self->{binding} = [$mod, $sym];
3547 $self->{commands} = $cmds;
3548
3549 $self->{binding_change} = $cb;
3550 $self->{binding_cancel} = $ccb;
3551
3552 $self->update_binding_widgets;
3553}
3554
3555# this is a shortcut method that asks for a binding
3556# and then just binds it.
3557sub do_quick_binding {
3558 my ($self, $cmds, $end_cb) = @_;
3559 $self->set_binding (undef, undef, $cmds, sub {
3560 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3561 });
3562 $self->ask_for_bind (1, $end_cb);
3563}
3564
3565sub update_binding_widgets {
3566 my ($self) = @_;
3567 my ($mod, $sym, $cmds) = $self->get_binding;
3568 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3569 $self->set_command_list ($cmds);
3570}
3571
3572sub get_binding {
3573 my ($self) = @_;
3574 return (
3575 $self->{binding}->[0],
3576 $self->{binding}->[1],
3577 [ grep { defined $_ } @{$self->{commands}} ]
3578 );
3579}
3580
3581sub clear_command_list {
3582 my ($self) = @_;
3583 $self->{cmdbox}->clear ();
3584}
3585
3586sub set_command_list {
3587 my ($self, $cmds) = @_;
3588
3589 $self->{cmdbox}->clear ();
3590 $self->{commands} = $cmds;
3591
3592 my $idx = 0;
3593
3594 for (@$cmds) {
3595 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3596
3597 my $i = $idx;
3598 $hb->add (new CFClient::UI::Label text => $_);
3599 $hb->add (new CFClient::UI::Button
3600 text => "delete",
3601 tooltip => "Deletes the action from the record",
3602 on_activate => sub {
3603 $self->{cmdbox}->remove ($hb);
3604 $cmds->[$i] = undef;
3605 });
3606
3607
3608 $idx++
3609 } 3500 }
3610} 3501}
3611 3502
3612############################################################################# 3503#############################################################################
3613 3504
… …
3667 } elsif ($ev->{button} == 2) { 3558 } elsif ($ev->{button} == 2) {
3668 $::CONN->user_send ("invoke $spell->{name}"); 3559 $::CONN->user_send ("invoke $spell->{name}");
3669 } elsif ($ev->{button} == 3) { 3560 } elsif ($ev->{button} == 3) {
3670 (new CFClient::UI::Menu 3561 (new CFClient::UI::Menu
3671 items => [ 3562 items => [
3672 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }], 3563 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3673 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }], 3564 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3674 ], 3565 ],
3675 )->popup ($ev); 3566 )->popup ($ev);
3676 } else { 3567 } else {
3677 return 0; 3568 return 0;
… …
3772 $coord = $max - $size if $coord > $max - $size; 3663 $coord = $max - $size if $coord > $max - $size;
3773 3664
3774 int $coord + 0.5 3665 int $coord + 0.5
3775} 3666}
3776 3667
3777sub size_allocate { 3668sub invoke_size_allocate {
3778 my ($self, $w, $h) = @_; 3669 my ($self, $w, $h) = @_;
3779 3670
3780 for my $child ($self->children) { 3671 for my $child ($self->children) {
3781 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3672 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3782 3673
… …
3786 $X = _to_pixel $X, $W, $self->{w}; 3677 $X = _to_pixel $X, $W, $self->{w};
3787 $Y = _to_pixel $Y, $H, $self->{h}; 3678 $Y = _to_pixel $Y, $H, $self->{h};
3788 3679
3789 $child->configure ($X, $Y, $W, $H); 3680 $child->configure ($X, $Y, $W, $H);
3790 } 3681 }
3682
3683 1
3791} 3684}
3792 3685
3793sub coord2local { 3686sub coord2local {
3794 my ($self, $x, $y) = @_; 3687 my ($self, $x, $y) = @_;
3795 3688

Diff Legend

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