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.358 by root, Fri Dec 8 14:59:54 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 #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;
… …
1964 } elsif ($sym == CFPlus::SDLK_LEFT) { 1979 } elsif ($sym == CFPlus::SDLK_LEFT) {
1965 --$self->{cursor} if $self->{cursor}; 1980 --$self->{cursor} if $self->{cursor};
1966 } elsif ($sym == CFPlus::SDLK_RIGHT) { 1981 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1967 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1982 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1968 } elsif ($sym == CFPlus::SDLK_HOME) { 1983 } elsif ($sym == CFPlus::SDLK_HOME) {
1984 # what a hack
1969 $self->{cursor} = 0; 1985 $self->{cursor} =
1986 (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
1987 ? length $1
1988 : 0;
1970 } 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/
1971 $self->{cursor} = length $text; 1993 ? $self->{cursor} + length $1
1994 : length $self->{text};
1972 } elsif ($uni == 21) { # ctrl-u 1995 } elsif ($uni == 21) { # ctrl-u
1973 $text = ""; 1996 $text = "";
1974 $self->{cursor} = 0; 1997 $self->{cursor} = 0;
1975 } elsif ($uni == 27) { 1998 } elsif ($uni == 27) {
1976 $self->emit ('escape'); 1999 $self->emit ('escape');
2000 } elsif ($uni == 0x0d) {
2001 substr $text, $self->{cursor}++, 0, "\012";
1977 } elsif ($uni >= 0x20) { 2002 } elsif ($uni >= 0x20) {
1978 substr $text, $self->{cursor}++, 0, chr $uni; 2003 substr $text, $self->{cursor}++, 0, chr $uni;
1979 } else { 2004 } else {
1980 return 0; 2005 return 0;
1981 } 2006 }
… …
2073sub invoke_key_down { 2098sub invoke_key_down {
2074 my ($self, $ev) = @_; 2099 my ($self, $ev) = @_;
2075 2100
2076 my $sym = $ev->{sym}; 2101 my $sym = $ev->{sym};
2077 2102
2078 if ($sym == 13) { 2103 if ($ev->{uni} == 0x0d || $sym == 13) {
2079 unshift @{$self->{history}}, 2104 unshift @{$self->{history}},
2080 my $txt = $self->get_text; 2105 my $txt = $self->get_text;
2081 2106
2082 $self->{history_pointer} = -1; 2107 $self->{history_pointer} = -1;
2083 $self->{history_saveback} = ''; 2108 $self->{history_saveback} = '';
… …
2124sub move_cursor_ver { 2149sub move_cursor_ver {
2125 my ($self, $dy) = @_; 2150 my ($self, $dy) = @_;
2126 2151
2127 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor}); 2152 my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2128 2153
2129 do { 2154 $y += $dy;
2155
2130 if (defined (my $index = $self->{layout}->line_x_to_index ($y + $dy, $x))) { 2156 if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
2131 $self->{cursor} = $index; 2157 $self->{cursor} = $index;
2132 delete $self->{cur_h}; 2158 delete $self->{cur_h};
2133 $self->update; 2159 $self->update;
2134 return; 2160 return;
2135 } 2161 }
2136 } while --$x >= 0;
2137} 2162}
2138 2163
2139sub invoke_key_down { 2164sub invoke_key_down {
2140 my ($self, $ev) = @_; 2165 my ($self, $ev) = @_;
2141 2166
… …
2303 or Carp::croak "'path' or 'tex' attributes required"; 2328 or Carp::croak "'path' or 'tex' attributes required";
2304 2329
2305 $self->{tex} ||= $texture_cache{$self->{path}} ||= 2330 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2306 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;
2307 2332
2308 Scalar::Util::weaken $texture_cache{$self->{path}}; 2333 CFPlus::weaken $texture_cache{$self->{path}};
2309 2334
2310 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2335 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2311 2336
2312 $self 2337 $self
2313} 2338}
… …
2686sub invoke_mouse_wheel { 2711sub invoke_mouse_wheel {
2687 my ($self, $ev) = @_; 2712 my ($self, $ev) = @_;
2688 2713
2689 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx}; 2714 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2690 2715
2716 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2717
2691 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2); 2718 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2692 2719
2693 ! ! $delta 2720 ! ! $delta
2694} 2721}
2695 2722
2696sub update { 2723sub update {
… …
2806 #font => default_font 2833 #font => default_font
2807 @_, 2834 @_,
2808 2835
2809 layout => (new CFPlus::Layout), 2836 layout => (new CFPlus::Layout),
2810 par => [], 2837 par => [],
2838 max_par => 0,
2811 height => 0, 2839 height => 0,
2812 children => [ 2840 children => [
2813 (new CFPlus::UI::Empty expand => 1), 2841 (new CFPlus::UI::Empty expand => 1),
2814 (new CFPlus::UI::Slider vertical => 1), 2842 (new CFPlus::UI::Slider vertical => 1),
2815 ], 2843 ],
… …
2938 wrapped => 1, 2966 wrapped => 1,
2939 }; 2967 };
2940 2968
2941 $self->add (@{ $para->{widget} }) if @{ $para->{widget} }; 2969 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2942 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;
2943 } 2975 }
2944 2976
2945 $self->{need_reflow}++; 2977 $self->{need_reflow}++;
2946 $self->update; 2978 $self->update;
2947} 2979}
… …
3261 can_events => 0, 3293 can_events => 0,
3262 @_, 3294 @_,
3263 ); 3295 );
3264 3296
3265 if ($self->{anim} && $self->{animspeed}) { 3297 if ($self->{anim} && $self->{animspeed}) {
3266 Scalar::Util::weaken (my $widget = $self); 3298 CFPlus::weaken (my $widget = $self);
3267 3299
3268 $self->{timer} = Event->timer ( 3300 $self->{timer} = Event->timer (
3269 at => $self->{animspeed} * int $::NOW / $self->{animspeed}, 3301 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3270 hard => 1, 3302 hard => 1,
3271 interval => $self->{animspeed}, 3303 interval => $self->{animspeed},
… …
3525} 3557}
3526 3558
3527sub add { 3559sub add {
3528 my ($self, $title, $widget, $tooltip) = @_; 3560 my ($self, $title, $widget, $tooltip) = @_;
3529 3561
3530 Scalar::Util::weaken $self; 3562 CFPlus::weaken $self;
3531 3563
3532 $self->{buttonbar}->add (new CFPlus::UI::Button 3564 $self->{buttonbar}->add (new CFPlus::UI::Button
3533 markup => $title, 3565 markup => $title,
3534 tooltip => $tooltip, 3566 tooltip => $tooltip,
3535 on_activate => sub { $self->set_current_page ($widget) }, 3567 on_activate => sub { $self->set_current_page ($widget) },
… …
3619 my $self = $class->SUPER::new ( 3651 my $self = $class->SUPER::new (
3620 fontsize => 0.8, 3652 fontsize => 0.8,
3621 @_, 3653 @_,
3622 ); 3654 );
3623 3655
3624 Scalar::Util::weaken (my $this = $self); 3656 CFPlus::weaken (my $this = $self);
3625 3657
3626 $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 });
3627 3659
3628 $self 3660 $self
3629} 3661}
… …
3752 $self->SUPER::destroy; 3784 $self->SUPER::destroy;
3753} 3785}
3754 3786
3755############################################################################# 3787#############################################################################
3756 3788
3757package CFPlus::UI::Inventory;
3758
3759our @ISA = CFPlus::UI::Table::;
3760
3761sub new {
3762 my $class = shift;
3763
3764 my $self = $class->SUPER::new (
3765 col_expand => [0, 1, 0],
3766 items => [],
3767 @_,
3768 );
3769
3770 $self->set_sort_order (undef);
3771
3772 $self
3773}
3774
3775sub update_items {
3776 my ($self) = @_;
3777
3778 $self->clear;
3779
3780 my @item = $self->{sort}->(@{ $self->{items} });
3781
3782 my @adds;
3783 my $row = 0;
3784 for my $item ($self->{sort}->(@{ $self->{items} })) {
3785 CFPlus::Item::update_widgets $item;
3786
3787 push @adds, 0, $row, $item->{face_widget};
3788 push @adds, 1, $row, $item->{desc_widget};
3789 push @adds, 2, $row, $item->{weight_widget};
3790
3791 $row++;
3792 }
3793
3794 $self->add (@adds);
3795}
3796
3797sub set_sort_order {
3798 my ($self, $order) = @_;
3799
3800 $self->{sort} = $order ||= sub {
3801 sort {
3802 $a->{type} <=> $b->{type}
3803 or $a->{name} cmp $b->{name}
3804 } @_
3805 };
3806
3807 $self->update_items;
3808}
3809
3810sub set_items {
3811 my ($self, $items) = @_;
3812
3813 $self->{items} = [$items ? values %$items : ()];
3814 $self->update_items;
3815}
3816
3817#############################################################################
3818
3819package CFPlus::UI::SpellList;
3820
3821our @ISA = CFPlus::UI::Table::;
3822
3823sub new {
3824 my $class = shift;
3825
3826 my $self = $class->SUPER::new (
3827 binding => [],
3828 commands => [],
3829 @_,
3830 )
3831}
3832
3833my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3834
3835my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3836 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3837my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3838 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3839my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3840 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3841my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3842 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3843my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3844 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3845
3846sub rebuild_spell_list {
3847 my ($self) = @_;
3848
3849 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3850 $self->clear;
3851
3852 return unless $::CONN;
3853
3854 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3855 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3856 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3857 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3858 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3859
3860 my $row = 0;
3861
3862 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3863 my $spell = $self->{spell}{$_};
3864
3865 $row++;
3866
3867 my $spell_cb = sub {
3868 my ($widget, $ev) = @_;
3869
3870 if ($ev->{button} == 1) {
3871 $::CONN->user_send ("cast $spell->{name}");
3872 } elsif ($ev->{button} == 2) {
3873 $::CONN->user_send ("invoke $spell->{name}");
3874 } elsif ($ev->{button} == 3) {
3875 my $shortname = CFPlus::shorten $spell->{name}, 14;
3876 (new CFPlus::UI::Menu
3877 items => [
3878 ["bind <i>cast $shortname</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3879 ["bind <i>invoke $shortname</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3880 ],
3881 )->popup ($ev);
3882 } else {
3883 return 0;
3884 }
3885
3886 1
3887 };
3888
3889 my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
3890
3891 #TODO: add path info to tooltip
3892 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3893
3894 $self->add (0, $row, new CFPlus::UI::Face
3895 face => $spell->{face},
3896 can_hover => 1,
3897 can_events => 1,
3898 tooltip => $tooltip,
3899 on_button_down => $spell_cb,
3900 );
3901
3902 $self->add (1, $row, new CFPlus::UI::Label
3903 expand => 1,
3904 text => $spell->{name},
3905 can_hover => 1,
3906 can_events => 1,
3907 tooltip => $tooltip,
3908 on_button_down => $spell_cb,
3909 );
3910
3911 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3912 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3913 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3914 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3915 }
3916 });
3917}
3918
3919sub add_spell {
3920 my ($self, $spell) = @_;
3921
3922 $self->{spell}->{$spell->{name}} = $spell;
3923 $self->rebuild_spell_list;
3924}
3925
3926sub remove_spell {
3927 my ($self, $spell) = @_;
3928
3929 delete $self->{spell}->{$spell->{name}};
3930 $self->rebuild_spell_list;
3931}
3932
3933sub clear_spells {
3934 my ($self) = @_;
3935
3936 $self->{spell} = {};
3937 $self->rebuild_spell_list;
3938}
3939
3940#############################################################################
3941
3942package CFPlus::UI::Root; 3789package CFPlus::UI::Root;
3943 3790
3944our @ISA = CFPlus::UI::Container::; 3791our @ISA = CFPlus::UI::Container::;
3945 3792
3946use List::Util qw(min max); 3793use List::Util qw(min max);
… …
3953 my $self = $class->SUPER::new ( 3800 my $self = $class->SUPER::new (
3954 visible => 1, 3801 visible => 1,
3955 @_, 3802 @_,
3956 ); 3803 );
3957 3804
3958 Scalar::Util::weaken ($self->{root} = $self); 3805 CFPlus::weaken ($self->{root} = $self);
3959 3806
3960 $self 3807 $self
3961} 3808}
3962 3809
3963sub size_request { 3810sub size_request {

Diff Legend

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