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.349 by root, Thu Aug 17 16:05:36 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,
… …
514); 523);
515 524
516sub emit { 525sub emit {
517 my ($self, $signal, @args) = @_; 526 my ($self, $signal, @args) = @_;
518 527
519 # I do not really like this solution, but I dislike duplication 528 # I do not really like this solution, but I do not like duplication
520 # and needlessly verbose code, too. 529 # and needlessly verbose code, either.
521 my @append 530 my @append
522 = $has_coords{$signal} 531 = $has_coords{$signal}
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 #d##TODO# stop propagating at first true, do not use sum 537 for my $cb (
529 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before 538 @{$self->{signal_cb}{$signal} || []}, # before
530 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure 539 ($self->can ("invoke_$signal") || sub { 1 }), # closure
540 ) {
541 return $cb->($self, @args, @append) || next;
542 }
543
544 # parent
531 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 545 $self->{parent} && $self->{parent}->emit ($signal, @args)
532} 546}
533 547
534sub find_widget { 548sub find_widget {
535 my ($self, $x, $y) = @_; 549 my ($self, $x, $y) = @_;
536 550
… …
544} 558}
545 559
546sub set_parent { 560sub set_parent {
547 my ($self, $parent) = @_; 561 my ($self, $parent) = @_;
548 562
549 Scalar::Util::weaken ($self->{parent} = $parent); 563 CFPlus::weaken ($self->{parent} = $parent);
550 $self->set_visible if $parent->{visible}; 564 $self->set_visible if $parent->{visible};
551} 565}
552 566
553sub realloc { 567sub realloc {
554 my ($self) = @_; 568 my ($self) = @_;
… …
633 my ($self) = @_; 647 my ($self) = @_;
634 648
635 warn "no draw defined for $self\n"; 649 warn "no draw defined for $self\n";
636} 650}
637 651
652my $cntx;#d#
638sub DESTROY { 653sub DESTROY {
639 my ($self) = @_; 654 my ($self) = @_;
640 655
641 return if CFPlus::in_destruct; 656 return if CFPlus::in_destruct;
642
643 delete $WIDGET{$self+0};
644 657
645 eval { $self->destroy }; 658 eval { $self->destroy };
646 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};
647} 662}
648 663
649############################################################################# 664#############################################################################
650 665
651package CFPlus::UI::DrawBG; 666package CFPlus::UI::DrawBG;
… …
898 glClear GL_COLOR_BUFFER_BIT; 913 glClear GL_COLOR_BUFFER_BIT;
899 914
900 { 915 {
901 package CFPlus::UI::Base; 916 package CFPlus::UI::Base;
902 917
903 ($draw_x, $draw_y, $draw_w, $draw_h) = 918 local ($draw_x, $draw_y, $draw_w, $draw_h) =
904 (0, 0, $self->{w}, $self->{h}); 919 (0, 0, $self->{w}, $self->{h});
920
921 $self->_render;
905 } 922 }
906
907 $self->_render;
908 }; 923 };
909} 924}
910 925
911sub _draw { 926sub _draw {
912 my ($self) = @_; 927 my ($self) = @_;
… …
1900 active_fg => [0, 0, 0], 1915 active_fg => [0, 0, 0],
1901 can_hover => 1, 1916 can_hover => 1,
1902 can_focus => 1, 1917 can_focus => 1,
1903 valign => 0, 1918 valign => 0,
1904 can_events => 1, 1919 can_events => 1,
1920 ellipsise => 0,
1905 #text => ... 1921 #text => ...
1906 #hidden => "*", 1922 #hidden => "*",
1907 @_ 1923 @_
1908 ) 1924 )
1909} 1925}
… …
1963 } elsif ($sym == CFPlus::SDLK_LEFT) { 1979 } elsif ($sym == CFPlus::SDLK_LEFT) {
1964 --$self->{cursor} if $self->{cursor}; 1980 --$self->{cursor} if $self->{cursor};
1965 } elsif ($sym == CFPlus::SDLK_RIGHT) { 1981 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1966 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1982 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1967 } elsif ($sym == CFPlus::SDLK_HOME) { 1983 } elsif ($sym == CFPlus::SDLK_HOME) {
1984 # what a hack
1968 $self->{cursor} = 0; 1985 $self->{cursor} =
1986 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
1987 ? length $1
1988 : 0;
1969 } 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/
1970 $self->{cursor} = length $text; 1993 ? $self->{cursor} + length $1
1994 : length $self->{text};
1971 } elsif ($uni == 21) { # ctrl-u 1995 } elsif ($uni == 21) { # ctrl-u
1972 $text = ""; 1996 $text = "";
1973 $self->{cursor} = 0; 1997 $self->{cursor} = 0;
1974 } elsif ($uni == 27) { 1998 } elsif ($uni == 27) {
1975 $self->emit ('escape'); 1999 $self->emit ('escape');
1976 } elsif ($uni) { 2000 } elsif ($uni == 0x0d) {
2001 substr $text, $self->{cursor}++, 0, "\012";
2002 } elsif ($uni >= 0x20) {
1977 substr $text, $self->{cursor}++, 0, chr $uni; 2003 substr $text, $self->{cursor}++, 0, chr $uni;
1978 } else { 2004 } else {
1979 return 0; 2005 return 0;
1980 } 2006 }
1981 2007
1982 $self->_set_text ($text); 2008 $self->_set_text ($text);
1983 2009
1984 $self->realloc; 2010 $self->realloc;
2011 $self->update;
1985 2012
1986 1 2013 1
1987} 2014}
1988 2015
1989sub invoke_focus_in { 2016sub invoke_focus_in {
… …
2058 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};
2059 glEnd; 2086 glEnd;
2060 } 2087 }
2061} 2088}
2062 2089
2090#############################################################################
2091
2063package CFPlus::UI::Entry; 2092package CFPlus::UI::Entry;
2064 2093
2065our @ISA = CFPlus::UI::EntryBase::; 2094our @ISA = CFPlus::UI::EntryBase::;
2066 2095
2067use CFPlus::OpenGL; 2096use CFPlus::OpenGL;
… …
2069sub invoke_key_down { 2098sub invoke_key_down {
2070 my ($self, $ev) = @_; 2099 my ($self, $ev) = @_;
2071 2100
2072 my $sym = $ev->{sym}; 2101 my $sym = $ev->{sym};
2073 2102
2074 if ($sym == 13) { 2103 if ($ev->{uni} == 0x0d || $sym == 13) {
2075 unshift @{$self->{history}}, 2104 unshift @{$self->{history}},
2076 my $txt = $self->get_text; 2105 my $txt = $self->get_text;
2077 2106
2078 $self->{history_pointer} = -1; 2107 $self->{history_pointer} = -1;
2079 $self->{history_saveback} = ''; 2108 $self->{history_saveback} = '';
… …
2109 1 2138 1
2110} 2139}
2111 2140
2112############################################################################# 2141#############################################################################
2113 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
2114package CFPlus::UI::Button; 2182package CFPlus::UI::Button;
2115 2183
2116our @ISA = CFPlus::UI::Label::; 2184our @ISA = CFPlus::UI::Label::;
2117 2185
2118use CFPlus::OpenGL; 2186use CFPlus::OpenGL;
… …
2260 or Carp::croak "'path' or 'tex' attributes required"; 2328 or Carp::croak "'path' or 'tex' attributes required";
2261 2329
2262 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2330 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2263 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;
2264 2332
2265 Scalar::Util::weaken $texture_cache{$self->{path}}; 2333 CFPlus::weaken $texture_cache{$self->{path}};
2266 2334
2267 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2335 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2268 2336
2269 $self 2337 $self
2270} 2338}
… …
2643sub invoke_mouse_wheel { 2711sub invoke_mouse_wheel {
2644 my ($self, $ev) = @_; 2712 my ($self, $ev) = @_;
2645 2713
2646 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2714 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2647 2715
2716 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2717
2648 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2718 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2649 2719
2650 ! ! $delta 2720 ! ! $delta
2651} 2721}
2652 2722
2653sub update { 2723sub update {
… …
2763 #font => default_font 2833 #font => default_font
2764 @_, 2834 @_,
2765 2835
2766 layout => (new CFPlus::Layout), 2836 layout => (new CFPlus::Layout),
2767 par => [], 2837 par => [],
2838 max_par => 0,
2768 height => 0, 2839 height => 0,
2769 children => [ 2840 children => [
2770 (new CFPlus::UI::Empty expand => 1), 2841 (new CFPlus::UI::Empty expand => 1),
2771 (new CFPlus::UI::Slider vertical => 1), 2842 (new CFPlus::UI::Slider vertical => 1),
2772 ], 2843 ],
… …
2897 2968
2898 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 2969 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2899 push @{$self->{par}}, $para; 2970 push @{$self->{par}}, $para;
2900 } 2971 }
2901 2972
2973 if (my $max = $self->{max_par}) {
2974 shift @{$self->{par}} while @{$self->{par}} > $max;
2975 }
2976
2902 $self->{need_reflow}++; 2977 $self->{need_reflow}++;
2903 $self->update; 2978 $self->update;
2904} 2979}
2905 2980
2906sub scroll_to_bottom { 2981sub scroll_to_bottom {
… …
2958 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3033 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2959 3034
2960 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3035 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2961 glClearColor 0, 0, 0, 0; 3036 glClearColor 0, 0, 0, 0;
2962 glClear GL_COLOR_BUFFER_BIT; 3037 glClear GL_COLOR_BUFFER_BIT;
3038
3039 package CFPlus::UI::Base;
3040 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3041 (0, 0, $self->{w}, $self->{h});
2963 3042
2964 my $top = int $self->{children}[1]{range}[0]; 3043 my $top = int $self->{children}[1]{range}[0];
2965 3044
2966 my $paridx = 0; 3045 my $paridx = 0;
2967 my $top_paragraph; 3046 my $top_paragraph;
… …
3214 can_events => 0, 3293 can_events => 0,
3215 @_, 3294 @_,
3216 ); 3295 );
3217 3296
3218 if ($self->{anim} && $self->{animspeed}) { 3297 if ($self->{anim} && $self->{animspeed}) {
3219 Scalar::Util::weaken (my $widget = $self); 3298 CFPlus::weaken (my $widget = $self);
3220 3299
3221 $self->{timer} = Event->timer ( 3300 $self->{timer} = Event->timer (
3222 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3301 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3223 hard => 1, 3302 hard => 1,
3224 interval => $self->{animspeed}, 3303 interval => $self->{animspeed},
… …
3284 3363
3285package CFPlus::UI::Buttonbar; 3364package CFPlus::UI::Buttonbar;
3286 3365
3287our @ISA = CFPlus::UI::HBox::; 3366our @ISA = CFPlus::UI::HBox::;
3288 3367
3289# TODO: should actualyl wrap buttons and other goodies. 3368# TODO: should actually wrap buttons and other goodies.
3290 3369
3291############################################################################# 3370#############################################################################
3292 3371
3293package CFPlus::UI::Menu; 3372package CFPlus::UI::Menu;
3294 3373
… …
3478} 3557}
3479 3558
3480sub add { 3559sub add {
3481 my ($self, $title, $widget, $tooltip) = @_; 3560 my ($self, $title, $widget, $tooltip) = @_;
3482 3561
3483 Scalar::Util::weaken $self; 3562 CFPlus::weaken $self;
3484 3563
3485 $self->{buttonbar}->add (new CFPlus::UI::Button 3564 $self->{buttonbar}->add (new CFPlus::UI::Button
3486 markup => $title, 3565 markup => $title,
3487 tooltip => $tooltip, 3566 tooltip => $tooltip,
3488 on_activate => sub { $self->set_current_page ($widget) }, 3567 on_activate => sub { $self->set_current_page ($widget) },
… …
3572 my $self = $class->SUPER::new ( 3651 my $self = $class->SUPER::new (
3573 fontsize => 0.8, 3652 fontsize => 0.8,
3574 @_, 3653 @_,
3575 ); 3654 );
3576 3655
3577 Scalar::Util::weaken (my $this = $self); 3656 CFPlus::weaken (my $this = $self);
3578 3657
3579 $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 });
3580 3659
3581 $self 3660 $self
3582} 3661}
… …
3705 $self->SUPER::destroy; 3784 $self->SUPER::destroy;
3706} 3785}
3707 3786
3708############################################################################# 3787#############################################################################
3709 3788
3710package CFPlus::UI::Inventory;
3711
3712our @ISA = CFPlus::UI::Table::;
3713
3714sub new {
3715 my $class = shift;
3716
3717 my $self = $class->SUPER::new (
3718 col_expand => [0, 1, 0],
3719 items => [],
3720 @_,
3721 );
3722
3723 $self->set_sort_order (undef);
3724
3725 $self
3726}
3727
3728sub update_items {
3729 my ($self) = @_;
3730
3731 $self->clear;
3732
3733 my @item = $self->{sort}->(@{ $self->{items} });
3734
3735 my @adds;
3736 my $row = 0;
3737 for my $item ($self->{sort}->(@{ $self->{items} })) {
3738 CFPlus::Item::update_widgets $item;
3739
3740 push @adds, 0, $row, $item->{face_widget};
3741 push @adds, 1, $row, $item->{desc_widget};
3742 push @adds, 2, $row, $item->{weight_widget};
3743
3744 $row++;
3745 }
3746
3747 $self->add (@adds);
3748}
3749
3750sub set_sort_order {
3751 my ($self, $order) = @_;
3752
3753 $self->{sort} = $order ||= sub {
3754 sort {
3755 $a->{type} <=> $b->{type}
3756 or $a->{name} cmp $b->{name}
3757 } @_
3758 };
3759
3760 $self->update_items;
3761}
3762
3763sub set_items {
3764 my ($self, $items) = @_;
3765
3766 $self->{items} = [$items ? values %$items : ()];
3767 $self->update_items;
3768}
3769
3770#############################################################################
3771
3772package CFPlus::UI::SpellList;
3773
3774our @ISA = CFPlus::UI::Table::;
3775
3776sub new {
3777 my $class = shift;
3778
3779 my $self = $class->SUPER::new (
3780 binding => [],
3781 commands => [],
3782 @_,
3783 )
3784}
3785
3786my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3787
3788my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3789 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3790my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3791 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3792my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3793 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3794my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3795 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3796my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3797 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3798
3799sub rebuild_spell_list {
3800 my ($self) = @_;
3801
3802 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3803 $self->clear;
3804
3805 return unless $::CONN;
3806
3807 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3808 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3809 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3810 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3811 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3812
3813 my $row = 0;
3814
3815 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3816 my $spell = $self->{spell}{$_};
3817
3818 $row++;
3819
3820 my $spell_cb = sub {
3821 my ($widget, $ev) = @_;
3822
3823 if ($ev->{button} == 1) {
3824 $::CONN->user_send ("cast $spell->{name}");
3825 } elsif ($ev->{button} == 2) {
3826 $::CONN->user_send ("invoke $spell->{name}");
3827 } elsif ($ev->{button} == 3) {
3828 (new CFPlus::UI::Menu
3829 items => [
3830 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3831 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3832 ],
3833 )->popup ($ev);
3834 } else {
3835 return 0;
3836 }
3837
3838 1
3839 };
3840
3841 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3842
3843 #TODO: add path info to tooltip
3844 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3845
3846 $self->add (0, $row, new CFPlus::UI::Face
3847 face => $spell->{face},
3848 can_hover => 1,
3849 can_events => 1,
3850 tooltip => $tooltip,
3851 on_button_down => $spell_cb,
3852 );
3853
3854 $self->add (1, $row, new CFPlus::UI::Label
3855 expand => 1,
3856 text => $spell->{name},
3857 can_hover => 1,
3858 can_events => 1,
3859 tooltip => $tooltip,
3860 on_button_down => $spell_cb,
3861 );
3862
3863 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3864 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3865 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3866 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3867 }
3868 });
3869}
3870
3871sub add_spell {
3872 my ($self, $spell) = @_;
3873
3874 $self->{spell}->{$spell->{name}} = $spell;
3875 $self->rebuild_spell_list;
3876}
3877
3878sub remove_spell {
3879 my ($self, $spell) = @_;
3880
3881 delete $self->{spell}->{$spell->{name}};
3882 $self->rebuild_spell_list;
3883}
3884
3885sub clear_spells {
3886 my ($self) = @_;
3887
3888 $self->{spell} = {};
3889 $self->rebuild_spell_list;
3890}
3891
3892#############################################################################
3893
3894package CFPlus::UI::Root; 3789package CFPlus::UI::Root;
3895 3790
3896our @ISA = CFPlus::UI::Container::; 3791our @ISA = CFPlus::UI::Container::;
3897 3792
3898use List::Util qw(min max); 3793use List::Util qw(min max);
… …
3905 my $self = $class->SUPER::new ( 3800 my $self = $class->SUPER::new (
3906 visible => 1, 3801 visible => 1,
3907 @_, 3802 @_,
3908 ); 3803 );
3909 3804
3910 Scalar::Util::weaken ($self->{root} = $self); 3805 CFPlus::weaken ($self->{root} = $self);
3911 3806
3912 $self 3807 $self
3913} 3808}
3914 3809
3915sub size_request { 3810sub size_request {
… …
4124 glLoadIdentity; 4019 glLoadIdentity;
4125 4020
4126 { 4021 {
4127 package CFPlus::UI::Base; 4022 package CFPlus::UI::Base;
4128 4023
4129 ($draw_x, $draw_y, $draw_w, $draw_h) = 4024 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4130 (0, 0, $self->{w}, $self->{h}); 4025 (0, 0, $self->{w}, $self->{h});
4131 }
4132 4026
4133 $self->_draw; 4027 $self->_draw;
4028 }
4134} 4029}
4135 4030
4136############################################################################# 4031#############################################################################
4137 4032
4138package CFPlus::UI; 4033package CFPlus::UI;

Diff Legend

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