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.345 by root, Sun Aug 13 21:46:10 2006 UTC vs.
Revision 1.361 by root, Sat Dec 9 02:21:25 2006 UTC

… …
262 262
263sub destroy { 263sub destroy {
264 my ($self) = @_; 264 my ($self) = @_;
265 265
266 $self->hide; 266 $self->hide;
267 $self->emit ("destroy");
267 %$self = (); 268 %$self = ();
268} 269}
269 270
270sub show { 271sub show {
271 my ($self) = @_; 272 my ($self) = @_;
… …
502 503
503 defined wantarray and CFPlus::guard { 504 defined wantarray and CFPlus::guard {
504 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 505 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
505 @{ $self->{signal_cb}{$signal} }; 506 @{ $self->{signal_cb}{$signal} };
506 } 507 }
508}
509
510sub disconnect_all {
511 my ($self, $signal) = @_;
512
513 delete $self->{signal_cb}{$signal};
507} 514}
508 515
509my %has_coords = ( 516my %has_coords = (
510 button_down => 1, 517 button_down => 1,
511 button_up => 1, 518 button_up => 1,
… …
514); 521);
515 522
516sub emit { 523sub emit {
517 my ($self, $signal, @args) = @_; 524 my ($self, $signal, @args) = @_;
518 525
519 # I do not really like this solution, but I dislike duplication 526 # I do not really like this solution, but I do not like duplication
520 # and needlessly verbose code, too. 527 # and needlessly verbose code, either.
521 my @append 528 my @append
522 = $has_coords{$signal} 529 = $has_coords{$signal}
523 ? $args[0]->xy ($self) 530 ? $args[0]->xy ($self)
524 : (); 531 : ();
525 532
… …
638sub DESTROY { 645sub DESTROY {
639 my ($self) = @_; 646 my ($self) = @_;
640 647
641 return if CFPlus::in_destruct; 648 return if CFPlus::in_destruct;
642 649
643 delete $WIDGET{$self+0};
644
645 eval { $self->destroy }; 650 eval { $self->destroy };
646 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 651 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
652
653 delete $WIDGET{$self+0};
647} 654}
648 655
649############################################################################# 656#############################################################################
650 657
651package CFPlus::UI::DrawBG; 658package CFPlus::UI::DrawBG;
… …
898 glClear GL_COLOR_BUFFER_BIT; 905 glClear GL_COLOR_BUFFER_BIT;
899 906
900 { 907 {
901 package CFPlus::UI::Base; 908 package CFPlus::UI::Base;
902 909
903 ($draw_x, $draw_y, $draw_w, $draw_h) = 910 local ($draw_x, $draw_y, $draw_w, $draw_h) =
904 (0, 0, $self->{w}, $self->{h}); 911 (0, 0, $self->{w}, $self->{h});
912
913 $self->_render;
905 } 914 }
906
907 $self->_render;
908 }; 915 };
909} 916}
910 917
911sub _draw { 918sub _draw {
912 my ($self) = @_; 919 my ($self) = @_;
… …
1127} 1134}
1128 1135
1129############################################################################# 1136#############################################################################
1130 1137
1131package CFPlus::UI::FancyFrame; 1138package CFPlus::UI::FancyFrame;
1139
1140our @ISA = CFPlus::UI::Bin::;
1141
1142use CFPlus::OpenGL;
1143
1144sub new {
1145 my ($class, %arg) = @_;
1146
1147 if ((exists $arg{label}) && !ref $arg{label}) {
1148 $arg{label} = new CFPlus::UI::Label
1149 align => 1,
1150 valign => 0,
1151 text => $arg{label},
1152 fontsize => ($arg{border} || 0.8) * 0.75;
1153 }
1154
1155 my $self = $class->SUPER::new (
1156 # label => "",
1157 fg => [0.6, 0.3, 0.1],
1158 border => 0.8,
1159 style => 'single',
1160 %arg,
1161 );
1162
1163 $self
1164}
1165
1166sub add {
1167 my ($self, @widgets) = @_;
1168
1169 $self->SUPER::add (@widgets);
1170 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1171}
1172
1173sub border {
1174 int $_[0]{border} * $::FONTSIZE
1175}
1176
1177sub size_request {
1178 my ($self) = @_;
1179
1180 ($self->{label_w}, undef) = $self->{label}->size_request
1181 if $self->{label};
1182
1183 my ($w, $h) = $self->SUPER::size_request;
1184
1185 (
1186 $w + $self->border * 2,
1187 $h + $self->border * 2,
1188 )
1189}
1190
1191sub invoke_size_allocate {
1192 my ($self, $w, $h) = @_;
1193
1194 my $border = $self->border;
1195
1196 $w -= List::Util::max 0, $border * 2;
1197 $h -= List::Util::max 0, $border * 2;
1198
1199 if (my $label = $self->{label}) {
1200 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1201 $label->{h} = List::Util::min $h, $border;
1202 $label->invoke_size_allocate ($label->{w}, $label->{h});
1203 }
1204
1205 $self->child->configure ($border, $border, $w, $h);
1206
1207 1
1208}
1209
1210sub _draw {
1211 my ($self) = @_;
1212
1213 my $child = $self->{children}[0];
1214
1215 my $border = $self->border;
1216 my ($w, $h) = ($self->{w}, $self->{h});
1217
1218 $child->draw;
1219
1220 glColor @{$self->{fg}};
1221 glBegin GL_LINE_STRIP;
1222 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1223 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1224 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1225 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1226 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1227 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1228 glEnd;
1229
1230 if ($self->{label}) {
1231 glTranslate $border * 2, 0;
1232 $self->{label}->_draw;
1233 }
1234}
1235
1236#############################################################################
1237
1238package CFPlus::UI::Toplevel;
1132 1239
1133our @ISA = CFPlus::UI::Bin::; 1240our @ISA = CFPlus::UI::Bin::;
1134 1241
1135use CFPlus::OpenGL; 1242use CFPlus::OpenGL;
1136 1243
… …
1800 active_fg => [0, 0, 0], 1907 active_fg => [0, 0, 0],
1801 can_hover => 1, 1908 can_hover => 1,
1802 can_focus => 1, 1909 can_focus => 1,
1803 valign => 0, 1910 valign => 0,
1804 can_events => 1, 1911 can_events => 1,
1912 ellipsise => 0,
1805 #text => ... 1913 #text => ...
1806 #hidden => "*", 1914 #hidden => "*",
1807 @_ 1915 @_
1808 ) 1916 )
1809} 1917}
… …
1866 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1974 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1867 } elsif ($sym == CFPlus::SDLK_HOME) { 1975 } elsif ($sym == CFPlus::SDLK_HOME) {
1868 $self->{cursor} = 0; 1976 $self->{cursor} = 0;
1869 } elsif ($sym == CFPlus::SDLK_END) { 1977 } elsif ($sym == CFPlus::SDLK_END) {
1870 $self->{cursor} = length $text; 1978 $self->{cursor} = length $text;
1979 } elsif ($uni == 21) { # ctrl-u
1980 $text = "";
1981 $self->{cursor} = 0;
1871 } elsif ($uni == 27) { 1982 } elsif ($uni == 27) {
1872 $self->emit ('escape'); 1983 $self->emit ('escape');
1873 } elsif ($uni) { 1984 } elsif ($uni >= 0x20 || $uni == 0x0d) {
1874 substr $text, $self->{cursor}++, 0, chr $uni; 1985 substr $text, $self->{cursor}++, 0, chr $uni;
1875 } else { 1986 } else {
1876 return 0; 1987 return 0;
1877 } 1988 }
1878 1989
1879 $self->_set_text ($text); 1990 $self->_set_text ($text);
1880 1991
1881 $self->realloc; 1992 $self->realloc;
1993 $self->update;
1882 1994
1883 1 1995 1
1884} 1996}
1885 1997
1886sub invoke_focus_in { 1998sub invoke_focus_in {
… …
1955 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2067 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1956 glEnd; 2068 glEnd;
1957 } 2069 }
1958} 2070}
1959 2071
2072#############################################################################
2073
1960package CFPlus::UI::Entry; 2074package CFPlus::UI::Entry;
1961 2075
1962our @ISA = CFPlus::UI::EntryBase::; 2076our @ISA = CFPlus::UI::EntryBase::;
1963 2077
1964use CFPlus::OpenGL; 2078use CFPlus::OpenGL;
… …
1966sub invoke_key_down { 2080sub invoke_key_down {
1967 my ($self, $ev) = @_; 2081 my ($self, $ev) = @_;
1968 2082
1969 my $sym = $ev->{sym}; 2083 my $sym = $ev->{sym};
1970 2084
1971 if ($sym == 13) { 2085 if ($ev->{uni} == 0x0d || $sym == 13) {
1972 unshift @{$self->{history}}, 2086 unshift @{$self->{history}},
1973 my $txt = $self->get_text; 2087 my $txt = $self->get_text;
1974 2088
1975 $self->{history_pointer} = -1; 2089 $self->{history_pointer} = -1;
1976 $self->{history_saveback} = ''; 2090 $self->{history_saveback} = '';
… …
1997 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2111 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1998 } else { 2112 } else {
1999 $self->set_text ($self->{history_saveback}); 2113 $self->set_text ($self->{history_saveback});
2000 } 2114 }
2001 2115
2116 } else {
2117 return $self->SUPER::invoke_key_down ($ev)
2118 }
2119
2120 1
2121}
2122
2123#############################################################################
2124
2125package CFPlus::UI::TextEdit;
2126
2127our @ISA = CFPlus::UI::EntryBase::;
2128
2129use CFPlus::OpenGL;
2130
2131sub move_cursor_ver {
2132 my ($self, $dy) = @_;
2133
2134 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2135
2136 $y += $dy;
2137
2138 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2139 $self->{cursor} = $index;
2140 delete $self->{cur_h};
2141 $self->update;
2142 return;
2143 }
2144}
2145
2146sub invoke_key_down {
2147 my ($self, $ev) = @_;
2148
2149 my $sym = $ev->{sym};
2150
2151 if ($sym == CFPlus::SDLK_UP) {
2152 $self->move_cursor_ver (-1);
2153 } elsif ($sym == CFPlus::SDLK_DOWN) {
2154 $self->move_cursor_ver (+1);
2002 } else { 2155 } else {
2003 return $self->SUPER::invoke_key_down ($ev) 2156 return $self->SUPER::invoke_key_down ($ev)
2004 } 2157 }
2005 2158
2006 1 2159 1
… …
2753} 2906}
2754 2907
2755sub current_paragraph { 2908sub current_paragraph {
2756 my ($self) = @_; 2909 my ($self) = @_;
2757 2910
2758 $self->force_uptodate;
2759 $self->{top_paragraph} - 1 2911 $self->{top_paragraph} - 1
2760} 2912}
2761 2913
2762sub scroll_to { 2914sub scroll_to {
2763 my ($self, $para) = @_; 2915 my ($self, $para) = @_;
2764 2916
2765 $self->force_uptodate;
2766
2767 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para; 2917 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2768 2918
2769 $self->{children}[1]->set_value ($self->{par}[$para]{y}); 2919 $self->{scroll_to} = $para;
2920 $self->update;
2770} 2921}
2771 2922
2772sub clear { 2923sub clear {
2773 my ($self) = @_; 2924 my ($self) = @_;
2774 2925
… …
2803} 2954}
2804 2955
2805sub scroll_to_bottom { 2956sub scroll_to_bottom {
2806 my ($self) = @_; 2957 my ($self) = @_;
2807 2958
2808 $self->{scroll_to_bottom} = 1; 2959 $self->{scroll_to} = $#{$self->{par}};
2809 $self->update; 2960 $self->update;
2810} 2961}
2811 2962
2812sub force_uptodate { 2963sub force_uptodate {
2813 my ($self) = @_; 2964 my ($self) = @_;
2814 2965
2815 if (delete $self->{need_reflow}) { 2966 if (delete $self->{need_reflow}) {
2816 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2967 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2817 2968
2818 my $height = 0; 2969 my $height = 0;
2819 my $paridx;
2820 my $top_paragraph;
2821 my $top = int $self->{children}[1]{range}[0];
2822 2970
2823 for my $para (@{$self->{par}}) { 2971 for my $para (@{$self->{par}}) {
2824 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) { 2972 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2825 my $layout = $self->get_layout ($para); 2973 my $layout = $self->get_layout ($para);
2826 my ($w, $h) = $layout->size; 2974 my ($w, $h) = $layout->size;
… …
2829 $para->{h} = $h; 2977 $para->{h} = $h;
2830 $para->{wrapped} = $layout->has_wrapped; 2978 $para->{wrapped} = $layout->has_wrapped;
2831 } 2979 }
2832 2980
2833 $para->{y} = $height; 2981 $para->{y} = $height;
2834
2835 $paridx++;
2836 $top_paragraph ||= $paridx if $height >= $top;
2837
2838 $height += $para->{h}; 2982 $height += $para->{h};
2839 } 2983 }
2840 2984
2841 $self->{top_paragraph} = $top_paragraph;
2842 $self->{height} = $height; 2985 $self->{height} = $height;
2843
2844 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]); 2986 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2845 2987
2846 delete $self->{texture}; 2988 delete $self->{texture};
2847 } 2989 }
2848 2990
2849 if (delete $self->{scroll_to_bottom}) { 2991 if (my $paridx = delete $self->{scroll_to}) {
2850 $self->{children}[1]->set_value (1e10); 2992 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
2851 } 2993 }
2852} 2994}
2853 2995
2854sub update { 2996sub update {
2855 my ($self) = @_; 2997 my ($self) = @_;
… …
2867 3009
2868 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3010 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2869 glClearColor 0, 0, 0, 0; 3011 glClearColor 0, 0, 0, 0;
2870 glClear GL_COLOR_BUFFER_BIT; 3012 glClear GL_COLOR_BUFFER_BIT;
2871 3013
3014 package CFPlus::UI::Base;
3015 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3016 (0, 0, $self->{w}, $self->{h});
3017
3018 my $top = int $self->{children}[1]{range}[0];
3019
3020 my $paridx = 0;
3021 my $top_paragraph;
2872 my $top = int $self->{children}[1]{range}[0]; 3022 my $top = int $self->{children}[1]{range}[0];
2873 3023
2874 my $y0 = $top; 3024 my $y0 = $top;
2875 my $y1 = $top + $H; 3025 my $y1 = $top + $H;
2876 3026
… …
2894 3044
2895 $_->draw; 3045 $_->draw;
2896 } 3046 }
2897 } 3047 }
2898 } 3048 }
3049
3050 $paridx++;
3051 $top_paragraph ||= $paridx if $y >= $top;
2899 } 3052 }
3053
3054 $self->{top_paragraph} = $top_paragraph;
2900 }; 3055 };
2901 }); 3056 });
2902} 3057}
2903 3058
2904sub reconfigure { 3059sub reconfigure {
… …
3183 3338
3184package CFPlus::UI::Buttonbar; 3339package CFPlus::UI::Buttonbar;
3185 3340
3186our @ISA = CFPlus::UI::HBox::; 3341our @ISA = CFPlus::UI::HBox::;
3187 3342
3188# TODO: should actualyl wrap buttons and other goodies. 3343# TODO: should actually wrap buttons and other goodies.
3189 3344
3190############################################################################# 3345#############################################################################
3191 3346
3192package CFPlus::UI::Menu; 3347package CFPlus::UI::Menu;
3193 3348
3194our @ISA = CFPlus::UI::FancyFrame::; 3349our @ISA = CFPlus::UI::Toplevel::;
3195 3350
3196use CFPlus::OpenGL; 3351use CFPlus::OpenGL;
3197 3352
3198sub new { 3353sub new {
3199 my $class = shift; 3354 my $class = shift;
… …
3604 $self->SUPER::destroy; 3759 $self->SUPER::destroy;
3605} 3760}
3606 3761
3607############################################################################# 3762#############################################################################
3608 3763
3609package CFPlus::UI::Inventory;
3610
3611our @ISA = CFPlus::UI::Table::;
3612
3613sub new {
3614 my $class = shift;
3615
3616 my $self = $class->SUPER::new (
3617 col_expand => [0, 1, 0],
3618 items => [],
3619 @_,
3620 );
3621
3622 $self->set_sort_order (undef);
3623
3624 $self
3625}
3626
3627sub update_items {
3628 my ($self) = @_;
3629
3630 $self->clear;
3631
3632 my @item = $self->{sort}->(@{ $self->{items} });
3633
3634 my @adds;
3635 my $row = 0;
3636 for my $item ($self->{sort}->(@{ $self->{items} })) {
3637 CFPlus::Item::update_widgets $item;
3638
3639 push @adds, 0, $row, $item->{face_widget};
3640 push @adds, 1, $row, $item->{desc_widget};
3641 push @adds, 2, $row, $item->{weight_widget};
3642
3643 $row++;
3644 }
3645
3646 $self->add (@adds);
3647}
3648
3649sub set_sort_order {
3650 my ($self, $order) = @_;
3651
3652 $self->{sort} = $order ||= sub {
3653 sort {
3654 $a->{type} <=> $b->{type}
3655 or $a->{name} cmp $b->{name}
3656 } @_
3657 };
3658
3659 $self->update_items;
3660}
3661
3662sub set_items {
3663 my ($self, $items) = @_;
3664
3665 $self->{items} = [$items ? values %$items : ()];
3666 $self->update_items;
3667}
3668
3669#############################################################################
3670
3671package CFPlus::UI::SpellList;
3672
3673our @ISA = CFPlus::UI::Table::;
3674
3675sub new {
3676 my $class = shift;
3677
3678 my $self = $class->SUPER::new (
3679 binding => [],
3680 commands => [],
3681 @_,
3682 )
3683}
3684
3685my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3686
3687my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3688 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3689my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3690 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3691my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3692 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3693my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3694 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3695my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3696 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3697
3698sub rebuild_spell_list {
3699 my ($self) = @_;
3700
3701 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3702 $self->clear;
3703
3704 return unless $::CONN;
3705
3706 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3707 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3708 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3709 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3710 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3711
3712 my $row = 0;
3713
3714 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3715 my $spell = $self->{spell}{$_};
3716
3717 $row++;
3718
3719 my $spell_cb = sub {
3720 my ($widget, $ev) = @_;
3721
3722 if ($ev->{button} == 1) {
3723 $::CONN->user_send ("cast $spell->{name}");
3724 } elsif ($ev->{button} == 2) {
3725 $::CONN->user_send ("invoke $spell->{name}");
3726 } elsif ($ev->{button} == 3) {
3727 (new CFPlus::UI::Menu
3728 items => [
3729 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3730 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3731 ],
3732 )->popup ($ev);
3733 } else {
3734 return 0;
3735 }
3736
3737 1
3738 };
3739
3740 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3741
3742 #TODO: add path info to tooltip
3743 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3744
3745 $self->add (0, $row, new CFPlus::UI::Face
3746 face => $spell->{face},
3747 can_hover => 1,
3748 can_events => 1,
3749 tooltip => $tooltip,
3750 on_button_down => $spell_cb,
3751 );
3752
3753 $self->add (1, $row, new CFPlus::UI::Label
3754 expand => 1,
3755 text => $spell->{name},
3756 can_hover => 1,
3757 can_events => 1,
3758 tooltip => $tooltip,
3759 on_button_down => $spell_cb,
3760 );
3761
3762 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3763 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3764 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3765 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3766 }
3767 });
3768}
3769
3770sub add_spell {
3771 my ($self, $spell) = @_;
3772
3773 $self->{spell}->{$spell->{name}} = $spell;
3774 $self->rebuild_spell_list;
3775}
3776
3777sub remove_spell {
3778 my ($self, $spell) = @_;
3779
3780 delete $self->{spell}->{$spell->{name}};
3781 $self->rebuild_spell_list;
3782}
3783
3784sub clear_spells {
3785 my ($self) = @_;
3786
3787 $self->{spell} = {};
3788 $self->rebuild_spell_list;
3789}
3790
3791#############################################################################
3792
3793package CFPlus::UI::Root; 3764package CFPlus::UI::Root;
3794 3765
3795our @ISA = CFPlus::UI::Container::; 3766our @ISA = CFPlus::UI::Container::;
3796 3767
3797use List::Util qw(min max); 3768use List::Util qw(min max);
… …
4023 glLoadIdentity; 3994 glLoadIdentity;
4024 3995
4025 { 3996 {
4026 package CFPlus::UI::Base; 3997 package CFPlus::UI::Base;
4027 3998
4028 ($draw_x, $draw_y, $draw_w, $draw_h) = 3999 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4029 (0, 0, $self->{w}, $self->{h}); 4000 (0, 0, $self->{w}, $self->{h});
4030 }
4031 4001
4032 $self->_draw; 4002 $self->_draw;
4003 }
4033} 4004}
4034 4005
4035############################################################################# 4006#############################################################################
4036 4007
4037package CFPlus::UI; 4008package CFPlus::UI;

Diff Legend

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