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.354 by root, Sat Nov 18 23:31:23 2006 UTC vs.
Revision 1.366 by root, Mon Apr 23 19:17:41 2007 UTC

1package CFPlus::UI; 1package CFPlus::UI;
2 2
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util ();
7use List::Util (); 6use List::Util ();
8use Event; 7use Event;
9 8
10use CFPlus; 9use CFPlus;
11use CFPlus::Pod; 10use CFPlus::Pod;
… …
23our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
24 if (!$GRAB) { 23 if (!$GRAB) {
25 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
26 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
27 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
28 $TOOLTIP->hide; 28 $TOOLTIP->hide;
29 29
30 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
31 32
32 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
33 34
34 my $tip = $widget->{tooltip}; 35 my $tip = $widget->{tooltip};
35 36
… …
43 } 44 }
44 } 45 }
45 } 46 }
46 47
47 $TOOLTIP->hide; 48 $TOOLTIP->hide;
49 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
48 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
49}); 51});
50 52
51sub get_layout { 53sub get_layout {
52 my $layout; 54 my $layout;
… …
235 h => undef, 237 h => undef,
236 can_events => 1, 238 can_events => 1,
237 @_ 239 @_
238 }, $class; 240 }, $class;
239 241
240 Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self); 242 CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
241 243
242 for (keys %$self) { 244 for (keys %$self) {
243 if (/^on_(.*)$/) { 245 if (/^on_(.*)$/) {
244 $self->connect ($1 => delete $self->{$_}); 246 $self->connect ($1 => delete $self->{$_});
245 } 247 }
… …
262 264
263sub destroy { 265sub destroy {
264 my ($self) = @_; 266 my ($self) = @_;
265 267
266 $self->hide; 268 $self->hide;
269 $self->emit ("destroy");
267 %$self = (); 270 %$self = ();
268} 271}
269 272
270sub show { 273sub show {
271 my ($self) = @_; 274 my ($self) = @_;
… …
502 505
503 defined wantarray and CFPlus::guard { 506 defined wantarray and CFPlus::guard {
504 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 507 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
505 @{ $self->{signal_cb}{$signal} }; 508 @{ $self->{signal_cb}{$signal} };
506 } 509 }
510}
511
512sub disconnect_all {
513 my ($self, $signal) = @_;
514
515 delete $self->{signal_cb}{$signal};
507} 516}
508 517
509my %has_coords = ( 518my %has_coords = (
510 button_down => 1, 519 button_down => 1,
511 button_up => 1, 520 button_up => 1,
… …
523 ? $args[0]->xy ($self) 532 ? $args[0]->xy ($self)
524 : (); 533 : ();
525 534
526 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d# 535 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
527 536
528 if ($self->{tooltip} =~ /Apply.*audio/) { 537 for my $cb (
529 warn "2 ", join ":", @{ $self->{signal_cb}{$signal} || []}, "\n";#d# 538 @{$self->{signal_cb}{$signal} || []}, # before
530 warn "3 $self->{parent}\n";#d# 539 ($self->can ("invoke_$signal") || sub { 1 }), # closure
540 ) {
541 return $cb->($self, @args, @append) || next;
531 } 542 }
532 543
533 #d##TODO# stop propagating at first true, do not use sum 544 # parent
534 my $res =
535 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
536 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
537 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 545 $self->{parent} && $self->{parent}->emit ($signal, @args)
538 ;
539 if ($self->{tooltip} =~ /Apply.*audio/) {
540 warn "4 ", join ":", @{ $self->{signal_cb}{$signal} || []}, "\n";#d#
541 warn "5 $self->{parent}\n";#d#
542 }
543
544 $res
545} 546}
546 547
547sub find_widget { 548sub find_widget {
548 my ($self, $x, $y) = @_; 549 my ($self, $x, $y) = @_;
549 550
… …
557} 558}
558 559
559sub set_parent { 560sub set_parent {
560 my ($self, $parent) = @_; 561 my ($self, $parent) = @_;
561 562
562 Scalar::Util::weaken ($self->{parent} = $parent); 563 CFPlus::weaken ($self->{parent} = $parent);
563 $self->set_visible if $parent->{visible}; 564 $self->set_visible if $parent->{visible};
564} 565}
565 566
566sub realloc { 567sub realloc {
567 my ($self) = @_; 568 my ($self) = @_;
… …
646 my ($self) = @_; 647 my ($self) = @_;
647 648
648 warn "no draw defined for $self\n"; 649 warn "no draw defined for $self\n";
649} 650}
650 651
652my $cntx;#d#
651sub DESTROY { 653sub DESTROY {
652 my ($self) = @_; 654 my ($self) = @_;
653 655
654 return if CFPlus::in_destruct; 656 return if CFPlus::in_destruct;
655
656 delete $WIDGET{$self+0};
657 657
658 eval { $self->destroy }; 658 eval { $self->destroy };
659 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 659 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
660
661 delete $WIDGET{$self+0};
660} 662}
661 663
662############################################################################# 664#############################################################################
663 665
664package CFPlus::UI::DrawBG; 666package CFPlus::UI::DrawBG;
… …
1913 active_fg => [0, 0, 0], 1915 active_fg => [0, 0, 0],
1914 can_hover => 1, 1916 can_hover => 1,
1915 can_focus => 1, 1917 can_focus => 1,
1916 valign => 0, 1918 valign => 0,
1917 can_events => 1, 1919 can_events => 1,
1920 ellipsise => 0,
1918 #text => ... 1921 #text => ...
1919 #hidden => "*", 1922 #hidden => "*",
1920 @_ 1923 @_
1921 ) 1924 )
1922} 1925}
… …
1976 } elsif ($sym == CFPlus::SDLK_LEFT) { 1979 } elsif ($sym == CFPlus::SDLK_LEFT) {
1977 --$self->{cursor} if $self->{cursor}; 1980 --$self->{cursor} if $self->{cursor};
1978 } elsif ($sym == CFPlus::SDLK_RIGHT) { 1981 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1979 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1982 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1980 } elsif ($sym == CFPlus::SDLK_HOME) { 1983 } elsif ($sym == CFPlus::SDLK_HOME) {
1984 # what a hack
1981 $self->{cursor} = 0; 1985 $self->{cursor} =
1986 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
1987 ? length $1
1988 : 0;
1982 } elsif ($sym == CFPlus::SDLK_END) { 1989 } elsif ($sym == CFPlus::SDLK_END) {
1990 # uh, again
1991 $self->{cursor} =
1992 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1983 $self->{cursor} = length $text; 1993 ? $self->{cursor} + length $1
1994 : length $self->{text};
1984 } elsif ($uni == 21) { # ctrl-u 1995 } elsif ($uni == 21) { # ctrl-u
1985 $text = ""; 1996 $text = "";
1986 $self->{cursor} = 0; 1997 $self->{cursor} = 0;
1987 } elsif ($uni == 27) { 1998 } elsif ($uni == 27) {
1988 $self->emit ('escape'); 1999 $self->emit ('escape');
1989 } elsif ($uni) { 2000 } elsif ($uni == 0x0d) {
2001 substr $text, $self->{cursor}++, 0, "\012";
2002 } elsif ($uni >= 0x20) {
1990 substr $text, $self->{cursor}++, 0, chr $uni; 2003 substr $text, $self->{cursor}++, 0, chr $uni;
1991 } else { 2004 } else {
1992 return 0; 2005 return 0;
1993 } 2006 }
1994 2007
1995 $self->_set_text ($text); 2008 $self->_set_text ($text);
1996 2009
1997 $self->realloc; 2010 $self->realloc;
2011 $self->update;
1998 2012
1999 1 2013 1
2000} 2014}
2001 2015
2002sub invoke_focus_in { 2016sub invoke_focus_in {
… …
2071 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2085 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2072 glEnd; 2086 glEnd;
2073 } 2087 }
2074} 2088}
2075 2089
2090#############################################################################
2091
2076package CFPlus::UI::Entry; 2092package CFPlus::UI::Entry;
2077 2093
2078our @ISA = CFPlus::UI::EntryBase::; 2094our @ISA = CFPlus::UI::EntryBase::;
2079 2095
2080use CFPlus::OpenGL; 2096use CFPlus::OpenGL;
… …
2082sub invoke_key_down { 2098sub invoke_key_down {
2083 my ($self, $ev) = @_; 2099 my ($self, $ev) = @_;
2084 2100
2085 my $sym = $ev->{sym}; 2101 my $sym = $ev->{sym};
2086 2102
2087 if ($sym == 13) { 2103 if ($ev->{uni} == 0x0d || $sym == 13) {
2088 unshift @{$self->{history}}, 2104 unshift @{$self->{history}},
2089 my $txt = $self->get_text; 2105 my $txt = $self->get_text;
2090 2106
2091 $self->{history_pointer} = -1; 2107 $self->{history_pointer} = -1;
2092 $self->{history_saveback} = ''; 2108 $self->{history_saveback} = '';
… …
2122 1 2138 1
2123} 2139}
2124 2140
2125############################################################################# 2141#############################################################################
2126 2142
2143package CFPlus::UI::TextEdit;
2144
2145our @ISA = CFPlus::UI::EntryBase::;
2146
2147use CFPlus::OpenGL;
2148
2149sub move_cursor_ver {
2150 my ($self, $dy) = @_;
2151
2152 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2153
2154 $y += $dy;
2155
2156 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2157 $self->{cursor} = $index;
2158 delete $self->{cur_h};
2159 $self->update;
2160 return;
2161 }
2162}
2163
2164sub invoke_key_down {
2165 my ($self, $ev) = @_;
2166
2167 my $sym = $ev->{sym};
2168
2169 if ($sym == CFPlus::SDLK_UP) {
2170 $self->move_cursor_ver (-1);
2171 } elsif ($sym == CFPlus::SDLK_DOWN) {
2172 $self->move_cursor_ver (+1);
2173 } else {
2174 return $self->SUPER::invoke_key_down ($ev)
2175 }
2176
2177 1
2178}
2179
2180#############################################################################
2181
2127package CFPlus::UI::Button; 2182package CFPlus::UI::Button;
2128 2183
2129our @ISA = CFPlus::UI::Label::; 2184our @ISA = CFPlus::UI::Label::;
2130 2185
2131use CFPlus::OpenGL; 2186use CFPlus::OpenGL;
… …
2273 or Carp::croak "'path' or 'tex' attributes required"; 2328 or Carp::croak "'path' or 'tex' attributes required";
2274 2329
2275 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2330 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2276 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1; 2331 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2277 2332
2278 Scalar::Util::weaken $texture_cache{$self->{path}}; 2333 CFPlus::weaken $texture_cache{$self->{path}};
2279 2334
2280 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2335 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2281 2336
2282 $self 2337 $self
2283} 2338}
… …
2656sub invoke_mouse_wheel { 2711sub invoke_mouse_wheel {
2657 my ($self, $ev) = @_; 2712 my ($self, $ev) = @_;
2658 2713
2659 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2714 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2660 2715
2716 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2717
2661 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2718 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2662 2719
2663 ! ! $delta 2720 ! ! $delta
2664} 2721}
2665 2722
2666sub update { 2723sub update {
… …
2776 #font => default_font 2833 #font => default_font
2777 @_, 2834 @_,
2778 2835
2779 layout => (new CFPlus::Layout), 2836 layout => (new CFPlus::Layout),
2780 par => [], 2837 par => [],
2838 max_par => 0,
2781 height => 0, 2839 height => 0,
2782 children => [ 2840 children => [
2783 (new CFPlus::UI::Empty expand => 1), 2841 (new CFPlus::UI::Empty expand => 1),
2784 (new CFPlus::UI::Slider vertical => 1), 2842 (new CFPlus::UI::Slider vertical => 1),
2785 ], 2843 ],
… …
2908 wrapped => 1, 2966 wrapped => 1,
2909 }; 2967 };
2910 2968
2911 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 2969 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2912 push @{$self->{par}}, $para; 2970 push @{$self->{par}}, $para;
2971 }
2972
2973 if (my $max = $self->{max_par}) {
2974 shift @{$self->{par}} while @{$self->{par}} > $max;
2913 } 2975 }
2914 2976
2915 $self->{need_reflow}++; 2977 $self->{need_reflow}++;
2916 $self->update; 2978 $self->update;
2917} 2979}
… …
3231 can_events => 0, 3293 can_events => 0,
3232 @_, 3294 @_,
3233 ); 3295 );
3234 3296
3235 if ($self->{anim} && $self->{animspeed}) { 3297 if ($self->{anim} && $self->{animspeed}) {
3236 Scalar::Util::weaken (my $widget = $self); 3298 CFPlus::weaken (my $widget = $self);
3237 3299
3238 $self->{timer} = Event->timer ( 3300 $self->{timer} = Event->timer (
3239 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3301 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3240 hard => 1, 3302 hard => 1,
3241 interval => $self->{animspeed}, 3303 interval => $self->{animspeed},
… …
3495} 3557}
3496 3558
3497sub add { 3559sub add {
3498 my ($self, $title, $widget, $tooltip) = @_; 3560 my ($self, $title, $widget, $tooltip) = @_;
3499 3561
3500 Scalar::Util::weaken $self; 3562 CFPlus::weaken $self;
3501 3563
3502 $self->{buttonbar}->add (new CFPlus::UI::Button 3564 $self->{buttonbar}->add (new CFPlus::UI::Button
3503 markup => $title, 3565 markup => $title,
3504 tooltip => $tooltip, 3566 tooltip => $tooltip,
3505 on_activate => sub { $self->set_current_page ($widget) }, 3567 on_activate => sub { $self->set_current_page ($widget) },
… …
3589 my $self = $class->SUPER::new ( 3651 my $self = $class->SUPER::new (
3590 fontsize => 0.8, 3652 fontsize => 0.8,
3591 @_, 3653 @_,
3592 ); 3654 );
3593 3655
3594 Scalar::Util::weaken (my $this = $self); 3656 CFPlus::weaken (my $this = $self);
3595 3657
3596 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder }); 3658 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3597 3659
3598 $self 3660 $self
3599} 3661}
… …
3722 $self->SUPER::destroy; 3784 $self->SUPER::destroy;
3723} 3785}
3724 3786
3725############################################################################# 3787#############################################################################
3726 3788
3727package CFPlus::UI::Inventory;
3728
3729our @ISA = CFPlus::UI::Table::;
3730
3731sub new {
3732 my $class = shift;
3733
3734 my $self = $class->SUPER::new (
3735 col_expand => [0, 1, 0],
3736 items => [],
3737 @_,
3738 );
3739
3740 $self->set_sort_order (undef);
3741
3742 $self
3743}
3744
3745sub update_items {
3746 my ($self) = @_;
3747
3748 $self->clear;
3749
3750 my @item = $self->{sort}->(@{ $self->{items} });
3751
3752 my @adds;
3753 my $row = 0;
3754 for my $item ($self->{sort}->(@{ $self->{items} })) {
3755 CFPlus::Item::update_widgets $item;
3756
3757 push @adds, 0, $row, $item->{face_widget};
3758 push @adds, 1, $row, $item->{desc_widget};
3759 push @adds, 2, $row, $item->{weight_widget};
3760
3761 $row++;
3762 }
3763
3764 $self->add (@adds);
3765}
3766
3767sub set_sort_order {
3768 my ($self, $order) = @_;
3769
3770 $self->{sort} = $order ||= sub {
3771 sort {
3772 $a->{type} <=> $b->{type}
3773 or $a->{name} cmp $b->{name}
3774 } @_
3775 };
3776
3777 $self->update_items;
3778}
3779
3780sub set_items {
3781 my ($self, $items) = @_;
3782
3783 $self->{items} = [$items ? values %$items : ()];
3784 $self->update_items;
3785}
3786
3787#############################################################################
3788
3789package CFPlus::UI::SpellList;
3790
3791our @ISA = CFPlus::UI::Table::;
3792
3793sub new {
3794 my $class = shift;
3795
3796 my $self = $class->SUPER::new (
3797 binding => [],
3798 commands => [],
3799 @_,
3800 )
3801}
3802
3803my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3804
3805my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3806 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3807my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3808 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3809my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3810 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3811my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3812 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3813my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3814 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3815
3816sub rebuild_spell_list {
3817 my ($self) = @_;
3818
3819 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3820 $self->clear;
3821
3822 return unless $::CONN;
3823
3824 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3825 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3826 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3827 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3828 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3829
3830 my $row = 0;
3831
3832 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3833 my $spell = $self->{spell}{$_};
3834
3835 $row++;
3836
3837 my $spell_cb = sub {
3838 my ($widget, $ev) = @_;
3839
3840 if ($ev->{button} == 1) {
3841 $::CONN->user_send ("cast $spell->{name}");
3842 } elsif ($ev->{button} == 2) {
3843 $::CONN->user_send ("invoke $spell->{name}");
3844 } elsif ($ev->{button} == 3) {
3845 (new CFPlus::UI::Menu
3846 items => [
3847 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3848 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3849 ],
3850 )->popup ($ev);
3851 } else {
3852 return 0;
3853 }
3854
3855 1
3856 };
3857
3858 my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
3859
3860 #TODO: add path info to tooltip
3861 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3862
3863 $self->add (0, $row, new CFPlus::UI::Face
3864 face => $spell->{face},
3865 can_hover => 1,
3866 can_events => 1,
3867 tooltip => $tooltip,
3868 on_button_down => $spell_cb,
3869 );
3870
3871 $self->add (1, $row, new CFPlus::UI::Label
3872 expand => 1,
3873 text => $spell->{name},
3874 can_hover => 1,
3875 can_events => 1,
3876 tooltip => $tooltip,
3877 on_button_down => $spell_cb,
3878 );
3879
3880 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3881 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3882 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3883 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3884 }
3885 });
3886}
3887
3888sub add_spell {
3889 my ($self, $spell) = @_;
3890
3891 $self->{spell}->{$spell->{name}} = $spell;
3892 $self->rebuild_spell_list;
3893}
3894
3895sub remove_spell {
3896 my ($self, $spell) = @_;
3897
3898 delete $self->{spell}->{$spell->{name}};
3899 $self->rebuild_spell_list;
3900}
3901
3902sub clear_spells {
3903 my ($self) = @_;
3904
3905 $self->{spell} = {};
3906 $self->rebuild_spell_list;
3907}
3908
3909#############################################################################
3910
3911package CFPlus::UI::Root; 3789package CFPlus::UI::Root;
3912 3790
3913our @ISA = CFPlus::UI::Container::; 3791our @ISA = CFPlus::UI::Container::;
3914 3792
3915use List::Util qw(min max); 3793use List::Util qw(min max);
… …
3922 my $self = $class->SUPER::new ( 3800 my $self = $class->SUPER::new (
3923 visible => 1, 3801 visible => 1,
3924 @_, 3802 @_,
3925 ); 3803 );
3926 3804
3927 Scalar::Util::weaken ($self->{root} = $self); 3805 CFPlus::weaken ($self->{root} = $self);
3928 3806
3929 $self 3807 $self
3930} 3808}
3931 3809
3932sub size_request { 3810sub size_request {

Diff Legend

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