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

Diff Legend

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