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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.302 by root, Mon Jun 12 13:26:14 2006 UTC vs.
Revision 1.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
1093 if ($self->{has_close_button}) {
1094 $self->{close_button} =
1095 new CFClient::UI::ImageButton
1096 path => 'x1_close.png',
1097 on_activate => sub { $self->hide };
1098
1099 $self->CFClient::UI::Container::add ($self->{close_button});
1100 }
1101
1095 $self 1102 $self
1096} 1103}
1097 1104
1098sub add { 1105sub add {
1099 my ($self, @widgets) = @_; 1106 my ($self, @widgets) = @_;
1100 1107
1101 $self->SUPER::add (@widgets); 1108 $self->SUPER::add (@widgets);
1109 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1102 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget}; 1110 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1103} 1111}
1104 1112
1105sub border { 1113sub border {
1106 int $_[0]{border} * $::FONTSIZE 1114 int $_[0]{border} * $::FONTSIZE
… …
1109sub size_request { 1117sub size_request {
1110 my ($self) = @_; 1118 my ($self) = @_;
1111 1119
1112 $self->{title_widget}->size_request 1120 $self->{title_widget}->size_request
1113 if $self->{title_widget}; 1121 if $self->{title_widget};
1122
1123 $self->{close_button}->size_request
1124 if $self->{close_button};
1114 1125
1115 my ($w, $h) = $self->SUPER::size_request; 1126 my ($w, $h) = $self->SUPER::size_request;
1116 1127
1117 ( 1128 (
1118 $w + $self->border * 2, 1129 $w + $self->border * 2,
1119 $h + $self->border * 2, 1130 $h + $self->border * 2,
1120 ) 1131 )
1121} 1132}
1122 1133
1123sub size_allocate { 1134sub invoke_size_allocate {
1124 my ($self, $w, $h) = @_; 1135 my ($self, $w, $h) = @_;
1125 1136
1126 if ($self->{title_widget}) { 1137 if ($self->{title_widget}) {
1127 $self->{title_widget}{w} = $w; 1138 $self->{title_widget}{w} = $w;
1128 $self->{title_widget}{h} = $h; 1139 $self->{title_widget}{h} = $h;
1129 $self->{title_widget}->size_allocate ($w, $h); 1140 $self->{title_widget}->invoke_size_allocate ($w, $h);
1130 } 1141 }
1131 1142
1132 my $border = $self->border; 1143 my $border = $self->border;
1133 1144
1134 $h -= List::Util::max 0, $border * 2; 1145 $h -= List::Util::max 0, $border * 2;
1135 $w -= List::Util::max 0, $border * 2; 1146 $w -= List::Util::max 0, $border * 2;
1136 1147
1137 $self->child->configure ($border, $border, $w, $h); 1148 $self->child->configure ($border, $border, $w, $h);
1138}
1139 1149
1150 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1151 if $self->{close_button};
1152
1153 1
1154}
1155
1140sub button_down { 1156sub invoke_button_down {
1141 my ($self, $ev, $x, $y) = @_; 1157 my ($self, $ev, $x, $y) = @_;
1142 1158
1143 my ($w, $h) = @$self{qw(w h)}; 1159 my ($w, $h) = @$self{qw(w h)};
1144 my $border = $self->border; 1160 my $border = $self->border;
1145 1161
… …
1176 1192
1177 ($x, $y) = ($ev->{x}, $ev->{y}); 1193 ($x, $y) = ($ev->{x}, $ev->{y});
1178 1194
1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180 # HACK: the next line is required to enforce placement 1196 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1197 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1182 }; 1198 };
1183 } else { 1199 } else {
1184 return 0; 1200 return 0;
1185 } 1201 }
1186 1202
1187 1 1203 1
1188} 1204}
1189 1205
1190sub button_up { 1206sub invoke_button_up {
1191 my ($self, $ev, $x, $y) = @_; 1207 my ($self, $ev, $x, $y) = @_;
1192 1208
1193 !!delete $self->{motion} 1209 ! ! delete $self->{motion}
1194} 1210}
1195 1211
1196sub mouse_motion { 1212sub invoke_mouse_motion {
1197 my ($self, $ev, $x, $y) = @_; 1213 my ($self, $ev, $x, $y) = @_;
1198 1214
1199 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1215 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200 1216
1201 !!$self->{motion} 1217 ! ! $self->{motion}
1202} 1218}
1203 1219
1204sub _draw { 1220sub _draw {
1205 my ($self) = @_; 1221 my ($self) = @_;
1206 1222
… …
1235 $child->draw; 1251 $child->draw;
1236 1252
1237 if ($self->{title_widget}) { 1253 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h}; 1254 glTranslate 0, $border - $self->{h};
1239 $self->{title_widget}->_draw; 1255 $self->{title_widget}->_draw;
1256
1257 glTranslate 0, - ($border - $self->{h});
1240 } 1258 }
1259
1260 $self->{close_button}->draw
1261 if $self->{close_button};
1241} 1262}
1242 1263
1243############################################################################# 1264#############################################################################
1244 1265
1245package CFClient::UI::Table; 1266package CFClient::UI::Table;
… …
1324 (sum @$ws), 1345 (sum @$ws),
1325 (sum @$hs), 1346 (sum @$hs),
1326 ) 1347 )
1327} 1348}
1328 1349
1329sub size_allocate { 1350sub invoke_size_allocate {
1330 my ($self, $w, $h) = @_; 1351 my ($self, $w, $h) = @_;
1331 1352
1332 my ($ws, $hs) = $self->get_wh; 1353 my ($ws, $hs) = $self->get_wh;
1333 1354
1334 my $req_w = (sum @$ws) || 1; 1355 my $req_w = (sum @$ws) || 1;
… …
1366 } 1387 }
1367 1388
1368 $y += $row_h; 1389 $y += $row_h;
1369 } 1390 }
1370 1391
1392 1
1371} 1393}
1372 1394
1373sub find_widget { 1395sub find_widget {
1374 my ($self, $x, $y) = @_; 1396 my ($self, $x, $y) = @_;
1375 1397
… …
1412 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1434 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1413 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1435 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1414 ) 1436 )
1415} 1437}
1416 1438
1417sub size_allocate { 1439sub invoke_size_allocate {
1418 my ($self, $w, $h) = @_; 1440 my ($self, $w, $h) = @_;
1419 1441
1420 my $space = $self->{vertical} ? $h : $w; 1442 my $space = $self->{vertical} ? $h : $w;
1421 my $children = $self->{children}; 1443 my @children = $self->visible_children;
1422 1444
1423 my @req; 1445 my @req;
1424 1446
1425 if ($self->{homogeneous}) { 1447 if ($self->{homogeneous}) {
1426 @req = ($space / (@$children || 1)) x @$children; 1448 @req = ($space / (@children || 1)) x @children;
1427 } else { 1449 } else {
1428 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1450 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1429 my $req = List::Util::sum @req; 1451 my $req = List::Util::sum @req;
1430 1452
1431 if ($req > $space) { 1453 if ($req > $space) {
1432 # ah well, not enough space 1454 # ah well, not enough space
1433 $_ *= $space / $req for @req; 1455 $_ *= $space / $req for @req;
1434 } else { 1456 } else {
1435 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1457 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1436 1458
1437 $space = ($space - $req) / $expand; # remaining space to give away 1459 $space = ($space - $req) / $expand; # remaining space to give away
1438 1460
1439 $req[$_] += $space * $children->[$_]{expand} 1461 $req[$_] += $space * $children[$_]{expand}
1440 for 0 .. $#$children; 1462 for 0 .. $#children;
1441 } 1463 }
1442 } 1464 }
1443 1465
1444 CFClient::UI::harmonize \@req; 1466 CFClient::UI::harmonize \@req;
1445 1467
1446 my $pos = 0; 1468 my $pos = 0;
1447 for (0 .. $#$children) { 1469 for (0 .. $#children) {
1448 my $alloc = $req[$_]; 1470 my $alloc = $req[$_];
1449 $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));
1450 1472
1451 $pos += $alloc; 1473 $pos += $alloc;
1452 } 1474 }
1453 1475
1454 1 1476 1
… …
1609 }; 1631 };
1610 1632
1611 @{ $self->{size_req} } 1633 @{ $self->{size_req} }
1612} 1634}
1613 1635
1614sub size_allocate { 1636sub invoke_size_allocate {
1615 my ($self, $w, $h) = @_; 1637 my ($self, $w, $h) = @_;
1616 1638
1617 delete $self->{ox}; 1639 delete $self->{ox};
1618 1640
1619 delete $self->{texture} 1641 delete $self->{texture}
1620 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
1621} 1645}
1622 1646
1623sub set_fontsize { 1647sub set_fontsize {
1624 my ($self, $fontsize) = @_; 1648 my ($self, $fontsize) = @_;
1625 1649
… …
1718 1742
1719 $text =~ s/./*/g if $self->{hidden}; 1743 $text =~ s/./*/g if $self->{hidden};
1720 $self->{layout}->set_text ("$text "); 1744 $self->{layout}->set_text ("$text ");
1721 delete $self->{size_req}; 1745 delete $self->{size_req};
1722 1746
1723 $self->_emit (changed => $self->{text}); 1747 $self->emit (changed => $self->{text});
1724 1748
1725 $self->realloc; 1749 $self->realloc;
1726 $self->update; 1750 $self->update;
1727} 1751}
1728 1752
… …
1743 my ($w, $h) = $self->SUPER::size_request; 1767 my ($w, $h) = $self->SUPER::size_request;
1744 1768
1745 ($w + 1, $h) # add 1 for cursor 1769 ($w + 1, $h) # add 1 for cursor
1746} 1770}
1747 1771
1748sub key_down { 1772sub invoke_key_down {
1749 my ($self, $ev) = @_; 1773 my ($self, $ev) = @_;
1750 1774
1751 my $mod = $ev->{mod}; 1775 my $mod = $ev->{mod};
1752 my $sym = $ev->{sym}; 1776 my $sym = $ev->{sym};
1753 my $uni = $ev->{unicode}; 1777 my $uni = $ev->{unicode};
… …
1765 } elsif ($sym == CFClient::SDLK_HOME) { 1789 } elsif ($sym == CFClient::SDLK_HOME) {
1766 $self->{cursor} = 0; 1790 $self->{cursor} = 0;
1767 } elsif ($sym == CFClient::SDLK_END) { 1791 } elsif ($sym == CFClient::SDLK_END) {
1768 $self->{cursor} = length $text; 1792 $self->{cursor} = length $text;
1769 } elsif ($uni == 27) { 1793 } elsif ($uni == 27) {
1770 $self->_emit ('escape'); 1794 $self->emit ('escape');
1771 } elsif ($uni) { 1795 } elsif ($uni) {
1772 substr $text, $self->{cursor}++, 0, chr $uni; 1796 substr $text, $self->{cursor}++, 0, chr $uni;
1773 } else { 1797 } else {
1774 return 0; 1798 return 0;
1775 } 1799 }
… …
1779 $self->realloc; 1803 $self->realloc;
1780 1804
1781 1 1805 1
1782} 1806}
1783 1807
1784sub focus_in { 1808sub invoke_focus_in {
1785 my ($self) = @_; 1809 my ($self) = @_;
1786 1810
1787 $self->{last_activity} = $::NOW; 1811 $self->{last_activity} = $::NOW;
1788 1812
1789 $self->SUPER::focus_in; 1813 $self->SUPER::invoke_focus_in
1790} 1814}
1791 1815
1792sub button_down { 1816sub invoke_button_down {
1793 my ($self, $ev, $x, $y) = @_; 1817 my ($self, $ev, $x, $y) = @_;
1794 1818
1795 $self->SUPER::button_down ($ev, $x, $y); 1819 $self->SUPER::invoke_button_down ($ev, $x, $y);
1796 1820
1797 my $idx = $self->{layout}->xy_to_index ($x, $y); 1821 my $idx = $self->{layout}->xy_to_index ($x, $y);
1798 1822
1799 # byte-index to char-index 1823 # byte-index to char-index
1800 my $text = $self->{text}; 1824 my $text = $self->{text};
… …
1805 $self->update; 1829 $self->update;
1806 1830
1807 1 1831 1
1808} 1832}
1809 1833
1810sub mouse_motion { 1834sub invoke_mouse_motion {
1811 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1812# 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#
1813 1837
1814 0 1838 1
1815} 1839}
1816 1840
1817sub _draw { 1841sub _draw {
1818 my ($self) = @_; 1842 my ($self) = @_;
1819 1843
… …
1860 1884
1861our @ISA = CFClient::UI::EntryBase::; 1885our @ISA = CFClient::UI::EntryBase::;
1862 1886
1863use CFClient::OpenGL; 1887use CFClient::OpenGL;
1864 1888
1865sub key_down { 1889sub invoke_key_down {
1866 my ($self, $ev) = @_; 1890 my ($self, $ev) = @_;
1867 1891
1868 my $sym = $ev->{sym}; 1892 my $sym = $ev->{sym};
1869 1893
1870 if ($sym == 13) { 1894 if ($sym == 13) {
1871 unshift @{$self->{history}}, 1895 unshift @{$self->{history}},
1872 my $txt = $self->get_text; 1896 my $txt = $self->get_text;
1897
1873 $self->{history_pointer} = -1; 1898 $self->{history_pointer} = -1;
1874 $self->{history_saveback} = ''; 1899 $self->{history_saveback} = '';
1875 $self->_emit (activate => $txt); 1900 $self->emit (activate => $txt);
1876 $self->update; 1901 $self->update;
1877 1902
1878 } elsif ($sym == CFClient::SDLK_UP) { 1903 } elsif ($sym == CFClient::SDLK_UP) {
1879 if ($self->{history_pointer} < 0) { 1904 if ($self->{history_pointer} < 0) {
1880 $self->{history_saveback} = $self->get_text; 1905 $self->{history_saveback} = $self->get_text;
… …
1896 } else { 1921 } else {
1897 $self->set_text ($self->{history_saveback}); 1922 $self->set_text ($self->{history_saveback});
1898 } 1923 }
1899 1924
1900 } else { 1925 } else {
1901 return $self->SUPER::key_down ($ev) 1926 return $self->SUPER::invoke_key_down ($ev)
1902 } 1927 }
1903 1928
1904 1 1929 1
1905} 1930}
1906 1931
… …
1930 can_events => 1, 1955 can_events => 1,
1931 @_ 1956 @_
1932 ) 1957 )
1933} 1958}
1934 1959
1935sub activate { }
1936
1937sub button_up { 1960sub invoke_button_up {
1938 my ($self, $ev, $x, $y) = @_; 1961 my ($self, $ev, $x, $y) = @_;
1939 1962
1940 $self->emit ("activate") 1963 $self->emit ("activate")
1941 if $x >= 0 && $x < $self->{w} 1964 if $x >= 0 && $x < $self->{w}
1942 && $y >= 0 && $y < $self->{h}; 1965 && $y >= 0 && $y < $self->{h};
… …
1956 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1979 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1957 1980
1958 glDisable GL_TEXTURE_2D; 1981 glDisable GL_TEXTURE_2D;
1959 1982
1960 $self->SUPER::_draw; 1983 $self->SUPER::_draw;
1984}
1985
1986#############################################################################
1987
1988package CFClient::UI::ImageButton;
1989
1990our @ISA = CFClient::UI::Image::;
1991
1992use CFClient::OpenGL;
1993
1994my %textures;
1995
1996sub new {
1997 my $class = shift;
1998
1999 my $self = $class->SUPER::new (
2000 padding_x => 4,
2001 padding_y => 4,
2002 fg => [1, 1, 1],
2003 active_fg => [0, 0, 1],
2004 can_hover => 1,
2005 align => 0,
2006 valign => 0,
2007 can_events => 1,
2008 @_
2009 );
2010}
2011
2012sub invoke_button_up {
2013 my ($self, $ev, $x, $y) = @_;
2014
2015 $self->emit ("activate")
2016 if $x >= 0 && $x < $self->{w}
2017 && $y >= 0 && $y < $self->{h};
2018
2019 1
1961} 2020}
1962 2021
1963############################################################################# 2022#############################################################################
1964 2023
1965package CFClient::UI::CheckBox; 2024package CFClient::UI::CheckBox;
… …
1992 my ($self) = @_; 2051 my ($self) = @_;
1993 2052
1994 (6) x 2 2053 (6) x 2
1995} 2054}
1996 2055
1997sub button_down { 2056sub invoke_button_down {
1998 my ($self, $ev, $x, $y) = @_; 2057 my ($self, $ev, $x, $y) = @_;
1999 2058
2000 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2059 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2001 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2060 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2002 $self->{state} = !$self->{state}; 2061 $self->{state} = !$self->{state};
2003 $self->_emit (changed => $self->{state}); 2062 $self->emit (changed => $self->{state});
2004 } else { 2063 } else {
2005 return 0 2064 return 0
2006 } 2065 }
2007 2066
2008 1 2067 1
… …
2033package CFClient::UI::Image; 2092package CFClient::UI::Image;
2034 2093
2035our @ISA = CFClient::UI::Base::; 2094our @ISA = CFClient::UI::Base::;
2036 2095
2037use CFClient::OpenGL; 2096use CFClient::OpenGL;
2038use Carp qw/confess/;
2039 2097
2040our %loaded_images; 2098our %texture_cache;
2041 2099
2042sub new { 2100sub new {
2043 my $class = shift; 2101 my $class = shift;
2044 2102
2045 my $self = $class->SUPER::new (can_events => 0, @_); 2103 my $self = $class->SUPER::new (
2104 can_events => 0,
2105 @_,
2106 );
2046 2107
2047 $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";
2048 2110
2049 $loaded_images{$self->{image}} ||= 2111 $self->{tex} = $texture_cache{$self->{path}} ||=
2050 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;
2051 2113
2052 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2114 Scalar::Util::weaken $texture_cache{$self->{path}};
2053 2115
2054 Scalar::Util::weaken $loaded_images{$self->{image}}; 2116 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2055
2056 $self->{aspect} = $tex->{w} / $tex->{h};
2057 2117
2058 $self 2118 $self
2059} 2119}
2060 2120
2061sub size_request { 2121sub size_request {
2062 my ($self) = @_; 2122 my ($self) = @_;
2063 2123
2064 ($self->{tex}->{w}, $self->{tex}->{h}) 2124 ($self->{tex}{w}, $self->{tex}{h})
2065} 2125}
2066 2126
2067sub _draw { 2127sub _draw {
2068 my ($self) = @_; 2128 my ($self) = @_;
2069 2129
… …
2305 $self->update; 2365 $self->update;
2306 2366
2307 $self 2367 $self
2308} 2368}
2309 2369
2310sub changed { }
2311
2312sub set_range { 2370sub set_range {
2313 my ($self, $range) = @_; 2371 my ($self, $range) = @_;
2314 2372
2315 ($range, $self->{range}) = ($self->{range}, $range); 2373 ($range, $self->{range}) = ($self->{range}, $range);
2316 2374
… …
2336 if $unit; 2394 if $unit;
2337 2395
2338 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2396 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2339 2397
2340 if ($value != $old_value) { 2398 if ($value != $old_value) {
2341 $self->_emit (changed => $value); 2399 $self->emit (changed => $value);
2342 $self->update; 2400 $self->update;
2343 } 2401 }
2344} 2402}
2345 2403
2346sub size_request { 2404sub size_request {
2347 my ($self) = @_; 2405 my ($self) = @_;
2348 2406
2349 ($self->{req_w}, $self->{req_h}) 2407 ($self->{req_w}, $self->{req_h})
2350} 2408}
2351 2409
2352sub button_down { 2410sub invoke_button_down {
2353 my ($self, $ev, $x, $y) = @_; 2411 my ($self, $ev, $x, $y) = @_;
2354 2412
2355 $self->SUPER::button_down ($ev, $x, $y); 2413 $self->SUPER::invoke_button_down ($ev, $x, $y);
2356 2414
2357 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2415 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2358 2416
2359 $self->mouse_motion ($ev, $x, $y) 2417 $self->invoke_mouse_motion ($ev, $x, $y)
2360} 2418}
2361 2419
2362sub mouse_motion { 2420sub invoke_mouse_motion {
2363 my ($self, $ev, $x, $y) = @_; 2421 my ($self, $ev, $x, $y) = @_;
2364 2422
2365 if ($GRAB == $self) { 2423 if ($GRAB == $self) {
2366 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2424 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2367 2425
… …
2509 2567
2510 $self->{fontsize} = $fontsize; 2568 $self->{fontsize} = $fontsize;
2511 $self->reflow; 2569 $self->reflow;
2512} 2570}
2513 2571
2572sub visible_children {
2573 my ($self) = @_;
2574
2575 @{$self->{children}}[0,1]
2576}
2577
2514sub size_allocate { 2578sub invoke_size_allocate {
2515 my ($self, $w, $h) = @_; 2579 my ($self, $w, $h) = @_;
2516 2580
2517 $self->SUPER::size_allocate ($w, $h); 2581 my (undef, undef, @other) = @{ $self->{children} };
2582 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2518 2583
2519 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2584 $self->{layout}->set_font ($self->{font}) if $self->{font};
2520 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2585 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2521 $self->{layout}->set_width ($self->{children}[0]{w}); 2586 $self->{layout}->set_width ($self->{children}[0]{w});
2522 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2587 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2523 2588
2524 $self->reflow; 2589 $self->reflow;
2525}
2526 2590
2527sub text_size { 2591 $self->SUPER::invoke_size_allocate ($w, $h)
2528 my ($self, $text, $indent) = @_; 2592}
2593
2594sub get_layout {
2595 my ($self, $para) = @_;
2529 2596
2530 my $layout = $self->{layout}; 2597 my $layout = $self->{layout};
2531 2598
2599 $layout->set_font ($self->{font}) if $self->{font};
2532 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2600 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2533 $layout->set_width ($self->{children}[0]{w} - $indent); 2601 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2534 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2602 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2535 $layout->set_markup ($text); 2603 $layout->set_markup ($para->{markup});
2536 2604 $layout->set_shapes (map +($_->{req_w}, $_->{req_h}), @{$para->{widget}});
2605
2537 $layout->size 2606 $layout
2538} 2607}
2539 2608
2540sub reflow { 2609sub reflow {
2541 my ($self) = @_; 2610 my ($self) = @_;
2542 2611
… …
2551 $self->{children}[1]->set_value ($offset); 2620 $self->{children}[1]->set_value ($offset);
2552} 2621}
2553 2622
2554sub clear { 2623sub clear {
2555 my ($self) = @_; 2624 my ($self) = @_;
2625
2626 my (undef, undef, @other) = @{ $self->{children} };
2627 $self->remove ($_) for @other;
2556 2628
2557 $self->{par} = []; 2629 $self->{par} = [];
2558 $self->{height} = 0; 2630 $self->{height} = 0;
2559 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2631 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2560} 2632}
2561 2633
2562sub add_paragraph { 2634sub add_paragraph {
2563 my ($self, $color, $text, $indent) = @_; 2635 my ($self, $color, $para, $indent) = @_;
2564 2636
2565 for my $line (split /\n/, $text) { 2637 my ($text, @w) = ref $para ? @$para : $para;
2566 my ($w, $h) = $self->text_size ($line); 2638
2567 $self->{height} += $h; 2639 $para = {
2568 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,
2569 } 2646 };
2570 2647
2571 $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;
2572} 2660}
2573 2661
2574sub update { 2662sub update {
2575 my ($self) = @_; 2663 my ($self) = @_;
2576 2664
… …
2584 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2672 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2585 2673
2586 if (delete $self->{need_reflow}) { 2674 if (delete $self->{need_reflow}) {
2587 my $height = 0; 2675 my $height = 0;
2588 2676
2589 my $layout = $self->{layout};
2590
2591 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2592
2593 for (@{$self->{par}}) { 2677 for my $para (@{$self->{par}}) {
2594 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2678 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2595 $layout->set_width ($W - $_->[3]); 2679 my $layout = $self->get_layout ($para);
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2597 $layout->set_markup ($_->[4]);
2598 my ($w, $h) = $layout->size; 2680 my ($w, $h) = $layout->size;
2599 $_->[0] = $w + $_->[3]; 2681
2682 $para->{w} = $w + $para->{indent};
2600 $_->[1] = $h; 2683 $para->{h} = $h;
2684 $para->{wrapped} = $layout->has_wrapped;
2601 } 2685 }
2602 2686
2603 $height += $_->[1]; 2687 $height += $para->{h};
2604 } 2688 }
2605 2689
2606 $self->{height} = $height; 2690 $self->{height} = $height;
2607 2691
2608 $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]);
2609 2693
2610 delete $self->{texture}; 2694 delete $self->{texture};
2695 }
2696
2697 if (delete $self->{scroll_to_bottom}) {
2698 $self->{children}[1]->set_value (1e10);
2611 } 2699 }
2612 2700
2613 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2701 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2614 glClearColor 0, 0, 0, 0; 2702 glClearColor 0, 0, 0, 0;
2615 glClear GL_COLOR_BUFFER_BIT; 2703 glClear GL_COLOR_BUFFER_BIT;
… …
2619 my $y0 = $top; 2707 my $y0 = $top;
2620 my $y1 = $top + $H; 2708 my $y1 = $top + $H;
2621 2709
2622 my $y = 0; 2710 my $y = 0;
2623 2711
2624 my $layout = $self->{layout};
2625
2626 $layout->set_font ($self->{font}) if $self->{font};
2627
2628 glEnable GL_BLEND; 2712 glEnable GL_BLEND;
2629 #TODO# not correct in windows where rgba is forced off 2713 #TODO# not correct in windows where rgba is forced off
2630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2714 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2631 2715
2632 for my $par (@{$self->{par}}) { 2716 for my $para (@{$self->{par}}) {
2633 my $h = $par->[1]; 2717 my $h = $para->{h};
2634 2718
2635 if ($y0 < $y + $h && $y < $y1) { 2719 if ($y0 < $y + $h && $y < $y1) {
2636 $layout->set_foreground (@{ $par->[2] }); 2720
2637 $layout->set_width ($W - $par->[3]); 2721 my $layout = $self->get_layout ($para);
2638 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2639 $layout->set_markup ($par->[4]);
2640 2722
2641 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2723 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2642 2724
2643 glRasterPos $par->[3], $y - $y0; 2725 glRasterPos $para->{indent}, $y - $y0;
2644 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 }
2645 } 2740 }
2646 2741
2647 $y += $h; 2742 $y += $h;
2648 } 2743 }
2649 2744
2650 glDisable GL_BLEND; 2745 glDisable GL_BLEND;
2651 }; 2746 };
2652 }); 2747 });
2748}
2749
2750sub reconfigure {
2751 my ($self) = @_;
2752
2753 $self->SUPER::reconfigure;
2754
2755 $_->{w} = 1e10 for @{ $self->{par} };
2756 $self->reflow;
2653} 2757}
2654 2758
2655sub _draw { 2759sub _draw {
2656 my ($self) = @_; 2760 my ($self) = @_;
2657 2761
… …
2660 glColor 0, 0, 0, 1; 2764 glColor 0, 0, 0, 1;
2661 $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});
2662 glDisable GL_TEXTURE_2D; 2766 glDisable GL_TEXTURE_2D;
2663 2767
2664 $self->{children}[1]->draw; 2768 $self->{children}[1]->draw;
2665
2666} 2769}
2667 2770
2668############################################################################# 2771#############################################################################
2669 2772
2670package CFClient::UI::Animator; 2773package CFClient::UI::Animator;
… …
2779 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2882 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2780 2883
2781 ($w + 4, $h + 4) 2884 ($w + 4, $h + 4)
2782} 2885}
2783 2886
2784sub size_allocate { 2887sub invoke_size_allocate {
2785 my ($self, $w, $h) = @_; 2888 my ($self, $w, $h) = @_;
2786 2889
2787 $self->SUPER::size_allocate ($w - 4, $h - 4); 2890 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2788} 2891}
2789 2892
2790sub visibility_change { 2893sub invoke_visibility_change {
2791 my ($self, $visible) = @_; 2894 my ($self, $visible) = @_;
2792 2895
2793 return unless $visible; 2896 return unless $visible;
2794 2897
2795 $self->{root}->on_post_alloc ("move_$self" => sub { 2898 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2962 3065
2963# 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)
2964sub popup { 3067sub popup {
2965 my ($self, $ev) = @_; 3068 my ($self, $ev) = @_;
2966 3069
2967 $self->_emit ("popdown"); 3070 $self->emit ("popdown");
2968 3071
2969 # maybe save $GRAB? must be careful about events... 3072 # maybe save $GRAB? must be careful about events...
2970 $GRAB = $self; 3073 $GRAB = $self;
2971 $self->{button} = $ev->{button}; 3074 $self->{button} = $ev->{button};
2972 3075
2973 $self->show; 3076 $self->show;
2974 $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);
2975} 3078}
2976 3079
2977sub mouse_motion { 3080sub invoke_mouse_motion {
2978 my ($self, $ev, $x, $y) = @_; 3081 my ($self, $ev, $x, $y) = @_;
2979 3082
2980 # TODO: should use vbox->find_widget or so 3083 # TODO: should use vbox->find_widget or so
2981 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3084 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2982 $self->{hover} = $self->{item}{$HOVER}; 3085 $self->{hover} = $self->{item}{$HOVER};
2983 3086
2984 0 3087 0
2985} 3088}
2986 3089
2987sub button_up { 3090sub invoke_button_up {
2988 my ($self, $ev, $x, $y) = @_; 3091 my ($self, $ev, $x, $y) = @_;
2989 3092
2990 if ($ev->{button} == $self->{button}) { 3093 if ($ev->{button} == $self->{button}) {
2991 undef $GRAB; 3094 undef $GRAB;
2992 $self->hide; 3095 $self->hide;
2993 3096
2994 $self->_emit ("popdown"); 3097 $self->emit ("popdown");
2995 $self->{hover}[1]->() if $self->{hover}; 3098 $self->{hover}[1]->() if $self->{hover};
2996 } else { 3099 } else {
2997 return 0 3100 return 0
2998 } 3101 }
2999 3102
… …
3036 : $self->{children}[$page_or_widget]; 3139 : $self->{children}[$page_or_widget];
3037 3140
3038 $self->{current} = $widget; 3141 $self->{current} = $widget;
3039 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3142 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3040 3143
3041 $self->_emit (page_changed => $self->{current}); 3144 $self->emit (page_changed => $self->{current});
3042 3145
3043 $self->realloc; 3146 $self->realloc;
3044} 3147}
3045 3148
3046sub visible_children { 3149sub visible_children {
… …
3051 my ($self) = @_; 3154 my ($self) = @_;
3052 3155
3053 $self->{current}->size_request 3156 $self->{current}->size_request
3054} 3157}
3055 3158
3056sub size_allocate { 3159sub invoke_size_allocate {
3057 my ($self, $w, $h) = @_; 3160 my ($self, $w, $h) = @_;
3058 3161
3059 $self->{current}->configure (0, 0, $w, $h); 3162 $self->{current}->configure (0, 0, $w, $h);
3163
3164 1
3060} 3165}
3061 3166
3062sub _draw { 3167sub _draw {
3063 my ($self) = @_; 3168 my ($self) = @_;
3064 3169
… …
3103 3208
3104sub set_current_page { 3209sub set_current_page {
3105 my ($self, $page) = @_; 3210 my ($self, $page) = @_;
3106 3211
3107 $self->{multiplexer}->set_current_page ($page); 3212 $self->{multiplexer}->set_current_page ($page);
3108 $self->_emit (page_changed => $self->{multiplexer}{current}); 3213 $self->emit (page_changed => $self->{multiplexer}{current});
3109} 3214}
3110 3215
3111############################################################################# 3216#############################################################################
3112 3217
3113package CFClient::UI::Combobox; 3218package CFClient::UI::Combobox;
… …
3128 $self->_set_value ($self->{value}); 3233 $self->_set_value ($self->{value});
3129 3234
3130 $self 3235 $self
3131} 3236}
3132 3237
3133sub button_down { 3238sub invoke_button_down {
3134 my ($self, $ev) = @_; 3239 my ($self, $ev) = @_;
3135 3240
3136 my @menu_items; 3241 my @menu_items;
3137 3242
3138 for (@{ $self->{options} }) { 3243 for (@{ $self->{options} }) {
… …
3159 my ($self, $value) = @_; 3264 my ($self, $value) = @_;
3160 3265
3161 return unless $self->{value} ne $value; 3266 return unless $self->{value} ne $value;
3162 3267
3163 $self->_set_value ($value); 3268 $self->_set_value ($value);
3164 $self->_emit (changed => $value); 3269 $self->emit (changed => $value);
3165} 3270}
3166 3271
3167############################################################################# 3272#############################################################################
3168 3273
3169package CFClient::UI::Statusbox; 3274package CFClient::UI::Statusbox;
… …
3413 $self->update_binding_widgets; 3518 $self->update_binding_widgets;
3414 3519
3415 $self 3520 $self
3416} 3521}
3417 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
3418sub commit { 3535sub commit {
3419 my ($self) = @_; 3536 my ($self) = @_;
3420 my ($mod, $sym, $cmds) = $self->get_binding; 3537 my ($mod, $sym, $cmds) = $self->get_binding;
3421 if ($sym != 0 && @$cmds > 0) { 3538 if ($sym != 0 && @$cmds > 0) {
3422 $::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)
… …
3456 my ($self) = @_; 3573 my ($self) = @_;
3457 $self->ask_for_bind (1); 3574 $self->ask_for_bind (1);
3458} 3575}
3459 3576
3460sub ask_for_bind { 3577sub ask_for_bind {
3461 my ($self, $commit) = @_; 3578 my ($self, $commit, $end_cb) = @_;
3462 3579
3463 CFClient::Binder::open_binding_dialog (sub { 3580 CFClient::Binder::open_binding_dialog (sub {
3464 my ($mod, $sym) = @_; 3581 my ($mod, $sym) = @_;
3465 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak? 3582 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3466 $self->update_binding_widgets; 3583 $self->update_binding_widgets;
3467 $self->commit if $commit; 3584 $self->commit if $commit;
3585 $end_cb->() if $end_cb;
3468 }); 3586 });
3469} 3587}
3470 3588
3471# $mod and $sym are the modifiers and key symbol 3589# $mod and $sym are the modifiers and key symbol
3472# $cmds is a array ref of strings (the commands) 3590# $cmds is a array ref of strings (the commands)
… …
3490} 3608}
3491 3609
3492# this is a shortcut method that asks for a binding 3610# this is a shortcut method that asks for a binding
3493# and then just binds it. 3611# and then just binds it.
3494sub do_quick_binding { 3612sub do_quick_binding {
3495 my ($self, $cmds) = @_; 3613 my ($self, $cmds, $end_cb) = @_;
3496 $self->set_binding (undef, undef, $cmds, sub { 3614 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3497 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3498 });
3499 $self->ask_for_bind (1); 3615 $self->ask_for_bind (1, $end_cb);
3500} 3616}
3501 3617
3502sub update_binding_widgets { 3618sub update_binding_widgets {
3503 my ($self) = @_; 3619 my ($self) = @_;
3504 my ($mod, $sym, $cmds) = $self->get_binding; 3620 my ($mod, $sym, $cmds) = $self->get_binding;
… …
3709 $coord = $max - $size if $coord > $max - $size; 3825 $coord = $max - $size if $coord > $max - $size;
3710 3826
3711 int $coord + 0.5 3827 int $coord + 0.5
3712} 3828}
3713 3829
3714sub size_allocate { 3830sub invoke_size_allocate {
3715 my ($self, $w, $h) = @_; 3831 my ($self, $w, $h) = @_;
3716 3832
3717 for my $child ($self->children) { 3833 for my $child ($self->children) {
3718 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)};
3719 3835
… …
3723 $X = _to_pixel $X, $W, $self->{w}; 3839 $X = _to_pixel $X, $W, $self->{w};
3724 $Y = _to_pixel $Y, $H, $self->{h}; 3840 $Y = _to_pixel $Y, $H, $self->{h};
3725 3841
3726 $child->configure ($X, $Y, $W, $H); 3842 $child->configure ($X, $Y, $W, $H);
3727 } 3843 }
3844
3845 1
3728} 3846}
3729 3847
3730sub coord2local { 3848sub coord2local {
3731 my ($self, $x, $y) = @_; 3849 my ($self, $x, $y) = @_;
3732 3850

Diff Legend

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