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.294 by root, Tue Jun 6 03:19:26 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) = @_;
2307sub set_range { 2312sub set_range {
2308 my ($self, $range) = @_; 2313 my ($self, $range) = @_;
2309 2314
2310 ($range, $self->{range}) = ($self->{range}, $range); 2315 ($range, $self->{range}) = ($self->{range}, $range);
2311 2316
2312 $self->update
2313 if "@$range" ne "@{$self->{range}}"; 2317 if ("@$range" ne "@{$self->{range}}") {
2318 $self->update;
2319 $self->set_value ($self->{range}[0]);
2320 }
2314} 2321}
2315 2322
2316sub set_value { 2323sub set_value {
2317 my ($self, $value) = @_; 2324 my ($self, $value) = @_;
2318 2325
2465sub set_range { shift->{slider}->set_range (@_) } 2472sub set_range { shift->{slider}->set_range (@_) }
2466sub set_value { shift->{slider}->set_value (@_) } 2473sub set_value { shift->{slider}->set_value (@_) }
2467 2474
2468############################################################################# 2475#############################################################################
2469 2476
2470package CFClient::UI::TextView; 2477package CFClient::UI::TextScroller;
2471 2478
2472our @ISA = CFClient::UI::HBox::; 2479our @ISA = CFClient::UI::HBox::;
2473 2480
2474use CFClient::OpenGL; 2481use CFClient::OpenGL;
2475 2482
2571 2578
2572 return unless $self->{h} > 0; 2579 return unless $self->{h} > 0;
2573 2580
2574 delete $self->{texture}; 2581 delete $self->{texture};
2575 2582
2576 $ROOT->on_post_alloc ($self, sub { 2583 $ROOT->on_post_alloc ($self => sub {
2577 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2584 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2578 2585
2579 if (delete $self->{need_reflow}) { 2586 if (delete $self->{need_reflow}) {
2580 my $height = 0; 2587 my $height = 0;
2581 2588
2597 } 2604 }
2598 2605
2599 $self->{height} = $height; 2606 $self->{height} = $height;
2600 2607
2601 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2608 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2602 2609
2603 delete $self->{texture}; 2610 delete $self->{texture};
2604 } 2611 }
2605 2612
2606 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2613 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2607 glClearColor 0, 0, 0, 0; 2614 glClearColor 0, 0, 0, 0;
2750 $tooltip .= "\n\n" . (ref $widget) . "\n" 2757 $tooltip .= "\n\n" . (ref $widget) . "\n"
2751 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2758 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2752 . "req $widget->{req_w} $widget->{req_h}\n" 2759 . "req $widget->{req_w} $widget->{req_h}\n"
2753 . "visible $widget->{visible}"; 2760 . "visible $widget->{visible}";
2754 } 2761 }
2762
2763 $tooltip =~ s/^\n+//;
2764 $tooltip =~ s/\n+$//;
2755 2765
2756 $self->add (new CFClient::UI::Label 2766 $self->add (new CFClient::UI::Label
2757 markup => $tooltip, 2767 markup => $tooltip,
2758 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2768 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2759 fontsize => 0.8, 2769 fontsize => 0.8,
2787 or return; 2797 or return;
2788 2798
2789 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2799 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2790 2800
2791 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2801 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2792 if $x + $self->{w} > $::WIDTH; 2802 if $x + $self->{w} > $self->{root}{w};
2793 2803
2794 $self->move_abs ($x, $y); 2804 $self->move_abs ($x, $y);
2795 }); 2805 });
2796} 2806}
2797 2807
2892 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2902 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2893 glDisable GL_TEXTURE_2D; 2903 glDisable GL_TEXTURE_2D;
2894 } 2904 }
2895} 2905}
2896 2906
2897sub DESTROY { 2907sub destroy {
2898 my ($self) = @_; 2908 my ($self) = @_;
2899 2909
2900 $self->{timer}->cancel 2910 $self->{timer}->cancel
2901 if $self->{timer}; 2911 if $self->{timer};
2902 2912
2903 $self->SUPER::DESTROY; 2913 $self->SUPER::destroy;
2904} 2914}
2905 2915
2906############################################################################# 2916#############################################################################
2907 2917
2908package CFClient::UI::Buttonbar; 2918package CFClient::UI::Buttonbar;
2936 # handle various types of items, only text for now 2946 # handle various types of items, only text for now
2937 if (!ref $widget) { 2947 if (!ref $widget) {
2938 $widget = new CFClient::UI::Label 2948 $widget = new CFClient::UI::Label
2939 can_hover => 1, 2949 can_hover => 1,
2940 can_events => 1, 2950 can_events => 1,
2941 text => $widget, 2951 markup => $widget,
2942 tooltip => $tooltip 2952 tooltip => $tooltip
2943 } 2953 }
2944 2954
2945 $self->{item}{$widget} = $item; 2955 $self->{item}{$widget} = $item;
2946 2956
3108 3118
3109sub new { 3119sub new {
3110 my $class = shift; 3120 my $class = shift;
3111 3121
3112 my $self = $class->SUPER::new ( 3122 my $self = $class->SUPER::new (
3113 options => [], # [title, value, tooltip], ... 3123 options => [], # [value, title, longdesc], ...
3114 value => undef, 3124 value => undef,
3115 @_, 3125 @_,
3116 ); 3126 );
3117 3127
3118 $self->_set_value ($self->{value}); 3128 $self->_set_value ($self->{value});
3124 my ($self, $ev) = @_; 3134 my ($self, $ev) = @_;
3125 3135
3126 my @menu_items; 3136 my @menu_items;
3127 3137
3128 for (@{ $self->{options} }) { 3138 for (@{ $self->{options} }) {
3129 my ($title, $value, $tooltip) = @$_; 3139 my ($value, $title, $tooltip) = @$_;
3130 3140
3131 push @menu_items, [$tooltip, sub { $self->set_value ($value) }]; 3141 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3132 } 3142 }
3133 3143
3134 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3144 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3135} 3145}
3136 3146
3137sub _set_value { 3147sub _set_value {
3138 my ($self, $value) = @_; 3148 my ($self, $value) = @_;
3139 3149
3140 my ($item) = grep $_->[1] eq $value, @{ $self->{options} } 3150 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3141 or return; 3151 or return;
3142 3152
3143 $self->{value} = $item->[1]; 3153 $self->{value} = $item->[0];
3144 $self->set_markup ("$item->[0] ⇓"); 3154 $self->set_markup ("$item->[1] ⇓");
3145 $self->set_tooltip ($item->[2]); 3155 $self->set_tooltip ($item->[2]);
3146} 3156}
3147 3157
3148sub set_value { 3158sub set_value {
3149 my ($self, $value) = @_; 3159 my ($self, $value) = @_;
3258 $item->{count}++; 3268 $item->{count}++;
3259 } else { 3269 } else {
3260 $item->{count} = 1; 3270 $item->{count} = 1;
3261 $item->{text} = $item->{tooltip} = $text; 3271 $item->{text} = $item->{tooltip} = $text;
3262 } 3272 }
3263 $item->{id} = ++$self->{id}; 3273 $item->{id} += 0.2;#d#
3264 $item->{timeout} = $timeout; 3274 $item->{timeout} = $timeout;
3265 delete $item->{label}; 3275 delete $item->{label};
3266 } else { 3276 } else {
3267 $self->{item}{$group} = { 3277 $self->{item}{$group} = {
3268 id => ++$self->{id}, 3278 id => ++$self->{id},
3287 3297
3288 $self->reorder; 3298 $self->reorder;
3289 $self->SUPER::reconfigure; 3299 $self->SUPER::reconfigure;
3290} 3300}
3291 3301
3292sub DESTROY { 3302sub destroy {
3293 my ($self) = @_; 3303 my ($self) = @_;
3294 3304
3295 $self->{timer}->cancel; 3305 $self->{timer}->cancel;
3296 3306
3297 $self->SUPER::DESTROY; 3307 $self->SUPER::destroy;
3298} 3308}
3299 3309
3300############################################################################# 3310#############################################################################
3301 3311
3302package CFClient::UI::Inventory; 3312package CFClient::UI::Inventory;
3550 commands => [], 3560 commands => [],
3551 @_, 3561 @_,
3552 ) 3562 )
3553} 3563}
3554 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");
3555my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip => 3571my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3556 "<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");
3557my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip => 3573my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3558 "<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");
3559my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip => 3575my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3560 "<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");
3561 3577
3562sub rebuild_spell_list { 3578sub rebuild_spell_list {
3563 my ($self) = @_; 3579 my ($self) = @_;
3564 3580
3565 $CFClient::UI::ROOT->on_refresh ($self => sub { 3581 $CFClient::UI::ROOT->on_refresh ($self => sub {
3566 $self->clear; 3582 $self->clear;
3567 3583
3584 return unless $::CONN;
3585
3568 $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);
3569 $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);
3570 $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);
3571 $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);
3572 3591
3573 my $row = 0; 3592 my $row = 0;
3574 3593
3575 for (sort { $a cmp $b } keys %{ $self->{spell} }) { 3594 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3576 my $spell = $self->{spell}{$_}; 3595 my $spell = $self->{spell}{$_};
3577 3596
3578 $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});
3579 3624
3580 $self->add (0, $row, new CFClient::UI::Face 3625 $self->add (0, $row, new CFClient::UI::Face
3581 face => $spell->{face}, 3626 face => $spell->{face},
3582 can_hover => 1, 3627 can_hover => 1,
3583 can_events => 1, 3628 can_events => 1,
3584 tooltip => $spell->{message}, 3629 tooltip => $tooltip,
3630 on_button_down => $spell_cb,
3585 ); 3631 );
3586 3632
3587 $self->add (1, $row, new CFClient::UI::Label 3633 $self->add (1, $row, new CFClient::UI::Label
3588 expand => 1, 3634 expand => 1,
3589 text => $spell->{name}, 3635 text => $spell->{name},
3590 can_hover => 1, 3636 can_hover => 1,
3591 can_events => 1, 3637 can_events => 1,
3592 tooltip => $spell->{message}, 3638 tooltip => $tooltip,
3639 on_button_down => $spell_cb,
3593 ); 3640 );
3594 3641
3642 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3595 $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);
3596 $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);
3597 $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);
3598
3599 # TODO: should be done via popup
3600 $self->add (5, $row, new CFClient::UI::Button
3601 text => "bind",
3602 tooltip => "bind spell readying (cast command) to key",
3603 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3604 );
3605 } 3646 }
3606 }); 3647 });
3607} 3648}
3608 3649
3609sub add_spell { 3650sub add_spell {
3615 3656
3616sub remove_spell { 3657sub remove_spell {
3617 my ($self, $spell) = @_; 3658 my ($self, $spell) = @_;
3618 3659
3619 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} = {};
3620 $self->rebuild_spell_list; 3668 $self->rebuild_spell_list;
3621} 3669}
3622 3670
3623############################################################################# 3671#############################################################################
3624 3672

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines