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.311 by root, Fri Jun 23 22:35:16 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
… …
789 786
790sub size_request { 787sub size_request {
791 $_[0]{children}[0]->size_request 788 $_[0]{children}[0]->size_request
792} 789}
793 790
794sub size_allocate { 791sub invoke_size_allocate {
795 my ($self, $w, $h) = @_; 792 my ($self, $w, $h) = @_;
796 793
797 $self->{children}[0]->configure (0, 0, $w, $h); 794 $self->{children}[0]->configure (0, 0, $w, $h);
795
796 1
798} 797}
799 798
800############################################################################# 799#############################################################################
801 800
802# back-buffered drawing area 801# back-buffered drawing area
… …
818 817
819 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 818 $ROOT->on_post_alloc ($self => sub { $self->render_child });
820 $self->SUPER::update; 819 $self->SUPER::update;
821} 820}
822 821
823sub size_allocate { 822sub invoke_size_allocate {
824 my ($self, $w, $h) = @_; 823 my ($self, $w, $h) = @_;
825 824
826 $self->SUPER::size_allocate ($w, $h);
827 $self->update; 825 $self->update;
826
827 $self->SUPER::invoke_size_allocate ($w, $h)
828} 828}
829 829
830sub _render { 830sub _render {
831 my ($self) = @_; 831 my ($self) = @_;
832 832
… …
893 $h = 10 if $self->{scroll_y}; 893 $h = 10 if $self->{scroll_y};
894 894
895 ($w, $h) 895 ($w, $h)
896} 896}
897 897
898sub size_allocate { 898sub invoke_size_allocate {
899 my ($self, $w, $h) = @_; 899 my ($self, $w, $h) = @_;
900 900
901 my $child = $self->child; 901 my $child = $self->child;
902 902
903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
905 905
906 $self->child->configure (0, 0, $w, $h); 906 $self->child->configure (0, 0, $w, $h);
907 $self->update; 907 $self->update;
908
909 1
908} 910}
909 911
910sub set_offset { 912sub set_offset {
911 my ($self, $x, $y) = @_; 913 my ($self, $x, $y) = @_;
912 914
… …
1002 # todo: overwrite size_allocate of child 1004 # todo: overwrite size_allocate of child
1003 my $child = $self->{vp}->child; 1005 my $child = $self->{vp}->child;
1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1006 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1005} 1007}
1006 1008
1007sub size_allocate { 1009sub invoke_size_allocate {
1008 my ($self, $w, $h) = @_; 1010 my ($self, $w, $h) = @_;
1009
1010 $self->SUPER::size_allocate ($w, $h);
1011 1011
1012 my $child = $self->{vp}->child; 1012 my $child = $self->{vp}->child;
1013 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1013 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1014
1015 $self->SUPER::invoke_size_allocate ($w, $h)
1014} 1016}
1015 1017
1016#TODO# update range on size_allocate depending on child 1018#TODO# update range on size_allocate depending on child
1017# update viewport offset on scroll 1019# update viewport offset on scroll
1018 1020
… …
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
… …
1742 1750
1743 $text =~ s/./*/g if $self->{hidden}; 1751 $text =~ s/./*/g if $self->{hidden};
1744 $self->{layout}->set_text ("$text "); 1752 $self->{layout}->set_text ("$text ");
1745 delete $self->{size_req}; 1753 delete $self->{size_req};
1746 1754
1747 $self->_emit (changed => $self->{text}); 1755 $self->emit (changed => $self->{text});
1748 1756
1749 $self->realloc; 1757 $self->realloc;
1750 $self->update; 1758 $self->update;
1751} 1759}
1752 1760
… …
1767 my ($w, $h) = $self->SUPER::size_request; 1775 my ($w, $h) = $self->SUPER::size_request;
1768 1776
1769 ($w + 1, $h) # add 1 for cursor 1777 ($w + 1, $h) # add 1 for cursor
1770} 1778}
1771 1779
1772sub key_down { 1780sub invoke_key_down {
1773 my ($self, $ev) = @_; 1781 my ($self, $ev) = @_;
1774 1782
1775 my $mod = $ev->{mod}; 1783 my $mod = $ev->{mod};
1776 my $sym = $ev->{sym}; 1784 my $sym = $ev->{sym};
1777 my $uni = $ev->{unicode}; 1785 my $uni = $ev->{unicode};
… …
1789 } elsif ($sym == CFClient::SDLK_HOME) { 1797 } elsif ($sym == CFClient::SDLK_HOME) {
1790 $self->{cursor} = 0; 1798 $self->{cursor} = 0;
1791 } elsif ($sym == CFClient::SDLK_END) { 1799 } elsif ($sym == CFClient::SDLK_END) {
1792 $self->{cursor} = length $text; 1800 $self->{cursor} = length $text;
1793 } elsif ($uni == 27) { 1801 } elsif ($uni == 27) {
1794 $self->_emit ('escape'); 1802 $self->emit ('escape');
1795 } elsif ($uni) { 1803 } elsif ($uni) {
1796 substr $text, $self->{cursor}++, 0, chr $uni; 1804 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else { 1805 } else {
1798 return 0; 1806 return 0;
1799 } 1807 }
… …
1803 $self->realloc; 1811 $self->realloc;
1804 1812
1805 1 1813 1
1806} 1814}
1807 1815
1808sub focus_in { 1816sub invoke_focus_in {
1809 my ($self) = @_; 1817 my ($self) = @_;
1810 1818
1811 $self->{last_activity} = $::NOW; 1819 $self->{last_activity} = $::NOW;
1812 1820
1813 $self->SUPER::focus_in; 1821 $self->SUPER::invoke_focus_in
1814} 1822}
1815 1823
1816sub button_down { 1824sub invoke_button_down {
1817 my ($self, $ev, $x, $y) = @_; 1825 my ($self, $ev, $x, $y) = @_;
1818 1826
1819 $self->SUPER::button_down ($ev, $x, $y); 1827 $self->SUPER::invoke_button_down ($ev, $x, $y);
1820 1828
1821 my $idx = $self->{layout}->xy_to_index ($x, $y); 1829 my $idx = $self->{layout}->xy_to_index ($x, $y);
1822 1830
1823 # byte-index to char-index 1831 # byte-index to char-index
1824 my $text = $self->{text}; 1832 my $text = $self->{text};
… …
1829 $self->update; 1837 $self->update;
1830 1838
1831 1 1839 1
1832} 1840}
1833 1841
1834sub mouse_motion { 1842sub invoke_mouse_motion {
1835 my ($self, $ev, $x, $y) = @_; 1843 my ($self, $ev, $x, $y) = @_;
1836# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1844# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1837 1845
1838 0 1846 1
1839} 1847}
1840 1848
1841sub _draw { 1849sub _draw {
1842 my ($self) = @_; 1850 my ($self) = @_;
1843 1851
… …
1884 1892
1885our @ISA = CFClient::UI::EntryBase::; 1893our @ISA = CFClient::UI::EntryBase::;
1886 1894
1887use CFClient::OpenGL; 1895use CFClient::OpenGL;
1888 1896
1889sub key_down { 1897sub invoke_key_down {
1890 my ($self, $ev) = @_; 1898 my ($self, $ev) = @_;
1891 1899
1892 my $sym = $ev->{sym}; 1900 my $sym = $ev->{sym};
1893 1901
1894 if ($sym == 13) { 1902 if ($sym == 13) {
1895 unshift @{$self->{history}}, 1903 unshift @{$self->{history}},
1896 my $txt = $self->get_text; 1904 my $txt = $self->get_text;
1905
1897 $self->{history_pointer} = -1; 1906 $self->{history_pointer} = -1;
1898 $self->{history_saveback} = ''; 1907 $self->{history_saveback} = '';
1899 $self->_emit (activate => $txt); 1908 $self->emit (activate => $txt);
1900 $self->update; 1909 $self->update;
1901 1910
1902 } elsif ($sym == CFClient::SDLK_UP) { 1911 } elsif ($sym == CFClient::SDLK_UP) {
1903 if ($self->{history_pointer} < 0) { 1912 if ($self->{history_pointer} < 0) {
1904 $self->{history_saveback} = $self->get_text; 1913 $self->{history_saveback} = $self->get_text;
… …
1920 } else { 1929 } else {
1921 $self->set_text ($self->{history_saveback}); 1930 $self->set_text ($self->{history_saveback});
1922 } 1931 }
1923 1932
1924 } else { 1933 } else {
1925 return $self->SUPER::key_down ($ev) 1934 return $self->SUPER::invoke_key_down ($ev)
1926 } 1935 }
1927 1936
1928 1 1937 1
1929} 1938}
1930 1939
… …
1954 can_events => 1, 1963 can_events => 1,
1955 @_ 1964 @_
1956 ) 1965 )
1957} 1966}
1958 1967
1959sub activate { }
1960
1961sub button_up { 1968sub invoke_button_up {
1962 my ($self, $ev, $x, $y) = @_; 1969 my ($self, $ev, $x, $y) = @_;
1963 1970
1964 $self->emit ("activate") 1971 $self->emit ("activate")
1965 if $x >= 0 && $x < $self->{w} 1972 if $x >= 0 && $x < $self->{w}
1966 && $y >= 0 && $y < $self->{h}; 1973 && $y >= 0 && $y < $self->{h};
… …
2008 can_events => 1, 2015 can_events => 1,
2009 @_ 2016 @_
2010 ); 2017 );
2011} 2018}
2012 2019
2013sub activate { }
2014
2015sub button_up { 2020sub invoke_button_up {
2016 my ($self, $ev, $x, $y) = @_; 2021 my ($self, $ev, $x, $y) = @_;
2017 2022
2018 $self->emit ("activate") 2023 $self->emit ("activate")
2019 if $x >= 0 && $x < $self->{w} 2024 if $x >= 0 && $x < $self->{w}
2020 && $y >= 0 && $y < $self->{h}; 2025 && $y >= 0 && $y < $self->{h};
… …
2054 my ($self) = @_; 2059 my ($self) = @_;
2055 2060
2056 (6) x 2 2061 (6) x 2
2057} 2062}
2058 2063
2059sub button_down { 2064sub invoke_button_down {
2060 my ($self, $ev, $x, $y) = @_; 2065 my ($self, $ev, $x, $y) = @_;
2061 2066
2062 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2067 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2063 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2068 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2064 $self->{state} = !$self->{state}; 2069 $self->{state} = !$self->{state};
2065 $self->_emit (changed => $self->{state}); 2070 $self->emit (changed => $self->{state});
2066 } else { 2071 } else {
2067 return 0 2072 return 0
2068 } 2073 }
2069 2074
2070 1 2075 1
… …
2095package CFClient::UI::Image; 2100package CFClient::UI::Image;
2096 2101
2097our @ISA = CFClient::UI::Base::; 2102our @ISA = CFClient::UI::Base::;
2098 2103
2099use CFClient::OpenGL; 2104use CFClient::OpenGL;
2100use Carp qw/confess/;
2101 2105
2102our %loaded_images; 2106our %texture_cache;
2103 2107
2104sub new { 2108sub new {
2105 my $class = shift; 2109 my $class = shift;
2106 2110
2107 my $self = $class->SUPER::new (can_events => 0, @_); 2111 my $self = $class->SUPER::new (
2112 can_events => 0,
2113 @_,
2114 );
2108 2115
2109 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2116 $self->{path}
2117 or Carp::croak "required attribute 'path' not set";
2110 2118
2111 $loaded_images{$self->{image}} ||= 2119 $self->{tex} = $texture_cache{$self->{path}} ||=
2112 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2120 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2113 2121
2114 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2122 Scalar::Util::weaken $texture_cache{$self->{path}};
2115 2123
2116 Scalar::Util::weaken $loaded_images{$self->{image}}; 2124 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2117
2118 $self->{aspect} = $tex->{w} / $tex->{h};
2119 2125
2120 $self 2126 $self
2121} 2127}
2122 2128
2123sub size_request { 2129sub size_request {
2124 my ($self) = @_; 2130 my ($self) = @_;
2125 2131
2126 ($self->{tex}->{w}, $self->{tex}->{h}) 2132 ($self->{tex}{w}, $self->{tex}{h})
2127} 2133}
2128 2134
2129sub _draw { 2135sub _draw {
2130 my ($self) = @_; 2136 my ($self) = @_;
2131 2137
… …
2367 $self->update; 2373 $self->update;
2368 2374
2369 $self 2375 $self
2370} 2376}
2371 2377
2372sub changed { }
2373
2374sub set_range { 2378sub set_range {
2375 my ($self, $range) = @_; 2379 my ($self, $range) = @_;
2376 2380
2377 ($range, $self->{range}) = ($self->{range}, $range); 2381 ($range, $self->{range}) = ($self->{range}, $range);
2378 2382
… …
2398 if $unit; 2402 if $unit;
2399 2403
2400 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2404 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2401 2405
2402 if ($value != $old_value) { 2406 if ($value != $old_value) {
2403 $self->_emit (changed => $value); 2407 $self->emit (changed => $value);
2404 $self->update; 2408 $self->update;
2405 } 2409 }
2406} 2410}
2407 2411
2408sub size_request { 2412sub size_request {
2409 my ($self) = @_; 2413 my ($self) = @_;
2410 2414
2411 ($self->{req_w}, $self->{req_h}) 2415 ($self->{req_w}, $self->{req_h})
2412} 2416}
2413 2417
2414sub button_down { 2418sub invoke_button_down {
2415 my ($self, $ev, $x, $y) = @_; 2419 my ($self, $ev, $x, $y) = @_;
2416 2420
2417 $self->SUPER::button_down ($ev, $x, $y); 2421 $self->SUPER::invoke_button_down ($ev, $x, $y);
2418 2422
2419 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2423 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2420 2424
2421 $self->mouse_motion ($ev, $x, $y) 2425 $self->invoke_mouse_motion ($ev, $x, $y)
2422} 2426}
2423 2427
2424sub mouse_motion { 2428sub invoke_mouse_motion {
2425 my ($self, $ev, $x, $y) = @_; 2429 my ($self, $ev, $x, $y) = @_;
2426 2430
2427 if ($GRAB == $self) { 2431 if ($GRAB == $self) {
2428 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2432 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2429 2433
… …
2571 2575
2572 $self->{fontsize} = $fontsize; 2576 $self->{fontsize} = $fontsize;
2573 $self->reflow; 2577 $self->reflow;
2574} 2578}
2575 2579
2580sub visible_children {
2581 my ($self) = @_;
2582
2583 @{$self->{children}}[0,1]
2584}
2585
2576sub size_allocate { 2586sub invoke_size_allocate {
2577 my ($self, $w, $h) = @_; 2587 my ($self, $w, $h) = @_;
2578 2588
2579 $self->SUPER::size_allocate ($w, $h); 2589 my ($empty, $slider, @other) = @{ $self->{children} };
2590 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2580 2591
2581 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2592 $self->{layout}->set_font ($self->{font}) if $self->{font};
2582 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2593 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2583 $self->{layout}->set_width ($self->{children}[0]{w}); 2594 $self->{layout}->set_width ($empty->{w});
2584 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2595 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2585 2596
2586 $self->reflow; 2597 $self->reflow;
2587}
2588 2598
2589sub text_size { 2599 $self->SUPER::invoke_size_allocate ($w, $h)
2590 my ($self, $text, $indent) = @_; 2600}
2601
2602sub get_layout {
2603 my ($self, $para) = @_;
2591 2604
2592 my $layout = $self->{layout}; 2605 my $layout = $self->{layout};
2593 2606
2607 $layout->set_font ($self->{font}) if $self->{font};
2608 $layout->set_foreground (@{$para->{fg}});
2594 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2609 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2595 $layout->set_width ($self->{children}[0]{w} - $indent); 2610 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2611 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2597 $layout->set_markup ($text); 2612 $layout->set_markup ($para->{markup});
2613
2614 $layout->set_shapes (
2615 map
2616 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2617 @{$para->{widget}}
2598 2618 );
2619
2599 $layout->size 2620 $layout
2600} 2621}
2601 2622
2602sub reflow { 2623sub reflow {
2603 my ($self) = @_; 2624 my ($self) = @_;
2604 2625
… …
2613 $self->{children}[1]->set_value ($offset); 2634 $self->{children}[1]->set_value ($offset);
2614} 2635}
2615 2636
2616sub clear { 2637sub clear {
2617 my ($self) = @_; 2638 my ($self) = @_;
2639
2640 my (undef, undef, @other) = @{ $self->{children} };
2641 $self->remove ($_) for @other;
2618 2642
2619 $self->{par} = []; 2643 $self->{par} = [];
2620 $self->{height} = 0; 2644 $self->{height} = 0;
2621 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2645 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2622} 2646}
2623 2647
2624sub add_paragraph { 2648sub add_paragraph {
2625 my ($self, $color, $text, $indent) = @_; 2649 my ($self, $color, $para, $indent) = @_;
2626 2650
2627 for my $line (split /\n/, $text) { 2651 my ($text, @w) = ref $para ? @$para : $para;
2628 my ($w, $h) = $self->text_size ($line); 2652
2629 $self->{height} += $h; 2653 $para = {
2630 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2654 w => 1e10,
2655 wrapped => 1,
2656 fg => $color,
2657 indent => $indent,
2658 markup => $text,
2659 widget => \@w,
2631 } 2660 };
2632 2661
2633 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2662 $self->add (@w) if @w;
2663 push @{$self->{par}}, $para;
2664
2665 $self->{need_reflow}++;
2666 $self->update;
2667}
2668
2669sub scroll_to_bottom {
2670 my ($self) = @_;
2671
2672 $self->{scroll_to_bottom} = 1;
2673 $self->update;
2634} 2674}
2635 2675
2636sub update { 2676sub update {
2637 my ($self) = @_; 2677 my ($self) = @_;
2638 2678
… …
2646 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2686 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2647 2687
2648 if (delete $self->{need_reflow}) { 2688 if (delete $self->{need_reflow}) {
2649 my $height = 0; 2689 my $height = 0;
2650 2690
2651 my $layout = $self->{layout};
2652
2653 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2654
2655 for (@{$self->{par}}) { 2691 for my $para (@{$self->{par}}) {
2656 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2692 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2657 $layout->set_width ($W - $_->[3]); 2693 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; 2694 my ($w, $h) = $layout->size;
2661 $_->[0] = $w + $_->[3]; 2695
2662 $_->[1] = $h; 2696 $para->{w} = $w + $para->{indent};
2697 $para->{h} = $h;
2698 $para->{wrapped} = $layout->has_wrapped;
2663 } 2699 }
2664 2700
2665 $height += $_->[1]; 2701 $height += $para->{h};
2666 } 2702 }
2667 2703
2668 $self->{height} = $height; 2704 $self->{height} = $height;
2669 2705
2670 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2706 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2671 2707
2672 delete $self->{texture}; 2708 delete $self->{texture};
2709 }
2710
2711 if (delete $self->{scroll_to_bottom}) {
2712 $self->{children}[1]->set_value (1e10);
2673 } 2713 }
2674 2714
2675 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2715 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2676 glClearColor 0, 0, 0, 0; 2716 glClearColor 0, 0, 0, 0;
2677 glClear GL_COLOR_BUFFER_BIT; 2717 glClear GL_COLOR_BUFFER_BIT;
… …
2681 my $y0 = $top; 2721 my $y0 = $top;
2682 my $y1 = $top + $H; 2722 my $y1 = $top + $H;
2683 2723
2684 my $y = 0; 2724 my $y = 0;
2685 2725
2686 my $layout = $self->{layout};
2687
2688 $layout->set_font ($self->{font}) if $self->{font};
2689
2690 glEnable GL_BLEND; 2726 glEnable GL_BLEND;
2691 #TODO# not correct in windows where rgba is forced off 2727 #TODO# not correct in windows where rgba is forced off
2692 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2728 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2693 2729
2694 for my $par (@{$self->{par}}) { 2730 for my $para (@{$self->{par}}) {
2695 my $h = $par->[1]; 2731 my $h = $para->{h};
2696 2732
2697 if ($y0 < $y + $h && $y < $y1) { 2733 if ($y0 < $y + $h && $y < $y1) {
2698 $layout->set_foreground (@{ $par->[2] }); 2734
2699 $layout->set_width ($W - $par->[3]); 2735 my $layout = $self->get_layout ($para);
2700 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2701 $layout->set_markup ($par->[4]);
2702 2736
2703 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2737 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2704 2738
2705 glRasterPos $par->[3], $y - $y0; 2739 glRasterPos $para->{indent}, $y - $y0;
2706 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2740 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2741
2742 if (my @w = @{ $para->{widget} }) {
2743 my @s = $layout->get_shapes;
2744
2745 for (@w) {
2746 my ($dx, $dy) = splice @s, 0, 2, ();
2747
2748 $_->{x} = $dx + $para->{indent};
2749 $_->{y} = $dy + $y - $y0;
2750
2751 $_->draw;
2752 }
2753 }
2707 } 2754 }
2708 2755
2709 $y += $h; 2756 $y += $h;
2710 } 2757 }
2711 2758
2712 glDisable GL_BLEND; 2759 glDisable GL_BLEND;
2713 }; 2760 };
2714 }); 2761 });
2762}
2763
2764sub reconfigure {
2765 my ($self) = @_;
2766
2767 $self->SUPER::reconfigure;
2768
2769 $_->{w} = 1e10 for @{ $self->{par} };
2770 $self->reflow;
2715} 2771}
2716 2772
2717sub _draw { 2773sub _draw {
2718 my ($self) = @_; 2774 my ($self) = @_;
2719 2775
… …
2722 glColor 0, 0, 0, 1; 2778 glColor 0, 0, 0, 1;
2723 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2779 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2724 glDisable GL_TEXTURE_2D; 2780 glDisable GL_TEXTURE_2D;
2725 2781
2726 $self->{children}[1]->draw; 2782 $self->{children}[1]->draw;
2727
2728} 2783}
2729 2784
2730############################################################################# 2785#############################################################################
2731 2786
2732package CFClient::UI::Animator; 2787package CFClient::UI::Animator;
… …
2841 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2896 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2842 2897
2843 ($w + 4, $h + 4) 2898 ($w + 4, $h + 4)
2844} 2899}
2845 2900
2846sub size_allocate { 2901sub invoke_size_allocate {
2847 my ($self, $w, $h) = @_; 2902 my ($self, $w, $h) = @_;
2848 2903
2849 $self->SUPER::size_allocate ($w - 4, $h - 4); 2904 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2850} 2905}
2851 2906
2852sub visibility_change { 2907sub invoke_visibility_change {
2853 my ($self, $visible) = @_; 2908 my ($self, $visible) = @_;
2854 2909
2855 return unless $visible; 2910 return unless $visible;
2856 2911
2857 $self->{root}->on_post_alloc ("move_$self" => sub { 2912 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
3024 3079
3025# popup given the event (must be a mouse button down event currently) 3080# popup given the event (must be a mouse button down event currently)
3026sub popup { 3081sub popup {
3027 my ($self, $ev) = @_; 3082 my ($self, $ev) = @_;
3028 3083
3029 $self->_emit ("popdown"); 3084 $self->emit ("popdown");
3030 3085
3031 # maybe save $GRAB? must be careful about events... 3086 # maybe save $GRAB? must be careful about events...
3032 $GRAB = $self; 3087 $GRAB = $self;
3033 $self->{button} = $ev->{button}; 3088 $self->{button} = $ev->{button};
3034 3089
3035 $self->show; 3090 $self->show;
3036 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3091 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
3037} 3092}
3038 3093
3039sub mouse_motion { 3094sub invoke_mouse_motion {
3040 my ($self, $ev, $x, $y) = @_; 3095 my ($self, $ev, $x, $y) = @_;
3041 3096
3042 # TODO: should use vbox->find_widget or so 3097 # TODO: should use vbox->find_widget or so
3043 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3098 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
3044 $self->{hover} = $self->{item}{$HOVER}; 3099 $self->{hover} = $self->{item}{$HOVER};
3045 3100
3046 0 3101 0
3047} 3102}
3048 3103
3049sub button_up { 3104sub invoke_button_up {
3050 my ($self, $ev, $x, $y) = @_; 3105 my ($self, $ev, $x, $y) = @_;
3051 3106
3052 if ($ev->{button} == $self->{button}) { 3107 if ($ev->{button} == $self->{button}) {
3053 undef $GRAB; 3108 undef $GRAB;
3054 $self->hide; 3109 $self->hide;
3055 3110
3056 $self->_emit ("popdown"); 3111 $self->emit ("popdown");
3057 $self->{hover}[1]->() if $self->{hover}; 3112 $self->{hover}[1]->() if $self->{hover};
3058 } else { 3113 } else {
3059 return 0 3114 return 0
3060 } 3115 }
3061 3116
… …
3098 : $self->{children}[$page_or_widget]; 3153 : $self->{children}[$page_or_widget];
3099 3154
3100 $self->{current} = $widget; 3155 $self->{current} = $widget;
3101 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3156 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3102 3157
3103 $self->_emit (page_changed => $self->{current}); 3158 $self->emit (page_changed => $self->{current});
3104 3159
3105 $self->realloc; 3160 $self->realloc;
3106} 3161}
3107 3162
3108sub visible_children { 3163sub visible_children {
… …
3113 my ($self) = @_; 3168 my ($self) = @_;
3114 3169
3115 $self->{current}->size_request 3170 $self->{current}->size_request
3116} 3171}
3117 3172
3118sub size_allocate { 3173sub invoke_size_allocate {
3119 my ($self, $w, $h) = @_; 3174 my ($self, $w, $h) = @_;
3120 3175
3121 $self->{current}->configure (0, 0, $w, $h); 3176 $self->{current}->configure (0, 0, $w, $h);
3177
3178 1
3122} 3179}
3123 3180
3124sub _draw { 3181sub _draw {
3125 my ($self) = @_; 3182 my ($self) = @_;
3126 3183
… …
3165 3222
3166sub set_current_page { 3223sub set_current_page {
3167 my ($self, $page) = @_; 3224 my ($self, $page) = @_;
3168 3225
3169 $self->{multiplexer}->set_current_page ($page); 3226 $self->{multiplexer}->set_current_page ($page);
3170 $self->_emit (page_changed => $self->{multiplexer}{current}); 3227 $self->emit (page_changed => $self->{multiplexer}{current});
3171} 3228}
3172 3229
3173############################################################################# 3230#############################################################################
3174 3231
3175package CFClient::UI::Combobox; 3232package CFClient::UI::Combobox;
… …
3190 $self->_set_value ($self->{value}); 3247 $self->_set_value ($self->{value});
3191 3248
3192 $self 3249 $self
3193} 3250}
3194 3251
3195sub button_down { 3252sub invoke_button_down {
3196 my ($self, $ev) = @_; 3253 my ($self, $ev) = @_;
3197 3254
3198 my @menu_items; 3255 my @menu_items;
3199 3256
3200 for (@{ $self->{options} }) { 3257 for (@{ $self->{options} }) {
… …
3221 my ($self, $value) = @_; 3278 my ($self, $value) = @_;
3222 3279
3223 return unless $self->{value} ne $value; 3280 return unless $self->{value} ne $value;
3224 3281
3225 $self->_set_value ($value); 3282 $self->_set_value ($value);
3226 $self->_emit (changed => $value); 3283 $self->emit (changed => $value);
3227} 3284}
3228 3285
3229############################################################################# 3286#############################################################################
3230 3287
3231package CFClient::UI::Statusbox; 3288package CFClient::UI::Statusbox;
… …
3475 $self->update_binding_widgets; 3532 $self->update_binding_widgets;
3476 3533
3477 $self 3534 $self
3478} 3535}
3479 3536
3537sub cfg_bind {
3538 my ($self, $mod, $sym, $cmds) = @_;
3539 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3540 ::update_bindings ();
3541}
3542
3543sub cfg_unbind {
3544 my ($self, $mod, $sym, $cmds) = @_;
3545 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3546 ::update_bindings ();
3547}
3548
3480sub commit { 3549sub commit {
3481 my ($self) = @_; 3550 my ($self) = @_;
3482 my ($mod, $sym, $cmds) = $self->get_binding; 3551 my ($mod, $sym, $cmds) = $self->get_binding;
3483 if ($sym != 0 && @$cmds > 0) { 3552 if ($sym != 0 && @$cmds > 0) {
3484 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym) 3553 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
… …
3554 3623
3555# this is a shortcut method that asks for a binding 3624# this is a shortcut method that asks for a binding
3556# and then just binds it. 3625# and then just binds it.
3557sub do_quick_binding { 3626sub do_quick_binding {
3558 my ($self, $cmds, $end_cb) = @_; 3627 my ($self, $cmds, $end_cb) = @_;
3559 $self->set_binding (undef, undef, $cmds, sub { 3628 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3560 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3561 });
3562 $self->ask_for_bind (1, $end_cb); 3629 $self->ask_for_bind (1, $end_cb);
3563} 3630}
3564 3631
3565sub update_binding_widgets { 3632sub update_binding_widgets {
3566 my ($self) = @_; 3633 my ($self) = @_;
… …
3772 $coord = $max - $size if $coord > $max - $size; 3839 $coord = $max - $size if $coord > $max - $size;
3773 3840
3774 int $coord + 0.5 3841 int $coord + 0.5
3775} 3842}
3776 3843
3777sub size_allocate { 3844sub invoke_size_allocate {
3778 my ($self, $w, $h) = @_; 3845 my ($self, $w, $h) = @_;
3779 3846
3780 for my $child ($self->children) { 3847 for my $child ($self->children) {
3781 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3848 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3782 3849
… …
3786 $X = _to_pixel $X, $W, $self->{w}; 3853 $X = _to_pixel $X, $W, $self->{w};
3787 $Y = _to_pixel $Y, $H, $self->{h}; 3854 $Y = _to_pixel $Y, $H, $self->{h};
3788 3855
3789 $child->configure ($X, $Y, $W, $H); 3856 $child->configure ($X, $Y, $W, $H);
3790 } 3857 }
3858
3859 1
3791} 3860}
3792 3861
3793sub coord2local { 3862sub coord2local {
3794 my ($self, $x, $y) = @_; 3863 my ($self, $x, $y) = @_;
3795 3864

Diff Legend

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