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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.302 by root, Mon Jun 12 13:26:14 2006 UTC vs.
Revision 1.317 by root, Sun Jul 2 18:52:05 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
1097 if ($self->{has_close_button}) {
1098 $self->{close_button} =
1099 new CFClient::UI::ImageButton
1100 path => 'x1_close.png',
1101 on_activate => sub { $self->emit ("delete") };
1102
1103 $self->CFClient::UI::Container::add ($self->{close_button});
1104 }
1105
1095 $self 1106 $self
1096} 1107}
1097 1108
1098sub add { 1109sub add {
1099 my ($self, @widgets) = @_; 1110 my ($self, @widgets) = @_;
1100 1111
1101 $self->SUPER::add (@widgets); 1112 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1102 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1114 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1103} 1115}
1104 1116
1105sub border { 1117sub border {
1106 int $_[0]{border} * $::FONTSIZE 1118 int $_[0]{border} * $::FONTSIZE
… …
1109sub size_request { 1121sub size_request {
1110 my ($self) = @_; 1122 my ($self) = @_;
1111 1123
1112 $self->{title_widget}->size_request 1124 $self->{title_widget}->size_request
1113 if $self->{title_widget}; 1125 if $self->{title_widget};
1126
1127 $self->{close_button}->size_request
1128 if $self->{close_button};
1114 1129
1115 my ($w, $h) = $self->SUPER::size_request; 1130 my ($w, $h) = $self->SUPER::size_request;
1116 1131
1117 ( 1132 (
1118 $w + $self->border * 2, 1133 $w + $self->border * 2,
1119 $h + $self->border * 2, 1134 $h + $self->border * 2,
1120 ) 1135 )
1121} 1136}
1122 1137
1123sub size_allocate { 1138sub invoke_size_allocate {
1124 my ($self, $w, $h) = @_; 1139 my ($self, $w, $h) = @_;
1125 1140
1126 if ($self->{title_widget}) { 1141 if ($self->{title_widget}) {
1127 $self->{title_widget}{w} = $w; 1142 $self->{title_widget}{w} = $w;
1128 $self->{title_widget}{h} = $h; 1143 $self->{title_widget}{h} = $h;
1129 $self->{title_widget}->size_allocate ($w, $h); 1144 $self->{title_widget}->invoke_size_allocate ($w, $h);
1130 } 1145 }
1131 1146
1132 my $border = $self->border; 1147 my $border = $self->border;
1133 1148
1134 $h -= List::Util::max 0, $border * 2; 1149 $h -= List::Util::max 0, $border * 2;
1135 $w -= List::Util::max 0, $border * 2; 1150 $w -= List::Util::max 0, $border * 2;
1151
1152 $self->child->configure ($border, $border, $w, $h);
1153
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button};
1156
1157 1
1158}
1159
1160sub invoke_delete {
1161 my ($self) = @_;
1162
1163 $self->hide;
1136 1164
1137 $self->child->configure ($border, $border, $w, $h); 1165 1
1138} 1166}
1139 1167
1140sub button_down { 1168sub invoke_button_down {
1141 my ($self, $ev, $x, $y) = @_; 1169 my ($self, $ev, $x, $y) = @_;
1142 1170
1143 my ($w, $h) = @$self{qw(w h)}; 1171 my ($w, $h) = @$self{qw(w h)};
1144 my $border = $self->border; 1172 my $border = $self->border;
1145 1173
… …
1176 1204
1177 ($x, $y) = ($ev->{x}, $ev->{y}); 1205 ($x, $y) = ($ev->{x}, $ev->{y});
1178 1206
1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1207 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180 # HACK: the next line is required to enforce placement 1208 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1209 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1182 }; 1210 };
1183 } else { 1211 } else {
1184 return 0; 1212 return 0;
1185 } 1213 }
1186 1214
1187 1 1215 1
1188} 1216}
1189 1217
1190sub button_up { 1218sub invoke_button_up {
1191 my ($self, $ev, $x, $y) = @_; 1219 my ($self, $ev, $x, $y) = @_;
1192 1220
1193 !!delete $self->{motion} 1221 ! ! delete $self->{motion}
1194} 1222}
1195 1223
1196sub mouse_motion { 1224sub invoke_mouse_motion {
1197 my ($self, $ev, $x, $y) = @_; 1225 my ($self, $ev, $x, $y) = @_;
1198 1226
1199 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1227 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200 1228
1201 !!$self->{motion} 1229 ! ! $self->{motion}
1202} 1230}
1203 1231
1204sub _draw { 1232sub _draw {
1205 my ($self) = @_; 1233 my ($self) = @_;
1206 1234
… …
1235 $child->draw; 1263 $child->draw;
1236 1264
1237 if ($self->{title_widget}) { 1265 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h}; 1266 glTranslate 0, $border - $self->{h};
1239 $self->{title_widget}->_draw; 1267 $self->{title_widget}->_draw;
1268
1269 glTranslate 0, - ($border - $self->{h});
1240 } 1270 }
1271
1272 $self->{close_button}->draw
1273 if $self->{close_button};
1241} 1274}
1242 1275
1243############################################################################# 1276#############################################################################
1244 1277
1245package CFClient::UI::Table; 1278package CFClient::UI::Table;
… …
1324 (sum @$ws), 1357 (sum @$ws),
1325 (sum @$hs), 1358 (sum @$hs),
1326 ) 1359 )
1327} 1360}
1328 1361
1329sub size_allocate { 1362sub invoke_size_allocate {
1330 my ($self, $w, $h) = @_; 1363 my ($self, $w, $h) = @_;
1331 1364
1332 my ($ws, $hs) = $self->get_wh; 1365 my ($ws, $hs) = $self->get_wh;
1333 1366
1334 my $req_w = (sum @$ws) || 1; 1367 my $req_w = (sum @$ws) || 1;
… …
1366 } 1399 }
1367 1400
1368 $y += $row_h; 1401 $y += $row_h;
1369 } 1402 }
1370 1403
1404 1
1371} 1405}
1372 1406
1373sub find_widget { 1407sub find_widget {
1374 my ($self, $x, $y) = @_; 1408 my ($self, $x, $y) = @_;
1375 1409
… …
1412 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1446 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1413 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1447 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1414 ) 1448 )
1415} 1449}
1416 1450
1417sub size_allocate { 1451sub invoke_size_allocate {
1418 my ($self, $w, $h) = @_; 1452 my ($self, $w, $h) = @_;
1419 1453
1420 my $space = $self->{vertical} ? $h : $w; 1454 my $space = $self->{vertical} ? $h : $w;
1421 my $children = $self->{children}; 1455 my @children = $self->visible_children;
1422 1456
1423 my @req; 1457 my @req;
1424 1458
1425 if ($self->{homogeneous}) { 1459 if ($self->{homogeneous}) {
1426 @req = ($space / (@$children || 1)) x @$children; 1460 @req = ($space / (@children || 1)) x @children;
1427 } else { 1461 } else {
1428 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1462 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1429 my $req = List::Util::sum @req; 1463 my $req = List::Util::sum @req;
1430 1464
1431 if ($req > $space) { 1465 if ($req > $space) {
1432 # ah well, not enough space 1466 # ah well, not enough space
1433 $_ *= $space / $req for @req; 1467 $_ *= $space / $req for @req;
1434 } else { 1468 } else {
1435 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1469 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1436 1470
1437 $space = ($space - $req) / $expand; # remaining space to give away 1471 $space = ($space - $req) / $expand; # remaining space to give away
1438 1472
1439 $req[$_] += $space * $children->[$_]{expand} 1473 $req[$_] += $space * $children[$_]{expand}
1440 for 0 .. $#$children; 1474 for 0 .. $#children;
1441 } 1475 }
1442 } 1476 }
1443 1477
1444 CFClient::UI::harmonize \@req; 1478 CFClient::UI::harmonize \@req;
1445 1479
1446 my $pos = 0; 1480 my $pos = 0;
1447 for (0 .. $#$children) { 1481 for (0 .. $#children) {
1448 my $alloc = $req[$_]; 1482 my $alloc = $req[$_];
1449 $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));
1450 1484
1451 $pos += $alloc; 1485 $pos += $alloc;
1452 } 1486 }
1453 1487
1454 1 1488 1
… …
1609 }; 1643 };
1610 1644
1611 @{ $self->{size_req} } 1645 @{ $self->{size_req} }
1612} 1646}
1613 1647
1648sub baseline_shift {
1649 $_[0]{layout}->descent
1650}
1651
1614sub size_allocate { 1652sub invoke_size_allocate {
1615 my ($self, $w, $h) = @_; 1653 my ($self, $w, $h) = @_;
1616 1654
1617 delete $self->{ox}; 1655 delete $self->{ox};
1618 1656
1619 delete $self->{texture} 1657 delete $self->{texture}
1620 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
1621} 1661}
1622 1662
1623sub set_fontsize { 1663sub set_fontsize {
1624 my ($self, $fontsize) = @_; 1664 my ($self, $fontsize) = @_;
1625 1665
1626 $self->{fontsize} = $fontsize; 1666 $self->{fontsize} = $fontsize;
1667 delete $self->{size_req};
1627 delete $self->{texture}; 1668 delete $self->{texture};
1628 1669
1629 $self->realloc; 1670 $self->realloc;
1630} 1671}
1631 1672
… …
1718 1759
1719 $text =~ s/./*/g if $self->{hidden}; 1760 $text =~ s/./*/g if $self->{hidden};
1720 $self->{layout}->set_text ("$text "); 1761 $self->{layout}->set_text ("$text ");
1721 delete $self->{size_req}; 1762 delete $self->{size_req};
1722 1763
1723 $self->_emit (changed => $self->{text}); 1764 $self->emit (changed => $self->{text});
1724 1765
1725 $self->realloc; 1766 $self->realloc;
1726 $self->update; 1767 $self->update;
1727} 1768}
1728 1769
… …
1743 my ($w, $h) = $self->SUPER::size_request; 1784 my ($w, $h) = $self->SUPER::size_request;
1744 1785
1745 ($w + 1, $h) # add 1 for cursor 1786 ($w + 1, $h) # add 1 for cursor
1746} 1787}
1747 1788
1748sub key_down { 1789sub invoke_key_down {
1749 my ($self, $ev) = @_; 1790 my ($self, $ev) = @_;
1750 1791
1751 my $mod = $ev->{mod}; 1792 my $mod = $ev->{mod};
1752 my $sym = $ev->{sym}; 1793 my $sym = $ev->{sym};
1753 my $uni = $ev->{unicode}; 1794 my $uni = $ev->{unicode};
… …
1765 } elsif ($sym == CFClient::SDLK_HOME) { 1806 } elsif ($sym == CFClient::SDLK_HOME) {
1766 $self->{cursor} = 0; 1807 $self->{cursor} = 0;
1767 } elsif ($sym == CFClient::SDLK_END) { 1808 } elsif ($sym == CFClient::SDLK_END) {
1768 $self->{cursor} = length $text; 1809 $self->{cursor} = length $text;
1769 } elsif ($uni == 27) { 1810 } elsif ($uni == 27) {
1770 $self->_emit ('escape'); 1811 $self->emit ('escape');
1771 } elsif ($uni) { 1812 } elsif ($uni) {
1772 substr $text, $self->{cursor}++, 0, chr $uni; 1813 substr $text, $self->{cursor}++, 0, chr $uni;
1773 } else { 1814 } else {
1774 return 0; 1815 return 0;
1775 } 1816 }
… …
1779 $self->realloc; 1820 $self->realloc;
1780 1821
1781 1 1822 1
1782} 1823}
1783 1824
1784sub focus_in { 1825sub invoke_focus_in {
1785 my ($self) = @_; 1826 my ($self) = @_;
1786 1827
1787 $self->{last_activity} = $::NOW; 1828 $self->{last_activity} = $::NOW;
1788 1829
1789 $self->SUPER::focus_in; 1830 $self->SUPER::invoke_focus_in
1790} 1831}
1791 1832
1792sub button_down { 1833sub invoke_button_down {
1793 my ($self, $ev, $x, $y) = @_; 1834 my ($self, $ev, $x, $y) = @_;
1794 1835
1795 $self->SUPER::button_down ($ev, $x, $y); 1836 $self->SUPER::invoke_button_down ($ev, $x, $y);
1796 1837
1797 my $idx = $self->{layout}->xy_to_index ($x, $y); 1838 my $idx = $self->{layout}->xy_to_index ($x, $y);
1798 1839
1799 # byte-index to char-index 1840 # byte-index to char-index
1800 my $text = $self->{text}; 1841 my $text = $self->{text};
… …
1805 $self->update; 1846 $self->update;
1806 1847
1807 1 1848 1
1808} 1849}
1809 1850
1810sub mouse_motion { 1851sub invoke_mouse_motion {
1811 my ($self, $ev, $x, $y) = @_; 1852 my ($self, $ev, $x, $y) = @_;
1812# 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#
1813 1854
1814 0 1855 1
1815} 1856}
1816 1857
1817sub _draw { 1858sub _draw {
1818 my ($self) = @_; 1859 my ($self) = @_;
1819 1860
… …
1860 1901
1861our @ISA = CFClient::UI::EntryBase::; 1902our @ISA = CFClient::UI::EntryBase::;
1862 1903
1863use CFClient::OpenGL; 1904use CFClient::OpenGL;
1864 1905
1865sub key_down { 1906sub invoke_key_down {
1866 my ($self, $ev) = @_; 1907 my ($self, $ev) = @_;
1867 1908
1868 my $sym = $ev->{sym}; 1909 my $sym = $ev->{sym};
1869 1910
1870 if ($sym == 13) { 1911 if ($sym == 13) {
1871 unshift @{$self->{history}}, 1912 unshift @{$self->{history}},
1872 my $txt = $self->get_text; 1913 my $txt = $self->get_text;
1914
1873 $self->{history_pointer} = -1; 1915 $self->{history_pointer} = -1;
1874 $self->{history_saveback} = ''; 1916 $self->{history_saveback} = '';
1875 $self->_emit (activate => $txt); 1917 $self->emit (activate => $txt);
1876 $self->update; 1918 $self->update;
1877 1919
1878 } elsif ($sym == CFClient::SDLK_UP) { 1920 } elsif ($sym == CFClient::SDLK_UP) {
1879 if ($self->{history_pointer} < 0) { 1921 if ($self->{history_pointer} < 0) {
1880 $self->{history_saveback} = $self->get_text; 1922 $self->{history_saveback} = $self->get_text;
… …
1896 } else { 1938 } else {
1897 $self->set_text ($self->{history_saveback}); 1939 $self->set_text ($self->{history_saveback});
1898 } 1940 }
1899 1941
1900 } else { 1942 } else {
1901 return $self->SUPER::key_down ($ev) 1943 return $self->SUPER::invoke_key_down ($ev)
1902 } 1944 }
1903 1945
1904 1 1946 1
1905} 1947}
1906 1948
… …
1930 can_events => 1, 1972 can_events => 1,
1931 @_ 1973 @_
1932 ) 1974 )
1933} 1975}
1934 1976
1935sub activate { }
1936
1937sub button_up { 1977sub invoke_button_up {
1938 my ($self, $ev, $x, $y) = @_; 1978 my ($self, $ev, $x, $y) = @_;
1939 1979
1940 $self->emit ("activate") 1980 $self->emit ("activate")
1941 if $x >= 0 && $x < $self->{w} 1981 if $x >= 0 && $x < $self->{w}
1942 && $y >= 0 && $y < $self->{h}; 1982 && $y >= 0 && $y < $self->{h};
… …
1956 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1996 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1957 1997
1958 glDisable GL_TEXTURE_2D; 1998 glDisable GL_TEXTURE_2D;
1959 1999
1960 $self->SUPER::_draw; 2000 $self->SUPER::_draw;
2001}
2002
2003#############################################################################
2004
2005package CFClient::UI::ImageButton;
2006
2007our @ISA = CFClient::UI::Image::;
2008
2009use CFClient::OpenGL;
2010
2011my %textures;
2012
2013sub new {
2014 my $class = shift;
2015
2016 my $self = $class->SUPER::new (
2017 padding_x => 4,
2018 padding_y => 4,
2019 fg => [1, 1, 1],
2020 active_fg => [0, 0, 1],
2021 can_hover => 1,
2022 align => 0,
2023 valign => 0,
2024 can_events => 1,
2025 @_
2026 );
2027}
2028
2029sub invoke_button_up {
2030 my ($self, $ev, $x, $y) = @_;
2031
2032 $self->emit ("activate")
2033 if $x >= 0 && $x < $self->{w}
2034 && $y >= 0 && $y < $self->{h};
2035
2036 1
1961} 2037}
1962 2038
1963############################################################################# 2039#############################################################################
1964 2040
1965package CFClient::UI::CheckBox; 2041package CFClient::UI::CheckBox;
… …
1992 my ($self) = @_; 2068 my ($self) = @_;
1993 2069
1994 (6) x 2 2070 (6) x 2
1995} 2071}
1996 2072
1997sub button_down { 2073sub invoke_button_down {
1998 my ($self, $ev, $x, $y) = @_; 2074 my ($self, $ev, $x, $y) = @_;
1999 2075
2000 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2076 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2001 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2077 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2002 $self->{state} = !$self->{state}; 2078 $self->{state} = !$self->{state};
2003 $self->_emit (changed => $self->{state}); 2079 $self->emit (changed => $self->{state});
2004 } else { 2080 } else {
2005 return 0 2081 return 0
2006 } 2082 }
2007 2083
2008 1 2084 1
… …
2033package CFClient::UI::Image; 2109package CFClient::UI::Image;
2034 2110
2035our @ISA = CFClient::UI::Base::; 2111our @ISA = CFClient::UI::Base::;
2036 2112
2037use CFClient::OpenGL; 2113use CFClient::OpenGL;
2038use Carp qw/confess/;
2039 2114
2040our %loaded_images; 2115our %texture_cache;
2041 2116
2042sub new { 2117sub new {
2043 my $class = shift; 2118 my $class = shift;
2044 2119
2045 my $self = $class->SUPER::new (can_events => 0, @_); 2120 my $self = $class->SUPER::new (
2121 can_events => 0,
2122 @_,
2123 );
2046 2124
2047 $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";
2048 2127
2049 $loaded_images{$self->{image}} ||= 2128 $self->{tex} = $texture_cache{$self->{path}} ||=
2050 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;
2051 2130
2052 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2131 Scalar::Util::weaken $texture_cache{$self->{path}};
2053 2132
2054 Scalar::Util::weaken $loaded_images{$self->{image}}; 2133 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2055
2056 $self->{aspect} = $tex->{w} / $tex->{h};
2057 2134
2058 $self 2135 $self
2059} 2136}
2060 2137
2061sub size_request { 2138sub size_request {
2062 my ($self) = @_; 2139 my ($self) = @_;
2063 2140
2064 ($self->{tex}->{w}, $self->{tex}->{h}) 2141 ($self->{tex}{w}, $self->{tex}{h})
2065} 2142}
2066 2143
2067sub _draw { 2144sub _draw {
2068 my ($self) = @_; 2145 my ($self) = @_;
2069 2146
… …
2178 my $ycut1 = max 0, min 1, $ycut; 2255 my $ycut1 = max 0, min 1, $ycut;
2179 my $ycut2 = max 0, min 1, $ycut - 1; 2256 my $ycut2 = max 0, min 1, $ycut - 1;
2180 2257
2181 my $h1 = $self->{h} * (1 - $ycut1); 2258 my $h1 = $self->{h} * (1 - $ycut1);
2182 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);
2183 2263
2184 glEnable GL_BLEND; 2264 glEnable GL_BLEND;
2185 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2265 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2186 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2266 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2187 glEnable GL_TEXTURE_2D; 2267 glEnable GL_TEXTURE_2D;
… …
2206 2286
2207 if ($t3) { 2287 if ($t3) {
2208 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2288 glBindTexture GL_TEXTURE_2D, $t3->{name};
2209 glBegin GL_QUADS; 2289 glBegin GL_QUADS;
2210 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2290 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2211 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2291 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2212 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2292 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2213 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2293 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2214 glEnd; 2294 glEnd;
2215 } 2295 }
2216 2296
2217 glDisable GL_BLEND; 2297 glDisable GL_BLEND;
… …
2305 $self->update; 2385 $self->update;
2306 2386
2307 $self 2387 $self
2308} 2388}
2309 2389
2310sub changed { }
2311
2312sub set_range { 2390sub set_range {
2313 my ($self, $range) = @_; 2391 my ($self, $range) = @_;
2314 2392
2315 ($range, $self->{range}) = ($self->{range}, $range); 2393 ($range, $self->{range}) = ($self->{range}, $range);
2316 2394
… …
2336 if $unit; 2414 if $unit;
2337 2415
2338 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2416 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2339 2417
2340 if ($value != $old_value) { 2418 if ($value != $old_value) {
2341 $self->_emit (changed => $value); 2419 $self->emit (changed => $value);
2342 $self->update; 2420 $self->update;
2343 } 2421 }
2344} 2422}
2345 2423
2346sub size_request { 2424sub size_request {
2347 my ($self) = @_; 2425 my ($self) = @_;
2348 2426
2349 ($self->{req_w}, $self->{req_h}) 2427 ($self->{req_w}, $self->{req_h})
2350} 2428}
2351 2429
2352sub button_down { 2430sub invoke_button_down {
2353 my ($self, $ev, $x, $y) = @_; 2431 my ($self, $ev, $x, $y) = @_;
2354 2432
2355 $self->SUPER::button_down ($ev, $x, $y); 2433 $self->SUPER::invoke_button_down ($ev, $x, $y);
2356 2434
2357 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2435 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2358 2436
2359 $self->mouse_motion ($ev, $x, $y) 2437 $self->invoke_mouse_motion ($ev, $x, $y)
2360} 2438}
2361 2439
2362sub mouse_motion { 2440sub invoke_mouse_motion {
2363 my ($self, $ev, $x, $y) = @_; 2441 my ($self, $ev, $x, $y) = @_;
2364 2442
2365 if ($GRAB == $self) { 2443 if ($GRAB == $self) {
2366 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2444 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2367 2445
… …
2509 2587
2510 $self->{fontsize} = $fontsize; 2588 $self->{fontsize} = $fontsize;
2511 $self->reflow; 2589 $self->reflow;
2512} 2590}
2513 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
2514sub size_allocate { 2601sub invoke_size_allocate {
2515 my ($self, $w, $h) = @_; 2602 my ($self, $w, $h) = @_;
2516 2603
2517 $self->SUPER::size_allocate ($w, $h); 2604 my ($empty, $slider, @other) = @{ $self->{children} };
2605 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2518 2606
2519 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2607 $self->{layout}->set_font ($self->{font}) if $self->{font};
2520 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2608 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2521 $self->{layout}->set_width ($self->{children}[0]{w}); 2609 $self->{layout}->set_width ($empty->{w});
2522 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2610 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2523 2611
2524 $self->reflow; 2612 $self->reflow;
2525}
2526 2613
2527sub text_size { 2614 local $self->{children} = [$empty, $slider];
2528 my ($self, $text, $indent) = @_; 2615 $self->SUPER::invoke_size_allocate ($w, $h)
2616}
2617
2618sub get_layout {
2619 my ($self, $para) = @_;
2529 2620
2530 my $layout = $self->{layout}; 2621 my $layout = $self->{layout};
2531 2622
2623 $layout->set_font ($self->{font}) if $self->{font};
2624 $layout->set_foreground (@{$para->{fg}});
2532 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2625 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2533 $layout->set_width ($self->{children}[0]{w} - $indent); 2626 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2534 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2627 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2535 $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}}
2536 2634 );
2635
2537 $layout->size 2636 $layout
2538} 2637}
2539 2638
2540sub reflow { 2639sub reflow {
2541 my ($self) = @_; 2640 my ($self) = @_;
2542 2641
… …
2551 $self->{children}[1]->set_value ($offset); 2650 $self->{children}[1]->set_value ($offset);
2552} 2651}
2553 2652
2554sub clear { 2653sub clear {
2555 my ($self) = @_; 2654 my ($self) = @_;
2655
2656 my (undef, undef, @other) = @{ $self->{children} };
2657 $self->remove ($_) for @other;
2556 2658
2557 $self->{par} = []; 2659 $self->{par} = [];
2558 $self->{height} = 0; 2660 $self->{height} = 0;
2559 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2661 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2560} 2662}
2561 2663
2562sub add_paragraph { 2664sub add_paragraph {
2563 my ($self, $color, $text, $indent) = @_; 2665 my ($self, $color, $para, $indent) = @_;
2564 2666
2565 for my $line (split /\n/, $text) { 2667 my ($text, @w) = ref $para ? @$para : $para;
2566 my ($w, $h) = $self->text_size ($line); 2668
2567 $self->{height} += $h; 2669 $para = {
2568 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,
2569 } 2676 };
2570 2677
2571 $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;
2572} 2690}
2573 2691
2574sub update { 2692sub update {
2575 my ($self) = @_; 2693 my ($self) = @_;
2576 2694
… …
2584 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2702 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2585 2703
2586 if (delete $self->{need_reflow}) { 2704 if (delete $self->{need_reflow}) {
2587 my $height = 0; 2705 my $height = 0;
2588 2706
2589 my $layout = $self->{layout};
2590
2591 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2592
2593 for (@{$self->{par}}) { 2707 for my $para (@{$self->{par}}) {
2594 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2708 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2595 $layout->set_width ($W - $_->[3]); 2709 my $layout = $self->get_layout ($para);
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2597 $layout->set_markup ($_->[4]);
2598 my ($w, $h) = $layout->size; 2710 my ($w, $h) = $layout->size;
2599 $_->[0] = $w + $_->[3]; 2711
2600 $_->[1] = $h; 2712 $para->{w} = $w + $para->{indent};
2713 $para->{h} = $h;
2714 $para->{wrapped} = $layout->has_wrapped;
2601 } 2715 }
2602 2716
2603 $height += $_->[1]; 2717 $height += $para->{h};
2604 } 2718 }
2605 2719
2606 $self->{height} = $height; 2720 $self->{height} = $height;
2607 2721
2608 $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]);
2609 2723
2610 delete $self->{texture}; 2724 delete $self->{texture};
2725 }
2726
2727 if (delete $self->{scroll_to_bottom}) {
2728 $self->{children}[1]->set_value (1e10);
2611 } 2729 }
2612 2730
2613 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2731 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2614 glClearColor 0, 0, 0, 0; 2732 glClearColor 0, 0, 0, 0;
2615 glClear GL_COLOR_BUFFER_BIT; 2733 glClear GL_COLOR_BUFFER_BIT;
… …
2619 my $y0 = $top; 2737 my $y0 = $top;
2620 my $y1 = $top + $H; 2738 my $y1 = $top + $H;
2621 2739
2622 my $y = 0; 2740 my $y = 0;
2623 2741
2624 my $layout = $self->{layout};
2625
2626 $layout->set_font ($self->{font}) if $self->{font};
2627
2628 glEnable GL_BLEND; 2742 glEnable GL_BLEND;
2629 #TODO# not correct in windows where rgba is forced off 2743 #TODO# not correct in windows where rgba is forced off
2630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2744 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2631 2745
2632 for my $par (@{$self->{par}}) { 2746 for my $para (@{$self->{par}}) {
2633 my $h = $par->[1]; 2747 my $h = $para->{h};
2634 2748
2635 if ($y0 < $y + $h && $y < $y1) { 2749 if ($y0 < $y + $h && $y < $y1) {
2636 $layout->set_foreground (@{ $par->[2] }); 2750
2637 $layout->set_width ($W - $par->[3]); 2751 my $layout = $self->get_layout ($para);
2638 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2639 $layout->set_markup ($par->[4]);
2640 2752
2641 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2753 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2642 2754
2643 glRasterPos $par->[3], $y - $y0; 2755 glRasterPos $para->{indent}, $y - $y0;
2644 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 }
2645 } 2773 }
2646 2774
2647 $y += $h; 2775 $y += $h;
2648 } 2776 }
2649 2777
2650 glDisable GL_BLEND; 2778 glDisable GL_BLEND;
2651 }; 2779 };
2652 }); 2780 });
2781}
2782
2783sub reconfigure {
2784 my ($self) = @_;
2785
2786 $self->SUPER::reconfigure;
2787
2788 $_->{w} = 1e10 for @{ $self->{par} };
2789 $self->reflow;
2653} 2790}
2654 2791
2655sub _draw { 2792sub _draw {
2656 my ($self) = @_; 2793 my ($self) = @_;
2657 2794
… …
2660 glColor 0, 0, 0, 1; 2797 glColor 0, 0, 0, 1;
2661 $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});
2662 glDisable GL_TEXTURE_2D; 2799 glDisable GL_TEXTURE_2D;
2663 2800
2664 $self->{children}[1]->draw; 2801 $self->{children}[1]->draw;
2665
2666} 2802}
2667 2803
2668############################################################################# 2804#############################################################################
2669 2805
2670package CFClient::UI::Animator; 2806package CFClient::UI::Animator;
… …
2779 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2915 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2780 2916
2781 ($w + 4, $h + 4) 2917 ($w + 4, $h + 4)
2782} 2918}
2783 2919
2784sub size_allocate { 2920sub invoke_size_allocate {
2785 my ($self, $w, $h) = @_; 2921 my ($self, $w, $h) = @_;
2786 2922
2787 $self->SUPER::size_allocate ($w - 4, $h - 4); 2923 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2788} 2924}
2789 2925
2790sub visibility_change { 2926sub invoke_visibility_change {
2791 my ($self, $visible) = @_; 2927 my ($self, $visible) = @_;
2792 2928
2793 return unless $visible; 2929 return unless $visible;
2794 2930
2795 $self->{root}->on_post_alloc ("move_$self" => sub { 2931 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2962 3098
2963# 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)
2964sub popup { 3100sub popup {
2965 my ($self, $ev) = @_; 3101 my ($self, $ev) = @_;
2966 3102
2967 $self->_emit ("popdown"); 3103 $self->emit ("popdown");
2968 3104
2969 # maybe save $GRAB? must be careful about events... 3105 # maybe save $GRAB? must be careful about events...
2970 $GRAB = $self; 3106 $GRAB = $self;
2971 $self->{button} = $ev->{button}; 3107 $self->{button} = $ev->{button};
2972 3108
2973 $self->show; 3109 $self->show;
2974 $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);
2975} 3111}
2976 3112
2977sub mouse_motion { 3113sub invoke_mouse_motion {
2978 my ($self, $ev, $x, $y) = @_; 3114 my ($self, $ev, $x, $y) = @_;
2979 3115
2980 # TODO: should use vbox->find_widget or so 3116 # TODO: should use vbox->find_widget or so
2981 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3117 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2982 $self->{hover} = $self->{item}{$HOVER}; 3118 $self->{hover} = $self->{item}{$HOVER};
2983 3119
2984 0 3120 0
2985} 3121}
2986 3122
2987sub button_up { 3123sub invoke_button_up {
2988 my ($self, $ev, $x, $y) = @_; 3124 my ($self, $ev, $x, $y) = @_;
2989 3125
2990 if ($ev->{button} == $self->{button}) { 3126 if ($ev->{button} == $self->{button}) {
2991 undef $GRAB; 3127 undef $GRAB;
2992 $self->hide; 3128 $self->hide;
2993 3129
2994 $self->_emit ("popdown"); 3130 $self->emit ("popdown");
2995 $self->{hover}[1]->() if $self->{hover}; 3131 $self->{hover}[1]->() if $self->{hover};
2996 } else { 3132 } else {
2997 return 0 3133 return 0
2998 } 3134 }
2999 3135
… …
3036 : $self->{children}[$page_or_widget]; 3172 : $self->{children}[$page_or_widget];
3037 3173
3038 $self->{current} = $widget; 3174 $self->{current} = $widget;
3039 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3175 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3040 3176
3041 $self->_emit (page_changed => $self->{current}); 3177 $self->emit (page_changed => $self->{current});
3042 3178
3043 $self->realloc; 3179 $self->realloc;
3044} 3180}
3045 3181
3046sub visible_children { 3182sub visible_children {
… …
3051 my ($self) = @_; 3187 my ($self) = @_;
3052 3188
3053 $self->{current}->size_request 3189 $self->{current}->size_request
3054} 3190}
3055 3191
3056sub size_allocate { 3192sub invoke_size_allocate {
3057 my ($self, $w, $h) = @_; 3193 my ($self, $w, $h) = @_;
3058 3194
3059 $self->{current}->configure (0, 0, $w, $h); 3195 $self->{current}->configure (0, 0, $w, $h);
3196
3197 1
3060} 3198}
3061 3199
3062sub _draw { 3200sub _draw {
3063 my ($self) = @_; 3201 my ($self) = @_;
3064 3202
… …
3103 3241
3104sub set_current_page { 3242sub set_current_page {
3105 my ($self, $page) = @_; 3243 my ($self, $page) = @_;
3106 3244
3107 $self->{multiplexer}->set_current_page ($page); 3245 $self->{multiplexer}->set_current_page ($page);
3108 $self->_emit (page_changed => $self->{multiplexer}{current}); 3246 $self->emit (page_changed => $self->{multiplexer}{current});
3109} 3247}
3110 3248
3111############################################################################# 3249#############################################################################
3112 3250
3113package CFClient::UI::Combobox; 3251package CFClient::UI::Combobox;
… …
3128 $self->_set_value ($self->{value}); 3266 $self->_set_value ($self->{value});
3129 3267
3130 $self 3268 $self
3131} 3269}
3132 3270
3133sub button_down { 3271sub invoke_button_down {
3134 my ($self, $ev) = @_; 3272 my ($self, $ev) = @_;
3135 3273
3136 my @menu_items; 3274 my @menu_items;
3137 3275
3138 for (@{ $self->{options} }) { 3276 for (@{ $self->{options} }) {
… …
3159 my ($self, $value) = @_; 3297 my ($self, $value) = @_;
3160 3298
3161 return unless $self->{value} ne $value; 3299 return unless $self->{value} ne $value;
3162 3300
3163 $self->_set_value ($value); 3301 $self->_set_value ($value);
3164 $self->_emit (changed => $value); 3302 $self->emit (changed => $value);
3165} 3303}
3166 3304
3167############################################################################# 3305#############################################################################
3168 3306
3169package CFClient::UI::Statusbox; 3307package CFClient::UI::Statusbox;
… …
3284 count => 1, 3422 count => 1,
3285 %arg, 3423 %arg,
3286 }; 3424 };
3287 } 3425 }
3288 3426
3427 $ROOT->on_refresh (reorder => sub {
3289 $self->reorder; 3428 $self->reorder;
3429 });
3290} 3430}
3291 3431
3292sub reconfigure { 3432sub reconfigure {
3293 my ($self) = @_; 3433 my ($self) = @_;
3294 3434
… …
3331 return unless $items; 3471 return unless $items;
3332 3472
3333 my @items = sort { 3473 my @items = sort {
3334 ($a->{type} <=> $b->{type}) 3474 ($a->{type} <=> $b->{type})
3335 or ($a->{name} cmp $b->{name}) 3475 or ($a->{name} cmp $b->{name})
3336 } @$items; 3476 } values %$items;
3337 3477
3338 $self->{real_items} = \@items; 3478 $self->{real_items} = \@items;
3339 3479
3340 my $row = 0; 3480 my $row = 0;
3341 for my $item (@items) { 3481 for my $item (@items) {
… …
3344 $self->{child}->add (0, $row, $item->{face_widget}); 3484 $self->{child}->add (0, $row, $item->{face_widget});
3345 $self->{child}->add (1, $row, $item->{desc_widget}); 3485 $self->{child}->add (1, $row, $item->{desc_widget});
3346 $self->{child}->add (2, $row, $item->{weight_widget}); 3486 $self->{child}->add (2, $row, $item->{weight_widget});
3347 3487
3348 $row++; 3488 $row++;
3349 }
3350}
3351
3352#############################################################################
3353
3354package CFClient::UI::BindEditor;
3355
3356our @ISA = CFClient::UI::FancyFrame::;
3357
3358sub new {
3359 my $class = shift;
3360
3361 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3362
3363 $self->add (my $vb = new CFClient::UI::VBox);
3364
3365
3366 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3367 text => "start recording",
3368 tooltip => "Start/Stops recording of actions."
3369 ."All subsequent actions after the recording started will be captured."
3370 ."The actions are displayed after the record was stopped."
3371 ."To bind the action you have to click on the 'Bind' button",
3372 on_activate => sub {
3373 unless ($self->{recording}) {
3374 $self->start;
3375 } else {
3376 $self->stop;
3377 }
3378 });
3379
3380 $vb->add (new CFClient::UI::Label text => "Actions:");
3381 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3382
3383 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3384 $vb->add (my $hb = new CFClient::UI::HBox);
3385 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3386 $hb->add (new CFClient::UI::Button
3387 text => "bind",
3388 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3389 on_activate => sub {
3390 $self->ask_for_bind;
3391 });
3392
3393 $vb->add (my $hb = new CFClient::UI::HBox);
3394 $hb->add (new CFClient::UI::Button
3395 text => "ok",
3396 expand => 1,
3397 tooltip => "This closes the binding editor and saves the binding",
3398 on_activate => sub {
3399 $self->hide;
3400 $self->commit;
3401 });
3402
3403 $hb->add (new CFClient::UI::Button
3404 text => "cancel",
3405 expand => 1,
3406 tooltip => "This closes the binding editor without saving",
3407 on_activate => sub {
3408 $self->hide;
3409 $self->{binding_cancel}->()
3410 if $self->{binding_cancel};
3411 });
3412
3413 $self->update_binding_widgets;
3414
3415 $self
3416}
3417
3418sub commit {
3419 my ($self) = @_;
3420 my ($mod, $sym, $cmds) = $self->get_binding;
3421 if ($sym != 0 && @$cmds > 0) {
3422 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3423 ."'. Don't forget 'Save Config'!");
3424 $self->{binding_change}->($mod, $sym, $cmds)
3425 if $self->{binding_change};
3426 } else {
3427 $::STATUSBOX->add ("No action bound, no key or action specified!");
3428 $self->{binding_cancel}->()
3429 if $self->{binding_cancel};
3430 }
3431}
3432
3433sub start {
3434 my ($self) = @_;
3435
3436 $self->{rec_btn}->set_text ("stop recording");
3437 $self->{recording} = 1;
3438 $self->clear_command_list;
3439 $::CONN->start_record if $::CONN;
3440}
3441
3442sub stop {
3443 my ($self) = @_;
3444
3445 $self->{rec_btn}->set_text ("start recording");
3446 $self->{recording} = 0;
3447
3448 my $rec;
3449 $rec = $::CONN->stop_record if $::CONN;
3450 return unless ref $rec eq 'ARRAY';
3451 $self->set_command_list ($rec);
3452}
3453
3454
3455sub ask_for_bind_and_commit {
3456 my ($self) = @_;
3457 $self->ask_for_bind (1);
3458}
3459
3460sub ask_for_bind {
3461 my ($self, $commit) = @_;
3462
3463 CFClient::Binder::open_binding_dialog (sub {
3464 my ($mod, $sym) = @_;
3465 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3466 $self->update_binding_widgets;
3467 $self->commit if $commit;
3468 });
3469}
3470
3471# $mod and $sym are the modifiers and key symbol
3472# $cmds is a array ref of strings (the commands)
3473# $cb is the callback that is executed on OK
3474# $ccb is the callback that is executed on CANCEL and
3475# when the binding was unsuccessful on OK
3476sub set_binding {
3477 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3478
3479 $self->clear_command_list;
3480 $self->{recording} = 0;
3481 $self->{rec_btn}->set_text ("start recording");
3482
3483 $self->{binding} = [$mod, $sym];
3484 $self->{commands} = $cmds;
3485
3486 $self->{binding_change} = $cb;
3487 $self->{binding_cancel} = $ccb;
3488
3489 $self->update_binding_widgets;
3490}
3491
3492# this is a shortcut method that asks for a binding
3493# and then just binds it.
3494sub do_quick_binding {
3495 my ($self, $cmds) = @_;
3496 $self->set_binding (undef, undef, $cmds, sub {
3497 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3498 });
3499 $self->ask_for_bind (1);
3500}
3501
3502sub update_binding_widgets {
3503 my ($self) = @_;
3504 my ($mod, $sym, $cmds) = $self->get_binding;
3505 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3506 $self->set_command_list ($cmds);
3507}
3508
3509sub get_binding {
3510 my ($self) = @_;
3511 return (
3512 $self->{binding}->[0],
3513 $self->{binding}->[1],
3514 [ grep { defined $_ } @{$self->{commands}} ]
3515 );
3516}
3517
3518sub clear_command_list {
3519 my ($self) = @_;
3520 $self->{cmdbox}->clear ();
3521}
3522
3523sub set_command_list {
3524 my ($self, $cmds) = @_;
3525
3526 $self->{cmdbox}->clear ();
3527 $self->{commands} = $cmds;
3528
3529 my $idx = 0;
3530
3531 for (@$cmds) {
3532 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3533
3534 my $i = $idx;
3535 $hb->add (new CFClient::UI::Label text => $_);
3536 $hb->add (new CFClient::UI::Button
3537 text => "delete",
3538 tooltip => "Deletes the action from the record",
3539 on_activate => sub {
3540 $self->{cmdbox}->remove ($hb);
3541 $cmds->[$i] = undef;
3542 });
3543
3544
3545 $idx++
3546 } 3489 }
3547} 3490}
3548 3491
3549############################################################################# 3492#############################################################################
3550 3493
… …
3604 } elsif ($ev->{button} == 2) { 3547 } elsif ($ev->{button} == 2) {
3605 $::CONN->user_send ("invoke $spell->{name}"); 3548 $::CONN->user_send ("invoke $spell->{name}");
3606 } elsif ($ev->{button} == 3) { 3549 } elsif ($ev->{button} == 3) {
3607 (new CFClient::UI::Menu 3550 (new CFClient::UI::Menu
3608 items => [ 3551 items => [
3609 ["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}"]) }],
3610 ["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}"]) }],
3611 ], 3554 ],
3612 )->popup ($ev); 3555 )->popup ($ev);
3613 } else { 3556 } else {
3614 return 0; 3557 return 0;
… …
3709 $coord = $max - $size if $coord > $max - $size; 3652 $coord = $max - $size if $coord > $max - $size;
3710 3653
3711 int $coord + 0.5 3654 int $coord + 0.5
3712} 3655}
3713 3656
3714sub size_allocate { 3657sub invoke_size_allocate {
3715 my ($self, $w, $h) = @_; 3658 my ($self, $w, $h) = @_;
3716 3659
3717 for my $child ($self->children) { 3660 for my $child ($self->children) {
3718 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)};
3719 3662
… …
3723 $X = _to_pixel $X, $W, $self->{w}; 3666 $X = _to_pixel $X, $W, $self->{w};
3724 $Y = _to_pixel $Y, $H, $self->{h}; 3667 $Y = _to_pixel $Y, $H, $self->{h};
3725 3668
3726 $child->configure ($X, $Y, $W, $H); 3669 $child->configure ($X, $Y, $W, $H);
3727 } 3670 }
3671
3672 1
3728} 3673}
3729 3674
3730sub coord2local { 3675sub coord2local {
3731 my ($self, $x, $y) = @_; 3676 my ($self, $x, $y) = @_;
3732 3677

Diff Legend

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