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.268 by root, Thu Jun 1 05:04:41 2006 UTC vs.
Revision 1.274 by root, Sat Jun 3 22:20:52 2006 UTC

… …
371sub size_allocate { 371sub size_allocate {
372 # nothing to be done 372 # nothing to be done
373} 373}
374 374
375sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
376} 381}
377 382
378sub set_max_size { 383sub set_max_size {
379 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
380 385
… …
439 444
440 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
441 unless $FOCUS; 446 unless $FOCUS;
442} 447}
443 448
444sub mouse_motion { } 449sub mouse_motion { 0 }
445sub button_up { } 450sub button_up { 0 }
446sub key_down { } 451sub key_down { 0 }
447sub key_up { } 452sub key_up { 0 }
448 453
449sub button_down { 454sub button_down {
450 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
451 456
452 $self->focus_in; 457 $self->focus_in;
458
459 0
453} 460}
454 461
455sub find_widget { 462sub find_widget {
456 my ($self, $x, $y) = @_; 463 my ($self, $x, $y) = @_;
457 464
… …
661our @ISA = CFClient::UI::Base::; 668our @ISA = CFClient::UI::Base::;
662 669
663sub new { 670sub new {
664 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
665 672
666 my $children = delete $arg{children} || []; 673 my $children = delete $arg{children};
667 674
668 my $self = $class->SUPER::new ( 675 my $self = $class->SUPER::new (
669 children => [], 676 children => [],
670 can_events => 0, 677 can_events => 0,
671 %arg, 678 %arg,
672 ); 679 );
680
673 $self->add ($_) for @$children; 681 $self->add (@$children)
682 if $children;
674 683
675 $self 684 $self
676} 685}
677 686
678sub add { 687sub add {
… …
726 $x -= $self->{x}; 735 $x -= $self->{x};
727 $y -= $self->{y}; 736 $y -= $self->{y};
728 737
729 my $res; 738 my $res;
730 739
731 for (reverse @{ $self->{children} }) { 740 for (reverse $self->visible_children) {
732 $res = $_->find_widget ($x, $y) 741 $res = $_->find_widget ($x, $y)
733 and return $res; 742 and return $res;
734 } 743 }
735 744
736 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 745 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
784 793
785 $self->{children}[0]->configure (0, 0, $w, $h); 794 $self->{children}[0]->configure (0, 0, $w, $h);
786} 795}
787 796
788############################################################################# 797#############################################################################
798
799# back-buffered drawing area
789 800
790package CFClient::UI::Window; 801package CFClient::UI::Window;
791 802
792our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
793 804
… …
946package CFClient::UI::ScrolledWindow; 957package CFClient::UI::ScrolledWindow;
947 958
948our @ISA = CFClient::UI::HBox::; 959our @ISA = CFClient::UI::HBox::;
949 960
950sub new { 961sub new {
951 my $class = shift; 962 my ($class, %arg) = @_;
963
964 my $child = delete $arg{child};
952 965
953 my $self; 966 my $self;
954 967
955 my $slider = new CFClient::UI::Slider 968 my $slider = new CFClient::UI::Slider
956 vertical => 1, 969 vertical => 1,
… …
961 ; 974 ;
962 975
963 $self = $class->SUPER::new ( 976 $self = $class->SUPER::new (
964 vp => (new CFClient::UI::ViewPort expand => 1), 977 vp => (new CFClient::UI::ViewPort expand => 1),
965 slider => $slider, 978 slider => $slider,
966 @_, 979 %arg,
967 ); 980 );
968 981
969 $self->{vp}->add ($self->{scrolled});
970 $self->add ($self->{vp});
971 $self->add ($self->{slider}); 982 $self->SUPER::add ($self->{vp}, $self->{slider});
983 $self->add ($child) if $child;
972 984
973 $self 985 $self
986}
987
988sub add {
989 my ($self, $widget) = @_;
990
991 $self->{vp}->add ($self->{child} = $widget);
974} 992}
975 993
976sub update { 994sub update {
977 my ($self) = @_; 995 my ($self) = @_;
978 996
… …
1050my @border = 1068my @border =
1051 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1052 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1070 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1053 1071
1054sub new { 1072sub new {
1055 my $class = shift; 1073 my ($class, %arg) = @_;
1074
1075 my $title = delete $arg{title};
1056 1076
1057 my $self = $class->SUPER::new ( 1077 my $self = $class->SUPER::new (
1058 bg => [1, 1, 1, 1], 1078 bg => [1, 1, 1, 1],
1059 border_bg => [1, 1, 1, 1], 1079 border_bg => [1, 1, 1, 1],
1060 border => 0.6, 1080 border => 0.6,
1061 can_events => 1, 1081 can_events => 1,
1062 min_w => 16, 1082 min_w => 16,
1063 min_h => 16, 1083 min_h => 16,
1064 @_ 1084 %arg,
1065 ); 1085 );
1066 1086
1067 $self->{title} &&= new CFClient::UI::Label 1087 $self->{title} = new CFClient::UI::Label
1068 align => 0, 1088 align => 0,
1069 valign => 1, 1089 valign => 1,
1070 text => $self->{title}, 1090 text => $title,
1071 fontsize => $self->{border}; 1091 fontsize => $self->{border}
1092 if defined $title;
1072 1093
1073 $self 1094 $self
1095}
1096
1097sub add {
1098 my ($self, @widgets) = @_;
1099
1100 $self->SUPER::add (@widgets);
1101 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1074} 1102}
1075 1103
1076sub border { 1104sub border {
1077 int $_[0]{border} * $::FONTSIZE 1105 int $_[0]{border} * $::FONTSIZE
1078} 1106}
1079 1107
1080sub size_request { 1108sub size_request {
1081 my ($self) = @_; 1109 my ($self) = @_;
1110
1111 $self->{title}->size_request
1112 if $self->{title};
1082 1113
1083 my ($w, $h) = $self->SUPER::size_request; 1114 my ($w, $h) = $self->SUPER::size_request;
1084 1115
1085 ( 1116 (
1086 $w + $self->border * 2, 1117 $w + $self->border * 2,
… …
1089} 1120}
1090 1121
1091sub size_allocate { 1122sub size_allocate {
1092 my ($self, $w, $h) = @_; 1123 my ($self, $w, $h) = @_;
1093 1124
1125 if ($self->{title}) {
1126 $self->{title}{w} = $w;
1127 $self->{title}{h} = $h;
1128 $self->{title}->size_allocate ($w, $h);
1129 }
1130
1131 my $border = $self->border;
1132
1094 $h -= List::Util::max 0, $self->border * 2; 1133 $h -= List::Util::max 0, $border * 2;
1095 $w -= List::Util::max 0, $self->border * 2; 1134 $w -= List::Util::max 0, $border * 2;
1096 1135
1097 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1098 if $self->{title};
1099
1100 $self->child->configure ($self->border, $self->border, $w, $h); 1136 $self->child->configure ($border, $border, $w, $h);
1101} 1137}
1102 1138
1103sub button_down { 1139sub button_down {
1104 my ($self, $ev, $x, $y) = @_; 1140 my ($self, $ev, $x, $y) = @_;
1105 1141
… …
1139 1175
1140 ($x, $y) = ($ev->{x}, $ev->{y}); 1176 ($x, $y) = ($ev->{x}, $ev->{y});
1141 1177
1142 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1178 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1143 }; 1179 };
1180 } else {
1181 return 0;
1182 }
1183
1144 } 1184 1
1145} 1185}
1146 1186
1147sub button_up { 1187sub button_up {
1148 my ($self, $ev, $x, $y) = @_; 1188 my ($self, $ev, $x, $y) = @_;
1149 1189
1150 delete $self->{motion}; 1190 !!delete $self->{motion}
1151} 1191}
1152 1192
1153sub mouse_motion { 1193sub mouse_motion {
1154 my ($self, $ev, $x, $y) = @_; 1194 my ($self, $ev, $x, $y) = @_;
1155 1195
1156 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1196 $self->{motion}->($ev, $x, $y) if $self->{motion};
1197
1198 !!$self->{motion}
1157} 1199}
1158 1200
1159sub _draw { 1201sub _draw {
1160 my ($self) = @_; 1202 my ($self) = @_;
1161 1203
1204 my $child = $self->{children}[0];
1205
1162 my ($w, $h ) = ($self->{w}, $self->{h}); 1206 my ($w, $h ) = ($self->{w}, $self->{h});
1163 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1207 my ($cw, $ch) = ($child->{w}, $child->{h});
1164 1208
1165 glEnable GL_TEXTURE_2D; 1209 glEnable GL_TEXTURE_2D;
1166 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1210 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1167 1211
1168 my $border = $self->border; 1212 my $border = $self->border;
… …
1183 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1227 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1184 } 1228 }
1185 1229
1186 glDisable GL_TEXTURE_2D; 1230 glDisable GL_TEXTURE_2D;
1187 1231
1188 $self->{title}->draw if $self->{title};
1189
1190 $self->child->draw; 1232 $child->draw;
1233
1234 if ($self->{title}) {
1235 glTranslate 0, $border - $self->{h};
1236 $self->{title}->_draw;
1237 }
1191} 1238}
1192 1239
1193############################################################################# 1240#############################################################################
1194 1241
1195package CFClient::UI::Table; 1242package CFClient::UI::Table;
… …
1543} 1590}
1544 1591
1545sub size_allocate { 1592sub size_allocate {
1546 my ($self, $w, $h) = @_; 1593 my ($self, $w, $h) = @_;
1547 1594
1595 delete $self->{ox};
1596
1548 delete $self->{texture} 1597 delete $self->{texture}
1549 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w}; 1598 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1550} 1599}
1551 1600
1552sub set_fontsize { 1601sub set_fontsize {
… …
1569 $self->{layout}->set_width ($self->{w}); 1618 $self->{layout}->set_width ($self->{w});
1570 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1619 $self->{layout}->set_ellipsise ($self->{ellipsise});
1571 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1620 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1572 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1621 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1573 1622
1574 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1623 new_from_layout CFClient::Texture $self->{layout}
1624 };
1575 1625
1626 unless (exists $self->{ox}) {
1576 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1627 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1577 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1628 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1578 : ($self->{w} - $tex->{w}) * 0.5); 1629 : ($self->{w} - $tex->{w}) * 0.5);
1579 1630
1580 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1631 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1581 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1632 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1582 : ($self->{h} - $tex->{h}) * 0.5); 1633 : ($self->{h} - $tex->{h}) * 0.5);
1583
1584 $tex
1585 }; 1634 };
1586 1635
1587 glEnable GL_TEXTURE_2D; 1636 glEnable GL_TEXTURE_2D;
1588 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1637 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1589 1638
… …
1684 $self->{cursor} = length $text; 1733 $self->{cursor} = length $text;
1685 } elsif ($uni == 27) { 1734 } elsif ($uni == 27) {
1686 $self->_emit ('escape'); 1735 $self->_emit ('escape');
1687 } elsif ($uni) { 1736 } elsif ($uni) {
1688 substr $text, $self->{cursor}++, 0, chr $uni; 1737 substr $text, $self->{cursor}++, 0, chr $uni;
1738 } else {
1739 return 0;
1689 } 1740 }
1690 1741
1691 $self->_set_text ($text); 1742 $self->_set_text ($text);
1692 1743
1693 $self->realloc; 1744 $self->realloc;
1745
1746 1
1694} 1747}
1695 1748
1696sub focus_in { 1749sub focus_in {
1697 my ($self) = @_; 1750 my ($self) = @_;
1698 1751
… …
1713 utf8::encode $text; 1766 utf8::encode $text;
1714 $self->{cursor} = length substr $text, 0, $idx; 1767 $self->{cursor} = length substr $text, 0, $idx;
1715 1768
1716 $self->_set_text ($self->{text}); 1769 $self->_set_text ($self->{text});
1717 $self->update; 1770 $self->update;
1771
1772 1
1718} 1773}
1719 1774
1720sub mouse_motion { 1775sub mouse_motion {
1721 my ($self, $ev, $x, $y) = @_; 1776 my ($self, $ev, $x, $y) = @_;
1722# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1777# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1778
1779 0
1723} 1780}
1724 1781
1725sub _draw { 1782sub _draw {
1726 my ($self) = @_; 1783 my ($self) = @_;
1727 1784
… …
1804 } else { 1861 } else {
1805 $self->set_text ($self->{history_saveback}); 1862 $self->set_text ($self->{history_saveback});
1806 } 1863 }
1807 1864
1808 } else { 1865 } else {
1809 $self->SUPER::key_down ($ev); 1866 return $self->SUPER::key_down ($ev)
1867 }
1868
1810 } 1869 1
1811
1812} 1870}
1813 1871
1814############################################################################# 1872#############################################################################
1815 1873
1816package CFClient::UI::Button; 1874package CFClient::UI::Button;
… …
1845 my ($self, $ev, $x, $y) = @_; 1903 my ($self, $ev, $x, $y) = @_;
1846 1904
1847 $self->emit ("activate") 1905 $self->emit ("activate")
1848 if $x >= 0 && $x < $self->{w} 1906 if $x >= 0 && $x < $self->{w}
1849 && $y >= 0 && $y < $self->{h}; 1907 && $y >= 0 && $y < $self->{h};
1908
1909 1
1850} 1910}
1851 1911
1852sub _draw { 1912sub _draw {
1853 my ($self) = @_; 1913 my ($self) = @_;
1854 1914
… …
1908 1968
1909 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 1969 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1910 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 1970 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1911 $self->{state} = !$self->{state}; 1971 $self->{state} = !$self->{state};
1912 $self->_emit (changed => $self->{state}); 1972 $self->_emit (changed => $self->{state});
1973 } else {
1974 return 0
1975 }
1976
1913 } 1977 1
1914} 1978}
1915 1979
1916sub _draw { 1980sub _draw {
1917 my ($self) = @_; 1981 my ($self) = @_;
1918 1982
… …
2256 2320
2257 $self->SUPER::button_down ($ev, $x, $y); 2321 $self->SUPER::button_down ($ev, $x, $y);
2258 2322
2259 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2323 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2260 2324
2261 $self->mouse_motion ($ev, $x, $y); 2325 $self->mouse_motion ($ev, $x, $y)
2262} 2326}
2263 2327
2264sub mouse_motion { 2328sub mouse_motion {
2265 my ($self, $ev, $x, $y) = @_; 2329 my ($self, $ev, $x, $y) = @_;
2266 2330
… …
2270 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2334 my (undef, $lo, $hi, $page) = @{$self->{range}};
2271 2335
2272 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2336 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2273 2337
2274 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2338 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2339 } else {
2340 return 0;
2341 }
2342
2275 } 2343 1
2276} 2344}
2277 2345
2278sub update { 2346sub update {
2279 my ($self) = @_; 2347 my ($self) = @_;
2280 2348
… …
2802 $self->SUPER::DESTROY; 2870 $self->SUPER::DESTROY;
2803} 2871}
2804 2872
2805############################################################################# 2873#############################################################################
2806 2874
2875package CFClient::UI::Buttonbar;
2876
2877our @ISA = CFClient::UI::HBox::;
2878
2879# TODO: should actualyl wrap buttons and other goodies.
2880
2881#############################################################################
2882
2807package CFClient::UI::Menu; 2883package CFClient::UI::Menu;
2808 2884
2809our @ISA = CFClient::UI::FancyFrame::; 2885our @ISA = CFClient::UI::FancyFrame::;
2810 2886
2811use CFClient::OpenGL; 2887use CFClient::OpenGL;
… …
2858 my ($self, $ev, $x, $y) = @_; 2934 my ($self, $ev, $x, $y) = @_;
2859 2935
2860 # TODO: should use vbox->find_widget or so 2936 # TODO: should use vbox->find_widget or so
2861 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2937 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2862 $self->{hover} = $self->{item}{$HOVER}; 2938 $self->{hover} = $self->{item}{$HOVER};
2939
2940 0
2863} 2941}
2864 2942
2865sub button_up { 2943sub button_up {
2866 my ($self, $ev, $x, $y) = @_; 2944 my ($self, $ev, $x, $y) = @_;
2867 2945
… …
2869 undef $GRAB; 2947 undef $GRAB;
2870 $self->hide; 2948 $self->hide;
2871 2949
2872 $self->_emit ("popdown"); 2950 $self->_emit ("popdown");
2873 $self->{hover}[1]->() if $self->{hover}; 2951 $self->{hover}[1]->() if $self->{hover};
2952 } else {
2953 return 0
2954 }
2955
2956 1
2957}
2958
2959#############################################################################
2960
2961package CFClient::UI::Multiplexer;
2962
2963our @ISA = CFClient::UI::Container::;
2964
2965sub new {
2966 my $class = shift;
2967
2968 my $self = $class->SUPER::new (
2969 @_,
2970 );
2971
2972 $self->{current} = $self->{children}[0]
2973 if @{ $self->{children} };
2974
2975 $self
2976}
2977
2978sub add {
2979 my ($self, @widgets) = @_;
2980
2981 $self->SUPER::add (@widgets);
2982
2983 $self->{current} = $self->{children}[0]
2984 if @{ $self->{children} };
2985}
2986
2987sub set_current_page {
2988 my ($self, $page_or_widget) = @_;
2989
2990 my $widget = ref $page_or_widget
2991 ? $page_or_widget
2992 : $self->{children}[$page_or_widget];
2993
2994 $self->{current} = $widget;
2995 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2996
2997 $self->_emit (page_changed => $self->{current});
2998
2999 $self->realloc;
3000}
3001
3002sub visible_children {
3003 $_[0]{current}
3004}
3005
3006sub size_request {
3007 my ($self) = @_;
3008
3009 $self->{current}->size_request
3010}
3011
3012sub size_allocate {
3013 my ($self, $w, $h) = @_;
3014
3015 $self->{current}->configure (0, 0, $w, $h);
3016}
3017
3018sub _draw {
3019 my ($self) = @_;
3020
3021 $self->{current}->draw;
3022}
3023
3024#############################################################################
3025
3026package CFClient::UI::Notebook;
3027
3028our @ISA = CFClient::UI::VBox::;
3029
3030sub new {
3031 my $class = shift;
3032
3033 my $self = $class->SUPER::new (
3034 buttonbar => (new CFClient::UI::Buttonbar),
3035 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3036 # filter => # will be put between multiplexer and $self
3037 @_,
3038 );
2874 } 3039
3040 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3041 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3042
3043 $self
3044}
3045
3046sub add {
3047 my ($self, $title, $widget, $tooltip) = @_;
3048
3049 Scalar::Util::weaken $self;
3050
3051 $self->{buttonbar}->add (new CFClient::UI::Button
3052 markup => $title,
3053 tooltip => $tooltip,
3054 on_activate => sub { $self->set_current_page ($widget) },
3055 );
3056
3057 $self->{multiplexer}->add ($widget);
3058}
3059
3060sub set_current_page {
3061 my ($self, $page) = @_;
3062
3063 $self->{multiplexer}->set_current_page ($page);
3064 $self->_emit (page_changed => $self->{multiplexer}{current});
2875} 3065}
2876 3066
2877############################################################################# 3067#############################################################################
2878 3068
2879package CFClient::UI::Statusbox; 3069package CFClient::UI::Statusbox;
… …
2992 3182
2993sub new { 3183sub new {
2994 my $class = shift; 3184 my $class = shift;
2995 3185
2996 my $self = $class->SUPER::new ( 3186 my $self = $class->SUPER::new (
2997 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3187 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2998 @_, 3188 @_,
2999 ); 3189 );
3000 3190
3001 $self 3191 $self
3002} 3192}
3003 3193
3004sub set_items { 3194sub set_items {
3005 my ($self, $items) = @_; 3195 my ($self, $items) = @_;
3006 3196
3007 $self->{scrolled}->clear; 3197 $self->{child}->clear;
3008 return unless $items; 3198 return unless $items;
3009 3199
3010 my @items = sort { 3200 my @items = sort {
3011 ($a->{type} <=> $b->{type}) 3201 ($a->{type} <=> $b->{type})
3012 or ($a->{name} cmp $b->{name}) 3202 or ($a->{name} cmp $b->{name})
… …
3016 3206
3017 my $row = 0; 3207 my $row = 0;
3018 for my $item (@items) { 3208 for my $item (@items) {
3019 CFClient::Item::update_widgets $item; 3209 CFClient::Item::update_widgets $item;
3020 3210
3021 $self->{scrolled}->add (0, $row, $item->{face_widget}); 3211 $self->{child}->add (0, $row, $item->{face_widget});
3022 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 3212 $self->{child}->add (1, $row, $item->{desc_widget});
3023 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 3213 $self->{child}->add (2, $row, $item->{weight_widget});
3024 3214
3025 $row++; 3215 $row++;
3026 } 3216 }
3027} 3217}
3028 3218
… …
3126 $rec = $::CONN->stop_record if $::CONN; 3316 $rec = $::CONN->stop_record if $::CONN;
3127 return unless ref $rec eq 'ARRAY'; 3317 return unless ref $rec eq 'ARRAY';
3128 $self->set_command_list ($rec); 3318 $self->set_command_list ($rec);
3129} 3319}
3130 3320
3131# if $commit is true, the binding will be set after the user entered a key combo 3321
3322sub ask_for_bind_and_commit {
3323 my ($self) = @_;
3324 $self->ask_for_bind (1);
3325}
3326
3132sub ask_for_bind { 3327sub ask_for_bind {
3133 my ($self, $commit) = @_; 3328 my ($self, $commit) = @_;
3134 3329
3135 CFClient::Binder::open_binding_dialog (sub { 3330 CFClient::Binder::open_binding_dialog (sub {
3136 my ($mod, $sym) = @_; 3331 my ($mod, $sym) = @_;
… …
3220 3415
3221############################################################################# 3416#############################################################################
3222 3417
3223package CFClient::UI::SpellList; 3418package CFClient::UI::SpellList;
3224 3419
3225our @ISA = CFClient::UI::FancyFrame::; 3420our @ISA = CFClient::UI::Table::;
3226 3421
3227sub new { 3422sub new {
3228 my $class = shift; 3423 my $class = shift;
3229 3424
3230 my $self = $class->SUPER::new (binding => [], commands => [], @_); 3425 my $self = $class->SUPER::new (
3231 3426 binding => [],
3232 $self->add (new CFClient::UI::ScrolledWindow 3427 commands => [],
3233 scrolled => $self->{spellbox} = new CFClient::UI::Table); 3428 @_,
3234 3429 )
3235 $self;
3236} 3430}
3237 3431
3238# XXX: Do sorting? Argl... 3432# XXX: Do sorting? Argl...
3239sub add_spell { 3433sub add_spell {
3240 my ($self, $spell) = @_; 3434 my ($self, $spell) = @_;
3241 $self->{spells}->{$spell->{name}} = $spell; 3435 $self->{spells}->{$spell->{name}} = $spell;
3242 3436
3243 $self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face 3437 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3244 face => $spell->{face}, 3438 face => $spell->{face},
3245 can_hover => 1, 3439 can_hover => 1,
3246 can_events => 1, 3440 can_events => 1,
3247 tooltip => $spell->{message}); 3441 tooltip => $spell->{message});
3248 3442
3249 $self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label 3443 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3250 text => $spell->{name}, 3444 text => $spell->{name},
3251 can_hover => 1, 3445 can_hover => 1,
3252 can_events => 1, 3446 can_events => 1,
3253 tooltip => $spell->{message}, 3447 tooltip => $spell->{message},
3254 expand => 1); 3448 expand => 1);
3255 3449
3256 $self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label 3450 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3257 text => (sprintf "lvl: %2d sp: %2d dmg: %2d", 3451 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3258 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}), 3452 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3259 expand => 1); 3453 expand => 1);
3260 3454
3261 $self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button 3455 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3262 text => "bind to key", 3456 text => "bind to key",
3263 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }); 3457 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3264} 3458}
3265 3459
3266sub rebuild_spell_list { 3460sub rebuild_spell_list {

Diff Legend

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