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.292 by root, Tue Jun 6 03:02:15 2006 UTC vs.
Revision 1.300 by root, Wed Jun 7 22:06:43 2006 UTC

… …
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
… …
1658 : ($self->{h} - $tex->{h}) * 0.5); 1658 : ($self->{h} - $tex->{h}) * 0.5);
1659 }; 1659 };
1660 1660
1661 glEnable GL_TEXTURE_2D; 1661 glEnable GL_TEXTURE_2D;
1662 1662
1663 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1664 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1665
1663 if ($tex->{format} == GL_ALPHA) { 1666 if ($tex->{format} == GL_ALPHA) {
1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1667 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1665 glColor @{$self->{fg}}; 1668 glColor @{$self->{fg}};
1666 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1669 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1667 } else { 1670 } else {
1668 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1671 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1669 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1672 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1670 } 1673 }
1671 1674
1672 glDisable GL_TEXTURE_2D; 1675 glDisable GL_TEXTURE_2D;
1673} 1676}
1674 1677
… …
2304sub set_range { 2307sub set_range {
2305 my ($self, $range) = @_; 2308 my ($self, $range) = @_;
2306 2309
2307 ($range, $self->{range}) = ($self->{range}, $range); 2310 ($range, $self->{range}) = ($self->{range}, $range);
2308 2311
2309 $self->update
2310 if "@$range" ne "@{$self->{range}}"; 2312 if ("@$range" ne "@{$self->{range}}") {
2313 $self->update;
2314 $self->set_value ($self->{range}[0]);
2315 }
2311} 2316}
2312 2317
2313sub set_value { 2318sub set_value {
2314 my ($self, $value) = @_; 2319 my ($self, $value) = @_;
2315 2320
… …
2462sub set_range { shift->{slider}->set_range (@_) } 2467sub set_range { shift->{slider}->set_range (@_) }
2463sub set_value { shift->{slider}->set_value (@_) } 2468sub set_value { shift->{slider}->set_value (@_) }
2464 2469
2465############################################################################# 2470#############################################################################
2466 2471
2467package CFClient::UI::TextView; 2472package CFClient::UI::TextScroller;
2468 2473
2469our @ISA = CFClient::UI::HBox::; 2474our @ISA = CFClient::UI::HBox::;
2470 2475
2471use CFClient::OpenGL; 2476use CFClient::OpenGL;
2472 2477
… …
2474 my $class = shift; 2479 my $class = shift;
2475 2480
2476 my $self = $class->SUPER::new ( 2481 my $self = $class->SUPER::new (
2477 fontsize => 1, 2482 fontsize => 1,
2478 can_events => 0, 2483 can_events => 0,
2484 indent => 0,
2479 #font => default_font 2485 #font => default_font
2480 @_, 2486 @_,
2481 2487
2482 layout => (new CFClient::Layout 1), 2488 layout => (new CFClient::Layout 1),
2483 par => [], 2489 par => [],
… …
2506 $self->SUPER::size_allocate ($w, $h); 2512 $self->SUPER::size_allocate ($w, $h);
2507 2513
2508 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2514 $self->{layout}->set_font ($self->{font}) if $self->{font};
2509 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2515 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2510 $self->{layout}->set_width ($self->{children}[0]{w}); 2516 $self->{layout}->set_width ($self->{children}[0]{w});
2511 $self->{layout}->set_indent (-$self->{fontsize} * $::FONTSIZE * 4); 2517 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2512 2518
2513 $self->reflow; 2519 $self->reflow;
2514} 2520}
2515 2521
2516sub text_size { 2522sub text_size {
… …
2518 2524
2519 my $layout = $self->{layout}; 2525 my $layout = $self->{layout};
2520 2526
2521 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2527 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2522 $layout->set_width ($self->{children}[0]{w} - $indent); 2528 $layout->set_width ($self->{children}[0]{w} - $indent);
2523 $layout->set_indent (-$self->{fontsize} * $::FONTSIZE * 4); 2529 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2524 $layout->set_markup ($text); 2530 $layout->set_markup ($text);
2525 2531
2526 $layout->size 2532 $layout->size
2527} 2533}
2528 2534
… …
2567 2573
2568 return unless $self->{h} > 0; 2574 return unless $self->{h} > 0;
2569 2575
2570 delete $self->{texture}; 2576 delete $self->{texture};
2571 2577
2572 $ROOT->on_post_alloc ($self, sub { 2578 $ROOT->on_post_alloc ($self => sub {
2573 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2579 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2574 2580
2575 if (delete $self->{need_reflow}) { 2581 if (delete $self->{need_reflow}) {
2576 my $height = 0; 2582 my $height = 0;
2577 2583
… …
2580 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2586 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2581 2587
2582 for (@{$self->{par}}) { 2588 for (@{$self->{par}}) {
2583 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2589 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2584 $layout->set_width ($W - $_->[3]); 2590 $layout->set_width ($W - $_->[3]);
2585 $layout->set_indent (-$self->{fontsize} * $::FONTSIZE * 4); 2591 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2586 $layout->set_markup ($_->[4]); 2592 $layout->set_markup ($_->[4]);
2587 my ($w, $h) = $layout->size; 2593 my ($w, $h) = $layout->size;
2588 $_->[0] = $w + $_->[3]; 2594 $_->[0] = $w + $_->[3];
2589 $_->[1] = $h; 2595 $_->[1] = $h;
2590 } 2596 }
… …
2593 } 2599 }
2594 2600
2595 $self->{height} = $height; 2601 $self->{height} = $height;
2596 2602
2597 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2603 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2598 2604
2599 delete $self->{texture}; 2605 delete $self->{texture};
2600 } 2606 }
2601 2607
2602 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2608 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2603 glClearColor 0, 0, 0, 0; 2609 glClearColor 0, 0, 0, 0;
… …
2622 my $h = $par->[1]; 2628 my $h = $par->[1];
2623 2629
2624 if ($y0 < $y + $h && $y < $y1) { 2630 if ($y0 < $y + $h && $y < $y1) {
2625 $layout->set_foreground (@{ $par->[2] }); 2631 $layout->set_foreground (@{ $par->[2] });
2626 $layout->set_width ($W - $par->[3]); 2632 $layout->set_width ($W - $par->[3]);
2627 $layout->set_indent (-$self->{fontsize} * $::FONTSIZE * 4); 2633 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2628 $layout->set_markup ($par->[4]); 2634 $layout->set_markup ($par->[4]);
2629 2635
2630 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2636 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2631 2637
2632 glRasterPos $par->[3], $y - $y0; 2638 glRasterPos $par->[3], $y - $y0;
… …
2746 $tooltip .= "\n\n" . (ref $widget) . "\n" 2752 $tooltip .= "\n\n" . (ref $widget) . "\n"
2747 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2753 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2748 . "req $widget->{req_w} $widget->{req_h}\n" 2754 . "req $widget->{req_w} $widget->{req_h}\n"
2749 . "visible $widget->{visible}"; 2755 . "visible $widget->{visible}";
2750 } 2756 }
2757
2758 $tooltip =~ s/^\n+//;
2759 $tooltip =~ s/\n+$//;
2751 2760
2752 $self->add (new CFClient::UI::Label 2761 $self->add (new CFClient::UI::Label
2753 markup => $tooltip, 2762 markup => $tooltip,
2754 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2763 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2755 fontsize => 0.8, 2764 fontsize => 0.8,
… …
2783 or return; 2792 or return;
2784 2793
2785 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2794 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2786 2795
2787 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2796 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2788 if $x + $self->{w} > $::WIDTH; 2797 if $x + $self->{w} > $self->{root}{w};
2789 2798
2790 $self->move_abs ($x, $y); 2799 $self->move_abs ($x, $y);
2791 }); 2800 });
2792} 2801}
2793 2802
… …
2932 # handle various types of items, only text for now 2941 # handle various types of items, only text for now
2933 if (!ref $widget) { 2942 if (!ref $widget) {
2934 $widget = new CFClient::UI::Label 2943 $widget = new CFClient::UI::Label
2935 can_hover => 1, 2944 can_hover => 1,
2936 can_events => 1, 2945 can_events => 1,
2937 text => $widget, 2946 markup => $widget,
2938 tooltip => $tooltip 2947 tooltip => $tooltip
2939 } 2948 }
2940 2949
2941 $self->{item}{$widget} = $item; 2950 $self->{item}{$widget} = $item;
2942 2951
… …
3104 3113
3105sub new { 3114sub new {
3106 my $class = shift; 3115 my $class = shift;
3107 3116
3108 my $self = $class->SUPER::new ( 3117 my $self = $class->SUPER::new (
3109 options => [], # [title, value, tooltip], ... 3118 options => [], # [value, title, longdesc], ...
3110 value => undef, 3119 value => undef,
3111 @_, 3120 @_,
3112 ); 3121 );
3113 3122
3114 $self->_set_value ($self->{value}); 3123 $self->_set_value ($self->{value});
… …
3120 my ($self, $ev) = @_; 3129 my ($self, $ev) = @_;
3121 3130
3122 my @menu_items; 3131 my @menu_items;
3123 3132
3124 for (@{ $self->{options} }) { 3133 for (@{ $self->{options} }) {
3125 my ($title, $value, $tooltip) = @$_; 3134 my ($value, $title, $tooltip) = @$_;
3126 3135
3127 push @menu_items, [$tooltip, sub { $self->set_value ($value) }]; 3136 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3128 } 3137 }
3129 3138
3130 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 3139 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3131} 3140}
3132 3141
3133sub _set_value { 3142sub _set_value {
3134 my ($self, $value) = @_; 3143 my ($self, $value) = @_;
3135 3144
3136 my ($item) = grep $_->[1] eq $value, @{ $self->{options} } 3145 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3137 or return; 3146 or return;
3138 3147
3139 $self->{value} = $item->[1]; 3148 $self->{value} = $item->[0];
3140 $self->set_markup ("$item->[0] ⇓"); 3149 $self->set_markup ("$item->[1] ⇓");
3141 $self->set_tooltip ($item->[2]); 3150 $self->set_tooltip ($item->[2]);
3142} 3151}
3143 3152
3144sub set_value { 3153sub set_value {
3145 my ($self, $value) = @_; 3154 my ($self, $value) = @_;
… …
3254 $item->{count}++; 3263 $item->{count}++;
3255 } else { 3264 } else {
3256 $item->{count} = 1; 3265 $item->{count} = 1;
3257 $item->{text} = $item->{tooltip} = $text; 3266 $item->{text} = $item->{tooltip} = $text;
3258 } 3267 }
3259 $item->{id} = ++$self->{id}; 3268 $item->{id} += 0.2;#d#
3260 $item->{timeout} = $timeout; 3269 $item->{timeout} = $timeout;
3261 delete $item->{label}; 3270 delete $item->{label};
3262 } else { 3271 } else {
3263 $self->{item}{$group} = { 3272 $self->{item}{$group} = {
3264 id => ++$self->{id}, 3273 id => ++$self->{id},
… …
3546 commands => [], 3555 commands => [],
3547 @_, 3556 @_,
3548 ) 3557 )
3549} 3558}
3550 3559
3560my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3561
3562my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3563 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3564my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3565 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3551my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip => 3566my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3552 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell."); 3567 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3553my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip => 3568my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3554 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation."); 3569 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3555my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip => 3570my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3556 "<b>Damage</b>. The amount of damage the spell deals when it hits."); 3571 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3557 3572
3558sub rebuild_spell_list { 3573sub rebuild_spell_list {
3559 my ($self) = @_; 3574 my ($self) = @_;
3560 3575
3561 $CFClient::UI::ROOT->on_refresh ($self => sub { 3576 $CFClient::UI::ROOT->on_refresh ($self => sub {
3562 $self->clear; 3577 $self->clear;
3563 3578
3564 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name"); 3579 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3580 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3565 $self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL); 3581 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3566 $self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP); 3582 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3567 $self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG); 3583 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3568 3584
3569 my $row = 0; 3585 my $row = 0;
3570 3586
3571 for (sort { $a cmp $b } keys %{ $self->{spell} }) { 3587 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3572 my $spell = $self->{spell}{$_}; 3588 my $spell = $self->{spell}{$_};
3573 3589
3574 $row++; 3590 $row++;
3591
3592 my $spell_cb = sub {
3593 my ($widget, $ev) = @_;
3594
3595 if ($ev->{button} == 1) {
3596 $::CONN->user_send ("cast $spell->{name}");
3597 } elsif ($ev->{button} == 2) {
3598 $::CONN->user_send ("invoke $spell->{name}");
3599 } elsif ($ev->{button} == 3) {
3600 (new CFClient::UI::Menu
3601 items => [
3602 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3603 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3604 ],
3605 )->popup ($ev);
3606 } else {
3607 return 0;
3608 }
3609
3610 1
3611 };
3612
3613 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3614
3615 #TODO: add path info to tooltip
3616 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3575 3617
3576 $self->add (0, $row, new CFClient::UI::Face 3618 $self->add (0, $row, new CFClient::UI::Face
3577 face => $spell->{face}, 3619 face => $spell->{face},
3578 can_hover => 1, 3620 can_hover => 1,
3579 can_events => 1, 3621 can_events => 1,
3580 tooltip => $spell->{message}, 3622 tooltip => $tooltip,
3623 on_button_down => $spell_cb,
3581 ); 3624 );
3582 3625
3583 $self->add (1, $row, new CFClient::UI::Label 3626 $self->add (1, $row, new CFClient::UI::Label
3584 expand => 1, 3627 expand => 1,
3585 text => $spell->{name}, 3628 text => $spell->{name},
3586 can_hover => 1, 3629 can_hover => 1,
3587 can_events => 1, 3630 can_events => 1,
3588 tooltip => $spell->{message}, 3631 tooltip => $tooltip,
3632 on_button_down => $spell_cb,
3589 ); 3633 );
3590 3634
3635 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3591 $self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL); 3636 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3592 $self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP); 3637 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3593 $self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG); 3638 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3594
3595 # TODO: should be done via popup
3596 $self->add (5, $row, new CFClient::UI::Button
3597 text => "bind",
3598 tooltip => "bind spell readying (cast command) to key",
3599 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3600 );
3601 } 3639 }
3602 }); 3640 });
3603} 3641}
3604 3642
3605sub add_spell { 3643sub add_spell {

Diff Legend

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