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.308 by root, Mon Jun 19 05:18:14 2006 UTC

… …
281 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
282 282
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
285 285
286 $self->focus_out; 286 $self->emit ("focus_out");
287
288 $self->emit (visibility_change => 0); 287 $self->emit (visibility_change => 0);
289} 288}
290 289
291sub set_visibility { 290sub set_visibility {
292 my ($self, $visible) = @_; 291 my ($self, $visible) = @_;
… …
367 366
368 $self->{root}{size_alloc}{$self+0} = $self; 367 $self->{root}{size_alloc}{$self+0} = $self;
369 } 368 }
370} 369}
371 370
372sub size_allocate {
373 # nothing to be done
374}
375
376sub children { 371sub children {
377 # nop 372 # nop
378} 373}
379 374
380sub visible_children { 375sub visible_children {
… …
418 my ($self, $x, $y) = @_; 413 my ($self, $x, $y) = @_;
419 414
420 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 415 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
421} 416}
422 417
423sub focus_in { 418sub invoke_focus_in {
424 my ($self) = @_; 419 my ($self) = @_;
425 420
426 return if $FOCUS == $self; 421 return if $FOCUS == $self;
427 return unless $self->{can_focus}; 422 return unless $self->{can_focus};
428 423
429 my $focus = $FOCUS; $FOCUS = $self; 424 my $focus = $FOCUS; $FOCUS = $self;
430 425
431 $self->_emit (focus_in => $focus);
432
433 $focus->update if $focus; 426 $focus->update if $focus;
434 $FOCUS->update; 427 $FOCUS->update;
435}
436 428
429 0
430}
431
437sub focus_out { 432sub invoke_focus_out {
438 my ($self) = @_; 433 my ($self) = @_;
439 434
440 return unless $FOCUS == $self; 435 return unless $FOCUS == $self;
441 436
442 my $focus = $FOCUS; undef $FOCUS; 437 my $focus = $FOCUS; undef $FOCUS;
443 438
444 $self->_emit (focus_out => $focus);
445
446 $focus->update if $focus; #? 439 $focus->update if $focus; #?
447 440
448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 441 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
449 unless $FOCUS; 442 unless $FOCUS;
450}
451 443
444 0
445}
446
447sub grab_focus {
448 my ($self) = @_;
449
450 $self->emit ("focus_in");
451}
452
452sub mouse_motion { 0 } 453sub invoke_mouse_motion { 1 }
453sub button_up { 0 } 454sub invoke_button_up { 1 }
454sub key_down { 0 } 455sub invoke_key_down { 1 }
455sub key_up { 0 } 456sub invoke_key_up { 1 }
456 457
457sub button_down { 458sub invoke_button_down {
458 my ($self, $ev, $x, $y) = @_; 459 my ($self, $ev, $x, $y) = @_;
459 460
460 $self->focus_in; 461 $self->grab_focus;
461 462
462 0 463 1
464}
465
466sub connect {
467 my ($self, $signal, $cb) = @_;
468
469 push @{ $self->{signal_cb}{$signal} }, $cb;
470}
471
472sub emit {
473 my ($self, $signal, @args) = @_;
474
475 #d##TODO# stop propagating at first true, do not use sum
476 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
477 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
478 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
463} 479}
464 480
465sub find_widget { 481sub find_widget {
466 my ($self, $x, $y) = @_; 482 my ($self, $x, $y) = @_;
467 483
… …
477sub set_parent { 493sub set_parent {
478 my ($self, $parent) = @_; 494 my ($self, $parent) = @_;
479 495
480 Scalar::Util::weaken ($self->{parent} = $parent); 496 Scalar::Util::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible}; 497 $self->set_visible if $parent->{visible};
482}
483
484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501}
502
503sub visibility_change {
504 #my ($self, $visible) = @_;
505} 498}
506 499
507sub realloc { 500sub realloc {
508 my ($self) = @_; 501 my ($self) = @_;
509 502
… …
789 782
790sub size_request { 783sub size_request {
791 $_[0]{children}[0]->size_request 784 $_[0]{children}[0]->size_request
792} 785}
793 786
794sub size_allocate { 787sub invoke_size_allocate {
795 my ($self, $w, $h) = @_; 788 my ($self, $w, $h) = @_;
796 789
797 $self->{children}[0]->configure (0, 0, $w, $h); 790 $self->{children}[0]->configure (0, 0, $w, $h);
791
792 1
798} 793}
799 794
800############################################################################# 795#############################################################################
801 796
802# back-buffered drawing area 797# back-buffered drawing area
… …
818 813
819 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 814 $ROOT->on_post_alloc ($self => sub { $self->render_child });
820 $self->SUPER::update; 815 $self->SUPER::update;
821} 816}
822 817
823sub size_allocate { 818sub invoke_size_allocate {
824 my ($self, $w, $h) = @_; 819 my ($self, $w, $h) = @_;
825 820
826 $self->SUPER::size_allocate ($w, $h);
827 $self->update; 821 $self->update;
822
823 $self->SUPER::invoke_size_allocate ($w, $h)
828} 824}
829 825
830sub _render { 826sub _render {
831 my ($self) = @_; 827 my ($self) = @_;
832 828
… …
893 $h = 10 if $self->{scroll_y}; 889 $h = 10 if $self->{scroll_y};
894 890
895 ($w, $h) 891 ($w, $h)
896} 892}
897 893
898sub size_allocate { 894sub invoke_size_allocate {
899 my ($self, $w, $h) = @_; 895 my ($self, $w, $h) = @_;
900 896
901 my $child = $self->child; 897 my $child = $self->child;
902 898
903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 899 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 900 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
905 901
906 $self->child->configure (0, 0, $w, $h); 902 $self->child->configure (0, 0, $w, $h);
907 $self->update; 903 $self->update;
904
905 1
908} 906}
909 907
910sub set_offset { 908sub set_offset {
911 my ($self, $x, $y) = @_; 909 my ($self, $x, $y) = @_;
912 910
… …
1002 # todo: overwrite size_allocate of child 1000 # todo: overwrite size_allocate of child
1003 my $child = $self->{vp}->child; 1001 my $child = $self->{vp}->child;
1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1005} 1003}
1006 1004
1007sub size_allocate { 1005sub invoke_size_allocate {
1008 my ($self, $w, $h) = @_; 1006 my ($self, $w, $h) = @_;
1009
1010 $self->SUPER::size_allocate ($w, $h);
1011 1007
1012 my $child = $self->{vp}->child; 1008 my $child = $self->{vp}->child;
1013 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1009 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1010
1011 $self->SUPER::invoke_size_allocate ($w, $h)
1014} 1012}
1015 1013
1016#TODO# update range on size_allocate depending on child 1014#TODO# update range on size_allocate depending on child
1017# update viewport offset on scroll 1015# update viewport offset on scroll
1018 1016
… …
1090 valign => 1, 1088 valign => 1,
1091 text => $self->{title}, 1089 text => $self->{title},
1092 fontsize => $self->{border}, 1090 fontsize => $self->{border},
1093 if exists $self->{title}; 1091 if exists $self->{title};
1094 1092
1095 unless ($self->{no_close_button}) { 1093 if ($self->{has_close_button}) {
1096 $self->{close_btn} = 1094 $self->{close_button} =
1097 new CFClient::UI::ImageButton 1095 new CFClient::UI::ImageButton
1098 image => 'x1_close.png', 1096 image => 'x1_close.png',
1099 on_activate => sub { $self->hide }; 1097 on_activate => sub { $self->hide };
1100 1098
1101 $self->CFClient::UI::Container::add ($self->{close_btn}); 1099 $self->CFClient::UI::Container::add ($self->{close_button});
1102 } 1100 }
1103 1101
1104 $self 1102 $self
1105} 1103}
1106 1104
1107sub add { 1105sub add {
1108 my ($self, @widgets) = @_; 1106 my ($self, @widgets) = @_;
1109 1107
1110 $self->SUPER::add (@widgets); 1108 $self->SUPER::add (@widgets);
1111 $self->CFClient::UI::Container::add ($self->{close_btn}) if $self->{close_btn}; 1109 $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}; 1110 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1113} 1111}
1114 1112
1115sub border { 1113sub border {
1116 int $_[0]{border} * $::FONTSIZE 1114 int $_[0]{border} * $::FONTSIZE
… …
1120 my ($self) = @_; 1118 my ($self) = @_;
1121 1119
1122 $self->{title_widget}->size_request 1120 $self->{title_widget}->size_request
1123 if $self->{title_widget}; 1121 if $self->{title_widget};
1124 1122
1125 $self->{close_btn}->size_request 1123 $self->{close_button}->size_request
1126 if $self->{close_btn}; 1124 if $self->{close_button};
1127 1125
1128 my ($w, $h) = $self->SUPER::size_request; 1126 my ($w, $h) = $self->SUPER::size_request;
1129 1127
1130 ( 1128 (
1131 $w + $self->border * 2, 1129 $w + $self->border * 2,
1132 $h + $self->border * 2, 1130 $h + $self->border * 2,
1133 ) 1131 )
1134} 1132}
1135 1133
1136sub size_allocate { 1134sub invoke_size_allocate {
1137 my ($self, $w, $h) = @_; 1135 my ($self, $w, $h) = @_;
1138 1136
1139 if ($self->{title_widget}) { 1137 if ($self->{title_widget}) {
1140 $self->{title_widget}{w} = $w; 1138 $self->{title_widget}{w} = $w;
1141 $self->{title_widget}{h} = $h; 1139 $self->{title_widget}{h} = $h;
1142 $self->{title_widget}->size_allocate ($w, $h); 1140 $self->{title_widget}->invoke_size_allocate ($w, $h);
1143 } 1141 }
1144 1142
1145 my $border = $self->border; 1143 my $border = $self->border;
1146 1144
1147 $h -= List::Util::max 0, $border * 2; 1145 $h -= List::Util::max 0, $border * 2;
1148 $w -= List::Util::max 0, $border * 2; 1146 $w -= List::Util::max 0, $border * 2;
1149 1147
1150 $self->child->configure ($border, $border, $w, $h); 1148 $self->child->configure ($border, $border, $w, $h);
1151 1149
1152 $self->{close_btn}->configure ($self->{w} - (2 * $border), 0, $border, $border) 1150 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153 if $self->{close_btn}; 1151 if $self->{close_button};
1154}
1155 1152
1153 1
1154}
1155
1156sub button_down { 1156sub invoke_button_down {
1157 my ($self, $ev, $x, $y) = @_; 1157 my ($self, $ev, $x, $y) = @_;
1158 1158
1159 my ($w, $h) = @$self{qw(w h)}; 1159 my ($w, $h) = @$self{qw(w h)};
1160 my $border = $self->border; 1160 my $border = $self->border;
1161 1161
… …
1192 1192
1193 ($x, $y) = ($ev->{x}, $ev->{y}); 1193 ($x, $y) = ($ev->{x}, $ev->{y});
1194 1194
1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1196 # HACK: the next line is required to enforce placement 1196 # HACK: the next line is required to enforce placement
1197 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1197 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1198 }; 1198 };
1199 } else { 1199 } else {
1200 return 0; 1200 return 0;
1201 } 1201 }
1202 1202
1203 1 1203 1
1204} 1204}
1205 1205
1206sub button_up { 1206sub invoke_button_up {
1207 my ($self, $ev, $x, $y) = @_; 1207 my ($self, $ev, $x, $y) = @_;
1208 1208
1209 $self->{close_btn}->button_up ($ev, $x, $y)
1210 if $self->{close_btn};
1211
1212 !!delete $self->{motion} 1209 ! ! delete $self->{motion}
1213} 1210}
1214 1211
1215sub mouse_motion { 1212sub invoke_mouse_motion {
1216 my ($self, $ev, $x, $y) = @_; 1213 my ($self, $ev, $x, $y) = @_;
1217 1214
1218 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1215 $self->{motion}->($ev, $x, $y) if $self->{motion};
1219 1216
1220 !!$self->{motion} 1217 ! ! $self->{motion}
1221} 1218}
1222 1219
1223sub _draw { 1220sub _draw {
1224 my ($self) = @_; 1221 my ($self) = @_;
1225 1222
… …
1258 $self->{title_widget}->_draw; 1255 $self->{title_widget}->_draw;
1259 1256
1260 glTranslate 0, - ($border - $self->{h}); 1257 glTranslate 0, - ($border - $self->{h});
1261 } 1258 }
1262 1259
1263 $self->{close_btn}->draw 1260 $self->{close_button}->draw
1264 if $self->{close_btn}; 1261 if $self->{close_button};
1265} 1262}
1266 1263
1267############################################################################# 1264#############################################################################
1268 1265
1269package CFClient::UI::Table; 1266package CFClient::UI::Table;
… …
1348 (sum @$ws), 1345 (sum @$ws),
1349 (sum @$hs), 1346 (sum @$hs),
1350 ) 1347 )
1351} 1348}
1352 1349
1353sub size_allocate { 1350sub invoke_size_allocate {
1354 my ($self, $w, $h) = @_; 1351 my ($self, $w, $h) = @_;
1355 1352
1356 my ($ws, $hs) = $self->get_wh; 1353 my ($ws, $hs) = $self->get_wh;
1357 1354
1358 my $req_w = (sum @$ws) || 1; 1355 my $req_w = (sum @$ws) || 1;
… …
1390 } 1387 }
1391 1388
1392 $y += $row_h; 1389 $y += $row_h;
1393 } 1390 }
1394 1391
1392 1
1395} 1393}
1396 1394
1397sub find_widget { 1395sub find_widget {
1398 my ($self, $x, $y) = @_; 1396 my ($self, $x, $y) = @_;
1399 1397
… …
1436 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1434 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1437 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1435 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1438 ) 1436 )
1439} 1437}
1440 1438
1441sub size_allocate { 1439sub invoke_size_allocate {
1442 my ($self, $w, $h) = @_; 1440 my ($self, $w, $h) = @_;
1443 1441
1444 my $space = $self->{vertical} ? $h : $w; 1442 my $space = $self->{vertical} ? $h : $w;
1445 my $children = $self->{children}; 1443 my $children = $self->{children};
1446 1444
… …
1633 }; 1631 };
1634 1632
1635 @{ $self->{size_req} } 1633 @{ $self->{size_req} }
1636} 1634}
1637 1635
1638sub size_allocate { 1636sub invoke_size_allocate {
1639 my ($self, $w, $h) = @_; 1637 my ($self, $w, $h) = @_;
1640 1638
1641 delete $self->{ox}; 1639 delete $self->{ox};
1642 1640
1643 delete $self->{texture} 1641 delete $self->{texture}
1644 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1642 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1643
1644 1
1645} 1645}
1646 1646
1647sub set_fontsize { 1647sub set_fontsize {
1648 my ($self, $fontsize) = @_; 1648 my ($self, $fontsize) = @_;
1649 1649
… …
1742 1742
1743 $text =~ s/./*/g if $self->{hidden}; 1743 $text =~ s/./*/g if $self->{hidden};
1744 $self->{layout}->set_text ("$text "); 1744 $self->{layout}->set_text ("$text ");
1745 delete $self->{size_req}; 1745 delete $self->{size_req};
1746 1746
1747 $self->_emit (changed => $self->{text}); 1747 $self->emit (changed => $self->{text});
1748 1748
1749 $self->realloc; 1749 $self->realloc;
1750 $self->update; 1750 $self->update;
1751} 1751}
1752 1752
… …
1767 my ($w, $h) = $self->SUPER::size_request; 1767 my ($w, $h) = $self->SUPER::size_request;
1768 1768
1769 ($w + 1, $h) # add 1 for cursor 1769 ($w + 1, $h) # add 1 for cursor
1770} 1770}
1771 1771
1772sub key_down { 1772sub invoke_key_down {
1773 my ($self, $ev) = @_; 1773 my ($self, $ev) = @_;
1774 1774
1775 my $mod = $ev->{mod}; 1775 my $mod = $ev->{mod};
1776 my $sym = $ev->{sym}; 1776 my $sym = $ev->{sym};
1777 my $uni = $ev->{unicode}; 1777 my $uni = $ev->{unicode};
… …
1789 } elsif ($sym == CFClient::SDLK_HOME) { 1789 } elsif ($sym == CFClient::SDLK_HOME) {
1790 $self->{cursor} = 0; 1790 $self->{cursor} = 0;
1791 } elsif ($sym == CFClient::SDLK_END) { 1791 } elsif ($sym == CFClient::SDLK_END) {
1792 $self->{cursor} = length $text; 1792 $self->{cursor} = length $text;
1793 } elsif ($uni == 27) { 1793 } elsif ($uni == 27) {
1794 $self->_emit ('escape'); 1794 $self->emit ('escape');
1795 } elsif ($uni) { 1795 } elsif ($uni) {
1796 substr $text, $self->{cursor}++, 0, chr $uni; 1796 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else { 1797 } else {
1798 return 0; 1798 return 0;
1799 } 1799 }
… …
1803 $self->realloc; 1803 $self->realloc;
1804 1804
1805 1 1805 1
1806} 1806}
1807 1807
1808sub focus_in { 1808sub invoke_focus_in {
1809 my ($self) = @_; 1809 my ($self) = @_;
1810 1810
1811 $self->{last_activity} = $::NOW; 1811 $self->{last_activity} = $::NOW;
1812 1812
1813 $self->SUPER::focus_in; 1813 $self->SUPER::invoke_focus_in
1814} 1814}
1815 1815
1816sub button_down { 1816sub invoke_button_down {
1817 my ($self, $ev, $x, $y) = @_; 1817 my ($self, $ev, $x, $y) = @_;
1818 1818
1819 $self->SUPER::button_down ($ev, $x, $y); 1819 $self->SUPER::invoke_button_down ($ev, $x, $y);
1820 1820
1821 my $idx = $self->{layout}->xy_to_index ($x, $y); 1821 my $idx = $self->{layout}->xy_to_index ($x, $y);
1822 1822
1823 # byte-index to char-index 1823 # byte-index to char-index
1824 my $text = $self->{text}; 1824 my $text = $self->{text};
… …
1829 $self->update; 1829 $self->update;
1830 1830
1831 1 1831 1
1832} 1832}
1833 1833
1834sub mouse_motion { 1834sub invoke_mouse_motion {
1835 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1836# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1836# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1837 1837
1838 0 1838 1
1839} 1839}
1840 1840
1841sub _draw { 1841sub _draw {
1842 my ($self) = @_; 1842 my ($self) = @_;
1843 1843
… …
1884 1884
1885our @ISA = CFClient::UI::EntryBase::; 1885our @ISA = CFClient::UI::EntryBase::;
1886 1886
1887use CFClient::OpenGL; 1887use CFClient::OpenGL;
1888 1888
1889sub key_down { 1889sub invoke_key_down {
1890 my ($self, $ev) = @_; 1890 my ($self, $ev) = @_;
1891 1891
1892 my $sym = $ev->{sym}; 1892 my $sym = $ev->{sym};
1893 1893
1894 if ($sym == 13) { 1894 if ($sym == 13) {
1895 unshift @{$self->{history}}, 1895 unshift @{$self->{history}},
1896 my $txt = $self->get_text; 1896 my $txt = $self->get_text;
1897
1897 $self->{history_pointer} = -1; 1898 $self->{history_pointer} = -1;
1898 $self->{history_saveback} = ''; 1899 $self->{history_saveback} = '';
1899 $self->_emit (activate => $txt); 1900 $self->emit (activate => $txt);
1900 $self->update; 1901 $self->update;
1901 1902
1902 } elsif ($sym == CFClient::SDLK_UP) { 1903 } elsif ($sym == CFClient::SDLK_UP) {
1903 if ($self->{history_pointer} < 0) { 1904 if ($self->{history_pointer} < 0) {
1904 $self->{history_saveback} = $self->get_text; 1905 $self->{history_saveback} = $self->get_text;
… …
1920 } else { 1921 } else {
1921 $self->set_text ($self->{history_saveback}); 1922 $self->set_text ($self->{history_saveback});
1922 } 1923 }
1923 1924
1924 } else { 1925 } else {
1925 return $self->SUPER::key_down ($ev) 1926 return $self->SUPER::invoke_key_down ($ev)
1926 } 1927 }
1927 1928
1928 1 1929 1
1929} 1930}
1930 1931
… …
1954 can_events => 1, 1955 can_events => 1,
1955 @_ 1956 @_
1956 ) 1957 )
1957} 1958}
1958 1959
1959sub activate { }
1960
1961sub button_up { 1960sub invoke_button_up {
1962 my ($self, $ev, $x, $y) = @_; 1961 my ($self, $ev, $x, $y) = @_;
1963 1962
1964 $self->emit ("activate") 1963 $self->emit ("activate")
1965 if $x >= 0 && $x < $self->{w} 1964 if $x >= 0 && $x < $self->{w}
1966 && $y >= 0 && $y < $self->{h}; 1965 && $y >= 0 && $y < $self->{h};
… …
2008 can_events => 1, 2007 can_events => 1,
2009 @_ 2008 @_
2010 ); 2009 );
2011} 2010}
2012 2011
2013sub activate { }
2014
2015sub button_up { 2012sub invoke_button_up {
2016 my ($self, $ev, $x, $y) = @_; 2013 my ($self, $ev, $x, $y) = @_;
2017 2014
2018 $self->emit ("activate") 2015 $self->emit ("activate")
2019 if $x >= 0 && $x < $self->{w} 2016 if $x >= 0 && $x < $self->{w}
2020 && $y >= 0 && $y < $self->{h}; 2017 && $y >= 0 && $y < $self->{h};
… …
2054 my ($self) = @_; 2051 my ($self) = @_;
2055 2052
2056 (6) x 2 2053 (6) x 2
2057} 2054}
2058 2055
2059sub button_down { 2056sub invoke_button_down {
2060 my ($self, $ev, $x, $y) = @_; 2057 my ($self, $ev, $x, $y) = @_;
2061 2058
2062 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2059 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2063 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2060 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2064 $self->{state} = !$self->{state}; 2061 $self->{state} = !$self->{state};
2065 $self->_emit (changed => $self->{state}); 2062 $self->emit (changed => $self->{state});
2066 } else { 2063 } else {
2067 return 0 2064 return 0
2068 } 2065 }
2069 2066
2070 1 2067 1
… …
2367 $self->update; 2364 $self->update;
2368 2365
2369 $self 2366 $self
2370} 2367}
2371 2368
2372sub changed { }
2373
2374sub set_range { 2369sub set_range {
2375 my ($self, $range) = @_; 2370 my ($self, $range) = @_;
2376 2371
2377 ($range, $self->{range}) = ($self->{range}, $range); 2372 ($range, $self->{range}) = ($self->{range}, $range);
2378 2373
… …
2398 if $unit; 2393 if $unit;
2399 2394
2400 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2395 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2401 2396
2402 if ($value != $old_value) { 2397 if ($value != $old_value) {
2403 $self->_emit (changed => $value); 2398 $self->emit (changed => $value);
2404 $self->update; 2399 $self->update;
2405 } 2400 }
2406} 2401}
2407 2402
2408sub size_request { 2403sub size_request {
2409 my ($self) = @_; 2404 my ($self) = @_;
2410 2405
2411 ($self->{req_w}, $self->{req_h}) 2406 ($self->{req_w}, $self->{req_h})
2412} 2407}
2413 2408
2414sub button_down { 2409sub invoke_button_down {
2415 my ($self, $ev, $x, $y) = @_; 2410 my ($self, $ev, $x, $y) = @_;
2416 2411
2417 $self->SUPER::button_down ($ev, $x, $y); 2412 $self->SUPER::invoke_button_down ($ev, $x, $y);
2418 2413
2419 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2414 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2420 2415
2421 $self->mouse_motion ($ev, $x, $y) 2416 $self->invoke_mouse_motion ($ev, $x, $y)
2422} 2417}
2423 2418
2424sub mouse_motion { 2419sub invoke_mouse_motion {
2425 my ($self, $ev, $x, $y) = @_; 2420 my ($self, $ev, $x, $y) = @_;
2426 2421
2427 if ($GRAB == $self) { 2422 if ($GRAB == $self) {
2428 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2423 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2429 2424
… …
2571 2566
2572 $self->{fontsize} = $fontsize; 2567 $self->{fontsize} = $fontsize;
2573 $self->reflow; 2568 $self->reflow;
2574} 2569}
2575 2570
2576sub size_allocate { 2571sub invoke_size_allocate {
2577 my ($self, $w, $h) = @_; 2572 my ($self, $w, $h) = @_;
2578
2579 $self->SUPER::size_allocate ($w, $h);
2580 2573
2581 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2574 $self->{layout}->set_font ($self->{font}) if $self->{font};
2582 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2575 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2583 $self->{layout}->set_width ($self->{children}[0]{w}); 2576 $self->{layout}->set_width ($self->{children}[0]{w});
2584 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2577 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2585 2578
2586 $self->reflow; 2579 $self->reflow;
2580
2581 $self->SUPER::invoke_size_allocate ($w, $h)
2587} 2582}
2588 2583
2589sub text_size { 2584sub text_size {
2590 my ($self, $text, $indent) = @_; 2585 my ($self, $text, $indent) = @_;
2591 2586
… …
2841 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2836 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2842 2837
2843 ($w + 4, $h + 4) 2838 ($w + 4, $h + 4)
2844} 2839}
2845 2840
2846sub size_allocate { 2841sub invoke_size_allocate {
2847 my ($self, $w, $h) = @_; 2842 my ($self, $w, $h) = @_;
2848 2843
2849 $self->SUPER::size_allocate ($w - 4, $h - 4); 2844 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2850} 2845}
2851 2846
2852sub visibility_change { 2847sub invoke_visibility_change {
2853 my ($self, $visible) = @_; 2848 my ($self, $visible) = @_;
2854 2849
2855 return unless $visible; 2850 return unless $visible;
2856 2851
2857 $self->{root}->on_post_alloc ("move_$self" => sub { 2852 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
3024 3019
3025# popup given the event (must be a mouse button down event currently) 3020# popup given the event (must be a mouse button down event currently)
3026sub popup { 3021sub popup {
3027 my ($self, $ev) = @_; 3022 my ($self, $ev) = @_;
3028 3023
3029 $self->_emit ("popdown"); 3024 $self->emit ("popdown");
3030 3025
3031 # maybe save $GRAB? must be careful about events... 3026 # maybe save $GRAB? must be careful about events...
3032 $GRAB = $self; 3027 $GRAB = $self;
3033 $self->{button} = $ev->{button}; 3028 $self->{button} = $ev->{button};
3034 3029
3035 $self->show; 3030 $self->show;
3036 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3031 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
3037} 3032}
3038 3033
3039sub mouse_motion { 3034sub invoke_mouse_motion {
3040 my ($self, $ev, $x, $y) = @_; 3035 my ($self, $ev, $x, $y) = @_;
3041 3036
3042 # TODO: should use vbox->find_widget or so 3037 # TODO: should use vbox->find_widget or so
3043 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3038 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
3044 $self->{hover} = $self->{item}{$HOVER}; 3039 $self->{hover} = $self->{item}{$HOVER};
3045 3040
3046 0 3041 0
3047} 3042}
3048 3043
3049sub button_up { 3044sub invoke_button_up {
3050 my ($self, $ev, $x, $y) = @_; 3045 my ($self, $ev, $x, $y) = @_;
3051 3046
3052 if ($ev->{button} == $self->{button}) { 3047 if ($ev->{button} == $self->{button}) {
3053 undef $GRAB; 3048 undef $GRAB;
3054 $self->hide; 3049 $self->hide;
3055 3050
3056 $self->_emit ("popdown"); 3051 $self->emit ("popdown");
3057 $self->{hover}[1]->() if $self->{hover}; 3052 $self->{hover}[1]->() if $self->{hover};
3058 } else { 3053 } else {
3059 return 0 3054 return 0
3060 } 3055 }
3061 3056
… …
3098 : $self->{children}[$page_or_widget]; 3093 : $self->{children}[$page_or_widget];
3099 3094
3100 $self->{current} = $widget; 3095 $self->{current} = $widget;
3101 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3096 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3102 3097
3103 $self->_emit (page_changed => $self->{current}); 3098 $self->emit (page_changed => $self->{current});
3104 3099
3105 $self->realloc; 3100 $self->realloc;
3106} 3101}
3107 3102
3108sub visible_children { 3103sub visible_children {
… …
3113 my ($self) = @_; 3108 my ($self) = @_;
3114 3109
3115 $self->{current}->size_request 3110 $self->{current}->size_request
3116} 3111}
3117 3112
3118sub size_allocate { 3113sub invoke_size_allocate {
3119 my ($self, $w, $h) = @_; 3114 my ($self, $w, $h) = @_;
3120 3115
3121 $self->{current}->configure (0, 0, $w, $h); 3116 $self->{current}->configure (0, 0, $w, $h);
3117
3118 1
3122} 3119}
3123 3120
3124sub _draw { 3121sub _draw {
3125 my ($self) = @_; 3122 my ($self) = @_;
3126 3123
… …
3165 3162
3166sub set_current_page { 3163sub set_current_page {
3167 my ($self, $page) = @_; 3164 my ($self, $page) = @_;
3168 3165
3169 $self->{multiplexer}->set_current_page ($page); 3166 $self->{multiplexer}->set_current_page ($page);
3170 $self->_emit (page_changed => $self->{multiplexer}{current}); 3167 $self->emit (page_changed => $self->{multiplexer}{current});
3171} 3168}
3172 3169
3173############################################################################# 3170#############################################################################
3174 3171
3175package CFClient::UI::Combobox; 3172package CFClient::UI::Combobox;
… …
3190 $self->_set_value ($self->{value}); 3187 $self->_set_value ($self->{value});
3191 3188
3192 $self 3189 $self
3193} 3190}
3194 3191
3195sub button_down { 3192sub invoke_button_down {
3196 my ($self, $ev) = @_; 3193 my ($self, $ev) = @_;
3197 3194
3198 my @menu_items; 3195 my @menu_items;
3199 3196
3200 for (@{ $self->{options} }) { 3197 for (@{ $self->{options} }) {
… …
3221 my ($self, $value) = @_; 3218 my ($self, $value) = @_;
3222 3219
3223 return unless $self->{value} ne $value; 3220 return unless $self->{value} ne $value;
3224 3221
3225 $self->_set_value ($value); 3222 $self->_set_value ($value);
3226 $self->_emit (changed => $value); 3223 $self->emit (changed => $value);
3227} 3224}
3228 3225
3229############################################################################# 3226#############################################################################
3230 3227
3231package CFClient::UI::Statusbox; 3228package CFClient::UI::Statusbox;
… …
3518 my ($self) = @_; 3515 my ($self) = @_;
3519 $self->ask_for_bind (1); 3516 $self->ask_for_bind (1);
3520} 3517}
3521 3518
3522sub ask_for_bind { 3519sub ask_for_bind {
3523 my ($self, $commit) = @_; 3520 my ($self, $commit, $end_cb) = @_;
3524 3521
3525 CFClient::Binder::open_binding_dialog (sub { 3522 CFClient::Binder::open_binding_dialog (sub {
3526 my ($mod, $sym) = @_; 3523 my ($mod, $sym) = @_;
3527 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak? 3524 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3528 $self->update_binding_widgets; 3525 $self->update_binding_widgets;
3529 $self->commit if $commit; 3526 $self->commit if $commit;
3527 $end_cb->() if $end_cb;
3530 }); 3528 });
3531} 3529}
3532 3530
3533# $mod and $sym are the modifiers and key symbol 3531# $mod and $sym are the modifiers and key symbol
3534# $cmds is a array ref of strings (the commands) 3532# $cmds is a array ref of strings (the commands)
… …
3552} 3550}
3553 3551
3554# this is a shortcut method that asks for a binding 3552# this is a shortcut method that asks for a binding
3555# and then just binds it. 3553# and then just binds it.
3556sub do_quick_binding { 3554sub do_quick_binding {
3557 my ($self, $cmds) = @_; 3555 my ($self, $cmds, $end_cb) = @_;
3558 $self->set_binding (undef, undef, $cmds, sub { 3556 $self->set_binding (undef, undef, $cmds, sub {
3559 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2]; 3557 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3560 }); 3558 });
3561 $self->ask_for_bind (1); 3559 $self->ask_for_bind (1, $end_cb);
3562} 3560}
3563 3561
3564sub update_binding_widgets { 3562sub update_binding_widgets {
3565 my ($self) = @_; 3563 my ($self) = @_;
3566 my ($mod, $sym, $cmds) = $self->get_binding; 3564 my ($mod, $sym, $cmds) = $self->get_binding;
… …
3771 $coord = $max - $size if $coord > $max - $size; 3769 $coord = $max - $size if $coord > $max - $size;
3772 3770
3773 int $coord + 0.5 3771 int $coord + 0.5
3774} 3772}
3775 3773
3776sub size_allocate { 3774sub invoke_size_allocate {
3777 my ($self, $w, $h) = @_; 3775 my ($self, $w, $h) = @_;
3778 3776
3779 for my $child ($self->children) { 3777 for my $child ($self->children) {
3780 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3778 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3781 3779
… …
3785 $X = _to_pixel $X, $W, $self->{w}; 3783 $X = _to_pixel $X, $W, $self->{w};
3786 $Y = _to_pixel $Y, $H, $self->{h}; 3784 $Y = _to_pixel $Y, $H, $self->{h};
3787 3785
3788 $child->configure ($X, $Y, $W, $H); 3786 $child->configure ($X, $Y, $W, $H);
3789 } 3787 }
3788
3789 1
3790} 3790}
3791 3791
3792sub coord2local { 3792sub coord2local {
3793 my ($self, $x, $y) = @_; 3793 my ($self, $x, $y) = @_;
3794 3794

Diff Legend

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