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.312 by root, Fri Jun 23 23:54:30 2006 UTC

… …
281 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
282 282
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
285 285
286 $self->focus_out; 286 $self->emit ("focus_out");
287
288 $self->emit (visibility_change => 0); 287 $self->emit (visibility_change => 0);
289} 288}
290 289
291sub set_visibility { 290sub set_visibility {
292 my ($self, $visible) = @_; 291 my ($self, $visible) = @_;
… …
334} 333}
335 334
336sub size_request { 335sub size_request {
337 require Carp; 336 require Carp;
338 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
338}
339
340sub baseline_shift {
341 0
339} 342}
340 343
341sub configure { 344sub configure {
342 my ($self, $x, $y, $w, $h) = @_; 345 my ($self, $x, $y, $w, $h) = @_;
343 346
… …
367 370
368 $self->{root}{size_alloc}{$self+0} = $self; 371 $self->{root}{size_alloc}{$self+0} = $self;
369 } 372 }
370} 373}
371 374
372sub size_allocate {
373 # nothing to be done
374}
375
376sub children { 375sub children {
377 # nop 376 # nop
378} 377}
379 378
380sub visible_children { 379sub visible_children {
… …
418 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
419 418
420 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
421} 420}
422 421
423sub focus_in { 422sub invoke_focus_in {
424 my ($self) = @_; 423 my ($self) = @_;
425 424
426 return if $FOCUS == $self; 425 return if $FOCUS == $self;
427 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
428 427
429 my $focus = $FOCUS; $FOCUS = $self; 428 my $focus = $FOCUS; $FOCUS = $self;
430 429
431 $self->_emit (focus_in => $focus);
432
433 $focus->update if $focus; 430 $focus->update if $focus;
434 $FOCUS->update; 431 $FOCUS->update;
435}
436 432
433 0
434}
435
437sub focus_out { 436sub invoke_focus_out {
438 my ($self) = @_; 437 my ($self) = @_;
439 438
440 return unless $FOCUS == $self; 439 return unless $FOCUS == $self;
441 440
442 my $focus = $FOCUS; undef $FOCUS; 441 my $focus = $FOCUS; undef $FOCUS;
443 442
444 $self->_emit (focus_out => $focus);
445
446 $focus->update if $focus; #? 443 $focus->update if $focus; #?
447 444
448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
449 unless $FOCUS; 446 unless $FOCUS;
450}
451 447
448 0
449}
450
451sub grab_focus {
452 my ($self) = @_;
453
454 $self->emit ("focus_in");
455}
456
452sub mouse_motion { 0 } 457sub invoke_mouse_motion { 1 }
453sub button_up { 0 } 458sub invoke_button_up { 1 }
454sub key_down { 0 } 459sub invoke_key_down { 1 }
455sub key_up { 0 } 460sub invoke_key_up { 1 }
456 461
457sub button_down { 462sub invoke_button_down {
458 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
459 464
460 $self->focus_in; 465 $self->grab_focus;
461 466
462 0 467 1
468}
469
470sub connect {
471 my ($self, $signal, $cb) = @_;
472
473 push @{ $self->{signal_cb}{$signal} }, $cb;
474}
475
476sub emit {
477 my ($self, $signal, @args) = @_;
478
479 #d##TODO# stop propagating at first true, do not use sum
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
463} 483}
464 484
465sub find_widget { 485sub find_widget {
466 my ($self, $x, $y) = @_; 486 my ($self, $x, $y) = @_;
467 487
… …
477sub set_parent { 497sub set_parent {
478 my ($self, $parent) = @_; 498 my ($self, $parent) = @_;
479 499
480 Scalar::Util::weaken ($self->{parent} = $parent); 500 Scalar::Util::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible}; 501 $self->set_visible if $parent->{visible};
482}
483
484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501}
502
503sub visibility_change {
504 #my ($self, $visible) = @_;
505} 502}
506 503
507sub realloc { 504sub realloc {
508 my ($self) = @_; 505 my ($self) = @_;
509 506
… …
542 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
543 540
544 # update screen rectangle 541 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x}; 542 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y}; 543 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549 544
550 # skip widgets that are entirely outside the drawing area 545 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 546 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 547 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
553 548
… …
789 784
790sub size_request { 785sub size_request {
791 $_[0]{children}[0]->size_request 786 $_[0]{children}[0]->size_request
792} 787}
793 788
794sub size_allocate { 789sub invoke_size_allocate {
795 my ($self, $w, $h) = @_; 790 my ($self, $w, $h) = @_;
796 791
797 $self->{children}[0]->configure (0, 0, $w, $h); 792 $self->{children}[0]->configure (0, 0, $w, $h);
793
794 1
798} 795}
799 796
800############################################################################# 797#############################################################################
801 798
802# back-buffered drawing area 799# back-buffered drawing area
… …
818 815
819 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 816 $ROOT->on_post_alloc ($self => sub { $self->render_child });
820 $self->SUPER::update; 817 $self->SUPER::update;
821} 818}
822 819
823sub size_allocate { 820sub invoke_size_allocate {
824 my ($self, $w, $h) = @_; 821 my ($self, $w, $h) = @_;
825 822
826 $self->SUPER::size_allocate ($w, $h);
827 $self->update; 823 $self->update;
824
825 $self->SUPER::invoke_size_allocate ($w, $h)
828} 826}
829 827
830sub _render { 828sub _render {
831 my ($self) = @_; 829 my ($self) = @_;
832 830
… …
893 $h = 10 if $self->{scroll_y}; 891 $h = 10 if $self->{scroll_y};
894 892
895 ($w, $h) 893 ($w, $h)
896} 894}
897 895
898sub size_allocate { 896sub invoke_size_allocate {
899 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
900 898
901 my $child = $self->child; 899 my $child = $self->child;
902 900
903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
905 903
906 $self->child->configure (0, 0, $w, $h); 904 $self->child->configure (0, 0, $w, $h);
907 $self->update; 905 $self->update;
906
907 1
908} 908}
909 909
910sub set_offset { 910sub set_offset {
911 my ($self, $x, $y) = @_; 911 my ($self, $x, $y) = @_;
912 912
… …
1002 # todo: overwrite size_allocate of child 1002 # todo: overwrite size_allocate of child
1003 my $child = $self->{vp}->child; 1003 my $child = $self->{vp}->child;
1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1005} 1005}
1006 1006
1007sub size_allocate { 1007sub invoke_size_allocate {
1008 my ($self, $w, $h) = @_; 1008 my ($self, $w, $h) = @_;
1009
1010 $self->SUPER::size_allocate ($w, $h);
1011 1009
1012 my $child = $self->{vp}->child; 1010 my $child = $self->{vp}->child;
1013 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1011 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1012
1013 $self->SUPER::invoke_size_allocate ($w, $h)
1014} 1014}
1015 1015
1016#TODO# update range on size_allocate depending on child 1016#TODO# update range on size_allocate depending on child
1017# update viewport offset on scroll 1017# update viewport offset on scroll
1018 1018
… …
1090 valign => 1, 1090 valign => 1,
1091 text => $self->{title}, 1091 text => $self->{title},
1092 fontsize => $self->{border}, 1092 fontsize => $self->{border},
1093 if exists $self->{title}; 1093 if exists $self->{title};
1094 1094
1095 unless ($self->{no_close_button}) { 1095 if ($self->{has_close_button}) {
1096 $self->{close_btn} = 1096 $self->{close_button} =
1097 new CFClient::UI::ImageButton 1097 new CFClient::UI::ImageButton
1098 image => 'x1_close.png', 1098 path => 'x1_close.png',
1099 on_activate => sub { $self->hide }; 1099 on_activate => sub { $self->hide };
1100 1100
1101 $self->CFClient::UI::Container::add ($self->{close_btn}); 1101 $self->CFClient::UI::Container::add ($self->{close_button});
1102 } 1102 }
1103 1103
1104 $self 1104 $self
1105} 1105}
1106 1106
1107sub add { 1107sub add {
1108 my ($self, @widgets) = @_; 1108 my ($self, @widgets) = @_;
1109 1109
1110 $self->SUPER::add (@widgets); 1110 $self->SUPER::add (@widgets);
1111 $self->CFClient::UI::Container::add ($self->{close_btn}) if $self->{close_btn}; 1111 $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}; 1112 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1113} 1113}
1114 1114
1115sub border { 1115sub border {
1116 int $_[0]{border} * $::FONTSIZE 1116 int $_[0]{border} * $::FONTSIZE
… …
1120 my ($self) = @_; 1120 my ($self) = @_;
1121 1121
1122 $self->{title_widget}->size_request 1122 $self->{title_widget}->size_request
1123 if $self->{title_widget}; 1123 if $self->{title_widget};
1124 1124
1125 $self->{close_btn}->size_request 1125 $self->{close_button}->size_request
1126 if $self->{close_btn}; 1126 if $self->{close_button};
1127 1127
1128 my ($w, $h) = $self->SUPER::size_request; 1128 my ($w, $h) = $self->SUPER::size_request;
1129 1129
1130 ( 1130 (
1131 $w + $self->border * 2, 1131 $w + $self->border * 2,
1132 $h + $self->border * 2, 1132 $h + $self->border * 2,
1133 ) 1133 )
1134} 1134}
1135 1135
1136sub size_allocate { 1136sub invoke_size_allocate {
1137 my ($self, $w, $h) = @_; 1137 my ($self, $w, $h) = @_;
1138 1138
1139 if ($self->{title_widget}) { 1139 if ($self->{title_widget}) {
1140 $self->{title_widget}{w} = $w; 1140 $self->{title_widget}{w} = $w;
1141 $self->{title_widget}{h} = $h; 1141 $self->{title_widget}{h} = $h;
1142 $self->{title_widget}->size_allocate ($w, $h); 1142 $self->{title_widget}->invoke_size_allocate ($w, $h);
1143 } 1143 }
1144 1144
1145 my $border = $self->border; 1145 my $border = $self->border;
1146 1146
1147 $h -= List::Util::max 0, $border * 2; 1147 $h -= List::Util::max 0, $border * 2;
1148 $w -= List::Util::max 0, $border * 2; 1148 $w -= List::Util::max 0, $border * 2;
1149 1149
1150 $self->child->configure ($border, $border, $w, $h); 1150 $self->child->configure ($border, $border, $w, $h);
1151 1151
1152 $self->{close_btn}->configure ($self->{w} - (2 * $border), 0, $border, $border) 1152 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153 if $self->{close_btn}; 1153 if $self->{close_button};
1154}
1155 1154
1155 1
1156}
1157
1156sub button_down { 1158sub invoke_button_down {
1157 my ($self, $ev, $x, $y) = @_; 1159 my ($self, $ev, $x, $y) = @_;
1158 1160
1159 my ($w, $h) = @$self{qw(w h)}; 1161 my ($w, $h) = @$self{qw(w h)};
1160 my $border = $self->border; 1162 my $border = $self->border;
1161 1163
… …
1192 1194
1193 ($x, $y) = ($ev->{x}, $ev->{y}); 1195 ($x, $y) = ($ev->{x}, $ev->{y});
1194 1196
1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1197 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1196 # HACK: the next line is required to enforce placement 1198 # HACK: the next line is required to enforce placement
1197 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1199 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1198 }; 1200 };
1199 } else { 1201 } else {
1200 return 0; 1202 return 0;
1201 } 1203 }
1202 1204
1203 1 1205 1
1204} 1206}
1205 1207
1206sub button_up { 1208sub invoke_button_up {
1207 my ($self, $ev, $x, $y) = @_; 1209 my ($self, $ev, $x, $y) = @_;
1208 1210
1209 $self->{close_btn}->button_up ($ev, $x, $y)
1210 if $self->{close_btn};
1211
1212 !!delete $self->{motion} 1211 ! ! delete $self->{motion}
1213} 1212}
1214 1213
1215sub mouse_motion { 1214sub invoke_mouse_motion {
1216 my ($self, $ev, $x, $y) = @_; 1215 my ($self, $ev, $x, $y) = @_;
1217 1216
1218 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1217 $self->{motion}->($ev, $x, $y) if $self->{motion};
1219 1218
1220 !!$self->{motion} 1219 ! ! $self->{motion}
1221} 1220}
1222 1221
1223sub _draw { 1222sub _draw {
1224 my ($self) = @_; 1223 my ($self) = @_;
1225 1224
… …
1258 $self->{title_widget}->_draw; 1257 $self->{title_widget}->_draw;
1259 1258
1260 glTranslate 0, - ($border - $self->{h}); 1259 glTranslate 0, - ($border - $self->{h});
1261 } 1260 }
1262 1261
1263 $self->{close_btn}->draw 1262 $self->{close_button}->draw
1264 if $self->{close_btn}; 1263 if $self->{close_button};
1265} 1264}
1266 1265
1267############################################################################# 1266#############################################################################
1268 1267
1269package CFClient::UI::Table; 1268package CFClient::UI::Table;
… …
1348 (sum @$ws), 1347 (sum @$ws),
1349 (sum @$hs), 1348 (sum @$hs),
1350 ) 1349 )
1351} 1350}
1352 1351
1353sub size_allocate { 1352sub invoke_size_allocate {
1354 my ($self, $w, $h) = @_; 1353 my ($self, $w, $h) = @_;
1355 1354
1356 my ($ws, $hs) = $self->get_wh; 1355 my ($ws, $hs) = $self->get_wh;
1357 1356
1358 my $req_w = (sum @$ws) || 1; 1357 my $req_w = (sum @$ws) || 1;
… …
1390 } 1389 }
1391 1390
1392 $y += $row_h; 1391 $y += $row_h;
1393 } 1392 }
1394 1393
1394 1
1395} 1395}
1396 1396
1397sub find_widget { 1397sub find_widget {
1398 my ($self, $x, $y) = @_; 1398 my ($self, $x, $y) = @_;
1399 1399
… …
1436 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1436 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1437 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1437 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1438 ) 1438 )
1439} 1439}
1440 1440
1441sub size_allocate { 1441sub invoke_size_allocate {
1442 my ($self, $w, $h) = @_; 1442 my ($self, $w, $h) = @_;
1443 1443
1444 my $space = $self->{vertical} ? $h : $w; 1444 my $space = $self->{vertical} ? $h : $w;
1445 my $children = $self->{children}; 1445 my @children = $self->visible_children;
1446 1446
1447 my @req; 1447 my @req;
1448 1448
1449 if ($self->{homogeneous}) { 1449 if ($self->{homogeneous}) {
1450 @req = ($space / (@$children || 1)) x @$children; 1450 @req = ($space / (@children || 1)) x @children;
1451 } else { 1451 } else {
1452 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1452 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1453 my $req = List::Util::sum @req; 1453 my $req = List::Util::sum @req;
1454 1454
1455 if ($req > $space) { 1455 if ($req > $space) {
1456 # ah well, not enough space 1456 # ah well, not enough space
1457 $_ *= $space / $req for @req; 1457 $_ *= $space / $req for @req;
1458 } else { 1458 } else {
1459 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1459 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1460 1460
1461 $space = ($space - $req) / $expand; # remaining space to give away 1461 $space = ($space - $req) / $expand; # remaining space to give away
1462 1462
1463 $req[$_] += $space * $children->[$_]{expand} 1463 $req[$_] += $space * $children[$_]{expand}
1464 for 0 .. $#$children; 1464 for 0 .. $#children;
1465 } 1465 }
1466 } 1466 }
1467 1467
1468 CFClient::UI::harmonize \@req; 1468 CFClient::UI::harmonize \@req;
1469 1469
1470 my $pos = 0; 1470 my $pos = 0;
1471 for (0 .. $#$children) { 1471 for (0 .. $#children) {
1472 my $alloc = $req[$_]; 1472 my $alloc = $req[$_];
1473 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1473 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1474 1474
1475 $pos += $alloc; 1475 $pos += $alloc;
1476 } 1476 }
1477 1477
1478 1 1478 1
… …
1633 }; 1633 };
1634 1634
1635 @{ $self->{size_req} } 1635 @{ $self->{size_req} }
1636} 1636}
1637 1637
1638sub baseline_shift {
1639 $_[0]{layout}->descent
1640}
1641
1638sub size_allocate { 1642sub invoke_size_allocate {
1639 my ($self, $w, $h) = @_; 1643 my ($self, $w, $h) = @_;
1640 1644
1641 delete $self->{ox}; 1645 delete $self->{ox};
1642 1646
1643 delete $self->{texture} 1647 delete $self->{texture}
1644 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1648 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1649
1650 1
1645} 1651}
1646 1652
1647sub set_fontsize { 1653sub set_fontsize {
1648 my ($self, $fontsize) = @_; 1654 my ($self, $fontsize) = @_;
1649 1655
… …
1742 1748
1743 $text =~ s/./*/g if $self->{hidden}; 1749 $text =~ s/./*/g if $self->{hidden};
1744 $self->{layout}->set_text ("$text "); 1750 $self->{layout}->set_text ("$text ");
1745 delete $self->{size_req}; 1751 delete $self->{size_req};
1746 1752
1747 $self->_emit (changed => $self->{text}); 1753 $self->emit (changed => $self->{text});
1748 1754
1749 $self->realloc; 1755 $self->realloc;
1750 $self->update; 1756 $self->update;
1751} 1757}
1752 1758
… …
1767 my ($w, $h) = $self->SUPER::size_request; 1773 my ($w, $h) = $self->SUPER::size_request;
1768 1774
1769 ($w + 1, $h) # add 1 for cursor 1775 ($w + 1, $h) # add 1 for cursor
1770} 1776}
1771 1777
1772sub key_down { 1778sub invoke_key_down {
1773 my ($self, $ev) = @_; 1779 my ($self, $ev) = @_;
1774 1780
1775 my $mod = $ev->{mod}; 1781 my $mod = $ev->{mod};
1776 my $sym = $ev->{sym}; 1782 my $sym = $ev->{sym};
1777 my $uni = $ev->{unicode}; 1783 my $uni = $ev->{unicode};
… …
1789 } elsif ($sym == CFClient::SDLK_HOME) { 1795 } elsif ($sym == CFClient::SDLK_HOME) {
1790 $self->{cursor} = 0; 1796 $self->{cursor} = 0;
1791 } elsif ($sym == CFClient::SDLK_END) { 1797 } elsif ($sym == CFClient::SDLK_END) {
1792 $self->{cursor} = length $text; 1798 $self->{cursor} = length $text;
1793 } elsif ($uni == 27) { 1799 } elsif ($uni == 27) {
1794 $self->_emit ('escape'); 1800 $self->emit ('escape');
1795 } elsif ($uni) { 1801 } elsif ($uni) {
1796 substr $text, $self->{cursor}++, 0, chr $uni; 1802 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else { 1803 } else {
1798 return 0; 1804 return 0;
1799 } 1805 }
… …
1803 $self->realloc; 1809 $self->realloc;
1804 1810
1805 1 1811 1
1806} 1812}
1807 1813
1808sub focus_in { 1814sub invoke_focus_in {
1809 my ($self) = @_; 1815 my ($self) = @_;
1810 1816
1811 $self->{last_activity} = $::NOW; 1817 $self->{last_activity} = $::NOW;
1812 1818
1813 $self->SUPER::focus_in; 1819 $self->SUPER::invoke_focus_in
1814} 1820}
1815 1821
1816sub button_down { 1822sub invoke_button_down {
1817 my ($self, $ev, $x, $y) = @_; 1823 my ($self, $ev, $x, $y) = @_;
1818 1824
1819 $self->SUPER::button_down ($ev, $x, $y); 1825 $self->SUPER::invoke_button_down ($ev, $x, $y);
1820 1826
1821 my $idx = $self->{layout}->xy_to_index ($x, $y); 1827 my $idx = $self->{layout}->xy_to_index ($x, $y);
1822 1828
1823 # byte-index to char-index 1829 # byte-index to char-index
1824 my $text = $self->{text}; 1830 my $text = $self->{text};
… …
1829 $self->update; 1835 $self->update;
1830 1836
1831 1 1837 1
1832} 1838}
1833 1839
1834sub mouse_motion { 1840sub invoke_mouse_motion {
1835 my ($self, $ev, $x, $y) = @_; 1841 my ($self, $ev, $x, $y) = @_;
1836# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1842# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1837 1843
1838 0 1844 1
1839} 1845}
1840 1846
1841sub _draw { 1847sub _draw {
1842 my ($self) = @_; 1848 my ($self) = @_;
1843 1849
… …
1884 1890
1885our @ISA = CFClient::UI::EntryBase::; 1891our @ISA = CFClient::UI::EntryBase::;
1886 1892
1887use CFClient::OpenGL; 1893use CFClient::OpenGL;
1888 1894
1889sub key_down { 1895sub invoke_key_down {
1890 my ($self, $ev) = @_; 1896 my ($self, $ev) = @_;
1891 1897
1892 my $sym = $ev->{sym}; 1898 my $sym = $ev->{sym};
1893 1899
1894 if ($sym == 13) { 1900 if ($sym == 13) {
1895 unshift @{$self->{history}}, 1901 unshift @{$self->{history}},
1896 my $txt = $self->get_text; 1902 my $txt = $self->get_text;
1903
1897 $self->{history_pointer} = -1; 1904 $self->{history_pointer} = -1;
1898 $self->{history_saveback} = ''; 1905 $self->{history_saveback} = '';
1899 $self->_emit (activate => $txt); 1906 $self->emit (activate => $txt);
1900 $self->update; 1907 $self->update;
1901 1908
1902 } elsif ($sym == CFClient::SDLK_UP) { 1909 } elsif ($sym == CFClient::SDLK_UP) {
1903 if ($self->{history_pointer} < 0) { 1910 if ($self->{history_pointer} < 0) {
1904 $self->{history_saveback} = $self->get_text; 1911 $self->{history_saveback} = $self->get_text;
… …
1920 } else { 1927 } else {
1921 $self->set_text ($self->{history_saveback}); 1928 $self->set_text ($self->{history_saveback});
1922 } 1929 }
1923 1930
1924 } else { 1931 } else {
1925 return $self->SUPER::key_down ($ev) 1932 return $self->SUPER::invoke_key_down ($ev)
1926 } 1933 }
1927 1934
1928 1 1935 1
1929} 1936}
1930 1937
… …
1954 can_events => 1, 1961 can_events => 1,
1955 @_ 1962 @_
1956 ) 1963 )
1957} 1964}
1958 1965
1959sub activate { }
1960
1961sub button_up { 1966sub invoke_button_up {
1962 my ($self, $ev, $x, $y) = @_; 1967 my ($self, $ev, $x, $y) = @_;
1963 1968
1964 $self->emit ("activate") 1969 $self->emit ("activate")
1965 if $x >= 0 && $x < $self->{w} 1970 if $x >= 0 && $x < $self->{w}
1966 && $y >= 0 && $y < $self->{h}; 1971 && $y >= 0 && $y < $self->{h};
… …
2008 can_events => 1, 2013 can_events => 1,
2009 @_ 2014 @_
2010 ); 2015 );
2011} 2016}
2012 2017
2013sub activate { }
2014
2015sub button_up { 2018sub invoke_button_up {
2016 my ($self, $ev, $x, $y) = @_; 2019 my ($self, $ev, $x, $y) = @_;
2017 2020
2018 $self->emit ("activate") 2021 $self->emit ("activate")
2019 if $x >= 0 && $x < $self->{w} 2022 if $x >= 0 && $x < $self->{w}
2020 && $y >= 0 && $y < $self->{h}; 2023 && $y >= 0 && $y < $self->{h};
… …
2054 my ($self) = @_; 2057 my ($self) = @_;
2055 2058
2056 (6) x 2 2059 (6) x 2
2057} 2060}
2058 2061
2059sub button_down { 2062sub invoke_button_down {
2060 my ($self, $ev, $x, $y) = @_; 2063 my ($self, $ev, $x, $y) = @_;
2061 2064
2062 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2065 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2063 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2066 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2064 $self->{state} = !$self->{state}; 2067 $self->{state} = !$self->{state};
2065 $self->_emit (changed => $self->{state}); 2068 $self->emit (changed => $self->{state});
2066 } else { 2069 } else {
2067 return 0 2070 return 0
2068 } 2071 }
2069 2072
2070 1 2073 1
… …
2095package CFClient::UI::Image; 2098package CFClient::UI::Image;
2096 2099
2097our @ISA = CFClient::UI::Base::; 2100our @ISA = CFClient::UI::Base::;
2098 2101
2099use CFClient::OpenGL; 2102use CFClient::OpenGL;
2100use Carp qw/confess/;
2101 2103
2102our %loaded_images; 2104our %texture_cache;
2103 2105
2104sub new { 2106sub new {
2105 my $class = shift; 2107 my $class = shift;
2106 2108
2107 my $self = $class->SUPER::new (can_events => 0, @_); 2109 my $self = $class->SUPER::new (
2110 can_events => 0,
2111 @_,
2112 );
2108 2113
2109 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2114 $self->{path}
2115 or Carp::croak "required attribute 'path' not set";
2110 2116
2111 $loaded_images{$self->{image}} ||= 2117 $self->{tex} = $texture_cache{$self->{path}} ||=
2112 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2118 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2113 2119
2114 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2120 Scalar::Util::weaken $texture_cache{$self->{path}};
2115 2121
2116 Scalar::Util::weaken $loaded_images{$self->{image}}; 2122 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2117
2118 $self->{aspect} = $tex->{w} / $tex->{h};
2119 2123
2120 $self 2124 $self
2121} 2125}
2122 2126
2123sub size_request { 2127sub size_request {
2124 my ($self) = @_; 2128 my ($self) = @_;
2125 2129
2126 ($self->{tex}->{w}, $self->{tex}->{h}) 2130 ($self->{tex}{w}, $self->{tex}{h})
2127} 2131}
2128 2132
2129sub _draw { 2133sub _draw {
2130 my ($self) = @_; 2134 my ($self) = @_;
2131 2135
… …
2367 $self->update; 2371 $self->update;
2368 2372
2369 $self 2373 $self
2370} 2374}
2371 2375
2372sub changed { }
2373
2374sub set_range { 2376sub set_range {
2375 my ($self, $range) = @_; 2377 my ($self, $range) = @_;
2376 2378
2377 ($range, $self->{range}) = ($self->{range}, $range); 2379 ($range, $self->{range}) = ($self->{range}, $range);
2378 2380
… …
2398 if $unit; 2400 if $unit;
2399 2401
2400 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2402 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2401 2403
2402 if ($value != $old_value) { 2404 if ($value != $old_value) {
2403 $self->_emit (changed => $value); 2405 $self->emit (changed => $value);
2404 $self->update; 2406 $self->update;
2405 } 2407 }
2406} 2408}
2407 2409
2408sub size_request { 2410sub size_request {
2409 my ($self) = @_; 2411 my ($self) = @_;
2410 2412
2411 ($self->{req_w}, $self->{req_h}) 2413 ($self->{req_w}, $self->{req_h})
2412} 2414}
2413 2415
2414sub button_down { 2416sub invoke_button_down {
2415 my ($self, $ev, $x, $y) = @_; 2417 my ($self, $ev, $x, $y) = @_;
2416 2418
2417 $self->SUPER::button_down ($ev, $x, $y); 2419 $self->SUPER::invoke_button_down ($ev, $x, $y);
2418 2420
2419 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2421 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2420 2422
2421 $self->mouse_motion ($ev, $x, $y) 2423 $self->invoke_mouse_motion ($ev, $x, $y)
2422} 2424}
2423 2425
2424sub mouse_motion { 2426sub invoke_mouse_motion {
2425 my ($self, $ev, $x, $y) = @_; 2427 my ($self, $ev, $x, $y) = @_;
2426 2428
2427 if ($GRAB == $self) { 2429 if ($GRAB == $self) {
2428 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2430 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2429 2431
… …
2571 2573
2572 $self->{fontsize} = $fontsize; 2574 $self->{fontsize} = $fontsize;
2573 $self->reflow; 2575 $self->reflow;
2574} 2576}
2575 2577
2578sub size_request {
2579 my ($self) = @_;
2580
2581 my ($empty, $slider) = @{ $self->{children} };
2582
2583 local $self->{children} = [$empty, $slider];
2584 $self->SUPER::size_request
2585}
2586
2576sub size_allocate { 2587sub invoke_size_allocate {
2577 my ($self, $w, $h) = @_; 2588 my ($self, $w, $h) = @_;
2578 2589
2579 $self->SUPER::size_allocate ($w, $h); 2590 my ($empty, $slider, @other) = @{ $self->{children} };
2591 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2580 2592
2581 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2593 $self->{layout}->set_font ($self->{font}) if $self->{font};
2582 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2594 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2583 $self->{layout}->set_width ($self->{children}[0]{w}); 2595 $self->{layout}->set_width ($empty->{w});
2584 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2596 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2585 2597
2586 $self->reflow; 2598 $self->reflow;
2587}
2588 2599
2589sub text_size { 2600 local $self->{children} = [$empty, $slider];
2590 my ($self, $text, $indent) = @_; 2601 $self->SUPER::invoke_size_allocate ($w, $h)
2602}
2603
2604sub get_layout {
2605 my ($self, $para) = @_;
2591 2606
2592 my $layout = $self->{layout}; 2607 my $layout = $self->{layout};
2593 2608
2609 $layout->set_font ($self->{font}) if $self->{font};
2610 $layout->set_foreground (@{$para->{fg}});
2594 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2611 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2595 $layout->set_width ($self->{children}[0]{w} - $indent); 2612 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2613 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2597 $layout->set_markup ($text); 2614 $layout->set_markup ($para->{markup});
2615
2616 $layout->set_shapes (
2617 map
2618 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2619 @{$para->{widget}}
2598 2620 );
2621
2599 $layout->size 2622 $layout
2600} 2623}
2601 2624
2602sub reflow { 2625sub reflow {
2603 my ($self) = @_; 2626 my ($self) = @_;
2604 2627
… …
2613 $self->{children}[1]->set_value ($offset); 2636 $self->{children}[1]->set_value ($offset);
2614} 2637}
2615 2638
2616sub clear { 2639sub clear {
2617 my ($self) = @_; 2640 my ($self) = @_;
2641
2642 my (undef, undef, @other) = @{ $self->{children} };
2643 $self->remove ($_) for @other;
2618 2644
2619 $self->{par} = []; 2645 $self->{par} = [];
2620 $self->{height} = 0; 2646 $self->{height} = 0;
2621 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2647 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2622} 2648}
2623 2649
2624sub add_paragraph { 2650sub add_paragraph {
2625 my ($self, $color, $text, $indent) = @_; 2651 my ($self, $color, $para, $indent) = @_;
2626 2652
2627 for my $line (split /\n/, $text) { 2653 my ($text, @w) = ref $para ? @$para : $para;
2628 my ($w, $h) = $self->text_size ($line); 2654
2629 $self->{height} += $h; 2655 $para = {
2630 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2656 w => 1e10,
2657 wrapped => 1,
2658 fg => $color,
2659 indent => $indent,
2660 markup => $text,
2661 widget => \@w,
2631 } 2662 };
2632 2663
2633 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2664 $self->add (@w) if @w;
2665 push @{$self->{par}}, $para;
2666
2667 $self->{need_reflow}++;
2668 $self->update;
2669}
2670
2671sub scroll_to_bottom {
2672 my ($self) = @_;
2673
2674 $self->{scroll_to_bottom} = 1;
2675 $self->update;
2634} 2676}
2635 2677
2636sub update { 2678sub update {
2637 my ($self) = @_; 2679 my ($self) = @_;
2638 2680
… …
2646 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2688 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2647 2689
2648 if (delete $self->{need_reflow}) { 2690 if (delete $self->{need_reflow}) {
2649 my $height = 0; 2691 my $height = 0;
2650 2692
2651 my $layout = $self->{layout};
2652
2653 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2654
2655 for (@{$self->{par}}) { 2693 for my $para (@{$self->{par}}) {
2656 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2694 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2657 $layout->set_width ($W - $_->[3]); 2695 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; 2696 my ($w, $h) = $layout->size;
2661 $_->[0] = $w + $_->[3]; 2697
2662 $_->[1] = $h; 2698 $para->{w} = $w + $para->{indent};
2699 $para->{h} = $h;
2700 $para->{wrapped} = $layout->has_wrapped;
2663 } 2701 }
2664 2702
2665 $height += $_->[1]; 2703 $height += $para->{h};
2666 } 2704 }
2667 2705
2668 $self->{height} = $height; 2706 $self->{height} = $height;
2669 2707
2670 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2708 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2671 2709
2672 delete $self->{texture}; 2710 delete $self->{texture};
2711 }
2712
2713 if (delete $self->{scroll_to_bottom}) {
2714 $self->{children}[1]->set_value (1e10);
2673 } 2715 }
2674 2716
2675 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2717 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2676 glClearColor 0, 0, 0, 0; 2718 glClearColor 0, 0, 0, 0;
2677 glClear GL_COLOR_BUFFER_BIT; 2719 glClear GL_COLOR_BUFFER_BIT;
… …
2681 my $y0 = $top; 2723 my $y0 = $top;
2682 my $y1 = $top + $H; 2724 my $y1 = $top + $H;
2683 2725
2684 my $y = 0; 2726 my $y = 0;
2685 2727
2686 my $layout = $self->{layout};
2687
2688 $layout->set_font ($self->{font}) if $self->{font};
2689
2690 glEnable GL_BLEND; 2728 glEnable GL_BLEND;
2691 #TODO# not correct in windows where rgba is forced off 2729 #TODO# not correct in windows where rgba is forced off
2692 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2730 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2693 2731
2694 for my $par (@{$self->{par}}) { 2732 for my $para (@{$self->{par}}) {
2695 my $h = $par->[1]; 2733 my $h = $para->{h};
2696 2734
2697 if ($y0 < $y + $h && $y < $y1) { 2735 if ($y0 < $y + $h && $y < $y1) {
2698 $layout->set_foreground (@{ $par->[2] }); 2736
2699 $layout->set_width ($W - $par->[3]); 2737 my $layout = $self->get_layout ($para);
2700 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2701 $layout->set_markup ($par->[4]);
2702 2738
2703 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2739 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2704 2740
2705 glRasterPos $par->[3], $y - $y0; 2741 glRasterPos $para->{indent}, $y - $y0;
2706 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2742 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2743
2744 if (my @w = @{ $para->{widget} }) {
2745 my @s = $layout->get_shapes;
2746
2747 for (@w) {
2748 my ($dx, $dy) = splice @s, 0, 2, ();
2749
2750 $_->{x} = $dx + $para->{indent};
2751 $_->{y} = $dy + $y - $y0;
2752
2753 $_->draw;
2754 }
2755 }
2707 } 2756 }
2708 2757
2709 $y += $h; 2758 $y += $h;
2710 } 2759 }
2711 2760
2712 glDisable GL_BLEND; 2761 glDisable GL_BLEND;
2713 }; 2762 };
2714 }); 2763 });
2764}
2765
2766sub reconfigure {
2767 my ($self) = @_;
2768
2769 $self->SUPER::reconfigure;
2770
2771 $_->{w} = 1e10 for @{ $self->{par} };
2772 $self->reflow;
2715} 2773}
2716 2774
2717sub _draw { 2775sub _draw {
2718 my ($self) = @_; 2776 my ($self) = @_;
2719 2777
… …
2722 glColor 0, 0, 0, 1; 2780 glColor 0, 0, 0, 1;
2723 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2781 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2724 glDisable GL_TEXTURE_2D; 2782 glDisable GL_TEXTURE_2D;
2725 2783
2726 $self->{children}[1]->draw; 2784 $self->{children}[1]->draw;
2727
2728} 2785}
2729 2786
2730############################################################################# 2787#############################################################################
2731 2788
2732package CFClient::UI::Animator; 2789package CFClient::UI::Animator;
… …
2841 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2898 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2842 2899
2843 ($w + 4, $h + 4) 2900 ($w + 4, $h + 4)
2844} 2901}
2845 2902
2846sub size_allocate { 2903sub invoke_size_allocate {
2847 my ($self, $w, $h) = @_; 2904 my ($self, $w, $h) = @_;
2848 2905
2849 $self->SUPER::size_allocate ($w - 4, $h - 4); 2906 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2850} 2907}
2851 2908
2852sub visibility_change { 2909sub invoke_visibility_change {
2853 my ($self, $visible) = @_; 2910 my ($self, $visible) = @_;
2854 2911
2855 return unless $visible; 2912 return unless $visible;
2856 2913
2857 $self->{root}->on_post_alloc ("move_$self" => sub { 2914 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
3024 3081
3025# popup given the event (must be a mouse button down event currently) 3082# popup given the event (must be a mouse button down event currently)
3026sub popup { 3083sub popup {
3027 my ($self, $ev) = @_; 3084 my ($self, $ev) = @_;
3028 3085
3029 $self->_emit ("popdown"); 3086 $self->emit ("popdown");
3030 3087
3031 # maybe save $GRAB? must be careful about events... 3088 # maybe save $GRAB? must be careful about events...
3032 $GRAB = $self; 3089 $GRAB = $self;
3033 $self->{button} = $ev->{button}; 3090 $self->{button} = $ev->{button};
3034 3091
3035 $self->show; 3092 $self->show;
3036 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3093 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
3037} 3094}
3038 3095
3039sub mouse_motion { 3096sub invoke_mouse_motion {
3040 my ($self, $ev, $x, $y) = @_; 3097 my ($self, $ev, $x, $y) = @_;
3041 3098
3042 # TODO: should use vbox->find_widget or so 3099 # TODO: should use vbox->find_widget or so
3043 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3100 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
3044 $self->{hover} = $self->{item}{$HOVER}; 3101 $self->{hover} = $self->{item}{$HOVER};
3045 3102
3046 0 3103 0
3047} 3104}
3048 3105
3049sub button_up { 3106sub invoke_button_up {
3050 my ($self, $ev, $x, $y) = @_; 3107 my ($self, $ev, $x, $y) = @_;
3051 3108
3052 if ($ev->{button} == $self->{button}) { 3109 if ($ev->{button} == $self->{button}) {
3053 undef $GRAB; 3110 undef $GRAB;
3054 $self->hide; 3111 $self->hide;
3055 3112
3056 $self->_emit ("popdown"); 3113 $self->emit ("popdown");
3057 $self->{hover}[1]->() if $self->{hover}; 3114 $self->{hover}[1]->() if $self->{hover};
3058 } else { 3115 } else {
3059 return 0 3116 return 0
3060 } 3117 }
3061 3118
… …
3098 : $self->{children}[$page_or_widget]; 3155 : $self->{children}[$page_or_widget];
3099 3156
3100 $self->{current} = $widget; 3157 $self->{current} = $widget;
3101 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3158 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3102 3159
3103 $self->_emit (page_changed => $self->{current}); 3160 $self->emit (page_changed => $self->{current});
3104 3161
3105 $self->realloc; 3162 $self->realloc;
3106} 3163}
3107 3164
3108sub visible_children { 3165sub visible_children {
… …
3113 my ($self) = @_; 3170 my ($self) = @_;
3114 3171
3115 $self->{current}->size_request 3172 $self->{current}->size_request
3116} 3173}
3117 3174
3118sub size_allocate { 3175sub invoke_size_allocate {
3119 my ($self, $w, $h) = @_; 3176 my ($self, $w, $h) = @_;
3120 3177
3121 $self->{current}->configure (0, 0, $w, $h); 3178 $self->{current}->configure (0, 0, $w, $h);
3179
3180 1
3122} 3181}
3123 3182
3124sub _draw { 3183sub _draw {
3125 my ($self) = @_; 3184 my ($self) = @_;
3126 3185
… …
3165 3224
3166sub set_current_page { 3225sub set_current_page {
3167 my ($self, $page) = @_; 3226 my ($self, $page) = @_;
3168 3227
3169 $self->{multiplexer}->set_current_page ($page); 3228 $self->{multiplexer}->set_current_page ($page);
3170 $self->_emit (page_changed => $self->{multiplexer}{current}); 3229 $self->emit (page_changed => $self->{multiplexer}{current});
3171} 3230}
3172 3231
3173############################################################################# 3232#############################################################################
3174 3233
3175package CFClient::UI::Combobox; 3234package CFClient::UI::Combobox;
… …
3190 $self->_set_value ($self->{value}); 3249 $self->_set_value ($self->{value});
3191 3250
3192 $self 3251 $self
3193} 3252}
3194 3253
3195sub button_down { 3254sub invoke_button_down {
3196 my ($self, $ev) = @_; 3255 my ($self, $ev) = @_;
3197 3256
3198 my @menu_items; 3257 my @menu_items;
3199 3258
3200 for (@{ $self->{options} }) { 3259 for (@{ $self->{options} }) {
… …
3221 my ($self, $value) = @_; 3280 my ($self, $value) = @_;
3222 3281
3223 return unless $self->{value} ne $value; 3282 return unless $self->{value} ne $value;
3224 3283
3225 $self->_set_value ($value); 3284 $self->_set_value ($value);
3226 $self->_emit (changed => $value); 3285 $self->emit (changed => $value);
3227} 3286}
3228 3287
3229############################################################################# 3288#############################################################################
3230 3289
3231package CFClient::UI::Statusbox; 3290package CFClient::UI::Statusbox;
… …
3475 $self->update_binding_widgets; 3534 $self->update_binding_widgets;
3476 3535
3477 $self 3536 $self
3478} 3537}
3479 3538
3539sub cfg_bind {
3540 my ($self, $mod, $sym, $cmds) = @_;
3541 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3542 ::update_bindings ();
3543}
3544
3545sub cfg_unbind {
3546 my ($self, $mod, $sym, $cmds) = @_;
3547 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3548 ::update_bindings ();
3549}
3550
3480sub commit { 3551sub commit {
3481 my ($self) = @_; 3552 my ($self) = @_;
3482 my ($mod, $sym, $cmds) = $self->get_binding; 3553 my ($mod, $sym, $cmds) = $self->get_binding;
3483 if ($sym != 0 && @$cmds > 0) { 3554 if ($sym != 0 && @$cmds > 0) {
3484 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym) 3555 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
… …
3518 my ($self) = @_; 3589 my ($self) = @_;
3519 $self->ask_for_bind (1); 3590 $self->ask_for_bind (1);
3520} 3591}
3521 3592
3522sub ask_for_bind { 3593sub ask_for_bind {
3523 my ($self, $commit) = @_; 3594 my ($self, $commit, $end_cb) = @_;
3524 3595
3525 CFClient::Binder::open_binding_dialog (sub { 3596 CFClient::Binder::open_binding_dialog (sub {
3526 my ($mod, $sym) = @_; 3597 my ($mod, $sym) = @_;
3527 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak? 3598 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3528 $self->update_binding_widgets; 3599 $self->update_binding_widgets;
3529 $self->commit if $commit; 3600 $self->commit if $commit;
3601 $end_cb->() if $end_cb;
3530 }); 3602 });
3531} 3603}
3532 3604
3533# $mod and $sym are the modifiers and key symbol 3605# $mod and $sym are the modifiers and key symbol
3534# $cmds is a array ref of strings (the commands) 3606# $cmds is a array ref of strings (the commands)
… …
3552} 3624}
3553 3625
3554# this is a shortcut method that asks for a binding 3626# this is a shortcut method that asks for a binding
3555# and then just binds it. 3627# and then just binds it.
3556sub do_quick_binding { 3628sub do_quick_binding {
3557 my ($self, $cmds) = @_; 3629 my ($self, $cmds, $end_cb) = @_;
3558 $self->set_binding (undef, undef, $cmds, sub { 3630 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3559 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3560 });
3561 $self->ask_for_bind (1); 3631 $self->ask_for_bind (1, $end_cb);
3562} 3632}
3563 3633
3564sub update_binding_widgets { 3634sub update_binding_widgets {
3565 my ($self) = @_; 3635 my ($self) = @_;
3566 my ($mod, $sym, $cmds) = $self->get_binding; 3636 my ($mod, $sym, $cmds) = $self->get_binding;
… …
3771 $coord = $max - $size if $coord > $max - $size; 3841 $coord = $max - $size if $coord > $max - $size;
3772 3842
3773 int $coord + 0.5 3843 int $coord + 0.5
3774} 3844}
3775 3845
3776sub size_allocate { 3846sub invoke_size_allocate {
3777 my ($self, $w, $h) = @_; 3847 my ($self, $w, $h) = @_;
3778 3848
3779 for my $child ($self->children) { 3849 for my $child ($self->children) {
3780 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3850 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3781 3851
… …
3785 $X = _to_pixel $X, $W, $self->{w}; 3855 $X = _to_pixel $X, $W, $self->{w};
3786 $Y = _to_pixel $Y, $H, $self->{h}; 3856 $Y = _to_pixel $Y, $H, $self->{h};
3787 3857
3788 $child->configure ($X, $Y, $W, $H); 3858 $child->configure ($X, $Y, $W, $H);
3789 } 3859 }
3860
3861 1
3790} 3862}
3791 3863
3792sub coord2local { 3864sub coord2local {
3793 my ($self, $x, $y) = @_; 3865 my ($self, $x, $y) = @_;
3794 3866

Diff Legend

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