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.290 by root, Mon Jun 5 22:30:35 2006 UTC vs.
Revision 1.310 by root, Fri Jun 23 20:28:20 2006 UTC

… …
272 272
273 return unless $self->{visible}; 273 return unless $self->{visible};
274 274
275 $_->set_invisible for $self->children; 275 $_->set_invisible for $self->children;
276 276
277 delete $self->{visible};
277 delete $self->{root}; 278 delete $self->{root};
278 delete $self->{visible};
279 279
280 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
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) = @_;
… …
315} 314}
316 315
317sub move_abs { 316sub move_abs {
318 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
319 318
320 $self->{x} = List::Util::max 0, int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
321 $self->{y} = List::Util::max 0, int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
322 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
323 322
324 $self->update; 323 $self->update;
325} 324}
326 325
… …
367 366
368 $self->{root}{size_alloc}{$self+0} = $self; 367 $self->{root}{size_alloc}{$self+0} = $self;
369 } 368 }
370} 369}
371 370
372sub size_allocate {
373 # nothing to be done
374}
375
376sub children { 371sub children {
377 # nop 372 # nop
378} 373}
379 374
380sub visible_children { 375sub visible_children {
… …
418 my ($self, $x, $y) = @_; 413 my ($self, $x, $y) = @_;
419 414
420 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 415 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
421} 416}
422 417
423sub focus_in { 418sub invoke_focus_in {
424 my ($self) = @_; 419 my ($self) = @_;
425 420
426 return if $FOCUS == $self; 421 return if $FOCUS == $self;
427 return unless $self->{can_focus}; 422 return unless $self->{can_focus};
428 423
429 my $focus = $FOCUS; $FOCUS = $self; 424 my $focus = $FOCUS; $FOCUS = $self;
430 425
431 $self->_emit (focus_in => $focus);
432
433 $focus->update if $focus; 426 $focus->update if $focus;
434 $FOCUS->update; 427 $FOCUS->update;
435}
436 428
429 0
430}
431
437sub focus_out { 432sub invoke_focus_out {
438 my ($self) = @_; 433 my ($self) = @_;
439 434
440 return unless $FOCUS == $self; 435 return unless $FOCUS == $self;
441 436
442 my $focus = $FOCUS; undef $FOCUS; 437 my $focus = $FOCUS; undef $FOCUS;
443 438
444 $self->_emit (focus_out => $focus);
445
446 $focus->update if $focus; #? 439 $focus->update if $focus; #?
447 440
448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 441 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
449 unless $FOCUS; 442 unless $FOCUS;
450}
451 443
444 0
445}
446
447sub grab_focus {
448 my ($self) = @_;
449
450 $self->emit ("focus_in");
451}
452
452sub mouse_motion { 0 } 453sub invoke_mouse_motion { 1 }
453sub button_up { 0 } 454sub invoke_button_up { 1 }
454sub key_down { 0 } 455sub invoke_key_down { 1 }
455sub key_up { 0 } 456sub invoke_key_up { 1 }
456 457
457sub button_down { 458sub invoke_button_down {
458 my ($self, $ev, $x, $y) = @_; 459 my ($self, $ev, $x, $y) = @_;
459 460
460 $self->focus_in; 461 $self->grab_focus;
461 462
462 0 463 1
464}
465
466sub connect {
467 my ($self, $signal, $cb) = @_;
468
469 push @{ $self->{signal_cb}{$signal} }, $cb;
470}
471
472sub emit {
473 my ($self, $signal, @args) = @_;
474
475 #d##TODO# stop propagating at first true, do not use sum
476 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
477 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
478 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
463} 479}
464 480
465sub find_widget { 481sub find_widget {
466 my ($self, $x, $y) = @_; 482 my ($self, $x, $y) = @_;
467 483
… …
477sub set_parent { 493sub set_parent {
478 my ($self, $parent) = @_; 494 my ($self, $parent) = @_;
479 495
480 Scalar::Util::weaken ($self->{parent} = $parent); 496 Scalar::Util::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible}; 497 $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} 498}
506 499
507sub realloc { 500sub realloc {
508 my ($self) = @_; 501 my ($self) = @_;
509 502
… …
593 586
594sub DESTROY { 587sub DESTROY {
595 my ($self) = @_; 588 my ($self) = @_;
596 589
597 delete $WIDGET{$self+0}; 590 delete $WIDGET{$self+0};
598 #$self->deactivate; 591
592 eval { $self->destroy };
593 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
599} 594}
600 595
601############################################################################# 596#############################################################################
602 597
603package CFClient::UI::DrawBG; 598package CFClient::UI::DrawBG;
… …
768} 763}
769 764
770sub add { 765sub add {
771 my ($self, $child) = @_; 766 my ($self, $child) = @_;
772 767
773 $self->{children} = []; 768 $self->SUPER::remove ($_) for @{ $self->{children} };
774
775 $self->SUPER::add ($child); 769 $self->SUPER::add ($child);
776} 770}
777 771
778sub remove { 772sub remove {
779 my ($self, $widget) = @_; 773 my ($self, $widget) = @_;
… …
788 782
789sub size_request { 783sub size_request {
790 $_[0]{children}[0]->size_request 784 $_[0]{children}[0]->size_request
791} 785}
792 786
793sub size_allocate { 787sub invoke_size_allocate {
794 my ($self, $w, $h) = @_; 788 my ($self, $w, $h) = @_;
795 789
796 $self->{children}[0]->configure (0, 0, $w, $h); 790 $self->{children}[0]->configure (0, 0, $w, $h);
791
792 1
797} 793}
798 794
799############################################################################# 795#############################################################################
800 796
801# back-buffered drawing area 797# back-buffered drawing area
… …
817 813
818 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 814 $ROOT->on_post_alloc ($self => sub { $self->render_child });
819 $self->SUPER::update; 815 $self->SUPER::update;
820} 816}
821 817
822sub size_allocate { 818sub invoke_size_allocate {
823 my ($self, $w, $h) = @_; 819 my ($self, $w, $h) = @_;
824 820
825 $self->SUPER::size_allocate ($w, $h);
826 $self->update; 821 $self->update;
822
823 $self->SUPER::invoke_size_allocate ($w, $h)
827} 824}
828 825
829sub _render { 826sub _render {
830 my ($self) = @_; 827 my ($self) = @_;
831 828
… …
892 $h = 10 if $self->{scroll_y}; 889 $h = 10 if $self->{scroll_y};
893 890
894 ($w, $h) 891 ($w, $h)
895} 892}
896 893
897sub size_allocate { 894sub invoke_size_allocate {
898 my ($self, $w, $h) = @_; 895 my ($self, $w, $h) = @_;
899 896
900 my $child = $self->child; 897 my $child = $self->child;
901 898
902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 899 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 900 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904 901
905 $self->child->configure (0, 0, $w, $h); 902 $self->child->configure (0, 0, $w, $h);
906 $self->update; 903 $self->update;
904
905 1
907} 906}
908 907
909sub set_offset { 908sub set_offset {
910 my ($self, $x, $y) = @_; 909 my ($self, $x, $y) = @_;
911 910
… …
1001 # todo: overwrite size_allocate of child 1000 # todo: overwrite size_allocate of child
1002 my $child = $self->{vp}->child; 1001 my $child = $self->{vp}->child;
1003 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1004} 1003}
1005 1004
1006sub size_allocate { 1005sub invoke_size_allocate {
1007 my ($self, $w, $h) = @_; 1006 my ($self, $w, $h) = @_;
1008
1009 $self->SUPER::size_allocate ($w, $h);
1010 1007
1011 my $child = $self->{vp}->child; 1008 my $child = $self->{vp}->child;
1012 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1009 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1010
1011 $self->SUPER::invoke_size_allocate ($w, $h)
1013} 1012}
1014 1013
1015#TODO# update range on size_allocate depending on child 1014#TODO# update range on size_allocate depending on child
1016# update viewport offset on scroll 1015# update viewport offset on scroll
1017 1016
… …
1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1072 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1071 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1073 1072
1074sub new { 1073sub new {
1075 my ($class, %arg) = @_; 1074 my ($class, %arg) = @_;
1076
1077 my $title = delete $arg{title};
1078 1075
1079 my $self = $class->SUPER::new ( 1076 my $self = $class->SUPER::new (
1080 bg => [1, 1, 1, 1], 1077 bg => [1, 1, 1, 1],
1081 border_bg => [1, 1, 1, 1], 1078 border_bg => [1, 1, 1, 1],
1082 border => 0.6, 1079 border => 0.6,
… …
1084 min_w => 16, 1081 min_w => 16,
1085 min_h => 16, 1082 min_h => 16,
1086 %arg, 1083 %arg,
1087 ); 1084 );
1088 1085
1089 $self->{title} = new CFClient::UI::Label 1086 $self->{title_widget} = new CFClient::UI::Label
1090 align => 0, 1087 align => 0,
1091 valign => 1, 1088 valign => 1,
1092 text => $title, 1089 text => $self->{title},
1093 fontsize => $self->{border} 1090 fontsize => $self->{border},
1094 if defined $title; 1091 if exists $self->{title};
1092
1093 if ($self->{has_close_button}) {
1094 $self->{close_button} =
1095 new CFClient::UI::ImageButton
1096 path => 'x1_close.png',
1097 on_activate => sub { $self->hide };
1098
1099 $self->CFClient::UI::Container::add ($self->{close_button});
1100 }
1095 1101
1096 $self 1102 $self
1097} 1103}
1098 1104
1099sub add { 1105sub add {
1100 my ($self, @widgets) = @_; 1106 my ($self, @widgets) = @_;
1101 1107
1102 $self->SUPER::add (@widgets); 1108 $self->SUPER::add (@widgets);
1109 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1110 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1104} 1111}
1105 1112
1106sub border { 1113sub border {
1107 int $_[0]{border} * $::FONTSIZE 1114 int $_[0]{border} * $::FONTSIZE
1108} 1115}
1109 1116
1110sub size_request { 1117sub size_request {
1111 my ($self) = @_; 1118 my ($self) = @_;
1112 1119
1113 $self->{title}->size_request 1120 $self->{title_widget}->size_request
1114 if $self->{title}; 1121 if $self->{title_widget};
1122
1123 $self->{close_button}->size_request
1124 if $self->{close_button};
1115 1125
1116 my ($w, $h) = $self->SUPER::size_request; 1126 my ($w, $h) = $self->SUPER::size_request;
1117 1127
1118 ( 1128 (
1119 $w + $self->border * 2, 1129 $w + $self->border * 2,
1120 $h + $self->border * 2, 1130 $h + $self->border * 2,
1121 ) 1131 )
1122} 1132}
1123 1133
1124sub size_allocate { 1134sub invoke_size_allocate {
1125 my ($self, $w, $h) = @_; 1135 my ($self, $w, $h) = @_;
1126 1136
1127 if ($self->{title}) { 1137 if ($self->{title_widget}) {
1128 $self->{title}{w} = $w; 1138 $self->{title_widget}{w} = $w;
1129 $self->{title}{h} = $h; 1139 $self->{title_widget}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h); 1140 $self->{title_widget}->invoke_size_allocate ($w, $h);
1131 } 1141 }
1132 1142
1133 my $border = $self->border; 1143 my $border = $self->border;
1134 1144
1135 $h -= List::Util::max 0, $border * 2; 1145 $h -= List::Util::max 0, $border * 2;
1136 $w -= List::Util::max 0, $border * 2; 1146 $w -= List::Util::max 0, $border * 2;
1137 1147
1138 $self->child->configure ($border, $border, $w, $h); 1148 $self->child->configure ($border, $border, $w, $h);
1139}
1140 1149
1150 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1151 if $self->{close_button};
1152
1153 1
1154}
1155
1141sub button_down { 1156sub invoke_button_down {
1142 my ($self, $ev, $x, $y) = @_; 1157 my ($self, $ev, $x, $y) = @_;
1143 1158
1144 my ($w, $h) = @$self{qw(w h)}; 1159 my ($w, $h) = @$self{qw(w h)};
1145 my $border = $self->border; 1160 my $border = $self->border;
1146 1161
… …
1177 1192
1178 ($x, $y) = ($ev->{x}, $ev->{y}); 1193 ($x, $y) = ($ev->{x}, $ev->{y});
1179 1194
1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1181 # HACK: the next line is required to enforce placement 1196 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1197 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1183 }; 1198 };
1184 } else { 1199 } else {
1185 return 0; 1200 return 0;
1186 } 1201 }
1187 1202
1188 1 1203 1
1189} 1204}
1190 1205
1191sub button_up { 1206sub invoke_button_up {
1192 my ($self, $ev, $x, $y) = @_; 1207 my ($self, $ev, $x, $y) = @_;
1193 1208
1194 !!delete $self->{motion} 1209 ! ! delete $self->{motion}
1195} 1210}
1196 1211
1197sub mouse_motion { 1212sub invoke_mouse_motion {
1198 my ($self, $ev, $x, $y) = @_; 1213 my ($self, $ev, $x, $y) = @_;
1199 1214
1200 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1215 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201 1216
1202 !!$self->{motion} 1217 ! ! $self->{motion}
1203} 1218}
1204 1219
1205sub _draw { 1220sub _draw {
1206 my ($self) = @_; 1221 my ($self) = @_;
1207 1222
… …
1233 1248
1234 glDisable GL_TEXTURE_2D; 1249 glDisable GL_TEXTURE_2D;
1235 1250
1236 $child->draw; 1251 $child->draw;
1237 1252
1238 if ($self->{title}) { 1253 if ($self->{title_widget}) {
1239 glTranslate 0, $border - $self->{h}; 1254 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw; 1255 $self->{title_widget}->_draw;
1256
1257 glTranslate 0, - ($border - $self->{h});
1241 } 1258 }
1259
1260 $self->{close_button}->draw
1261 if $self->{close_button};
1242} 1262}
1243 1263
1244############################################################################# 1264#############################################################################
1245 1265
1246package CFClient::UI::Table; 1266package CFClient::UI::Table;
… …
1269 1289
1270 $child->set_parent ($self); 1290 $child->set_parent ($self);
1271 $self->{children}[$y][$x] = $child; 1291 $self->{children}[$y][$x] = $child;
1272 1292
1273 $self->realloc; 1293 $self->realloc;
1294}
1295
1296sub remove {
1297 my ($self, $child) = @_;
1298
1299 # TODO: not yet implemented
1274} 1300}
1275 1301
1276# TODO: move to container class maybe? send children a signal on removal? 1302# TODO: move to container class maybe? send children a signal on removal?
1277sub clear { 1303sub clear {
1278 my ($self) = @_; 1304 my ($self) = @_;
… …
1319 (sum @$ws), 1345 (sum @$ws),
1320 (sum @$hs), 1346 (sum @$hs),
1321 ) 1347 )
1322} 1348}
1323 1349
1324sub size_allocate { 1350sub invoke_size_allocate {
1325 my ($self, $w, $h) = @_; 1351 my ($self, $w, $h) = @_;
1326 1352
1327 my ($ws, $hs) = $self->get_wh; 1353 my ($ws, $hs) = $self->get_wh;
1328 1354
1329 my $req_w = (sum @$ws) || 1; 1355 my $req_w = (sum @$ws) || 1;
… …
1361 } 1387 }
1362 1388
1363 $y += $row_h; 1389 $y += $row_h;
1364 } 1390 }
1365 1391
1392 1
1366} 1393}
1367 1394
1368sub find_widget { 1395sub find_widget {
1369 my ($self, $x, $y) = @_; 1396 my ($self, $x, $y) = @_;
1370 1397
… …
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1434 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1435 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 ) 1436 )
1410} 1437}
1411 1438
1412sub size_allocate { 1439sub invoke_size_allocate {
1413 my ($self, $w, $h) = @_; 1440 my ($self, $w, $h) = @_;
1414 1441
1415 my $space = $self->{vertical} ? $h : $w; 1442 my $space = $self->{vertical} ? $h : $w;
1416 my $children = $self->{children}; 1443 my @children = $self->visible_children;
1417 1444
1418 my @req; 1445 my @req;
1419 1446
1420 if ($self->{homogeneous}) { 1447 if ($self->{homogeneous}) {
1421 @req = ($space / (@$children || 1)) x @$children; 1448 @req = ($space / (@children || 1)) x @children;
1422 } else { 1449 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1450 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1424 my $req = List::Util::sum @req; 1451 my $req = List::Util::sum @req;
1425 1452
1426 if ($req > $space) { 1453 if ($req > $space) {
1427 # ah well, not enough space 1454 # ah well, not enough space
1428 $_ *= $space / $req for @req; 1455 $_ *= $space / $req for @req;
1429 } else { 1456 } else {
1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1457 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1431 1458
1432 $space = ($space - $req) / $expand; # remaining space to give away 1459 $space = ($space - $req) / $expand; # remaining space to give away
1433 1460
1434 $req[$_] += $space * $children->[$_]{expand} 1461 $req[$_] += $space * $children[$_]{expand}
1435 for 0 .. $#$children; 1462 for 0 .. $#children;
1436 } 1463 }
1437 } 1464 }
1438 1465
1439 CFClient::UI::harmonize \@req; 1466 CFClient::UI::harmonize \@req;
1440 1467
1441 my $pos = 0; 1468 my $pos = 0;
1442 for (0 .. $#$children) { 1469 for (0 .. $#children) {
1443 my $alloc = $req[$_]; 1470 my $alloc = $req[$_];
1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1471 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1445 1472
1446 $pos += $alloc; 1473 $pos += $alloc;
1447 } 1474 }
1448 1475
1449 1 1476 1
… …
1604 }; 1631 };
1605 1632
1606 @{ $self->{size_req} } 1633 @{ $self->{size_req} }
1607} 1634}
1608 1635
1609sub size_allocate { 1636sub invoke_size_allocate {
1610 my ($self, $w, $h) = @_; 1637 my ($self, $w, $h) = @_;
1611 1638
1612 delete $self->{ox}; 1639 delete $self->{ox};
1613 1640
1614 delete $self->{texture} 1641 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1642 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1643
1644 1
1616} 1645}
1617 1646
1618sub set_fontsize { 1647sub set_fontsize {
1619 my ($self, $fontsize) = @_; 1648 my ($self, $fontsize) = @_;
1620 1649
… …
1658 : ($self->{h} - $tex->{h}) * 0.5); 1687 : ($self->{h} - $tex->{h}) * 0.5);
1659 }; 1688 };
1660 1689
1661 glEnable GL_TEXTURE_2D; 1690 glEnable GL_TEXTURE_2D;
1662 1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1694
1663 if ($tex->{format} == GL_ALPHA) { 1695 if ($tex->{format} == GL_ALPHA) {
1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1665 glColor @{$self->{fg}}; 1697 glColor @{$self->{fg}};
1666 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1667 } else { 1699 } else {
1668 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1669 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1670 } 1702 }
1671 1703
1672 glDisable GL_TEXTURE_2D; 1704 glDisable GL_TEXTURE_2D;
1673} 1705}
1674 1706
… …
1691 can_hover => 1, 1723 can_hover => 1,
1692 can_focus => 1, 1724 can_focus => 1,
1693 valign => 0, 1725 valign => 0,
1694 can_events => 1, 1726 can_events => 1,
1695 #text => ... 1727 #text => ...
1728 #hidden => "*",
1696 @_ 1729 @_
1697 ) 1730 )
1698} 1731}
1699 1732
1700sub _set_text { 1733sub _set_text {
… …
1709 1742
1710 $text =~ s/./*/g if $self->{hidden}; 1743 $text =~ s/./*/g if $self->{hidden};
1711 $self->{layout}->set_text ("$text "); 1744 $self->{layout}->set_text ("$text ");
1712 delete $self->{size_req}; 1745 delete $self->{size_req};
1713 1746
1714 $self->_emit (changed => $self->{text}); 1747 $self->emit (changed => $self->{text});
1715 1748
1716 $self->realloc; 1749 $self->realloc;
1717 $self->update; 1750 $self->update;
1718} 1751}
1719 1752
… …
1734 my ($w, $h) = $self->SUPER::size_request; 1767 my ($w, $h) = $self->SUPER::size_request;
1735 1768
1736 ($w + 1, $h) # add 1 for cursor 1769 ($w + 1, $h) # add 1 for cursor
1737} 1770}
1738 1771
1739sub key_down { 1772sub invoke_key_down {
1740 my ($self, $ev) = @_; 1773 my ($self, $ev) = @_;
1741 1774
1742 my $mod = $ev->{mod}; 1775 my $mod = $ev->{mod};
1743 my $sym = $ev->{sym}; 1776 my $sym = $ev->{sym};
1744 my $uni = $ev->{unicode}; 1777 my $uni = $ev->{unicode};
… …
1756 } elsif ($sym == CFClient::SDLK_HOME) { 1789 } elsif ($sym == CFClient::SDLK_HOME) {
1757 $self->{cursor} = 0; 1790 $self->{cursor} = 0;
1758 } elsif ($sym == CFClient::SDLK_END) { 1791 } elsif ($sym == CFClient::SDLK_END) {
1759 $self->{cursor} = length $text; 1792 $self->{cursor} = length $text;
1760 } elsif ($uni == 27) { 1793 } elsif ($uni == 27) {
1761 $self->_emit ('escape'); 1794 $self->emit ('escape');
1762 } elsif ($uni) { 1795 } elsif ($uni) {
1763 substr $text, $self->{cursor}++, 0, chr $uni; 1796 substr $text, $self->{cursor}++, 0, chr $uni;
1764 } else { 1797 } else {
1765 return 0; 1798 return 0;
1766 } 1799 }
… …
1770 $self->realloc; 1803 $self->realloc;
1771 1804
1772 1 1805 1
1773} 1806}
1774 1807
1775sub focus_in { 1808sub invoke_focus_in {
1776 my ($self) = @_; 1809 my ($self) = @_;
1777 1810
1778 $self->{last_activity} = $::NOW; 1811 $self->{last_activity} = $::NOW;
1779 1812
1780 $self->SUPER::focus_in; 1813 $self->SUPER::invoke_focus_in
1781} 1814}
1782 1815
1783sub button_down { 1816sub invoke_button_down {
1784 my ($self, $ev, $x, $y) = @_; 1817 my ($self, $ev, $x, $y) = @_;
1785 1818
1786 $self->SUPER::button_down ($ev, $x, $y); 1819 $self->SUPER::invoke_button_down ($ev, $x, $y);
1787 1820
1788 my $idx = $self->{layout}->xy_to_index ($x, $y); 1821 my $idx = $self->{layout}->xy_to_index ($x, $y);
1789 1822
1790 # byte-index to char-index 1823 # byte-index to char-index
1791 my $text = $self->{text}; 1824 my $text = $self->{text};
… …
1796 $self->update; 1829 $self->update;
1797 1830
1798 1 1831 1
1799} 1832}
1800 1833
1801sub mouse_motion { 1834sub invoke_mouse_motion {
1802 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1803# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1836# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1804 1837
1805 0 1838 1
1806} 1839}
1807 1840
1808sub _draw { 1841sub _draw {
1809 my ($self) = @_; 1842 my ($self) = @_;
1810 1843
… …
1851 1884
1852our @ISA = CFClient::UI::EntryBase::; 1885our @ISA = CFClient::UI::EntryBase::;
1853 1886
1854use CFClient::OpenGL; 1887use CFClient::OpenGL;
1855 1888
1856sub key_down { 1889sub invoke_key_down {
1857 my ($self, $ev) = @_; 1890 my ($self, $ev) = @_;
1858 1891
1859 my $sym = $ev->{sym}; 1892 my $sym = $ev->{sym};
1860 1893
1861 if ($sym == 13) { 1894 if ($sym == 13) {
1862 unshift @{$self->{history}}, 1895 unshift @{$self->{history}},
1863 my $txt = $self->get_text; 1896 my $txt = $self->get_text;
1897
1864 $self->{history_pointer} = -1; 1898 $self->{history_pointer} = -1;
1865 $self->{history_saveback} = ''; 1899 $self->{history_saveback} = '';
1866 $self->_emit (activate => $txt); 1900 $self->emit (activate => $txt);
1867 $self->update; 1901 $self->update;
1868 1902
1869 } elsif ($sym == CFClient::SDLK_UP) { 1903 } elsif ($sym == CFClient::SDLK_UP) {
1870 if ($self->{history_pointer} < 0) { 1904 if ($self->{history_pointer} < 0) {
1871 $self->{history_saveback} = $self->get_text; 1905 $self->{history_saveback} = $self->get_text;
… …
1887 } else { 1921 } else {
1888 $self->set_text ($self->{history_saveback}); 1922 $self->set_text ($self->{history_saveback});
1889 } 1923 }
1890 1924
1891 } else { 1925 } else {
1892 return $self->SUPER::key_down ($ev) 1926 return $self->SUPER::invoke_key_down ($ev)
1893 } 1927 }
1894 1928
1895 1 1929 1
1896} 1930}
1897 1931
… …
1921 can_events => 1, 1955 can_events => 1,
1922 @_ 1956 @_
1923 ) 1957 )
1924} 1958}
1925 1959
1926sub activate { }
1927
1928sub button_up { 1960sub invoke_button_up {
1929 my ($self, $ev, $x, $y) = @_; 1961 my ($self, $ev, $x, $y) = @_;
1930 1962
1931 $self->emit ("activate") 1963 $self->emit ("activate")
1932 if $x >= 0 && $x < $self->{w} 1964 if $x >= 0 && $x < $self->{w}
1933 && $y >= 0 && $y < $self->{h}; 1965 && $y >= 0 && $y < $self->{h};
… …
1947 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1979 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1948 1980
1949 glDisable GL_TEXTURE_2D; 1981 glDisable GL_TEXTURE_2D;
1950 1982
1951 $self->SUPER::_draw; 1983 $self->SUPER::_draw;
1984}
1985
1986#############################################################################
1987
1988package CFClient::UI::ImageButton;
1989
1990our @ISA = CFClient::UI::Image::;
1991
1992use CFClient::OpenGL;
1993
1994my %textures;
1995
1996sub new {
1997 my $class = shift;
1998
1999 my $self = $class->SUPER::new (
2000 padding_x => 4,
2001 padding_y => 4,
2002 fg => [1, 1, 1],
2003 active_fg => [0, 0, 1],
2004 can_hover => 1,
2005 align => 0,
2006 valign => 0,
2007 can_events => 1,
2008 @_
2009 );
2010}
2011
2012sub invoke_button_up {
2013 my ($self, $ev, $x, $y) = @_;
2014
2015 $self->emit ("activate")
2016 if $x >= 0 && $x < $self->{w}
2017 && $y >= 0 && $y < $self->{h};
2018
2019 1
1952} 2020}
1953 2021
1954############################################################################# 2022#############################################################################
1955 2023
1956package CFClient::UI::CheckBox; 2024package CFClient::UI::CheckBox;
… …
1983 my ($self) = @_; 2051 my ($self) = @_;
1984 2052
1985 (6) x 2 2053 (6) x 2
1986} 2054}
1987 2055
1988sub button_down { 2056sub invoke_button_down {
1989 my ($self, $ev, $x, $y) = @_; 2057 my ($self, $ev, $x, $y) = @_;
1990 2058
1991 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2059 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1992 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2060 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1993 $self->{state} = !$self->{state}; 2061 $self->{state} = !$self->{state};
1994 $self->_emit (changed => $self->{state}); 2062 $self->emit (changed => $self->{state});
1995 } else { 2063 } else {
1996 return 0 2064 return 0
1997 } 2065 }
1998 2066
1999 1 2067 1
… …
2024package CFClient::UI::Image; 2092package CFClient::UI::Image;
2025 2093
2026our @ISA = CFClient::UI::Base::; 2094our @ISA = CFClient::UI::Base::;
2027 2095
2028use CFClient::OpenGL; 2096use CFClient::OpenGL;
2029use Carp qw/confess/;
2030 2097
2031our %loaded_images; 2098our %texture_cache;
2032 2099
2033sub new { 2100sub new {
2034 my $class = shift; 2101 my $class = shift;
2035 2102
2036 my $self = $class->SUPER::new (can_events => 0, @_); 2103 my $self = $class->SUPER::new (
2104 can_events => 0,
2105 @_,
2106 );
2037 2107
2038 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2108 $self->{path}
2109 or Carp::croak "required attribute 'path' not set";
2039 2110
2040 $loaded_images{$self->{image}} ||= 2111 $self->{tex} = $texture_cache{$self->{path}} ||=
2041 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2112 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2042 2113
2043 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2114 Scalar::Util::weaken $texture_cache{$self->{path}};
2044 2115
2045 Scalar::Util::weaken $loaded_images{$self->{image}}; 2116 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2046
2047 $self->{aspect} = $tex->{w} / $tex->{h};
2048 2117
2049 $self 2118 $self
2050} 2119}
2051 2120
2052sub size_request { 2121sub size_request {
2053 my ($self) = @_; 2122 my ($self) = @_;
2054 2123
2055 ($self->{tex}->{w}, $self->{tex}->{h}) 2124 ($self->{tex}{w}, $self->{tex}{h})
2056} 2125}
2057 2126
2058sub _draw { 2127sub _draw {
2059 my ($self) = @_; 2128 my ($self) = @_;
2060 2129
… …
2296 $self->update; 2365 $self->update;
2297 2366
2298 $self 2367 $self
2299} 2368}
2300 2369
2301sub changed { }
2302
2303sub set_range { 2370sub set_range {
2304 my ($self, $range) = @_; 2371 my ($self, $range) = @_;
2305 2372
2306 ($range, $self->{range}) = ($self->{range}, $range); 2373 ($range, $self->{range}) = ($self->{range}, $range);
2307 2374
2308 $self->update
2309 if "@$range" ne "@{$self->{range}}"; 2375 if ("@$range" ne "@{$self->{range}}") {
2376 $self->update;
2377 $self->set_value ($self->{range}[0]);
2378 }
2310} 2379}
2311 2380
2312sub set_value { 2381sub set_value {
2313 my ($self, $value) = @_; 2382 my ($self, $value) = @_;
2314 2383
… …
2325 if $unit; 2394 if $unit;
2326 2395
2327 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2396 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2328 2397
2329 if ($value != $old_value) { 2398 if ($value != $old_value) {
2330 $self->_emit (changed => $value); 2399 $self->emit (changed => $value);
2331 $self->update; 2400 $self->update;
2332 } 2401 }
2333} 2402}
2334 2403
2335sub size_request { 2404sub size_request {
2336 my ($self) = @_; 2405 my ($self) = @_;
2337 2406
2338 ($self->{req_w}, $self->{req_h}) 2407 ($self->{req_w}, $self->{req_h})
2339} 2408}
2340 2409
2341sub button_down { 2410sub invoke_button_down {
2342 my ($self, $ev, $x, $y) = @_; 2411 my ($self, $ev, $x, $y) = @_;
2343 2412
2344 $self->SUPER::button_down ($ev, $x, $y); 2413 $self->SUPER::invoke_button_down ($ev, $x, $y);
2345 2414
2346 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2415 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2347 2416
2348 $self->mouse_motion ($ev, $x, $y) 2417 $self->invoke_mouse_motion ($ev, $x, $y)
2349} 2418}
2350 2419
2351sub mouse_motion { 2420sub invoke_mouse_motion {
2352 my ($self, $ev, $x, $y) = @_; 2421 my ($self, $ev, $x, $y) = @_;
2353 2422
2354 if ($GRAB == $self) { 2423 if ($GRAB == $self) {
2355 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2424 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2356 2425
… …
2461sub set_range { shift->{slider}->set_range (@_) } 2530sub set_range { shift->{slider}->set_range (@_) }
2462sub set_value { shift->{slider}->set_value (@_) } 2531sub set_value { shift->{slider}->set_value (@_) }
2463 2532
2464############################################################################# 2533#############################################################################
2465 2534
2466package CFClient::UI::TextView; 2535package CFClient::UI::TextScroller;
2467 2536
2468our @ISA = CFClient::UI::HBox::; 2537our @ISA = CFClient::UI::HBox::;
2469 2538
2470use CFClient::OpenGL; 2539use CFClient::OpenGL;
2471 2540
… …
2473 my $class = shift; 2542 my $class = shift;
2474 2543
2475 my $self = $class->SUPER::new ( 2544 my $self = $class->SUPER::new (
2476 fontsize => 1, 2545 fontsize => 1,
2477 can_events => 0, 2546 can_events => 0,
2547 indent => 0,
2478 #font => default_font 2548 #font => default_font
2479 @_, 2549 @_,
2480 2550
2481 layout => (new CFClient::Layout 1), 2551 layout => (new CFClient::Layout 1),
2482 par => [], 2552 par => [],
… …
2497 2567
2498 $self->{fontsize} = $fontsize; 2568 $self->{fontsize} = $fontsize;
2499 $self->reflow; 2569 $self->reflow;
2500} 2570}
2501 2571
2572sub visible_children {
2573 my ($self) = @_;
2574
2575 @{$self->{children}}[0,1]
2576}
2577
2502sub size_allocate { 2578sub invoke_size_allocate {
2503 my ($self, $w, $h) = @_; 2579 my ($self, $w, $h) = @_;
2504 2580
2505 $self->SUPER::size_allocate ($w, $h); 2581 my (undef, undef, @other) = @{ $self->{children} };
2582 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2506 2583
2507 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2584 $self->{layout}->set_font ($self->{font}) if $self->{font};
2508 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2585 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2509 $self->{layout}->set_width ($self->{children}[0]{w}); 2586 $self->{layout}->set_width ($self->{children}[0]{w});
2587 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2510 2588
2511 $self->reflow; 2589 $self->reflow;
2512}
2513 2590
2514sub text_size { 2591 $self->SUPER::invoke_size_allocate ($w, $h)
2515 my ($self, $text, $indent) = @_; 2592}
2593
2594sub get_layout {
2595 my ($self, $para) = @_;
2516 2596
2517 my $layout = $self->{layout}; 2597 my $layout = $self->{layout};
2518 2598
2599 $layout->set_font ($self->{font}) if $self->{font};
2519 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2600 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2520 $layout->set_width ($self->{children}[0]{w} - $indent); 2601 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2602 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2521 $layout->set_markup ($text); 2603 $layout->set_markup ($para->{markup});
2522 2604 $layout->set_shapes (map +($_->{req_w}, $_->{req_h}), @{$para->{widget}});
2605
2523 $layout->size 2606 $layout
2524} 2607}
2525 2608
2526sub reflow { 2609sub reflow {
2527 my ($self) = @_; 2610 my ($self) = @_;
2528 2611
… …
2537 $self->{children}[1]->set_value ($offset); 2620 $self->{children}[1]->set_value ($offset);
2538} 2621}
2539 2622
2540sub clear { 2623sub clear {
2541 my ($self) = @_; 2624 my ($self) = @_;
2625
2626 my (undef, undef, @other) = @{ $self->{children} };
2627 $self->remove ($_) for @other;
2542 2628
2543 $self->{par} = []; 2629 $self->{par} = [];
2544 $self->{height} = 0; 2630 $self->{height} = 0;
2545 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2631 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2546} 2632}
2547 2633
2548sub add_paragraph { 2634sub add_paragraph {
2549 my ($self, $color, $text, $indent) = @_; 2635 my ($self, $color, $para, $indent) = @_;
2550 2636
2551 for my $line (split /\n/, $text) { 2637 my ($text, @w) = ref $para ? @$para : $para;
2552 my ($w, $h) = $self->text_size ($line); 2638
2553 $self->{height} += $h; 2639 $para = {
2554 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2640 w => 1e10,
2641 wrapped => 1,
2642 fg => $color,
2643 indent => $indent,
2644 markup => $text,
2645 widget => \@w,
2555 } 2646 };
2556 2647
2557 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2648 $self->add (@w) if @w;
2649 push @{$self->{par}}, $para;
2650
2651 $self->{need_reflow}++;
2652 $self->update;
2653}
2654
2655sub scroll_to_bottom {
2656 my ($self) = @_;
2657
2658 $self->{scroll_to_bottom} = 1;
2659 $self->update;
2558} 2660}
2559 2661
2560sub update { 2662sub update {
2561 my ($self) = @_; 2663 my ($self) = @_;
2562 2664
… …
2564 2666
2565 return unless $self->{h} > 0; 2667 return unless $self->{h} > 0;
2566 2668
2567 delete $self->{texture}; 2669 delete $self->{texture};
2568 2670
2569 $ROOT->on_post_alloc ($self, sub { 2671 $ROOT->on_post_alloc ($self => sub {
2570 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2672 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2571 2673
2572 if (delete $self->{need_reflow}) { 2674 if (delete $self->{need_reflow}) {
2573 my $height = 0; 2675 my $height = 0;
2574 2676
2575 my $layout = $self->{layout};
2576
2577 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2578
2579 for (@{$self->{par}}) { 2677 for my $para (@{$self->{par}}) {
2580 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2678 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2581 $layout->set_width ($W - $_->[3]); 2679 my $layout = $self->get_layout ($para);
2582 $layout->set_markup ($_->[4]);
2583 my ($w, $h) = $layout->size; 2680 my ($w, $h) = $layout->size;
2584 $_->[0] = $w + $_->[3]; 2681
2682 $para->{w} = $w + $para->{indent};
2585 $_->[1] = $h; 2683 $para->{h} = $h;
2684 $para->{wrapped} = $layout->has_wrapped;
2586 } 2685 }
2587 2686
2588 $height += $_->[1]; 2687 $height += $para->{h};
2589 } 2688 }
2590 2689
2591 $self->{height} = $height; 2690 $self->{height} = $height;
2592 2691
2593 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2692 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2594 2693
2595 delete $self->{texture}; 2694 delete $self->{texture};
2695 }
2696
2697 if (delete $self->{scroll_to_bottom}) {
2698 $self->{children}[1]->set_value (1e10);
2596 } 2699 }
2597 2700
2598 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2701 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2599 glClearColor 0, 0, 0, 0; 2702 glClearColor 0, 0, 0, 0;
2600 glClear GL_COLOR_BUFFER_BIT; 2703 glClear GL_COLOR_BUFFER_BIT;
… …
2604 my $y0 = $top; 2707 my $y0 = $top;
2605 my $y1 = $top + $H; 2708 my $y1 = $top + $H;
2606 2709
2607 my $y = 0; 2710 my $y = 0;
2608 2711
2609 my $layout = $self->{layout};
2610
2611 $layout->set_font ($self->{font}) if $self->{font};
2612
2613 glEnable GL_BLEND; 2712 glEnable GL_BLEND;
2614 #TODO# not correct in windows where rgba is forced off 2713 #TODO# not correct in windows where rgba is forced off
2615 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2714 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2616 2715
2617 for my $par (@{$self->{par}}) { 2716 for my $para (@{$self->{par}}) {
2618 my $h = $par->[1]; 2717 my $h = $para->{h};
2619 2718
2620 if ($y0 < $y + $h && $y < $y1) { 2719 if ($y0 < $y + $h && $y < $y1) {
2621 $layout->set_foreground (@{ $par->[2] }); 2720
2622 $layout->set_width ($W - $par->[3]); 2721 my $layout = $self->get_layout ($para);
2623 $layout->set_markup ($par->[4]);
2624 2722
2625 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2723 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2626 2724
2627 glRasterPos $par->[3], $y - $y0; 2725 glRasterPos $para->{indent}, $y - $y0;
2628 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2726 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2727
2728 if (my @w = @{ $para->{widget} }) {
2729 my @s = $layout->get_shapes;
2730
2731 for (@w) {
2732 my ($dx, $dy) = splice @s, 0, 2, ();
2733
2734 $_->{x} = $dx + $para->{indent};
2735 $_->{y} = $dy + $y - $y0;
2736
2737 $_->draw;
2738 }
2739 }
2629 } 2740 }
2630 2741
2631 $y += $h; 2742 $y += $h;
2632 } 2743 }
2633 2744
2634 glDisable GL_BLEND; 2745 glDisable GL_BLEND;
2635 }; 2746 };
2636 }); 2747 });
2748}
2749
2750sub reconfigure {
2751 my ($self) = @_;
2752
2753 $self->SUPER::reconfigure;
2754
2755 $_->{w} = 1e10 for @{ $self->{par} };
2756 $self->reflow;
2637} 2757}
2638 2758
2639sub _draw { 2759sub _draw {
2640 my ($self) = @_; 2760 my ($self) = @_;
2641 2761
… …
2644 glColor 0, 0, 0, 1; 2764 glColor 0, 0, 0, 1;
2645 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2765 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2646 glDisable GL_TEXTURE_2D; 2766 glDisable GL_TEXTURE_2D;
2647 2767
2648 $self->{children}[1]->draw; 2768 $self->{children}[1]->draw;
2649
2650} 2769}
2651 2770
2652############################################################################# 2771#############################################################################
2653 2772
2654package CFClient::UI::Animator; 2773package CFClient::UI::Animator;
… …
2741 $tooltip .= "\n\n" . (ref $widget) . "\n" 2860 $tooltip .= "\n\n" . (ref $widget) . "\n"
2742 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2861 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2743 . "req $widget->{req_w} $widget->{req_h}\n" 2862 . "req $widget->{req_w} $widget->{req_h}\n"
2744 . "visible $widget->{visible}"; 2863 . "visible $widget->{visible}";
2745 } 2864 }
2865
2866 $tooltip =~ s/^\n+//;
2867 $tooltip =~ s/\n+$//;
2746 2868
2747 $self->add (new CFClient::UI::Label 2869 $self->add (new CFClient::UI::Label
2748 markup => $tooltip, 2870 markup => $tooltip,
2749 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2871 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2750 fontsize => 0.8, 2872 fontsize => 0.8,
… …
2760 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2882 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2761 2883
2762 ($w + 4, $h + 4) 2884 ($w + 4, $h + 4)
2763} 2885}
2764 2886
2765sub size_allocate { 2887sub invoke_size_allocate {
2766 my ($self, $w, $h) = @_; 2888 my ($self, $w, $h) = @_;
2767 2889
2768 $self->SUPER::size_allocate ($w - 4, $h - 4); 2890 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2769} 2891}
2770 2892
2771sub visibility_change { 2893sub invoke_visibility_change {
2772 my ($self, $visible) = @_; 2894 my ($self, $visible) = @_;
2773 2895
2774 return unless $visible; 2896 return unless $visible;
2775 2897
2776 $self->{root}->on_post_alloc ("move_$self" => sub { 2898 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2778 or return; 2900 or return;
2779 2901
2780 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2902 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2781 2903
2782 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2904 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2783 if $x + $self->{w} > $::WIDTH; 2905 if $x + $self->{w} > $self->{root}{w};
2784 2906
2785 $self->move_abs ($x, $y); 2907 $self->move_abs ($x, $y);
2786 }); 2908 });
2787} 2909}
2788 2910
… …
2883 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3005 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2884 glDisable GL_TEXTURE_2D; 3006 glDisable GL_TEXTURE_2D;
2885 } 3007 }
2886} 3008}
2887 3009
2888sub DESTROY { 3010sub destroy {
2889 my ($self) = @_; 3011 my ($self) = @_;
2890 3012
2891 $self->{timer}->cancel 3013 $self->{timer}->cancel
2892 if $self->{timer}; 3014 if $self->{timer};
2893 3015
2894 $self->SUPER::DESTROY; 3016 $self->SUPER::destroy;
2895} 3017}
2896 3018
2897############################################################################# 3019#############################################################################
2898 3020
2899package CFClient::UI::Buttonbar; 3021package CFClient::UI::Buttonbar;
… …
2920 ); 3042 );
2921 3043
2922 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3044 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2923 3045
2924 for my $item (@{ $self->{items} }) { 3046 for my $item (@{ $self->{items} }) {
2925 my ($widget, $cb) = @$item; 3047 my ($widget, $cb, $tooltip) = @$item;
2926 3048
2927 # handle various types of items, only text for now 3049 # handle various types of items, only text for now
2928 if (!ref $widget) { 3050 if (!ref $widget) {
2929 $widget = new CFClient::UI::Label 3051 $widget = new CFClient::UI::Label
2930 can_hover => 1, 3052 can_hover => 1,
2931 can_events => 1, 3053 can_events => 1,
2932 text => $widget; 3054 markup => $widget,
3055 tooltip => $tooltip
2933 } 3056 }
2934 3057
2935 $self->{item}{$widget} = $item; 3058 $self->{item}{$widget} = $item;
2936 3059
2937 $self->{vbox}->add ($widget); 3060 $self->{vbox}->add ($widget);
… …
2942 3065
2943# popup given the event (must be a mouse button down event currently) 3066# popup given the event (must be a mouse button down event currently)
2944sub popup { 3067sub popup {
2945 my ($self, $ev) = @_; 3068 my ($self, $ev) = @_;
2946 3069
2947 $self->_emit ("popdown"); 3070 $self->emit ("popdown");
2948 3071
2949 # maybe save $GRAB? must be careful about events... 3072 # maybe save $GRAB? must be careful about events...
2950 $GRAB = $self; 3073 $GRAB = $self;
2951 $self->{button} = $ev->{button}; 3074 $self->{button} = $ev->{button};
2952 3075
2953 $self->show; 3076 $self->show;
2954 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3077 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2955} 3078}
2956 3079
2957sub mouse_motion { 3080sub invoke_mouse_motion {
2958 my ($self, $ev, $x, $y) = @_; 3081 my ($self, $ev, $x, $y) = @_;
2959 3082
2960 # TODO: should use vbox->find_widget or so 3083 # TODO: should use vbox->find_widget or so
2961 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3084 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2962 $self->{hover} = $self->{item}{$HOVER}; 3085 $self->{hover} = $self->{item}{$HOVER};
2963 3086
2964 0 3087 0
2965} 3088}
2966 3089
2967sub button_up { 3090sub invoke_button_up {
2968 my ($self, $ev, $x, $y) = @_; 3091 my ($self, $ev, $x, $y) = @_;
2969 3092
2970 if ($ev->{button} == $self->{button}) { 3093 if ($ev->{button} == $self->{button}) {
2971 undef $GRAB; 3094 undef $GRAB;
2972 $self->hide; 3095 $self->hide;
2973 3096
2974 $self->_emit ("popdown"); 3097 $self->emit ("popdown");
2975 $self->{hover}[1]->() if $self->{hover}; 3098 $self->{hover}[1]->() if $self->{hover};
2976 } else { 3099 } else {
2977 return 0 3100 return 0
2978 } 3101 }
2979 3102
… …
3016 : $self->{children}[$page_or_widget]; 3139 : $self->{children}[$page_or_widget];
3017 3140
3018 $self->{current} = $widget; 3141 $self->{current} = $widget;
3019 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3142 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3020 3143
3021 $self->_emit (page_changed => $self->{current}); 3144 $self->emit (page_changed => $self->{current});
3022 3145
3023 $self->realloc; 3146 $self->realloc;
3024} 3147}
3025 3148
3026sub visible_children { 3149sub visible_children {
… …
3031 my ($self) = @_; 3154 my ($self) = @_;
3032 3155
3033 $self->{current}->size_request 3156 $self->{current}->size_request
3034} 3157}
3035 3158
3036sub size_allocate { 3159sub invoke_size_allocate {
3037 my ($self, $w, $h) = @_; 3160 my ($self, $w, $h) = @_;
3038 3161
3039 $self->{current}->configure (0, 0, $w, $h); 3162 $self->{current}->configure (0, 0, $w, $h);
3163
3164 1
3040} 3165}
3041 3166
3042sub _draw { 3167sub _draw {
3043 my ($self) = @_; 3168 my ($self) = @_;
3044 3169
… …
3083 3208
3084sub set_current_page { 3209sub set_current_page {
3085 my ($self, $page) = @_; 3210 my ($self, $page) = @_;
3086 3211
3087 $self->{multiplexer}->set_current_page ($page); 3212 $self->{multiplexer}->set_current_page ($page);
3088 $self->_emit (page_changed => $self->{multiplexer}{current}); 3213 $self->emit (page_changed => $self->{multiplexer}{current});
3214}
3215
3216#############################################################################
3217
3218package CFClient::UI::Combobox;
3219
3220use utf8;
3221
3222our @ISA = CFClient::UI::Button::;
3223
3224sub new {
3225 my $class = shift;
3226
3227 my $self = $class->SUPER::new (
3228 options => [], # [value, title, longdesc], ...
3229 value => undef,
3230 @_,
3231 );
3232
3233 $self->_set_value ($self->{value});
3234
3235 $self
3236}
3237
3238sub invoke_button_down {
3239 my ($self, $ev) = @_;
3240
3241 my @menu_items;
3242
3243 for (@{ $self->{options} }) {
3244 my ($value, $title, $tooltip) = @$_;
3245
3246 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3247 }
3248
3249 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3250}
3251
3252sub _set_value {
3253 my ($self, $value) = @_;
3254
3255 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3256 or return;
3257
3258 $self->{value} = $item->[0];
3259 $self->set_markup ("$item->[1] ⇓");
3260 $self->set_tooltip ($item->[2]);
3261}
3262
3263sub set_value {
3264 my ($self, $value) = @_;
3265
3266 return unless $self->{value} ne $value;
3267
3268 $self->_set_value ($value);
3269 $self->emit (changed => $value);
3089} 3270}
3090 3271
3091############################################################################# 3272#############################################################################
3092 3273
3093package CFClient::UI::Statusbox; 3274package CFClient::UI::Statusbox;
… …
3192 $item->{count}++; 3373 $item->{count}++;
3193 } else { 3374 } else {
3194 $item->{count} = 1; 3375 $item->{count} = 1;
3195 $item->{text} = $item->{tooltip} = $text; 3376 $item->{text} = $item->{tooltip} = $text;
3196 } 3377 }
3197 $item->{id} = ++$self->{id}; 3378 $item->{id} += 0.2;#d#
3198 $item->{timeout} = $timeout; 3379 $item->{timeout} = $timeout;
3199 delete $item->{label}; 3380 delete $item->{label};
3200 } else { 3381 } else {
3201 $self->{item}{$group} = { 3382 $self->{item}{$group} = {
3202 id => ++$self->{id}, 3383 id => ++$self->{id},
… …
3221 3402
3222 $self->reorder; 3403 $self->reorder;
3223 $self->SUPER::reconfigure; 3404 $self->SUPER::reconfigure;
3224} 3405}
3225 3406
3226sub DESTROY { 3407sub destroy {
3227 my ($self) = @_; 3408 my ($self) = @_;
3228 3409
3229 $self->{timer}->cancel; 3410 $self->{timer}->cancel;
3230 3411
3231 $self->SUPER::DESTROY; 3412 $self->SUPER::destroy;
3232} 3413}
3233 3414
3234############################################################################# 3415#############################################################################
3235 3416
3236package CFClient::UI::Inventory; 3417package CFClient::UI::Inventory;
… …
3337 $self->update_binding_widgets; 3518 $self->update_binding_widgets;
3338 3519
3339 $self 3520 $self
3340} 3521}
3341 3522
3523sub cfg_bind {
3524 my ($self, $mod, $sym, $cmds) = @_;
3525 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3526 ::update_bindings ();
3527}
3528
3529sub cfg_unbind {
3530 my ($self, $mod, $sym, $cmds) = @_;
3531 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3532 ::update_bindings ();
3533}
3534
3342sub commit { 3535sub commit {
3343 my ($self) = @_; 3536 my ($self) = @_;
3344 my ($mod, $sym, $cmds) = $self->get_binding; 3537 my ($mod, $sym, $cmds) = $self->get_binding;
3345 if ($sym != 0 && @$cmds > 0) { 3538 if ($sym != 0 && @$cmds > 0) {
3346 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym) 3539 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
… …
3380 my ($self) = @_; 3573 my ($self) = @_;
3381 $self->ask_for_bind (1); 3574 $self->ask_for_bind (1);
3382} 3575}
3383 3576
3384sub ask_for_bind { 3577sub ask_for_bind {
3385 my ($self, $commit) = @_; 3578 my ($self, $commit, $end_cb) = @_;
3386 3579
3387 CFClient::Binder::open_binding_dialog (sub { 3580 CFClient::Binder::open_binding_dialog (sub {
3388 my ($mod, $sym) = @_; 3581 my ($mod, $sym) = @_;
3389 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak? 3582 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3390 $self->update_binding_widgets; 3583 $self->update_binding_widgets;
3391 $self->commit if $commit; 3584 $self->commit if $commit;
3585 $end_cb->() if $end_cb;
3392 }); 3586 });
3393} 3587}
3394 3588
3395# $mod and $sym are the modifiers and key symbol 3589# $mod and $sym are the modifiers and key symbol
3396# $cmds is a array ref of strings (the commands) 3590# $cmds is a array ref of strings (the commands)
… …
3414} 3608}
3415 3609
3416# this is a shortcut method that asks for a binding 3610# this is a shortcut method that asks for a binding
3417# and then just binds it. 3611# and then just binds it.
3418sub do_quick_binding { 3612sub do_quick_binding {
3419 my ($self, $cmds) = @_; 3613 my ($self, $cmds, $end_cb) = @_;
3420 $self->set_binding (undef, undef, $cmds, sub { 3614 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3421 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3422 });
3423 $self->ask_for_bind (1); 3615 $self->ask_for_bind (1, $end_cb);
3424} 3616}
3425 3617
3426sub update_binding_widgets { 3618sub update_binding_widgets {
3427 my ($self) = @_; 3619 my ($self) = @_;
3428 my ($mod, $sym, $cmds) = $self->get_binding; 3620 my ($mod, $sym, $cmds) = $self->get_binding;
… …
3484 commands => [], 3676 commands => [],
3485 @_, 3677 @_,
3486 ) 3678 )
3487} 3679}
3488 3680
3681my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3682
3683my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3684 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3685my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3686 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3489my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip => 3687my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3490 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell."); 3688 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3491my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip => 3689my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3492 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation."); 3690 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3493my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip => 3691my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3494 "<b>Damage</b>. The amount of damage the spell deals when it hits."); 3692 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3495 3693
3496sub rebuild_spell_list { 3694sub rebuild_spell_list {
3497 my ($self) = @_; 3695 my ($self) = @_;
3498 3696
3499 $CFClient::UI::ROOT->on_refresh ($self => sub { 3697 $CFClient::UI::ROOT->on_refresh ($self => sub {
3500 $self->clear; 3698 $self->clear;
3501 3699
3700 return unless $::CONN;
3701
3502 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name"); 3702 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3703 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3503 $self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL); 3704 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3504 $self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP); 3705 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3505 $self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG); 3706 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3506 3707
3507 my $row = 0; 3708 my $row = 0;
3508 3709
3509 for (sort { $a cmp $b } keys %{ $self->{spell} }) { 3710 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3510 my $spell = $self->{spell}{$_}; 3711 my $spell = $self->{spell}{$_};
3511 3712
3512 $row++; 3713 $row++;
3714
3715 my $spell_cb = sub {
3716 my ($widget, $ev) = @_;
3717
3718 if ($ev->{button} == 1) {
3719 $::CONN->user_send ("cast $spell->{name}");
3720 } elsif ($ev->{button} == 2) {
3721 $::CONN->user_send ("invoke $spell->{name}");
3722 } elsif ($ev->{button} == 3) {
3723 (new CFClient::UI::Menu
3724 items => [
3725 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3726 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3727 ],
3728 )->popup ($ev);
3729 } else {
3730 return 0;
3731 }
3732
3733 1
3734 };
3735
3736 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3737
3738 #TODO: add path info to tooltip
3739 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3513 3740
3514 $self->add (0, $row, new CFClient::UI::Face 3741 $self->add (0, $row, new CFClient::UI::Face
3515 face => $spell->{face}, 3742 face => $spell->{face},
3516 can_hover => 1, 3743 can_hover => 1,
3517 can_events => 1, 3744 can_events => 1,
3518 tooltip => $spell->{message}, 3745 tooltip => $tooltip,
3746 on_button_down => $spell_cb,
3519 ); 3747 );
3520 3748
3521 $self->add (1, $row, new CFClient::UI::Label 3749 $self->add (1, $row, new CFClient::UI::Label
3522 expand => 1, 3750 expand => 1,
3523 text => $spell->{name}, 3751 text => $spell->{name},
3524 can_hover => 1, 3752 can_hover => 1,
3525 can_events => 1, 3753 can_events => 1,
3526 tooltip => $spell->{message}, 3754 tooltip => $tooltip,
3755 on_button_down => $spell_cb,
3527 ); 3756 );
3528 3757
3758 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3529 $self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL); 3759 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3530 $self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP); 3760 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3531 $self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG); 3761 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3532
3533 # TODO: should be done via popup
3534 $self->add (5, $row, new CFClient::UI::Button
3535 text => "bind",
3536 tooltip => "bind spell readying (cast command) to key",
3537 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3538 );
3539 } 3762 }
3540 }); 3763 });
3541} 3764}
3542 3765
3543sub add_spell { 3766sub add_spell {
… …
3549 3772
3550sub remove_spell { 3773sub remove_spell {
3551 my ($self, $spell) = @_; 3774 my ($self, $spell) = @_;
3552 3775
3553 delete $self->{spell}->{$spell->{name}}; 3776 delete $self->{spell}->{$spell->{name}};
3777 $self->rebuild_spell_list;
3778}
3779
3780sub clear_spells {
3781 my ($self) = @_;
3782
3783 $self->{spell} = {};
3554 $self->rebuild_spell_list; 3784 $self->rebuild_spell_list;
3555} 3785}
3556 3786
3557############################################################################# 3787#############################################################################
3558 3788
… …
3595 $coord = $max - $size if $coord > $max - $size; 3825 $coord = $max - $size if $coord > $max - $size;
3596 3826
3597 int $coord + 0.5 3827 int $coord + 0.5
3598} 3828}
3599 3829
3600sub size_allocate { 3830sub invoke_size_allocate {
3601 my ($self, $w, $h) = @_; 3831 my ($self, $w, $h) = @_;
3602 3832
3603 for my $child ($self->children) { 3833 for my $child ($self->children) {
3604 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3834 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3605 3835
… …
3609 $X = _to_pixel $X, $W, $self->{w}; 3839 $X = _to_pixel $X, $W, $self->{w};
3610 $Y = _to_pixel $Y, $H, $self->{h}; 3840 $Y = _to_pixel $Y, $H, $self->{h};
3611 3841
3612 $child->configure ($X, $Y, $W, $H); 3842 $child->configure ($X, $Y, $W, $H);
3613 } 3843 }
3844
3845 1
3614} 3846}
3615 3847
3616sub coord2local { 3848sub coord2local {
3617 my ($self, $x, $y) = @_; 3849 my ($self, $x, $y) = @_;
3618 3850

Diff Legend

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