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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.302 by root, Mon Jun 12 13:26:14 2006 UTC vs.
Revision 1.329 by root, Sun Jul 23 02:44:06 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 { 0 }
453sub button_up { 0 } 458sub invoke_button_up { 0 }
454sub key_down { 0 } 459sub invoke_key_down { 0 }
455sub key_up { 0 } 460sub invoke_key_up { 0 }
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 0
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 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
480
481 #d##TODO# stop propagating at first true, do not use sum
482 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
483 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
484 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
463} 485}
464 486
465sub find_widget { 487sub find_widget {
466 my ($self, $x, $y) = @_; 488 my ($self, $x, $y) = @_;
467 489
… …
477sub set_parent { 499sub set_parent {
478 my ($self, $parent) = @_; 500 my ($self, $parent) = @_;
479 501
480 Scalar::Util::weaken ($self->{parent} = $parent); 502 Scalar::Util::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible}; 503 $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} 504}
506 505
507sub realloc { 506sub realloc {
508 my ($self) = @_; 507 my ($self) = @_;
509 508
… …
542 return unless $self->{h} && $self->{w}; 541 return unless $self->{h} && $self->{w};
543 542
544 # update screen rectangle 543 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x}; 544 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y}; 545 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549 546
550 # skip widgets that are entirely outside the drawing area 547 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
553 550
… …
592} 589}
593 590
594sub DESTROY { 591sub DESTROY {
595 my ($self) = @_; 592 my ($self) = @_;
596 593
594 return if CFClient::in_destruct;
595
597 delete $WIDGET{$self+0}; 596 delete $WIDGET{$self+0};
598 597
599 eval { $self->destroy }; 598 eval { $self->destroy };
600 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 599 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
601} 600}
… …
789 788
790sub size_request { 789sub size_request {
791 $_[0]{children}[0]->size_request 790 $_[0]{children}[0]->size_request
792} 791}
793 792
794sub size_allocate { 793sub invoke_size_allocate {
795 my ($self, $w, $h) = @_; 794 my ($self, $w, $h) = @_;
796 795
797 $self->{children}[0]->configure (0, 0, $w, $h); 796 $self->{children}[0]->configure (0, 0, $w, $h);
797
798 1
798} 799}
799 800
800############################################################################# 801#############################################################################
801 802
802# back-buffered drawing area 803# back-buffered drawing area
… …
818 819
819 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 820 $ROOT->on_post_alloc ($self => sub { $self->render_child });
820 $self->SUPER::update; 821 $self->SUPER::update;
821} 822}
822 823
823sub size_allocate { 824sub invoke_size_allocate {
824 my ($self, $w, $h) = @_; 825 my ($self, $w, $h) = @_;
825 826
826 $self->SUPER::size_allocate ($w, $h);
827 $self->update; 827 $self->update;
828
829 $self->SUPER::invoke_size_allocate ($w, $h)
828} 830}
829 831
830sub _render { 832sub _render {
831 my ($self) = @_; 833 my ($self) = @_;
832 834
… …
893 $h = 10 if $self->{scroll_y}; 895 $h = 10 if $self->{scroll_y};
894 896
895 ($w, $h) 897 ($w, $h)
896} 898}
897 899
898sub size_allocate { 900sub invoke_size_allocate {
899 my ($self, $w, $h) = @_; 901 my ($self, $w, $h) = @_;
900 902
901 my $child = $self->child; 903 my $child = $self->child;
902 904
903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 905 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 906 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
905 907
906 $self->child->configure (0, 0, $w, $h); 908 $self->child->configure (0, 0, $w, $h);
907 $self->update; 909 $self->update;
910
911 1
908} 912}
909 913
910sub set_offset { 914sub set_offset {
911 my ($self, $x, $y) = @_; 915 my ($self, $x, $y) = @_;
912 916
… …
986 $self->add ($child) if $child; 990 $self->add ($child) if $child;
987 991
988 $self 992 $self
989} 993}
990 994
995#TODO# update range on size_allocate depending on child
996
991sub add { 997sub add {
992 my ($self, $widget) = @_; 998 my ($self, $widget) = @_;
993 999
994 $self->{vp}->add ($self->{child} = $widget); 1000 $self->{vp}->add ($self->{child} = $widget);
995} 1001}
996 1002
1003sub invoke_button_up {
1004 my ($self, $ev) = @_;
1005
1006 warn "button up $ev->{button}\n";#d#
1007
1008 0
1009}
1010
1011sub update_slider {
1012 my ($self) = @_;
1013
1014 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1015}
1016
997sub update { 1017sub update {
998 my ($self) = @_; 1018 my ($self) = @_;
999 1019
1000 $self->SUPER::update; 1020 $self->SUPER::update;
1001 1021
1002 # todo: overwrite size_allocate of child 1022 $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} 1023}
1006 1024
1007sub size_allocate { 1025sub invoke_size_allocate {
1008 my ($self, $w, $h) = @_; 1026 my ($self, $w, $h) = @_;
1009 1027
1028 $self->update_slider;
1029
1010 $self->SUPER::size_allocate ($w, $h); 1030 $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} 1031}
1015
1016#TODO# update range on size_allocate depending on child
1017# update viewport offset on scroll
1018 1032
1019############################################################################# 1033#############################################################################
1020 1034
1021package CFClient::UI::Frame; 1035package CFClient::UI::Frame;
1022 1036
… …
1078 my $self = $class->SUPER::new ( 1092 my $self = $class->SUPER::new (
1079 bg => [1, 1, 1, 1], 1093 bg => [1, 1, 1, 1],
1080 border_bg => [1, 1, 1, 1], 1094 border_bg => [1, 1, 1, 1],
1081 border => 0.6, 1095 border => 0.6,
1082 can_events => 1, 1096 can_events => 1,
1083 min_w => 16, 1097 min_w => 64,
1084 min_h => 16, 1098 min_h => 32,
1085 %arg, 1099 %arg,
1086 ); 1100 );
1087 1101
1088 $self->{title_widget} = new CFClient::UI::Label 1102 $self->{title_widget} = new CFClient::UI::Label
1089 align => 0, 1103 align => 0,
1090 valign => 1, 1104 valign => 1,
1091 text => $self->{title}, 1105 text => $self->{title},
1092 fontsize => $self->{border}, 1106 fontsize => $self->{border},
1093 if exists $self->{title}; 1107 if exists $self->{title};
1094 1108
1109 if ($self->{has_close_button}) {
1110 $self->{close_button} =
1111 new CFClient::UI::ImageButton
1112 path => 'x1_close.png',
1113 on_activate => sub { $self->emit ("delete") };
1114
1115 $self->CFClient::UI::Container::add ($self->{close_button});
1116 }
1117
1095 $self 1118 $self
1096} 1119}
1097 1120
1098sub add { 1121sub add {
1099 my ($self, @widgets) = @_; 1122 my ($self, @widgets) = @_;
1100 1123
1101 $self->SUPER::add (@widgets); 1124 $self->SUPER::add (@widgets);
1125 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1102 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1126 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1103} 1127}
1104 1128
1105sub border { 1129sub border {
1106 int $_[0]{border} * $::FONTSIZE 1130 int $_[0]{border} * $::FONTSIZE
… …
1109sub size_request { 1133sub size_request {
1110 my ($self) = @_; 1134 my ($self) = @_;
1111 1135
1112 $self->{title_widget}->size_request 1136 $self->{title_widget}->size_request
1113 if $self->{title_widget}; 1137 if $self->{title_widget};
1138
1139 $self->{close_button}->size_request
1140 if $self->{close_button};
1114 1141
1115 my ($w, $h) = $self->SUPER::size_request; 1142 my ($w, $h) = $self->SUPER::size_request;
1116 1143
1117 ( 1144 (
1118 $w + $self->border * 2, 1145 $w + $self->border * 2,
1119 $h + $self->border * 2, 1146 $h + $self->border * 2,
1120 ) 1147 )
1121} 1148}
1122 1149
1123sub size_allocate { 1150sub invoke_size_allocate {
1124 my ($self, $w, $h) = @_; 1151 my ($self, $w, $h) = @_;
1125 1152
1126 if ($self->{title_widget}) { 1153 if ($self->{title_widget}) {
1127 $self->{title_widget}{w} = $w; 1154 $self->{title_widget}{w} = $w;
1128 $self->{title_widget}{h} = $h; 1155 $self->{title_widget}{h} = $h;
1129 $self->{title_widget}->size_allocate ($w, $h); 1156 $self->{title_widget}->invoke_size_allocate ($w, $h);
1130 } 1157 }
1131 1158
1132 my $border = $self->border; 1159 my $border = $self->border;
1133 1160
1134 $h -= List::Util::max 0, $border * 2; 1161 $h -= List::Util::max 0, $border * 2;
1135 $w -= List::Util::max 0, $border * 2; 1162 $w -= List::Util::max 0, $border * 2;
1163
1164 $self->child->configure ($border, $border, $w, $h);
1165
1166 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1167 if $self->{close_button};
1168
1169 1
1170}
1171
1172sub invoke_delete {
1173 my ($self) = @_;
1174
1175 $self->hide;
1136 1176
1137 $self->child->configure ($border, $border, $w, $h); 1177 1
1138} 1178}
1139 1179
1140sub button_down { 1180sub invoke_button_down {
1141 my ($self, $ev, $x, $y) = @_; 1181 my ($self, $ev, $x, $y) = @_;
1142 1182
1143 my ($w, $h) = @$self{qw(w h)}; 1183 my ($w, $h) = @$self{qw(w h)};
1144 my $border = $self->border; 1184 my $border = $self->border;
1145 1185
… …
1176 1216
1177 ($x, $y) = ($ev->{x}, $ev->{y}); 1217 ($x, $y) = ($ev->{x}, $ev->{y});
1178 1218
1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1219 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180 # HACK: the next line is required to enforce placement 1220 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1221 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1182 }; 1222 };
1183 } else { 1223 } else {
1184 return 0; 1224 return 0;
1185 } 1225 }
1186 1226
1187 1 1227 1
1188} 1228}
1189 1229
1190sub button_up { 1230sub invoke_button_up {
1191 my ($self, $ev, $x, $y) = @_; 1231 my ($self, $ev, $x, $y) = @_;
1192 1232
1193 !!delete $self->{motion} 1233 ! ! delete $self->{motion}
1194} 1234}
1195 1235
1196sub mouse_motion { 1236sub invoke_mouse_motion {
1197 my ($self, $ev, $x, $y) = @_; 1237 my ($self, $ev, $x, $y) = @_;
1198 1238
1199 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1239 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200 1240
1201 !!$self->{motion} 1241 ! ! $self->{motion}
1202} 1242}
1203 1243
1204sub _draw { 1244sub _draw {
1205 my ($self) = @_; 1245 my ($self) = @_;
1206 1246
… …
1235 $child->draw; 1275 $child->draw;
1236 1276
1237 if ($self->{title_widget}) { 1277 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h}; 1278 glTranslate 0, $border - $self->{h};
1239 $self->{title_widget}->_draw; 1279 $self->{title_widget}->_draw;
1280
1281 glTranslate 0, - ($border - $self->{h});
1240 } 1282 }
1283
1284 $self->{close_button}->draw
1285 if $self->{close_button};
1241} 1286}
1242 1287
1243############################################################################# 1288#############################################################################
1244 1289
1245package CFClient::UI::Table; 1290package CFClient::UI::Table;
… …
1324 (sum @$ws), 1369 (sum @$ws),
1325 (sum @$hs), 1370 (sum @$hs),
1326 ) 1371 )
1327} 1372}
1328 1373
1329sub size_allocate { 1374sub invoke_size_allocate {
1330 my ($self, $w, $h) = @_; 1375 my ($self, $w, $h) = @_;
1331 1376
1332 my ($ws, $hs) = $self->get_wh; 1377 my ($ws, $hs) = $self->get_wh;
1333 1378
1334 my $req_w = (sum @$ws) || 1; 1379 my $req_w = (sum @$ws) || 1;
… …
1366 } 1411 }
1367 1412
1368 $y += $row_h; 1413 $y += $row_h;
1369 } 1414 }
1370 1415
1416 1
1371} 1417}
1372 1418
1373sub find_widget { 1419sub find_widget {
1374 my ($self, $x, $y) = @_; 1420 my ($self, $x, $y) = @_;
1375 1421
… …
1412 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1458 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1413 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1459 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1414 ) 1460 )
1415} 1461}
1416 1462
1417sub size_allocate { 1463sub invoke_size_allocate {
1418 my ($self, $w, $h) = @_; 1464 my ($self, $w, $h) = @_;
1419 1465
1420 my $space = $self->{vertical} ? $h : $w; 1466 my $space = $self->{vertical} ? $h : $w;
1421 my $children = $self->{children}; 1467 my @children = $self->visible_children;
1422 1468
1423 my @req; 1469 my @req;
1424 1470
1425 if ($self->{homogeneous}) { 1471 if ($self->{homogeneous}) {
1426 @req = ($space / (@$children || 1)) x @$children; 1472 @req = ($space / (@children || 1)) x @children;
1427 } else { 1473 } else {
1428 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1474 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1429 my $req = List::Util::sum @req; 1475 my $req = List::Util::sum @req;
1430 1476
1431 if ($req > $space) { 1477 if ($req > $space) {
1432 # ah well, not enough space 1478 # ah well, not enough space
1433 $_ *= $space / $req for @req; 1479 $_ *= $space / $req for @req;
1434 } else { 1480 } else {
1435 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1481 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1436 1482
1437 $space = ($space - $req) / $expand; # remaining space to give away 1483 $space = ($space - $req) / $expand; # remaining space to give away
1438 1484
1439 $req[$_] += $space * $children->[$_]{expand} 1485 $req[$_] += $space * $children[$_]{expand}
1440 for 0 .. $#$children; 1486 for 0 .. $#children;
1441 } 1487 }
1442 } 1488 }
1443 1489
1444 CFClient::UI::harmonize \@req; 1490 CFClient::UI::harmonize \@req;
1445 1491
1446 my $pos = 0; 1492 my $pos = 0;
1447 for (0 .. $#$children) { 1493 for (0 .. $#children) {
1448 my $alloc = $req[$_]; 1494 my $alloc = $req[$_];
1449 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1495 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1450 1496
1451 $pos += $alloc; 1497 $pos += $alloc;
1452 } 1498 }
1453 1499
1454 1 1500 1
… …
1557 my ($self, $text) = @_; 1603 my ($self, $text) = @_;
1558 1604
1559 return if $self->{text} eq "T$text"; 1605 return if $self->{text} eq "T$text";
1560 $self->{text} = "T$text"; 1606 $self->{text} = "T$text";
1561 1607
1562 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1563 $self->{layout}->set_text ($text); 1608 $self->{layout}->set_text ($text);
1564 1609
1565 delete $self->{size_req}; 1610 delete $self->{size_req};
1566 $self->realloc; 1611 $self->realloc;
1567 $self->update; 1612 $self->update;
… …
1573 return if $self->{text} eq "M$markup"; 1618 return if $self->{text} eq "M$markup";
1574 $self->{text} = "M$markup"; 1619 $self->{text} = "M$markup";
1575 1620
1576 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1621 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1577 1622
1578 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1579 $self->{layout}->set_markup ($markup); 1623 $self->{layout}->set_markup ($markup);
1580 1624
1581 delete $self->{size_req}; 1625 delete $self->{size_req};
1582 $self->realloc; 1626 $self->realloc;
1583 $self->update; 1627 $self->update;
… …
1595 1639
1596 my ($w, $h) = $self->{layout}->size; 1640 my ($w, $h) = $self->{layout}->size;
1597 1641
1598 if (exists $self->{template}) { 1642 if (exists $self->{template}) {
1599 $self->{template}->set_font ($self->{font}) if $self->{font}; 1643 $self->{template}->set_font ($self->{font}) if $self->{font};
1644 $self->{template}->set_width ($self->{max_w} || -1);
1600 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1645 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1601 1646
1602 my ($w2, $h2) = $self->{template}->size; 1647 my ($w2, $h2) = $self->{template}->size;
1603 1648
1604 $w = List::Util::max $w, $w2; 1649 $w = List::Util::max $w, $w2;
… …
1609 }; 1654 };
1610 1655
1611 @{ $self->{size_req} } 1656 @{ $self->{size_req} }
1612} 1657}
1613 1658
1659sub baseline_shift {
1660 $_[0]{layout}->descent
1661}
1662
1614sub size_allocate { 1663sub invoke_size_allocate {
1615 my ($self, $w, $h) = @_; 1664 my ($self, $w, $h) = @_;
1616 1665
1617 delete $self->{ox}; 1666 delete $self->{ox};
1618 1667
1619 delete $self->{texture} 1668 delete $self->{texture}
1620 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1669 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1670
1671 1
1621} 1672}
1622 1673
1623sub set_fontsize { 1674sub set_fontsize {
1624 my ($self, $fontsize) = @_; 1675 my ($self, $fontsize) = @_;
1625 1676
1626 $self->{fontsize} = $fontsize; 1677 $self->{fontsize} = $fontsize;
1678 delete $self->{size_req};
1627 delete $self->{texture}; 1679 delete $self->{texture};
1628 1680
1629 $self->realloc; 1681 $self->realloc;
1630} 1682}
1631 1683
1632sub reconfigure { 1684sub reconfigure {
1633 my ($self) = @_; 1685 my ($self) = @_;
1634 1686
1635 delete $self->{size_req}; 1687 delete $self->{size_req};
1688 delete $self->{texture};
1636 1689
1637 $self->SUPER::reconfigure; 1690 $self->SUPER::reconfigure;
1638} 1691}
1639 1692
1640sub _draw { 1693sub _draw {
1641 my ($self) = @_; 1694 my ($self) = @_;
1642 1695
1643 $self->SUPER::_draw; # draw background, if applicable 1696 $self->SUPER::_draw; # draw background, if applicable
1644 1697
1645 my $tex = $self->{texture} ||= do { 1698 my $size = $self->{texture} ||= do {
1646 $self->{layout}->set_foreground (@{$self->{fg}}); 1699 $self->{layout}->set_foreground (@{$self->{fg}});
1647 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1700 $self->{layout}->set_font ($self->{font}) if $self->{font};
1648 $self->{layout}->set_width ($self->{w}); 1701 $self->{layout}->set_width ($self->{w});
1649 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1702 $self->{layout}->set_ellipsise ($self->{ellipsise});
1650 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1703 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1651 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1704 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1652 1705
1653 new_from_layout CFClient::Texture $self->{layout} 1706 [$self->{layout}->size]
1654 }; 1707 };
1655 1708
1656 unless (exists $self->{ox}) { 1709 unless (exists $self->{ox}) {
1657 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1710 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1658 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1711 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1659 : ($self->{w} - $tex->{w}) * 0.5); 1712 : ($self->{w} - $size->[0]) * 0.5);
1660 1713
1661 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1714 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1662 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1715 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1663 : ($self->{h} - $tex->{h}) * 0.5); 1716 : ($self->{h} - $size->[1]) * 0.5);
1664 }; 1717 };
1665 1718
1666 glEnable GL_TEXTURE_2D;
1667
1668 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1719 my $w = List::Util::min $self->{w} + 4, $size->[0];
1669 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1720 my $h = List::Util::min $self->{h} + 2, $size->[1];
1670 1721
1671 if ($tex->{format} == GL_ALPHA) { 1722 $self->{layout}->render ($self->{ox}, $self->{oy});
1672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1673 glColor @{$self->{fg}};
1674 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1675 } else {
1676 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1677 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1678 }
1679
1680 glDisable GL_TEXTURE_2D;
1681} 1723}
1682 1724
1683############################################################################# 1725#############################################################################
1684 1726
1685package CFClient::UI::EntryBase; 1727package CFClient::UI::EntryBase;
… …
1718 1760
1719 $text =~ s/./*/g if $self->{hidden}; 1761 $text =~ s/./*/g if $self->{hidden};
1720 $self->{layout}->set_text ("$text "); 1762 $self->{layout}->set_text ("$text ");
1721 delete $self->{size_req}; 1763 delete $self->{size_req};
1722 1764
1723 $self->_emit (changed => $self->{text}); 1765 $self->emit (changed => $self->{text});
1724 1766
1725 $self->realloc; 1767 $self->realloc;
1726 $self->update; 1768 $self->update;
1727} 1769}
1728 1770
… …
1743 my ($w, $h) = $self->SUPER::size_request; 1785 my ($w, $h) = $self->SUPER::size_request;
1744 1786
1745 ($w + 1, $h) # add 1 for cursor 1787 ($w + 1, $h) # add 1 for cursor
1746} 1788}
1747 1789
1748sub key_down { 1790sub invoke_key_down {
1749 my ($self, $ev) = @_; 1791 my ($self, $ev) = @_;
1750 1792
1751 my $mod = $ev->{mod}; 1793 my $mod = $ev->{mod};
1752 my $sym = $ev->{sym}; 1794 my $sym = $ev->{sym};
1753 my $uni = $ev->{unicode}; 1795 my $uni = $ev->{unicode};
… …
1765 } elsif ($sym == CFClient::SDLK_HOME) { 1807 } elsif ($sym == CFClient::SDLK_HOME) {
1766 $self->{cursor} = 0; 1808 $self->{cursor} = 0;
1767 } elsif ($sym == CFClient::SDLK_END) { 1809 } elsif ($sym == CFClient::SDLK_END) {
1768 $self->{cursor} = length $text; 1810 $self->{cursor} = length $text;
1769 } elsif ($uni == 27) { 1811 } elsif ($uni == 27) {
1770 $self->_emit ('escape'); 1812 $self->emit ('escape');
1771 } elsif ($uni) { 1813 } elsif ($uni) {
1772 substr $text, $self->{cursor}++, 0, chr $uni; 1814 substr $text, $self->{cursor}++, 0, chr $uni;
1773 } else { 1815 } else {
1774 return 0; 1816 return 0;
1775 } 1817 }
… …
1779 $self->realloc; 1821 $self->realloc;
1780 1822
1781 1 1823 1
1782} 1824}
1783 1825
1784sub focus_in { 1826sub invoke_focus_in {
1785 my ($self) = @_; 1827 my ($self) = @_;
1786 1828
1787 $self->{last_activity} = $::NOW; 1829 $self->{last_activity} = $::NOW;
1788 1830
1789 $self->SUPER::focus_in; 1831 $self->SUPER::invoke_focus_in
1790} 1832}
1791 1833
1792sub button_down { 1834sub invoke_button_down {
1793 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1794 1836
1795 $self->SUPER::button_down ($ev, $x, $y); 1837 $self->SUPER::invoke_button_down ($ev, $x, $y);
1796 1838
1797 my $idx = $self->{layout}->xy_to_index ($x, $y); 1839 my $idx = $self->{layout}->xy_to_index ($x, $y);
1798 1840
1799 # byte-index to char-index 1841 # byte-index to char-index
1800 my $text = $self->{text}; 1842 my $text = $self->{text};
1801 utf8::encode $text; 1843 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1802 $self->{cursor} = length substr $text, 0, $idx; 1844 $self->{cursor} = length $text;
1803 1845
1804 $self->_set_text ($self->{text}); 1846 $self->_set_text ($self->{text});
1805 $self->update; 1847 $self->update;
1806 1848
1807 1 1849 1
1808} 1850}
1809 1851
1810sub mouse_motion { 1852sub invoke_mouse_motion {
1811 my ($self, $ev, $x, $y) = @_; 1853 my ($self, $ev, $x, $y) = @_;
1812# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1854# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1813 1855
1814 0 1856 1
1815} 1857}
1816 1858
1817sub _draw { 1859sub _draw {
1818 my ($self) = @_; 1860 my ($self) = @_;
1819 1861
… …
1860 1902
1861our @ISA = CFClient::UI::EntryBase::; 1903our @ISA = CFClient::UI::EntryBase::;
1862 1904
1863use CFClient::OpenGL; 1905use CFClient::OpenGL;
1864 1906
1865sub key_down { 1907sub invoke_key_down {
1866 my ($self, $ev) = @_; 1908 my ($self, $ev) = @_;
1867 1909
1868 my $sym = $ev->{sym}; 1910 my $sym = $ev->{sym};
1869 1911
1870 if ($sym == 13) { 1912 if ($sym == 13) {
1871 unshift @{$self->{history}}, 1913 unshift @{$self->{history}},
1872 my $txt = $self->get_text; 1914 my $txt = $self->get_text;
1915
1873 $self->{history_pointer} = -1; 1916 $self->{history_pointer} = -1;
1874 $self->{history_saveback} = ''; 1917 $self->{history_saveback} = '';
1875 $self->_emit (activate => $txt); 1918 $self->emit (activate => $txt);
1876 $self->update; 1919 $self->update;
1877 1920
1878 } elsif ($sym == CFClient::SDLK_UP) { 1921 } elsif ($sym == CFClient::SDLK_UP) {
1879 if ($self->{history_pointer} < 0) { 1922 if ($self->{history_pointer} < 0) {
1880 $self->{history_saveback} = $self->get_text; 1923 $self->{history_saveback} = $self->get_text;
… …
1896 } else { 1939 } else {
1897 $self->set_text ($self->{history_saveback}); 1940 $self->set_text ($self->{history_saveback});
1898 } 1941 }
1899 1942
1900 } else { 1943 } else {
1901 return $self->SUPER::key_down ($ev) 1944 return $self->SUPER::invoke_key_down ($ev)
1902 } 1945 }
1903 1946
1904 1 1947 1
1905} 1948}
1906 1949
… …
1930 can_events => 1, 1973 can_events => 1,
1931 @_ 1974 @_
1932 ) 1975 )
1933} 1976}
1934 1977
1935sub activate { }
1936
1937sub button_up { 1978sub invoke_button_up {
1938 my ($self, $ev, $x, $y) = @_; 1979 my ($self, $ev, $x, $y) = @_;
1939 1980
1940 $self->emit ("activate") 1981 $self->emit ("activate")
1941 if $x >= 0 && $x < $self->{w} 1982 if $x >= 0 && $x < $self->{w}
1942 && $y >= 0 && $y < $self->{h}; 1983 && $y >= 0 && $y < $self->{h};
… …
1956 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1997 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1957 1998
1958 glDisable GL_TEXTURE_2D; 1999 glDisable GL_TEXTURE_2D;
1959 2000
1960 $self->SUPER::_draw; 2001 $self->SUPER::_draw;
2002}
2003
2004#############################################################################
2005
2006package CFClient::UI::ImageButton;
2007
2008our @ISA = CFClient::UI::Image::;
2009
2010use CFClient::OpenGL;
2011
2012my %textures;
2013
2014sub new {
2015 my $class = shift;
2016
2017 my $self = $class->SUPER::new (
2018 padding_x => 4,
2019 padding_y => 4,
2020 fg => [1, 1, 1],
2021 active_fg => [0, 0, 1],
2022 can_hover => 1,
2023 align => 0,
2024 valign => 0,
2025 can_events => 1,
2026 @_
2027 );
2028}
2029
2030sub invoke_button_up {
2031 my ($self, $ev, $x, $y) = @_;
2032
2033 $self->emit ("activate")
2034 if $x >= 0 && $x < $self->{w}
2035 && $y >= 0 && $y < $self->{h};
2036
2037 1
1961} 2038}
1962 2039
1963############################################################################# 2040#############################################################################
1964 2041
1965package CFClient::UI::CheckBox; 2042package CFClient::UI::CheckBox;
… …
1992 my ($self) = @_; 2069 my ($self) = @_;
1993 2070
1994 (6) x 2 2071 (6) x 2
1995} 2072}
1996 2073
2074sub toggle {
2075 my ($self) = @_;
2076
2077 $self->{state} = !$self->{state};
2078 $self->emit (changed => $self->{state});
2079 $self->update;
2080}
2081
1997sub button_down { 2082sub invoke_button_down {
1998 my ($self, $ev, $x, $y) = @_; 2083 my ($self, $ev, $x, $y) = @_;
1999 2084
2000 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2085 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2001 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2086 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2002 $self->{state} = !$self->{state}; 2087 $self->toggle;
2003 $self->_emit (changed => $self->{state});
2004 } else { 2088 } else {
2005 return 0 2089 return 0
2006 } 2090 }
2007 2091
2008 1 2092 1
… …
2033package CFClient::UI::Image; 2117package CFClient::UI::Image;
2034 2118
2035our @ISA = CFClient::UI::Base::; 2119our @ISA = CFClient::UI::Base::;
2036 2120
2037use CFClient::OpenGL; 2121use CFClient::OpenGL;
2038use Carp qw/confess/;
2039 2122
2040our %loaded_images; 2123our %texture_cache;
2041 2124
2042sub new { 2125sub new {
2043 my $class = shift; 2126 my $class = shift;
2044 2127
2045 my $self = $class->SUPER::new (can_events => 0, @_); 2128 my $self = $class->SUPER::new (
2129 can_events => 0,
2130 @_,
2131 );
2046 2132
2047 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2133 $self->{path} || $self->{tex}
2134 or Carp::croak "'path' or 'tex' attributes required";
2048 2135
2049 $loaded_images{$self->{image}} ||= 2136 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2050 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2137 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2051 2138
2052 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2139 Scalar::Util::weaken $texture_cache{$self->{path}};
2053 2140
2054 Scalar::Util::weaken $loaded_images{$self->{image}}; 2141 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2055
2056 $self->{aspect} = $tex->{w} / $tex->{h};
2057 2142
2058 $self 2143 $self
2059} 2144}
2060 2145
2061sub size_request { 2146sub size_request {
2062 my ($self) = @_; 2147 my ($self) = @_;
2063 2148
2064 ($self->{tex}->{w}, $self->{tex}->{h}) 2149 ($self->{tex}{w}, $self->{tex}{h})
2065} 2150}
2066 2151
2067sub _draw { 2152sub _draw {
2068 my ($self) = @_; 2153 my ($self) = @_;
2069 2154
… …
2178 my $ycut1 = max 0, min 1, $ycut; 2263 my $ycut1 = max 0, min 1, $ycut;
2179 my $ycut2 = max 0, min 1, $ycut - 1; 2264 my $ycut2 = max 0, min 1, $ycut - 1;
2180 2265
2181 my $h1 = $self->{h} * (1 - $ycut1); 2266 my $h1 = $self->{h} * (1 - $ycut1);
2182 my $h2 = $self->{h} * (1 - $ycut2); 2267 my $h2 = $self->{h} * (1 - $ycut2);
2268 my $h3 = $self->{h};
2269
2270 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2183 2271
2184 glEnable GL_BLEND; 2272 glEnable GL_BLEND;
2185 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2273 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2186 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2274 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2187 glEnable GL_TEXTURE_2D; 2275 glEnable GL_TEXTURE_2D;
… …
2206 2294
2207 if ($t3) { 2295 if ($t3) {
2208 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2296 glBindTexture GL_TEXTURE_2D, $t3->{name};
2209 glBegin GL_QUADS; 2297 glBegin GL_QUADS;
2210 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2298 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2211 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2299 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2212 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2300 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2213 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2301 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2214 glEnd; 2302 glEnd;
2215 } 2303 }
2216 2304
2217 glDisable GL_BLEND; 2305 glDisable GL_BLEND;
… …
2305 $self->update; 2393 $self->update;
2306 2394
2307 $self 2395 $self
2308} 2396}
2309 2397
2310sub changed { }
2311
2312sub set_range { 2398sub set_range {
2313 my ($self, $range) = @_; 2399 my ($self, $range) = @_;
2314 2400
2315 ($range, $self->{range}) = ($self->{range}, $range); 2401 ($range, $self->{range}) = ($self->{range}, $range);
2316 2402
… …
2336 if $unit; 2422 if $unit;
2337 2423
2338 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2424 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2339 2425
2340 if ($value != $old_value) { 2426 if ($value != $old_value) {
2341 $self->_emit (changed => $value); 2427 $self->emit (changed => $value);
2342 $self->update; 2428 $self->update;
2343 } 2429 }
2344} 2430}
2345 2431
2346sub size_request { 2432sub size_request {
2347 my ($self) = @_; 2433 my ($self) = @_;
2348 2434
2349 ($self->{req_w}, $self->{req_h}) 2435 ($self->{req_w}, $self->{req_h})
2350} 2436}
2351 2437
2352sub button_down { 2438sub invoke_button_down {
2353 my ($self, $ev, $x, $y) = @_; 2439 my ($self, $ev, $x, $y) = @_;
2354 2440
2355 $self->SUPER::button_down ($ev, $x, $y); 2441 $self->SUPER::invoke_button_down ($ev, $x, $y);
2356 2442
2357 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2443 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2358 2444
2359 $self->mouse_motion ($ev, $x, $y) 2445 $self->invoke_mouse_motion ($ev, $x, $y)
2360} 2446}
2361 2447
2362sub mouse_motion { 2448sub invoke_mouse_motion {
2363 my ($self, $ev, $x, $y) = @_; 2449 my ($self, $ev, $x, $y) = @_;
2364 2450
2365 if ($GRAB == $self) { 2451 if ($GRAB == $self) {
2366 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2452 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2367 2453
… …
2488 can_events => 0, 2574 can_events => 0,
2489 indent => 0, 2575 indent => 0,
2490 #font => default_font 2576 #font => default_font
2491 @_, 2577 @_,
2492 2578
2493 layout => (new CFClient::Layout 1), 2579 layout => (new CFClient::Layout),
2494 par => [], 2580 par => [],
2495 height => 0, 2581 height => 0,
2496 children => [ 2582 children => [
2497 (new CFClient::UI::Empty expand => 1), 2583 (new CFClient::UI::Empty expand => 1),
2498 (new CFClient::UI::Slider vertical => 1), 2584 (new CFClient::UI::Slider vertical => 1),
… …
2509 2595
2510 $self->{fontsize} = $fontsize; 2596 $self->{fontsize} = $fontsize;
2511 $self->reflow; 2597 $self->reflow;
2512} 2598}
2513 2599
2600sub size_request {
2601 my ($self) = @_;
2602
2603 my ($empty, $slider) = @{ $self->{children} };
2604
2605 local $self->{children} = [$empty, $slider];
2606 $self->SUPER::size_request
2607}
2608
2514sub size_allocate { 2609sub invoke_size_allocate {
2515 my ($self, $w, $h) = @_; 2610 my ($self, $w, $h) = @_;
2516 2611
2517 $self->SUPER::size_allocate ($w, $h); 2612 my ($empty, $slider, @other) = @{ $self->{children} };
2613 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2518 2614
2519 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2615 $self->{layout}->set_font ($self->{font}) if $self->{font};
2520 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2616 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2521 $self->{layout}->set_width ($self->{children}[0]{w}); 2617 $self->{layout}->set_width ($empty->{w});
2522 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2618 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2523 2619
2524 $self->reflow; 2620 $self->reflow;
2525}
2526 2621
2527sub text_size { 2622 local $self->{children} = [$empty, $slider];
2528 my ($self, $text, $indent) = @_; 2623 $self->SUPER::invoke_size_allocate ($w, $h)
2624}
2625
2626sub get_layout {
2627 my ($self, $para) = @_;
2529 2628
2530 my $layout = $self->{layout}; 2629 my $layout = $self->{layout};
2531 2630
2631 $layout->set_font ($self->{font}) if $self->{font};
2632 $layout->set_foreground (@{$para->{fg}});
2532 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2633 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2533 $layout->set_width ($self->{children}[0]{w} - $indent); 2634 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2534 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2635 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2535 $layout->set_markup ($text); 2636 $layout->set_markup ($para->{markup});
2637
2638 $layout->set_shapes (
2639 map
2640 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2641 @{$para->{widget}}
2536 2642 );
2643
2537 $layout->size 2644 $layout
2538} 2645}
2539 2646
2540sub reflow { 2647sub reflow {
2541 my ($self) = @_; 2648 my ($self) = @_;
2542 2649
… …
2551 $self->{children}[1]->set_value ($offset); 2658 $self->{children}[1]->set_value ($offset);
2552} 2659}
2553 2660
2554sub clear { 2661sub clear {
2555 my ($self) = @_; 2662 my ($self) = @_;
2663
2664 my (undef, undef, @other) = @{ $self->{children} };
2665 $self->remove ($_) for @other;
2556 2666
2557 $self->{par} = []; 2667 $self->{par} = [];
2558 $self->{height} = 0; 2668 $self->{height} = 0;
2559 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2669 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2560} 2670}
2561 2671
2562sub add_paragraph { 2672sub add_paragraph {
2563 my ($self, $color, $text, $indent) = @_; 2673 my ($self, $color, $para, $indent) = @_;
2564 2674
2565 for my $line (split /\n/, $text) { 2675 my ($text, @w) = ref $para ? @$para : $para;
2566 my ($w, $h) = $self->text_size ($line); 2676
2567 $self->{height} += $h; 2677 $para = {
2568 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2678 w => 1e10,
2679 wrapped => 1,
2680 fg => $color,
2681 indent => $indent,
2682 markup => $text,
2683 widget => \@w,
2569 } 2684 };
2570 2685
2571 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2686 $self->add (@w) if @w;
2687 push @{$self->{par}}, $para;
2688
2689 $self->{need_reflow}++;
2690 $self->update;
2691}
2692
2693sub scroll_to_bottom {
2694 my ($self) = @_;
2695
2696 $self->{scroll_to_bottom} = 1;
2697 $self->update;
2572} 2698}
2573 2699
2574sub update { 2700sub update {
2575 my ($self) = @_; 2701 my ($self) = @_;
2576 2702
… …
2584 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2710 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2585 2711
2586 if (delete $self->{need_reflow}) { 2712 if (delete $self->{need_reflow}) {
2587 my $height = 0; 2713 my $height = 0;
2588 2714
2589 my $layout = $self->{layout};
2590
2591 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2592
2593 for (@{$self->{par}}) { 2715 for my $para (@{$self->{par}}) {
2594 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2716 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2595 $layout->set_width ($W - $_->[3]); 2717 my $layout = $self->get_layout ($para);
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2597 $layout->set_markup ($_->[4]);
2598 my ($w, $h) = $layout->size; 2718 my ($w, $h) = $layout->size;
2599 $_->[0] = $w + $_->[3]; 2719
2600 $_->[1] = $h; 2720 $para->{w} = $w + $para->{indent};
2721 $para->{h} = $h;
2722 $para->{wrapped} = $layout->has_wrapped;
2601 } 2723 }
2602 2724
2603 $height += $_->[1]; 2725 $height += $para->{h};
2604 } 2726 }
2605 2727
2606 $self->{height} = $height; 2728 $self->{height} = $height;
2607 2729
2608 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2730 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2609 2731
2610 delete $self->{texture}; 2732 delete $self->{texture};
2733 }
2734
2735 if (delete $self->{scroll_to_bottom}) {
2736 $self->{children}[1]->set_value (1e10);
2611 } 2737 }
2612 2738
2613 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2739 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2614 glClearColor 0, 0, 0, 0; 2740 glClearColor 0, 0, 0, 0;
2615 glClear GL_COLOR_BUFFER_BIT; 2741 glClear GL_COLOR_BUFFER_BIT;
… …
2619 my $y0 = $top; 2745 my $y0 = $top;
2620 my $y1 = $top + $H; 2746 my $y1 = $top + $H;
2621 2747
2622 my $y = 0; 2748 my $y = 0;
2623 2749
2624 my $layout = $self->{layout};
2625
2626 $layout->set_font ($self->{font}) if $self->{font};
2627
2628 glEnable GL_BLEND;
2629 #TODO# not correct in windows where rgba is forced off
2630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2631
2632 for my $par (@{$self->{par}}) { 2750 for my $para (@{$self->{par}}) {
2633 my $h = $par->[1]; 2751 my $h = $para->{h};
2634 2752
2635 if ($y0 < $y + $h && $y < $y1) { 2753 if ($y0 < $y + $h && $y < $y1) {
2636 $layout->set_foreground (@{ $par->[2] });
2637 $layout->set_width ($W - $par->[3]);
2638 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2639 $layout->set_markup ($par->[4]);
2640 2754
2641 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2755 my $layout = $self->get_layout ($para);
2642 2756
2643 glRasterPos $par->[3], $y - $y0; 2757 $layout->render ($para->{indent}, $y - $y0);
2644 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2758
2759 if (my @w = @{ $para->{widget} }) {
2760 my @s = $layout->get_shapes;
2761
2762 for (@w) {
2763 my ($dx, $dy) = splice @s, 0, 2, ();
2764
2765 $_->{x} = $dx + $para->{indent};
2766 $_->{y} = $dy + $y - $y0;
2767
2768 $_->draw;
2769 }
2770 }
2645 } 2771 }
2646 2772
2647 $y += $h; 2773 $y += $h;
2648 } 2774 }
2649
2650 glDisable GL_BLEND;
2651 }; 2775 };
2652 }); 2776 });
2777}
2778
2779sub reconfigure {
2780 my ($self) = @_;
2781
2782 $self->SUPER::reconfigure;
2783
2784 $_->{w} = 1e10 for @{ $self->{par} };
2785 $self->reflow;
2653} 2786}
2654 2787
2655sub _draw { 2788sub _draw {
2656 my ($self) = @_; 2789 my ($self) = @_;
2657 2790
… …
2660 glColor 0, 0, 0, 1; 2793 glColor 0, 0, 0, 1;
2661 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2794 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2662 glDisable GL_TEXTURE_2D; 2795 glDisable GL_TEXTURE_2D;
2663 2796
2664 $self->{children}[1]->draw; 2797 $self->{children}[1]->draw;
2665
2666} 2798}
2667 2799
2668############################################################################# 2800#############################################################################
2669 2801
2670package CFClient::UI::Animator; 2802package CFClient::UI::Animator;
… …
2779 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2911 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2780 2912
2781 ($w + 4, $h + 4) 2913 ($w + 4, $h + 4)
2782} 2914}
2783 2915
2784sub size_allocate { 2916sub invoke_size_allocate {
2785 my ($self, $w, $h) = @_; 2917 my ($self, $w, $h) = @_;
2786 2918
2787 $self->SUPER::size_allocate ($w - 4, $h - 4); 2919 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2788} 2920}
2789 2921
2790sub visibility_change { 2922sub invoke_visibility_change {
2791 my ($self, $visible) = @_; 2923 my ($self, $visible) = @_;
2792 2924
2793 return unless $visible; 2925 return unless $visible;
2794 2926
2795 $self->{root}->on_post_alloc ("move_$self" => sub { 2927 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2943 for my $item (@{ $self->{items} }) { 3075 for my $item (@{ $self->{items} }) {
2944 my ($widget, $cb, $tooltip) = @$item; 3076 my ($widget, $cb, $tooltip) = @$item;
2945 3077
2946 # handle various types of items, only text for now 3078 # handle various types of items, only text for now
2947 if (!ref $widget) { 3079 if (!ref $widget) {
3080 if ($widget =~ /\t/) {
3081 my ($left, $right) = split /\t/, $widget, 2;
3082
3083 $widget = new CFClient::UI::HBox
3084 can_hover => 1,
3085 can_events => 1,
3086 tooltip => $tooltip,
3087 children => [
3088 (new CFClient::UI::Label markup => $left, expand => 1),
3089 (new CFClient::UI::Label markup => $right, align => +1),
3090 ],
3091 ;
3092
3093 } else {
2948 $widget = new CFClient::UI::Label 3094 $widget = new CFClient::UI::Label
2949 can_hover => 1, 3095 can_hover => 1,
2950 can_events => 1, 3096 can_events => 1,
2951 markup => $widget, 3097 markup => $widget,
2952 tooltip => $tooltip 3098 tooltip => $tooltip;
3099 }
2953 } 3100 }
2954 3101
2955 $self->{item}{$widget} = $item; 3102 $self->{item}{$widget} = $item;
2956 3103
2957 $self->{vbox}->add ($widget); 3104 $self->{vbox}->add ($widget);
… …
2962 3109
2963# popup given the event (must be a mouse button down event currently) 3110# popup given the event (must be a mouse button down event currently)
2964sub popup { 3111sub popup {
2965 my ($self, $ev) = @_; 3112 my ($self, $ev) = @_;
2966 3113
2967 $self->_emit ("popdown"); 3114 $self->emit ("popdown");
2968 3115
2969 # maybe save $GRAB? must be careful about events... 3116 # maybe save $GRAB? must be careful about events...
2970 $GRAB = $self; 3117 $GRAB = $self;
2971 $self->{button} = $ev->{button}; 3118 $self->{button} = $ev->{button};
2972 3119
2973 $self->show; 3120 $self->show;
2974 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3121 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2975} 3122}
2976 3123
2977sub mouse_motion { 3124sub invoke_mouse_motion {
2978 my ($self, $ev, $x, $y) = @_; 3125 my ($self, $ev, $x, $y) = @_;
2979 3126
2980 # TODO: should use vbox->find_widget or so 3127 # TODO: should use vbox->find_widget or so
2981 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3128 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2982 $self->{hover} = $self->{item}{$HOVER}; 3129 $self->{hover} = $self->{item}{$HOVER};
2983 3130
2984 0 3131 0
2985} 3132}
2986 3133
2987sub button_up { 3134sub invoke_button_up {
2988 my ($self, $ev, $x, $y) = @_; 3135 my ($self, $ev, $x, $y) = @_;
2989 3136
2990 if ($ev->{button} == $self->{button}) { 3137 if ($ev->{button} == $self->{button}) {
2991 undef $GRAB; 3138 undef $GRAB;
2992 $self->hide; 3139 $self->hide;
2993 3140
2994 $self->_emit ("popdown"); 3141 $self->emit ("popdown");
2995 $self->{hover}[1]->() if $self->{hover}; 3142 $self->{hover}[1]->() if $self->{hover};
2996 } else { 3143 } else {
2997 return 0 3144 return 0
2998 } 3145 }
2999 3146
… …
3026 3173
3027 $self->{current} = $self->{children}[0] 3174 $self->{current} = $self->{children}[0]
3028 if @{ $self->{children} }; 3175 if @{ $self->{children} };
3029} 3176}
3030 3177
3178sub get_current_page {
3179 my ($self) = @_;
3180
3181 $self->{current}
3182}
3183
3031sub set_current_page { 3184sub set_current_page {
3032 my ($self, $page_or_widget) = @_; 3185 my ($self, $page_or_widget) = @_;
3033 3186
3034 my $widget = ref $page_or_widget 3187 my $widget = ref $page_or_widget
3035 ? $page_or_widget 3188 ? $page_or_widget
3036 : $self->{children}[$page_or_widget]; 3189 : $self->{children}[$page_or_widget];
3037 3190
3038 $self->{current} = $widget; 3191 $self->{current} = $widget;
3039 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3192 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3040 3193
3041 $self->_emit (page_changed => $self->{current}); 3194 $self->emit (page_changed => $self->{current});
3042 3195
3043 $self->realloc; 3196 $self->realloc;
3044} 3197}
3045 3198
3046sub visible_children { 3199sub visible_children {
… …
3051 my ($self) = @_; 3204 my ($self) = @_;
3052 3205
3053 $self->{current}->size_request 3206 $self->{current}->size_request
3054} 3207}
3055 3208
3056sub size_allocate { 3209sub invoke_size_allocate {
3057 my ($self, $w, $h) = @_; 3210 my ($self, $w, $h) = @_;
3058 3211
3059 $self->{current}->configure (0, 0, $w, $h); 3212 $self->{current}->configure (0, 0, $w, $h);
3213
3214 1
3060} 3215}
3061 3216
3062sub _draw { 3217sub _draw {
3063 my ($self) = @_; 3218 my ($self) = @_;
3064 3219
… …
3099 ); 3254 );
3100 3255
3101 $self->{multiplexer}->add ($widget); 3256 $self->{multiplexer}->add ($widget);
3102} 3257}
3103 3258
3259sub get_current_page {
3260 my ($self) = @_;
3261
3262 $self->{multiplexer}->get_current_page
3263}
3264
3104sub set_current_page { 3265sub set_current_page {
3105 my ($self, $page) = @_; 3266 my ($self, $page) = @_;
3106 3267
3107 $self->{multiplexer}->set_current_page ($page); 3268 $self->{multiplexer}->set_current_page ($page);
3108 $self->_emit (page_changed => $self->{multiplexer}{current}); 3269 $self->emit (page_changed => $self->{multiplexer}{current});
3109} 3270}
3110 3271
3111############################################################################# 3272#############################################################################
3112 3273
3113package CFClient::UI::Combobox; 3274package CFClient::UI::Combobox;
… …
3128 $self->_set_value ($self->{value}); 3289 $self->_set_value ($self->{value});
3129 3290
3130 $self 3291 $self
3131} 3292}
3132 3293
3133sub button_down { 3294sub invoke_button_down {
3134 my ($self, $ev) = @_; 3295 my ($self, $ev) = @_;
3135 3296
3136 my @menu_items; 3297 my @menu_items;
3137 3298
3138 for (@{ $self->{options} }) { 3299 for (@{ $self->{options} }) {
… …
3159 my ($self, $value) = @_; 3320 my ($self, $value) = @_;
3160 3321
3161 return unless $self->{value} ne $value; 3322 return unless $self->{value} ne $value;
3162 3323
3163 $self->_set_value ($value); 3324 $self->_set_value ($value);
3164 $self->_emit (changed => $value); 3325 $self->emit (changed => $value);
3165} 3326}
3166 3327
3167############################################################################# 3328#############################################################################
3168 3329
3169package CFClient::UI::Statusbox; 3330package CFClient::UI::Statusbox;
… …
3284 count => 1, 3445 count => 1,
3285 %arg, 3446 %arg,
3286 }; 3447 };
3287 } 3448 }
3288 3449
3450 $ROOT->on_refresh (reorder => sub {
3289 $self->reorder; 3451 $self->reorder;
3452 });
3290} 3453}
3291 3454
3292sub reconfigure { 3455sub reconfigure {
3293 my ($self) = @_; 3456 my ($self) = @_;
3294 3457
… …
3309 3472
3310############################################################################# 3473#############################################################################
3311 3474
3312package CFClient::UI::Inventory; 3475package CFClient::UI::Inventory;
3313 3476
3314our @ISA = CFClient::UI::ScrolledWindow::; 3477our @ISA = CFClient::UI::Table::;
3315 3478
3316sub new { 3479sub new {
3317 my $class = shift; 3480 my $class = shift;
3318 3481
3319 my $self = $class->SUPER::new ( 3482 my $self = $class->SUPER::new (
3320 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3483 col_expand => [0, 1, 0],
3321 @_, 3484 @_,
3322 ); 3485 );
3323 3486
3324 $self 3487 $self
3325} 3488}
3326 3489
3327sub set_items { 3490sub set_items {
3328 my ($self, $items) = @_; 3491 my ($self, $items) = @_;
3329 3492
3330 $self->{child}->clear; 3493 $self->clear;
3331 return unless $items; 3494 return unless $items;
3332 3495
3333 my @items = sort { 3496 my @items = sort {
3334 ($a->{type} <=> $b->{type}) 3497 ($a->{type} <=> $b->{type})
3335 or ($a->{name} cmp $b->{name}) 3498 or ($a->{name} cmp $b->{name})
3336 } @$items; 3499 } values %$items;
3337 3500
3338 $self->{real_items} = \@items; 3501 $self->{real_items} = \@items;
3339 3502
3340 my $row = 0; 3503 my $row = 0;
3341 for my $item (@items) { 3504 for my $item (@items) {
3342 CFClient::Item::update_widgets $item; 3505 CFClient::Item::update_widgets $item;
3343 3506
3344 $self->{child}->add (0, $row, $item->{face_widget}); 3507 $self->add (0, $row, $item->{face_widget});
3345 $self->{child}->add (1, $row, $item->{desc_widget}); 3508 $self->add (1, $row, $item->{desc_widget});
3346 $self->{child}->add (2, $row, $item->{weight_widget}); 3509 $self->add (2, $row, $item->{weight_widget});
3347 3510
3348 $row++; 3511 $row++;
3349 }
3350}
3351
3352#############################################################################
3353
3354package CFClient::UI::BindEditor;
3355
3356our @ISA = CFClient::UI::FancyFrame::;
3357
3358sub new {
3359 my $class = shift;
3360
3361 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3362
3363 $self->add (my $vb = new CFClient::UI::VBox);
3364
3365
3366 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3367 text => "start recording",
3368 tooltip => "Start/Stops recording of actions."
3369 ."All subsequent actions after the recording started will be captured."
3370 ."The actions are displayed after the record was stopped."
3371 ."To bind the action you have to click on the 'Bind' button",
3372 on_activate => sub {
3373 unless ($self->{recording}) {
3374 $self->start;
3375 } else {
3376 $self->stop;
3377 }
3378 });
3379
3380 $vb->add (new CFClient::UI::Label text => "Actions:");
3381 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3382
3383 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3384 $vb->add (my $hb = new CFClient::UI::HBox);
3385 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3386 $hb->add (new CFClient::UI::Button
3387 text => "bind",
3388 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3389 on_activate => sub {
3390 $self->ask_for_bind;
3391 });
3392
3393 $vb->add (my $hb = new CFClient::UI::HBox);
3394 $hb->add (new CFClient::UI::Button
3395 text => "ok",
3396 expand => 1,
3397 tooltip => "This closes the binding editor and saves the binding",
3398 on_activate => sub {
3399 $self->hide;
3400 $self->commit;
3401 });
3402
3403 $hb->add (new CFClient::UI::Button
3404 text => "cancel",
3405 expand => 1,
3406 tooltip => "This closes the binding editor without saving",
3407 on_activate => sub {
3408 $self->hide;
3409 $self->{binding_cancel}->()
3410 if $self->{binding_cancel};
3411 });
3412
3413 $self->update_binding_widgets;
3414
3415 $self
3416}
3417
3418sub commit {
3419 my ($self) = @_;
3420 my ($mod, $sym, $cmds) = $self->get_binding;
3421 if ($sym != 0 && @$cmds > 0) {
3422 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3423 ."'. Don't forget 'Save Config'!");
3424 $self->{binding_change}->($mod, $sym, $cmds)
3425 if $self->{binding_change};
3426 } else {
3427 $::STATUSBOX->add ("No action bound, no key or action specified!");
3428 $self->{binding_cancel}->()
3429 if $self->{binding_cancel};
3430 }
3431}
3432
3433sub start {
3434 my ($self) = @_;
3435
3436 $self->{rec_btn}->set_text ("stop recording");
3437 $self->{recording} = 1;
3438 $self->clear_command_list;
3439 $::CONN->start_record if $::CONN;
3440}
3441
3442sub stop {
3443 my ($self) = @_;
3444
3445 $self->{rec_btn}->set_text ("start recording");
3446 $self->{recording} = 0;
3447
3448 my $rec;
3449 $rec = $::CONN->stop_record if $::CONN;
3450 return unless ref $rec eq 'ARRAY';
3451 $self->set_command_list ($rec);
3452}
3453
3454
3455sub ask_for_bind_and_commit {
3456 my ($self) = @_;
3457 $self->ask_for_bind (1);
3458}
3459
3460sub ask_for_bind {
3461 my ($self, $commit) = @_;
3462
3463 CFClient::Binder::open_binding_dialog (sub {
3464 my ($mod, $sym) = @_;
3465 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3466 $self->update_binding_widgets;
3467 $self->commit if $commit;
3468 });
3469}
3470
3471# $mod and $sym are the modifiers and key symbol
3472# $cmds is a array ref of strings (the commands)
3473# $cb is the callback that is executed on OK
3474# $ccb is the callback that is executed on CANCEL and
3475# when the binding was unsuccessful on OK
3476sub set_binding {
3477 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3478
3479 $self->clear_command_list;
3480 $self->{recording} = 0;
3481 $self->{rec_btn}->set_text ("start recording");
3482
3483 $self->{binding} = [$mod, $sym];
3484 $self->{commands} = $cmds;
3485
3486 $self->{binding_change} = $cb;
3487 $self->{binding_cancel} = $ccb;
3488
3489 $self->update_binding_widgets;
3490}
3491
3492# this is a shortcut method that asks for a binding
3493# and then just binds it.
3494sub do_quick_binding {
3495 my ($self, $cmds) = @_;
3496 $self->set_binding (undef, undef, $cmds, sub {
3497 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3498 });
3499 $self->ask_for_bind (1);
3500}
3501
3502sub update_binding_widgets {
3503 my ($self) = @_;
3504 my ($mod, $sym, $cmds) = $self->get_binding;
3505 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3506 $self->set_command_list ($cmds);
3507}
3508
3509sub get_binding {
3510 my ($self) = @_;
3511 return (
3512 $self->{binding}->[0],
3513 $self->{binding}->[1],
3514 [ grep { defined $_ } @{$self->{commands}} ]
3515 );
3516}
3517
3518sub clear_command_list {
3519 my ($self) = @_;
3520 $self->{cmdbox}->clear ();
3521}
3522
3523sub set_command_list {
3524 my ($self, $cmds) = @_;
3525
3526 $self->{cmdbox}->clear ();
3527 $self->{commands} = $cmds;
3528
3529 my $idx = 0;
3530
3531 for (@$cmds) {
3532 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3533
3534 my $i = $idx;
3535 $hb->add (new CFClient::UI::Label text => $_);
3536 $hb->add (new CFClient::UI::Button
3537 text => "delete",
3538 tooltip => "Deletes the action from the record",
3539 on_activate => sub {
3540 $self->{cmdbox}->remove ($hb);
3541 $cmds->[$i] = undef;
3542 });
3543
3544
3545 $idx++
3546 } 3512 }
3547} 3513}
3548 3514
3549############################################################################# 3515#############################################################################
3550 3516
… …
3604 } elsif ($ev->{button} == 2) { 3570 } elsif ($ev->{button} == 2) {
3605 $::CONN->user_send ("invoke $spell->{name}"); 3571 $::CONN->user_send ("invoke $spell->{name}");
3606 } elsif ($ev->{button} == 3) { 3572 } elsif ($ev->{button} == 3) {
3607 (new CFClient::UI::Menu 3573 (new CFClient::UI::Menu
3608 items => [ 3574 items => [
3609 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }], 3575 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3610 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }], 3576 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3611 ], 3577 ],
3612 )->popup ($ev); 3578 )->popup ($ev);
3613 } else { 3579 } else {
3614 return 0; 3580 return 0;
… …
3709 $coord = $max - $size if $coord > $max - $size; 3675 $coord = $max - $size if $coord > $max - $size;
3710 3676
3711 int $coord + 0.5 3677 int $coord + 0.5
3712} 3678}
3713 3679
3714sub size_allocate { 3680sub invoke_size_allocate {
3715 my ($self, $w, $h) = @_; 3681 my ($self, $w, $h) = @_;
3716 3682
3717 for my $child ($self->children) { 3683 for my $child ($self->children) {
3718 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3684 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3719 3685
… …
3723 $X = _to_pixel $X, $W, $self->{w}; 3689 $X = _to_pixel $X, $W, $self->{w};
3724 $Y = _to_pixel $Y, $H, $self->{h}; 3690 $Y = _to_pixel $Y, $H, $self->{h};
3725 3691
3726 $child->configure ($X, $Y, $W, $H); 3692 $child->configure ($X, $Y, $W, $H);
3727 } 3693 }
3694
3695 1
3728} 3696}
3729 3697
3730sub coord2local { 3698sub coord2local {
3731 my ($self, $x, $y) = @_; 3699 my ($self, $x, $y) = @_;
3732 3700
… …
3858 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3826 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3859 3827
3860 $w = 0 if $w < 0; 3828 $w = 0 if $w < 0;
3861 $h = 0 if $h < 0; 3829 $h = 0 if $h < 0;
3862 3830
3831 $w = max $widget->{min_w}, $w;
3832 $h = max $widget->{min_h}, $h;
3833
3834 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3835 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3836
3863 $w = int $w + 0.5; 3837 $w = int $w + 0.5;
3864 $h = int $h + 0.5; 3838 $h = int $h + 0.5;
3865 3839
3866 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3840 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3867 $widget->{old_w} = $widget->{w}; 3841 $widget->{old_w} = $widget->{w};

Diff Legend

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