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.304 by elmex, Tue Jun 13 11:01:04 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
1095 unless ($self->{no_close_button}) { 1109 if ($self->{has_close_button}) {
1096 $self->{close_btn} = 1110 $self->{close_button} =
1097 new CFClient::UI::ImageButton 1111 new CFClient::UI::ImageButton
1098 image => 'x1_close.png', 1112 path => 'x1_close.png',
1099 on_activate => sub { $self->hide }; 1113 on_activate => sub { $self->emit ("delete") };
1100 1114
1101 $self->CFClient::UI::Container::add ($self->{close_btn}); 1115 $self->CFClient::UI::Container::add ($self->{close_button});
1102 } 1116 }
1103 1117
1104 $self 1118 $self
1105} 1119}
1106 1120
1107sub add { 1121sub add {
1108 my ($self, @widgets) = @_; 1122 my ($self, @widgets) = @_;
1109 1123
1110 $self->SUPER::add (@widgets); 1124 $self->SUPER::add (@widgets);
1111 $self->CFClient::UI::Container::add ($self->{close_btn}) if $self->{close_btn}; 1125 $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}; 1126 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1113} 1127}
1114 1128
1115sub border { 1129sub border {
1116 int $_[0]{border} * $::FONTSIZE 1130 int $_[0]{border} * $::FONTSIZE
… …
1120 my ($self) = @_; 1134 my ($self) = @_;
1121 1135
1122 $self->{title_widget}->size_request 1136 $self->{title_widget}->size_request
1123 if $self->{title_widget}; 1137 if $self->{title_widget};
1124 1138
1125 $self->{close_btn}->size_request 1139 $self->{close_button}->size_request
1126 if $self->{close_btn}; 1140 if $self->{close_button};
1127 1141
1128 my ($w, $h) = $self->SUPER::size_request; 1142 my ($w, $h) = $self->SUPER::size_request;
1129 1143
1130 ( 1144 (
1131 $w + $self->border * 2, 1145 $w + $self->border * 2,
1132 $h + $self->border * 2, 1146 $h + $self->border * 2,
1133 ) 1147 )
1134} 1148}
1135 1149
1136sub size_allocate { 1150sub invoke_size_allocate {
1137 my ($self, $w, $h) = @_; 1151 my ($self, $w, $h) = @_;
1138 1152
1139 if ($self->{title_widget}) { 1153 if ($self->{title_widget}) {
1140 $self->{title_widget}{w} = $w; 1154 $self->{title_widget}{w} = $w;
1141 $self->{title_widget}{h} = $h; 1155 $self->{title_widget}{h} = $h;
1142 $self->{title_widget}->size_allocate ($w, $h); 1156 $self->{title_widget}->invoke_size_allocate ($w, $h);
1143 } 1157 }
1144 1158
1145 my $border = $self->border; 1159 my $border = $self->border;
1146 1160
1147 $h -= List::Util::max 0, $border * 2; 1161 $h -= List::Util::max 0, $border * 2;
1148 $w -= List::Util::max 0, $border * 2; 1162 $w -= List::Util::max 0, $border * 2;
1149 1163
1150 $self->child->configure ($border, $border, $w, $h); 1164 $self->child->configure ($border, $border, $w, $h);
1151 1165
1152 $self->{close_btn}->configure ($self->{w} - (2 * $border), 0, $border, $border) 1166 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153 if $self->{close_btn}; 1167 if $self->{close_button};
1154}
1155 1168
1169 1
1170}
1171
1172sub invoke_delete {
1173 my ($self) = @_;
1174
1175 $self->hide;
1176
1177 1
1178}
1179
1156sub button_down { 1180sub invoke_button_down {
1157 my ($self, $ev, $x, $y) = @_; 1181 my ($self, $ev, $x, $y) = @_;
1158 1182
1159 my ($w, $h) = @$self{qw(w h)}; 1183 my ($w, $h) = @$self{qw(w h)};
1160 my $border = $self->border; 1184 my $border = $self->border;
1161 1185
… …
1192 1216
1193 ($x, $y) = ($ev->{x}, $ev->{y}); 1217 ($x, $y) = ($ev->{x}, $ev->{y});
1194 1218
1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1219 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1196 # HACK: the next line is required to enforce placement 1220 # HACK: the next line is required to enforce placement
1197 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1221 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1198 }; 1222 };
1199 } else { 1223 } else {
1200 return 0; 1224 return 0;
1201 } 1225 }
1202 1226
1203 1 1227 1
1204} 1228}
1205 1229
1206sub button_up { 1230sub invoke_button_up {
1207 my ($self, $ev, $x, $y) = @_; 1231 my ($self, $ev, $x, $y) = @_;
1208 1232
1209 $self->{close_btn}->button_up ($ev, $x, $y)
1210 if $self->{close_btn};
1211
1212 !!delete $self->{motion} 1233 ! ! delete $self->{motion}
1213} 1234}
1214 1235
1215sub mouse_motion { 1236sub invoke_mouse_motion {
1216 my ($self, $ev, $x, $y) = @_; 1237 my ($self, $ev, $x, $y) = @_;
1217 1238
1218 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1239 $self->{motion}->($ev, $x, $y) if $self->{motion};
1219 1240
1220 !!$self->{motion} 1241 ! ! $self->{motion}
1221} 1242}
1222 1243
1223sub _draw { 1244sub _draw {
1224 my ($self) = @_; 1245 my ($self) = @_;
1225 1246
… …
1258 $self->{title_widget}->_draw; 1279 $self->{title_widget}->_draw;
1259 1280
1260 glTranslate 0, - ($border - $self->{h}); 1281 glTranslate 0, - ($border - $self->{h});
1261 } 1282 }
1262 1283
1263 $self->{close_btn}->draw 1284 $self->{close_button}->draw
1264 if $self->{close_btn}; 1285 if $self->{close_button};
1265} 1286}
1266 1287
1267############################################################################# 1288#############################################################################
1268 1289
1269package CFClient::UI::Table; 1290package CFClient::UI::Table;
… …
1348 (sum @$ws), 1369 (sum @$ws),
1349 (sum @$hs), 1370 (sum @$hs),
1350 ) 1371 )
1351} 1372}
1352 1373
1353sub size_allocate { 1374sub invoke_size_allocate {
1354 my ($self, $w, $h) = @_; 1375 my ($self, $w, $h) = @_;
1355 1376
1356 my ($ws, $hs) = $self->get_wh; 1377 my ($ws, $hs) = $self->get_wh;
1357 1378
1358 my $req_w = (sum @$ws) || 1; 1379 my $req_w = (sum @$ws) || 1;
… …
1390 } 1411 }
1391 1412
1392 $y += $row_h; 1413 $y += $row_h;
1393 } 1414 }
1394 1415
1416 1
1395} 1417}
1396 1418
1397sub find_widget { 1419sub find_widget {
1398 my ($self, $x, $y) = @_; 1420 my ($self, $x, $y) = @_;
1399 1421
… …
1436 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1458 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1437 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1459 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1438 ) 1460 )
1439} 1461}
1440 1462
1441sub size_allocate { 1463sub invoke_size_allocate {
1442 my ($self, $w, $h) = @_; 1464 my ($self, $w, $h) = @_;
1443 1465
1444 my $space = $self->{vertical} ? $h : $w; 1466 my $space = $self->{vertical} ? $h : $w;
1445 my $children = $self->{children}; 1467 my @children = $self->visible_children;
1446 1468
1447 my @req; 1469 my @req;
1448 1470
1449 if ($self->{homogeneous}) { 1471 if ($self->{homogeneous}) {
1450 @req = ($space / (@$children || 1)) x @$children; 1472 @req = ($space / (@children || 1)) x @children;
1451 } else { 1473 } else {
1452 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1474 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1453 my $req = List::Util::sum @req; 1475 my $req = List::Util::sum @req;
1454 1476
1455 if ($req > $space) { 1477 if ($req > $space) {
1456 # ah well, not enough space 1478 # ah well, not enough space
1457 $_ *= $space / $req for @req; 1479 $_ *= $space / $req for @req;
1458 } else { 1480 } else {
1459 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1481 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1460 1482
1461 $space = ($space - $req) / $expand; # remaining space to give away 1483 $space = ($space - $req) / $expand; # remaining space to give away
1462 1484
1463 $req[$_] += $space * $children->[$_]{expand} 1485 $req[$_] += $space * $children[$_]{expand}
1464 for 0 .. $#$children; 1486 for 0 .. $#children;
1465 } 1487 }
1466 } 1488 }
1467 1489
1468 CFClient::UI::harmonize \@req; 1490 CFClient::UI::harmonize \@req;
1469 1491
1470 my $pos = 0; 1492 my $pos = 0;
1471 for (0 .. $#$children) { 1493 for (0 .. $#children) {
1472 my $alloc = $req[$_]; 1494 my $alloc = $req[$_];
1473 $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));
1474 1496
1475 $pos += $alloc; 1497 $pos += $alloc;
1476 } 1498 }
1477 1499
1478 1 1500 1
… …
1581 my ($self, $text) = @_; 1603 my ($self, $text) = @_;
1582 1604
1583 return if $self->{text} eq "T$text"; 1605 return if $self->{text} eq "T$text";
1584 $self->{text} = "T$text"; 1606 $self->{text} = "T$text";
1585 1607
1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1587 $self->{layout}->set_text ($text); 1608 $self->{layout}->set_text ($text);
1588 1609
1589 delete $self->{size_req}; 1610 delete $self->{size_req};
1590 $self->realloc; 1611 $self->realloc;
1591 $self->update; 1612 $self->update;
… …
1597 return if $self->{text} eq "M$markup"; 1618 return if $self->{text} eq "M$markup";
1598 $self->{text} = "M$markup"; 1619 $self->{text} = "M$markup";
1599 1620
1600 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1621 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1601 1622
1602 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1603 $self->{layout}->set_markup ($markup); 1623 $self->{layout}->set_markup ($markup);
1604 1624
1605 delete $self->{size_req}; 1625 delete $self->{size_req};
1606 $self->realloc; 1626 $self->realloc;
1607 $self->update; 1627 $self->update;
… …
1619 1639
1620 my ($w, $h) = $self->{layout}->size; 1640 my ($w, $h) = $self->{layout}->size;
1621 1641
1622 if (exists $self->{template}) { 1642 if (exists $self->{template}) {
1623 $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);
1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1645 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1625 1646
1626 my ($w2, $h2) = $self->{template}->size; 1647 my ($w2, $h2) = $self->{template}->size;
1627 1648
1628 $w = List::Util::max $w, $w2; 1649 $w = List::Util::max $w, $w2;
… …
1633 }; 1654 };
1634 1655
1635 @{ $self->{size_req} } 1656 @{ $self->{size_req} }
1636} 1657}
1637 1658
1659sub baseline_shift {
1660 $_[0]{layout}->descent
1661}
1662
1638sub size_allocate { 1663sub invoke_size_allocate {
1639 my ($self, $w, $h) = @_; 1664 my ($self, $w, $h) = @_;
1640 1665
1641 delete $self->{ox}; 1666 delete $self->{ox};
1642 1667
1643 delete $self->{texture} 1668 delete $self->{texture}
1644 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
1645} 1672}
1646 1673
1647sub set_fontsize { 1674sub set_fontsize {
1648 my ($self, $fontsize) = @_; 1675 my ($self, $fontsize) = @_;
1649 1676
1650 $self->{fontsize} = $fontsize; 1677 $self->{fontsize} = $fontsize;
1678 delete $self->{size_req};
1651 delete $self->{texture}; 1679 delete $self->{texture};
1652 1680
1653 $self->realloc; 1681 $self->realloc;
1654} 1682}
1655 1683
1656sub reconfigure { 1684sub reconfigure {
1657 my ($self) = @_; 1685 my ($self) = @_;
1658 1686
1659 delete $self->{size_req}; 1687 delete $self->{size_req};
1688 delete $self->{texture};
1660 1689
1661 $self->SUPER::reconfigure; 1690 $self->SUPER::reconfigure;
1662} 1691}
1663 1692
1664sub _draw { 1693sub _draw {
1665 my ($self) = @_; 1694 my ($self) = @_;
1666 1695
1667 $self->SUPER::_draw; # draw background, if applicable 1696 $self->SUPER::_draw; # draw background, if applicable
1668 1697
1669 my $tex = $self->{texture} ||= do { 1698 my $size = $self->{texture} ||= do {
1670 $self->{layout}->set_foreground (@{$self->{fg}}); 1699 $self->{layout}->set_foreground (@{$self->{fg}});
1671 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1700 $self->{layout}->set_font ($self->{font}) if $self->{font};
1672 $self->{layout}->set_width ($self->{w}); 1701 $self->{layout}->set_width ($self->{w});
1673 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1702 $self->{layout}->set_ellipsise ($self->{ellipsise});
1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1703 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1704 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1676 1705
1677 new_from_layout CFClient::Texture $self->{layout} 1706 [$self->{layout}->size]
1678 }; 1707 };
1679 1708
1680 unless (exists $self->{ox}) { 1709 unless (exists $self->{ox}) {
1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1710 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1711 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1683 : ($self->{w} - $tex->{w}) * 0.5); 1712 : ($self->{w} - $size->[0]) * 0.5);
1684 1713
1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1714 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1715 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1687 : ($self->{h} - $tex->{h}) * 0.5); 1716 : ($self->{h} - $size->[1]) * 0.5);
1688 }; 1717 };
1689 1718
1690 glEnable GL_TEXTURE_2D;
1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1719 my $w = List::Util::min $self->{w} + 4, $size->[0];
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1720 my $h = List::Util::min $self->{h} + 2, $size->[1];
1694 1721
1695 if ($tex->{format} == GL_ALPHA) { 1722 $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} 1723}
1706 1724
1707############################################################################# 1725#############################################################################
1708 1726
1709package CFClient::UI::EntryBase; 1727package CFClient::UI::EntryBase;
… …
1742 1760
1743 $text =~ s/./*/g if $self->{hidden}; 1761 $text =~ s/./*/g if $self->{hidden};
1744 $self->{layout}->set_text ("$text "); 1762 $self->{layout}->set_text ("$text ");
1745 delete $self->{size_req}; 1763 delete $self->{size_req};
1746 1764
1747 $self->_emit (changed => $self->{text}); 1765 $self->emit (changed => $self->{text});
1748 1766
1749 $self->realloc; 1767 $self->realloc;
1750 $self->update; 1768 $self->update;
1751} 1769}
1752 1770
… …
1767 my ($w, $h) = $self->SUPER::size_request; 1785 my ($w, $h) = $self->SUPER::size_request;
1768 1786
1769 ($w + 1, $h) # add 1 for cursor 1787 ($w + 1, $h) # add 1 for cursor
1770} 1788}
1771 1789
1772sub key_down { 1790sub invoke_key_down {
1773 my ($self, $ev) = @_; 1791 my ($self, $ev) = @_;
1774 1792
1775 my $mod = $ev->{mod}; 1793 my $mod = $ev->{mod};
1776 my $sym = $ev->{sym}; 1794 my $sym = $ev->{sym};
1777 my $uni = $ev->{unicode}; 1795 my $uni = $ev->{unicode};
… …
1789 } elsif ($sym == CFClient::SDLK_HOME) { 1807 } elsif ($sym == CFClient::SDLK_HOME) {
1790 $self->{cursor} = 0; 1808 $self->{cursor} = 0;
1791 } elsif ($sym == CFClient::SDLK_END) { 1809 } elsif ($sym == CFClient::SDLK_END) {
1792 $self->{cursor} = length $text; 1810 $self->{cursor} = length $text;
1793 } elsif ($uni == 27) { 1811 } elsif ($uni == 27) {
1794 $self->_emit ('escape'); 1812 $self->emit ('escape');
1795 } elsif ($uni) { 1813 } elsif ($uni) {
1796 substr $text, $self->{cursor}++, 0, chr $uni; 1814 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else { 1815 } else {
1798 return 0; 1816 return 0;
1799 } 1817 }
… …
1803 $self->realloc; 1821 $self->realloc;
1804 1822
1805 1 1823 1
1806} 1824}
1807 1825
1808sub focus_in { 1826sub invoke_focus_in {
1809 my ($self) = @_; 1827 my ($self) = @_;
1810 1828
1811 $self->{last_activity} = $::NOW; 1829 $self->{last_activity} = $::NOW;
1812 1830
1813 $self->SUPER::focus_in; 1831 $self->SUPER::invoke_focus_in
1814} 1832}
1815 1833
1816sub button_down { 1834sub invoke_button_down {
1817 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1818 1836
1819 $self->SUPER::button_down ($ev, $x, $y); 1837 $self->SUPER::invoke_button_down ($ev, $x, $y);
1820 1838
1821 my $idx = $self->{layout}->xy_to_index ($x, $y); 1839 my $idx = $self->{layout}->xy_to_index ($x, $y);
1822 1840
1823 # byte-index to char-index 1841 # byte-index to char-index
1824 my $text = $self->{text}; 1842 my $text = $self->{text};
1825 utf8::encode $text; 1843 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1826 $self->{cursor} = length substr $text, 0, $idx; 1844 $self->{cursor} = length $text;
1827 1845
1828 $self->_set_text ($self->{text}); 1846 $self->_set_text ($self->{text});
1829 $self->update; 1847 $self->update;
1830 1848
1831 1 1849 1
1832} 1850}
1833 1851
1834sub mouse_motion { 1852sub invoke_mouse_motion {
1835 my ($self, $ev, $x, $y) = @_; 1853 my ($self, $ev, $x, $y) = @_;
1836# 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#
1837 1855
1838 0 1856 1
1839} 1857}
1840 1858
1841sub _draw { 1859sub _draw {
1842 my ($self) = @_; 1860 my ($self) = @_;
1843 1861
… …
1884 1902
1885our @ISA = CFClient::UI::EntryBase::; 1903our @ISA = CFClient::UI::EntryBase::;
1886 1904
1887use CFClient::OpenGL; 1905use CFClient::OpenGL;
1888 1906
1889sub key_down { 1907sub invoke_key_down {
1890 my ($self, $ev) = @_; 1908 my ($self, $ev) = @_;
1891 1909
1892 my $sym = $ev->{sym}; 1910 my $sym = $ev->{sym};
1893 1911
1894 if ($sym == 13) { 1912 if ($sym == 13) {
1895 unshift @{$self->{history}}, 1913 unshift @{$self->{history}},
1896 my $txt = $self->get_text; 1914 my $txt = $self->get_text;
1915
1897 $self->{history_pointer} = -1; 1916 $self->{history_pointer} = -1;
1898 $self->{history_saveback} = ''; 1917 $self->{history_saveback} = '';
1899 $self->_emit (activate => $txt); 1918 $self->emit (activate => $txt);
1900 $self->update; 1919 $self->update;
1901 1920
1902 } elsif ($sym == CFClient::SDLK_UP) { 1921 } elsif ($sym == CFClient::SDLK_UP) {
1903 if ($self->{history_pointer} < 0) { 1922 if ($self->{history_pointer} < 0) {
1904 $self->{history_saveback} = $self->get_text; 1923 $self->{history_saveback} = $self->get_text;
… …
1920 } else { 1939 } else {
1921 $self->set_text ($self->{history_saveback}); 1940 $self->set_text ($self->{history_saveback});
1922 } 1941 }
1923 1942
1924 } else { 1943 } else {
1925 return $self->SUPER::key_down ($ev) 1944 return $self->SUPER::invoke_key_down ($ev)
1926 } 1945 }
1927 1946
1928 1 1947 1
1929} 1948}
1930 1949
… …
1954 can_events => 1, 1973 can_events => 1,
1955 @_ 1974 @_
1956 ) 1975 )
1957} 1976}
1958 1977
1959sub activate { }
1960
1961sub button_up { 1978sub invoke_button_up {
1962 my ($self, $ev, $x, $y) = @_; 1979 my ($self, $ev, $x, $y) = @_;
1963 1980
1964 $self->emit ("activate") 1981 $self->emit ("activate")
1965 if $x >= 0 && $x < $self->{w} 1982 if $x >= 0 && $x < $self->{w}
1966 && $y >= 0 && $y < $self->{h}; 1983 && $y >= 0 && $y < $self->{h};
… …
2008 can_events => 1, 2025 can_events => 1,
2009 @_ 2026 @_
2010 ); 2027 );
2011} 2028}
2012 2029
2013sub activate { }
2014
2015sub button_up { 2030sub invoke_button_up {
2016 my ($self, $ev, $x, $y) = @_; 2031 my ($self, $ev, $x, $y) = @_;
2017 2032
2018 $self->emit ("activate") 2033 $self->emit ("activate")
2019 if $x >= 0 && $x < $self->{w} 2034 if $x >= 0 && $x < $self->{w}
2020 && $y >= 0 && $y < $self->{h}; 2035 && $y >= 0 && $y < $self->{h};
… …
2054 my ($self) = @_; 2069 my ($self) = @_;
2055 2070
2056 (6) x 2 2071 (6) x 2
2057} 2072}
2058 2073
2074sub toggle {
2075 my ($self) = @_;
2076
2077 $self->{state} = !$self->{state};
2078 $self->emit (changed => $self->{state});
2079 $self->update;
2080}
2081
2059sub button_down { 2082sub invoke_button_down {
2060 my ($self, $ev, $x, $y) = @_; 2083 my ($self, $ev, $x, $y) = @_;
2061 2084
2062 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2085 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2063 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2086 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2064 $self->{state} = !$self->{state}; 2087 $self->toggle;
2065 $self->_emit (changed => $self->{state});
2066 } else { 2088 } else {
2067 return 0 2089 return 0
2068 } 2090 }
2069 2091
2070 1 2092 1
… …
2095package CFClient::UI::Image; 2117package CFClient::UI::Image;
2096 2118
2097our @ISA = CFClient::UI::Base::; 2119our @ISA = CFClient::UI::Base::;
2098 2120
2099use CFClient::OpenGL; 2121use CFClient::OpenGL;
2100use Carp qw/confess/;
2101 2122
2102our %loaded_images; 2123our %texture_cache;
2103 2124
2104sub new { 2125sub new {
2105 my $class = shift; 2126 my $class = shift;
2106 2127
2107 my $self = $class->SUPER::new (can_events => 0, @_); 2128 my $self = $class->SUPER::new (
2129 can_events => 0,
2130 @_,
2131 );
2108 2132
2109 $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";
2110 2135
2111 $loaded_images{$self->{image}} ||= 2136 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2112 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;
2113 2138
2114 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2139 Scalar::Util::weaken $texture_cache{$self->{path}};
2115 2140
2116 Scalar::Util::weaken $loaded_images{$self->{image}}; 2141 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2117
2118 $self->{aspect} = $tex->{w} / $tex->{h};
2119 2142
2120 $self 2143 $self
2121} 2144}
2122 2145
2123sub size_request { 2146sub size_request {
2124 my ($self) = @_; 2147 my ($self) = @_;
2125 2148
2126 ($self->{tex}->{w}, $self->{tex}->{h}) 2149 ($self->{tex}{w}, $self->{tex}{h})
2127} 2150}
2128 2151
2129sub _draw { 2152sub _draw {
2130 my ($self) = @_; 2153 my ($self) = @_;
2131 2154
… …
2240 my $ycut1 = max 0, min 1, $ycut; 2263 my $ycut1 = max 0, min 1, $ycut;
2241 my $ycut2 = max 0, min 1, $ycut - 1; 2264 my $ycut2 = max 0, min 1, $ycut - 1;
2242 2265
2243 my $h1 = $self->{h} * (1 - $ycut1); 2266 my $h1 = $self->{h} * (1 - $ycut1);
2244 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);
2245 2271
2246 glEnable GL_BLEND; 2272 glEnable GL_BLEND;
2247 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2273 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2248 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2274 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2249 glEnable GL_TEXTURE_2D; 2275 glEnable GL_TEXTURE_2D;
… …
2268 2294
2269 if ($t3) { 2295 if ($t3) {
2270 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2296 glBindTexture GL_TEXTURE_2D, $t3->{name};
2271 glBegin GL_QUADS; 2297 glBegin GL_QUADS;
2272 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2298 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2273 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2299 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2274 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2300 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2275 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2301 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2276 glEnd; 2302 glEnd;
2277 } 2303 }
2278 2304
2279 glDisable GL_BLEND; 2305 glDisable GL_BLEND;
… …
2367 $self->update; 2393 $self->update;
2368 2394
2369 $self 2395 $self
2370} 2396}
2371 2397
2372sub changed { }
2373
2374sub set_range { 2398sub set_range {
2375 my ($self, $range) = @_; 2399 my ($self, $range) = @_;
2376 2400
2377 ($range, $self->{range}) = ($self->{range}, $range); 2401 ($range, $self->{range}) = ($self->{range}, $range);
2378 2402
… …
2398 if $unit; 2422 if $unit;
2399 2423
2400 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2424 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2401 2425
2402 if ($value != $old_value) { 2426 if ($value != $old_value) {
2403 $self->_emit (changed => $value); 2427 $self->emit (changed => $value);
2404 $self->update; 2428 $self->update;
2405 } 2429 }
2406} 2430}
2407 2431
2408sub size_request { 2432sub size_request {
2409 my ($self) = @_; 2433 my ($self) = @_;
2410 2434
2411 ($self->{req_w}, $self->{req_h}) 2435 ($self->{req_w}, $self->{req_h})
2412} 2436}
2413 2437
2414sub button_down { 2438sub invoke_button_down {
2415 my ($self, $ev, $x, $y) = @_; 2439 my ($self, $ev, $x, $y) = @_;
2416 2440
2417 $self->SUPER::button_down ($ev, $x, $y); 2441 $self->SUPER::invoke_button_down ($ev, $x, $y);
2418 2442
2419 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2443 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2420 2444
2421 $self->mouse_motion ($ev, $x, $y) 2445 $self->invoke_mouse_motion ($ev, $x, $y)
2422} 2446}
2423 2447
2424sub mouse_motion { 2448sub invoke_mouse_motion {
2425 my ($self, $ev, $x, $y) = @_; 2449 my ($self, $ev, $x, $y) = @_;
2426 2450
2427 if ($GRAB == $self) { 2451 if ($GRAB == $self) {
2428 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2452 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2429 2453
… …
2550 can_events => 0, 2574 can_events => 0,
2551 indent => 0, 2575 indent => 0,
2552 #font => default_font 2576 #font => default_font
2553 @_, 2577 @_,
2554 2578
2555 layout => (new CFClient::Layout 1), 2579 layout => (new CFClient::Layout),
2556 par => [], 2580 par => [],
2557 height => 0, 2581 height => 0,
2558 children => [ 2582 children => [
2559 (new CFClient::UI::Empty expand => 1), 2583 (new CFClient::UI::Empty expand => 1),
2560 (new CFClient::UI::Slider vertical => 1), 2584 (new CFClient::UI::Slider vertical => 1),
… …
2571 2595
2572 $self->{fontsize} = $fontsize; 2596 $self->{fontsize} = $fontsize;
2573 $self->reflow; 2597 $self->reflow;
2574} 2598}
2575 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
2576sub size_allocate { 2609sub invoke_size_allocate {
2577 my ($self, $w, $h) = @_; 2610 my ($self, $w, $h) = @_;
2578 2611
2579 $self->SUPER::size_allocate ($w, $h); 2612 my ($empty, $slider, @other) = @{ $self->{children} };
2613 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2580 2614
2581 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2615 $self->{layout}->set_font ($self->{font}) if $self->{font};
2582 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2616 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2583 $self->{layout}->set_width ($self->{children}[0]{w}); 2617 $self->{layout}->set_width ($empty->{w});
2584 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2618 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2585 2619
2586 $self->reflow; 2620 $self->reflow;
2587}
2588 2621
2589sub text_size { 2622 local $self->{children} = [$empty, $slider];
2590 my ($self, $text, $indent) = @_; 2623 $self->SUPER::invoke_size_allocate ($w, $h)
2624}
2625
2626sub get_layout {
2627 my ($self, $para) = @_;
2591 2628
2592 my $layout = $self->{layout}; 2629 my $layout = $self->{layout};
2593 2630
2631 $layout->set_font ($self->{font}) if $self->{font};
2632 $layout->set_foreground (@{$para->{fg}});
2594 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2633 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2595 $layout->set_width ($self->{children}[0]{w} - $indent); 2634 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2635 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2597 $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}}
2598 2642 );
2643
2599 $layout->size 2644 $layout
2600} 2645}
2601 2646
2602sub reflow { 2647sub reflow {
2603 my ($self) = @_; 2648 my ($self) = @_;
2604 2649
… …
2613 $self->{children}[1]->set_value ($offset); 2658 $self->{children}[1]->set_value ($offset);
2614} 2659}
2615 2660
2616sub clear { 2661sub clear {
2617 my ($self) = @_; 2662 my ($self) = @_;
2663
2664 my (undef, undef, @other) = @{ $self->{children} };
2665 $self->remove ($_) for @other;
2618 2666
2619 $self->{par} = []; 2667 $self->{par} = [];
2620 $self->{height} = 0; 2668 $self->{height} = 0;
2621 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2669 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2622} 2670}
2623 2671
2624sub add_paragraph { 2672sub add_paragraph {
2625 my ($self, $color, $text, $indent) = @_; 2673 my ($self, $color, $para, $indent) = @_;
2626 2674
2627 for my $line (split /\n/, $text) { 2675 my ($text, @w) = ref $para ? @$para : $para;
2628 my ($w, $h) = $self->text_size ($line); 2676
2629 $self->{height} += $h; 2677 $para = {
2630 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,
2631 } 2684 };
2632 2685
2633 $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;
2634} 2698}
2635 2699
2636sub update { 2700sub update {
2637 my ($self) = @_; 2701 my ($self) = @_;
2638 2702
… …
2646 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2710 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2647 2711
2648 if (delete $self->{need_reflow}) { 2712 if (delete $self->{need_reflow}) {
2649 my $height = 0; 2713 my $height = 0;
2650 2714
2651 my $layout = $self->{layout};
2652
2653 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2654
2655 for (@{$self->{par}}) { 2715 for my $para (@{$self->{par}}) {
2656 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2716 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2657 $layout->set_width ($W - $_->[3]); 2717 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; 2718 my ($w, $h) = $layout->size;
2661 $_->[0] = $w + $_->[3]; 2719
2662 $_->[1] = $h; 2720 $para->{w} = $w + $para->{indent};
2721 $para->{h} = $h;
2722 $para->{wrapped} = $layout->has_wrapped;
2663 } 2723 }
2664 2724
2665 $height += $_->[1]; 2725 $height += $para->{h};
2666 } 2726 }
2667 2727
2668 $self->{height} = $height; 2728 $self->{height} = $height;
2669 2729
2670 $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]);
2671 2731
2672 delete $self->{texture}; 2732 delete $self->{texture};
2733 }
2734
2735 if (delete $self->{scroll_to_bottom}) {
2736 $self->{children}[1]->set_value (1e10);
2673 } 2737 }
2674 2738
2675 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2739 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2676 glClearColor 0, 0, 0, 0; 2740 glClearColor 0, 0, 0, 0;
2677 glClear GL_COLOR_BUFFER_BIT; 2741 glClear GL_COLOR_BUFFER_BIT;
… …
2681 my $y0 = $top; 2745 my $y0 = $top;
2682 my $y1 = $top + $H; 2746 my $y1 = $top + $H;
2683 2747
2684 my $y = 0; 2748 my $y = 0;
2685 2749
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}}) { 2750 for my $para (@{$self->{par}}) {
2695 my $h = $par->[1]; 2751 my $h = $para->{h};
2696 2752
2697 if ($y0 < $y + $h && $y < $y1) { 2753 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 2754
2703 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2755 my $layout = $self->get_layout ($para);
2704 2756
2705 glRasterPos $par->[3], $y - $y0; 2757 $layout->render ($para->{indent}, $y - $y0);
2706 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 }
2707 } 2771 }
2708 2772
2709 $y += $h; 2773 $y += $h;
2710 } 2774 }
2711
2712 glDisable GL_BLEND;
2713 }; 2775 };
2714 }); 2776 });
2777}
2778
2779sub reconfigure {
2780 my ($self) = @_;
2781
2782 $self->SUPER::reconfigure;
2783
2784 $_->{w} = 1e10 for @{ $self->{par} };
2785 $self->reflow;
2715} 2786}
2716 2787
2717sub _draw { 2788sub _draw {
2718 my ($self) = @_; 2789 my ($self) = @_;
2719 2790
… …
2722 glColor 0, 0, 0, 1; 2793 glColor 0, 0, 0, 1;
2723 $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});
2724 glDisable GL_TEXTURE_2D; 2795 glDisable GL_TEXTURE_2D;
2725 2796
2726 $self->{children}[1]->draw; 2797 $self->{children}[1]->draw;
2727
2728} 2798}
2729 2799
2730############################################################################# 2800#############################################################################
2731 2801
2732package CFClient::UI::Animator; 2802package CFClient::UI::Animator;
… …
2841 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2911 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2842 2912
2843 ($w + 4, $h + 4) 2913 ($w + 4, $h + 4)
2844} 2914}
2845 2915
2846sub size_allocate { 2916sub invoke_size_allocate {
2847 my ($self, $w, $h) = @_; 2917 my ($self, $w, $h) = @_;
2848 2918
2849 $self->SUPER::size_allocate ($w - 4, $h - 4); 2919 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2850} 2920}
2851 2921
2852sub visibility_change { 2922sub invoke_visibility_change {
2853 my ($self, $visible) = @_; 2923 my ($self, $visible) = @_;
2854 2924
2855 return unless $visible; 2925 return unless $visible;
2856 2926
2857 $self->{root}->on_post_alloc ("move_$self" => sub { 2927 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
3005 for my $item (@{ $self->{items} }) { 3075 for my $item (@{ $self->{items} }) {
3006 my ($widget, $cb, $tooltip) = @$item; 3076 my ($widget, $cb, $tooltip) = @$item;
3007 3077
3008 # handle various types of items, only text for now 3078 # handle various types of items, only text for now
3009 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 {
3010 $widget = new CFClient::UI::Label 3094 $widget = new CFClient::UI::Label
3011 can_hover => 1, 3095 can_hover => 1,
3012 can_events => 1, 3096 can_events => 1,
3013 markup => $widget, 3097 markup => $widget,
3014 tooltip => $tooltip 3098 tooltip => $tooltip;
3099 }
3015 } 3100 }
3016 3101
3017 $self->{item}{$widget} = $item; 3102 $self->{item}{$widget} = $item;
3018 3103
3019 $self->{vbox}->add ($widget); 3104 $self->{vbox}->add ($widget);
… …
3024 3109
3025# 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)
3026sub popup { 3111sub popup {
3027 my ($self, $ev) = @_; 3112 my ($self, $ev) = @_;
3028 3113
3029 $self->_emit ("popdown"); 3114 $self->emit ("popdown");
3030 3115
3031 # maybe save $GRAB? must be careful about events... 3116 # maybe save $GRAB? must be careful about events...
3032 $GRAB = $self; 3117 $GRAB = $self;
3033 $self->{button} = $ev->{button}; 3118 $self->{button} = $ev->{button};
3034 3119
3035 $self->show; 3120 $self->show;
3036 $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);
3037} 3122}
3038 3123
3039sub mouse_motion { 3124sub invoke_mouse_motion {
3040 my ($self, $ev, $x, $y) = @_; 3125 my ($self, $ev, $x, $y) = @_;
3041 3126
3042 # TODO: should use vbox->find_widget or so 3127 # TODO: should use vbox->find_widget or so
3043 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3128 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
3044 $self->{hover} = $self->{item}{$HOVER}; 3129 $self->{hover} = $self->{item}{$HOVER};
3045 3130
3046 0 3131 0
3047} 3132}
3048 3133
3049sub button_up { 3134sub invoke_button_up {
3050 my ($self, $ev, $x, $y) = @_; 3135 my ($self, $ev, $x, $y) = @_;
3051 3136
3052 if ($ev->{button} == $self->{button}) { 3137 if ($ev->{button} == $self->{button}) {
3053 undef $GRAB; 3138 undef $GRAB;
3054 $self->hide; 3139 $self->hide;
3055 3140
3056 $self->_emit ("popdown"); 3141 $self->emit ("popdown");
3057 $self->{hover}[1]->() if $self->{hover}; 3142 $self->{hover}[1]->() if $self->{hover};
3058 } else { 3143 } else {
3059 return 0 3144 return 0
3060 } 3145 }
3061 3146
… …
3088 3173
3089 $self->{current} = $self->{children}[0] 3174 $self->{current} = $self->{children}[0]
3090 if @{ $self->{children} }; 3175 if @{ $self->{children} };
3091} 3176}
3092 3177
3178sub get_current_page {
3179 my ($self) = @_;
3180
3181 $self->{current}
3182}
3183
3093sub set_current_page { 3184sub set_current_page {
3094 my ($self, $page_or_widget) = @_; 3185 my ($self, $page_or_widget) = @_;
3095 3186
3096 my $widget = ref $page_or_widget 3187 my $widget = ref $page_or_widget
3097 ? $page_or_widget 3188 ? $page_or_widget
3098 : $self->{children}[$page_or_widget]; 3189 : $self->{children}[$page_or_widget];
3099 3190
3100 $self->{current} = $widget; 3191 $self->{current} = $widget;
3101 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3192 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3102 3193
3103 $self->_emit (page_changed => $self->{current}); 3194 $self->emit (page_changed => $self->{current});
3104 3195
3105 $self->realloc; 3196 $self->realloc;
3106} 3197}
3107 3198
3108sub visible_children { 3199sub visible_children {
… …
3113 my ($self) = @_; 3204 my ($self) = @_;
3114 3205
3115 $self->{current}->size_request 3206 $self->{current}->size_request
3116} 3207}
3117 3208
3118sub size_allocate { 3209sub invoke_size_allocate {
3119 my ($self, $w, $h) = @_; 3210 my ($self, $w, $h) = @_;
3120 3211
3121 $self->{current}->configure (0, 0, $w, $h); 3212 $self->{current}->configure (0, 0, $w, $h);
3213
3214 1
3122} 3215}
3123 3216
3124sub _draw { 3217sub _draw {
3125 my ($self) = @_; 3218 my ($self) = @_;
3126 3219
… …
3161 ); 3254 );
3162 3255
3163 $self->{multiplexer}->add ($widget); 3256 $self->{multiplexer}->add ($widget);
3164} 3257}
3165 3258
3259sub get_current_page {
3260 my ($self) = @_;
3261
3262 $self->{multiplexer}->get_current_page
3263}
3264
3166sub set_current_page { 3265sub set_current_page {
3167 my ($self, $page) = @_; 3266 my ($self, $page) = @_;
3168 3267
3169 $self->{multiplexer}->set_current_page ($page); 3268 $self->{multiplexer}->set_current_page ($page);
3170 $self->_emit (page_changed => $self->{multiplexer}{current}); 3269 $self->emit (page_changed => $self->{multiplexer}{current});
3171} 3270}
3172 3271
3173############################################################################# 3272#############################################################################
3174 3273
3175package CFClient::UI::Combobox; 3274package CFClient::UI::Combobox;
… …
3190 $self->_set_value ($self->{value}); 3289 $self->_set_value ($self->{value});
3191 3290
3192 $self 3291 $self
3193} 3292}
3194 3293
3195sub button_down { 3294sub invoke_button_down {
3196 my ($self, $ev) = @_; 3295 my ($self, $ev) = @_;
3197 3296
3198 my @menu_items; 3297 my @menu_items;
3199 3298
3200 for (@{ $self->{options} }) { 3299 for (@{ $self->{options} }) {
… …
3221 my ($self, $value) = @_; 3320 my ($self, $value) = @_;
3222 3321
3223 return unless $self->{value} ne $value; 3322 return unless $self->{value} ne $value;
3224 3323
3225 $self->_set_value ($value); 3324 $self->_set_value ($value);
3226 $self->_emit (changed => $value); 3325 $self->emit (changed => $value);
3227} 3326}
3228 3327
3229############################################################################# 3328#############################################################################
3230 3329
3231package CFClient::UI::Statusbox; 3330package CFClient::UI::Statusbox;
… …
3346 count => 1, 3445 count => 1,
3347 %arg, 3446 %arg,
3348 }; 3447 };
3349 } 3448 }
3350 3449
3450 $ROOT->on_refresh (reorder => sub {
3351 $self->reorder; 3451 $self->reorder;
3452 });
3352} 3453}
3353 3454
3354sub reconfigure { 3455sub reconfigure {
3355 my ($self) = @_; 3456 my ($self) = @_;
3356 3457
… …
3371 3472
3372############################################################################# 3473#############################################################################
3373 3474
3374package CFClient::UI::Inventory; 3475package CFClient::UI::Inventory;
3375 3476
3376our @ISA = CFClient::UI::ScrolledWindow::; 3477our @ISA = CFClient::UI::Table::;
3377 3478
3378sub new { 3479sub new {
3379 my $class = shift; 3480 my $class = shift;
3380 3481
3381 my $self = $class->SUPER::new ( 3482 my $self = $class->SUPER::new (
3382 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3483 col_expand => [0, 1, 0],
3383 @_, 3484 @_,
3384 ); 3485 );
3385 3486
3386 $self 3487 $self
3387} 3488}
3388 3489
3389sub set_items { 3490sub set_items {
3390 my ($self, $items) = @_; 3491 my ($self, $items) = @_;
3391 3492
3392 $self->{child}->clear; 3493 $self->clear;
3393 return unless $items; 3494 return unless $items;
3394 3495
3395 my @items = sort { 3496 my @items = sort {
3396 ($a->{type} <=> $b->{type}) 3497 ($a->{type} <=> $b->{type})
3397 or ($a->{name} cmp $b->{name}) 3498 or ($a->{name} cmp $b->{name})
3398 } @$items; 3499 } values %$items;
3399 3500
3400 $self->{real_items} = \@items; 3501 $self->{real_items} = \@items;
3401 3502
3402 my $row = 0; 3503 my $row = 0;
3403 for my $item (@items) { 3504 for my $item (@items) {
3404 CFClient::Item::update_widgets $item; 3505 CFClient::Item::update_widgets $item;
3405 3506
3406 $self->{child}->add (0, $row, $item->{face_widget}); 3507 $self->add (0, $row, $item->{face_widget});
3407 $self->{child}->add (1, $row, $item->{desc_widget}); 3508 $self->add (1, $row, $item->{desc_widget});
3408 $self->{child}->add (2, $row, $item->{weight_widget}); 3509 $self->add (2, $row, $item->{weight_widget});
3409 3510
3410 $row++; 3511 $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, $end_cb) = @_;
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 $end_cb->() if $end_cb;
3531 });
3532}
3533
3534# $mod and $sym are the modifiers and key symbol
3535# $cmds is a array ref of strings (the commands)
3536# $cb is the callback that is executed on OK
3537# $ccb is the callback that is executed on CANCEL and
3538# when the binding was unsuccessful on OK
3539sub set_binding {
3540 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3541
3542 $self->clear_command_list;
3543 $self->{recording} = 0;
3544 $self->{rec_btn}->set_text ("start recording");
3545
3546 $self->{binding} = [$mod, $sym];
3547 $self->{commands} = $cmds;
3548
3549 $self->{binding_change} = $cb;
3550 $self->{binding_cancel} = $ccb;
3551
3552 $self->update_binding_widgets;
3553}
3554
3555# this is a shortcut method that asks for a binding
3556# and then just binds it.
3557sub do_quick_binding {
3558 my ($self, $cmds, $end_cb) = @_;
3559 $self->set_binding (undef, undef, $cmds, sub {
3560 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3561 });
3562 $self->ask_for_bind (1, $end_cb);
3563}
3564
3565sub update_binding_widgets {
3566 my ($self) = @_;
3567 my ($mod, $sym, $cmds) = $self->get_binding;
3568 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3569 $self->set_command_list ($cmds);
3570}
3571
3572sub get_binding {
3573 my ($self) = @_;
3574 return (
3575 $self->{binding}->[0],
3576 $self->{binding}->[1],
3577 [ grep { defined $_ } @{$self->{commands}} ]
3578 );
3579}
3580
3581sub clear_command_list {
3582 my ($self) = @_;
3583 $self->{cmdbox}->clear ();
3584}
3585
3586sub set_command_list {
3587 my ($self, $cmds) = @_;
3588
3589 $self->{cmdbox}->clear ();
3590 $self->{commands} = $cmds;
3591
3592 my $idx = 0;
3593
3594 for (@$cmds) {
3595 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3596
3597 my $i = $idx;
3598 $hb->add (new CFClient::UI::Label text => $_);
3599 $hb->add (new CFClient::UI::Button
3600 text => "delete",
3601 tooltip => "Deletes the action from the record",
3602 on_activate => sub {
3603 $self->{cmdbox}->remove ($hb);
3604 $cmds->[$i] = undef;
3605 });
3606
3607
3608 $idx++
3609 } 3512 }
3610} 3513}
3611 3514
3612############################################################################# 3515#############################################################################
3613 3516
… …
3667 } elsif ($ev->{button} == 2) { 3570 } elsif ($ev->{button} == 2) {
3668 $::CONN->user_send ("invoke $spell->{name}"); 3571 $::CONN->user_send ("invoke $spell->{name}");
3669 } elsif ($ev->{button} == 3) { 3572 } elsif ($ev->{button} == 3) {
3670 (new CFClient::UI::Menu 3573 (new CFClient::UI::Menu
3671 items => [ 3574 items => [
3672 ["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}"]) }],
3673 ["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}"]) }],
3674 ], 3577 ],
3675 )->popup ($ev); 3578 )->popup ($ev);
3676 } else { 3579 } else {
3677 return 0; 3580 return 0;
… …
3772 $coord = $max - $size if $coord > $max - $size; 3675 $coord = $max - $size if $coord > $max - $size;
3773 3676
3774 int $coord + 0.5 3677 int $coord + 0.5
3775} 3678}
3776 3679
3777sub size_allocate { 3680sub invoke_size_allocate {
3778 my ($self, $w, $h) = @_; 3681 my ($self, $w, $h) = @_;
3779 3682
3780 for my $child ($self->children) { 3683 for my $child ($self->children) {
3781 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)};
3782 3685
… …
3786 $X = _to_pixel $X, $W, $self->{w}; 3689 $X = _to_pixel $X, $W, $self->{w};
3787 $Y = _to_pixel $Y, $H, $self->{h}; 3690 $Y = _to_pixel $Y, $H, $self->{h};
3788 3691
3789 $child->configure ($X, $Y, $W, $H); 3692 $child->configure ($X, $Y, $W, $H);
3790 } 3693 }
3694
3695 1
3791} 3696}
3792 3697
3793sub coord2local { 3698sub coord2local {
3794 my ($self, $x, $y) = @_; 3699 my ($self, $x, $y) = @_;
3795 3700
… …
3921 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3826 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3922 3827
3923 $w = 0 if $w < 0; 3828 $w = 0 if $w < 0;
3924 $h = 0 if $h < 0; 3829 $h = 0 if $h < 0;
3925 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
3926 $w = int $w + 0.5; 3837 $w = int $w + 0.5;
3927 $h = int $h + 0.5; 3838 $h = int $h + 0.5;
3928 3839
3929 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}) {
3930 $widget->{old_w} = $widget->{w}; 3841 $widget->{old_w} = $widget->{w};

Diff Legend

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