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.318 by elmex, Sun Jul 2 19:32:55 2006 UTC

… …
281 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
282 282
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
285 285
286 $self->focus_out; 286 $self->emit ("focus_out");
287
288 $self->emit (visibility_change => 0); 287 $self->emit (visibility_change => 0);
289} 288}
290 289
291sub set_visibility { 290sub set_visibility {
292 my ($self, $visible) = @_; 291 my ($self, $visible) = @_;
… …
334} 333}
335 334
336sub size_request { 335sub size_request {
337 require Carp; 336 require Carp;
338 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
338}
339
340sub baseline_shift {
341 0
339} 342}
340 343
341sub configure { 344sub configure {
342 my ($self, $x, $y, $w, $h) = @_; 345 my ($self, $x, $y, $w, $h) = @_;
343 346
… …
367 370
368 $self->{root}{size_alloc}{$self+0} = $self; 371 $self->{root}{size_alloc}{$self+0} = $self;
369 } 372 }
370} 373}
371 374
372sub size_allocate {
373 # nothing to be done
374}
375
376sub children { 375sub children {
377 # nop 376 # nop
378} 377}
379 378
380sub visible_children { 379sub visible_children {
… …
418 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
419 418
420 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
421} 420}
422 421
423sub focus_in { 422sub invoke_focus_in {
424 my ($self) = @_; 423 my ($self) = @_;
425 424
426 return if $FOCUS == $self; 425 return if $FOCUS == $self;
427 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
428 427
429 my $focus = $FOCUS; $FOCUS = $self; 428 $FOCUS = $self;
430 429
431 $self->_emit (focus_in => $focus); 430 $self->update;
432 431
433 $focus->update if $focus; 432 0
434 $FOCUS->update;
435} 433}
436 434
437sub focus_out { 435sub invoke_focus_out {
438 my ($self) = @_; 436 my ($self) = @_;
439 437
440 return unless $FOCUS == $self; 438 return unless $FOCUS == $self;
441 439
442 my $focus = $FOCUS; undef $FOCUS; 440 undef $FOCUS;
443 441
444 $self->_emit (focus_out => $focus); 442 $self->update;
445 443
446 $focus->update if $focus; #?
447
448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 444 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
449 unless $FOCUS; 445 unless $FOCUS;
450}
451 446
447 0
448}
449
450sub grab_focus {
451 my ($self) = @_;
452
453 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in");
455}
456
452sub mouse_motion { 0 } 457sub invoke_mouse_motion { 1 }
453sub button_up { 0 } 458sub invoke_button_up { 1 }
454sub key_down { 0 } 459sub invoke_key_down { 1 }
455sub key_up { 0 } 460sub invoke_key_up { 1 }
456 461
457sub button_down { 462sub invoke_button_down {
458 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
459 464
460 $self->focus_in; 465 $self->grab_focus;
461 466
462 0 467 1
468}
469
470sub connect {
471 my ($self, $signal, $cb) = @_;
472
473 push @{ $self->{signal_cb}{$signal} }, $cb;
474}
475
476sub emit {
477 my ($self, $signal, @args) = @_;
478
479 #d##TODO# stop propagating at first true, do not use sum
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
463} 483}
464 484
465sub find_widget { 485sub find_widget {
466 my ($self, $x, $y) = @_; 486 my ($self, $x, $y) = @_;
467 487
… …
477sub set_parent { 497sub set_parent {
478 my ($self, $parent) = @_; 498 my ($self, $parent) = @_;
479 499
480 Scalar::Util::weaken ($self->{parent} = $parent); 500 Scalar::Util::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible}; 501 $self->set_visible if $parent->{visible};
482}
483
484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501}
502
503sub visibility_change {
504 #my ($self, $visible) = @_;
505} 502}
506 503
507sub realloc { 504sub realloc {
508 my ($self) = @_; 505 my ($self) = @_;
509 506
… …
542 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
543 540
544 # update screen rectangle 541 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x}; 542 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y}; 543 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549 544
550 # skip widgets that are entirely outside the drawing area 545 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 546 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 547 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
553 548
… …
789 784
790sub size_request { 785sub size_request {
791 $_[0]{children}[0]->size_request 786 $_[0]{children}[0]->size_request
792} 787}
793 788
794sub size_allocate { 789sub invoke_size_allocate {
795 my ($self, $w, $h) = @_; 790 my ($self, $w, $h) = @_;
796 791
797 $self->{children}[0]->configure (0, 0, $w, $h); 792 $self->{children}[0]->configure (0, 0, $w, $h);
793
794 1
798} 795}
799 796
800############################################################################# 797#############################################################################
801 798
802# back-buffered drawing area 799# back-buffered drawing area
… …
818 815
819 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 816 $ROOT->on_post_alloc ($self => sub { $self->render_child });
820 $self->SUPER::update; 817 $self->SUPER::update;
821} 818}
822 819
823sub size_allocate { 820sub invoke_size_allocate {
824 my ($self, $w, $h) = @_; 821 my ($self, $w, $h) = @_;
825 822
826 $self->SUPER::size_allocate ($w, $h);
827 $self->update; 823 $self->update;
824
825 $self->SUPER::invoke_size_allocate ($w, $h)
828} 826}
829 827
830sub _render { 828sub _render {
831 my ($self) = @_; 829 my ($self) = @_;
832 830
… …
893 $h = 10 if $self->{scroll_y}; 891 $h = 10 if $self->{scroll_y};
894 892
895 ($w, $h) 893 ($w, $h)
896} 894}
897 895
898sub size_allocate { 896sub invoke_size_allocate {
899 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
900 898
901 my $child = $self->child; 899 my $child = $self->child;
902 900
903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
905 903
906 $self->child->configure (0, 0, $w, $h); 904 $self->child->configure (0, 0, $w, $h);
907 $self->update; 905 $self->update;
906
907 1
908} 908}
909 909
910sub set_offset { 910sub set_offset {
911 my ($self, $x, $y) = @_; 911 my ($self, $x, $y) = @_;
912 912
… …
986 $self->add ($child) if $child; 986 $self->add ($child) if $child;
987 987
988 $self 988 $self
989} 989}
990 990
991#TODO# update range on size_allocate depending on child
992
991sub add { 993sub add {
992 my ($self, $widget) = @_; 994 my ($self, $widget) = @_;
993 995
994 $self->{vp}->add ($self->{child} = $widget); 996 $self->{vp}->add ($self->{child} = $widget);
995} 997}
996 998
999sub update_slider {
1000 my ($self) = @_;
1001
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1003}
1004
997sub update { 1005sub update {
998 my ($self) = @_; 1006 my ($self) = @_;
999 1007
1000 $self->SUPER::update; 1008 $self->SUPER::update;
1001 1009
1002 # todo: overwrite size_allocate of child 1010 $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} 1011}
1006 1012
1007sub size_allocate { 1013sub invoke_size_allocate {
1008 my ($self, $w, $h) = @_; 1014 my ($self, $w, $h) = @_;
1009 1015
1016 $self->update_slider;
1017
1010 $self->SUPER::size_allocate ($w, $h); 1018 $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} 1019}
1015
1016#TODO# update range on size_allocate depending on child
1017# update viewport offset on scroll
1018 1020
1019############################################################################# 1021#############################################################################
1020 1022
1021package CFClient::UI::Frame; 1023package CFClient::UI::Frame;
1022 1024
… …
1090 valign => 1, 1092 valign => 1,
1091 text => $self->{title}, 1093 text => $self->{title},
1092 fontsize => $self->{border}, 1094 fontsize => $self->{border},
1093 if exists $self->{title}; 1095 if exists $self->{title};
1094 1096
1095 unless ($self->{no_close_button}) { 1097 if ($self->{has_close_button}) {
1096 $self->{close_btn} = 1098 $self->{close_button} =
1097 new CFClient::UI::ImageButton 1099 new CFClient::UI::ImageButton
1098 image => 'x1_close.png', 1100 path => 'x1_close.png',
1099 on_activate => sub { $self->hide }; 1101 on_activate => sub { $self->emit ("delete") };
1100 1102
1101 $self->CFClient::UI::Container::add ($self->{close_btn}); 1103 $self->CFClient::UI::Container::add ($self->{close_button});
1102 } 1104 }
1103 1105
1104 $self 1106 $self
1105} 1107}
1106 1108
1107sub add { 1109sub add {
1108 my ($self, @widgets) = @_; 1110 my ($self, @widgets) = @_;
1109 1111
1110 $self->SUPER::add (@widgets); 1112 $self->SUPER::add (@widgets);
1111 $self->CFClient::UI::Container::add ($self->{close_btn}) if $self->{close_btn}; 1113 $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}; 1114 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1113} 1115}
1114 1116
1115sub border { 1117sub border {
1116 int $_[0]{border} * $::FONTSIZE 1118 int $_[0]{border} * $::FONTSIZE
… …
1120 my ($self) = @_; 1122 my ($self) = @_;
1121 1123
1122 $self->{title_widget}->size_request 1124 $self->{title_widget}->size_request
1123 if $self->{title_widget}; 1125 if $self->{title_widget};
1124 1126
1125 $self->{close_btn}->size_request 1127 $self->{close_button}->size_request
1126 if $self->{close_btn}; 1128 if $self->{close_button};
1127 1129
1128 my ($w, $h) = $self->SUPER::size_request; 1130 my ($w, $h) = $self->SUPER::size_request;
1129 1131
1130 ( 1132 (
1131 $w + $self->border * 2, 1133 $w + $self->border * 2,
1132 $h + $self->border * 2, 1134 $h + $self->border * 2,
1133 ) 1135 )
1134} 1136}
1135 1137
1136sub size_allocate { 1138sub invoke_size_allocate {
1137 my ($self, $w, $h) = @_; 1139 my ($self, $w, $h) = @_;
1138 1140
1139 if ($self->{title_widget}) { 1141 if ($self->{title_widget}) {
1140 $self->{title_widget}{w} = $w; 1142 $self->{title_widget}{w} = $w;
1141 $self->{title_widget}{h} = $h; 1143 $self->{title_widget}{h} = $h;
1142 $self->{title_widget}->size_allocate ($w, $h); 1144 $self->{title_widget}->invoke_size_allocate ($w, $h);
1143 } 1145 }
1144 1146
1145 my $border = $self->border; 1147 my $border = $self->border;
1146 1148
1147 $h -= List::Util::max 0, $border * 2; 1149 $h -= List::Util::max 0, $border * 2;
1148 $w -= List::Util::max 0, $border * 2; 1150 $w -= List::Util::max 0, $border * 2;
1149 1151
1150 $self->child->configure ($border, $border, $w, $h); 1152 $self->child->configure ($border, $border, $w, $h);
1151 1153
1152 $self->{close_btn}->configure ($self->{w} - (2 * $border), 0, $border, $border) 1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153 if $self->{close_btn}; 1155 if $self->{close_button};
1154}
1155 1156
1157 1
1158}
1159
1160sub invoke_delete {
1161 my ($self) = @_;
1162
1163 $self->hide;
1164
1165 1
1166}
1167
1156sub button_down { 1168sub invoke_button_down {
1157 my ($self, $ev, $x, $y) = @_; 1169 my ($self, $ev, $x, $y) = @_;
1158 1170
1159 my ($w, $h) = @$self{qw(w h)}; 1171 my ($w, $h) = @$self{qw(w h)};
1160 my $border = $self->border; 1172 my $border = $self->border;
1161 1173
… …
1192 1204
1193 ($x, $y) = ($ev->{x}, $ev->{y}); 1205 ($x, $y) = ($ev->{x}, $ev->{y});
1194 1206
1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1207 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1196 # HACK: the next line is required to enforce placement 1208 # HACK: the next line is required to enforce placement
1197 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1209 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1198 }; 1210 };
1199 } else { 1211 } else {
1200 return 0; 1212 return 0;
1201 } 1213 }
1202 1214
1203 1 1215 1
1204} 1216}
1205 1217
1206sub button_up { 1218sub invoke_button_up {
1207 my ($self, $ev, $x, $y) = @_; 1219 my ($self, $ev, $x, $y) = @_;
1208 1220
1209 $self->{close_btn}->button_up ($ev, $x, $y)
1210 if $self->{close_btn};
1211
1212 !!delete $self->{motion} 1221 ! ! delete $self->{motion}
1213} 1222}
1214 1223
1215sub mouse_motion { 1224sub invoke_mouse_motion {
1216 my ($self, $ev, $x, $y) = @_; 1225 my ($self, $ev, $x, $y) = @_;
1217 1226
1218 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1227 $self->{motion}->($ev, $x, $y) if $self->{motion};
1219 1228
1220 !!$self->{motion} 1229 ! ! $self->{motion}
1221} 1230}
1222 1231
1223sub _draw { 1232sub _draw {
1224 my ($self) = @_; 1233 my ($self) = @_;
1225 1234
… …
1258 $self->{title_widget}->_draw; 1267 $self->{title_widget}->_draw;
1259 1268
1260 glTranslate 0, - ($border - $self->{h}); 1269 glTranslate 0, - ($border - $self->{h});
1261 } 1270 }
1262 1271
1263 $self->{close_btn}->draw 1272 $self->{close_button}->draw
1264 if $self->{close_btn}; 1273 if $self->{close_button};
1265} 1274}
1266 1275
1267############################################################################# 1276#############################################################################
1268 1277
1269package CFClient::UI::Table; 1278package CFClient::UI::Table;
… …
1348 (sum @$ws), 1357 (sum @$ws),
1349 (sum @$hs), 1358 (sum @$hs),
1350 ) 1359 )
1351} 1360}
1352 1361
1353sub size_allocate { 1362sub invoke_size_allocate {
1354 my ($self, $w, $h) = @_; 1363 my ($self, $w, $h) = @_;
1355 1364
1356 my ($ws, $hs) = $self->get_wh; 1365 my ($ws, $hs) = $self->get_wh;
1357 1366
1358 my $req_w = (sum @$ws) || 1; 1367 my $req_w = (sum @$ws) || 1;
… …
1390 } 1399 }
1391 1400
1392 $y += $row_h; 1401 $y += $row_h;
1393 } 1402 }
1394 1403
1404 1
1395} 1405}
1396 1406
1397sub find_widget { 1407sub find_widget {
1398 my ($self, $x, $y) = @_; 1408 my ($self, $x, $y) = @_;
1399 1409
… …
1436 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1446 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1437 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1447 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1438 ) 1448 )
1439} 1449}
1440 1450
1441sub size_allocate { 1451sub invoke_size_allocate {
1442 my ($self, $w, $h) = @_; 1452 my ($self, $w, $h) = @_;
1443 1453
1444 my $space = $self->{vertical} ? $h : $w; 1454 my $space = $self->{vertical} ? $h : $w;
1445 my $children = $self->{children}; 1455 my @children = $self->visible_children;
1446 1456
1447 my @req; 1457 my @req;
1448 1458
1449 if ($self->{homogeneous}) { 1459 if ($self->{homogeneous}) {
1450 @req = ($space / (@$children || 1)) x @$children; 1460 @req = ($space / (@children || 1)) x @children;
1451 } else { 1461 } else {
1452 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1462 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1453 my $req = List::Util::sum @req; 1463 my $req = List::Util::sum @req;
1454 1464
1455 if ($req > $space) { 1465 if ($req > $space) {
1456 # ah well, not enough space 1466 # ah well, not enough space
1457 $_ *= $space / $req for @req; 1467 $_ *= $space / $req for @req;
1458 } else { 1468 } else {
1459 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1469 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1460 1470
1461 $space = ($space - $req) / $expand; # remaining space to give away 1471 $space = ($space - $req) / $expand; # remaining space to give away
1462 1472
1463 $req[$_] += $space * $children->[$_]{expand} 1473 $req[$_] += $space * $children[$_]{expand}
1464 for 0 .. $#$children; 1474 for 0 .. $#children;
1465 } 1475 }
1466 } 1476 }
1467 1477
1468 CFClient::UI::harmonize \@req; 1478 CFClient::UI::harmonize \@req;
1469 1479
1470 my $pos = 0; 1480 my $pos = 0;
1471 for (0 .. $#$children) { 1481 for (0 .. $#children) {
1472 my $alloc = $req[$_]; 1482 my $alloc = $req[$_];
1473 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1483 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1474 1484
1475 $pos += $alloc; 1485 $pos += $alloc;
1476 } 1486 }
1477 1487
1478 1 1488 1
… …
1633 }; 1643 };
1634 1644
1635 @{ $self->{size_req} } 1645 @{ $self->{size_req} }
1636} 1646}
1637 1647
1648sub baseline_shift {
1649 $_[0]{layout}->descent
1650}
1651
1638sub size_allocate { 1652sub invoke_size_allocate {
1639 my ($self, $w, $h) = @_; 1653 my ($self, $w, $h) = @_;
1640 1654
1641 delete $self->{ox}; 1655 delete $self->{ox};
1642 1656
1643 delete $self->{texture} 1657 delete $self->{texture}
1644 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1658 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1659
1660 1
1645} 1661}
1646 1662
1647sub set_fontsize { 1663sub set_fontsize {
1648 my ($self, $fontsize) = @_; 1664 my ($self, $fontsize) = @_;
1649 1665
1650 $self->{fontsize} = $fontsize; 1666 $self->{fontsize} = $fontsize;
1667 delete $self->{size_req};
1651 delete $self->{texture}; 1668 delete $self->{texture};
1652 1669
1653 $self->realloc; 1670 $self->realloc;
1654} 1671}
1655 1672
… …
1742 1759
1743 $text =~ s/./*/g if $self->{hidden}; 1760 $text =~ s/./*/g if $self->{hidden};
1744 $self->{layout}->set_text ("$text "); 1761 $self->{layout}->set_text ("$text ");
1745 delete $self->{size_req}; 1762 delete $self->{size_req};
1746 1763
1747 $self->_emit (changed => $self->{text}); 1764 $self->emit (changed => $self->{text});
1748 1765
1749 $self->realloc; 1766 $self->realloc;
1750 $self->update; 1767 $self->update;
1751} 1768}
1752 1769
… …
1767 my ($w, $h) = $self->SUPER::size_request; 1784 my ($w, $h) = $self->SUPER::size_request;
1768 1785
1769 ($w + 1, $h) # add 1 for cursor 1786 ($w + 1, $h) # add 1 for cursor
1770} 1787}
1771 1788
1772sub key_down { 1789sub invoke_key_down {
1773 my ($self, $ev) = @_; 1790 my ($self, $ev) = @_;
1774 1791
1775 my $mod = $ev->{mod}; 1792 my $mod = $ev->{mod};
1776 my $sym = $ev->{sym}; 1793 my $sym = $ev->{sym};
1777 my $uni = $ev->{unicode}; 1794 my $uni = $ev->{unicode};
… …
1789 } elsif ($sym == CFClient::SDLK_HOME) { 1806 } elsif ($sym == CFClient::SDLK_HOME) {
1790 $self->{cursor} = 0; 1807 $self->{cursor} = 0;
1791 } elsif ($sym == CFClient::SDLK_END) { 1808 } elsif ($sym == CFClient::SDLK_END) {
1792 $self->{cursor} = length $text; 1809 $self->{cursor} = length $text;
1793 } elsif ($uni == 27) { 1810 } elsif ($uni == 27) {
1794 $self->_emit ('escape'); 1811 $self->emit ('escape');
1795 } elsif ($uni) { 1812 } elsif ($uni) {
1796 substr $text, $self->{cursor}++, 0, chr $uni; 1813 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else { 1814 } else {
1798 return 0; 1815 return 0;
1799 } 1816 }
… …
1803 $self->realloc; 1820 $self->realloc;
1804 1821
1805 1 1822 1
1806} 1823}
1807 1824
1808sub focus_in { 1825sub invoke_focus_in {
1809 my ($self) = @_; 1826 my ($self) = @_;
1810 1827
1811 $self->{last_activity} = $::NOW; 1828 $self->{last_activity} = $::NOW;
1812 1829
1813 $self->SUPER::focus_in; 1830 $self->SUPER::invoke_focus_in
1814} 1831}
1815 1832
1816sub button_down { 1833sub invoke_button_down {
1817 my ($self, $ev, $x, $y) = @_; 1834 my ($self, $ev, $x, $y) = @_;
1818 1835
1819 $self->SUPER::button_down ($ev, $x, $y); 1836 $self->SUPER::invoke_button_down ($ev, $x, $y);
1820 1837
1821 my $idx = $self->{layout}->xy_to_index ($x, $y); 1838 my $idx = $self->{layout}->xy_to_index ($x, $y);
1822 1839
1823 # byte-index to char-index 1840 # byte-index to char-index
1824 my $text = $self->{text}; 1841 my $text = $self->{text};
… …
1829 $self->update; 1846 $self->update;
1830 1847
1831 1 1848 1
1832} 1849}
1833 1850
1834sub mouse_motion { 1851sub invoke_mouse_motion {
1835 my ($self, $ev, $x, $y) = @_; 1852 my ($self, $ev, $x, $y) = @_;
1836# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1853# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1837 1854
1838 0 1855 1
1839} 1856}
1840 1857
1841sub _draw { 1858sub _draw {
1842 my ($self) = @_; 1859 my ($self) = @_;
1843 1860
… …
1884 1901
1885our @ISA = CFClient::UI::EntryBase::; 1902our @ISA = CFClient::UI::EntryBase::;
1886 1903
1887use CFClient::OpenGL; 1904use CFClient::OpenGL;
1888 1905
1889sub key_down { 1906sub invoke_key_down {
1890 my ($self, $ev) = @_; 1907 my ($self, $ev) = @_;
1891 1908
1892 my $sym = $ev->{sym}; 1909 my $sym = $ev->{sym};
1893 1910
1894 if ($sym == 13) { 1911 if ($sym == 13) {
1895 unshift @{$self->{history}}, 1912 unshift @{$self->{history}},
1896 my $txt = $self->get_text; 1913 my $txt = $self->get_text;
1914
1897 $self->{history_pointer} = -1; 1915 $self->{history_pointer} = -1;
1898 $self->{history_saveback} = ''; 1916 $self->{history_saveback} = '';
1899 $self->_emit (activate => $txt); 1917 $self->emit (activate => $txt);
1900 $self->update; 1918 $self->update;
1901 1919
1902 } elsif ($sym == CFClient::SDLK_UP) { 1920 } elsif ($sym == CFClient::SDLK_UP) {
1903 if ($self->{history_pointer} < 0) { 1921 if ($self->{history_pointer} < 0) {
1904 $self->{history_saveback} = $self->get_text; 1922 $self->{history_saveback} = $self->get_text;
… …
1920 } else { 1938 } else {
1921 $self->set_text ($self->{history_saveback}); 1939 $self->set_text ($self->{history_saveback});
1922 } 1940 }
1923 1941
1924 } else { 1942 } else {
1925 return $self->SUPER::key_down ($ev) 1943 return $self->SUPER::invoke_key_down ($ev)
1926 } 1944 }
1927 1945
1928 1 1946 1
1929} 1947}
1930 1948
… …
1954 can_events => 1, 1972 can_events => 1,
1955 @_ 1973 @_
1956 ) 1974 )
1957} 1975}
1958 1976
1959sub activate { }
1960
1961sub button_up { 1977sub invoke_button_up {
1962 my ($self, $ev, $x, $y) = @_; 1978 my ($self, $ev, $x, $y) = @_;
1963 1979
1964 $self->emit ("activate") 1980 $self->emit ("activate")
1965 if $x >= 0 && $x < $self->{w} 1981 if $x >= 0 && $x < $self->{w}
1966 && $y >= 0 && $y < $self->{h}; 1982 && $y >= 0 && $y < $self->{h};
… …
2008 can_events => 1, 2024 can_events => 1,
2009 @_ 2025 @_
2010 ); 2026 );
2011} 2027}
2012 2028
2013sub activate { }
2014
2015sub button_up { 2029sub invoke_button_up {
2016 my ($self, $ev, $x, $y) = @_; 2030 my ($self, $ev, $x, $y) = @_;
2017 2031
2018 $self->emit ("activate") 2032 $self->emit ("activate")
2019 if $x >= 0 && $x < $self->{w} 2033 if $x >= 0 && $x < $self->{w}
2020 && $y >= 0 && $y < $self->{h}; 2034 && $y >= 0 && $y < $self->{h};
… …
2054 my ($self) = @_; 2068 my ($self) = @_;
2055 2069
2056 (6) x 2 2070 (6) x 2
2057} 2071}
2058 2072
2059sub button_down { 2073sub invoke_button_down {
2060 my ($self, $ev, $x, $y) = @_; 2074 my ($self, $ev, $x, $y) = @_;
2061 2075
2062 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2076 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2063 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2077 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2064 $self->{state} = !$self->{state}; 2078 $self->{state} = !$self->{state};
2065 $self->_emit (changed => $self->{state}); 2079 $self->emit (changed => $self->{state});
2066 } else { 2080 } else {
2067 return 0 2081 return 0
2068 } 2082 }
2069 2083
2070 1 2084 1
… …
2095package CFClient::UI::Image; 2109package CFClient::UI::Image;
2096 2110
2097our @ISA = CFClient::UI::Base::; 2111our @ISA = CFClient::UI::Base::;
2098 2112
2099use CFClient::OpenGL; 2113use CFClient::OpenGL;
2100use Carp qw/confess/;
2101 2114
2102our %loaded_images; 2115our %texture_cache;
2103 2116
2104sub new { 2117sub new {
2105 my $class = shift; 2118 my $class = shift;
2106 2119
2107 my $self = $class->SUPER::new (can_events => 0, @_); 2120 my $self = $class->SUPER::new (
2121 can_events => 0,
2122 @_,
2123 );
2108 2124
2109 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2125 $self->{path}
2126 or Carp::croak "required attribute 'path' not set";
2110 2127
2111 $loaded_images{$self->{image}} ||= 2128 $self->{tex} = $texture_cache{$self->{path}} ||=
2112 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2129 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2113 2130
2114 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2131 Scalar::Util::weaken $texture_cache{$self->{path}};
2115 2132
2116 Scalar::Util::weaken $loaded_images{$self->{image}}; 2133 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2117
2118 $self->{aspect} = $tex->{w} / $tex->{h};
2119 2134
2120 $self 2135 $self
2121} 2136}
2122 2137
2123sub size_request { 2138sub size_request {
2124 my ($self) = @_; 2139 my ($self) = @_;
2125 2140
2126 ($self->{tex}->{w}, $self->{tex}->{h}) 2141 ($self->{tex}{w}, $self->{tex}{h})
2127} 2142}
2128 2143
2129sub _draw { 2144sub _draw {
2130 my ($self) = @_; 2145 my ($self) = @_;
2131 2146
… …
2240 my $ycut1 = max 0, min 1, $ycut; 2255 my $ycut1 = max 0, min 1, $ycut;
2241 my $ycut2 = max 0, min 1, $ycut - 1; 2256 my $ycut2 = max 0, min 1, $ycut - 1;
2242 2257
2243 my $h1 = $self->{h} * (1 - $ycut1); 2258 my $h1 = $self->{h} * (1 - $ycut1);
2244 my $h2 = $self->{h} * (1 - $ycut2); 2259 my $h2 = $self->{h} * (1 - $ycut2);
2260 my $h3 = $self->{h};
2261
2262 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2245 2263
2246 glEnable GL_BLEND; 2264 glEnable GL_BLEND;
2247 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2265 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2248 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2266 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2249 glEnable GL_TEXTURE_2D; 2267 glEnable GL_TEXTURE_2D;
… …
2268 2286
2269 if ($t3) { 2287 if ($t3) {
2270 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2288 glBindTexture GL_TEXTURE_2D, $t3->{name};
2271 glBegin GL_QUADS; 2289 glBegin GL_QUADS;
2272 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2290 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2273 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2291 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2274 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2292 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2275 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2293 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2276 glEnd; 2294 glEnd;
2277 } 2295 }
2278 2296
2279 glDisable GL_BLEND; 2297 glDisable GL_BLEND;
… …
2367 $self->update; 2385 $self->update;
2368 2386
2369 $self 2387 $self
2370} 2388}
2371 2389
2372sub changed { }
2373
2374sub set_range { 2390sub set_range {
2375 my ($self, $range) = @_; 2391 my ($self, $range) = @_;
2376 2392
2377 ($range, $self->{range}) = ($self->{range}, $range); 2393 ($range, $self->{range}) = ($self->{range}, $range);
2378 2394
… …
2398 if $unit; 2414 if $unit;
2399 2415
2400 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2416 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2401 2417
2402 if ($value != $old_value) { 2418 if ($value != $old_value) {
2403 $self->_emit (changed => $value); 2419 $self->emit (changed => $value);
2404 $self->update; 2420 $self->update;
2405 } 2421 }
2406} 2422}
2407 2423
2408sub size_request { 2424sub size_request {
2409 my ($self) = @_; 2425 my ($self) = @_;
2410 2426
2411 ($self->{req_w}, $self->{req_h}) 2427 ($self->{req_w}, $self->{req_h})
2412} 2428}
2413 2429
2414sub button_down { 2430sub invoke_button_down {
2415 my ($self, $ev, $x, $y) = @_; 2431 my ($self, $ev, $x, $y) = @_;
2416 2432
2417 $self->SUPER::button_down ($ev, $x, $y); 2433 $self->SUPER::invoke_button_down ($ev, $x, $y);
2418 2434
2419 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2435 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2420 2436
2421 $self->mouse_motion ($ev, $x, $y) 2437 $self->invoke_mouse_motion ($ev, $x, $y)
2422} 2438}
2423 2439
2424sub mouse_motion { 2440sub invoke_mouse_motion {
2425 my ($self, $ev, $x, $y) = @_; 2441 my ($self, $ev, $x, $y) = @_;
2426 2442
2427 if ($GRAB == $self) { 2443 if ($GRAB == $self) {
2428 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2444 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2429 2445
… …
2571 2587
2572 $self->{fontsize} = $fontsize; 2588 $self->{fontsize} = $fontsize;
2573 $self->reflow; 2589 $self->reflow;
2574} 2590}
2575 2591
2592sub size_request {
2593 my ($self) = @_;
2594
2595 my ($empty, $slider) = @{ $self->{children} };
2596
2597 local $self->{children} = [$empty, $slider];
2598 $self->SUPER::size_request
2599}
2600
2576sub size_allocate { 2601sub invoke_size_allocate {
2577 my ($self, $w, $h) = @_; 2602 my ($self, $w, $h) = @_;
2578 2603
2579 $self->SUPER::size_allocate ($w, $h); 2604 my ($empty, $slider, @other) = @{ $self->{children} };
2605 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2580 2606
2581 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2607 $self->{layout}->set_font ($self->{font}) if $self->{font};
2582 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2608 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2583 $self->{layout}->set_width ($self->{children}[0]{w}); 2609 $self->{layout}->set_width ($empty->{w});
2584 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2610 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2585 2611
2586 $self->reflow; 2612 $self->reflow;
2587}
2588 2613
2589sub text_size { 2614 local $self->{children} = [$empty, $slider];
2590 my ($self, $text, $indent) = @_; 2615 $self->SUPER::invoke_size_allocate ($w, $h)
2616}
2617
2618sub get_layout {
2619 my ($self, $para) = @_;
2591 2620
2592 my $layout = $self->{layout}; 2621 my $layout = $self->{layout};
2593 2622
2623 $layout->set_font ($self->{font}) if $self->{font};
2624 $layout->set_foreground (@{$para->{fg}});
2594 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2625 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2595 $layout->set_width ($self->{children}[0]{w} - $indent); 2626 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2627 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2597 $layout->set_markup ($text); 2628 $layout->set_markup ($para->{markup});
2629
2630 $layout->set_shapes (
2631 map
2632 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2633 @{$para->{widget}}
2598 2634 );
2635
2599 $layout->size 2636 $layout
2600} 2637}
2601 2638
2602sub reflow { 2639sub reflow {
2603 my ($self) = @_; 2640 my ($self) = @_;
2604 2641
… …
2613 $self->{children}[1]->set_value ($offset); 2650 $self->{children}[1]->set_value ($offset);
2614} 2651}
2615 2652
2616sub clear { 2653sub clear {
2617 my ($self) = @_; 2654 my ($self) = @_;
2655
2656 my (undef, undef, @other) = @{ $self->{children} };
2657 $self->remove ($_) for @other;
2618 2658
2619 $self->{par} = []; 2659 $self->{par} = [];
2620 $self->{height} = 0; 2660 $self->{height} = 0;
2621 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2661 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2622} 2662}
2623 2663
2624sub add_paragraph { 2664sub add_paragraph {
2625 my ($self, $color, $text, $indent) = @_; 2665 my ($self, $color, $para, $indent) = @_;
2626 2666
2627 for my $line (split /\n/, $text) { 2667 my ($text, @w) = ref $para ? @$para : $para;
2628 my ($w, $h) = $self->text_size ($line); 2668
2629 $self->{height} += $h; 2669 $para = {
2630 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2670 w => 1e10,
2671 wrapped => 1,
2672 fg => $color,
2673 indent => $indent,
2674 markup => $text,
2675 widget => \@w,
2631 } 2676 };
2632 2677
2633 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2678 $self->add (@w) if @w;
2679 push @{$self->{par}}, $para;
2680
2681 $self->{need_reflow}++;
2682 $self->update;
2683}
2684
2685sub scroll_to_bottom {
2686 my ($self) = @_;
2687
2688 $self->{scroll_to_bottom} = 1;
2689 $self->update;
2634} 2690}
2635 2691
2636sub update { 2692sub update {
2637 my ($self) = @_; 2693 my ($self) = @_;
2638 2694
… …
2646 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2702 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2647 2703
2648 if (delete $self->{need_reflow}) { 2704 if (delete $self->{need_reflow}) {
2649 my $height = 0; 2705 my $height = 0;
2650 2706
2651 my $layout = $self->{layout};
2652
2653 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2654
2655 for (@{$self->{par}}) { 2707 for my $para (@{$self->{par}}) {
2656 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2708 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2657 $layout->set_width ($W - $_->[3]); 2709 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; 2710 my ($w, $h) = $layout->size;
2661 $_->[0] = $w + $_->[3]; 2711
2662 $_->[1] = $h; 2712 $para->{w} = $w + $para->{indent};
2713 $para->{h} = $h;
2714 $para->{wrapped} = $layout->has_wrapped;
2663 } 2715 }
2664 2716
2665 $height += $_->[1]; 2717 $height += $para->{h};
2666 } 2718 }
2667 2719
2668 $self->{height} = $height; 2720 $self->{height} = $height;
2669 2721
2670 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2722 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2671 2723
2672 delete $self->{texture}; 2724 delete $self->{texture};
2725 }
2726
2727 if (delete $self->{scroll_to_bottom}) {
2728 $self->{children}[1]->set_value (1e10);
2673 } 2729 }
2674 2730
2675 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2731 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2676 glClearColor 0, 0, 0, 0; 2732 glClearColor 0, 0, 0, 0;
2677 glClear GL_COLOR_BUFFER_BIT; 2733 glClear GL_COLOR_BUFFER_BIT;
… …
2681 my $y0 = $top; 2737 my $y0 = $top;
2682 my $y1 = $top + $H; 2738 my $y1 = $top + $H;
2683 2739
2684 my $y = 0; 2740 my $y = 0;
2685 2741
2686 my $layout = $self->{layout};
2687
2688 $layout->set_font ($self->{font}) if $self->{font};
2689
2690 glEnable GL_BLEND; 2742 glEnable GL_BLEND;
2691 #TODO# not correct in windows where rgba is forced off 2743 #TODO# not correct in windows where rgba is forced off
2692 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2744 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2693 2745
2694 for my $par (@{$self->{par}}) { 2746 for my $para (@{$self->{par}}) {
2695 my $h = $par->[1]; 2747 my $h = $para->{h};
2696 2748
2697 if ($y0 < $y + $h && $y < $y1) { 2749 if ($y0 < $y + $h && $y < $y1) {
2698 $layout->set_foreground (@{ $par->[2] }); 2750
2699 $layout->set_width ($W - $par->[3]); 2751 my $layout = $self->get_layout ($para);
2700 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2701 $layout->set_markup ($par->[4]);
2702 2752
2703 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2753 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2704 2754
2705 glRasterPos $par->[3], $y - $y0; 2755 glRasterPos $para->{indent}, $y - $y0;
2706 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2756 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2757
2758 if (my @w = @{ $para->{widget} }) {
2759 my @s = $layout->get_shapes;
2760
2761 glDisable GL_BLEND;
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 glEnable GL_BLEND;
2771 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2772 }
2707 } 2773 }
2708 2774
2709 $y += $h; 2775 $y += $h;
2710 } 2776 }
2711 2777
2712 glDisable GL_BLEND; 2778 glDisable GL_BLEND;
2713 }; 2779 };
2714 }); 2780 });
2781}
2782
2783sub reconfigure {
2784 my ($self) = @_;
2785
2786 $self->SUPER::reconfigure;
2787
2788 $_->{w} = 1e10 for @{ $self->{par} };
2789 $self->reflow;
2715} 2790}
2716 2791
2717sub _draw { 2792sub _draw {
2718 my ($self) = @_; 2793 my ($self) = @_;
2719 2794
… …
2722 glColor 0, 0, 0, 1; 2797 glColor 0, 0, 0, 1;
2723 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2798 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2724 glDisable GL_TEXTURE_2D; 2799 glDisable GL_TEXTURE_2D;
2725 2800
2726 $self->{children}[1]->draw; 2801 $self->{children}[1]->draw;
2727
2728} 2802}
2729 2803
2730############################################################################# 2804#############################################################################
2731 2805
2732package CFClient::UI::Animator; 2806package CFClient::UI::Animator;
… …
2841 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2915 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2842 2916
2843 ($w + 4, $h + 4) 2917 ($w + 4, $h + 4)
2844} 2918}
2845 2919
2846sub size_allocate { 2920sub invoke_size_allocate {
2847 my ($self, $w, $h) = @_; 2921 my ($self, $w, $h) = @_;
2848 2922
2849 $self->SUPER::size_allocate ($w - 4, $h - 4); 2923 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2850} 2924}
2851 2925
2852sub visibility_change { 2926sub invoke_visibility_change {
2853 my ($self, $visible) = @_; 2927 my ($self, $visible) = @_;
2854 2928
2855 return unless $visible; 2929 return unless $visible;
2856 2930
2857 $self->{root}->on_post_alloc ("move_$self" => sub { 2931 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
3024 3098
3025# popup given the event (must be a mouse button down event currently) 3099# popup given the event (must be a mouse button down event currently)
3026sub popup { 3100sub popup {
3027 my ($self, $ev) = @_; 3101 my ($self, $ev) = @_;
3028 3102
3029 $self->_emit ("popdown"); 3103 $self->emit ("popdown");
3030 3104
3031 # maybe save $GRAB? must be careful about events... 3105 # maybe save $GRAB? must be careful about events...
3032 $GRAB = $self; 3106 $GRAB = $self;
3033 $self->{button} = $ev->{button}; 3107 $self->{button} = $ev->{button};
3034 3108
3035 $self->show; 3109 $self->show;
3036 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3110 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
3037} 3111}
3038 3112
3039sub mouse_motion { 3113sub invoke_mouse_motion {
3040 my ($self, $ev, $x, $y) = @_; 3114 my ($self, $ev, $x, $y) = @_;
3041 3115
3042 # TODO: should use vbox->find_widget or so 3116 # TODO: should use vbox->find_widget or so
3043 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3117 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
3044 $self->{hover} = $self->{item}{$HOVER}; 3118 $self->{hover} = $self->{item}{$HOVER};
3045 3119
3046 0 3120 0
3047} 3121}
3048 3122
3049sub button_up { 3123sub invoke_button_up {
3050 my ($self, $ev, $x, $y) = @_; 3124 my ($self, $ev, $x, $y) = @_;
3051 3125
3052 if ($ev->{button} == $self->{button}) { 3126 if ($ev->{button} == $self->{button}) {
3053 undef $GRAB; 3127 undef $GRAB;
3054 $self->hide; 3128 $self->hide;
3055 3129
3056 $self->_emit ("popdown"); 3130 $self->emit ("popdown");
3057 $self->{hover}[1]->() if $self->{hover}; 3131 $self->{hover}[1]->() if $self->{hover};
3058 } else { 3132 } else {
3059 return 0 3133 return 0
3060 } 3134 }
3061 3135
… …
3098 : $self->{children}[$page_or_widget]; 3172 : $self->{children}[$page_or_widget];
3099 3173
3100 $self->{current} = $widget; 3174 $self->{current} = $widget;
3101 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3175 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3102 3176
3103 $self->_emit (page_changed => $self->{current}); 3177 $self->emit (page_changed => $self->{current});
3104 3178
3105 $self->realloc; 3179 $self->realloc;
3106} 3180}
3107 3181
3108sub visible_children { 3182sub visible_children {
… …
3113 my ($self) = @_; 3187 my ($self) = @_;
3114 3188
3115 $self->{current}->size_request 3189 $self->{current}->size_request
3116} 3190}
3117 3191
3118sub size_allocate { 3192sub invoke_size_allocate {
3119 my ($self, $w, $h) = @_; 3193 my ($self, $w, $h) = @_;
3120 3194
3121 $self->{current}->configure (0, 0, $w, $h); 3195 $self->{current}->configure (0, 0, $w, $h);
3196
3197 1
3122} 3198}
3123 3199
3124sub _draw { 3200sub _draw {
3125 my ($self) = @_; 3201 my ($self) = @_;
3126 3202
… …
3165 3241
3166sub set_current_page { 3242sub set_current_page {
3167 my ($self, $page) = @_; 3243 my ($self, $page) = @_;
3168 3244
3169 $self->{multiplexer}->set_current_page ($page); 3245 $self->{multiplexer}->set_current_page ($page);
3170 $self->_emit (page_changed => $self->{multiplexer}{current}); 3246 $self->emit (page_changed => $self->{multiplexer}{current});
3171} 3247}
3172 3248
3173############################################################################# 3249#############################################################################
3174 3250
3175package CFClient::UI::Combobox; 3251package CFClient::UI::Combobox;
… …
3190 $self->_set_value ($self->{value}); 3266 $self->_set_value ($self->{value});
3191 3267
3192 $self 3268 $self
3193} 3269}
3194 3270
3195sub button_down { 3271sub invoke_button_down {
3196 my ($self, $ev) = @_; 3272 my ($self, $ev) = @_;
3197 3273
3198 my @menu_items; 3274 my @menu_items;
3199 3275
3200 for (@{ $self->{options} }) { 3276 for (@{ $self->{options} }) {
… …
3221 my ($self, $value) = @_; 3297 my ($self, $value) = @_;
3222 3298
3223 return unless $self->{value} ne $value; 3299 return unless $self->{value} ne $value;
3224 3300
3225 $self->_set_value ($value); 3301 $self->_set_value ($value);
3226 $self->_emit (changed => $value); 3302 $self->emit (changed => $value);
3227} 3303}
3228 3304
3229############################################################################# 3305#############################################################################
3230 3306
3231package CFClient::UI::Statusbox; 3307package CFClient::UI::Statusbox;
… …
3346 count => 1, 3422 count => 1,
3347 %arg, 3423 %arg,
3348 }; 3424 };
3349 } 3425 }
3350 3426
3427 $ROOT->on_refresh (reorder => sub {
3351 $self->reorder; 3428 $self->reorder;
3429 });
3352} 3430}
3353 3431
3354sub reconfigure { 3432sub reconfigure {
3355 my ($self) = @_; 3433 my ($self) = @_;
3356 3434
… …
3371 3449
3372############################################################################# 3450#############################################################################
3373 3451
3374package CFClient::UI::Inventory; 3452package CFClient::UI::Inventory;
3375 3453
3376our @ISA = CFClient::UI::ScrolledWindow::; 3454our @ISA = CFClient::UI::Table::;
3377 3455
3378sub new { 3456sub new {
3379 my $class = shift; 3457 my $class = shift;
3380 3458
3381 my $self = $class->SUPER::new ( 3459 my $self = $class->SUPER::new (
3382 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3460 col_expand => [0, 1, 0],
3383 @_, 3461 @_,
3384 ); 3462 );
3385 3463
3386 $self 3464 $self
3387} 3465}
3388 3466
3389sub set_items { 3467sub set_items {
3390 my ($self, $items) = @_; 3468 my ($self, $items) = @_;
3391 3469
3392 $self->{child}->clear; 3470 $self->clear;
3393 return unless $items; 3471 return unless $items;
3394 3472
3395 my @items = sort { 3473 my @items = sort {
3396 ($a->{type} <=> $b->{type}) 3474 ($a->{type} <=> $b->{type})
3397 or ($a->{name} cmp $b->{name}) 3475 or ($a->{name} cmp $b->{name})
3398 } @$items; 3476 } values %$items;
3399 3477
3400 $self->{real_items} = \@items; 3478 $self->{real_items} = \@items;
3401 3479
3402 my $row = 0; 3480 my $row = 0;
3403 for my $item (@items) { 3481 for my $item (@items) {
3404 CFClient::Item::update_widgets $item; 3482 CFClient::Item::update_widgets $item;
3405 3483
3406 $self->{child}->add (0, $row, $item->{face_widget}); 3484 $self->add (0, $row, $item->{face_widget});
3407 $self->{child}->add (1, $row, $item->{desc_widget}); 3485 $self->add (1, $row, $item->{desc_widget});
3408 $self->{child}->add (2, $row, $item->{weight_widget}); 3486 $self->add (2, $row, $item->{weight_widget});
3409 3487
3410 $row++; 3488 $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 } 3489 }
3610} 3490}
3611 3491
3612############################################################################# 3492#############################################################################
3613 3493
… …
3667 } elsif ($ev->{button} == 2) { 3547 } elsif ($ev->{button} == 2) {
3668 $::CONN->user_send ("invoke $spell->{name}"); 3548 $::CONN->user_send ("invoke $spell->{name}");
3669 } elsif ($ev->{button} == 3) { 3549 } elsif ($ev->{button} == 3) {
3670 (new CFClient::UI::Menu 3550 (new CFClient::UI::Menu
3671 items => [ 3551 items => [
3672 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }], 3552 ["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}"]) }], 3553 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3674 ], 3554 ],
3675 )->popup ($ev); 3555 )->popup ($ev);
3676 } else { 3556 } else {
3677 return 0; 3557 return 0;
… …
3772 $coord = $max - $size if $coord > $max - $size; 3652 $coord = $max - $size if $coord > $max - $size;
3773 3653
3774 int $coord + 0.5 3654 int $coord + 0.5
3775} 3655}
3776 3656
3777sub size_allocate { 3657sub invoke_size_allocate {
3778 my ($self, $w, $h) = @_; 3658 my ($self, $w, $h) = @_;
3779 3659
3780 for my $child ($self->children) { 3660 for my $child ($self->children) {
3781 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3661 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3782 3662
… …
3786 $X = _to_pixel $X, $W, $self->{w}; 3666 $X = _to_pixel $X, $W, $self->{w};
3787 $Y = _to_pixel $Y, $H, $self->{h}; 3667 $Y = _to_pixel $Y, $H, $self->{h};
3788 3668
3789 $child->configure ($X, $Y, $W, $H); 3669 $child->configure ($X, $Y, $W, $H);
3790 } 3670 }
3671
3672 1
3791} 3673}
3792 3674
3793sub coord2local { 3675sub coord2local {
3794 my ($self, $x, $y) = @_; 3676 my ($self, $x, $y) = @_;
3795 3677

Diff Legend

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