ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.304 by elmex, Tue Jun 13 11:01:04 2006 UTC vs.
Revision 1.305 by root, Sun Jun 18 17:13:12 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 (List::Util::sum +(map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}), # before
476 ($self->can ("invoke_$signal") || sub { 1 })->($self, @args)) # closure
477 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
463} 478}
464 479
465sub find_widget { 480sub find_widget {
466 my ($self, $x, $y) = @_; 481 my ($self, $x, $y) = @_;
467 482
… …
477sub set_parent { 492sub set_parent {
478 my ($self, $parent) = @_; 493 my ($self, $parent) = @_;
479 494
480 Scalar::Util::weaken ($self->{parent} = $parent); 495 Scalar::Util::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible}; 496 $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} 497}
506 498
507sub realloc { 499sub realloc {
508 my ($self) = @_; 500 my ($self) = @_;
509 501
… …
789 781
790sub size_request { 782sub size_request {
791 $_[0]{children}[0]->size_request 783 $_[0]{children}[0]->size_request
792} 784}
793 785
794sub size_allocate { 786sub invoke_size_allocate {
795 my ($self, $w, $h) = @_; 787 my ($self, $w, $h) = @_;
796 788
797 $self->{children}[0]->configure (0, 0, $w, $h); 789 $self->{children}[0]->configure (0, 0, $w, $h);
790
791 1
798} 792}
799 793
800############################################################################# 794#############################################################################
801 795
802# back-buffered drawing area 796# back-buffered drawing area
… …
818 812
819 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 813 $ROOT->on_post_alloc ($self => sub { $self->render_child });
820 $self->SUPER::update; 814 $self->SUPER::update;
821} 815}
822 816
823sub size_allocate { 817sub invoke_size_allocate {
824 my ($self, $w, $h) = @_; 818 my ($self, $w, $h) = @_;
825 819
826 $self->SUPER::size_allocate ($w, $h);
827 $self->update; 820 $self->update;
821
822 $self->SUPER::invoke_size_allocate ($w, $h)
828} 823}
829 824
830sub _render { 825sub _render {
831 my ($self) = @_; 826 my ($self) = @_;
832 827
… …
893 $h = 10 if $self->{scroll_y}; 888 $h = 10 if $self->{scroll_y};
894 889
895 ($w, $h) 890 ($w, $h)
896} 891}
897 892
898sub size_allocate { 893sub invoke_size_allocate {
899 my ($self, $w, $h) = @_; 894 my ($self, $w, $h) = @_;
900 895
901 my $child = $self->child; 896 my $child = $self->child;
902 897
903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 898 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 899 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
905 900
906 $self->child->configure (0, 0, $w, $h); 901 $self->child->configure (0, 0, $w, $h);
907 $self->update; 902 $self->update;
903
904 1
908} 905}
909 906
910sub set_offset { 907sub set_offset {
911 my ($self, $x, $y) = @_; 908 my ($self, $x, $y) = @_;
912 909
… …
1002 # todo: overwrite size_allocate of child 999 # todo: overwrite size_allocate of child
1003 my $child = $self->{vp}->child; 1000 my $child = $self->{vp}->child;
1004 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1001 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1005} 1002}
1006 1003
1007sub size_allocate { 1004sub invoke_size_allocate {
1008 my ($self, $w, $h) = @_; 1005 my ($self, $w, $h) = @_;
1009
1010 $self->SUPER::size_allocate ($w, $h);
1011 1006
1012 my $child = $self->{vp}->child; 1007 my $child = $self->{vp}->child;
1013 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1008 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1009
1010 $self->SUPER::invoke_size_allocate ($w, $h)
1014} 1011}
1015 1012
1016#TODO# update range on size_allocate depending on child 1013#TODO# update range on size_allocate depending on child
1017# update viewport offset on scroll 1014# update viewport offset on scroll
1018 1015
… …
1090 valign => 1, 1087 valign => 1,
1091 text => $self->{title}, 1088 text => $self->{title},
1092 fontsize => $self->{border}, 1089 fontsize => $self->{border},
1093 if exists $self->{title}; 1090 if exists $self->{title};
1094 1091
1095 unless ($self->{no_close_button}) { 1092 if ($self->{has_close_button}) {
1096 $self->{close_btn} = 1093 $self->{close_button} =
1097 new CFClient::UI::ImageButton 1094 new CFClient::UI::ImageButton
1098 image => 'x1_close.png', 1095 image => 'x1_close.png',
1099 on_activate => sub { $self->hide }; 1096 on_activate => sub { $self->hide };
1100 1097
1101 $self->CFClient::UI::Container::add ($self->{close_btn}); 1098 $self->CFClient::UI::Container::add ($self->{close_button});
1102 } 1099 }
1103 1100
1104 $self 1101 $self
1105} 1102}
1106 1103
1107sub add { 1104sub add {
1108 my ($self, @widgets) = @_; 1105 my ($self, @widgets) = @_;
1109 1106
1110 $self->SUPER::add (@widgets); 1107 $self->SUPER::add (@widgets);
1111 $self->CFClient::UI::Container::add ($self->{close_btn}) if $self->{close_btn}; 1108 $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}; 1109 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1113} 1110}
1114 1111
1115sub border { 1112sub border {
1116 int $_[0]{border} * $::FONTSIZE 1113 int $_[0]{border} * $::FONTSIZE
… …
1120 my ($self) = @_; 1117 my ($self) = @_;
1121 1118
1122 $self->{title_widget}->size_request 1119 $self->{title_widget}->size_request
1123 if $self->{title_widget}; 1120 if $self->{title_widget};
1124 1121
1125 $self->{close_btn}->size_request 1122 $self->{close_button}->size_request
1126 if $self->{close_btn}; 1123 if $self->{close_button};
1127 1124
1128 my ($w, $h) = $self->SUPER::size_request; 1125 my ($w, $h) = $self->SUPER::size_request;
1129 1126
1130 ( 1127 (
1131 $w + $self->border * 2, 1128 $w + $self->border * 2,
1132 $h + $self->border * 2, 1129 $h + $self->border * 2,
1133 ) 1130 )
1134} 1131}
1135 1132
1136sub size_allocate { 1133sub invoke_size_allocate {
1137 my ($self, $w, $h) = @_; 1134 my ($self, $w, $h) = @_;
1138 1135
1139 if ($self->{title_widget}) { 1136 if ($self->{title_widget}) {
1140 $self->{title_widget}{w} = $w; 1137 $self->{title_widget}{w} = $w;
1141 $self->{title_widget}{h} = $h; 1138 $self->{title_widget}{h} = $h;
1142 $self->{title_widget}->size_allocate ($w, $h); 1139 $self->{title_widget}->invoke_size_allocate ($w, $h);
1143 } 1140 }
1144 1141
1145 my $border = $self->border; 1142 my $border = $self->border;
1146 1143
1147 $h -= List::Util::max 0, $border * 2; 1144 $h -= List::Util::max 0, $border * 2;
1148 $w -= List::Util::max 0, $border * 2; 1145 $w -= List::Util::max 0, $border * 2;
1149 1146
1150 $self->child->configure ($border, $border, $w, $h); 1147 $self->child->configure ($border, $border, $w, $h);
1151 1148
1152 $self->{close_btn}->configure ($self->{w} - (2 * $border), 0, $border, $border) 1149 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1153 if $self->{close_btn}; 1150 if $self->{close_button};
1154}
1155 1151
1152 1
1153}
1154
1156sub button_down { 1155sub invoke_button_down {
1157 my ($self, $ev, $x, $y) = @_; 1156 my ($self, $ev, $x, $y) = @_;
1158 1157
1159 my ($w, $h) = @$self{qw(w h)}; 1158 my ($w, $h) = @$self{qw(w h)};
1160 my $border = $self->border; 1159 my $border = $self->border;
1161 1160
… …
1192 1191
1193 ($x, $y) = ($ev->{x}, $ev->{y}); 1192 ($x, $y) = ($ev->{x}, $ev->{y});
1194 1193
1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1194 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1196 # HACK: the next line is required to enforce placement 1195 # HACK: the next line is required to enforce placement
1197 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1196 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1198 }; 1197 };
1199 } else { 1198 } else {
1200 return 0; 1199 return 0;
1201 } 1200 }
1202 1201
1203 1 1202 1
1204} 1203}
1205 1204
1206sub button_up { 1205sub invoke_button_up {
1207 my ($self, $ev, $x, $y) = @_; 1206 my ($self, $ev, $x, $y) = @_;
1208 1207
1209 $self->{close_btn}->button_up ($ev, $x, $y)
1210 if $self->{close_btn};
1211
1212 !!delete $self->{motion} 1208 ! ! delete $self->{motion}
1213} 1209}
1214 1210
1215sub mouse_motion { 1211sub invoke_mouse_motion {
1216 my ($self, $ev, $x, $y) = @_; 1212 my ($self, $ev, $x, $y) = @_;
1217 1213
1218 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1214 $self->{motion}->($ev, $x, $y) if $self->{motion};
1219 1215
1220 !!$self->{motion} 1216 ! ! $self->{motion}
1221} 1217}
1222 1218
1223sub _draw { 1219sub _draw {
1224 my ($self) = @_; 1220 my ($self) = @_;
1225 1221
… …
1258 $self->{title_widget}->_draw; 1254 $self->{title_widget}->_draw;
1259 1255
1260 glTranslate 0, - ($border - $self->{h}); 1256 glTranslate 0, - ($border - $self->{h});
1261 } 1257 }
1262 1258
1263 $self->{close_btn}->draw 1259 $self->{close_button}->draw
1264 if $self->{close_btn}; 1260 if $self->{close_button};
1265} 1261}
1266 1262
1267############################################################################# 1263#############################################################################
1268 1264
1269package CFClient::UI::Table; 1265package CFClient::UI::Table;
… …
1348 (sum @$ws), 1344 (sum @$ws),
1349 (sum @$hs), 1345 (sum @$hs),
1350 ) 1346 )
1351} 1347}
1352 1348
1353sub size_allocate { 1349sub invoke_size_allocate {
1354 my ($self, $w, $h) = @_; 1350 my ($self, $w, $h) = @_;
1355 1351
1356 my ($ws, $hs) = $self->get_wh; 1352 my ($ws, $hs) = $self->get_wh;
1357 1353
1358 my $req_w = (sum @$ws) || 1; 1354 my $req_w = (sum @$ws) || 1;
… …
1390 } 1386 }
1391 1387
1392 $y += $row_h; 1388 $y += $row_h;
1393 } 1389 }
1394 1390
1391 1
1395} 1392}
1396 1393
1397sub find_widget { 1394sub find_widget {
1398 my ($self, $x, $y) = @_; 1395 my ($self, $x, $y) = @_;
1399 1396
… …
1436 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1433 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1437 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1434 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1438 ) 1435 )
1439} 1436}
1440 1437
1441sub size_allocate { 1438sub invoke_size_allocate {
1442 my ($self, $w, $h) = @_; 1439 my ($self, $w, $h) = @_;
1443 1440
1444 my $space = $self->{vertical} ? $h : $w; 1441 my $space = $self->{vertical} ? $h : $w;
1445 my $children = $self->{children}; 1442 my $children = $self->{children};
1446 1443
… …
1633 }; 1630 };
1634 1631
1635 @{ $self->{size_req} } 1632 @{ $self->{size_req} }
1636} 1633}
1637 1634
1638sub size_allocate { 1635sub invoke_size_allocate {
1639 my ($self, $w, $h) = @_; 1636 my ($self, $w, $h) = @_;
1640 1637
1641 delete $self->{ox}; 1638 delete $self->{ox};
1642 1639
1643 delete $self->{texture} 1640 delete $self->{texture}
1644 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1641 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1642
1643 1
1645} 1644}
1646 1645
1647sub set_fontsize { 1646sub set_fontsize {
1648 my ($self, $fontsize) = @_; 1647 my ($self, $fontsize) = @_;
1649 1648
… …
1742 1741
1743 $text =~ s/./*/g if $self->{hidden}; 1742 $text =~ s/./*/g if $self->{hidden};
1744 $self->{layout}->set_text ("$text "); 1743 $self->{layout}->set_text ("$text ");
1745 delete $self->{size_req}; 1744 delete $self->{size_req};
1746 1745
1747 $self->_emit (changed => $self->{text}); 1746 $self->emit (changed => $self->{text});
1748 1747
1749 $self->realloc; 1748 $self->realloc;
1750 $self->update; 1749 $self->update;
1751} 1750}
1752 1751
… …
1767 my ($w, $h) = $self->SUPER::size_request; 1766 my ($w, $h) = $self->SUPER::size_request;
1768 1767
1769 ($w + 1, $h) # add 1 for cursor 1768 ($w + 1, $h) # add 1 for cursor
1770} 1769}
1771 1770
1772sub key_down { 1771sub invoke_key_down {
1773 my ($self, $ev) = @_; 1772 my ($self, $ev) = @_;
1774 1773
1775 my $mod = $ev->{mod}; 1774 my $mod = $ev->{mod};
1776 my $sym = $ev->{sym}; 1775 my $sym = $ev->{sym};
1777 my $uni = $ev->{unicode}; 1776 my $uni = $ev->{unicode};
… …
1789 } elsif ($sym == CFClient::SDLK_HOME) { 1788 } elsif ($sym == CFClient::SDLK_HOME) {
1790 $self->{cursor} = 0; 1789 $self->{cursor} = 0;
1791 } elsif ($sym == CFClient::SDLK_END) { 1790 } elsif ($sym == CFClient::SDLK_END) {
1792 $self->{cursor} = length $text; 1791 $self->{cursor} = length $text;
1793 } elsif ($uni == 27) { 1792 } elsif ($uni == 27) {
1794 $self->_emit ('escape'); 1793 $self->emit ('escape');
1795 } elsif ($uni) { 1794 } elsif ($uni) {
1796 substr $text, $self->{cursor}++, 0, chr $uni; 1795 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else { 1796 } else {
1798 return 0; 1797 return 0;
1799 } 1798 }
… …
1803 $self->realloc; 1802 $self->realloc;
1804 1803
1805 1 1804 1
1806} 1805}
1807 1806
1808sub focus_in { 1807sub invoke_focus_in {
1809 my ($self) = @_; 1808 my ($self) = @_;
1810 1809
1811 $self->{last_activity} = $::NOW; 1810 $self->{last_activity} = $::NOW;
1812 1811
1813 $self->SUPER::focus_in; 1812 $self->SUPER::invoke_focus_in
1814} 1813}
1815 1814
1816sub button_down { 1815sub invoke_button_down {
1817 my ($self, $ev, $x, $y) = @_; 1816 my ($self, $ev, $x, $y) = @_;
1818 1817
1819 $self->SUPER::button_down ($ev, $x, $y); 1818 $self->SUPER::invoke_button_down ($ev, $x, $y);
1820 1819
1821 my $idx = $self->{layout}->xy_to_index ($x, $y); 1820 my $idx = $self->{layout}->xy_to_index ($x, $y);
1822 1821
1823 # byte-index to char-index 1822 # byte-index to char-index
1824 my $text = $self->{text}; 1823 my $text = $self->{text};
… …
1829 $self->update; 1828 $self->update;
1830 1829
1831 1 1830 1
1832} 1831}
1833 1832
1834sub mouse_motion { 1833sub invoke_mouse_motion {
1835 my ($self, $ev, $x, $y) = @_; 1834 my ($self, $ev, $x, $y) = @_;
1836# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1835# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1837 1836
1838 0 1837 1
1839} 1838}
1840 1839
1841sub _draw { 1840sub _draw {
1842 my ($self) = @_; 1841 my ($self) = @_;
1843 1842
… …
1884 1883
1885our @ISA = CFClient::UI::EntryBase::; 1884our @ISA = CFClient::UI::EntryBase::;
1886 1885
1887use CFClient::OpenGL; 1886use CFClient::OpenGL;
1888 1887
1889sub key_down { 1888sub invoke_key_down {
1890 my ($self, $ev) = @_; 1889 my ($self, $ev) = @_;
1891 1890
1892 my $sym = $ev->{sym}; 1891 my $sym = $ev->{sym};
1893 1892
1894 if ($sym == 13) { 1893 if ($sym == 13) {
1895 unshift @{$self->{history}}, 1894 unshift @{$self->{history}},
1896 my $txt = $self->get_text; 1895 my $txt = $self->get_text;
1897 $self->{history_pointer} = -1; 1896 $self->{history_pointer} = -1;
1898 $self->{history_saveback} = ''; 1897 $self->{history_saveback} = '';
1899 $self->_emit (activate => $txt); 1898 $self->emit (activate => $txt);
1900 $self->update; 1899 $self->update;
1901 1900
1902 } elsif ($sym == CFClient::SDLK_UP) { 1901 } elsif ($sym == CFClient::SDLK_UP) {
1903 if ($self->{history_pointer} < 0) { 1902 if ($self->{history_pointer} < 0) {
1904 $self->{history_saveback} = $self->get_text; 1903 $self->{history_saveback} = $self->get_text;
… …
1920 } else { 1919 } else {
1921 $self->set_text ($self->{history_saveback}); 1920 $self->set_text ($self->{history_saveback});
1922 } 1921 }
1923 1922
1924 } else { 1923 } else {
1925 return $self->SUPER::key_down ($ev) 1924 return $self->SUPER::invoke_key_down ($ev)
1926 } 1925 }
1927 1926
1928 1 1927 1
1929} 1928}
1930 1929
… …
1954 can_events => 1, 1953 can_events => 1,
1955 @_ 1954 @_
1956 ) 1955 )
1957} 1956}
1958 1957
1959sub activate { }
1960
1961sub button_up { 1958sub invoke_button_up {
1962 my ($self, $ev, $x, $y) = @_; 1959 my ($self, $ev, $x, $y) = @_;
1963 1960
1964 $self->emit ("activate") 1961 $self->emit ("activate")
1965 if $x >= 0 && $x < $self->{w} 1962 if $x >= 0 && $x < $self->{w}
1966 && $y >= 0 && $y < $self->{h}; 1963 && $y >= 0 && $y < $self->{h};
… …
2008 can_events => 1, 2005 can_events => 1,
2009 @_ 2006 @_
2010 ); 2007 );
2011} 2008}
2012 2009
2013sub activate { }
2014
2015sub button_up { 2010sub invoke_button_up {
2016 my ($self, $ev, $x, $y) = @_; 2011 my ($self, $ev, $x, $y) = @_;
2017 2012
2018 $self->emit ("activate") 2013 $self->emit ("activate")
2019 if $x >= 0 && $x < $self->{w} 2014 if $x >= 0 && $x < $self->{w}
2020 && $y >= 0 && $y < $self->{h}; 2015 && $y >= 0 && $y < $self->{h};
… …
2054 my ($self) = @_; 2049 my ($self) = @_;
2055 2050
2056 (6) x 2 2051 (6) x 2
2057} 2052}
2058 2053
2059sub button_down { 2054sub invoke_button_down {
2060 my ($self, $ev, $x, $y) = @_; 2055 my ($self, $ev, $x, $y) = @_;
2061 2056
2062 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2057 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2063 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2058 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2064 $self->{state} = !$self->{state}; 2059 $self->{state} = !$self->{state};
2065 $self->_emit (changed => $self->{state}); 2060 $self->emit (changed => $self->{state});
2066 } else { 2061 } else {
2067 return 0 2062 return 0
2068 } 2063 }
2069 2064
2070 1 2065 1
… …
2367 $self->update; 2362 $self->update;
2368 2363
2369 $self 2364 $self
2370} 2365}
2371 2366
2372sub changed { }
2373
2374sub set_range { 2367sub set_range {
2375 my ($self, $range) = @_; 2368 my ($self, $range) = @_;
2376 2369
2377 ($range, $self->{range}) = ($self->{range}, $range); 2370 ($range, $self->{range}) = ($self->{range}, $range);
2378 2371
… …
2398 if $unit; 2391 if $unit;
2399 2392
2400 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2393 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2401 2394
2402 if ($value != $old_value) { 2395 if ($value != $old_value) {
2403 $self->_emit (changed => $value); 2396 $self->emit (changed => $value);
2404 $self->update; 2397 $self->update;
2405 } 2398 }
2406} 2399}
2407 2400
2408sub size_request { 2401sub size_request {
2409 my ($self) = @_; 2402 my ($self) = @_;
2410 2403
2411 ($self->{req_w}, $self->{req_h}) 2404 ($self->{req_w}, $self->{req_h})
2412} 2405}
2413 2406
2414sub button_down { 2407sub invoke_button_down {
2415 my ($self, $ev, $x, $y) = @_; 2408 my ($self, $ev, $x, $y) = @_;
2416 2409
2417 $self->SUPER::button_down ($ev, $x, $y); 2410 $self->SUPER::invoke_button_down ($ev, $x, $y);
2418 2411
2419 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2412 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2420 2413
2421 $self->mouse_motion ($ev, $x, $y) 2414 $self->mouse_motion ($ev, $x, $y)
2422} 2415}
2423 2416
2424sub mouse_motion { 2417sub invoke_mouse_motion {
2425 my ($self, $ev, $x, $y) = @_; 2418 my ($self, $ev, $x, $y) = @_;
2426 2419
2427 if ($GRAB == $self) { 2420 if ($GRAB == $self) {
2428 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2421 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2429 2422
… …
2571 2564
2572 $self->{fontsize} = $fontsize; 2565 $self->{fontsize} = $fontsize;
2573 $self->reflow; 2566 $self->reflow;
2574} 2567}
2575 2568
2576sub size_allocate { 2569sub invoke_size_allocate {
2577 my ($self, $w, $h) = @_; 2570 my ($self, $w, $h) = @_;
2578
2579 $self->SUPER::size_allocate ($w, $h);
2580 2571
2581 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2572 $self->{layout}->set_font ($self->{font}) if $self->{font};
2582 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2573 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2583 $self->{layout}->set_width ($self->{children}[0]{w}); 2574 $self->{layout}->set_width ($self->{children}[0]{w});
2584 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2575 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2585 2576
2586 $self->reflow; 2577 $self->reflow;
2578
2579 $self->SUPER::invoke_size_allocate ($w, $h)
2587} 2580}
2588 2581
2589sub text_size { 2582sub text_size {
2590 my ($self, $text, $indent) = @_; 2583 my ($self, $text, $indent) = @_;
2591 2584
… …
2841 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2834 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2842 2835
2843 ($w + 4, $h + 4) 2836 ($w + 4, $h + 4)
2844} 2837}
2845 2838
2846sub size_allocate { 2839sub invoke_size_allocate {
2847 my ($self, $w, $h) = @_; 2840 my ($self, $w, $h) = @_;
2848 2841
2849 $self->SUPER::size_allocate ($w - 4, $h - 4); 2842 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2850} 2843}
2851 2844
2852sub visibility_change { 2845sub invoke_visibility_change {
2853 my ($self, $visible) = @_; 2846 my ($self, $visible) = @_;
2854 2847
2855 return unless $visible; 2848 return unless $visible;
2856 2849
2857 $self->{root}->on_post_alloc ("move_$self" => sub { 2850 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
3024 3017
3025# popup given the event (must be a mouse button down event currently) 3018# popup given the event (must be a mouse button down event currently)
3026sub popup { 3019sub popup {
3027 my ($self, $ev) = @_; 3020 my ($self, $ev) = @_;
3028 3021
3029 $self->_emit ("popdown"); 3022 $self->emit ("popdown");
3030 3023
3031 # maybe save $GRAB? must be careful about events... 3024 # maybe save $GRAB? must be careful about events...
3032 $GRAB = $self; 3025 $GRAB = $self;
3033 $self->{button} = $ev->{button}; 3026 $self->{button} = $ev->{button};
3034 3027
3035 $self->show; 3028 $self->show;
3036 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3029 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
3037} 3030}
3038 3031
3039sub mouse_motion { 3032sub invoke_mouse_motion {
3040 my ($self, $ev, $x, $y) = @_; 3033 my ($self, $ev, $x, $y) = @_;
3041 3034
3042 # TODO: should use vbox->find_widget or so 3035 # TODO: should use vbox->find_widget or so
3043 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3036 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
3044 $self->{hover} = $self->{item}{$HOVER}; 3037 $self->{hover} = $self->{item}{$HOVER};
3045 3038
3046 0 3039 0
3047} 3040}
3048 3041
3049sub button_up { 3042sub invoke_button_up {
3050 my ($self, $ev, $x, $y) = @_; 3043 my ($self, $ev, $x, $y) = @_;
3051 3044
3052 if ($ev->{button} == $self->{button}) { 3045 if ($ev->{button} == $self->{button}) {
3053 undef $GRAB; 3046 undef $GRAB;
3054 $self->hide; 3047 $self->hide;
3055 3048
3056 $self->_emit ("popdown"); 3049 $self->emit ("popdown");
3057 $self->{hover}[1]->() if $self->{hover}; 3050 $self->{hover}[1]->() if $self->{hover};
3058 } else { 3051 } else {
3059 return 0 3052 return 0
3060 } 3053 }
3061 3054
… …
3098 : $self->{children}[$page_or_widget]; 3091 : $self->{children}[$page_or_widget];
3099 3092
3100 $self->{current} = $widget; 3093 $self->{current} = $widget;
3101 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3094 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3102 3095
3103 $self->_emit (page_changed => $self->{current}); 3096 $self->emit (page_changed => $self->{current});
3104 3097
3105 $self->realloc; 3098 $self->realloc;
3106} 3099}
3107 3100
3108sub visible_children { 3101sub visible_children {
… …
3113 my ($self) = @_; 3106 my ($self) = @_;
3114 3107
3115 $self->{current}->size_request 3108 $self->{current}->size_request
3116} 3109}
3117 3110
3118sub size_allocate { 3111sub invoke_size_allocate {
3119 my ($self, $w, $h) = @_; 3112 my ($self, $w, $h) = @_;
3120 3113
3121 $self->{current}->configure (0, 0, $w, $h); 3114 $self->{current}->configure (0, 0, $w, $h);
3115
3116 1
3122} 3117}
3123 3118
3124sub _draw { 3119sub _draw {
3125 my ($self) = @_; 3120 my ($self) = @_;
3126 3121
… …
3165 3160
3166sub set_current_page { 3161sub set_current_page {
3167 my ($self, $page) = @_; 3162 my ($self, $page) = @_;
3168 3163
3169 $self->{multiplexer}->set_current_page ($page); 3164 $self->{multiplexer}->set_current_page ($page);
3170 $self->_emit (page_changed => $self->{multiplexer}{current}); 3165 $self->emit (page_changed => $self->{multiplexer}{current});
3171} 3166}
3172 3167
3173############################################################################# 3168#############################################################################
3174 3169
3175package CFClient::UI::Combobox; 3170package CFClient::UI::Combobox;
… …
3190 $self->_set_value ($self->{value}); 3185 $self->_set_value ($self->{value});
3191 3186
3192 $self 3187 $self
3193} 3188}
3194 3189
3195sub button_down { 3190sub invoke_button_down {
3196 my ($self, $ev) = @_; 3191 my ($self, $ev) = @_;
3197 3192
3198 my @menu_items; 3193 my @menu_items;
3199 3194
3200 for (@{ $self->{options} }) { 3195 for (@{ $self->{options} }) {
… …
3221 my ($self, $value) = @_; 3216 my ($self, $value) = @_;
3222 3217
3223 return unless $self->{value} ne $value; 3218 return unless $self->{value} ne $value;
3224 3219
3225 $self->_set_value ($value); 3220 $self->_set_value ($value);
3226 $self->_emit (changed => $value); 3221 $self->emit (changed => $value);
3227} 3222}
3228 3223
3229############################################################################# 3224#############################################################################
3230 3225
3231package CFClient::UI::Statusbox; 3226package CFClient::UI::Statusbox;
… …
3772 $coord = $max - $size if $coord > $max - $size; 3767 $coord = $max - $size if $coord > $max - $size;
3773 3768
3774 int $coord + 0.5 3769 int $coord + 0.5
3775} 3770}
3776 3771
3777sub size_allocate { 3772sub invoke_size_allocate {
3778 my ($self, $w, $h) = @_; 3773 my ($self, $w, $h) = @_;
3779 3774
3780 for my $child ($self->children) { 3775 for my $child ($self->children) {
3781 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3776 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3782 3777
… …
3786 $X = _to_pixel $X, $W, $self->{w}; 3781 $X = _to_pixel $X, $W, $self->{w};
3787 $Y = _to_pixel $Y, $H, $self->{h}; 3782 $Y = _to_pixel $Y, $H, $self->{h};
3788 3783
3789 $child->configure ($X, $Y, $W, $H); 3784 $child->configure ($X, $Y, $W, $H);
3790 } 3785 }
3786
3787 1
3791} 3788}
3792 3789
3793sub coord2local { 3790sub coord2local {
3794 my ($self, $x, $y) = @_; 3791 my ($self, $x, $y) = @_;
3795 3792

Diff Legend

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