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.290 by root, Mon Jun 5 22:30:35 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
… …
1691 can_hover => 1, 1694 can_hover => 1,
1692 can_focus => 1, 1695 can_focus => 1,
1693 valign => 0, 1696 valign => 0,
1694 can_events => 1, 1697 can_events => 1,
1695 #text => ... 1698 #text => ...
1699 #hidden => "*",
1696 @_ 1700 @_
1697 ) 1701 )
1698} 1702}
1699 1703
1700sub _set_text { 1704sub _set_text {
… …
2303sub set_range { 2307sub set_range {
2304 my ($self, $range) = @_; 2308 my ($self, $range) = @_;
2305 2309
2306 ($range, $self->{range}) = ($self->{range}, $range); 2310 ($range, $self->{range}) = ($self->{range}, $range);
2307 2311
2308 $self->update
2309 if "@$range" ne "@{$self->{range}}"; 2312 if ("@$range" ne "@{$self->{range}}") {
2313 $self->update;
2314 $self->set_value ($self->{range}[0]);
2315 }
2310} 2316}
2311 2317
2312sub set_value { 2318sub set_value {
2313 my ($self, $value) = @_; 2319 my ($self, $value) = @_;
2314 2320
… …
2461sub set_range { shift->{slider}->set_range (@_) } 2467sub set_range { shift->{slider}->set_range (@_) }
2462sub set_value { shift->{slider}->set_value (@_) } 2468sub set_value { shift->{slider}->set_value (@_) }
2463 2469
2464############################################################################# 2470#############################################################################
2465 2471
2466package CFClient::UI::TextView; 2472package CFClient::UI::TextScroller;
2467 2473
2468our @ISA = CFClient::UI::HBox::; 2474our @ISA = CFClient::UI::HBox::;
2469 2475
2470use CFClient::OpenGL; 2476use CFClient::OpenGL;
2471 2477
… …
2473 my $class = shift; 2479 my $class = shift;
2474 2480
2475 my $self = $class->SUPER::new ( 2481 my $self = $class->SUPER::new (
2476 fontsize => 1, 2482 fontsize => 1,
2477 can_events => 0, 2483 can_events => 0,
2484 indent => 0,
2478 #font => default_font 2485 #font => default_font
2479 @_, 2486 @_,
2480 2487
2481 layout => (new CFClient::Layout 1), 2488 layout => (new CFClient::Layout 1),
2482 par => [], 2489 par => [],
… …
2505 $self->SUPER::size_allocate ($w, $h); 2512 $self->SUPER::size_allocate ($w, $h);
2506 2513
2507 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2514 $self->{layout}->set_font ($self->{font}) if $self->{font};
2508 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2515 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2509 $self->{layout}->set_width ($self->{children}[0]{w}); 2516 $self->{layout}->set_width ($self->{children}[0]{w});
2517 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2510 2518
2511 $self->reflow; 2519 $self->reflow;
2512} 2520}
2513 2521
2514sub text_size { 2522sub text_size {
… …
2516 2524
2517 my $layout = $self->{layout}; 2525 my $layout = $self->{layout};
2518 2526
2519 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2527 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2520 $layout->set_width ($self->{children}[0]{w} - $indent); 2528 $layout->set_width ($self->{children}[0]{w} - $indent);
2529 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2521 $layout->set_markup ($text); 2530 $layout->set_markup ($text);
2522 2531
2523 $layout->size 2532 $layout->size
2524} 2533}
2525 2534
… …
2564 2573
2565 return unless $self->{h} > 0; 2574 return unless $self->{h} > 0;
2566 2575
2567 delete $self->{texture}; 2576 delete $self->{texture};
2568 2577
2569 $ROOT->on_post_alloc ($self, sub { 2578 $ROOT->on_post_alloc ($self => sub {
2570 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2579 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2571 2580
2572 if (delete $self->{need_reflow}) { 2581 if (delete $self->{need_reflow}) {
2573 my $height = 0; 2582 my $height = 0;
2574 2583
… …
2577 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2586 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2578 2587
2579 for (@{$self->{par}}) { 2588 for (@{$self->{par}}) {
2580 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2589 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2581 $layout->set_width ($W - $_->[3]); 2590 $layout->set_width ($W - $_->[3]);
2591 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2582 $layout->set_markup ($_->[4]); 2592 $layout->set_markup ($_->[4]);
2583 my ($w, $h) = $layout->size; 2593 my ($w, $h) = $layout->size;
2584 $_->[0] = $w + $_->[3]; 2594 $_->[0] = $w + $_->[3];
2585 $_->[1] = $h; 2595 $_->[1] = $h;
2586 } 2596 }
… …
2589 } 2599 }
2590 2600
2591 $self->{height} = $height; 2601 $self->{height} = $height;
2592 2602
2593 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2603 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2594 2604
2595 delete $self->{texture}; 2605 delete $self->{texture};
2596 } 2606 }
2597 2607
2598 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2608 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2599 glClearColor 0, 0, 0, 0; 2609 glClearColor 0, 0, 0, 0;
… …
2618 my $h = $par->[1]; 2628 my $h = $par->[1];
2619 2629
2620 if ($y0 < $y + $h && $y < $y1) { 2630 if ($y0 < $y + $h && $y < $y1) {
2621 $layout->set_foreground (@{ $par->[2] }); 2631 $layout->set_foreground (@{ $par->[2] });
2622 $layout->set_width ($W - $par->[3]); 2632 $layout->set_width ($W - $par->[3]);
2633 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2623 $layout->set_markup ($par->[4]); 2634 $layout->set_markup ($par->[4]);
2624 2635
2625 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2636 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2626 2637
2627 glRasterPos $par->[3], $y - $y0; 2638 glRasterPos $par->[3], $y - $y0;
… …
2741 $tooltip .= "\n\n" . (ref $widget) . "\n" 2752 $tooltip .= "\n\n" . (ref $widget) . "\n"
2742 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2753 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2743 . "req $widget->{req_w} $widget->{req_h}\n" 2754 . "req $widget->{req_w} $widget->{req_h}\n"
2744 . "visible $widget->{visible}"; 2755 . "visible $widget->{visible}";
2745 } 2756 }
2757
2758 $tooltip =~ s/^\n+//;
2759 $tooltip =~ s/\n+$//;
2746 2760
2747 $self->add (new CFClient::UI::Label 2761 $self->add (new CFClient::UI::Label
2748 markup => $tooltip, 2762 markup => $tooltip,
2749 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2763 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2750 fontsize => 0.8, 2764 fontsize => 0.8,
… …
2778 or return; 2792 or return;
2779 2793
2780 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2794 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2781 2795
2782 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2796 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2783 if $x + $self->{w} > $::WIDTH; 2797 if $x + $self->{w} > $self->{root}{w};
2784 2798
2785 $self->move_abs ($x, $y); 2799 $self->move_abs ($x, $y);
2786 }); 2800 });
2787} 2801}
2788 2802
… …
2920 ); 2934 );
2921 2935
2922 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2936 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2923 2937
2924 for my $item (@{ $self->{items} }) { 2938 for my $item (@{ $self->{items} }) {
2925 my ($widget, $cb) = @$item; 2939 my ($widget, $cb, $tooltip) = @$item;
2926 2940
2927 # handle various types of items, only text for now 2941 # handle various types of items, only text for now
2928 if (!ref $widget) { 2942 if (!ref $widget) {
2929 $widget = new CFClient::UI::Label 2943 $widget = new CFClient::UI::Label
2930 can_hover => 1, 2944 can_hover => 1,
2931 can_events => 1, 2945 can_events => 1,
2932 text => $widget; 2946 markup => $widget,
2947 tooltip => $tooltip
2933 } 2948 }
2934 2949
2935 $self->{item}{$widget} = $item; 2950 $self->{item}{$widget} = $item;
2936 2951
2937 $self->{vbox}->add ($widget); 2952 $self->{vbox}->add ($widget);
… …
3084sub set_current_page { 3099sub set_current_page {
3085 my ($self, $page) = @_; 3100 my ($self, $page) = @_;
3086 3101
3087 $self->{multiplexer}->set_current_page ($page); 3102 $self->{multiplexer}->set_current_page ($page);
3088 $self->_emit (page_changed => $self->{multiplexer}{current}); 3103 $self->_emit (page_changed => $self->{multiplexer}{current});
3104}
3105
3106#############################################################################
3107
3108package CFClient::UI::Combobox;
3109
3110use utf8;
3111
3112our @ISA = CFClient::UI::Button::;
3113
3114sub new {
3115 my $class = shift;
3116
3117 my $self = $class->SUPER::new (
3118 options => [], # [value, title, longdesc], ...
3119 value => undef,
3120 @_,
3121 );
3122
3123 $self->_set_value ($self->{value});
3124
3125 $self
3126}
3127
3128sub button_down {
3129 my ($self, $ev) = @_;
3130
3131 my @menu_items;
3132
3133 for (@{ $self->{options} }) {
3134 my ($value, $title, $tooltip) = @$_;
3135
3136 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3137 }
3138
3139 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3140}
3141
3142sub _set_value {
3143 my ($self, $value) = @_;
3144
3145 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3146 or return;
3147
3148 $self->{value} = $item->[0];
3149 $self->set_markup ("$item->[1] ⇓");
3150 $self->set_tooltip ($item->[2]);
3151}
3152
3153sub set_value {
3154 my ($self, $value) = @_;
3155
3156 return unless $self->{value} ne $value;
3157
3158 $self->_set_value ($value);
3159 $self->_emit (changed => $value);
3089} 3160}
3090 3161
3091############################################################################# 3162#############################################################################
3092 3163
3093package CFClient::UI::Statusbox; 3164package CFClient::UI::Statusbox;
… …
3192 $item->{count}++; 3263 $item->{count}++;
3193 } else { 3264 } else {
3194 $item->{count} = 1; 3265 $item->{count} = 1;
3195 $item->{text} = $item->{tooltip} = $text; 3266 $item->{text} = $item->{tooltip} = $text;
3196 } 3267 }
3197 $item->{id} = ++$self->{id}; 3268 $item->{id} += 0.2;#d#
3198 $item->{timeout} = $timeout; 3269 $item->{timeout} = $timeout;
3199 delete $item->{label}; 3270 delete $item->{label};
3200 } else { 3271 } else {
3201 $self->{item}{$group} = { 3272 $self->{item}{$group} = {
3202 id => ++$self->{id}, 3273 id => ++$self->{id},
… …
3484 commands => [], 3555 commands => [],
3485 @_, 3556 @_,
3486 ) 3557 )
3487} 3558}
3488 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");
3489my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip => 3566my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3490 "<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");
3491my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip => 3568my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3492 "<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");
3493my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip => 3570my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3494 "<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");
3495 3572
3496sub rebuild_spell_list { 3573sub rebuild_spell_list {
3497 my ($self) = @_; 3574 my ($self) = @_;
3498 3575
3499 $CFClient::UI::ROOT->on_refresh ($self => sub { 3576 $CFClient::UI::ROOT->on_refresh ($self => sub {
3500 $self->clear; 3577 $self->clear;
3501 3578
3502 $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);
3503 $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);
3504 $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);
3505 $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);
3506 3584
3507 my $row = 0; 3585 my $row = 0;
3508 3586
3509 for (sort { $a cmp $b } keys %{ $self->{spell} }) { 3587 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3510 my $spell = $self->{spell}{$_}; 3588 my $spell = $self->{spell}{$_};
3511 3589
3512 $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});
3513 3617
3514 $self->add (0, $row, new CFClient::UI::Face 3618 $self->add (0, $row, new CFClient::UI::Face
3515 face => $spell->{face}, 3619 face => $spell->{face},
3516 can_hover => 1, 3620 can_hover => 1,
3517 can_events => 1, 3621 can_events => 1,
3518 tooltip => $spell->{message}, 3622 tooltip => $tooltip,
3623 on_button_down => $spell_cb,
3519 ); 3624 );
3520 3625
3521 $self->add (1, $row, new CFClient::UI::Label 3626 $self->add (1, $row, new CFClient::UI::Label
3522 expand => 1, 3627 expand => 1,
3523 text => $spell->{name}, 3628 text => $spell->{name},
3524 can_hover => 1, 3629 can_hover => 1,
3525 can_events => 1, 3630 can_events => 1,
3526 tooltip => $spell->{message}, 3631 tooltip => $tooltip,
3632 on_button_down => $spell_cb,
3527 ); 3633 );
3528 3634
3635 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3529 $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);
3530 $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);
3531 $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);
3532
3533 # TODO: should be done via popup
3534 $self->add (5, $row, new CFClient::UI::Button
3535 text => "bind",
3536 tooltip => "bind spell readying (cast command) to key",
3537 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3538 );
3539 } 3639 }
3540 }); 3640 });
3541} 3641}
3542 3642
3543sub add_spell { 3643sub add_spell {

Diff Legend

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