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.344 by root, Sun Aug 13 16:29:36 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
… …
2750 2903
2751 # todo: base offset on lines or so, not on pixels 2904 # todo: base offset on lines or so, not on pixels
2752 $self->{children}[1]->set_value ($offset); 2905 $self->{children}[1]->set_value ($offset);
2753} 2906}
2754 2907
2908sub current_paragraph {
2909 my ($self) = @_;
2910
2911 $self->{top_paragraph} - 1
2912}
2913
2914sub scroll_to {
2915 my ($self, $para) = @_;
2916
2917 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2918
2919 $self->{scroll_to} = $para;
2920 $self->update;
2921}
2922
2755sub clear { 2923sub clear {
2756 my ($self) = @_; 2924 my ($self) = @_;
2757 2925
2758 my (undef, undef, @other) = @{ $self->{children} }; 2926 my (undef, undef, @other) = @{ $self->{children} };
2759 $self->remove ($_) for @other; 2927 $self->remove ($_) for @other;
… …
2786} 2954}
2787 2955
2788sub scroll_to_bottom { 2956sub scroll_to_bottom {
2789 my ($self) = @_; 2957 my ($self) = @_;
2790 2958
2791 $self->{scroll_to_bottom} = 1; 2959 $self->{scroll_to} = $#{$self->{par}};
2792 $self->update; 2960 $self->update;
2793} 2961}
2794 2962
2963sub force_uptodate {
2964 my ($self) = @_;
2965
2966 if (delete $self->{need_reflow}) {
2967 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2968
2969 my $height = 0;
2970
2971 for my $para (@{$self->{par}}) {
2972 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2973 my $layout = $self->get_layout ($para);
2974 my ($w, $h) = $layout->size;
2975
2976 $para->{w} = $w + $para->{indent};
2977 $para->{h} = $h;
2978 $para->{wrapped} = $layout->has_wrapped;
2979 }
2980
2981 $para->{y} = $height;
2982 $height += $para->{h};
2983 }
2984
2985 $self->{height} = $height;
2986 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2987
2988 delete $self->{texture};
2989 }
2990
2991 if (my $paridx = delete $self->{scroll_to}) {
2992 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
2993 }
2994}
2995
2795sub update { 2996sub update {
2796 my ($self) = @_; 2997 my ($self) = @_;
2797 2998
2798 $self->SUPER::update; 2999 $self->SUPER::update;
2799 3000
2800 return unless $self->{h} > 0; 3001 return unless $self->{h} > 0;
2801 3002
2802 delete $self->{texture}; 3003 delete $self->{texture};
2803 3004
2804 $ROOT->on_post_alloc ($self => sub { 3005 $ROOT->on_post_alloc ($self => sub {
3006 $self->force_uptodate;
3007
2805 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3008 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2806
2807 if (delete $self->{need_reflow}) {
2808 my $height = 0;
2809
2810 for my $para (@{$self->{par}}) {
2811 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2812 my $layout = $self->get_layout ($para);
2813 my ($w, $h) = $layout->size;
2814
2815 $para->{w} = $w + $para->{indent};
2816 $para->{h} = $h;
2817 $para->{wrapped} = $layout->has_wrapped;
2818 }
2819
2820 $height += $para->{h};
2821 }
2822
2823 $self->{height} = $height;
2824
2825 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2826
2827 delete $self->{texture};
2828 }
2829
2830 if (delete $self->{scroll_to_bottom}) {
2831 $self->{children}[1]->set_value (1e10);
2832 }
2833 3009
2834 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3010 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2835 glClearColor 0, 0, 0, 0; 3011 glClearColor 0, 0, 0, 0;
2836 glClear GL_COLOR_BUFFER_BIT; 3012 glClear GL_COLOR_BUFFER_BIT;
2837 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;
2838 my $top = int $self->{children}[1]{range}[0]; 3022 my $top = int $self->{children}[1]{range}[0];
2839 3023
2840 my $y0 = $top; 3024 my $y0 = $top;
2841 my $y1 = $top + $H; 3025 my $y1 = $top + $H;
2842 3026
2843 my $y = 0;
2844
2845 for my $para (@{$self->{par}}) { 3027 for my $para (@{$self->{par}}) {
2846 my $h = $para->{h}; 3028 my $h = $para->{h};
3029 my $y = $para->{y};
2847 3030
2848 if ($y0 < $y + $h && $y < $y1) { 3031 if ($y0 < $y + $h && $y < $y1) {
2849
2850 my $layout = $self->get_layout ($para); 3032 my $layout = $self->get_layout ($para);
2851 3033
2852 $layout->render ($para->{indent}, $y - $y0); 3034 $layout->render ($para->{indent}, $y - $y0);
2853 3035
2854 if (my @w = @{ $para->{widget} }) { 3036 if (my @w = @{ $para->{widget} }) {
… …
2863 $_->draw; 3045 $_->draw;
2864 } 3046 }
2865 } 3047 }
2866 } 3048 }
2867 3049
2868 $y += $h; 3050 $paridx++;
3051 $top_paragraph ||= $paridx if $y >= $top;
2869 } 3052 }
3053
3054 $self->{top_paragraph} = $top_paragraph;
2870 }; 3055 };
2871 }); 3056 });
2872} 3057}
2873 3058
2874sub reconfigure { 3059sub reconfigure {
… …
3153 3338
3154package CFPlus::UI::Buttonbar; 3339package CFPlus::UI::Buttonbar;
3155 3340
3156our @ISA = CFPlus::UI::HBox::; 3341our @ISA = CFPlus::UI::HBox::;
3157 3342
3158# TODO: should actualyl wrap buttons and other goodies. 3343# TODO: should actually wrap buttons and other goodies.
3159 3344
3160############################################################################# 3345#############################################################################
3161 3346
3162package CFPlus::UI::Menu; 3347package CFPlus::UI::Menu;
3163 3348
3164our @ISA = CFPlus::UI::FancyFrame::; 3349our @ISA = CFPlus::UI::Toplevel::;
3165 3350
3166use CFPlus::OpenGL; 3351use CFPlus::OpenGL;
3167 3352
3168sub new { 3353sub new {
3169 my $class = shift; 3354 my $class = shift;
… …
3574 $self->SUPER::destroy; 3759 $self->SUPER::destroy;
3575} 3760}
3576 3761
3577############################################################################# 3762#############################################################################
3578 3763
3579package CFPlus::UI::Inventory;
3580
3581our @ISA = CFPlus::UI::Table::;
3582
3583sub new {
3584 my $class = shift;
3585
3586 my $self = $class->SUPER::new (
3587 col_expand => [0, 1, 0],
3588 items => [],
3589 @_,
3590 );
3591
3592 $self->set_sort_order (undef);
3593
3594 $self
3595}
3596
3597sub update_items {
3598 my ($self) = @_;
3599
3600 $self->clear;
3601
3602 my @item = $self->{sort}->(@{ $self->{items} });
3603
3604 my @adds;
3605 my $row = 0;
3606 for my $item ($self->{sort}->(@{ $self->{items} })) {
3607 CFPlus::Item::update_widgets $item;
3608
3609 push @adds, 0, $row, $item->{face_widget};
3610 push @adds, 1, $row, $item->{desc_widget};
3611 push @adds, 2, $row, $item->{weight_widget};
3612
3613 $row++;
3614 }
3615
3616 $self->add (@adds);
3617}
3618
3619sub set_sort_order {
3620 my ($self, $order) = @_;
3621
3622 $self->{sort} = $order ||= sub {
3623 sort {
3624 $a->{type} <=> $b->{type}
3625 or $a->{name} cmp $b->{name}
3626 } @_
3627 };
3628
3629 $self->update_items;
3630}
3631
3632sub set_items {
3633 my ($self, $items) = @_;
3634
3635 $self->{items} = [$items ? values %$items : ()];
3636 $self->update_items;
3637}
3638
3639#############################################################################
3640
3641package CFPlus::UI::SpellList;
3642
3643our @ISA = CFPlus::UI::Table::;
3644
3645sub new {
3646 my $class = shift;
3647
3648 my $self = $class->SUPER::new (
3649 binding => [],
3650 commands => [],
3651 @_,
3652 )
3653}
3654
3655my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3656
3657my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3658 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3659my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3660 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3661my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3662 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3663my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3664 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3665my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3666 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3667
3668sub rebuild_spell_list {
3669 my ($self) = @_;
3670
3671 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3672 $self->clear;
3673
3674 return unless $::CONN;
3675
3676 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3677 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3678 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3679 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3680 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3681
3682 my $row = 0;
3683
3684 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3685 my $spell = $self->{spell}{$_};
3686
3687 $row++;
3688
3689 my $spell_cb = sub {
3690 my ($widget, $ev) = @_;
3691
3692 if ($ev->{button} == 1) {
3693 $::CONN->user_send ("cast $spell->{name}");
3694 } elsif ($ev->{button} == 2) {
3695 $::CONN->user_send ("invoke $spell->{name}");
3696 } elsif ($ev->{button} == 3) {
3697 (new CFPlus::UI::Menu
3698 items => [
3699 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3700 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3701 ],
3702 )->popup ($ev);
3703 } else {
3704 return 0;
3705 }
3706
3707 1
3708 };
3709
3710 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3711
3712 #TODO: add path info to tooltip
3713 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3714
3715 $self->add (0, $row, new CFPlus::UI::Face
3716 face => $spell->{face},
3717 can_hover => 1,
3718 can_events => 1,
3719 tooltip => $tooltip,
3720 on_button_down => $spell_cb,
3721 );
3722
3723 $self->add (1, $row, new CFPlus::UI::Label
3724 expand => 1,
3725 text => $spell->{name},
3726 can_hover => 1,
3727 can_events => 1,
3728 tooltip => $tooltip,
3729 on_button_down => $spell_cb,
3730 );
3731
3732 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3733 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3734 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3735 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3736 }
3737 });
3738}
3739
3740sub add_spell {
3741 my ($self, $spell) = @_;
3742
3743 $self->{spell}->{$spell->{name}} = $spell;
3744 $self->rebuild_spell_list;
3745}
3746
3747sub remove_spell {
3748 my ($self, $spell) = @_;
3749
3750 delete $self->{spell}->{$spell->{name}};
3751 $self->rebuild_spell_list;
3752}
3753
3754sub clear_spells {
3755 my ($self) = @_;
3756
3757 $self->{spell} = {};
3758 $self->rebuild_spell_list;
3759}
3760
3761#############################################################################
3762
3763package CFPlus::UI::Root; 3764package CFPlus::UI::Root;
3764 3765
3765our @ISA = CFPlus::UI::Container::; 3766our @ISA = CFPlus::UI::Container::;
3766 3767
3767use List::Util qw(min max); 3768use List::Util qw(min max);
… …
3993 glLoadIdentity; 3994 glLoadIdentity;
3994 3995
3995 { 3996 {
3996 package CFPlus::UI::Base; 3997 package CFPlus::UI::Base;
3997 3998
3998 ($draw_x, $draw_y, $draw_w, $draw_h) = 3999 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3999 (0, 0, $self->{w}, $self->{h}); 4000 (0, 0, $self->{w}, $self->{h});
4000 }
4001 4001
4002 $self->_draw; 4002 $self->_draw;
4003 }
4003} 4004}
4004 4005
4005############################################################################# 4006#############################################################################
4006 4007
4007package CFPlus::UI; 4008package CFPlus::UI;

Diff Legend

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