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.316 by root, Sun Jul 2 13:57:58 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 my $focus = $FOCUS; $FOCUS = $self;
430 429
431 $self->_emit (focus_in => $focus);
432
433 $focus->update if $focus; 430 $focus->update if $focus;
434 $FOCUS->update; 431 $FOCUS->update;
435}
436 432
433 0
434}
435
437sub focus_out { 436sub invoke_focus_out {
438 my ($self) = @_; 437 my ($self) = @_;
439 438
440 return unless $FOCUS == $self; 439 return unless $FOCUS == $self;
441 440
442 my $focus = $FOCUS; undef $FOCUS; 441 my $focus = $FOCUS; undef $FOCUS;
443 442
444 $self->_emit (focus_out => $focus);
445
446 $focus->update if $focus; #? 443 $focus->update if $focus; #?
447 444
448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
449 unless $FOCUS; 446 unless $FOCUS;
450}
451 447
448 0
449}
450
451sub grab_focus {
452 my ($self) = @_;
453
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->hide };
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;
1136 1151
1137 $self->child->configure ($border, $border, $w, $h); 1152 $self->child->configure ($border, $border, $w, $h);
1138}
1139 1153
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button};
1156
1157 1
1158}
1159
1140sub button_down { 1160sub invoke_button_down {
1141 my ($self, $ev, $x, $y) = @_; 1161 my ($self, $ev, $x, $y) = @_;
1142 1162
1143 my ($w, $h) = @$self{qw(w h)}; 1163 my ($w, $h) = @$self{qw(w h)};
1144 my $border = $self->border; 1164 my $border = $self->border;
1145 1165
… …
1176 1196
1177 ($x, $y) = ($ev->{x}, $ev->{y}); 1197 ($x, $y) = ($ev->{x}, $ev->{y});
1178 1198
1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1199 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180 # HACK: the next line is required to enforce placement 1200 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1201 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1182 }; 1202 };
1183 } else { 1203 } else {
1184 return 0; 1204 return 0;
1185 } 1205 }
1186 1206
1187 1 1207 1
1188} 1208}
1189 1209
1190sub button_up { 1210sub invoke_button_up {
1191 my ($self, $ev, $x, $y) = @_; 1211 my ($self, $ev, $x, $y) = @_;
1192 1212
1193 !!delete $self->{motion} 1213 ! ! delete $self->{motion}
1194} 1214}
1195 1215
1196sub mouse_motion { 1216sub invoke_mouse_motion {
1197 my ($self, $ev, $x, $y) = @_; 1217 my ($self, $ev, $x, $y) = @_;
1198 1218
1199 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1219 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200 1220
1201 !!$self->{motion} 1221 ! ! $self->{motion}
1202} 1222}
1203 1223
1204sub _draw { 1224sub _draw {
1205 my ($self) = @_; 1225 my ($self) = @_;
1206 1226
… …
1235 $child->draw; 1255 $child->draw;
1236 1256
1237 if ($self->{title_widget}) { 1257 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h}; 1258 glTranslate 0, $border - $self->{h};
1239 $self->{title_widget}->_draw; 1259 $self->{title_widget}->_draw;
1260
1261 glTranslate 0, - ($border - $self->{h});
1240 } 1262 }
1263
1264 $self->{close_button}->draw
1265 if $self->{close_button};
1241} 1266}
1242 1267
1243############################################################################# 1268#############################################################################
1244 1269
1245package CFClient::UI::Table; 1270package CFClient::UI::Table;
… …
1324 (sum @$ws), 1349 (sum @$ws),
1325 (sum @$hs), 1350 (sum @$hs),
1326 ) 1351 )
1327} 1352}
1328 1353
1329sub size_allocate { 1354sub invoke_size_allocate {
1330 my ($self, $w, $h) = @_; 1355 my ($self, $w, $h) = @_;
1331 1356
1332 my ($ws, $hs) = $self->get_wh; 1357 my ($ws, $hs) = $self->get_wh;
1333 1358
1334 my $req_w = (sum @$ws) || 1; 1359 my $req_w = (sum @$ws) || 1;
… …
1366 } 1391 }
1367 1392
1368 $y += $row_h; 1393 $y += $row_h;
1369 } 1394 }
1370 1395
1396 1
1371} 1397}
1372 1398
1373sub find_widget { 1399sub find_widget {
1374 my ($self, $x, $y) = @_; 1400 my ($self, $x, $y) = @_;
1375 1401
… …
1412 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1438 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1413 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1439 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1414 ) 1440 )
1415} 1441}
1416 1442
1417sub size_allocate { 1443sub invoke_size_allocate {
1418 my ($self, $w, $h) = @_; 1444 my ($self, $w, $h) = @_;
1419 1445
1420 my $space = $self->{vertical} ? $h : $w; 1446 my $space = $self->{vertical} ? $h : $w;
1421 my $children = $self->{children}; 1447 my @children = $self->visible_children;
1422 1448
1423 my @req; 1449 my @req;
1424 1450
1425 if ($self->{homogeneous}) { 1451 if ($self->{homogeneous}) {
1426 @req = ($space / (@$children || 1)) x @$children; 1452 @req = ($space / (@children || 1)) x @children;
1427 } else { 1453 } else {
1428 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1454 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1429 my $req = List::Util::sum @req; 1455 my $req = List::Util::sum @req;
1430 1456
1431 if ($req > $space) { 1457 if ($req > $space) {
1432 # ah well, not enough space 1458 # ah well, not enough space
1433 $_ *= $space / $req for @req; 1459 $_ *= $space / $req for @req;
1434 } else { 1460 } else {
1435 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1461 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1436 1462
1437 $space = ($space - $req) / $expand; # remaining space to give away 1463 $space = ($space - $req) / $expand; # remaining space to give away
1438 1464
1439 $req[$_] += $space * $children->[$_]{expand} 1465 $req[$_] += $space * $children[$_]{expand}
1440 for 0 .. $#$children; 1466 for 0 .. $#children;
1441 } 1467 }
1442 } 1468 }
1443 1469
1444 CFClient::UI::harmonize \@req; 1470 CFClient::UI::harmonize \@req;
1445 1471
1446 my $pos = 0; 1472 my $pos = 0;
1447 for (0 .. $#$children) { 1473 for (0 .. $#children) {
1448 my $alloc = $req[$_]; 1474 my $alloc = $req[$_];
1449 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1475 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1450 1476
1451 $pos += $alloc; 1477 $pos += $alloc;
1452 } 1478 }
1453 1479
1454 1 1480 1
… …
1609 }; 1635 };
1610 1636
1611 @{ $self->{size_req} } 1637 @{ $self->{size_req} }
1612} 1638}
1613 1639
1640sub baseline_shift {
1641 $_[0]{layout}->descent
1642}
1643
1614sub size_allocate { 1644sub invoke_size_allocate {
1615 my ($self, $w, $h) = @_; 1645 my ($self, $w, $h) = @_;
1616 1646
1617 delete $self->{ox}; 1647 delete $self->{ox};
1618 1648
1619 delete $self->{texture} 1649 delete $self->{texture}
1620 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1650 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1651
1652 1
1621} 1653}
1622 1654
1623sub set_fontsize { 1655sub set_fontsize {
1624 my ($self, $fontsize) = @_; 1656 my ($self, $fontsize) = @_;
1625 1657
1626 $self->{fontsize} = $fontsize; 1658 $self->{fontsize} = $fontsize;
1659 delete $self->{size_req};
1627 delete $self->{texture}; 1660 delete $self->{texture};
1628 1661
1629 $self->realloc; 1662 $self->realloc;
1630} 1663}
1631 1664
… …
1718 1751
1719 $text =~ s/./*/g if $self->{hidden}; 1752 $text =~ s/./*/g if $self->{hidden};
1720 $self->{layout}->set_text ("$text "); 1753 $self->{layout}->set_text ("$text ");
1721 delete $self->{size_req}; 1754 delete $self->{size_req};
1722 1755
1723 $self->_emit (changed => $self->{text}); 1756 $self->emit (changed => $self->{text});
1724 1757
1725 $self->realloc; 1758 $self->realloc;
1726 $self->update; 1759 $self->update;
1727} 1760}
1728 1761
… …
1743 my ($w, $h) = $self->SUPER::size_request; 1776 my ($w, $h) = $self->SUPER::size_request;
1744 1777
1745 ($w + 1, $h) # add 1 for cursor 1778 ($w + 1, $h) # add 1 for cursor
1746} 1779}
1747 1780
1748sub key_down { 1781sub invoke_key_down {
1749 my ($self, $ev) = @_; 1782 my ($self, $ev) = @_;
1750 1783
1751 my $mod = $ev->{mod}; 1784 my $mod = $ev->{mod};
1752 my $sym = $ev->{sym}; 1785 my $sym = $ev->{sym};
1753 my $uni = $ev->{unicode}; 1786 my $uni = $ev->{unicode};
… …
1765 } elsif ($sym == CFClient::SDLK_HOME) { 1798 } elsif ($sym == CFClient::SDLK_HOME) {
1766 $self->{cursor} = 0; 1799 $self->{cursor} = 0;
1767 } elsif ($sym == CFClient::SDLK_END) { 1800 } elsif ($sym == CFClient::SDLK_END) {
1768 $self->{cursor} = length $text; 1801 $self->{cursor} = length $text;
1769 } elsif ($uni == 27) { 1802 } elsif ($uni == 27) {
1770 $self->_emit ('escape'); 1803 $self->emit ('escape');
1771 } elsif ($uni) { 1804 } elsif ($uni) {
1772 substr $text, $self->{cursor}++, 0, chr $uni; 1805 substr $text, $self->{cursor}++, 0, chr $uni;
1773 } else { 1806 } else {
1774 return 0; 1807 return 0;
1775 } 1808 }
… …
1779 $self->realloc; 1812 $self->realloc;
1780 1813
1781 1 1814 1
1782} 1815}
1783 1816
1784sub focus_in { 1817sub invoke_focus_in {
1785 my ($self) = @_; 1818 my ($self) = @_;
1786 1819
1787 $self->{last_activity} = $::NOW; 1820 $self->{last_activity} = $::NOW;
1788 1821
1789 $self->SUPER::focus_in; 1822 $self->SUPER::invoke_focus_in
1790} 1823}
1791 1824
1792sub button_down { 1825sub invoke_button_down {
1793 my ($self, $ev, $x, $y) = @_; 1826 my ($self, $ev, $x, $y) = @_;
1794 1827
1795 $self->SUPER::button_down ($ev, $x, $y); 1828 $self->SUPER::invoke_button_down ($ev, $x, $y);
1796 1829
1797 my $idx = $self->{layout}->xy_to_index ($x, $y); 1830 my $idx = $self->{layout}->xy_to_index ($x, $y);
1798 1831
1799 # byte-index to char-index 1832 # byte-index to char-index
1800 my $text = $self->{text}; 1833 my $text = $self->{text};
… …
1805 $self->update; 1838 $self->update;
1806 1839
1807 1 1840 1
1808} 1841}
1809 1842
1810sub mouse_motion { 1843sub invoke_mouse_motion {
1811 my ($self, $ev, $x, $y) = @_; 1844 my ($self, $ev, $x, $y) = @_;
1812# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1845# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1813 1846
1814 0 1847 1
1815} 1848}
1816 1849
1817sub _draw { 1850sub _draw {
1818 my ($self) = @_; 1851 my ($self) = @_;
1819 1852
… …
1860 1893
1861our @ISA = CFClient::UI::EntryBase::; 1894our @ISA = CFClient::UI::EntryBase::;
1862 1895
1863use CFClient::OpenGL; 1896use CFClient::OpenGL;
1864 1897
1865sub key_down { 1898sub invoke_key_down {
1866 my ($self, $ev) = @_; 1899 my ($self, $ev) = @_;
1867 1900
1868 my $sym = $ev->{sym}; 1901 my $sym = $ev->{sym};
1869 1902
1870 if ($sym == 13) { 1903 if ($sym == 13) {
1871 unshift @{$self->{history}}, 1904 unshift @{$self->{history}},
1872 my $txt = $self->get_text; 1905 my $txt = $self->get_text;
1906
1873 $self->{history_pointer} = -1; 1907 $self->{history_pointer} = -1;
1874 $self->{history_saveback} = ''; 1908 $self->{history_saveback} = '';
1875 $self->_emit (activate => $txt); 1909 $self->emit (activate => $txt);
1876 $self->update; 1910 $self->update;
1877 1911
1878 } elsif ($sym == CFClient::SDLK_UP) { 1912 } elsif ($sym == CFClient::SDLK_UP) {
1879 if ($self->{history_pointer} < 0) { 1913 if ($self->{history_pointer} < 0) {
1880 $self->{history_saveback} = $self->get_text; 1914 $self->{history_saveback} = $self->get_text;
… …
1896 } else { 1930 } else {
1897 $self->set_text ($self->{history_saveback}); 1931 $self->set_text ($self->{history_saveback});
1898 } 1932 }
1899 1933
1900 } else { 1934 } else {
1901 return $self->SUPER::key_down ($ev) 1935 return $self->SUPER::invoke_key_down ($ev)
1902 } 1936 }
1903 1937
1904 1 1938 1
1905} 1939}
1906 1940
… …
1930 can_events => 1, 1964 can_events => 1,
1931 @_ 1965 @_
1932 ) 1966 )
1933} 1967}
1934 1968
1935sub activate { }
1936
1937sub button_up { 1969sub invoke_button_up {
1938 my ($self, $ev, $x, $y) = @_; 1970 my ($self, $ev, $x, $y) = @_;
1939 1971
1940 $self->emit ("activate") 1972 $self->emit ("activate")
1941 if $x >= 0 && $x < $self->{w} 1973 if $x >= 0 && $x < $self->{w}
1942 && $y >= 0 && $y < $self->{h}; 1974 && $y >= 0 && $y < $self->{h};
… …
1956 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1988 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1957 1989
1958 glDisable GL_TEXTURE_2D; 1990 glDisable GL_TEXTURE_2D;
1959 1991
1960 $self->SUPER::_draw; 1992 $self->SUPER::_draw;
1993}
1994
1995#############################################################################
1996
1997package CFClient::UI::ImageButton;
1998
1999our @ISA = CFClient::UI::Image::;
2000
2001use CFClient::OpenGL;
2002
2003my %textures;
2004
2005sub new {
2006 my $class = shift;
2007
2008 my $self = $class->SUPER::new (
2009 padding_x => 4,
2010 padding_y => 4,
2011 fg => [1, 1, 1],
2012 active_fg => [0, 0, 1],
2013 can_hover => 1,
2014 align => 0,
2015 valign => 0,
2016 can_events => 1,
2017 @_
2018 );
2019}
2020
2021sub invoke_button_up {
2022 my ($self, $ev, $x, $y) = @_;
2023
2024 $self->emit ("activate")
2025 if $x >= 0 && $x < $self->{w}
2026 && $y >= 0 && $y < $self->{h};
2027
2028 1
1961} 2029}
1962 2030
1963############################################################################# 2031#############################################################################
1964 2032
1965package CFClient::UI::CheckBox; 2033package CFClient::UI::CheckBox;
… …
1992 my ($self) = @_; 2060 my ($self) = @_;
1993 2061
1994 (6) x 2 2062 (6) x 2
1995} 2063}
1996 2064
1997sub button_down { 2065sub invoke_button_down {
1998 my ($self, $ev, $x, $y) = @_; 2066 my ($self, $ev, $x, $y) = @_;
1999 2067
2000 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2068 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2001 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2069 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2002 $self->{state} = !$self->{state}; 2070 $self->{state} = !$self->{state};
2003 $self->_emit (changed => $self->{state}); 2071 $self->emit (changed => $self->{state});
2004 } else { 2072 } else {
2005 return 0 2073 return 0
2006 } 2074 }
2007 2075
2008 1 2076 1
… …
2033package CFClient::UI::Image; 2101package CFClient::UI::Image;
2034 2102
2035our @ISA = CFClient::UI::Base::; 2103our @ISA = CFClient::UI::Base::;
2036 2104
2037use CFClient::OpenGL; 2105use CFClient::OpenGL;
2038use Carp qw/confess/;
2039 2106
2040our %loaded_images; 2107our %texture_cache;
2041 2108
2042sub new { 2109sub new {
2043 my $class = shift; 2110 my $class = shift;
2044 2111
2045 my $self = $class->SUPER::new (can_events => 0, @_); 2112 my $self = $class->SUPER::new (
2113 can_events => 0,
2114 @_,
2115 );
2046 2116
2047 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2117 $self->{path}
2118 or Carp::croak "required attribute 'path' not set";
2048 2119
2049 $loaded_images{$self->{image}} ||= 2120 $self->{tex} = $texture_cache{$self->{path}} ||=
2050 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2121 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2051 2122
2052 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2123 Scalar::Util::weaken $texture_cache{$self->{path}};
2053 2124
2054 Scalar::Util::weaken $loaded_images{$self->{image}}; 2125 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2055
2056 $self->{aspect} = $tex->{w} / $tex->{h};
2057 2126
2058 $self 2127 $self
2059} 2128}
2060 2129
2061sub size_request { 2130sub size_request {
2062 my ($self) = @_; 2131 my ($self) = @_;
2063 2132
2064 ($self->{tex}->{w}, $self->{tex}->{h}) 2133 ($self->{tex}{w}, $self->{tex}{h})
2065} 2134}
2066 2135
2067sub _draw { 2136sub _draw {
2068 my ($self) = @_; 2137 my ($self) = @_;
2069 2138
… …
2305 $self->update; 2374 $self->update;
2306 2375
2307 $self 2376 $self
2308} 2377}
2309 2378
2310sub changed { }
2311
2312sub set_range { 2379sub set_range {
2313 my ($self, $range) = @_; 2380 my ($self, $range) = @_;
2314 2381
2315 ($range, $self->{range}) = ($self->{range}, $range); 2382 ($range, $self->{range}) = ($self->{range}, $range);
2316 2383
… …
2336 if $unit; 2403 if $unit;
2337 2404
2338 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2405 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2339 2406
2340 if ($value != $old_value) { 2407 if ($value != $old_value) {
2341 $self->_emit (changed => $value); 2408 $self->emit (changed => $value);
2342 $self->update; 2409 $self->update;
2343 } 2410 }
2344} 2411}
2345 2412
2346sub size_request { 2413sub size_request {
2347 my ($self) = @_; 2414 my ($self) = @_;
2348 2415
2349 ($self->{req_w}, $self->{req_h}) 2416 ($self->{req_w}, $self->{req_h})
2350} 2417}
2351 2418
2352sub button_down { 2419sub invoke_button_down {
2353 my ($self, $ev, $x, $y) = @_; 2420 my ($self, $ev, $x, $y) = @_;
2354 2421
2355 $self->SUPER::button_down ($ev, $x, $y); 2422 $self->SUPER::invoke_button_down ($ev, $x, $y);
2356 2423
2357 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2424 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2358 2425
2359 $self->mouse_motion ($ev, $x, $y) 2426 $self->invoke_mouse_motion ($ev, $x, $y)
2360} 2427}
2361 2428
2362sub mouse_motion { 2429sub invoke_mouse_motion {
2363 my ($self, $ev, $x, $y) = @_; 2430 my ($self, $ev, $x, $y) = @_;
2364 2431
2365 if ($GRAB == $self) { 2432 if ($GRAB == $self) {
2366 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2433 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2367 2434
… …
2509 2576
2510 $self->{fontsize} = $fontsize; 2577 $self->{fontsize} = $fontsize;
2511 $self->reflow; 2578 $self->reflow;
2512} 2579}
2513 2580
2581sub size_request {
2582 my ($self) = @_;
2583
2584 my ($empty, $slider) = @{ $self->{children} };
2585
2586 local $self->{children} = [$empty, $slider];
2587 $self->SUPER::size_request
2588}
2589
2514sub size_allocate { 2590sub invoke_size_allocate {
2515 my ($self, $w, $h) = @_; 2591 my ($self, $w, $h) = @_;
2516 2592
2517 $self->SUPER::size_allocate ($w, $h); 2593 my ($empty, $slider, @other) = @{ $self->{children} };
2594 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2518 2595
2519 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2596 $self->{layout}->set_font ($self->{font}) if $self->{font};
2520 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2597 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2521 $self->{layout}->set_width ($self->{children}[0]{w}); 2598 $self->{layout}->set_width ($empty->{w});
2522 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2599 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2523 2600
2524 $self->reflow; 2601 $self->reflow;
2525}
2526 2602
2527sub text_size { 2603 local $self->{children} = [$empty, $slider];
2528 my ($self, $text, $indent) = @_; 2604 $self->SUPER::invoke_size_allocate ($w, $h)
2605}
2606
2607sub get_layout {
2608 my ($self, $para) = @_;
2529 2609
2530 my $layout = $self->{layout}; 2610 my $layout = $self->{layout};
2531 2611
2612 $layout->set_font ($self->{font}) if $self->{font};
2613 $layout->set_foreground (@{$para->{fg}});
2532 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2614 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2533 $layout->set_width ($self->{children}[0]{w} - $indent); 2615 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2534 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2616 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2535 $layout->set_markup ($text); 2617 $layout->set_markup ($para->{markup});
2618
2619 $layout->set_shapes (
2620 map
2621 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2622 @{$para->{widget}}
2536 2623 );
2624
2537 $layout->size 2625 $layout
2538} 2626}
2539 2627
2540sub reflow { 2628sub reflow {
2541 my ($self) = @_; 2629 my ($self) = @_;
2542 2630
… …
2551 $self->{children}[1]->set_value ($offset); 2639 $self->{children}[1]->set_value ($offset);
2552} 2640}
2553 2641
2554sub clear { 2642sub clear {
2555 my ($self) = @_; 2643 my ($self) = @_;
2644
2645 my (undef, undef, @other) = @{ $self->{children} };
2646 $self->remove ($_) for @other;
2556 2647
2557 $self->{par} = []; 2648 $self->{par} = [];
2558 $self->{height} = 0; 2649 $self->{height} = 0;
2559 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2650 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2560} 2651}
2561 2652
2562sub add_paragraph { 2653sub add_paragraph {
2563 my ($self, $color, $text, $indent) = @_; 2654 my ($self, $color, $para, $indent) = @_;
2564 2655
2565 for my $line (split /\n/, $text) { 2656 my ($text, @w) = ref $para ? @$para : $para;
2566 my ($w, $h) = $self->text_size ($line); 2657
2567 $self->{height} += $h; 2658 $para = {
2568 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2659 w => 1e10,
2660 wrapped => 1,
2661 fg => $color,
2662 indent => $indent,
2663 markup => $text,
2664 widget => \@w,
2569 } 2665 };
2570 2666
2571 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2667 $self->add (@w) if @w;
2668 push @{$self->{par}}, $para;
2669
2670 $self->{need_reflow}++;
2671 $self->update;
2672}
2673
2674sub scroll_to_bottom {
2675 my ($self) = @_;
2676
2677 $self->{scroll_to_bottom} = 1;
2678 $self->update;
2572} 2679}
2573 2680
2574sub update { 2681sub update {
2575 my ($self) = @_; 2682 my ($self) = @_;
2576 2683
… …
2584 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2691 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2585 2692
2586 if (delete $self->{need_reflow}) { 2693 if (delete $self->{need_reflow}) {
2587 my $height = 0; 2694 my $height = 0;
2588 2695
2589 my $layout = $self->{layout};
2590
2591 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2592
2593 for (@{$self->{par}}) { 2696 for my $para (@{$self->{par}}) {
2594 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2697 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2595 $layout->set_width ($W - $_->[3]); 2698 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; 2699 my ($w, $h) = $layout->size;
2599 $_->[0] = $w + $_->[3]; 2700
2600 $_->[1] = $h; 2701 $para->{w} = $w + $para->{indent};
2702 $para->{h} = $h;
2703 $para->{wrapped} = $layout->has_wrapped;
2601 } 2704 }
2602 2705
2603 $height += $_->[1]; 2706 $height += $para->{h};
2604 } 2707 }
2605 2708
2606 $self->{height} = $height; 2709 $self->{height} = $height;
2607 2710
2608 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2711 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2609 2712
2610 delete $self->{texture}; 2713 delete $self->{texture};
2714 }
2715
2716 if (delete $self->{scroll_to_bottom}) {
2717 $self->{children}[1]->set_value (1e10);
2611 } 2718 }
2612 2719
2613 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2720 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2614 glClearColor 0, 0, 0, 0; 2721 glClearColor 0, 0, 0, 0;
2615 glClear GL_COLOR_BUFFER_BIT; 2722 glClear GL_COLOR_BUFFER_BIT;
… …
2619 my $y0 = $top; 2726 my $y0 = $top;
2620 my $y1 = $top + $H; 2727 my $y1 = $top + $H;
2621 2728
2622 my $y = 0; 2729 my $y = 0;
2623 2730
2624 my $layout = $self->{layout};
2625
2626 $layout->set_font ($self->{font}) if $self->{font};
2627
2628 glEnable GL_BLEND; 2731 glEnable GL_BLEND;
2629 #TODO# not correct in windows where rgba is forced off 2732 #TODO# not correct in windows where rgba is forced off
2630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2733 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2631 2734
2632 for my $par (@{$self->{par}}) { 2735 for my $para (@{$self->{par}}) {
2633 my $h = $par->[1]; 2736 my $h = $para->{h};
2634 2737
2635 if ($y0 < $y + $h && $y < $y1) { 2738 if ($y0 < $y + $h && $y < $y1) {
2636 $layout->set_foreground (@{ $par->[2] }); 2739
2637 $layout->set_width ($W - $par->[3]); 2740 my $layout = $self->get_layout ($para);
2638 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2639 $layout->set_markup ($par->[4]);
2640 2741
2641 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2742 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2642 2743
2643 glRasterPos $par->[3], $y - $y0; 2744 glRasterPos $para->{indent}, $y - $y0;
2644 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2745 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2746
2747 if (my @w = @{ $para->{widget} }) {
2748 my @s = $layout->get_shapes;
2749
2750 glDisable GL_BLEND;
2751 for (@w) {
2752 my ($dx, $dy) = splice @s, 0, 2, ();
2753
2754 $_->{x} = $dx + $para->{indent};
2755 $_->{y} = $dy + $y - $y0;
2756
2757 $_->draw;
2758 }
2759 glEnable GL_BLEND;
2760 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2761 }
2645 } 2762 }
2646 2763
2647 $y += $h; 2764 $y += $h;
2648 } 2765 }
2649 2766
2650 glDisable GL_BLEND; 2767 glDisable GL_BLEND;
2651 }; 2768 };
2652 }); 2769 });
2770}
2771
2772sub reconfigure {
2773 my ($self) = @_;
2774
2775 $self->SUPER::reconfigure;
2776
2777 $_->{w} = 1e10 for @{ $self->{par} };
2778 $self->reflow;
2653} 2779}
2654 2780
2655sub _draw { 2781sub _draw {
2656 my ($self) = @_; 2782 my ($self) = @_;
2657 2783
… …
2660 glColor 0, 0, 0, 1; 2786 glColor 0, 0, 0, 1;
2661 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2787 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2662 glDisable GL_TEXTURE_2D; 2788 glDisable GL_TEXTURE_2D;
2663 2789
2664 $self->{children}[1]->draw; 2790 $self->{children}[1]->draw;
2665
2666} 2791}
2667 2792
2668############################################################################# 2793#############################################################################
2669 2794
2670package CFClient::UI::Animator; 2795package CFClient::UI::Animator;
… …
2779 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2904 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2780 2905
2781 ($w + 4, $h + 4) 2906 ($w + 4, $h + 4)
2782} 2907}
2783 2908
2784sub size_allocate { 2909sub invoke_size_allocate {
2785 my ($self, $w, $h) = @_; 2910 my ($self, $w, $h) = @_;
2786 2911
2787 $self->SUPER::size_allocate ($w - 4, $h - 4); 2912 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2788} 2913}
2789 2914
2790sub visibility_change { 2915sub invoke_visibility_change {
2791 my ($self, $visible) = @_; 2916 my ($self, $visible) = @_;
2792 2917
2793 return unless $visible; 2918 return unless $visible;
2794 2919
2795 $self->{root}->on_post_alloc ("move_$self" => sub { 2920 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2962 3087
2963# popup given the event (must be a mouse button down event currently) 3088# popup given the event (must be a mouse button down event currently)
2964sub popup { 3089sub popup {
2965 my ($self, $ev) = @_; 3090 my ($self, $ev) = @_;
2966 3091
2967 $self->_emit ("popdown"); 3092 $self->emit ("popdown");
2968 3093
2969 # maybe save $GRAB? must be careful about events... 3094 # maybe save $GRAB? must be careful about events...
2970 $GRAB = $self; 3095 $GRAB = $self;
2971 $self->{button} = $ev->{button}; 3096 $self->{button} = $ev->{button};
2972 3097
2973 $self->show; 3098 $self->show;
2974 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3099 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2975} 3100}
2976 3101
2977sub mouse_motion { 3102sub invoke_mouse_motion {
2978 my ($self, $ev, $x, $y) = @_; 3103 my ($self, $ev, $x, $y) = @_;
2979 3104
2980 # TODO: should use vbox->find_widget or so 3105 # TODO: should use vbox->find_widget or so
2981 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3106 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2982 $self->{hover} = $self->{item}{$HOVER}; 3107 $self->{hover} = $self->{item}{$HOVER};
2983 3108
2984 0 3109 0
2985} 3110}
2986 3111
2987sub button_up { 3112sub invoke_button_up {
2988 my ($self, $ev, $x, $y) = @_; 3113 my ($self, $ev, $x, $y) = @_;
2989 3114
2990 if ($ev->{button} == $self->{button}) { 3115 if ($ev->{button} == $self->{button}) {
2991 undef $GRAB; 3116 undef $GRAB;
2992 $self->hide; 3117 $self->hide;
2993 3118
2994 $self->_emit ("popdown"); 3119 $self->emit ("popdown");
2995 $self->{hover}[1]->() if $self->{hover}; 3120 $self->{hover}[1]->() if $self->{hover};
2996 } else { 3121 } else {
2997 return 0 3122 return 0
2998 } 3123 }
2999 3124
… …
3036 : $self->{children}[$page_or_widget]; 3161 : $self->{children}[$page_or_widget];
3037 3162
3038 $self->{current} = $widget; 3163 $self->{current} = $widget;
3039 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3164 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3040 3165
3041 $self->_emit (page_changed => $self->{current}); 3166 $self->emit (page_changed => $self->{current});
3042 3167
3043 $self->realloc; 3168 $self->realloc;
3044} 3169}
3045 3170
3046sub visible_children { 3171sub visible_children {
… …
3051 my ($self) = @_; 3176 my ($self) = @_;
3052 3177
3053 $self->{current}->size_request 3178 $self->{current}->size_request
3054} 3179}
3055 3180
3056sub size_allocate { 3181sub invoke_size_allocate {
3057 my ($self, $w, $h) = @_; 3182 my ($self, $w, $h) = @_;
3058 3183
3059 $self->{current}->configure (0, 0, $w, $h); 3184 $self->{current}->configure (0, 0, $w, $h);
3185
3186 1
3060} 3187}
3061 3188
3062sub _draw { 3189sub _draw {
3063 my ($self) = @_; 3190 my ($self) = @_;
3064 3191
… …
3103 3230
3104sub set_current_page { 3231sub set_current_page {
3105 my ($self, $page) = @_; 3232 my ($self, $page) = @_;
3106 3233
3107 $self->{multiplexer}->set_current_page ($page); 3234 $self->{multiplexer}->set_current_page ($page);
3108 $self->_emit (page_changed => $self->{multiplexer}{current}); 3235 $self->emit (page_changed => $self->{multiplexer}{current});
3109} 3236}
3110 3237
3111############################################################################# 3238#############################################################################
3112 3239
3113package CFClient::UI::Combobox; 3240package CFClient::UI::Combobox;
… …
3128 $self->_set_value ($self->{value}); 3255 $self->_set_value ($self->{value});
3129 3256
3130 $self 3257 $self
3131} 3258}
3132 3259
3133sub button_down { 3260sub invoke_button_down {
3134 my ($self, $ev) = @_; 3261 my ($self, $ev) = @_;
3135 3262
3136 my @menu_items; 3263 my @menu_items;
3137 3264
3138 for (@{ $self->{options} }) { 3265 for (@{ $self->{options} }) {
… …
3159 my ($self, $value) = @_; 3286 my ($self, $value) = @_;
3160 3287
3161 return unless $self->{value} ne $value; 3288 return unless $self->{value} ne $value;
3162 3289
3163 $self->_set_value ($value); 3290 $self->_set_value ($value);
3164 $self->_emit (changed => $value); 3291 $self->emit (changed => $value);
3165} 3292}
3166 3293
3167############################################################################# 3294#############################################################################
3168 3295
3169package CFClient::UI::Statusbox; 3296package CFClient::UI::Statusbox;
… …
3284 count => 1, 3411 count => 1,
3285 %arg, 3412 %arg,
3286 }; 3413 };
3287 } 3414 }
3288 3415
3416 $ROOT->on_refresh (reorder => sub {
3289 $self->reorder; 3417 $self->reorder;
3418 });
3290} 3419}
3291 3420
3292sub reconfigure { 3421sub reconfigure {
3293 my ($self) = @_; 3422 my ($self) = @_;
3294 3423
… …
3331 return unless $items; 3460 return unless $items;
3332 3461
3333 my @items = sort { 3462 my @items = sort {
3334 ($a->{type} <=> $b->{type}) 3463 ($a->{type} <=> $b->{type})
3335 or ($a->{name} cmp $b->{name}) 3464 or ($a->{name} cmp $b->{name})
3336 } @$items; 3465 } values %$items;
3337 3466
3338 $self->{real_items} = \@items; 3467 $self->{real_items} = \@items;
3339 3468
3340 my $row = 0; 3469 my $row = 0;
3341 for my $item (@items) { 3470 for my $item (@items) {
… …
3344 $self->{child}->add (0, $row, $item->{face_widget}); 3473 $self->{child}->add (0, $row, $item->{face_widget});
3345 $self->{child}->add (1, $row, $item->{desc_widget}); 3474 $self->{child}->add (1, $row, $item->{desc_widget});
3346 $self->{child}->add (2, $row, $item->{weight_widget}); 3475 $self->{child}->add (2, $row, $item->{weight_widget});
3347 3476
3348 $row++; 3477 $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 } 3478 }
3547} 3479}
3548 3480
3549############################################################################# 3481#############################################################################
3550 3482
… …
3604 } elsif ($ev->{button} == 2) { 3536 } elsif ($ev->{button} == 2) {
3605 $::CONN->user_send ("invoke $spell->{name}"); 3537 $::CONN->user_send ("invoke $spell->{name}");
3606 } elsif ($ev->{button} == 3) { 3538 } elsif ($ev->{button} == 3) {
3607 (new CFClient::UI::Menu 3539 (new CFClient::UI::Menu
3608 items => [ 3540 items => [
3609 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }], 3541 ["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}"]) }], 3542 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3611 ], 3543 ],
3612 )->popup ($ev); 3544 )->popup ($ev);
3613 } else { 3545 } else {
3614 return 0; 3546 return 0;
… …
3709 $coord = $max - $size if $coord > $max - $size; 3641 $coord = $max - $size if $coord > $max - $size;
3710 3642
3711 int $coord + 0.5 3643 int $coord + 0.5
3712} 3644}
3713 3645
3714sub size_allocate { 3646sub invoke_size_allocate {
3715 my ($self, $w, $h) = @_; 3647 my ($self, $w, $h) = @_;
3716 3648
3717 for my $child ($self->children) { 3649 for my $child ($self->children) {
3718 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3650 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3719 3651
… …
3723 $X = _to_pixel $X, $W, $self->{w}; 3655 $X = _to_pixel $X, $W, $self->{w};
3724 $Y = _to_pixel $Y, $H, $self->{h}; 3656 $Y = _to_pixel $Y, $H, $self->{h};
3725 3657
3726 $child->configure ($X, $Y, $W, $H); 3658 $child->configure ($X, $Y, $W, $H);
3727 } 3659 }
3660
3661 1
3728} 3662}
3729 3663
3730sub coord2local { 3664sub coord2local {
3731 my ($self, $x, $y) = @_; 3665 my ($self, $x, $y) = @_;
3732 3666

Diff Legend

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