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.289 by root, Mon Jun 5 21:43:56 2006 UTC vs.
Revision 1.293 by root, Tue Jun 6 03:05:16 2006 UTC

… …
1691 can_hover => 1, 1691 can_hover => 1,
1692 can_focus => 1, 1692 can_focus => 1,
1693 valign => 0, 1693 valign => 0,
1694 can_events => 1, 1694 can_events => 1,
1695 #text => ... 1695 #text => ...
1696 #hidden => "*",
1696 @_ 1697 @_
1697 ) 1698 )
1698} 1699}
1699 1700
1700sub _set_text { 1701sub _set_text {
… …
2473 my $class = shift; 2474 my $class = shift;
2474 2475
2475 my $self = $class->SUPER::new ( 2476 my $self = $class->SUPER::new (
2476 fontsize => 1, 2477 fontsize => 1,
2477 can_events => 0, 2478 can_events => 0,
2479 indent => 0,
2478 #font => default_font 2480 #font => default_font
2479 @_, 2481 @_,
2480 2482
2481 layout => (new CFClient::Layout 1), 2483 layout => (new CFClient::Layout 1),
2482 par => [], 2484 par => [],
… …
2505 $self->SUPER::size_allocate ($w, $h); 2507 $self->SUPER::size_allocate ($w, $h);
2506 2508
2507 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2509 $self->{layout}->set_font ($self->{font}) if $self->{font};
2508 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2510 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2509 $self->{layout}->set_width ($self->{children}[0]{w}); 2511 $self->{layout}->set_width ($self->{children}[0]{w});
2512 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2510 2513
2511 $self->reflow; 2514 $self->reflow;
2512} 2515}
2513 2516
2514sub text_size { 2517sub text_size {
… …
2516 2519
2517 my $layout = $self->{layout}; 2520 my $layout = $self->{layout};
2518 2521
2519 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2522 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2520 $layout->set_width ($self->{children}[0]{w} - $indent); 2523 $layout->set_width ($self->{children}[0]{w} - $indent);
2524 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2521 $layout->set_markup ($text); 2525 $layout->set_markup ($text);
2522 2526
2523 $layout->size 2527 $layout->size
2524} 2528}
2525 2529
… …
2577 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2581 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2578 2582
2579 for (@{$self->{par}}) { 2583 for (@{$self->{par}}) {
2580 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2584 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2581 $layout->set_width ($W - $_->[3]); 2585 $layout->set_width ($W - $_->[3]);
2586 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2582 $layout->set_markup ($_->[4]); 2587 $layout->set_markup ($_->[4]);
2583 my ($w, $h) = $layout->size; 2588 my ($w, $h) = $layout->size;
2584 $_->[0] = $w + $_->[3]; 2589 $_->[0] = $w + $_->[3];
2585 $_->[1] = $h; 2590 $_->[1] = $h;
2586 } 2591 }
… …
2618 my $h = $par->[1]; 2623 my $h = $par->[1];
2619 2624
2620 if ($y0 < $y + $h && $y < $y1) { 2625 if ($y0 < $y + $h && $y < $y1) {
2621 $layout->set_foreground (@{ $par->[2] }); 2626 $layout->set_foreground (@{ $par->[2] });
2622 $layout->set_width ($W - $par->[3]); 2627 $layout->set_width ($W - $par->[3]);
2628 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2623 $layout->set_markup ($par->[4]); 2629 $layout->set_markup ($par->[4]);
2624 2630
2625 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2631 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2626 2632
2627 glRasterPos $par->[3], $y - $y0; 2633 glRasterPos $par->[3], $y - $y0;
… …
2920 ); 2926 );
2921 2927
2922 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2928 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2923 2929
2924 for my $item (@{ $self->{items} }) { 2930 for my $item (@{ $self->{items} }) {
2925 my ($widget, $cb) = @$item; 2931 my ($widget, $cb, $tooltip) = @$item;
2926 2932
2927 # handle various types of items, only text for now 2933 # handle various types of items, only text for now
2928 if (!ref $widget) { 2934 if (!ref $widget) {
2929 $widget = new CFClient::UI::Label 2935 $widget = new CFClient::UI::Label
2930 can_hover => 1, 2936 can_hover => 1,
2931 can_events => 1, 2937 can_events => 1,
2932 text => $widget; 2938 text => $widget,
2939 tooltip => $tooltip
2933 } 2940 }
2934 2941
2935 $self->{item}{$widget} = $item; 2942 $self->{item}{$widget} = $item;
2936 2943
2937 $self->{vbox}->add ($widget); 2944 $self->{vbox}->add ($widget);
… …
3084sub set_current_page { 3091sub set_current_page {
3085 my ($self, $page) = @_; 3092 my ($self, $page) = @_;
3086 3093
3087 $self->{multiplexer}->set_current_page ($page); 3094 $self->{multiplexer}->set_current_page ($page);
3088 $self->_emit (page_changed => $self->{multiplexer}{current}); 3095 $self->_emit (page_changed => $self->{multiplexer}{current});
3096}
3097
3098#############################################################################
3099
3100package CFClient::UI::Combobox;
3101
3102use utf8;
3103
3104our @ISA = CFClient::UI::Button::;
3105
3106sub new {
3107 my $class = shift;
3108
3109 my $self = $class->SUPER::new (
3110 options => [], # [title, value, tooltip], ...
3111 value => undef,
3112 @_,
3113 );
3114
3115 $self->_set_value ($self->{value});
3116
3117 $self
3118}
3119
3120sub button_down {
3121 my ($self, $ev) = @_;
3122
3123 my @menu_items;
3124
3125 for (@{ $self->{options} }) {
3126 my ($title, $value, $tooltip) = @$_;
3127
3128 push @menu_items, [$tooltip, sub { $self->set_value ($value) }];
3129 }
3130
3131 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3132}
3133
3134sub _set_value {
3135 my ($self, $value) = @_;
3136
3137 my ($item) = grep $_->[1] eq $value, @{ $self->{options} }
3138 or return;
3139
3140 $self->{value} = $item->[1];
3141 $self->set_markup ("$item->[0] ⇓");
3142 $self->set_tooltip ($item->[2]);
3143}
3144
3145sub set_value {
3146 my ($self, $value) = @_;
3147
3148 return unless $self->{value} ne $value;
3149
3150 $self->_set_value ($value);
3151 $self->_emit (changed => $value);
3089} 3152}
3090 3153
3091############################################################################# 3154#############################################################################
3092 3155
3093package CFClient::UI::Statusbox; 3156package CFClient::UI::Statusbox;
… …
3484 commands => [], 3547 commands => [],
3485 @_, 3548 @_,
3486 ) 3549 )
3487} 3550}
3488 3551
3489# XXX: Do sorting? Argl... 3552my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3553 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");
3554my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3555 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");
3556my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3557 "<b>Damage</b>. The amount of damage the spell deals when it hits.");
3558
3559sub rebuild_spell_list {
3560 my ($self) = @_;
3561
3562 $CFClient::UI::ROOT->on_refresh ($self => sub {
3563 $self->clear;
3564
3565 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name");
3566 $self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3567 $self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3568 $self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3569
3570 my $row = 0;
3571
3572 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3573 my $spell = $self->{spell}{$_};
3574
3575 $row++;
3576
3577 $self->add (0, $row, new CFClient::UI::Face
3578 face => $spell->{face},
3579 can_hover => 1,
3580 can_events => 1,
3581 tooltip => $spell->{message},
3582 );
3583
3584 $self->add (1, $row, new CFClient::UI::Label
3585 expand => 1,
3586 text => $spell->{name},
3587 can_hover => 1,
3588 can_events => 1,
3589 tooltip => $spell->{message},
3590 );
3591
3592 $self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3593 $self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3594 $self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3595
3596 # TODO: should be done via popup
3597 $self->add (5, $row, new CFClient::UI::Button
3598 text => "bind",
3599 tooltip => "bind spell readying (cast command) to key",
3600 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3601 );
3602 }
3603 });
3604}
3605
3490sub add_spell { 3606sub add_spell {
3491 my ($self, $spell) = @_; 3607 my ($self, $spell) = @_;
3608
3492 $self->{spells}->{$spell->{name}} = $spell; 3609 $self->{spell}->{$spell->{name}} = $spell;
3493 3610 $self->rebuild_spell_list;
3494 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3495 face => $spell->{face},
3496 can_hover => 1,
3497 can_events => 1,
3498 tooltip => $spell->{message});
3499
3500 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3501 text => $spell->{name},
3502 can_hover => 1,
3503 can_events => 1,
3504 tooltip => $spell->{message},
3505 expand => 1);
3506
3507 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3508 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3509 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3510 expand => 1);
3511
3512 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3513 text => "bind to key",
3514 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3515}
3516
3517sub rebuild_spell_list {
3518 my ($self) = @_;
3519 $self->{tbl_idx} = 0;
3520 $self->add_spell ($_) for values %{$self->{spells}};
3521} 3611}
3522 3612
3523sub remove_spell { 3613sub remove_spell {
3524 my ($self, $spell) = @_; 3614 my ($self, $spell) = @_;
3615
3525 delete $self->{spells}->{$spell->{name}}; 3616 delete $self->{spell}->{$spell->{name}};
3526 $self->rebuild_spell_list; 3617 $self->rebuild_spell_list;
3527} 3618}
3528 3619
3529############################################################################# 3620#############################################################################
3530 3621

Diff Legend

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