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.324 by root, Wed Jul 12 17:20:04 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
… …
592} 587}
593 588
594sub DESTROY { 589sub DESTROY {
595 my ($self) = @_; 590 my ($self) = @_;
596 591
592 return if CFClient::in_destruct;
593
597 delete $WIDGET{$self+0}; 594 delete $WIDGET{$self+0};
598 595
599 eval { $self->destroy }; 596 eval { $self->destroy };
600 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 597 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
601} 598}
… …
789 786
790sub size_request { 787sub size_request {
791 $_[0]{children}[0]->size_request 788 $_[0]{children}[0]->size_request
792} 789}
793 790
794sub size_allocate { 791sub invoke_size_allocate {
795 my ($self, $w, $h) = @_; 792 my ($self, $w, $h) = @_;
796 793
797 $self->{children}[0]->configure (0, 0, $w, $h); 794 $self->{children}[0]->configure (0, 0, $w, $h);
795
796 1
798} 797}
799 798
800############################################################################# 799#############################################################################
801 800
802# back-buffered drawing area 801# back-buffered drawing area
… …
818 817
819 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 818 $ROOT->on_post_alloc ($self => sub { $self->render_child });
820 $self->SUPER::update; 819 $self->SUPER::update;
821} 820}
822 821
823sub size_allocate { 822sub invoke_size_allocate {
824 my ($self, $w, $h) = @_; 823 my ($self, $w, $h) = @_;
825 824
826 $self->SUPER::size_allocate ($w, $h);
827 $self->update; 825 $self->update;
826
827 $self->SUPER::invoke_size_allocate ($w, $h)
828} 828}
829 829
830sub _render { 830sub _render {
831 my ($self) = @_; 831 my ($self) = @_;
832 832
… …
893 $h = 10 if $self->{scroll_y}; 893 $h = 10 if $self->{scroll_y};
894 894
895 ($w, $h) 895 ($w, $h)
896} 896}
897 897
898sub size_allocate { 898sub invoke_size_allocate {
899 my ($self, $w, $h) = @_; 899 my ($self, $w, $h) = @_;
900 900
901 my $child = $self->child; 901 my $child = $self->child;
902 902
903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
905 905
906 $self->child->configure (0, 0, $w, $h); 906 $self->child->configure (0, 0, $w, $h);
907 $self->update; 907 $self->update;
908
909 1
908} 910}
909 911
910sub set_offset { 912sub set_offset {
911 my ($self, $x, $y) = @_; 913 my ($self, $x, $y) = @_;
912 914
… …
986 $self->add ($child) if $child; 988 $self->add ($child) if $child;
987 989
988 $self 990 $self
989} 991}
990 992
993#TODO# update range on size_allocate depending on child
994
991sub add { 995sub add {
992 my ($self, $widget) = @_; 996 my ($self, $widget) = @_;
993 997
994 $self->{vp}->add ($self->{child} = $widget); 998 $self->{vp}->add ($self->{child} = $widget);
995} 999}
996 1000
1001sub update_slider {
1002 my ($self) = @_;
1003
1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1005}
1006
997sub update { 1007sub update {
998 my ($self) = @_; 1008 my ($self) = @_;
999 1009
1000 $self->SUPER::update; 1010 $self->SUPER::update;
1001 1011
1002 # todo: overwrite size_allocate of child 1012 $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} 1013}
1006 1014
1007sub size_allocate { 1015sub invoke_size_allocate {
1008 my ($self, $w, $h) = @_; 1016 my ($self, $w, $h) = @_;
1009 1017
1018 $self->update_slider;
1019
1010 $self->SUPER::size_allocate ($w, $h); 1020 $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} 1021}
1015
1016#TODO# update range on size_allocate depending on child
1017# update viewport offset on scroll
1018 1022
1019############################################################################# 1023#############################################################################
1020 1024
1021package CFClient::UI::Frame; 1025package CFClient::UI::Frame;
1022 1026
… …
1090 valign => 1, 1094 valign => 1,
1091 text => $self->{title}, 1095 text => $self->{title},
1092 fontsize => $self->{border}, 1096 fontsize => $self->{border},
1093 if exists $self->{title}; 1097 if exists $self->{title};
1094 1098
1099 if ($self->{has_close_button}) {
1100 $self->{close_button} =
1101 new CFClient::UI::ImageButton
1102 path => 'x1_close.png',
1103 on_activate => sub { $self->emit ("delete") };
1104
1105 $self->CFClient::UI::Container::add ($self->{close_button});
1106 }
1107
1095 $self 1108 $self
1096} 1109}
1097 1110
1098sub add { 1111sub add {
1099 my ($self, @widgets) = @_; 1112 my ($self, @widgets) = @_;
1100 1113
1101 $self->SUPER::add (@widgets); 1114 $self->SUPER::add (@widgets);
1115 $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}; 1116 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1103} 1117}
1104 1118
1105sub border { 1119sub border {
1106 int $_[0]{border} * $::FONTSIZE 1120 int $_[0]{border} * $::FONTSIZE
… …
1109sub size_request { 1123sub size_request {
1110 my ($self) = @_; 1124 my ($self) = @_;
1111 1125
1112 $self->{title_widget}->size_request 1126 $self->{title_widget}->size_request
1113 if $self->{title_widget}; 1127 if $self->{title_widget};
1128
1129 $self->{close_button}->size_request
1130 if $self->{close_button};
1114 1131
1115 my ($w, $h) = $self->SUPER::size_request; 1132 my ($w, $h) = $self->SUPER::size_request;
1116 1133
1117 ( 1134 (
1118 $w + $self->border * 2, 1135 $w + $self->border * 2,
1119 $h + $self->border * 2, 1136 $h + $self->border * 2,
1120 ) 1137 )
1121} 1138}
1122 1139
1123sub size_allocate { 1140sub invoke_size_allocate {
1124 my ($self, $w, $h) = @_; 1141 my ($self, $w, $h) = @_;
1125 1142
1126 if ($self->{title_widget}) { 1143 if ($self->{title_widget}) {
1127 $self->{title_widget}{w} = $w; 1144 $self->{title_widget}{w} = $w;
1128 $self->{title_widget}{h} = $h; 1145 $self->{title_widget}{h} = $h;
1129 $self->{title_widget}->size_allocate ($w, $h); 1146 $self->{title_widget}->invoke_size_allocate ($w, $h);
1130 } 1147 }
1131 1148
1132 my $border = $self->border; 1149 my $border = $self->border;
1133 1150
1134 $h -= List::Util::max 0, $border * 2; 1151 $h -= List::Util::max 0, $border * 2;
1135 $w -= List::Util::max 0, $border * 2; 1152 $w -= List::Util::max 0, $border * 2;
1153
1154 $self->child->configure ($border, $border, $w, $h);
1155
1156 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1157 if $self->{close_button};
1158
1159 1
1160}
1161
1162sub invoke_delete {
1163 my ($self) = @_;
1164
1165 $self->hide;
1136 1166
1137 $self->child->configure ($border, $border, $w, $h); 1167 1
1138} 1168}
1139 1169
1140sub button_down { 1170sub invoke_button_down {
1141 my ($self, $ev, $x, $y) = @_; 1171 my ($self, $ev, $x, $y) = @_;
1142 1172
1143 my ($w, $h) = @$self{qw(w h)}; 1173 my ($w, $h) = @$self{qw(w h)};
1144 my $border = $self->border; 1174 my $border = $self->border;
1145 1175
… …
1176 1206
1177 ($x, $y) = ($ev->{x}, $ev->{y}); 1207 ($x, $y) = ($ev->{x}, $ev->{y});
1178 1208
1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1209 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180 # HACK: the next line is required to enforce placement 1210 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1211 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1182 }; 1212 };
1183 } else { 1213 } else {
1184 return 0; 1214 return 0;
1185 } 1215 }
1186 1216
1187 1 1217 1
1188} 1218}
1189 1219
1190sub button_up { 1220sub invoke_button_up {
1191 my ($self, $ev, $x, $y) = @_; 1221 my ($self, $ev, $x, $y) = @_;
1192 1222
1193 !!delete $self->{motion} 1223 ! ! delete $self->{motion}
1194} 1224}
1195 1225
1196sub mouse_motion { 1226sub invoke_mouse_motion {
1197 my ($self, $ev, $x, $y) = @_; 1227 my ($self, $ev, $x, $y) = @_;
1198 1228
1199 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1229 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200 1230
1201 !!$self->{motion} 1231 ! ! $self->{motion}
1202} 1232}
1203 1233
1204sub _draw { 1234sub _draw {
1205 my ($self) = @_; 1235 my ($self) = @_;
1206 1236
… …
1235 $child->draw; 1265 $child->draw;
1236 1266
1237 if ($self->{title_widget}) { 1267 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h}; 1268 glTranslate 0, $border - $self->{h};
1239 $self->{title_widget}->_draw; 1269 $self->{title_widget}->_draw;
1270
1271 glTranslate 0, - ($border - $self->{h});
1240 } 1272 }
1273
1274 $self->{close_button}->draw
1275 if $self->{close_button};
1241} 1276}
1242 1277
1243############################################################################# 1278#############################################################################
1244 1279
1245package CFClient::UI::Table; 1280package CFClient::UI::Table;
… …
1324 (sum @$ws), 1359 (sum @$ws),
1325 (sum @$hs), 1360 (sum @$hs),
1326 ) 1361 )
1327} 1362}
1328 1363
1329sub size_allocate { 1364sub invoke_size_allocate {
1330 my ($self, $w, $h) = @_; 1365 my ($self, $w, $h) = @_;
1331 1366
1332 my ($ws, $hs) = $self->get_wh; 1367 my ($ws, $hs) = $self->get_wh;
1333 1368
1334 my $req_w = (sum @$ws) || 1; 1369 my $req_w = (sum @$ws) || 1;
… …
1366 } 1401 }
1367 1402
1368 $y += $row_h; 1403 $y += $row_h;
1369 } 1404 }
1370 1405
1406 1
1371} 1407}
1372 1408
1373sub find_widget { 1409sub find_widget {
1374 my ($self, $x, $y) = @_; 1410 my ($self, $x, $y) = @_;
1375 1411
… …
1412 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1448 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1413 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1449 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1414 ) 1450 )
1415} 1451}
1416 1452
1417sub size_allocate { 1453sub invoke_size_allocate {
1418 my ($self, $w, $h) = @_; 1454 my ($self, $w, $h) = @_;
1419 1455
1420 my $space = $self->{vertical} ? $h : $w; 1456 my $space = $self->{vertical} ? $h : $w;
1421 my $children = $self->{children}; 1457 my @children = $self->visible_children;
1422 1458
1423 my @req; 1459 my @req;
1424 1460
1425 if ($self->{homogeneous}) { 1461 if ($self->{homogeneous}) {
1426 @req = ($space / (@$children || 1)) x @$children; 1462 @req = ($space / (@children || 1)) x @children;
1427 } else { 1463 } else {
1428 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1464 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1429 my $req = List::Util::sum @req; 1465 my $req = List::Util::sum @req;
1430 1466
1431 if ($req > $space) { 1467 if ($req > $space) {
1432 # ah well, not enough space 1468 # ah well, not enough space
1433 $_ *= $space / $req for @req; 1469 $_ *= $space / $req for @req;
1434 } else { 1470 } else {
1435 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1471 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1436 1472
1437 $space = ($space - $req) / $expand; # remaining space to give away 1473 $space = ($space - $req) / $expand; # remaining space to give away
1438 1474
1439 $req[$_] += $space * $children->[$_]{expand} 1475 $req[$_] += $space * $children[$_]{expand}
1440 for 0 .. $#$children; 1476 for 0 .. $#children;
1441 } 1477 }
1442 } 1478 }
1443 1479
1444 CFClient::UI::harmonize \@req; 1480 CFClient::UI::harmonize \@req;
1445 1481
1446 my $pos = 0; 1482 my $pos = 0;
1447 for (0 .. $#$children) { 1483 for (0 .. $#children) {
1448 my $alloc = $req[$_]; 1484 my $alloc = $req[$_];
1449 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1485 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1450 1486
1451 $pos += $alloc; 1487 $pos += $alloc;
1452 } 1488 }
1453 1489
1454 1 1490 1
… …
1557 my ($self, $text) = @_; 1593 my ($self, $text) = @_;
1558 1594
1559 return if $self->{text} eq "T$text"; 1595 return if $self->{text} eq "T$text";
1560 $self->{text} = "T$text"; 1596 $self->{text} = "T$text";
1561 1597
1562 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1563 $self->{layout}->set_text ($text); 1598 $self->{layout}->set_text ($text);
1564 1599
1565 delete $self->{size_req}; 1600 delete $self->{size_req};
1566 $self->realloc; 1601 $self->realloc;
1567 $self->update; 1602 $self->update;
… …
1573 return if $self->{text} eq "M$markup"; 1608 return if $self->{text} eq "M$markup";
1574 $self->{text} = "M$markup"; 1609 $self->{text} = "M$markup";
1575 1610
1576 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1611 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1577 1612
1578 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1579 $self->{layout}->set_markup ($markup); 1613 $self->{layout}->set_markup ($markup);
1580 1614
1581 delete $self->{size_req}; 1615 delete $self->{size_req};
1582 $self->realloc; 1616 $self->realloc;
1583 $self->update; 1617 $self->update;
… …
1595 1629
1596 my ($w, $h) = $self->{layout}->size; 1630 my ($w, $h) = $self->{layout}->size;
1597 1631
1598 if (exists $self->{template}) { 1632 if (exists $self->{template}) {
1599 $self->{template}->set_font ($self->{font}) if $self->{font}; 1633 $self->{template}->set_font ($self->{font}) if $self->{font};
1634 $self->{template}->set_width ($self->{max_w} || -1);
1600 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1635 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1601 1636
1602 my ($w2, $h2) = $self->{template}->size; 1637 my ($w2, $h2) = $self->{template}->size;
1603 1638
1604 $w = List::Util::max $w, $w2; 1639 $w = List::Util::max $w, $w2;
… …
1609 }; 1644 };
1610 1645
1611 @{ $self->{size_req} } 1646 @{ $self->{size_req} }
1612} 1647}
1613 1648
1649sub baseline_shift {
1650 $_[0]{layout}->descent
1651}
1652
1614sub size_allocate { 1653sub invoke_size_allocate {
1615 my ($self, $w, $h) = @_; 1654 my ($self, $w, $h) = @_;
1616 1655
1617 delete $self->{ox}; 1656 delete $self->{ox};
1618 1657
1619 delete $self->{texture} 1658 delete $self->{texture}
1620 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1659 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1660
1661 1
1621} 1662}
1622 1663
1623sub set_fontsize { 1664sub set_fontsize {
1624 my ($self, $fontsize) = @_; 1665 my ($self, $fontsize) = @_;
1625 1666
1626 $self->{fontsize} = $fontsize; 1667 $self->{fontsize} = $fontsize;
1668 delete $self->{size_req};
1627 delete $self->{texture}; 1669 delete $self->{texture};
1628 1670
1629 $self->realloc; 1671 $self->realloc;
1630} 1672}
1631 1673
1632sub reconfigure { 1674sub reconfigure {
1633 my ($self) = @_; 1675 my ($self) = @_;
1634 1676
1635 delete $self->{size_req}; 1677 delete $self->{size_req};
1678 delete $self->{texture};
1636 1679
1637 $self->SUPER::reconfigure; 1680 $self->SUPER::reconfigure;
1638} 1681}
1639 1682
1640sub _draw { 1683sub _draw {
1641 my ($self) = @_; 1684 my ($self) = @_;
1642 1685
1643 $self->SUPER::_draw; # draw background, if applicable 1686 $self->SUPER::_draw; # draw background, if applicable
1644 1687
1645 my $tex = $self->{texture} ||= do { 1688 my $size = $self->{texture} ||= do {
1646 $self->{layout}->set_foreground (@{$self->{fg}}); 1689 $self->{layout}->set_foreground (@{$self->{fg}});
1647 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1690 $self->{layout}->set_font ($self->{font}) if $self->{font};
1648 $self->{layout}->set_width ($self->{w}); 1691 $self->{layout}->set_width ($self->{w});
1649 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1692 $self->{layout}->set_ellipsise ($self->{ellipsise});
1650 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1693 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1651 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1694 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1652 1695
1653 new_from_layout CFClient::Texture $self->{layout} 1696 [$self->{layout}->size]
1654 }; 1697 };
1655 1698
1656 unless (exists $self->{ox}) { 1699 unless (exists $self->{ox}) {
1657 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1700 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1658 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1701 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1659 : ($self->{w} - $tex->{w}) * 0.5); 1702 : ($self->{w} - $size->[0]) * 0.5);
1660 1703
1661 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1704 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1662 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1705 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1663 : ($self->{h} - $tex->{h}) * 0.5); 1706 : ($self->{h} - $size->[1]) * 0.5);
1664 }; 1707 };
1665 1708
1666 glEnable GL_TEXTURE_2D;
1667
1668 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1709 my $w = List::Util::min $self->{w} + 4, $size->[0];
1669 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1710 my $h = List::Util::min $self->{h} + 2, $size->[1];
1670 1711
1671 if ($tex->{format} == GL_ALPHA) { 1712 $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} 1713}
1682 1714
1683############################################################################# 1715#############################################################################
1684 1716
1685package CFClient::UI::EntryBase; 1717package CFClient::UI::EntryBase;
… …
1718 1750
1719 $text =~ s/./*/g if $self->{hidden}; 1751 $text =~ s/./*/g if $self->{hidden};
1720 $self->{layout}->set_text ("$text "); 1752 $self->{layout}->set_text ("$text ");
1721 delete $self->{size_req}; 1753 delete $self->{size_req};
1722 1754
1723 $self->_emit (changed => $self->{text}); 1755 $self->emit (changed => $self->{text});
1724 1756
1725 $self->realloc; 1757 $self->realloc;
1726 $self->update; 1758 $self->update;
1727} 1759}
1728 1760
… …
1743 my ($w, $h) = $self->SUPER::size_request; 1775 my ($w, $h) = $self->SUPER::size_request;
1744 1776
1745 ($w + 1, $h) # add 1 for cursor 1777 ($w + 1, $h) # add 1 for cursor
1746} 1778}
1747 1779
1748sub key_down { 1780sub invoke_key_down {
1749 my ($self, $ev) = @_; 1781 my ($self, $ev) = @_;
1750 1782
1751 my $mod = $ev->{mod}; 1783 my $mod = $ev->{mod};
1752 my $sym = $ev->{sym}; 1784 my $sym = $ev->{sym};
1753 my $uni = $ev->{unicode}; 1785 my $uni = $ev->{unicode};
… …
1765 } elsif ($sym == CFClient::SDLK_HOME) { 1797 } elsif ($sym == CFClient::SDLK_HOME) {
1766 $self->{cursor} = 0; 1798 $self->{cursor} = 0;
1767 } elsif ($sym == CFClient::SDLK_END) { 1799 } elsif ($sym == CFClient::SDLK_END) {
1768 $self->{cursor} = length $text; 1800 $self->{cursor} = length $text;
1769 } elsif ($uni == 27) { 1801 } elsif ($uni == 27) {
1770 $self->_emit ('escape'); 1802 $self->emit ('escape');
1771 } elsif ($uni) { 1803 } elsif ($uni) {
1772 substr $text, $self->{cursor}++, 0, chr $uni; 1804 substr $text, $self->{cursor}++, 0, chr $uni;
1773 } else { 1805 } else {
1774 return 0; 1806 return 0;
1775 } 1807 }
… …
1779 $self->realloc; 1811 $self->realloc;
1780 1812
1781 1 1813 1
1782} 1814}
1783 1815
1784sub focus_in { 1816sub invoke_focus_in {
1785 my ($self) = @_; 1817 my ($self) = @_;
1786 1818
1787 $self->{last_activity} = $::NOW; 1819 $self->{last_activity} = $::NOW;
1788 1820
1789 $self->SUPER::focus_in; 1821 $self->SUPER::invoke_focus_in
1790} 1822}
1791 1823
1792sub button_down { 1824sub invoke_button_down {
1793 my ($self, $ev, $x, $y) = @_; 1825 my ($self, $ev, $x, $y) = @_;
1794 1826
1795 $self->SUPER::button_down ($ev, $x, $y); 1827 $self->SUPER::invoke_button_down ($ev, $x, $y);
1796 1828
1797 my $idx = $self->{layout}->xy_to_index ($x, $y); 1829 my $idx = $self->{layout}->xy_to_index ($x, $y);
1798 1830
1799 # byte-index to char-index 1831 # byte-index to char-index
1800 my $text = $self->{text}; 1832 my $text = $self->{text};
… …
1805 $self->update; 1837 $self->update;
1806 1838
1807 1 1839 1
1808} 1840}
1809 1841
1810sub mouse_motion { 1842sub invoke_mouse_motion {
1811 my ($self, $ev, $x, $y) = @_; 1843 my ($self, $ev, $x, $y) = @_;
1812# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1844# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1813 1845
1814 0 1846 1
1815} 1847}
1816 1848
1817sub _draw { 1849sub _draw {
1818 my ($self) = @_; 1850 my ($self) = @_;
1819 1851
… …
1860 1892
1861our @ISA = CFClient::UI::EntryBase::; 1893our @ISA = CFClient::UI::EntryBase::;
1862 1894
1863use CFClient::OpenGL; 1895use CFClient::OpenGL;
1864 1896
1865sub key_down { 1897sub invoke_key_down {
1866 my ($self, $ev) = @_; 1898 my ($self, $ev) = @_;
1867 1899
1868 my $sym = $ev->{sym}; 1900 my $sym = $ev->{sym};
1869 1901
1870 if ($sym == 13) { 1902 if ($sym == 13) {
1871 unshift @{$self->{history}}, 1903 unshift @{$self->{history}},
1872 my $txt = $self->get_text; 1904 my $txt = $self->get_text;
1905
1873 $self->{history_pointer} = -1; 1906 $self->{history_pointer} = -1;
1874 $self->{history_saveback} = ''; 1907 $self->{history_saveback} = '';
1875 $self->_emit (activate => $txt); 1908 $self->emit (activate => $txt);
1876 $self->update; 1909 $self->update;
1877 1910
1878 } elsif ($sym == CFClient::SDLK_UP) { 1911 } elsif ($sym == CFClient::SDLK_UP) {
1879 if ($self->{history_pointer} < 0) { 1912 if ($self->{history_pointer} < 0) {
1880 $self->{history_saveback} = $self->get_text; 1913 $self->{history_saveback} = $self->get_text;
… …
1896 } else { 1929 } else {
1897 $self->set_text ($self->{history_saveback}); 1930 $self->set_text ($self->{history_saveback});
1898 } 1931 }
1899 1932
1900 } else { 1933 } else {
1901 return $self->SUPER::key_down ($ev) 1934 return $self->SUPER::invoke_key_down ($ev)
1902 } 1935 }
1903 1936
1904 1 1937 1
1905} 1938}
1906 1939
… …
1930 can_events => 1, 1963 can_events => 1,
1931 @_ 1964 @_
1932 ) 1965 )
1933} 1966}
1934 1967
1935sub activate { }
1936
1937sub button_up { 1968sub invoke_button_up {
1938 my ($self, $ev, $x, $y) = @_; 1969 my ($self, $ev, $x, $y) = @_;
1939 1970
1940 $self->emit ("activate") 1971 $self->emit ("activate")
1941 if $x >= 0 && $x < $self->{w} 1972 if $x >= 0 && $x < $self->{w}
1942 && $y >= 0 && $y < $self->{h}; 1973 && $y >= 0 && $y < $self->{h};
… …
1956 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1987 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1957 1988
1958 glDisable GL_TEXTURE_2D; 1989 glDisable GL_TEXTURE_2D;
1959 1990
1960 $self->SUPER::_draw; 1991 $self->SUPER::_draw;
1992}
1993
1994#############################################################################
1995
1996package CFClient::UI::ImageButton;
1997
1998our @ISA = CFClient::UI::Image::;
1999
2000use CFClient::OpenGL;
2001
2002my %textures;
2003
2004sub new {
2005 my $class = shift;
2006
2007 my $self = $class->SUPER::new (
2008 padding_x => 4,
2009 padding_y => 4,
2010 fg => [1, 1, 1],
2011 active_fg => [0, 0, 1],
2012 can_hover => 1,
2013 align => 0,
2014 valign => 0,
2015 can_events => 1,
2016 @_
2017 );
2018}
2019
2020sub invoke_button_up {
2021 my ($self, $ev, $x, $y) = @_;
2022
2023 $self->emit ("activate")
2024 if $x >= 0 && $x < $self->{w}
2025 && $y >= 0 && $y < $self->{h};
2026
2027 1
1961} 2028}
1962 2029
1963############################################################################# 2030#############################################################################
1964 2031
1965package CFClient::UI::CheckBox; 2032package CFClient::UI::CheckBox;
… …
1992 my ($self) = @_; 2059 my ($self) = @_;
1993 2060
1994 (6) x 2 2061 (6) x 2
1995} 2062}
1996 2063
2064sub toggle {
2065 my ($self) = @_;
2066
2067 $self->{state} = !$self->{state};
2068 $self->emit (changed => $self->{state});
2069 $self->update;
2070}
2071
1997sub button_down { 2072sub invoke_button_down {
1998 my ($self, $ev, $x, $y) = @_; 2073 my ($self, $ev, $x, $y) = @_;
1999 2074
2000 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2075 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2001 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2076 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2002 $self->{state} = !$self->{state}; 2077 $self->toggle;
2003 $self->_emit (changed => $self->{state});
2004 } else { 2078 } else {
2005 return 0 2079 return 0
2006 } 2080 }
2007 2081
2008 1 2082 1
… …
2033package CFClient::UI::Image; 2107package CFClient::UI::Image;
2034 2108
2035our @ISA = CFClient::UI::Base::; 2109our @ISA = CFClient::UI::Base::;
2036 2110
2037use CFClient::OpenGL; 2111use CFClient::OpenGL;
2038use Carp qw/confess/;
2039 2112
2040our %loaded_images; 2113our %texture_cache;
2041 2114
2042sub new { 2115sub new {
2043 my $class = shift; 2116 my $class = shift;
2044 2117
2045 my $self = $class->SUPER::new (can_events => 0, @_); 2118 my $self = $class->SUPER::new (
2119 can_events => 0,
2120 @_,
2121 );
2046 2122
2047 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2123 $self->{path}
2124 or Carp::croak "required attribute 'path' not set";
2048 2125
2049 $loaded_images{$self->{image}} ||= 2126 $self->{tex} = $texture_cache{$self->{path}} ||=
2050 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2127 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2051 2128
2052 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2129 Scalar::Util::weaken $texture_cache{$self->{path}};
2053 2130
2054 Scalar::Util::weaken $loaded_images{$self->{image}}; 2131 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2055
2056 $self->{aspect} = $tex->{w} / $tex->{h};
2057 2132
2058 $self 2133 $self
2059} 2134}
2060 2135
2061sub size_request { 2136sub size_request {
2062 my ($self) = @_; 2137 my ($self) = @_;
2063 2138
2064 ($self->{tex}->{w}, $self->{tex}->{h}) 2139 ($self->{tex}{w}, $self->{tex}{h})
2065} 2140}
2066 2141
2067sub _draw { 2142sub _draw {
2068 my ($self) = @_; 2143 my ($self) = @_;
2069 2144
… …
2178 my $ycut1 = max 0, min 1, $ycut; 2253 my $ycut1 = max 0, min 1, $ycut;
2179 my $ycut2 = max 0, min 1, $ycut - 1; 2254 my $ycut2 = max 0, min 1, $ycut - 1;
2180 2255
2181 my $h1 = $self->{h} * (1 - $ycut1); 2256 my $h1 = $self->{h} * (1 - $ycut1);
2182 my $h2 = $self->{h} * (1 - $ycut2); 2257 my $h2 = $self->{h} * (1 - $ycut2);
2258 my $h3 = $self->{h};
2259
2260 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2183 2261
2184 glEnable GL_BLEND; 2262 glEnable GL_BLEND;
2185 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2263 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2186 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2264 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2187 glEnable GL_TEXTURE_2D; 2265 glEnable GL_TEXTURE_2D;
… …
2206 2284
2207 if ($t3) { 2285 if ($t3) {
2208 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2286 glBindTexture GL_TEXTURE_2D, $t3->{name};
2209 glBegin GL_QUADS; 2287 glBegin GL_QUADS;
2210 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2288 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2211 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2289 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2212 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2290 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2213 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2291 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2214 glEnd; 2292 glEnd;
2215 } 2293 }
2216 2294
2217 glDisable GL_BLEND; 2295 glDisable GL_BLEND;
… …
2305 $self->update; 2383 $self->update;
2306 2384
2307 $self 2385 $self
2308} 2386}
2309 2387
2310sub changed { }
2311
2312sub set_range { 2388sub set_range {
2313 my ($self, $range) = @_; 2389 my ($self, $range) = @_;
2314 2390
2315 ($range, $self->{range}) = ($self->{range}, $range); 2391 ($range, $self->{range}) = ($self->{range}, $range);
2316 2392
… …
2336 if $unit; 2412 if $unit;
2337 2413
2338 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2414 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2339 2415
2340 if ($value != $old_value) { 2416 if ($value != $old_value) {
2341 $self->_emit (changed => $value); 2417 $self->emit (changed => $value);
2342 $self->update; 2418 $self->update;
2343 } 2419 }
2344} 2420}
2345 2421
2346sub size_request { 2422sub size_request {
2347 my ($self) = @_; 2423 my ($self) = @_;
2348 2424
2349 ($self->{req_w}, $self->{req_h}) 2425 ($self->{req_w}, $self->{req_h})
2350} 2426}
2351 2427
2352sub button_down { 2428sub invoke_button_down {
2353 my ($self, $ev, $x, $y) = @_; 2429 my ($self, $ev, $x, $y) = @_;
2354 2430
2355 $self->SUPER::button_down ($ev, $x, $y); 2431 $self->SUPER::invoke_button_down ($ev, $x, $y);
2356 2432
2357 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2433 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2358 2434
2359 $self->mouse_motion ($ev, $x, $y) 2435 $self->invoke_mouse_motion ($ev, $x, $y)
2360} 2436}
2361 2437
2362sub mouse_motion { 2438sub invoke_mouse_motion {
2363 my ($self, $ev, $x, $y) = @_; 2439 my ($self, $ev, $x, $y) = @_;
2364 2440
2365 if ($GRAB == $self) { 2441 if ($GRAB == $self) {
2366 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2442 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2367 2443
… …
2488 can_events => 0, 2564 can_events => 0,
2489 indent => 0, 2565 indent => 0,
2490 #font => default_font 2566 #font => default_font
2491 @_, 2567 @_,
2492 2568
2493 layout => (new CFClient::Layout 1), 2569 layout => (new CFClient::Layout),
2494 par => [], 2570 par => [],
2495 height => 0, 2571 height => 0,
2496 children => [ 2572 children => [
2497 (new CFClient::UI::Empty expand => 1), 2573 (new CFClient::UI::Empty expand => 1),
2498 (new CFClient::UI::Slider vertical => 1), 2574 (new CFClient::UI::Slider vertical => 1),
… …
2509 2585
2510 $self->{fontsize} = $fontsize; 2586 $self->{fontsize} = $fontsize;
2511 $self->reflow; 2587 $self->reflow;
2512} 2588}
2513 2589
2590sub size_request {
2591 my ($self) = @_;
2592
2593 my ($empty, $slider) = @{ $self->{children} };
2594
2595 local $self->{children} = [$empty, $slider];
2596 $self->SUPER::size_request
2597}
2598
2514sub size_allocate { 2599sub invoke_size_allocate {
2515 my ($self, $w, $h) = @_; 2600 my ($self, $w, $h) = @_;
2516 2601
2517 $self->SUPER::size_allocate ($w, $h); 2602 my ($empty, $slider, @other) = @{ $self->{children} };
2603 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2518 2604
2519 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2605 $self->{layout}->set_font ($self->{font}) if $self->{font};
2520 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2606 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2521 $self->{layout}->set_width ($self->{children}[0]{w}); 2607 $self->{layout}->set_width ($empty->{w});
2522 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2608 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2523 2609
2524 $self->reflow; 2610 $self->reflow;
2525}
2526 2611
2527sub text_size { 2612 local $self->{children} = [$empty, $slider];
2528 my ($self, $text, $indent) = @_; 2613 $self->SUPER::invoke_size_allocate ($w, $h)
2614}
2615
2616sub get_layout {
2617 my ($self, $para) = @_;
2529 2618
2530 my $layout = $self->{layout}; 2619 my $layout = $self->{layout};
2531 2620
2621 $layout->set_font ($self->{font}) if $self->{font};
2622 $layout->set_foreground (@{$para->{fg}});
2532 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2623 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2533 $layout->set_width ($self->{children}[0]{w} - $indent); 2624 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2534 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2625 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2535 $layout->set_markup ($text); 2626 $layout->set_markup ($para->{markup});
2627
2628 $layout->set_shapes (
2629 map
2630 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2631 @{$para->{widget}}
2536 2632 );
2633
2537 $layout->size 2634 $layout
2538} 2635}
2539 2636
2540sub reflow { 2637sub reflow {
2541 my ($self) = @_; 2638 my ($self) = @_;
2542 2639
… …
2551 $self->{children}[1]->set_value ($offset); 2648 $self->{children}[1]->set_value ($offset);
2552} 2649}
2553 2650
2554sub clear { 2651sub clear {
2555 my ($self) = @_; 2652 my ($self) = @_;
2653
2654 my (undef, undef, @other) = @{ $self->{children} };
2655 $self->remove ($_) for @other;
2556 2656
2557 $self->{par} = []; 2657 $self->{par} = [];
2558 $self->{height} = 0; 2658 $self->{height} = 0;
2559 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2659 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2560} 2660}
2561 2661
2562sub add_paragraph { 2662sub add_paragraph {
2563 my ($self, $color, $text, $indent) = @_; 2663 my ($self, $color, $para, $indent) = @_;
2564 2664
2565 for my $line (split /\n/, $text) { 2665 my ($text, @w) = ref $para ? @$para : $para;
2566 my ($w, $h) = $self->text_size ($line); 2666
2567 $self->{height} += $h; 2667 $para = {
2568 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2668 w => 1e10,
2669 wrapped => 1,
2670 fg => $color,
2671 indent => $indent,
2672 markup => $text,
2673 widget => \@w,
2569 } 2674 };
2570 2675
2571 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2676 $self->add (@w) if @w;
2677 push @{$self->{par}}, $para;
2678
2679 $self->{need_reflow}++;
2680 $self->update;
2681}
2682
2683sub scroll_to_bottom {
2684 my ($self) = @_;
2685
2686 $self->{scroll_to_bottom} = 1;
2687 $self->update;
2572} 2688}
2573 2689
2574sub update { 2690sub update {
2575 my ($self) = @_; 2691 my ($self) = @_;
2576 2692
… …
2584 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2700 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2585 2701
2586 if (delete $self->{need_reflow}) { 2702 if (delete $self->{need_reflow}) {
2587 my $height = 0; 2703 my $height = 0;
2588 2704
2589 my $layout = $self->{layout};
2590
2591 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2592
2593 for (@{$self->{par}}) { 2705 for my $para (@{$self->{par}}) {
2594 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2706 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2595 $layout->set_width ($W - $_->[3]); 2707 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; 2708 my ($w, $h) = $layout->size;
2599 $_->[0] = $w + $_->[3]; 2709
2600 $_->[1] = $h; 2710 $para->{w} = $w + $para->{indent};
2711 $para->{h} = $h;
2712 $para->{wrapped} = $layout->has_wrapped;
2601 } 2713 }
2602 2714
2603 $height += $_->[1]; 2715 $height += $para->{h};
2604 } 2716 }
2605 2717
2606 $self->{height} = $height; 2718 $self->{height} = $height;
2607 2719
2608 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2720 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2609 2721
2610 delete $self->{texture}; 2722 delete $self->{texture};
2723 }
2724
2725 if (delete $self->{scroll_to_bottom}) {
2726 $self->{children}[1]->set_value (1e10);
2611 } 2727 }
2612 2728
2613 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2729 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2614 glClearColor 0, 0, 0, 0; 2730 glClearColor 0, 0, 0, 0;
2615 glClear GL_COLOR_BUFFER_BIT; 2731 glClear GL_COLOR_BUFFER_BIT;
… …
2619 my $y0 = $top; 2735 my $y0 = $top;
2620 my $y1 = $top + $H; 2736 my $y1 = $top + $H;
2621 2737
2622 my $y = 0; 2738 my $y = 0;
2623 2739
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}}) { 2740 for my $para (@{$self->{par}}) {
2633 my $h = $par->[1]; 2741 my $h = $para->{h};
2634 2742
2635 if ($y0 < $y + $h && $y < $y1) { 2743 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 2744
2641 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2745 my $layout = $self->get_layout ($para);
2642 2746
2643 glRasterPos $par->[3], $y - $y0; 2747 $layout->render ($para->{indent}, $y - $y0);
2644 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2748
2749 if (my @w = @{ $para->{widget} }) {
2750 my @s = $layout->get_shapes;
2751
2752 for (@w) {
2753 my ($dx, $dy) = splice @s, 0, 2, ();
2754
2755 $_->{x} = $dx + $para->{indent};
2756 $_->{y} = $dy + $y - $y0;
2757
2758 $_->draw;
2759 }
2760 }
2645 } 2761 }
2646 2762
2647 $y += $h; 2763 $y += $h;
2648 } 2764 }
2649
2650 glDisable GL_BLEND;
2651 }; 2765 };
2652 }); 2766 });
2767}
2768
2769sub reconfigure {
2770 my ($self) = @_;
2771
2772 $self->SUPER::reconfigure;
2773
2774 $_->{w} = 1e10 for @{ $self->{par} };
2775 $self->reflow;
2653} 2776}
2654 2777
2655sub _draw { 2778sub _draw {
2656 my ($self) = @_; 2779 my ($self) = @_;
2657 2780
… …
2660 glColor 0, 0, 0, 1; 2783 glColor 0, 0, 0, 1;
2661 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2784 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2662 glDisable GL_TEXTURE_2D; 2785 glDisable GL_TEXTURE_2D;
2663 2786
2664 $self->{children}[1]->draw; 2787 $self->{children}[1]->draw;
2665
2666} 2788}
2667 2789
2668############################################################################# 2790#############################################################################
2669 2791
2670package CFClient::UI::Animator; 2792package CFClient::UI::Animator;
… …
2779 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2901 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2780 2902
2781 ($w + 4, $h + 4) 2903 ($w + 4, $h + 4)
2782} 2904}
2783 2905
2784sub size_allocate { 2906sub invoke_size_allocate {
2785 my ($self, $w, $h) = @_; 2907 my ($self, $w, $h) = @_;
2786 2908
2787 $self->SUPER::size_allocate ($w - 4, $h - 4); 2909 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2788} 2910}
2789 2911
2790sub visibility_change { 2912sub invoke_visibility_change {
2791 my ($self, $visible) = @_; 2913 my ($self, $visible) = @_;
2792 2914
2793 return unless $visible; 2915 return unless $visible;
2794 2916
2795 $self->{root}->on_post_alloc ("move_$self" => sub { 2917 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2943 for my $item (@{ $self->{items} }) { 3065 for my $item (@{ $self->{items} }) {
2944 my ($widget, $cb, $tooltip) = @$item; 3066 my ($widget, $cb, $tooltip) = @$item;
2945 3067
2946 # handle various types of items, only text for now 3068 # handle various types of items, only text for now
2947 if (!ref $widget) { 3069 if (!ref $widget) {
3070 if ($widget =~ /\t/) {
3071 my ($left, $right) = split /\t/, $widget, 2;
3072
3073 $widget = new CFClient::UI::HBox
3074 can_hover => 1,
3075 can_events => 1,
3076 tooltip => $tooltip,
3077 children => [
3078 (new CFClient::UI::Label markup => $left, expand => 1),
3079 (new CFClient::UI::Label markup => $right, align => +1),
3080 ],
3081 ;
3082
3083 } else {
2948 $widget = new CFClient::UI::Label 3084 $widget = new CFClient::UI::Label
2949 can_hover => 1, 3085 can_hover => 1,
2950 can_events => 1, 3086 can_events => 1,
2951 markup => $widget, 3087 markup => $widget,
2952 tooltip => $tooltip 3088 tooltip => $tooltip;
3089 }
2953 } 3090 }
2954 3091
2955 $self->{item}{$widget} = $item; 3092 $self->{item}{$widget} = $item;
2956 3093
2957 $self->{vbox}->add ($widget); 3094 $self->{vbox}->add ($widget);
… …
2962 3099
2963# popup given the event (must be a mouse button down event currently) 3100# popup given the event (must be a mouse button down event currently)
2964sub popup { 3101sub popup {
2965 my ($self, $ev) = @_; 3102 my ($self, $ev) = @_;
2966 3103
2967 $self->_emit ("popdown"); 3104 $self->emit ("popdown");
2968 3105
2969 # maybe save $GRAB? must be careful about events... 3106 # maybe save $GRAB? must be careful about events...
2970 $GRAB = $self; 3107 $GRAB = $self;
2971 $self->{button} = $ev->{button}; 3108 $self->{button} = $ev->{button};
2972 3109
2973 $self->show; 3110 $self->show;
2974 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3111 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2975} 3112}
2976 3113
2977sub mouse_motion { 3114sub invoke_mouse_motion {
2978 my ($self, $ev, $x, $y) = @_; 3115 my ($self, $ev, $x, $y) = @_;
2979 3116
2980 # TODO: should use vbox->find_widget or so 3117 # TODO: should use vbox->find_widget or so
2981 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3118 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2982 $self->{hover} = $self->{item}{$HOVER}; 3119 $self->{hover} = $self->{item}{$HOVER};
2983 3120
2984 0 3121 0
2985} 3122}
2986 3123
2987sub button_up { 3124sub invoke_button_up {
2988 my ($self, $ev, $x, $y) = @_; 3125 my ($self, $ev, $x, $y) = @_;
2989 3126
2990 if ($ev->{button} == $self->{button}) { 3127 if ($ev->{button} == $self->{button}) {
2991 undef $GRAB; 3128 undef $GRAB;
2992 $self->hide; 3129 $self->hide;
2993 3130
2994 $self->_emit ("popdown"); 3131 $self->emit ("popdown");
2995 $self->{hover}[1]->() if $self->{hover}; 3132 $self->{hover}[1]->() if $self->{hover};
2996 } else { 3133 } else {
2997 return 0 3134 return 0
2998 } 3135 }
2999 3136
… …
3026 3163
3027 $self->{current} = $self->{children}[0] 3164 $self->{current} = $self->{children}[0]
3028 if @{ $self->{children} }; 3165 if @{ $self->{children} };
3029} 3166}
3030 3167
3168sub get_current_page {
3169 my ($self) = @_;
3170
3171 $self->{current}
3172}
3173
3031sub set_current_page { 3174sub set_current_page {
3032 my ($self, $page_or_widget) = @_; 3175 my ($self, $page_or_widget) = @_;
3033 3176
3034 my $widget = ref $page_or_widget 3177 my $widget = ref $page_or_widget
3035 ? $page_or_widget 3178 ? $page_or_widget
3036 : $self->{children}[$page_or_widget]; 3179 : $self->{children}[$page_or_widget];
3037 3180
3038 $self->{current} = $widget; 3181 $self->{current} = $widget;
3039 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3182 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3040 3183
3041 $self->_emit (page_changed => $self->{current}); 3184 $self->emit (page_changed => $self->{current});
3042 3185
3043 $self->realloc; 3186 $self->realloc;
3044} 3187}
3045 3188
3046sub visible_children { 3189sub visible_children {
… …
3051 my ($self) = @_; 3194 my ($self) = @_;
3052 3195
3053 $self->{current}->size_request 3196 $self->{current}->size_request
3054} 3197}
3055 3198
3056sub size_allocate { 3199sub invoke_size_allocate {
3057 my ($self, $w, $h) = @_; 3200 my ($self, $w, $h) = @_;
3058 3201
3059 $self->{current}->configure (0, 0, $w, $h); 3202 $self->{current}->configure (0, 0, $w, $h);
3203
3204 1
3060} 3205}
3061 3206
3062sub _draw { 3207sub _draw {
3063 my ($self) = @_; 3208 my ($self) = @_;
3064 3209
… …
3099 ); 3244 );
3100 3245
3101 $self->{multiplexer}->add ($widget); 3246 $self->{multiplexer}->add ($widget);
3102} 3247}
3103 3248
3249sub get_current_page {
3250 my ($self) = @_;
3251
3252 $self->{multiplexer}->get_current_page
3253}
3254
3104sub set_current_page { 3255sub set_current_page {
3105 my ($self, $page) = @_; 3256 my ($self, $page) = @_;
3106 3257
3107 $self->{multiplexer}->set_current_page ($page); 3258 $self->{multiplexer}->set_current_page ($page);
3108 $self->_emit (page_changed => $self->{multiplexer}{current}); 3259 $self->emit (page_changed => $self->{multiplexer}{current});
3109} 3260}
3110 3261
3111############################################################################# 3262#############################################################################
3112 3263
3113package CFClient::UI::Combobox; 3264package CFClient::UI::Combobox;
… …
3128 $self->_set_value ($self->{value}); 3279 $self->_set_value ($self->{value});
3129 3280
3130 $self 3281 $self
3131} 3282}
3132 3283
3133sub button_down { 3284sub invoke_button_down {
3134 my ($self, $ev) = @_; 3285 my ($self, $ev) = @_;
3135 3286
3136 my @menu_items; 3287 my @menu_items;
3137 3288
3138 for (@{ $self->{options} }) { 3289 for (@{ $self->{options} }) {
… …
3159 my ($self, $value) = @_; 3310 my ($self, $value) = @_;
3160 3311
3161 return unless $self->{value} ne $value; 3312 return unless $self->{value} ne $value;
3162 3313
3163 $self->_set_value ($value); 3314 $self->_set_value ($value);
3164 $self->_emit (changed => $value); 3315 $self->emit (changed => $value);
3165} 3316}
3166 3317
3167############################################################################# 3318#############################################################################
3168 3319
3169package CFClient::UI::Statusbox; 3320package CFClient::UI::Statusbox;
… …
3284 count => 1, 3435 count => 1,
3285 %arg, 3436 %arg,
3286 }; 3437 };
3287 } 3438 }
3288 3439
3440 $ROOT->on_refresh (reorder => sub {
3289 $self->reorder; 3441 $self->reorder;
3442 });
3290} 3443}
3291 3444
3292sub reconfigure { 3445sub reconfigure {
3293 my ($self) = @_; 3446 my ($self) = @_;
3294 3447
… …
3309 3462
3310############################################################################# 3463#############################################################################
3311 3464
3312package CFClient::UI::Inventory; 3465package CFClient::UI::Inventory;
3313 3466
3314our @ISA = CFClient::UI::ScrolledWindow::; 3467our @ISA = CFClient::UI::Table::;
3315 3468
3316sub new { 3469sub new {
3317 my $class = shift; 3470 my $class = shift;
3318 3471
3319 my $self = $class->SUPER::new ( 3472 my $self = $class->SUPER::new (
3320 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3473 col_expand => [0, 1, 0],
3321 @_, 3474 @_,
3322 ); 3475 );
3323 3476
3324 $self 3477 $self
3325} 3478}
3326 3479
3327sub set_items { 3480sub set_items {
3328 my ($self, $items) = @_; 3481 my ($self, $items) = @_;
3329 3482
3330 $self->{child}->clear; 3483 $self->clear;
3331 return unless $items; 3484 return unless $items;
3332 3485
3333 my @items = sort { 3486 my @items = sort {
3334 ($a->{type} <=> $b->{type}) 3487 ($a->{type} <=> $b->{type})
3335 or ($a->{name} cmp $b->{name}) 3488 or ($a->{name} cmp $b->{name})
3336 } @$items; 3489 } values %$items;
3337 3490
3338 $self->{real_items} = \@items; 3491 $self->{real_items} = \@items;
3339 3492
3340 my $row = 0; 3493 my $row = 0;
3341 for my $item (@items) { 3494 for my $item (@items) {
3342 CFClient::Item::update_widgets $item; 3495 CFClient::Item::update_widgets $item;
3343 3496
3344 $self->{child}->add (0, $row, $item->{face_widget}); 3497 $self->add (0, $row, $item->{face_widget});
3345 $self->{child}->add (1, $row, $item->{desc_widget}); 3498 $self->add (1, $row, $item->{desc_widget});
3346 $self->{child}->add (2, $row, $item->{weight_widget}); 3499 $self->add (2, $row, $item->{weight_widget});
3347 3500
3348 $row++; 3501 $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 } 3502 }
3547} 3503}
3548 3504
3549############################################################################# 3505#############################################################################
3550 3506
… …
3604 } elsif ($ev->{button} == 2) { 3560 } elsif ($ev->{button} == 2) {
3605 $::CONN->user_send ("invoke $spell->{name}"); 3561 $::CONN->user_send ("invoke $spell->{name}");
3606 } elsif ($ev->{button} == 3) { 3562 } elsif ($ev->{button} == 3) {
3607 (new CFClient::UI::Menu 3563 (new CFClient::UI::Menu
3608 items => [ 3564 items => [
3609 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }], 3565 ["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}"]) }], 3566 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3611 ], 3567 ],
3612 )->popup ($ev); 3568 )->popup ($ev);
3613 } else { 3569 } else {
3614 return 0; 3570 return 0;
… …
3709 $coord = $max - $size if $coord > $max - $size; 3665 $coord = $max - $size if $coord > $max - $size;
3710 3666
3711 int $coord + 0.5 3667 int $coord + 0.5
3712} 3668}
3713 3669
3714sub size_allocate { 3670sub invoke_size_allocate {
3715 my ($self, $w, $h) = @_; 3671 my ($self, $w, $h) = @_;
3716 3672
3717 for my $child ($self->children) { 3673 for my $child ($self->children) {
3718 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3674 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3719 3675
… …
3723 $X = _to_pixel $X, $W, $self->{w}; 3679 $X = _to_pixel $X, $W, $self->{w};
3724 $Y = _to_pixel $Y, $H, $self->{h}; 3680 $Y = _to_pixel $Y, $H, $self->{h};
3725 3681
3726 $child->configure ($X, $Y, $W, $H); 3682 $child->configure ($X, $Y, $W, $H);
3727 } 3683 }
3684
3685 1
3728} 3686}
3729 3687
3730sub coord2local { 3688sub coord2local {
3731 my ($self, $x, $y) = @_; 3689 my ($self, $x, $y) = @_;
3732 3690

Diff Legend

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