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.295 by root, Tue Jun 6 09:19:28 2006 UTC vs.
Revision 1.302 by root, Mon Jun 12 13:26:14 2006 UTC

… …
272 272
273 return unless $self->{visible}; 273 return unless $self->{visible};
274 274
275 $_->set_invisible for $self->children; 275 $_->set_invisible for $self->children;
276 276
277 delete $self->{visible};
277 delete $self->{root}; 278 delete $self->{root};
278 delete $self->{visible};
279 279
280 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
281 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
282 282
283 $CFClient::UI::TOOLTIP_WATCHER->cb->() 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
… …
315} 315}
316 316
317sub move_abs { 317sub move_abs {
318 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
319 319
320 $self->{x} = List::Util::max 0, int $x; 320 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
321 $self->{y} = List::Util::max 0, int $y; 321 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
322 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
323 323
324 $self->update; 324 $self->update;
325} 325}
326 326
… …
593 593
594sub DESTROY { 594sub DESTROY {
595 my ($self) = @_; 595 my ($self) = @_;
596 596
597 delete $WIDGET{$self+0}; 597 delete $WIDGET{$self+0};
598 #$self->deactivate; 598
599 eval { $self->destroy };
600 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
599} 601}
600 602
601############################################################################# 603#############################################################################
602 604
603package CFClient::UI::DrawBG; 605package CFClient::UI::DrawBG;
… …
768} 770}
769 771
770sub add { 772sub add {
771 my ($self, $child) = @_; 773 my ($self, $child) = @_;
772 774
773 $self->{children} = []; 775 $self->SUPER::remove ($_) for @{ $self->{children} };
774
775 $self->SUPER::add ($child); 776 $self->SUPER::add ($child);
776} 777}
777 778
778sub remove { 779sub remove {
779 my ($self, $widget) = @_; 780 my ($self, $widget) = @_;
… …
1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1072 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1073 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1073 1074
1074sub new { 1075sub new {
1075 my ($class, %arg) = @_; 1076 my ($class, %arg) = @_;
1076
1077 my $title = delete $arg{title};
1078 1077
1079 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
1080 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
1081 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
1082 border => 0.6, 1081 border => 0.6,
… …
1084 min_w => 16, 1083 min_w => 16,
1085 min_h => 16, 1084 min_h => 16,
1086 %arg, 1085 %arg,
1087 ); 1086 );
1088 1087
1089 $self->{title} = new CFClient::UI::Label 1088 $self->{title_widget} = new CFClient::UI::Label
1090 align => 0, 1089 align => 0,
1091 valign => 1, 1090 valign => 1,
1092 text => $title, 1091 text => $self->{title},
1093 fontsize => $self->{border} 1092 fontsize => $self->{border},
1094 if defined $title; 1093 if exists $self->{title};
1095 1094
1096 $self 1095 $self
1097} 1096}
1098 1097
1099sub add { 1098sub add {
1100 my ($self, @widgets) = @_; 1099 my ($self, @widgets) = @_;
1101 1100
1102 $self->SUPER::add (@widgets); 1101 $self->SUPER::add (@widgets);
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title}; 1102 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1104} 1103}
1105 1104
1106sub border { 1105sub border {
1107 int $_[0]{border} * $::FONTSIZE 1106 int $_[0]{border} * $::FONTSIZE
1108} 1107}
1109 1108
1110sub size_request { 1109sub size_request {
1111 my ($self) = @_; 1110 my ($self) = @_;
1112 1111
1113 $self->{title}->size_request 1112 $self->{title_widget}->size_request
1114 if $self->{title}; 1113 if $self->{title_widget};
1115 1114
1116 my ($w, $h) = $self->SUPER::size_request; 1115 my ($w, $h) = $self->SUPER::size_request;
1117 1116
1118 ( 1117 (
1119 $w + $self->border * 2, 1118 $w + $self->border * 2,
… …
1122} 1121}
1123 1122
1124sub size_allocate { 1123sub size_allocate {
1125 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
1126 1125
1127 if ($self->{title}) { 1126 if ($self->{title_widget}) {
1128 $self->{title}{w} = $w; 1127 $self->{title_widget}{w} = $w;
1129 $self->{title}{h} = $h; 1128 $self->{title_widget}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h); 1129 $self->{title_widget}->size_allocate ($w, $h);
1131 } 1130 }
1132 1131
1133 my $border = $self->border; 1132 my $border = $self->border;
1134 1133
1135 $h -= List::Util::max 0, $border * 2; 1134 $h -= List::Util::max 0, $border * 2;
… …
1233 1232
1234 glDisable GL_TEXTURE_2D; 1233 glDisable GL_TEXTURE_2D;
1235 1234
1236 $child->draw; 1235 $child->draw;
1237 1236
1238 if ($self->{title}) { 1237 if ($self->{title_widget}) {
1239 glTranslate 0, $border - $self->{h}; 1238 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw; 1239 $self->{title_widget}->_draw;
1241 } 1240 }
1242} 1241}
1243 1242
1244############################################################################# 1243#############################################################################
1245 1244
… …
1269 1268
1270 $child->set_parent ($self); 1269 $child->set_parent ($self);
1271 $self->{children}[$y][$x] = $child; 1270 $self->{children}[$y][$x] = $child;
1272 1271
1273 $self->realloc; 1272 $self->realloc;
1273}
1274
1275sub remove {
1276 my ($self, $child) = @_;
1277
1278 # TODO: not yet implemented
1274} 1279}
1275 1280
1276# TODO: move to container class maybe? send children a signal on removal? 1281# TODO: move to container class maybe? send children a signal on removal?
1277sub clear { 1282sub clear {
1278 my ($self) = @_; 1283 my ($self) = @_;
… …
2467sub set_range { shift->{slider}->set_range (@_) } 2472sub set_range { shift->{slider}->set_range (@_) }
2468sub set_value { shift->{slider}->set_value (@_) } 2473sub set_value { shift->{slider}->set_value (@_) }
2469 2474
2470############################################################################# 2475#############################################################################
2471 2476
2472package CFClient::UI::TextView; 2477package CFClient::UI::TextScroller;
2473 2478
2474our @ISA = CFClient::UI::HBox::; 2479our @ISA = CFClient::UI::HBox::;
2475 2480
2476use CFClient::OpenGL; 2481use CFClient::OpenGL;
2477 2482
… …
2753 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2758 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2754 . "req $widget->{req_w} $widget->{req_h}\n" 2759 . "req $widget->{req_w} $widget->{req_h}\n"
2755 . "visible $widget->{visible}"; 2760 . "visible $widget->{visible}";
2756 } 2761 }
2757 2762
2763 $tooltip =~ s/^\n+//;
2764 $tooltip =~ s/\n+$//;
2765
2758 $self->add (new CFClient::UI::Label 2766 $self->add (new CFClient::UI::Label
2759 markup => $tooltip, 2767 markup => $tooltip,
2760 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2768 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2761 fontsize => 0.8, 2769 fontsize => 0.8,
2762 fg => [0, 0, 0, 1], 2770 fg => [0, 0, 0, 1],
… …
2789 or return; 2797 or return;
2790 2798
2791 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2799 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2792 2800
2793 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2801 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2794 if $x + $self->{w} > $::WIDTH; 2802 if $x + $self->{w} > $self->{root}{w};
2795 2803
2796 $self->move_abs ($x, $y); 2804 $self->move_abs ($x, $y);
2797 }); 2805 });
2798} 2806}
2799 2807
… …
2894 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2902 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2895 glDisable GL_TEXTURE_2D; 2903 glDisable GL_TEXTURE_2D;
2896 } 2904 }
2897} 2905}
2898 2906
2899sub DESTROY { 2907sub destroy {
2900 my ($self) = @_; 2908 my ($self) = @_;
2901 2909
2902 $self->{timer}->cancel 2910 $self->{timer}->cancel
2903 if $self->{timer}; 2911 if $self->{timer};
2904 2912
2905 $self->SUPER::DESTROY; 2913 $self->SUPER::destroy;
2906} 2914}
2907 2915
2908############################################################################# 2916#############################################################################
2909 2917
2910package CFClient::UI::Buttonbar; 2918package CFClient::UI::Buttonbar;
… …
2938 # handle various types of items, only text for now 2946 # handle various types of items, only text for now
2939 if (!ref $widget) { 2947 if (!ref $widget) {
2940 $widget = new CFClient::UI::Label 2948 $widget = new CFClient::UI::Label
2941 can_hover => 1, 2949 can_hover => 1,
2942 can_events => 1, 2950 can_events => 1,
2943 text => $widget, 2951 markup => $widget,
2944 tooltip => $tooltip 2952 tooltip => $tooltip
2945 } 2953 }
2946 2954
2947 $self->{item}{$widget} = $item; 2955 $self->{item}{$widget} = $item;
2948 2956
… …
3110 3118
3111sub new { 3119sub new {
3112 my $class = shift; 3120 my $class = shift;
3113 3121
3114 my $self = $class->SUPER::new ( 3122 my $self = $class->SUPER::new (
3115 options => [], # [title, value, tooltip], ... 3123 options => [], # [value, title, longdesc], ...
3116 value => undef, 3124 value => undef,
3117 @_, 3125 @_,
3118 ); 3126 );
3119 3127
3120 $self->_set_value ($self->{value}); 3128 $self->_set_value ($self->{value});
… …
3126 my ($self, $ev) = @_; 3134 my ($self, $ev) = @_;
3127 3135
3128 my @menu_items; 3136 my @menu_items;
3129 3137
3130 for (@{ $self->{options} }) { 3138 for (@{ $self->{options} }) {
3131 my ($title, $value, $tooltip) = @$_; 3139 my ($value, $title, $tooltip) = @$_;
3132 3140
3133 push @menu_items, [$tooltip, sub { $self->set_value ($value) }]; 3141 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3134 } 3142 }
3135 3143
3136 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3144 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3137} 3145}
3138 3146
3139sub _set_value { 3147sub _set_value {
3140 my ($self, $value) = @_; 3148 my ($self, $value) = @_;
3141 3149
3142 my ($item) = grep $_->[1] eq $value, @{ $self->{options} } 3150 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3143 or return; 3151 or return;
3144 3152
3145 $self->{value} = $item->[1]; 3153 $self->{value} = $item->[0];
3146 $self->set_markup ("$item->[0] ⇓"); 3154 $self->set_markup ("$item->[1] ⇓");
3147 $self->set_tooltip ($item->[2]); 3155 $self->set_tooltip ($item->[2]);
3148} 3156}
3149 3157
3150sub set_value { 3158sub set_value {
3151 my ($self, $value) = @_; 3159 my ($self, $value) = @_;
… …
3260 $item->{count}++; 3268 $item->{count}++;
3261 } else { 3269 } else {
3262 $item->{count} = 1; 3270 $item->{count} = 1;
3263 $item->{text} = $item->{tooltip} = $text; 3271 $item->{text} = $item->{tooltip} = $text;
3264 } 3272 }
3265 $item->{id} = ++$self->{id}; 3273 $item->{id} += 0.2;#d#
3266 $item->{timeout} = $timeout; 3274 $item->{timeout} = $timeout;
3267 delete $item->{label}; 3275 delete $item->{label};
3268 } else { 3276 } else {
3269 $self->{item}{$group} = { 3277 $self->{item}{$group} = {
3270 id => ++$self->{id}, 3278 id => ++$self->{id},
… …
3289 3297
3290 $self->reorder; 3298 $self->reorder;
3291 $self->SUPER::reconfigure; 3299 $self->SUPER::reconfigure;
3292} 3300}
3293 3301
3294sub DESTROY { 3302sub destroy {
3295 my ($self) = @_; 3303 my ($self) = @_;
3296 3304
3297 $self->{timer}->cancel; 3305 $self->{timer}->cancel;
3298 3306
3299 $self->SUPER::DESTROY; 3307 $self->SUPER::destroy;
3300} 3308}
3301 3309
3302############################################################################# 3310#############################################################################
3303 3311
3304package CFClient::UI::Inventory; 3312package CFClient::UI::Inventory;
… …
3552 commands => [], 3560 commands => [],
3553 @_, 3561 @_,
3554 ) 3562 )
3555} 3563}
3556 3564
3565my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3566
3567my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3568 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3569my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3570 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3557my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip => 3571my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3558 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell."); 3572 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3559my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip => 3573my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3560 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation."); 3574 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3561my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip => 3575my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3562 "<b>Damage</b>. The amount of damage the spell deals when it hits."); 3576 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3563 3577
3564sub rebuild_spell_list { 3578sub rebuild_spell_list {
3565 my ($self) = @_; 3579 my ($self) = @_;
3566 3580
3567 $CFClient::UI::ROOT->on_refresh ($self => sub { 3581 $CFClient::UI::ROOT->on_refresh ($self => sub {
3568 $self->clear; 3582 $self->clear;
3569 3583
3584 return unless $::CONN;
3585
3570 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name"); 3586 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3587 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3571 $self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL); 3588 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3572 $self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP); 3589 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3573 $self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG); 3590 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3574 3591
3575 my $row = 0; 3592 my $row = 0;
3576 3593
3577 for (sort { $a cmp $b } keys %{ $self->{spell} }) { 3594 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3578 my $spell = $self->{spell}{$_}; 3595 my $spell = $self->{spell}{$_};
3579 3596
3580 $row++; 3597 $row++;
3598
3599 my $spell_cb = sub {
3600 my ($widget, $ev) = @_;
3601
3602 if ($ev->{button} == 1) {
3603 $::CONN->user_send ("cast $spell->{name}");
3604 } elsif ($ev->{button} == 2) {
3605 $::CONN->user_send ("invoke $spell->{name}");
3606 } elsif ($ev->{button} == 3) {
3607 (new CFClient::UI::Menu
3608 items => [
3609 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3610 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3611 ],
3612 )->popup ($ev);
3613 } else {
3614 return 0;
3615 }
3616
3617 1
3618 };
3619
3620 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3621
3622 #TODO: add path info to tooltip
3623 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3581 3624
3582 $self->add (0, $row, new CFClient::UI::Face 3625 $self->add (0, $row, new CFClient::UI::Face
3583 face => $spell->{face}, 3626 face => $spell->{face},
3584 can_hover => 1, 3627 can_hover => 1,
3585 can_events => 1, 3628 can_events => 1,
3586 tooltip => $spell->{message}, 3629 tooltip => $tooltip,
3630 on_button_down => $spell_cb,
3587 ); 3631 );
3588 3632
3589 $self->add (1, $row, new CFClient::UI::Label 3633 $self->add (1, $row, new CFClient::UI::Label
3590 expand => 1, 3634 expand => 1,
3591 text => $spell->{name}, 3635 text => $spell->{name},
3592 can_hover => 1, 3636 can_hover => 1,
3593 can_events => 1, 3637 can_events => 1,
3594 tooltip => $spell->{message}, 3638 tooltip => $tooltip,
3639 on_button_down => $spell_cb,
3595 ); 3640 );
3596 3641
3642 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3597 $self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL); 3643 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3598 $self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP); 3644 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3599 $self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG); 3645 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3600
3601 # TODO: should be done via popup
3602 $self->add (5, $row, new CFClient::UI::Button
3603 text => "bind",
3604 tooltip => "bind spell readying (cast command) to key",
3605 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3606 );
3607 } 3646 }
3608 }); 3647 });
3609} 3648}
3610 3649
3611sub add_spell { 3650sub add_spell {
… …
3617 3656
3618sub remove_spell { 3657sub remove_spell {
3619 my ($self, $spell) = @_; 3658 my ($self, $spell) = @_;
3620 3659
3621 delete $self->{spell}->{$spell->{name}}; 3660 delete $self->{spell}->{$spell->{name}};
3661 $self->rebuild_spell_list;
3662}
3663
3664sub clear_spells {
3665 my ($self) = @_;
3666
3667 $self->{spell} = {};
3622 $self->rebuild_spell_list; 3668 $self->rebuild_spell_list;
3623} 3669}
3624 3670
3625############################################################################# 3671#############################################################################
3626 3672

Diff Legend

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