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.313 by root, Sat Jun 24 00:24:09 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 if ($self->{has_close_button}) {
1096 $self->{close_button} =
1097 new CFClient::UI::ImageButton
1098 path => 'x1_close.png',
1099 on_activate => sub { $self->hide };
1100
1101 $self->CFClient::UI::Container::add ($self->{close_button});
1102 }
1103
1095 $self 1104 $self
1096} 1105}
1097 1106
1098sub add { 1107sub add {
1099 my ($self, @widgets) = @_; 1108 my ($self, @widgets) = @_;
1100 1109
1101 $self->SUPER::add (@widgets); 1110 $self->SUPER::add (@widgets);
1111 $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}; 1112 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1103} 1113}
1104 1114
1105sub border { 1115sub border {
1106 int $_[0]{border} * $::FONTSIZE 1116 int $_[0]{border} * $::FONTSIZE
… …
1109sub size_request { 1119sub size_request {
1110 my ($self) = @_; 1120 my ($self) = @_;
1111 1121
1112 $self->{title_widget}->size_request 1122 $self->{title_widget}->size_request
1113 if $self->{title_widget}; 1123 if $self->{title_widget};
1124
1125 $self->{close_button}->size_request
1126 if $self->{close_button};
1114 1127
1115 my ($w, $h) = $self->SUPER::size_request; 1128 my ($w, $h) = $self->SUPER::size_request;
1116 1129
1117 ( 1130 (
1118 $w + $self->border * 2, 1131 $w + $self->border * 2,
1119 $h + $self->border * 2, 1132 $h + $self->border * 2,
1120 ) 1133 )
1121} 1134}
1122 1135
1123sub size_allocate { 1136sub invoke_size_allocate {
1124 my ($self, $w, $h) = @_; 1137 my ($self, $w, $h) = @_;
1125 1138
1126 if ($self->{title_widget}) { 1139 if ($self->{title_widget}) {
1127 $self->{title_widget}{w} = $w; 1140 $self->{title_widget}{w} = $w;
1128 $self->{title_widget}{h} = $h; 1141 $self->{title_widget}{h} = $h;
1129 $self->{title_widget}->size_allocate ($w, $h); 1142 $self->{title_widget}->invoke_size_allocate ($w, $h);
1130 } 1143 }
1131 1144
1132 my $border = $self->border; 1145 my $border = $self->border;
1133 1146
1134 $h -= List::Util::max 0, $border * 2; 1147 $h -= List::Util::max 0, $border * 2;
1135 $w -= List::Util::max 0, $border * 2; 1148 $w -= List::Util::max 0, $border * 2;
1136 1149
1137 $self->child->configure ($border, $border, $w, $h); 1150 $self->child->configure ($border, $border, $w, $h);
1138}
1139 1151
1152 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153 if $self->{close_button};
1154
1155 1
1156}
1157
1140sub button_down { 1158sub invoke_button_down {
1141 my ($self, $ev, $x, $y) = @_; 1159 my ($self, $ev, $x, $y) = @_;
1142 1160
1143 my ($w, $h) = @$self{qw(w h)}; 1161 my ($w, $h) = @$self{qw(w h)};
1144 my $border = $self->border; 1162 my $border = $self->border;
1145 1163
… …
1176 1194
1177 ($x, $y) = ($ev->{x}, $ev->{y}); 1195 ($x, $y) = ($ev->{x}, $ev->{y});
1178 1196
1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1197 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180 # HACK: the next line is required to enforce placement 1198 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1199 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1182 }; 1200 };
1183 } else { 1201 } else {
1184 return 0; 1202 return 0;
1185 } 1203 }
1186 1204
1187 1 1205 1
1188} 1206}
1189 1207
1190sub button_up { 1208sub invoke_button_up {
1191 my ($self, $ev, $x, $y) = @_; 1209 my ($self, $ev, $x, $y) = @_;
1192 1210
1193 !!delete $self->{motion} 1211 ! ! delete $self->{motion}
1194} 1212}
1195 1213
1196sub mouse_motion { 1214sub invoke_mouse_motion {
1197 my ($self, $ev, $x, $y) = @_; 1215 my ($self, $ev, $x, $y) = @_;
1198 1216
1199 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1217 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200 1218
1201 !!$self->{motion} 1219 ! ! $self->{motion}
1202} 1220}
1203 1221
1204sub _draw { 1222sub _draw {
1205 my ($self) = @_; 1223 my ($self) = @_;
1206 1224
… …
1235 $child->draw; 1253 $child->draw;
1236 1254
1237 if ($self->{title_widget}) { 1255 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h}; 1256 glTranslate 0, $border - $self->{h};
1239 $self->{title_widget}->_draw; 1257 $self->{title_widget}->_draw;
1258
1259 glTranslate 0, - ($border - $self->{h});
1240 } 1260 }
1261
1262 $self->{close_button}->draw
1263 if $self->{close_button};
1241} 1264}
1242 1265
1243############################################################################# 1266#############################################################################
1244 1267
1245package CFClient::UI::Table; 1268package CFClient::UI::Table;
… …
1324 (sum @$ws), 1347 (sum @$ws),
1325 (sum @$hs), 1348 (sum @$hs),
1326 ) 1349 )
1327} 1350}
1328 1351
1329sub size_allocate { 1352sub invoke_size_allocate {
1330 my ($self, $w, $h) = @_; 1353 my ($self, $w, $h) = @_;
1331 1354
1332 my ($ws, $hs) = $self->get_wh; 1355 my ($ws, $hs) = $self->get_wh;
1333 1356
1334 my $req_w = (sum @$ws) || 1; 1357 my $req_w = (sum @$ws) || 1;
… …
1366 } 1389 }
1367 1390
1368 $y += $row_h; 1391 $y += $row_h;
1369 } 1392 }
1370 1393
1394 1
1371} 1395}
1372 1396
1373sub find_widget { 1397sub find_widget {
1374 my ($self, $x, $y) = @_; 1398 my ($self, $x, $y) = @_;
1375 1399
… …
1412 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1436 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1413 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1437 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1414 ) 1438 )
1415} 1439}
1416 1440
1417sub size_allocate { 1441sub invoke_size_allocate {
1418 my ($self, $w, $h) = @_; 1442 my ($self, $w, $h) = @_;
1419 1443
1420 my $space = $self->{vertical} ? $h : $w; 1444 my $space = $self->{vertical} ? $h : $w;
1421 my $children = $self->{children}; 1445 my @children = $self->visible_children;
1422 1446
1423 my @req; 1447 my @req;
1424 1448
1425 if ($self->{homogeneous}) { 1449 if ($self->{homogeneous}) {
1426 @req = ($space / (@$children || 1)) x @$children; 1450 @req = ($space / (@children || 1)) x @children;
1427 } else { 1451 } else {
1428 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1452 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1429 my $req = List::Util::sum @req; 1453 my $req = List::Util::sum @req;
1430 1454
1431 if ($req > $space) { 1455 if ($req > $space) {
1432 # ah well, not enough space 1456 # ah well, not enough space
1433 $_ *= $space / $req for @req; 1457 $_ *= $space / $req for @req;
1434 } else { 1458 } else {
1435 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1459 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1436 1460
1437 $space = ($space - $req) / $expand; # remaining space to give away 1461 $space = ($space - $req) / $expand; # remaining space to give away
1438 1462
1439 $req[$_] += $space * $children->[$_]{expand} 1463 $req[$_] += $space * $children[$_]{expand}
1440 for 0 .. $#$children; 1464 for 0 .. $#children;
1441 } 1465 }
1442 } 1466 }
1443 1467
1444 CFClient::UI::harmonize \@req; 1468 CFClient::UI::harmonize \@req;
1445 1469
1446 my $pos = 0; 1470 my $pos = 0;
1447 for (0 .. $#$children) { 1471 for (0 .. $#children) {
1448 my $alloc = $req[$_]; 1472 my $alloc = $req[$_];
1449 $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));
1450 1474
1451 $pos += $alloc; 1475 $pos += $alloc;
1452 } 1476 }
1453 1477
1454 1 1478 1
… …
1609 }; 1633 };
1610 1634
1611 @{ $self->{size_req} } 1635 @{ $self->{size_req} }
1612} 1636}
1613 1637
1638sub baseline_shift {
1639 $_[0]{layout}->descent
1640}
1641
1614sub size_allocate { 1642sub invoke_size_allocate {
1615 my ($self, $w, $h) = @_; 1643 my ($self, $w, $h) = @_;
1616 1644
1617 delete $self->{ox}; 1645 delete $self->{ox};
1618 1646
1619 delete $self->{texture} 1647 delete $self->{texture}
1620 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
1621} 1651}
1622 1652
1623sub set_fontsize { 1653sub set_fontsize {
1624 my ($self, $fontsize) = @_; 1654 my ($self, $fontsize) = @_;
1625 1655
… …
1718 1748
1719 $text =~ s/./*/g if $self->{hidden}; 1749 $text =~ s/./*/g if $self->{hidden};
1720 $self->{layout}->set_text ("$text "); 1750 $self->{layout}->set_text ("$text ");
1721 delete $self->{size_req}; 1751 delete $self->{size_req};
1722 1752
1723 $self->_emit (changed => $self->{text}); 1753 $self->emit (changed => $self->{text});
1724 1754
1725 $self->realloc; 1755 $self->realloc;
1726 $self->update; 1756 $self->update;
1727} 1757}
1728 1758
… …
1743 my ($w, $h) = $self->SUPER::size_request; 1773 my ($w, $h) = $self->SUPER::size_request;
1744 1774
1745 ($w + 1, $h) # add 1 for cursor 1775 ($w + 1, $h) # add 1 for cursor
1746} 1776}
1747 1777
1748sub key_down { 1778sub invoke_key_down {
1749 my ($self, $ev) = @_; 1779 my ($self, $ev) = @_;
1750 1780
1751 my $mod = $ev->{mod}; 1781 my $mod = $ev->{mod};
1752 my $sym = $ev->{sym}; 1782 my $sym = $ev->{sym};
1753 my $uni = $ev->{unicode}; 1783 my $uni = $ev->{unicode};
… …
1765 } elsif ($sym == CFClient::SDLK_HOME) { 1795 } elsif ($sym == CFClient::SDLK_HOME) {
1766 $self->{cursor} = 0; 1796 $self->{cursor} = 0;
1767 } elsif ($sym == CFClient::SDLK_END) { 1797 } elsif ($sym == CFClient::SDLK_END) {
1768 $self->{cursor} = length $text; 1798 $self->{cursor} = length $text;
1769 } elsif ($uni == 27) { 1799 } elsif ($uni == 27) {
1770 $self->_emit ('escape'); 1800 $self->emit ('escape');
1771 } elsif ($uni) { 1801 } elsif ($uni) {
1772 substr $text, $self->{cursor}++, 0, chr $uni; 1802 substr $text, $self->{cursor}++, 0, chr $uni;
1773 } else { 1803 } else {
1774 return 0; 1804 return 0;
1775 } 1805 }
… …
1779 $self->realloc; 1809 $self->realloc;
1780 1810
1781 1 1811 1
1782} 1812}
1783 1813
1784sub focus_in { 1814sub invoke_focus_in {
1785 my ($self) = @_; 1815 my ($self) = @_;
1786 1816
1787 $self->{last_activity} = $::NOW; 1817 $self->{last_activity} = $::NOW;
1788 1818
1789 $self->SUPER::focus_in; 1819 $self->SUPER::invoke_focus_in
1790} 1820}
1791 1821
1792sub button_down { 1822sub invoke_button_down {
1793 my ($self, $ev, $x, $y) = @_; 1823 my ($self, $ev, $x, $y) = @_;
1794 1824
1795 $self->SUPER::button_down ($ev, $x, $y); 1825 $self->SUPER::invoke_button_down ($ev, $x, $y);
1796 1826
1797 my $idx = $self->{layout}->xy_to_index ($x, $y); 1827 my $idx = $self->{layout}->xy_to_index ($x, $y);
1798 1828
1799 # byte-index to char-index 1829 # byte-index to char-index
1800 my $text = $self->{text}; 1830 my $text = $self->{text};
… …
1805 $self->update; 1835 $self->update;
1806 1836
1807 1 1837 1
1808} 1838}
1809 1839
1810sub mouse_motion { 1840sub invoke_mouse_motion {
1811 my ($self, $ev, $x, $y) = @_; 1841 my ($self, $ev, $x, $y) = @_;
1812# 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#
1813 1843
1814 0 1844 1
1815} 1845}
1816 1846
1817sub _draw { 1847sub _draw {
1818 my ($self) = @_; 1848 my ($self) = @_;
1819 1849
… …
1860 1890
1861our @ISA = CFClient::UI::EntryBase::; 1891our @ISA = CFClient::UI::EntryBase::;
1862 1892
1863use CFClient::OpenGL; 1893use CFClient::OpenGL;
1864 1894
1865sub key_down { 1895sub invoke_key_down {
1866 my ($self, $ev) = @_; 1896 my ($self, $ev) = @_;
1867 1897
1868 my $sym = $ev->{sym}; 1898 my $sym = $ev->{sym};
1869 1899
1870 if ($sym == 13) { 1900 if ($sym == 13) {
1871 unshift @{$self->{history}}, 1901 unshift @{$self->{history}},
1872 my $txt = $self->get_text; 1902 my $txt = $self->get_text;
1903
1873 $self->{history_pointer} = -1; 1904 $self->{history_pointer} = -1;
1874 $self->{history_saveback} = ''; 1905 $self->{history_saveback} = '';
1875 $self->_emit (activate => $txt); 1906 $self->emit (activate => $txt);
1876 $self->update; 1907 $self->update;
1877 1908
1878 } elsif ($sym == CFClient::SDLK_UP) { 1909 } elsif ($sym == CFClient::SDLK_UP) {
1879 if ($self->{history_pointer} < 0) { 1910 if ($self->{history_pointer} < 0) {
1880 $self->{history_saveback} = $self->get_text; 1911 $self->{history_saveback} = $self->get_text;
… …
1896 } else { 1927 } else {
1897 $self->set_text ($self->{history_saveback}); 1928 $self->set_text ($self->{history_saveback});
1898 } 1929 }
1899 1930
1900 } else { 1931 } else {
1901 return $self->SUPER::key_down ($ev) 1932 return $self->SUPER::invoke_key_down ($ev)
1902 } 1933 }
1903 1934
1904 1 1935 1
1905} 1936}
1906 1937
… …
1930 can_events => 1, 1961 can_events => 1,
1931 @_ 1962 @_
1932 ) 1963 )
1933} 1964}
1934 1965
1935sub activate { }
1936
1937sub button_up { 1966sub invoke_button_up {
1938 my ($self, $ev, $x, $y) = @_; 1967 my ($self, $ev, $x, $y) = @_;
1939 1968
1940 $self->emit ("activate") 1969 $self->emit ("activate")
1941 if $x >= 0 && $x < $self->{w} 1970 if $x >= 0 && $x < $self->{w}
1942 && $y >= 0 && $y < $self->{h}; 1971 && $y >= 0 && $y < $self->{h};
… …
1956 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1985 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1957 1986
1958 glDisable GL_TEXTURE_2D; 1987 glDisable GL_TEXTURE_2D;
1959 1988
1960 $self->SUPER::_draw; 1989 $self->SUPER::_draw;
1990}
1991
1992#############################################################################
1993
1994package CFClient::UI::ImageButton;
1995
1996our @ISA = CFClient::UI::Image::;
1997
1998use CFClient::OpenGL;
1999
2000my %textures;
2001
2002sub new {
2003 my $class = shift;
2004
2005 my $self = $class->SUPER::new (
2006 padding_x => 4,
2007 padding_y => 4,
2008 fg => [1, 1, 1],
2009 active_fg => [0, 0, 1],
2010 can_hover => 1,
2011 align => 0,
2012 valign => 0,
2013 can_events => 1,
2014 @_
2015 );
2016}
2017
2018sub invoke_button_up {
2019 my ($self, $ev, $x, $y) = @_;
2020
2021 $self->emit ("activate")
2022 if $x >= 0 && $x < $self->{w}
2023 && $y >= 0 && $y < $self->{h};
2024
2025 1
1961} 2026}
1962 2027
1963############################################################################# 2028#############################################################################
1964 2029
1965package CFClient::UI::CheckBox; 2030package CFClient::UI::CheckBox;
… …
1992 my ($self) = @_; 2057 my ($self) = @_;
1993 2058
1994 (6) x 2 2059 (6) x 2
1995} 2060}
1996 2061
1997sub button_down { 2062sub invoke_button_down {
1998 my ($self, $ev, $x, $y) = @_; 2063 my ($self, $ev, $x, $y) = @_;
1999 2064
2000 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2065 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2001 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2066 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2002 $self->{state} = !$self->{state}; 2067 $self->{state} = !$self->{state};
2003 $self->_emit (changed => $self->{state}); 2068 $self->emit (changed => $self->{state});
2004 } else { 2069 } else {
2005 return 0 2070 return 0
2006 } 2071 }
2007 2072
2008 1 2073 1
… …
2033package CFClient::UI::Image; 2098package CFClient::UI::Image;
2034 2099
2035our @ISA = CFClient::UI::Base::; 2100our @ISA = CFClient::UI::Base::;
2036 2101
2037use CFClient::OpenGL; 2102use CFClient::OpenGL;
2038use Carp qw/confess/;
2039 2103
2040our %loaded_images; 2104our %texture_cache;
2041 2105
2042sub new { 2106sub new {
2043 my $class = shift; 2107 my $class = shift;
2044 2108
2045 my $self = $class->SUPER::new (can_events => 0, @_); 2109 my $self = $class->SUPER::new (
2110 can_events => 0,
2111 @_,
2112 );
2046 2113
2047 $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";
2048 2116
2049 $loaded_images{$self->{image}} ||= 2117 $self->{tex} = $texture_cache{$self->{path}} ||=
2050 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;
2051 2119
2052 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2120 Scalar::Util::weaken $texture_cache{$self->{path}};
2053 2121
2054 Scalar::Util::weaken $loaded_images{$self->{image}}; 2122 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2055
2056 $self->{aspect} = $tex->{w} / $tex->{h};
2057 2123
2058 $self 2124 $self
2059} 2125}
2060 2126
2061sub size_request { 2127sub size_request {
2062 my ($self) = @_; 2128 my ($self) = @_;
2063 2129
2064 ($self->{tex}->{w}, $self->{tex}->{h}) 2130 ($self->{tex}{w}, $self->{tex}{h})
2065} 2131}
2066 2132
2067sub _draw { 2133sub _draw {
2068 my ($self) = @_; 2134 my ($self) = @_;
2069 2135
… …
2305 $self->update; 2371 $self->update;
2306 2372
2307 $self 2373 $self
2308} 2374}
2309 2375
2310sub changed { }
2311
2312sub set_range { 2376sub set_range {
2313 my ($self, $range) = @_; 2377 my ($self, $range) = @_;
2314 2378
2315 ($range, $self->{range}) = ($self->{range}, $range); 2379 ($range, $self->{range}) = ($self->{range}, $range);
2316 2380
… …
2336 if $unit; 2400 if $unit;
2337 2401
2338 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2402 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2339 2403
2340 if ($value != $old_value) { 2404 if ($value != $old_value) {
2341 $self->_emit (changed => $value); 2405 $self->emit (changed => $value);
2342 $self->update; 2406 $self->update;
2343 } 2407 }
2344} 2408}
2345 2409
2346sub size_request { 2410sub size_request {
2347 my ($self) = @_; 2411 my ($self) = @_;
2348 2412
2349 ($self->{req_w}, $self->{req_h}) 2413 ($self->{req_w}, $self->{req_h})
2350} 2414}
2351 2415
2352sub button_down { 2416sub invoke_button_down {
2353 my ($self, $ev, $x, $y) = @_; 2417 my ($self, $ev, $x, $y) = @_;
2354 2418
2355 $self->SUPER::button_down ($ev, $x, $y); 2419 $self->SUPER::invoke_button_down ($ev, $x, $y);
2356 2420
2357 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2421 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2358 2422
2359 $self->mouse_motion ($ev, $x, $y) 2423 $self->invoke_mouse_motion ($ev, $x, $y)
2360} 2424}
2361 2425
2362sub mouse_motion { 2426sub invoke_mouse_motion {
2363 my ($self, $ev, $x, $y) = @_; 2427 my ($self, $ev, $x, $y) = @_;
2364 2428
2365 if ($GRAB == $self) { 2429 if ($GRAB == $self) {
2366 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2430 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2367 2431
… …
2509 2573
2510 $self->{fontsize} = $fontsize; 2574 $self->{fontsize} = $fontsize;
2511 $self->reflow; 2575 $self->reflow;
2512} 2576}
2513 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
2514sub size_allocate { 2587sub invoke_size_allocate {
2515 my ($self, $w, $h) = @_; 2588 my ($self, $w, $h) = @_;
2516 2589
2517 $self->SUPER::size_allocate ($w, $h); 2590 my ($empty, $slider, @other) = @{ $self->{children} };
2591 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2518 2592
2519 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2593 $self->{layout}->set_font ($self->{font}) if $self->{font};
2520 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2594 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2521 $self->{layout}->set_width ($self->{children}[0]{w}); 2595 $self->{layout}->set_width ($empty->{w});
2522 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2596 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2523 2597
2524 $self->reflow; 2598 $self->reflow;
2525}
2526 2599
2527sub text_size { 2600 local $self->{children} = [$empty, $slider];
2528 my ($self, $text, $indent) = @_; 2601 $self->SUPER::invoke_size_allocate ($w, $h)
2602}
2603
2604sub get_layout {
2605 my ($self, $para) = @_;
2529 2606
2530 my $layout = $self->{layout}; 2607 my $layout = $self->{layout};
2531 2608
2609 $layout->set_font ($self->{font}) if $self->{font};
2610 $layout->set_foreground (@{$para->{fg}});
2532 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2611 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2533 $layout->set_width ($self->{children}[0]{w} - $indent); 2612 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2534 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2613 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2535 $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}}
2536 2620 );
2621
2537 $layout->size 2622 $layout
2538} 2623}
2539 2624
2540sub reflow { 2625sub reflow {
2541 my ($self) = @_; 2626 my ($self) = @_;
2542 2627
… …
2551 $self->{children}[1]->set_value ($offset); 2636 $self->{children}[1]->set_value ($offset);
2552} 2637}
2553 2638
2554sub clear { 2639sub clear {
2555 my ($self) = @_; 2640 my ($self) = @_;
2641
2642 my (undef, undef, @other) = @{ $self->{children} };
2643 $self->remove ($_) for @other;
2556 2644
2557 $self->{par} = []; 2645 $self->{par} = [];
2558 $self->{height} = 0; 2646 $self->{height} = 0;
2559 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2647 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2560} 2648}
2561 2649
2562sub add_paragraph { 2650sub add_paragraph {
2563 my ($self, $color, $text, $indent) = @_; 2651 my ($self, $color, $para, $indent) = @_;
2564 2652
2565 for my $line (split /\n/, $text) { 2653 my ($text, @w) = ref $para ? @$para : $para;
2566 my ($w, $h) = $self->text_size ($line); 2654
2567 $self->{height} += $h; 2655 $para = {
2568 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,
2569 } 2662 };
2570 2663
2571 $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;
2572} 2676}
2573 2677
2574sub update { 2678sub update {
2575 my ($self) = @_; 2679 my ($self) = @_;
2576 2680
… …
2584 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2688 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2585 2689
2586 if (delete $self->{need_reflow}) { 2690 if (delete $self->{need_reflow}) {
2587 my $height = 0; 2691 my $height = 0;
2588 2692
2589 my $layout = $self->{layout};
2590
2591 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2592
2593 for (@{$self->{par}}) { 2693 for my $para (@{$self->{par}}) {
2594 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2694 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2595 $layout->set_width ($W - $_->[3]); 2695 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; 2696 my ($w, $h) = $layout->size;
2599 $_->[0] = $w + $_->[3]; 2697
2600 $_->[1] = $h; 2698 $para->{w} = $w + $para->{indent};
2699 $para->{h} = $h;
2700 $para->{wrapped} = $layout->has_wrapped;
2601 } 2701 }
2602 2702
2603 $height += $_->[1]; 2703 $height += $para->{h};
2604 } 2704 }
2605 2705
2606 $self->{height} = $height; 2706 $self->{height} = $height;
2607 2707
2608 $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]);
2609 2709
2610 delete $self->{texture}; 2710 delete $self->{texture};
2711 }
2712
2713 if (delete $self->{scroll_to_bottom}) {
2714 $self->{children}[1]->set_value (1e10);
2611 } 2715 }
2612 2716
2613 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2717 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2614 glClearColor 0, 0, 0, 0; 2718 glClearColor 0, 0, 0, 0;
2615 glClear GL_COLOR_BUFFER_BIT; 2719 glClear GL_COLOR_BUFFER_BIT;
… …
2619 my $y0 = $top; 2723 my $y0 = $top;
2620 my $y1 = $top + $H; 2724 my $y1 = $top + $H;
2621 2725
2622 my $y = 0; 2726 my $y = 0;
2623 2727
2624 my $layout = $self->{layout};
2625
2626 $layout->set_font ($self->{font}) if $self->{font};
2627
2628 glEnable GL_BLEND; 2728 glEnable GL_BLEND;
2629 #TODO# not correct in windows where rgba is forced off 2729 #TODO# not correct in windows where rgba is forced off
2630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2730 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2631 2731
2632 for my $par (@{$self->{par}}) { 2732 for my $para (@{$self->{par}}) {
2633 my $h = $par->[1]; 2733 my $h = $para->{h};
2634 2734
2635 if ($y0 < $y + $h && $y < $y1) { 2735 if ($y0 < $y + $h && $y < $y1) {
2636 $layout->set_foreground (@{ $par->[2] }); 2736
2637 $layout->set_width ($W - $par->[3]); 2737 my $layout = $self->get_layout ($para);
2638 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2639 $layout->set_markup ($par->[4]);
2640 2738
2641 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2739 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2642 2740
2643 glRasterPos $par->[3], $y - $y0; 2741 glRasterPos $para->{indent}, $y - $y0;
2644 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 glDisable GL_BLEND;
2748 for (@w) {
2749 my ($dx, $dy) = splice @s, 0, 2, ();
2750
2751 $_->{x} = $dx + $para->{indent};
2752 $_->{y} = $dy + $y - $y0;
2753
2754 $_->draw;
2755 }
2756 glEnable GL_BLEND;
2757 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2758 }
2645 } 2759 }
2646 2760
2647 $y += $h; 2761 $y += $h;
2648 } 2762 }
2649 2763
2650 glDisable GL_BLEND; 2764 glDisable GL_BLEND;
2651 }; 2765 };
2652 }); 2766 });
2767}
2768
2769sub reconfigure {
2770 my ($self) = @_;
2771
2772 $self->SUPER::reconfigure;
2773
2774 $_->{w} = 1e10 for @{ $self->{par} };
2775 $self->reflow;
2653} 2776}
2654 2777
2655sub _draw { 2778sub _draw {
2656 my ($self) = @_; 2779 my ($self) = @_;
2657 2780
… …
2660 glColor 0, 0, 0, 1; 2783 glColor 0, 0, 0, 1;
2661 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2784 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2662 glDisable GL_TEXTURE_2D; 2785 glDisable GL_TEXTURE_2D;
2663 2786
2664 $self->{children}[1]->draw; 2787 $self->{children}[1]->draw;
2665
2666} 2788}
2667 2789
2668############################################################################# 2790#############################################################################
2669 2791
2670package CFClient::UI::Animator; 2792package CFClient::UI::Animator;
… …
2779 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2901 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2780 2902
2781 ($w + 4, $h + 4) 2903 ($w + 4, $h + 4)
2782} 2904}
2783 2905
2784sub size_allocate { 2906sub invoke_size_allocate {
2785 my ($self, $w, $h) = @_; 2907 my ($self, $w, $h) = @_;
2786 2908
2787 $self->SUPER::size_allocate ($w - 4, $h - 4); 2909 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2788} 2910}
2789 2911
2790sub visibility_change { 2912sub invoke_visibility_change {
2791 my ($self, $visible) = @_; 2913 my ($self, $visible) = @_;
2792 2914
2793 return unless $visible; 2915 return unless $visible;
2794 2916
2795 $self->{root}->on_post_alloc ("move_$self" => sub { 2917 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2962 3084
2963# popup given the event (must be a mouse button down event currently) 3085# popup given the event (must be a mouse button down event currently)
2964sub popup { 3086sub popup {
2965 my ($self, $ev) = @_; 3087 my ($self, $ev) = @_;
2966 3088
2967 $self->_emit ("popdown"); 3089 $self->emit ("popdown");
2968 3090
2969 # maybe save $GRAB? must be careful about events... 3091 # maybe save $GRAB? must be careful about events...
2970 $GRAB = $self; 3092 $GRAB = $self;
2971 $self->{button} = $ev->{button}; 3093 $self->{button} = $ev->{button};
2972 3094
2973 $self->show; 3095 $self->show;
2974 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3096 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2975} 3097}
2976 3098
2977sub mouse_motion { 3099sub invoke_mouse_motion {
2978 my ($self, $ev, $x, $y) = @_; 3100 my ($self, $ev, $x, $y) = @_;
2979 3101
2980 # TODO: should use vbox->find_widget or so 3102 # TODO: should use vbox->find_widget or so
2981 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3103 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2982 $self->{hover} = $self->{item}{$HOVER}; 3104 $self->{hover} = $self->{item}{$HOVER};
2983 3105
2984 0 3106 0
2985} 3107}
2986 3108
2987sub button_up { 3109sub invoke_button_up {
2988 my ($self, $ev, $x, $y) = @_; 3110 my ($self, $ev, $x, $y) = @_;
2989 3111
2990 if ($ev->{button} == $self->{button}) { 3112 if ($ev->{button} == $self->{button}) {
2991 undef $GRAB; 3113 undef $GRAB;
2992 $self->hide; 3114 $self->hide;
2993 3115
2994 $self->_emit ("popdown"); 3116 $self->emit ("popdown");
2995 $self->{hover}[1]->() if $self->{hover}; 3117 $self->{hover}[1]->() if $self->{hover};
2996 } else { 3118 } else {
2997 return 0 3119 return 0
2998 } 3120 }
2999 3121
… …
3036 : $self->{children}[$page_or_widget]; 3158 : $self->{children}[$page_or_widget];
3037 3159
3038 $self->{current} = $widget; 3160 $self->{current} = $widget;
3039 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3161 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3040 3162
3041 $self->_emit (page_changed => $self->{current}); 3163 $self->emit (page_changed => $self->{current});
3042 3164
3043 $self->realloc; 3165 $self->realloc;
3044} 3166}
3045 3167
3046sub visible_children { 3168sub visible_children {
… …
3051 my ($self) = @_; 3173 my ($self) = @_;
3052 3174
3053 $self->{current}->size_request 3175 $self->{current}->size_request
3054} 3176}
3055 3177
3056sub size_allocate { 3178sub invoke_size_allocate {
3057 my ($self, $w, $h) = @_; 3179 my ($self, $w, $h) = @_;
3058 3180
3059 $self->{current}->configure (0, 0, $w, $h); 3181 $self->{current}->configure (0, 0, $w, $h);
3182
3183 1
3060} 3184}
3061 3185
3062sub _draw { 3186sub _draw {
3063 my ($self) = @_; 3187 my ($self) = @_;
3064 3188
… …
3103 3227
3104sub set_current_page { 3228sub set_current_page {
3105 my ($self, $page) = @_; 3229 my ($self, $page) = @_;
3106 3230
3107 $self->{multiplexer}->set_current_page ($page); 3231 $self->{multiplexer}->set_current_page ($page);
3108 $self->_emit (page_changed => $self->{multiplexer}{current}); 3232 $self->emit (page_changed => $self->{multiplexer}{current});
3109} 3233}
3110 3234
3111############################################################################# 3235#############################################################################
3112 3236
3113package CFClient::UI::Combobox; 3237package CFClient::UI::Combobox;
… …
3128 $self->_set_value ($self->{value}); 3252 $self->_set_value ($self->{value});
3129 3253
3130 $self 3254 $self
3131} 3255}
3132 3256
3133sub button_down { 3257sub invoke_button_down {
3134 my ($self, $ev) = @_; 3258 my ($self, $ev) = @_;
3135 3259
3136 my @menu_items; 3260 my @menu_items;
3137 3261
3138 for (@{ $self->{options} }) { 3262 for (@{ $self->{options} }) {
… …
3159 my ($self, $value) = @_; 3283 my ($self, $value) = @_;
3160 3284
3161 return unless $self->{value} ne $value; 3285 return unless $self->{value} ne $value;
3162 3286
3163 $self->_set_value ($value); 3287 $self->_set_value ($value);
3164 $self->_emit (changed => $value); 3288 $self->emit (changed => $value);
3165} 3289}
3166 3290
3167############################################################################# 3291#############################################################################
3168 3292
3169package CFClient::UI::Statusbox; 3293package CFClient::UI::Statusbox;
… …
3413 $self->update_binding_widgets; 3537 $self->update_binding_widgets;
3414 3538
3415 $self 3539 $self
3416} 3540}
3417 3541
3542sub cfg_bind {
3543 my ($self, $mod, $sym, $cmds) = @_;
3544 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3545 ::update_bindings ();
3546}
3547
3548sub cfg_unbind {
3549 my ($self, $mod, $sym, $cmds) = @_;
3550 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3551 ::update_bindings ();
3552}
3553
3418sub commit { 3554sub commit {
3419 my ($self) = @_; 3555 my ($self) = @_;
3420 my ($mod, $sym, $cmds) = $self->get_binding; 3556 my ($mod, $sym, $cmds) = $self->get_binding;
3421 if ($sym != 0 && @$cmds > 0) { 3557 if ($sym != 0 && @$cmds > 0) {
3422 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym) 3558 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
… …
3456 my ($self) = @_; 3592 my ($self) = @_;
3457 $self->ask_for_bind (1); 3593 $self->ask_for_bind (1);
3458} 3594}
3459 3595
3460sub ask_for_bind { 3596sub ask_for_bind {
3461 my ($self, $commit) = @_; 3597 my ($self, $commit, $end_cb) = @_;
3462 3598
3463 CFClient::Binder::open_binding_dialog (sub { 3599 CFClient::Binder::open_binding_dialog (sub {
3464 my ($mod, $sym) = @_; 3600 my ($mod, $sym) = @_;
3465 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak? 3601 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3466 $self->update_binding_widgets; 3602 $self->update_binding_widgets;
3467 $self->commit if $commit; 3603 $self->commit if $commit;
3604 $end_cb->() if $end_cb;
3468 }); 3605 });
3469} 3606}
3470 3607
3471# $mod and $sym are the modifiers and key symbol 3608# $mod and $sym are the modifiers and key symbol
3472# $cmds is a array ref of strings (the commands) 3609# $cmds is a array ref of strings (the commands)
… …
3490} 3627}
3491 3628
3492# this is a shortcut method that asks for a binding 3629# this is a shortcut method that asks for a binding
3493# and then just binds it. 3630# and then just binds it.
3494sub do_quick_binding { 3631sub do_quick_binding {
3495 my ($self, $cmds) = @_; 3632 my ($self, $cmds, $end_cb) = @_;
3496 $self->set_binding (undef, undef, $cmds, sub { 3633 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3497 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3498 });
3499 $self->ask_for_bind (1); 3634 $self->ask_for_bind (1, $end_cb);
3500} 3635}
3501 3636
3502sub update_binding_widgets { 3637sub update_binding_widgets {
3503 my ($self) = @_; 3638 my ($self) = @_;
3504 my ($mod, $sym, $cmds) = $self->get_binding; 3639 my ($mod, $sym, $cmds) = $self->get_binding;
… …
3709 $coord = $max - $size if $coord > $max - $size; 3844 $coord = $max - $size if $coord > $max - $size;
3710 3845
3711 int $coord + 0.5 3846 int $coord + 0.5
3712} 3847}
3713 3848
3714sub size_allocate { 3849sub invoke_size_allocate {
3715 my ($self, $w, $h) = @_; 3850 my ($self, $w, $h) = @_;
3716 3851
3717 for my $child ($self->children) { 3852 for my $child ($self->children) {
3718 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3853 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3719 3854
… …
3723 $X = _to_pixel $X, $W, $self->{w}; 3858 $X = _to_pixel $X, $W, $self->{w};
3724 $Y = _to_pixel $Y, $H, $self->{h}; 3859 $Y = _to_pixel $Y, $H, $self->{h};
3725 3860
3726 $child->configure ($X, $Y, $W, $H); 3861 $child->configure ($X, $Y, $W, $H);
3727 } 3862 }
3863
3864 1
3728} 3865}
3729 3866
3730sub coord2local { 3867sub coord2local {
3731 my ($self, $x, $y) = @_; 3868 my ($self, $x, $y) = @_;
3732 3869

Diff Legend

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