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

Diff Legend

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