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.303 by elmex, Tue Jun 13 10:28:38 2006 UTC vs.
Revision 1.310 by root, Fri Jun 23 20:28:20 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) = @_;
… …
367 366
368 $self->{root}{size_alloc}{$self+0} = $self; 367 $self->{root}{size_alloc}{$self+0} = $self;
369 } 368 }
370} 369}
371 370
372sub size_allocate {
373 # nothing to be done
374}
375
376sub children { 371sub children {
377 # nop 372 # nop
378} 373}
379 374
380sub visible_children { 375sub visible_children {
… …
418 my ($self, $x, $y) = @_; 413 my ($self, $x, $y) = @_;
419 414
420 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 415 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
421} 416}
422 417
423sub focus_in { 418sub invoke_focus_in {
424 my ($self) = @_; 419 my ($self) = @_;
425 420
426 return if $FOCUS == $self; 421 return if $FOCUS == $self;
427 return unless $self->{can_focus}; 422 return unless $self->{can_focus};
428 423
429 my $focus = $FOCUS; $FOCUS = $self; 424 my $focus = $FOCUS; $FOCUS = $self;
430 425
431 $self->_emit (focus_in => $focus);
432
433 $focus->update if $focus; 426 $focus->update if $focus;
434 $FOCUS->update; 427 $FOCUS->update;
435}
436 428
429 0
430}
431
437sub focus_out { 432sub invoke_focus_out {
438 my ($self) = @_; 433 my ($self) = @_;
439 434
440 return unless $FOCUS == $self; 435 return unless $FOCUS == $self;
441 436
442 my $focus = $FOCUS; undef $FOCUS; 437 my $focus = $FOCUS; undef $FOCUS;
443 438
444 $self->_emit (focus_out => $focus);
445
446 $focus->update if $focus; #? 439 $focus->update if $focus; #?
447 440
448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 441 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
449 unless $FOCUS; 442 unless $FOCUS;
450}
451 443
444 0
445}
446
447sub grab_focus {
448 my ($self) = @_;
449
450 $self->emit ("focus_in");
451}
452
452sub mouse_motion { 0 } 453sub invoke_mouse_motion { 1 }
453sub button_up { 0 } 454sub invoke_button_up { 1 }
454sub key_down { 0 } 455sub invoke_key_down { 1 }
455sub key_up { 0 } 456sub invoke_key_up { 1 }
456 457
457sub button_down { 458sub invoke_button_down {
458 my ($self, $ev, $x, $y) = @_; 459 my ($self, $ev, $x, $y) = @_;
459 460
460 $self->focus_in; 461 $self->grab_focus;
461 462
462 0 463 1
464}
465
466sub connect {
467 my ($self, $signal, $cb) = @_;
468
469 push @{ $self->{signal_cb}{$signal} }, $cb;
470}
471
472sub emit {
473 my ($self, $signal, @args) = @_;
474
475 #d##TODO# stop propagating at first true, do not use sum
476 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
477 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
478 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
463} 479}
464 480
465sub find_widget { 481sub find_widget {
466 my ($self, $x, $y) = @_; 482 my ($self, $x, $y) = @_;
467 483
… …
477sub set_parent { 493sub set_parent {
478 my ($self, $parent) = @_; 494 my ($self, $parent) = @_;
479 495
480 Scalar::Util::weaken ($self->{parent} = $parent); 496 Scalar::Util::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible}; 497 $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} 498}
506 499
507sub realloc { 500sub realloc {
508 my ($self) = @_; 501 my ($self) = @_;
509 502
… …
789 782
790sub size_request { 783sub size_request {
791 $_[0]{children}[0]->size_request 784 $_[0]{children}[0]->size_request
792} 785}
793 786
794sub size_allocate { 787sub invoke_size_allocate {
795 my ($self, $w, $h) = @_; 788 my ($self, $w, $h) = @_;
796 789
797 $self->{children}[0]->configure (0, 0, $w, $h); 790 $self->{children}[0]->configure (0, 0, $w, $h);
791
792 1
798} 793}
799 794
800############################################################################# 795#############################################################################
801 796
802# back-buffered drawing area 797# back-buffered drawing area
… …
818 813
819 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 814 $ROOT->on_post_alloc ($self => sub { $self->render_child });
820 $self->SUPER::update; 815 $self->SUPER::update;
821} 816}
822 817
823sub size_allocate { 818sub invoke_size_allocate {
824 my ($self, $w, $h) = @_; 819 my ($self, $w, $h) = @_;
825 820
826 $self->SUPER::size_allocate ($w, $h);
827 $self->update; 821 $self->update;
822
823 $self->SUPER::invoke_size_allocate ($w, $h)
828} 824}
829 825
830sub _render { 826sub _render {
831 my ($self) = @_; 827 my ($self) = @_;
832 828
… …
893 $h = 10 if $self->{scroll_y}; 889 $h = 10 if $self->{scroll_y};
894 890
895 ($w, $h) 891 ($w, $h)
896} 892}
897 893
898sub size_allocate { 894sub invoke_size_allocate {
899 my ($self, $w, $h) = @_; 895 my ($self, $w, $h) = @_;
900 896
901 my $child = $self->child; 897 my $child = $self->child;
902 898
903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 899 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 900 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
905 901
906 $self->child->configure (0, 0, $w, $h); 902 $self->child->configure (0, 0, $w, $h);
907 $self->update; 903 $self->update;
904
905 1
908} 906}
909 907
910sub set_offset { 908sub set_offset {
911 my ($self, $x, $y) = @_; 909 my ($self, $x, $y) = @_;
912 910
… …
1002 # todo: overwrite size_allocate of child 1000 # todo: overwrite size_allocate of child
1003 my $child = $self->{vp}->child; 1001 my $child = $self->{vp}->child;
1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1005} 1003}
1006 1004
1007sub size_allocate { 1005sub invoke_size_allocate {
1008 my ($self, $w, $h) = @_; 1006 my ($self, $w, $h) = @_;
1009
1010 $self->SUPER::size_allocate ($w, $h);
1011 1007
1012 my $child = $self->{vp}->child; 1008 my $child = $self->{vp}->child;
1013 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1009 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1010
1011 $self->SUPER::invoke_size_allocate ($w, $h)
1014} 1012}
1015 1013
1016#TODO# update range on size_allocate depending on child 1014#TODO# update range on size_allocate depending on child
1017# update viewport offset on scroll 1015# update viewport offset on scroll
1018 1016
… …
1090 valign => 1, 1088 valign => 1,
1091 text => $self->{title}, 1089 text => $self->{title},
1092 fontsize => $self->{border}, 1090 fontsize => $self->{border},
1093 if exists $self->{title}; 1091 if exists $self->{title};
1094 1092
1095 unless ($self->{no_close_button}) { 1093 if ($self->{has_close_button}) {
1096 $self->{close_btn} = 1094 $self->{close_button} =
1097 new CFClient::UI::ImageButton 1095 new CFClient::UI::ImageButton
1098 image => 'x1_close.png', 1096 path => 'x1_close.png',
1099 on_activate => sub { $self->hide }; 1097 on_activate => sub { $self->hide };
1100 1098
1101 $self->CFClient::UI::Container::add ($self->{close_btn}); 1099 $self->CFClient::UI::Container::add ($self->{close_button});
1102 } 1100 }
1103 1101
1104 $self 1102 $self
1105} 1103}
1106 1104
1107sub add { 1105sub add {
1108 my ($self, @widgets) = @_; 1106 my ($self, @widgets) = @_;
1109 1107
1110 $self->SUPER::add (@widgets); 1108 $self->SUPER::add (@widgets);
1111 $self->CFClient::UI::Container::add ($self->{close_btn}) if $self->{close_btn}; 1109 $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}; 1110 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1113} 1111}
1114 1112
1115sub border { 1113sub border {
1116 int $_[0]{border} * $::FONTSIZE 1114 int $_[0]{border} * $::FONTSIZE
… …
1120 my ($self) = @_; 1118 my ($self) = @_;
1121 1119
1122 $self->{title_widget}->size_request 1120 $self->{title_widget}->size_request
1123 if $self->{title_widget}; 1121 if $self->{title_widget};
1124 1122
1125 $self->{close_btn}->size_request 1123 $self->{close_button}->size_request
1126 if $self->{close_btn}; 1124 if $self->{close_button};
1127 1125
1128 my ($w, $h) = $self->SUPER::size_request; 1126 my ($w, $h) = $self->SUPER::size_request;
1129 1127
1130 ( 1128 (
1131 $w + $self->border * 2, 1129 $w + $self->border * 2,
1132 $h + $self->border * 2, 1130 $h + $self->border * 2,
1133 ) 1131 )
1134} 1132}
1135 1133
1136sub size_allocate { 1134sub invoke_size_allocate {
1137 my ($self, $w, $h) = @_; 1135 my ($self, $w, $h) = @_;
1138 1136
1139 if ($self->{title_widget}) { 1137 if ($self->{title_widget}) {
1140 $self->{title_widget}{w} = $w; 1138 $self->{title_widget}{w} = $w;
1141 $self->{title_widget}{h} = $h; 1139 $self->{title_widget}{h} = $h;
1142 $self->{title_widget}->size_allocate ($w, $h); 1140 $self->{title_widget}->invoke_size_allocate ($w, $h);
1143 } 1141 }
1144 1142
1145 my $border = $self->border; 1143 my $border = $self->border;
1146 1144
1147 $h -= List::Util::max 0, $border * 2; 1145 $h -= List::Util::max 0, $border * 2;
1148 $w -= List::Util::max 0, $border * 2; 1146 $w -= List::Util::max 0, $border * 2;
1149 1147
1150 $self->child->configure ($border, $border, $w, $h); 1148 $self->child->configure ($border, $border, $w, $h);
1151 1149
1152 $self->{close_btn}->configure ($self->{w} - (2 * $border), 0, $border, $border) 1150 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153 if $self->{close_btn}; 1151 if $self->{close_button};
1154}
1155 1152
1153 1
1154}
1155
1156sub button_down { 1156sub invoke_button_down {
1157 my ($self, $ev, $x, $y) = @_; 1157 my ($self, $ev, $x, $y) = @_;
1158 1158
1159 my ($w, $h) = @$self{qw(w h)}; 1159 my ($w, $h) = @$self{qw(w h)};
1160 my $border = $self->border; 1160 my $border = $self->border;
1161 1161
… …
1192 1192
1193 ($x, $y) = ($ev->{x}, $ev->{y}); 1193 ($x, $y) = ($ev->{x}, $ev->{y});
1194 1194
1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1196 # HACK: the next line is required to enforce placement 1196 # HACK: the next line is required to enforce placement
1197 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1197 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1198 }; 1198 };
1199 } else { 1199 } else {
1200 return 0; 1200 return 0;
1201 } 1201 }
1202 1202
1203 1 1203 1
1204} 1204}
1205 1205
1206sub button_up { 1206sub invoke_button_up {
1207 my ($self, $ev, $x, $y) = @_; 1207 my ($self, $ev, $x, $y) = @_;
1208 1208
1209 $self->{close_btn}->button_up ($ev, $x, $y)
1210 if $self->{close_btn};
1211
1212 !!delete $self->{motion} 1209 ! ! delete $self->{motion}
1213} 1210}
1214 1211
1215sub mouse_motion { 1212sub invoke_mouse_motion {
1216 my ($self, $ev, $x, $y) = @_; 1213 my ($self, $ev, $x, $y) = @_;
1217 1214
1218 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1215 $self->{motion}->($ev, $x, $y) if $self->{motion};
1219 1216
1220 !!$self->{motion} 1217 ! ! $self->{motion}
1221} 1218}
1222 1219
1223sub _draw { 1220sub _draw {
1224 my ($self) = @_; 1221 my ($self) = @_;
1225 1222
… …
1258 $self->{title_widget}->_draw; 1255 $self->{title_widget}->_draw;
1259 1256
1260 glTranslate 0, - ($border - $self->{h}); 1257 glTranslate 0, - ($border - $self->{h});
1261 } 1258 }
1262 1259
1263 $self->{close_btn}->draw 1260 $self->{close_button}->draw
1264 if $self->{close_btn}; 1261 if $self->{close_button};
1265} 1262}
1266 1263
1267############################################################################# 1264#############################################################################
1268 1265
1269package CFClient::UI::Table; 1266package CFClient::UI::Table;
… …
1348 (sum @$ws), 1345 (sum @$ws),
1349 (sum @$hs), 1346 (sum @$hs),
1350 ) 1347 )
1351} 1348}
1352 1349
1353sub size_allocate { 1350sub invoke_size_allocate {
1354 my ($self, $w, $h) = @_; 1351 my ($self, $w, $h) = @_;
1355 1352
1356 my ($ws, $hs) = $self->get_wh; 1353 my ($ws, $hs) = $self->get_wh;
1357 1354
1358 my $req_w = (sum @$ws) || 1; 1355 my $req_w = (sum @$ws) || 1;
… …
1390 } 1387 }
1391 1388
1392 $y += $row_h; 1389 $y += $row_h;
1393 } 1390 }
1394 1391
1392 1
1395} 1393}
1396 1394
1397sub find_widget { 1395sub find_widget {
1398 my ($self, $x, $y) = @_; 1396 my ($self, $x, $y) = @_;
1399 1397
… …
1436 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1434 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1437 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1435 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1438 ) 1436 )
1439} 1437}
1440 1438
1441sub size_allocate { 1439sub invoke_size_allocate {
1442 my ($self, $w, $h) = @_; 1440 my ($self, $w, $h) = @_;
1443 1441
1444 my $space = $self->{vertical} ? $h : $w; 1442 my $space = $self->{vertical} ? $h : $w;
1445 my $children = $self->{children}; 1443 my @children = $self->visible_children;
1446 1444
1447 my @req; 1445 my @req;
1448 1446
1449 if ($self->{homogeneous}) { 1447 if ($self->{homogeneous}) {
1450 @req = ($space / (@$children || 1)) x @$children; 1448 @req = ($space / (@children || 1)) x @children;
1451 } else { 1449 } else {
1452 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1450 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1453 my $req = List::Util::sum @req; 1451 my $req = List::Util::sum @req;
1454 1452
1455 if ($req > $space) { 1453 if ($req > $space) {
1456 # ah well, not enough space 1454 # ah well, not enough space
1457 $_ *= $space / $req for @req; 1455 $_ *= $space / $req for @req;
1458 } else { 1456 } else {
1459 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1457 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1460 1458
1461 $space = ($space - $req) / $expand; # remaining space to give away 1459 $space = ($space - $req) / $expand; # remaining space to give away
1462 1460
1463 $req[$_] += $space * $children->[$_]{expand} 1461 $req[$_] += $space * $children[$_]{expand}
1464 for 0 .. $#$children; 1462 for 0 .. $#children;
1465 } 1463 }
1466 } 1464 }
1467 1465
1468 CFClient::UI::harmonize \@req; 1466 CFClient::UI::harmonize \@req;
1469 1467
1470 my $pos = 0; 1468 my $pos = 0;
1471 for (0 .. $#$children) { 1469 for (0 .. $#children) {
1472 my $alloc = $req[$_]; 1470 my $alloc = $req[$_];
1473 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1471 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1474 1472
1475 $pos += $alloc; 1473 $pos += $alloc;
1476 } 1474 }
1477 1475
1478 1 1476 1
… …
1633 }; 1631 };
1634 1632
1635 @{ $self->{size_req} } 1633 @{ $self->{size_req} }
1636} 1634}
1637 1635
1638sub size_allocate { 1636sub invoke_size_allocate {
1639 my ($self, $w, $h) = @_; 1637 my ($self, $w, $h) = @_;
1640 1638
1641 delete $self->{ox}; 1639 delete $self->{ox};
1642 1640
1643 delete $self->{texture} 1641 delete $self->{texture}
1644 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1642 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1643
1644 1
1645} 1645}
1646 1646
1647sub set_fontsize { 1647sub set_fontsize {
1648 my ($self, $fontsize) = @_; 1648 my ($self, $fontsize) = @_;
1649 1649
… …
1742 1742
1743 $text =~ s/./*/g if $self->{hidden}; 1743 $text =~ s/./*/g if $self->{hidden};
1744 $self->{layout}->set_text ("$text "); 1744 $self->{layout}->set_text ("$text ");
1745 delete $self->{size_req}; 1745 delete $self->{size_req};
1746 1746
1747 $self->_emit (changed => $self->{text}); 1747 $self->emit (changed => $self->{text});
1748 1748
1749 $self->realloc; 1749 $self->realloc;
1750 $self->update; 1750 $self->update;
1751} 1751}
1752 1752
… …
1767 my ($w, $h) = $self->SUPER::size_request; 1767 my ($w, $h) = $self->SUPER::size_request;
1768 1768
1769 ($w + 1, $h) # add 1 for cursor 1769 ($w + 1, $h) # add 1 for cursor
1770} 1770}
1771 1771
1772sub key_down { 1772sub invoke_key_down {
1773 my ($self, $ev) = @_; 1773 my ($self, $ev) = @_;
1774 1774
1775 my $mod = $ev->{mod}; 1775 my $mod = $ev->{mod};
1776 my $sym = $ev->{sym}; 1776 my $sym = $ev->{sym};
1777 my $uni = $ev->{unicode}; 1777 my $uni = $ev->{unicode};
… …
1789 } elsif ($sym == CFClient::SDLK_HOME) { 1789 } elsif ($sym == CFClient::SDLK_HOME) {
1790 $self->{cursor} = 0; 1790 $self->{cursor} = 0;
1791 } elsif ($sym == CFClient::SDLK_END) { 1791 } elsif ($sym == CFClient::SDLK_END) {
1792 $self->{cursor} = length $text; 1792 $self->{cursor} = length $text;
1793 } elsif ($uni == 27) { 1793 } elsif ($uni == 27) {
1794 $self->_emit ('escape'); 1794 $self->emit ('escape');
1795 } elsif ($uni) { 1795 } elsif ($uni) {
1796 substr $text, $self->{cursor}++, 0, chr $uni; 1796 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else { 1797 } else {
1798 return 0; 1798 return 0;
1799 } 1799 }
… …
1803 $self->realloc; 1803 $self->realloc;
1804 1804
1805 1 1805 1
1806} 1806}
1807 1807
1808sub focus_in { 1808sub invoke_focus_in {
1809 my ($self) = @_; 1809 my ($self) = @_;
1810 1810
1811 $self->{last_activity} = $::NOW; 1811 $self->{last_activity} = $::NOW;
1812 1812
1813 $self->SUPER::focus_in; 1813 $self->SUPER::invoke_focus_in
1814} 1814}
1815 1815
1816sub button_down { 1816sub invoke_button_down {
1817 my ($self, $ev, $x, $y) = @_; 1817 my ($self, $ev, $x, $y) = @_;
1818 1818
1819 $self->SUPER::button_down ($ev, $x, $y); 1819 $self->SUPER::invoke_button_down ($ev, $x, $y);
1820 1820
1821 my $idx = $self->{layout}->xy_to_index ($x, $y); 1821 my $idx = $self->{layout}->xy_to_index ($x, $y);
1822 1822
1823 # byte-index to char-index 1823 # byte-index to char-index
1824 my $text = $self->{text}; 1824 my $text = $self->{text};
… …
1829 $self->update; 1829 $self->update;
1830 1830
1831 1 1831 1
1832} 1832}
1833 1833
1834sub mouse_motion { 1834sub invoke_mouse_motion {
1835 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1836# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1836# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1837 1837
1838 0 1838 1
1839} 1839}
1840 1840
1841sub _draw { 1841sub _draw {
1842 my ($self) = @_; 1842 my ($self) = @_;
1843 1843
… …
1884 1884
1885our @ISA = CFClient::UI::EntryBase::; 1885our @ISA = CFClient::UI::EntryBase::;
1886 1886
1887use CFClient::OpenGL; 1887use CFClient::OpenGL;
1888 1888
1889sub key_down { 1889sub invoke_key_down {
1890 my ($self, $ev) = @_; 1890 my ($self, $ev) = @_;
1891 1891
1892 my $sym = $ev->{sym}; 1892 my $sym = $ev->{sym};
1893 1893
1894 if ($sym == 13) { 1894 if ($sym == 13) {
1895 unshift @{$self->{history}}, 1895 unshift @{$self->{history}},
1896 my $txt = $self->get_text; 1896 my $txt = $self->get_text;
1897
1897 $self->{history_pointer} = -1; 1898 $self->{history_pointer} = -1;
1898 $self->{history_saveback} = ''; 1899 $self->{history_saveback} = '';
1899 $self->_emit (activate => $txt); 1900 $self->emit (activate => $txt);
1900 $self->update; 1901 $self->update;
1901 1902
1902 } elsif ($sym == CFClient::SDLK_UP) { 1903 } elsif ($sym == CFClient::SDLK_UP) {
1903 if ($self->{history_pointer} < 0) { 1904 if ($self->{history_pointer} < 0) {
1904 $self->{history_saveback} = $self->get_text; 1905 $self->{history_saveback} = $self->get_text;
… …
1920 } else { 1921 } else {
1921 $self->set_text ($self->{history_saveback}); 1922 $self->set_text ($self->{history_saveback});
1922 } 1923 }
1923 1924
1924 } else { 1925 } else {
1925 return $self->SUPER::key_down ($ev) 1926 return $self->SUPER::invoke_key_down ($ev)
1926 } 1927 }
1927 1928
1928 1 1929 1
1929} 1930}
1930 1931
… …
1954 can_events => 1, 1955 can_events => 1,
1955 @_ 1956 @_
1956 ) 1957 )
1957} 1958}
1958 1959
1959sub activate { }
1960
1961sub button_up { 1960sub invoke_button_up {
1962 my ($self, $ev, $x, $y) = @_; 1961 my ($self, $ev, $x, $y) = @_;
1963 1962
1964 $self->emit ("activate") 1963 $self->emit ("activate")
1965 if $x >= 0 && $x < $self->{w} 1964 if $x >= 0 && $x < $self->{w}
1966 && $y >= 0 && $y < $self->{h}; 1965 && $y >= 0 && $y < $self->{h};
… …
2008 can_events => 1, 2007 can_events => 1,
2009 @_ 2008 @_
2010 ); 2009 );
2011} 2010}
2012 2011
2013sub activate { }
2014
2015sub button_up { 2012sub invoke_button_up {
2016 my ($self, $ev, $x, $y) = @_; 2013 my ($self, $ev, $x, $y) = @_;
2017 2014
2018 $self->emit ("activate") 2015 $self->emit ("activate")
2019 if $x >= 0 && $x < $self->{w} 2016 if $x >= 0 && $x < $self->{w}
2020 && $y >= 0 && $y < $self->{h}; 2017 && $y >= 0 && $y < $self->{h};
… …
2054 my ($self) = @_; 2051 my ($self) = @_;
2055 2052
2056 (6) x 2 2053 (6) x 2
2057} 2054}
2058 2055
2059sub button_down { 2056sub invoke_button_down {
2060 my ($self, $ev, $x, $y) = @_; 2057 my ($self, $ev, $x, $y) = @_;
2061 2058
2062 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2059 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2063 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2060 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2064 $self->{state} = !$self->{state}; 2061 $self->{state} = !$self->{state};
2065 $self->_emit (changed => $self->{state}); 2062 $self->emit (changed => $self->{state});
2066 } else { 2063 } else {
2067 return 0 2064 return 0
2068 } 2065 }
2069 2066
2070 1 2067 1
… …
2095package CFClient::UI::Image; 2092package CFClient::UI::Image;
2096 2093
2097our @ISA = CFClient::UI::Base::; 2094our @ISA = CFClient::UI::Base::;
2098 2095
2099use CFClient::OpenGL; 2096use CFClient::OpenGL;
2100use Carp qw/confess/;
2101 2097
2102our %loaded_images; 2098our %texture_cache;
2103 2099
2104sub new { 2100sub new {
2105 my $class = shift; 2101 my $class = shift;
2106 2102
2107 my $self = $class->SUPER::new (can_events => 0, @_); 2103 my $self = $class->SUPER::new (
2104 can_events => 0,
2105 @_,
2106 );
2108 2107
2109 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2108 $self->{path}
2109 or Carp::croak "required attribute 'path' not set";
2110 2110
2111 $loaded_images{$self->{image}} ||= 2111 $self->{tex} = $texture_cache{$self->{path}} ||=
2112 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2112 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2113 2113
2114 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2114 Scalar::Util::weaken $texture_cache{$self->{path}};
2115 2115
2116 Scalar::Util::weaken $loaded_images{$self->{image}}; 2116 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2117
2118 $self->{aspect} = $tex->{w} / $tex->{h};
2119 2117
2120 $self 2118 $self
2121} 2119}
2122 2120
2123sub size_request { 2121sub size_request {
2124 my ($self) = @_; 2122 my ($self) = @_;
2125 2123
2126 ($self->{tex}->{w}, $self->{tex}->{h}) 2124 ($self->{tex}{w}, $self->{tex}{h})
2127} 2125}
2128 2126
2129sub _draw { 2127sub _draw {
2130 my ($self) = @_; 2128 my ($self) = @_;
2131 2129
… …
2367 $self->update; 2365 $self->update;
2368 2366
2369 $self 2367 $self
2370} 2368}
2371 2369
2372sub changed { }
2373
2374sub set_range { 2370sub set_range {
2375 my ($self, $range) = @_; 2371 my ($self, $range) = @_;
2376 2372
2377 ($range, $self->{range}) = ($self->{range}, $range); 2373 ($range, $self->{range}) = ($self->{range}, $range);
2378 2374
… …
2398 if $unit; 2394 if $unit;
2399 2395
2400 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2396 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2401 2397
2402 if ($value != $old_value) { 2398 if ($value != $old_value) {
2403 $self->_emit (changed => $value); 2399 $self->emit (changed => $value);
2404 $self->update; 2400 $self->update;
2405 } 2401 }
2406} 2402}
2407 2403
2408sub size_request { 2404sub size_request {
2409 my ($self) = @_; 2405 my ($self) = @_;
2410 2406
2411 ($self->{req_w}, $self->{req_h}) 2407 ($self->{req_w}, $self->{req_h})
2412} 2408}
2413 2409
2414sub button_down { 2410sub invoke_button_down {
2415 my ($self, $ev, $x, $y) = @_; 2411 my ($self, $ev, $x, $y) = @_;
2416 2412
2417 $self->SUPER::button_down ($ev, $x, $y); 2413 $self->SUPER::invoke_button_down ($ev, $x, $y);
2418 2414
2419 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2415 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2420 2416
2421 $self->mouse_motion ($ev, $x, $y) 2417 $self->invoke_mouse_motion ($ev, $x, $y)
2422} 2418}
2423 2419
2424sub mouse_motion { 2420sub invoke_mouse_motion {
2425 my ($self, $ev, $x, $y) = @_; 2421 my ($self, $ev, $x, $y) = @_;
2426 2422
2427 if ($GRAB == $self) { 2423 if ($GRAB == $self) {
2428 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2424 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2429 2425
… …
2571 2567
2572 $self->{fontsize} = $fontsize; 2568 $self->{fontsize} = $fontsize;
2573 $self->reflow; 2569 $self->reflow;
2574} 2570}
2575 2571
2572sub visible_children {
2573 my ($self) = @_;
2574
2575 @{$self->{children}}[0,1]
2576}
2577
2576sub size_allocate { 2578sub invoke_size_allocate {
2577 my ($self, $w, $h) = @_; 2579 my ($self, $w, $h) = @_;
2578 2580
2579 $self->SUPER::size_allocate ($w, $h); 2581 my (undef, undef, @other) = @{ $self->{children} };
2582 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2580 2583
2581 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2584 $self->{layout}->set_font ($self->{font}) if $self->{font};
2582 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2585 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2583 $self->{layout}->set_width ($self->{children}[0]{w}); 2586 $self->{layout}->set_width ($self->{children}[0]{w});
2584 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2587 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2585 2588
2586 $self->reflow; 2589 $self->reflow;
2587}
2588 2590
2589sub text_size { 2591 $self->SUPER::invoke_size_allocate ($w, $h)
2590 my ($self, $text, $indent) = @_; 2592}
2593
2594sub get_layout {
2595 my ($self, $para) = @_;
2591 2596
2592 my $layout = $self->{layout}; 2597 my $layout = $self->{layout};
2593 2598
2599 $layout->set_font ($self->{font}) if $self->{font};
2594 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2600 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2595 $layout->set_width ($self->{children}[0]{w} - $indent); 2601 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2602 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2597 $layout->set_markup ($text); 2603 $layout->set_markup ($para->{markup});
2598 2604 $layout->set_shapes (map +($_->{req_w}, $_->{req_h}), @{$para->{widget}});
2605
2599 $layout->size 2606 $layout
2600} 2607}
2601 2608
2602sub reflow { 2609sub reflow {
2603 my ($self) = @_; 2610 my ($self) = @_;
2604 2611
… …
2613 $self->{children}[1]->set_value ($offset); 2620 $self->{children}[1]->set_value ($offset);
2614} 2621}
2615 2622
2616sub clear { 2623sub clear {
2617 my ($self) = @_; 2624 my ($self) = @_;
2625
2626 my (undef, undef, @other) = @{ $self->{children} };
2627 $self->remove ($_) for @other;
2618 2628
2619 $self->{par} = []; 2629 $self->{par} = [];
2620 $self->{height} = 0; 2630 $self->{height} = 0;
2621 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2631 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2622} 2632}
2623 2633
2624sub add_paragraph { 2634sub add_paragraph {
2625 my ($self, $color, $text, $indent) = @_; 2635 my ($self, $color, $para, $indent) = @_;
2626 2636
2627 for my $line (split /\n/, $text) { 2637 my ($text, @w) = ref $para ? @$para : $para;
2628 my ($w, $h) = $self->text_size ($line); 2638
2629 $self->{height} += $h; 2639 $para = {
2630 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2640 w => 1e10,
2641 wrapped => 1,
2642 fg => $color,
2643 indent => $indent,
2644 markup => $text,
2645 widget => \@w,
2631 } 2646 };
2632 2647
2633 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2648 $self->add (@w) if @w;
2649 push @{$self->{par}}, $para;
2650
2651 $self->{need_reflow}++;
2652 $self->update;
2653}
2654
2655sub scroll_to_bottom {
2656 my ($self) = @_;
2657
2658 $self->{scroll_to_bottom} = 1;
2659 $self->update;
2634} 2660}
2635 2661
2636sub update { 2662sub update {
2637 my ($self) = @_; 2663 my ($self) = @_;
2638 2664
… …
2646 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2672 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2647 2673
2648 if (delete $self->{need_reflow}) { 2674 if (delete $self->{need_reflow}) {
2649 my $height = 0; 2675 my $height = 0;
2650 2676
2651 my $layout = $self->{layout};
2652
2653 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2654
2655 for (@{$self->{par}}) { 2677 for my $para (@{$self->{par}}) {
2656 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2678 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2657 $layout->set_width ($W - $_->[3]); 2679 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; 2680 my ($w, $h) = $layout->size;
2661 $_->[0] = $w + $_->[3]; 2681
2682 $para->{w} = $w + $para->{indent};
2662 $_->[1] = $h; 2683 $para->{h} = $h;
2684 $para->{wrapped} = $layout->has_wrapped;
2663 } 2685 }
2664 2686
2665 $height += $_->[1]; 2687 $height += $para->{h};
2666 } 2688 }
2667 2689
2668 $self->{height} = $height; 2690 $self->{height} = $height;
2669 2691
2670 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2692 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2671 2693
2672 delete $self->{texture}; 2694 delete $self->{texture};
2695 }
2696
2697 if (delete $self->{scroll_to_bottom}) {
2698 $self->{children}[1]->set_value (1e10);
2673 } 2699 }
2674 2700
2675 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2701 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2676 glClearColor 0, 0, 0, 0; 2702 glClearColor 0, 0, 0, 0;
2677 glClear GL_COLOR_BUFFER_BIT; 2703 glClear GL_COLOR_BUFFER_BIT;
… …
2681 my $y0 = $top; 2707 my $y0 = $top;
2682 my $y1 = $top + $H; 2708 my $y1 = $top + $H;
2683 2709
2684 my $y = 0; 2710 my $y = 0;
2685 2711
2686 my $layout = $self->{layout};
2687
2688 $layout->set_font ($self->{font}) if $self->{font};
2689
2690 glEnable GL_BLEND; 2712 glEnable GL_BLEND;
2691 #TODO# not correct in windows where rgba is forced off 2713 #TODO# not correct in windows where rgba is forced off
2692 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2714 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2693 2715
2694 for my $par (@{$self->{par}}) { 2716 for my $para (@{$self->{par}}) {
2695 my $h = $par->[1]; 2717 my $h = $para->{h};
2696 2718
2697 if ($y0 < $y + $h && $y < $y1) { 2719 if ($y0 < $y + $h && $y < $y1) {
2698 $layout->set_foreground (@{ $par->[2] }); 2720
2699 $layout->set_width ($W - $par->[3]); 2721 my $layout = $self->get_layout ($para);
2700 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2701 $layout->set_markup ($par->[4]);
2702 2722
2703 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2723 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2704 2724
2705 glRasterPos $par->[3], $y - $y0; 2725 glRasterPos $para->{indent}, $y - $y0;
2706 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2726 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2727
2728 if (my @w = @{ $para->{widget} }) {
2729 my @s = $layout->get_shapes;
2730
2731 for (@w) {
2732 my ($dx, $dy) = splice @s, 0, 2, ();
2733
2734 $_->{x} = $dx + $para->{indent};
2735 $_->{y} = $dy + $y - $y0;
2736
2737 $_->draw;
2738 }
2739 }
2707 } 2740 }
2708 2741
2709 $y += $h; 2742 $y += $h;
2710 } 2743 }
2711 2744
2712 glDisable GL_BLEND; 2745 glDisable GL_BLEND;
2713 }; 2746 };
2714 }); 2747 });
2748}
2749
2750sub reconfigure {
2751 my ($self) = @_;
2752
2753 $self->SUPER::reconfigure;
2754
2755 $_->{w} = 1e10 for @{ $self->{par} };
2756 $self->reflow;
2715} 2757}
2716 2758
2717sub _draw { 2759sub _draw {
2718 my ($self) = @_; 2760 my ($self) = @_;
2719 2761
… …
2722 glColor 0, 0, 0, 1; 2764 glColor 0, 0, 0, 1;
2723 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2765 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2724 glDisable GL_TEXTURE_2D; 2766 glDisable GL_TEXTURE_2D;
2725 2767
2726 $self->{children}[1]->draw; 2768 $self->{children}[1]->draw;
2727
2728} 2769}
2729 2770
2730############################################################################# 2771#############################################################################
2731 2772
2732package CFClient::UI::Animator; 2773package CFClient::UI::Animator;
… …
2841 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2882 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2842 2883
2843 ($w + 4, $h + 4) 2884 ($w + 4, $h + 4)
2844} 2885}
2845 2886
2846sub size_allocate { 2887sub invoke_size_allocate {
2847 my ($self, $w, $h) = @_; 2888 my ($self, $w, $h) = @_;
2848 2889
2849 $self->SUPER::size_allocate ($w - 4, $h - 4); 2890 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2850} 2891}
2851 2892
2852sub visibility_change { 2893sub invoke_visibility_change {
2853 my ($self, $visible) = @_; 2894 my ($self, $visible) = @_;
2854 2895
2855 return unless $visible; 2896 return unless $visible;
2856 2897
2857 $self->{root}->on_post_alloc ("move_$self" => sub { 2898 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
3024 3065
3025# popup given the event (must be a mouse button down event currently) 3066# popup given the event (must be a mouse button down event currently)
3026sub popup { 3067sub popup {
3027 my ($self, $ev) = @_; 3068 my ($self, $ev) = @_;
3028 3069
3029 $self->_emit ("popdown"); 3070 $self->emit ("popdown");
3030 3071
3031 # maybe save $GRAB? must be careful about events... 3072 # maybe save $GRAB? must be careful about events...
3032 $GRAB = $self; 3073 $GRAB = $self;
3033 $self->{button} = $ev->{button}; 3074 $self->{button} = $ev->{button};
3034 3075
3035 $self->show; 3076 $self->show;
3036 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3077 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
3037} 3078}
3038 3079
3039sub mouse_motion { 3080sub invoke_mouse_motion {
3040 my ($self, $ev, $x, $y) = @_; 3081 my ($self, $ev, $x, $y) = @_;
3041 3082
3042 # TODO: should use vbox->find_widget or so 3083 # TODO: should use vbox->find_widget or so
3043 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3084 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
3044 $self->{hover} = $self->{item}{$HOVER}; 3085 $self->{hover} = $self->{item}{$HOVER};
3045 3086
3046 0 3087 0
3047} 3088}
3048 3089
3049sub button_up { 3090sub invoke_button_up {
3050 my ($self, $ev, $x, $y) = @_; 3091 my ($self, $ev, $x, $y) = @_;
3051 3092
3052 if ($ev->{button} == $self->{button}) { 3093 if ($ev->{button} == $self->{button}) {
3053 undef $GRAB; 3094 undef $GRAB;
3054 $self->hide; 3095 $self->hide;
3055 3096
3056 $self->_emit ("popdown"); 3097 $self->emit ("popdown");
3057 $self->{hover}[1]->() if $self->{hover}; 3098 $self->{hover}[1]->() if $self->{hover};
3058 } else { 3099 } else {
3059 return 0 3100 return 0
3060 } 3101 }
3061 3102
… …
3098 : $self->{children}[$page_or_widget]; 3139 : $self->{children}[$page_or_widget];
3099 3140
3100 $self->{current} = $widget; 3141 $self->{current} = $widget;
3101 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3142 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3102 3143
3103 $self->_emit (page_changed => $self->{current}); 3144 $self->emit (page_changed => $self->{current});
3104 3145
3105 $self->realloc; 3146 $self->realloc;
3106} 3147}
3107 3148
3108sub visible_children { 3149sub visible_children {
… …
3113 my ($self) = @_; 3154 my ($self) = @_;
3114 3155
3115 $self->{current}->size_request 3156 $self->{current}->size_request
3116} 3157}
3117 3158
3118sub size_allocate { 3159sub invoke_size_allocate {
3119 my ($self, $w, $h) = @_; 3160 my ($self, $w, $h) = @_;
3120 3161
3121 $self->{current}->configure (0, 0, $w, $h); 3162 $self->{current}->configure (0, 0, $w, $h);
3163
3164 1
3122} 3165}
3123 3166
3124sub _draw { 3167sub _draw {
3125 my ($self) = @_; 3168 my ($self) = @_;
3126 3169
… …
3165 3208
3166sub set_current_page { 3209sub set_current_page {
3167 my ($self, $page) = @_; 3210 my ($self, $page) = @_;
3168 3211
3169 $self->{multiplexer}->set_current_page ($page); 3212 $self->{multiplexer}->set_current_page ($page);
3170 $self->_emit (page_changed => $self->{multiplexer}{current}); 3213 $self->emit (page_changed => $self->{multiplexer}{current});
3171} 3214}
3172 3215
3173############################################################################# 3216#############################################################################
3174 3217
3175package CFClient::UI::Combobox; 3218package CFClient::UI::Combobox;
… …
3190 $self->_set_value ($self->{value}); 3233 $self->_set_value ($self->{value});
3191 3234
3192 $self 3235 $self
3193} 3236}
3194 3237
3195sub button_down { 3238sub invoke_button_down {
3196 my ($self, $ev) = @_; 3239 my ($self, $ev) = @_;
3197 3240
3198 my @menu_items; 3241 my @menu_items;
3199 3242
3200 for (@{ $self->{options} }) { 3243 for (@{ $self->{options} }) {
… …
3221 my ($self, $value) = @_; 3264 my ($self, $value) = @_;
3222 3265
3223 return unless $self->{value} ne $value; 3266 return unless $self->{value} ne $value;
3224 3267
3225 $self->_set_value ($value); 3268 $self->_set_value ($value);
3226 $self->_emit (changed => $value); 3269 $self->emit (changed => $value);
3227} 3270}
3228 3271
3229############################################################################# 3272#############################################################################
3230 3273
3231package CFClient::UI::Statusbox; 3274package CFClient::UI::Statusbox;
… …
3475 $self->update_binding_widgets; 3518 $self->update_binding_widgets;
3476 3519
3477 $self 3520 $self
3478} 3521}
3479 3522
3523sub cfg_bind {
3524 my ($self, $mod, $sym, $cmds) = @_;
3525 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3526 ::update_bindings ();
3527}
3528
3529sub cfg_unbind {
3530 my ($self, $mod, $sym, $cmds) = @_;
3531 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3532 ::update_bindings ();
3533}
3534
3480sub commit { 3535sub commit {
3481 my ($self) = @_; 3536 my ($self) = @_;
3482 my ($mod, $sym, $cmds) = $self->get_binding; 3537 my ($mod, $sym, $cmds) = $self->get_binding;
3483 if ($sym != 0 && @$cmds > 0) { 3538 if ($sym != 0 && @$cmds > 0) {
3484 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym) 3539 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
… …
3518 my ($self) = @_; 3573 my ($self) = @_;
3519 $self->ask_for_bind (1); 3574 $self->ask_for_bind (1);
3520} 3575}
3521 3576
3522sub ask_for_bind { 3577sub ask_for_bind {
3523 my ($self, $commit) = @_; 3578 my ($self, $commit, $end_cb) = @_;
3524 3579
3525 CFClient::Binder::open_binding_dialog (sub { 3580 CFClient::Binder::open_binding_dialog (sub {
3526 my ($mod, $sym) = @_; 3581 my ($mod, $sym) = @_;
3527 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak? 3582 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3528 $self->update_binding_widgets; 3583 $self->update_binding_widgets;
3529 $self->commit if $commit; 3584 $self->commit if $commit;
3585 $end_cb->() if $end_cb;
3530 }); 3586 });
3531} 3587}
3532 3588
3533# $mod and $sym are the modifiers and key symbol 3589# $mod and $sym are the modifiers and key symbol
3534# $cmds is a array ref of strings (the commands) 3590# $cmds is a array ref of strings (the commands)
… …
3552} 3608}
3553 3609
3554# this is a shortcut method that asks for a binding 3610# this is a shortcut method that asks for a binding
3555# and then just binds it. 3611# and then just binds it.
3556sub do_quick_binding { 3612sub do_quick_binding {
3557 my ($self, $cmds) = @_; 3613 my ($self, $cmds, $end_cb) = @_;
3558 $self->set_binding (undef, undef, $cmds, sub { 3614 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3559 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3560 });
3561 $self->ask_for_bind (1); 3615 $self->ask_for_bind (1, $end_cb);
3562} 3616}
3563 3617
3564sub update_binding_widgets { 3618sub update_binding_widgets {
3565 my ($self) = @_; 3619 my ($self) = @_;
3566 my ($mod, $sym, $cmds) = $self->get_binding; 3620 my ($mod, $sym, $cmds) = $self->get_binding;
… …
3771 $coord = $max - $size if $coord > $max - $size; 3825 $coord = $max - $size if $coord > $max - $size;
3772 3826
3773 int $coord + 0.5 3827 int $coord + 0.5
3774} 3828}
3775 3829
3776sub size_allocate { 3830sub invoke_size_allocate {
3777 my ($self, $w, $h) = @_; 3831 my ($self, $w, $h) = @_;
3778 3832
3779 for my $child ($self->children) { 3833 for my $child ($self->children) {
3780 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3834 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3781 3835
… …
3785 $X = _to_pixel $X, $W, $self->{w}; 3839 $X = _to_pixel $X, $W, $self->{w};
3786 $Y = _to_pixel $Y, $H, $self->{h}; 3840 $Y = _to_pixel $Y, $H, $self->{h};
3787 3841
3788 $child->configure ($X, $Y, $W, $H); 3842 $child->configure ($X, $Y, $W, $H);
3789 } 3843 }
3844
3845 1
3790} 3846}
3791 3847
3792sub coord2local { 3848sub coord2local {
3793 my ($self, $x, $y) = @_; 3849 my ($self, $x, $y) = @_;
3794 3850

Diff Legend

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