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.302 by root, Mon Jun 12 13:26:14 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
1097 if ($self->{has_close_button}) {
1098 $self->{close_button} =
1099 new CFClient::UI::ImageButton
1100 path => 'x1_close.png',
1101 on_activate => sub { $self->emit ("delete") };
1102
1103 $self->CFClient::UI::Container::add ($self->{close_button});
1104 }
1105
1095 $self 1106 $self
1096} 1107}
1097 1108
1098sub add { 1109sub add {
1099 my ($self, @widgets) = @_; 1110 my ($self, @widgets) = @_;
1100 1111
1101 $self->SUPER::add (@widgets); 1112 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1102 $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};
1103} 1115}
1104 1116
1105sub border { 1117sub border {
1106 int $_[0]{border} * $::FONTSIZE 1118 int $_[0]{border} * $::FONTSIZE
… …
1109sub size_request { 1121sub size_request {
1110 my ($self) = @_; 1122 my ($self) = @_;
1111 1123
1112 $self->{title_widget}->size_request 1124 $self->{title_widget}->size_request
1113 if $self->{title_widget}; 1125 if $self->{title_widget};
1126
1127 $self->{close_button}->size_request
1128 if $self->{close_button};
1114 1129
1115 my ($w, $h) = $self->SUPER::size_request; 1130 my ($w, $h) = $self->SUPER::size_request;
1116 1131
1117 ( 1132 (
1118 $w + $self->border * 2, 1133 $w + $self->border * 2,
1119 $h + $self->border * 2, 1134 $h + $self->border * 2,
1120 ) 1135 )
1121} 1136}
1122 1137
1123sub size_allocate { 1138sub invoke_size_allocate {
1124 my ($self, $w, $h) = @_; 1139 my ($self, $w, $h) = @_;
1125 1140
1126 if ($self->{title_widget}) { 1141 if ($self->{title_widget}) {
1127 $self->{title_widget}{w} = $w; 1142 $self->{title_widget}{w} = $w;
1128 $self->{title_widget}{h} = $h; 1143 $self->{title_widget}{h} = $h;
1129 $self->{title_widget}->size_allocate ($w, $h); 1144 $self->{title_widget}->invoke_size_allocate ($w, $h);
1130 } 1145 }
1131 1146
1132 my $border = $self->border; 1147 my $border = $self->border;
1133 1148
1134 $h -= List::Util::max 0, $border * 2; 1149 $h -= List::Util::max 0, $border * 2;
1135 $w -= List::Util::max 0, $border * 2; 1150 $w -= List::Util::max 0, $border * 2;
1151
1152 $self->child->configure ($border, $border, $w, $h);
1153
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button};
1156
1157 1
1158}
1159
1160sub invoke_delete {
1161 my ($self) = @_;
1162
1163 $self->hide;
1136 1164
1137 $self->child->configure ($border, $border, $w, $h); 1165 1
1138} 1166}
1139 1167
1140sub button_down { 1168sub invoke_button_down {
1141 my ($self, $ev, $x, $y) = @_; 1169 my ($self, $ev, $x, $y) = @_;
1142 1170
1143 my ($w, $h) = @$self{qw(w h)}; 1171 my ($w, $h) = @$self{qw(w h)};
1144 my $border = $self->border; 1172 my $border = $self->border;
1145 1173
… …
1176 1204
1177 ($x, $y) = ($ev->{x}, $ev->{y}); 1205 ($x, $y) = ($ev->{x}, $ev->{y});
1178 1206
1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1207 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180 # HACK: the next line is required to enforce placement 1208 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1209 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1182 }; 1210 };
1183 } else { 1211 } else {
1184 return 0; 1212 return 0;
1185 } 1213 }
1186 1214
1187 1 1215 1
1188} 1216}
1189 1217
1190sub button_up { 1218sub invoke_button_up {
1191 my ($self, $ev, $x, $y) = @_; 1219 my ($self, $ev, $x, $y) = @_;
1192 1220
1193 !!delete $self->{motion} 1221 ! ! delete $self->{motion}
1194} 1222}
1195 1223
1196sub mouse_motion { 1224sub invoke_mouse_motion {
1197 my ($self, $ev, $x, $y) = @_; 1225 my ($self, $ev, $x, $y) = @_;
1198 1226
1199 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1227 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200 1228
1201 !!$self->{motion} 1229 ! ! $self->{motion}
1202} 1230}
1203 1231
1204sub _draw { 1232sub _draw {
1205 my ($self) = @_; 1233 my ($self) = @_;
1206 1234
… …
1235 $child->draw; 1263 $child->draw;
1236 1264
1237 if ($self->{title_widget}) { 1265 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h}; 1266 glTranslate 0, $border - $self->{h};
1239 $self->{title_widget}->_draw; 1267 $self->{title_widget}->_draw;
1268
1269 glTranslate 0, - ($border - $self->{h});
1240 } 1270 }
1271
1272 $self->{close_button}->draw
1273 if $self->{close_button};
1241} 1274}
1242 1275
1243############################################################################# 1276#############################################################################
1244 1277
1245package CFClient::UI::Table; 1278package CFClient::UI::Table;
… …
1324 (sum @$ws), 1357 (sum @$ws),
1325 (sum @$hs), 1358 (sum @$hs),
1326 ) 1359 )
1327} 1360}
1328 1361
1329sub size_allocate { 1362sub invoke_size_allocate {
1330 my ($self, $w, $h) = @_; 1363 my ($self, $w, $h) = @_;
1331 1364
1332 my ($ws, $hs) = $self->get_wh; 1365 my ($ws, $hs) = $self->get_wh;
1333 1366
1334 my $req_w = (sum @$ws) || 1; 1367 my $req_w = (sum @$ws) || 1;
… …
1366 } 1399 }
1367 1400
1368 $y += $row_h; 1401 $y += $row_h;
1369 } 1402 }
1370 1403
1404 1
1371} 1405}
1372 1406
1373sub find_widget { 1407sub find_widget {
1374 my ($self, $x, $y) = @_; 1408 my ($self, $x, $y) = @_;
1375 1409
… …
1412 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1446 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1413 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1447 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1414 ) 1448 )
1415} 1449}
1416 1450
1417sub size_allocate { 1451sub invoke_size_allocate {
1418 my ($self, $w, $h) = @_; 1452 my ($self, $w, $h) = @_;
1419 1453
1420 my $space = $self->{vertical} ? $h : $w; 1454 my $space = $self->{vertical} ? $h : $w;
1421 my $children = $self->{children}; 1455 my @children = $self->visible_children;
1422 1456
1423 my @req; 1457 my @req;
1424 1458
1425 if ($self->{homogeneous}) { 1459 if ($self->{homogeneous}) {
1426 @req = ($space / (@$children || 1)) x @$children; 1460 @req = ($space / (@children || 1)) x @children;
1427 } else { 1461 } else {
1428 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1462 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1429 my $req = List::Util::sum @req; 1463 my $req = List::Util::sum @req;
1430 1464
1431 if ($req > $space) { 1465 if ($req > $space) {
1432 # ah well, not enough space 1466 # ah well, not enough space
1433 $_ *= $space / $req for @req; 1467 $_ *= $space / $req for @req;
1434 } else { 1468 } else {
1435 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1469 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1436 1470
1437 $space = ($space - $req) / $expand; # remaining space to give away 1471 $space = ($space - $req) / $expand; # remaining space to give away
1438 1472
1439 $req[$_] += $space * $children->[$_]{expand} 1473 $req[$_] += $space * $children[$_]{expand}
1440 for 0 .. $#$children; 1474 for 0 .. $#children;
1441 } 1475 }
1442 } 1476 }
1443 1477
1444 CFClient::UI::harmonize \@req; 1478 CFClient::UI::harmonize \@req;
1445 1479
1446 my $pos = 0; 1480 my $pos = 0;
1447 for (0 .. $#$children) { 1481 for (0 .. $#children) {
1448 my $alloc = $req[$_]; 1482 my $alloc = $req[$_];
1449 $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));
1450 1484
1451 $pos += $alloc; 1485 $pos += $alloc;
1452 } 1486 }
1453 1487
1454 1 1488 1
… …
1557 my ($self, $text) = @_; 1591 my ($self, $text) = @_;
1558 1592
1559 return if $self->{text} eq "T$text"; 1593 return if $self->{text} eq "T$text";
1560 $self->{text} = "T$text"; 1594 $self->{text} = "T$text";
1561 1595
1562 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1563 $self->{layout}->set_text ($text); 1596 $self->{layout}->set_text ($text);
1564 1597
1565 delete $self->{size_req}; 1598 delete $self->{size_req};
1566 $self->realloc; 1599 $self->realloc;
1567 $self->update; 1600 $self->update;
… …
1573 return if $self->{text} eq "M$markup"; 1606 return if $self->{text} eq "M$markup";
1574 $self->{text} = "M$markup"; 1607 $self->{text} = "M$markup";
1575 1608
1576 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1609 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1577 1610
1578 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1579 $self->{layout}->set_markup ($markup); 1611 $self->{layout}->set_markup ($markup);
1580 1612
1581 delete $self->{size_req}; 1613 delete $self->{size_req};
1582 $self->realloc; 1614 $self->realloc;
1583 $self->update; 1615 $self->update;
… …
1595 1627
1596 my ($w, $h) = $self->{layout}->size; 1628 my ($w, $h) = $self->{layout}->size;
1597 1629
1598 if (exists $self->{template}) { 1630 if (exists $self->{template}) {
1599 $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);
1600 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1633 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1601 1634
1602 my ($w2, $h2) = $self->{template}->size; 1635 my ($w2, $h2) = $self->{template}->size;
1603 1636
1604 $w = List::Util::max $w, $w2; 1637 $w = List::Util::max $w, $w2;
… …
1609 }; 1642 };
1610 1643
1611 @{ $self->{size_req} } 1644 @{ $self->{size_req} }
1612} 1645}
1613 1646
1647sub baseline_shift {
1648 $_[0]{layout}->descent
1649}
1650
1614sub size_allocate { 1651sub invoke_size_allocate {
1615 my ($self, $w, $h) = @_; 1652 my ($self, $w, $h) = @_;
1616 1653
1617 delete $self->{ox}; 1654 delete $self->{ox};
1618 1655
1619 delete $self->{texture} 1656 delete $self->{texture}
1620 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
1621} 1660}
1622 1661
1623sub set_fontsize { 1662sub set_fontsize {
1624 my ($self, $fontsize) = @_; 1663 my ($self, $fontsize) = @_;
1625 1664
1626 $self->{fontsize} = $fontsize; 1665 $self->{fontsize} = $fontsize;
1666 delete $self->{size_req};
1627 delete $self->{texture}; 1667 delete $self->{texture};
1628 1668
1629 $self->realloc; 1669 $self->realloc;
1630} 1670}
1631 1671
1632sub reconfigure { 1672sub reconfigure {
1633 my ($self) = @_; 1673 my ($self) = @_;
1634 1674
1635 delete $self->{size_req}; 1675 delete $self->{size_req};
1676 delete $self->{texture};
1636 1677
1637 $self->SUPER::reconfigure; 1678 $self->SUPER::reconfigure;
1638} 1679}
1639 1680
1640sub _draw { 1681sub _draw {
1641 my ($self) = @_; 1682 my ($self) = @_;
1642 1683
1643 $self->SUPER::_draw; # draw background, if applicable 1684 $self->SUPER::_draw; # draw background, if applicable
1644 1685
1645 my $tex = $self->{texture} ||= do { 1686 my $size = $self->{texture} ||= do {
1646 $self->{layout}->set_foreground (@{$self->{fg}}); 1687 $self->{layout}->set_foreground (@{$self->{fg}});
1647 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1688 $self->{layout}->set_font ($self->{font}) if $self->{font};
1648 $self->{layout}->set_width ($self->{w}); 1689 $self->{layout}->set_width ($self->{w});
1649 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1690 $self->{layout}->set_ellipsise ($self->{ellipsise});
1650 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1691 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1651 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1692 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1652 1693
1653 new_from_layout CFClient::Texture $self->{layout} 1694 [$self->{layout}->size]
1654 }; 1695 };
1655 1696
1656 unless (exists $self->{ox}) { 1697 unless (exists $self->{ox}) {
1657 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1698 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1658 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1699 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1659 : ($self->{w} - $tex->{w}) * 0.5); 1700 : ($self->{w} - $size->[0]) * 0.5);
1660 1701
1661 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1702 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1662 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1703 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1663 : ($self->{h} - $tex->{h}) * 0.5); 1704 : ($self->{h} - $size->[1]) * 0.5);
1664 }; 1705 };
1665 1706
1666 glEnable GL_TEXTURE_2D;
1667
1668 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1707 my $w = List::Util::min $self->{w} + 4, $size->[0];
1669 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1708 my $h = List::Util::min $self->{h} + 2, $size->[1];
1670 1709
1671 if ($tex->{format} == GL_ALPHA) { 1710 $self->{layout}->render ($self->{ox}, $self->{oy});
1672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1673 glColor @{$self->{fg}};
1674 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1675 } else {
1676 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1677 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1678 }
1679
1680 glDisable GL_TEXTURE_2D;
1681} 1711}
1682 1712
1683############################################################################# 1713#############################################################################
1684 1714
1685package CFClient::UI::EntryBase; 1715package CFClient::UI::EntryBase;
… …
1718 1748
1719 $text =~ s/./*/g if $self->{hidden}; 1749 $text =~ s/./*/g if $self->{hidden};
1720 $self->{layout}->set_text ("$text "); 1750 $self->{layout}->set_text ("$text ");
1721 delete $self->{size_req}; 1751 delete $self->{size_req};
1722 1752
1723 $self->_emit (changed => $self->{text}); 1753 $self->emit (changed => $self->{text});
1724 1754
1725 $self->realloc; 1755 $self->realloc;
1726 $self->update; 1756 $self->update;
1727} 1757}
1728 1758
… …
1743 my ($w, $h) = $self->SUPER::size_request; 1773 my ($w, $h) = $self->SUPER::size_request;
1744 1774
1745 ($w + 1, $h) # add 1 for cursor 1775 ($w + 1, $h) # add 1 for cursor
1746} 1776}
1747 1777
1748sub key_down { 1778sub invoke_key_down {
1749 my ($self, $ev) = @_; 1779 my ($self, $ev) = @_;
1750 1780
1751 my $mod = $ev->{mod}; 1781 my $mod = $ev->{mod};
1752 my $sym = $ev->{sym}; 1782 my $sym = $ev->{sym};
1753 my $uni = $ev->{unicode}; 1783 my $uni = $ev->{unicode};
… …
1765 } elsif ($sym == CFClient::SDLK_HOME) { 1795 } elsif ($sym == CFClient::SDLK_HOME) {
1766 $self->{cursor} = 0; 1796 $self->{cursor} = 0;
1767 } elsif ($sym == CFClient::SDLK_END) { 1797 } elsif ($sym == CFClient::SDLK_END) {
1768 $self->{cursor} = length $text; 1798 $self->{cursor} = length $text;
1769 } elsif ($uni == 27) { 1799 } elsif ($uni == 27) {
1770 $self->_emit ('escape'); 1800 $self->emit ('escape');
1771 } elsif ($uni) { 1801 } elsif ($uni) {
1772 substr $text, $self->{cursor}++, 0, chr $uni; 1802 substr $text, $self->{cursor}++, 0, chr $uni;
1773 } else { 1803 } else {
1774 return 0; 1804 return 0;
1775 } 1805 }
… …
1779 $self->realloc; 1809 $self->realloc;
1780 1810
1781 1 1811 1
1782} 1812}
1783 1813
1784sub focus_in { 1814sub invoke_focus_in {
1785 my ($self) = @_; 1815 my ($self) = @_;
1786 1816
1787 $self->{last_activity} = $::NOW; 1817 $self->{last_activity} = $::NOW;
1788 1818
1789 $self->SUPER::focus_in; 1819 $self->SUPER::invoke_focus_in
1790} 1820}
1791 1821
1792sub button_down { 1822sub invoke_button_down {
1793 my ($self, $ev, $x, $y) = @_; 1823 my ($self, $ev, $x, $y) = @_;
1794 1824
1795 $self->SUPER::button_down ($ev, $x, $y); 1825 $self->SUPER::invoke_button_down ($ev, $x, $y);
1796 1826
1797 my $idx = $self->{layout}->xy_to_index ($x, $y); 1827 my $idx = $self->{layout}->xy_to_index ($x, $y);
1798 1828
1799 # byte-index to char-index 1829 # byte-index to char-index
1800 my $text = $self->{text}; 1830 my $text = $self->{text};
… …
1805 $self->update; 1835 $self->update;
1806 1836
1807 1 1837 1
1808} 1838}
1809 1839
1810sub mouse_motion { 1840sub invoke_mouse_motion {
1811 my ($self, $ev, $x, $y) = @_; 1841 my ($self, $ev, $x, $y) = @_;
1812# 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#
1813 1843
1814 0 1844 1
1815} 1845}
1816 1846
1817sub _draw { 1847sub _draw {
1818 my ($self) = @_; 1848 my ($self) = @_;
1819 1849
… …
1860 1890
1861our @ISA = CFClient::UI::EntryBase::; 1891our @ISA = CFClient::UI::EntryBase::;
1862 1892
1863use CFClient::OpenGL; 1893use CFClient::OpenGL;
1864 1894
1865sub key_down { 1895sub invoke_key_down {
1866 my ($self, $ev) = @_; 1896 my ($self, $ev) = @_;
1867 1897
1868 my $sym = $ev->{sym}; 1898 my $sym = $ev->{sym};
1869 1899
1870 if ($sym == 13) { 1900 if ($sym == 13) {
1871 unshift @{$self->{history}}, 1901 unshift @{$self->{history}},
1872 my $txt = $self->get_text; 1902 my $txt = $self->get_text;
1903
1873 $self->{history_pointer} = -1; 1904 $self->{history_pointer} = -1;
1874 $self->{history_saveback} = ''; 1905 $self->{history_saveback} = '';
1875 $self->_emit (activate => $txt); 1906 $self->emit (activate => $txt);
1876 $self->update; 1907 $self->update;
1877 1908
1878 } elsif ($sym == CFClient::SDLK_UP) { 1909 } elsif ($sym == CFClient::SDLK_UP) {
1879 if ($self->{history_pointer} < 0) { 1910 if ($self->{history_pointer} < 0) {
1880 $self->{history_saveback} = $self->get_text; 1911 $self->{history_saveback} = $self->get_text;
… …
1896 } else { 1927 } else {
1897 $self->set_text ($self->{history_saveback}); 1928 $self->set_text ($self->{history_saveback});
1898 } 1929 }
1899 1930
1900 } else { 1931 } else {
1901 return $self->SUPER::key_down ($ev) 1932 return $self->SUPER::invoke_key_down ($ev)
1902 } 1933 }
1903 1934
1904 1 1935 1
1905} 1936}
1906 1937
… …
1930 can_events => 1, 1961 can_events => 1,
1931 @_ 1962 @_
1932 ) 1963 )
1933} 1964}
1934 1965
1935sub activate { }
1936
1937sub button_up { 1966sub invoke_button_up {
1938 my ($self, $ev, $x, $y) = @_; 1967 my ($self, $ev, $x, $y) = @_;
1939 1968
1940 $self->emit ("activate") 1969 $self->emit ("activate")
1941 if $x >= 0 && $x < $self->{w} 1970 if $x >= 0 && $x < $self->{w}
1942 && $y >= 0 && $y < $self->{h}; 1971 && $y >= 0 && $y < $self->{h};
… …
1956 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1985 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1957 1986
1958 glDisable GL_TEXTURE_2D; 1987 glDisable GL_TEXTURE_2D;
1959 1988
1960 $self->SUPER::_draw; 1989 $self->SUPER::_draw;
1990}
1991
1992#############################################################################
1993
1994package CFClient::UI::ImageButton;
1995
1996our @ISA = CFClient::UI::Image::;
1997
1998use CFClient::OpenGL;
1999
2000my %textures;
2001
2002sub new {
2003 my $class = shift;
2004
2005 my $self = $class->SUPER::new (
2006 padding_x => 4,
2007 padding_y => 4,
2008 fg => [1, 1, 1],
2009 active_fg => [0, 0, 1],
2010 can_hover => 1,
2011 align => 0,
2012 valign => 0,
2013 can_events => 1,
2014 @_
2015 );
2016}
2017
2018sub invoke_button_up {
2019 my ($self, $ev, $x, $y) = @_;
2020
2021 $self->emit ("activate")
2022 if $x >= 0 && $x < $self->{w}
2023 && $y >= 0 && $y < $self->{h};
2024
2025 1
1961} 2026}
1962 2027
1963############################################################################# 2028#############################################################################
1964 2029
1965package CFClient::UI::CheckBox; 2030package CFClient::UI::CheckBox;
… …
1992 my ($self) = @_; 2057 my ($self) = @_;
1993 2058
1994 (6) x 2 2059 (6) x 2
1995} 2060}
1996 2061
2062sub toggle {
2063 my ($self) = @_;
2064
2065 $self->{state} = !$self->{state};
2066 $self->emit (changed => $self->{state});
2067 $self->update;
2068}
2069
1997sub button_down { 2070sub invoke_button_down {
1998 my ($self, $ev, $x, $y) = @_; 2071 my ($self, $ev, $x, $y) = @_;
1999 2072
2000 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2073 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2001 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2074 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2002 $self->{state} = !$self->{state}; 2075 $self->toggle;
2003 $self->_emit (changed => $self->{state});
2004 } else { 2076 } else {
2005 return 0 2077 return 0
2006 } 2078 }
2007 2079
2008 1 2080 1
… …
2033package CFClient::UI::Image; 2105package CFClient::UI::Image;
2034 2106
2035our @ISA = CFClient::UI::Base::; 2107our @ISA = CFClient::UI::Base::;
2036 2108
2037use CFClient::OpenGL; 2109use CFClient::OpenGL;
2038use Carp qw/confess/;
2039 2110
2040our %loaded_images; 2111our %texture_cache;
2041 2112
2042sub new { 2113sub new {
2043 my $class = shift; 2114 my $class = shift;
2044 2115
2045 my $self = $class->SUPER::new (can_events => 0, @_); 2116 my $self = $class->SUPER::new (
2117 can_events => 0,
2118 @_,
2119 );
2046 2120
2047 $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";
2048 2123
2049 $loaded_images{$self->{image}} ||= 2124 $self->{tex} = $texture_cache{$self->{path}} ||=
2050 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;
2051 2126
2052 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2127 Scalar::Util::weaken $texture_cache{$self->{path}};
2053 2128
2054 Scalar::Util::weaken $loaded_images{$self->{image}}; 2129 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2055
2056 $self->{aspect} = $tex->{w} / $tex->{h};
2057 2130
2058 $self 2131 $self
2059} 2132}
2060 2133
2061sub size_request { 2134sub size_request {
2062 my ($self) = @_; 2135 my ($self) = @_;
2063 2136
2064 ($self->{tex}->{w}, $self->{tex}->{h}) 2137 ($self->{tex}{w}, $self->{tex}{h})
2065} 2138}
2066 2139
2067sub _draw { 2140sub _draw {
2068 my ($self) = @_; 2141 my ($self) = @_;
2069 2142
… …
2178 my $ycut1 = max 0, min 1, $ycut; 2251 my $ycut1 = max 0, min 1, $ycut;
2179 my $ycut2 = max 0, min 1, $ycut - 1; 2252 my $ycut2 = max 0, min 1, $ycut - 1;
2180 2253
2181 my $h1 = $self->{h} * (1 - $ycut1); 2254 my $h1 = $self->{h} * (1 - $ycut1);
2182 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);
2183 2259
2184 glEnable GL_BLEND; 2260 glEnable GL_BLEND;
2185 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2261 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2186 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2262 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2187 glEnable GL_TEXTURE_2D; 2263 glEnable GL_TEXTURE_2D;
… …
2206 2282
2207 if ($t3) { 2283 if ($t3) {
2208 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2284 glBindTexture GL_TEXTURE_2D, $t3->{name};
2209 glBegin GL_QUADS; 2285 glBegin GL_QUADS;
2210 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2286 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2211 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2287 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2212 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2288 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2213 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2289 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2214 glEnd; 2290 glEnd;
2215 } 2291 }
2216 2292
2217 glDisable GL_BLEND; 2293 glDisable GL_BLEND;
… …
2305 $self->update; 2381 $self->update;
2306 2382
2307 $self 2383 $self
2308} 2384}
2309 2385
2310sub changed { }
2311
2312sub set_range { 2386sub set_range {
2313 my ($self, $range) = @_; 2387 my ($self, $range) = @_;
2314 2388
2315 ($range, $self->{range}) = ($self->{range}, $range); 2389 ($range, $self->{range}) = ($self->{range}, $range);
2316 2390
… …
2336 if $unit; 2410 if $unit;
2337 2411
2338 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2412 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2339 2413
2340 if ($value != $old_value) { 2414 if ($value != $old_value) {
2341 $self->_emit (changed => $value); 2415 $self->emit (changed => $value);
2342 $self->update; 2416 $self->update;
2343 } 2417 }
2344} 2418}
2345 2419
2346sub size_request { 2420sub size_request {
2347 my ($self) = @_; 2421 my ($self) = @_;
2348 2422
2349 ($self->{req_w}, $self->{req_h}) 2423 ($self->{req_w}, $self->{req_h})
2350} 2424}
2351 2425
2352sub button_down { 2426sub invoke_button_down {
2353 my ($self, $ev, $x, $y) = @_; 2427 my ($self, $ev, $x, $y) = @_;
2354 2428
2355 $self->SUPER::button_down ($ev, $x, $y); 2429 $self->SUPER::invoke_button_down ($ev, $x, $y);
2356 2430
2357 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2431 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2358 2432
2359 $self->mouse_motion ($ev, $x, $y) 2433 $self->invoke_mouse_motion ($ev, $x, $y)
2360} 2434}
2361 2435
2362sub mouse_motion { 2436sub invoke_mouse_motion {
2363 my ($self, $ev, $x, $y) = @_; 2437 my ($self, $ev, $x, $y) = @_;
2364 2438
2365 if ($GRAB == $self) { 2439 if ($GRAB == $self) {
2366 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2440 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2367 2441
… …
2488 can_events => 0, 2562 can_events => 0,
2489 indent => 0, 2563 indent => 0,
2490 #font => default_font 2564 #font => default_font
2491 @_, 2565 @_,
2492 2566
2493 layout => (new CFClient::Layout 1), 2567 layout => (new CFClient::Layout),
2494 par => [], 2568 par => [],
2495 height => 0, 2569 height => 0,
2496 children => [ 2570 children => [
2497 (new CFClient::UI::Empty expand => 1), 2571 (new CFClient::UI::Empty expand => 1),
2498 (new CFClient::UI::Slider vertical => 1), 2572 (new CFClient::UI::Slider vertical => 1),
… …
2509 2583
2510 $self->{fontsize} = $fontsize; 2584 $self->{fontsize} = $fontsize;
2511 $self->reflow; 2585 $self->reflow;
2512} 2586}
2513 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
2514sub size_allocate { 2597sub invoke_size_allocate {
2515 my ($self, $w, $h) = @_; 2598 my ($self, $w, $h) = @_;
2516 2599
2517 $self->SUPER::size_allocate ($w, $h); 2600 my ($empty, $slider, @other) = @{ $self->{children} };
2601 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2518 2602
2519 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2603 $self->{layout}->set_font ($self->{font}) if $self->{font};
2520 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2604 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2521 $self->{layout}->set_width ($self->{children}[0]{w}); 2605 $self->{layout}->set_width ($empty->{w});
2522 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2606 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2523 2607
2524 $self->reflow; 2608 $self->reflow;
2525}
2526 2609
2527sub text_size { 2610 local $self->{children} = [$empty, $slider];
2528 my ($self, $text, $indent) = @_; 2611 $self->SUPER::invoke_size_allocate ($w, $h)
2612}
2613
2614sub get_layout {
2615 my ($self, $para) = @_;
2529 2616
2530 my $layout = $self->{layout}; 2617 my $layout = $self->{layout};
2531 2618
2619 $layout->set_font ($self->{font}) if $self->{font};
2620 $layout->set_foreground (@{$para->{fg}});
2532 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2621 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2533 $layout->set_width ($self->{children}[0]{w} - $indent); 2622 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2534 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2623 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2535 $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}}
2536 2630 );
2631
2537 $layout->size 2632 $layout
2538} 2633}
2539 2634
2540sub reflow { 2635sub reflow {
2541 my ($self) = @_; 2636 my ($self) = @_;
2542 2637
… …
2551 $self->{children}[1]->set_value ($offset); 2646 $self->{children}[1]->set_value ($offset);
2552} 2647}
2553 2648
2554sub clear { 2649sub clear {
2555 my ($self) = @_; 2650 my ($self) = @_;
2651
2652 my (undef, undef, @other) = @{ $self->{children} };
2653 $self->remove ($_) for @other;
2556 2654
2557 $self->{par} = []; 2655 $self->{par} = [];
2558 $self->{height} = 0; 2656 $self->{height} = 0;
2559 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2657 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2560} 2658}
2561 2659
2562sub add_paragraph { 2660sub add_paragraph {
2563 my ($self, $color, $text, $indent) = @_; 2661 my ($self, $color, $para, $indent) = @_;
2564 2662
2565 for my $line (split /\n/, $text) { 2663 my ($text, @w) = ref $para ? @$para : $para;
2566 my ($w, $h) = $self->text_size ($line); 2664
2567 $self->{height} += $h; 2665 $para = {
2568 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,
2569 } 2672 };
2570 2673
2571 $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;
2572} 2686}
2573 2687
2574sub update { 2688sub update {
2575 my ($self) = @_; 2689 my ($self) = @_;
2576 2690
… …
2584 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2698 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2585 2699
2586 if (delete $self->{need_reflow}) { 2700 if (delete $self->{need_reflow}) {
2587 my $height = 0; 2701 my $height = 0;
2588 2702
2589 my $layout = $self->{layout};
2590
2591 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2592
2593 for (@{$self->{par}}) { 2703 for my $para (@{$self->{par}}) {
2594 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2704 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2595 $layout->set_width ($W - $_->[3]); 2705 my $layout = $self->get_layout ($para);
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2597 $layout->set_markup ($_->[4]);
2598 my ($w, $h) = $layout->size; 2706 my ($w, $h) = $layout->size;
2599 $_->[0] = $w + $_->[3]; 2707
2600 $_->[1] = $h; 2708 $para->{w} = $w + $para->{indent};
2709 $para->{h} = $h;
2710 $para->{wrapped} = $layout->has_wrapped;
2601 } 2711 }
2602 2712
2603 $height += $_->[1]; 2713 $height += $para->{h};
2604 } 2714 }
2605 2715
2606 $self->{height} = $height; 2716 $self->{height} = $height;
2607 2717
2608 $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]);
2609 2719
2610 delete $self->{texture}; 2720 delete $self->{texture};
2721 }
2722
2723 if (delete $self->{scroll_to_bottom}) {
2724 $self->{children}[1]->set_value (1e10);
2611 } 2725 }
2612 2726
2613 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2727 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2614 glClearColor 0, 0, 0, 0; 2728 glClearColor 0, 0, 0, 0;
2615 glClear GL_COLOR_BUFFER_BIT; 2729 glClear GL_COLOR_BUFFER_BIT;
… …
2619 my $y0 = $top; 2733 my $y0 = $top;
2620 my $y1 = $top + $H; 2734 my $y1 = $top + $H;
2621 2735
2622 my $y = 0; 2736 my $y = 0;
2623 2737
2624 my $layout = $self->{layout};
2625
2626 $layout->set_font ($self->{font}) if $self->{font};
2627
2628 glEnable GL_BLEND;
2629 #TODO# not correct in windows where rgba is forced off
2630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2631
2632 for my $par (@{$self->{par}}) { 2738 for my $para (@{$self->{par}}) {
2633 my $h = $par->[1]; 2739 my $h = $para->{h};
2634 2740
2635 if ($y0 < $y + $h && $y < $y1) { 2741 if ($y0 < $y + $h && $y < $y1) {
2636 $layout->set_foreground (@{ $par->[2] });
2637 $layout->set_width ($W - $par->[3]);
2638 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2639 $layout->set_markup ($par->[4]);
2640 2742
2641 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2743 my $layout = $self->get_layout ($para);
2642 2744
2643 glRasterPos $par->[3], $y - $y0; 2745 $layout->render ($para->{indent}, $y - $y0);
2644 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 }
2645 } 2759 }
2646 2760
2647 $y += $h; 2761 $y += $h;
2648 } 2762 }
2649
2650 glDisable GL_BLEND;
2651 }; 2763 };
2652 }); 2764 });
2765}
2766
2767sub reconfigure {
2768 my ($self) = @_;
2769
2770 $self->SUPER::reconfigure;
2771
2772 $_->{w} = 1e10 for @{ $self->{par} };
2773 $self->reflow;
2653} 2774}
2654 2775
2655sub _draw { 2776sub _draw {
2656 my ($self) = @_; 2777 my ($self) = @_;
2657 2778
… …
2660 glColor 0, 0, 0, 1; 2781 glColor 0, 0, 0, 1;
2661 $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});
2662 glDisable GL_TEXTURE_2D; 2783 glDisable GL_TEXTURE_2D;
2663 2784
2664 $self->{children}[1]->draw; 2785 $self->{children}[1]->draw;
2665
2666} 2786}
2667 2787
2668############################################################################# 2788#############################################################################
2669 2789
2670package CFClient::UI::Animator; 2790package CFClient::UI::Animator;
… …
2779 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2899 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2780 2900
2781 ($w + 4, $h + 4) 2901 ($w + 4, $h + 4)
2782} 2902}
2783 2903
2784sub size_allocate { 2904sub invoke_size_allocate {
2785 my ($self, $w, $h) = @_; 2905 my ($self, $w, $h) = @_;
2786 2906
2787 $self->SUPER::size_allocate ($w - 4, $h - 4); 2907 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2788} 2908}
2789 2909
2790sub visibility_change { 2910sub invoke_visibility_change {
2791 my ($self, $visible) = @_; 2911 my ($self, $visible) = @_;
2792 2912
2793 return unless $visible; 2913 return unless $visible;
2794 2914
2795 $self->{root}->on_post_alloc ("move_$self" => sub { 2915 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2943 for my $item (@{ $self->{items} }) { 3063 for my $item (@{ $self->{items} }) {
2944 my ($widget, $cb, $tooltip) = @$item; 3064 my ($widget, $cb, $tooltip) = @$item;
2945 3065
2946 # handle various types of items, only text for now 3066 # handle various types of items, only text for now
2947 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 {
2948 $widget = new CFClient::UI::Label 3082 $widget = new CFClient::UI::Label
2949 can_hover => 1, 3083 can_hover => 1,
2950 can_events => 1, 3084 can_events => 1,
2951 markup => $widget, 3085 markup => $widget,
2952 tooltip => $tooltip 3086 tooltip => $tooltip;
3087 }
2953 } 3088 }
2954 3089
2955 $self->{item}{$widget} = $item; 3090 $self->{item}{$widget} = $item;
2956 3091
2957 $self->{vbox}->add ($widget); 3092 $self->{vbox}->add ($widget);
… …
2962 3097
2963# 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)
2964sub popup { 3099sub popup {
2965 my ($self, $ev) = @_; 3100 my ($self, $ev) = @_;
2966 3101
2967 $self->_emit ("popdown"); 3102 $self->emit ("popdown");
2968 3103
2969 # maybe save $GRAB? must be careful about events... 3104 # maybe save $GRAB? must be careful about events...
2970 $GRAB = $self; 3105 $GRAB = $self;
2971 $self->{button} = $ev->{button}; 3106 $self->{button} = $ev->{button};
2972 3107
2973 $self->show; 3108 $self->show;
2974 $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);
2975} 3110}
2976 3111
2977sub mouse_motion { 3112sub invoke_mouse_motion {
2978 my ($self, $ev, $x, $y) = @_; 3113 my ($self, $ev, $x, $y) = @_;
2979 3114
2980 # TODO: should use vbox->find_widget or so 3115 # TODO: should use vbox->find_widget or so
2981 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3116 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2982 $self->{hover} = $self->{item}{$HOVER}; 3117 $self->{hover} = $self->{item}{$HOVER};
2983 3118
2984 0 3119 0
2985} 3120}
2986 3121
2987sub button_up { 3122sub invoke_button_up {
2988 my ($self, $ev, $x, $y) = @_; 3123 my ($self, $ev, $x, $y) = @_;
2989 3124
2990 if ($ev->{button} == $self->{button}) { 3125 if ($ev->{button} == $self->{button}) {
2991 undef $GRAB; 3126 undef $GRAB;
2992 $self->hide; 3127 $self->hide;
2993 3128
2994 $self->_emit ("popdown"); 3129 $self->emit ("popdown");
2995 $self->{hover}[1]->() if $self->{hover}; 3130 $self->{hover}[1]->() if $self->{hover};
2996 } else { 3131 } else {
2997 return 0 3132 return 0
2998 } 3133 }
2999 3134
… …
3026 3161
3027 $self->{current} = $self->{children}[0] 3162 $self->{current} = $self->{children}[0]
3028 if @{ $self->{children} }; 3163 if @{ $self->{children} };
3029} 3164}
3030 3165
3166sub get_current_page {
3167 my ($self) = @_;
3168
3169 $self->{current}
3170}
3171
3031sub set_current_page { 3172sub set_current_page {
3032 my ($self, $page_or_widget) = @_; 3173 my ($self, $page_or_widget) = @_;
3033 3174
3034 my $widget = ref $page_or_widget 3175 my $widget = ref $page_or_widget
3035 ? $page_or_widget 3176 ? $page_or_widget
3036 : $self->{children}[$page_or_widget]; 3177 : $self->{children}[$page_or_widget];
3037 3178
3038 $self->{current} = $widget; 3179 $self->{current} = $widget;
3039 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3180 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3040 3181
3041 $self->_emit (page_changed => $self->{current}); 3182 $self->emit (page_changed => $self->{current});
3042 3183
3043 $self->realloc; 3184 $self->realloc;
3044} 3185}
3045 3186
3046sub visible_children { 3187sub visible_children {
… …
3051 my ($self) = @_; 3192 my ($self) = @_;
3052 3193
3053 $self->{current}->size_request 3194 $self->{current}->size_request
3054} 3195}
3055 3196
3056sub size_allocate { 3197sub invoke_size_allocate {
3057 my ($self, $w, $h) = @_; 3198 my ($self, $w, $h) = @_;
3058 3199
3059 $self->{current}->configure (0, 0, $w, $h); 3200 $self->{current}->configure (0, 0, $w, $h);
3201
3202 1
3060} 3203}
3061 3204
3062sub _draw { 3205sub _draw {
3063 my ($self) = @_; 3206 my ($self) = @_;
3064 3207
… …
3099 ); 3242 );
3100 3243
3101 $self->{multiplexer}->add ($widget); 3244 $self->{multiplexer}->add ($widget);
3102} 3245}
3103 3246
3247sub get_current_page {
3248 my ($self) = @_;
3249
3250 $self->{multiplexer}->get_current_page
3251}
3252
3104sub set_current_page { 3253sub set_current_page {
3105 my ($self, $page) = @_; 3254 my ($self, $page) = @_;
3106 3255
3107 $self->{multiplexer}->set_current_page ($page); 3256 $self->{multiplexer}->set_current_page ($page);
3108 $self->_emit (page_changed => $self->{multiplexer}{current}); 3257 $self->emit (page_changed => $self->{multiplexer}{current});
3109} 3258}
3110 3259
3111############################################################################# 3260#############################################################################
3112 3261
3113package CFClient::UI::Combobox; 3262package CFClient::UI::Combobox;
… …
3128 $self->_set_value ($self->{value}); 3277 $self->_set_value ($self->{value});
3129 3278
3130 $self 3279 $self
3131} 3280}
3132 3281
3133sub button_down { 3282sub invoke_button_down {
3134 my ($self, $ev) = @_; 3283 my ($self, $ev) = @_;
3135 3284
3136 my @menu_items; 3285 my @menu_items;
3137 3286
3138 for (@{ $self->{options} }) { 3287 for (@{ $self->{options} }) {
… …
3159 my ($self, $value) = @_; 3308 my ($self, $value) = @_;
3160 3309
3161 return unless $self->{value} ne $value; 3310 return unless $self->{value} ne $value;
3162 3311
3163 $self->_set_value ($value); 3312 $self->_set_value ($value);
3164 $self->_emit (changed => $value); 3313 $self->emit (changed => $value);
3165} 3314}
3166 3315
3167############################################################################# 3316#############################################################################
3168 3317
3169package CFClient::UI::Statusbox; 3318package CFClient::UI::Statusbox;
… …
3284 count => 1, 3433 count => 1,
3285 %arg, 3434 %arg,
3286 }; 3435 };
3287 } 3436 }
3288 3437
3438 $ROOT->on_refresh (reorder => sub {
3289 $self->reorder; 3439 $self->reorder;
3440 });
3290} 3441}
3291 3442
3292sub reconfigure { 3443sub reconfigure {
3293 my ($self) = @_; 3444 my ($self) = @_;
3294 3445
… …
3309 3460
3310############################################################################# 3461#############################################################################
3311 3462
3312package CFClient::UI::Inventory; 3463package CFClient::UI::Inventory;
3313 3464
3314our @ISA = CFClient::UI::ScrolledWindow::; 3465our @ISA = CFClient::UI::Table::;
3315 3466
3316sub new { 3467sub new {
3317 my $class = shift; 3468 my $class = shift;
3318 3469
3319 my $self = $class->SUPER::new ( 3470 my $self = $class->SUPER::new (
3320 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3471 col_expand => [0, 1, 0],
3321 @_, 3472 @_,
3322 ); 3473 );
3323 3474
3324 $self 3475 $self
3325} 3476}
3326 3477
3327sub set_items { 3478sub set_items {
3328 my ($self, $items) = @_; 3479 my ($self, $items) = @_;
3329 3480
3330 $self->{child}->clear; 3481 $self->clear;
3331 return unless $items; 3482 return unless $items;
3332 3483
3333 my @items = sort { 3484 my @items = sort {
3334 ($a->{type} <=> $b->{type}) 3485 ($a->{type} <=> $b->{type})
3335 or ($a->{name} cmp $b->{name}) 3486 or ($a->{name} cmp $b->{name})
3336 } @$items; 3487 } values %$items;
3337 3488
3338 $self->{real_items} = \@items; 3489 $self->{real_items} = \@items;
3339 3490
3340 my $row = 0; 3491 my $row = 0;
3341 for my $item (@items) { 3492 for my $item (@items) {
3342 CFClient::Item::update_widgets $item; 3493 CFClient::Item::update_widgets $item;
3343 3494
3344 $self->{child}->add (0, $row, $item->{face_widget}); 3495 $self->add (0, $row, $item->{face_widget});
3345 $self->{child}->add (1, $row, $item->{desc_widget}); 3496 $self->add (1, $row, $item->{desc_widget});
3346 $self->{child}->add (2, $row, $item->{weight_widget}); 3497 $self->add (2, $row, $item->{weight_widget});
3347 3498
3348 $row++; 3499 $row++;
3349 }
3350}
3351
3352#############################################################################
3353
3354package CFClient::UI::BindEditor;
3355
3356our @ISA = CFClient::UI::FancyFrame::;
3357
3358sub new {
3359 my $class = shift;
3360
3361 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3362
3363 $self->add (my $vb = new CFClient::UI::VBox);
3364
3365
3366 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3367 text => "start recording",
3368 tooltip => "Start/Stops recording of actions."
3369 ."All subsequent actions after the recording started will be captured."
3370 ."The actions are displayed after the record was stopped."
3371 ."To bind the action you have to click on the 'Bind' button",
3372 on_activate => sub {
3373 unless ($self->{recording}) {
3374 $self->start;
3375 } else {
3376 $self->stop;
3377 }
3378 });
3379
3380 $vb->add (new CFClient::UI::Label text => "Actions:");
3381 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3382
3383 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3384 $vb->add (my $hb = new CFClient::UI::HBox);
3385 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3386 $hb->add (new CFClient::UI::Button
3387 text => "bind",
3388 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3389 on_activate => sub {
3390 $self->ask_for_bind;
3391 });
3392
3393 $vb->add (my $hb = new CFClient::UI::HBox);
3394 $hb->add (new CFClient::UI::Button
3395 text => "ok",
3396 expand => 1,
3397 tooltip => "This closes the binding editor and saves the binding",
3398 on_activate => sub {
3399 $self->hide;
3400 $self->commit;
3401 });
3402
3403 $hb->add (new CFClient::UI::Button
3404 text => "cancel",
3405 expand => 1,
3406 tooltip => "This closes the binding editor without saving",
3407 on_activate => sub {
3408 $self->hide;
3409 $self->{binding_cancel}->()
3410 if $self->{binding_cancel};
3411 });
3412
3413 $self->update_binding_widgets;
3414
3415 $self
3416}
3417
3418sub commit {
3419 my ($self) = @_;
3420 my ($mod, $sym, $cmds) = $self->get_binding;
3421 if ($sym != 0 && @$cmds > 0) {
3422 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3423 ."'. Don't forget 'Save Config'!");
3424 $self->{binding_change}->($mod, $sym, $cmds)
3425 if $self->{binding_change};
3426 } else {
3427 $::STATUSBOX->add ("No action bound, no key or action specified!");
3428 $self->{binding_cancel}->()
3429 if $self->{binding_cancel};
3430 }
3431}
3432
3433sub start {
3434 my ($self) = @_;
3435
3436 $self->{rec_btn}->set_text ("stop recording");
3437 $self->{recording} = 1;
3438 $self->clear_command_list;
3439 $::CONN->start_record if $::CONN;
3440}
3441
3442sub stop {
3443 my ($self) = @_;
3444
3445 $self->{rec_btn}->set_text ("start recording");
3446 $self->{recording} = 0;
3447
3448 my $rec;
3449 $rec = $::CONN->stop_record if $::CONN;
3450 return unless ref $rec eq 'ARRAY';
3451 $self->set_command_list ($rec);
3452}
3453
3454
3455sub ask_for_bind_and_commit {
3456 my ($self) = @_;
3457 $self->ask_for_bind (1);
3458}
3459
3460sub ask_for_bind {
3461 my ($self, $commit) = @_;
3462
3463 CFClient::Binder::open_binding_dialog (sub {
3464 my ($mod, $sym) = @_;
3465 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3466 $self->update_binding_widgets;
3467 $self->commit if $commit;
3468 });
3469}
3470
3471# $mod and $sym are the modifiers and key symbol
3472# $cmds is a array ref of strings (the commands)
3473# $cb is the callback that is executed on OK
3474# $ccb is the callback that is executed on CANCEL and
3475# when the binding was unsuccessful on OK
3476sub set_binding {
3477 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3478
3479 $self->clear_command_list;
3480 $self->{recording} = 0;
3481 $self->{rec_btn}->set_text ("start recording");
3482
3483 $self->{binding} = [$mod, $sym];
3484 $self->{commands} = $cmds;
3485
3486 $self->{binding_change} = $cb;
3487 $self->{binding_cancel} = $ccb;
3488
3489 $self->update_binding_widgets;
3490}
3491
3492# this is a shortcut method that asks for a binding
3493# and then just binds it.
3494sub do_quick_binding {
3495 my ($self, $cmds) = @_;
3496 $self->set_binding (undef, undef, $cmds, sub {
3497 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3498 });
3499 $self->ask_for_bind (1);
3500}
3501
3502sub update_binding_widgets {
3503 my ($self) = @_;
3504 my ($mod, $sym, $cmds) = $self->get_binding;
3505 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3506 $self->set_command_list ($cmds);
3507}
3508
3509sub get_binding {
3510 my ($self) = @_;
3511 return (
3512 $self->{binding}->[0],
3513 $self->{binding}->[1],
3514 [ grep { defined $_ } @{$self->{commands}} ]
3515 );
3516}
3517
3518sub clear_command_list {
3519 my ($self) = @_;
3520 $self->{cmdbox}->clear ();
3521}
3522
3523sub set_command_list {
3524 my ($self, $cmds) = @_;
3525
3526 $self->{cmdbox}->clear ();
3527 $self->{commands} = $cmds;
3528
3529 my $idx = 0;
3530
3531 for (@$cmds) {
3532 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3533
3534 my $i = $idx;
3535 $hb->add (new CFClient::UI::Label text => $_);
3536 $hb->add (new CFClient::UI::Button
3537 text => "delete",
3538 tooltip => "Deletes the action from the record",
3539 on_activate => sub {
3540 $self->{cmdbox}->remove ($hb);
3541 $cmds->[$i] = undef;
3542 });
3543
3544
3545 $idx++
3546 } 3500 }
3547} 3501}
3548 3502
3549############################################################################# 3503#############################################################################
3550 3504
… …
3604 } elsif ($ev->{button} == 2) { 3558 } elsif ($ev->{button} == 2) {
3605 $::CONN->user_send ("invoke $spell->{name}"); 3559 $::CONN->user_send ("invoke $spell->{name}");
3606 } elsif ($ev->{button} == 3) { 3560 } elsif ($ev->{button} == 3) {
3607 (new CFClient::UI::Menu 3561 (new CFClient::UI::Menu
3608 items => [ 3562 items => [
3609 ["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}"]) }],
3610 ["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}"]) }],
3611 ], 3565 ],
3612 )->popup ($ev); 3566 )->popup ($ev);
3613 } else { 3567 } else {
3614 return 0; 3568 return 0;
… …
3709 $coord = $max - $size if $coord > $max - $size; 3663 $coord = $max - $size if $coord > $max - $size;
3710 3664
3711 int $coord + 0.5 3665 int $coord + 0.5
3712} 3666}
3713 3667
3714sub size_allocate { 3668sub invoke_size_allocate {
3715 my ($self, $w, $h) = @_; 3669 my ($self, $w, $h) = @_;
3716 3670
3717 for my $child ($self->children) { 3671 for my $child ($self->children) {
3718 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)};
3719 3673
… …
3723 $X = _to_pixel $X, $W, $self->{w}; 3677 $X = _to_pixel $X, $W, $self->{w};
3724 $Y = _to_pixel $Y, $H, $self->{h}; 3678 $Y = _to_pixel $Y, $H, $self->{h};
3725 3679
3726 $child->configure ($X, $Y, $W, $H); 3680 $child->configure ($X, $Y, $W, $H);
3727 } 3681 }
3682
3683 1
3728} 3684}
3729 3685
3730sub coord2local { 3686sub coord2local {
3731 my ($self, $x, $y) = @_; 3687 my ($self, $x, $y) = @_;
3732 3688

Diff Legend

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