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.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
1093 if ($self->{has_close_button}) {
1094 $self->{close_button} =
1095 new CFClient::UI::ImageButton
1096 image => 'x1_close.png',
1097 on_activate => sub { $self->hide };
1098
1099 $self->CFClient::UI::Container::add ($self->{close_button});
1100 }
1101
1095 $self 1102 $self
1096} 1103}
1097 1104
1098sub add { 1105sub add {
1099 my ($self, @widgets) = @_; 1106 my ($self, @widgets) = @_;
1100 1107
1101 $self->SUPER::add (@widgets); 1108 $self->SUPER::add (@widgets);
1109 $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}; 1110 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1103} 1111}
1104 1112
1105sub border { 1113sub border {
1106 int $_[0]{border} * $::FONTSIZE 1114 int $_[0]{border} * $::FONTSIZE
… …
1109sub size_request { 1117sub size_request {
1110 my ($self) = @_; 1118 my ($self) = @_;
1111 1119
1112 $self->{title_widget}->size_request 1120 $self->{title_widget}->size_request
1113 if $self->{title_widget}; 1121 if $self->{title_widget};
1122
1123 $self->{close_button}->size_request
1124 if $self->{close_button};
1114 1125
1115 my ($w, $h) = $self->SUPER::size_request; 1126 my ($w, $h) = $self->SUPER::size_request;
1116 1127
1117 ( 1128 (
1118 $w + $self->border * 2, 1129 $w + $self->border * 2,
1119 $h + $self->border * 2, 1130 $h + $self->border * 2,
1120 ) 1131 )
1121} 1132}
1122 1133
1123sub size_allocate { 1134sub invoke_size_allocate {
1124 my ($self, $w, $h) = @_; 1135 my ($self, $w, $h) = @_;
1125 1136
1126 if ($self->{title_widget}) { 1137 if ($self->{title_widget}) {
1127 $self->{title_widget}{w} = $w; 1138 $self->{title_widget}{w} = $w;
1128 $self->{title_widget}{h} = $h; 1139 $self->{title_widget}{h} = $h;
1129 $self->{title_widget}->size_allocate ($w, $h); 1140 $self->{title_widget}->invoke_size_allocate ($w, $h);
1130 } 1141 }
1131 1142
1132 my $border = $self->border; 1143 my $border = $self->border;
1133 1144
1134 $h -= List::Util::max 0, $border * 2; 1145 $h -= List::Util::max 0, $border * 2;
1135 $w -= List::Util::max 0, $border * 2; 1146 $w -= List::Util::max 0, $border * 2;
1136 1147
1137 $self->child->configure ($border, $border, $w, $h); 1148 $self->child->configure ($border, $border, $w, $h);
1138}
1139 1149
1150 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1151 if $self->{close_button};
1152
1153 1
1154}
1155
1140sub button_down { 1156sub invoke_button_down {
1141 my ($self, $ev, $x, $y) = @_; 1157 my ($self, $ev, $x, $y) = @_;
1142 1158
1143 my ($w, $h) = @$self{qw(w h)}; 1159 my ($w, $h) = @$self{qw(w h)};
1144 my $border = $self->border; 1160 my $border = $self->border;
1145 1161
… …
1176 1192
1177 ($x, $y) = ($ev->{x}, $ev->{y}); 1193 ($x, $y) = ($ev->{x}, $ev->{y});
1178 1194
1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180 # HACK: the next line is required to enforce placement 1196 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h}); 1197 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1182 }; 1198 };
1183 } else { 1199 } else {
1184 return 0; 1200 return 0;
1185 } 1201 }
1186 1202
1187 1 1203 1
1188} 1204}
1189 1205
1190sub button_up { 1206sub invoke_button_up {
1191 my ($self, $ev, $x, $y) = @_; 1207 my ($self, $ev, $x, $y) = @_;
1192 1208
1193 !!delete $self->{motion} 1209 ! ! delete $self->{motion}
1194} 1210}
1195 1211
1196sub mouse_motion { 1212sub invoke_mouse_motion {
1197 my ($self, $ev, $x, $y) = @_; 1213 my ($self, $ev, $x, $y) = @_;
1198 1214
1199 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1215 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200 1216
1201 !!$self->{motion} 1217 ! ! $self->{motion}
1202} 1218}
1203 1219
1204sub _draw { 1220sub _draw {
1205 my ($self) = @_; 1221 my ($self) = @_;
1206 1222
… …
1235 $child->draw; 1251 $child->draw;
1236 1252
1237 if ($self->{title_widget}) { 1253 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h}; 1254 glTranslate 0, $border - $self->{h};
1239 $self->{title_widget}->_draw; 1255 $self->{title_widget}->_draw;
1256
1257 glTranslate 0, - ($border - $self->{h});
1240 } 1258 }
1259
1260 $self->{close_button}->draw
1261 if $self->{close_button};
1241} 1262}
1242 1263
1243############################################################################# 1264#############################################################################
1244 1265
1245package CFClient::UI::Table; 1266package CFClient::UI::Table;
… …
1324 (sum @$ws), 1345 (sum @$ws),
1325 (sum @$hs), 1346 (sum @$hs),
1326 ) 1347 )
1327} 1348}
1328 1349
1329sub size_allocate { 1350sub invoke_size_allocate {
1330 my ($self, $w, $h) = @_; 1351 my ($self, $w, $h) = @_;
1331 1352
1332 my ($ws, $hs) = $self->get_wh; 1353 my ($ws, $hs) = $self->get_wh;
1333 1354
1334 my $req_w = (sum @$ws) || 1; 1355 my $req_w = (sum @$ws) || 1;
… …
1366 } 1387 }
1367 1388
1368 $y += $row_h; 1389 $y += $row_h;
1369 } 1390 }
1370 1391
1392 1
1371} 1393}
1372 1394
1373sub find_widget { 1395sub find_widget {
1374 my ($self, $x, $y) = @_; 1396 my ($self, $x, $y) = @_;
1375 1397
… …
1412 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1434 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1413 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1435 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1414 ) 1436 )
1415} 1437}
1416 1438
1417sub size_allocate { 1439sub invoke_size_allocate {
1418 my ($self, $w, $h) = @_; 1440 my ($self, $w, $h) = @_;
1419 1441
1420 my $space = $self->{vertical} ? $h : $w; 1442 my $space = $self->{vertical} ? $h : $w;
1421 my $children = $self->{children}; 1443 my $children = $self->{children};
1422 1444
… …
1609 }; 1631 };
1610 1632
1611 @{ $self->{size_req} } 1633 @{ $self->{size_req} }
1612} 1634}
1613 1635
1614sub size_allocate { 1636sub invoke_size_allocate {
1615 my ($self, $w, $h) = @_; 1637 my ($self, $w, $h) = @_;
1616 1638
1617 delete $self->{ox}; 1639 delete $self->{ox};
1618 1640
1619 delete $self->{texture} 1641 delete $self->{texture}
1620 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
1621} 1645}
1622 1646
1623sub set_fontsize { 1647sub set_fontsize {
1624 my ($self, $fontsize) = @_; 1648 my ($self, $fontsize) = @_;
1625 1649
… …
1718 1742
1719 $text =~ s/./*/g if $self->{hidden}; 1743 $text =~ s/./*/g if $self->{hidden};
1720 $self->{layout}->set_text ("$text "); 1744 $self->{layout}->set_text ("$text ");
1721 delete $self->{size_req}; 1745 delete $self->{size_req};
1722 1746
1723 $self->_emit (changed => $self->{text}); 1747 $self->emit (changed => $self->{text});
1724 1748
1725 $self->realloc; 1749 $self->realloc;
1726 $self->update; 1750 $self->update;
1727} 1751}
1728 1752
… …
1743 my ($w, $h) = $self->SUPER::size_request; 1767 my ($w, $h) = $self->SUPER::size_request;
1744 1768
1745 ($w + 1, $h) # add 1 for cursor 1769 ($w + 1, $h) # add 1 for cursor
1746} 1770}
1747 1771
1748sub key_down { 1772sub invoke_key_down {
1749 my ($self, $ev) = @_; 1773 my ($self, $ev) = @_;
1750 1774
1751 my $mod = $ev->{mod}; 1775 my $mod = $ev->{mod};
1752 my $sym = $ev->{sym}; 1776 my $sym = $ev->{sym};
1753 my $uni = $ev->{unicode}; 1777 my $uni = $ev->{unicode};
… …
1765 } elsif ($sym == CFClient::SDLK_HOME) { 1789 } elsif ($sym == CFClient::SDLK_HOME) {
1766 $self->{cursor} = 0; 1790 $self->{cursor} = 0;
1767 } elsif ($sym == CFClient::SDLK_END) { 1791 } elsif ($sym == CFClient::SDLK_END) {
1768 $self->{cursor} = length $text; 1792 $self->{cursor} = length $text;
1769 } elsif ($uni == 27) { 1793 } elsif ($uni == 27) {
1770 $self->_emit ('escape'); 1794 $self->emit ('escape');
1771 } elsif ($uni) { 1795 } elsif ($uni) {
1772 substr $text, $self->{cursor}++, 0, chr $uni; 1796 substr $text, $self->{cursor}++, 0, chr $uni;
1773 } else { 1797 } else {
1774 return 0; 1798 return 0;
1775 } 1799 }
… …
1779 $self->realloc; 1803 $self->realloc;
1780 1804
1781 1 1805 1
1782} 1806}
1783 1807
1784sub focus_in { 1808sub invoke_focus_in {
1785 my ($self) = @_; 1809 my ($self) = @_;
1786 1810
1787 $self->{last_activity} = $::NOW; 1811 $self->{last_activity} = $::NOW;
1788 1812
1789 $self->SUPER::focus_in; 1813 $self->SUPER::invoke_focus_in
1790} 1814}
1791 1815
1792sub button_down { 1816sub invoke_button_down {
1793 my ($self, $ev, $x, $y) = @_; 1817 my ($self, $ev, $x, $y) = @_;
1794 1818
1795 $self->SUPER::button_down ($ev, $x, $y); 1819 $self->SUPER::invoke_button_down ($ev, $x, $y);
1796 1820
1797 my $idx = $self->{layout}->xy_to_index ($x, $y); 1821 my $idx = $self->{layout}->xy_to_index ($x, $y);
1798 1822
1799 # byte-index to char-index 1823 # byte-index to char-index
1800 my $text = $self->{text}; 1824 my $text = $self->{text};
… …
1805 $self->update; 1829 $self->update;
1806 1830
1807 1 1831 1
1808} 1832}
1809 1833
1810sub mouse_motion { 1834sub invoke_mouse_motion {
1811 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1812# 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#
1813 1837
1814 0 1838 1
1815} 1839}
1816 1840
1817sub _draw { 1841sub _draw {
1818 my ($self) = @_; 1842 my ($self) = @_;
1819 1843
… …
1860 1884
1861our @ISA = CFClient::UI::EntryBase::; 1885our @ISA = CFClient::UI::EntryBase::;
1862 1886
1863use CFClient::OpenGL; 1887use CFClient::OpenGL;
1864 1888
1865sub key_down { 1889sub invoke_key_down {
1866 my ($self, $ev) = @_; 1890 my ($self, $ev) = @_;
1867 1891
1868 my $sym = $ev->{sym}; 1892 my $sym = $ev->{sym};
1869 1893
1870 if ($sym == 13) { 1894 if ($sym == 13) {
1871 unshift @{$self->{history}}, 1895 unshift @{$self->{history}},
1872 my $txt = $self->get_text; 1896 my $txt = $self->get_text;
1897
1873 $self->{history_pointer} = -1; 1898 $self->{history_pointer} = -1;
1874 $self->{history_saveback} = ''; 1899 $self->{history_saveback} = '';
1875 $self->_emit (activate => $txt); 1900 $self->emit (activate => $txt);
1876 $self->update; 1901 $self->update;
1877 1902
1878 } elsif ($sym == CFClient::SDLK_UP) { 1903 } elsif ($sym == CFClient::SDLK_UP) {
1879 if ($self->{history_pointer} < 0) { 1904 if ($self->{history_pointer} < 0) {
1880 $self->{history_saveback} = $self->get_text; 1905 $self->{history_saveback} = $self->get_text;
… …
1896 } else { 1921 } else {
1897 $self->set_text ($self->{history_saveback}); 1922 $self->set_text ($self->{history_saveback});
1898 } 1923 }
1899 1924
1900 } else { 1925 } else {
1901 return $self->SUPER::key_down ($ev) 1926 return $self->SUPER::invoke_key_down ($ev)
1902 } 1927 }
1903 1928
1904 1 1929 1
1905} 1930}
1906 1931
… …
1930 can_events => 1, 1955 can_events => 1,
1931 @_ 1956 @_
1932 ) 1957 )
1933} 1958}
1934 1959
1935sub activate { }
1936
1937sub button_up { 1960sub invoke_button_up {
1938 my ($self, $ev, $x, $y) = @_; 1961 my ($self, $ev, $x, $y) = @_;
1939 1962
1940 $self->emit ("activate") 1963 $self->emit ("activate")
1941 if $x >= 0 && $x < $self->{w} 1964 if $x >= 0 && $x < $self->{w}
1942 && $y >= 0 && $y < $self->{h}; 1965 && $y >= 0 && $y < $self->{h};
… …
1956 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1979 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1957 1980
1958 glDisable GL_TEXTURE_2D; 1981 glDisable GL_TEXTURE_2D;
1959 1982
1960 $self->SUPER::_draw; 1983 $self->SUPER::_draw;
1984}
1985
1986#############################################################################
1987
1988package CFClient::UI::ImageButton;
1989
1990our @ISA = CFClient::UI::Image::;
1991
1992use CFClient::OpenGL;
1993
1994my %textures;
1995
1996sub new {
1997 my $class = shift;
1998
1999 my $self = $class->SUPER::new (
2000 padding_x => 4,
2001 padding_y => 4,
2002 fg => [1, 1, 1],
2003 active_fg => [0, 0, 1],
2004 can_hover => 1,
2005 align => 0,
2006 valign => 0,
2007 can_events => 1,
2008 @_
2009 );
2010}
2011
2012sub invoke_button_up {
2013 my ($self, $ev, $x, $y) = @_;
2014
2015 $self->emit ("activate")
2016 if $x >= 0 && $x < $self->{w}
2017 && $y >= 0 && $y < $self->{h};
2018
2019 1
1961} 2020}
1962 2021
1963############################################################################# 2022#############################################################################
1964 2023
1965package CFClient::UI::CheckBox; 2024package CFClient::UI::CheckBox;
… …
1992 my ($self) = @_; 2051 my ($self) = @_;
1993 2052
1994 (6) x 2 2053 (6) x 2
1995} 2054}
1996 2055
1997sub button_down { 2056sub invoke_button_down {
1998 my ($self, $ev, $x, $y) = @_; 2057 my ($self, $ev, $x, $y) = @_;
1999 2058
2000 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2059 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2001 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2060 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2002 $self->{state} = !$self->{state}; 2061 $self->{state} = !$self->{state};
2003 $self->_emit (changed => $self->{state}); 2062 $self->emit (changed => $self->{state});
2004 } else { 2063 } else {
2005 return 0 2064 return 0
2006 } 2065 }
2007 2066
2008 1 2067 1
… …
2305 $self->update; 2364 $self->update;
2306 2365
2307 $self 2366 $self
2308} 2367}
2309 2368
2310sub changed { }
2311
2312sub set_range { 2369sub set_range {
2313 my ($self, $range) = @_; 2370 my ($self, $range) = @_;
2314 2371
2315 ($range, $self->{range}) = ($self->{range}, $range); 2372 ($range, $self->{range}) = ($self->{range}, $range);
2316 2373
… …
2336 if $unit; 2393 if $unit;
2337 2394
2338 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2395 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2339 2396
2340 if ($value != $old_value) { 2397 if ($value != $old_value) {
2341 $self->_emit (changed => $value); 2398 $self->emit (changed => $value);
2342 $self->update; 2399 $self->update;
2343 } 2400 }
2344} 2401}
2345 2402
2346sub size_request { 2403sub size_request {
2347 my ($self) = @_; 2404 my ($self) = @_;
2348 2405
2349 ($self->{req_w}, $self->{req_h}) 2406 ($self->{req_w}, $self->{req_h})
2350} 2407}
2351 2408
2352sub button_down { 2409sub invoke_button_down {
2353 my ($self, $ev, $x, $y) = @_; 2410 my ($self, $ev, $x, $y) = @_;
2354 2411
2355 $self->SUPER::button_down ($ev, $x, $y); 2412 $self->SUPER::invoke_button_down ($ev, $x, $y);
2356 2413
2357 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2414 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2358 2415
2359 $self->mouse_motion ($ev, $x, $y) 2416 $self->invoke_mouse_motion ($ev, $x, $y)
2360} 2417}
2361 2418
2362sub mouse_motion { 2419sub invoke_mouse_motion {
2363 my ($self, $ev, $x, $y) = @_; 2420 my ($self, $ev, $x, $y) = @_;
2364 2421
2365 if ($GRAB == $self) { 2422 if ($GRAB == $self) {
2366 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2423 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2367 2424
… …
2509 2566
2510 $self->{fontsize} = $fontsize; 2567 $self->{fontsize} = $fontsize;
2511 $self->reflow; 2568 $self->reflow;
2512} 2569}
2513 2570
2514sub size_allocate { 2571sub invoke_size_allocate {
2515 my ($self, $w, $h) = @_; 2572 my ($self, $w, $h) = @_;
2516
2517 $self->SUPER::size_allocate ($w, $h);
2518 2573
2519 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2574 $self->{layout}->set_font ($self->{font}) if $self->{font};
2520 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2575 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2521 $self->{layout}->set_width ($self->{children}[0]{w}); 2576 $self->{layout}->set_width ($self->{children}[0]{w});
2522 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent}); 2577 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2523 2578
2524 $self->reflow; 2579 $self->reflow;
2580
2581 $self->SUPER::invoke_size_allocate ($w, $h)
2525} 2582}
2526 2583
2527sub text_size { 2584sub text_size {
2528 my ($self, $text, $indent) = @_; 2585 my ($self, $text, $indent) = @_;
2529 2586
… …
2779 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2836 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2780 2837
2781 ($w + 4, $h + 4) 2838 ($w + 4, $h + 4)
2782} 2839}
2783 2840
2784sub size_allocate { 2841sub invoke_size_allocate {
2785 my ($self, $w, $h) = @_; 2842 my ($self, $w, $h) = @_;
2786 2843
2787 $self->SUPER::size_allocate ($w - 4, $h - 4); 2844 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2788} 2845}
2789 2846
2790sub visibility_change { 2847sub invoke_visibility_change {
2791 my ($self, $visible) = @_; 2848 my ($self, $visible) = @_;
2792 2849
2793 return unless $visible; 2850 return unless $visible;
2794 2851
2795 $self->{root}->on_post_alloc ("move_$self" => sub { 2852 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2962 3019
2963# 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)
2964sub popup { 3021sub popup {
2965 my ($self, $ev) = @_; 3022 my ($self, $ev) = @_;
2966 3023
2967 $self->_emit ("popdown"); 3024 $self->emit ("popdown");
2968 3025
2969 # maybe save $GRAB? must be careful about events... 3026 # maybe save $GRAB? must be careful about events...
2970 $GRAB = $self; 3027 $GRAB = $self;
2971 $self->{button} = $ev->{button}; 3028 $self->{button} = $ev->{button};
2972 3029
2973 $self->show; 3030 $self->show;
2974 $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);
2975} 3032}
2976 3033
2977sub mouse_motion { 3034sub invoke_mouse_motion {
2978 my ($self, $ev, $x, $y) = @_; 3035 my ($self, $ev, $x, $y) = @_;
2979 3036
2980 # TODO: should use vbox->find_widget or so 3037 # TODO: should use vbox->find_widget or so
2981 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3038 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2982 $self->{hover} = $self->{item}{$HOVER}; 3039 $self->{hover} = $self->{item}{$HOVER};
2983 3040
2984 0 3041 0
2985} 3042}
2986 3043
2987sub button_up { 3044sub invoke_button_up {
2988 my ($self, $ev, $x, $y) = @_; 3045 my ($self, $ev, $x, $y) = @_;
2989 3046
2990 if ($ev->{button} == $self->{button}) { 3047 if ($ev->{button} == $self->{button}) {
2991 undef $GRAB; 3048 undef $GRAB;
2992 $self->hide; 3049 $self->hide;
2993 3050
2994 $self->_emit ("popdown"); 3051 $self->emit ("popdown");
2995 $self->{hover}[1]->() if $self->{hover}; 3052 $self->{hover}[1]->() if $self->{hover};
2996 } else { 3053 } else {
2997 return 0 3054 return 0
2998 } 3055 }
2999 3056
… …
3036 : $self->{children}[$page_or_widget]; 3093 : $self->{children}[$page_or_widget];
3037 3094
3038 $self->{current} = $widget; 3095 $self->{current} = $widget;
3039 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 3096 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3040 3097
3041 $self->_emit (page_changed => $self->{current}); 3098 $self->emit (page_changed => $self->{current});
3042 3099
3043 $self->realloc; 3100 $self->realloc;
3044} 3101}
3045 3102
3046sub visible_children { 3103sub visible_children {
… …
3051 my ($self) = @_; 3108 my ($self) = @_;
3052 3109
3053 $self->{current}->size_request 3110 $self->{current}->size_request
3054} 3111}
3055 3112
3056sub size_allocate { 3113sub invoke_size_allocate {
3057 my ($self, $w, $h) = @_; 3114 my ($self, $w, $h) = @_;
3058 3115
3059 $self->{current}->configure (0, 0, $w, $h); 3116 $self->{current}->configure (0, 0, $w, $h);
3117
3118 1
3060} 3119}
3061 3120
3062sub _draw { 3121sub _draw {
3063 my ($self) = @_; 3122 my ($self) = @_;
3064 3123
… …
3103 3162
3104sub set_current_page { 3163sub set_current_page {
3105 my ($self, $page) = @_; 3164 my ($self, $page) = @_;
3106 3165
3107 $self->{multiplexer}->set_current_page ($page); 3166 $self->{multiplexer}->set_current_page ($page);
3108 $self->_emit (page_changed => $self->{multiplexer}{current}); 3167 $self->emit (page_changed => $self->{multiplexer}{current});
3109} 3168}
3110 3169
3111############################################################################# 3170#############################################################################
3112 3171
3113package CFClient::UI::Combobox; 3172package CFClient::UI::Combobox;
… …
3128 $self->_set_value ($self->{value}); 3187 $self->_set_value ($self->{value});
3129 3188
3130 $self 3189 $self
3131} 3190}
3132 3191
3133sub button_down { 3192sub invoke_button_down {
3134 my ($self, $ev) = @_; 3193 my ($self, $ev) = @_;
3135 3194
3136 my @menu_items; 3195 my @menu_items;
3137 3196
3138 for (@{ $self->{options} }) { 3197 for (@{ $self->{options} }) {
… …
3159 my ($self, $value) = @_; 3218 my ($self, $value) = @_;
3160 3219
3161 return unless $self->{value} ne $value; 3220 return unless $self->{value} ne $value;
3162 3221
3163 $self->_set_value ($value); 3222 $self->_set_value ($value);
3164 $self->_emit (changed => $value); 3223 $self->emit (changed => $value);
3165} 3224}
3166 3225
3167############################################################################# 3226#############################################################################
3168 3227
3169package CFClient::UI::Statusbox; 3228package CFClient::UI::Statusbox;
… …
3456 my ($self) = @_; 3515 my ($self) = @_;
3457 $self->ask_for_bind (1); 3516 $self->ask_for_bind (1);
3458} 3517}
3459 3518
3460sub ask_for_bind { 3519sub ask_for_bind {
3461 my ($self, $commit) = @_; 3520 my ($self, $commit, $end_cb) = @_;
3462 3521
3463 CFClient::Binder::open_binding_dialog (sub { 3522 CFClient::Binder::open_binding_dialog (sub {
3464 my ($mod, $sym) = @_; 3523 my ($mod, $sym) = @_;
3465 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak? 3524 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3466 $self->update_binding_widgets; 3525 $self->update_binding_widgets;
3467 $self->commit if $commit; 3526 $self->commit if $commit;
3527 $end_cb->() if $end_cb;
3468 }); 3528 });
3469} 3529}
3470 3530
3471# $mod and $sym are the modifiers and key symbol 3531# $mod and $sym are the modifiers and key symbol
3472# $cmds is a array ref of strings (the commands) 3532# $cmds is a array ref of strings (the commands)
… …
3490} 3550}
3491 3551
3492# this is a shortcut method that asks for a binding 3552# this is a shortcut method that asks for a binding
3493# and then just binds it. 3553# and then just binds it.
3494sub do_quick_binding { 3554sub do_quick_binding {
3495 my ($self, $cmds) = @_; 3555 my ($self, $cmds, $end_cb) = @_;
3496 $self->set_binding (undef, undef, $cmds, sub { 3556 $self->set_binding (undef, undef, $cmds, sub {
3497 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2]; 3557 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3498 }); 3558 });
3499 $self->ask_for_bind (1); 3559 $self->ask_for_bind (1, $end_cb);
3500} 3560}
3501 3561
3502sub update_binding_widgets { 3562sub update_binding_widgets {
3503 my ($self) = @_; 3563 my ($self) = @_;
3504 my ($mod, $sym, $cmds) = $self->get_binding; 3564 my ($mod, $sym, $cmds) = $self->get_binding;
… …
3709 $coord = $max - $size if $coord > $max - $size; 3769 $coord = $max - $size if $coord > $max - $size;
3710 3770
3711 int $coord + 0.5 3771 int $coord + 0.5
3712} 3772}
3713 3773
3714sub size_allocate { 3774sub invoke_size_allocate {
3715 my ($self, $w, $h) = @_; 3775 my ($self, $w, $h) = @_;
3716 3776
3717 for my $child ($self->children) { 3777 for my $child ($self->children) {
3718 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)};
3719 3779
… …
3723 $X = _to_pixel $X, $W, $self->{w}; 3783 $X = _to_pixel $X, $W, $self->{w};
3724 $Y = _to_pixel $Y, $H, $self->{h}; 3784 $Y = _to_pixel $Y, $H, $self->{h};
3725 3785
3726 $child->configure ($X, $Y, $W, $H); 3786 $child->configure ($X, $Y, $W, $H);
3727 } 3787 }
3788
3789 1
3728} 3790}
3729 3791
3730sub coord2local { 3792sub coord2local {
3731 my ($self, $x, $y) = @_; 3793 my ($self, $x, $y) = @_;
3732 3794

Diff Legend

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