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

… …
525 if $self->{parent}; 525 if $self->{parent};
526} 526}
527 527
528sub reconfigure { 528sub reconfigure {
529 my ($self) = @_; 529 my ($self) = @_;
530
531 # some widgets cache req_w and req_h
532 delete $self->{req_w};
533 delete $self->{req_h};
534 530
535 $self->realloc; 531 $self->realloc;
536 $self->update; 532 $self->update;
537} 533}
538 534
… …
1559 $self->{text} = "T$text"; 1555 $self->{text} = "T$text";
1560 1556
1561 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1562 $self->{layout}->set_text ($text); 1558 $self->{layout}->set_text ($text);
1563 1559
1564 delete $self->{req_h}; 1560 delete $self->{size_req};
1565 $self->realloc; 1561 $self->realloc;
1566 $self->update; 1562 $self->update;
1567} 1563}
1568 1564
1569sub set_markup { 1565sub set_markup {
… …
1575 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1571 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1576 1572
1577 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1573 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1578 $self->{layout}->set_markup ($markup); 1574 $self->{layout}->set_markup ($markup);
1579 1575
1580 delete $self->{req_h}; 1576 delete $self->{size_req};
1581 $self->realloc; 1577 $self->realloc;
1582 $self->update; 1578 $self->update;
1583} 1579}
1584 1580
1585sub size_request { 1581sub size_request {
1586 my ($self) = @_; 1582 my ($self) = @_;
1587 1583
1588 if (exists $self->{req_h}) { 1584 $self->{size_req} ||= do {
1589 @$self{qw(req_w req_h)}
1590 } else {
1591 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1585 $self->{layout}->set_font ($self->{font}) if $self->{font};
1592 $self->{layout}->set_width ($self->{max_w} || -1); 1586 $self->{layout}->set_width ($self->{max_w} || -1);
1593 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1587 $self->{layout}->set_ellipsise ($self->{ellipsise});
1594 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1588 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1595 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1589 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
… …
1604 1598
1605 $w = List::Util::max $w, $w2; 1599 $w = List::Util::max $w, $w2;
1606 $h = List::Util::max $h, $h2; 1600 $h = List::Util::max $h, $h2;
1607 } 1601 }
1608 1602
1609 ($w, $h) 1603 [$w, $h]
1610 } 1604 };
1605
1606 @{ $self->{size_req} }
1611} 1607}
1612 1608
1613sub size_allocate { 1609sub size_allocate {
1614 my ($self, $w, $h) = @_; 1610 my ($self, $w, $h) = @_;
1615 1611
… …
1624 1620
1625 $self->{fontsize} = $fontsize; 1621 $self->{fontsize} = $fontsize;
1626 delete $self->{texture}; 1622 delete $self->{texture};
1627 1623
1628 $self->realloc; 1624 $self->realloc;
1625}
1626
1627sub reconfigure {
1628 my ($self) = @_;
1629
1630 delete $self->{size_req};
1631
1632 $self->SUPER::reconfigure;
1629} 1633}
1630 1634
1631sub _draw { 1635sub _draw {
1632 my ($self) = @_; 1636 my ($self) = @_;
1633 1637
… …
1687 can_hover => 1, 1691 can_hover => 1,
1688 can_focus => 1, 1692 can_focus => 1,
1689 valign => 0, 1693 valign => 0,
1690 can_events => 1, 1694 can_events => 1,
1691 #text => ... 1695 #text => ...
1696 #hidden => "*",
1692 @_ 1697 @_
1693 ) 1698 )
1694} 1699}
1695 1700
1696sub _set_text { 1701sub _set_text {
… …
1703 $self->{last_activity} = $::NOW; 1708 $self->{last_activity} = $::NOW;
1704 $self->{text} = $text; 1709 $self->{text} = $text;
1705 1710
1706 $text =~ s/./*/g if $self->{hidden}; 1711 $text =~ s/./*/g if $self->{hidden};
1707 $self->{layout}->set_text ("$text "); 1712 $self->{layout}->set_text ("$text ");
1708 delete $self->{req_h}; 1713 delete $self->{size_req};
1709 1714
1710 $self->_emit (changed => $self->{text}); 1715 $self->_emit (changed => $self->{text});
1711 1716
1712 $self->realloc; 1717 $self->realloc;
1713 $self->update; 1718 $self->update;
… …
2469 my $class = shift; 2474 my $class = shift;
2470 2475
2471 my $self = $class->SUPER::new ( 2476 my $self = $class->SUPER::new (
2472 fontsize => 1, 2477 fontsize => 1,
2473 can_events => 0, 2478 can_events => 0,
2479 indent => 0,
2474 #font => default_font 2480 #font => default_font
2475 @_, 2481 @_,
2476 2482
2477 layout => (new CFClient::Layout 1), 2483 layout => (new CFClient::Layout 1),
2478 par => [], 2484 par => [],
… …
2501 $self->SUPER::size_allocate ($w, $h); 2507 $self->SUPER::size_allocate ($w, $h);
2502 2508
2503 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2509 $self->{layout}->set_font ($self->{font}) if $self->{font};
2504 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2510 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2505 $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});
2506 2513
2507 $self->reflow; 2514 $self->reflow;
2508} 2515}
2509 2516
2510sub text_size { 2517sub text_size {
… …
2512 2519
2513 my $layout = $self->{layout}; 2520 my $layout = $self->{layout};
2514 2521
2515 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2522 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2516 $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});
2517 $layout->set_markup ($text); 2525 $layout->set_markup ($text);
2518 2526
2519 $layout->size 2527 $layout->size
2520} 2528}
2521 2529
… …
2573 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2581 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2574 2582
2575 for (@{$self->{par}}) { 2583 for (@{$self->{par}}) {
2576 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2584 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2577 $layout->set_width ($W - $_->[3]); 2585 $layout->set_width ($W - $_->[3]);
2586 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2578 $layout->set_markup ($_->[4]); 2587 $layout->set_markup ($_->[4]);
2579 my ($w, $h) = $layout->size; 2588 my ($w, $h) = $layout->size;
2580 $_->[0] = $w + $_->[3]; 2589 $_->[0] = $w + $_->[3];
2581 $_->[1] = $h; 2590 $_->[1] = $h;
2582 } 2591 }
… …
2614 my $h = $par->[1]; 2623 my $h = $par->[1];
2615 2624
2616 if ($y0 < $y + $h && $y < $y1) { 2625 if ($y0 < $y + $h && $y < $y1) {
2617 $layout->set_foreground (@{ $par->[2] }); 2626 $layout->set_foreground (@{ $par->[2] });
2618 $layout->set_width ($W - $par->[3]); 2627 $layout->set_width ($W - $par->[3]);
2628 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2619 $layout->set_markup ($par->[4]); 2629 $layout->set_markup ($par->[4]);
2620 2630
2621 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2631 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2622 2632
2623 glRasterPos $par->[3], $y - $y0; 2633 glRasterPos $par->[3], $y - $y0;
… …
2916 ); 2926 );
2917 2927
2918 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2928 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2919 2929
2920 for my $item (@{ $self->{items} }) { 2930 for my $item (@{ $self->{items} }) {
2921 my ($widget, $cb) = @$item; 2931 my ($widget, $cb, $tooltip) = @$item;
2922 2932
2923 # handle various types of items, only text for now 2933 # handle various types of items, only text for now
2924 if (!ref $widget) { 2934 if (!ref $widget) {
2925 $widget = new CFClient::UI::Label 2935 $widget = new CFClient::UI::Label
2926 can_hover => 1, 2936 can_hover => 1,
2927 can_events => 1, 2937 can_events => 1,
2928 text => $widget; 2938 text => $widget,
2939 tooltip => $tooltip
2929 } 2940 }
2930 2941
2931 $self->{item}{$widget} = $item; 2942 $self->{item}{$widget} = $item;
2932 2943
2933 $self->{vbox}->add ($widget); 2944 $self->{vbox}->add ($widget);
… …
3080sub set_current_page { 3091sub set_current_page {
3081 my ($self, $page) = @_; 3092 my ($self, $page) = @_;
3082 3093
3083 $self->{multiplexer}->set_current_page ($page); 3094 $self->{multiplexer}->set_current_page ($page);
3084 $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);
3085} 3152}
3086 3153
3087############################################################################# 3154#############################################################################
3088 3155
3089package CFClient::UI::Statusbox; 3156package CFClient::UI::Statusbox;
… …
3480 commands => [], 3547 commands => [],
3481 @_, 3548 @_,
3482 ) 3549 )
3483} 3550}
3484 3551
3485# 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
3486sub add_spell { 3606sub add_spell {
3487 my ($self, $spell) = @_; 3607 my ($self, $spell) = @_;
3608
3488 $self->{spells}->{$spell->{name}} = $spell; 3609 $self->{spell}->{$spell->{name}} = $spell;
3489 3610 $self->rebuild_spell_list;
3490 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3491 face => $spell->{face},
3492 can_hover => 1,
3493 can_events => 1,
3494 tooltip => $spell->{message});
3495
3496 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3497 text => $spell->{name},
3498 can_hover => 1,
3499 can_events => 1,
3500 tooltip => $spell->{message},
3501 expand => 1);
3502
3503 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3504 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3505 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3506 expand => 1);
3507
3508 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3509 text => "bind to key",
3510 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3511}
3512
3513sub rebuild_spell_list {
3514 my ($self) = @_;
3515 $self->{tbl_idx} = 0;
3516 $self->add_spell ($_) for values %{$self->{spells}};
3517} 3611}
3518 3612
3519sub remove_spell { 3613sub remove_spell {
3520 my ($self, $spell) = @_; 3614 my ($self, $spell) = @_;
3615
3521 delete $self->{spells}->{$spell->{name}}; 3616 delete $self->{spell}->{$spell->{name}};
3522 $self->rebuild_spell_list; 3617 $self->rebuild_spell_list;
3523} 3618}
3524 3619
3525############################################################################# 3620#############################################################################
3526 3621

Diff Legend

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