ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.303 by elmex, Tue Jun 13 10:28:38 2006 UTC vs.
Revision 1.326 by root, Sun Jul 16 20:04:08 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
… …
1078 my $self = $class->SUPER::new ( 1082 my $self = $class->SUPER::new (
1079 bg => [1, 1, 1, 1], 1083 bg => [1, 1, 1, 1],
1080 border_bg => [1, 1, 1, 1], 1084 border_bg => [1, 1, 1, 1],
1081 border => 0.6, 1085 border => 0.6,
1082 can_events => 1, 1086 can_events => 1,
1083 min_w => 16, 1087 min_w => 64,
1084 min_h => 16, 1088 min_h => 32,
1085 %arg, 1089 %arg,
1086 ); 1090 );
1087 1091
1088 $self->{title_widget} = new CFClient::UI::Label 1092 $self->{title_widget} = new CFClient::UI::Label
1089 align => 0, 1093 align => 0,
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
1095 unless ($self->{no_close_button}) { 1099 if ($self->{has_close_button}) {
1096 $self->{close_btn} = 1100 $self->{close_button} =
1097 new CFClient::UI::ImageButton 1101 new CFClient::UI::ImageButton
1098 image => 'x1_close.png', 1102 path => 'x1_close.png',
1099 on_activate => sub { $self->hide }; 1103 on_activate => sub { $self->emit ("delete") };
1100 1104
1101 $self->CFClient::UI::Container::add ($self->{close_btn}); 1105 $self->CFClient::UI::Container::add ($self->{close_button});
1102 } 1106 }
1103 1107
1104 $self 1108 $self
1105} 1109}
1106 1110
1107sub add { 1111sub add {
1108 my ($self, @widgets) = @_; 1112 my ($self, @widgets) = @_;
1109 1113
1110 $self->SUPER::add (@widgets); 1114 $self->SUPER::add (@widgets);
1111 $self->CFClient::UI::Container::add ($self->{close_btn}) if $self->{close_btn}; 1115 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1112 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1116 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1113} 1117}
1114 1118
1115sub border { 1119sub border {
1116 int $_[0]{border} * $::FONTSIZE 1120 int $_[0]{border} * $::FONTSIZE
… …
1120 my ($self) = @_; 1124 my ($self) = @_;
1121 1125
1122 $self->{title_widget}->size_request 1126 $self->{title_widget}->size_request
1123 if $self->{title_widget}; 1127 if $self->{title_widget};
1124 1128
1125 $self->{close_btn}->size_request 1129 $self->{close_button}->size_request
1126 if $self->{close_btn}; 1130 if $self->{close_button};
1127 1131
1128 my ($w, $h) = $self->SUPER::size_request; 1132 my ($w, $h) = $self->SUPER::size_request;
1129 1133
1130 ( 1134 (
1131 $w + $self->border * 2, 1135 $w + $self->border * 2,
1132 $h + $self->border * 2, 1136 $h + $self->border * 2,
1133 ) 1137 )
1134} 1138}
1135 1139
1136sub size_allocate { 1140sub invoke_size_allocate {
1137 my ($self, $w, $h) = @_; 1141 my ($self, $w, $h) = @_;
1138 1142
1139 if ($self->{title_widget}) { 1143 if ($self->{title_widget}) {
1140 $self->{title_widget}{w} = $w; 1144 $self->{title_widget}{w} = $w;
1141 $self->{title_widget}{h} = $h; 1145 $self->{title_widget}{h} = $h;
1142 $self->{title_widget}->size_allocate ($w, $h); 1146 $self->{title_widget}->invoke_size_allocate ($w, $h);
1143 } 1147 }
1144 1148
1145 my $border = $self->border; 1149 my $border = $self->border;
1146 1150
1147 $h -= List::Util::max 0, $border * 2; 1151 $h -= List::Util::max 0, $border * 2;
1148 $w -= List::Util::max 0, $border * 2; 1152 $w -= List::Util::max 0, $border * 2;
1149 1153
1150 $self->child->configure ($border, $border, $w, $h); 1154 $self->child->configure ($border, $border, $w, $h);
1151 1155
1152 $self->{close_btn}->configure ($self->{w} - (2 * $border), 0, $border, $border) 1156 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153 if $self->{close_btn}; 1157 if $self->{close_button};
1154}
1155 1158
1159 1
1160}
1161
1162sub invoke_delete {
1163 my ($self) = @_;
1164
1165 $self->hide;
1166
1167 1
1168}
1169
1156sub button_down { 1170sub invoke_button_down {
1157 my ($self, $ev, $x, $y) = @_; 1171 my ($self, $ev, $x, $y) = @_;
1158 1172
1159 my ($w, $h) = @$self{qw(w h)}; 1173 my ($w, $h) = @$self{qw(w h)};
1160 my $border = $self->border; 1174 my $border = $self->border;
1161 1175
… …
1192 1206
1193 ($x, $y) = ($ev->{x}, $ev->{y}); 1207 ($x, $y) = ($ev->{x}, $ev->{y});
1194 1208
1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1209 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1196 # HACK: the next line is required to enforce placement 1210 # HACK: the next line is required to enforce placement
1197 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1211 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1198 }; 1212 };
1199 } else { 1213 } else {
1200 return 0; 1214 return 0;
1201 } 1215 }
1202 1216
1203 1 1217 1
1204} 1218}
1205 1219
1206sub button_up { 1220sub invoke_button_up {
1207 my ($self, $ev, $x, $y) = @_; 1221 my ($self, $ev, $x, $y) = @_;
1208 1222
1209 $self->{close_btn}->button_up ($ev, $x, $y)
1210 if $self->{close_btn};
1211
1212 !!delete $self->{motion} 1223 ! ! delete $self->{motion}
1213} 1224}
1214 1225
1215sub mouse_motion { 1226sub invoke_mouse_motion {
1216 my ($self, $ev, $x, $y) = @_; 1227 my ($self, $ev, $x, $y) = @_;
1217 1228
1218 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1229 $self->{motion}->($ev, $x, $y) if $self->{motion};
1219 1230
1220 !!$self->{motion} 1231 ! ! $self->{motion}
1221} 1232}
1222 1233
1223sub _draw { 1234sub _draw {
1224 my ($self) = @_; 1235 my ($self) = @_;
1225 1236
… …
1258 $self->{title_widget}->_draw; 1269 $self->{title_widget}->_draw;
1259 1270
1260 glTranslate 0, - ($border - $self->{h}); 1271 glTranslate 0, - ($border - $self->{h});
1261 } 1272 }
1262 1273
1263 $self->{close_btn}->draw 1274 $self->{close_button}->draw
1264 if $self->{close_btn}; 1275 if $self->{close_button};
1265} 1276}
1266 1277
1267############################################################################# 1278#############################################################################
1268 1279
1269package CFClient::UI::Table; 1280package CFClient::UI::Table;
… …
1348 (sum @$ws), 1359 (sum @$ws),
1349 (sum @$hs), 1360 (sum @$hs),
1350 ) 1361 )
1351} 1362}
1352 1363
1353sub size_allocate { 1364sub invoke_size_allocate {
1354 my ($self, $w, $h) = @_; 1365 my ($self, $w, $h) = @_;
1355 1366
1356 my ($ws, $hs) = $self->get_wh; 1367 my ($ws, $hs) = $self->get_wh;
1357 1368
1358 my $req_w = (sum @$ws) || 1; 1369 my $req_w = (sum @$ws) || 1;
… …
1390 } 1401 }
1391 1402
1392 $y += $row_h; 1403 $y += $row_h;
1393 } 1404 }
1394 1405
1406 1
1395} 1407}
1396 1408
1397sub find_widget { 1409sub find_widget {
1398 my ($self, $x, $y) = @_; 1410 my ($self, $x, $y) = @_;
1399 1411
… …
1436 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1448 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1437 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1449 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1438 ) 1450 )
1439} 1451}
1440 1452
1441sub size_allocate { 1453sub invoke_size_allocate {
1442 my ($self, $w, $h) = @_; 1454 my ($self, $w, $h) = @_;
1443 1455
1444 my $space = $self->{vertical} ? $h : $w; 1456 my $space = $self->{vertical} ? $h : $w;
1445 my $children = $self->{children}; 1457 my @children = $self->visible_children;
1446 1458
1447 my @req; 1459 my @req;
1448 1460
1449 if ($self->{homogeneous}) { 1461 if ($self->{homogeneous}) {
1450 @req = ($space / (@$children || 1)) x @$children; 1462 @req = ($space / (@children || 1)) x @children;
1451 } else { 1463 } else {
1452 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1464 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1453 my $req = List::Util::sum @req; 1465 my $req = List::Util::sum @req;
1454 1466
1455 if ($req > $space) { 1467 if ($req > $space) {
1456 # ah well, not enough space 1468 # ah well, not enough space
1457 $_ *= $space / $req for @req; 1469 $_ *= $space / $req for @req;
1458 } else { 1470 } else {
1459 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1471 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1460 1472
1461 $space = ($space - $req) / $expand; # remaining space to give away 1473 $space = ($space - $req) / $expand; # remaining space to give away
1462 1474
1463 $req[$_] += $space * $children->[$_]{expand} 1475 $req[$_] += $space * $children[$_]{expand}
1464 for 0 .. $#$children; 1476 for 0 .. $#children;
1465 } 1477 }
1466 } 1478 }
1467 1479
1468 CFClient::UI::harmonize \@req; 1480 CFClient::UI::harmonize \@req;
1469 1481
1470 my $pos = 0; 1482 my $pos = 0;
1471 for (0 .. $#$children) { 1483 for (0 .. $#children) {
1472 my $alloc = $req[$_]; 1484 my $alloc = $req[$_];
1473 $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));
1474 1486
1475 $pos += $alloc; 1487 $pos += $alloc;
1476 } 1488 }
1477 1489
1478 1 1490 1
… …
1581 my ($self, $text) = @_; 1593 my ($self, $text) = @_;
1582 1594
1583 return if $self->{text} eq "T$text"; 1595 return if $self->{text} eq "T$text";
1584 $self->{text} = "T$text"; 1596 $self->{text} = "T$text";
1585 1597
1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1587 $self->{layout}->set_text ($text); 1598 $self->{layout}->set_text ($text);
1588 1599
1589 delete $self->{size_req}; 1600 delete $self->{size_req};
1590 $self->realloc; 1601 $self->realloc;
1591 $self->update; 1602 $self->update;
… …
1597 return if $self->{text} eq "M$markup"; 1608 return if $self->{text} eq "M$markup";
1598 $self->{text} = "M$markup"; 1609 $self->{text} = "M$markup";
1599 1610
1600 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1611 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1601 1612
1602 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1603 $self->{layout}->set_markup ($markup); 1613 $self->{layout}->set_markup ($markup);
1604 1614
1605 delete $self->{size_req}; 1615 delete $self->{size_req};
1606 $self->realloc; 1616 $self->realloc;
1607 $self->update; 1617 $self->update;
… …
1619 1629
1620 my ($w, $h) = $self->{layout}->size; 1630 my ($w, $h) = $self->{layout}->size;
1621 1631
1622 if (exists $self->{template}) { 1632 if (exists $self->{template}) {
1623 $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);
1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1635 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1625 1636
1626 my ($w2, $h2) = $self->{template}->size; 1637 my ($w2, $h2) = $self->{template}->size;
1627 1638
1628 $w = List::Util::max $w, $w2; 1639 $w = List::Util::max $w, $w2;
… …
1633 }; 1644 };
1634 1645
1635 @{ $self->{size_req} } 1646 @{ $self->{size_req} }
1636} 1647}
1637 1648
1649sub baseline_shift {
1650 $_[0]{layout}->descent
1651}
1652
1638sub size_allocate { 1653sub invoke_size_allocate {
1639 my ($self, $w, $h) = @_; 1654 my ($self, $w, $h) = @_;
1640 1655
1641 delete $self->{ox}; 1656 delete $self->{ox};
1642 1657
1643 delete $self->{texture} 1658 delete $self->{texture}
1644 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
1645} 1662}
1646 1663
1647sub set_fontsize { 1664sub set_fontsize {
1648 my ($self, $fontsize) = @_; 1665 my ($self, $fontsize) = @_;
1649 1666
1650 $self->{fontsize} = $fontsize; 1667 $self->{fontsize} = $fontsize;
1668 delete $self->{size_req};
1651 delete $self->{texture}; 1669 delete $self->{texture};
1652 1670
1653 $self->realloc; 1671 $self->realloc;
1654} 1672}
1655 1673
1656sub reconfigure { 1674sub reconfigure {
1657 my ($self) = @_; 1675 my ($self) = @_;
1658 1676
1659 delete $self->{size_req}; 1677 delete $self->{size_req};
1678 delete $self->{texture};
1660 1679
1661 $self->SUPER::reconfigure; 1680 $self->SUPER::reconfigure;
1662} 1681}
1663 1682
1664sub _draw { 1683sub _draw {
1665 my ($self) = @_; 1684 my ($self) = @_;
1666 1685
1667 $self->SUPER::_draw; # draw background, if applicable 1686 $self->SUPER::_draw; # draw background, if applicable
1668 1687
1669 my $tex = $self->{texture} ||= do { 1688 my $size = $self->{texture} ||= do {
1670 $self->{layout}->set_foreground (@{$self->{fg}}); 1689 $self->{layout}->set_foreground (@{$self->{fg}});
1671 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1690 $self->{layout}->set_font ($self->{font}) if $self->{font};
1672 $self->{layout}->set_width ($self->{w}); 1691 $self->{layout}->set_width ($self->{w});
1673 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1692 $self->{layout}->set_ellipsise ($self->{ellipsise});
1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1693 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1694 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1676 1695
1677 new_from_layout CFClient::Texture $self->{layout} 1696 [$self->{layout}->size]
1678 }; 1697 };
1679 1698
1680 unless (exists $self->{ox}) { 1699 unless (exists $self->{ox}) {
1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1700 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1701 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1683 : ($self->{w} - $tex->{w}) * 0.5); 1702 : ($self->{w} - $size->[0]) * 0.5);
1684 1703
1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1704 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1705 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1687 : ($self->{h} - $tex->{h}) * 0.5); 1706 : ($self->{h} - $size->[1]) * 0.5);
1688 }; 1707 };
1689 1708
1690 glEnable GL_TEXTURE_2D;
1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1709 my $w = List::Util::min $self->{w} + 4, $size->[0];
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1710 my $h = List::Util::min $self->{h} + 2, $size->[1];
1694 1711
1695 if ($tex->{format} == GL_ALPHA) { 1712 $self->{layout}->render ($self->{ox}, $self->{oy});
1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1697 glColor @{$self->{fg}};
1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1699 } else {
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1702 }
1703
1704 glDisable GL_TEXTURE_2D;
1705} 1713}
1706 1714
1707############################################################################# 1715#############################################################################
1708 1716
1709package CFClient::UI::EntryBase; 1717package CFClient::UI::EntryBase;
… …
1742 1750
1743 $text =~ s/./*/g if $self->{hidden}; 1751 $text =~ s/./*/g if $self->{hidden};
1744 $self->{layout}->set_text ("$text "); 1752 $self->{layout}->set_text ("$text ");
1745 delete $self->{size_req}; 1753 delete $self->{size_req};
1746 1754
1747 $self->_emit (changed => $self->{text}); 1755 $self->emit (changed => $self->{text});
1748 1756
1749 $self->realloc; 1757 $self->realloc;
1750 $self->update; 1758 $self->update;
1751} 1759}
1752 1760
… …
1767 my ($w, $h) = $self->SUPER::size_request; 1775 my ($w, $h) = $self->SUPER::size_request;
1768 1776
1769 ($w + 1, $h) # add 1 for cursor 1777 ($w + 1, $h) # add 1 for cursor
1770} 1778}
1771 1779
1772sub key_down { 1780sub invoke_key_down {
1773 my ($self, $ev) = @_; 1781 my ($self, $ev) = @_;
1774 1782
1775 my $mod = $ev->{mod}; 1783 my $mod = $ev->{mod};
1776 my $sym = $ev->{sym}; 1784 my $sym = $ev->{sym};
1777 my $uni = $ev->{unicode}; 1785 my $uni = $ev->{unicode};
… …
1789 } elsif ($sym == CFClient::SDLK_HOME) { 1797 } elsif ($sym == CFClient::SDLK_HOME) {
1790 $self->{cursor} = 0; 1798 $self->{cursor} = 0;
1791 } elsif ($sym == CFClient::SDLK_END) { 1799 } elsif ($sym == CFClient::SDLK_END) {
1792 $self->{cursor} = length $text; 1800 $self->{cursor} = length $text;
1793 } elsif ($uni == 27) { 1801 } elsif ($uni == 27) {
1794 $self->_emit ('escape'); 1802 $self->emit ('escape');
1795 } elsif ($uni) { 1803 } elsif ($uni) {
1796 substr $text, $self->{cursor}++, 0, chr $uni; 1804 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else { 1805 } else {
1798 return 0; 1806 return 0;
1799 } 1807 }
… …
1803 $self->realloc; 1811 $self->realloc;
1804 1812
1805 1 1813 1
1806} 1814}
1807 1815
1808sub focus_in { 1816sub invoke_focus_in {
1809 my ($self) = @_; 1817 my ($self) = @_;
1810 1818
1811 $self->{last_activity} = $::NOW; 1819 $self->{last_activity} = $::NOW;
1812 1820
1813 $self->SUPER::focus_in; 1821 $self->SUPER::invoke_focus_in
1814} 1822}
1815 1823
1816sub button_down { 1824sub invoke_button_down {
1817 my ($self, $ev, $x, $y) = @_; 1825 my ($self, $ev, $x, $y) = @_;
1818 1826
1819 $self->SUPER::button_down ($ev, $x, $y); 1827 $self->SUPER::invoke_button_down ($ev, $x, $y);
1820 1828
1821 my $idx = $self->{layout}->xy_to_index ($x, $y); 1829 my $idx = $self->{layout}->xy_to_index ($x, $y);
1822 1830
1823 # byte-index to char-index 1831 # byte-index to char-index
1824 my $text = $self->{text}; 1832 my $text = $self->{text};
1825 utf8::encode $text; 1833 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1826 $self->{cursor} = length substr $text, 0, $idx; 1834 $self->{cursor} = length $text;
1827 1835
1828 $self->_set_text ($self->{text}); 1836 $self->_set_text ($self->{text});
1829 $self->update; 1837 $self->update;
1830 1838
1831 1 1839 1
1832} 1840}
1833 1841
1834sub mouse_motion { 1842sub invoke_mouse_motion {
1835 my ($self, $ev, $x, $y) = @_; 1843 my ($self, $ev, $x, $y) = @_;
1836# 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#
1837 1845
1838 0 1846 1
1839} 1847}
1840 1848
1841sub _draw { 1849sub _draw {
1842 my ($self) = @_; 1850 my ($self) = @_;
1843 1851
… …
1884 1892
1885our @ISA = CFClient::UI::EntryBase::; 1893our @ISA = CFClient::UI::EntryBase::;
1886 1894
1887use CFClient::OpenGL; 1895use CFClient::OpenGL;
1888 1896
1889sub key_down { 1897sub invoke_key_down {
1890 my ($self, $ev) = @_; 1898 my ($self, $ev) = @_;
1891 1899
1892 my $sym = $ev->{sym}; 1900 my $sym = $ev->{sym};
1893 1901
1894 if ($sym == 13) { 1902 if ($sym == 13) {
1895 unshift @{$self->{history}}, 1903 unshift @{$self->{history}},
1896 my $txt = $self->get_text; 1904 my $txt = $self->get_text;
1905
1897 $self->{history_pointer} = -1; 1906 $self->{history_pointer} = -1;
1898 $self->{history_saveback} = ''; 1907 $self->{history_saveback} = '';
1899 $self->_emit (activate => $txt); 1908 $self->emit (activate => $txt);
1900 $self->update; 1909 $self->update;
1901 1910
1902 } elsif ($sym == CFClient::SDLK_UP) { 1911 } elsif ($sym == CFClient::SDLK_UP) {
1903 if ($self->{history_pointer} < 0) { 1912 if ($self->{history_pointer} < 0) {
1904 $self->{history_saveback} = $self->get_text; 1913 $self->{history_saveback} = $self->get_text;
… …
1920 } else { 1929 } else {
1921 $self->set_text ($self->{history_saveback}); 1930 $self->set_text ($self->{history_saveback});
1922 } 1931 }
1923 1932
1924 } else { 1933 } else {
1925 return $self->SUPER::key_down ($ev) 1934 return $self->SUPER::invoke_key_down ($ev)
1926 } 1935 }
1927 1936
1928 1 1937 1
1929} 1938}
1930 1939
… …
1954 can_events => 1, 1963 can_events => 1,
1955 @_ 1964 @_
1956 ) 1965 )
1957} 1966}
1958 1967
1959sub activate { }
1960
1961sub button_up { 1968sub invoke_button_up {
1962 my ($self, $ev, $x, $y) = @_; 1969 my ($self, $ev, $x, $y) = @_;
1963 1970
1964 $self->emit ("activate") 1971 $self->emit ("activate")
1965 if $x >= 0 && $x < $self->{w} 1972 if $x >= 0 && $x < $self->{w}
1966 && $y >= 0 && $y < $self->{h}; 1973 && $y >= 0 && $y < $self->{h};
… …
2008 can_events => 1, 2015 can_events => 1,
2009 @_ 2016 @_
2010 ); 2017 );
2011} 2018}
2012 2019
2013sub activate { }
2014
2015sub button_up { 2020sub invoke_button_up {
2016 my ($self, $ev, $x, $y) = @_; 2021 my ($self, $ev, $x, $y) = @_;
2017 2022
2018 $self->emit ("activate") 2023 $self->emit ("activate")
2019 if $x >= 0 && $x < $self->{w} 2024 if $x >= 0 && $x < $self->{w}
2020 && $y >= 0 && $y < $self->{h}; 2025 && $y >= 0 && $y < $self->{h};
… …
2054 my ($self) = @_; 2059 my ($self) = @_;
2055 2060
2056 (6) x 2 2061 (6) x 2
2057} 2062}
2058 2063
2064sub toggle {
2065 my ($self) = @_;
2066
2067 $self->{state} = !$self->{state};
2068 $self->emit (changed => $self->{state});
2069 $self->update;
2070}
2071
2059sub button_down { 2072sub invoke_button_down {
2060 my ($self, $ev, $x, $y) = @_; 2073 my ($self, $ev, $x, $y) = @_;
2061 2074
2062 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2075 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2063 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2076 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2064 $self->{state} = !$self->{state}; 2077 $self->toggle;
2065 $self->_emit (changed => $self->{state});
2066 } else { 2078 } else {
2067 return 0 2079 return 0
2068 } 2080 }
2069 2081
2070 1 2082 1
… …
2095package CFClient::UI::Image; 2107package CFClient::UI::Image;
2096 2108
2097our @ISA = CFClient::UI::Base::; 2109our @ISA = CFClient::UI::Base::;
2098 2110
2099use CFClient::OpenGL; 2111use CFClient::OpenGL;
2100use Carp qw/confess/;
2101 2112
2102our %loaded_images; 2113our %texture_cache;
2103 2114
2104sub new { 2115sub new {
2105 my $class = shift; 2116 my $class = shift;
2106 2117
2107 my $self = $class->SUPER::new (can_events => 0, @_); 2118 my $self = $class->SUPER::new (
2119 can_events => 0,
2120 @_,
2121 );
2108 2122
2109 $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";
2110 2125
2111 $loaded_images{$self->{image}} ||= 2126 $self->{tex} = $texture_cache{$self->{path}} ||=
2112 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;
2113 2128
2114 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2129 Scalar::Util::weaken $texture_cache{$self->{path}};
2115 2130
2116 Scalar::Util::weaken $loaded_images{$self->{image}}; 2131 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2117
2118 $self->{aspect} = $tex->{w} / $tex->{h};
2119 2132
2120 $self 2133 $self
2121} 2134}
2122 2135
2123sub size_request { 2136sub size_request {
2124 my ($self) = @_; 2137 my ($self) = @_;
2125 2138
2126 ($self->{tex}->{w}, $self->{tex}->{h}) 2139 ($self->{tex}{w}, $self->{tex}{h})
2127} 2140}
2128 2141
2129sub _draw { 2142sub _draw {
2130 my ($self) = @_; 2143 my ($self) = @_;
2131 2144
… …
2240 my $ycut1 = max 0, min 1, $ycut; 2253 my $ycut1 = max 0, min 1, $ycut;
2241 my $ycut2 = max 0, min 1, $ycut - 1; 2254 my $ycut2 = max 0, min 1, $ycut - 1;
2242 2255
2243 my $h1 = $self->{h} * (1 - $ycut1); 2256 my $h1 = $self->{h} * (1 - $ycut1);
2244 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);
2245 2261
2246 glEnable GL_BLEND; 2262 glEnable GL_BLEND;
2247 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2263 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2248 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2264 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2249 glEnable GL_TEXTURE_2D; 2265 glEnable GL_TEXTURE_2D;
… …
2268 2284
2269 if ($t3) { 2285 if ($t3) {
2270 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2286 glBindTexture GL_TEXTURE_2D, $t3->{name};
2271 glBegin GL_QUADS; 2287 glBegin GL_QUADS;
2272 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2288 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2273 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2289 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2274 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2290 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2275 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2291 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2276 glEnd; 2292 glEnd;
2277 } 2293 }
2278 2294
2279 glDisable GL_BLEND; 2295 glDisable GL_BLEND;
… …
2367 $self->update; 2383 $self->update;
2368 2384
2369 $self 2385 $self
2370} 2386}
2371 2387
2372sub changed { }
2373
2374sub set_range { 2388sub set_range {
2375 my ($self, $range) = @_; 2389 my ($self, $range) = @_;
2376 2390
2377 ($range, $self->{range}) = ($self->{range}, $range); 2391 ($range, $self->{range}) = ($self->{range}, $range);
2378 2392
… …
2398 if $unit; 2412 if $unit;
2399 2413
2400 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2414 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2401 2415
2402 if ($value != $old_value) { 2416 if ($value != $old_value) {
2403 $self->_emit (changed => $value); 2417 $self->emit (changed => $value);
2404 $self->update; 2418 $self->update;
2405 } 2419 }
2406} 2420}
2407 2421
2408sub size_request { 2422sub size_request {
2409 my ($self) = @_; 2423 my ($self) = @_;
2410 2424
2411 ($self->{req_w}, $self->{req_h}) 2425 ($self->{req_w}, $self->{req_h})
2412} 2426}
2413 2427
2414sub button_down { 2428sub invoke_button_down {
2415 my ($self, $ev, $x, $y) = @_; 2429 my ($self, $ev, $x, $y) = @_;
2416 2430
2417 $self->SUPER::button_down ($ev, $x, $y); 2431 $self->SUPER::invoke_button_down ($ev, $x, $y);
2418 2432
2419 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2433 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2420 2434
2421 $self->mouse_motion ($ev, $x, $y) 2435 $self->invoke_mouse_motion ($ev, $x, $y)
2422} 2436}
2423 2437
2424sub mouse_motion { 2438sub invoke_mouse_motion {
2425 my ($self, $ev, $x, $y) = @_; 2439 my ($self, $ev, $x, $y) = @_;
2426 2440
2427 if ($GRAB == $self) { 2441 if ($GRAB == $self) {
2428 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2442 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2429 2443
… …
2550 can_events => 0, 2564 can_events => 0,
2551 indent => 0, 2565 indent => 0,
2552 #font => default_font 2566 #font => default_font
2553 @_, 2567 @_,
2554 2568
2555 layout => (new CFClient::Layout 1), 2569 layout => (new CFClient::Layout),
2556 par => [], 2570 par => [],
2557 height => 0, 2571 height => 0,
2558 children => [ 2572 children => [
2559 (new CFClient::UI::Empty expand => 1), 2573 (new CFClient::UI::Empty expand => 1),
2560 (new CFClient::UI::Slider vertical => 1), 2574 (new CFClient::UI::Slider vertical => 1),
… …
2571 2585
2572 $self->{fontsize} = $fontsize; 2586 $self->{fontsize} = $fontsize;
2573 $self->reflow; 2587 $self->reflow;
2574} 2588}
2575 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
2576sub size_allocate { 2599sub invoke_size_allocate {
2577 my ($self, $w, $h) = @_; 2600 my ($self, $w, $h) = @_;
2578 2601
2579 $self->SUPER::size_allocate ($w, $h); 2602 my ($empty, $slider, @other) = @{ $self->{children} };
2603 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2580 2604
2581 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2605 $self->{layout}->set_font ($self->{font}) if $self->{font};
2582 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2606 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2583 $self->{layout}->set_width ($self->{children}[0]{w}); 2607 $self->{layout}->set_width ($empty->{w});
2584 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2608 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2585 2609
2586 $self->reflow; 2610 $self->reflow;
2587}
2588 2611
2589sub text_size { 2612 local $self->{children} = [$empty, $slider];
2590 my ($self, $text, $indent) = @_; 2613 $self->SUPER::invoke_size_allocate ($w, $h)
2614}
2615
2616sub get_layout {
2617 my ($self, $para) = @_;
2591 2618
2592 my $layout = $self->{layout}; 2619 my $layout = $self->{layout};
2593 2620
2621 $layout->set_font ($self->{font}) if $self->{font};
2622 $layout->set_foreground (@{$para->{fg}});
2594 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2623 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2595 $layout->set_width ($self->{children}[0]{w} - $indent); 2624 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2625 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2597 $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}}
2598 2632 );
2633
2599 $layout->size 2634 $layout
2600} 2635}
2601 2636
2602sub reflow { 2637sub reflow {
2603 my ($self) = @_; 2638 my ($self) = @_;
2604 2639
… …
2613 $self->{children}[1]->set_value ($offset); 2648 $self->{children}[1]->set_value ($offset);
2614} 2649}
2615 2650
2616sub clear { 2651sub clear {
2617 my ($self) = @_; 2652 my ($self) = @_;
2653
2654 my (undef, undef, @other) = @{ $self->{children} };
2655 $self->remove ($_) for @other;
2618 2656
2619 $self->{par} = []; 2657 $self->{par} = [];
2620 $self->{height} = 0; 2658 $self->{height} = 0;
2621 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2659 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2622} 2660}
2623 2661
2624sub add_paragraph { 2662sub add_paragraph {
2625 my ($self, $color, $text, $indent) = @_; 2663 my ($self, $color, $para, $indent) = @_;
2626 2664
2627 for my $line (split /\n/, $text) { 2665 my ($text, @w) = ref $para ? @$para : $para;
2628 my ($w, $h) = $self->text_size ($line); 2666
2629 $self->{height} += $h; 2667 $para = {
2630 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,
2631 } 2674 };
2632 2675
2633 $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;
2634} 2688}
2635 2689
2636sub update { 2690sub update {
2637 my ($self) = @_; 2691 my ($self) = @_;
2638 2692
… …
2646 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2700 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2647 2701
2648 if (delete $self->{need_reflow}) { 2702 if (delete $self->{need_reflow}) {
2649 my $height = 0; 2703 my $height = 0;
2650 2704
2651 my $layout = $self->{layout};
2652
2653 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2654
2655 for (@{$self->{par}}) { 2705 for my $para (@{$self->{par}}) {
2656 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2706 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2657 $layout->set_width ($W - $_->[3]); 2707 my $layout = $self->get_layout ($para);
2658 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2659 $layout->set_markup ($_->[4]);
2660 my ($w, $h) = $layout->size; 2708 my ($w, $h) = $layout->size;
2661 $_->[0] = $w + $_->[3]; 2709
2662 $_->[1] = $h; 2710 $para->{w} = $w + $para->{indent};
2711 $para->{h} = $h;
2712 $para->{wrapped} = $layout->has_wrapped;
2663 } 2713 }
2664 2714
2665 $height += $_->[1]; 2715 $height += $para->{h};
2666 } 2716 }
2667 2717
2668 $self->{height} = $height; 2718 $self->{height} = $height;
2669 2719
2670 $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]);
2671 2721
2672 delete $self->{texture}; 2722 delete $self->{texture};
2723 }
2724
2725 if (delete $self->{scroll_to_bottom}) {
2726 $self->{children}[1]->set_value (1e10);
2673 } 2727 }
2674 2728
2675 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2729 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2676 glClearColor 0, 0, 0, 0; 2730 glClearColor 0, 0, 0, 0;
2677 glClear GL_COLOR_BUFFER_BIT; 2731 glClear GL_COLOR_BUFFER_BIT;
… …
2681 my $y0 = $top; 2735 my $y0 = $top;
2682 my $y1 = $top + $H; 2736 my $y1 = $top + $H;
2683 2737
2684 my $y = 0; 2738 my $y = 0;
2685 2739
2686 my $layout = $self->{layout};
2687
2688 $layout->set_font ($self->{font}) if $self->{font};
2689
2690 glEnable GL_BLEND;
2691 #TODO# not correct in windows where rgba is forced off
2692 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2693
2694 for my $par (@{$self->{par}}) { 2740 for my $para (@{$self->{par}}) {
2695 my $h = $par->[1]; 2741 my $h = $para->{h};
2696 2742
2697 if ($y0 < $y + $h && $y < $y1) { 2743 if ($y0 < $y + $h && $y < $y1) {
2698 $layout->set_foreground (@{ $par->[2] });
2699 $layout->set_width ($W - $par->[3]);
2700 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2701 $layout->set_markup ($par->[4]);
2702 2744
2703 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2745 my $layout = $self->get_layout ($para);
2704 2746
2705 glRasterPos $par->[3], $y - $y0; 2747 $layout->render ($para->{indent}, $y - $y0);
2706 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 }
2707 } 2761 }
2708 2762
2709 $y += $h; 2763 $y += $h;
2710 } 2764 }
2711
2712 glDisable GL_BLEND;
2713 }; 2765 };
2714 }); 2766 });
2767}
2768
2769sub reconfigure {
2770 my ($self) = @_;
2771
2772 $self->SUPER::reconfigure;
2773
2774 $_->{w} = 1e10 for @{ $self->{par} };
2775 $self->reflow;
2715} 2776}
2716 2777
2717sub _draw { 2778sub _draw {
2718 my ($self) = @_; 2779 my ($self) = @_;
2719 2780
… …
2722 glColor 0, 0, 0, 1; 2783 glColor 0, 0, 0, 1;
2723 $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});
2724 glDisable GL_TEXTURE_2D; 2785 glDisable GL_TEXTURE_2D;
2725 2786
2726 $self->{children}[1]->draw; 2787 $self->{children}[1]->draw;
2727
2728} 2788}
2729 2789
2730############################################################################# 2790#############################################################################
2731 2791
2732package CFClient::UI::Animator; 2792package CFClient::UI::Animator;
… …
2841 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2901 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2842 2902
2843 ($w + 4, $h + 4) 2903 ($w + 4, $h + 4)
2844} 2904}
2845 2905
2846sub size_allocate { 2906sub invoke_size_allocate {
2847 my ($self, $w, $h) = @_; 2907 my ($self, $w, $h) = @_;
2848 2908
2849 $self->SUPER::size_allocate ($w - 4, $h - 4); 2909 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2850} 2910}
2851 2911
2852sub visibility_change { 2912sub invoke_visibility_change {
2853 my ($self, $visible) = @_; 2913 my ($self, $visible) = @_;
2854 2914
2855 return unless $visible; 2915 return unless $visible;
2856 2916
2857 $self->{root}->on_post_alloc ("move_$self" => sub { 2917 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
3005 for my $item (@{ $self->{items} }) { 3065 for my $item (@{ $self->{items} }) {
3006 my ($widget, $cb, $tooltip) = @$item; 3066 my ($widget, $cb, $tooltip) = @$item;
3007 3067
3008 # handle various types of items, only text for now 3068 # handle various types of items, only text for now
3009 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 {
3010 $widget = new CFClient::UI::Label 3084 $widget = new CFClient::UI::Label
3011 can_hover => 1, 3085 can_hover => 1,
3012 can_events => 1, 3086 can_events => 1,
3013 markup => $widget, 3087 markup => $widget,
3014 tooltip => $tooltip 3088 tooltip => $tooltip;
3089 }
3015 } 3090 }
3016 3091
3017 $self->{item}{$widget} = $item; 3092 $self->{item}{$widget} = $item;
3018 3093
3019 $self->{vbox}->add ($widget); 3094 $self->{vbox}->add ($widget);
… …
3024 3099
3025# 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)
3026sub popup { 3101sub popup {
3027 my ($self, $ev) = @_; 3102 my ($self, $ev) = @_;
3028 3103
3029 $self->_emit ("popdown"); 3104 $self->emit ("popdown");
3030 3105
3031 # maybe save $GRAB? must be careful about events... 3106 # maybe save $GRAB? must be careful about events...
3032 $GRAB = $self; 3107 $GRAB = $self;
3033 $self->{button} = $ev->{button}; 3108 $self->{button} = $ev->{button};
3034 3109
3035 $self->show; 3110 $self->show;
3036 $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);
3037} 3112}
3038 3113
3039sub mouse_motion { 3114sub invoke_mouse_motion {
3040 my ($self, $ev, $x, $y) = @_; 3115 my ($self, $ev, $x, $y) = @_;
3041 3116
3042 # TODO: should use vbox->find_widget or so 3117 # TODO: should use vbox->find_widget or so
3043 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3118 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
3044 $self->{hover} = $self->{item}{$HOVER}; 3119 $self->{hover} = $self->{item}{$HOVER};
3045 3120
3046 0 3121 0
3047} 3122}
3048 3123
3049sub button_up { 3124sub invoke_button_up {
3050 my ($self, $ev, $x, $y) = @_; 3125 my ($self, $ev, $x, $y) = @_;
3051 3126
3052 if ($ev->{button} == $self->{button}) { 3127 if ($ev->{button} == $self->{button}) {
3053 undef $GRAB; 3128 undef $GRAB;
3054 $self->hide; 3129 $self->hide;
3055 3130
3056 $self->_emit ("popdown"); 3131 $self->emit ("popdown");
3057 $self->{hover}[1]->() if $self->{hover}; 3132 $self->{hover}[1]->() if $self->{hover};
3058 } else { 3133 } else {
3059 return 0 3134 return 0
3060 } 3135 }
3061 3136
… …
3088 3163
3089 $self->{current} = $self->{children}[0] 3164 $self->{current} = $self->{children}[0]
3090 if @{ $self->{children} }; 3165 if @{ $self->{children} };
3091} 3166}
3092 3167
3168sub get_current_page {
3169 my ($self) = @_;
3170
3171 $self->{current}
3172}
3173
3093sub set_current_page { 3174sub set_current_page {
3094 my ($self, $page_or_widget) = @_; 3175 my ($self, $page_or_widget) = @_;
3095 3176
3096 my $widget = ref $page_or_widget 3177 my $widget = ref $page_or_widget
3097 ? $page_or_widget 3178 ? $page_or_widget
3098 : $self->{children}[$page_or_widget]; 3179 : $self->{children}[$page_or_widget];
3099 3180
3100 $self->{current} = $widget; 3181 $self->{current} = $widget;
3101 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3182 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3102 3183
3103 $self->_emit (page_changed => $self->{current}); 3184 $self->emit (page_changed => $self->{current});
3104 3185
3105 $self->realloc; 3186 $self->realloc;
3106} 3187}
3107 3188
3108sub visible_children { 3189sub visible_children {
… …
3113 my ($self) = @_; 3194 my ($self) = @_;
3114 3195
3115 $self->{current}->size_request 3196 $self->{current}->size_request
3116} 3197}
3117 3198
3118sub size_allocate { 3199sub invoke_size_allocate {
3119 my ($self, $w, $h) = @_; 3200 my ($self, $w, $h) = @_;
3120 3201
3121 $self->{current}->configure (0, 0, $w, $h); 3202 $self->{current}->configure (0, 0, $w, $h);
3203
3204 1
3122} 3205}
3123 3206
3124sub _draw { 3207sub _draw {
3125 my ($self) = @_; 3208 my ($self) = @_;
3126 3209
… …
3161 ); 3244 );
3162 3245
3163 $self->{multiplexer}->add ($widget); 3246 $self->{multiplexer}->add ($widget);
3164} 3247}
3165 3248
3249sub get_current_page {
3250 my ($self) = @_;
3251
3252 $self->{multiplexer}->get_current_page
3253}
3254
3166sub set_current_page { 3255sub set_current_page {
3167 my ($self, $page) = @_; 3256 my ($self, $page) = @_;
3168 3257
3169 $self->{multiplexer}->set_current_page ($page); 3258 $self->{multiplexer}->set_current_page ($page);
3170 $self->_emit (page_changed => $self->{multiplexer}{current}); 3259 $self->emit (page_changed => $self->{multiplexer}{current});
3171} 3260}
3172 3261
3173############################################################################# 3262#############################################################################
3174 3263
3175package CFClient::UI::Combobox; 3264package CFClient::UI::Combobox;
… …
3190 $self->_set_value ($self->{value}); 3279 $self->_set_value ($self->{value});
3191 3280
3192 $self 3281 $self
3193} 3282}
3194 3283
3195sub button_down { 3284sub invoke_button_down {
3196 my ($self, $ev) = @_; 3285 my ($self, $ev) = @_;
3197 3286
3198 my @menu_items; 3287 my @menu_items;
3199 3288
3200 for (@{ $self->{options} }) { 3289 for (@{ $self->{options} }) {
… …
3221 my ($self, $value) = @_; 3310 my ($self, $value) = @_;
3222 3311
3223 return unless $self->{value} ne $value; 3312 return unless $self->{value} ne $value;
3224 3313
3225 $self->_set_value ($value); 3314 $self->_set_value ($value);
3226 $self->_emit (changed => $value); 3315 $self->emit (changed => $value);
3227} 3316}
3228 3317
3229############################################################################# 3318#############################################################################
3230 3319
3231package CFClient::UI::Statusbox; 3320package CFClient::UI::Statusbox;
… …
3346 count => 1, 3435 count => 1,
3347 %arg, 3436 %arg,
3348 }; 3437 };
3349 } 3438 }
3350 3439
3440 $ROOT->on_refresh (reorder => sub {
3351 $self->reorder; 3441 $self->reorder;
3442 });
3352} 3443}
3353 3444
3354sub reconfigure { 3445sub reconfigure {
3355 my ($self) = @_; 3446 my ($self) = @_;
3356 3447
… …
3371 3462
3372############################################################################# 3463#############################################################################
3373 3464
3374package CFClient::UI::Inventory; 3465package CFClient::UI::Inventory;
3375 3466
3376our @ISA = CFClient::UI::ScrolledWindow::; 3467our @ISA = CFClient::UI::Table::;
3377 3468
3378sub new { 3469sub new {
3379 my $class = shift; 3470 my $class = shift;
3380 3471
3381 my $self = $class->SUPER::new ( 3472 my $self = $class->SUPER::new (
3382 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3473 col_expand => [0, 1, 0],
3383 @_, 3474 @_,
3384 ); 3475 );
3385 3476
3386 $self 3477 $self
3387} 3478}
3388 3479
3389sub set_items { 3480sub set_items {
3390 my ($self, $items) = @_; 3481 my ($self, $items) = @_;
3391 3482
3392 $self->{child}->clear; 3483 $self->clear;
3393 return unless $items; 3484 return unless $items;
3394 3485
3395 my @items = sort { 3486 my @items = sort {
3396 ($a->{type} <=> $b->{type}) 3487 ($a->{type} <=> $b->{type})
3397 or ($a->{name} cmp $b->{name}) 3488 or ($a->{name} cmp $b->{name})
3398 } @$items; 3489 } values %$items;
3399 3490
3400 $self->{real_items} = \@items; 3491 $self->{real_items} = \@items;
3401 3492
3402 my $row = 0; 3493 my $row = 0;
3403 for my $item (@items) { 3494 for my $item (@items) {
3404 CFClient::Item::update_widgets $item; 3495 CFClient::Item::update_widgets $item;
3405 3496
3406 $self->{child}->add (0, $row, $item->{face_widget}); 3497 $self->add (0, $row, $item->{face_widget});
3407 $self->{child}->add (1, $row, $item->{desc_widget}); 3498 $self->add (1, $row, $item->{desc_widget});
3408 $self->{child}->add (2, $row, $item->{weight_widget}); 3499 $self->add (2, $row, $item->{weight_widget});
3409 3500
3410 $row++; 3501 $row++;
3411 }
3412}
3413
3414#############################################################################
3415
3416package CFClient::UI::BindEditor;
3417
3418our @ISA = CFClient::UI::FancyFrame::;
3419
3420sub new {
3421 my $class = shift;
3422
3423 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3424
3425 $self->add (my $vb = new CFClient::UI::VBox);
3426
3427
3428 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3429 text => "start recording",
3430 tooltip => "Start/Stops recording of actions."
3431 ."All subsequent actions after the recording started will be captured."
3432 ."The actions are displayed after the record was stopped."
3433 ."To bind the action you have to click on the 'Bind' button",
3434 on_activate => sub {
3435 unless ($self->{recording}) {
3436 $self->start;
3437 } else {
3438 $self->stop;
3439 }
3440 });
3441
3442 $vb->add (new CFClient::UI::Label text => "Actions:");
3443 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3444
3445 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3446 $vb->add (my $hb = new CFClient::UI::HBox);
3447 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3448 $hb->add (new CFClient::UI::Button
3449 text => "bind",
3450 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3451 on_activate => sub {
3452 $self->ask_for_bind;
3453 });
3454
3455 $vb->add (my $hb = new CFClient::UI::HBox);
3456 $hb->add (new CFClient::UI::Button
3457 text => "ok",
3458 expand => 1,
3459 tooltip => "This closes the binding editor and saves the binding",
3460 on_activate => sub {
3461 $self->hide;
3462 $self->commit;
3463 });
3464
3465 $hb->add (new CFClient::UI::Button
3466 text => "cancel",
3467 expand => 1,
3468 tooltip => "This closes the binding editor without saving",
3469 on_activate => sub {
3470 $self->hide;
3471 $self->{binding_cancel}->()
3472 if $self->{binding_cancel};
3473 });
3474
3475 $self->update_binding_widgets;
3476
3477 $self
3478}
3479
3480sub commit {
3481 my ($self) = @_;
3482 my ($mod, $sym, $cmds) = $self->get_binding;
3483 if ($sym != 0 && @$cmds > 0) {
3484 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3485 ."'. Don't forget 'Save Config'!");
3486 $self->{binding_change}->($mod, $sym, $cmds)
3487 if $self->{binding_change};
3488 } else {
3489 $::STATUSBOX->add ("No action bound, no key or action specified!");
3490 $self->{binding_cancel}->()
3491 if $self->{binding_cancel};
3492 }
3493}
3494
3495sub start {
3496 my ($self) = @_;
3497
3498 $self->{rec_btn}->set_text ("stop recording");
3499 $self->{recording} = 1;
3500 $self->clear_command_list;
3501 $::CONN->start_record if $::CONN;
3502}
3503
3504sub stop {
3505 my ($self) = @_;
3506
3507 $self->{rec_btn}->set_text ("start recording");
3508 $self->{recording} = 0;
3509
3510 my $rec;
3511 $rec = $::CONN->stop_record if $::CONN;
3512 return unless ref $rec eq 'ARRAY';
3513 $self->set_command_list ($rec);
3514}
3515
3516
3517sub ask_for_bind_and_commit {
3518 my ($self) = @_;
3519 $self->ask_for_bind (1);
3520}
3521
3522sub ask_for_bind {
3523 my ($self, $commit) = @_;
3524
3525 CFClient::Binder::open_binding_dialog (sub {
3526 my ($mod, $sym) = @_;
3527 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3528 $self->update_binding_widgets;
3529 $self->commit if $commit;
3530 });
3531}
3532
3533# $mod and $sym are the modifiers and key symbol
3534# $cmds is a array ref of strings (the commands)
3535# $cb is the callback that is executed on OK
3536# $ccb is the callback that is executed on CANCEL and
3537# when the binding was unsuccessful on OK
3538sub set_binding {
3539 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3540
3541 $self->clear_command_list;
3542 $self->{recording} = 0;
3543 $self->{rec_btn}->set_text ("start recording");
3544
3545 $self->{binding} = [$mod, $sym];
3546 $self->{commands} = $cmds;
3547
3548 $self->{binding_change} = $cb;
3549 $self->{binding_cancel} = $ccb;
3550
3551 $self->update_binding_widgets;
3552}
3553
3554# this is a shortcut method that asks for a binding
3555# and then just binds it.
3556sub do_quick_binding {
3557 my ($self, $cmds) = @_;
3558 $self->set_binding (undef, undef, $cmds, sub {
3559 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3560 });
3561 $self->ask_for_bind (1);
3562}
3563
3564sub update_binding_widgets {
3565 my ($self) = @_;
3566 my ($mod, $sym, $cmds) = $self->get_binding;
3567 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3568 $self->set_command_list ($cmds);
3569}
3570
3571sub get_binding {
3572 my ($self) = @_;
3573 return (
3574 $self->{binding}->[0],
3575 $self->{binding}->[1],
3576 [ grep { defined $_ } @{$self->{commands}} ]
3577 );
3578}
3579
3580sub clear_command_list {
3581 my ($self) = @_;
3582 $self->{cmdbox}->clear ();
3583}
3584
3585sub set_command_list {
3586 my ($self, $cmds) = @_;
3587
3588 $self->{cmdbox}->clear ();
3589 $self->{commands} = $cmds;
3590
3591 my $idx = 0;
3592
3593 for (@$cmds) {
3594 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3595
3596 my $i = $idx;
3597 $hb->add (new CFClient::UI::Label text => $_);
3598 $hb->add (new CFClient::UI::Button
3599 text => "delete",
3600 tooltip => "Deletes the action from the record",
3601 on_activate => sub {
3602 $self->{cmdbox}->remove ($hb);
3603 $cmds->[$i] = undef;
3604 });
3605
3606
3607 $idx++
3608 } 3502 }
3609} 3503}
3610 3504
3611############################################################################# 3505#############################################################################
3612 3506
… …
3666 } elsif ($ev->{button} == 2) { 3560 } elsif ($ev->{button} == 2) {
3667 $::CONN->user_send ("invoke $spell->{name}"); 3561 $::CONN->user_send ("invoke $spell->{name}");
3668 } elsif ($ev->{button} == 3) { 3562 } elsif ($ev->{button} == 3) {
3669 (new CFClient::UI::Menu 3563 (new CFClient::UI::Menu
3670 items => [ 3564 items => [
3671 ["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}"]) }],
3672 ["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}"]) }],
3673 ], 3567 ],
3674 )->popup ($ev); 3568 )->popup ($ev);
3675 } else { 3569 } else {
3676 return 0; 3570 return 0;
… …
3771 $coord = $max - $size if $coord > $max - $size; 3665 $coord = $max - $size if $coord > $max - $size;
3772 3666
3773 int $coord + 0.5 3667 int $coord + 0.5
3774} 3668}
3775 3669
3776sub size_allocate { 3670sub invoke_size_allocate {
3777 my ($self, $w, $h) = @_; 3671 my ($self, $w, $h) = @_;
3778 3672
3779 for my $child ($self->children) { 3673 for my $child ($self->children) {
3780 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)};
3781 3675
… …
3785 $X = _to_pixel $X, $W, $self->{w}; 3679 $X = _to_pixel $X, $W, $self->{w};
3786 $Y = _to_pixel $Y, $H, $self->{h}; 3680 $Y = _to_pixel $Y, $H, $self->{h};
3787 3681
3788 $child->configure ($X, $Y, $W, $H); 3682 $child->configure ($X, $Y, $W, $H);
3789 } 3683 }
3684
3685 1
3790} 3686}
3791 3687
3792sub coord2local { 3688sub coord2local {
3793 my ($self, $x, $y) = @_; 3689 my ($self, $x, $y) = @_;
3794 3690
… …
3920 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3816 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3921 3817
3922 $w = 0 if $w < 0; 3818 $w = 0 if $w < 0;
3923 $h = 0 if $h < 0; 3819 $h = 0 if $h < 0;
3924 3820
3821 $w = max $widget->{min_w}, $w;
3822 $h = max $widget->{min_h}, $h;
3823
3824 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3825 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3826
3925 $w = int $w + 0.5; 3827 $w = int $w + 0.5;
3926 $h = int $h + 0.5; 3828 $h = int $h + 0.5;
3927 3829
3928 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3830 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3929 $widget->{old_w} = $widget->{w}; 3831 $widget->{old_w} = $widget->{w};

Diff Legend

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