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.347 by root, Mon Aug 14 03:41:28 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
1985 $self->{cursor} =
1986 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
1987 ? length $1
1988 : 0;
1989 } elsif ($sym == CFPlus::SDLK_END) {
1990 # uh, again
1991 $self->{cursor} =
1992 (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1993 ? $self->{cursor} + length $1
1994 : length $self->{text};
1995 } elsif ($uni == 21) { # ctrl-u
1996 $text = "";
1968 $self->{cursor} = 0; 1997 $self->{cursor} = 0;
1969 } elsif ($sym == CFPlus::SDLK_END) {
1970 $self->{cursor} = length $text;
1971 } elsif ($uni == 27) { 1998 } elsif ($uni == 27) {
1972 $self->emit ('escape'); 1999 $self->emit ('escape');
1973 } elsif ($uni) { 2000 } elsif ($uni == 0x0d) {
2001 substr $text, $self->{cursor}++, 0, "\012";
2002 } elsif ($uni >= 0x20) {
1974 substr $text, $self->{cursor}++, 0, chr $uni; 2003 substr $text, $self->{cursor}++, 0, chr $uni;
1975 } else { 2004 } else {
1976 return 0; 2005 return 0;
1977 } 2006 }
1978 2007
1979 $self->_set_text ($text); 2008 $self->_set_text ($text);
1980 2009
1981 $self->realloc; 2010 $self->realloc;
2011 $self->update;
1982 2012
1983 1 2013 1
1984} 2014}
1985 2015
1986sub invoke_focus_in { 2016sub invoke_focus_in {
… …
2055 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};
2056 glEnd; 2086 glEnd;
2057 } 2087 }
2058} 2088}
2059 2089
2090#############################################################################
2091
2060package CFPlus::UI::Entry; 2092package CFPlus::UI::Entry;
2061 2093
2062our @ISA = CFPlus::UI::EntryBase::; 2094our @ISA = CFPlus::UI::EntryBase::;
2063 2095
2064use CFPlus::OpenGL; 2096use CFPlus::OpenGL;
… …
2066sub invoke_key_down { 2098sub invoke_key_down {
2067 my ($self, $ev) = @_; 2099 my ($self, $ev) = @_;
2068 2100
2069 my $sym = $ev->{sym}; 2101 my $sym = $ev->{sym};
2070 2102
2071 if ($sym == 13) { 2103 if ($ev->{uni} == 0x0d || $sym == 13) {
2072 unshift @{$self->{history}}, 2104 unshift @{$self->{history}},
2073 my $txt = $self->get_text; 2105 my $txt = $self->get_text;
2074 2106
2075 $self->{history_pointer} = -1; 2107 $self->{history_pointer} = -1;
2076 $self->{history_saveback} = ''; 2108 $self->{history_saveback} = '';
… …
2106 1 2138 1
2107} 2139}
2108 2140
2109############################################################################# 2141#############################################################################
2110 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
2111package CFPlus::UI::Button; 2182package CFPlus::UI::Button;
2112 2183
2113our @ISA = CFPlus::UI::Label::; 2184our @ISA = CFPlus::UI::Label::;
2114 2185
2115use CFPlus::OpenGL; 2186use CFPlus::OpenGL;
… …
2257 or Carp::croak "'path' or 'tex' attributes required"; 2328 or Carp::croak "'path' or 'tex' attributes required";
2258 2329
2259 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2330 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2260 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;
2261 2332
2262 Scalar::Util::weaken $texture_cache{$self->{path}}; 2333 CFPlus::weaken $texture_cache{$self->{path}};
2263 2334
2264 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2335 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2265 2336
2266 $self 2337 $self
2267} 2338}
… …
2640sub invoke_mouse_wheel { 2711sub invoke_mouse_wheel {
2641 my ($self, $ev) = @_; 2712 my ($self, $ev) = @_;
2642 2713
2643 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2714 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2644 2715
2716 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2717
2645 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2718 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2646 2719
2647 ! ! $delta 2720 ! ! $delta
2648} 2721}
2649 2722
2650sub update { 2723sub update {
… …
2760 #font => default_font 2833 #font => default_font
2761 @_, 2834 @_,
2762 2835
2763 layout => (new CFPlus::Layout), 2836 layout => (new CFPlus::Layout),
2764 par => [], 2837 par => [],
2838 max_par => 0,
2765 height => 0, 2839 height => 0,
2766 children => [ 2840 children => [
2767 (new CFPlus::UI::Empty expand => 1), 2841 (new CFPlus::UI::Empty expand => 1),
2768 (new CFPlus::UI::Slider vertical => 1), 2842 (new CFPlus::UI::Slider vertical => 1),
2769 ], 2843 ],
… …
2894 2968
2895 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 2969 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2896 push @{$self->{par}}, $para; 2970 push @{$self->{par}}, $para;
2897 } 2971 }
2898 2972
2973 if (my $max = $self->{max_par}) {
2974 shift @{$self->{par}} while @{$self->{par}} > $max;
2975 }
2976
2899 $self->{need_reflow}++; 2977 $self->{need_reflow}++;
2900 $self->update; 2978 $self->update;
2901} 2979}
2902 2980
2903sub scroll_to_bottom { 2981sub scroll_to_bottom {
… …
2955 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3033 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2956 3034
2957 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 3035 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2958 glClearColor 0, 0, 0, 0; 3036 glClearColor 0, 0, 0, 0;
2959 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});
2960 3042
2961 my $top = int $self->{children}[1]{range}[0]; 3043 my $top = int $self->{children}[1]{range}[0];
2962 3044
2963 my $paridx = 0; 3045 my $paridx = 0;
2964 my $top_paragraph; 3046 my $top_paragraph;
… …
3211 can_events => 0, 3293 can_events => 0,
3212 @_, 3294 @_,
3213 ); 3295 );
3214 3296
3215 if ($self->{anim} && $self->{animspeed}) { 3297 if ($self->{anim} && $self->{animspeed}) {
3216 Scalar::Util::weaken (my $widget = $self); 3298 CFPlus::weaken (my $widget = $self);
3217 3299
3218 $self->{timer} = Event->timer ( 3300 $self->{timer} = Event->timer (
3219 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3301 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3220 hard => 1, 3302 hard => 1,
3221 interval => $self->{animspeed}, 3303 interval => $self->{animspeed},
… …
3281 3363
3282package CFPlus::UI::Buttonbar; 3364package CFPlus::UI::Buttonbar;
3283 3365
3284our @ISA = CFPlus::UI::HBox::; 3366our @ISA = CFPlus::UI::HBox::;
3285 3367
3286# TODO: should actualyl wrap buttons and other goodies. 3368# TODO: should actually wrap buttons and other goodies.
3287 3369
3288############################################################################# 3370#############################################################################
3289 3371
3290package CFPlus::UI::Menu; 3372package CFPlus::UI::Menu;
3291 3373
… …
3475} 3557}
3476 3558
3477sub add { 3559sub add {
3478 my ($self, $title, $widget, $tooltip) = @_; 3560 my ($self, $title, $widget, $tooltip) = @_;
3479 3561
3480 Scalar::Util::weaken $self; 3562 CFPlus::weaken $self;
3481 3563
3482 $self->{buttonbar}->add (new CFPlus::UI::Button 3564 $self->{buttonbar}->add (new CFPlus::UI::Button
3483 markup => $title, 3565 markup => $title,
3484 tooltip => $tooltip, 3566 tooltip => $tooltip,
3485 on_activate => sub { $self->set_current_page ($widget) }, 3567 on_activate => sub { $self->set_current_page ($widget) },
… …
3569 my $self = $class->SUPER::new ( 3651 my $self = $class->SUPER::new (
3570 fontsize => 0.8, 3652 fontsize => 0.8,
3571 @_, 3653 @_,
3572 ); 3654 );
3573 3655
3574 Scalar::Util::weaken (my $this = $self); 3656 CFPlus::weaken (my $this = $self);
3575 3657
3576 $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 });
3577 3659
3578 $self 3660 $self
3579} 3661}
… …
3702 $self->SUPER::destroy; 3784 $self->SUPER::destroy;
3703} 3785}
3704 3786
3705############################################################################# 3787#############################################################################
3706 3788
3707package CFPlus::UI::Inventory;
3708
3709our @ISA = CFPlus::UI::Table::;
3710
3711sub new {
3712 my $class = shift;
3713
3714 my $self = $class->SUPER::new (
3715 col_expand => [0, 1, 0],
3716 items => [],
3717 @_,
3718 );
3719
3720 $self->set_sort_order (undef);
3721
3722 $self
3723}
3724
3725sub update_items {
3726 my ($self) = @_;
3727
3728 $self->clear;
3729
3730 my @item = $self->{sort}->(@{ $self->{items} });
3731
3732 my @adds;
3733 my $row = 0;
3734 for my $item ($self->{sort}->(@{ $self->{items} })) {
3735 CFPlus::Item::update_widgets $item;
3736
3737 push @adds, 0, $row, $item->{face_widget};
3738 push @adds, 1, $row, $item->{desc_widget};
3739 push @adds, 2, $row, $item->{weight_widget};
3740
3741 $row++;
3742 }
3743
3744 $self->add (@adds);
3745}
3746
3747sub set_sort_order {
3748 my ($self, $order) = @_;
3749
3750 $self->{sort} = $order ||= sub {
3751 sort {
3752 $a->{type} <=> $b->{type}
3753 or $a->{name} cmp $b->{name}
3754 } @_
3755 };
3756
3757 $self->update_items;
3758}
3759
3760sub set_items {
3761 my ($self, $items) = @_;
3762
3763 $self->{items} = [$items ? values %$items : ()];
3764 $self->update_items;
3765}
3766
3767#############################################################################
3768
3769package CFPlus::UI::SpellList;
3770
3771our @ISA = CFPlus::UI::Table::;
3772
3773sub new {
3774 my $class = shift;
3775
3776 my $self = $class->SUPER::new (
3777 binding => [],
3778 commands => [],
3779 @_,
3780 )
3781}
3782
3783my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3784
3785my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3786 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3787my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3788 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3789my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3790 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3791my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3792 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3793my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3794 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3795
3796sub rebuild_spell_list {
3797 my ($self) = @_;
3798
3799 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3800 $self->clear;
3801
3802 return unless $::CONN;
3803
3804 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3805 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3806 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3807 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3808 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3809
3810 my $row = 0;
3811
3812 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3813 my $spell = $self->{spell}{$_};
3814
3815 $row++;
3816
3817 my $spell_cb = sub {
3818 my ($widget, $ev) = @_;
3819
3820 if ($ev->{button} == 1) {
3821 $::CONN->user_send ("cast $spell->{name}");
3822 } elsif ($ev->{button} == 2) {
3823 $::CONN->user_send ("invoke $spell->{name}");
3824 } elsif ($ev->{button} == 3) {
3825 (new CFPlus::UI::Menu
3826 items => [
3827 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3828 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3829 ],
3830 )->popup ($ev);
3831 } else {
3832 return 0;
3833 }
3834
3835 1
3836 };
3837
3838 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3839
3840 #TODO: add path info to tooltip
3841 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3842
3843 $self->add (0, $row, new CFPlus::UI::Face
3844 face => $spell->{face},
3845 can_hover => 1,
3846 can_events => 1,
3847 tooltip => $tooltip,
3848 on_button_down => $spell_cb,
3849 );
3850
3851 $self->add (1, $row, new CFPlus::UI::Label
3852 expand => 1,
3853 text => $spell->{name},
3854 can_hover => 1,
3855 can_events => 1,
3856 tooltip => $tooltip,
3857 on_button_down => $spell_cb,
3858 );
3859
3860 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3861 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3862 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3863 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3864 }
3865 });
3866}
3867
3868sub add_spell {
3869 my ($self, $spell) = @_;
3870
3871 $self->{spell}->{$spell->{name}} = $spell;
3872 $self->rebuild_spell_list;
3873}
3874
3875sub remove_spell {
3876 my ($self, $spell) = @_;
3877
3878 delete $self->{spell}->{$spell->{name}};
3879 $self->rebuild_spell_list;
3880}
3881
3882sub clear_spells {
3883 my ($self) = @_;
3884
3885 $self->{spell} = {};
3886 $self->rebuild_spell_list;
3887}
3888
3889#############################################################################
3890
3891package CFPlus::UI::Root; 3789package CFPlus::UI::Root;
3892 3790
3893our @ISA = CFPlus::UI::Container::; 3791our @ISA = CFPlus::UI::Container::;
3894 3792
3895use List::Util qw(min max); 3793use List::Util qw(min max);
… …
3902 my $self = $class->SUPER::new ( 3800 my $self = $class->SUPER::new (
3903 visible => 1, 3801 visible => 1,
3904 @_, 3802 @_,
3905 ); 3803 );
3906 3804
3907 Scalar::Util::weaken ($self->{root} = $self); 3805 CFPlus::weaken ($self->{root} = $self);
3908 3806
3909 $self 3807 $self
3910} 3808}
3911 3809
3912sub size_request { 3810sub size_request {
… …
4121 glLoadIdentity; 4019 glLoadIdentity;
4122 4020
4123 { 4021 {
4124 package CFPlus::UI::Base; 4022 package CFPlus::UI::Base;
4125 4023
4126 ($draw_x, $draw_y, $draw_w, $draw_h) = 4024 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4127 (0, 0, $self->{w}, $self->{h}); 4025 (0, 0, $self->{w}, $self->{h});
4128 }
4129 4026
4130 $self->_draw; 4027 $self->_draw;
4028 }
4131} 4029}
4132 4030
4133############################################################################# 4031#############################################################################
4134 4032
4135package CFPlus::UI; 4033package CFPlus::UI;

Diff Legend

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