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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.304 by elmex, Tue Jun 13 11:01:04 2006 UTC vs.
Revision 1.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
1095 unless ($self->{no_close_button}) { 1097 if ($self->{has_close_button}) {
1096 $self->{close_btn} = 1098 $self->{close_button} =
1097 new CFClient::UI::ImageButton 1099 new CFClient::UI::ImageButton
1098 image => 'x1_close.png', 1100 path => 'x1_close.png',
1099 on_activate => sub { $self->hide }; 1101 on_activate => sub { $self->hide };
1100 1102
1101 $self->CFClient::UI::Container::add ($self->{close_btn}); 1103 $self->CFClient::UI::Container::add ($self->{close_button});
1102 } 1104 }
1103 1105
1104 $self 1106 $self
1105} 1107}
1106 1108
1107sub add { 1109sub add {
1108 my ($self, @widgets) = @_; 1110 my ($self, @widgets) = @_;
1109 1111
1110 $self->SUPER::add (@widgets); 1112 $self->SUPER::add (@widgets);
1111 $self->CFClient::UI::Container::add ($self->{close_btn}) if $self->{close_btn}; 1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1112 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1114 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1113} 1115}
1114 1116
1115sub border { 1117sub border {
1116 int $_[0]{border} * $::FONTSIZE 1118 int $_[0]{border} * $::FONTSIZE
… …
1120 my ($self) = @_; 1122 my ($self) = @_;
1121 1123
1122 $self->{title_widget}->size_request 1124 $self->{title_widget}->size_request
1123 if $self->{title_widget}; 1125 if $self->{title_widget};
1124 1126
1125 $self->{close_btn}->size_request 1127 $self->{close_button}->size_request
1126 if $self->{close_btn}; 1128 if $self->{close_button};
1127 1129
1128 my ($w, $h) = $self->SUPER::size_request; 1130 my ($w, $h) = $self->SUPER::size_request;
1129 1131
1130 ( 1132 (
1131 $w + $self->border * 2, 1133 $w + $self->border * 2,
1132 $h + $self->border * 2, 1134 $h + $self->border * 2,
1133 ) 1135 )
1134} 1136}
1135 1137
1136sub size_allocate { 1138sub invoke_size_allocate {
1137 my ($self, $w, $h) = @_; 1139 my ($self, $w, $h) = @_;
1138 1140
1139 if ($self->{title_widget}) { 1141 if ($self->{title_widget}) {
1140 $self->{title_widget}{w} = $w; 1142 $self->{title_widget}{w} = $w;
1141 $self->{title_widget}{h} = $h; 1143 $self->{title_widget}{h} = $h;
1142 $self->{title_widget}->size_allocate ($w, $h); 1144 $self->{title_widget}->invoke_size_allocate ($w, $h);
1143 } 1145 }
1144 1146
1145 my $border = $self->border; 1147 my $border = $self->border;
1146 1148
1147 $h -= List::Util::max 0, $border * 2; 1149 $h -= List::Util::max 0, $border * 2;
1148 $w -= List::Util::max 0, $border * 2; 1150 $w -= List::Util::max 0, $border * 2;
1149 1151
1150 $self->child->configure ($border, $border, $w, $h); 1152 $self->child->configure ($border, $border, $w, $h);
1151 1153
1152 $self->{close_btn}->configure ($self->{w} - (2 * $border), 0, $border, $border) 1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153 if $self->{close_btn}; 1155 if $self->{close_button};
1154}
1155 1156
1157 1
1158}
1159
1156sub button_down { 1160sub invoke_button_down {
1157 my ($self, $ev, $x, $y) = @_; 1161 my ($self, $ev, $x, $y) = @_;
1158 1162
1159 my ($w, $h) = @$self{qw(w h)}; 1163 my ($w, $h) = @$self{qw(w h)};
1160 my $border = $self->border; 1164 my $border = $self->border;
1161 1165
… …
1192 1196
1193 ($x, $y) = ($ev->{x}, $ev->{y}); 1197 ($x, $y) = ($ev->{x}, $ev->{y});
1194 1198
1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1199 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1196 # HACK: the next line is required to enforce placement 1200 # HACK: the next line is required to enforce placement
1197 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1201 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1198 }; 1202 };
1199 } else { 1203 } else {
1200 return 0; 1204 return 0;
1201 } 1205 }
1202 1206
1203 1 1207 1
1204} 1208}
1205 1209
1206sub button_up { 1210sub invoke_button_up {
1207 my ($self, $ev, $x, $y) = @_; 1211 my ($self, $ev, $x, $y) = @_;
1208 1212
1209 $self->{close_btn}->button_up ($ev, $x, $y)
1210 if $self->{close_btn};
1211
1212 !!delete $self->{motion} 1213 ! ! delete $self->{motion}
1213} 1214}
1214 1215
1215sub mouse_motion { 1216sub invoke_mouse_motion {
1216 my ($self, $ev, $x, $y) = @_; 1217 my ($self, $ev, $x, $y) = @_;
1217 1218
1218 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1219 $self->{motion}->($ev, $x, $y) if $self->{motion};
1219 1220
1220 !!$self->{motion} 1221 ! ! $self->{motion}
1221} 1222}
1222 1223
1223sub _draw { 1224sub _draw {
1224 my ($self) = @_; 1225 my ($self) = @_;
1225 1226
… …
1258 $self->{title_widget}->_draw; 1259 $self->{title_widget}->_draw;
1259 1260
1260 glTranslate 0, - ($border - $self->{h}); 1261 glTranslate 0, - ($border - $self->{h});
1261 } 1262 }
1262 1263
1263 $self->{close_btn}->draw 1264 $self->{close_button}->draw
1264 if $self->{close_btn}; 1265 if $self->{close_button};
1265} 1266}
1266 1267
1267############################################################################# 1268#############################################################################
1268 1269
1269package CFClient::UI::Table; 1270package CFClient::UI::Table;
… …
1348 (sum @$ws), 1349 (sum @$ws),
1349 (sum @$hs), 1350 (sum @$hs),
1350 ) 1351 )
1351} 1352}
1352 1353
1353sub size_allocate { 1354sub invoke_size_allocate {
1354 my ($self, $w, $h) = @_; 1355 my ($self, $w, $h) = @_;
1355 1356
1356 my ($ws, $hs) = $self->get_wh; 1357 my ($ws, $hs) = $self->get_wh;
1357 1358
1358 my $req_w = (sum @$ws) || 1; 1359 my $req_w = (sum @$ws) || 1;
… …
1390 } 1391 }
1391 1392
1392 $y += $row_h; 1393 $y += $row_h;
1393 } 1394 }
1394 1395
1396 1
1395} 1397}
1396 1398
1397sub find_widget { 1399sub find_widget {
1398 my ($self, $x, $y) = @_; 1400 my ($self, $x, $y) = @_;
1399 1401
… …
1436 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1438 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1437 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1439 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1438 ) 1440 )
1439} 1441}
1440 1442
1441sub size_allocate { 1443sub invoke_size_allocate {
1442 my ($self, $w, $h) = @_; 1444 my ($self, $w, $h) = @_;
1443 1445
1444 my $space = $self->{vertical} ? $h : $w; 1446 my $space = $self->{vertical} ? $h : $w;
1445 my $children = $self->{children}; 1447 my @children = $self->visible_children;
1446 1448
1447 my @req; 1449 my @req;
1448 1450
1449 if ($self->{homogeneous}) { 1451 if ($self->{homogeneous}) {
1450 @req = ($space / (@$children || 1)) x @$children; 1452 @req = ($space / (@children || 1)) x @children;
1451 } else { 1453 } else {
1452 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1454 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1453 my $req = List::Util::sum @req; 1455 my $req = List::Util::sum @req;
1454 1456
1455 if ($req > $space) { 1457 if ($req > $space) {
1456 # ah well, not enough space 1458 # ah well, not enough space
1457 $_ *= $space / $req for @req; 1459 $_ *= $space / $req for @req;
1458 } else { 1460 } else {
1459 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1461 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1460 1462
1461 $space = ($space - $req) / $expand; # remaining space to give away 1463 $space = ($space - $req) / $expand; # remaining space to give away
1462 1464
1463 $req[$_] += $space * $children->[$_]{expand} 1465 $req[$_] += $space * $children[$_]{expand}
1464 for 0 .. $#$children; 1466 for 0 .. $#children;
1465 } 1467 }
1466 } 1468 }
1467 1469
1468 CFClient::UI::harmonize \@req; 1470 CFClient::UI::harmonize \@req;
1469 1471
1470 my $pos = 0; 1472 my $pos = 0;
1471 for (0 .. $#$children) { 1473 for (0 .. $#children) {
1472 my $alloc = $req[$_]; 1474 my $alloc = $req[$_];
1473 $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));
1474 1476
1475 $pos += $alloc; 1477 $pos += $alloc;
1476 } 1478 }
1477 1479
1478 1 1480 1
… …
1633 }; 1635 };
1634 1636
1635 @{ $self->{size_req} } 1637 @{ $self->{size_req} }
1636} 1638}
1637 1639
1640sub baseline_shift {
1641 $_[0]{layout}->descent
1642}
1643
1638sub size_allocate { 1644sub invoke_size_allocate {
1639 my ($self, $w, $h) = @_; 1645 my ($self, $w, $h) = @_;
1640 1646
1641 delete $self->{ox}; 1647 delete $self->{ox};
1642 1648
1643 delete $self->{texture} 1649 delete $self->{texture}
1644 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
1645} 1653}
1646 1654
1647sub set_fontsize { 1655sub set_fontsize {
1648 my ($self, $fontsize) = @_; 1656 my ($self, $fontsize) = @_;
1649 1657
1650 $self->{fontsize} = $fontsize; 1658 $self->{fontsize} = $fontsize;
1659 delete $self->{size_req};
1651 delete $self->{texture}; 1660 delete $self->{texture};
1652 1661
1653 $self->realloc; 1662 $self->realloc;
1654} 1663}
1655 1664
… …
1742 1751
1743 $text =~ s/./*/g if $self->{hidden}; 1752 $text =~ s/./*/g if $self->{hidden};
1744 $self->{layout}->set_text ("$text "); 1753 $self->{layout}->set_text ("$text ");
1745 delete $self->{size_req}; 1754 delete $self->{size_req};
1746 1755
1747 $self->_emit (changed => $self->{text}); 1756 $self->emit (changed => $self->{text});
1748 1757
1749 $self->realloc; 1758 $self->realloc;
1750 $self->update; 1759 $self->update;
1751} 1760}
1752 1761
… …
1767 my ($w, $h) = $self->SUPER::size_request; 1776 my ($w, $h) = $self->SUPER::size_request;
1768 1777
1769 ($w + 1, $h) # add 1 for cursor 1778 ($w + 1, $h) # add 1 for cursor
1770} 1779}
1771 1780
1772sub key_down { 1781sub invoke_key_down {
1773 my ($self, $ev) = @_; 1782 my ($self, $ev) = @_;
1774 1783
1775 my $mod = $ev->{mod}; 1784 my $mod = $ev->{mod};
1776 my $sym = $ev->{sym}; 1785 my $sym = $ev->{sym};
1777 my $uni = $ev->{unicode}; 1786 my $uni = $ev->{unicode};
… …
1789 } elsif ($sym == CFClient::SDLK_HOME) { 1798 } elsif ($sym == CFClient::SDLK_HOME) {
1790 $self->{cursor} = 0; 1799 $self->{cursor} = 0;
1791 } elsif ($sym == CFClient::SDLK_END) { 1800 } elsif ($sym == CFClient::SDLK_END) {
1792 $self->{cursor} = length $text; 1801 $self->{cursor} = length $text;
1793 } elsif ($uni == 27) { 1802 } elsif ($uni == 27) {
1794 $self->_emit ('escape'); 1803 $self->emit ('escape');
1795 } elsif ($uni) { 1804 } elsif ($uni) {
1796 substr $text, $self->{cursor}++, 0, chr $uni; 1805 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else { 1806 } else {
1798 return 0; 1807 return 0;
1799 } 1808 }
… …
1803 $self->realloc; 1812 $self->realloc;
1804 1813
1805 1 1814 1
1806} 1815}
1807 1816
1808sub focus_in { 1817sub invoke_focus_in {
1809 my ($self) = @_; 1818 my ($self) = @_;
1810 1819
1811 $self->{last_activity} = $::NOW; 1820 $self->{last_activity} = $::NOW;
1812 1821
1813 $self->SUPER::focus_in; 1822 $self->SUPER::invoke_focus_in
1814} 1823}
1815 1824
1816sub button_down { 1825sub invoke_button_down {
1817 my ($self, $ev, $x, $y) = @_; 1826 my ($self, $ev, $x, $y) = @_;
1818 1827
1819 $self->SUPER::button_down ($ev, $x, $y); 1828 $self->SUPER::invoke_button_down ($ev, $x, $y);
1820 1829
1821 my $idx = $self->{layout}->xy_to_index ($x, $y); 1830 my $idx = $self->{layout}->xy_to_index ($x, $y);
1822 1831
1823 # byte-index to char-index 1832 # byte-index to char-index
1824 my $text = $self->{text}; 1833 my $text = $self->{text};
… …
1829 $self->update; 1838 $self->update;
1830 1839
1831 1 1840 1
1832} 1841}
1833 1842
1834sub mouse_motion { 1843sub invoke_mouse_motion {
1835 my ($self, $ev, $x, $y) = @_; 1844 my ($self, $ev, $x, $y) = @_;
1836# 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#
1837 1846
1838 0 1847 1
1839} 1848}
1840 1849
1841sub _draw { 1850sub _draw {
1842 my ($self) = @_; 1851 my ($self) = @_;
1843 1852
… …
1884 1893
1885our @ISA = CFClient::UI::EntryBase::; 1894our @ISA = CFClient::UI::EntryBase::;
1886 1895
1887use CFClient::OpenGL; 1896use CFClient::OpenGL;
1888 1897
1889sub key_down { 1898sub invoke_key_down {
1890 my ($self, $ev) = @_; 1899 my ($self, $ev) = @_;
1891 1900
1892 my $sym = $ev->{sym}; 1901 my $sym = $ev->{sym};
1893 1902
1894 if ($sym == 13) { 1903 if ($sym == 13) {
1895 unshift @{$self->{history}}, 1904 unshift @{$self->{history}},
1896 my $txt = $self->get_text; 1905 my $txt = $self->get_text;
1906
1897 $self->{history_pointer} = -1; 1907 $self->{history_pointer} = -1;
1898 $self->{history_saveback} = ''; 1908 $self->{history_saveback} = '';
1899 $self->_emit (activate => $txt); 1909 $self->emit (activate => $txt);
1900 $self->update; 1910 $self->update;
1901 1911
1902 } elsif ($sym == CFClient::SDLK_UP) { 1912 } elsif ($sym == CFClient::SDLK_UP) {
1903 if ($self->{history_pointer} < 0) { 1913 if ($self->{history_pointer} < 0) {
1904 $self->{history_saveback} = $self->get_text; 1914 $self->{history_saveback} = $self->get_text;
… …
1920 } else { 1930 } else {
1921 $self->set_text ($self->{history_saveback}); 1931 $self->set_text ($self->{history_saveback});
1922 } 1932 }
1923 1933
1924 } else { 1934 } else {
1925 return $self->SUPER::key_down ($ev) 1935 return $self->SUPER::invoke_key_down ($ev)
1926 } 1936 }
1927 1937
1928 1 1938 1
1929} 1939}
1930 1940
… …
1954 can_events => 1, 1964 can_events => 1,
1955 @_ 1965 @_
1956 ) 1966 )
1957} 1967}
1958 1968
1959sub activate { }
1960
1961sub button_up { 1969sub invoke_button_up {
1962 my ($self, $ev, $x, $y) = @_; 1970 my ($self, $ev, $x, $y) = @_;
1963 1971
1964 $self->emit ("activate") 1972 $self->emit ("activate")
1965 if $x >= 0 && $x < $self->{w} 1973 if $x >= 0 && $x < $self->{w}
1966 && $y >= 0 && $y < $self->{h}; 1974 && $y >= 0 && $y < $self->{h};
… …
2008 can_events => 1, 2016 can_events => 1,
2009 @_ 2017 @_
2010 ); 2018 );
2011} 2019}
2012 2020
2013sub activate { }
2014
2015sub button_up { 2021sub invoke_button_up {
2016 my ($self, $ev, $x, $y) = @_; 2022 my ($self, $ev, $x, $y) = @_;
2017 2023
2018 $self->emit ("activate") 2024 $self->emit ("activate")
2019 if $x >= 0 && $x < $self->{w} 2025 if $x >= 0 && $x < $self->{w}
2020 && $y >= 0 && $y < $self->{h}; 2026 && $y >= 0 && $y < $self->{h};
… …
2054 my ($self) = @_; 2060 my ($self) = @_;
2055 2061
2056 (6) x 2 2062 (6) x 2
2057} 2063}
2058 2064
2059sub button_down { 2065sub invoke_button_down {
2060 my ($self, $ev, $x, $y) = @_; 2066 my ($self, $ev, $x, $y) = @_;
2061 2067
2062 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2068 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2063 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2069 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2064 $self->{state} = !$self->{state}; 2070 $self->{state} = !$self->{state};
2065 $self->_emit (changed => $self->{state}); 2071 $self->emit (changed => $self->{state});
2066 } else { 2072 } else {
2067 return 0 2073 return 0
2068 } 2074 }
2069 2075
2070 1 2076 1
… …
2095package CFClient::UI::Image; 2101package CFClient::UI::Image;
2096 2102
2097our @ISA = CFClient::UI::Base::; 2103our @ISA = CFClient::UI::Base::;
2098 2104
2099use CFClient::OpenGL; 2105use CFClient::OpenGL;
2100use Carp qw/confess/;
2101 2106
2102our %loaded_images; 2107our %texture_cache;
2103 2108
2104sub new { 2109sub new {
2105 my $class = shift; 2110 my $class = shift;
2106 2111
2107 my $self = $class->SUPER::new (can_events => 0, @_); 2112 my $self = $class->SUPER::new (
2113 can_events => 0,
2114 @_,
2115 );
2108 2116
2109 $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";
2110 2119
2111 $loaded_images{$self->{image}} ||= 2120 $self->{tex} = $texture_cache{$self->{path}} ||=
2112 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;
2113 2122
2114 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2123 Scalar::Util::weaken $texture_cache{$self->{path}};
2115 2124
2116 Scalar::Util::weaken $loaded_images{$self->{image}}; 2125 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2117
2118 $self->{aspect} = $tex->{w} / $tex->{h};
2119 2126
2120 $self 2127 $self
2121} 2128}
2122 2129
2123sub size_request { 2130sub size_request {
2124 my ($self) = @_; 2131 my ($self) = @_;
2125 2132
2126 ($self->{tex}->{w}, $self->{tex}->{h}) 2133 ($self->{tex}{w}, $self->{tex}{h})
2127} 2134}
2128 2135
2129sub _draw { 2136sub _draw {
2130 my ($self) = @_; 2137 my ($self) = @_;
2131 2138
… …
2367 $self->update; 2374 $self->update;
2368 2375
2369 $self 2376 $self
2370} 2377}
2371 2378
2372sub changed { }
2373
2374sub set_range { 2379sub set_range {
2375 my ($self, $range) = @_; 2380 my ($self, $range) = @_;
2376 2381
2377 ($range, $self->{range}) = ($self->{range}, $range); 2382 ($range, $self->{range}) = ($self->{range}, $range);
2378 2383
… …
2398 if $unit; 2403 if $unit;
2399 2404
2400 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2405 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2401 2406
2402 if ($value != $old_value) { 2407 if ($value != $old_value) {
2403 $self->_emit (changed => $value); 2408 $self->emit (changed => $value);
2404 $self->update; 2409 $self->update;
2405 } 2410 }
2406} 2411}
2407 2412
2408sub size_request { 2413sub size_request {
2409 my ($self) = @_; 2414 my ($self) = @_;
2410 2415
2411 ($self->{req_w}, $self->{req_h}) 2416 ($self->{req_w}, $self->{req_h})
2412} 2417}
2413 2418
2414sub button_down { 2419sub invoke_button_down {
2415 my ($self, $ev, $x, $y) = @_; 2420 my ($self, $ev, $x, $y) = @_;
2416 2421
2417 $self->SUPER::button_down ($ev, $x, $y); 2422 $self->SUPER::invoke_button_down ($ev, $x, $y);
2418 2423
2419 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2424 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2420 2425
2421 $self->mouse_motion ($ev, $x, $y) 2426 $self->invoke_mouse_motion ($ev, $x, $y)
2422} 2427}
2423 2428
2424sub mouse_motion { 2429sub invoke_mouse_motion {
2425 my ($self, $ev, $x, $y) = @_; 2430 my ($self, $ev, $x, $y) = @_;
2426 2431
2427 if ($GRAB == $self) { 2432 if ($GRAB == $self) {
2428 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2433 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2429 2434
… …
2571 2576
2572 $self->{fontsize} = $fontsize; 2577 $self->{fontsize} = $fontsize;
2573 $self->reflow; 2578 $self->reflow;
2574} 2579}
2575 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
2576sub size_allocate { 2590sub invoke_size_allocate {
2577 my ($self, $w, $h) = @_; 2591 my ($self, $w, $h) = @_;
2578 2592
2579 $self->SUPER::size_allocate ($w, $h); 2593 my ($empty, $slider, @other) = @{ $self->{children} };
2594 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2580 2595
2581 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2596 $self->{layout}->set_font ($self->{font}) if $self->{font};
2582 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2597 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2583 $self->{layout}->set_width ($self->{children}[0]{w}); 2598 $self->{layout}->set_width ($empty->{w});
2584 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2599 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2585 2600
2586 $self->reflow; 2601 $self->reflow;
2587}
2588 2602
2589sub text_size { 2603 local $self->{children} = [$empty, $slider];
2590 my ($self, $text, $indent) = @_; 2604 $self->SUPER::invoke_size_allocate ($w, $h)
2605}
2606
2607sub get_layout {
2608 my ($self, $para) = @_;
2591 2609
2592 my $layout = $self->{layout}; 2610 my $layout = $self->{layout};
2593 2611
2612 $layout->set_font ($self->{font}) if $self->{font};
2613 $layout->set_foreground (@{$para->{fg}});
2594 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2614 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2595 $layout->set_width ($self->{children}[0]{w} - $indent); 2615 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2616 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2597 $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}}
2598 2623 );
2624
2599 $layout->size 2625 $layout
2600} 2626}
2601 2627
2602sub reflow { 2628sub reflow {
2603 my ($self) = @_; 2629 my ($self) = @_;
2604 2630
… …
2613 $self->{children}[1]->set_value ($offset); 2639 $self->{children}[1]->set_value ($offset);
2614} 2640}
2615 2641
2616sub clear { 2642sub clear {
2617 my ($self) = @_; 2643 my ($self) = @_;
2644
2645 my (undef, undef, @other) = @{ $self->{children} };
2646 $self->remove ($_) for @other;
2618 2647
2619 $self->{par} = []; 2648 $self->{par} = [];
2620 $self->{height} = 0; 2649 $self->{height} = 0;
2621 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2650 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2622} 2651}
2623 2652
2624sub add_paragraph { 2653sub add_paragraph {
2625 my ($self, $color, $text, $indent) = @_; 2654 my ($self, $color, $para, $indent) = @_;
2626 2655
2627 for my $line (split /\n/, $text) { 2656 my ($text, @w) = ref $para ? @$para : $para;
2628 my ($w, $h) = $self->text_size ($line); 2657
2629 $self->{height} += $h; 2658 $para = {
2630 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,
2631 } 2665 };
2632 2666
2633 $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;
2634} 2679}
2635 2680
2636sub update { 2681sub update {
2637 my ($self) = @_; 2682 my ($self) = @_;
2638 2683
… …
2646 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2691 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2647 2692
2648 if (delete $self->{need_reflow}) { 2693 if (delete $self->{need_reflow}) {
2649 my $height = 0; 2694 my $height = 0;
2650 2695
2651 my $layout = $self->{layout};
2652
2653 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2654
2655 for (@{$self->{par}}) { 2696 for my $para (@{$self->{par}}) {
2656 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2697 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2657 $layout->set_width ($W - $_->[3]); 2698 my $layout = $self->get_layout ($para);
2658 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2659 $layout->set_markup ($_->[4]);
2660 my ($w, $h) = $layout->size; 2699 my ($w, $h) = $layout->size;
2661 $_->[0] = $w + $_->[3]; 2700
2662 $_->[1] = $h; 2701 $para->{w} = $w + $para->{indent};
2702 $para->{h} = $h;
2703 $para->{wrapped} = $layout->has_wrapped;
2663 } 2704 }
2664 2705
2665 $height += $_->[1]; 2706 $height += $para->{h};
2666 } 2707 }
2667 2708
2668 $self->{height} = $height; 2709 $self->{height} = $height;
2669 2710
2670 $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]);
2671 2712
2672 delete $self->{texture}; 2713 delete $self->{texture};
2714 }
2715
2716 if (delete $self->{scroll_to_bottom}) {
2717 $self->{children}[1]->set_value (1e10);
2673 } 2718 }
2674 2719
2675 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2720 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2676 glClearColor 0, 0, 0, 0; 2721 glClearColor 0, 0, 0, 0;
2677 glClear GL_COLOR_BUFFER_BIT; 2722 glClear GL_COLOR_BUFFER_BIT;
… …
2681 my $y0 = $top; 2726 my $y0 = $top;
2682 my $y1 = $top + $H; 2727 my $y1 = $top + $H;
2683 2728
2684 my $y = 0; 2729 my $y = 0;
2685 2730
2686 my $layout = $self->{layout};
2687
2688 $layout->set_font ($self->{font}) if $self->{font};
2689
2690 glEnable GL_BLEND; 2731 glEnable GL_BLEND;
2691 #TODO# not correct in windows where rgba is forced off 2732 #TODO# not correct in windows where rgba is forced off
2692 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2733 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2693 2734
2694 for my $par (@{$self->{par}}) { 2735 for my $para (@{$self->{par}}) {
2695 my $h = $par->[1]; 2736 my $h = $para->{h};
2696 2737
2697 if ($y0 < $y + $h && $y < $y1) { 2738 if ($y0 < $y + $h && $y < $y1) {
2698 $layout->set_foreground (@{ $par->[2] }); 2739
2699 $layout->set_width ($W - $par->[3]); 2740 my $layout = $self->get_layout ($para);
2700 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2701 $layout->set_markup ($par->[4]);
2702 2741
2703 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2742 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2704 2743
2705 glRasterPos $par->[3], $y - $y0; 2744 glRasterPos $para->{indent}, $y - $y0;
2706 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 }
2707 } 2762 }
2708 2763
2709 $y += $h; 2764 $y += $h;
2710 } 2765 }
2711 2766
2712 glDisable GL_BLEND; 2767 glDisable GL_BLEND;
2713 }; 2768 };
2714 }); 2769 });
2770}
2771
2772sub reconfigure {
2773 my ($self) = @_;
2774
2775 $self->SUPER::reconfigure;
2776
2777 $_->{w} = 1e10 for @{ $self->{par} };
2778 $self->reflow;
2715} 2779}
2716 2780
2717sub _draw { 2781sub _draw {
2718 my ($self) = @_; 2782 my ($self) = @_;
2719 2783
… …
2722 glColor 0, 0, 0, 1; 2786 glColor 0, 0, 0, 1;
2723 $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});
2724 glDisable GL_TEXTURE_2D; 2788 glDisable GL_TEXTURE_2D;
2725 2789
2726 $self->{children}[1]->draw; 2790 $self->{children}[1]->draw;
2727
2728} 2791}
2729 2792
2730############################################################################# 2793#############################################################################
2731 2794
2732package CFClient::UI::Animator; 2795package CFClient::UI::Animator;
… …
2841 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2904 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2842 2905
2843 ($w + 4, $h + 4) 2906 ($w + 4, $h + 4)
2844} 2907}
2845 2908
2846sub size_allocate { 2909sub invoke_size_allocate {
2847 my ($self, $w, $h) = @_; 2910 my ($self, $w, $h) = @_;
2848 2911
2849 $self->SUPER::size_allocate ($w - 4, $h - 4); 2912 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2850} 2913}
2851 2914
2852sub visibility_change { 2915sub invoke_visibility_change {
2853 my ($self, $visible) = @_; 2916 my ($self, $visible) = @_;
2854 2917
2855 return unless $visible; 2918 return unless $visible;
2856 2919
2857 $self->{root}->on_post_alloc ("move_$self" => sub { 2920 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
3024 3087
3025# 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)
3026sub popup { 3089sub popup {
3027 my ($self, $ev) = @_; 3090 my ($self, $ev) = @_;
3028 3091
3029 $self->_emit ("popdown"); 3092 $self->emit ("popdown");
3030 3093
3031 # maybe save $GRAB? must be careful about events... 3094 # maybe save $GRAB? must be careful about events...
3032 $GRAB = $self; 3095 $GRAB = $self;
3033 $self->{button} = $ev->{button}; 3096 $self->{button} = $ev->{button};
3034 3097
3035 $self->show; 3098 $self->show;
3036 $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);
3037} 3100}
3038 3101
3039sub mouse_motion { 3102sub invoke_mouse_motion {
3040 my ($self, $ev, $x, $y) = @_; 3103 my ($self, $ev, $x, $y) = @_;
3041 3104
3042 # TODO: should use vbox->find_widget or so 3105 # TODO: should use vbox->find_widget or so
3043 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3106 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
3044 $self->{hover} = $self->{item}{$HOVER}; 3107 $self->{hover} = $self->{item}{$HOVER};
3045 3108
3046 0 3109 0
3047} 3110}
3048 3111
3049sub button_up { 3112sub invoke_button_up {
3050 my ($self, $ev, $x, $y) = @_; 3113 my ($self, $ev, $x, $y) = @_;
3051 3114
3052 if ($ev->{button} == $self->{button}) { 3115 if ($ev->{button} == $self->{button}) {
3053 undef $GRAB; 3116 undef $GRAB;
3054 $self->hide; 3117 $self->hide;
3055 3118
3056 $self->_emit ("popdown"); 3119 $self->emit ("popdown");
3057 $self->{hover}[1]->() if $self->{hover}; 3120 $self->{hover}[1]->() if $self->{hover};
3058 } else { 3121 } else {
3059 return 0 3122 return 0
3060 } 3123 }
3061 3124
… …
3098 : $self->{children}[$page_or_widget]; 3161 : $self->{children}[$page_or_widget];
3099 3162
3100 $self->{current} = $widget; 3163 $self->{current} = $widget;
3101 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3164 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3102 3165
3103 $self->_emit (page_changed => $self->{current}); 3166 $self->emit (page_changed => $self->{current});
3104 3167
3105 $self->realloc; 3168 $self->realloc;
3106} 3169}
3107 3170
3108sub visible_children { 3171sub visible_children {
… …
3113 my ($self) = @_; 3176 my ($self) = @_;
3114 3177
3115 $self->{current}->size_request 3178 $self->{current}->size_request
3116} 3179}
3117 3180
3118sub size_allocate { 3181sub invoke_size_allocate {
3119 my ($self, $w, $h) = @_; 3182 my ($self, $w, $h) = @_;
3120 3183
3121 $self->{current}->configure (0, 0, $w, $h); 3184 $self->{current}->configure (0, 0, $w, $h);
3185
3186 1
3122} 3187}
3123 3188
3124sub _draw { 3189sub _draw {
3125 my ($self) = @_; 3190 my ($self) = @_;
3126 3191
… …
3165 3230
3166sub set_current_page { 3231sub set_current_page {
3167 my ($self, $page) = @_; 3232 my ($self, $page) = @_;
3168 3233
3169 $self->{multiplexer}->set_current_page ($page); 3234 $self->{multiplexer}->set_current_page ($page);
3170 $self->_emit (page_changed => $self->{multiplexer}{current}); 3235 $self->emit (page_changed => $self->{multiplexer}{current});
3171} 3236}
3172 3237
3173############################################################################# 3238#############################################################################
3174 3239
3175package CFClient::UI::Combobox; 3240package CFClient::UI::Combobox;
… …
3190 $self->_set_value ($self->{value}); 3255 $self->_set_value ($self->{value});
3191 3256
3192 $self 3257 $self
3193} 3258}
3194 3259
3195sub button_down { 3260sub invoke_button_down {
3196 my ($self, $ev) = @_; 3261 my ($self, $ev) = @_;
3197 3262
3198 my @menu_items; 3263 my @menu_items;
3199 3264
3200 for (@{ $self->{options} }) { 3265 for (@{ $self->{options} }) {
… …
3221 my ($self, $value) = @_; 3286 my ($self, $value) = @_;
3222 3287
3223 return unless $self->{value} ne $value; 3288 return unless $self->{value} ne $value;
3224 3289
3225 $self->_set_value ($value); 3290 $self->_set_value ($value);
3226 $self->_emit (changed => $value); 3291 $self->emit (changed => $value);
3227} 3292}
3228 3293
3229############################################################################# 3294#############################################################################
3230 3295
3231package CFClient::UI::Statusbox; 3296package CFClient::UI::Statusbox;
… …
3346 count => 1, 3411 count => 1,
3347 %arg, 3412 %arg,
3348 }; 3413 };
3349 } 3414 }
3350 3415
3416 $ROOT->on_refresh (reorder => sub {
3351 $self->reorder; 3417 $self->reorder;
3418 });
3352} 3419}
3353 3420
3354sub reconfigure { 3421sub reconfigure {
3355 my ($self) = @_; 3422 my ($self) = @_;
3356 3423
… …
3393 return unless $items; 3460 return unless $items;
3394 3461
3395 my @items = sort { 3462 my @items = sort {
3396 ($a->{type} <=> $b->{type}) 3463 ($a->{type} <=> $b->{type})
3397 or ($a->{name} cmp $b->{name}) 3464 or ($a->{name} cmp $b->{name})
3398 } @$items; 3465 } values %$items;
3399 3466
3400 $self->{real_items} = \@items; 3467 $self->{real_items} = \@items;
3401 3468
3402 my $row = 0; 3469 my $row = 0;
3403 for my $item (@items) { 3470 for my $item (@items) {
… …
3406 $self->{child}->add (0, $row, $item->{face_widget}); 3473 $self->{child}->add (0, $row, $item->{face_widget});
3407 $self->{child}->add (1, $row, $item->{desc_widget}); 3474 $self->{child}->add (1, $row, $item->{desc_widget});
3408 $self->{child}->add (2, $row, $item->{weight_widget}); 3475 $self->{child}->add (2, $row, $item->{weight_widget});
3409 3476
3410 $row++; 3477 $row++;
3411 }
3412}
3413
3414#############################################################################
3415
3416package CFClient::UI::BindEditor;
3417
3418our @ISA = CFClient::UI::FancyFrame::;
3419
3420sub new {
3421 my $class = shift;
3422
3423 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3424
3425 $self->add (my $vb = new CFClient::UI::VBox);
3426
3427
3428 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3429 text => "start recording",
3430 tooltip => "Start/Stops recording of actions."
3431 ."All subsequent actions after the recording started will be captured."
3432 ."The actions are displayed after the record was stopped."
3433 ."To bind the action you have to click on the 'Bind' button",
3434 on_activate => sub {
3435 unless ($self->{recording}) {
3436 $self->start;
3437 } else {
3438 $self->stop;
3439 }
3440 });
3441
3442 $vb->add (new CFClient::UI::Label text => "Actions:");
3443 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3444
3445 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3446 $vb->add (my $hb = new CFClient::UI::HBox);
3447 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3448 $hb->add (new CFClient::UI::Button
3449 text => "bind",
3450 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3451 on_activate => sub {
3452 $self->ask_for_bind;
3453 });
3454
3455 $vb->add (my $hb = new CFClient::UI::HBox);
3456 $hb->add (new CFClient::UI::Button
3457 text => "ok",
3458 expand => 1,
3459 tooltip => "This closes the binding editor and saves the binding",
3460 on_activate => sub {
3461 $self->hide;
3462 $self->commit;
3463 });
3464
3465 $hb->add (new CFClient::UI::Button
3466 text => "cancel",
3467 expand => 1,
3468 tooltip => "This closes the binding editor without saving",
3469 on_activate => sub {
3470 $self->hide;
3471 $self->{binding_cancel}->()
3472 if $self->{binding_cancel};
3473 });
3474
3475 $self->update_binding_widgets;
3476
3477 $self
3478}
3479
3480sub commit {
3481 my ($self) = @_;
3482 my ($mod, $sym, $cmds) = $self->get_binding;
3483 if ($sym != 0 && @$cmds > 0) {
3484 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3485 ."'. Don't forget 'Save Config'!");
3486 $self->{binding_change}->($mod, $sym, $cmds)
3487 if $self->{binding_change};
3488 } else {
3489 $::STATUSBOX->add ("No action bound, no key or action specified!");
3490 $self->{binding_cancel}->()
3491 if $self->{binding_cancel};
3492 }
3493}
3494
3495sub start {
3496 my ($self) = @_;
3497
3498 $self->{rec_btn}->set_text ("stop recording");
3499 $self->{recording} = 1;
3500 $self->clear_command_list;
3501 $::CONN->start_record if $::CONN;
3502}
3503
3504sub stop {
3505 my ($self) = @_;
3506
3507 $self->{rec_btn}->set_text ("start recording");
3508 $self->{recording} = 0;
3509
3510 my $rec;
3511 $rec = $::CONN->stop_record if $::CONN;
3512 return unless ref $rec eq 'ARRAY';
3513 $self->set_command_list ($rec);
3514}
3515
3516
3517sub ask_for_bind_and_commit {
3518 my ($self) = @_;
3519 $self->ask_for_bind (1);
3520}
3521
3522sub ask_for_bind {
3523 my ($self, $commit, $end_cb) = @_;
3524
3525 CFClient::Binder::open_binding_dialog (sub {
3526 my ($mod, $sym) = @_;
3527 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3528 $self->update_binding_widgets;
3529 $self->commit if $commit;
3530 $end_cb->() if $end_cb;
3531 });
3532}
3533
3534# $mod and $sym are the modifiers and key symbol
3535# $cmds is a array ref of strings (the commands)
3536# $cb is the callback that is executed on OK
3537# $ccb is the callback that is executed on CANCEL and
3538# when the binding was unsuccessful on OK
3539sub set_binding {
3540 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3541
3542 $self->clear_command_list;
3543 $self->{recording} = 0;
3544 $self->{rec_btn}->set_text ("start recording");
3545
3546 $self->{binding} = [$mod, $sym];
3547 $self->{commands} = $cmds;
3548
3549 $self->{binding_change} = $cb;
3550 $self->{binding_cancel} = $ccb;
3551
3552 $self->update_binding_widgets;
3553}
3554
3555# this is a shortcut method that asks for a binding
3556# and then just binds it.
3557sub do_quick_binding {
3558 my ($self, $cmds, $end_cb) = @_;
3559 $self->set_binding (undef, undef, $cmds, sub {
3560 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3561 });
3562 $self->ask_for_bind (1, $end_cb);
3563}
3564
3565sub update_binding_widgets {
3566 my ($self) = @_;
3567 my ($mod, $sym, $cmds) = $self->get_binding;
3568 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3569 $self->set_command_list ($cmds);
3570}
3571
3572sub get_binding {
3573 my ($self) = @_;
3574 return (
3575 $self->{binding}->[0],
3576 $self->{binding}->[1],
3577 [ grep { defined $_ } @{$self->{commands}} ]
3578 );
3579}
3580
3581sub clear_command_list {
3582 my ($self) = @_;
3583 $self->{cmdbox}->clear ();
3584}
3585
3586sub set_command_list {
3587 my ($self, $cmds) = @_;
3588
3589 $self->{cmdbox}->clear ();
3590 $self->{commands} = $cmds;
3591
3592 my $idx = 0;
3593
3594 for (@$cmds) {
3595 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3596
3597 my $i = $idx;
3598 $hb->add (new CFClient::UI::Label text => $_);
3599 $hb->add (new CFClient::UI::Button
3600 text => "delete",
3601 tooltip => "Deletes the action from the record",
3602 on_activate => sub {
3603 $self->{cmdbox}->remove ($hb);
3604 $cmds->[$i] = undef;
3605 });
3606
3607
3608 $idx++
3609 } 3478 }
3610} 3479}
3611 3480
3612############################################################################# 3481#############################################################################
3613 3482
… …
3667 } elsif ($ev->{button} == 2) { 3536 } elsif ($ev->{button} == 2) {
3668 $::CONN->user_send ("invoke $spell->{name}"); 3537 $::CONN->user_send ("invoke $spell->{name}");
3669 } elsif ($ev->{button} == 3) { 3538 } elsif ($ev->{button} == 3) {
3670 (new CFClient::UI::Menu 3539 (new CFClient::UI::Menu
3671 items => [ 3540 items => [
3672 ["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}"]) }],
3673 ["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}"]) }],
3674 ], 3543 ],
3675 )->popup ($ev); 3544 )->popup ($ev);
3676 } else { 3545 } else {
3677 return 0; 3546 return 0;
… …
3772 $coord = $max - $size if $coord > $max - $size; 3641 $coord = $max - $size if $coord > $max - $size;
3773 3642
3774 int $coord + 0.5 3643 int $coord + 0.5
3775} 3644}
3776 3645
3777sub size_allocate { 3646sub invoke_size_allocate {
3778 my ($self, $w, $h) = @_; 3647 my ($self, $w, $h) = @_;
3779 3648
3780 for my $child ($self->children) { 3649 for my $child ($self->children) {
3781 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)};
3782 3651
… …
3786 $X = _to_pixel $X, $W, $self->{w}; 3655 $X = _to_pixel $X, $W, $self->{w};
3787 $Y = _to_pixel $Y, $H, $self->{h}; 3656 $Y = _to_pixel $Y, $H, $self->{h};
3788 3657
3789 $child->configure ($X, $Y, $W, $H); 3658 $child->configure ($X, $Y, $W, $H);
3790 } 3659 }
3660
3661 1
3791} 3662}
3792 3663
3793sub coord2local { 3664sub coord2local {
3794 my ($self, $x, $y) = @_; 3665 my ($self, $x, $y) = @_;
3795 3666

Diff Legend

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